@@ -1,4 +1,150 @@

 -------------------------------------------------------------------

+Tue Feb 28 00:38:38 UTC 2017 - jimmy@boombatower.com

+

+- Update to version 18.0.0:

+  * UI: Add more command line options

+  * obs-browser: Update submodule to latest version

+  * Revert "Revert "win-capture: Use FindWindowEx to traverse window list""

+  * CI: Add in inital appveyor config

+  * CI: Move browser source before building app

+  * CI: Build VLC plugin for OSX on travis

+  * rtmp-services: remove shut down services

+  * CI: Build Windows version and upload artifacts

+  * obs-browser: Update browser ref

+  * CI: Update permissions on CEF app plist before packaging

+  * cmake: Enable COPY_DEPENDENCIES by default on Windows

+  * rtmp-services: Update Vaughn Live ingests

+  * libobs: Log correct amount of memory on 32bit (windows)

+  * UI: Convert to wide before outputting debug text (win)

+  * UI: Protect debug text static string var with mutex

+  * libobs: Add ability to get output congestion

+  * obs-output: Add ability to get congestion to rtmp output

+  * obs-outputs: Increase default drop threshold

+  * UI: Add connection status square to status bar

+  * UI: Add separate timers to status bar

+  * UI: Add option to always minimize to tray

+  * UI: Hide/show dialogs when minimizing to tray

+  * UI: Do not quit program when last windows are projectors

+  * UI: Add option to save projectors

+  * UI: Add auto-start replay buf. opt. when stream starts

+  * UI: Fix scaling in viewport when source flipped

+  * UI: Fix linux display/resize bug with preview widget

+  * rtmp-services: Add Restream.io Los Angeles server

+  * libobs: Add optional ultrawide -> wide scaling techniques

+  * obs-filters: Add option to undistort ultrawide -> wide

+  * obs-filters: Add "Color Grading" filter

+  * rtmp-services: Add new beam.pro ingests

+  * CI: Add post install script to OBS installer to fix CEF permissions

+  * rtmp-services: Add Web.TV streaming service

+  * Add VST Plugin

+  * obs-filters: Fix compiler warnings

+  * UI: Remove unused variables

+  * UI: Clarify "Always minimize to tray" option

+  * obs-filters: Rename "Color Grade" filter to "LUT Filter"

+  * obs-filters: Change "LUT Filter" to "Apply LUT"

+  * CI: Fix VLC download

+  * CI: Unzip VLC quietly

+  * rtmp-services: Update twitch/hitbox ingest and youtube recommendations

+  * CI: Fix OSX post-install script

+  * UI: Fix locale text alignment

+  * UI: Make advanced settings pane a bit more compact

+  * libobs: Mark last video ts even when buffering off

+  * libobs: Mark parameter as constant if not modifying

+  * libobs: Use original audio structure for audio signal

+  * libobs: Implement audio monitoring

+  * win-wasapi: Mark audio outputs as unmonitorable

+  * UI: Add audio monitoring to settings/adv audio props.

+  * UI: Prevent thread stalls with fader/volume widgets

+  * obs-transitions: Convert premultiplied alpha to straight

+  * UI: Add 24 NTSC as a common FPS value

+  * obs-ffmpeg: Do not use HW accel by default on mac

+  * rtmp-services: Update twitch ingests

+  * obs-ffmpeg: Fix compiler warnings

+  * UI: Fix compiler warning

+  * UI: Change volume meter update interval to 30fps

+  * UI: Add warning if starting the output fails

+  * obs-ffmpeg: Be more verbose when custom params fail

+  * obs-ffmpeg: Fix custom audio codec parameters

+  * CI: Retry failed downloads

+  * UI: fix ffmpeg output file extension

+  * UI: Clean up general pane of settings dialog

+  * UI: Add function to get remote file

+  * UI: Add front-end auto-updater

+  * UI: Update installer to latest version

+  * UI: Add latest installer fixes from R1CH

+  * obs-ffmpeg: Add 'save' to replay buffer proc handler

+  * win-capture: Fall back to GetWindow if FindWindowEx fails

+  * libobs: Fix audio monitoring delaying perpetually

+  * rtmp-services: Update max video bitrate for beam

+  * libobs/util: Use a mutex with config files

+  * win-capture: Blacklist chrome/firefox from game capture

+  * win-dshow: Add LGP timestamp fix

+  * UI: Trigger frontend api scene change after transition

+  * Add AUTHORS file

+  * mailmap: Disambiguate between a few authors

+  * mailmap: Disambiguate between another author

+  * rtmp-services: Add "Pandora TV Korea"

+  * UI: Trigger scene list change event when scene removed

+  * CI: Speedup msbuild by using all CPU cores

+  * UI: Improve accessibility text on main window

+  * CI: Download VLC repo instead of cloning from git

+  * CI: Disable test discovery on AppVeyor

+  * CI: Cache dependencies downloads on AppVeyor

+  * CI: Disable deps download in AppVeyor and use cache

+  * CI: Download deps if they aren't in build cache

+  * UI: Use blake2b instead of SHA1 for updater

+  * UI: Make installer execute 64bit on 64bit windows

+  * obs-text: Fix issue drawing some chinese characters

+  * obs-filters: Add audio compression filter

+  * obs-outputs: Port windows socket loop from OBS Classic

+  * librtmp: Clean up our extra RTMP fields on close

+  * UI: Add options for new socket loop

+  * UI: Make sure size-specific spacers are fixed

+  * UI: Fix some settings layouts on non-windows systems

+  * win-capture: Add hook exception for theHunter: COTW

+  * obs-ffmpeg/ffmpeg-mux: Fix failing when no video

+  * image-source: Add solid color source

+  * image-source: Add missing locale

+  * Fix various null pointer issues detected by Coverity

+  * obs-ffmpeg: Allow saving with different video codecs

+  * UI: Add support for other codecs

+  * graphics-hook: Account for sizeof(wchar_t) in len

+  * obs-qsv11: Fix various issues detected by Coverity

+  * obs-ffmpeg: Make gop size configurable

+  * UI: Add gop size option for custom ffmpeg output

+  * libff: Add override for codec compatability check

+  * UI: Add codec compatability checkbox to ffmpeg output

+  * UI: Add warning about recording to mp4 format

+  * CI: Fetch git tags on OSX build

+  * CI: Exit on errors when building the OSX package

+  * UI: Fix typo in general settings

+  * enc-amf: Update to version 1.4.3.9

+  * CI: Build on Linux

+  * libobs: Update version to 18.0.0

+  * libobs: Fix bug where scenes would not properly mix audio

+  * UI: If scene/source names exist, start from 2

+  * CI: Don't skip_join for Travis IRC notifications

+  * obs-frontend-api: Use virtual destructor (fix memory leak)

+  * libobs: Add missing mutex unlock in audio monitoring

+  * CI: Get some codesigning and sparkle stuff in place

+  * CI: Use combined cert for signing OSX

+  * CI: Set keychain timeout & allow productsign

+  * CI: Add some logging to the before deploy script on OSX

+  * CI: Possibly fix OSX cert import issue

+  * CI: OSX - Brew install jack

+  * CI: Notify on failure and only for fixed builds

+  * CI: Reformat Travis CI IRC notification

+  * UI: Hide auto update option for linux

+  * obs-filters: Change attack/release ms limit to 300 (from 100)

+  * obs-filters: Increase max compressor release/attack values

+  * Update translations from Crowdin

+  * AUTHORS: Update with data from Git and Crowdin

+  * UI: Update Simple Mode AMD Presets

+  * enc-amf: Update to hotfix 1.4.3.10

+  * CI: OSX Set builds to stable on tagged builds

+  * CI: Update public OSX install key

+

+-------------------------------------------------------------------

 Wed Jan 18 14:48:26 UTC 2017 - jimmy@boombatower.com

 - Update to version 17.0.2:

​

@@ -1,5 +1,5 @@

 Name:           obs-studio

-Version:        17.0.2

+Version:        18.0.0

 Release:        0

 Summary:        A recording/broadcasting program

​

@@ -1,7 +1,7 @@

 <services>

   <service name="tar_scm" mode="disabled">

     <param name="versionformat">@PARENT_TAG@</param>

-    <param name="revision">refs/tags/17.0.2</param>

+    <param name="revision">refs/tags/18.0.0</param>

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

     <param name="scm">git</param>

     <param name="changesgenerate">enable</param>

​

@@ -1,6 +1,6 @@

 <servicedata>

   <service name="tar_scm">

     <param name="url">git://github.com/jp9000/obs-studio.git</param>

-    <param name="changesrevision">841dfade55dff65a4080dbdfd5672f3318de6f08</param>

+    <param name="changesrevision">5312ffa8157c4210cf57026f90eeb09e81a5a461</param>

   </service>

 </servicedata>

​

@@ -3,3 +3,6 @@

 Benjamin Klettbach <b.klettbach@gmail.com>

 BtbN <btbn@btbn.de>

 John Bradley <jrb@turrettech.com>

+HomeWorld <homeworld@gmail.com> hwdro <pdarvaru@yahoo.com>

+Michael Fabian Dirks <info@xaymar.com> <michael.dirks@xaymar.com>

+Martell Malone <martellmalone@gmail.com>

​

@@ -1,18 +1,29 @@

-os: osx

+language: cpp

+

 env:

-  matrix:

-  - CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake

   global:

   # AWS S3 creds

   # access key

   - secure: "MfhOg+84yb4ZHB2tM8PIPFQX2Y+WLN0I0iiAgyLC4KaHPUoNOyloe9yk6OjV7Lj7SZWqTlQUsqHa8S9mOUswGIody1Ydglo4RvyGOKCd8I6b2ri/jE8qHVuD9sO+sNlIxq4YqqG/qReTsbSs2YEgLneZUCYLCk/fihl8L6eVuSc="

   # secret

   - secure: "JRQVU2zgC3hY6CEY+Crmh/upp93En0BzKaLcsuBT538johNlK7m5hn3m2UOw63seLvBvVaKKWUDj9N986a3DwcXxWPMyF/9ctXgNWy39WzaVWxrbVR5nQB1fdiRp5YEgkoVN+gEm3OVF7sV5AGzh5/8CvEdRCoTLIGgMGHxW9mc="

-language: cpp

-before_install: "./CI/install-dependencies-osx.sh"

-before_script: "./CI/before-script-osx.sh"

+

+matrix:

+  include:

+    - os: osx

+      env: CMAKE_PREFIX_PATH=/usr/local/opt/qt5/lib/cmake

+      before_install: "./CI/install-dependencies-osx.sh"

+      before_script: "./CI/before-script-osx.sh"

+      before_deploy: "./CI/before-deploy-osx.sh"

+

+    - os: linux

+      dist: trusty

+      sudo: required

+      before_install: "./CI/install-dependencies-linux.sh"

+      before_script: "./CI/before-script-linux.sh"

+

 script: cd ./build && make -j4 && cd -

-before_deploy: "./CI/before-deploy-osx.sh"

+

 deploy:

   provider: s3

   access_key_id: $AWS_ACCESS_KEY

@@ -24,12 +35,15 @@

   acl: public_read

   on:

     repo: jp9000/obs-studio

+    condition: "$TRAVIS_OS_NAME = osx"

 # The channel name "azubu.il.us.quakenet.org#obs-dev" is encrypted against jp9000/obs-studio to prevent IRC spam of forks

 notifications:

   irc:

-    skip_join: true

+    skip_join: false

     template:

-      - "%{message} %{build_url}"

+      - "[Travis CI|%{result}] %{repository_name}/%{branch} (%{author} - %{commit_subject}) %{build_url}"

     channels:

       - secure: k9j7+ogVODMlveZdd5pP73AVLCFl1VbzVaVon0ECn3EQcxnLSpiZbc6l+PnIUKgee5pRKtUB4breufgmr4puq3s69YeQiOVKk5gx2yJGZ5jGacbSne0xTspzPxapiEbVUkcJ2L7gKntDG4+SUiW67dtt4G26O7zsErDF/lY/woQ=

+    on_failure: always

+    on_success: change

​

@@ -0,0 +1,472 @@

+Contributors are sorted by their amount of commits / validated strings.

+

+Contributors:

+Jim

+Palana

+fryshorts

+BtbN

+John Bradley

+Gol-D-Ace

+Zachary Lund

+Richard Stanway

+Colin Edwards

+Michael Fabian Dirks

+Martell Malone

+Christoph Hohmann

+HomeWorld

+dodgepong

+cg2121

+derrod

+Ryan Foster

+Radzaquiel

+Socapex

+Skyler Lipthay

+SuslikV

+Arkkis

+Cephas Reis

+GoaLitiuM

+Danni

+Jess Mayo

+Kris Moore

+Carl Fürstenberg

+juvester

+Anry

+CoDEmanX

+Ján Mlynek

+Manuel Kroeber

+sorayuki

+Alexandre Vicenzi

+Benjamin Klettbach

+bl

+Bl00drav3n

+Blackhive

+Charles Ray Shisler III

+Jeremiah Senkpiel

+John R. Bradley

+Kilian von Pflugk

+Serge Paquet

+shiina424

+shousa

+Timo Gurr

+adray

+Andrei Nistor

+Andrew Surzhynskyi

+Azat Khasanshin

+Ben Torell

+bootkiller

+Brian S. Stephan

+Eric Bataille

+Joseph El-Khouri

+jpk

+Kurt Kartaltepe

+Lexsus

+Lionheart Zhang

+paibox

+Robin Hielscher

+skwerlman

+taesheren

+Take Vos

+Taylor Blau

+Warren Turkal

+yogpstop

+Aarni Koskela

+Aesen Vismea

+Akagi201

+Alexander Uhlmann

+Alexandre Biny

+Andreas Reischuck

+Anthony Catel

+Anthony Super

+Asgeir Mortensen

+Autumin

+Aydin Akan

+Bernd Buschinski

+bla

+boombatower

+Caitlin Potter

+Caleb Anderson

+CallumHoward

+Cam

+CommanderRoot

+Copy Liu

+cryptonaut

+Dan Dascalescu

+David Cooper

+David McMackins II

+dennis

+Derrick Lambert

+Emil Sayahi

+EpicCoder

+Ethan Lee

+Frank Gehann

+Giorgio Pellero

+Grigorii Chirkov

+Guillermo A. Amaral

+Gökberk Yaltıraklı

+Haden F

+Iblis Lin

+Jake Probst

+Jamy Timmermans

+Jimmy Berry

+Jkoan

+Joel Bethke

+Julian Miller

+Kazuki Oishi

+ka’imi

+Kevin

+Kevin Tardif

+Lasse Dalegaard

+lemmi

+Lioncash

+Lucian Poston

+Lukas Monka

+Luke Yelavich

+mape

+Marc Chambers

+Mark Vaughn

+Mathias Panzenböck

+Matthew McNamara

+MedicMomcilo

+michael bishop

+Michael Hoang

+Momcilo Medic

+nd

+Nicolas F

+Night

+Olle Kelderman

+pantonvich

+partouf

+Peter SZTANOJEV

+pipll

+raincomplex

+repeat

+Ricardo Constantino

+Rodrigo Ipince

+rpslack

+Ryan Sullivan

+sam8641

+Seth Murphy

+Seung-Woo Kim

+Simon

+Teemu Kauhanen

+thekrzos

+Thomas McGrew

+TotalCaesar659

+vic

+vividnightmare

+wayne wang

+Weikardzaena

+Will Jamieson

+William Casarin

+Younes SERRAJ

+Ziemas

+

+Translations:

+Arabic

+    Abdullah AL-Qahtani (Za7ef_SA)

+    majdcomp

+    ZILZAL

+    BWU Wheelman (Wheelman)

+    Saleh Luxmaroc (salehoukiki)

+    Gol D. Ace (goldace)

+    معتصم دعنا (rozana-media)

+    chaironeko

+    dodgepong

+    FC Barcelona HD (kurdnews)

+Basque

+    Alexander Gabilondo (alexgabi)

+    Xabier Aramendi (azpidatziak)

+    Osoitz

+    txaro

+    etxondoko

+    Gol D. Ace (goldace)

+    dodgepong

+Bulgarian

+    kalmarin

+    Seyhan Halil (yildirim17)

+    Viktor Kitov (viktorkitov)

+    Stanislav_Evtimov

+    Ivan (SKDown)

+Catalan

+    Jaime Muñoz Martín (jmmartin_5)

+    jmontane

+    Nil Campamà (Soifam)

+    Aleix Vidal i Gaya (leixet)

+    Gol D. Ace (goldace)

+Chinese Simplified

+    Bob Liu (Akagi201)

+    PabloLiu (719018105)

+    Sasasu

​

@@ -1,10 +1,56 @@

+hr() {

+  echo "───────────────────────────────────────────────────"

+  echo $1

+  echo "───────────────────────────────────────────────────"

+}

+

+# Exit if something fails

+set -e

+

+# Generate file name variables

 export GIT_HASH=$(git rev-parse --short HEAD)

 export FILE_DATE=$(date +%Y-%m-%d.%H:%M:%S)

 export FILENAME=$FILE_DATE-$GIT_HASH-osx.pkg

-mkdir nightly

+

 cd ./build

-sudo python ../CI/install/osx/build_app.py

+

+# Move the CEF plugin out before running build_app so that it doesn't get packaged twice

+hr "Moving CEF out to preserve linking"

+mv ./rundir/RelWithDebInfo/obs-plugins/CEF.app ./

+mv ./rundir/RelWithDebInfo/obs-plugins/obs-browser.so ./

+

+# Package everything into a nice .app

+hr "Packaging .app"

+STABLE=False

+if [ -n "${TRAVIS_TAG}" ]; then

+  STABLE=TRUE

+fi

+

+sudo python ../CI/install/osx/build_app.py --public-key ../CI/install/osx/OBSPublicDSAKey.pem --sparkle-framework ../../sparkle/Sparkle.framework --base-url "https://obsproject.com/osx_update" --stable $STABLE

+

+# Move the CEF plugin back to where it belongs

+hr "Moving CEF back"

+mv ./CEF.app ./rundir/RelWithDebInfo/obs-plugins/

+mv ./obs-browser.so ./rundir/RelWithDebInfo/obs-plugins/

+

+# Package app

+hr "Generating .pkg"

 packagesbuild ../CI/install/osx/CMakeLists.pkgproj

-sudo cp OBS.pkg ./$FILENAME

+# Signing stuff

+hr "Decrypting Cert"

+openssl aes-256-cbc -K $encrypted_dd3c7f5e9db9_key -iv $encrypted_dd3c7f5e9db9_iv -in ../CI/osxcert/Certificates.p12.enc -out Certificates.p12 -d

+hr "Creating Keychain"

+security create-keychain -p mysecretpassword build.keychain

+security default-keychain -s build.keychain

+security unlock-keychain -p mysecretpassword build.keychain

+security set-keychain-settings -t 3600 -u build.keychain

+hr "Importing certs into keychain"

+security import ./Certificates.p12 -k build.keychain -T /usr/bin/productsign -P ""

+hr "Signing Package"

+productsign --sign 'Developer ID Installer: Hugh Bailey (2MMRE5MTB8)' ./OBS.pkg ./$FILENAME

+

+# Move to the folder that travis uses to upload artifacts from

+hr "Moving package to nightly folder for distribution"

+mkdir ../nightly

 sudo mv ./$FILENAME ../nightly

​

@@ -0,0 +1,3 @@

+xcopy /e C:\projects\obs-studio\build32\rundir\RelWithDebInfo C:\projects\obs-studio\build\

+robocopy C:\projects\obs-studio\build64\rundir\RelWithDebInfo C:\projects\obs-studio\build\ /E /XC /XN /XO

+7z a build.zip C:\projects\obs-studio\build\*

\ No newline at end of file

​

@@ -0,0 +1,5 @@

+#!/bin/sh

+set -ex

+

+mkdir build && cd build

+cmake ..

​

@@ -1,3 +1,3 @@

 mkdir build

 cd build

-cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2883.1540.gedbfb20_macosx64 ..

\ No newline at end of file

+cmake -DCMAKE_OSX_DEPLOYMENT_TARGET=10.9 -DDepsPath=/tmp/obsdeps -DVLCPath=$PWD/../../vlc-master -DBUILD_BROWSER=ON -DCEF_ROOT_DIR=$PWD/../../cef_binary_3.2883.1540.gedbfb20_macosx64 ..

\ No newline at end of file

​

@@ -0,0 +1,37 @@

+#!/bin/sh

+set -ex

+

+sudo add-apt-repository ppa:kirillshkrogalev/ffmpeg-next -y

+sudo apt-get -qq update

+sudo apt-get install -y \

+        build-essential \

+        checkinstall \

+        cmake \

+        libasound2-dev \

+        libavcodec-ffmpeg-dev \

+        libavdevice-ffmpeg-dev \

+        libavfilter-ffmpeg-dev \

+        libavformat-ffmpeg-dev \

+        libavutil-ffmpeg-dev \

+        libcurl4-openssl-dev \

+        libfontconfig-dev \

+        libfreetype6-dev \

+        libgl1-mesa-dev \

+        libjack-jackd2-dev \

+        libjansson-dev \

+        libpulse-dev \

+        libqt5x11extras5-dev \

+        libspeexdsp-dev \

+        libswresample-ffmpeg-dev \

+        libswscale-ffmpeg-dev \

+        libudev-dev \

+        libv4l-dev \

+        libvlc-dev \

+        libx11-dev \

+        libx264-dev \

+        libxcb-shm0-dev \

+        libxcb-xinerama0-dev \

+        libxcomposite-dev \

+        libxinerama-dev \

+        pkg-config \

+        qtbase5-dev

​

@@ -1,17 +1,36 @@

-curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg

+# Exit if something fails

+set -e

+

+git fetch --tags

+

+# Leave obs-studio folder

+cd ../

+

+# Install Packages app so we can build a package later

+# http://s.sudre.free.fr/Software/Packages/about.html

+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/Packages.pkg -f --retry 5 -C -

 sudo installer -pkg ./Packages.pkg -target /

 brew update

 #Base OBS Deps

-brew install qt5

+brew install qt5 jack

-curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz

+# Fetch and untar prebuilt OBS deps that are compatible with older versions of OSX

+curl -L -O https://s3-us-west-2.amazonaws.com/obs-nightly/osx-deps.tar.gz -f --retry 5 -C -

 tar -xf ./osx-deps.tar.gz -C /tmp

+# Fetch vlc codebase

+curl -L -o vlc-master.zip https://github.com/videolan/vlc/archive/master.zip -f --retry 5 -C -

+unzip -q ./vlc-master.zip

+

+# Get sparkle

+curl -L -o ./sparkle.tar.bz2 https://github.com/sparkle-project/Sparkle/releases/download/1.16.0/Sparkle-1.16.0.tar.bz2

+mkdir ./sparkle

+tar -xf ./sparkle.tar.bz2 -C ./sparkle

+

 # CEF Stuff

-cd ../

-curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2

+curl -kLO http://opensource.spotify.com/cefbuilds/cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2 -f --retry 5 -C -

 tar -xf ./cef_binary_3.2883.1540.gedbfb20_macosx64.tar.bz2

 cd ./cef_binary_3.2883.1540.gedbfb20_macosx64

 mkdir build

​

@@ -573,7 +573,12 @@

            <key>PACKAGE_SCRIPTS</key>

            <dict>

                <key>POSTINSTALL_PATH</key>

-               <dict/>

+               <dict>

+                   <key>PATH</key>

+                   <string>post-install.sh</string>

+                   <key>PATH_TYPE</key>

+                   <integer>3</integer>

+               </dict>

                <key>PREINSTALL_PATH</key>

                <dict/>

                <key>RESOURCES</key>

@@ -632,7 +637,7 @@

            ZW50LVN0eWxlLVR5cGUiIGNvbnRlbnQ9InRleHQvY3NzIj4KPHRp

            dGxlPjwvdGl0bGU+CjxtZXRhIG5hbWU9IkdlbmVyYXRvciIgY29u

            dGVudD0iQ29jb2EgSFRNTCBXcml0ZXIiPgo8bWV0YSBuYW1lPSJD

-           b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuNzYiPgo8c3R5bGUg

+           b2NvYVZlcnNpb24iIGNvbnRlbnQ9IjE1MDQuODEiPgo8c3R5bGUg

            dHlwZT0idGV4dC9jc3MiPgo8L3N0eWxlPgo8L2hlYWQ+Cjxib2R5

            Pgo8L2JvZHk+CjwvaHRtbD4K

            </data>

​

@@ -1,36 +1,36 @@

 -----BEGIN PUBLIC KEY-----

-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

-0tZk6dhMjtrBOkZMfnBbSKDKQlcHvXM25yIjgA==

+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

+MGjmuSOlPA1umQsToIcO4g==

 -----END PUBLIC KEY-----

​

@@ -0,0 +1,5 @@

+#!/usr/bin/env bash

+

+# Fix permissions on CEF

+chmod 744 "/Library/Application Support/obs-studio/plugins/obs-browser/bin/CEF.app/Contents/Info.plist"

+chmod 744 "/Library/Application Support/obs-studio/plugins/obs-browser/bin/CEF.app/Contents/Frameworks/CEF Helper.app/Contents/Info.plist"

​

+(directory)

​

@@ -14,6 +14,8 @@

 project(obs)

+set(ENABLE_WIN_UPDATER FALSE CACHE BOOL "Enable the windows updater")

+

 if(DEFINED QTDIR${_lib_suffix})

    list(APPEND CMAKE_PREFIX_PATH "${QTDIR${_lib_suffix}}")

 elseif(DEFINED QTDIR)

@@ -52,9 +54,27 @@

 add_definitions(${LIBCURL_DEFINITIONS})

 if(WIN32)

+   include_directories(${OBS_JANSSON_INCLUDE_DIRS})

+   include_directories(${BLAKE2_INCLUDE_DIR})

+

    set(obs_PLATFORM_SOURCES

        platform-windows.cpp

+       win-update/update-window.cpp

+       win-update/win-update.cpp

+       win-update/win-update-helpers.cpp

        obs.rc)

+   set(obs_PLATFORM_HEADERS

+       win-update/update-window.hpp

+       win-update/win-update.hpp

+       win-update/win-update-helpers.hpp)

+   set(obs_PLATFORM_LIBRARIES

+       crypt32

+       blake2

+       ${OBS_JANSSON_IMPORT})

+

+   if(ENABLE_WIN_UPDATER)

+       add_definitions(-DENABLE_WIN_UPDATER)

+   endif()

 elseif(APPLE)

    set(obs_PLATFORM_SOURCES

        platform-osx.mm)

@@ -132,6 +152,7 @@

    qt-wrappers.cpp)

 set(obs_HEADERS

+   ${obs_PLATFORM_HEADERS}

    obs-app.hpp

    platform.hpp

    window-main.hpp

@@ -184,6 +205,7 @@

    forms/OBSBasicSettings.ui

    forms/OBSBasicSourceSelect.ui

    forms/OBSBasicInteraction.ui

+   forms/OBSUpdate.ui

    forms/OBSRemux.ui)

 set(obs_QRC

​

@@ -2,9 +2,11 @@

 #include <QGridLayout>

 #include <QLabel>

 #include <QSpinBox>

+#include <QComboBox>

 #include <QCheckBox>

 #include <QSlider>

 #include "qt-wrappers.hpp"

+#include "obs-app.hpp"

 #include "adv-audio-control.hpp"

 #ifndef NSEC_PER_MSEC

@@ -30,6 +32,9 @@

    volume                         = new QSpinBox();

    forceMono                      = new QCheckBox();

    panning                        = new QSlider(Qt::Horizontal);

+#if defined(_WIN32) || defined(__APPLE__)

+   monitoringType                 = new QComboBox();

+#endif

    syncOffset                     = new QSpinBox();

    mixer1                         = new QCheckBox();

    mixer2                         = new QCheckBox();

@@ -87,6 +92,19 @@

    syncOffset->setMaximum(20000);

    syncOffset->setValue(int(cur_sync / NSEC_PER_MSEC));

+   int idx;

+#if defined(_WIN32) || defined(__APPLE__)

+   monitoringType->addItem(QTStr("Basic.AdvAudio.Monitoring.None"),

+           (int)OBS_MONITORING_TYPE_NONE);

+   monitoringType->addItem(QTStr("Basic.AdvAudio.Monitoring.MonitorOnly"),

+           (int)OBS_MONITORING_TYPE_MONITOR_ONLY);

+   monitoringType->addItem(QTStr("Basic.AdvAudio.Monitoring.Both"),

+           (int)OBS_MONITORING_TYPE_MONITOR_AND_OUTPUT);

+   int mt = (int)obs_source_get_monitoring_type(source);

+   idx = monitoringType->findData(mt);

+   monitoringType->setCurrentIndex(idx);

+#endif

+

    mixer1->setText("1");

    mixer1->setChecked(mixers & (1<<0));

    mixer2->setText("2");

@@ -120,6 +138,10 @@

            this, SLOT(panningChanged(int)));

    QWidget::connect(syncOffset, SIGNAL(valueChanged(int)),

            this, SLOT(syncOffsetChanged(int)));

+#if defined(_WIN32) || defined(__APPLE__)

+   QWidget::connect(monitoringType, SIGNAL(currentIndexChanged(int)),

+           this, SLOT(monitoringTypeChanged(int)));

+#endif

    QWidget::connect(mixer1, SIGNAL(clicked(bool)),

            this, SLOT(mixer1Changed(bool)));

    QWidget::connect(mixer2, SIGNAL(clicked(bool)),

@@ -135,12 +157,16 @@

    int lastRow = layout->rowCount();

-   layout->addWidget(nameLabel, lastRow, 0);

-   layout->addWidget(volume, lastRow, 1);

-   layout->addWidget(forceMonoContainer, lastRow, 2);

-   layout->addWidget(panningContainer, lastRow, 3);

-   layout->addWidget(syncOffset, lastRow, 4);

-   layout->addWidget(mixerContainer, lastRow, 5);

+   idx = 0;

+   layout->addWidget(nameLabel, lastRow, idx++);

+   layout->addWidget(volume, lastRow, idx++);

+   layout->addWidget(forceMonoContainer, lastRow, idx++);

+   layout->addWidget(panningContainer, lastRow, idx++);

+   layout->addWidget(syncOffset, lastRow, idx++);

+#if defined(_WIN32) || defined(__APPLE__)

+   layout->addWidget(monitoringType, lastRow, idx++);

+#endif

+   layout->addWidget(mixerContainer, lastRow, idx++);

    layout->layout()->setAlignment(mixerContainer,

            Qt::AlignHCenter | Qt::AlignVCenter);

 }

@@ -152,6 +178,9 @@

    forceMonoContainer->deleteLater();

    panningContainer->deleteLater();

    syncOffset->deleteLater();

+#if defined(_WIN32) || defined(__APPLE__)

+   monitoringType->deleteLater();

+#endif

    mixerContainer->deleteLater();

 }

@@ -264,6 +293,12 @@

                int64_t(milliseconds) * NSEC_PER_MSEC);

 }

+void OBSAdvAudioCtrl::monitoringTypeChanged(int index)

+{

+   int mt = monitoringType->itemData(index).toInt();

+   obs_source_set_monitoring_type(source, (obs_monitoring_type)mt);

+}

+

 static inline void setMixer(obs_source_t *source, const int mixerIdx,

        const bool checked)

 {

​

@@ -9,6 +9,7 @@

 class QSpinBox;

 class QCheckBox;

 class QSlider;

+class QComboBox;

 class OBSAdvAudioCtrl : public QObject {

    Q_OBJECT

@@ -27,6 +28,7 @@

    QPointer<QLabel>       labelL;

    QPointer<QLabel>       labelR;

    QPointer<QSpinBox>     syncOffset;

+   QPointer<QComboBox>    monitoringType;

    QPointer<QCheckBox>    mixer1;

    QPointer<QCheckBox>    mixer2;

    QPointer<QCheckBox>    mixer3;

@@ -60,6 +62,7 @@

    void downmixMonoChanged(bool checked);

    void panningChanged(int val);

    void syncOffsetChanged(int milliseconds);

+   void monitoringTypeChanged(int index);

    void mixer1Changed(bool checked);

    void mixer2Changed(bool checked);

    void mixer3Changed(bool checked);

​

@@ -49,6 +49,7 @@

 Top="أعلى"

 Bottom="أسفل"

+

 QuickTransitions.SwapScenes="التبديل بين مشهدي المعاينة و الاخراج بعد عملية الانتقال"

 QuickTransitions.SwapScenesTT="يقوم بتبديل مشهد المعاينة مع مشهد الاخراج بعد عملية الانتقال بين المشاهد (اذا كان مشهد الاخراج الاصلي لازال موجوداً) \n هذا لن يقوم بالتراجع عن اي تغييرات قمت بها على مشهد الاخراج الأصلي."

 QuickTransitions.DuplicateScene="استنساخ المشهد"

@@ -87,6 +88,7 @@

 ConfirmRemove.Title="تأكيد الإزالة"

 ConfirmRemove.Text="هل أنت متأكد من رغبتك في إزالة '$1' ?"

+

 Output.ConnectFail.Title="فشل في الاتصال"

 Output.ConnectFail.BadPath="مسار أو رابط الاتصال غير صالح. الرجاء التحقق من الإعدادات للتحقق من كونه صالح."

 Output.ConnectFail.ConnectFailed="فشل الاتصال بالسيرفر"

@@ -147,6 +149,7 @@

 Deinterlacing.Discard="تجاهل"

+

 Basic.Main.AddSceneDlg.Title="أضف المشهد"

 Basic.Main.AddSceneDlg.Text="الرجاء إدخال اسم المشهد"

​

@@ -45,6 +45,7 @@

+

 TitleBar.Profile="Профил"

 TitleBar.Scenes="Сцени"

@@ -61,6 +62,7 @@

 ConfirmRemove.Title="Потвърди премахване"

 ConfirmRemove.Text="Наистина ли искате да премахнете \"$1\"?"

+

 Output.ConnectFail.Title="Неуспешно свързване"

 Output.ConnectFail.BadPath="Невалиден път или URL. Проверете дали настройките ви са валидни."

 Output.ConnectFail.ConnectFailed="Неуспешна връзка със сървъра"

@@ -112,6 +114,7 @@

+

 Basic.Main.AddSceneDlg.Title="Добави сцена"

 Basic.Main.AddSceneDlg.Text="Моля, въведете името на сцената"

​

@@ -57,12 +57,25 @@

 Import="Importa"

 Export="Exporta"

+Updater.Title="Nova actualització disponible"

+Updater.Text="Hi ha una nova actualització disponible:"

+Updater.UpdateNow="Actualitza ara"

+Updater.RemindMeLater="Recordeu-m'ho més tard"

+Updater.Skip="Omet la versió"

+Updater.Running.Title="Programa actualment actiu"

+Updater.Running.Text="Les sortides estan actives actualment, apagueu qualsevol sortida activa abans d'intentar actualitzar"

+Updater.NoUpdatesAvailable.Title="No hi ha actualitzacions disponibles"

+Updater.NoUpdatesAvailable.Text="Actualment no hi ha actualitzacions disponibles"

+Updater.FailedToLaunch="No s'han pogut executar l'actualitzador"

+Updater.GameCaptureActive.Title="Captura de joc activa"

+Updater.GameCaptureActive.Text="La llibreria de captura de jocs està actualment en ús. Tanqueu qualsevol joc/programa que estigui sent capturat (o reinicieu Windows) i proveu-ho de nou."

+

 QuickTransitions.SwapScenes="Canvia la vista prèvia i sortida d'escenes després de la transició"

 QuickTransitions.SwapScenesTT="Canvia la vista prèvia i sortida d'escenes després de la transició (si encara existeix l'escena original de la sortida). \nAixò no desfarà qualsevol canvi que pugui haver fet a l'escena original de la sortida."

 QuickTransitions.DuplicateScene="Duplica l'escena"

-QuickTransitions.DuplicateSceneTT="Al editar la misma escena, permite la edición transformar/visibilidad de fuentes sin modificar las salida.\nPer editar les propietats de les fonts sense modificar la sortida, activi 'Duplicar Fonts'.\nCanviant aquest valor restablirà l'escena actual de sortida (si encara existeix)."

+QuickTransitions.DuplicateSceneTT="En editar la mateixa escena, permet editar la visibilitat i transformació de les fonts sense modificar la sortida.\nPer editar les propietats de les fonts sense modificar la sortida, activeu «Duplicar Fonts».\nSi canvieu aquest valor es restablirà l'escena actual de la sortida (si encara existeix)."

 QuickTransitions.EditProperties="Duplica les fonts"

-QuickTransitions.EditPropertiesTT="En editar la mateixa escena, permeti editar propietats de fonts sense modificar la sortida.\n Això només es pot utilitzar si està activat 'Duplicar l'escena'.\nCertes fonts (tals com a fonts de captura o els mitjans de comunicació) no són compatibles amb això i no es poden editar per separat.\nCanviant aquest valor restablirà l'escena actual de sortida (si encara existeix).\n\nAdvertiment: com es duplicaran les fonts, això requerirà un extra de recursos del sistema i de vídeo."

+QuickTransitions.EditPropertiesTT="En editar la mateixa escena, permet editar les propietats de les fonts sense modificar la sortida.\nAixò només es pot utilitzar si s'ha activat «Duplicar l'escena».\nAlgunes fonts (com dispositius de captura o mèdia) no ho permeten i no es poden editar per separat.\nSi canvieu aquest valor es restablirà l'escena actual de la sortida (si encara existeix).\n\nAtenció: com que es duplicaran les fonts, poden ser necessaris més recursos del sistema o de vídeo."

 QuickTransitions.HotkeyName="Transició Ràpida: %1"

 Basic.AddTransition="Afegir transició configurable"

@@ -97,6 +110,11 @@

 ConfirmRemove.Text="Esteu segur que voleu suprimir «$1»?"

 ConfirmRemove.TextMultiple="¿Segur que vols esborrar %1 elements?"

+Output.StartStreamFailed="No s'ha pogut iniciar la transmissió"

+Output.StartRecordingFailed="No s'ha pogut iniciar la gravació"

+Output.StartReplayFailed="No s'ha pogut iniciar la memòria intermèdia de reproducció"

+Output.StartFailedGeneric="Error en iniciar la sortida. Comproveu el registre per més detalls.\n\nAvís: Si utilitzeu els codificadors NVENC o AMD, assegureu-vos que els controladors de vídeo estan actualitzats."

+

 Output.ConnectFail.Title="Error en connectar"

 Output.ConnectFail.BadPath="Ruta o adreça URL no vàlida.  Si us plau, comproveu la configuració per confirmar que són vàlids."

 Output.ConnectFail.ConnectFailed="No ha pogut connectar al servidor"

@@ -173,6 +191,11 @@

 Deinterlacing.TopFieldFirst="Camp superior primer"

 Deinterlacing.BottomFieldFirst="Camp inferior primer"

+VolControl.SliderUnmuted="Control lliscant del volum per '%1': %2"

+VolControl.SliderMuted="Control lliscant del volum per '%1': %2 (silenciat)"

+VolControl.Mute="Silencia '%1'"

+VolControl.Properties="Propietats per '%1'"

+

 Basic.Main.AddSceneDlg.Title="Afegeix una escena"

 Basic.Main.AddSceneDlg.Text="Introduïu el nom de l'escena"

@@ -351,8 +374,10 @@

 Basic.Settings.General="General"

 Basic.Settings.General.Theme="Tema"

 Basic.Settings.General.Language="Llengua"

+Basic.Settings.General.EnableAutoUpdates="Comprova si hi ha actualitzacions automàticament a l'inici"

 Basic.Settings.General.WarnBeforeStartingStream="Mostra diàleg de confirmació quan s'iniciï una transmissió"

 Basic.Settings.General.WarnBeforeStoppingStream="Mostra diàleg de confirmació quan s'aturi una transmissió"

+Basic.Settings.General.Projectors="Projectors"

 Basic.Settings.General.HideProjectorCursor="Amaga el cursor sobre projectors"

 Basic.Settings.General.ProjectorAlwaysOnTop="Projectors sempre en la part superior"

 Basic.Settings.General.Snapping="Ajustament d'alineació de la font"

@@ -362,8 +387,12 @@

 Basic.Settings.General.SnapDistance="Ajusta la sensibilitat"

 Basic.Settings.General.RecordWhenStreaming="Enregistra automàticament quan es transmet"

 Basic.Settings.General.KeepRecordingWhenStreamStops="Mantenir l'enregistrament quan s'atura la transmissió"

-Basic.Settings.General.SysTrayEnabled="Activar icona a la safata del sistema"

+Basic.Settings.General.ReplayBufferWhileStreaming="Inicia la reproducció de la memòria intermèdia automàticament durant la transmissió"

+Basic.Settings.General.KeepReplayBufferStreamStops="Mantén activa la memòria intermèdia de reproducció quan la transmissió s'aturi"

+Basic.Settings.General.SysTray="Safata del sistema"

 Basic.Settings.General.SysTrayWhenStarted="Minimitzar a la safata del sistema en iniciar"

+Basic.Settings.General.SystemTrayHideMinimize="Minimitza sempre a la safata del sistema en lloc de la barra de tasques"

+Basic.Settings.General.SaveProjectors="Desa els projectors en sortir"

 Basic.Settings.Stream="Directe"

 Basic.Settings.Stream.StreamType="Tipus de directe"

@@ -452,6 +481,8 @@

 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador d'àudio"

 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Configuració de codificador d'àudio (si escau)"

 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Configuració del convertidor (si escau)"

+Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval de fotogrames clau (fotogrames)"

+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Mostra tots els codificadors (encara que siguin potencialment incompatibles)"

 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z"

@@ -505,12 +536,16 @@

 Basic.Settings.Advanced.Video.ColorRange="Gamma de color YUV"

 Basic.Settings.Advanced.Video.ColorRange.Partial="Parcial"

 Basic.Settings.Advanced.Video.ColorRange.Full="Màxima"

+Basic.Settings.Advanced.Audio.MonitoringDevice="Dispositiu de monitorització d'àudio"

+Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Per defecte"

 Basic.Settings.Advanced.StreamDelay="Retard del directe"

 Basic.Settings.Advanced.StreamDelay.Duration="Durada (en segons)"

 Basic.Settings.Advanced.StreamDelay.Preserve="Preservar el punt de tall (augmenta retard) quan s'estigui reconnectant"

 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Ús de memòria estimat: %1 MB"

 Basic.Settings.Advanced.Network="Xarxa"

 Basic.Settings.Advanced.Network.BindToIP="Enllaçar amb"

+Basic.Settings.Advanced.Network.EnableNewSocketLoop="Activa el nou codi de xarxa"

+Basic.Settings.Advanced.Network.EnableLowLatencyMode="Mode de baixa latència"

 Basic.AdvAudio="&Propietats avançades d'àudio"

 Basic.AdvAudio.Name="Nom"

@@ -518,6 +553,10 @@

 Basic.AdvAudio.Mono="Mescla a Mono"

 Basic.AdvAudio.Panning="Balanç"

 Basic.AdvAudio.SyncOffset="Correcció de sincronització (ms)"

+Basic.AdvAudio.Monitoring="Monitorització d'àudio"

+Basic.AdvAudio.Monitoring.None="Monitorització desactivada"

+Basic.AdvAudio.Monitoring.MonitorOnly="Només monitorizació (silencia la sortida)"

+Basic.AdvAudio.Monitoring.Both="Monitorització i sortida"

 Basic.AdvAudio.AudioTracks="Pistes"

 Basic.Settings.Hotkeys="Dreceres de teclat"

@@ -526,7 +565,7 @@

 Basic.Hotkeys.SelectScene="Canviar a escena"

 Basic.SystemTray.Show="Mostra"

-Basic.SystemTray.Hide="Oculta"

+Basic.SystemTray.Hide="Amaga"

 Basic.SystemTray.Message.Reconnecting="Desconnectat. Tornant a connectar..."

@@ -576,4 +615,5 @@

 OutputWarnings.NoTracksSelected="Heu de seleccionar almenys una cançó"

 OutputWarnings.MultiTrackRecording="Advertiment: Alguns formats (com FLV) no suporten múltiples cançons per gravació"

+OutputWarnings.MP4Recording="Advertència: Els enregistraments desats en MP4 seran irrecuperables si l'arxiu no va poder finalitzar (p.ex. com a resultat de BSODs, pèrdues de potència, etc.). Si voleu enregistrar diverses pistes d'àudio utilitzi MKV i multiplexeu l'enregistrament a MP4 després que acabi (Fitxer-> Multiplexació d'enregistraments)"

​

@@ -57,6 +57,19 @@

 Import="Importovat"

 Export="Exportovat"

+Updater.Title="Aktualizace"

+Updater.Text="K dispozici je nová verze:"

+Updater.UpdateNow="Aktualizovat nyní"

+Updater.RemindMeLater="Upozornit později"

+Updater.Skip="Přeskočit verzi"

+Updater.Running.Title="Program je stále aktivní"

+Updater.Running.Text="Některé výstupy jsou stále aktivní, zastavte je, prosím, před další pokusem o aktualizaci"

+Updater.NoUpdatesAvailable.Title="Žádná aktualizace"

+Updater.NoUpdatesAvailable.Text="Není dostupná žádná novější verze"

+Updater.FailedToLaunch="Nepodařilo se spustit aktualizátor"

+Updater.GameCaptureActive.Title="Snímání hry"

+Updater.GameCaptureActive.Text="Knihovna pro snímání her je aktivní. Ukončete prosím všechny snímané hry/programy (nebo restartujte Windows) a zkuste to znovu."

+

 QuickTransitions.SwapScenes="Prohodit scény náhledu a výstupu po přechodu"

 QuickTransitions.SwapScenesTT="Prohodí scény náhledu a výstupu po přechodu (pokud originální výstupní scéna stále existuje).\nTato funkce nevrátí provedené změny, které byly provedeny v originální scéně výstupu."

 QuickTransitions.DuplicateScene="Duplikovat scénu"

@@ -97,6 +110,11 @@

 ConfirmRemove.Text="Opravdu si přejete odebrat '$1'?"

 ConfirmRemove.TextMultiple="Opravdu si přejete odebrat %1 položky ?"

+Output.StartStreamFailed="Chyba při spouštění vysílání"

+Output.StartRecordingFailed="Chyba při spouštění nahrávání"

+Output.StartReplayFailed="Chyba při spouštění nahrávání do paměti"

+Output.StartFailedGeneric="Nastala chyba při začátku nahrávání. Zkontrolujte, prosím, textový záznam pro další podrobnosti.\n\nPoznámka: Pokud používáte enkodér NVENC či AMD, zkontrolujte zda používáte aktuální verzi grafického ovladače."

+

 Output.ConnectFail.Title="Spojení se nezdařilo"

 Output.ConnectFail.BadPath="Chybná cesta nebo adresa připojení. Zkontrolujte, prosím, správnost svých nastavení."

 Output.ConnectFail.ConnectFailed="K serveru se nepodařilo připojit"

@@ -173,6 +191,11 @@

 Deinterlacing.TopFieldFirst="Svrchní řádek dříve"

 Deinterlacing.BottomFieldFirst="Spodní řádek dříve"

+VolControl.SliderUnmuted="Posuvník hlasitosti pro '%1': %2"

+VolControl.SliderMuted="Posuvník hlasitosti pro '%1': %2 (ztlumeno)"

+VolControl.Mute="Ztlumit '%1'"

+VolControl.Properties="Vlastnosti pro \"%1\""

+

 Basic.Main.AddSceneDlg.Title="Přidat scénu"

 Basic.Main.AddSceneDlg.Text="Prosím, zadejte jméno scény"

@@ -351,8 +374,10 @@

 Basic.Settings.General="Hlavní"

 Basic.Settings.General.Theme="Vzhled"

 Basic.Settings.General.Language="Jazyk"

+Basic.Settings.General.EnableAutoUpdates="Automaticky kontrolovat aktualizace při spuštění"

 Basic.Settings.General.WarnBeforeStartingStream="Vyžadovat potvrzení pro spuštění vysílání"

 Basic.Settings.General.WarnBeforeStoppingStream="Vyžadovat potvrzení pro ukončení vysílání"

+Basic.Settings.General.Projectors="Projektory"

 Basic.Settings.General.HideProjectorCursor="Skrýt kurzor přes projektor"

 Basic.Settings.General.ProjectorAlwaysOnTop="Zobrazovat projektor vždy navrchu"

 Basic.Settings.General.Snapping="Přichycování zdrojů"

@@ -362,8 +387,12 @@

 Basic.Settings.General.SnapDistance="Citlivost přichycení"

 Basic.Settings.General.RecordWhenStreaming="Automaticky nahrávat při vysílání"

 Basic.Settings.General.KeepRecordingWhenStreamStops="Pokračovat v nahrávání i po zastavení vysílání"

-Basic.Settings.General.SysTrayEnabled="Zobrazit ikonu v oznamovací oblasti"

+Basic.Settings.General.ReplayBufferWhileStreaming="Automaticky zapnout záznam do paměti se začátkem vysílání"

+Basic.Settings.General.KeepReplayBufferStreamStops="Ponechat záznam do paměti aktivní i po ukončení vysílání"

+Basic.Settings.General.SysTray="Systémová lišta"

 Basic.Settings.General.SysTrayWhenStarted="Minimalizovat do systémové lišty při spuštění"

+Basic.Settings.General.SystemTrayHideMinimize="Vždy minimalizovat do systémové lišty místo hlavního panelu"

+Basic.Settings.General.SaveProjectors="Při ukončení uložit projektory"

 Basic.Settings.Stream="Vysílání"

 Basic.Settings.Stream.StreamType="Typ vysílání"

@@ -452,6 +481,8 @@

 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Enkodér zvuku"

 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Nastavení enkodéru zvuku (pokud existuje)"

 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Nastavení směšovače (pokud existuje)"

+Basic.Settings.Output.Adv.FFmpeg.GOPSize="Interval klíčových snímků (snímky)"

+Basic.Settings.Output.Adv.FFmpeg.IgnoreCodecCompat="Zobrazit všechny kodeky (i když je možné, že nejsou kompatibilní)"

 FilenameFormatting.completer="%CCYY-%MM-%DD %hh-%mm-%ss\n%YY-%MM-%DD %hh-%mm-%ss\n%Y-%m-%d %H-%M-%S\n%y-%m-%d %H-%M-%S\n%a %Y-%m-%d %H-%M-%S\n%A %Y-%m-%d %H-%M-%S\n%Y-%b-%d %H-%M-%S\n%Y-%B-%d %H-%M-%S\n%Y-%m-%d %I-%M-%S-%p\n%Y-%m-%d %H-%M-%S-%z\n%Y-%m-%d %H-%M-%S-%Z"

@@ -505,12 +536,16 @@

 Basic.Settings.Advanced.Video.ColorRange="Oblast barev YUV"

 Basic.Settings.Advanced.Video.ColorRange.Partial="Částečné"

 Basic.Settings.Advanced.Video.ColorRange.Full="Plné"

+Basic.Settings.Advanced.Audio.MonitoringDevice="Zařízení pro monitorování zvuku"

+Basic.Settings.Advanced.Audio.MonitoringDevice.Default="Výchozí"

 Basic.Settings.Advanced.StreamDelay="Zpoždění vysílání"

 Basic.Settings.Advanced.StreamDelay.Duration="Délka (vteřiny)"

 Basic.Settings.Advanced.StreamDelay.Preserve="Zachovat zpoždění při obnovení spojení (zvýšení zpoždění)"

 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Přibližné využití paměti: %1 MB"

 Basic.Settings.Advanced.Network="Síť"

 Basic.Settings.Advanced.Network.BindToIP="Svázat s adresou"