Imported Upstream version 0.14.2+dfsg1

cmake/Modules/CopyMSVCBins.cmake

@@ -68,6 +68,9 @@ file(GLOB FFMPEG_BIN_FILES
 	"${FFMPEG_avcodec_INCLUDE_DIR}/bin/libogg*.dll"
 	"${FFMPEG_avcodec_INCLUDE_DIR}/bin/libvorbis*.dll"
 
+	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin/libvpx*.dll"
+	"${FFMPEG_avcodec_INCLUDE_DIR}/bin/libvpx*.dll"
+
 	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/libopus*.dll"
 	"${FFMPEG_avcodec_INCLUDE_DIR}/../bin${_bin_suffix}/opus*.dll"
 	"${FFMPEG_avcodec_INCLUDE_DIR}/bin${_bin_suffix}/libopus*.dll"

deps/file-updater/file-updater/file-updater.c

@@ -29,6 +29,9 @@ struct update_info {
 	obs_data_t *cache_package;
 	obs_data_t *remote_package;
 
+	char *etag_local;
+	char *etag_remote;
+
 	confirm_file_callback_t callback;
 	void *param;
 
@@ -76,7 +79,33 @@ static size_t http_write(uint8_t *ptr, size_t size, size_t nmemb,
 	return total;
 }
 
-static bool do_http_request(struct update_info *info, const char *url)
+static size_t http_header(char *buffer, size_t size, size_t nitems,
+		struct update_info *info)
+{
+	if (!strncmp(buffer, "ETag: ", 6))
+	{
+		char *etag = buffer + 6;
+		if (*etag) {
+			char *etag_clean, *p;
+
+			etag_clean = bstrdup(etag);
+
+			p = strchr(etag_clean, '\r');
+			if (p)
+				*p = 0;
+
+			p = strchr(etag_clean, '\n');
+			if (p)
+				*p = 0;
+
+			info->etag_remote = etag_clean;
+		}
+	}
+	return nitems * size;
+}
+
+static bool do_http_request(struct update_info *info, const char *url,
+	long *response_code)
 {
 	CURLcode code;
 	uint8_t null_terminator = 0;
@@ -89,6 +118,17 @@ static bool do_http_request(struct update_info *info, const char *url)
 	curl_easy_setopt(info->curl, CURLOPT_WRITEDATA, info);
 	curl_easy_setopt(info->curl, CURLOPT_FAILONERROR, true);
 
+	if (!info->remote_url) {
+		// We only care about headers from the main package file
+		curl_easy_setopt(info->curl, CURLOPT_HEADERFUNCTION, http_header);
+		curl_easy_setopt(info->curl, CURLOPT_HEADERDATA, info);
+	}
+
+#if LIBCURL_VERSION_NUM >= 0x072400
+	// A lot of servers don't yet support ALPN
+	curl_easy_setopt(info->curl, CURLOPT_SSL_ENABLE_ALPN, 0);
+#endif
+
 	code = curl_easy_perform(info->curl);
 	if (code != CURLE_OK) {
 		warn("Remote update of URL \"%s\" failed: %s", url,
@@ -96,6 +136,16 @@ static bool do_http_request(struct update_info *info, const char *url)
 		return false;
 	}
 
+	if (curl_easy_getinfo(info->curl, CURLINFO_RESPONSE_CODE,
+		response_code) != CURLE_OK)
+		return false;
+
+	if (*response_code >= 400) {
+		warn("Remote update of URL \"%s\" failed: HTTP/%ld", url,
+			*response_code);
+		return false;
+	}
+
 	da_push_back(info->file_data, &null_terminator);
 
 	return true;
@@ -135,6 +185,25 @@ static bool init_update(struct update_info *info)
 	info->local_package = get_package(info->local, "package.json");
 	info->cache_package = get_package(info->cache, "package.json");
 
+	obs_data_t *metadata = get_package(info->cache, "meta.json");
+	if (metadata) {
+		const char *etag = obs_data_get_string(metadata, "etag");
+		if (etag) {
+			struct dstr if_none_match = { 0 };
+			dstr_copy(&if_none_match, "If-None-Match: ");
+			dstr_cat(&if_none_match, etag);
+
+			info->etag_local = bstrdup(etag);
+
+			info->header = curl_slist_append(info->header,
+				if_none_match.array);
+
+			dstr_free(&if_none_match);
+		}
+
+		obs_data_release(metadata);
+	}
+
 	dstr_copy(&user_agent, "User-Agent: ");
 	dstr_cat(&user_agent, info->user_agent);
 
@@ -246,10 +315,11 @@ static int update_local_version(struct update_info *info)
 static inline bool do_relative_http_request(struct update_info *info,
 		const char *url, const char *file)
 {
+	long response_code;
 	char *full_url = get_path(url, file);
-	bool success = do_http_request(info, full_url);
+	bool success = do_http_request(info, full_url, &response_code);
 	bfree(full_url);
-	return success;
+	return success && response_code == 200;
 }
 
 static inline void write_file_data(struct update_info *info,
@@ -320,11 +390,34 @@ static bool update_remote_files(void *param, obs_data_t *remote_file)
 	return true;
 }
 
+static void update_save_metadata(struct update_info *info)
+{
+	struct dstr path = { 0 };
+
+	if (!info->etag_remote)
+		return;
+
+	dstr_copy(&path, info->cache);
+	dstr_cat(&path, "meta.json");
+
+	obs_data_t *data;
+	data = obs_data_create();
+	obs_data_set_string(data, "etag", info->etag_remote);
+	obs_data_save_json(data, path.array);
+	obs_data_release(data);
+
+	dstr_free(&path);
+}
+
 static void update_remote_version(struct update_info *info, int cur_version)
 {
 	int remote_version;
+	long response_code;
 
-	if (!do_http_request(info, info->url))
+	if (!do_http_request(info, info->url, &response_code))
+		return;
+
+	if (response_code == 304)
 		return;
 
 	if (!info->file_data.array || info->file_data.array[0] != '{') {
@@ -332,6 +425,8 @@ static void update_remote_version(struct update_info *info, int cur_version)
 		return;
 	}
 
+	update_save_metadata(info);
+
 	info->remote_package = obs_data_create_from_json(
 			(char*)info->file_data.array);
 	if (!info->remote_package) {
@@ -371,6 +466,12 @@ static void *update_thread(void *data)
 	cur_version = update_local_version(info);
 	update_remote_version(info, cur_version);
 	os_rmdir(info->temp);
+
+	if (info->etag_local)
+		bfree(info->etag_local);
+	if (info->etag_remote)
+		bfree(info->etag_remote);
+
 	return NULL;
 }
 

deps/libff/libff/ff-audio-decoder.c

@@ -28,6 +28,8 @@
 
 #include <assert.h>
 
+#include "ff-compat.h"
+
 static inline void shrink_packet(struct ff_packet *packet, int packet_length)
 {
 	if (packet_length <= packet->base.size) {
@@ -47,11 +49,6 @@ static bool handle_reset_packet(struct ff_decoder *decoder,
 	decoder->clock = packet->clock;
 	av_free_packet(&packet->base);
 
-	// not a real packet, so try to get another packet
-	if (packet_queue_get(&decoder->packet_queue, packet, 1)
-			== FF_PACKET_FAIL)
-		return false;
-
 	return true;
 }
 
@@ -73,6 +70,28 @@ static int decode_frame(struct ff_decoder *decoder,
 	int ret;
 
 	while (true) {
+		if (decoder->eof)
+			ret = packet_queue_get(&decoder->packet_queue, packet, 0);
+		else
+			ret = packet_queue_get(&decoder->packet_queue, packet, 1);
+
+		if (ret == FF_PACKET_EMPTY) {
+			return 0;
+		} else if (ret == FF_PACKET_FAIL) {
+			return -1;
+		}
+
+		if (packet->base.data ==
+				decoder->packet_queue.flush_packet.base.data) {
+			avcodec_flush_buffers(decoder->codec);
+			continue;
+		}
+
+		// Packet has a new clock (reset packet)
+		if (packet->clock != NULL)
+			if (!handle_reset_packet(decoder, packet))
+				return -1;
+
 		while (packet->base.size > 0) {
 			int complete;
 
@@ -98,28 +117,6 @@ static int decode_frame(struct ff_decoder *decoder,
 
 		if (packet->base.data != NULL)
 			av_packet_unref(&packet->base);
-
-		ret = packet_queue_get(&decoder->packet_queue, packet, 1);
-		if (ret == FF_PACKET_FAIL) {
-			return -1;
-		}
-
-		if (packet->base.data ==
-				decoder->packet_queue.flush_packet.base.data) {
-			avcodec_flush_buffers(decoder->codec);
-
-			// we were flushed, so try to get another packet
-			ret = packet_queue_get(&decoder->packet_queue,
-					packet, 1);
-			if (ret == FF_PACKET_FAIL) {
-				return -1;
-			}
-		}
-
-		// Packet has a new clock (reset packet)
-		if (packet->clock != NULL)
-			if (!handle_reset_packet(decoder, packet))
-				return -1;
 	}
 }
 
@@ -143,8 +140,10 @@ static bool queue_frame(struct ff_decoder *decoder, AVFrame *frame,
 			|| queue_frame->frame->sample_rate != codec->sample_rate
 			|| queue_frame->frame->format != codec->sample_fmt);
 
-	if (queue_frame->frame != NULL)
+	if (queue_frame->frame != NULL) {
+		//FIXME: this shouldn't happen any more!
 		av_frame_free(&queue_frame->frame);
+	}
 
 	queue_frame->frame = av_frame_clone(frame);
 	queue_frame->clock = ff_clock_retain(decoder->clock);
@@ -166,10 +165,13 @@ void *ff_audio_decoder_thread(void *opaque_audio_decoder)
 	struct ff_packet packet = {0};
 	bool frame_complete;
 	AVFrame *frame = av_frame_alloc();
+	int ret;
 
 	while (!decoder->abort) {
-		if (decode_frame(decoder, &packet, frame, &frame_complete)
+		ret = decode_frame(decoder, &packet, frame, &frame_complete);
-				< 0) {
+		if (ret == 0) {
+			break;
+		} else if (ret < 0) {
 			av_free_packet(&packet.base);
 			continue;
 		}
@@ -193,5 +195,8 @@ void *ff_audio_decoder_thread(void *opaque_audio_decoder)
 		ff_clock_release(&decoder->clock);
 
 	av_frame_free(&frame);
+
+	decoder->finished = true;
+
 	return NULL;
 }

deps/libff/libff/ff-compat.h

@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2016 Hugh Bailey <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#pragma once
+
+#if LIBAVCODEC_VERSION_MAJOR >= 57
+#define av_free_packet av_packet_unref
+static inline int av_dup_packet_2(AVPacket *pkt)
+{
+	AVPacket tmp = *pkt;
+	int ret = av_packet_ref(pkt, &tmp);
+	av_packet_unref(&tmp);
+	return ret;
+}
+#define av_dup_packet av_dup_packet_2
+#endif

deps/libff/libff/ff-decoder.c

@@ -42,6 +42,7 @@ struct ff_decoder *ff_decoder_init(AVCodecContext *codec_context,
 	decoder->codec->opaque = decoder;
 	decoder->stream = stream;
 	decoder->abort = false;
+	decoder->finished = false;
 
 	decoder->packet_queue_size = packet_queue_size;
 	if (!packet_queue_init(&decoder->packet_queue))
@@ -179,7 +180,7 @@ void ff_decoder_refresh(void *opaque)
 
 	if (decoder && decoder->stream) {
 		if (decoder->frame_queue.size == 0) {
-			if (!decoder->eof) {
+			if (!decoder->eof || !decoder->finished) {
 				// We expected a frame, but there were none
 				// available
 				
@@ -280,6 +281,8 @@ void ff_decoder_refresh(void *opaque)
 					(int)(delay_until_next_wake * 1000
 						+ 0.5L));
 
+			av_frame_free(&frame->frame);
+
 			ff_circular_queue_advance_read(&decoder->frame_queue);
 		}
 	} else {

deps/libff/libff/ff-decoder.h

@@ -56,6 +56,7 @@ struct ff_decoder {
 	bool first_frame;
 	bool eof;
 	bool abort;
+	bool finished;
 };
 
 typedef struct ff_decoder ff_decoder_t;

deps/libff/libff/ff-demuxer.c

@@ -23,6 +23,8 @@
 
 #include <assert.h>
 
+#include "ff-compat.h"
+
 #define DEFAULT_AV_SYNC_TYPE AV_SYNC_VIDEO_MASTER
 
 #define AUDIO_FRAME_QUEUE_SIZE 1
@@ -92,7 +94,7 @@ void ff_demuxer_free(struct ff_demuxer *demuxer)
 		ff_decoder_free(demuxer->video_decoder);
 
 	if (demuxer->format_context)
-		avformat_free_context(demuxer->format_context);
+		avformat_close_input(&demuxer->format_context);
 
 	av_free(demuxer);
 }
@@ -342,15 +344,15 @@ void ff_demuxer_reset(struct ff_demuxer *demuxer)
 	packet.clock = clock;
 
 	if (demuxer->audio_decoder != NULL) {
+		ff_clock_retain(clock);
 		packet_queue_put(&demuxer->audio_decoder->packet_queue,
 				&packet);
-		ff_clock_retain(clock);
 	}
 
 	if (demuxer->video_decoder != NULL) {
+		ff_clock_retain(clock);
 		packet_queue_put(&demuxer->video_decoder->packet_queue,
 				&packet);
-		ff_clock_retain(clock);
 	}
 }
 
@@ -500,7 +502,7 @@ static bool handle_seek(struct ff_demuxer *demuxer)
 			seek_stream = demuxer->audio_decoder->stream;
 		}
 
-		if (seek_stream != NULL) {
+		if (seek_stream != NULL && demuxer->format_context->duration != AV_NOPTS_VALUE) {
 			seek_target = av_rescale_q(seek_target,
 					AV_TIME_BASE_Q,
 					seek_stream->time_base);
@@ -529,8 +531,13 @@ static bool handle_seek(struct ff_demuxer *demuxer)
 
 static void seek_beginning(struct ff_demuxer *demuxer)
 {
+	if (demuxer->format_context->duration == AV_NOPTS_VALUE) {
+		demuxer->seek_flags = AVSEEK_FLAG_FRAME;
+		demuxer->seek_pos = 0;
+	} else {
 		demuxer->seek_flags = AVSEEK_FLAG_BACKWARD;
 		demuxer->seek_pos = demuxer->format_context->start_time;
+	}
 	demuxer->seek_request = true;
 	demuxer->seek_flush = false;
 	av_log(NULL, AV_LOG_VERBOSE, "looping media %s", demuxer->input);

deps/libff/libff/ff-packet-queue.c

@@ -15,6 +15,7 @@
  */
 
 #include "ff-packet-queue.h"
+#include "ff-compat.h"
 
 bool packet_queue_init(struct ff_packet_queue *q)
 {
@@ -60,10 +61,6 @@ int packet_queue_put(struct ff_packet_queue *q, struct ff_packet *packet)
 {
 	struct ff_packet_list *new_packet;
 
-	if (packet != &q->flush_packet
-			&& av_dup_packet(&packet->base) < 0)
-		return FF_PACKET_FAIL;
-
 	new_packet = av_malloc(sizeof(struct ff_packet_list));
 
 	if (new_packet == NULL)

deps/libff/libff/ff-timer.c

@@ -51,6 +51,9 @@ static void *timer_thread(void *opaque)
 						- current_time));
 			}
 
+			pthread_mutex_unlock(&timer->mutex);
+			continue;
+
 			// we can be woken up merely to set a sooner wake time
 
 		} else {

deps/libff/libff/ff-video-decoder.c

@@ -27,6 +27,8 @@
 
 #include <assert.h>
 
+#include "ff-compat.h"
+
 static bool queue_frame(struct ff_decoder *decoder, AVFrame *frame,
 		double best_effort_pts)
 {
@@ -49,8 +51,11 @@ static bool queue_frame(struct ff_decoder *decoder, AVFrame *frame,
 			|| queue_frame->frame->height != codec->height
 			|| queue_frame->frame->format != codec->pix_fmt);
 
-	if (queue_frame->frame != NULL)
+	if (queue_frame->frame != NULL) {
+		// This shouldn't happen any more, the frames are freed in
+		// ff_decoder_refresh.
 		av_frame_free(&queue_frame->frame);
+	}
 
 	queue_frame->frame = av_frame_clone(frame);
 	queue_frame->clock = ff_clock_retain(decoder->clock);
@@ -76,8 +81,12 @@ void *ff_video_decoder_thread(void *opaque_video_decoder)
 	bool key_frame;
 
 	while (!decoder->abort) {
+		if (decoder->eof)
+			ret = packet_queue_get(&decoder->packet_queue, &packet, 0);
+		else
 			ret = packet_queue_get(&decoder->packet_queue, &packet, 1);
-		if (ret == FF_PACKET_FAIL) {
+
+		if (ret == FF_PACKET_EMPTY || ret == FF_PACKET_FAIL) {
 			// should we just use abort here?
 			break;
 		}
@@ -135,5 +144,8 @@ void *ff_video_decoder_thread(void *opaque_video_decoder)
 		ff_clock_release(&decoder->clock);
 
 	av_frame_free(&frame);
+
+	decoder->finished = true;
+
 	return NULL;
 }

libobs-opengl/gl-indexbuffer.c

@@ -22,8 +22,8 @@ static inline bool init_ib(struct gs_index_buffer *ib)
 	GLenum usage = ib->dynamic ? GL_DYNAMIC_DRAW : GL_STATIC_DRAW;
 	bool success;
 
-	success = gl_create_buffer(GL_ARRAY_BUFFER, &ib->buffer, ib->size,
+	success = gl_create_buffer(GL_ELEMENT_ARRAY_BUFFER, &ib->buffer,
-			ib->data, usage);
+			ib->size, ib->data, usage);
 
 	if (!ib->dynamic) {
 		bfree(ib->data);
@@ -77,7 +77,8 @@ void gs_indexbuffer_flush(gs_indexbuffer_t *ib)
 		goto fail;
 	}
 
-	if (!update_buffer(GL_ARRAY_BUFFER, ib->buffer, ib->data, ib->size))
+	if (!update_buffer(GL_ELEMENT_ARRAY_BUFFER, ib->buffer, ib->data,
+				ib->size))
 		goto fail;
 
 	return;
@@ -103,11 +104,5 @@ enum gs_index_type gs_indexbuffer_get_type(const gs_indexbuffer_t *ib)
 
 void device_load_indexbuffer(gs_device_t *device, gs_indexbuffer_t *ib)
 {
-	if (ib == device->cur_index_buffer)
-		return;
-
 	device->cur_index_buffer = ib;
-
-	if (!gl_bind_buffer(GL_ELEMENT_ARRAY_BUFFER, ib->buffer))
-		blog(LOG_ERROR, "device_load_indexbuffer (GL) failed");
 }

libobs-opengl/gl-shaderparser.c

@@ -63,6 +63,12 @@ static bool gl_write_type_n(struct gl_shader_parser *glsp,
 		dstr_cat(&glsp->gl_string, "vec3");
 	else if (cmp_type(type, len, "float4", 6) == 0)
 		dstr_cat(&glsp->gl_string, "vec4");
+	else if (cmp_type(type, len, "int2", 4) == 0)
+		dstr_cat(&glsp->gl_string, "ivec2");
+	else if (cmp_type(type, len, "int3", 4) == 0)
+		dstr_cat(&glsp->gl_string, "ivec3");
+	else if (cmp_type(type, len, "int4", 4) == 0)
+		dstr_cat(&glsp->gl_string, "ivec4");
 	else if (cmp_type(type, len, "float3x3", 8) == 0)
 		dstr_cat(&glsp->gl_string, "mat3x3");
 	else if (cmp_type(type, len, "float3x4", 8) == 0)
@@ -294,20 +300,21 @@ static bool gl_write_saturate(struct gl_shader_parser *glsp,
 }
 
 static inline bool gl_write_texture_call(struct gl_shader_parser *glsp,
-		struct shader_var *var, const char *call)
+		struct shader_var *var, const char *call, bool sampler)
 {
 	struct cf_parser *cfp = &glsp->parser.cfp;
 	size_t sampler_id = (size_t)-1;
 
 	if (!cf_next_token(cfp))    return false;
 	if (!cf_token_is(cfp, "(")) return false;
-	if (!cf_next_token(cfp))    return false;
 
+	if (sampler) {
+		if (!cf_next_token(cfp))    return false;
 		sampler_id = sp_getsampler(glsp, cfp->cur_token);
 		if (sampler_id == (size_t) -1) return false;
-
 		if (!cf_next_token(cfp))    return false;
 		if (!cf_token_is(cfp, ",")) return false;
+	}
 
 	var->gl_sampler_id = sampler_id;
 
@@ -330,14 +337,21 @@ static bool gl_write_texture_code(struct gl_shader_parser *glsp,
 	if (!cf_token_is(cfp, ".")) return false;
 	if (!cf_next_token(cfp))    return false;
 
+	const char *function_end = ")";
+
 	if (cf_token_is(cfp, "Sample"))
-		written = gl_write_texture_call(glsp, var, "texture");
+		written = gl_write_texture_call(glsp, var, "texture", true);
 	else if (cf_token_is(cfp, "SampleBias"))
-		written = gl_write_texture_call(glsp, var, "texture");
+		written = gl_write_texture_call(glsp, var, "texture", true);
 	else if (cf_token_is(cfp, "SampleGrad"))
-		written = gl_write_texture_call(glsp, var, "textureGrad");
+		written = gl_write_texture_call(glsp, var, "textureGrad", true);
 	else if (cf_token_is(cfp, "SampleLevel"))
-		written = gl_write_texture_call(glsp, var, "textureLod");
+		written = gl_write_texture_call(glsp, var, "textureLod", true);
+	else if (cf_token_is(cfp, "Load")) {
+		written = gl_write_texture_call(glsp, var, "texelFetch", false);
+		dstr_cat(&glsp->gl_string, "(");
+		function_end = ").xy, 0)";
+	}
 
 	if (!written)
 		return false;
@@ -345,7 +359,7 @@ static bool gl_write_texture_code(struct gl_shader_parser *glsp,
 	if (!cf_next_token(cfp)) return false;
 
 	gl_write_function_contents(glsp, &cfp->cur_token, ")");
-	dstr_cat(&glsp->gl_string, ")");
+	dstr_cat(&glsp->gl_string, function_end);
 
 	*p_token = cfp->cur_token;
 	return true;

libobs-opengl/gl-subsystem.c

@@ -470,7 +470,11 @@ void device_load_texture(gs_device_t *device, gs_texture_t *tex, int unit)
 	if (!tex)
 		return;
 
+	// texelFetch doesn't need a sampler
+	if (param->sampler_id != (size_t)-1)
 		sampler = device->cur_samplers[param->sampler_id];
+	else
+		sampler = NULL;
 
 	if (!gl_bind_texture(tex->gl_target, tex->texture))
 		goto fail;
@@ -975,7 +979,7 @@ void device_draw(gs_device_t *device, enum gs_draw_mode draw_mode,
 	if (!program)
 		goto fail;
 
-	load_vb_buffers(program, device->cur_vertex_buffer);
+	load_vb_buffers(program, device->cur_vertex_buffer, ib);
 
 	if (program != device->cur_program && device->cur_program) {
 		glUseProgram(0);

libobs-opengl/gl-subsystem.h

@@ -39,7 +39,7 @@ enum copy_type {
 static inline GLint convert_gs_format(enum gs_color_format format)
 {
 	switch (format) {
-	case GS_A8:          return GL_RGBA;
+	case GS_A8:          return GL_RED;
 	case GS_R8:          return GL_RED;
 	case GS_RGBA:        return GL_RGBA;
 	case GS_BGRX:        return GL_BGRA;
@@ -377,7 +377,7 @@ struct gs_vertex_buffer {
 };
 
 extern bool load_vb_buffers(struct gs_program *program,
-		struct gs_vertex_buffer *vb);
+		struct gs_vertex_buffer *vb, struct gs_index_buffer *ib);
 
 struct gs_index_buffer {
 	GLuint               buffer;

libobs-opengl/gl-vertexbuffer.c

@@ -234,7 +234,8 @@ static bool load_vb_buffer(struct shader_attrib *attrib,
 	return success;
 }
 
-bool load_vb_buffers(struct gs_program *program, struct gs_vertex_buffer *vb)
+bool load_vb_buffers(struct gs_program *program, struct gs_vertex_buffer *vb,
+		struct gs_index_buffer *ib)
 {
 	struct gs_shader *shader = program->vertex_shader;
 	size_t i;
@@ -248,6 +249,9 @@ bool load_vb_buffers(struct gs_program *program, struct gs_vertex_buffer *vb)
 			return false;
 	}
 
+	if (ib && !gl_bind_buffer(GL_ELEMENT_ARRAY_BUFFER, ib->buffer))
+		return false;
+
 	return true;
 }
 

libobs/CMakeLists.txt

@@ -273,6 +273,7 @@ set(libobs_libobs_SOURCES
 	obs-encoder.c
 	obs-service.c
 	obs-source.c
+	obs-source-deinterlace.c
 	obs-source-transition.c
 	obs-output.c
 	obs-output-delay.c

libobs/data/default_rect.effect

@@ -1,7 +1,4 @@
 uniform float4x4 ViewProj;
-uniform float4x4 color_matrix;
-uniform float3 color_range_min = {0.0, 0.0, 0.0};
-uniform float3 color_range_max = {1.0, 1.0, 1.0};
 uniform texture_rect image;
 
 sampler_state def_sampler {
@@ -28,13 +25,6 @@ float4 PSDrawBare(VertInOut vert_in) : TARGET
 	return image.Sample(def_sampler, vert_in.uv);
 }
 
-float4 PSDrawMatrix(VertInOut vert_in) : TARGET
-{
-	float4 yuv = image.Sample(def_sampler, vert_in.uv);
-	yuv.xyz = clamp(yuv.xyz, color_range_min, color_range_max);
-	return saturate(mul(float4(yuv.xyz, 1.0), color_matrix));
-}
-
 technique Draw
 {
 	pass
@@ -43,13 +33,3 @@ technique Draw
 		pixel_shader  = PSDrawBare(vert_in);
 	}
 }
-
-technique DrawMatrix
-{
-	pass
-	{
-		vertex_shader = VSDefault(vert_in);
-		pixel_shader  = PSDrawMatrix(vert_in);
-	}
-}
-

libobs/data/deinterlace_base.effect

@@ -0,0 +1,293 @@
+/*
+ * Copyright (c) 2015 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+uniform float4x4 ViewProj;
+uniform texture2d image;
+uniform float4x4 color_matrix;
+uniform float3 color_range_min = {0.0, 0.0, 0.0};
+uniform float3 color_range_max = {1.0, 1.0, 1.0};
+
+uniform texture2d previous_image;
+uniform float2 dimensions;
+uniform int field_order;
+uniform bool frame2;
+
+sampler_state textureSampler {
+	Filter    = Linear;
+	AddressU  = Clamp;
+	AddressV  = Clamp;
+};
+
+struct VertData {
+	float4 pos : POSITION;
+	float2 uv  : TEXCOORD0;
+};
+
+int3 select(int2 texel, int x, int y)
+{
+	return int3(texel + int2(x, y), 0);
+}
+
+float4 load_at_prev(int2 texel, int x, int y)
+{
+	return previous_image.Load(select(texel, x, y));
+}
+
+float4 load_at_image(int2 texel, int x, int y)
+{
+	return image.Load(select(texel, x, y));
+}
+
+float4 load_at(int2 texel, int x, int y, int field)
+{
+	if(field == 0)
+		return load_at_image(texel, x, y);
+	else
+		return load_at_prev(texel, x, y);
+}
+
+#define YADIF_UPDATE(c, level) 	\
+	if(score.c < spatial_score.c) \
+	{ \
+		spatial_score.c = score.c; \
+		spatial_pred.c = (load_at(texel, level, -1, field) + load_at(texel, -level, 1, field)).c / 2; \
+
+#define YADIF_CHECK_ONE(level, c) \
+{ \
+	float4 score = abs(load_at(texel, -1 + level, 1, field) - load_at(texel, -1 - level, -1, field)) + \
+	               abs(load_at(texel, level,      1, field) - load_at(texel, -level,     -1, field)) + \
+	               abs(load_at(texel, 1 + level,  1, field) - load_at(texel, 1 - level,  -1, field)); \
+	YADIF_UPDATE(c, level) } \
+}
+
+#define YADIF_CHECK(level) \
+{ \
+	float4 score = abs(load_at(texel, -1 + level, 1, field) - load_at(texel, -1 - level, -1, field)) + \
+	               abs(load_at(texel, level,      1, field) - load_at(texel, -level,     -1, field)) + \
+	               abs(load_at(texel, 1 + level,  1, field) - load_at(texel, 1 - level,  -1, field)); \
+	YADIF_UPDATE(r, level) YADIF_CHECK_ONE(level * 2, r) } \
+	YADIF_UPDATE(g, level) YADIF_CHECK_ONE(level * 2, g) } \
+	YADIF_UPDATE(b, level) YADIF_CHECK_ONE(level * 2, b) } \
+	YADIF_UPDATE(a, level) YADIF_CHECK_ONE(level * 2, a) } \
+}
+
+float4 texel_at_yadif(int2 texel, int field, bool mode0)
+{
+	if((texel.y % 2) == field)
+		return load_at(texel, 0, 0, field);
+
+	#define YADIF_AVG(x_off, y_off) ((load_at_prev(texel, x_off, y_off) + load_at_image(texel, x_off, y_off))/2)
+	float4 c = load_at(texel, 0, 1, field),
+	       d = YADIF_AVG(0, 0),
+	       e = load_at(texel, 0, -1, field);
+
+	float4 temporal_diff0 = (abs(load_at_prev(texel,  0, 0)      -     load_at_image(texel, 0, 0)))      / 2,
+	       temporal_diff1 = (abs(load_at_prev(texel,  0, 1) - c) + abs(load_at_prev(texel,  0, -1) - e)) / 2,
+	       temporal_diff2 = (abs(load_at_image(texel, 0, 1) - c) + abs(load_at_image(texel, 0, -1) - e)) / 2,
+	       diff = max(temporal_diff0, max(temporal_diff1, temporal_diff2));
+
+	float4 spatial_pred = (c + e) / 2,
+	       spatial_score = abs(load_at(texel, -1, 1, field) - load_at(texel, -1, -1, field)) +
+	                       abs(c - e) +
+	                       abs(load_at(texel, 1,  1, field) - load_at(texel, 1,  -1, field)) - 1;
+
+	YADIF_CHECK(-1)
+	YADIF_CHECK(1)
+
+	if (mode0) {
+		float4 b = YADIF_AVG(0, 2),
+		       f = YADIF_AVG(0, -2);
+
+		float4 max_ = max(d - e, max(d - c, min(b - c, f - e))),
+		       min_ = min(d - e, min(d - c, max(b - c, f - e)));
+
+		diff = max(diff, max(min_, -max_));
+	} else {
+		diff = max(diff, max(min(d - e, d - c), -max(d - e, d - c)));
+	}
+
+#define YADIF_SPATIAL(c) \
+{ \
+	if(spatial_pred.c > d.c + diff.c) \
+		spatial_pred.c = d.c + diff.c; \
+	else if(spatial_pred.c < d.c - diff.c) \
+		spatial_pred.c = d.c - diff.c; \
+}
+
+	YADIF_SPATIAL(r)
+	YADIF_SPATIAL(g)
+	YADIF_SPATIAL(b)
+	YADIF_SPATIAL(a)
+
+	return spatial_pred;
+}
+
+float4 texel_at_yadif_2x(int2 texel, int field, bool mode0)
+{
+	field = frame2 ? (1 - field) : field;
+	return texel_at_yadif(texel, field, mode0);
+}
+
+float4 texel_at_discard(int2 texel, int field)
+{
+	texel.y = texel.y / 2 * 2;
+	return load_at_image(texel, 0, field);
+}
+
+float4 texel_at_discard_2x(int2 texel, int field)
+{
+	field = frame2 ? field : (1 - field);
+	return texel_at_discard(texel, field);
+}
+
+float4 texel_at_blend(int2 texel, int field)
+{
+	return (load_at_image(texel, 0, 0) + load_at_image(texel, 0, 1)) / 2;
+}
+
+float4 texel_at_blend_2x(int2 texel, int field)
+{
+	if (!frame2)
+		return (load_at_image(texel, 0, 0) +
+		        load_at_prev(texel, 0, 1)) / 2;
+	else
+		return (load_at_image(texel, 0, 0) +
+		        load_at_image(texel, 0, 1)) / 2;
+}
+
+float4 texel_at_linear(int2 texel, int field)
+{
+	if ((texel.y % 2) == field)
+		return load_at_image(texel, 0, 0);
+	return (load_at_image(texel, 0, -1) + load_at_image(texel, 0, 1)) / 2;
+}
+
+float4 texel_at_linear_2x(int2 texel, int field)
+{
+	field = frame2 ? field : (1 - field);
+	return texel_at_linear(texel, field);
+}
+
+float4 texel_at_yadif_discard(int2 texel, int field)
+{
+	return (texel_at_yadif(texel, field, true) + texel_at_discard(texel, field)) / 2;
+}
+
+float4 texel_at_yadif_discard_2x(int2 texel, int field)
+{
+	field = frame2 ? (1 - field) : field;
+	return (texel_at_yadif(texel, field, true) + texel_at_discard(texel, field)) / 2;
+}
+
+int2 pixel_uv(float2 uv)
+{
+	return int2(uv * dimensions);
+}
+
+float4 PSYadifMode0RGBA(VertData v_in) : TARGET
+{
+	return texel_at_yadif(pixel_uv(v_in.uv), field_order, true);
+}
+
+float4 PSYadifMode0RGBA_2x(VertData v_in) : TARGET
+{
+	return texel_at_yadif_2x(pixel_uv(v_in.uv), field_order, true);
+}
+
+float4 PSYadifMode2RGBA(VertData v_in) : TARGET
+{
+	return texel_at_yadif(pixel_uv(v_in.uv), field_order, false);
+}
+
+float4 PSYadifMode2RGBA_2x(VertData v_in) : TARGET
+{
+	return texel_at_yadif_2x(pixel_uv(v_in.uv), field_order, false);
+}
+
+float4 PSYadifDiscardRGBA(VertData v_in) : TARGET
+{
+	return texel_at_yadif_discard(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSYadifDiscardRGBA_2x(VertData v_in) : TARGET
+{
+	return texel_at_yadif_discard_2x(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSLinearRGBA(VertData v_in) : TARGET
+{
+	return texel_at_linear(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSLinearRGBA_2x(VertData v_in) : TARGET
+{
+	return texel_at_linear_2x(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSDiscardRGBA(VertData v_in) : TARGET
+{
+	return texel_at_discard(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSDiscardRGBA_2x(VertData v_in) : TARGET
+{
+	return texel_at_discard_2x(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSBlendRGBA(VertData v_in) : TARGET
+{
+	return texel_at_blend(pixel_uv(v_in.uv), field_order);
+}
+
+float4 PSBlendRGBA_2x(VertData v_in) : TARGET
+{
+	return texel_at_blend_2x(pixel_uv(v_in.uv), field_order);
+}
+
+VertData VSDefault(VertData v_in)
+{
+	VertData vert_out;
+	vert_out.pos = mul(float4(v_in.pos.xyz, 1.0), ViewProj);
+	vert_out.uv  = v_in.uv;
+	return vert_out;
+}
+
+#define TECHNIQUE(rgba_ps, matrix_ps) \
+technique Draw \
+{ \
+	pass \
+	{ \
+		vertex_shader = VSDefault(v_in); \
+		pixel_shader  = rgba_ps(v_in); \
+	} \
+} \
+float4 matrix_ps(VertData v_in) : TARGET \
+{ \
+	float4 yuv = rgba_ps(v_in); \
+	yuv.xyz = clamp(yuv.xyz, color_range_min, color_range_max); \
+	return saturate(mul(float4(yuv.xyz, 1.0), color_matrix)); \
+} \
+\
+technique DrawMatrix \
+{ \
+	pass \
+	{ \
+		vertex_shader = VSDefault(v_in); \
+		pixel_shader  = matrix_ps(v_in); \
+	} \
+}

libobs/data/deinterlace_blend.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE( PSBlendRGBA, PSBlendMatrix);

libobs/data/deinterlace_blend_2x.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSBlendRGBA_2x, PSBlendMatrix_2x);

libobs/data/deinterlace_discard.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSDiscardRGBA, PSDiscardMatrix);

libobs/data/deinterlace_discard_2x.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSDiscardRGBA_2x, PSDiscardMatrix_2x);

libobs/data/deinterlace_linear.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSLinearRGBA, PSLinearMatrix);

libobs/data/deinterlace_linear_2x.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSLinearRGBA_2x, PSLinearxMatrixA_2x);

libobs/data/deinterlace_yadif.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSYadifMode0RGBA, PSYadifMode0Matrix);

libobs/data/deinterlace_yadif_2x.effect

@@ -0,0 +1,21 @@
+/*
+ * Copyright (c) 2016 Ruwen Hahn <palana@stunned.de>
+ *                    John R. Bradley <jrb@turrettech.com>
+ *                    Hugh Bailey "Jim" <obs.jim@gmail.com>
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose with or without fee is hereby granted, provided that the above
+ * copyright notice and this permission notice appear in all copies.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ * WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ * MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ * ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+ */
+
+#include "deinterlace_base.effect"
+
+TECHNIQUE(PSYadifMode0RGBA_2x, PSYadifMode0Matrix_2x);

libobs/data/lanczos_scale.effect

@@ -23,11 +23,19 @@ struct VertData {
 	float2 uv  : TEXCOORD0;
 };
 
-VertData VSDefault(VertData v_in)
+struct FragData {
+	float4 pos : POSITION;
+	float2 uv  : TEXCOORD0;
+	float2 scale  : TEXCOORD1;
+};
+
+FragData VSDefault(VertData v_in)
 {
-	VertData vert_out;
+	FragData vert_out;
 	vert_out.pos = mul(float4(v_in.pos.xyz, 1.0), ViewProj);
 	vert_out.uv  = v_in.uv;
+	vert_out.scale = min(0.25 + abs(0.75 / mul(float4(1.0 / base_dimension_i.xy, 1.0, 1.0), ViewProj).xy), 1.0);
+
 	return vert_out;
 }
 
@@ -48,12 +56,12 @@ float weight(float x, float radius)
 		return 0.0;
 }
 
-float3 weight3(float x)
+float3 weight3(float x, float scale)
 {
 	return float3(
-		weight(x * 2.0 + 0.0 * 2.0 - 3.0, 3.0),
+		weight((x * 2.0 + 0.0 * 2.0 - 3.0) * scale, 3.0),
-		weight(x * 2.0 + 1.0 * 2.0 - 3.0, 3.0),
+		weight((x * 2.0 + 1.0 * 2.0 - 3.0) * scale, 3.0),
-		weight(x * 2.0 + 2.0 * 2.0 - 3.0, 3.0));
+		weight((x * 2.0 + 2.0 * 2.0 - 3.0) * scale, 3.0));
 }
 
 float4 pixel(float xpos, float ypos)
@@ -73,16 +81,16 @@ float4 get_line(float ypos, float3 xpos1, float3 xpos2, float3 rowtap1,
 		pixel(xpos2.b, ypos) * rowtap2.b;
 }
 
-float4 DrawLanczos(VertData v_in)
+float4 DrawLanczos(FragData v_in)
 {
 	float2 stepxy = base_dimension_i;
 	float2 pos = v_in.uv + stepxy * 0.5;
 	float2 f = frac(pos / stepxy);
 
-	float3 rowtap1 = weight3((1.0 - f.x) / 2.0);
+	float3 rowtap1 = weight3((1.0 - f.x) / 2.0,       v_in.scale.x);
-	float3 rowtap2 = weight3((1.0 - f.x) / 2.0 + 0.5);
+	float3 rowtap2 = weight3((1.0 - f.x) / 2.0 + 0.5, v_in.scale.x);
-	float3 coltap1 = weight3((1.0 - f.y) / 2.0);
+	float3 coltap1 = weight3((1.0 - f.y) / 2.0,       v_in.scale.y);
-	float3 coltap2 = weight3((1.0 - f.y) / 2.0 + 0.5);
+	float3 coltap2 = weight3((1.0 - f.y) / 2.0 + 0.5, v_in.scale.y);
 
 	/* make sure all taps added together is exactly 1.0, otherwise some
          * (very small) distortion can occur */
@@ -106,12 +114,12 @@ float4 DrawLanczos(VertData v_in)
 		get_line(xystart.y + stepxy.y * 5.0, xpos1, xpos2, rowtap1, rowtap2) * coltap2.b;
 }
 
-float4 PSDrawLanczosRGBA(VertData v_in) : TARGET
+float4 PSDrawLanczosRGBA(FragData v_in) : TARGET
 {
 	return DrawLanczos(v_in);
 }
 
-float4 PSDrawLanczosMatrix(VertData v_in) : TARGET
+float4 PSDrawLanczosMatrix(FragData v_in) : TARGET
 {
 	float4 rgba = DrawLanczos(v_in);
 	float4 yuv;

libobs/data/premultiplied_alpha.effect

@@ -0,0 +1,38 @@
+uniform float4x4 ViewProj;
+uniform texture2d image;
+
+sampler_state def_sampler {
+	Filter   = Linear;
+	AddressU = Clamp;
+	AddressV = Clamp;
+};
+
+struct VertInOut {
+	float4 pos : POSITION;
+	float2 uv  : TEXCOORD0;
+};
+
+VertInOut VSDefault(VertInOut vert_in)
+{
+	VertInOut vert_out;
+	vert_out.pos = mul(float4(vert_in.pos.xyz, 1.0), ViewProj);
+	vert_out.uv  = vert_in.uv;
+	return vert_out;
+}
+
+float4 PSDraw(VertInOut vert_in) : TARGET
+{
+	float4 rgba = image.Sample(def_sampler, vert_in.uv);
+	if (rgba.a > 0.0)
+		rgba.rgb /= rgba.a;
+	return saturate(rgba);
+}
+
+technique Draw
+{
+	pass
+	{
+		vertex_shader = VSDefault(vert_in);
+		pixel_shader  = PSDraw(vert_in);
+	}
+}

libobs/graphics/graphics.h

@@ -284,6 +284,9 @@ enum gs_shader_param_type {
 	GS_SHADER_PARAM_VEC2,
 	GS_SHADER_PARAM_VEC3,
 	GS_SHADER_PARAM_VEC4,
+	GS_SHADER_PARAM_INT2,
+	GS_SHADER_PARAM_INT3,
+	GS_SHADER_PARAM_INT4,
 	GS_SHADER_PARAM_MATRIX4X4,
 	GS_SHADER_PARAM_TEXTURE,
 };

libobs/graphics/matrix4.c

@@ -232,7 +232,7 @@ void matrix4_scale_i(struct matrix4 *dst, const struct vec3 *v,
 bool matrix4_inv(struct matrix4 *dst, const struct matrix4 *m)
 {
 	struct vec4 *dstv = (struct vec4 *)dst;
-	float det = matrix4_determinant(m);
+	float det;
 	float m3x3[9];
 	int   i, j, sign;
 

libobs/graphics/shader-parser.c

@@ -28,6 +28,12 @@ enum gs_shader_param_type get_shader_param_type(const char *type)
 		return GS_SHADER_PARAM_VEC3;
 	else if (strcmp(type, "float4") == 0)
 		return GS_SHADER_PARAM_VEC4;
+	else if (strcmp(type, "int2") == 0)
+		return GS_SHADER_PARAM_INT2;
+	else if (strcmp(type, "int3") == 0)
+		return GS_SHADER_PARAM_INT3;
+	else if (strcmp(type, "int4") == 0)
+		return GS_SHADER_PARAM_INT4;
 	else if (astrcmp_n(type, "texture", 7) == 0)
 		return GS_SHADER_PARAM_TEXTURE;
 	else if (strcmp(type, "float4x4") == 0)

libobs/graphics/texture-render.c

@@ -99,6 +99,9 @@ bool gs_texrender_begin(gs_texrender_t *texrender, uint32_t cx, uint32_t cy)
 		if (!texrender_resetbuffer(texrender, cx, cy))
 			return false;
 
+	if (!texrender->target)
+		return false;
+
 	gs_viewport_push();
 	gs_projection_push();
 	gs_matrix_push();

libobs/media-io/video-fourcc.c

@@ -45,6 +45,9 @@ enum video_format video_format_from_fourcc(uint32_t fourcc)
 		case MAKE_FOURCC('Y','V','Y','U'):
 			return VIDEO_FORMAT_YVYU;
 
+		case MAKE_FOURCC('Y','8','0','0'):
+			return VIDEO_FORMAT_Y800;
+		
 	}
 	return VIDEO_FORMAT_NONE;
 }

libobs/media-io/video-frame.c

@@ -66,6 +66,13 @@ void video_frame_init(struct video_frame *frame, enum video_format format,
 		frame->linesize[1] = width;
 		break;
 
+	case VIDEO_FORMAT_Y800:
+		size = width * height;
+		ALIGN_SIZE(size, alignment);
+		frame->data[0] = bmalloc(size);
+		frame->linesize[0] = width;
+		break;
+
 	case VIDEO_FORMAT_YVYU:
 	case VIDEO_FORMAT_YUY2:
 	case VIDEO_FORMAT_UYVY:
@@ -115,6 +122,7 @@ void video_frame_copy(struct video_frame *dst, const struct video_frame *src,
 		memcpy(dst->data[1], src->data[1], src->linesize[1] * cy / 2);
 		break;
 
+	case VIDEO_FORMAT_Y800:
 	case VIDEO_FORMAT_YVYU:
 	case VIDEO_FORMAT_YUY2:
 	case VIDEO_FORMAT_UYVY:

libobs/media-io/video-io.h

@@ -46,6 +46,7 @@ enum video_format {
 	VIDEO_FORMAT_RGBA,
 	VIDEO_FORMAT_BGRA,
 	VIDEO_FORMAT_BGRX,
+	VIDEO_FORMAT_Y800, /* grayscale */
 
 	/* planar 4:4:4 */
 	VIDEO_FORMAT_I444,
@@ -97,6 +98,7 @@ static inline bool format_is_yuv(enum video_format format)
 	case VIDEO_FORMAT_RGBA:
 	case VIDEO_FORMAT_BGRA:
 	case VIDEO_FORMAT_BGRX:
+	case VIDEO_FORMAT_Y800:
 		return false;
 	}
 
@@ -115,6 +117,7 @@ static inline const char *get_video_format_name(enum video_format format)
 	case VIDEO_FORMAT_BGRA: return "BGRA";
 	case VIDEO_FORMAT_BGRX: return "BGRX";
 	case VIDEO_FORMAT_I444: return "I444";
+	case VIDEO_FORMAT_Y800: return "Y800";
 	case VIDEO_FORMAT_NONE:;
 	}
 

libobs/media-io/video-scaler-ffmpeg.c

@@ -38,6 +38,7 @@ static inline enum AVPixelFormat get_ffmpeg_video_format(
 	case VIDEO_FORMAT_RGBA: return AV_PIX_FMT_RGBA;
 	case VIDEO_FORMAT_BGRA: return AV_PIX_FMT_BGRA;
 	case VIDEO_FORMAT_BGRX: return AV_PIX_FMT_BGRA;
+	case VIDEO_FORMAT_Y800: return AV_PIX_FMT_GRAY8;
 	case VIDEO_FORMAT_I444: return AV_PIX_FMT_YUV444P;
 	}
 

libobs/obs-avc.c

@@ -221,3 +221,58 @@ size_t obs_parse_avc_header(uint8_t **header, const uint8_t *data, size_t size)
 	*header = output.bytes.array;
 	return output.bytes.num;
 }
+
+void obs_extract_avc_headers(const uint8_t *packet, size_t size,
+		uint8_t **new_packet_data, size_t *new_packet_size,
+		uint8_t **header_data, size_t *header_size,
+		uint8_t **sei_data, size_t *sei_size)
+{
+	DARRAY(uint8_t) new_packet;
+	DARRAY(uint8_t) header;
+	DARRAY(uint8_t) sei;
+	const uint8_t *nal_start, *nal_end, *nal_codestart;
+	const uint8_t *end = packet + size;
+	int type;
+
+	da_init(new_packet);
+	da_init(header);
+	da_init(sei);
+
+	nal_start = obs_avc_find_startcode(packet, end);
+	nal_end = NULL;
+	while (nal_end != end) {
+		nal_codestart = nal_start;
+
+		while (nal_start < end && !*(nal_start++));
+
+		if (nal_start == end)
+			break;
+
+		type = nal_start[0] & 0x1F;
+
+		nal_end = obs_avc_find_startcode(nal_start, end);
+		if (!nal_end)
+			nal_end = end;
+
+		if (type == OBS_NAL_SPS || type == OBS_NAL_PPS) {
+			da_push_back_array(header, nal_codestart,
+					nal_end - nal_codestart);
+		} else if (type == OBS_NAL_SEI) {
+			da_push_back_array(sei, nal_codestart,
+					nal_end - nal_codestart);
+
+		} else {
+			da_push_back_array(new_packet, nal_codestart,
+					nal_end - nal_codestart);
+		}
+
+		nal_start = nal_end;
+	}
+
+	*new_packet_data = new_packet.array;
+	*new_packet_size = new_packet.num;
+	*header_data = header.array;
+	*header_size = header.num;
+	*sei_data = sei.array;
+	*sei_size = sei.num;
+}

libobs/obs-avc.h

@@ -55,6 +55,10 @@ EXPORT void obs_parse_avc_packet(struct encoder_packet *avc_packet,
 		const struct encoder_packet *src);
 EXPORT size_t obs_parse_avc_header(uint8_t **header, const uint8_t *data,
 		size_t size);
+EXPORT void obs_extract_avc_headers(const uint8_t *packet, size_t size,
+		uint8_t **new_packet_data, size_t *new_packet_size,
+		uint8_t **header_data, size_t *header_size,
+		uint8_t **sei_data, size_t *sei_size);
 
 #ifdef __cplusplus
 }

libobs/obs-config.h

@@ -34,7 +34,7 @@
  *
  * Reset to zero each major version
  */
-#define LIBOBS_API_MINOR_VER  13
+#define LIBOBS_API_MINOR_VER  14
 
 /*
  * Increment if backward-compatible bug fix

libobs/obs-encoder.c

@@ -54,8 +54,8 @@ static bool init_encoder(struct obs_encoder *encoder, const char *name,
 		return false;
 	if (pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE) != 0)
 		return false;
-	if (!obs_context_data_init(&encoder->context, settings, name,
+	if (!obs_context_data_init(&encoder->context, OBS_OBJ_TYPE_ENCODER,
-				hotkey_data, false))
+				settings, name, hotkey_data, false))
 		return false;
 	if (pthread_mutex_init(&encoder->init_mutex, &attr) != 0)
 		return false;
@@ -731,7 +731,7 @@ static void send_first_video_packet(struct obs_encoder *encoder,
 
 	da_init(data);
 
-	if (!get_sei(encoder, &sei, &size)) {
+	if (!get_sei(encoder, &sei, &size) || !sei || !size) {
 		cb->new_packet(cb->param, packet);
 		cb->sent_first_packet = true;
 		return;
@@ -1150,3 +1150,9 @@ const char *obs_encoder_get_id(const obs_encoder_t *encoder)
 	return obs_encoder_valid(encoder, "obs_encoder_get_id")
 		? encoder->info.id : NULL;
 }
+
+uint32_t obs_get_encoder_caps(const char *encoder_id)
+{
+	struct obs_encoder_info *info = find_encoder(encoder_id);
+	return info ? info->caps : 0;
+}

libobs/obs-encoder.h

@@ -29,6 +29,8 @@
 extern "C" {
 #endif
 
+#define OBS_ENCODER_CAP_DEPRECATED             (1<<0)
+
 /** Specifies the encoder type */
 enum obs_encoder_type {
 	OBS_ENCODER_AUDIO, /**< The encoder provides an audio codec */
@@ -227,6 +229,8 @@ struct obs_encoder_info {
 
 	void *type_data;
 	void (*free_type_data)(void *type_data);
+
+	uint32_t caps;
 };
 
 EXPORT void obs_register_encoder_s(const struct obs_encoder_info *info,

libobs/obs-internal.h

@@ -237,6 +237,7 @@ struct obs_core_video {
 	gs_effect_t                     *bicubic_effect;
 	gs_effect_t                     *lanczos_effect;
 	gs_effect_t                     *bilinear_lowres_effect;
+	gs_effect_t                     *premultiplied_alpha_effect;
 	gs_stagesurf_t                  *mapped_surface;
 	int                             cur_texture;
 
@@ -262,6 +263,15 @@ struct obs_core_video {
 	enum obs_scale_type             scale_type;
 
 	gs_texture_t                    *transparent_texture;
+
+	gs_effect_t                     *deinterlace_discard_effect;
+	gs_effect_t                     *deinterlace_discard_2x_effect;
+	gs_effect_t                     *deinterlace_linear_effect;
+	gs_effect_t                     *deinterlace_linear_2x_effect;
+	gs_effect_t                     *deinterlace_blend_effect;
+	gs_effect_t                     *deinterlace_blend_2x_effect;
+	gs_effect_t                     *deinterlace_yadif_effect;
+	gs_effect_t                     *deinterlace_yadif_2x_effect;
 };
 
 struct obs_core_audio {
@@ -371,6 +381,8 @@ extern struct obs_core *obs;
 
 extern void *obs_video_thread(void *param);
 
+extern gs_effect_t *obs_load_effect(gs_effect_t **effect, const char *file);
+
 extern bool audio_callback(void *param,
 		uint64_t start_ts_in, uint64_t end_ts_in, uint64_t *out_ts,
 		uint32_t mixers, struct audio_output_data *mixes);
@@ -385,6 +397,7 @@ struct obs_context_data {
 	obs_data_t                      *settings;
 	signal_handler_t                *signals;
 	proc_handler_t                  *procs;
+	enum obs_obj_type               type;
 
 	DARRAY(obs_hotkey_id)           hotkeys;
 	DARRAY(obs_hotkey_pair_id)      hotkey_pairs;
@@ -402,6 +415,7 @@ struct obs_context_data {
 
 extern bool obs_context_data_init(
 		struct obs_context_data *context,
+		enum obs_obj_type       type,
 		obs_data_t              *settings,
 		const char              *name,
 		obs_data_t              *hotkey_data,
@@ -564,7 +578,7 @@ struct obs_source {
 
 	/* async video data */
 	gs_texture_t                    *async_texture;
-	gs_texrender_t                  *async_convert_texrender;
+	gs_texrender_t                  *async_texrender;
 	struct obs_source_frame         *cur_async_frame;
 	bool                            async_gpu_conversion;
 	enum video_format               async_format;
@@ -587,6 +601,18 @@ struct obs_source {
 	uint32_t                        async_convert_width;
 	uint32_t                        async_convert_height;
 
+	/* async video deinterlacing */
+	uint64_t                        deinterlace_offset;
+	uint64_t                        deinterlace_frame_ts;
+	gs_effect_t                     *deinterlace_effect;
+	struct obs_source_frame         *prev_async_frame;
+	gs_texture_t                    *async_prev_texture;
+	gs_texrender_t                  *async_prev_texrender;
+	uint32_t                        deinterlace_half_duration;
+	enum obs_deinterlace_mode       deinterlace_mode;
+	bool                            deinterlace_top_first;
+	bool                            deinterlace_rendered;
+
 	/* filters */
 	struct obs_source               *filter_parent;
 	struct obs_source               *filter_target;
@@ -671,6 +697,30 @@ static inline void obs_source_dosignal(struct obs_source *source,
 				&data);
 }
 
+/* maximum timestamp variance in nanoseconds */
+#define MAX_TS_VAR          2000000000ULL
+
+static inline bool frame_out_of_bounds(const obs_source_t *source, uint64_t ts)
+{
+	if (ts < source->last_frame_ts)
+		return ((source->last_frame_ts - ts) > MAX_TS_VAR);
+	else
+		return ((ts - source->last_frame_ts) > MAX_TS_VAR);
+}
+
+static inline enum gs_color_format convert_video_format(
+		enum video_format format)
+{
+	if (format == VIDEO_FORMAT_RGBA)
+		return GS_RGBA;
+	else if (format == VIDEO_FORMAT_BGRA)
+		return GS_BGRA;
+	else if (format == VIDEO_FORMAT_Y800)
+		return GS_R8;
+
+	return GS_BGRX;
+}
+
 extern void obs_source_activate(obs_source_t *source, enum view_type type);
 extern void obs_source_deactivate(obs_source_t *source, enum view_type type);
 extern void obs_source_video_tick(obs_source_t *source, float seconds);
@@ -682,6 +732,22 @@ extern void obs_source_audio_render(obs_source_t *source, uint32_t mixers,
 
 extern void add_alignment(struct vec2 *v, uint32_t align, int cx, int cy);
 
+extern struct obs_source_frame *filter_async_video(obs_source_t *source,
+		struct obs_source_frame *in);
+extern bool update_async_texture(struct obs_source *source,
+		const struct obs_source_frame *frame,
+		gs_texture_t *tex, gs_texrender_t *texrender);
+extern bool set_async_texture_size(struct obs_source *source,
+		const struct obs_source_frame *frame);
+extern void remove_async_frame(obs_source_t *source,
+		struct obs_source_frame *frame);
+
+extern void set_deinterlace_texture_size(obs_source_t *source);
+extern void deinterlace_process_last_frame(obs_source_t *source,
+		uint64_t sys_time);
+extern void deinterlace_update_async_video(obs_source_t *source);
+extern void deinterlace_render(obs_source_t *s);
+
 
 /* ------------------------------------------------------------------------- */
 /* outputs  */

libobs/obs-output.c

@@ -53,8 +53,8 @@ static const char *output_signals[] = {
 static bool init_output_handlers(struct obs_output *output, const char *name,
 		obs_data_t *settings, obs_data_t *hotkey_data)
 {
-	if (!obs_context_data_init(&output->context, settings, name,
+	if (!obs_context_data_init(&output->context, OBS_OBJ_TYPE_OUTPUT,
-				hotkey_data, false))
+				settings, name, hotkey_data, false))
 		return false;
 
 	signal_handler_add_array(output->context.signals, output_signals);
@@ -994,14 +994,15 @@ static bool prune_interleaved_packets(struct obs_output *output)
 	int prune_start = prune_premature_packets(output);
 
 #if DEBUG_STARTING_PACKETS == 1
-	blog(LOG_DEBUG, "--------- Pruning! ---------");
+	blog(LOG_DEBUG, "--------- Pruning! %d ---------", prune_start);
 	for (size_t i = 0; i < output->interleaved_packets.num; i++) {
 		struct encoder_packet *packet =
 			&output->interleaved_packets.array[i];
-		blog(LOG_DEBUG, "packet: %s %d, ts: %lld",
+		blog(LOG_DEBUG, "packet: %s %d, ts: %lld, pruned = %s",
 				packet->type == OBS_ENCODER_AUDIO ?
 				"audio" : "video", (int)packet->track_idx,
-				packet->dts_usec);
+				packet->dts_usec,
+				(int)i < prune_start ? "true" : "false");
 	}
 #endif
 
@@ -1039,6 +1040,26 @@ static int find_first_packet_type_idx(struct obs_output *output,
 	return -1;
 }
 
+static int find_last_packet_type_idx(struct obs_output *output,
+		enum obs_encoder_type type, size_t audio_idx)
+{
+	for (size_t i = output->interleaved_packets.num; i > 0; i--) {
+		struct encoder_packet *packet =
+			&output->interleaved_packets.array[i - 1];
+
+		if (packet->type == type) {
+			if (type == OBS_ENCODER_AUDIO &&
+			    packet->track_idx != audio_idx) {
+				continue;
+			}
+
+			return (int)(i - 1);
+		}
+	}
+
+	return -1;
+}
+
 static inline struct encoder_packet *find_first_packet_type(
 		struct obs_output *output, enum obs_encoder_type type,
 		size_t audio_idx)
@@ -1047,14 +1068,20 @@ static inline struct encoder_packet *find_first_packet_type(
 	return (idx != -1) ? &output->interleaved_packets.array[idx] : NULL;
 }
 
-static bool initialize_interleaved_packets(struct obs_output *output)
+static inline struct encoder_packet *find_last_packet_type(
+		struct obs_output *output, enum obs_encoder_type type,
+		size_t audio_idx)
 {
-	struct encoder_packet *video;
+	int idx = find_last_packet_type_idx(output, type, audio_idx);
-	struct encoder_packet *audio[MAX_AUDIO_MIXES];
+	return (idx != -1) ? &output->interleaved_packets.array[idx] : NULL;
-	size_t audio_mixes = num_audio_mixes(output);
+}
 
-	video = find_first_packet_type(output, OBS_ENCODER_VIDEO, 0);
+static bool get_audio_and_video_packets(struct obs_output *output,
-	if (!video)
+		struct encoder_packet **video,
+		struct encoder_packet **audio, size_t audio_mixes)
+{
+	*video = find_first_packet_type(output, OBS_ENCODER_VIDEO, 0);
+	if (!*video)
 		output->received_video = false;
 
 	for (size_t i = 0; i < audio_mixes; i++) {
@@ -1065,7 +1092,42 @@ static bool initialize_interleaved_packets(struct obs_output *output)
 		}
 	}
 
-	if (!video) {
+	if (!*video) {
+		return false;
+	}
+
+	return true;
+}
+
+static bool initialize_interleaved_packets(struct obs_output *output)
+{
+	struct encoder_packet *video;
+	struct encoder_packet *audio[MAX_AUDIO_MIXES];
+	struct encoder_packet *last_audio[MAX_AUDIO_MIXES];
+	size_t audio_mixes = num_audio_mixes(output);
+	size_t start_idx;
+
+	if (!get_audio_and_video_packets(output, &video, audio, audio_mixes))
+		return false;
+
+	for (size_t i = 0; i < audio_mixes; i++)
+		last_audio[i] = find_last_packet_type(output, OBS_ENCODER_AUDIO,
+				i);
+
+	/* ensure that there is audio past the first video packet */
+	for (size_t i = 0; i < audio_mixes; i++) {
+		if (last_audio[i]->dts_usec < video->dts_usec) {
+			output->received_audio = false;
+			return false;
+		}
+	}
+
+	/* clear out excess starting audio if it hasn't been already */
+	start_idx = get_interleaved_start_idx(output);
+	if (start_idx) {
+		discard_to_idx(output, start_idx);
+		if (!get_audio_and_video_packets(output, &video, audio,
+					audio_mixes))
 			return false;
 	}
 

libobs/obs-scene.c

@@ -281,18 +281,38 @@ static void calculate_bounds_data(struct obs_scene_item *item,
 			(int)-width_diff, (int)-height_diff);
 }
 
+static inline uint32_t calc_cx(const struct obs_scene_item *item,
+		uint32_t width)
+{
+	uint32_t crop_cx = item->crop.left + item->crop.right;
+	return (crop_cx > width) ? 2 : (width - crop_cx);
+}
+
+static inline uint32_t calc_cy(const struct obs_scene_item *item,
+		uint32_t height)
+{
+	uint32_t crop_cy = item->crop.top + item->crop.bottom;
+	return (crop_cy > height) ? 2 : (height - crop_cy);
+}
+
 static void update_item_transform(struct obs_scene_item *item)
 {
 	uint32_t        width         = obs_source_get_width(item->source);
 	uint32_t        height        = obs_source_get_height(item->source);
-	uint32_t        cx            = width;
+	uint32_t        cx            = calc_cx(item, width);
-	uint32_t        cy            = height;
+	uint32_t        cy            = calc_cy(item, height);
 	struct vec2     base_origin;
 	struct vec2     origin;
 	struct vec2     scale         = item->scale;
 	struct calldata params;
 	uint8_t         stack[128];
 
+	if (os_atomic_load_long(&item->defer_update) > 0)
+		return;
+
+	width = cx;
+	height = cy;
+
 	vec2_zero(&base_origin);
 	vec2_zero(&origin);
 
@@ -358,6 +378,70 @@ static inline bool source_size_changed(struct obs_scene_item *item)
 	return item->last_width != width || item->last_height != height;
 }
 
+static inline bool crop_enabled(const struct obs_sceneitem_crop *crop)
+{
+	return crop->left || crop->right || crop->top || crop->bottom;
+}
+
+static inline void render_item(struct obs_scene_item *item)
+{
+	if (item->crop_render) {
+		uint32_t width  = obs_source_get_width(item->source);
+		uint32_t height = obs_source_get_height(item->source);
+		uint32_t cx = calc_cx(item, width);
+		uint32_t cy = calc_cy(item, height);
+
+		if (cx && cy && gs_texrender_begin(item->crop_render, cx, cy)) {
+			float cx_scale = (float)width  / (float)cx;
+			float cy_scale = (float)height / (float)cy;
+			struct vec4 clear_color;
+
+			vec4_zero(&clear_color);
+			gs_clear(GS_CLEAR_COLOR, &clear_color, 0.0f, 0);
+			gs_ortho(0.0f, (float)width, 0.0f, (float)height,
+					-100.0f, 100.0f);
+
+			gs_matrix_scale3f(cx_scale, cy_scale, 1.0f);
+			gs_matrix_translate3f(
+					-(float)item->crop.left,
+					-(float)item->crop.top,
+					0.0f);
+
+			obs_source_video_render(item->source);
+			gs_texrender_end(item->crop_render);
+		}
+	}
+
+	gs_matrix_push();
+	gs_matrix_mul(&item->draw_transform);
+	if (item->crop_render) {
+		gs_texture_t *tex = gs_texrender_get_texture(item->crop_render);
+
+		while (gs_effect_loop(obs->video.default_effect, "Draw"))
+			obs_source_draw(tex, 0, 0, 0, 0, 0);
+	} else {
+		obs_source_video_render(item->source);
+	}
+	gs_matrix_pop();
+}
+
+static void scene_video_tick(void *data, float seconds)
+{
+	struct obs_scene *scene = data;
+	struct obs_scene_item *item;
+
+	video_lock(scene);
+	item = scene->first_item;
+	while (item) {
+		if (item->crop_render)
+			gs_texrender_reset(item->crop_render);
+		item = item->next;
+	}
+	video_unlock(scene);
+
+	UNUSED_PARAMETER(seconds);
+}
+
 static void scene_video_render(void *data, gs_effect_t *effect)
 {
 	DARRAY(struct obs_scene_item*) remove_items;
@@ -385,12 +469,8 @@ static void scene_video_render(void *data, gs_effect_t *effect)
 		if (source_size_changed(item))
 			update_item_transform(item);
 
-		if (item->user_visible) {
+		if (item->user_visible)
-			gs_matrix_push();
+			render_item(item);
-			gs_matrix_mul(&item->draw_transform);
-			obs_source_video_render(item->source);
-			gs_matrix_pop();
-		}
 
 		item = item->next;
 	}
@@ -468,6 +548,23 @@ static void scene_load_item(struct obs_scene *scene, obs_data_t *item_data)
 		(uint32_t)obs_data_get_int(item_data, "bounds_align");
 	obs_data_get_vec2(item_data, "bounds", &item->bounds);
 
+	item->crop.left   = (uint32_t)obs_data_get_int(item_data, "crop_left");
+	item->crop.top    = (uint32_t)obs_data_get_int(item_data, "crop_top");
+	item->crop.right  = (uint32_t)obs_data_get_int(item_data, "crop_right");
+	item->crop.bottom = (uint32_t)obs_data_get_int(item_data, "crop_bottom");
+
+	if (item->crop_render && !crop_enabled(&item->crop)) {
+		obs_enter_graphics();
+		gs_texrender_destroy(item->crop_render);
+		item->crop_render = NULL;
+		obs_leave_graphics();
+
+	} else if (!item->crop_render && crop_enabled(&item->crop)) {
+		obs_enter_graphics();
+		item->crop_render = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
+		obs_leave_graphics();
+	}
+
 	obs_source_release(source);
 
 	update_item_transform(item);
@@ -508,6 +605,10 @@ static void scene_save_item(obs_data_array_t *array,
 	obs_data_set_int   (item_data, "bounds_type",  (int)item->bounds_type);
 	obs_data_set_int   (item_data, "bounds_align", (int)item->bounds_align);
 	obs_data_set_vec2 (item_data, "bounds",       &item->bounds);
+	obs_data_set_int  (item_data, "crop_left",    (int)item->crop.left);
+	obs_data_set_int  (item_data, "crop_top",     (int)item->crop.top);
+	obs_data_set_int  (item_data, "crop_right",   (int)item->crop.right);
+	obs_data_set_int  (item_data, "crop_bottom",  (int)item->crop.bottom);
 
 	obs_data_array_push_back(array, item_data);
 	obs_data_release(item_data);
@@ -742,6 +843,7 @@ const struct obs_source_info scene_info =
 	.get_name      = scene_getname,
 	.create        = scene_create,
 	.destroy       = scene_destroy,
+	.video_tick    = scene_video_tick,
 	.video_render  = scene_video_render,
 	.audio_render  = scene_audio_render,
 	.get_width     = scene_getwidth,
@@ -869,6 +971,8 @@ obs_scene_t *obs_scene_duplicate(obs_scene_t *scene, const char *name,
 			new_item->bounds_align = item->bounds_align;
 			new_item->bounds = item->bounds;
 
+			obs_sceneitem_set_crop(new_item, &item->crop);
+
 			obs_source_release(source);
 		}
 	}
@@ -1123,6 +1227,11 @@ obs_sceneitem_t *obs_scene_add(obs_scene_t *scene, obs_source_t *source)
 static void obs_sceneitem_destroy(obs_sceneitem_t *item)
 {
 	if (item) {
+		if (item->crop_render) {
+			obs_enter_graphics();
+			gs_texrender_destroy(item->crop_render);
+			obs_leave_graphics();
+		}
 		obs_hotkey_pair_unregister(item->toggle_visibility);
 		pthread_mutex_destroy(&item->actions_mutex);
 		if (item->source)
@@ -1573,3 +1682,75 @@ void obs_scene_atomic_update(obs_scene_t *scene,
 	full_unlock(scene);
 	obs_scene_release(scene);
 }
+
+static inline bool crop_equal(const struct obs_sceneitem_crop *crop1,
+		const struct obs_sceneitem_crop *crop2)
+{
+	return crop1->left   == crop2->left  &&
+	       crop1->right  == crop2->right &&
+	       crop1->top    == crop2->top   &&
+	       crop1->bottom == crop2->bottom;
+}
+
+void obs_sceneitem_set_crop(obs_sceneitem_t *item,
+		const struct obs_sceneitem_crop *crop)
+{
+	bool now_enabled;
+
+	if (!obs_ptr_valid(item, "obs_sceneitem_set_crop"))
+		return;
+	if (!obs_ptr_valid(crop, "obs_sceneitem_set_crop"))
+		return;
+	if (crop_equal(crop, &item->crop))
+		return;
+
+	now_enabled = crop_enabled(crop);
+
+	obs_enter_graphics();
+
+	if (!now_enabled) {
+		gs_texrender_destroy(item->crop_render);
+		item->crop_render = NULL;
+
+	} else if (!item->crop_render) {
+		item->crop_render = gs_texrender_create(GS_RGBA, GS_ZS_NONE);
+	}
+
+	memcpy(&item->crop, crop, sizeof(*crop));
+
+	if (item->crop.left < 0) item->crop.left = 0;
+	if (item->crop.right < 0) item->crop.right = 0;
+	if (item->crop.top < 0) item->crop.top = 0;
+	if (item->crop.bottom < 0) item->crop.bottom = 0;
+	obs_leave_graphics();
+
+	update_item_transform(item);
+}
+
+void obs_sceneitem_get_crop(const obs_sceneitem_t *item,
+		struct obs_sceneitem_crop *crop)
+{
+	if (!obs_ptr_valid(item, "obs_sceneitem_get_crop"))
+		return;
+	if (!obs_ptr_valid(crop, "obs_sceneitem_get_crop"))
+		return;
+
+	memcpy(crop, &item->crop, sizeof(*crop));
+}
+
+void obs_sceneitem_defer_update_begin(obs_sceneitem_t *item)
+{
+	if (!obs_ptr_valid(item, "obs_sceneitem_defer_update_begin"))
+		return;
+
+	os_atomic_inc_long(&item->defer_update);
+}
+
+void obs_sceneitem_defer_update_end(obs_sceneitem_t *item)
+{
+	if (!obs_ptr_valid(item, "obs_sceneitem_defer_update_end"))
+		return;
+
+	if (os_atomic_dec_long(&item->defer_update) == 0)
+		update_item_transform(item);
+}

libobs/obs-scene.h

@@ -35,10 +35,14 @@ struct obs_scene_item {
 	struct obs_scene      *parent;
 	struct obs_source     *source;
 	volatile long         active_refs;
+	volatile long         defer_update;
 	bool                  user_visible;
 	bool                  visible;
 	bool                  selected;
 
+	gs_texrender_t        *crop_render;
+	struct obs_sceneitem_crop crop;
+
 	struct vec2           pos;
 	struct vec2           scale;
 	float                 rot;

libobs/obs-service.c

@@ -33,8 +33,9 @@ const char *obs_service_get_display_name(const char *id)
 	return (info != NULL) ? info->get_name(info->type_data) : NULL;
 }
 
-obs_service_t *obs_service_create(const char *id, const char *name,
+static obs_service_t *obs_service_create_internal(const char *id,
-		obs_data_t *settings, obs_data_t *hotkey_data)
+		const char *name, obs_data_t *settings, obs_data_t *hotkey_data,
+		bool private)
 {
 	const struct obs_service_info *info = find_service(id);
 	struct obs_service *service;
@@ -46,22 +47,13 @@ obs_service_t *obs_service_create(const char *id, const char *name,
 
 	service = bzalloc(sizeof(struct obs_service));
 
-	if (!obs_context_data_init(&service->context, settings, name,
+	if (!obs_context_data_init(&service->context, OBS_OBJ_TYPE_SERVICE,
-				hotkey_data, false)) {
+				settings, name, hotkey_data, private)) {
 		bfree(service);
 		return NULL;
 	}
 
-	if (!info) {
-		blog(LOG_ERROR, "Service ID '%s' not found", id);
-
-		service->info.id      = bstrdup(id);
-		service->owns_info_id = true;
-	} else {
 	service->info = *info;
-	}
-
-	if (info)
 	service->context.data = service->info.create(
 				service->context.settings, service);
 	if (!service->context.data)
@@ -74,10 +66,24 @@ obs_service_t *obs_service_create(const char *id, const char *name,
 			&obs->data.services_mutex,
 			&obs->data.first_service);
 
-	blog(LOG_INFO, "service '%s' (%s) created", name, id);
+	blog(private ? LOG_DEBUG : LOG_INFO, "service '%s' (%s) created",
+			name, id);
 	return service;
 }
 
+obs_service_t *obs_service_create(const char *id,
+		const char *name, obs_data_t *settings, obs_data_t *hotkey_data)
+{
+	return obs_service_create_internal(id, name, settings, hotkey_data,
+			false);
+}
+
+obs_service_t *obs_service_create_private(const char *id,
+		const char *name, obs_data_t *settings)
+{
+	return obs_service_create_internal(id, name, settings, NULL, true);
+}
+
 static void actually_destroy_service(struct obs_service *service)
 {
 	if (service->context.data)
@@ -86,7 +92,8 @@ static void actually_destroy_service(struct obs_service *service)
 	if (service->output)
 		service->output->service = NULL;
 
-	blog(LOG_INFO, "service '%s' destroyed", service->context.name);
+	blog(service->context.private ? LOG_DEBUG : LOG_INFO,
+			"service '%s' destroyed", service->context.name);
 
 	obs_context_data_free(&service->context);
 	if (service->owns_info_id)

libobs/obs-source-deinterlace.c

@@ -0,0 +1,444 @@
+/******************************************************************************
+    Copyright (C) 2016 by Hugh Bailey <obs.jim@gmail.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, see <http://www.gnu.org/licenses/>.
+******************************************************************************/
+
+#include "obs-internal.h"
+
+static bool ready_deinterlace_frames(obs_source_t *source, uint64_t sys_time)
+{
+	struct obs_source_frame *next_frame = source->async_frames.array[0];
+	struct obs_source_frame *prev_frame = NULL;
+	struct obs_source_frame *frame      = NULL;
+	uint64_t sys_offset = sys_time - source->last_sys_timestamp;
+	uint64_t frame_time = next_frame->timestamp;
+	uint64_t frame_offset = 0;
+	size_t idx = 1;
+
+	if ((source->flags & OBS_SOURCE_FLAG_UNBUFFERED) != 0) {
+		while (source->async_frames.num > 2) {
+			da_erase(source->async_frames, 0);
+			remove_async_frame(source, next_frame);
+			next_frame = source->async_frames.array[0];
+		}
+
+		if (source->async_frames.num == 2)
+			source->async_frames.array[0]->prev_frame = true;
+		source->deinterlace_offset = 0;
+		return true;
+	}
+
+	/* account for timestamp invalidation */
+	if (frame_out_of_bounds(source, frame_time)) {
+		source->last_frame_ts = next_frame->timestamp;
+		source->deinterlace_offset = 0;
+		return true;
+	} else {
+		frame_offset = frame_time - source->last_frame_ts;
+		source->last_frame_ts += sys_offset;
+	}
+
+	while (source->last_frame_ts > next_frame->timestamp) {
+
+		/* this tries to reduce the needless frame duplication, also
+		 * helps smooth out async rendering to frame boundaries.  In
+		 * other words, tries to keep the framerate as smooth as
+		 * possible */
+		if ((source->last_frame_ts - next_frame->timestamp) < 2000000)
+			break;
+
+		if (prev_frame) {
+			da_erase(source->async_frames, 0);
+			remove_async_frame(source, prev_frame);
+		}
+
+		if (source->async_frames.num <= 2) {
+			bool exit = true;
+
+			if (prev_frame) {
+				prev_frame->prev_frame = true;
+
+			} else if (!frame && source->async_frames.num == 2) {
+				exit = false;
+			}
+
+			if (exit) {
+				source->deinterlace_offset = 0;
+				return true;
+			}
+		}
+
+		if (frame)
+			idx = 2;
+		else
+			idx = 1;
+
+		prev_frame = frame;
+		frame = next_frame;
+		next_frame = source->async_frames.array[idx];
+
+		/* more timestamp checking and compensating */
+		if ((next_frame->timestamp - frame_time) > MAX_TS_VAR) {
+			source->last_frame_ts =
+				next_frame->timestamp - frame_offset;
+			source->deinterlace_offset = 0;
+		}
+
+		frame_time   = next_frame->timestamp;
+		frame_offset = frame_time - source->last_frame_ts;
+	}
+
+	if (prev_frame)
+		prev_frame->prev_frame = true;
+
+	return frame != NULL;
+}
+
+static inline bool first_frame(obs_source_t *s)
+{
+	if (s->last_frame_ts)
+		return false;
+
+	if (s->async_frames.num >= 2)
+		s->async_frames.array[0]->prev_frame = true;
+	return true;
+}
+
+static inline uint64_t uint64_diff(uint64_t ts1, uint64_t ts2)
+{
+	return (ts1 < ts2) ?  (ts2 - ts1) : (ts1 - ts2);
+}
+
+static inline void deinterlace_get_closest_frames(obs_source_t *s,
+		uint64_t sys_time)
+{
+	const struct video_output_info *info;
+	uint64_t half_interval;
+
+	if (!s->async_frames.num)
+		return;
+
+	info = video_output_get_info(obs->video.video);
+	half_interval = (uint64_t)info->fps_den * 500000000ULL /
+		(uint64_t)info->fps_num;
+
+	if (first_frame(s) || ready_deinterlace_frames(s, sys_time)) {
+		uint64_t offset;
+
+		s->prev_async_frame = NULL;
+		s->cur_async_frame = s->async_frames.array[0];
+
+		da_erase(s->async_frames, 0);
+
+		if (s->cur_async_frame->prev_frame) {
+			s->prev_async_frame = s->cur_async_frame;
+			s->cur_async_frame = s->async_frames.array[0];
+
+			da_erase(s->async_frames, 0);
+
+			s->deinterlace_half_duration = (uint32_t)
+				((s->cur_async_frame->timestamp -
+				  s->prev_async_frame->timestamp) / 2);
+		} else {
+			s->deinterlace_half_duration = (uint32_t)
+				((s->cur_async_frame->timestamp -
+				  s->deinterlace_frame_ts) / 2);
+		}
+
+		if (!s->last_frame_ts)
+			s->last_frame_ts = s->cur_async_frame->timestamp;
+
+		s->deinterlace_frame_ts = s->cur_async_frame->timestamp;
+
+		offset = obs->video.video_time - s->deinterlace_frame_ts;
+
+		if (!s->deinterlace_offset) {
+			s->deinterlace_offset = offset;
+		} else {
+			uint64_t offset_diff = uint64_diff(
+					s->deinterlace_offset, offset);
+			if (offset_diff > half_interval)
+				s->deinterlace_offset = offset;
+		}
+	}
+}
+
+void deinterlace_process_last_frame(obs_source_t *s, uint64_t sys_time)
+{
+	if (s->prev_async_frame) {
+		remove_async_frame(s, s->prev_async_frame);
+		s->prev_async_frame = NULL;
+	}
+	if (s->cur_async_frame) {
+		remove_async_frame(s, s->cur_async_frame);
+		s->cur_async_frame = NULL;
+	}
+
+	deinterlace_get_closest_frames(s, sys_time);
+}
+
+void set_deinterlace_texture_size(obs_source_t *source)
+{
+	if (source->async_gpu_conversion) {
+		source->async_prev_texrender =
+			gs_texrender_create(GS_BGRX, GS_ZS_NONE);
+
+		source->async_prev_texture = gs_texture_create(
+				source->async_convert_width,
+				source->async_convert_height,
+				source->async_texture_format,
+				1, NULL, GS_DYNAMIC);
+
+	} else {
+		enum gs_color_format format = convert_video_format(
+				source->async_format);
+
+		source->async_prev_texture = gs_texture_create(
+				source->async_width, source->async_height,
+				format, 1, NULL, GS_DYNAMIC);
+	}
+}
+
+static inline struct obs_source_frame *get_prev_frame(obs_source_t *source,
+		bool *updated)
+{
+	struct obs_source_frame *frame = NULL;
+
+	pthread_mutex_lock(&source->async_mutex);
+
+	*updated = source->cur_async_frame != NULL;
+	frame = source->prev_async_frame;
+	source->prev_async_frame = NULL;
+
+	if (frame)
+		os_atomic_inc_long(&frame->refs);
+
+	pthread_mutex_unlock(&source->async_mutex);
+
+	return frame;
+}
+
+void deinterlace_update_async_video(obs_source_t *source)
+{
+	struct obs_source_frame *frame;
+	bool updated;
+
+	if (source->deinterlace_rendered)
+		return;
+
+	frame = get_prev_frame(source, &updated);
+
+	source->deinterlace_rendered = true;
+	if (frame)
+		frame = filter_async_video(source, frame);
+
+	if (frame) {
+		if (set_async_texture_size(source, frame)) {
+			update_async_texture(source, frame,
+					source->async_prev_texture,
+					source->async_prev_texrender);
+		}
+
+		obs_source_release_frame(source, frame);
+
+	} else if (updated) { /* swap cur/prev if no previous texture */
+		gs_texture_t *prev_tex = source->async_prev_texture;
+		source->async_prev_texture = source->async_texture;
+		source->async_texture = prev_tex;
+
+		if (source->async_texrender) {
+			gs_texrender_t *prev = source->async_prev_texrender;
+			source->async_prev_texrender = source->async_texrender;
+			source->async_texrender = prev;
+		}
+	}
+}
+
+static inline gs_effect_t *get_effect(enum obs_deinterlace_mode mode)
+{
+	switch (mode) {
+	case OBS_DEINTERLACE_MODE_DISABLE: return NULL;
+	case OBS_DEINTERLACE_MODE_DISCARD:
+		return obs_load_effect(&obs->video.deinterlace_discard_effect,
+				"deinterlace_discard.effect");
+	case OBS_DEINTERLACE_MODE_RETRO:
+		return obs_load_effect(&obs->video.deinterlace_discard_2x_effect,
+				"deinterlace_discard_2x.effect");
+	case OBS_DEINTERLACE_MODE_BLEND:
+		return obs_load_effect(&obs->video.deinterlace_blend_effect,
+				"deinterlace_blend.effect");
+	case OBS_DEINTERLACE_MODE_BLEND_2X:
+		return obs_load_effect(&obs->video.deinterlace_blend_2x_effect,
+				"deinterlace_blend_2x.effect");
+	case OBS_DEINTERLACE_MODE_LINEAR:
+		return obs_load_effect(&obs->video.deinterlace_linear_effect,
+				"deinterlace_linear.effect");
+	case OBS_DEINTERLACE_MODE_LINEAR_2X:
+		return obs_load_effect(&obs->video.deinterlace_linear_2x_effect,
+				"deinterlace_linear_2x.effect");
+	case OBS_DEINTERLACE_MODE_YADIF:
+		return obs_load_effect(&obs->video.deinterlace_yadif_effect,
+				"deinterlace_yadif.effect");
+	case OBS_DEINTERLACE_MODE_YADIF_2X:
+		return obs_load_effect(&obs->video.deinterlace_yadif_2x_effect,
+				"deinterlace_yadif_2x.effect");
+	}
+
+	return NULL;
+}
+
+#define TWOX_TOLERANCE 1000000
+
+void deinterlace_render(obs_source_t *s)
+{
+	gs_effect_t *effect = s->deinterlace_effect;
+
+	uint64_t frame2_ts;
+	gs_eparam_t *image = gs_effect_get_param_by_name(effect, "image");
+	gs_eparam_t *prev = gs_effect_get_param_by_name(effect,
+			"previous_image");
+	gs_eparam_t *field = gs_effect_get_param_by_name(effect, "field_order");
+	gs_eparam_t *frame2 = gs_effect_get_param_by_name(effect, "frame2");
+	gs_eparam_t *dimensions = gs_effect_get_param_by_name(effect,
+			"dimensions");
+	struct vec2 size = {(float)s->async_width, (float)s->async_height};
+	bool yuv = format_is_yuv(s->async_format);
+	bool limited_range = yuv && !s->async_full_range;
+	const char *tech = yuv ? "DrawMatrix" : "Draw";
+
+	gs_texture_t *cur_tex = s->async_texrender ?
+		gs_texrender_get_texture(s->async_texrender) :
+		s->async_texture;
+	gs_texture_t *prev_tex = s->async_prev_texrender ?
+		gs_texrender_get_texture(s->async_prev_texrender) :
+		s->async_prev_texture;
+
+	if (!cur_tex || !prev_tex || !s->async_width || !s->async_height)
+		return;
+
+	gs_effect_set_texture(image, cur_tex);
+	gs_effect_set_texture(prev, prev_tex);
+	gs_effect_set_int(field, s->deinterlace_top_first);
+	gs_effect_set_vec2(dimensions, &size);
+
+	if (yuv) {
+		gs_eparam_t *color_matrix = gs_effect_get_param_by_name(
+				effect, "color_matrix");
+		gs_effect_set_val(color_matrix, s->async_color_matrix,
+				sizeof(float) * 16);
+	}
+	if (limited_range) {
+		const size_t size = sizeof(float) * 3;
+		gs_eparam_t *color_range_min = gs_effect_get_param_by_name(
+				effect, "color_range_min");
+		gs_eparam_t *color_range_max = gs_effect_get_param_by_name(
+				effect, "color_range_max");
+		gs_effect_set_val(color_range_min, s->async_color_range_min,
+				size);
+		gs_effect_set_val(color_range_max, s->async_color_range_max,
+				size);
+	}
+
+	frame2_ts = s->deinterlace_frame_ts + s->deinterlace_offset +
+		s->deinterlace_half_duration - TWOX_TOLERANCE;
+
+	gs_effect_set_bool(frame2, obs->video.video_time >= frame2_ts);
+
+	while (gs_effect_loop(effect, tech))
+		gs_draw_sprite(NULL, s->async_flip ? GS_FLIP_V : 0,
+				s->async_width, s->async_height);
+}
+
+static void enable_deinterlacing(obs_source_t *source,
+		enum obs_deinterlace_mode mode)
+{
+	obs_enter_graphics();
+
+	if (source->async_format != VIDEO_FORMAT_NONE &&
+	    source->async_width != 0 &&
+	    source->async_height != 0)
+		set_deinterlace_texture_size(source);
+
+	source->deinterlace_mode = mode;
+	source->deinterlace_effect = get_effect(mode);
+
+	pthread_mutex_lock(&source->async_mutex);
+	if (source->prev_async_frame) {
+		remove_async_frame(source, source->prev_async_frame);
+		source->prev_async_frame = NULL;
+	}
+	pthread_mutex_unlock(&source->async_mutex);
+
+	obs_leave_graphics();
+}
+
+static void disable_deinterlacing(obs_source_t *source)
+{
+	obs_enter_graphics();
+	gs_texture_destroy(source->async_prev_texture);
+	gs_texrender_destroy(source->async_prev_texrender);
+	source->deinterlace_mode = OBS_DEINTERLACE_MODE_DISABLE;
+	source->async_prev_texture = NULL;
+	source->async_prev_texrender = NULL;
+	obs_leave_graphics();
+}
+
+void obs_source_set_deinterlace_mode(obs_source_t *source,
+		enum obs_deinterlace_mode mode)
+{
+	if (!obs_source_valid(source, "obs_source_set_deinterlace_mode"))
+		return;
+	if (source->deinterlace_mode == mode)
+		return;
+
+	if (source->deinterlace_mode == OBS_DEINTERLACE_MODE_DISABLE) {
+		enable_deinterlacing(source, mode);
+	} else if (mode == OBS_DEINTERLACE_MODE_DISABLE) {
+		disable_deinterlacing(source);
+	} else {
+		obs_enter_graphics();
+		source->deinterlace_mode = mode;
+		source->deinterlace_effect = get_effect(mode);
+		obs_leave_graphics();
+	}
+}
+
+enum obs_deinterlace_mode obs_source_get_deinterlace_mode(
+		const obs_source_t *source)
+{
+	return obs_source_valid(source, "obs_source_set_deinterlace_mode") ?
+		source->deinterlace_mode : OBS_DEINTERLACE_MODE_DISABLE;
+}
+
+void obs_source_set_deinterlace_field_order(obs_source_t *source,
+		enum obs_deinterlace_field_order field_order)
+{
+	if (!obs_source_valid(source, "obs_source_set_deinterlace_field_order"))
+		return;
+
+	source->deinterlace_top_first =
+		field_order == OBS_DEINTERLACE_FIELD_ORDER_TOP;
+}
+
+enum obs_deinterlace_field_order obs_source_get_deinterlace_field_order(
+		const obs_source_t *source)
+{
+	if (!obs_source_valid(source, "obs_source_set_deinterlace_field_order"))
+		return OBS_DEINTERLACE_FIELD_ORDER_TOP;
+
+	return source->deinterlace_top_first
+		? OBS_DEINTERLACE_FIELD_ORDER_TOP
+		: OBS_DEINTERLACE_FIELD_ORDER_BOTTOM;
+}

libobs/obs-source-transition.c

@@ -824,7 +824,8 @@ bool obs_transition_audio_render(obs_source_t *transition,
 		if (min_ts)
 			copy_transition_state(transition, &state);
 
-	} else if (transition->transitioning_audio) {
+	} else if (!transition->transitioning_video &&
+	           transition->transitioning_audio) {
 		stopped = stop_audio(transition);
 	}
 

libobs/obs-source.c

@@ -34,6 +34,11 @@ static inline bool data_valid(const struct obs_source *source, const char *f)
 	return obs_source_valid(source, f) && source->context.data;
 }
 
+static inline bool deinterlacing_enabled(const struct obs_source *source)
+{
+	return source->deinterlace_mode != OBS_DEINTERLACE_MODE_DISABLE;
+}
+
 const struct obs_source_info *get_source_info(const char *id)
 {
 	for (size_t i = 0; i < obs->source_types.num; i++) {
@@ -79,8 +84,8 @@ bool obs_source_init_context(struct obs_source *source,
 		obs_data_t *settings, const char *name, obs_data_t *hotkey_data,
 		bool private)
 {
-	if (!obs_context_data_init(&source->context, settings, name,
+	if (!obs_context_data_init(&source->context, OBS_OBJ_TYPE_SOURCE,
-				hotkey_data, private))
+				settings, name, hotkey_data, private))
 		return false;
 
 	return signal_handler_add_array(source->context.signals,
@@ -109,6 +114,12 @@ static void allocate_audio_output_buffer(struct obs_source *source)
 	}
 }
 
+static inline bool is_async_video_source(const struct obs_source *source)
+{
+	return (source->info.output_flags & OBS_SOURCE_ASYNC_VIDEO) ==
+		OBS_SOURCE_ASYNC_VIDEO;
+}
+
 static inline bool is_audio_source(const struct obs_source *source)
 {
 	return source->info.output_flags & OBS_SOURCE_AUDIO;
@@ -119,6 +130,8 @@ static inline bool is_composite_source(const struct obs_source *source)
 	return source->info.output_flags & OBS_SOURCE_COMPOSITE;
 }
 
+extern char *find_libobs_data_file(const char *file);
+
 /* internal initialization */
 bool obs_source_init(struct obs_source *source)
 {
@@ -153,6 +166,16 @@ bool obs_source_init(struct obs_source *source)
 	if (is_audio_source(source) || is_composite_source(source))
 		allocate_audio_output_buffer(source);
 
+	if (source->info.type == OBS_SOURCE_TYPE_TRANSITION) {
+		if (!obs_transition_init(source))
+			return false;
+	}
+
+	source->control = bzalloc(sizeof(obs_weak_source_t));
+	source->deinterlace_top_first = true;
+	source->control->source = source;
+	source->audio_mixers = 0xF;
+
 	if (is_audio_source(source)) {
 		pthread_mutex_lock(&obs->data.audio_sources_mutex);
 
@@ -167,15 +190,6 @@ bool obs_source_init(struct obs_source *source)
 		pthread_mutex_unlock(&obs->data.audio_sources_mutex);
 	}
 
-	if (source->info.type == OBS_SOURCE_TYPE_TRANSITION) {
-		if (!obs_transition_init(source))
-			return false;
-	}
-
-	source->control = bzalloc(sizeof(obs_weak_source_t));
-	source->control->source = source;
-	source->audio_mixers = 0xF;
-
 	obs_context_data_insert(&source->context,
 			&obs->data.sources_mutex,
 			&obs->data.first_source);
@@ -290,6 +304,13 @@ static obs_source_t *obs_source_create_internal(const char *id,
 		source->owns_info_id = true;
 	} else {
 		source->info = *info;
+
+		/* Always mark filters as private so they aren't found by
+		 * source enum/search functions.
+		 *
+		 * XXX: Fix design flaws with filters */
+		if (info->type == OBS_SOURCE_TYPE_FILTER)
+			private = true;
 	}
 
 	source->mute_unmute_key  = OBS_INVALID_HOTKEY_PAIR_ID;
@@ -481,10 +502,14 @@ void obs_source_destroy(struct obs_source *source)
 		obs_source_frame_decref(source->async_cache.array[i].frame);
 
 	gs_enter_context(obs->video.graphics);
-	if (source->async_convert_texrender)
+	if (source->async_texrender)
-		gs_texrender_destroy(source->async_convert_texrender);
+		gs_texrender_destroy(source->async_texrender);
+	if (source->async_prev_texrender)
+		gs_texrender_destroy(source->async_prev_texrender);
 	if (source->async_texture)
 		gs_texture_destroy(source->async_texture);
+	if (source->async_prev_texture)
+		gs_texture_destroy(source->async_prev_texture);
 	if (source->filter_texrender)
 		gs_texrender_destroy(source->filter_texrender);
 	gs_leave_context();
@@ -888,8 +913,6 @@ void obs_source_deactivate(obs_source_t *source, enum view_type type)
 
 static inline struct obs_source_frame *get_closest_frame(obs_source_t *source,
 		uint64_t sys_time);
-static void remove_async_frame(obs_source_t *source,
-		struct obs_source_frame *frame);
 
 void obs_source_video_tick(obs_source_t *source, float seconds)
 {
@@ -905,12 +928,20 @@ void obs_source_video_tick(obs_source_t *source, float seconds)
 		uint64_t sys_time = obs->video.video_time;
 
 		pthread_mutex_lock(&source->async_mutex);
+
+		if (deinterlacing_enabled(source)) {
+			deinterlace_process_last_frame(source, sys_time);
+		} else {
 			if (source->cur_async_frame) {
-			remove_async_frame(source, source->cur_async_frame);
+				remove_async_frame(source,
+						source->cur_async_frame);
 				source->cur_async_frame = NULL;
 			}
 
-		source->cur_async_frame = get_closest_frame(source, sys_time);
+			source->cur_async_frame = get_closest_frame(source,
+					sys_time);
+		}
+
 		source->last_sys_timestamp = sys_time;
 		pthread_mutex_unlock(&source->async_mutex);
 	}
@@ -950,6 +981,7 @@ void obs_source_video_tick(obs_source_t *source, float seconds)
 		source->info.video_tick(source->context.data, seconds);
 
 	source->async_rendered = false;
+	source->deinterlace_rendered = false;
 }
 
 /* unless the value is 3+ hours worth of frames, this won't overflow */
@@ -965,8 +997,6 @@ static inline size_t conv_time_to_frames(const size_t sample_rate,
 	return (size_t)(duration * (uint64_t)sample_rate / 1000000000ULL);
 }
 
-/* maximum timestamp variance in nanoseconds */
-#define MAX_TS_VAR          2000000000ULL
 /* maximum buffer size */
 #define MAX_BUF_SIZE        (1000 * AUDIO_OUTPUT_FRAMES * sizeof(float))
 
@@ -1210,6 +1240,7 @@ static inline enum convert_type get_convert_type(enum video_format format)
 	case VIDEO_FORMAT_UYVY:
 		return CONVERT_422_U;
 
+	case VIDEO_FORMAT_Y800:
 	case VIDEO_FORMAT_I444:
 	case VIDEO_FORMAT_NONE:
 	case VIDEO_FORMAT_RGBA:
@@ -1280,18 +1311,7 @@ static inline bool init_gpu_conversion(struct obs_source *source,
 	return false;
 }
 
-static inline enum gs_color_format convert_video_format(
+bool set_async_texture_size(struct obs_source *source,
-		enum video_format format)
-{
-	if (format == VIDEO_FORMAT_RGBA)
-		return GS_RGBA;
-	else if (format == VIDEO_FORMAT_BGRA)
-		return GS_BGRA;
-
-	return GS_BGRX;
-}
-
-static inline bool set_async_texture_size(struct obs_source *source,
 		const struct obs_source_frame *frame)
 {
 	enum convert_type cur = get_convert_type(frame->format);
@@ -1306,13 +1326,18 @@ static inline bool set_async_texture_size(struct obs_source *source,
 	source->async_format = frame->format;
 
 	gs_texture_destroy(source->async_texture);
-	gs_texrender_destroy(source->async_convert_texrender);
+	gs_texture_destroy(source->async_prev_texture);
-	source->async_convert_texrender = NULL;
+	gs_texrender_destroy(source->async_texrender);
+	gs_texrender_destroy(source->async_prev_texrender);
+	source->async_texture = NULL;
+	source->async_prev_texture = NULL;
+	source->async_texrender = NULL;
+	source->async_prev_texrender = NULL;
 
 	if (cur != CONVERT_NONE && init_gpu_conversion(source, frame)) {
 		source->async_gpu_conversion = true;
 
-		source->async_convert_texrender =
+		source->async_texrender =
 			gs_texrender_create(GS_BGRX, GS_ZS_NONE);
 
 		source->async_texture = gs_texture_create(
@@ -1331,6 +1356,9 @@ static inline bool set_async_texture_size(struct obs_source *source,
 				format, 1, NULL, GS_DYNAMIC);
 	}
 
+	if (deinterlacing_enabled(source))
+		set_deinterlace_texture_size(source);
+
 	return !!source->async_texture;
 }
 
@@ -1379,6 +1407,7 @@ static const char *select_conversion_technique(enum video_format format)
 			return "NV12_Reverse";
 			break;
 
+		case VIDEO_FORMAT_Y800:
 		case VIDEO_FORMAT_BGRA:
 		case VIDEO_FORMAT_BGRX:
 		case VIDEO_FORMAT_RGBA:
@@ -1397,11 +1426,9 @@ static inline void set_eparam(gs_effect_t *effect, const char *name, float val)
 }
 
 static bool update_async_texrender(struct obs_source *source,
-		const struct obs_source_frame *frame)
+		const struct obs_source_frame *frame,
+		gs_texture_t *tex, gs_texrender_t *texrender)
 {
-	gs_texture_t   *tex       = source->async_texture;
-	gs_texrender_t *texrender = source->async_convert_texrender;
-
 	gs_texrender_reset(texrender);
 
 	upload_raw_frame(tex, frame);
@@ -1454,11 +1481,10 @@ static bool update_async_texrender(struct obs_source *source,
 	return true;
 }
 
-static bool update_async_texture(struct obs_source *source,
+bool update_async_texture(struct obs_source *source,
-		const struct obs_source_frame *frame)
+		const struct obs_source_frame *frame,
+		gs_texture_t *tex, gs_texrender_t *texrender)
 {
-	gs_texture_t      *tex       = source->async_texture;
-	gs_texrender_t    *texrender = source->async_convert_texrender;
 	enum convert_type type      = get_convert_type(frame->format);
 	uint8_t           *ptr;
 	uint32_t          linesize;
@@ -1473,7 +1499,7 @@ static bool update_async_texture(struct obs_source *source,
 			sizeof frame->color_range_max);
 
 	if (source->async_gpu_conversion && texrender)
-		return update_async_texrender(source, frame);
+		return update_async_texrender(source, frame, tex, texrender);
 
 	if (type == CONVERT_NONE) {
 		gs_texture_set_image(tex, frame->data[0], frame->linesize[0],
@@ -1513,8 +1539,8 @@ static inline void obs_source_draw_texture(struct obs_source *source,
 	gs_texture_t *tex = source->async_texture;
 	gs_eparam_t  *param;
 
-	if (source->async_convert_texrender)
+	if (source->async_texrender)
-		tex = gs_texrender_get_texture(source->async_convert_texrender);
+		tex = gs_texrender_get_texture(source->async_texrender);
 
 	if (color_range_min) {
 		size_t const size = sizeof(float) * 3;
@@ -1566,9 +1592,6 @@ static void obs_source_draw_async_texture(struct obs_source *source)
 	}
 }
 
-static inline struct obs_source_frame *filter_async_video(obs_source_t *source,
-		struct obs_source_frame *in);
-
 static void obs_source_update_async_video(obs_source_t *source)
 {
 	if (!source->async_rendered) {
@@ -1583,15 +1606,16 @@ static void obs_source_update_async_video(obs_source_t *source)
 				os_gettime_ns() - frame->timestamp;
 			source->timing_set = true;
 
-			if (!set_async_texture_size(source, frame))
+			if (set_async_texture_size(source, frame)) {
-				return;
+				update_async_texture(source, frame,
-			if (!update_async_texture(source, frame))
+						source->async_texture,
-				return;
+						source->async_texrender);
 			}
 
 			obs_source_release_frame(source, frame);
 		}
 	}
+}
 
 static inline void obs_source_render_async_video(obs_source_t *source)
 {
@@ -1606,11 +1630,10 @@ static inline void obs_source_render_filters(obs_source_t *source)
 	source->rendering_filter = false;
 }
 
-static void obs_source_default_render(obs_source_t *source, bool color_matrix)
+static void obs_source_default_render(obs_source_t *source)
 {
 	gs_effect_t    *effect     = obs->video.default_effect;
-	const char     *tech_name = color_matrix ? "DrawMatrix" : "Draw";
+	gs_technique_t *tech       = gs_effect_get_technique(effect, "Draw");
-	gs_technique_t *tech       = gs_effect_get_technique(effect, tech_name);
 	size_t         passes, i;
 
 	passes = gs_technique_begin(tech);
@@ -1626,14 +1649,13 @@ static void obs_source_default_render(obs_source_t *source, bool color_matrix)
 static inline void obs_source_main_render(obs_source_t *source)
 {
 	uint32_t flags      = source->info.output_flags;
-	bool color_matrix   = (flags & OBS_SOURCE_COLOR_MATRIX) != 0;
 	bool custom_draw    = (flags & OBS_SOURCE_CUSTOM_DRAW) != 0;
 	bool default_effect = !source->filter_parent &&
 	                      source->filters.num == 0 &&
 	                      !custom_draw;
 
 	if (default_effect)
-		obs_source_default_render(source, color_matrix);
+		obs_source_default_render(source);
 	else if (source->context.data)
 		source->info.video_render(source->context.data,
 				custom_draw ? NULL : gs_get_effect());
@@ -1649,8 +1671,11 @@ static inline void render_video(obs_source_t *source)
 
 	if (source->info.type == OBS_SOURCE_TYPE_INPUT &&
 	    (source->info.output_flags & OBS_SOURCE_ASYNC) != 0 &&
-	    !source->rendering_filter)
+	    !source->rendering_filter) {
+		if (deinterlacing_enabled(source))
+			deinterlace_update_async_video(source);
 		obs_source_update_async_video(source);
+	}
 
 	if (!source->context.data || !source->enabled) {
 		if (source->filter_parent)
@@ -1667,6 +1692,9 @@ static inline void render_video(obs_source_t *source)
 	else if (source->filter_target)
 		obs_source_video_render(source->filter_target);
 
+	else if (deinterlacing_enabled(source))
+		deinterlace_render(source);
+
 	else
 		obs_source_render_async_video(source);
 }
@@ -1827,6 +1855,12 @@ void obs_source_filter_add(obs_source_t *source, obs_source_t *filter)
 	calldata_set_ptr(&cd, "filter", filter);
 
 	signal_handler_signal(source->context.signals, "filter_add", &cd);
+
+	if (source && filter)
+		blog(source->context.private ? LOG_DEBUG : LOG_INFO,
+				"- filter '%s' (%s) added to source '%s'",
+				filter->context.name, filter->info.id,
+				source->context.name);
 }
 
 static bool obs_source_filter_remove_refless(obs_source_t *source,
@@ -1859,6 +1893,12 @@ static bool obs_source_filter_remove_refless(obs_source_t *source,
 
 	signal_handler_signal(source->context.signals, "filter_remove", &cd);
 
+	if (source && filter)
+		blog(source->context.private ? LOG_DEBUG : LOG_INFO,
+				"- filter '%s' (%s) removed from source '%s'",
+				filter->context.name, filter->info.id,
+				source->context.name);
+
 	if (filter->info.filter_remove)
 		filter->info.filter_remove(filter->context.data,
 				filter->filter_parent);
@@ -1988,7 +2028,7 @@ obs_data_t *obs_source_get_settings(const obs_source_t *source)
 	return source->context.settings;
 }
 
-static inline struct obs_source_frame *filter_async_video(obs_source_t *source,
+struct obs_source_frame *filter_async_video(obs_source_t *source,
 		struct obs_source_frame *in)
 {
 	size_t i;
@@ -2071,6 +2111,7 @@ static void copy_frame_data(struct obs_source_frame *dst,
 	case VIDEO_FORMAT_YVYU:
 	case VIDEO_FORMAT_YUY2:
 	case VIDEO_FORMAT_UYVY:
+	case VIDEO_FORMAT_Y800:
 	case VIDEO_FORMAT_NONE:
 	case VIDEO_FORMAT_RGBA:
 	case VIDEO_FORMAT_BGRA:
@@ -2099,6 +2140,7 @@ static inline void free_async_cache(struct obs_source *source)
 	da_resize(source->async_cache, 0);
 	da_resize(source->async_frames, 0);
 	source->cur_async_frame = NULL;
+	source->prev_async_frame = NULL;
 }
 
 #define MAX_UNUSED_FRAME_DURATION 5
@@ -2375,17 +2417,11 @@ void obs_source_output_audio(obs_source_t *source,
 	pthread_mutex_unlock(&source->filter_mutex);
 }
 
-static inline bool frame_out_of_bounds(const obs_source_t *source, uint64_t ts)
+void remove_async_frame(obs_source_t *source, struct obs_source_frame *frame)
 {
-	if (ts < source->last_frame_ts)
+	if (frame)
-		return ((source->last_frame_ts - ts) > MAX_TS_VAR);
+		frame->prev_frame = false;
-	else
-		return ((ts - source->last_frame_ts) > MAX_TS_VAR);
-}
 
-static void remove_async_frame(obs_source_t *source,
-		struct obs_source_frame *frame)
-{
 	for (size_t i = 0; i < source->async_cache.num; i++) {
 		struct async_frame *f = &source->async_cache.array[i];
 
@@ -2594,9 +2630,8 @@ const char *obs_source_get_id(const obs_source_t *source)
 }
 
 static inline void render_filter_bypass(obs_source_t *target,
-		gs_effect_t *effect, bool use_matrix)
+		gs_effect_t *effect, const char *tech_name)
 {
-	const char  *tech_name = use_matrix ? "DrawMatrix" : "Draw";
 	gs_technique_t *tech    = gs_effect_get_technique(effect, tech_name);
 	size_t      passes, i;
 
@@ -2610,9 +2645,8 @@ static inline void render_filter_bypass(obs_source_t *target,
 }
 
 static inline void render_filter_tex(gs_texture_t *tex, gs_effect_t *effect,
-		uint32_t width, uint32_t height, bool use_matrix)
+		uint32_t width, uint32_t height, const char *tech_name)
 {
-	const char  *tech_name = use_matrix ? "DrawMatrix" : "Draw";
 	gs_technique_t *tech    = gs_effect_get_technique(effect, tech_name);
 	gs_eparam_t    *image   = gs_effect_get_param_by_name(effect, "image");
 	size_t      passes, i;
@@ -2638,25 +2672,35 @@ static inline bool can_bypass(obs_source_t *target, obs_source_t *parent,
 		((parent_flags & OBS_SOURCE_ASYNC) == 0);
 }
 
-void obs_source_process_filter_begin(obs_source_t *filter,
+bool obs_source_process_filter_begin(obs_source_t *filter,
 		enum gs_color_format format,
 		enum obs_allow_direct_render allow_direct)
 {
 	obs_source_t *target, *parent;
 	uint32_t     target_flags, parent_flags;
 	int          cx, cy;
-	bool         use_matrix;
 
 	if (!obs_ptr_valid(filter, "obs_source_process_filter_begin"))
-		return;
+		return false;
 
 	target       = obs_filter_get_target(filter);
 	parent       = obs_filter_get_parent(filter);
+
+	if (!target) {
+		blog(LOG_INFO, "filter '%s' being processed with no target!",
+				filter->context.name);
+		return false;
+	}
+	if (!parent) {
+		blog(LOG_INFO, "filter '%s' being processed with no parent!",
+				filter->context.name);
+		return false;
+	}
+
 	target_flags = target->info.output_flags;
 	parent_flags = parent->info.output_flags;
 	cx           = get_base_width(target);
 	cy           = get_base_height(target);
-	use_matrix   = !!(target_flags & OBS_SOURCE_COLOR_MATRIX);
 
 	filter->allow_direct = allow_direct;
 
@@ -2665,12 +2709,12 @@ void obs_source_process_filter_begin(obs_source_t *filter,
 	 * using the filter effect instead of rendering to texture to reduce
 	 * the total number of passes */
 	if (can_bypass(target, parent, parent_flags, allow_direct)) {
-		return;
+		return true;
 	}
 
 	if (!cx || !cy) {
 		obs_source_skip_video_filter(filter);
-		return;
+		return false;
 	}
 
 	if (!filter->filter_texrender)
@@ -2690,7 +2734,7 @@ void obs_source_process_filter_begin(obs_source_t *filter,
 		gs_ortho(0.0f, (float)cx, 0.0f, (float)cy, -100.0f, 100.0f);
 
 		if (target == parent && !custom_draw && !async)
-			obs_source_default_render(target, use_matrix);
+			obs_source_default_render(target);
 		else
 			obs_source_video_render(target);
 
@@ -2698,15 +2742,44 @@ void obs_source_process_filter_begin(obs_source_t *filter,
 	}
 
 	gs_blend_state_pop();
+	return true;
 }
 
+void obs_source_process_filter_tech_end(obs_source_t *filter, gs_effect_t *effect,
+		uint32_t width, uint32_t height, const char *tech_name)
+{
+	obs_source_t *target, *parent;
+	gs_texture_t *texture;
+	uint32_t     target_flags, parent_flags;
+
+	if (!filter) return;
+
+	target       = obs_filter_get_target(filter);
+	parent       = obs_filter_get_parent(filter);
+
+	if (!target || !parent)
+		return;
+
+	target_flags = target->info.output_flags;
+	parent_flags = parent->info.output_flags;
+
+	const char *tech = tech_name ? tech_name : "Draw";
+
+	if (can_bypass(target, parent, parent_flags, filter->allow_direct)) {
+		render_filter_bypass(target, effect, tech);
+	} else {
+		texture = gs_texrender_get_texture(filter->filter_texrender);
+		render_filter_tex(texture, effect, width, height, tech);
+	}
+}
+
+
 void obs_source_process_filter_end(obs_source_t *filter, gs_effect_t *effect,
 		uint32_t width, uint32_t height)
 {
 	obs_source_t *target, *parent;
 	gs_texture_t *texture;
 	uint32_t     target_flags, parent_flags;
-	bool         use_matrix;
 
 	if (!obs_ptr_valid(filter, "obs_source_process_filter_end"))
 		return;
@@ -2715,15 +2788,14 @@ void obs_source_process_filter_end(obs_source_t *filter, gs_effect_t *effect,
 	parent       = obs_filter_get_parent(filter);
 	target_flags = target->info.output_flags;
 	parent_flags = parent->info.output_flags;
-	use_matrix   = !!(target_flags & OBS_SOURCE_COLOR_MATRIX);
 
 	if (can_bypass(target, parent, parent_flags, filter->allow_direct)) {
-		render_filter_bypass(target, effect, use_matrix);
+		render_filter_bypass(target, effect, "Draw");
 	} else {
 		texture = gs_texrender_get_texture(filter->filter_texrender);
 		if (texture)
 			render_filter_tex(texture, effect, width, height,
-					use_matrix);
+					"Draw");
 	}
 }
 
@@ -2732,7 +2804,6 @@ void obs_source_skip_video_filter(obs_source_t *filter)
 	obs_source_t *target, *parent;
 	bool custom_draw, async;
 	uint32_t parent_flags;
-	bool use_matrix;
 
 	if (!obs_ptr_valid(filter, "obs_source_skip_video_filter"))
 		return;
@@ -2742,13 +2813,14 @@ void obs_source_skip_video_filter(obs_source_t *filter)
 	parent_flags = parent->info.output_flags;
 	custom_draw = (parent_flags & OBS_SOURCE_CUSTOM_DRAW) != 0;
 	async = (parent_flags & OBS_SOURCE_ASYNC) != 0;
-	use_matrix = !!(parent_flags & OBS_SOURCE_COLOR_MATRIX);
 
 	if (target == parent) {
 		if (!custom_draw && !async)
-			obs_source_default_render(target, use_matrix);
+			obs_source_default_render(target);
 		else if (target->info.video_render)
 			obs_source_main_render(target);
+		else if (deinterlacing_enabled(target))
+			deinterlace_render(target);
 		else
 			obs_source_render_async_video(target);
 
@@ -3622,7 +3694,7 @@ static inline void process_audio_source_tick(obs_source_t *source,
 void obs_source_audio_render(obs_source_t *source, uint32_t mixers,
 		size_t channels, size_t sample_rate, size_t size)
 {
-	if (!source || !source->audio_output_buf[0][0]) {
+	if (!source->audio_output_buf[0][0]) {
 		source->audio_pending = true;
 		return;
 	}

libobs/obs-source.h

@@ -87,15 +87,6 @@ enum obs_source_type {
  */
 #define OBS_SOURCE_CUSTOM_DRAW  (1<<3)
 
-/**
- * Source uses a color matrix (usually YUV sources).
- *
- * When this is used, the video_render callback will automatically assign a
- * 4x4 YUV->RGB matrix to the "color_matrix" parameter of the effect, or it can
- * be changed to a custom value.
- */
-#define OBS_SOURCE_COLOR_MATRIX (1<<4)
-
 /**
  * Source supports interaction.
  *

libobs/obs-windows.c

@@ -384,8 +384,8 @@ static bool vk_down(DWORD vk)
 {
 	short state = GetAsyncKeyState(vk);
 	bool down = (state & 0x8000) != 0;
-	bool was_down = (state & 0x1) != 0;
+
-	return down || was_down;
+	return down;
 }
 
 bool obs_hotkeys_platform_is_pressed(obs_hotkeys_platform_t *context,

libobs/obs.c

@@ -215,6 +215,17 @@ static bool obs_init_textures(struct obs_video_info *ovi)
 	return true;
 }
 
+gs_effect_t *obs_load_effect(gs_effect_t **effect, const char *file)
+{
+	if (!*effect) {
+		char *filename = find_libobs_data_file(file);
+		*effect = gs_effect_create_from_file(filename, NULL);
+		bfree(filename);
+	}
+
+	return *effect;
+}
+
 static int obs_init_graphics(struct obs_video_info *ovi)
 {
 	struct obs_core_video *video = &obs->video;
@@ -280,6 +291,11 @@ static int obs_init_graphics(struct obs_video_info *ovi)
 			NULL);
 	bfree(filename);
 
+	filename = find_libobs_data_file("premultiplied_alpha.effect");
+	video->premultiplied_alpha_effect = gs_effect_create_from_file(filename,
+			NULL);
+	bfree(filename);
+
 	obs->video.transparent_texture = gs_texture_create(2, 2, GS_RGBA, 1,
 			&transparent_tex, 0);
 
@@ -295,6 +311,8 @@ static int obs_init_graphics(struct obs_video_info *ovi)
 		success = false;
 	if (!video->conversion_effect)
 		success = false;
+	if (!video->premultiplied_alpha_effect)
+		success = false;
 	if (!video->transparent_texture)
 		success = false;
 
@@ -1340,6 +1358,8 @@ gs_effect_t *obs_get_base_effect(enum obs_base_effect effect)
 		return obs->video.lanczos_effect;
 	case OBS_EFFECT_BILINEAR_LOWRES:
 		return obs->video.bilinear_lowres_effect;
+	case OBS_EFFECT_PREMULTIPLIED_ALPHA:
+		return obs->video.premultiplied_alpha_effect;
 	}
 
 	return NULL;
@@ -1401,6 +1421,8 @@ static obs_source_t *obs_load_source_type(obs_data_t *source_data)
 	int64_t      sync;
 	uint32_t     flags;
 	uint32_t     mixers;
+	int          di_order;
+	int          di_mode;
 
 	source = obs_source_create(id, name, settings, hotkeys);
 
@@ -1444,6 +1466,14 @@ static obs_source_t *obs_load_source_type(obs_data_t *source_data)
 	obs_source_set_push_to_talk_delay(source,
 			obs_data_get_int(source_data, "push-to-talk-delay"));
 
+	di_mode = (int)obs_data_get_int(source_data, "deinterlace_mode");
+	obs_source_set_deinterlace_mode(source,
+			(enum obs_deinterlace_mode)di_mode);
+
+	di_order = (int)obs_data_get_int(source_data, "deinterlace_field_order");
+	obs_source_set_deinterlace_field_order(source,
+			(enum obs_deinterlace_field_order)di_order);
+
 	if (filters) {
 		size_t count = obs_data_array_count(filters);
 
@@ -1474,7 +1504,8 @@ obs_source_t *obs_load_source(obs_data_t *source_data)
 	return obs_load_source_type(source_data);
 }
 
-void obs_load_sources(obs_data_array_t *array)
+void obs_load_sources(obs_data_array_t *array, obs_load_source_cb cb,
+		void *private_data)
 {
 	if (!obs) return;
 
@@ -1507,6 +1538,7 @@ void obs_load_sources(obs_data_array_t *array)
 			if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
 				obs_transition_load(source, source_data);
 			obs_source_load(source);
+			cb(private_data, source);
 		}
 		obs_data_release(source_data);
 	}
@@ -1538,6 +1570,9 @@ obs_data_t *obs_save_source(obs_source_t *source)
 	uint64_t   ptm_delay   = obs_source_get_push_to_mute_delay(source);
 	bool       push_to_talk= obs_source_push_to_talk_enabled(source);
 	uint64_t   ptt_delay   = obs_source_get_push_to_talk_delay(source);
+	int        di_mode     = (int)obs_source_get_deinterlace_mode(source);
+	int        di_order    =
+		(int)obs_source_get_deinterlace_field_order(source);
 
 	obs_source_save(source);
 	hotkeys = obs_hotkeys_save_source(source);
@@ -1562,6 +1597,8 @@ obs_data_t *obs_save_source(obs_source_t *source)
 	obs_data_set_bool  (source_data, "push-to-talk", push_to_talk);
 	obs_data_set_int   (source_data, "push-to-talk-delay", ptt_delay);
 	obs_data_set_obj   (source_data, "hotkeys",  hotkey_data);
+	obs_data_set_int   (source_data, "deinterlace_mode", di_mode);
+	obs_data_set_int   (source_data, "deinterlace_field_order", di_order);
 
 	if (source->info.type == OBS_SOURCE_TYPE_TRANSITION)
 		obs_transition_save(source, source_data);
@@ -1650,6 +1687,7 @@ static inline char *dup_name(const char *name, bool private)
 
 static inline bool obs_context_data_init_wrap(
 		struct obs_context_data *context,
+		enum obs_obj_type       type,
 		obs_data_t              *settings,
 		const char              *name,
 		obs_data_t              *hotkey_data,
@@ -1658,6 +1696,7 @@ static inline bool obs_context_data_init_wrap(
 	assert(context);
 	memset(context, 0, sizeof(*context));
 	context->private = private;
+	context->type = type;
 
 	pthread_mutex_init_value(&context->rename_cache_mutex);
 	if (pthread_mutex_init(&context->rename_cache_mutex, NULL) < 0)
@@ -1679,13 +1718,14 @@ static inline bool obs_context_data_init_wrap(
 
 bool obs_context_data_init(
 		struct obs_context_data *context,
+		enum obs_obj_type       type,
 		obs_data_t              *settings,
 		const char              *name,
 		obs_data_t              *hotkey_data,
 		bool                    private)
 {
-	if (obs_context_data_init_wrap(context, settings, name, hotkey_data,
+	if (obs_context_data_init_wrap(context, type, settings, name,
-				private)) {
+				hotkey_data, private)) {
 		return true;
 	} else {
 		obs_context_data_free(context);
@@ -1768,3 +1808,35 @@ uint64_t obs_get_video_frame_time(void)
 {
 	return obs ? obs->video.video_time : 0;
 }
+
+enum obs_obj_type obs_obj_get_type(void *obj)
+{
+	struct obs_context_data *context = obj;
+	return context ? context->type : OBS_OBJ_TYPE_INVALID;
+}
+
+const char *obs_obj_get_id(void *obj)
+{
+	struct obs_context_data *context = obj;
+	if (!context)
+		return NULL;
+
+	switch (context->type) {
+	case OBS_OBJ_TYPE_SOURCE:  return ((obs_source_t*)obj)->info.id;
+	case OBS_OBJ_TYPE_OUTPUT:  return ((obs_output_t*)obj)->info.id;
+	case OBS_OBJ_TYPE_ENCODER: return ((obs_encoder_t*)obj)->info.id;
+	case OBS_OBJ_TYPE_SERVICE: return ((obs_service_t*)obj)->info.id;
+	default:;
+	}
+
+	return NULL;
+}
+
+bool obs_obj_invalid(void *obj)
+{
+	struct obs_context_data *context = obj;
+	if (!context)
+		return true;
+
+	return !context->data;
+}

libobs/obs.h

@@ -1,5 +1,5 @@
 /******************************************************************************
-    Copyright (C) 2013-2014 by Hugh Bailey <obs.jim@gmail.com>
+    Copyright (C) 2013-2014 by Hugh Bailey <jim@obsproject.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
@@ -232,6 +232,7 @@ struct obs_source_frame {
 
 	/* used internally by libobs */
 	volatile long       refs;
+	bool                prev_frame;
 };
 
 /* ------------------------------------------------------------------------- */
@@ -520,6 +521,7 @@ enum obs_base_effect {
 	OBS_EFFECT_BICUBIC,            /**< Bicubic downscale */
 	OBS_EFFECT_LANCZOS,            /**< Lanczos downscale */
 	OBS_EFFECT_BILINEAR_LOWRES,    /**< Bilinear low resolution downscale */
+	OBS_EFFECT_PREMULTIPLIED_ALPHA,/**< Premultiplied alpha */
 };
 
 /** Returns a commonly used base effect */
@@ -550,8 +552,11 @@ EXPORT obs_data_t *obs_save_source(obs_source_t *source);
 /** Loads a source from settings data */
 EXPORT obs_source_t *obs_load_source(obs_data_t *data);
 
+typedef void (*obs_load_source_cb)(void *private_data, obs_source_t *source);
+
 /** Loads sources from a data array */
-EXPORT void obs_load_sources(obs_data_array_t *array);
+EXPORT void obs_load_sources(obs_data_array_t *array, obs_load_source_cb cb,
+		void *private_data);
 
 /** Saves sources to a data array */
 EXPORT obs_data_array_t *obs_save_sources(void);
@@ -560,6 +565,18 @@ typedef bool (*obs_save_source_filter_cb)(void *data, obs_source_t *source);
 EXPORT obs_data_array_t *obs_save_sources_filtered(obs_save_source_filter_cb cb,
 		void *data);
 
+enum obs_obj_type {
+	OBS_OBJ_TYPE_INVALID,
+	OBS_OBJ_TYPE_SOURCE,
+	OBS_OBJ_TYPE_OUTPUT,
+	OBS_OBJ_TYPE_ENCODER,
+	OBS_OBJ_TYPE_SERVICE
+};
+
+EXPORT enum obs_obj_type obs_obj_get_type(void *obj);
+EXPORT const char *obs_obj_get_id(void *obj);
+EXPORT bool obs_obj_invalid(void *obj);
+
 
 /* ------------------------------------------------------------------------- */
 /* View context */
@@ -864,6 +881,32 @@ EXPORT void obs_source_add_audio_capture_callback(obs_source_t *source,
 EXPORT void obs_source_remove_audio_capture_callback(obs_source_t *source,
 		obs_source_audio_capture_t callback, void *param);
 
+enum obs_deinterlace_mode {
+	OBS_DEINTERLACE_MODE_DISABLE,
+	OBS_DEINTERLACE_MODE_DISCARD,
+	OBS_DEINTERLACE_MODE_RETRO,
+	OBS_DEINTERLACE_MODE_BLEND,
+	OBS_DEINTERLACE_MODE_BLEND_2X,
+	OBS_DEINTERLACE_MODE_LINEAR,
+	OBS_DEINTERLACE_MODE_LINEAR_2X,
+	OBS_DEINTERLACE_MODE_YADIF,
+	OBS_DEINTERLACE_MODE_YADIF_2X
+};
+
+enum obs_deinterlace_field_order {
+	OBS_DEINTERLACE_FIELD_ORDER_TOP,
+	OBS_DEINTERLACE_FIELD_ORDER_BOTTOM
+};
+
+EXPORT void obs_source_set_deinterlace_mode(obs_source_t *source,
+		enum obs_deinterlace_mode mode);
+EXPORT enum obs_deinterlace_mode obs_source_get_deinterlace_mode(
+		const obs_source_t *source);
+EXPORT void obs_source_set_deinterlace_field_order(obs_source_t *source,
+		enum obs_deinterlace_field_order field_order);
+EXPORT enum obs_deinterlace_field_order obs_source_get_deinterlace_field_order(
+		const obs_source_t *source);
+
 /* ------------------------------------------------------------------------- */
 /* Functions used by sources */
 
@@ -925,8 +968,11 @@ EXPORT void obs_source_release_frame(obs_source_t *source,
  *
  * After calling this, set your parameters for the effect, then call
  * obs_source_process_filter_end to draw the filter.
+ *
+ * Returns true if filtering should continue, false if the filter is bypassed
+ * for whatever reason.
  */
-EXPORT void obs_source_process_filter_begin(obs_source_t *filter,
+EXPORT bool obs_source_process_filter_begin(obs_source_t *filter,
 		enum gs_color_format format,
 		enum obs_allow_direct_render allow_direct);
 
@@ -940,6 +986,17 @@ EXPORT void obs_source_process_filter_begin(obs_source_t *filter,
 EXPORT void obs_source_process_filter_end(obs_source_t *filter,
 		gs_effect_t *effect, uint32_t width, uint32_t height);
 
+/**
+ * Draws the filter with a specific technique.
+ *
+ * Before calling this function, first call obs_source_process_filter_begin and
+ * then set the effect parameters, and then call this function to finalize the
+ * filter.
+ */
+EXPORT void obs_source_process_filter_tech_end(obs_source_t *filter,
+		gs_effect_t *effect, uint32_t width, uint32_t height,
+		const char *tech_name);
+
 /** Skips the filter if the filter is invalid and cannot be rendered */
 EXPORT void obs_source_skip_video_filter(obs_source_t *filter);
 
@@ -1184,6 +1241,21 @@ EXPORT void obs_sceneitem_get_box_transform(const obs_sceneitem_t *item,
 EXPORT bool obs_sceneitem_visible(const obs_sceneitem_t *item);
 EXPORT bool obs_sceneitem_set_visible(obs_sceneitem_t *item, bool visible);
 
+struct obs_sceneitem_crop {
+	int left;
+	int top;
+	int right;
+	int bottom;
+};
+
+EXPORT void obs_sceneitem_set_crop(obs_sceneitem_t *item,
+		const struct obs_sceneitem_crop *crop);
+EXPORT void obs_sceneitem_get_crop(const obs_sceneitem_t *item,
+		struct obs_sceneitem_crop *crop);
+
+EXPORT void obs_sceneitem_defer_update_begin(obs_sceneitem_t *item);
+EXPORT void obs_sceneitem_defer_update_end(obs_sceneitem_t *item);
+
 
 /* ------------------------------------------------------------------------- */
 /* Outputs */
@@ -1564,6 +1636,8 @@ EXPORT void *obs_encoder_get_type_data(obs_encoder_t *encoder);
 
 EXPORT const char *obs_encoder_get_id(const obs_encoder_t *encoder);
 
+EXPORT uint32_t obs_get_encoder_caps(const char *encoder_id);
+
 /** Duplicates an encoder packet */
 EXPORT void obs_duplicate_encoder_packet(struct encoder_packet *dst,
 		const struct encoder_packet *src);
@@ -1579,6 +1653,9 @@ EXPORT const char *obs_service_get_display_name(const char *id);
 EXPORT obs_service_t *obs_service_create(const char *id, const char *name,
 		obs_data_t *settings, obs_data_t *hotkey_data);
 
+EXPORT obs_service_t *obs_service_create_private(const char *id,
+		const char *name, obs_data_t *settings);
+
 /**
  * Adds/releases a reference to a service.  When the last reference is
  * released, the service is destroyed.

libobs/util/cf-lexer.c

@@ -602,6 +602,24 @@ static inline void cf_adderror_unexpected_eof(struct cf_preprocessor *pp,
 			NULL, NULL, NULL);
 }
 
+static inline void insert_path(struct cf_preprocessor *pp,
+		struct dstr *str_file)
+{
+	const char *file;
+	const char *slash;
+
+	if (pp && pp->lex && pp->lex->file) {
+		file = pp->lex->file;
+		slash = strrchr(file, '/');
+		if (slash) {
+			struct dstr path = {0};
+			dstr_ncopy(&path, file, slash - file + 1);
+			dstr_insert_dstr(str_file, 0, &path);
+			dstr_free(&path);
+		}
+	}
+}
+
 static void cf_include_file(struct cf_preprocessor *pp,
 		const struct cf_token *file_token)
 {
@@ -615,6 +633,7 @@ static void cf_include_file(struct cf_preprocessor *pp,
 	dstr_init(&str_file);
 	dstr_copy_strref(&str_file, &file_token->str);
 	dstr_mid(&str_file, &str_file, 1, str_file.len-2);
+	insert_path(pp, &str_file);
 
 	/* if dependency already exists, run preprocessor on it */
 	for (i = 0; i < pp->dependencies.num; i++) {

libobs/util/dstr.c

@@ -346,6 +346,7 @@ void dstr_ncopy(struct dstr *dst, const char *array, const size_t len)
 
 	dst->array = bmemdup(array, len + 1);
 	dst->len   = len;
+	dst->capacity = len + 1;
 
 	dst->array[len] = 0;
 }
@@ -363,6 +364,7 @@ void dstr_ncopy_dstr(struct dstr *dst, const struct dstr *str, const size_t len)
 	newlen = size_min(len, str->len);
 	dst->array = bmemdup(str->array, newlen + 1);
 	dst->len   = newlen;
+	dst->capacity = newlen + 1;
 
 	dst->array[newlen] = 0;
 }
@@ -430,10 +432,11 @@ void dstr_insert(struct dstr *dst, const size_t idx, const char *array)
 	new_len = dst->len + len;
 
 	dstr_ensure_capacity(dst, new_len + 1);
-	dst->len   = new_len;
 
 	memmove(dst->array+idx+len, dst->array+idx, dst->len - idx + 1);
 	memcpy(dst->array+idx, array, len);
+
+	dst->len = new_len;
 }
 
 void dstr_insert_dstr(struct dstr *dst, const size_t idx,
@@ -450,10 +453,11 @@ void dstr_insert_dstr(struct dstr *dst, const size_t idx,
 	new_len = dst->len + str->len;
 
 	dstr_ensure_capacity(dst, (new_len+1));
-	dst->len = new_len;
 
 	memmove(dst->array+idx+str->len, dst->array+idx, dst->len - idx + 1);
 	memcpy(dst->array+idx, str->array, str->len);
+
+	dst->len = new_len;
 }
 
 void dstr_insert_ch(struct dstr *dst, const size_t idx, const char ch)

libobs/util/platform.c

@@ -85,6 +85,37 @@ int64_t os_fgetsize(FILE *file)
 	return size;
 }
 
+#ifdef _WIN32
+int os_stat(const char *file, struct stat *st)
+{
+	if (file) {
+		wchar_t w_file[512];
+		size_t size = os_utf8_to_wcs(file, 0, w_file, sizeof(w_file));
+		if (size > 0) {
+			struct _stat st_w32;
+			int ret = _wstat(w_file, &st_w32);
+			if (ret == 0) {
+				st->st_dev = st_w32.st_dev;
+				st->st_ino = st_w32.st_ino;
+				st->st_mode = st_w32.st_mode;
+				st->st_nlink = st_w32.st_nlink;
+				st->st_uid = st_w32.st_uid;
+				st->st_gid = st_w32.st_gid;
+				st->st_rdev = st_w32.st_rdev;
+				st->st_size = st_w32.st_size;
+				st->st_atime = st_w32.st_atime;
+				st->st_mtime = st_w32.st_mtime;
+				st->st_ctime = st_w32.st_ctime;
+			}
+
+			return ret;
+		}
+	}
+
+	return -1;
+}
+#endif
+
 int os_fseeki64(FILE *file, int64_t offset, int origin)
 {
 #ifdef _MSC_VER

libobs/util/platform.h

@@ -34,6 +34,12 @@ EXPORT FILE *os_wfopen(const wchar_t *path, const char *mode);
 EXPORT FILE *os_fopen(const char *path, const char *mode);
 EXPORT int64_t os_fgetsize(FILE *file);
 
+#ifdef _WIN32
+EXPORT int os_stat(const char *file, struct stat *st);
+#else
+#define os_stat stat
+#endif
+
 EXPORT int os_fseeki64(FILE *file, int64_t offset, int origin);
 EXPORT int64_t os_ftelli64(FILE *file);
 

libobs/util/text-lookup.c

@@ -287,6 +287,7 @@ static char *convert_string(const char *str, size_t len)
 	dstr_replace(&out, "\\n", "\n");
 	dstr_replace(&out, "\\t", "\t");
 	dstr_replace(&out, "\\r", "\r");
+	dstr_replace(&out, "\\\"", "\"");
 
 	return out.array;
 }

obs/data/locale.ini

@@ -85,6 +85,9 @@ Name=Galego
 [hr-HR]
 Name=Hrvatski
 
+[he-IL]
+Name=עברית
+
 [sr-CS]
 Name=Srpski
 
@@ -108,3 +111,9 @@ Name=Bahasa Melayu
 
 [vi-VN]
 Name=Tiếng Việt
+
+[ta-IN]
+Name=தமிழ்
+
+[lt-LT]
+Name=Lietuvių kalba

obs/data/locale/ar-SA.ini

@@ -8,31 +8,77 @@ Cancel="إلغاء"
 Close="إغلاق"
 Save="حفظ"
 Discard="إزالة"
+Disable="تعطيل"
 Yes="نعم"
 No="لا"
 Add="أضف"
 Remove="إحذف"
 Rename="اعادة تسمية"
+Interact="تفاعل"
+Filters="المرشّحات"
 Properties="خصائص"
 MoveUp="تحريك للاعلى"
 MoveDown="تحريك للاسفل"
 Settings="إعدادات"
+Display="شاشة العرض"
+Name="الاسم"
 Exit="خروج"
 Mixer="مختلط"
 Browse="استعراض"
 Mono="صوت أحادي القناة \"مونو\""
 Stereo="صوت ثنائي القناة \"ستيريو\""
 DroppedFrames="إسقاط المشاهد %1 (% %2)"
+PreviewProjector="عرض بالشاشة الكاملة (المعاينة)"
+SceneProjector="عرض بالشاشة الكاملة (المشهد)"
+SourceProjector="عرض بالشاشة الكاملة (المصدر)"
+Clear="مسح"
+Revert="استعادة"
+Show="إظهار"
+Hide="اخفاء"
+Untitled="بدون عنوان"
+New="جديد"
+Duplicate="تكرار مزدوج"
+Enable="تفعيل"
+DisableOSXVSync="تعطيل خاصية OSX V-Sync"
+ResetOSXVSyncOnExit="اعادة تعيين خاصية OSX V-sync عند الخروج"
+HighResourceUsage="زيادة الحِمل في غملية ترميز الفيديو! خذ بعين الاعتبار تخفيض اعدادات الفيديو, او استخدم اعدادات ترميز اسرع."
+Transition="تبديل المشهد"
+QuickTransitions="تبديل سريع"
+Left="يسار"
+Right="يمين"
+Top="أعلى"
+Bottom="أسفل"
 
+QuickTransitions.SwapScenes="التبديل بين مشهدي المعاينة و الاخراج بعد عملية الانتقال"
+QuickTransitions.SwapScenesTT="يقوم بتبديل مشهد المعاينة مع مشهد الاخراج بعد عملية الانتقال بين المشاهد (اذا كان مشهد الاخراج الاصلي لازال موجوداً) \n هذا لن يقوم بالتراجع عن اي تغييرات قمت بها على مشهد الاخراج الأصلي."
+QuickTransitions.DuplicateScene="استنساخ المشهد"
+QuickTransitions.EditProperties="استنساخ المصدر"
+QuickTransitions.HotkeyName="الانتقال السريع: %1"
 
+Basic.TransitionProperties="خصائص تأثير الإنتقال"
+Basic.SceneTransitions="تأثير انتقال المشهد"
+Basic.TransitionDuration="مدة الانتقال"
+Basic.TogglePreviewProgramMode="طور الاستوديو"
 
+TransitionNameDlg.Title="اسم تأثير الإنتقال"
+
+TitleBar.Profile="الملف الشخصي"
+TitleBar.Scenes="المشاهد"
 
 NameExists.Title="الاسم موجود بالفعل"
 NameExists.Text="الاسم مستخدم حاليا."
 
+NoNameEntered.Title="الرجاء إدخال اسم صالح"
+NoNameEntered.Text="لا يمكنك استخدام أسماء فارغة."
 
+ConfirmStart.Title="بدء البث ؟"
+ConfirmStart.Text="هل انت متأكد انك تريد بدء البث ؟"
 
+ConfirmStop.Title="ايقاف البث؟"
+ConfirmStop.Text="هل أنت متأكد انك تريد ايقاف البث؟"
 
+ConfirmExit.Title="الخروج من OBS ؟"
+ConfirmExit.Text="OBS حالياً نشط، كافة عمليات البث/التسجيلات سيتم إيقافها، هل أنت متأكد من رغبتك في الخروج ؟"
 
 ConfirmRemove.Title="تأكيد الإزالة"
 ConfirmRemove.Text="هل أنت متأكد من رغبتك في إزالة '$1' ?"
@@ -40,10 +86,12 @@ ConfirmRemove.Text="هل أنت متأكد من رغبتك في إزالة '$1'
 Output.ConnectFail.Title="فشل في الاتصال"
 Output.ConnectFail.BadPath="مسار أو رابط الاتصال غير صالح. الرجاء التحقق من الإعدادات للتحقق من كونه صالح."
 Output.ConnectFail.ConnectFailed="فشل الاتصال بالسيرفر"
-Output.ConnectFail.InvalidStream="غير قادر على الوصول للقناة المحددة او مفتاح البث. قد يكون هذا بسبب ان المفتاح/القناة غير صحيحة , او بسبب ان السيرفر يعتبر انك لازلت في وضع تسجيل الدخول."
+Output.ConnectFail.InvalidStream="تعذر الوصول إلى القناة أو مفتاح البث المحدد، الرجاء أعد التحقق من صحة مفتاح البث الخاص بك، أما إذا كان صحيحاً، قد تكون المشكلة في الاتصال بالخادم."
 Output.ConnectFail.Error="حدث خطأ غير متوقع عند محاولة الاتصال بالخادم.  مزيد من المعلومات في ملف السجل."
 Output.ConnectFail.Disconnected="تم قطع الاتصال من السيرفر."
 
+Output.RecordFail.Title="فشل في بدء التسجيل"
+Output.RecordError.Title="خطأ في التسجيل"
 
 Output.BadPath.Title="مسار الملف غير صحيح"
 Output.BadPath.Text="مسار الإخراج ملف تكوين غير صالح.  الرجاء التحقق من الإعدادات الخاصة بك للتأكد من أنه تم تعيين مسار ملف صحيح."
@@ -58,6 +106,9 @@ LicenseAgreement.ClickIAgreeToContinue="إذا قمت بقبول شروط الا
 LicenseAgreement.IAgree="موافق"
 LicenseAgreement.Exit="خروج"
 
+Remux.SourceFile="تسجيل OBS"
+Remux.TargetFile="الملف الهدف"
+Remux.OBSRecording="تسجيل OBS"
 
 UpdateAvailable="تحديث جديد متوفر"
 UpdateAvailable.Text="الإصدار %1.%2.%3 متوفر الآن. <a href='%4'>انقر هنا للتتحميل</a>"
@@ -72,6 +123,9 @@ Basic.AuxDevice4="Mic/Aux 4"
 Basic.Scene="مشهد"
 Basic.DisplayCapture="التقاط الشاشة"
 
+Basic.Main.PreviewConextMenu.Enable="تمكين المعاينة"
+
+Deinterlacing.Discard="تجاهل"
 
 Basic.Main.AddSceneDlg.Title="أضف المشهد"
 Basic.Main.AddSceneDlg.Text="الرجاء إدخال اسم المشهد"
@@ -89,20 +143,30 @@ Basic.SourceSelect.AddExisting="إضافة عنصر موجود"
 
 Basic.PropertiesWindow="خصائص ل '%1'"
 Basic.PropertiesWindow.SelectColor="تحديد اللون"
+Basic.PropertiesWindow.SelectFont="إختيار خط"
+Basic.PropertiesWindow.AddFiles="إضافة ملفات"
 
 
 
 Basic.StatusBar.ReconnectSuccessful="إعادة الاتصال الناجح"
 
+Basic.Filters="مرشحات"
+Basic.Filters.AsyncFilters="مرشحات الصوت/الفيديو"
+Basic.Filters.AudioFilters="مرشحات الصوت"
+Basic.Filters.EffectFilters="مرشحات التأثير"
+Basic.Filters.Title="مرشحات لـ '%1'"
+Basic.Filters.AddFilter.Title="اسم المرشّح"
+Basic.Filters.AddFilter.Text="الرجاء تحديد اسم المرشح"
 
-Basic.TransformWindow="تحويل البند المشهد"
+Basic.TransformWindow="تحوّل عنصر المشهد"
-Basic.TransformWindow.Position="موقف"
+Basic.TransformWindow.Position="موضع"
-Basic.TransformWindow.Rotation="التدوير"
+Basic.TransformWindow.Rotation="الإستدارة"
 Basic.TransformWindow.Size="الحجم"
 Basic.TransformWindow.Alignment="محاذاة الموضعية"
 Basic.TransformWindow.BoundsType="نوع مربع الإحاطة"
 Basic.TransformWindow.BoundsAlignment="المحاذاة في المربع المحيط"
 Basic.TransformWindow.Bounds="حجم المربع المحيط"
+Basic.TransformWindow.Crop="قطع"
 
 Basic.TransformWindow.Alignment.TopLeft="أعلى اليسار"
 Basic.TransformWindow.Alignment.TopCenter="أعلى الوسط"
@@ -116,8 +180,8 @@ Basic.TransformWindow.Alignment.BottomRight="أسفل اليمين"
 
 Basic.TransformWindow.BoundsType.None="لا حدود له"
 Basic.TransformWindow.BoundsType.MaxOnly="الحد الأقصى للحجم فقط"
-Basic.TransformWindow.BoundsType.ScaleInner="مقياس لحدود داخلية"
+Basic.TransformWindow.BoundsType.ScaleInner="تحجيم للحدود الداخلية"
-Basic.TransformWindow.BoundsType.ScaleOuter="مقياس للحدود الخارجية"
+Basic.TransformWindow.BoundsType.ScaleOuter="تحجيم للحدود الخارجية"
 Basic.TransformWindow.BoundsType.ScaleToWidth="مقياس لعرض الحدود"
 Basic.TransformWindow.BoundsType.ScaleToHeight="مقياس للارتفاع الحدود"
 Basic.TransformWindow.BoundsType.Stretch="تمتد إلى الحدود"
@@ -127,7 +191,7 @@ Basic.Main.AddSourceHelp.Text="تحتاج إلى أن يكون على الأقل
 
 Basic.Main.Scenes="المشاهد"
 Basic.Main.Sources="المصادر"
-Basic.Main.Connecting="جاري الإتصال..."
+Basic.Main.Connecting="يتصل..."
 Basic.Main.StartRecording="بدء التسجيل"
 Basic.Main.StartStreaming="بدء البث"
 Basic.Main.StopRecording="إيقاف التسجيل"
@@ -136,7 +200,11 @@ Basic.Main.StopStreaming="ايقاف البث"
 Basic.MainMenu.File="&ملف"
 Basic.MainMenu.File.Export="&تصدير"
 Basic.MainMenu.File.Import="&استيراد"
+Basic.MainMenu.File.ShowRecordings="إظهار &التسجيلات"
 Basic.MainMenu.File.Settings="&الإعدادات"
+Basic.MainMenu.File.ShowSettingsFolder="إظهار مجلد الإعدادات"
+Basic.MainMenu.File.ShowProfileFolder="إظهار مجلد الملف الشخصي"
+Basic.MainMenu.AlwaysOnTop="&دائماً في القمة"
 Basic.MainMenu.File.Exit="&خروج"
 
 Basic.MainMenu.Edit="&تعديل"
@@ -155,14 +223,18 @@ Basic.MainMenu.Edit.Transform.FlipVertical="انعكاس &عمودي"
 Basic.MainMenu.Edit.Transform.FitToScreen="&تمديد الشاشة"
 Basic.MainMenu.Edit.Transform.StretchToScreen="&تمتد إلى الشاشة"
 Basic.MainMenu.Edit.Transform.CenterToScreen="&وسط الشاشة"
-Basic.MainMenu.Edit.Order="&الطلب"
+Basic.MainMenu.Edit.Order="&الترتيب"
 Basic.MainMenu.Edit.Order.MoveUp="التحرك &للأعلى"
 Basic.MainMenu.Edit.Order.MoveDown="التحرك &للأسفل"
 Basic.MainMenu.Edit.Order.MoveToTop="التحرك &للقمة"
 Basic.MainMenu.Edit.Order.MoveToBottom="التحرك &للقاع"
+Basic.MainMenu.Edit.AdvAudio="&خصائص الصوت المتقدمة"
 
+Basic.MainMenu.SceneCollection="&مجموعة المشاهد"
+Basic.MainMenu.Profile="&الملف الشخصي"
 
-Basic.MainMenu.Help="&المساعدة"
+Basic.MainMenu.Help="&مساعدة"
+Basic.MainMenu.Help.Website="زيارة &الموقع الإلكتروني"
 Basic.MainMenu.Help.Logs="&ملفات السجل"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="رفع &ملف السجل الحالي"
 Basic.MainMenu.Help.Logs.UploadLastLog="رفع &آخر ملف سجل"
@@ -173,12 +245,18 @@ Basic.Settings.ConfirmTitle="تأكيد التغييرات"
 Basic.Settings.Confirm="لديك تغييرات غير محفوظة. هل تريد حفظها?"
 
 Basic.Settings.General="عام"
+Basic.Settings.General.Theme="السمة"
+Basic.Settings.General.Language="اللغة"
 
 Basic.Settings.Stream="بث"
 Basic.Settings.Stream.StreamType="نوع البث"
 
 Basic.Settings.Output="المخرج"
+Basic.Settings.Output.Format="صيغة التسجيل"
+Basic.Settings.Output.Encoder="مرمّز"
 Basic.Settings.Output.Mode="نوع المخرج"
+Basic.Settings.Output.Mode.Simple="بسيط"
+Basic.Settings.Output.Mode.Adv="متقدم"
 Basic.Settings.Output.VideoBitrate="معدل البت للفيديو"
 Basic.Settings.Output.AudioBitrate="معدل البت للصوت"
 Basic.Settings.Output.Reconnect="إعادة الاتصال تلقائياً"
@@ -186,6 +264,10 @@ Basic.Settings.Output.RetryDelay="إعادة محاولة تأخير (ثوان)"
 Basic.Settings.Output.MaxRetries="أقصى عدد للمحاولات"
 
 
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="‮كل الملفات"
+Basic.Settings.Output.Adv.FFmpeg.Format="صيغة الحاوية"
+
+
 
 Basic.Settings.Video="الفيديو"
 Basic.Settings.Video.Adapter="محول الفيديو:"

obs/data/locale/bg-BG.ini

@@ -8,6 +8,7 @@ Cancel="Откажи"
 Close="Затвори"
 Save="Запази"
 Discard="Отхвърли"
+Disable="Деактивирай"
 Yes="Да"
 No="Не"
 Add="Добави"
@@ -43,6 +44,7 @@ ResetOSXVSyncOnExit="Рестартиране на OSX V-синхронизац
 
 
 
+
 TitleBar.Profile="Профил"
 TitleBar.Scenes="Сцени"
 
@@ -62,7 +64,6 @@ ConfirmRemove.Text="Наистина ли искате да премахнете
 Output.ConnectFail.Title="Неуспешно свързване"
 Output.ConnectFail.BadPath="Невалиден път или URL. Проверете дали настройките ви са валидни."
 Output.ConnectFail.ConnectFailed="Неуспешна връзка със сървъра"
-Output.ConnectFail.InvalidStream="Избраният канал или стрийм ключ не е достъпен, Причината може да е невалиден ключ/канал, или защото сървърът предполага, че сте все още логнат."
 Output.ConnectFail.Error="Неочаквана грешка при опит за връзка със сървъра.  Повече информация в \"log\" файла."
 Output.ConnectFail.Disconnected="Изключен от сървъра."
 
@@ -84,7 +85,6 @@ LicenseAgreement.Exit="Изход"
 Remux.SourceFile="OBS запис"
 Remux.TargetFile="Целеви файл"
 Remux.Remux="Конвертиране"
-Remux.RecordingPattern="OBS запис (*.flv)"
 Remux.FinishedTitle="Конвертирането завърши"
 Remux.Finished="Записът е конвертиран"
 Remux.FinishedError="Записът е конвертиран, но файлът може да бъде незавършен"
@@ -110,6 +110,7 @@ Basic.DisplayCapture="Заснемане на екрана"
 
 Basic.Main.PreviewConextMenu.Enable="Разреши преглед"
 
+
 Basic.Main.AddSceneDlg.Title="Добави сцена"
 Basic.Main.AddSceneDlg.Text="Моля, въведете името на сцената"
 
@@ -248,6 +249,8 @@ Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Аудио"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Видео"
 Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Формат по подразбиране"
 
+
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео адаптер:"
 Basic.Settings.Video.DownscaleFilter="Филтър:"

obs/data/locale/ca-ES.ini

@@ -8,6 +8,7 @@ Cancel="Cancel·la"
 Close="Tanca"
 Save="Desa"
 Discard="Descarta"
+Disable="Inhabilita"
 Yes="Sí"
 No="No"
 Add="Afegeix"
@@ -38,8 +39,33 @@ Untitled="Sense títol"
 New="Nou"
 Duplicate="Duplica"
 Enable="Activa"
+DisableOSXVSync="Inhabilita V-Sync en OSX"
+ResetOSXVSyncOnExit="Reinicia V-Sync de OSX a la sortida"
+HighResourceUsage="Sobrecàrrega en codificar! Consideri baixar els ajustos de vídeo o utilitzar una configuració del codificador mes ràpida."
+Transition="Transició"
+QuickTransitions="Transicions ràpides"
+Left="Esquerra"
+Right="Dreta"
+Top="Part superior"
+Bottom="Part inferior"
 
+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.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.HotkeyName="Transició Ràpida: %1"
 
+Basic.AddTransition="Afegir transició configurable"
+Basic.RemoveTransition="Eliminar transició configurable"
+Basic.TransitionProperties="Propietats de la transició"
+Basic.SceneTransitions="Transicions d'escena"
+Basic.TransitionDuration="Duració"
+Basic.TogglePreviewProgramMode="Mode estudi"
+
+TransitionNameDlg.Text="Si us plau, introdueixi el nom de la transició"
+TransitionNameDlg.Title="Nom de la transició"
 
 TitleBar.Profile="Perfil"
 TitleBar.Scenes="Escenes"
@@ -50,7 +76,11 @@ NameExists.Text="Aquest nom ja és en ús."
 NoNameEntered.Title="Introduïu un nom vàlid"
 NoNameEntered.Text="No podeu usar noms buits."
 
+ConfirmStart.Title="Inicia la transmissió?"
+ConfirmStart.Text="Està segur que desitja iniciar la transmissió?"
 
+ConfirmStop.Title="Atura la transmissió?"
+ConfirmStop.Text="Està segur que desitja aturar la transmissió?"
 
 ConfirmExit.Title="Voleu sortir de l'OBS?"
 ConfirmExit.Text="OBS és actualment actiu.  Tots els directes/gravacions s'aturaran.  Esteu segur que voleu sortir?"
@@ -61,7 +91,7 @@ ConfirmRemove.Text="Esteu segur que voleu suprimir «$1»?"
 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"
-Output.ConnectFail.InvalidStream="No es pot accedir al canal o la clau d'stream especificat. Això podria ser degut a que el codi o la clau introduïts no són vàlids, o perquè el servidor encara considera que hi estàs connectat."
+Output.ConnectFail.InvalidStream="No pot accedir a la clau del canal especificat o de la transmissió, per favor comprovar dues vegades la seva clau de transmissió. Si és correcte, pot haver-hi un problema connectant-se al servidor."
 Output.ConnectFail.Error="S'ha produït un error inesperat quan s'intentava connectar amb el servidor.  Més informació al fitxer de registre."
 Output.ConnectFail.Disconnected="Desconnectat del servidor."
 
@@ -88,7 +118,7 @@ LicenseAgreement.Exit="Surt"
 Remux.SourceFile="Enregistrament OBS"
 Remux.TargetFile="Fitxer de destinació"
 Remux.Remux="Converteix"
-Remux.RecordingPattern="Gravació OBS (*.flv)"
+Remux.OBSRecording="Enregistrament OBS"
 Remux.FinishedTitle="Conversió finalitzada"
 Remux.Finished="Gravació convertida"
 Remux.FinishedError="Gravació convertida, però l'arxiu pot ser incomplet"
@@ -114,6 +144,18 @@ Basic.DisplayCapture="Captura de pantalla"
 
 Basic.Main.PreviewConextMenu.Enable="Habilita la visualització prèvia"
 
+Deinterlacing="Desentrellaçar"
+Deinterlacing.Discard="Descarta"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Barrejat"
+Deinterlacing.Blend2x="Barrejat 2x"
+Deinterlacing.Linear="Lineal"
+Deinterlacing.Linear2x="Lineal 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Camp superior primer"
+Deinterlacing.BottomFieldFirst="Camp inferior primer"
+
 Basic.Main.AddSceneDlg.Title="Afegeix una escena"
 Basic.Main.AddSceneDlg.Text="Introduïu el nom de l'escena"
 
@@ -179,6 +221,7 @@ Basic.TransformWindow.Alignment="Posició"
 Basic.TransformWindow.BoundsType="Tipus de quadre de limitació"
 Basic.TransformWindow.BoundsAlignment="Alineació en el quadre de limitació"
 Basic.TransformWindow.Bounds="Mida del quadre de limitació"
+Basic.TransformWindow.Crop="Retalla"
 
 Basic.TransformWindow.Alignment.TopLeft="Part superior esquerra"
 Basic.TransformWindow.Alignment.TopCenter="Part superior centre"
@@ -218,6 +261,7 @@ Basic.MainMenu.File.Remux="Converteix format de gravacions"
 Basic.MainMenu.File.Settings="&Paràmetres"
 Basic.MainMenu.File.ShowSettingsFolder="Mostrar carpeta de configuració"
 Basic.MainMenu.File.ShowProfileFolder="Mostra la carpeta del perfil"
+Basic.MainMenu.AlwaysOnTop="&Sempre al davant"
 Basic.MainMenu.File.Exit="&Surt"
 
 Basic.MainMenu.Edit="&Edita"
@@ -262,6 +306,13 @@ Basic.Settings.Confirm="Hi han canvis no desats.  Voleu desar els canvis?"
 Basic.Settings.General="General"
 Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Llengua"
+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.Snapping="Ajustament d'alineació de la font"
+Basic.Settings.General.ScreenSnapping="Ajustar les fonts a la vora de la pantalla"
+Basic.Settings.General.CenterSnapping="Ajustar les fonts al centre horitzontal i vertical"
+Basic.Settings.General.SourceSnapping="Ajustar les fonts a altres fonts"
+Basic.Settings.General.SnapDistance="Ajusta la sensibilitat"
 
 Basic.Settings.Stream="Directe"
 Basic.Settings.Stream.StreamType="Tipus de directe"
@@ -271,6 +322,7 @@ Basic.Settings.Output.Format="Format d'enregistrament"
 Basic.Settings.Output.Encoder="Codificador"
 Basic.Settings.Output.SelectDirectory="Seleccioneu el directori de gravació"
 Basic.Settings.Output.SelectFile="Seleccioni l'arxiu de gravació"
+Basic.Settings.Output.EnforceBitrate="Forçar límits de tassa de bits al servei d'streaming"
 Basic.Settings.Output.Mode="Mode de sortida"
 Basic.Settings.Output.Mode.Simple="Simple"
 Basic.Settings.Output.Mode.Adv="Avançat"
@@ -281,11 +333,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Mateixa que en directe"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Qualitat alta, mida d'arxiu mitjana"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Qualitat molt elevada, mida de fitxer gran"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Qualitat sense pèrdues, mida de l'arxiu molt gran"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="ADVERTÈNCIA: La transmissió del vídeo s'establirà a %1, que és el límit superior per al servei de streaming actual.  Si està segur que vol anar per sobre de %1, activi les opcions avançades del codificador i desactivi \"Forçar límits de tassa de bits al servei d'streaming\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="ADVERTÈNCIA: La transmissió d'àudio s'establirà a %1, que és el límit superior per al servei de streaming actual.  Si està segur que vol anar per sobre de %1, activi les opcions avançades del codificador i desactivi \"Forçar límits de tassa de bits al servei d'streaming\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Advertiment: Gravar amb un software codificador en una qualitat diferent que el directe requerirà ús de CPU addicional si el directe i la gravació es fan a la vegada."
 Basic.Settings.Output.Simple.Warn.Lossless="Advertiment: La qualitat sense pèrdues genera mides d'arxiu gegantines!  La qualitat sense pèrdues pot utilitzar un total de 7 gigabytes d'espai de disc per minut a alta resolució i FPS.  Aquesta qualitat no és recomanable per a enregistraments llargs llevat que tingui una gran quantitat d'espai de disc disponible."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Esteu segur que voleu utilitzar qualitat sense pèrdues?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Advertiment de qualitat sense pèrdues!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Advertència: No es poden utilitzar diversos descodificadors QSV separats en transmetre i enregistrar al mateix temps. Per transmetre i engrestriar al mateix temps, si us plau modifiqueu-los, ja sigui el codificador de gravació o el codificador de transmissió."
 Basic.Settings.Output.Simple.Encoder.Software="Programari (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Maquinari (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Maquinari (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Programari (preconfiguració de x264 amb baix ús de CPU, augmenta la mida del fitxer)"
 Basic.Settings.Output.VideoBitrate="Bitrate de vídeo"
 Basic.Settings.Output.AudioBitrate="Bitrate d'àudio"
@@ -312,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="Tipus"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Estàndard"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Sortida personalitzada (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Fer servir codificador de directe)"
+Basic.Settings.Output.Adv.Recording.Filename="Nom de l'arxiu de format"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Sobreescriure si l'arxiu existeix"
 Basic.Settings.Output.Adv.FFmpeg.Type="Tipus de sortida FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Sortida a un URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Sortida a un fitxer"
@@ -332,6 +391,10 @@ 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)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Any, quatre dígits\n%YY		Any, darrers dos digits (00-99)\n%MM		Mes com a número decimal (01-12)\n%DD		Dia del mes, emplena amb zero (01-31)\n%hh		Hora en format 24h (00-23)\n%mm		Minut (00-59)\n%ss		Segon (00-61)\n%%		A % signe\n%a		Nom de la setmana abreujat\n%A		Nom complet de la setmana\n%b		Nom del mes abreujat\n%B		Nom del mes complet\n%d		Dia del mes, zero-afegit (01-31)\n%H		Hora en format 24h (00-23)\n%I		Hora en format 12h (01-12)\n%m		Mes com a número decimal (01-12)\n%M		Minut (00-59)\n%p		Designació AM o PM\n%S		Segon (00-61)\n%y		Any, darrers dos dígits (00-99)\n%Y		Any\n%z		ISO 8601 ajust UTC o zona horària\n		nom or abreujament\n%Z		Nom de la zona horària o abreujament\n"
+
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de vídeo:"
 Basic.Settings.Video.BaseResolution="Resolució base (quadre):"
@@ -365,6 +428,7 @@ Basic.Settings.Audio.EnablePushToMute="Activa \"prémer-per-silenciar\""
 Basic.Settings.Audio.PushToMuteDelay="Retard \"prémer-per-silenciar\""
 Basic.Settings.Audio.EnablePushToTalk="Activa \"prémer-per-parlar\""
 Basic.Settings.Audio.PushToTalkDelay="Retard de \"prémer-per-parlar\""
+Basic.Settings.Audio.UnknownAudioDevice="[Dispositiu no connectat o no disponible]"
 
 Basic.Settings.Advanced="Avançat"
 Basic.Settings.Advanced.FormatWarning="Advertiment: Els formats de color diferents de NV12 estan destinats principalment per a la gravació i no són recomanables quan es fa un directe.  Fer un directe pot comportar un major ús de CPU a causa de la conversió de format de color."

obs/data/locale/cs-CZ.ini

@@ -8,6 +8,7 @@ Cancel="Zrušit"
 Close="Zavřít"
 Save="Uložit"
 Discard="Zahodit"
+Disable="Vypnout"
 Yes="Ano"
 No="Ne"
 Add="Přidat"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Resetovat OSX V-Sync při ukončení"
 HighResourceUsage="Vysoké zatížení enkodéru! Zvažte snížení požadavků v nastavení obrazu nebo použití rychlé předvolby enkodéru."
 Transition="Přechod"
 QuickTransitions="Rychlé přechody"
+Left="Vlevo"
+Right="Vpravo"
+Top="Nahoře"
+Bottom="Dole"
 
 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."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Duplikovat zdroje"
 QuickTransitions.EditPropertiesTT="Při úpravě stejné scény, umožňuje úpravu vlastností zdrojů bez úpravy výstupu.\nTato funkce může být použita pouze, pokud je zapnuto 'Duplikovat scénu'.\nNěkteré zdroje (jako jsou zdroje záznamu či mediální zdroje) tuto funkci nepodporují a nemohou být upraveny samostatně.\nPo změně této hodnoty bude aktuální scéna výstupu resetována (pokud stále existuje).\n\nVarování: Z důvodu duplikace zdrojů může tato funkce vyžadovat více systémových prostředků."
 QuickTransitions.HotkeyName="Rychlý přechod: %1"
 
+Basic.AddTransition="Přidat nastavitelný přechod"
+Basic.RemoveTransition="Odebrat nastavitelný přechod"
+Basic.TransitionProperties="Vlastnosti přechodu"
 Basic.SceneTransitions="Přechody scény"
 Basic.TransitionDuration="Délka"
 Basic.TogglePreviewProgramMode="Studiový mód"
 
+TransitionNameDlg.Text="Zadejte název přechodu"
+TransitionNameDlg.Title="Název přechodu"
+
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scény"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Opravdu si přejete odebrat '$1'?"
 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"
-Output.ConnectFail.InvalidStream="Nelze přistoupit ke specifickému vysílacímu klíči. Může to být zapříčiněno chybným klíčem nebo samotným serverem (stále si myslí, že jste přihlášeni)."
+Output.ConnectFail.InvalidStream="K nastavenému kanálu či klíči nelze přistoupit. Zkontrolujte, zda je vysílací klíč správný. Pokud ano, může být problém s připojením k serveru."
 Output.ConnectFail.Error="Při pokusu o připojení k serveru došlo k neočekávané chybě.  Další informace v záznamovém souboru."
 Output.ConnectFail.Disconnected="Odpojen od serveru."
 
@@ -95,7 +106,7 @@ Output.BadPath.Title="Špatná cesta k souboru"
 Output.BadPath.Text="Nastavená cesta k výstupnímu souboru je chybná. Zkontrolujte nastavení, zda není cesta špatně napsána."
 
 LogReturnDialog="Záznam byl úspěšně nahrán"
-LogReturnDialog.CopyURL="Zkopírovat URL"
+LogReturnDialog.CopyURL="Zkopírovat"
 LogReturnDialog.ErrorUploadingLog="Nahrání záznamu se nezdařilo"
 
 LicenseAgreement="Licenční smlouva"
@@ -107,7 +118,7 @@ LicenseAgreement.Exit="Konec"
 Remux.SourceFile="OBS nahrávka"
 Remux.TargetFile="Cílový soubor"
 Remux.Remux="Převést"
-Remux.RecordingPattern="OBS nahrávka (*.flv)"
+Remux.OBSRecording="OBS nahrávka"
 Remux.FinishedTitle="Převod dokončen"
 Remux.Finished="Nahrávka převedena"
 Remux.FinishedError="Nahrávka převedena, ale soubor nemusí být kompletní"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="Záznam obrazovky"
 
 Basic.Main.PreviewConextMenu.Enable="Povolit náhled"
 
+Deinterlacing="Odstranění prokladu"
+Deinterlacing.Discard="Zahození"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Prolnutí"
+Deinterlacing.Blend2x="Prolnutí 2x"
+Deinterlacing.Linear="Lineární"
+Deinterlacing.Linear2x="Lineární 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Svrchní řádek dříve"
+Deinterlacing.BottomFieldFirst="Spodní řádek dříve"
+
 Basic.Main.AddSceneDlg.Title="Přidat scénu"
 Basic.Main.AddSceneDlg.Text="Prosím, zadejte jméno scény"
 
@@ -155,7 +178,7 @@ Basic.SourceSelect.CreateNew="Vytvořit nový"
 Basic.SourceSelect.AddExisting="Přidat existující"
 Basic.SourceSelect.AddVisible="Zviditelnit zdroj"
 
-Basic.PropertiesWindow="Vlastnosti pro '%1'"
+Basic.PropertiesWindow="Vlastnosti objektu '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (automatické: %2)"
 Basic.PropertiesWindow.SelectColor="Výběr barvy"
 Basic.PropertiesWindow.SelectFont="Výběr písma"
@@ -198,6 +221,7 @@ Basic.TransformWindow.Alignment="Zarovnání pozice"
 Basic.TransformWindow.BoundsType="Typ ohraničení"
 Basic.TransformWindow.BoundsAlignment="Zarovnání v hranici"
 Basic.TransformWindow.Bounds="Velikost hranice"
+Basic.TransformWindow.Crop="Oříznout"
 
 Basic.TransformWindow.Alignment.TopLeft="Nahoře, vlevo"
 Basic.TransformWindow.Alignment.TopCenter="Nahoře, uprostřed"
@@ -229,50 +253,50 @@ Basic.Main.StopRecording="Zastavit nahrávání"
 Basic.Main.StopStreaming="Zastavit vysílání"
 Basic.Main.ForceStopStreaming="Zastavit vysání (bez zpoždění)"
 
-Basic.MainMenu.File="&Soubor"
+Basic.MainMenu.File="Soubor (&F)"
 Basic.MainMenu.File.Export="&Exportovat"
 Basic.MainMenu.File.Import="&Importovat"
-Basic.MainMenu.File.ShowRecordings="Zobrazit &nahrávky"
+Basic.MainMenu.File.ShowRecordings="Zobrazit nahrávky (&R)"
-Basic.MainMenu.File.Remux="&Převést nahrávky"
+Basic.MainMenu.File.Remux="Převést nahrávky (&M)"
 Basic.MainMenu.File.Settings="Na&stavení"
 Basic.MainMenu.File.ShowSettingsFolder="Zobrazit složku nastavení"
 Basic.MainMenu.File.ShowProfileFolder="Zobrazit složku profilu"
-Basic.MainMenu.AlwaysOnTop="&Vždy navrchu"
+Basic.MainMenu.AlwaysOnTop="Vždy n&avrchu"
-Basic.MainMenu.File.Exit="&Skončit"
+Basic.MainMenu.File.Exit="Kon&ec"
 
-Basic.MainMenu.Edit="&Upravit"
+Basic.MainMenu.Edit="Upravit (&E)"
-Basic.MainMenu.Edit.Undo="&Zpět"
+Basic.MainMenu.Edit.Undo="Zpět (&U)"
-Basic.MainMenu.Edit.Redo="Zno&vu"
+Basic.MainMenu.Edit.Redo="Znovu (&R)"
-Basic.MainMenu.Edit.UndoAction="&Zpět $1"
+Basic.MainMenu.Edit.UndoAction="Zpět $1 (&U)"
-Basic.MainMenu.Edit.RedoAction="Zno&vu $1"
+Basic.MainMenu.Edit.RedoAction="Znovu $1 (&R)"
-Basic.MainMenu.Edit.Transform="&Pozicování"
+Basic.MainMenu.Edit.Transform="Pozicování (&T)"
-Basic.MainMenu.Edit.Transform.EditTransform="&Upravit pozici..."
+Basic.MainMenu.Edit.Transform.EditTransform="Upravit pozici... (&E)"
-Basic.MainMenu.Edit.Transform.ResetTransform="&Obnovit pozici"
+Basic.MainMenu.Edit.Transform.ResetTransform="Obnovit pozici (&R)"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Otočit o 90 stupňů vpravo"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Otočit o 90 stupňů vlevo"
 Basic.MainMenu.Edit.Transform.Rotate180="Otočit o 180 stupňů"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="Překlopit &vodorovně"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Překlopit vodorovně (&H)"
-Basic.MainMenu.Edit.Transform.FlipVertical="Překlopit &svisle"
+Basic.MainMenu.Edit.Transform.FlipVertical="Překlopit s&visle"
-Basic.MainMenu.Edit.Transform.FitToScreen="&Přizpůsobit obrazovce"
+Basic.MainMenu.Edit.Transform.FitToScreen="Přizpůsobit obrazovce (&F)"
-Basic.MainMenu.Edit.Transform.StretchToScreen="&Roztáhnout na obrazovku"
+Basic.MainMenu.Edit.Transform.StretchToScreen="Roztáhnout na obrazovku (&S)"
-Basic.MainMenu.Edit.Transform.CenterToScreen="&Vycentrovat"
+Basic.MainMenu.Edit.Transform.CenterToScreen="Vy&centrovat"
-Basic.MainMenu.Edit.Order="&Pořadí"
+Basic.MainMenu.Edit.Order="P&ořadí"
-Basic.MainMenu.Edit.Order.MoveUp="Posunout &výše"
+Basic.MainMenu.Edit.Order.MoveUp="Posunout výše (&U)"
-Basic.MainMenu.Edit.Order.MoveDown="Posunout &níže"
+Basic.MainMenu.Edit.Order.MoveDown="Posunout níže (&D)"
-Basic.MainMenu.Edit.Order.MoveToTop="Posunout na &vršek"
+Basic.MainMenu.Edit.Order.MoveToTop="Posunout na vršek (&T)"
-Basic.MainMenu.Edit.Order.MoveToBottom="Posunout na &spodek"
+Basic.MainMenu.Edit.Order.MoveToBottom="Posunout na spodek (&B)"
-Basic.MainMenu.Edit.AdvAudio="&Rozšířené vlastnosti zvuku"
+Basic.MainMenu.Edit.AdvAudio="Rozšířené vl&astnosti zvuku"
 
-Basic.MainMenu.SceneCollection="&Kolekce scén"
+Basic.MainMenu.SceneCollection="Kolekce &scén"
 Basic.MainMenu.Profile="&Profil"
 
-Basic.MainMenu.Help="&Pomoc"
+Basic.MainMenu.Help="Pomoc (&H)"
 Basic.MainMenu.Help.Website="Navštívit &web"
-Basic.MainMenu.Help.Logs="Soubory &záznamu"
+Basic.MainMenu.Help.Logs="Soubory záznamu (&L)"
-Basic.MainMenu.Help.Logs.ShowLogs="Zobrazit s&oubory záznamu"
+Basic.MainMenu.Help.Logs.ShowLogs="Zobrazit soubory záznamu (&S)"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="Nahrát &aktuální soubor záznamu"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Nahrát aktuální soubor záznamu (&C)"
-Basic.MainMenu.Help.Logs.UploadLastLog="Nahrát &poslední soubor záznamu"
+Basic.MainMenu.Help.Logs.UploadLastLog="Nahrát poslední soubor záznamu (&L)"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&Zobrazit aktuální záznam"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="Zobrazit aktuální záznam (&V)"
 Basic.MainMenu.Help.CheckForUpdates="Zkontrolovat aktualizace"
 
 Basic.Settings.ProgramRestart="Pro projevení nastavení je potřeba restartovat aplikaci."
@@ -282,8 +306,13 @@ Basic.Settings.Confirm="Některé změny nejsou uložené. Chcete je uložit nyn
 Basic.Settings.General="Hlavní"
 Basic.Settings.General.Theme="Vzhled"
 Basic.Settings.General.Language="Jazyk"
-Basic.Settings.General.WarnBeforeStartingStream="Zobrazit dialog potvrzení před začátkem vysílání"
+Basic.Settings.General.WarnBeforeStartingStream="Vyžadovat potvrzení pro spuštění vysílání"
-Basic.Settings.General.WarnBeforeStoppingStream="Zobrazit dialog potvrzení před ukončením vysílání"
+Basic.Settings.General.WarnBeforeStoppingStream="Vyžadovat potvrzení pro ukončení vysílání"
+Basic.Settings.General.Snapping="Přichycování zdrojů"
+Basic.Settings.General.ScreenSnapping="Přichytávat zdroje k okraji obrazovky"
+Basic.Settings.General.CenterSnapping="Přichytávat zdroje k vertikálnímu a horizontálnímu středu"
+Basic.Settings.General.SourceSnapping="Přichytávat zdroje k ostatním zdrojům"
+Basic.Settings.General.SnapDistance="Citlivost přichycení"
 
 Basic.Settings.Stream="Vysílání"
 Basic.Settings.Stream.StreamType="Typ vysílání"
@@ -293,6 +322,7 @@ Basic.Settings.Output.Format="Formát nahrávání"
 Basic.Settings.Output.Encoder="Enkodér"
 Basic.Settings.Output.SelectDirectory="Vyberte složku pro nahrávání"
 Basic.Settings.Output.SelectFile="Vyberte soubor pro nahrávání"
+Basic.Settings.Output.EnforceBitrate="Vynutit omezení bitratu streamovací služby"
 Basic.Settings.Output.Mode="Režim výstupu"
 Basic.Settings.Output.Mode.Simple="Jednoduché"
 Basic.Settings.Output.Mode.Adv="Rozšířené"
@@ -302,12 +332,17 @@ Basic.Settings.Output.Simple.RecordingQuality="Nahrávací kvalita"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Stejná jako vysílaná"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Vysoká kvalita, střední velikost souboru"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Nerozeznatelný pokles kvality, velké soubory"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Bez ztrát, obrovské soubory"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Lossless, obrovské soubory"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Varování: Bitrate videa bude nastaven %1, což je maximum, které tato streamovací služba umožňuje. Pokud si jste jisti, že chcete tento limit překročit, povolte rožšířené možnosti enkodéru a odškrtněte \"Vynutit omezení bitratu streamovací služby\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Varování: Bitrate zvuku bude nastaven %1, což je maximum, které tato streamovací služba umožňuje. Pokud si jste jisti, že chcete tento limit překročit, povolte rožšířené možnosti enkodéru a odškrtněte \"Vynutit omezení bitratu streamovací služby\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Varování: Nahrávání se softwarovým enkodérem v jiné kvalitě než je vysílaná bude CPU využívat více, pokud budete vysílat a nahrávat současně."
-Basic.Settings.Output.Simple.Warn.Lossless="Varování: Nahrané soubory, při použití kvality \"bez ztrát\", budou enormní! Tato kvalita může využít, při vysokých rozlišeních a snímkování, až 7 GB diskového prostoru za minutu. Tato kvalita není doporučena pro dlouhé nahrávky, pokud nemáte opravdu velký volný prostor na disku."
+Basic.Settings.Output.Simple.Warn.Lossless="Varování: Při použití této kvality budou výsledné nahrávky obrovské! Při použití vysokého rozlišení a snímkování mohou využít až 7 GB diskového prostoru za minutu nahrávky. Tato kvalita není doporučena pro dlouhé nahrávky, pokud nemáte opravdu velký volný prostor na disku."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Opravdu chcete použít tuto kvalitu ?"
-Basic.Settings.Output.Simple.Warn.Lossless.Title="Varování bez ztrátové kvality!"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Varování nastavené kvality!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Varování: Není možné použit více oddělených QSV enkodérů pro streamování a nahrávání ve stejnou dobu. Pokud chcete tuto limitaci obejít, tak změňte použitý enkodér pro streamování či nahrávání."
 Basic.Settings.Output.Simple.Encoder.Software="Softwarový (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardwarový (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardwarový (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softwarový (x264 předvolba nízkého zatížení CPU, větší soubory)"
 Basic.Settings.Output.VideoBitrate="Bitrate videa"
 Basic.Settings.Output.AudioBitrate="Bitrate zvuku"
@@ -331,9 +366,11 @@ Basic.Settings.Output.Adv.Audio.Track4="Stopa 4"
 
 Basic.Settings.Output.Adv.Recording="Nahrávání"
 Basic.Settings.Output.Adv.Recording.Type="Typ"
-Basic.Settings.Output.Adv.Recording.Type.Standard="Standrartní"
+Basic.Settings.Output.Adv.Recording.Type.Standard="Standardní"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Vlastní výstup (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Použít enkodér vysílání)"
+Basic.Settings.Output.Adv.Recording.Filename="Formát názvu souborů"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Přepsat existující"
 Basic.Settings.Output.Adv.FFmpeg.Type="Typ výstupu FFmpegu"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Výstup do URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Výstup do souboru"
@@ -354,6 +391,10 @@ 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)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Rok, 4 číslice\n%YY		Rok, 2 poslední číslice (00-99)\n%MM		Měsíc, číslo (01-12)\n%DD		Den v měsíci, 2 číslice (01-31)\n%hh		Hodina ve 24h formátu (00-23)\n%mm		Minuta (00-59)\n%ss		Vteřina (00-61)\n%%		Znak %\n%a		Zkratka dne v týdnu\n%A		Den v týdnu\n%b		Zkratka měsíce\n%B		Měsíc\n%d		Den v měsíci, 2 číslice (01-31)\n%H		Hodina ve 24h formátu (00-23)\n%I		Hodina ve 12h formátu (01-12)\n%m		Měsíc, číslo (01-12)\n%M		Minuta (00-59)\n%p		AM / PM\n%S		Vteřina (00-61)\n%y		Rok, 2 poslední číslice (00-99)\n%Y		Rok\n%z		ISO 8601 časový posun od UTC nebo časového pásma\n		- název nebo zkratka\n%Z		Zkratka nebo název časového pásma\n"
+
 Basic.Settings.Video="Obraz"
 Basic.Settings.Video.Adapter="Grafická karta:"
 Basic.Settings.Video.BaseResolution="Základní rozlišení:"
@@ -383,9 +424,9 @@ Basic.Settings.Audio.DesktopDevice2="Zařízení zvuku plochy 2"
 Basic.Settings.Audio.AuxDevice="Zvukové zařízení - mikrofon/AUX"
 Basic.Settings.Audio.AuxDevice2="Zvukové zařízení - mikrofon/AUX 2"
 Basic.Settings.Audio.AuxDevice3="Zvukové zařízení - mikrofon/AUX 3"
-Basic.Settings.Audio.EnablePushToMute="Povolit \"Ztlumit podržením\""
+Basic.Settings.Audio.EnablePushToMute="Povolit Ztlumit podržením"
 Basic.Settings.Audio.PushToMuteDelay="Zpoždění"
-Basic.Settings.Audio.EnablePushToTalk="Povolit \"Naslouchat podržením\""
+Basic.Settings.Audio.EnablePushToTalk="Povolit Naslouchat podržením"
 Basic.Settings.Audio.PushToTalkDelay="Zpoždění"
 Basic.Settings.Audio.UnknownAudioDevice="[Zařízení není připojeno nebo není k dispozici]"
 
@@ -464,5 +505,5 @@ SceneItemShow="Zobrazit '%1'"
 SceneItemHide="Skrýt '%1'"
 
 OutputWarnings.NoTracksSelected="Musíte vybrat alespoň jednu stopu"
-OutputWarnings.MultiTrackRecording="Varování: Některé formáte (např. FLV) nepodporují více zvukových stop na nahrávku"
+OutputWarnings.MultiTrackRecording="Varování: Některé formáty (např. FLV) nepodporují více zvukových stop na nahrávku"
 

obs/data/locale/da-DK.ini

@@ -8,6 +8,7 @@ Cancel="Annuller"
 Close="Luk"
 Save="Gem"
 Discard="Kassér"
+Disable="Deaktiver"
 Yes="Ja"
 No="Nej"
 Add="Tilføj"
@@ -27,6 +28,9 @@ Browse="Browse"
 Mono="Mono"
 Stereo="Stereo"
 DroppedFrames="Taber frames %1 (%2%)"
+PreviewProjector="Fuldskærms projektering (forhåndsvisning)"
+SceneProjector="Fuldskærms projektering (scene)"
+SourceProjector="Fuldskærms projektering (kilde)"
 Clear="Ryd"
 Revert="Gendan"
 Show="Vis"
@@ -34,8 +38,31 @@ Hide="Skjul"
 Untitled="Ikke-navngivet"
 New="Ny"
 Duplicate="Dupliker"
+Enable="Slå til"
+DisableOSXVSync="Deaktiver OSX V-Sync"
+ResetOSXVSyncOnExit="Nulstil OSX V-Sync ved afslutning"
+HighResourceUsage="Encoding overbelastet! Overvej at skrue ned for videoindstillingerne eller brug et hurtigere encoding forvalg."
+Transition="Overgange"
+QuickTransitions="Hurtig overgange"
+Left="Venstre"
+Right="Højre"
+Top="Top"
+Bottom="Bund"
 
+QuickTransitions.SwapScenes="Byt om på forhåndsvisning/output scener efter overgang"
+QuickTransitions.DuplicateScene="Dupliker scene"
+QuickTransitions.EditProperties="Dupliker kilder"
+QuickTransitions.HotkeyName="Hurtig overgang: %1"
 
+Basic.AddTransition="Tilføj konfigurerbar overgang"
+Basic.RemoveTransition="Fjern konfigurerbar overgang"
+Basic.TransitionProperties="Overgangsegenskaber"
+Basic.SceneTransitions="Scene overgange"
+Basic.TransitionDuration="Varighed"
+Basic.TogglePreviewProgramMode="Studio tilstand"
+
+TransitionNameDlg.Text="Indtast venligst navnet på overgangen"
+TransitionNameDlg.Title="Overgangsnavn"
 
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scener"
@@ -46,20 +73,31 @@ NameExists.Text="Navnet er allerede i brug."
 NoNameEntered.Title="Indtast venligst et gyldigt navn"
 NoNameEntered.Text="Du kan ikke bruge tomme navne."
 
+ConfirmStart.Title="Start stream?"
+ConfirmStart.Text="Er du sikker på at du ønsker at starte streamen?"
 
+ConfirmStop.Title="Stop stream?"
+ConfirmStop.Text="Er du sikker på at du ønsker at stoppe streamen?"
 
 ConfirmExit.Title="Forlad OBS?"
+ConfirmExit.Text="OBS er aktiv i øjeblikket. Alle streams/optagelser vil blive lukket ned. Er du sikker på at du ønsker at afslutte?"
 
 ConfirmRemove.Title="Bekræfte fjern"
 ConfirmRemove.Text="Er du sikker på du ønsker at fjerne '$1'?"
 
 Output.ConnectFail.Title="Kunne ikke oprette forbindelse"
-Output.ConnectFail.BadPath="Ugyldig sti eller forbindelse URL.  Kontroller indstillinger for at bekræfte, at de er gyldige."
+Output.ConnectFail.BadPath="Ugyldig sti eller forbindelses URL.  Kontroller indstillinger for at bekræfte, at de er gyldige."
 Output.ConnectFail.ConnectFailed="Kunne ikke forbinde til server"
-Output.ConnectFail.InvalidStream="Kunne ikke få adgang til den angivne kanal eller stream nøgle.  Dette kunne være fordi nøglen/kanalen er ugyldige, eller fordi serveren stadig tror, du er logget ind."
+Output.ConnectFail.InvalidStream="Kunne ikke tilgå den angivne kanel eller streamnøgle, kontroller venligst din streamnøgle. Hvis den er korrekt kan der være problemer med at forbinde til serveren."
 Output.ConnectFail.Error="Der opstod en uventet fejl, da du forsøgte at oprette forbindelse til serveren.  Du kan finde flere oplysninger i logfilen."
 Output.ConnectFail.Disconnected="Afbrudt fra serveren."
 
+Output.RecordFail.Title="Kunne ikke begynde optagelsen"
+Output.RecordFail.Unsupported="Outputformatet er enten ikke understøttet eller understøtter ikke mere end ét lydspor. Tjek venligst dine indstillinger og prøv igen."
+Output.RecordNoSpace.Title="Utilstrækkelig diskplads"
+Output.RecordNoSpace.Msg="Der er ikke tilstrækkelig diskplads til at fortsætte optagelsen."
+Output.RecordError.Title="Optagelsesfejl"
+Output.RecordError.Msg="Der opstod en uangivet fejl under optagelsen."
 
 Output.BadPath.Title="Dårlig filsti"
 Output.BadPath.Text="Den konfigureret output sti er ugyldig. Kontroller indstillinger for at bekræfte, at en gyldig filsti er angivet."
@@ -77,7 +115,6 @@ LicenseAgreement.Exit="Afslut"
 Remux.SourceFile="OBS optagelse"
 Remux.TargetFile="Destinationsfil"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS optagelse (*.flv)"
 Remux.FinishedTitle="Remuxing færdigt"
 Remux.Finished="Optagelse remuxed"
 Remux.FinishedError="Optagelse remuxed, men filen kan være ufuldstændige"
@@ -103,33 +140,65 @@ Basic.DisplayCapture="Indfang display"
 
 Basic.Main.PreviewConextMenu.Enable="Aktiver visning"
 
+Deinterlacing="Deinterlacing"
+Deinterlacing.Discard="Kassér"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Linear="Lineær"
+Deinterlacing.Linear2x="Lineær 2x"
+
 Basic.Main.AddSceneDlg.Title="Tilføje scene"
 Basic.Main.AddSceneDlg.Text="Angiv navnet på scene"
 
 Basic.Main.DefaultSceneName.Text="Scene %1"
 
+Basic.Main.AddSceneCollection.Title="Tilføj scenesamling"
+Basic.Main.AddSceneCollection.Text="Indtast venligst navnet på scenesamlingen"
 
+Basic.Main.RenameSceneCollection.Title="Omdøb scenesamling"
 
+AddProfile.Title="Tilføj profil"
+AddProfile.Text="Indtast venligst profilens navn"
 
+RenameProfile.Title="Omdøb profil"
 
+Basic.Main.PreviewDisabled="Forhåndsvisning er i øjeblikket deaktiveret"
 
 Basic.SourceSelect="Opret/Vælg kilde"
 Basic.SourceSelect.CreateNew="Opret ny"
 Basic.SourceSelect.AddExisting="Tilføj eksisterende"
+Basic.SourceSelect.AddVisible="Gør kilden synlig"
 
 Basic.PropertiesWindow="Egenskaber for '%1'"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (auto-vælg: %2)"
 Basic.PropertiesWindow.SelectColor="Vælg farve"
 Basic.PropertiesWindow.SelectFont="Vælg skrifttype"
 Basic.PropertiesWindow.ConfirmTitle="Indstillinger ændret"
 Basic.PropertiesWindow.Confirm="Der er ændringer, som ikke er gemt.  Vil du gerne beholde dem?"
 Basic.PropertiesWindow.NoProperties="Ingen egenskaber tilgængelige"
+Basic.PropertiesWindow.AddFiles="Tilføj filer"
+Basic.PropertiesWindow.AddURL="Tilføj sti/url"
+Basic.PropertiesWindow.AddEditableListFiles="Tilføj filer til '%1'"
+Basic.PropertiesWindow.AddEditableListEntry="Tilføj emne til '%1'"
+Basic.PropertiesWindow.EditEditableListEntry="Rediger emne fra '%1'"
 
+Basic.PropertiesView.FPS.Simple="Simple FPS værdier"
+Basic.PropertiesView.FPS.Rational="Rationelle FPS værdier"
+Basic.PropertiesView.FPS.ValidFPSRanges="Gyldige FPS områder:"
 
 Basic.InteractionWindow="Interagere med '%1'"
 
+Basic.StatusBar.Reconnecting="Afbrudt, tilslutter igen om %2 sekund(er) (forsøg %1)"
+Basic.StatusBar.AttemptingReconnect="Prøver at forbinde igen... (forsøg %1)"
 Basic.StatusBar.ReconnectSuccessful="Gentilslutning vellykket"
+Basic.StatusBar.Delay="Forsinkelse (%1 sek)"
+Basic.StatusBar.DelayStartingIn="Forsinkelse (starter om %1 sek)"
+Basic.StatusBar.DelayStoppingIn="Forsinkelse (stopper om %1 sek)"
+Basic.StatusBar.DelayStartingStoppingIn="Forsinkelse (stopper om %1 sek, starter om %2 sek)"
 
 Basic.Filters="Filtre"
+Basic.Filters.AsyncFilters="Lyd/video filtre"
+Basic.Filters.AudioFilters="Lyd filter"
+Basic.Filters.EffectFilters="Effektfiltre"
 Basic.Filters.Title="Filtre for '%1'"
 Basic.Filters.AddFilter.Title="Filternavn"
 Basic.Filters.AddFilter.Text="Angiv navnet på filteret"
@@ -142,6 +211,7 @@ Basic.TransformWindow.Alignment="Positionelle justering"
 Basic.TransformWindow.BoundsType="Afgrænsning Rammen Boks Type"
 Basic.TransformWindow.BoundsAlignment="Justering i afgrænsningsområdet"
 Basic.TransformWindow.Bounds="Afgrænsning Rammen boksstørrelse"
+Basic.TransformWindow.Crop="Beskær"
 
 Basic.TransformWindow.Alignment.TopLeft="Øverst til venstre"
 Basic.TransformWindow.Alignment.TopCenter="Top Center"
@@ -171,6 +241,7 @@ Basic.Main.StartRecording="Start optagelse"
 Basic.Main.StartStreaming="Start streaming"
 Basic.Main.StopRecording="Stop optagelse"
 Basic.Main.StopStreaming="Stop streaming"
+Basic.Main.ForceStopStreaming="Stop streaming (ignorer forsinkelse)"
 
 Basic.MainMenu.File="&Fil"
 Basic.MainMenu.File.Export="&Eksport"
@@ -178,6 +249,9 @@ Basic.MainMenu.File.Import="&Import"
 Basic.MainMenu.File.ShowRecordings="Vis optagelse&r"
 Basic.MainMenu.File.Remux="Re&mux optagelser"
 Basic.MainMenu.File.Settings="Indstillinger (&S)"
+Basic.MainMenu.File.ShowSettingsFolder="Vis indstillings-mappen"
+Basic.MainMenu.File.ShowProfileFolder="Vis profil-mappe"
+Basic.MainMenu.AlwaysOnTop="&Altid øverst"
 Basic.MainMenu.File.Exit="Afslut (&X)"
 
 Basic.MainMenu.Edit="Redigere (&E)"
@@ -203,12 +277,16 @@ Basic.MainMenu.Edit.Order.MoveToTop="Flyt til &Toppen"
 Basic.MainMenu.Edit.Order.MoveToBottom="Flyt til &Bunden"
 Basic.MainMenu.Edit.AdvAudio="&Avancerede lydegenskaber"
 
+Basic.MainMenu.SceneCollection="&Scenesamling"
+Basic.MainMenu.Profile="&Profil"
 
 Basic.MainMenu.Help="&Hjælp"
+Basic.MainMenu.Help.Website="Besøg &websted"
 Basic.MainMenu.Help.Logs="&Logfiler"
 Basic.MainMenu.Help.Logs.ShowLogs="Vis log-filer (&S)"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Upload Aktuelle logfil (&C)"
 Basic.MainMenu.Help.Logs.UploadLastLog="Upload Sidste logfil (&L)"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vis aktuel logfil"
 Basic.MainMenu.Help.CheckForUpdates="Tjek for opdateringer"
 
 Basic.Settings.ProgramRestart="Programmet skal genstartes, før disse indstillinger træder i kraft."
@@ -218,24 +296,43 @@ Basic.Settings.Confirm="Du har ugemte ændringer.  Skal ændringerne gemmes?"
 Basic.Settings.General="Generelt"
 Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Sprog"
+Basic.Settings.General.WarnBeforeStartingStream="Vis bekræftelses-dialog ved opstart af stream"
+Basic.Settings.General.WarnBeforeStoppingStream="Vis bekræftelses-dialog ved afslutning af stream"
+Basic.Settings.General.Snapping="Kilde justeringsfastgørelse"
+Basic.Settings.General.ScreenSnapping="Fastgør kilder til kanten af skærmen"
+Basic.Settings.General.CenterSnapping="Fastgør kilder til horisontalt og vertikalt centrum"
+Basic.Settings.General.SourceSnapping="Fastgør kilder til andre kilder"
+Basic.Settings.General.SnapDistance="Fastgørings-følsomhed"
 
 Basic.Settings.Stream="Stream"
-Basic.Settings.Stream.StreamType="Stream Type"
+Basic.Settings.Stream.StreamType="Streamtype"
 
 Basic.Settings.Output="Output"
+Basic.Settings.Output.Format="Optagelsesformat"
 Basic.Settings.Output.Encoder="Encoder"
 Basic.Settings.Output.SelectDirectory="Vælg optagelsesmappe"
 Basic.Settings.Output.SelectFile="Vælg optagelsesfil"
-Basic.Settings.Output.Mode="Output Mode"
+Basic.Settings.Output.EnforceBitrate="Håndhæv streaming service bitrate grænser"
+Basic.Settings.Output.Mode="Output tilstand"
 Basic.Settings.Output.Mode.Simple="Simpel"
 Basic.Settings.Output.Mode.Adv="Avanceret"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg output"
+Basic.Settings.Output.Simple.SavePath="Optagelsessti"
+Basic.Settings.Output.Simple.RecordingQuality="Optagelseskvalitet"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Samme som stream"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Høj kvalitet, medium filstørrelse"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Samme kvalitet, stor filstørrelse"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Tabsfri kvalitet, utrolig stor filstørrelse"
+Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
 Basic.Settings.Output.Reconnect="Automatisk Reconnect"
 Basic.Settings.Output.RetryDelay="Retry forsinkelse (sekunder)"
 Basic.Settings.Output.MaxRetries="Maksimum forsøg"
-Basic.Settings.Output.Advanced="Aktivere avancerede Encoder indstillinger"
+Basic.Settings.Output.Advanced="Aktiver avancerede Encoder indstillinger"
+Basic.Settings.Output.NoSpaceFileName="Opret filnavne uden mellemrum"
 
 Basic.Settings.Output.Adv.Rescale="Om-skalere output"
 Basic.Settings.Output.Adv.AudioTrack="Lydspor"
@@ -249,13 +346,36 @@ Basic.Settings.Output.Adv.Audio.Track4="Spor 4"
 Basic.Settings.Output.Adv.Recording="Optagelse"
 Basic.Settings.Output.Adv.Recording.Type="Type"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Tilpasset output (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Brug stream encoder)"
+Basic.Settings.Output.Adv.Recording.Filename="Filnavnsformatering"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Overskriv hvis filen eksisterer"
+Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg outputtype"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Output til URL"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Output til fil"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alle filer"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Filsti eller URL"
+Basic.Settings.Output.Adv.FFmpeg.Format="Containerformat"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Lyd"
+Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Standard format"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Standard encoder"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Deaktiver encoder"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Video encoder"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Video encoder indstillinger (hvis nogen)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Lyd encoder"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Lyd encoder indstillinger (hvis nogen)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer indstillinger (hvis nogen)"
+
+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"
+
+FilenameFormatting.TT="%CCYY		år, fire cifre\n%YY		år, sidste to cifre (00-99)\n%MM		måned som tal (01-12)\n%DD		dag i måneden, foranstillet nul (01-31)\n%hh		time i 24t format (00-23)\n%mm		minut (00-59)\n%ss		sekund (00-61)\n%%		et % tegn\n%a		forkortet ugedagsnavn\n%A		helt ugedagsnavn\n%b		forkortet månedsnavn\n%B		helt månedsnavn\n%d		dag i åneden, foranstillet nul (01-31)\n%H		time i 24t format (00-23)\n%I		time i 12t format (01-12)\n%m		måned som et tal (01-12)\n%M		minut (00-59)\n%p		am eller pm angivelse\n%S		sekund (00-61)\n%y		år, sidste to cifre (00-99)\n%Y		år\n%z		ISO 8601 offset fra UTC eller tidszone\n		navn eller forkortelse\n%Z		tidszone navn eller forkortelse\n"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Skærmkort:"
-Basic.Settings.Video.DownscaleFilter="Nedskalere Filter:"
+Basic.Settings.Video.BaseResolution="Grund (lærred) opløsning:"
+Basic.Settings.Video.ScaledResolution="Output (skaleret) opløsning:"
+Basic.Settings.Video.DownscaleFilter="Nedskaleringsfilter:"
 Basic.Settings.Video.DisableAeroWindows="Deaktivere Aero (kun Windows)"
 Basic.Settings.Video.FPS="FPS:"
 Basic.Settings.Video.FPSCommon="Fælles FPS værdier"
@@ -266,7 +386,11 @@ Basic.Settings.Video.Denominator="Nævneren:"
 Basic.Settings.Video.Renderer="Renderer:"
 Basic.Settings.Video.InvalidResolution="Ugyldig opløsningsværdi.  Skal være [bredde] x [højde] (dvs. 1920 x 1080)"
 Basic.Settings.Video.CurrentlyActive="Video output er aktiv i øjeblikket.  Venligst slukke eventuelle udgange til at ændre videoindstillinger."
+Basic.Settings.Video.DisableAero="Deaktiver Aero"
 
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinear (hurtigst, men sløret ved skalering)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Skarp skalering, 16 prøver)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Skarp skalering, 32 prøver)"
 
 Basic.Settings.Audio="Lyd"
 Basic.Settings.Audio.SampleRate="Sample Rate"
@@ -276,6 +400,9 @@ Basic.Settings.Audio.DesktopDevice2="Desktop lydenhed 2"
 Basic.Settings.Audio.AuxDevice="Mic/Auxiliary lydenhed"
 Basic.Settings.Audio.AuxDevice2="Mic/Auxiliary lydenhed 2"
 Basic.Settings.Audio.AuxDevice3="Mic/Auxiliary lydenhed 3"
+Basic.Settings.Audio.EnablePushToMute="Aktiver tryk-for-stilhed"
+Basic.Settings.Audio.EnablePushToTalk="Aktiver tryk-for-tale"
+Basic.Settings.Audio.UnknownAudioDevice="[Enhed ikke tilsluttet eller ikke tilgængelig]"
 
 Basic.Settings.Advanced="Avanceret"
 Basic.Settings.Advanced.Video.ColorFormat="Farveformat"
@@ -283,6 +410,9 @@ Basic.Settings.Advanced.Video.ColorSpace="YUV farverum"
 Basic.Settings.Advanced.Video.ColorRange="YUV farveområde"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Delvis"
 Basic.Settings.Advanced.Video.ColorRange.Full="Fuld"
+Basic.Settings.Advanced.StreamDelay="Stream forsinkelse"
+Basic.Settings.Advanced.StreamDelay.Duration="Varighed (sekunder)"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Anslået hukommelsesbrug: %1 MB"
 
 Basic.AdvAudio="Avancerede lydegenskaber"
 Basic.AdvAudio.Name="Navn"
@@ -290,9 +420,56 @@ Basic.AdvAudio.Volume="Volumen (%)"
 Basic.AdvAudio.Panning="Panorering"
 Basic.AdvAudio.AudioTracks="Spor"
 
-
+Basic.Settings.Hotkeys="Genvejstaster"
-
+
-
+Basic.Hotkeys.StartStreaming="Start streaming"
-
+Basic.Hotkeys.StopStreaming="Stop streaming"
+Basic.Hotkeys.StartRecording="Start optagelse"
+Basic.Hotkeys.StopRecording="Stop optagelse"
+Basic.Hotkeys.SelectScene="Skift til scene"
+
+Hotkeys.Insert="Insert"
+Hotkeys.Delete="Delete"
+Hotkeys.Home="Home"
+Hotkeys.End="End"
+Hotkeys.PageUp="Page up"
+Hotkeys.PageDown="Page Down"
+Hotkeys.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
+Hotkeys.CapsLock="Caps Lock"
+Hotkeys.Backspace="Backspace"
+Hotkeys.Tab="Tab"
+Hotkeys.Print="Print"
+Hotkeys.Pause="Pause"
+Hotkeys.Left="Venstre"
+Hotkeys.Right="Højre"
+Hotkeys.Up="Op"
+Hotkeys.Down="Ned"
+Hotkeys.Windows="Windows"
+Hotkeys.Super="Super"
+Hotkeys.Menu="Menu"
+Hotkeys.Space="Mellemrum"
+Hotkeys.NumpadNum="Numerisk %1"
+Hotkeys.NumpadMultiply="Numeriske tastatur gange"
+Hotkeys.NumpadDivide="Numeriske tastatur dividere"
+Hotkeys.NumpadAdd="Numeriske tastatur plus"
+Hotkeys.NumpadSubtract="Numeriske tastatur minus"
+Hotkeys.NumpadDecimal="Numeriske tastatur komma"
+Hotkeys.AppleKeypadNum="%1 (numeriske tastatur)"
+Hotkeys.AppleKeypadMultiply="* (numeriske tastatur)"
+Hotkeys.AppleKeypadDivide="/ (numeriske tastatur)"
+Hotkeys.AppleKeypadAdd="+ (numeriske tastatur)"
+Hotkeys.AppleKeypadSubtract="- (numeriske tastatur)"
+Hotkeys.AppleKeypadDecimal=", (numeriske tastatur)"
+Hotkeys.AppleKeypadEqual="= (numeriske tastatur)"
+Hotkeys.MouseButton="Mus %1"
+
+Mute="Lyd fra"
+Unmute="Lyd til"
+Push-to-mute="Tryk-for-lydløs"
+Push-to-talk="Tryk-for-tale"
+
+SceneItemShow="Vis '%1'"
+SceneItemHide="Skjul '%1'"
 
 

obs/data/locale/de-DE.ini

@@ -8,6 +8,7 @@ Cancel="Abbrechen"
 Close="Schließen"
 Save="Speichern"
 Discard="Verwerfen"
+Disable="Deaktivieren"
 Yes="Ja"
 No="Nein"
 Add="Hinzufügen"
@@ -30,37 +31,47 @@ DroppedFrames="Verworfene Frames %1 (%2%)"
 PreviewProjector="Vollbild-Projektor (Vorschau)"
 SceneProjector="Vollbild-Projektor (Szene)"
 SourceProjector="Vollbild-Projektor (Quelle)"
-Clear="Leeren"
+Clear="Entfernen"
 Revert="Wiederherstellen"
-Show="Zeigen"
+Show="Anzeigen"
 Hide="Ausblenden"
 Untitled="Unbenannt"
 New="Neu"
-Duplicate="Duplizieren"
+Duplicate="Klonen"
 Enable="Aktivieren"
 DisableOSXVSync="OSX V-Sync deaktivieren"
-ResetOSXVSyncOnExit="Zurücksetzen von OSX V-Sync beim Beenden"
+ResetOSXVSyncOnExit="OSX V-Sync beim Beenden zurücksetzen"
-HighResourceUsage="Kodierung überladet! Erwägen Sie Ihre Video-Einstellungen zu verringen, oder benutzen Sie eine schnellere Encoder-Voreinstellung."
+HighResourceUsage="Kodierung überlastet! Erwägen Sie Ihre Video-Einstellungen zu verringern, oder benutzen Sie eine schnellere Encoder-Voreinstellung."
 Transition="Übergang"
 QuickTransitions="Schnelle Übergänge"
+Left="Links"
+Right="Rechts"
+Top="Oben"
+Bottom="Unten"
 
-QuickTransitions.SwapScenes="Tausche Vorschau/Ausgabe-Szenen, nach dem Übergang"
+QuickTransitions.SwapScenes="Tausche Vorschau/Ausgabe-Szenen nach dem Übergang"
-QuickTransitions.SwapScenesTT="Vertauscht die Vorschau- und Ausgabe-Szenen beim Übergang (wenn die ursprüngliche Ausgabe-Szene noch vorhanden ist).\nBeachten Sie, dass dies nicht Änderungen, die in der Originalszene der Ausgabe vorgenommen wurden, rückgängig machen wird."
+QuickTransitions.SwapScenesTT="Vertauscht die Vorschau- und Ausgabe-Szenen nach dem Übergang (falls die ursprüngliche Ausgabe-Szene noch vorhanden ist).\nEventuelle Änderungen an der original Ausgabe-Szene werden hierbei nicht rückgängig gemacht."
 QuickTransitions.DuplicateScene="Dupliziere Szene"
-QuickTransitions.DuplicateSceneTT="Ermöglicht das bearbeiten von Transformation/Sichtbarkeit von Quellen, ohne die Ausgabe zu verändern, wenn dieselbe Szene bearbeitet wird.\nUm die Eigenschaften von Quellen zu bearbeiten, ohne die Ausgabe zu verändern, aktivieren Sie 'Dupliziere Quellen'.\nDas ändern dieses Wertes, wird die derzeitige Ausgabe-Szene zurücksetzen (falls sie noch existiert)."
+QuickTransitions.DuplicateSceneTT="Ermöglicht das Bearbeiten von Transformationen und der Sichtbarkeit von Quellen, ohne die Ausgabe zu verändern, wenn dieselbe Szene bearbeitet wird.\nAktivieren Sie 'Dupliziere Szene' um die Eigenschaften von Quellen zu bearbeiten, ohne die Ausgabe zu verändern.\nDas Ändern dieses Wertes wird die derzeitige Ausgabe-Szene zurücksetzen (falls sie noch existiert)."
 QuickTransitions.EditProperties="Dupliziere Quellen"
-QuickTransitions.EditPropertiesTT="Ermöglicht das bearbeiten der Eigenschaften von Quellen, ohne die Ausgabe zu verändern, wenn dieselbe Szene bearbeitet wird.\nDies kann nur benutzt werden, wenn 'Dupliziere Szene' aktiviert ist.\nBestimmte Quellen (wie Aufnahme- oder Medienquellen) unterstützen dies nicht und können nicht separat bearbeitet werden.\n Das ändern dieses Wertes, wird die derzeitige Ausgabe-Szene zurücksetzen (falls sie noch existiert).\n\nWarnung: Da Quellen dupliziert werden, könnte dies zusätzliche System- oder Videoresourcen verbrauchen."
+QuickTransitions.EditPropertiesTT="Ermöglicht das Bearbeiten der Eigenschaften von Quellen, ohne die Ausgabe zu verändern, wenn dieselbe Szene bearbeitet wird.\nDies kann nur verwendet werden, wenn 'Dupliziere Szene' aktiviert ist.\nBestimmte Quellen (wie Aufnahme- oder Medienquellen) unterstützen dies nicht und können nicht separat bearbeitet werden.\n Das Ändern dieses Wertes wird die derzeitige Ausgabe-Szene zurücksetzen (falls sie noch existiert).\n\nWarnung: Da Quellen dupliziert werden, könnte dies zusätzliche System- oder Videoressourcen verbrauchen."
 QuickTransitions.HotkeyName="Schneller Übergang: %1"
 
+Basic.AddTransition="Konfigurierbaren Übergang hinzufügen"
+Basic.RemoveTransition="Konfigurierbaren Übergang entfernen"
+Basic.TransitionProperties="Übergangseigenschaften"
 Basic.SceneTransitions="Szenenübergänge"
 Basic.TransitionDuration="Dauer"
 Basic.TogglePreviewProgramMode="Studio-Modus"
 
+TransitionNameDlg.Text="Bitte geben Sie den Namen des Übergangs ein"
+TransitionNameDlg.Title="Übergangsname"
+
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Szenen"
 
 NameExists.Title="Name existiert bereits"
-NameExists.Text="Name wird bereits verwendet."
+NameExists.Text="Dieser Name wird bereits verwendet."
 
 NoNameEntered.Title="Bitte geben Sie einen gültigen Namen ein"
 NoNameEntered.Text="Sie können leere Namen nicht verwenden."
@@ -72,15 +83,15 @@ ConfirmStop.Title="Stream stoppen?"
 ConfirmStop.Text="Sind Sie sicher, dass Sie den Stream beenden möchten?"
 
 ConfirmExit.Title="OBS beenden?"
-ConfirmExit.Text="OBS ist derzeit aktiv.  Alle Streams/Aufnahmen werden heruntergefahren.  Sind Sie sicher, dass Sie OBS beenden möchten?"
+ConfirmExit.Text="OBS ist derzeit aktiv.  Alle Streams/Aufnahmen werden beendet. Sind Sie sicher, dass Sie OBS beenden möchten?"
 
 ConfirmRemove.Title="Entfernen bestätigen"
 ConfirmRemove.Text="Sind Sie sicher, dass Sie '$1' entfernen möchten?"
 
 Output.ConnectFail.Title="Verbindung fehlgeschlagen"
-Output.ConnectFail.BadPath="Ungültiger Pfad oder Verbindungs-URL. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass sie gültig sind."
+Output.ConnectFail.BadPath="Ungültiger Pfad oder Verbindungs-URL. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass diese korrekt sind."
 Output.ConnectFail.ConnectFailed="Verbindung zum Server fehlgeschlagen"
-Output.ConnectFail.InvalidStream="Konnte auf den angegebenen Kanal oder Streamschlüssel nicht zugreifen. Dies kann daran liegen, dass der Schlüssel oder Kanal ungültig ist, oder der Server noch denkt, dass Sie angemeldet sind."
+Output.ConnectFail.InvalidStream="Konnte nicht auf den angegebenen Kanal oder Stream-Key zugreifen. Bitte überprüfen Sie den eingegebenen Stream-Key. Wenn er richtig ist, kann es ein Problem beim Verbinden mit dem Server gegeben haben."
 Output.ConnectFail.Error="Ein unerwarteter Fehler ist beim Verbindungsversuch zum Server aufgetreten. Mehr Informationen finden Sie in der Logdatei."
 Output.ConnectFail.Disconnected="Verbindung zum Server getrennt."
 
@@ -89,7 +100,7 @@ Output.RecordFail.Unsupported="Das Ausgabeformat wird entweder nicht unterstütz
 Output.RecordNoSpace.Title="Nicht genügend Speicherplatz"
 Output.RecordNoSpace.Msg="Es gibt nicht genügend Speicherplatz, um die Aufnahme fortzusetzen."
 Output.RecordError.Title="Aufnahmefehler"
-Output.RecordError.Msg="Ein unbekannter Fehler ist aufgetreten, während der Aufnahme."
+Output.RecordError.Msg="Während der Aufnahme ist ein unbekannter Fehler aufgetreten."
 
 Output.BadPath.Title="Ungültiger Dateipfad"
 Output.BadPath.Text="Der konfigurierte Ausgabepfad ist ungültig. Bitte überprüfen Sie Ihre Einstellungen und stellen Sie sicher, dass ein gültiger Pfad angegeben wurde."
@@ -99,7 +110,7 @@ LogReturnDialog.CopyURL="URL kopieren"
 LogReturnDialog.ErrorUploadingLog="Fehler beim Upload der Logdatei"
 
 LicenseAgreement="Lizenzvereinbarung"
-LicenseAgreement.PleaseReview="Bitte lesen Sie die Lizenzbedingungen vor der Verwendung von OBS.  Mit dem verwenden dieses Programms, bestätigen Sie, dass Sie diese gelesen haben und den Bedingungen der <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a> zustimmen. Bitte scrollen Sie nach unten, um den Rest der Vereinbarung zu sehen."
+LicenseAgreement.PleaseReview="Bitte lesen Sie die Lizenzbedingungen vor der Verwendung von OBS.  Mit der Verwendung dieses Programms bestätigen Sie, dass Sie diese gelesen haben und den Bedingungen der <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a> zustimmen. Bitte scrollen Sie nach unten, um den Rest der Vereinbarung zu sehen."
 LicenseAgreement.ClickIAgreeToContinue="Wenn Sie die Vereinbarung akzeptieren, klicken Sie auf ich stimme zu, um fortzufahren.  Sie müssen akzeptieren, um OBS verwenden zu können."
 LicenseAgreement.IAgree="Ich stimme zu"
 LicenseAgreement.Exit="Beenden"
@@ -107,10 +118,10 @@ LicenseAgreement.Exit="Beenden"
 Remux.SourceFile="OBS Aufnahme"
 Remux.TargetFile="Zieldatei"
 Remux.Remux="Remuxen"
-Remux.RecordingPattern="OBS Aufnahme (*.flv)"
+Remux.OBSRecording="OBS Aufnahme"
 Remux.FinishedTitle="Remuxen beendet"
 Remux.Finished="Aufnahme remuxed"
-Remux.FinishedError="Aufnahme remuxed, aber die Datei kann unvollständig sein"
+Remux.FinishedError="Aufnahme remuxed, aber die Datei könnte unvollständig sein"
 Remux.SelectRecording="Wählen Sie die OBS Aufnahme aus …"
 Remux.SelectTarget="Wähle Zieldatei …"
 Remux.FileExistsTitle="Zieldatei ist bereits vorhanden"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="Monitoraufnahme"
 
 Basic.Main.PreviewConextMenu.Enable="Vorschau aktivieren"
 
+Deinterlacing="Zeilenentflechtung (Deinterlacing)"
+Deinterlacing.Discard="Verwerfen"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Oberes Feld zuerst"
+Deinterlacing.BottomFieldFirst="Unteres Feld zuerst"
+
 Basic.Main.AddSceneDlg.Title="Szene hinzufügen"
 Basic.Main.AddSceneDlg.Text="Bitte geben Sie einen Namen für die Szene ein"
 
@@ -155,7 +178,7 @@ Basic.SourceSelect.CreateNew="Neu erstellen"
 Basic.SourceSelect.AddExisting="Existierende hinzufügen"
 Basic.SourceSelect.AddVisible="Quelle sichtbar machen"
 
-Basic.PropertiesWindow="Eigenschaften für '%1'"
+Basic.PropertiesWindow="Eigenschaften von '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (automatisch ausgewählt: %2)"
 Basic.PropertiesWindow.SelectColor="Farbe auswählen"
 Basic.PropertiesWindow.SelectFont="Schriftart auswählen"
@@ -176,7 +199,7 @@ Basic.InteractionWindow="Interagiere mit '%1'"
 
 Basic.StatusBar.Reconnecting="Verbindung getrennt; Verbindungsversuch %1 in %2 Sekunde(n)"
 Basic.StatusBar.AttemptingReconnect="Versuche die Verbindung wiederherzustellen ... (Versuch %1)"
-Basic.StatusBar.ReconnectSuccessful="Wiederverbindung erfolgreich"
+Basic.StatusBar.ReconnectSuccessful="Wiederverbinden erfolgreich"
 Basic.StatusBar.Delay="Verzögerung (%1 s)"
 Basic.StatusBar.DelayStartingIn="Verzögerung (starte in %1 s)"
 Basic.StatusBar.DelayStoppingIn="Verzögerung (stoppe in %1 s)"
@@ -194,10 +217,11 @@ Basic.TransformWindow="Szenen-Element-Transformation"
 Basic.TransformWindow.Position="Position"
 Basic.TransformWindow.Rotation="Drehung"
 Basic.TransformWindow.Size="Größe"
-Basic.TransformWindow.Alignment="Positionelle Ausrichtung"
+Basic.TransformWindow.Alignment="Ausrichtung"
 Basic.TransformWindow.BoundsType="Bounding Box Typ"
 Basic.TransformWindow.BoundsAlignment="Ausrichtung in Bounding Box"
 Basic.TransformWindow.Bounds="BoundingBox Größe"
+Basic.TransformWindow.Crop="Zuschneiden"
 
 Basic.TransformWindow.Alignment.TopLeft="Oben links"
 Basic.TransformWindow.Alignment.TopCenter="Oben in der Mitte"
@@ -227,7 +251,7 @@ Basic.Main.StartRecording="Aufnahme starten"
 Basic.Main.StartStreaming="Streaming starten"
 Basic.Main.StopRecording="Aufnahme stoppen"
 Basic.Main.StopStreaming="Streaming stoppen"
-Basic.Main.ForceStopStreaming="Streaming stoppen (verwerfe Verzögerung)"
+Basic.Main.ForceStopStreaming="Streaming stoppen (Verzögerung verwerfen)"
 
 Basic.MainMenu.File="Datei (&F)"
 Basic.MainMenu.File.Export="&Exportieren"
@@ -284,6 +308,11 @@ Basic.Settings.General.Theme="Motiv"
 Basic.Settings.General.Language="Sprache"
 Basic.Settings.General.WarnBeforeStartingStream="Bestätigungsdialog beim Streamstart anzeigen"
 Basic.Settings.General.WarnBeforeStoppingStream="Bestätigungsdialog beim Streamstop anzeigen"
+Basic.Settings.General.Snapping="Quellenausrichtung"
+Basic.Settings.General.ScreenSnapping="Quellen am Bildschirmrand ausrichten"
+Basic.Settings.General.CenterSnapping="Quellen zur horizontalen und vertikalen Mitte ausrichten"
+Basic.Settings.General.SourceSnapping="Quellen an anderen Quellen ausrichten"
+Basic.Settings.General.SnapDistance="Ausrichtungsempfindlichkeit"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Stream Typ"
@@ -293,6 +322,7 @@ Basic.Settings.Output.Format="Aufnahmeformat"
 Basic.Settings.Output.Encoder="Encoder"
 Basic.Settings.Output.SelectDirectory="Wählen Sie das Aufnahmeverzeichnis"
 Basic.Settings.Output.SelectFile="Wählen Sie die Aufnahmedatei"
+Basic.Settings.Output.EnforceBitrate="Erzwinge Bitratenlimit des Streamingdiensts"
 Basic.Settings.Output.Mode="Ausgabemodus"
 Basic.Settings.Output.Mode.Simple="Einfach"
 Basic.Settings.Output.Mode.Adv="Erweitert"
@@ -303,18 +333,23 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Gleiche wie Stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Hohe Qualität, mittelgroße Dateien"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Ununterscheidbare Qualität, große Dateien"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Verlustfreie Qualität, enorm große Dateien"
-Basic.Settings.Output.Simple.Warn.Encoder="Achtung: Aufnahmen mit einem Software-Encoder mit einer anderen Qualität als der Stream, wird zusätzliche CPU-Auslastung erfordern, wenn Sie gleichzeitig streamen und aufzeichnen."
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Warnung: Die Videobitrate beim streamen wird auf %1 festlegt, was der Obergrenze des aktuellen Streamingdiensts entspricht.  Falls Sie sicher sind, dass Sie %1 überschreiten wollen, deaktivieren Sie \"Erzwinge Bitratenlimit des Streamingdiensts\" in den erweiterten Encodereinstellungen."
-Basic.Settings.Output.Simple.Warn.Lossless="Warnung: Verlustfreie Qualität erzeugt enorm großen Dateigrößen!  Verlustfreie Qualität, kann mehr als 7 Gigabyte Speicherplatz pro Minute, bei hohen Auflösungen und Frameraten in Anspruch nehmen.  Verlustfrei ist für lange Aufnahmen nicht empfohlen, es sei denn, Sie haben eine sehr große Menge an Speicherplatz zur Verfügung."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Warnung: Die Audiobitrate beim streamen wird auf %1 festlegt, was der Obergrenze des aktuellen Streamingdiensts entspricht.  Falls Sie sicher sind, dass Sie %1 überschreiten wollen, deaktivieren Sie \"Erzwinge Bitratenlimit des Streamingdiensts\" in den erweiterten Encodereinstellungen."
+Basic.Settings.Output.Simple.Warn.Encoder="Warnung: Mit einem Software-Encoder in einer anderen Qualität als der des Stream aufzunehmen wird zusätzliche CPU-Auslastung erzeugen, wenn Sie gleichzeitig streamen und aufzeichnen."
+Basic.Settings.Output.Simple.Warn.Lossless="Warnung: Verlustfreie Qualität erzeugt enorm große Dateien!  Verlustfreie Qualität, kann mehr als 7 Gigabyte Speicherplatz pro Minute, bei hohen Auflösungen und Frameraten in Anspruch nehmen.  Verlustfrei ist für lange Aufnahmen nicht empfohlen, es sei denn, Sie haben eine sehr große Menge an Speicherplatz zur Verfügung."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sind Sie sicher, dass Sie verlustfreie Qualität verwenden möchten?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Verlustfreie Qualität-Warnung!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Achtung: Sie können nicht mehrere separate QSV-Encoder beim streamen und aufnehmen gleichzeitig verwenden.  Wenn Sie zur gleichen Zeit streamen und aufnehmen möchten, dann ändern Sie bitte entweder den Aufnahme-Encoder oder den Stream-Encoder."
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 niedrige CPU-Auslastung Voreinstellung, erhöht die Dateigröße)"
-Basic.Settings.Output.VideoBitrate="Video-Bitrate"
+Basic.Settings.Output.VideoBitrate="Videobitrate"
-Basic.Settings.Output.AudioBitrate="Audio-Bitrate"
+Basic.Settings.Output.AudioBitrate="Audiobitrate"
 Basic.Settings.Output.Reconnect="Automatisch wiederverbinden"
 Basic.Settings.Output.RetryDelay="Wiederverbindungsverzögerung (Sekunden)"
 Basic.Settings.Output.MaxRetries="Maximale Wiederholungsversuche"
-Basic.Settings.Output.Advanced="Erweiterte Encoder-Einstellungen aktivieren"
+Basic.Settings.Output.Advanced="Erweiterte Encodereinstellungen aktivieren"
 Basic.Settings.Output.EncoderPreset="Encoder-Voreinstellung (höher = weniger CPU Auslastung)"
 Basic.Settings.Output.CustomEncoderSettings="Benutzerdefinierte Encoder-Einstellungen"
 Basic.Settings.Output.CustomMuxerSettings="Benutzerdefinierte Muxereinstellungen"
@@ -334,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="Art"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Normal"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Benutzerdefinierte Ausgabe (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Benutze Streamencoder)"
+Basic.Settings.Output.Adv.Recording.Filename="Dateinameformatierung"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Überschreiben, wenn die Datei vorhanden ist"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg-Ausgabetyp"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ausgabe zu URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ausgabe in Datei"
@@ -354,11 +391,15 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio-Encoder"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Encoder-Einstellungen (falls gewünscht)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer Einstellungen (falls vorhanden)"
 
+FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S"
+
+FilenameFormatting.TT="%CCYY	Jahr, vier Ziffern\n%YY		Jahr, letzte zwei Ziffern (00-99)\n%MM		Monat als Dezimalzahl (01-12)\n%DD		Tag des Monats, mit Nullen aufgefüllt (01-31)\n%hh		Stunden im 24 Stunden Format (00-23)\n%mm		Minute (00-59)\n%ss		Sekunde (00-61)\n%%		Ein % Zeichen\n%a		Abgekürzter Wochentagsname\n%A		Voller Wochentagsname\n%b		Abgekürzer Monatsname\n%B		Voller Monatsname\n%d		Tag des Monats, mit Nullen aufgefüllt (01-31)\n%H		Stunden im 24 Stunden Format (00-23)\n%I		Stunden im 12 Stunden Format (01-12)\n%m		Monat als Dezimalzahl (01-12)\n%M		Minute (00-59)\n%p		AM oder PM Angabe\n%S		Sekunde (00-61)\n%y		Jahr, letzte zwei Ziffern (00-99)\n%Y		Jahr\n%z		ISO 8601 Verschiebung von UTC oder Zeitzone\n		Name oder Abkürzung\n%Z		Zeitzonenname oder Abkürzung\n"
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Grafikkarte:"
 Basic.Settings.Video.BaseResolution="Basis (Leinwand) Auflösung:"
 Basic.Settings.Video.ScaledResolution="Ausgabe (skaliert) Auflösung:"
-Basic.Settings.Video.DownscaleFilter="Skalierungs Filter:"
+Basic.Settings.Video.DownscaleFilter="Skalierungs-Filter:"
 Basic.Settings.Video.DisableAeroWindows="Aero deaktivieren (nur Windows)"
 Basic.Settings.Video.FPS="FPS:"
 Basic.Settings.Video.FPSCommon="Übliche FPS Werte"
@@ -395,7 +436,7 @@ Basic.Settings.Advanced.Audio.BufferingTime="Audio Pufferungszeit"
 Basic.Settings.Advanced.Video.ColorFormat="Farbformat"
 Basic.Settings.Advanced.Video.ColorSpace="YUV-Farbmatrix"
 Basic.Settings.Advanced.Video.ColorRange="YUV Farbbereich"
-Basic.Settings.Advanced.Video.ColorRange.Partial="Teilweise"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Begrenzt"
 Basic.Settings.Advanced.Video.ColorRange.Full="Voll"
 Basic.Settings.Advanced.StreamDelay="Stream-Verzögerung"
 Basic.Settings.Advanced.StreamDelay.Duration="Dauer (Sekunden)"

obs/data/locale/el-GR.ini

@@ -34,9 +34,16 @@ Clear="Καθαρισμός"
 Revert="Επαναφορά"
 Show="Εμφάνιση"
 Hide="Απόκρυψη"
+Untitled="Χωρίς όνομα"
 New="Νέο"
+Duplicate="Διπλότυπη εγγραφή"
+Enable="Ενεργοποίηση"
+DisableOSXVSync="Απενεργοποίηση OSX V-Sync"
 
 
+Basic.TransitionDuration="Διάρκεια"
+Basic.TogglePreviewProgramMode="Λειτουργία στούντιο"
+
 
 TitleBar.Profile="Προφίλ"
 TitleBar.Scenes="Σκηνές"
@@ -57,7 +64,6 @@ ConfirmRemove.Text="Είστε βέβαιοι ότι θέλετε να κατα
 Output.ConnectFail.Title="Η σύνδεση απέτυχε"
 Output.ConnectFail.BadPath="Μη έγκυρη Διαδρομή ή URL Σύνδεσης.  Παρακαλώ ελέγξτε τις ρυθμίσεις σας και επιβεβαιώστε ότι είναι έγκυρες."
 Output.ConnectFail.ConnectFailed="Απέτυχε η σύνδεση στον διακομιστή"
-Output.ConnectFail.InvalidStream="Δεν ήταν δυνατή η πρόσβαση στο συγκεκριμένο κανάλι ή το κλειδί μετάδοσης. Αυτό ίσως συνέβη διότι το κλειδί/κανάλη δεν είναι έγκυρα, ή επειδή ο διακομιστής πιστέυει ότι είστε ακόμα συνδεμένος."
 Output.ConnectFail.Error="Παρουσιάστηκε μη αναμενόμενο σφάλμα κατα την προσπάθεια σύνδεσης με τον διακομιστή.  Περισσότερες πληροφορίες στο αρχείο καταγραφής."
 Output.ConnectFail.Disconnected="Αποσυνδεθήκατε από τον διακομιστή."
 
@@ -80,7 +86,6 @@ LicenseAgreement.Exit="Έξοδος"
 Remux.SourceFile="OBS Καταγραφή"
 Remux.TargetFile="Αρχείο Προορισμού"
 Remux.Remux="Μετατροπή"
-Remux.RecordingPattern="OBS Καταγραφή (*.flv)"
 Remux.FinishedTitle="Η μετατροπή τελείωσε"
 Remux.Finished="Η καταγραφή μετατράπηκε"
 Remux.FinishedError="Η καταγραφή μετατράπηκε, άλλα ενδέχεται το αρχείο να είναι ελλιπής"
@@ -106,6 +111,7 @@ Basic.DisplayCapture="Σύλληψη Οθόνης"
 
 Basic.Main.PreviewConextMenu.Enable="Ενεργοποίηση Προεπισκόπησης"
 
+
 Basic.Main.AddSceneDlg.Title="Προσθήκη Σκηνής"
 Basic.Main.AddSceneDlg.Text="Παρακαλώ εισάγετε το όνομα της σκηνής"
 
@@ -257,6 +263,7 @@ Basic.Settings.Output.Mode.Simple="Απλό"
 Basic.Settings.Output.Mode.Adv="Σύνθετες επιλογές"
 Basic.Settings.Output.Mode.FFmpeg="Έξοδος FFmpeg"
 Basic.Settings.Output.Simple.SavePath="Διαδρομή Καταγραφής"
+Basic.Settings.Output.Simple.Encoder.Software="Λογισμικό (x264)"
 Basic.Settings.Output.VideoBitrate="Ρυθμός Bit του Βίντεο"
 Basic.Settings.Output.AudioBitrate="Ρυθμός Bit του Ήχου"
 Basic.Settings.Output.Reconnect="Αυτόματη Επανασύνδεση"
@@ -280,6 +287,7 @@ Basic.Settings.Output.Adv.Recording.Type="Τύπος"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Κανονικός"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Προσαρμοσμένη Έξοδος (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Χρήση κωδικοποιητή ροής)"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Έξοδος σε διεύθυνση URL"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Κοινή μορφές εγγραφής"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Όλα τα αρχεία"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Διαδρομή αρχείου ή URL"
@@ -296,6 +304,8 @@ Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Ρυθμίσεις Κωδικ
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Κωδικοποιητής Ήχου"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ρυθμίσεις Κωδικοποιητή Ήχου (αν υπάρχουν)"
 
+
+
 Basic.Settings.Video="Βίντεο"
 Basic.Settings.Video.Adapter="Προσαρμογέας Βίντεο:"
 Basic.Settings.Video.DownscaleFilter="Φίλτρο Σμίκρυνσης:"

obs/data/locale/en-US.ini

@@ -13,6 +13,7 @@ Cancel="Cancel"
 Close="Close"
 Save="Save"
 Discard="Discard"
+Disable="Disable"
 Yes="Yes"
 No="No"
 Add="Add"
@@ -48,6 +49,10 @@ ResetOSXVSyncOnExit="Reset OSX V-Sync on Exit"
 HighResourceUsage="Encoding overloaded!  Consider turning down video settings or using a faster encoding preset."
 Transition="Transition"
 QuickTransitions="Quick Transitions"
+Left="Left"
+Right="Right"
+Top="Top"
+Bottom="Bottom"
 
 # quick transitions
 QuickTransitions.SwapScenes="Swap Preview/Output Scenes After Transitioning"
@@ -59,10 +64,17 @@ QuickTransitions.EditPropertiesTT="When editing the same scene, allows editing p
 QuickTransitions.HotkeyName="Quick Transition: %1"
 
 # transitions
+Basic.AddTransition="Add Configurable Transition"
+Basic.RemoveTransition="Remove Configurable Transition"
+Basic.TransitionProperties="Transition Properties"
 Basic.SceneTransitions="Scene Transitions"
 Basic.TransitionDuration="Duration"
 Basic.TogglePreviewProgramMode="Studio Mode"
 
+# transition name dialog
+TransitionNameDlg.Text="Please enter the name of the transition"
+TransitionNameDlg.Title="Transition Name"
+
 # title bar strings
 TitleBar.Profile="Profile"
 TitleBar.Scenes="Scenes"
@@ -94,7 +106,7 @@ ConfirmRemove.Text="Are you sure you wish to remove '$1'?"
 Output.ConnectFail.Title="Failed to connect"
 Output.ConnectFail.BadPath="Invalid Path or Connection URL.  Please check your settings to confirm that they are valid."
 Output.ConnectFail.ConnectFailed="Failed to connect to server"
-Output.ConnectFail.InvalidStream="Could not access the specified channel or stream key.  This could be because the key/channel is invalid, or because the server still thinks you are logged in."
+Output.ConnectFail.InvalidStream="Could not access the specified channel or stream key, please double-check your stream key.  If it is correct, there may be a problem connecting to the server."
 Output.ConnectFail.Error="An unexpected error occurred when trying to connect to the server.  More information in the log file."
 Output.ConnectFail.Disconnected="Disconnected from server."
 
@@ -126,7 +138,7 @@ LicenseAgreement.Exit="Exit"
 Remux.SourceFile="OBS Recording"
 Remux.TargetFile="Target File"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS Recording (*.flv)"
+Remux.OBSRecording="OBS Recording"
 Remux.FinishedTitle="Remuxing finished"
 Remux.Finished="Recording remuxed"
 Remux.FinishedError="Recording remuxed, but the file may be incomplete"
@@ -156,6 +168,19 @@ Basic.DisplayCapture="Display Capture"
 # display context menu
 Basic.Main.PreviewConextMenu.Enable="Enable Preview"
 
+# deinterlacing
+Deinterlacing="Deinterlacing"
+Deinterlacing.Discard="Discard"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Top Field First"
+Deinterlacing.BottomFieldFirst="Bottom Field First"
+
 # add scene dialog
 Basic.Main.AddSceneDlg.Title="Add Scene"
 Basic.Main.AddSceneDlg.Text="Please enter the name of the scene"
@@ -235,6 +260,7 @@ Basic.TransformWindow.Alignment="Positional Alignment"
 Basic.TransformWindow.BoundsType="Bounding Box Type"
 Basic.TransformWindow.BoundsAlignment="Alignment in Bounding Box"
 Basic.TransformWindow.Bounds="Bounding Box Size"
+Basic.TransformWindow.Crop="Crop"
 
 Basic.TransformWindow.Alignment.TopLeft="Top Left"
 Basic.TransformWindow.Alignment.TopCenter="Top Center"
@@ -329,6 +355,11 @@ Basic.Settings.General.Theme="Theme"
 Basic.Settings.General.Language="Language"
 Basic.Settings.General.WarnBeforeStartingStream="Show confirmation dialog when starting streams"
 Basic.Settings.General.WarnBeforeStoppingStream="Show confirmation dialog when stopping streams"
+Basic.Settings.General.Snapping="Source Alignment Snapping"
+Basic.Settings.General.ScreenSnapping="Snap Sources to edge of screen"
+Basic.Settings.General.CenterSnapping="Snap Sources to horizontal and vertical center"
+Basic.Settings.General.SourceSnapping="Snap Sources to other sources"
+Basic.Settings.General.SnapDistance="Snap Sensitivity"
 
 # basic mode 'stream' settings
 Basic.Settings.Stream="Stream"
@@ -340,6 +371,7 @@ Basic.Settings.Output.Format="Recording Format"
 Basic.Settings.Output.Encoder="Encoder"
 Basic.Settings.Output.SelectDirectory="Select Recording Directory"
 Basic.Settings.Output.SelectFile="Select Recording File"
+Basic.Settings.Output.EnforceBitrate="Enforce streaming service bitrate limits"
 Basic.Settings.Output.Mode="Output Mode"
 Basic.Settings.Output.Mode.Simple="Simple"
 Basic.Settings.Output.Mode.Adv="Advanced"
@@ -350,11 +382,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Same as stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="High Quality, Medium File Size"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Indistinguishable Quality, Large File Size"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Lossless Quality, Tremendously Large File Size"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Warning: The streaming video bitrate will be set to %1, which is the upper limit for the current streaming service.  If you're sure you want to go above %1, enable advanced encoder options and uncheck \"Enforce streaming service bitrate limits\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Warning: The streaming audio bitrate will be set to %1, which is the upper limit for the current streaming service.  If you're sure you want to go above %1, enable advanced encoder options and uncheck \"Enforce streaming service bitrate limits\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Warning: Recording with a software encoder at a different quality than the stream will require extra CPU usage if you stream and record at the same time."
 Basic.Settings.Output.Simple.Warn.Lossless="Warning: Lossless quality generates tremendously large file sizes!  Lossless quality can use upward of 7 gigabytes of disk space per minute at high resolutions and framerates.  Lossless is not recommended for long recordings unless you have a very large amount of disk space available."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Are you sure you want to use lossless quality?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless quality warning!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Warning: You cannot use multiple separate QSV encoders when streaming and recording at the same time.  If you want to stream and record at the same time, please change either the recording encoder or the stream encoder."
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 low CPU usage preset, increases file size)"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -383,6 +420,8 @@ Basic.Settings.Output.Adv.Recording.Type="Type"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Custom Output (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Use stream encoder)"
+Basic.Settings.Output.Adv.Recording.Filename="Filename Formatting"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Overwrite if file exists"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg Output Type"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Output to URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Output to File"
@@ -403,6 +442,12 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Encoder"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Encoder Settings (if any)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer Settings (if any)"
 
+# basic mode 'output' settings - advanced section - recording subsection - completer
+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"
+
+# basic mode 'output' settings - advanced section - recording subsection - TT
+FilenameFormatting.TT="%CCYY		Year, four digits\n%YY		Year, last two digits (00-99)\n%MM		Month as a decimal number (01-12)\n%DD		Day of the month, zero-padded (01-31)\n%hh		Hour in 24h format (00-23)\n%mm		Minute (00-59)\n%ss		Second (00-61)\n%%		A % sign\n%a		Abbreviated weekday name\n%A		Full weekday name\n%b		Abbreviated month name\n%B		Full month name\n%d		Day of the month, zero-padded (01-31)\n%H		Hour in 24h format (00-23)\n%I		Hour in 12h format (01-12)\n%m		Month as a decimal number (01-12)\n%M		Minute (00-59)\n%p		AM or PM designation\n%S		Second (00-61)\n%y		Year, last two digits (00-99)\n%Y		Year\n%z		ISO 8601 offset from UTC or timezone\n		name or abbreviation\n%Z		Timezone name or abbreviation\n"
+
 # basic mode 'video' settings
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video Adapter:"

obs/data/locale/es-ES.ini

@@ -8,6 +8,7 @@ Cancel="Cancelar"
 Close="Cerrar"
 Save="Grabar"
 Discard="Descartar"
+Disable="Deshabilitar"
 Yes="Sí"
 No="No"
 Add="Agregar"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Resetear V-Sync de OSX a la salida"
 HighResourceUsage="¡Sobrecarga al codificar! Considera bajar los ajustes de vídeo o usa una configuración del codificador mas rapida."
 Transition="Transición"
 QuickTransitions="Transiciones rápidas"
+Left="Izquierda"
+Right="Derecha"
+Top="Arriba"
+Bottom="Abajo"
 
 QuickTransitions.SwapScenes="Cambiar vista previa y salida escenas después de la transición"
 QuickTransitions.SwapScenesTT="Cambia la vista previa y salida escenas después de la transición (si todavía existe la escena original de la salida). \nEsto no deshará cualquier cambio que pueda haber hecho a la escena original de la salida."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Duplicar fuentes"
 QuickTransitions.EditPropertiesTT="Al editar la misma escena, permite editar propiedades de fuentes sin modificar la salida. \n Esto sólo se puede utilizar si está activado 'Escena de duplicar'. \nCiertas fuentes (tales como fuentes de captura o los medios de comunicación) no son compatibles con esto y no se pueden editar por separado. \nCambiando este valor restablecerá la escena actual de salida (si todavía existe).\n\nAdvertencia: porque se duplicarán las fuentes, esto puede requerir extra sistema o recursos de vídeo."
 QuickTransitions.HotkeyName="Transición Rápida: %1"
 
+Basic.AddTransition="Añadir transición configurable"
+Basic.RemoveTransition="Quitar transición configurable"
+Basic.TransitionProperties="Propiedades de la transición"
 Basic.SceneTransitions="Transiciones de escena"
 Basic.TransitionDuration="Duración"
 Basic.TogglePreviewProgramMode="Modo de estudio"
 
+TransitionNameDlg.Text="Por favor, introduzca el nombre de la transición"
+TransitionNameDlg.Title="Nombre de la transición"
+
 TitleBar.Profile="Perfíl"
 TitleBar.Scenes="Escenas"
 
@@ -68,7 +79,7 @@ NoNameEntered.Text="No puede utilizar nombres de vacíos."
 ConfirmStart.Title="¿Iniciar Transmisión?"
 ConfirmStart.Text="¿Está seguro que desea iniciar la transmisión?"
 
-ConfirmStop.Title="¿Parar la Transmisión?"
+ConfirmStop.Title="¿Parar Transmisión?"
 ConfirmStop.Text="¿Está seguro que desea parar la transmisión?"
 
 ConfirmExit.Title="¿Cerrar OBS?"
@@ -80,7 +91,7 @@ ConfirmRemove.Text="¿Seguro que desea eliminar '$1'?"
 Output.ConnectFail.Title="Error al conectarse"
 Output.ConnectFail.BadPath="URL ruta de acceso o conexión no válida.  Por favor, compruebe su configuración para confirmar que está correcta."
 Output.ConnectFail.ConnectFailed="No se pudo conectar al servidor"
-Output.ConnectFail.InvalidStream="No se pudo acceder al canal o flujo encriptado.  Esto podría deberse a que el canal o la clave no son válidos, o porque el servidor piensa que todavía tienes una sesión iniciada."
+Output.ConnectFail.InvalidStream="No puede acceder a la llave del canal especificado o de la trasmisión, por favor comprobar dos veces su llave de trasmisión.  Si es correcto, puede haber un problema conectándose al servidor."
 Output.ConnectFail.Error="Se ha producido un error inesperado al intentar conectar con el servidor.  Más información en el archivo de registro."
 Output.ConnectFail.Disconnected="Desconectado del servidor."
 
@@ -107,7 +118,7 @@ LicenseAgreement.Exit="Salir"
 Remux.SourceFile="Grabación OBS"
 Remux.TargetFile="Archivo de destino"
 Remux.Remux="Convertir"
-Remux.RecordingPattern="OBS grabación (*.flv)"
+Remux.OBSRecording="Grabación OBS"
 Remux.FinishedTitle="Conversión finalizada"
 Remux.Finished="Grabando conversión"
 Remux.FinishedError="Grabación convertida, pero el archivo podría estar incompleto"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="Captura de pantalla"
 
 Basic.Main.PreviewConextMenu.Enable="Habilitar previsualización"
 
+Deinterlacing="Desentrelazado"
+Deinterlacing.Discard="Descartar"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Mezclado"
+Deinterlacing.Blend2x="Mezclado 2x"
+Deinterlacing.Linear="Lineal"
+Deinterlacing.Linear2x="Lineal 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Campo Superior Primero"
+Deinterlacing.BottomFieldFirst="Campo Inferior Primero"
+
 Basic.Main.AddSceneDlg.Title="Añadir escena"
 Basic.Main.AddSceneDlg.Text="Por favor, introduzca el nombre de la escena"
 
@@ -198,6 +221,7 @@ Basic.TransformWindow.Alignment="Alineamiento posicional"
 Basic.TransformWindow.BoundsType="Tipo de cuadro delimitador"
 Basic.TransformWindow.BoundsAlignment="Alineamiento en el cuadro delimitador"
 Basic.TransformWindow.Bounds="Tamaño de cuadro delimitador"
+Basic.TransformWindow.Crop="Recorte"
 
 Basic.TransformWindow.Alignment.TopLeft="Parte superior izquierda"
 Basic.TransformWindow.Alignment.TopCenter="Parte superior central"
@@ -224,10 +248,10 @@ Basic.Main.Scenes="Escenas"
 Basic.Main.Sources="Fuentes"
 Basic.Main.Connecting="Conectando..."
 Basic.Main.StartRecording="Iniciar grabación"
-Basic.Main.StartStreaming="Iniciar retransmisión"
+Basic.Main.StartStreaming="Iniciar Transmisión"
 Basic.Main.StopRecording="Detener grabación"
-Basic.Main.StopStreaming="Detener retransmisión"
+Basic.Main.StopStreaming="Detener Transmisión"
-Basic.Main.ForceStopStreaming="Parar transmisión (descartar retraso)"
+Basic.Main.ForceStopStreaming="Parar Transmisión (descartar retraso)"
 
 Basic.MainMenu.File="&Archivo"
 Basic.MainMenu.File.Export="&Exportar"
@@ -284,30 +308,41 @@ Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Idioma"
 Basic.Settings.General.WarnBeforeStartingStream="Mostrar diálogo de confirmación cuando se inicia una transmisión"
 Basic.Settings.General.WarnBeforeStoppingStream="Mostrar diálogo de confirmación cuando se para una transmisión"
+Basic.Settings.General.Snapping="Ajuste de alineación de la fuente"
+Basic.Settings.General.ScreenSnapping="Ajustar las fuentes al borde de la pantalla"
+Basic.Settings.General.CenterSnapping="Ajustar las fuentes al centro horizontal y vertical"
+Basic.Settings.General.SourceSnapping="Ajustar las fuentes a otras fuentes"
+Basic.Settings.General.SnapDistance="Ajustar la sensibilidad"
 
-Basic.Settings.Stream="Flujo"
+Basic.Settings.Stream="Emision"
-Basic.Settings.Stream.StreamType="Tipo de flujo"
+Basic.Settings.Stream.StreamType="Tipo de Emision"
 
 Basic.Settings.Output="Salida"
 Basic.Settings.Output.Format="Formato de grabación"
 Basic.Settings.Output.Encoder="Codificador"
 Basic.Settings.Output.SelectDirectory="Seleccione Directorio de grabación"
 Basic.Settings.Output.SelectFile="Seleccione archivo de grabación"
+Basic.Settings.Output.EnforceBitrate="Forzar limites de bitrate en el servicio de streaming"
 Basic.Settings.Output.Mode="Modo de salida"
 Basic.Settings.Output.Mode.Simple="Sencillo"
 Basic.Settings.Output.Mode.Adv="Avanzado"
 Basic.Settings.Output.Mode.FFmpeg="Salida de FFmpeg"
 Basic.Settings.Output.Simple.SavePath="Ruta de grabación"
 Basic.Settings.Output.Simple.RecordingQuality="Calidad de grabación"
-Basic.Settings.Output.Simple.RecordingQuality.Stream="Igual a la entrada"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Igual a la emision"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Alta calidad, tamaño de archivo medio"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Tamaño de archivo grande, calidad indistinguible"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Tamaño del archivo sin pérdida de calidad, tremendamente grande"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="ADVERTENCIA: El streaming de vídeo se establecerá a %1, que es el límite superior para el servicio de streaming actual.  Si estás seguro que quieres ir por encima de %1, active las opciones avanzadas del codificador y desactive \"Forzar limites de bitrate en el servicio de streaming\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="ADVERTENCIA: El streaming de audio se establecerá a %1, que es el límite superior para el servicio de streaming actual.  Si estás seguro que quieres ir por encima de %1, active las opciones avanzadas del codificador y desactive \"Forzar limites de bitrate en el servicio de streaming\"."
 Basic.Settings.Output.Simple.Warn.Encoder="ADVERTENCIA: La grabación con un codificador de software con una calidad diferente de la secuencia requerirá el uso de CPU extra si transmitir y registro al mismo tiempo."
 Basic.Settings.Output.Simple.Warn.Lossless="ADVERTENCIA: ¡La calidad sin perdidas genera tamaños de archivo muy grandes!  La calidad sin pérdidas puede utilizar más de 7 gigabytes de espacio en disco por minuto en alta resolución y con alta tasa de fotogramas.  La calidad sin pérdidas no se recomienda para grabaciones largas, a menos que tenga una gran cantidad de espacio en disco disponible."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="¿Confirma que desea utilizar calidad sin perdidas?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="¡Atención de calidad sin pérdidas!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Advertencia: No se pueden usar varios codificadores QSV separados al transmitir y grabar al mismo tiempo. Si desea transmitir y grabar al mismo tiempo, por favor cambíelos, ya sea el codificador de grabación o el codificador de trasmisión."
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 bajo uso de CPU, aumenta el tamaño de archivo)"
 Basic.Settings.Output.VideoBitrate="Bitrate de vídeo"
 Basic.Settings.Output.AudioBitrate="Bitrate de audio"
@@ -322,7 +357,7 @@ Basic.Settings.Output.NoSpaceFileName="Generar el nombre del archivo sin espacio
 
 Basic.Settings.Output.Adv.Rescale="Cambiar la escala de salida"
 Basic.Settings.Output.Adv.AudioTrack="Pista de audio"
-Basic.Settings.Output.Adv.Streaming="En tiempo real"
+Basic.Settings.Output.Adv.Streaming="Emision en directo"
 Basic.Settings.Output.Adv.ApplyServiceSettings="Aplicar ajustes de codificador de servicio streaming"
 Basic.Settings.Output.Adv.Audio.Track1="Pista 1"
 Basic.Settings.Output.Adv.Audio.Track2="Pista 2"
@@ -333,7 +368,9 @@ Basic.Settings.Output.Adv.Recording="Grabando"
 Basic.Settings.Output.Adv.Recording.Type="Tipo"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Estándar"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Salida personalizada (FFmpeg)"
-Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Usar flujo del codificador)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Usar codificación de trasmisión)"
+Basic.Settings.Output.Adv.Recording.Filename="Nombre de archivo de formato"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Sobrescribir si el archivo existe"
 Basic.Settings.Output.Adv.FFmpeg.Type="Tipo de salida de FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Salida a URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Salida a archivo"
@@ -354,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador de audio"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Configuración de codificador de vídeo (si existe)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Ajustes de Muxer (en caso de que haya)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Año, cuatro dígitos\n%YY		Año, ultimo dos dígitos (00-99)\n%MM		Mes como numero decimal (01-12)\n%DD		Día del mes, cero-añadido (01-31)\n%hh		Hora en formato 24h (00-23)\n%mm		Minuto (00-59)\n%ss		Segundo (00-61)\n%%		A % signo\n%a		Nombre del día semanal Abreviado\n%A		completo nombre dia semanal\n%b		Nombre del Mes Abreviado\n%B		Nombre completo del nombre del mes\n%d		Día del mes, cero-añadido (01-31)\n%H		Formato Hora en 24h (00-23)\n%I		Formato Hora en 12h (01-12)\n%m		Mes como numero decimal (01-12)\n%M		Minuto (00-59)\n%p		Designación AM o PM\n%S		Segundo (00-61)\n%y		Año, últimos dos dígitos (00-99)\n%Y		Year\n%z		ISO 8601 ajuste de UTC o zona horaria\n		nombre o abreviación\n%Z		Nombre de zona horaria o abreviación\n"
+
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de vídeo:"
 Basic.Settings.Video.BaseResolution="Resolución de la base (Canvas):"
@@ -410,11 +451,11 @@ Basic.AdvAudio.Panning="Panorámica"
 Basic.AdvAudio.SyncOffset="Sincronización Offset (ms)"
 Basic.AdvAudio.AudioTracks="Pistas"
 
-Basic.Settings.Hotkeys="Teclas de acceso rápido"
+Basic.Settings.Hotkeys="Atajos"
 Basic.Settings.Hotkeys.Pair="Combinaciones de teclas con '%1' actúan como interruptores"
 
-Basic.Hotkeys.StartStreaming="Iniciar transmisión"
+Basic.Hotkeys.StartStreaming="Iniciar Transmisión"
-Basic.Hotkeys.StopStreaming="Detener retransmisión"
+Basic.Hotkeys.StopStreaming="Detener Transmisión"
 Basic.Hotkeys.StartRecording="Iniciar grabación"
 Basic.Hotkeys.StopRecording="Detener grabación"
 Basic.Hotkeys.SelectScene="Cambiar a la escena"

obs/data/locale/eu-ES.ini

@@ -2,238 +2,266 @@
 Language="Euskara"
 Region="Euskal Herria"
 
-OK="Ongi"
+OK="Ados"
-Apply="Ezarri"
+Apply="Aplikatu"
 Cancel="Ezeztatu"
 Close="Itxi"
 Save="Gorde"
 Discard="Baztertu"
+Disable="Ezgaitu"
 Yes="Bai"
 No="Ez"
 Add="Gehitu"
 Remove="Kendu"
 Rename="Berrizendatu"
-Interact="Elkarrekintza"
+Interact="Elkarreragin"
 Filters="Iragazkiak"
 Properties="Ezaugarriak"
-MoveUp="Mugitu Gora"
+MoveUp="Mugitu gora"
-MoveDown="Mugitu Behera"
+MoveDown="Mugitu behera"
-Settings="Ezarpenak..."
+Settings="Ezarpenak"
-Display="Erakusleihoa"
+Display="Pantaila"
 Name="Izena"
 Exit="Irten"
-Mixer="Nahastzailea"
+Mixer="Nahastailea"
-Browse="Bilatu..."
+Browse="Arakatu"
 Mono="Monoa"
 Stereo="Estereoa"
-DroppedFrames="Eroritako Frameak %1 (%2%)"
+DroppedFrames="Galdutako fotogramak %1 (%2%)"
-PreviewProjector="Ikusleiho-osoko Proiektorea (Aurreikuspena)"
+PreviewProjector="Pantaila osoko proiektorea (aurrebista)"
-SceneProjector="Ikusleiho-osoko Proiektorea (Agerraldia)"
+SceneProjector="Pantaila osoko proiektorea (eszena)"
-SourceProjector="Ikusleiho-osoko Proiektorea (Iturburua)"
+SourceProjector="Pantaila osoko proiektorea (iturburua)"
 Clear="Garbitu"
 Revert="Leheneratu"
 Show="Erakutsi"
 Hide="Ezkutatu"
-Untitled="Izenburugabea"
+Untitled="Izengabea"
 New="Berria"
 Duplicate="Bikoiztu"
 Enable="Gaitu"
 DisableOSXVSync="Ezgaitu OSX V-Sync"
-ResetOSXVSyncOnExit="Berrezarri OSX V-Sync Irtetzerakoan"
+ResetOSXVSyncOnExit="Berrezarri OSX V-Sync-a Irtetean"
-HighResourceUsage="Kodeaketa gainzamatuta! Kontuan hartu bideo ezarpenak beheratzea edo kodeaketa aurrezarpen azkarrago bat erabiltzea."
+HighResourceUsage="Kodeketa gainzamatuta! Kontuan hartu bideo ezarpenak jaistea edo kodeketa-aurrezarpen azkarragoa erabiltzea."
-Transition="Aldaketa"
+Transition="Trantsizioa"
-QuickTransitions="Aldaketa Azkarrak"
+QuickTransitions="Trantsizio azkarrak"
+Left="Ezkerrean"
+Right="Eskuinean"
+Top="Goian"
+Bottom="Behean"
 
-QuickTransitions.DuplicateScene="Bikoiztu Agerraldia"
+QuickTransitions.SwapScenes="Trukatu Aurrebista/Irteera-eszenak trantsizioen ondoren"
-QuickTransitions.EditProperties="Bikoiztu Iturburuak"
+QuickTransitions.SwapScenesTT="Trukatu aurrebistak eta irteera-eszenak trantsizioen ondoren (baldin eta irteerakoaren jatorrizkoa eszena badago).\n Honek ez du desegingo irteerakoaren jatorrizko eszenari egindako aldaketak."
-QuickTransitions.HotkeyName="Aldaketa Azkarra: %1"
+QuickTransitions.DuplicateScene="Bikoiztu eszena"
+QuickTransitions.DuplicateSceneTT="Eszena bera editatzerakoan, iturburuen eraldaketa/ikusgarritasuna editatzea ahalbidetzen du irteera aldatu gabe.\nIturburuen ezaugarriak editatzeko irteera aldatu gabe, gaitu 'Bikoiztu iturburuak'.\nBalio hau aldatzeak uneko agerraldi irteera (oraindik badago) berrezarriko du."
+QuickTransitions.EditProperties="Bikoiztu iturburuak"
+QuickTransitions.EditPropertiesTT="Eszena bera editatzerakoan, iturburuen ezaugarriak irteera aldatu gabe editatzea ahalbidetzen du.\nHau 'Bikoiztu Iturburuak' gaituta badago bakarrik erabili daiteke.\nZenbait iturburuk (kaptura edo multimedia iturburuak) ez dute hau onartzen eta ezin dira bereizita editatu.\nBalio hau aldatzeak uneko eszena irteera (oraindik badago) berrezarriko du.\n\nKontuz: Iturburuak bikoiztuko direnez, honek sistema edo bideo baliabide gehigarriak behar izan ditzake."
+QuickTransitions.HotkeyName="Trantsizio azkarra: %1"
 
-Basic.SceneTransitions="Agerraldi Aldaketak"
+Basic.AddTransition="Gehitu trantsizio konfiguragarria"
+Basic.RemoveTransition="Kendu trantsizio konfiguragarria"
+Basic.TransitionProperties="Trantsizioaren ezaugarriak"
+Basic.SceneTransitions="Eszena-trantsizioak"
 Basic.TransitionDuration="Iraupena"
 Basic.TogglePreviewProgramMode="Estudio Modua"
 
+TransitionNameDlg.Text="Sartu trantsizioaren izena"
+TransitionNameDlg.Title="Trantsizioaren Izena"
+
 TitleBar.Profile="Profila"
-TitleBar.Scenes="Agerraldiak"
+TitleBar.Scenes="Eszenak"
 
 NameExists.Title="Izena badago jadanik"
-NameExists.Text="Izena jadanik erabilia da."
+NameExists.Text="Izena dagoeneko erabilia."
 
-NoNameEntered.Title="Mesedez sartu baliozko izen bat"
+NoNameEntered.Title="Sartu baliozko izena"
-NoNameEntered.Text="Ezin duzu izena hutsik erabili."
+NoNameEntered.Text="Ezin duzu hutsik dagoen izena erabili."
 
-ConfirmStart.Title="Hasi Jarioa?"
+ConfirmStart.Title="Hasi transmisioa?"
-ConfirmStart.Text="Zihur zaude jarioa hastea nahi duzula?"
+ConfirmStart.Text="Ziur zaude transmisioa hasi nahi duzula?"
 
-ConfirmStop.Title="Gelditu Jarioa?"
+ConfirmStop.Title="Gelditu transmisioa?"
-ConfirmStop.Text="Zihur zaude jarioa gelditzea nahi duzula?"
+ConfirmStop.Text="Ziur zaude transmisioa gelditu nahi duzula?"
 
 ConfirmExit.Title="Irten OBS-tik?"
-ConfirmExit.Text="OBS jardunean dago.  Jario/grabaketa guztiak itzali egingo dira.  Zihur zaude irtetzea nahi duzula?"
+ConfirmExit.Text="OBS jardunean dago. Transmisio/grabazio guztiak itzaliko dira.  Ziur zaude irten nahi duzula?"
 
-ConfirmRemove.Title="Baieztatu Kentzea"
+ConfirmRemove.Title="Baieztatu kentzea"
-ConfirmRemove.Text="Zihur zaude '$1' kentzea nahi duzula?"
+ConfirmRemove.Text="Ziur zaude '$1' kendu nahi duzula?"
 
-Output.ConnectFail.Title="Hutsegitea elkartzerakoan"
+Output.ConnectFail.Title="Huts egin du konektatzean"
-Output.ConnectFail.BadPath="Helburu edo Elkarketa URL okerra. Mesedez egiaztatu zure ezarpenak baliozkoak direla baieztatzeko."
+Output.ConnectFail.BadPath="Helburu edo konexio-URL okerra. Egiaztatu zure ezarpenak baliozkoak direla baieztatzeko."
-Output.ConnectFail.ConnectFailed="Hutsegitea zerbitzariarekin elkartzerakoan"
+Output.ConnectFail.ConnectFailed="Huts egin du zerbitzariarekin konektatzean"
-Output.ConnectFail.InvalidStream="Ez dago sarbiderik adierazitako bidera edo jario giltzara. Hau izan daiteke giltza/bidea baliogabea delako, edo zerbitzariak oraindik saioa hasita zaudela uste duelako."
+Output.ConnectFail.InvalidStream="Ezin da atzitu kanala edo transmisioaren gakoa. Egiaztatu, mesedez, birritan transmisio gakoa. Zuzena bada zerbitzariarekin konektatzen arazoa egon daiteke."
-Output.ConnectFail.Error="Ustekabeko akats bat gertatu da zerbitzariarekin elkartzen saiatzerakoan. Argibide gehiago ohar agirian."
+Output.ConnectFail.Error="Ustekabeko akats bat gertatu da zerbitzariarekin konektatzen saiatzerakoan. Argibide gehiago egunkari-fitxategian."
-Output.ConnectFail.Disconnected="Zerbitzaritik etenda."
+Output.ConnectFail.Disconnected="Zerbitzaritik deskonektatuta."
 
-Output.RecordFail.Title="Hutsegitea grabaketa hastean"
+Output.RecordFail.Title="Ezin izan da grabaketa hasi"
-Output.RecordFail.Unsupported="Irteera heuskarria ez dago sostengatua edo ez du audio bide bat baino gehiago sostengatzen. Mesedez egiaztatu zure ezarpenak eta saiatu berriro."
+Output.RecordFail.Unsupported="Irteera formatua ez da onartzen edo ez du audio pista bat baino gehiago onartzen. Egiaztatu zure ezarpenak eta saiatu berriro."
-Output.RecordNoSpace.Title="Ez dago nahikoa toki diskan"
+Output.RecordNoSpace.Title="Ez dago nahiko tokirik diskoan"
-Output.RecordNoSpace.Msg="Ez dago nahikoa toki diskan grabatzen jarraitzeko."
+Output.RecordNoSpace.Msg="Ez dago nahikoa tokirik diskoan grabatzen jarraitzeko."
-Output.RecordError.Title="Grabaketa akatsa"
+Output.RecordError.Title="Grabazio akatsa"
 Output.RecordError.Msg="Zehaztugabeko akats bat gertatu da grabatzerakoan."
 
-Output.BadPath.Title="Agiri Helburu Okerra"
+Output.BadPath.Title="Fitxategi-bide okerra"
-Output.BadPath.Text="Itxuratutako agiri irteera helburua baliogabea da. Mesedez egiaztatu zure ezarpenak agiri helburu baliozkoa bat ezarri dela baieztatzeko."
+Output.BadPath.Text="Ezarritako fitxategiaren irteera-bidea baliogabea da. Egiaztatu zure ezarpenak baieztatzeko baliozko fitxategi-bidea ezarri dela."
 
-LogReturnDialog="Ohar Igotzea Ongi"
+LogReturnDialog="Egunkaria ongi kargatu da"
 LogReturnDialog.CopyURL="Kopiatu URL-a"
-LogReturnDialog.ErrorUploadingLog="Akatsa ohar agiria igotzerakoan"
+LogReturnDialog.ErrorUploadingLog="Errorea egunkari-fitxategia kargatzean"
 
-LicenseAgreement="Baimen Ituna"
+LicenseAgreement="Lizentzia-kontratua"
-LicenseAgreement.PleaseReview="Mesedez berrikusi baimenaren baldintzak OBS erabili aurretik. Programa hau erabiliz, adierazten duzu <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU Baimen Publiko Orokorra v2.0</a> ituna irakurri duzula eta itunaren baldintzak onartzen dituzula. Mesedez irristatu behera itunaren gainontzekoa ikusteko."
+LicenseAgreement.PleaseReview="Berrikusi lizentziaren baldintzak OBS erabili aurretik. Programa hau erabiltzean, adierazten duzu <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a>-ren baldintzak irakurri eta onartzen dituzula. Korritu behera itun osoa ikusteko."
-LicenseAgreement.ClickIAgreeToContinue="Itunaren baldintzak onartzen badituzu, klikatu Onartzen dut jarraitzeko. Ituna onartu behar duzu OBS erabiltzeko."
+LicenseAgreement.ClickIAgreeToContinue="Lizentziaren baldintzak onartzen badituzu, klikatu Onartzen dut jarraitzeko. Lizentzia onartu behar duzu OBS erabiltzeko."
 LicenseAgreement.IAgree="Onartzen dut"
 LicenseAgreement.Exit="Irten"
 
-Remux.SourceFile="OBS Grabaketa"
+Remux.SourceFile="OBS Grabazioa"
-Remux.TargetFile="Xede Agiria"
+Remux.TargetFile="Helburu-fitxategia"
 Remux.Remux="Bermultiplexatu"
-Remux.RecordingPattern="OBS Grabaketa (*.flv)"
+Remux.OBSRecording="OBS Grabazioa"
-Remux.FinishedTitle="Bermultiplexaketa amaituta"
+Remux.FinishedTitle="Bihurketa amaituta"
-Remux.Finished="Grabaketa bermultiplexatuta"
+Remux.Finished="Grabazioa bihurtuta"
-Remux.FinishedError="Grabaketa bermultiplexatuta, baina badaiteke agiria osatugabe egotea"
+Remux.FinishedError="Grabazioa bihurtua, baina fitxategia osatu gabe egon daiteke"
-Remux.SelectRecording="Hautatu OBS Grabaketa…"
+Remux.SelectRecording="Hautatu OBS grabazioa…"
-Remux.SelectTarget="Hautatu xede agiria..."
+Remux.SelectTarget="Hautatu helburu-fitxategia…"
-Remux.FileExistsTitle="Xede agiria badago"
+Remux.FileExistsTitle="Helburu-fitxategia badago"
-Remux.FileExists="Xede agiria badago, ordeztea nahi duzu?"
+Remux.FileExists="Helburu-fitxategia badago, ordeztea nahi duzu?"
 Remux.ExitUnfinishedTitle="Bermultiplexaketa garatzen"
-Remux.ExitUnfinished="Bermultiplexaketa ez da amaitu, orain gelditzeak xede agiria erabiltezin aurkeztu dezake.\nZihur zaude bermultiplexaketa gelditzea nahi duzula?"
+Remux.ExitUnfinished="Bihurketa ez da amaitu, orain gelditzeak fitxategi-helburua erabiltezin bihur dezake.\nZiur zaude bihurtzea gelditu nahi duzula?"
 
-UpdateAvailable="Eguneraketa Berria Eskuragarri"
+UpdateAvailable="Eguneraketa eskuragarria"
-UpdateAvailable.Text="%1.%2.%3 bertsioa eskuragarri dago.  <a href='%4'>Klikatu hemen jeisteko</a>"
+UpdateAvailable.Text="%1.%2.%3 bertsioa eskuragarri dago.  <a href='%4'>Klikatu hemen deskargatzeko</a>"
 
-Basic.DesktopDevice1="Mahaigaineko Audioa"
+Basic.DesktopDevice1="Mahaigaineko audioa"
-Basic.DesktopDevice2="Mahaigaineko Audioa 2"
+Basic.DesktopDevice2="Mahaigaineko audioa 2"
 Basic.AuxDevice1="Mik/Osag"
 Basic.AuxDevice2="Mik/Osag 2"
 Basic.AuxDevice3="Mik/Osag 3"
 Basic.AuxDevice4="Mik/Osag 4"
 
-Basic.Scene="Agerraldia"
+Basic.Scene="Eszena"
-Basic.DisplayCapture="Erakusleiho Harpena"
+Basic.DisplayCapture="Pantaila-kaptura"
 
-Basic.Main.PreviewConextMenu.Enable="Gaitu aurreikuspena"
+Basic.Main.PreviewConextMenu.Enable="Gaitu aurrebista"
 
-Basic.Main.AddSceneDlg.Title="Gehitu Agerraldia"
+Deinterlacing="Desgurutzelarkatzea"
-Basic.Main.AddSceneDlg.Text="Mesedez sartu agerraldiaren izena"
+Deinterlacing.Discard="Baztertu"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Nahasketa"
+Deinterlacing.Blend2x="Nahasketa 2x"
+Deinterlacing.Linear="Lineala"
+Deinterlacing.Linear2x="Lineala 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Goiko eremua lehenik"
+Deinterlacing.BottomFieldFirst="Beheko eremua lehenik"
 
-Basic.Main.DefaultSceneName.Text="%1 agerraldia"
+Basic.Main.AddSceneDlg.Title="Gehitu eszena"
+Basic.Main.AddSceneDlg.Text="Sartu eszenaren izena"
 
-Basic.Main.AddSceneCollection.Title="Gehitu Agerraldi Bilduma"
+Basic.Main.DefaultSceneName.Text="%1 eszena"
-Basic.Main.AddSceneCollection.Text="Mesedez sartu agerraldi bildumaren izena"
 
-Basic.Main.RenameSceneCollection.Title="Berrizendatu Agerraldi Bilduma"
+Basic.Main.AddSceneCollection.Title="Gehitu eszena-bilduma"
+Basic.Main.AddSceneCollection.Text="Sartu eszena-bildumaren izena"
 
-AddProfile.Title="Gehitu Profila"
+Basic.Main.RenameSceneCollection.Title="Berrizendatu eszena-bilduma"
-AddProfile.Text="Mesedez sartu profilaren izena"
+
+AddProfile.Title="Gehitu profila"
+AddProfile.Text="Sartu profilaren izena"
 
 RenameProfile.Title="Berrizendatu profila"
 
-Basic.Main.PreviewDisabled="Aurreikuspena ezgaituta dago"
+Basic.Main.PreviewDisabled="Aurrebista ezgaituta dago"
 
 Basic.SourceSelect="Sortu/Hautatu Iturburua"
 Basic.SourceSelect.CreateNew="Sortu berria"
-Basic.SourceSelect.AddExisting="Gehitu Badagoena"
+Basic.SourceSelect.AddExisting="Gehitu lehendik dagoena"
 Basic.SourceSelect.AddVisible="Egin iturburua ikusgarri"
 
 Basic.PropertiesWindow="'%1'-ren ezaugarriak"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (berez-hautatu: %2)"
-Basic.PropertiesWindow.SelectColor="Hautatu margoa"
+Basic.PropertiesWindow.SelectColor="Hautatu kolorea"
-Basic.PropertiesWindow.SelectFont="Hautatu hizkia"
+Basic.PropertiesWindow.SelectFont="Hautatu letra-mota"
-Basic.PropertiesWindow.ConfirmTitle="Ezarpenak Aldatuta"
+Basic.PropertiesWindow.ConfirmTitle="Ezarpenak aldatuta"
-Basic.PropertiesWindow.Confirm="Gorde gabeko aldaketak daude. Heustea nahi diezu?"
+Basic.PropertiesWindow.Confirm="Gorde gabeko aldaketak daude. Nahi duzu dagoena mantentzea?"
 Basic.PropertiesWindow.NoProperties="Ezaugarriak ez daude eskuragarri"
-Basic.PropertiesWindow.AddFiles="Gehitu Agiriak"
+Basic.PropertiesWindow.AddFiles="Gehitu fitxategiak"
-Basic.PropertiesWindow.AddURL="Gehitu Helburua/URL-a"
+Basic.PropertiesWindow.AddURL="Gehitu bidea/URL-a"
-Basic.PropertiesWindow.AddEditableListFiles="Gehitu agiriak '%1'-ra"
+Basic.PropertiesWindow.AddEditableListFiles="Gehitu fitxategiak '%1'-ra"
 Basic.PropertiesWindow.AddEditableListEntry="Gehitu sarrera '%1'-ra"
 Basic.PropertiesWindow.EditEditableListEntry="Editatu sarrera '%1'-tik"
 
-Basic.PropertiesView.FPS.Simple="FS-ko Balio Arrunta"
+Basic.PropertiesView.FPS.Simple="FPS-ko balio arruntak"
-Basic.PropertiesView.FPS.Rational="FS-ko Balio Arrazionala"
+Basic.PropertiesView.FPS.Rational="FPS-ko balio arrazionalak"
-Basic.PropertiesView.FPS.ValidFPSRanges="Baliozko FS-ko Tarteak:"
+Basic.PropertiesView.FPS.ValidFPSRanges="Baliozko FPS-ko tarteak:"
 
 Basic.InteractionWindow="Elkarrekintza '%1'-rekin"
 
-Basic.StatusBar.Reconnecting="Entenda, %2 segundu barru berrelkartzen (saiakera %1)"
+Basic.StatusBar.Reconnecting="Konexiorik gabe, %2 segundo barru birkonektatzen (saiakera %1)"
-Basic.StatusBar.AttemptingReconnect="Berrelkartzen saiatzen... (saiakera %1)"
+Basic.StatusBar.AttemptingReconnect="Birkonektatzen saiatzen... (saiakera %1)"
-Basic.StatusBar.ReconnectSuccessful="Ber-elkarketa ongi"
+Basic.StatusBar.ReconnectSuccessful="Birkonexioa ongi burutu da"
 Basic.StatusBar.Delay="Atzerapena (%1 seg)"
-Basic.StatusBar.DelayStartingIn="Atzerapena (hasiera %1 seg)"
+Basic.StatusBar.DelayStartingIn="Atzerapena (hasiera %1 seg-tan)"
-Basic.StatusBar.DelayStoppingIn="Atzerapena (gelditzea %1 seg)"
+Basic.StatusBar.DelayStoppingIn="Atzerapena (gelditzea %1 seg-tan)"
-Basic.StatusBar.DelayStartingStoppingIn="Atzerapena (gelditzea %1 seg, hasiera %2 seg)"
+Basic.StatusBar.DelayStartingStoppingIn="Atzerapena (gelditzea %1 seg-tan, hasiera %2 seg-tan)"
 
 Basic.Filters="Iragazkiak"
 Basic.Filters.AsyncFilters="Audio/Bideo Iragazkiak"
 Basic.Filters.AudioFilters="Audio Iragazkiak"
-Basic.Filters.EffectFilters="Eragin Iragazkiak"
+Basic.Filters.EffectFilters="Efektu Iragazkiak"
 Basic.Filters.Title="Iragazkiak '%1'-rako"
 Basic.Filters.AddFilter.Title="Iragazkiaren Izena"
-Basic.Filters.AddFilter.Text="Mesedez adierazi iragazkiaren izena"
+Basic.Filters.AddFilter.Text="Adierazi iragazkiaren izena"
 
-Basic.TransformWindow="Agerraldi Gaiaren Eraldaketa"
+Basic.TransformWindow="Eszenaren ezarpenak"
 Basic.TransformWindow.Position="Kokapena"
-Basic.TransformWindow.Rotation="Itzulikapena"
+Basic.TransformWindow.Rotation="Biraketa"
-Basic.TransformWindow.Size="Neurria"
+Basic.TransformWindow.Size="Tamaina"
-Basic.TransformWindow.Alignment="Kokapen Lerrokapena"
+Basic.TransformWindow.Alignment="Kokapen lerrokatzea"
-Basic.TransformWindow.BoundsType="Muga Kutxa Mota"
+Basic.TransformWindow.BoundsType="Muga-koadro mota"
-Basic.TransformWindow.BoundsAlignment="Lerrokatu Muga Kutxan"
+Basic.TransformWindow.BoundsAlignment="Lerrokatu muga-koadroan"
-Basic.TransformWindow.Bounds="Muga Kutxa Neurria"
+Basic.TransformWindow.Bounds="Muga-koadroaren tamaina"
+Basic.TransformWindow.Crop="Moztu"
 
-Basic.TransformWindow.Alignment.TopLeft="Goi Ezkerrean"
+Basic.TransformWindow.Alignment.TopLeft="Goian ezkerrean"
-Basic.TransformWindow.Alignment.TopCenter="Goi Erdian"
+Basic.TransformWindow.Alignment.TopCenter="Goian erdian"
-Basic.TransformWindow.Alignment.TopRight="Goi Eskuinean"
+Basic.TransformWindow.Alignment.TopRight="Goian eskuinean"
-Basic.TransformWindow.Alignment.CenterLeft="Erdi Ezkerrean"
+Basic.TransformWindow.Alignment.CenterLeft="Erdian ezkerrean"
 Basic.TransformWindow.Alignment.Center="Erdian"
-Basic.TransformWindow.Alignment.CenterRight="Erdi Eskuinean"
+Basic.TransformWindow.Alignment.CenterRight="Erdian eskuinean"
-Basic.TransformWindow.Alignment.BottomLeft="Behe Ezkerrean"
+Basic.TransformWindow.Alignment.BottomLeft="Behean ezkerrean"
-Basic.TransformWindow.Alignment.BottomCenter="Behe Erdian"
+Basic.TransformWindow.Alignment.BottomCenter="Behean erdian"
-Basic.TransformWindow.Alignment.BottomRight="Behe Eskuinean"
+Basic.TransformWindow.Alignment.BottomRight="Behean eskuinean"
 
 Basic.TransformWindow.BoundsType.None="Mugarik ez"
-Basic.TransformWindow.BoundsType.MaxOnly="Gehienezko neurria bakarrik"
+Basic.TransformWindow.BoundsType.MaxOnly="Gehienezko tamaina bakarrik"
 Basic.TransformWindow.BoundsType.ScaleInner="Eskalatu barruko mugetara"
 Basic.TransformWindow.BoundsType.ScaleOuter="Eskalatu kanpoko mugetara"
 Basic.TransformWindow.BoundsType.ScaleToWidth="Eskalatu muga zabalerara"
-Basic.TransformWindow.BoundsType.ScaleToHeight="Eskalatu garaiera mugetara"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Eskalatu altuera-mugetara"
 Basic.TransformWindow.BoundsType.Stretch="Luzatu mugetara"
 
-Basic.Main.AddSourceHelp.Title="Ezin da Iturbururik Gehitu"
+Basic.Main.AddSourceHelp.Title="Ezin da iturbururik gehitu"
-Basic.Main.AddSourceHelp.Text="Gutxienez 1 agerraldi eduki behar duzu iturburu batera gehituta."
+Basic.Main.AddSourceHelp.Text="Gutxienez eszena bat eduki behar duzu iturburu bat gehitzeko."
 
-Basic.Main.Scenes="Agerraldiak"
+Basic.Main.Scenes="Eszenak"
 Basic.Main.Sources="Iturburuak"
-Basic.Main.Connecting="Elkartzen..."
+Basic.Main.Connecting="Konektatzen..."
-Basic.Main.StartRecording="Hasi Grabaketa"
+Basic.Main.StartRecording="Hasi grabazioa"
-Basic.Main.StartStreaming="Hasi Jarioa"
+Basic.Main.StartStreaming="Hasi transmisioa"
-Basic.Main.StopRecording="Gelditu Grabaketa"
+Basic.Main.StopRecording="Gelditu grabazioa"
-Basic.Main.StopStreaming="Gelditu Jarioa"
+Basic.Main.StopStreaming="Gelditu transmisioa"
-Basic.Main.ForceStopStreaming="Gelditu Jarioa (baztertu atzerapena)"
+Basic.Main.ForceStopStreaming="Gelditu transmisioa (baztertu atzerapena)"
 
-Basic.MainMenu.File="&Agiria"
+Basic.MainMenu.File="&Fitxategia"
-Basic.MainMenu.File.Export="E&sportatu"
+Basic.MainMenu.File.Export="&Esportatu"
-Basic.MainMenu.File.Import="I&nportatu"
+Basic.MainMenu.File.Import="&Inportatu"
-Basic.MainMenu.File.ShowRecordings="Erakutsi &Grabaketak"
+Basic.MainMenu.File.ShowRecordings="Erakutsi &Grabazioak"
 Basic.MainMenu.File.Remux="&Bermultiplexaketa Grabaketak"
 Basic.MainMenu.File.Settings="&Ezarpenak"
-Basic.MainMenu.File.ShowSettingsFolder="Erakutsi Ezarpenak Agiritegia"
+Basic.MainMenu.File.ShowSettingsFolder="Erakutsi ezarpenen karpeta"
-Basic.MainMenu.File.ShowProfileFolder="Erakutsi Profila Agiritegia"
+Basic.MainMenu.File.ShowProfileFolder="Erakutsi profilaren karpeta"
-Basic.MainMenu.AlwaysOnTop="&Betik Gainean"
+Basic.MainMenu.AlwaysOnTop="&Beti gainean"
 Basic.MainMenu.File.Exit="I&rten"
 
 Basic.MainMenu.Edit="&Editatu"
@@ -244,189 +272,206 @@ Basic.MainMenu.Edit.RedoAction="&Berregin $1"
 Basic.MainMenu.Edit.Transform="&Eraldatu"
 Basic.MainMenu.Edit.Transform.EditTransform="E&ditatu Eraldaketa..."
 Basic.MainMenu.Edit.Transform.ResetTransform="&Berrezarri Eraldaketa"
-Basic.MainMenu.Edit.Transform.Rotate90CW="Itzulikatu 90 gradu ON"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Biratu 90 gradu erlojuaren norabidean"
-Basic.MainMenu.Edit.Transform.Rotate90CCW="Itzulikatu 90 gradu OAN"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Itzulikatu 90 gradu erlojuaren kontrako norabidean"
-Basic.MainMenu.Edit.Transform.Rotate180="Itzulikatu 180 gradu"
+Basic.MainMenu.Edit.Transform.Rotate180="Biratu 180 gradu"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="Itzulikatu &Etzanka"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Irauli &horizontala"
-Basic.MainMenu.Edit.Transform.FlipVertical="Itzulikatu &Zutika"
+Basic.MainMenu.Edit.Transform.FlipVertical="Irauli &bertikala"
-Basic.MainMenu.Edit.Transform.FitToScreen="&Finkatu ikusleihora"
+Basic.MainMenu.Edit.Transform.FitToScreen="&Doitu pantailara"
-Basic.MainMenu.Edit.Transform.StretchToScreen="&Luzatu ikusleihora"
+Basic.MainMenu.Edit.Transform.StretchToScreen="&Luzatu pantailara"
-Basic.MainMenu.Edit.Transform.CenterToScreen="&Erdiratu ikusleihoan"
+Basic.MainMenu.Edit.Transform.CenterToScreen="&Erdiratu pantailan"
 Basic.MainMenu.Edit.Order="&Ordenatu"
 Basic.MainMenu.Edit.Order.MoveUp="Mugitu &Gora"
-Basic.MainMenu.Edit.Order.MoveDown="Mugitu &Behera"
+Basic.MainMenu.Edit.Order.MoveDown="Mugitu &behera"
-Basic.MainMenu.Edit.Order.MoveToTop="Mugitu G&oren"
+Basic.MainMenu.Edit.Order.MoveToTop="Mugitu &goraino"
-Basic.MainMenu.Edit.Order.MoveToBottom="Mugitu B&eheren"
+Basic.MainMenu.Edit.Order.MoveToBottom="Mugitu &beheraino"
-Basic.MainMenu.Edit.AdvAudio="A&udio Ezaugarri Aurreratuak"
+Basic.MainMenu.Edit.AdvAudio="&Audio ezarpen aurreratuak"
 
-Basic.MainMenu.SceneCollection="&Agerraldi Bilduma"
+Basic.MainMenu.SceneCollection="&Eszena-bilduma"
 Basic.MainMenu.Profile="&Profila"
 
 Basic.MainMenu.Help="&Laguntza"
 Basic.MainMenu.Help.Website="Ikusi &Webgunea"
-Basic.MainMenu.Help.Logs="&Ohar Agiriak"
+Basic.MainMenu.Help.Logs="&Egunkari-fitxategiak"
-Basic.MainMenu.Help.Logs.ShowLogs="&Erakutsi Ohar Agiriak"
+Basic.MainMenu.Help.Logs.ShowLogs="&Erakutsi egunkari-fitxategiak"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="Igo &Oraingo Ohar Agiria"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="Kargatu &uneko egunkari-fitxategiak"
-Basic.MainMenu.Help.Logs.UploadLastLog="Igo &Azken Ohar Agiria"
+Basic.MainMenu.Help.Logs.UploadLastLog="Kargatu &azken egunkari-fitxategia"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ikusi Oraingo Oharra"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ikusi uneko egunkari-fitxategia"
-Basic.MainMenu.Help.CheckForUpdates="Egiaztatu Eguneraketak"
+Basic.MainMenu.Help.CheckForUpdates="Begiratu eguneraketak"
 
 Basic.Settings.ProgramRestart="Programa berrabiarazi egin behar da ezarpen hauek eragina izateko."
-Basic.Settings.ConfirmTitle="Baieztatu Aldaketak"
+Basic.Settings.ConfirmTitle="Baieztatu aldaketak"
 Basic.Settings.Confirm="Gordegabeko aldaketak dituzu. Gorde aldaketak?"
 
 Basic.Settings.General="Orokorra"
-Basic.Settings.General.Theme="Azalgaia"
+Basic.Settings.General.Theme="Gaia"
 Basic.Settings.General.Language="Hizkuntza"
-Basic.Settings.General.WarnBeforeStartingStream="Erakutsi baieztapen elkarrizketa jairoak hasterakoan"
+Basic.Settings.General.WarnBeforeStartingStream="Erakutsi baieztapen elkarrizketa transmisioak hasterakoan"
-Basic.Settings.General.WarnBeforeStoppingStream="Erakutsi baieztapen elkarrizketa jairoak gelditzerakoan"
+Basic.Settings.General.WarnBeforeStoppingStream="Erakutsi baieztapen elkarrizketa transmisioak gelditzerakoan"
+Basic.Settings.General.Snapping="Iturburuaren lerrokatzearen doitzea"
+Basic.Settings.General.ScreenSnapping="Doitu iturburuak pantailaren ertzera"
+Basic.Settings.General.CenterSnapping="Doitu iturburuak bertikalki eta horizontalki erdira"
+Basic.Settings.General.SourceSnapping="Doitu iturburuak beste iturburuetara"
+Basic.Settings.General.SnapDistance="Doitu sentikortasuna"
 
-Basic.Settings.Stream="Jarioa"
+Basic.Settings.Stream="Transmisioa"
-Basic.Settings.Stream.StreamType="Jario Mota"
+Basic.Settings.Stream.StreamType="Transmisio-mota"
 
 Basic.Settings.Output="Irteera"
-Basic.Settings.Output.Format="Grabaketa Heuskarria"
+Basic.Settings.Output.Format="Grabazio-formatua"
-Basic.Settings.Output.Encoder="Kodeatzailea"
+Basic.Settings.Output.Encoder="Kodetzailea"
-Basic.Settings.Output.SelectDirectory="Hautatu Grabaketa Zuzenbidea"
+Basic.Settings.Output.SelectDirectory="Hautatu grabazioaren karpeta"
-Basic.Settings.Output.SelectFile="Hautatu Grabaketa Agiria"
+Basic.Settings.Output.SelectFile="Hautatu grabazioaren fitxategia"
-Basic.Settings.Output.Mode="Irteera Modua"
+Basic.Settings.Output.EnforceBitrate="Behartu transmisio zerbitzuaren bit-tasaren mugak"
+Basic.Settings.Output.Mode="Irteera-modua"
 Basic.Settings.Output.Mode.Simple="Arrunta"
 Basic.Settings.Output.Mode.Adv="Aurreratua"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg Irteera"
-Basic.Settings.Output.Simple.SavePath="Grabaketa Helburua"
+Basic.Settings.Output.Simple.SavePath="Grabazio-bidea"
-Basic.Settings.Output.Simple.RecordingQuality="Grabaketa Ontasuna"
+Basic.Settings.Output.Simple.RecordingQuality="Grabazio-kalitatea"
-Basic.Settings.Output.Simple.RecordingQuality.Stream="Jarioaren berdina"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Transmisioaren berdina"
-Basic.Settings.Output.Simple.RecordingQuality.Small="Ontasun Handia. Agiri Neurri Ertaina"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Kalitate altua. Fitxategi-tamaina ertaina"
-Basic.Settings.Output.Simple.RecordingQuality.HQ="Bereizgabeko Ontasuna. Agiri Neurri Handia"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Bereizigabeko kalitatea. Fitxategi-tamaina handia"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Galeragabeko Ontasuna. Agiri Neurri Izugarri Handia"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Galerarik gabeko kalitatea. Fitxategi-tamaina izugarri handia"
-Basic.Settings.Output.Simple.Warn.Encoder="Oharra: Software kodeatzaile batekin grabatzeak jarioaren ontasun ezberdin batean CPU-aren erabilpen gehigarria beharko du jarioa eta grabaketa aldiberean egiten badituzu."
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Kontuz: transmisioaren bideoaren bit-tasa %1 ean ezarriko da; hau izango da oraingo transmisio zerbitzuaren goiko muga. Seguru bazaude %1 aren gainetik nahi duzula, gaitu kodetze aukera aurreratuak eta desautatu \"Behartu transmisio zerbitzuaren bit-tasaren mugak\"."
-Basic.Settings.Output.Simple.Warn.Lossless="Oharra: Galeragabeko ontasunak agiri neurri izugarri handiak sortzen ditu! Galeragabeko ontasunak 7 gigabytetik gorako diska tokia erabili dezake minutuko bereizmen eta frameneurri handietan. Galeragabea ez dago gomendatua grabaketa luzeetarako diska toki eskuragarri oso handi bat ez baduzu."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Kontuz: transmisioaren audioaren bit-tasa %1 ean ezarriko da; hau izango da oraingo transmisio zerbitzuaren goiko muga. Seguru bazaude %1 aren gainetik nahi duzula, gaitu kodetze aukera aurreratuak eta desautatu \"Behartu transmisio zerbitzuaren bit-tasaren mugak\"."
-Basic.Settings.Output.Simple.Warn.Lossless.Msg="Zihur zaude galeragabeko ontasuna erabiltzea nahi duzula?"
+Basic.Settings.Output.Simple.Warn.Encoder="Oharra: Transmisioak duen kalitatea ez bestelako kalitate batez grabatzeak PUZ-ren aparteko erabilera eskatzen du une berean transmititzen eta grabatzen baduzu."
-Basic.Settings.Output.Simple.Warn.Lossless.Title="Galeragabeko ontasun oharra!"
+Basic.Settings.Output.Simple.Warn.Lossless="Oharra: Galerarik gabeko kalitateak  neurri izugarri handiko fitxategiak sortzen ditu! Galerarik gabeko kalitateak minutuko 7 gigabytetik gorako tokia erabili dezake diskoan bereizmen eta fotograma-emari handietan. Galerarik gabeko kalitatea ez dago gomendatua grabazio luzeetarako disko toki eskuragarri oso handi bat ez baduzu."
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="Ziur zaude galerarik gabeko kalitatea erabili nahi duzula?"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Galerarik gabeko kalitateaz oharra!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Kontuz: Ezin dituzu QSV kodeatzaile ugari bananduta erabili aldiberean jariotu eta grabatzerakoan.  Aldiberean jariotu eta grabatzea nahi baduzu, mesedez aldatu bietako bat, grabaketa kodeatzailea edo jariotze kodeatzailea."
 Basic.Settings.Output.Simple.Encoder.Software="Softwarea (x264)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softwarea (x264 CPU erabilpen apaleko aurrezarpena, agiri neurria handitzen du)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardwarea (QSV)"
-Basic.Settings.Output.VideoBitrate="Bideo Bitneurria"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardwarea (NVENC)"
-Basic.Settings.Output.AudioBitrate="Audio Bitneurria"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softwarea (x264 PUZ erabilpen apaleko aurre-ezarpena, fitxategiaren tamaina handitzen du)"
-Basic.Settings.Output.Reconnect="Berezgaitasunez Berrelkartu"
+Basic.Settings.Output.VideoBitrate="Bideo bit-emaria"
-Basic.Settings.Output.RetryDelay="Saiakera Atzerapena (segundu)"
+Basic.Settings.Output.AudioBitrate="Audio bit-emaria"
-Basic.Settings.Output.MaxRetries="Gehienezko Saiakerak"
+Basic.Settings.Output.Reconnect="Automatikoki birkonektatu"
-Basic.Settings.Output.Advanced="Gaitu Kodeatzaile Aurreratu Ezarpenak"
+Basic.Settings.Output.RetryDelay="Saiakera-atzerapena (segundoak)"
-Basic.Settings.Output.EncoderPreset="Kodeatzaile Aurrezarpena (handiagoa = CPU gutxiago)"
+Basic.Settings.Output.MaxRetries="Gehienezko saiakerak"
-Basic.Settings.Output.CustomEncoderSettings="Norbere Kodeatzaile Ezarpenak"
+Basic.Settings.Output.Advanced="Gaitu Kodetzaile aurreratuaren ezarpenak"
-Basic.Settings.Output.CustomMuxerSettings="Norbere Nahastzaile Ezarpenak"
+Basic.Settings.Output.EncoderPreset="Kodetzailearen aurre-ezarpena (handiagoa = PUZ gutxiago)"
-Basic.Settings.Output.NoSpaceFileName="Sortu Agiri Izena Tarterik gabe"
+Basic.Settings.Output.CustomEncoderSettings="Kodetzailearen ezarpen pertsonalizatuak"
+Basic.Settings.Output.CustomMuxerSettings="Bihurtzailearen ezarpen pertsonalizatuak"
+Basic.Settings.Output.NoSpaceFileName="Sortu tarterik gabeko fitxategi-izena"
 
-Basic.Settings.Output.Adv.Rescale="Birneurriratu Irteera"
+Basic.Settings.Output.Adv.Rescale="Eskala-aldaketaren Irteera"
-Basic.Settings.Output.Adv.AudioTrack="Audio Bidea"
+Basic.Settings.Output.Adv.AudioTrack="Audio-pista"
-Basic.Settings.Output.Adv.Streaming="Jarioa"
+Basic.Settings.Output.Adv.Streaming="Transmisioa"
-Basic.Settings.Output.Adv.ApplyServiceSettings="Behartu jario zerbitzu kodeatzaile ezarpenak"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Behartu transmisio-zerbitzu kodetzaileren ezarpenak"
-Basic.Settings.Output.Adv.Audio.Track1="1 Bidea"
+Basic.Settings.Output.Adv.Audio.Track1="1 pista"
-Basic.Settings.Output.Adv.Audio.Track2="2 Bidea"
+Basic.Settings.Output.Adv.Audio.Track2="2 pista"
-Basic.Settings.Output.Adv.Audio.Track3="3 Bidea"
+Basic.Settings.Output.Adv.Audio.Track3="3 pista"
-Basic.Settings.Output.Adv.Audio.Track4="4 Bidea"
+Basic.Settings.Output.Adv.Audio.Track4="4 pista"
 
 Basic.Settings.Output.Adv.Recording="Grabatzen"
 Basic.Settings.Output.Adv.Recording.Type="Mota"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Estandarra"
-Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Norbere Irteera (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Irteera pertsonalizatua (FFmpeg)"
-Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Erabili jario kodeatzailea)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Erabili transmisio kodetzailea)"
-Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg Irteera Mota"
+Basic.Settings.Output.Adv.Recording.Filename="Fitxategi-izenaren formatua"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Gainidatzi fitxategia badago"
+Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg Irteera-mota"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Irteera URL-ra"
-Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Irteera Agirira"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Irteera fitxategira"
-Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Grabaketa heuskarri arruntak"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Grabazio formatu arruntak"
-Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Agiri Guztiak"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Fitxategi guztiak"
-Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Agiri helburua edo URL-a"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Fitxategi-bidea edo URL-a"
-Basic.Settings.Output.Adv.FFmpeg.Format="Edukiontzi Heuskarria"
+Basic.Settings.Output.Adv.FFmpeg.Format="Edukiontziaren formatua"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Audioa"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Bideoa"
-Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Berezko Heuskarria"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Formatu lehenetsia"
-Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Edukiontzi Heuskarri Azalpena"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Edukiontzi-formatuaren ezaugarriak"
-Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Audio/Bideo Kodeka Agiri helburutik edo URL-tik igarria"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Audio/Bideo Kodeka fitxategiaren bidetik edo URLtik igarria"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Berezko Kodeatzailea"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Lehenetsitako kodetzailea"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Ezgaitu Kodeatzailea"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Ezgaitu kodetzailea"
-Basic.Settings.Output.Adv.FFmpeg.VEncoder="Bideo Kodeatzailea"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Bideo kodetzailea"
-Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Bideo Kodeatzaile Ezarpenak (egonez gero)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Bideo kodetzailearen ezarpenak (egonez gero)"
-Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Kodeatzailea"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio kodetzailea"
-Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Kodeatzaile Ezarpenak (egonez gero)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio kodetzailearen ezarpenak (egonez gero)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Nahastzaile Ezarpenak (egonez gero)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Bihurtzailearen ezarpenak (egonez gero)"
+
+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"
+
+FilenameFormatting.TT="%CCYY		Urtea, lau digitu\n%YY		Urtea, azken bi digitu (00-99)\n%MM		Hilabetea zenbaki hamartarrez (01-12)\n%DD		Hilabeteko eguna bi digituz (01-31)\n%hh		Ordua 24h formatuan (00-23)\n%mm		Minutu (00-59)\n%ss		Segundo (00-61)\n%%		A % ikur\n%a		Asteko eguna laburtua\n%A		Asteko eguna izen osoa\n%b		Hilabetea laburtua\n%B		Hilabeteko izen osoa\n%d		Hilabeteko eguna bi digituz (01-31)\n%H		Ordua 24h formatuan (00-23)\n%I		Ordua 12h formatuan (01-12)\n%m		Hilabetea zenbaki hamartarrez (01-12)\n%M		Minutua (00-59)\n%p		AM edo PM \n%S		Segundo (00-61)\n%y		Urtea, azken bi digituz (00-99)\n%Y		Urtea\n%z		ISO 8601 UTC edo ordu-zonaz desplazatua\n		laburduraren izena\n%Z		Ordu-zona edo laburdura\n"
 
 Basic.Settings.Video="Bideoa"
-Basic.Settings.Video.Adapter="Bideo Egokitzailea:"
+Basic.Settings.Video.Adapter="Bideo moldagailua:"
-Basic.Settings.Video.BaseResolution="Ohinarria (Oihala) Bereizmena:"
+Basic.Settings.Video.BaseResolution="Oinarriaren (oihalaren) bereizmena:"
-Basic.Settings.Video.ScaledResolution="Irteera (Eskalatua) Bereizmena:"
+Basic.Settings.Video.ScaledResolution="Irteera (eskalatuaren) bereizmena:"
-Basic.Settings.Video.DownscaleFilter="Behera-eskalatze Iragazkia:"
+Basic.Settings.Video.DownscaleFilter="Behera-eskalatze iragazkia:"
 Basic.Settings.Video.DisableAeroWindows="Ezgaitu Aero (Windows bakarrik)"
-Basic.Settings.Video.FPS="FS-ko:"
+Basic.Settings.Video.FPS="FPS:"
-Basic.Settings.Video.FPSCommon="FS-ko Balio Arruntak"
+Basic.Settings.Video.FPSCommon="FPS balio arruntak"
-Basic.Settings.Video.FPSInteger="FS-ko Balio Osoa"
+Basic.Settings.Video.FPSInteger="FPS balio osoa"
-Basic.Settings.Video.FPSFraction="FS-ko Balio Zatizkia"
+Basic.Settings.Video.FPSFraction="FPS zatikizko balioa"
 Basic.Settings.Video.Numerator="Zenbakitzailea:"
 Basic.Settings.Video.Denominator="Izendatzailea:"
-Basic.Settings.Video.Renderer="Aurkezlea:"
+Basic.Settings.Video.Renderer="Errendatzailea:"
-Basic.Settings.Video.InvalidResolution="Bereizmen balio baliogabea. Izan behar da [width]x[height] (adib. 1920x1080)"
+Basic.Settings.Video.InvalidResolution="Bereizmen baliogabea. Izan behar da [width]x[height] (adib. 1920x1080)"
-Basic.Settings.Video.CurrentlyActive="Bideo irtera gaituta dago une honetan. Mesedez eten irteera guztiak bideo ezarpenak aldatzeko."
+Basic.Settings.Video.CurrentlyActive="Bideo irteera gaituta dago une honetan. Eten irteera guztiak bideo ezarpenak aldatzeko."
 Basic.Settings.Video.DisableAero="Ezgaitu Aero"
 
-Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinearra (Azkarrena, baina lausoa eskalatuz gero)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Bilineala (Azkarrena, baina lausoa eskalatuz gero)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubikoa (Eskalatze itzaldua, 16 lagin)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubikoa (enfokatutako eskalatzea, 16 lagin)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Eskalatze itzaldua, 32 lagin)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (enfokatutako eskalatzea, 32 lagin)"
 
 Basic.Settings.Audio="Audioa"
-Basic.Settings.Audio.SampleRate="Laginketa Neurria"
+Basic.Settings.Audio.SampleRate="Lagin-maiztasuna"
 Basic.Settings.Audio.Channels="Bideak"
-Basic.Settings.Audio.DesktopDevice="Mahaigaineko Audio Gailua"
+Basic.Settings.Audio.DesktopDevice="Mahaigaineko audio gailua"
-Basic.Settings.Audio.DesktopDevice2="Mahaigaineko Audio Gailua 2"
+Basic.Settings.Audio.DesktopDevice2="Mahaigaineko audio gailua 2"
-Basic.Settings.Audio.AuxDevice="Mik/Osagarri Audio Gailua"
+Basic.Settings.Audio.AuxDevice="Mik/Osagarri audio gailua"
-Basic.Settings.Audio.AuxDevice2="Mik/Osagarri Audio Gailua 2"
+Basic.Settings.Audio.AuxDevice2="Mik/Osagarri audio gailua 2"
-Basic.Settings.Audio.AuxDevice3="Mik/Osagarri Audio Gailua 3"
+Basic.Settings.Audio.AuxDevice3="Mik/Osagarri audio gailua 3"
 Basic.Settings.Audio.EnablePushToMute="Gaitu Sakatu-mututzeko"
 Basic.Settings.Audio.PushToMuteDelay="Sakatu-mututzeko atzerapena"
 Basic.Settings.Audio.EnablePushToTalk="Gaitu Sakatu-hitz-egiteko"
 Basic.Settings.Audio.PushToTalkDelay="Sakatu-hitz-egiteko atzerapena"
-Basic.Settings.Audio.UnknownAudioDevice="[Gailua ezin da elkartu edo ez dago eskuragarri]"
+Basic.Settings.Audio.UnknownAudioDevice="[Gailua konektatu gabe edo ez dago eskuragarri]"
 
 Basic.Settings.Advanced="Aurreratua"
-Basic.Settings.Advanced.FormatWarning="Kontuz: NV12 ez diren margo heuskarriak grabaketarako dira gehienbat, eta ez daude gomendatutarik jariorako. Jarioak CPU erabilpena handitu dezake margo heuskarri bihurketa dela-eta."
+Basic.Settings.Advanced.FormatWarning="Oharra: NV12 ez diren kolore formatuak grabaziorako dira gehienbat, eta ez daude gomendatuta transmisiorako. Transmisioak PUZ erabilpena handitu dezake kolore formatu bihurketa dela medio."
-Basic.Settings.Advanced.Audio.BufferingTime="Audio Buffer Denbora"
+Basic.Settings.Advanced.Audio.BufferingTime="Audio bufferratze denbora"
-Basic.Settings.Advanced.Video.ColorFormat="Margo Heuskarria"
+Basic.Settings.Advanced.Video.ColorFormat="Kolore formatua"
-Basic.Settings.Advanced.Video.ColorSpace="YUV Margo Tartea"
+Basic.Settings.Advanced.Video.ColorSpace="YUV kolore-espazioa"
-Basic.Settings.Advanced.Video.ColorRange="YUV Margo Maila"
+Basic.Settings.Advanced.Video.ColorRange="YUV kolore-barrutia"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Partziala"
 Basic.Settings.Advanced.Video.ColorRange.Full="Osoa"
-Basic.Settings.Advanced.StreamDelay="Jario Atzerapena"
+Basic.Settings.Advanced.StreamDelay="Taansmisio-atzerapena"
-Basic.Settings.Advanced.StreamDelay.Duration="Iraupena (segunduak)"
+Basic.Settings.Advanced.StreamDelay.Duration="Iraupena (segundoak)"
-Basic.Settings.Advanced.StreamDelay.Preserve="Heutsi ebaketa puntuari (handitu atzerapena) berrelkartzean"
+Basic.Settings.Advanced.StreamDelay.Preserve="Mantendu ebaketa puntua (handitu atzerapena) birkonektatzean"
-Basic.Settings.Advanced.StreamDelay.MemoryUsage="Ustezko Oroimen Erabilpena: %1 MB"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Estimatutako memoria erabilpena: %1 MB"
 
-Basic.AdvAudio="Audio Ezaugarri Aurreratuak"
+Basic.AdvAudio="Audio propietate aurreratuak"
 Basic.AdvAudio.Name="Izena"
 Basic.AdvAudio.Volume="Bolumena (%)"
-Basic.AdvAudio.Mono="Behera-nahastu Monora"
+Basic.AdvAudio.Mono="Nahasketa monora murriztu"
 Basic.AdvAudio.Panning="Panoramika"
-Basic.AdvAudio.SyncOffset="Aldiberetze Oreka (sm)"
+Basic.AdvAudio.SyncOffset="Sinkronizazioaren desplazamendua (ms)"
-Basic.AdvAudio.AudioTracks="Bideak"
+Basic.AdvAudio.AudioTracks="Pistak"
 
-Basic.Settings.Hotkeys="Lasterteklak"
+Basic.Settings.Hotkeys="Laster-teklak"
-Basic.Settings.Hotkeys.Pair="'%1'-rekin elkarbanatutako tekla konbinazioak aldatzaile bezala ekiten dute"
+Basic.Settings.Hotkeys.Pair="'%1'-rekin egindako tekla konbinazioek txandakatze moduan jokatzen dute"
 
-Basic.Hotkeys.StartStreaming="Hasi Jarioa"
+Basic.Hotkeys.StartStreaming="Hasi transmisioa"
-Basic.Hotkeys.StopStreaming="Gelditu Jarioa"
+Basic.Hotkeys.StopStreaming="Gelditu transmisioa"
-Basic.Hotkeys.StartRecording="Hasi Grabaketa"
+Basic.Hotkeys.StartRecording="Hasi Grabazioa"
-Basic.Hotkeys.StopRecording="Gelditu Grabaketa"
+Basic.Hotkeys.StopRecording="Gelditu grabazioa"
-Basic.Hotkeys.SelectScene="Aldatu agerraldira"
+Basic.Hotkeys.SelectScene="Aldatu eszenara"
 
 Hotkeys.Insert="Txertatu"
 Hotkeys.Delete="Ezabatu"
 Hotkeys.Home="Hasiera"
 Hotkeys.End="Amaiera"
-Hotkeys.PageUp="Orrialdean Gora"
+Hotkeys.PageUp="Orria gora"
-Hotkeys.PageDown="Orrialdean Behera"
+Hotkeys.PageDown="Orria behera"
-Hotkeys.NumLock="Zbk. Blokeoa"
+Hotkeys.NumLock="Blok Zenb"
-Hotkeys.ScrollLock="Irristari Blokeoa"
+Hotkeys.ScrollLock="Blok korr"
-Hotkeys.CapsLock="Hizki-larri Blokeoa"
+Hotkeys.CapsLock="Blok Maius"
 Hotkeys.Backspace="Atzera"
-Hotkeys.Tab="Tabulazioa"
+Hotkeys.Tab="Tab"
-Hotkeys.Print="Irarkitu"
+Hotkeys.Print="Inprimatu"
 Hotkeys.Pause="Pausatu"
 Hotkeys.Left="Ezker"
 Hotkeys.Right="Eskuin"
@@ -435,30 +480,30 @@ Hotkeys.Down="Behera"
 Hotkeys.Windows="Windows"
 Hotkeys.Super="Super"
 Hotkeys.Menu="Menua"
-Hotkeys.Space="Tartea"
+Hotkeys.Space="Zuriunea"
-Hotkeys.NumpadNum="Zbk-panela %1"
+Hotkeys.NumpadNum="Zenb-teklatua %1"
-Hotkeys.NumpadMultiply="Zbk-panela Biderkatu"
+Hotkeys.NumpadMultiply="Zenb-teklatuko biderketa"
-Hotkeys.NumpadDivide="Zbk-panela Zatitu"
+Hotkeys.NumpadDivide="Zenb-teklatuaren Zatiketa"
-Hotkeys.NumpadAdd="Zbk-panela Gehitu"
+Hotkeys.NumpadAdd="Zenb-teklatuaren gehiketa"
-Hotkeys.NumpadSubtract="Zbk-panela Kendu"
+Hotkeys.NumpadSubtract="Zenb-teklatuaren kenketa"
-Hotkeys.NumpadDecimal="Zbk-panela Hamarrena"
+Hotkeys.NumpadDecimal="Zenb-teklatuaren hamartarra"
-Hotkeys.AppleKeypadNum="%1 (Zbk-panela)"
+Hotkeys.AppleKeypadNum="%1 (tekla)"
-Hotkeys.AppleKeypadMultiply="* (Zbk-panela)"
+Hotkeys.AppleKeypadMultiply="* (tekla)"
-Hotkeys.AppleKeypadDivide="/ (Zbk-panela)"
+Hotkeys.AppleKeypadDivide="/ (tekla)"
-Hotkeys.AppleKeypadAdd="+ (Zbk-panela)"
+Hotkeys.AppleKeypadAdd="+ (tekla)"
-Hotkeys.AppleKeypadSubtract="- (Zbk-panela)"
+Hotkeys.AppleKeypadSubtract="- (tekla)"
-Hotkeys.AppleKeypadDecimal=". (Zbk-panela)"
+Hotkeys.AppleKeypadDecimal=". (tekla)"
-Hotkeys.AppleKeypadEqual="= (Zbk-panela)"
+Hotkeys.AppleKeypadEqual="= (tekla)"
 Hotkeys.MouseButton="Sagua %1"
 
 Mute="Mututu"
-Unmute="Desmututu"
+Unmute="Ez mututu"
 Push-to-mute="Sakatu-mututzeko"
 Push-to-talk="Sakatu-hitz-egiteko"
 
 SceneItemShow="Erakutsi '%1'"
 SceneItemHide="Ezkutatu '%1'"
 
-OutputWarnings.NoTracksSelected="Gutxienez bide bat hautatu behar duzu"
+OutputWarnings.NoTracksSelected="Gutxienez pista bat hautatu behar duzu"
-OutputWarnings.MultiTrackRecording="Kontuz: Zenbait heuskarrik (FLV bezalakoak) ez dituzte bide anitz sostengatzen grabaketa bakoitzeko"
+OutputWarnings.MultiTrackRecording="Oharra: Zenbait formatuk (esaterako FLV-k) ez ditu pista anitzak onartzen grabazioan"
 

obs/data/locale/fi-FI.ini

@@ -8,6 +8,7 @@ Cancel="Peruuta"
 Close="Sulje"
 Save="Tallenna"
 Discard="Hylkää"
+Disable="Poista käytöstä"
 Yes="Kyllä"
 No="Ei"
 Add="Lisää"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Palauta OSX V-Sync suljettaessa"
 HighResourceUsage="Enkoodaus on ylikuormitettu! Harkitse laatu-asetusten laskemista tai käytä nopeampaa preset-asetusta."
 Transition="Siirtymä"
 QuickTransitions="Pikasiirtymät"
+Left="Vasen"
+Right="Oikea"
+Top="Ylhäältä"
+Bottom="Alhaalta"
 
 QuickTransitions.SwapScenes="Vaihda esikatselu- ja ulostulo-skenet siirtymän jälkeen"
 QuickTransitions.SwapScenesTT="Vaihda esikatselu- ja ulostulo-skenet siirtymän jälkeen (jos ulostulon alkuperäinen skene on yhä olemassa).\nTämä ei peruuta muutoksia joita on tehty alkuperäiseen skeneen."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Kahdenna lähteet"
 QuickTransitions.EditPropertiesTT="Sallitaan lähteiden muuntaminen ja näkyvyyden muuttaminen muuttamatta ulostuloa samaa skeneä muokattaessa.\nTämä on käytössä vain jos 'Kahdenna skene' on käytössä.\nTietyt lähteet, kuten kaappauslaitteiden ja medialähteiden, eivät tue tätä, eikä niitä voi muokata erikseen.\nAsetuksen muuttaminen palauttaa nykyisen ulostulo-skenen (jos se on olemassa).\n\nVaroitus: Tämä saattaa vaatia järjestelmältä lisätehoa, koska lähteitä kahdennetaan."
 QuickTransitions.HotkeyName="Pikasiirtymä: %1"
 
+Basic.AddTransition="Lisää muokattava siirtymä"
+Basic.RemoveTransition="Poista muokattava siirtymä"
+Basic.TransitionProperties="Siirtymän ominaisuudet"
 Basic.SceneTransitions="Skene-siirtymät"
 Basic.TransitionDuration="Kesto"
 Basic.TogglePreviewProgramMode="Studio-tila"
 
+TransitionNameDlg.Text="Syötä siirtymän nimi"
+TransitionNameDlg.Title="Siirtymän nimi"
+
 TitleBar.Profile="Profiili"
 TitleBar.Scenes="Skenet"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Haluatko varmasti poistaa '$1'?"
 Output.ConnectFail.Title="Yhdistäminen epäonnistui"
 Output.ConnectFail.BadPath="Viallinen polku tai yhteysosoite.  Tarkista, että asetuksesi ovat kunnossa."
 Output.ConnectFail.ConnectFailed="Palvelimelle yhdistäminen epäonnistui"
-Output.ConnectFail.InvalidStream="Kanavaan tai striimiavaimeen ei saada oikeuksia.  Tämä saattaa johtua siitä, että kanava tai avain on kirjoitettu väärin tai siksi että palvelin luulee sinun olevan yhä kirjautuneena."
+Output.ConnectFail.InvalidStream="Kanavaa tai lähetysavainta ei voida käyttää. Tarkista lähetysavain varmuuden vuoksi. Jos se kuitenkin on oikein, vika saattaa olla yhdistettävässä palvelimessa."
 Output.ConnectFail.Error="Odottamaton virhe ilmeni, kun palvelimelle yritettiin yhdistää.  Lisää tietoa saat lokitiedostosta."
 Output.ConnectFail.Disconnected="Yhteys palvelimeen katkaistiin."
 
@@ -99,8 +110,7 @@ LogReturnDialog.CopyURL="Kopioi osoite"
 LogReturnDialog.ErrorUploadingLog="Lokitiedoston lähetyksessä tapahtui virhe"
 
 LicenseAgreement="Käyttöoikeussopimus"
-LicenseAgreement.PleaseReview="Lukaise lisenssin ehdot ennen kuin käytät OBS-ohjelmistoa. Käyttämällä tätä ohjelmaa tunnustat, että olet lukenut ja hyväksynyt <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a> ehdot.
+LicenseAgreement.PleaseReview="Lukaise lisenssin ehdot ennen kuin käytät OBS-ohjelmistoa. Käyttämällä tätä ohjelmaa tunnustat, että olet lukenut ja hyväksynyt <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU General Public License v2.0</a> ehdot. Vieritä alas nähdäksesi loput sopimuksesta."
-Vieritä alas nähdäksesi loput sopimuksesta."
 LicenseAgreement.ClickIAgreeToContinue="Jos hyväksyt sopimuksen ehdot, klikkaa 'Hyväksyn' jatkaaksesi. Sinun täytyy hyväksyä sopimus käyttääksesi OBS-ohjelmistoa."
 LicenseAgreement.IAgree="Hyväksyn"
 LicenseAgreement.Exit="Sulje"
@@ -108,7 +118,7 @@ LicenseAgreement.Exit="Sulje"
 Remux.SourceFile="OBS-tallenne"
 Remux.TargetFile="Kohdetiedosto"
 Remux.Remux="Muunna"
-Remux.RecordingPattern="OBS-tallenne (*.flv)"
+Remux.OBSRecording="OBS-tallenne"
 Remux.FinishedTitle="Muunto on valmistunut"
 Remux.Finished="Tallenne muunnettu"
 Remux.FinishedError="Tallenne on muunnettu, mutta tiedosto saattaa olla keskeneräinen"
@@ -134,6 +144,18 @@ Basic.DisplayCapture="Kaappaa monitori"
 
 Basic.Main.PreviewConextMenu.Enable="Näytä esikatselu"
 
+Deinterlacing="Lomituksen poisto (Deinterlace)"
+Deinterlacing.Discard="Ohita"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Ylin kenttä ensin"
+Deinterlacing.BottomFieldFirst="Alin kenttä ensin"
+
 Basic.Main.AddSceneDlg.Title="Lisää skene"
 Basic.Main.AddSceneDlg.Text="Aseta skenen nimi"
 
@@ -199,6 +221,7 @@ Basic.TransformWindow.Alignment="Sijaintiin kohdistus"
 Basic.TransformWindow.BoundsType="Rajauslaatikon tyyppi"
 Basic.TransformWindow.BoundsAlignment="Rajauslaatikon kohdistus"
 Basic.TransformWindow.Bounds="Rajauslaatikon koko"
+Basic.TransformWindow.Crop="Rajaa"
 
 Basic.TransformWindow.Alignment.TopLeft="Ylävasen"
 Basic.TransformWindow.Alignment.TopCenter="Yläkeski"
@@ -285,6 +308,11 @@ Basic.Settings.General.Theme="Teema"
 Basic.Settings.General.Language="Kieli"
 Basic.Settings.General.WarnBeforeStartingStream="Näytä varmistus-ikkuna kun lähetys aloitetaan"
 Basic.Settings.General.WarnBeforeStoppingStream="Näytä varmistusikkuna kun lähetys pysäytetään"
+Basic.Settings.General.Snapping="Lähteiden kiinnitys"
+Basic.Settings.General.ScreenSnapping="Kiinnitä lähteitä ruudun reunaan"
+Basic.Settings.General.CenterSnapping="Kiinnitä lähteitä vaaka- sekä pystysuunnan keskilinjaan"
+Basic.Settings.General.SourceSnapping="Kiinnitä lähteitä muihin lähteisiin"
+Basic.Settings.General.SnapDistance="Kiinnityksen herkkyys"
 
 Basic.Settings.Stream="Lähetys"
 Basic.Settings.Stream.StreamType="Lähetystyyppi"
@@ -294,6 +322,7 @@ Basic.Settings.Output.Format="Tallennuksen muoto"
 Basic.Settings.Output.Encoder="Enkooderi"
 Basic.Settings.Output.SelectDirectory="Valitse tallennuskansio"
 Basic.Settings.Output.SelectFile="Valitse tallennustiedosto"
+Basic.Settings.Output.EnforceBitrate="Rajoita bitrate lähetyspalvelun suosituksiin"
 Basic.Settings.Output.Mode="Ulostulon tila"
 Basic.Settings.Output.Mode.Simple="Yksinkertainen"
 Basic.Settings.Output.Mode.Adv="Kehittynyt"
@@ -304,11 +333,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Lähetyksen laatu"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Korkea laatu, keskikokoinen tiedostokoko"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Erottamaton laatu, suuri tiedostokoko"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Häviötön laatu, jättimäinen tiedostokoko"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Varoitus: Kuvan bitrate asetetaan arvoon %1, joka on yläraja valitsemassasi palvelussa. Jos haluat varmasti mennä %1:n yli, poista valinta lisäasetuksista kohdasta \"Rajoita bitrate lähetyspalvelun suosituksiin\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Varoitus: Äänen bitrate asetetaan arvoon %1, joka on yläraja valitsemassasi palvelussa. Jos haluat varmasti mennä %1:n yli, poista valinta lisäasetuksista kohdasta \"Rajoita bitrate lähetyspalvelun suosituksiin\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Varoitus: Tallentaminen lähetyksestä eroavalla laadulla vaatii prosessorilta lisätyötä jos lähetät ja tallennat samanaikaisesti."
 Basic.Settings.Output.Simple.Warn.Lossless="Varoitus: Häviötön laatu luo järjettömän kokoisia tiedostoja! Häviötön laatu saattaa käyttää jopa 7 gigatavua levytilastasi minuutissa, mikäli käytät suuria resoluutioita ja korkeita FPS-arvoja. Häviötöntä pakkausta ei suositella pitkiin tallennuksiin ellei sinulla ole todella paljon tallennustilaa käytettävissäsi."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Haluatko varmasti käyttää häviötöntä laatua?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Häviötön laatu!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Varoitus: Et voi käyttää useampaa QSV-enkooderia lähettäessä ja tallentaessa samaan aikaan. Jos haluat tehdä molempia yhtä aikaa, vaihda lähetys tai tallennus-enkooderi."
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Laitteisto (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Laitteisto (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 matala CPU-käyttö, lisää tiedostokokoa)"
 Basic.Settings.Output.VideoBitrate="Kuvan bitrate"
 Basic.Settings.Output.AudioBitrate="Äänen bitrate"
@@ -335,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="Tyyppi"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Tavallinen"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Valinnainen lähtö (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Käytä lähetysenkooderia)"
+Basic.Settings.Output.Adv.Recording.Filename="Tiedostonimen muoto"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Korvaa olemassa oleva"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg ulostulon tyyppi"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ulostulo osoitteeseen"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ulostulo tiedostoon"
@@ -355,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Äänienkooderi"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ääni-enkooderin asetukset"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Mukserin asetukset"
 
+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"
+
+FilenameFormatting.TT="%CCYY vuosi, neljä digits\n%YY vuoden kaksi viimeistä numeroa (00-99)\n%MM kuukauden desimaalin numero (01-12) \n%DD nolla-pehmustettu kuukauden päivänä (01-31)\n%hh Fi 24h muodossa (00-23)\n%mm minuutin (00-59) \n%ss toinen (00-61) \n%% A % sign\n%a Abbreviated arkipäivä name\n%A koko päivän name\n%b Abbreviated kuukauden name\n%B  Kuukauden koko kuukauden, päivän name\n%d nolla-pehmustettu (01-31)\n%H tunnin 24h muodossa (00-23) \n%I Fi 12h muodossa (01-12)\n%m kuukauden desimaalilukuna (01-12)\n%M minuutin (00-59) \n%p AM tai PM designation\n%S toinen (00-61)\n%y vuoden kaksi viimeistä numeroa (00-99)\n%Y Year\n%z ISO 8601 offset UTC tai timezone\n tai abbreviation\n%Z  Aikavyöhykkeen nimi tai abbreviation\n"
+
 Basic.Settings.Video="Kuva"
 Basic.Settings.Video.Adapter="Näytönohjain:"
 Basic.Settings.Video.BaseResolution="Piirtoalueen resoluutio:"

obs/data/locale/fr-FR.ini

@@ -8,6 +8,7 @@ Cancel="Annuler"
 Close="Fermer"
 Save="Enregistrer"
 Discard="Ignorer les modifications"
+Disable="Désactiver"
 Yes="Oui"
 No="Non"
 Add="Ajouter"
@@ -22,7 +23,7 @@ Settings="Paramètres"
 Display="Affichage"
 Name="Nom"
 Exit="Quitter OBS"
-Mixer="Table de mixage"
+Mixer="Mixage audio"
 Browse="Parcourir"
 Mono="Mono"
 Stereo="Stéréo"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Réinitialiser le V-Sync d'OSX en quittant"
 HighResourceUsage="Encodage en surcharge !  Pensez à désactiver des paramètres vidéo ou à utiliser un préréglage d'encodage plus rapide."
 Transition="Transition"
 QuickTransitions="Transitions rapides"
+Left="À gauche"
+Right="À droite"
+Top="En haut"
+Bottom="En bas"
 
 QuickTransitions.SwapScenes="Permuter les scènes d'aperçu et de sortie après la transition"
 QuickTransitions.SwapScenesTT="Permute les scènes d'aperçu et de sortie après la transition (si la scène d'origine de la sortie existe toujours). \nCela n'annulera pas les modifications qui auront pu être faites sur la scène d'origine de la sortie."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Dupliquer les sources"
 QuickTransitions.EditPropertiesTT="Lors de l'édition d'une même scène, permet de modifier les propriétés des sources sans modification de la sortie. \nCela ne peut être utilisé que si \"Dupliquer la scène\" est activé. \nCertaines sources (telles que les captures ou sources médias) ne supportent pas cela et ne peuvent être modifiés séparément. \nModifier ce paramètre réinitialisera la scène actuelle de sortie (si elle existe encore).\n\nAttention : parce que les sources seront dupliquées , cela peut nécessiter des ressources système ou vidéo supplémentaires."
 QuickTransitions.HotkeyName="Transition rapide : %1"
 
-Basic.SceneTransitions="Transitions de scènes"
+Basic.AddTransition="Ajouter une transition configurable"
+Basic.RemoveTransition="Supprimer une transition configurable"
+Basic.TransitionProperties="Propriétés de la transition"
+Basic.SceneTransitions="Transition de scènes"
 Basic.TransitionDuration="Durée"
 Basic.TogglePreviewProgramMode="Mode Studio"
 
+TransitionNameDlg.Text="Veuillez entrer le nom de la transition"
+TransitionNameDlg.Title="Nom de la transition"
+
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scènes"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Êtes-vous sûr de vouloir supprimer « $1 » ?"
 Output.ConnectFail.Title="Échec de la connexion"
 Output.ConnectFail.BadPath="Adresse de connexion ou chemin invalide. Veuillez vérifier vos paramètres afin de confirmer leur validité."
 Output.ConnectFail.ConnectFailed="Échec de la connexion au serveur"
-Output.ConnectFail.InvalidStream="Impossible d'accéder à la chaîne ou à la clé spécifiée. Cela peut être causé par une chaîne/clé invalide ou par le serveur qui vous considère toujours connecté."
+Output.ConnectFail.InvalidStream="Impossible d'accéder à la chaîne ou à la clé de stream spécifiée, veuillez revérifier votre clé de stream. Si celle-ci est correcte, il y a peut-être un problème de connexion au serveur."
 Output.ConnectFail.Error="Une erreur inattendue s'est produite en essayant de se connecter au serveur. Plus d'informations dans le fichier journal."
 Output.ConnectFail.Disconnected="Déconnecté du serveur."
 
@@ -107,7 +118,7 @@ LicenseAgreement.Exit="Quitter"
 Remux.SourceFile="Enregistrement OBS"
 Remux.TargetFile="Fichier cible"
 Remux.Remux="Convertir"
-Remux.RecordingPattern="Enregistrement OBS (*.flv)"
+Remux.OBSRecording="Enregistrement OBS"
 Remux.FinishedTitle="Conversion terminée"
 Remux.Finished="L'enregistrement a été converti"
 Remux.FinishedError="L'enregistrement a été converti, mais le fichier peut être incomplet"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="Afficher la capture"
 
 Basic.Main.PreviewConextMenu.Enable="Activer l'aperçu"
 
+Deinterlacing="Désentrelacement"
+Deinterlacing.Discard="Abandonner"
+Deinterlacing.Retro="Rétro"
+Deinterlacing.Blend="Mélange"
+Deinterlacing.Blend2x="Mélange 2x"
+Deinterlacing.Linear="Linéaire"
+Deinterlacing.Linear2x="Linéaire 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Champ du haut prioritaire"
+Deinterlacing.BottomFieldFirst="Champ du bas prioritaire"
+
 Basic.Main.AddSceneDlg.Title="Ajouter une scène"
 Basic.Main.AddSceneDlg.Text="Veuillez entrer le nom de la scène"
 
@@ -198,6 +221,7 @@ Basic.TransformWindow.Alignment="Position de l'alignement"
 Basic.TransformWindow.BoundsType="Type de la fenêtre"
 Basic.TransformWindow.BoundsAlignment="Alignement de la fenêtre"
 Basic.TransformWindow.Bounds="Taille de la fenêtre"
+Basic.TransformWindow.Crop="Rogner"
 
 Basic.TransformWindow.Alignment.TopLeft="En haut à gauche"
 Basic.TransformWindow.Alignment.TopCenter="Centrer en haut"
@@ -284,6 +308,11 @@ Basic.Settings.General.Theme="Thème"
 Basic.Settings.General.Language="Langue"
 Basic.Settings.General.WarnBeforeStartingStream="Afficher une boîte de dialogue de confirmation au démarrage d'un stream"
 Basic.Settings.General.WarnBeforeStoppingStream="Afficher une boîte de dialogue de confirmation à l'arrêt d'un stream"
+Basic.Settings.General.Snapping="Déclenchement d'alignement des sources"
+Basic.Settings.General.ScreenSnapping="Déclencher avec les bords de l'écran"
+Basic.Settings.General.CenterSnapping="Déclencher avec le centre de l'écran"
+Basic.Settings.General.SourceSnapping="Déclencher avec d'autres sources"
+Basic.Settings.General.SnapDistance="Sensibilité du déclenchement"
 
 Basic.Settings.Stream="Flux"
 Basic.Settings.Stream.StreamType="Type de diffusion"
@@ -293,6 +322,7 @@ Basic.Settings.Output.Format="Format d'enregistrement"
 Basic.Settings.Output.Encoder="Encodeur"
 Basic.Settings.Output.SelectDirectory="Sélectionnez le répertoire d'enregistrement"
 Basic.Settings.Output.SelectFile="Sélectionnez le fichier cible"
+Basic.Settings.Output.EnforceBitrate="Imposer les limites de débit du service de streaming"
 Basic.Settings.Output.Mode="Mode de sortie"
 Basic.Settings.Output.Mode.Simple="Simple"
 Basic.Settings.Output.Mode.Adv="Avancé"
@@ -303,11 +333,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Identique au stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Haute qualité, taille de fichier moyenne"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Qualité indistinguable, grande taille de fichier "
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Qualité sans perte, énorme taille de fichier"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Attention: le débit vidéo de streaming va être fixé à %1, qui est la limite maximale pour le service de streaming actuel. Si vous êtes surs de vouloir aller au delà de %1, activez les options avancées de l'encodeur & décochez \"Imposer les limites de débit du service de streaming\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Attention: le débit audio de streaming va être fixé à %1, qui est la limite maximale pour le service de streaming actuel. Si vous êtes surs de vouloir aller au delà de %1, activez les options avancées de l'encodeur & décochez \"Imposer les limites de débit du service de streaming\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Attention : enregistrer via un encodeur logiciel avec une qualité autre que celle du stream sollicitera encore plus le CPU si vous streamez et enregistrez simultanément."
 Basic.Settings.Output.Simple.Warn.Lossless="Attention: la qualité sans perte génère des fichiers de taille énorme ! Elle peut utiliser jusqu'à  7 gigaoctets d'espace disque par minute pour de hautes résolutions et fréquences d'image. Cette qualité n'est pas recommandée pour de longs enregistrements à moins d'avoir énormément d'espace disque disponible."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Êtes-vous certain de vouloir utiliser la qualité sans perte ?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Avertissement de qualité sans perte"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Attention : Vous ne pouvez pas utiliser plusieurs encodeurs QSV distincts lorsque vous streamez et enregistrez en même temps. Si vous voulez streamer et enregistrer en même temps, veuillez changer soit l'encodeur d'enregistrement, soit l'encodeur de streaming."
 Basic.Settings.Output.Simple.Encoder.Software="Logiciel (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Matériel (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Matériel (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Logiciel (préréglage x264 \"faible utilisation du CPU\", augmente la taille du fichier)"
 Basic.Settings.Output.VideoBitrate="Débit vidéo"
 Basic.Settings.Output.AudioBitrate="Débit audio"
@@ -334,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="Type "
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Sortie personnalisée (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Utiliser l'encodeur de flux)"
+Basic.Settings.Output.Adv.Recording.Filename="Format du nom de fichier"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Écraser si le fichier existe"
 Basic.Settings.Output.Adv.FFmpeg.Type="Type de sortie FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Sortie vers une URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Sortie vers un fichier"
@@ -354,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Encodeur audio"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Paramètres de l'encodeur audio (le cas échéant)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Paramètres du muxer (le cas échéant)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Année, 4 chiffres\n%YY		Année, 2 derniers chiffres (00-99)\n%MM		Mois en nombre (01-12)\n%DD		Jour du mois(01-31)\n%hh		Heure au format 24h (00-23)\n%mm		Minute (00-59)\n%ss		Seconde (00-61)\n%%		Symbole %\n%a		Jour de la semaine en abrégé\n%A		Jour de la semaine\n%b		Mois abrégé\n%B		Mois\n%d		Jour du mois (01-31)\n%H		Heure au format 24h (00-23)\n%I		Heure au format 12h (01-12)\n%m		Mois en nombre (01-12)\n%M		Minute (00-59)\n%p		Désignation AM ou PM\n%S		Seconde (00-61)\n%y		Année, 2 derniers chiffres (00-99)\n%Y		Année\n%z		Nom ou abbréviation du fuseau horaire/n		ou décalage ISO 8601 par rapport à l'UTC\n%Z		Nom ou abbréviation du fuseau horaire\n"
+
 Basic.Settings.Video="Vidéo"
 Basic.Settings.Video.Adapter="Périphérique vidéo :"
 Basic.Settings.Video.BaseResolution="Résolution de base (canvas) :"

obs/data/locale/gl-ES.ini

@@ -8,6 +8,7 @@ Cancel="Cancelar"
 Close="Pechar"
 Save="Gardar"
 Discard="Descartar"
+Disable="Desactivar"
 Yes="Si"
 No="Non"
 Add="Engadir"
@@ -34,8 +35,26 @@ Revert="Anular"
 Show="Mostrar"
 Hide="Agochar"
 Untitled="Sen título"
+New="Novo"
+Duplicate="Duplicar"
+Enable="Activar"
+DisableOSXVSync="Desactivar V-Sync en OSX"
+Transition="Transición"
+QuickTransitions="Transicións rápidas"
+Left="Esquerda"
+Right="Dereita"
+Top="Arriba"
+Bottom="Abaixo"
 
 
+Basic.AddTransition="Engadir transición configurable"
+Basic.RemoveTransition="Eliminar transición configurable"
+Basic.TransitionProperties="Propiedades da transición"
+Basic.SceneTransitions="Transicións de escena"
+Basic.TransitionDuration="Duración"
+Basic.TogglePreviewProgramMode="Modo de estudio"
+
+TransitionNameDlg.Title="Nome da transición"
 
 TitleBar.Profile="Perfil"
 TitleBar.Scenes="Escenas"
@@ -46,7 +65,10 @@ NameExists.Text="O nome xa está en uso."
 NoNameEntered.Title="Por favor, insire un nome válido"
 NoNameEntered.Text="Non podes empregar nomes baleiros."
 
+ConfirmStart.Title="Iniciar transmisión?"
 
+ConfirmStop.Title="Deter transmisión?"
+ConfirmStop.Text="Tes a certeza de querer deter a transmisión?"
 
 ConfirmExit.Title="Saír de OBS?"
 
@@ -56,7 +78,6 @@ ConfirmRemove.Text="Tes a certeza de querer eliminar '$1'?"
 Output.ConnectFail.Title="Erro ao se conectar"
 Output.ConnectFail.BadPath="Camiño ou URL de conexión non válidos. Por favor, comproba a configuración para confirmar de que son correctos."
 Output.ConnectFail.ConnectFailed="Erro ao conectar co servidor"
-Output.ConnectFail.InvalidStream="Non se puido acceder á canle ou chave de retransmisión. Isto podería deberse a que a canle ou a chave non son válidas ou porque o servidor pensa que aínda tes unha sesión iniciada."
 Output.ConnectFail.Error="Produciuse un erro inesperado ao tentar conectar co servidor. Máis información no ficheiro de rexistro."
 Output.ConnectFail.Disconnected="Desconectado do servidor."
 
@@ -78,7 +99,6 @@ LicenseAgreement.Exit="Saír"
 Remux.SourceFile="Gravación OBS"
 Remux.TargetFile="Ficheiro de destino"
 Remux.Remux="Converter"
-Remux.RecordingPattern="Gravación OBS (*.flv)"
 Remux.FinishedTitle="Conversión rematada"
 Remux.Finished="Gravando conversión"
 Remux.FinishedError="Gravación convertida, mais o ficheiro podería estar incompleto"
@@ -104,6 +124,7 @@ Basic.DisplayCapture="Captura de pantalla"
 
 Basic.Main.PreviewConextMenu.Enable="Habilitar vista previa"
 
+
 Basic.Main.AddSceneDlg.Title="Engadir escena"
 Basic.Main.AddSceneDlg.Text="Por favor, insire un nome para a escena"
 
@@ -292,6 +313,8 @@ Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Axustes do codificador de ví
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador de audio"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Axustes do codificador de audio (se existe)"
 
+
+
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de vídeo:"
 Basic.Settings.Video.DownscaleFilter="Filtro de redución:"
@@ -343,6 +366,7 @@ Basic.Hotkeys.StopRecording="Deter gravación"
 
 Hotkeys.Insert="Inserir"
 Hotkeys.Delete="Eliminar"
+Hotkeys.Home="Inicio"
 Hotkeys.NumLock="BLOQ NÚM"
 Hotkeys.ScrollLock="BLOQ DESPR"
 Hotkeys.CapsLock="BLOQ MAIÚS"

obs/data/locale/he-IL.ini

@@ -0,0 +1,497 @@
+
+Language="עברית"
+Region="ישראל"
+
+OK="אישור"
+Apply="החל"
+Cancel="בטל"
+Close="סגור"
+Save="שמור"
+Discard="אל תשמור"
+Disable="השבת"
+Yes="כן"
+No="לא"
+Add="הוסף"
+Remove="הסר"
+Rename="שנה שם"
+Interact="אינטרקציה"
+Filters="מסננים"
+Properties="מאפיינים"
+MoveUp="הזז למעלה"
+MoveDown="הזז למטה"
+Settings="הגדרות"
+Display="תצוגה"
+Name="שם"
+Exit="יציאה"
+Mixer="מיקסר"
+Browse="עיון"
+Mono="מונו"
+Stereo="סטריאו"
+DroppedFrames="השמטת תמונות %1 (%2%)"
+PreviewProjector="מקרן מסך מלא (תצוגה מקדימה)"
+SceneProjector="מקרן מסך מלא (סצנה)"
+SourceProjector="מקרן מסך מלא (מקור)"
+Clear="נקה"
+Revert="החזר לקדמותו"
+Show="הצג"
+Hide="הסתר"
+Untitled="ללא כותרת"
+New="חדש"
+Duplicate="שכפל"
+Enable="אפשר"
+DisableOSXVSync="בטל סנכרון אנכי OSX"
+ResetOSXVSyncOnExit="איפוס סנכרון אנכי OSX ביציאה"
+HighResourceUsage="קידוד עמוס מידי!  שקול להנמיך הגדרות וידאו או שימוש בקידוד מהיר יותר."
+Transition="מעבר"
+QuickTransitions="מעברים מהירים"
+Left="שמאל"
+Right="ימין"
+Top="עליון"
+Bottom="תחתון"
+
+QuickTransitions.SwapScenes="החלף סצינות תצוגה מקדימה/פלט לאחר המעבר"
+QuickTransitions.SwapScenesTT="החלף הסצינות של התצוגה המקדימה ושל הפלט לאחר המעבר (באם הסצינה המקורית של הפלט עדיין קיימת). \n פעולה זו לא תבטל כל שינוי שייתכן ובוצע לסצינה המקורית של הפלט."
+QuickTransitions.DuplicateScene="הכפל סצינה"
+QuickTransitions.DuplicateSceneTT="בעת עריכת אותה הסצנה, מאפשר עריכת שינוי צורה/הנראות של המקורות מבלי לשנות את הפלט.\nבכדי לערוך מאפייני מקורות מבלי לשנות את הפלט, אפשר 'שכפל מקורות'.\nשינוי ערך זה יאפס את פלט הסצנה הנוכחית (אם הוא עדיין קיים)."
+QuickTransitions.EditProperties="הכפל מקורות"
+QuickTransitions.EditPropertiesTT="בזמן עריכת אותה הסצנה, מאפשר עריכת מאפיינים של מקורות ללא שינוי הפלט. \nפעולה זו אפשרית רק אם אפשרות 'שכפל סצינה' מופעלת. \nמקורות מסויימים (כגון לכידה או מקורות מדיה) לא תומכים באפשרות זו ולא ניתן לערוך אותם בנפרד. \nשינוי ערך זה יאפס את פלט הסצנה (אם עדיין קיים).\n\nאזהרה: בגלל שמקורות ישוכפלו, ייתכן ומשאבי מערכת או ווידאו נוספים יידרשו."
+QuickTransitions.HotkeyName="מעבר מהיר: %1"
+
+Basic.AddTransition="הוסף מעבר בר הגדרה"
+Basic.RemoveTransition="הסר מעבר בר הגדרה"
+Basic.TransitionProperties="מאפייני מעבר"
+Basic.SceneTransitions="מעברי סצינות"
+Basic.TransitionDuration="משך"
+Basic.TogglePreviewProgramMode="מצב סטודיו"
+
+TransitionNameDlg.Text="אנא הזן את שם המעבר"
+TransitionNameDlg.Title="שם מעבר"
+
+TitleBar.Profile="פרופיל"
+TitleBar.Scenes="סצינות"
+
+NameExists.Title="שם כבר קיים"
+NameExists.Text="שם זה נמצא כבר בשימוש."
+
+NoNameEntered.Title="נא הזן שם תקף"
+NoNameEntered.Text="אינך יכול להשתמש בשדה שמות ריק."
+
+ConfirmStart.Title="התחל הזרמת נתונים?"
+ConfirmStart.Text="האם אתה בטוח שברצונך להפעיל את הזרמת הנתונים?"
+
+ConfirmStop.Title="עצור את הזרמת הנתונים?"
+ConfirmStop.Text="האם אתה בטוח שברצונך להפסיק את הזרמת הנתונים?"
+
+ConfirmExit.Title="יציאה מ-OBS?"
+ConfirmExit.Text="תוכנת OBS פעילה כעת.  כל הזרמת נתונים/הקלטות ייסגרו.  האם אתה בטוח שאתה רוצה לצאת?"
+
+ConfirmRemove.Title="אשר הסרה"
+ConfirmRemove.Text="האם אתה בטוח שברצונך להסיר את '$1'?"
+
+Output.ConnectFail.Title="ההתחברות נכשלה"
+Output.ConnectFail.BadPath="URL לא חוקי של נתיב או חיבור.  נא בדוק את ההגדרות שלך כדי לוודא כי הם נכונים."
+Output.ConnectFail.ConnectFailed="ההתחברות לשרת נכשלה"
+Output.ConnectFail.InvalidStream="לא ניתן להתחבר לערוץ שצויין או למפתח זרם הנתונים, נא בדוק שנית את מפתח זרם הנתונים. אם הוא נכון, ככל הנראה יש בעיה בהתחברות לשרת."
+Output.ConnectFail.Error="אירעה שגיאה בלתי צפויה בעת ניסיון להתחבר לשרת.  מידע נוסף בקובץ יומן הרישום."
+Output.ConnectFail.Disconnected="התנתקת מהשרת."
+
+Output.RecordFail.Title="התחלת ההקלטה נכשלה"
+Output.RecordFail.Unsupported="תבנית הפלט לא נתמכת או לא תומכת ביותר מרצועת שמע אחת.  נא בדוק את ההגדרות ונסה שוב."
+Output.RecordNoSpace.Title="אין די שטח דיסק"
+Output.RecordNoSpace.Msg="אין די שטח דיסק כדי להמשיך הקלטה."
+Output.RecordError.Title="שגיאה הקלטה"
+Output.RecordError.Msg="אירעה שגיאה לא מוגדרת בזמן ההקלטה."
+
+Output.BadPath.Title="נתיב קובץ לא תקין"
+Output.BadPath.Text="נתיב פלט הקובץ שהוגדר אינו חוקי.  נא בדוק את הגדרות כדי לוודא שנתיב קובץ תקני נקבע."
+
+LogReturnDialog="עידכון יומן הצליח"
+LogReturnDialog.CopyURL="העתק קישור"
+LogReturnDialog.ErrorUploadingLog="עידכון קובץ יומן נכשל"
+
+LicenseAgreement="הסכם רשיון"
+LicenseAgreement.PleaseReview="אנא קרא את תנאי רשיון לפני השימוש בתוכנית זו.בשימוש בתוכנית אתה מכיר בעובדה כי יש לקרוא ולהסכים לתנאים המופיעים ב <a href='http://www.gnu.org/licenses/gpl-2.0.html'> הרישיון הציבורי הכללי של גנו v 2.0</a>.  נא גלול למטה כדי לראות את שאר ההסכם."
+LicenseAgreement.ClickIAgreeToContinue="אם אתה מקבל את תנאי ההסכם, לחץ על אני מסכים בכדי להמשיך.  עליך לקבל ההסכם בכדי להשתמש בתוכנת OBS."
+LicenseAgreement.IAgree="אני מסכים"
+LicenseAgreement.Exit="יציאה"
+
+Remux.SourceFile="הקלטת OBS"
+Remux.TargetFile="קובץ היעד"
+Remux.Remux="המרה"
+Remux.FinishedTitle="המרה הסתיימה"
+Remux.Finished="הקלטה הומרה"
+Remux.FinishedError="הקלטה הומרה, אבל הקובץ עשוי להיות לא שלם"
+Remux.SelectRecording="בחר הקלטת OBS…"
+Remux.SelectTarget="בחר קובץ יעד…"
+Remux.FileExistsTitle="קובץ היעד קיים"
+Remux.FileExists="קובץ היעד קיים, האם ברצונך להחליפו?"
+Remux.ExitUnfinishedTitle="המרה בתהליך"
+Remux.ExitUnfinished="ההמרה לא הסתיימה, עצירה עכשיו עלולה להפוך את קובץ היעד לא שמיש. \n אתה בטוח שאתה רוצה לעצור את ההמרה?"
+
+UpdateAvailable="עידכון חדש זמין"
+UpdateAvailable.Text="גירסה %1.%2.%3 זמין כעת.  <a href='%4'> לחץ כאן כדי להוריד</a>"
+
+Basic.DesktopDevice1="אודיו שולחן עבודה"
+Basic.DesktopDevice2="אודיו שולחן עבודה 2"
+Basic.AuxDevice1="מיקרופון/Aux"
+Basic.AuxDevice2="מיקרופון/Aux 2"
+Basic.AuxDevice3="מיקרופון/Aux 3"
+Basic.AuxDevice4="מיקרופון/Aux 4"
+
+Basic.Scene="סצנה"
+Basic.DisplayCapture="הצג לכידת מסך"
+
+Basic.Main.PreviewConextMenu.Enable="אפשר תצוגה מקדימה"
+
+Deinterlacing="ביטול שזירה"
+Deinterlacing.Discard="אל תשמור"
+Deinterlacing.Retro="רטרו"
+Deinterlacing.Blend="מיזוג"
+Deinterlacing.Blend2x="מיזוג 2x"
+Deinterlacing.Linear="לינארי"
+Deinterlacing.Linear2x="לינארי 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="שדה עליון ראשון"
+Deinterlacing.BottomFieldFirst="שדה תחתון ראשון"
+
+Basic.Main.AddSceneDlg.Title="הוסף סצנה"
+Basic.Main.AddSceneDlg.Text="אנא הזן את השם של הסצנה"
+
+Basic.Main.DefaultSceneName.Text="סצנה %1"
+
+Basic.Main.AddSceneCollection.Title="הוסף אוסף סצינות"
+Basic.Main.AddSceneCollection.Text="נא הזן את שם אוסף הסצינות"
+
+Basic.Main.RenameSceneCollection.Title="שינוי שם של אוסף הסצינות"
+
+AddProfile.Title="הוסף פרופיל"
+AddProfile.Text="אנא הזן את שם הפרופיל"
+
+RenameProfile.Title="שנה שם פרופיל"
+
+Basic.Main.PreviewDisabled="תצוגה מקדימה אינה זמינה כעת"
+
+Basic.SourceSelect="בחר/צור מקור"
+Basic.SourceSelect.CreateNew="צור חדש"
+Basic.SourceSelect.AddExisting="הוסף קיימים"
+Basic.SourceSelect.AddVisible="הפוך מקור לגלוי"
+
+Basic.PropertiesWindow="מאפיינים עבור '%1'"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (בחירה אוטומטית: %2)"
+Basic.PropertiesWindow.SelectColor="בחר צבע"
+Basic.PropertiesWindow.SelectFont="בחר גופן"
+Basic.PropertiesWindow.ConfirmTitle="הגדרות שונו"
+Basic.PropertiesWindow.Confirm="יש שינויים שלא נשמרו.  האם ברצונך לשמור אותם?"
+Basic.PropertiesWindow.NoProperties="אין מאפיינים זמינים"
+Basic.PropertiesWindow.AddFiles="הוסף קבצים"
+Basic.PropertiesWindow.AddURL="הוסף נתיב/כתובת"
+Basic.PropertiesWindow.AddEditableListFiles="הוסף קבצים '%1'"
+Basic.PropertiesWindow.AddEditableListEntry="הוסף ערך ל- '%1'"
+Basic.PropertiesWindow.EditEditableListEntry="ערוך ערך של '%1'"
+
+Basic.PropertiesView.FPS.Simple="ערכים פשוטים של פריימים לשניה"
+Basic.PropertiesView.FPS.Rational="ערכים הגיוניים של פריימים לשניה"
+Basic.PropertiesView.FPS.ValidFPSRanges="טווחים תקינים של פריימים לשניה:"
+
+Basic.InteractionWindow="אינטראקציה עם '%1'"
+
+Basic.StatusBar.Reconnecting="החיבור מנותק, התחברות מחדש ב- %2 שניות (ניסיון %1)"
+Basic.StatusBar.AttemptingReconnect="מנסה להתחבר מחדש... (ניסיון %1)"
+Basic.StatusBar.ReconnectSuccessful="חיבור מחדש הצליח"
+Basic.StatusBar.Delay="השהיה (%1 שניות)"
+Basic.StatusBar.DelayStartingIn="השהיה (מתחיל בעוד %1 שניות)"
+Basic.StatusBar.DelayStoppingIn="השהיה (מסיים בעוד %1 שניות)"
+Basic.StatusBar.DelayStartingStoppingIn="השהיה (מסיים בעוד %1 שניות, מתחיל בעוד %2 שניות)"
+
+Basic.Filters="מסננים"
+Basic.Filters.AsyncFilters="מסנני אודיו/וידאו"
+Basic.Filters.AudioFilters="מסנני שמע"
+Basic.Filters.EffectFilters="מסנני אפקטים"
+Basic.Filters.Title="מסננים עבור '%1'"
+Basic.Filters.AddFilter.Title="שם מסנן"
+Basic.Filters.AddFilter.Text="נא ציין את שם המסנן"
+
+Basic.TransformWindow="שנה פריט סצנה"
+Basic.TransformWindow.Position="מיקום"
+Basic.TransformWindow.Rotation="סיבוב"
+Basic.TransformWindow.Size="גודל"
+Basic.TransformWindow.Alignment="יישור לפי מיקום"
+Basic.TransformWindow.BoundsType="סוג התיבה התוחמת"
+Basic.TransformWindow.BoundsAlignment="יישור בתיבה תוחמת"
+Basic.TransformWindow.Bounds="גודל התיבה התוחמת"
+Basic.TransformWindow.Crop="חתוך"
+
+Basic.TransformWindow.Alignment.TopLeft="למעלה שמאל"
+Basic.TransformWindow.Alignment.TopCenter="למעלה מרכז"
+Basic.TransformWindow.Alignment.TopRight="למעלה ימין"
+Basic.TransformWindow.Alignment.CenterLeft="מרכז שמאל"
+Basic.TransformWindow.Alignment.Center="מרכז"
+Basic.TransformWindow.Alignment.CenterRight="מרכז ימין"
+Basic.TransformWindow.Alignment.BottomLeft="למטה שמאל"
+Basic.TransformWindow.Alignment.BottomCenter="למטה מרכז"
+Basic.TransformWindow.Alignment.BottomRight="למטה ימין"
+
+Basic.TransformWindow.BoundsType.None="ללא גבולות"
+Basic.TransformWindow.BoundsType.MaxOnly="הגודל המרבי בלבד"
+Basic.TransformWindow.BoundsType.ScaleInner="שנה גודל לגבולות הפנימיים"
+Basic.TransformWindow.BoundsType.ScaleOuter="שנה גודל לגבולות החיצוניים"
+Basic.TransformWindow.BoundsType.ScaleToWidth="שנה גודל לרוחב של הגבולות"
+Basic.TransformWindow.BoundsType.ScaleToHeight="שנה גודל לגובה של הגבולות"
+Basic.TransformWindow.BoundsType.Stretch="מתח לגבולות"
+
+Basic.Main.AddSourceHelp.Title="אין אפשרות להוסיף מקור"
+Basic.Main.AddSourceHelp.Text="צריכה להיות לפחות סצנה אחת בכדי להוסיף מקור."
+
+Basic.Main.Scenes="סצינות"
+Basic.Main.Sources="מקורות"
+Basic.Main.Connecting="מתחבר..."
+Basic.Main.StartRecording="התחל הקלטה"
+Basic.Main.StartStreaming="התחל הזרמת נתונים"
+Basic.Main.StopRecording="עצור הקלטה"
+Basic.Main.StopStreaming="עצור זרם נתונים"
+Basic.Main.ForceStopStreaming="עצור זרם נתונים (בטל השהייה)"
+
+Basic.MainMenu.File="קובץ(&F)"
+Basic.MainMenu.File.Export="ייצא(&E)"
+Basic.MainMenu.File.Import="יבא(&I)"
+Basic.MainMenu.File.ShowRecordings="הצג הקלטות(&R)"
+Basic.MainMenu.File.Remux="המרת הקלטות(&m)"
+Basic.MainMenu.File.Settings="הגדרות(&S)"
+Basic.MainMenu.File.ShowSettingsFolder="הצג תיקיית הגדרות"
+Basic.MainMenu.File.ShowProfileFolder="הצג תיקיית פרופיל"
+Basic.MainMenu.AlwaysOnTop="תמיד עליון(&A)"
+Basic.MainMenu.File.Exit="יציאה(&E)"
+
+Basic.MainMenu.Edit="ערוך(&E)"
+Basic.MainMenu.Edit.Undo="בטל(&U)"
+Basic.MainMenu.Edit.Redo="בצע שוב(&R)"
+Basic.MainMenu.Edit.UndoAction="בטל $1(&U)"
+Basic.MainMenu.Edit.RedoAction="בצע שוב $1(&R)"
+Basic.MainMenu.Edit.Transform="שנה(&T)"
+Basic.MainMenu.Edit.Transform.EditTransform="ערוך שינוי...(&E)"
+Basic.MainMenu.Edit.Transform.ResetTransform="אפס שינוי(&R)"
+Basic.MainMenu.Edit.Transform.Rotate90CW="סובב 90 מעלות בכיוון השעון"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="סובב 90 מעלות בניגוד לכיוון השעון"
+Basic.MainMenu.Edit.Transform.Rotate180="סובב 180 מעלות"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="הפוך אופקי(&H)"
+Basic.MainMenu.Edit.Transform.FlipVertical="הפוך אנכי(&V)"
+Basic.MainMenu.Edit.Transform.FitToScreen="התאם למסך(&F)"
+Basic.MainMenu.Edit.Transform.StretchToScreen="מתח לגודל המסך(&S)"
+Basic.MainMenu.Edit.Transform.CenterToScreen="מרכז למסך(&C)"
+Basic.MainMenu.Edit.Order="סדר(&O)"
+Basic.MainMenu.Edit.Order.MoveUp="הזז למעלה(&U)"
+Basic.MainMenu.Edit.Order.MoveDown="הזז למטה(&D)"
+Basic.MainMenu.Edit.Order.MoveToTop="הזז לקצה עליון(&T)"
+Basic.MainMenu.Edit.Order.MoveToBottom="הזז לקצה תחתון(&B)"
+Basic.MainMenu.Edit.AdvAudio="מאפייני קול מתקדמים(&A)"
+
+Basic.MainMenu.SceneCollection="אוסף סצינות(&S)"
+Basic.MainMenu.Profile="פרופיל(&P)"
+
+Basic.MainMenu.Help="עזרה(&H)"
+Basic.MainMenu.Help.Website="בקר אתר(&W)"
+Basic.MainMenu.Help.Logs="קבצי יומן רישום(&L)"
+Basic.MainMenu.Help.Logs.ShowLogs="הצג קבצי יומן רישום(&S)"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="העלה קובץ יומן רישום נוכחי(&C)"
+Basic.MainMenu.Help.Logs.UploadLastLog="העלה קובץ יומן רישום אחרון(&L)"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="הצג את יומן הרישום הנוכחי(&V)"
+Basic.MainMenu.Help.CheckForUpdates="בדוק עדכונים"
+
+Basic.Settings.ProgramRestart="יש להפעיל מחדש את התוכנה בכדי שהגדרות האלה ייכנסו לתוקף."
+Basic.Settings.ConfirmTitle="אשר את השינויים"
+Basic.Settings.Confirm="קיימים שינויים שלא נשמרו.  האם לשמור שינויים?"
+
+Basic.Settings.General="כללי"
+Basic.Settings.General.Theme="ערכת עיצוב"
+Basic.Settings.General.Language="שפה"
+Basic.Settings.General.WarnBeforeStartingStream="הצג תיבת דו-שיח לאישור בעת הפעלת זרם נתונים"
+Basic.Settings.General.WarnBeforeStoppingStream="הצג תיבת דו-שיח לאישור בעת עצירת זרם נתונים"
+
+Basic.Settings.Stream="זרם נתונים"
+Basic.Settings.Stream.StreamType="סוג זרם נתונים"
+
+Basic.Settings.Output="פלט"
+Basic.Settings.Output.Format="פורמט הקלטה"
+Basic.Settings.Output.Encoder="מקודד"
+Basic.Settings.Output.SelectDirectory="בחר ספריית הקלטות"
+Basic.Settings.Output.SelectFile="בחר קובץ הקלטה"
+Basic.Settings.Output.Mode="מצב פלט"
+Basic.Settings.Output.Mode.Simple="פשוט"
+Basic.Settings.Output.Mode.Adv="מתקדם"
+Basic.Settings.Output.Mode.FFmpeg="פלט FFmpeg"
+Basic.Settings.Output.Simple.SavePath="נתיב הקלטה"
+Basic.Settings.Output.Simple.RecordingQuality="איכות הקלטה"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="כמו זרם הנתונים"
+Basic.Settings.Output.Simple.RecordingQuality.Small="איכות גבוהה, גודל קובץ בינוני"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="איכות בלתי מובחנת, גודל קובץ גדול"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="ללא אובדן איכות, גודל קובץ עצום"
+Basic.Settings.Output.Simple.Warn.Encoder="אזהרה: הקלטה עם מקודד תוכנה באיכות שונה מאשר זרם הנתונים ידרוש שימוש במשאבי מעבד נוספים אם מתבצעת הקלטה וזרם נתונים במקביל."
+Basic.Settings.Output.Simple.Warn.Lossless="אזהרה: איכות ללא אובדן יוצר גדלי קבצים גדולים מאוד!  איכות ללא אובדן נתונים יכול להשתמש ביותר מ-7 ג'יגה-בתים של שטח דיסק לדקה ברזולוציות גבוהות ופריימים.  שימוש באיכות ללא אובדן אינו מומלץ  להקלטות ארוכות אלא אם קיים שטח דיסק פנוי גדול מאד."
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="האם אתה בטוח שברצונך להשתמש באיכות ללא אובדן איכות?"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="אזהרה איכות ללא אובדן איכות!"
+Basic.Settings.Output.Simple.Encoder.Software="תוכנה (x264)"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="תוכנה (x 264 השימוש בהגדרת מעבד נמוך, גודל הקובץ גדל)"
+Basic.Settings.Output.VideoBitrate="קצב סיביות וידאו"
+Basic.Settings.Output.AudioBitrate="קצב סיביות שמע"
+Basic.Settings.Output.Reconnect="חיבור מחדש באופן אוטומטי"
+Basic.Settings.Output.RetryDelay="נסה שנית השהייה (שניות)"
+Basic.Settings.Output.MaxRetries="מרב נסינות"
+Basic.Settings.Output.Advanced="אפשר הגדרות מקודד מתקדמות"
+Basic.Settings.Output.EncoderPreset="מקודד קבוע מראש (גבוה = מעט מעבד)"
+Basic.Settings.Output.CustomEncoderSettings="הגדרות מקודד מותאמות אישית"
+Basic.Settings.Output.CustomMuxerSettings="הגדרות ממיר מותאמות אישית"
+Basic.Settings.Output.NoSpaceFileName="צור שם קובץ ללא רווחים"
+
+Basic.Settings.Output.Adv.Rescale="שנה קנה מידה של הפלט"
+Basic.Settings.Output.Adv.AudioTrack="ערוץ שמע"
+Basic.Settings.Output.Adv.Streaming="זרם נתונים"
+Basic.Settings.Output.Adv.ApplyServiceSettings="אכוף הגדרות מקודד של שירות זרם נתונים"
+Basic.Settings.Output.Adv.Audio.Track1="ערוץ 1"
+Basic.Settings.Output.Adv.Audio.Track2="ערוץ 2"
+Basic.Settings.Output.Adv.Audio.Track3="ערוץ 3"
+Basic.Settings.Output.Adv.Audio.Track4="ערוץ 4"
+
+Basic.Settings.Output.Adv.Recording="הקלטה"
+Basic.Settings.Output.Adv.Recording.Type="סוג"
+Basic.Settings.Output.Adv.Recording.Type.Standard="ברירת מחדל"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="פלט מותאם אישית (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(השתמש במקודד זרם נתונים)"
+Basic.Settings.Output.Adv.Recording.Filename="תבנית שם קובץ"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="דרוס אם קובץ קיים"
+Basic.Settings.Output.Adv.FFmpeg.Type="סוג פלט FFmpeg"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="פלט לקישור"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="פלט לקובץ"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="תבניות הקלטה נפוצות"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="כל הקבצים"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="נתיב קובץ או קישור"
+Basic.Settings.Output.Adv.FFmpeg.Format="פורמט קובץ"
+Basic.Settings.Output.Adv.FFmpeg.FormatAudio="שמע"
+Basic.Settings.Output.Adv.FFmpeg.FormatVideo="וידאו"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="פורמט ברירת מחדל"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="תיאור סוג הקובץ"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="ניחוש הקודקד של השמע/וידאו מנתיב קובץ או קישור"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="מקודד ברירת המחדל"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="שתק את המקודד"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="מקודד וידאו"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="הגדרות מקודד וידאו (אם בכלל)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="מקודד אודיו"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="הגדרות מקודד שמע (אם בכלל)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="הגדרות Muxer (אם בכלל)"
+
+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"
+
+FilenameFormatting.TT="%CCYY		שנה,ארבע ספרות\n%YY		שנה,שתי ספרות אחרונות (00-99)\n%MM		חודש כ מספר עשרוני (01-12)\n%DD		יום בחודש,ללא ריפוד (01-31)\n%hh		שעה בפורמט 24 שעות פורמט (00-23)\n%mm		דקה (00-59)\n%ss		שניה (00-61)\n%%		A % סימן\n%a		שם יום מקוצר\n%A		שם יום מלא\n%b		שם חודש מקוצר\n%B		שם חודש מלא\n%d		יום בחודש,ללא ריפוד (01-31)\n%H		שעה בפורמט 24 שעות (00-23)\n%I		שעה בפורמט 12 שעות (01-12)\n%m		חודש כעשרוני מספר (01-12)\n%M		דקה (00-59)\n%p		AM או PM ציון\n%S		שניה (00-61)\n%y		שנה,שתי ספרות אחרונות (00-99)\n%Y		שנה\n%z		ISO 8601 הסט מזמן UTC או אזור זמן\n		שם או קיצור\n%Z		שם אזור זמן או קיצור\n"
+
+Basic.Settings.Video="וידאו"
+Basic.Settings.Video.Adapter="מתאם תצוגה:"
+Basic.Settings.Video.BaseResolution="רזולציית (קנבס) בסיס:"
+Basic.Settings.Video.ScaledResolution="רזולוציית (קנה מידה) פלט:"
+Basic.Settings.Video.DownscaleFilter="מסנן מצמצם:"
+Basic.Settings.Video.DisableAeroWindows="בטל את Aero (Windows בלבד)"
+Basic.Settings.Video.FPS="פריימים לשנייה:"
+Basic.Settings.Video.FPSCommon="ערכים משותפים לפריימים לשניה"
+Basic.Settings.Video.FPSInteger="ערך מספר שלם של פריימים לשניה"
+Basic.Settings.Video.FPSFraction="ערך שברים של פריימים לשניה"
+Basic.Settings.Video.Numerator="מונה:"
+Basic.Settings.Video.Denominator="מכנה:"
+Basic.Settings.Video.Renderer="מעבד:"
+Basic.Settings.Video.InvalidResolution="ערך רזולוציה לא חוקי. חייב להיות [width]x[height] (לדוגמה 1920x1080)"
+Basic.Settings.Video.CurrentlyActive="פלט וידאו פעיל כעת.  נא כבה את כל הפלטים בכדי לשנות הגדרות וידאו."
+Basic.Settings.Video.DisableAero="בטל את ממשק Aero"
+
+Basic.Settings.Video.DownscaleFilter.Bilinear="דו-ליניארי (מהיר ביותר, מטושטש בשינוי קנה מידה)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="ממוצע משוקלל (חד בשינוי קנה המידה, 16 דגימות)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (חד בשינוי קנה המידה, 32 דגימות)"
+
+Basic.Settings.Audio="אודיו"
+Basic.Settings.Audio.SampleRate="קצב דגימה"
+Basic.Settings.Audio.Channels="ערוצים"
+Basic.Settings.Audio.DesktopDevice="התקן שמע בשולחן עבודה"
+Basic.Settings.Audio.DesktopDevice2="התקן שמע בשולחן עבודה 2"
+Basic.Settings.Audio.AuxDevice="התקן שמע מיקרופון/עזר"
+Basic.Settings.Audio.AuxDevice2="התקן שמע מיקרופון/עזר 2"
+Basic.Settings.Audio.AuxDevice3="התקן שמע מיקרופון/עזר 3"
+Basic.Settings.Audio.EnablePushToMute="אפשר לחץ-להשתקה"
+Basic.Settings.Audio.PushToMuteDelay="השהיית לחץ-להשתקה"
+Basic.Settings.Audio.EnablePushToTalk="הפעל לחץ-כדי-לדבר"
+Basic.Settings.Audio.PushToTalkDelay="השהיית לחץ-כדי-לדבר"
+Basic.Settings.Audio.UnknownAudioDevice="[התקן לא מחובר או לא זמין]"
+
+Basic.Settings.Advanced="הגדרות מתקדמות"
+Basic.Settings.Advanced.FormatWarning="אזהרה: תבניות צבע שונות מ-NV12 נועדו בעיקר עבור הקלטה, והם אינם מומלצות בעת הזרמת נתונים.  הזרמת נתונים עלולה לגרום למשאבי עיבוד מוגברים כתוצאה מהמרת תבנית צבע."
+Basic.Settings.Advanced.Audio.BufferingTime="זמן אוגר שמע"
+Basic.Settings.Advanced.Video.ColorFormat="תבנית צבע"
+Basic.Settings.Advanced.Video.ColorSpace="מרחב צבע YUV"
+Basic.Settings.Advanced.Video.ColorRange="טווח צבעים YUV"
+Basic.Settings.Advanced.Video.ColorRange.Partial="חלקי"
+Basic.Settings.Advanced.Video.ColorRange.Full="מלא"
+Basic.Settings.Advanced.StreamDelay="השהיית זרם נתונים"
+Basic.Settings.Advanced.StreamDelay.Duration="משך זמן (בשניות)"
+Basic.Settings.Advanced.StreamDelay.Preserve="שמר נקודת חיתוך (השהייה מוגדלת) בעת חיבור מחדש"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="שימוש זיכרון משוער: %1 MB"
+
+Basic.AdvAudio="מאפייני קול מתקדמים"
+Basic.AdvAudio.Name="שם"
+Basic.AdvAudio.Volume="עוצמת קול (%)"
+Basic.AdvAudio.Mono="הפוך למונו"
+Basic.AdvAudio.Panning="איזון"
+Basic.AdvAudio.SyncOffset="היסט סינכרון (מילישניות)"
+Basic.AdvAudio.AudioTracks="ערוצים"
+
+Basic.Settings.Hotkeys="מקשי קיצור"
+Basic.Settings.Hotkeys.Pair="צירופי מקשים משותים עם '%1' משמשים כמחליפים"
+
+Basic.Hotkeys.StartStreaming="התחל הזרמת נתונים"
+Basic.Hotkeys.StopStreaming="עצור הזרמת נתונים"
+Basic.Hotkeys.StartRecording="התחל הקלטה"
+Basic.Hotkeys.StopRecording="עצור הקלטה"
+Basic.Hotkeys.SelectScene="עבור לסצנה"
+
+Hotkeys.Insert="הוסף"
+Hotkeys.Delete="מחק"
+Hotkeys.Home="בית"
+Hotkeys.End="סיום"
+Hotkeys.PageUp="דף למעלה"
+Hotkeys.PageDown="דף למטה"
+Hotkeys.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
+Hotkeys.CapsLock="Caps lock"
+Hotkeys.Backspace="מחק תו"
+Hotkeys.Tab="טאב"
+Hotkeys.Print="הדפס"
+Hotkeys.Pause="השהה"
+Hotkeys.Left="שמאל"
+Hotkeys.Right="ימין"
+Hotkeys.Up="למעלה"
+Hotkeys.Down="למטה"
+Hotkeys.Windows="Windows"
+Hotkeys.Super="סופר"
+Hotkeys.Menu="תפריט"
+Hotkeys.Space="רווח"
+Hotkeys.NumpadNum="מקשי מספרים %1"
+Hotkeys.NumpadMultiply="מקשי מספרים הכפל"
+Hotkeys.NumpadDivide="מקשי מספרים חלק"
+Hotkeys.NumpadAdd="מקשי מספרים הוסף"
+Hotkeys.NumpadSubtract="מקשי מספרים חסר"
+Hotkeys.NumpadDecimal="מקשי מספרים עשרוני"
+Hotkeys.AppleKeypadNum="%1 (מקלדת נומרית)"
+Hotkeys.AppleKeypadMultiply="* (מקלדת נומרית)"
+Hotkeys.AppleKeypadDivide="/ (מקלדת נומרית)"
+Hotkeys.AppleKeypadAdd="+ (מקלדת נומרית)"
+Hotkeys.AppleKeypadSubtract="-(מקלדת נומרית)"
+Hotkeys.AppleKeypadDecimal=". (מקלדת נומרית)"
+Hotkeys.AppleKeypadEqual="= (מקלדת נומרית)"
+Hotkeys.MouseButton="עכבר %1"
+
+Mute="השתק"
+Unmute="בטל השתקה"
+Push-to-mute="לחץ-להשתקה"
+Push-to-talk="לחץ-כדי-לדבר"
+
+SceneItemShow="הצג '%1'"
+SceneItemHide="הסתר '%1'"
+
+OutputWarnings.NoTracksSelected="עליך לבחור ערוץ אחד לפחות"
+OutputWarnings.MultiTrackRecording="אזהרה: תבניות מסוימות (כגון FLV) אינם תומכים במספר רצועות להקלטה"
+

obs/data/locale/hr-HR.ini

@@ -8,6 +8,7 @@ Cancel="Otkaži"
 Close="Zatvori"
 Save="Sačuvaj"
 Discard="Odbaci"
+Disable="Onemogući"
 Yes="Da"
 No="Ne"
 Add="Dodaj"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Povrati OSX vertikalnu sinhronizaciju po izlasku"
 HighResourceUsage="Enkodiranje preopterećeno! Razmotrite snižavanje video podešavanja ili korišćenje bržeg šablona za enkodiranje."
 Transition="Prelaz"
 QuickTransitions="Brzi prelazi"
+Left="Sleva"
+Right="Zdesna"
+Top="Odozgo"
+Bottom="Odozdo"
 
 QuickTransitions.SwapScenes="Zameni scene pregleda/izlaza nakon prelaza"
 QuickTransitions.SwapScenesTT="Zamenjuje scene pregleda i izlaza nakon prelaza (ako originalna scena izlaza još uvek postoji).\nOvo neće poništiti promene koje su načinjene nad originalnom scenom izlaza."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Dupliraj izvore"
 QuickTransitions.EditPropertiesTT="Kada se menja ista scena, dozvoli promenu svojstava izvora bez promene izlaza.\nOvo može biti upotrebljeno samo ako je 'Dupliraj scene' omogućeno.\nOdređeni izvori (kao što su video hvatanja ili medija izvori) ne podržavaju ovo i ne mogu biti izmenjeni zasebno.\nPromena ove vrednosti će poništiti trenutnu scenu izlaza (ako i dalje postoji).\n\nUpozorenje: Zbog toga što izvori mogu biti duplirani, ovo može zahtevati dodatne sistemske ili video resurse."
 QuickTransitions.HotkeyName="Brzi prelaz: %1"
 
+Basic.AddTransition="Dodaj podesivi prelaz"
+Basic.RemoveTransition="Ukloni podesivi prelaz"
+Basic.TransitionProperties="Svojstva prelaza"
 Basic.SceneTransitions="Prelazi scena"
 Basic.TransitionDuration="Trajanje"
 Basic.TogglePreviewProgramMode="Studijski režim"
 
+TransitionNameDlg.Text="Molim unesite ime prelaza"
+TransitionNameDlg.Title="Ime prelaza"
+
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scene"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Da li ste sigurni da želite izbaciti '$1'?"
 Output.ConnectFail.Title="Neuspešno povezivanje"
 Output.ConnectFail.BadPath="Neispravna putanja ili URL konekcije. Molim proverite vaša podešavanja da potvrdite njihovu ispravnost."
 Output.ConnectFail.ConnectFailed="Neuspešno povezivanje na server"
-Output.ConnectFail.InvalidStream="Ne mogu pristupiti određenom kanalu ili strim ključu. Ovo je moguće, zato što je uneti ključ ili kanal pogrešan, ili zato što server misli da ste i dalje ulogovani."
+Output.ConnectFail.InvalidStream="Ne mogu pristupiti navedenom kanalu ili strim ključu, molim proverite vaš strim ključ. Ako je ispravan, možda postoji problem pri povezivanju na server."
 Output.ConnectFail.Error="Neočekivana greška u povezivanju sa serverom. Više informacija se nalazi u log datoteci."
 Output.ConnectFail.Disconnected="Prekinuta veza sa serverom."
 
@@ -107,7 +118,6 @@ LicenseAgreement.Exit="Izlaz"
 Remux.SourceFile="OBS snimak"
 Remux.TargetFile="Datoteka"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS snimci (*.flv)"
 Remux.FinishedTitle="Remux završen"
 Remux.Finished="Završen remux snimka"
 Remux.FinishedError="Remux završen, ali datoteka možda nije kompletirana"
@@ -133,6 +143,18 @@ Basic.DisplayCapture="Prikaži ulaz"
 
 Basic.Main.PreviewConextMenu.Enable="Omogući pregled"
 
+Deinterlacing="Deinterlejsing"
+Deinterlacing.Discard="Odbaci"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Stapanje"
+Deinterlacing.Blend2x="Stapanje 2x"
+Deinterlacing.Linear="Linearno"
+Deinterlacing.Linear2x="Linearno 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Prvo gornje polje"
+Deinterlacing.BottomFieldFirst="Prvo donje polje"
+
 Basic.Main.AddSceneDlg.Title="Dodaj scenu"
 Basic.Main.AddSceneDlg.Text="Molim unesite ime scene"
 
@@ -198,6 +220,7 @@ Basic.TransformWindow.Alignment="Poziciono poravnanje"
 Basic.TransformWindow.BoundsType="Tip okvira"
 Basic.TransformWindow.BoundsAlignment="Poravnanje u okviru"
 Basic.TransformWindow.Bounds="Veličina okvira"
+Basic.TransformWindow.Crop="Isecanje"
 
 Basic.TransformWindow.Alignment.TopLeft="Gore levo"
 Basic.TransformWindow.Alignment.TopCenter="Gore centar"
@@ -284,6 +307,11 @@ Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Jezik"
 Basic.Settings.General.WarnBeforeStartingStream="Prikaži prozor za potvrdu kada se započinju strimovi"
 Basic.Settings.General.WarnBeforeStoppingStream="Prikaži prozor za potvrdu kada se zaustavljaju strimovi"
+Basic.Settings.General.Snapping="Poravnavanje privlačenjem izvora"
+Basic.Settings.General.ScreenSnapping="Privuci izvore ivici ekrana"
+Basic.Settings.General.CenterSnapping="Privuci izvore horizontalnoj i vertikalnoj sredini"
+Basic.Settings.General.SourceSnapping="Privlačenje izvora ka drugim izvorima"
+Basic.Settings.General.SnapDistance="Osetljivost privlačenja"
 
 Basic.Settings.Stream="Strim"
 Basic.Settings.Stream.StreamType="Vrsta strima"
@@ -293,6 +321,7 @@ Basic.Settings.Output.Format="Format snimanja"
 Basic.Settings.Output.Encoder="Enkoder"
 Basic.Settings.Output.SelectDirectory="Odaberi direktorijum za snimanje"
 Basic.Settings.Output.SelectFile="Odaberi datoteku za snimanje"
+Basic.Settings.Output.EnforceBitrate="Sprovedi ograničenja u protoku striming servisa"
 Basic.Settings.Output.Mode="Režim izlaza"
 Basic.Settings.Output.Mode.Simple="Jednostavno"
 Basic.Settings.Output.Mode.Adv="Napredno"
@@ -303,11 +332,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Isto kao strim"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Visoki kvalitet, osrednja veličina datoteke"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Kvalitet sa neprimetnim razlikama, velika datoteka"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Kvalitet bez gubitka, izričito velika datoteka"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Upozorenje: Video protok strima će biti postavljen na %1, što je gornja granica za trenutni striming servis. Ako ste sigurni da želite ići preko %1, omogućite napredne opcije enkodera i isključite \"Sprovedi ograničenja u protoku striming servisa\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Upozorenje: Zvučni protok strima će biti postavljen na %1, što je gornja granica za trenutni striming servis. Ako ste sigurni da želite ići preko %1, omogućite napredne opcije enkodera i isključite \"Sprovedi ograničenja u protoku striming servisa\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Upozorenje: Snimanje sa softverskim enkoderom drugačijeg kvaliteta u odnosu na strim će zahtevati dodatnu procesorsku snagu ako strimujete i snimate u isto vreme."
 Basic.Settings.Output.Simple.Warn.Lossless="Upozorenje: Kvalitet bez gubitka stvara izričito velike datoteke! Kvalitet bez gubitka može koristiti više od 7 gigabajta prostora na disku po minutu pri visokim rezolucijama i framerate-om. Kvalitet bez gubitka nije preporučen za duže snimanje osim ako imate veliku količinu slobodnog prostora na disku."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Da li ste sigurni da želite koristiti kvalitet bez gubitka?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Upozorenje za kvalitet bez gubitka!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Upozorenje: Ne možete koristi više odvojenih QSV enkodera kada emitujete i snimate u isto vreme. Ako želite da emitujete i snimate u isto vreme, molim promenite ili enkoder snimanja ili enkoder emitovanja."
 Basic.Settings.Output.Simple.Encoder.Software="Softverski (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Mašinski (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Mašinski (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softverski (x264 niska upotreba procesora, povećava veličinu datoteke)"
 Basic.Settings.Output.VideoBitrate="Protok videa"
 Basic.Settings.Output.AudioBitrate="Protok zvuka"
@@ -334,6 +368,8 @@ Basic.Settings.Output.Adv.Recording.Type="Vrsta"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Uobičajeni"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Prilagođeni izlaz (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Koristi strim enkoder)"
+Basic.Settings.Output.Adv.Recording.Filename="Oblikovanje imena datoteke"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Prepiši ako postoji datoteka"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg vrsta ispisa"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ispis na URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ispis u datoteku"
@@ -354,6 +390,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Zvučni enkoder"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Podešavanja zvučnog enkodera (ako postoje)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Podešavanja muxer-a (ako postoje)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Godina, četiri cifre\n%YY		Godina, poslednje dve cifre (00-99)\n%MM		Mesec kao decimalni broj (01-12)\n%DD		Dan u mesecu, sa nulom ispred (01-31)\n%hh		Sat u 24-časovnom zapisu (00-23)\n%mm		Minut (00-59)\n%ss		Sekunda (00-61)\n%%		Znak procenta\n%a		Skraćeno ime dana u nedelji\n%A		Puno ime dana u nedelji\n%b		Skraćeno ime meseca\n%B		Puno ime meseca\n%d		Dan u mesecu, sa nulom ispred (01-31)\n%H		Sat u 24-časovnom zapisu (00-23)\n%I		Sat u 12-časovnom zapisu (01-12)\n%m		Mesec kao decimalni broj (01-12)\n%M		Minut (00-59)\n%p		Oznaka za pre ili posle podne\n%S		Sekunda (00-61)\n%y		Godina, poslednje dve cifre (00-99)\n%Y		Godina\n%z		ISO 8601 odstupanje od UTC ili ime\n		vremenske zone ili skraćenica\n%Z		Ime vremenske zone ili skraćenica\n"
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adapter:"
 Basic.Settings.Video.BaseResolution="Osnovna (površinska) rezolucija:"

obs/data/locale/hu-HU.ini

@@ -8,6 +8,7 @@ Cancel="Mégse"
 Close="Bezár"
 Save="Mentés"
 Discard="Elvet"
+Disable="Letiltás"
 Yes="Igen"
 No="Nem"
 Add="Hozzáadás"
@@ -26,7 +27,7 @@ Mixer="Keverő"
 Browse="Tallózás"
 Mono="Mono"
 Stereo="Sztereó"
-DroppedFrames="Ejtett Képkockák: %1 (%2 %)"
+DroppedFrames="Ejtett képkockák: %1 (%2 %)"
 PreviewProjector="Teljes képernyős projektor (Előnézet)"
 SceneProjector="Teljes képernyős projektor (Jelenet)"
 SourceProjector="Teljes képernyős projektor (Forrás)"
@@ -38,23 +39,33 @@ Untitled="Névtelen"
 New="Új"
 Duplicate="Másolat készítése"
 Enable="Engedélyezés"
-DisableOSXVSync="OSX V-Sync Kikapcsolása"
+DisableOSXVSync="OSX V-Sync kikapcsolása"
 ResetOSXVSyncOnExit="OSX V-Sync visszaállítása kilépéskor"
 HighResourceUsage="Túlterhelt kódolás! Fontolja meg a videó beállítások csökkentését vagy egy gyorsabb kódoló készletre váltást."
 Transition="Átmenet"
-QuickTransitions="Gyors Átmenetek"
+QuickTransitions="Gyors átmenetek"
+Left="Bal"
+Right="Jobb"
+Top="Felső"
+Bottom="Alsó"
 
 QuickTransitions.SwapScenes="Előnézeti/Kimeneti Jelenetek cseréje átmenet után"
 QuickTransitions.SwapScenesTT="Az előnézet és a kimeneti jelenet cseréje átmenet után (ha a kimenet eredeti jelenete még létezik).\nEz nincs kihatással a kimenet eredeti jelenetére."
-QuickTransitions.DuplicateScene="Jelenet Kettőzése"
+QuickTransitions.DuplicateScene="Jelenet kettőzése"
 QuickTransitions.DuplicateSceneTT="Ugyanazon jelenet szerkesztésekor, lehetősége van átformálni ás a láthatóságát megváltoztatni a kimenetnek.\nA kimeneti forrás tulajdonságainak módosításához, engedélyezze a 'Forrás Kettőzését'.\nAz érték megváltoztatásakor a jelenlegi kimeneti jelenetet visszaállítja (ha még létezik)."
-QuickTransitions.EditProperties="Forrás Kettőzése"
+QuickTransitions.EditProperties="Forrás kettőzése"
 QuickTransitions.EditPropertiesTT="Ugyanazon jelenet szerkesztésekor, lehetősége van a kimeneti források tulajdonságainak módosítására.\nCsak akkor használható ha a 'Jelenet Kettőzés' engedélyezve van.\nEgyes források (a felvevő és média források) nem támogatják ezt és nem lehet őket külön szerkeszteni.\nAz érték megváltoztatásakor az aktuális kimeneti jelenetet visszaállítja (ha az még létezik).\n\nFigyelem: A források megkettőzése, extra erőforrásigénnyel járhat."
-QuickTransitions.HotkeyName="Gyors Átmenet: %1"
+QuickTransitions.HotkeyName="Gyors átmenet: %1"
 
-Basic.SceneTransitions="Jelenet Átmenetek"
+Basic.AddTransition="Konfigurálható átmenet hozzáadása"
+Basic.RemoveTransition="Konfigurálható átmenet eltávolítása"
+Basic.TransitionProperties="Átmenet tulajdonságai"
+Basic.SceneTransitions="Jelenet átmenetek"
 Basic.TransitionDuration="Időtartam"
-Basic.TogglePreviewProgramMode="Stúdió Mód"
+Basic.TogglePreviewProgramMode="Stúdió mód"
+
+TransitionNameDlg.Text="Kérem írja be az átmenet nevét"
+TransitionNameDlg.Title="Átmenet neve"
 
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Jelenetek"
@@ -65,7 +76,7 @@ NameExists.Text="A név már használatban van."
 NoNameEntered.Title="Kérem adjon meg egy érvényes nevet"
 NoNameEntered.Text="Üres nevek nem használhatóak."
 
-ConfirmStart.Title="Stream Indítása?"
+ConfirmStart.Title="Stream indítása?"
 ConfirmStart.Text="Biztos benne, hogy elindítja a streamet?"
 
 ConfirmStop.Title="Stream megállítása?"
@@ -74,13 +85,13 @@ ConfirmStop.Text="Biztos benne, hogy leállítja a streamet?"
 ConfirmExit.Title="Kilép a programból?"
 ConfirmExit.Text="Az OBS jelenleg aktív. Minden stream és/vagy felvétel le fog állni. Biztosan kilép?"
 
-ConfirmRemove.Title="Eltávolítás Megerősítése"
+ConfirmRemove.Title="Eltávolítás megerősítése"
 ConfirmRemove.Text="\"$1\" eltávolítására készül, biztos benne?"
 
 Output.ConnectFail.Title="Csatlakozás sikertelen"
 Output.ConnectFail.BadPath="Érvénytelen elérési út vagy kapcsolati URL cím. Kérem, ellenőrizze a beállításokat és győződjön meg az érvényességükről."
 Output.ConnectFail.ConnectFailed="Nem sikerült kapcsolódni a szerverhez"
-Output.ConnectFail.InvalidStream="Nem lehet hozzáférni a megadott csatornához vagy stream kulcshoz. Lehet, hogy a kulcs / csatorna érvénytelen, vagy a kiszolgáló szerint már be van jelentkezve."
+Output.ConnectFail.InvalidStream="Nem lehet hozzáférni a megadott csatornához vagy stream kulcshoz, kérem ellenőrizze a kulcsot. Ha helyesnek találja, akkor probléma merült fel a szerverhez csatlakozás során."
 Output.ConnectFail.Error="A szerverhez való kapcsolódás során váratlan hiba történt. További információért tekintse meg a naplófájlt."
 Output.ConnectFail.Disconnected="Kiszolgálóról lecsatlakoztatva."
 
@@ -95,7 +106,7 @@ Output.BadPath.Title="A fájl elérési útja hibás"
 Output.BadPath.Text="A beállított elérési útvonal érvénytelen. Kérem ellenőrizze a beállításait és győződjön meg arról, hogy a fájl elérési útja érvényes."
 
 LogReturnDialog="Napló feltöltése sikeres"
-LogReturnDialog.CopyURL="URL Másolása"
+LogReturnDialog.CopyURL="URL másolása"
 LogReturnDialog.ErrorUploadingLog="Naplófájl feltöltésekor hiba lépett fel"
 
 LicenseAgreement="Licencmegállapodás"
@@ -104,10 +115,10 @@ LicenseAgreement.ClickIAgreeToContinue="Amennyiben elfogadja a megállapodás fe
 LicenseAgreement.IAgree="Elfogadom"
 LicenseAgreement.Exit="Kilépés"
 
-Remux.SourceFile="OBS Felvétel"
+Remux.SourceFile="OBS felvétel"
 Remux.TargetFile="Célfájl"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS Felvétel (*.flv)"
+Remux.OBSRecording="OBS felvétel"
 Remux.FinishedTitle="Remux kész"
 Remux.Finished="Felvétel remuxolva"
 Remux.FinishedError="Felvétel remuxolva, de a fájl hiányos lehet"
@@ -118,22 +129,34 @@ Remux.FileExists="A célfájl létezik, kívánja cserélni?"
 Remux.ExitUnfinishedTitle="Remuxolás folyamatban"
 Remux.ExitUnfinished="A Remux nem fejeződött be, a megállítása a célfájlt használhatatlanná teheti.\nBiztosan megállítja?"
 
-UpdateAvailable="Elérhető Újabb Programváltozat"
+UpdateAvailable="Elérhető újabb programváltozat"
 UpdateAvailable.Text="Verzió: %1. %2. %3 most elérhető. <a href='%4'>Kattintson ide a letöltéshez</a>"
 
-Basic.DesktopDevice1="Asztal Audio"
+Basic.DesktopDevice1="Asztal audio"
-Basic.DesktopDevice2="Asztal Audio 2"
+Basic.DesktopDevice2="Asztal audio 2"
 Basic.AuxDevice1="Mikrofon/Aux"
 Basic.AuxDevice2="Mikrofon/Aux 2"
 Basic.AuxDevice3="Mikrofon/Aux 3"
 Basic.AuxDevice4="Mikrofon/Aux 4"
 
 Basic.Scene="Jelenet"
-Basic.DisplayCapture="Képernyő Felvétel"
+Basic.DisplayCapture="Képernyő felvétel"
 
 Basic.Main.PreviewConextMenu.Enable="Előnézet bekapcsolása"
 
-Basic.Main.AddSceneDlg.Title="Jelenet Hozzáadása"
+Deinterlacing="Váltottsorosság"
+Deinterlacing.Discard="Elvetés"
+Deinterlacing.Retro="Retró mód"
+Deinterlacing.Blend="Vegyítés"
+Deinterlacing.Blend2x="Kétszeres Vegyítés"
+Deinterlacing.Linear="Lineáris"
+Deinterlacing.Linear2x="Kétszeresen Lineáris"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Felső mező először"
+Deinterlacing.BottomFieldFirst="Alsó mező először"
+
+Basic.Main.AddSceneDlg.Title="Jelenet hozzáadása"
 Basic.Main.AddSceneDlg.Text="Kérem adja meg a jelenet nevét"
 
 Basic.Main.DefaultSceneName.Text="Jelenet %1"
@@ -151,15 +174,15 @@ RenameProfile.Title="Profil átnevezése"
 Basic.Main.PreviewDisabled="Előnézet pillanatnyilag lekapcsolva"
 
 Basic.SourceSelect="Forrás Létrehozása/Kijelölése"
-Basic.SourceSelect.CreateNew="Új Létrehozása"
+Basic.SourceSelect.CreateNew="Új létrehozása"
 Basic.SourceSelect.AddExisting="Létező tartalom hozzáadása"
 Basic.SourceSelect.AddVisible="Forrás láthatóvá tétele"
 
 Basic.PropertiesWindow="Tulajdonságok: '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (autokiválasztás: %2)"
-Basic.PropertiesWindow.SelectColor="Szín Kiválasztása"
+Basic.PropertiesWindow.SelectColor="Szín kiválasztása"
 Basic.PropertiesWindow.SelectFont="Betűtípus kiválasztása"
-Basic.PropertiesWindow.ConfirmTitle="Beállítások Módosultak"
+Basic.PropertiesWindow.ConfirmTitle="Beállítások módosultak"
 Basic.PropertiesWindow.Confirm="Változtatásai nincsenek elmentve. Szeretné megtartani őket?"
 Basic.PropertiesWindow.NoProperties="Nincsenek elérhető tulajdonságok"
 Basic.PropertiesWindow.AddFiles="Fájlok hozzáadása"
@@ -183,21 +206,22 @@ Basic.StatusBar.DelayStoppingIn="Késleltetés (megáll: %1 mp)"
 Basic.StatusBar.DelayStartingStoppingIn="Késleltetés (megáll: %1 mp; kezdés: %2 mp)"
 
 Basic.Filters="Szűrők"
-Basic.Filters.AsyncFilters="Audió/Videó szűrők"
+Basic.Filters.AsyncFilters="Audio/Videó szűrők"
-Basic.Filters.AudioFilters="Audio Szűrők"
+Basic.Filters.AudioFilters="Hangszűrők"
-Basic.Filters.EffectFilters="Effekt Szűrők"
+Basic.Filters.EffectFilters="Effekt szűrők"
 Basic.Filters.Title="Szűrők a \"%1\""
 Basic.Filters.AddFilter.Title="Szűrő neve"
 Basic.Filters.AddFilter.Text="Kérem adja meg a szűrő nevét"
 
-Basic.TransformWindow="Jelenet Elemének Alakítása"
+Basic.TransformWindow="Jelenet elemének alakítása"
 Basic.TransformWindow.Position="Pozíció"
 Basic.TransformWindow.Rotation="Forgatás"
 Basic.TransformWindow.Size="Méret"
 Basic.TransformWindow.Alignment="Tartalom pozícionálása"
-Basic.TransformWindow.BoundsType="Méretezőkeret Típus"
+Basic.TransformWindow.BoundsType="Méretezőkeret típus"
-Basic.TransformWindow.BoundsAlignment="Méretezőkeret Igazítás"
+Basic.TransformWindow.BoundsAlignment="Méretezőkeret igazítás"
-Basic.TransformWindow.Bounds="Méretezőkeret Mérete"
+Basic.TransformWindow.Bounds="Határkeret mérete"
+Basic.TransformWindow.Crop="Vágás"
 
 Basic.TransformWindow.Alignment.TopLeft="Bal Felül"
 Basic.TransformWindow.Alignment.TopCenter="Középen Fent"
@@ -223,17 +247,17 @@ Basic.Main.AddSourceHelp.Text="Legalább 1 jelenetre van szükség forrás hozz
 Basic.Main.Scenes="Jelenetek"
 Basic.Main.Sources="Források"
 Basic.Main.Connecting="Kapcsolódás..."
-Basic.Main.StartRecording="Felvétel Indítása"
+Basic.Main.StartRecording="Felvétel indítása"
-Basic.Main.StartStreaming="Stream Indítása"
+Basic.Main.StartStreaming="Stream indítása"
-Basic.Main.StopRecording="Felvétel Leállítása"
+Basic.Main.StopRecording="Felvétel leállítása"
-Basic.Main.StopStreaming="Stream Leállítása"
+Basic.Main.StopStreaming="Stream leállítása"
-Basic.Main.ForceStopStreaming="Stream Leállítása (Késleltetés elvetése)"
+Basic.Main.ForceStopStreaming="Stream leállítása (Késleltetés elvetése)"
 
 Basic.MainMenu.File="&Fájl"
 Basic.MainMenu.File.Export="&Exportálás"
 Basic.MainMenu.File.Import="&Importálás"
-Basic.MainMenu.File.ShowRecordings="&Felvételek Mutatása"
+Basic.MainMenu.File.ShowRecordings="&Felvételek megjelenítése"
-Basic.MainMenu.File.Remux="Re&mux Felvételek"
+Basic.MainMenu.File.Remux="Re&mux felvételek"
 Basic.MainMenu.File.Settings="&Beállítások"
 Basic.MainMenu.File.ShowSettingsFolder="Beállítási mappa megjelenítése"
 Basic.MainMenu.File.ShowProfileFolder="Profilmappa megjelenítése"
@@ -246,13 +270,13 @@ Basic.MainMenu.Edit.Redo="&Ismét"
 Basic.MainMenu.Edit.UndoAction="&Visszavonás $1"
 Basic.MainMenu.Edit.RedoAction="&Ismét $1"
 Basic.MainMenu.Edit.Transform="&Alakítás"
-Basic.MainMenu.Edit.Transform.EditTransform="&Alakítás Átszerkesztése..."
+Basic.MainMenu.Edit.Transform.EditTransform="&Alakítás átszerkesztése..."
-Basic.MainMenu.Edit.Transform.ResetTransform="&Alakítás Visszaállítása"
+Basic.MainMenu.Edit.Transform.ResetTransform="&Alakítás visszaállítása"
 Basic.MainMenu.Edit.Transform.Rotate90CW="Forgatás 90 fokkal balra"
 Basic.MainMenu.Edit.Transform.Rotate90CCW="Forgatás 90 fokkal jobbra"
 Basic.MainMenu.Edit.Transform.Rotate180="Forgatás 180 fokkal"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="&Vízszintes Tükrözés"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="&Vízszintes tükrözés"
-Basic.MainMenu.Edit.Transform.FlipVertical="&Függőleges Tükrözés"
+Basic.MainMenu.Edit.Transform.FlipVertical="&Függőleges tükrözés"
 Basic.MainMenu.Edit.Transform.FitToScreen="&Képernyőhöz igazítás"
 Basic.MainMenu.Edit.Transform.StretchToScreen="&Képernyőhöz nyújtás"
 Basic.MainMenu.Edit.Transform.CenterToScreen="&Képernyő középpontjához"
@@ -261,7 +285,7 @@ Basic.MainMenu.Edit.Order.MoveUp="Mozgatás &Fel"
 Basic.MainMenu.Edit.Order.MoveDown="Mozgatás &Le"
 Basic.MainMenu.Edit.Order.MoveToTop="Mozgatás a &Tetejére"
 Basic.MainMenu.Edit.Order.MoveToBottom="Mozgatás az &Aljára"
-Basic.MainMenu.Edit.AdvAudio="&Speciális Audio Tulajdonságok"
+Basic.MainMenu.Edit.AdvAudio="&Speciális hangtulajdonságok"
 
 Basic.MainMenu.SceneCollection="&Jelenet gyűjtemény"
 Basic.MainMenu.Profile="&Profil"
@@ -269,14 +293,14 @@ Basic.MainMenu.Profile="&Profil"
 Basic.MainMenu.Help="&Segítség"
 Basic.MainMenu.Help.Website="Weboldal meglátogatása"
 Basic.MainMenu.Help.Logs="&Naplófájlok"
-Basic.MainMenu.Help.Logs.ShowLogs="&Naplófájlok Mutatása"
+Basic.MainMenu.Help.Logs.ShowLogs="&Naplófájlok megjelenítése"
-Basic.MainMenu.Help.Logs.UploadCurrentLog="&Aktuális Naplófájl Feltöltése"
+Basic.MainMenu.Help.Logs.UploadCurrentLog="&Aktuális Naplófájl feltöltése"
-Basic.MainMenu.Help.Logs.UploadLastLog="&Utolsó Naplófájl Feltöltése"
+Basic.MainMenu.Help.Logs.UploadLastLog="&Utolsó Naplófájl feltöltése"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&Jelenlegi Napló Megtekintése"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Jelenlegi napló megtekintése"
-Basic.MainMenu.Help.CheckForUpdates="Frissítések Ellenőrzése"
+Basic.MainMenu.Help.CheckForUpdates="Frissítések ellenőrzése"
 
 Basic.Settings.ProgramRestart="A beállítások érvénybe lépéséhez a program újraindítása szükséges."
-Basic.Settings.ConfirmTitle="Változtatások Megerősítése"
+Basic.Settings.ConfirmTitle="Változtatások megerősítése"
 Basic.Settings.Confirm="Nem mentette a módosításokat. Menti a változtatásokat?"
 
 Basic.Settings.General="Általános"
@@ -284,43 +308,54 @@ Basic.Settings.General.Theme="Téma"
 Basic.Settings.General.Language="Nyelv"
 Basic.Settings.General.WarnBeforeStartingStream="Megerősítő párbeszédpanel megjelenítése stream indításakor"
 Basic.Settings.General.WarnBeforeStoppingStream="Megerősítő párbeszédpanel megjelenítése stream leállításakor"
+Basic.Settings.General.Snapping="Forrás pozicionálásának igazítása"
+Basic.Settings.General.ScreenSnapping="Források igazítása a képernyő széléhez"
+Basic.Settings.General.CenterSnapping="Források vízszintes és függőleges középponthoz igazítása"
+Basic.Settings.General.SourceSnapping="Források igazítása más forrásokhoz"
+Basic.Settings.General.SnapDistance="Igazítás érzékenysége"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Stream típusa"
 
 Basic.Settings.Output="Kimenet"
-Basic.Settings.Output.Format="Felvétel Formátuma"
+Basic.Settings.Output.Format="Felvétel formátuma"
 Basic.Settings.Output.Encoder="Kódoló"
-Basic.Settings.Output.SelectDirectory="Felvételi Könyvtár Kiválasztása"
+Basic.Settings.Output.SelectDirectory="Felvételi könyvtár kiválasztása"
-Basic.Settings.Output.SelectFile="Felvétel Fájljának Kiválasztása"
+Basic.Settings.Output.SelectFile="Felvétel fájljának kiválasztása"
-Basic.Settings.Output.Mode="Kimeneti Mód"
+Basic.Settings.Output.EnforceBitrate="Stream kiszolgáló bitráta korlátainak kényszerítése"
+Basic.Settings.Output.Mode="Kimeneti mód"
 Basic.Settings.Output.Mode.Simple="Egyszerű"
 Basic.Settings.Output.Mode.Adv="Haladó"
-Basic.Settings.Output.Mode.FFmpeg="FFmpeg Kimenet"
+Basic.Settings.Output.Mode.FFmpeg="FFmpeg kimenet"
-Basic.Settings.Output.Simple.SavePath="Felvétel Helye"
+Basic.Settings.Output.Simple.SavePath="Felvétel helye"
-Basic.Settings.Output.Simple.RecordingQuality="Felvételi Minőség"
+Basic.Settings.Output.Simple.RecordingQuality="Felvétel minősége"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="Ugyanaz, mint a stream"
-Basic.Settings.Output.Simple.RecordingQuality.Small="Kiváló Minőség, Közepes Fájlméret"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Jó minőség, közepes fájlméret"
-Basic.Settings.Output.Simple.RecordingQuality.HQ="Megkülönböztethetetlen Minőség, Nagy Fájlméret"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Megkülönböztethetetlen minőség, nagy fájlméret"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Veszteségmentes Minőség, Terjedelmes Fájlméret"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Veszteségmentes minőség, hatalmas fájlméret"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Figyelem: Az adás videó bitrátája %1 értéken áll, ami a kiválasztott kiszolgáló felső határértéke. Amennyiben túl kívánja lépni a megadott %1 értéket, úgy engedélyezze a haladó kódolási opciókat és törölje a \"stream kiszolgáló bitráta korlátainak kényszerítése\" opciót."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Figyelem: Az adás audio bitrátája %1 értéken áll, ami a kiválasztott kiszolgáló felső határértéke. Amennyiben túl kívánja lépni a megadott %1 értéket, úgy engedélyezze a haladó kódolási opciókat és törölje a \"stream kiszolgáló bitráta korlátainak kényszerítése\" opciót."
 Basic.Settings.Output.Simple.Warn.Encoder="Figyelem: A streamtől eltérő minőséggel történő rögzítés, további CPU erőforrásokat igényel, ha egyidejűleg használja mindkettőt."
-Basic.Settings.Output.Simple.Warn.Lossless="Figyelem: A veszteségmentes minőséggel történő felvétel hatalmas fájlméretet generál. Ezzel a minőséggel percenként akár 7 gigabájtnyi adatot is generálhat nagy felbontáson és képkockasebességen. Ez az eljárás nem ajánlott hosszú felvételekhez, kivéve ha hatalmas lemezterület áll rendelkezésre."
+Basic.Settings.Output.Simple.Warn.Lossless="Figyelem: A veszteségmentes minőséggel történő felvétel hatalmas fájlméretet generál. Ezzel a minőséggel percenként akár 7 gigabájt adatot is generálhat nagy felbontáson és képkockasebességen. Ez az eljárás nem ajánlott hosszú felvételekhez, kivéve ha hatalmas lemezterület áll rendelkezésre."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Biztos benne, hogy veszteségmentes minőséget kíván használni?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Veszteségmentes minőség figyelem!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Figyelem: Nem használható több különálló QSV kódoló streamelésre és felvételre egyidejűleg. Ha ön egyidejűleg kíván streamet és felvételt készíteni, akkor váltsa le a felvevő vagy a stream kódolóját."
 Basic.Settings.Output.Simple.Encoder.Software="Szoftver (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardver (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardver (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Szoftveres (x264 alacsony CPU használati készlet, növekvő fájlméret)"
-Basic.Settings.Output.VideoBitrate="Videó Bitráta"
+Basic.Settings.Output.VideoBitrate="Videó bitráta"
-Basic.Settings.Output.AudioBitrate="Audio Bitráta"
+Basic.Settings.Output.AudioBitrate="Audio bitráta"
-Basic.Settings.Output.Reconnect="Automatikus Újracsatlakozás"
+Basic.Settings.Output.Reconnect="Automatikus újracsatlakozás"
-Basic.Settings.Output.RetryDelay="Újrapróbálkozás Késleltetése (másodperc)"
+Basic.Settings.Output.RetryDelay="Újrapróbálkozás késleltetése (másodperc)"
-Basic.Settings.Output.MaxRetries="Újrapróbálkozások Maximális Száma"
+Basic.Settings.Output.MaxRetries="Újrapróbálkozások maximális száma"
-Basic.Settings.Output.Advanced="Speciális Kódoló beállítások engedélyezése"
+Basic.Settings.Output.Advanced="Speciális kódoló beállítások engedélyezése"
-Basic.Settings.Output.EncoderPreset="Kódoló Készlet (magasabb = kevesebb CPU igény)"
+Basic.Settings.Output.EncoderPreset="Kódoló készlet (magasabb = kevesebb CPU igény)"
-Basic.Settings.Output.CustomEncoderSettings="Egyéni Kódolási Beállítások"
+Basic.Settings.Output.CustomEncoderSettings="Egyéni kódolási beállítások"
-Basic.Settings.Output.CustomMuxerSettings="Egyéni Muxer Beállítások"
+Basic.Settings.Output.CustomMuxerSettings="Egyéni Muxer beállítások"
 Basic.Settings.Output.NoSpaceFileName="Fájlnév generálása helyfoglalás nélkül"
 
-Basic.Settings.Output.Adv.Rescale="Kimenet Átméretezése"
+Basic.Settings.Output.Adv.Rescale="Kimenet átméretezése"
 Basic.Settings.Output.Adv.AudioTrack="Hangsáv"
 Basic.Settings.Output.Adv.Streaming="Streamelés"
 Basic.Settings.Output.Adv.ApplyServiceSettings="A kiszolgáló kódoló beállításainak kényszerítése"
@@ -332,33 +367,39 @@ Basic.Settings.Output.Adv.Audio.Track4="Sáv 4"
 Basic.Settings.Output.Adv.Recording="Rögzítés"
 Basic.Settings.Output.Adv.Recording.Type="Típus"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Szabvány"
-Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Egyéni Kimenet (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Egyéni kimenet (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Stream kódoló használata)"
-Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg Kimenet Típusa"
+Basic.Settings.Output.Adv.Recording.Filename="Fájlnév formázás"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Létező fájl felülírása"
+Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg kimenet típusa"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Kimenet URL-re"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Kimenet fájlba"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Általános felvételi formátumok"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Minden fájl"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Fájl elérési útja vagy URL"
-Basic.Settings.Output.Adv.FFmpeg.Format="Tároló Formátum"
+Basic.Settings.Output.Adv.FFmpeg.Format="Tároló formátum"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Hang"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Videó"
-Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Alapértelmezett Formátum"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Alapértelmezett formátum"
-Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Tároló Formátum Leírás"
+Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Tároló formátum leírás"
-Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Audió/Videó Kodek kitalálása a fájl elérési útból vagy URL-ből"
+Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Audio/Videó kodek kitalálása a fájl elérési útból vagy URL-ből"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Alapértelmezett Kódoló"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Alapértelmezett kódoló"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Kódoló Letiltása"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Kódoló letiltása"
-Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videó Kódoló"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videó kódoló"
-Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videó Kódoló Beállítások (ha van)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videó kódoló beállítások (ha van)"
-Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Kódoló"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio kódoló"
-Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Kódoló Beállítások (ha van)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio kódoló beállítások (ha van)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer Beállítások (ha van)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer beállítások (ha van)"
+
+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"
+
+FilenameFormatting.TT="%CCYY Év, négy számjegy\n%YY Év, utolsó két számjegy (00-99)\n%MM Hónap mint tizedes szám (01-12)\n%DD Hónap napja, nulla kitöltéssel (01-31)\n%hh Óra 24ó formátumban (00-23)\n%mm Perc (00-59)\n%ss Másodperc (00-61)\n%%	A % sign\n%a	Rövidített hétköznap neve\n%A	Teljes hétköznap neve\n%b	Rövidített hónap neve\n%B	Teljes hónap neve\n%d	Hónap napja, nulla kitöltéssel (01-31)\n%H Óra 24ó formátumban (00-23)\n%I	Óra 12ó formátumban (01-12)\n%m Hónap mint decimális szám (01-12)\n%M Perc (00-59)\n%p	DE vagy DU megjelölés\n%S	Másodperc (00-61)\n%y Év, utolsó két számjegy (00-99)\n%Y Év\n%z ISO 8601 eltolással UTC-hez képest vagy időzóna\n	név vagy rövidítés\n%Z Időzóna neve vagy rövidítése\n"
 
 Basic.Settings.Video="Videó"
-Basic.Settings.Video.Adapter="Videó Adapter:"
+Basic.Settings.Video.Adapter="Videó adapter:"
-Basic.Settings.Video.BaseResolution="Alap (Vászon) Felbontás:"
+Basic.Settings.Video.BaseResolution="Alap (Vászon) felbontás:"
-Basic.Settings.Video.ScaledResolution="Kimeneti (Skálázott) Felbontás:"
+Basic.Settings.Video.ScaledResolution="Kimeneti (Skálázott) felbontás:"
-Basic.Settings.Video.DownscaleFilter="Leskálázás Szűrő:"
+Basic.Settings.Video.DownscaleFilter="Leskálázás szűrő:"
 Basic.Settings.Video.DisableAeroWindows="Aero Letiltása (csak Windows esetén)"
 Basic.Settings.Video.FPS="FPS:"
 Basic.Settings.Video.FPSCommon="Átlagos FPS érték"
@@ -380,9 +421,9 @@ Basic.Settings.Audio.SampleRate="Mintavételezés"
 Basic.Settings.Audio.Channels="Csatornák"
 Basic.Settings.Audio.DesktopDevice="Asztali hangeszköz"
 Basic.Settings.Audio.DesktopDevice2="Asztali hangeszköz 2"
-Basic.Settings.Audio.AuxDevice="Mikrofon/Aux Audio eszköz"
+Basic.Settings.Audio.AuxDevice="Mikrofon/Aux hangeszköz"
-Basic.Settings.Audio.AuxDevice2="Mikrofon/Aux Audio eszköz 2"
+Basic.Settings.Audio.AuxDevice2="Mikrofon/Aux hangeszköz 2"
-Basic.Settings.Audio.AuxDevice3="Mikrofon/Aux Audio eszköz 3"
+Basic.Settings.Audio.AuxDevice3="Mikrofon/Aux hangeszköz 3"
 Basic.Settings.Audio.EnablePushToMute="Push-to-mute engedélyezése"
 Basic.Settings.Audio.PushToMuteDelay="Push-to-mute késleltetés"
 Basic.Settings.Audio.EnablePushToTalk="Push-to-talk engedélyezése"
@@ -393,16 +434,16 @@ Basic.Settings.Advanced="Haladó"
 Basic.Settings.Advanced.FormatWarning="Figyelem: Az NV12-től eltérő színformátumok elsősorban felvételhez vannak és nem ajánlott a használatuk streamekhez. Adás közben megnövekedett processzor igényt okozhat a színkonverzió."
 Basic.Settings.Advanced.Audio.BufferingTime="Audio pufferelési idő"
 Basic.Settings.Advanced.Video.ColorFormat="Színformátum"
-Basic.Settings.Advanced.Video.ColorSpace="YUV Színtér"
+Basic.Settings.Advanced.Video.ColorSpace="YUV színtér"
-Basic.Settings.Advanced.Video.ColorRange="YUV Színtartomány"
+Basic.Settings.Advanced.Video.ColorRange="YUV színtartomány"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Részleges"
 Basic.Settings.Advanced.Video.ColorRange.Full="Teljes"
-Basic.Settings.Advanced.StreamDelay="Stream Késleltetés"
+Basic.Settings.Advanced.StreamDelay="Stream késleltetés"
 Basic.Settings.Advanced.StreamDelay.Duration="Időtartam (másodperc)"
 Basic.Settings.Advanced.StreamDelay.Preserve="Töréspont megőrzése (Késleltetés növeléssel) újrakapcsolódás esetén"
 Basic.Settings.Advanced.StreamDelay.MemoryUsage="Becsült memóriahasználat: %1 MB"
 
-Basic.AdvAudio="Speciális Audio Tulajdonságok"
+Basic.AdvAudio="Speciális hangtulajdonságok"
 Basic.AdvAudio.Name="Név"
 Basic.AdvAudio.Volume="Hangerő (%)"
 Basic.AdvAudio.Mono="Monora lekeverés"
@@ -413,10 +454,10 @@ Basic.AdvAudio.AudioTracks="Sávok"
 Basic.Settings.Hotkeys="Gyorsbillentyűk"
 Basic.Settings.Hotkeys.Pair="Azonos billentyűkombináció a '%1' mezővel, ezért kapcsolóként működik"
 
-Basic.Hotkeys.StartStreaming="Stream Indítása"
+Basic.Hotkeys.StartStreaming="Stream indítása"
-Basic.Hotkeys.StopStreaming="Stream Leállítása"
+Basic.Hotkeys.StopStreaming="Stream leállítása"
-Basic.Hotkeys.StartRecording="Felvétel Indítása"
+Basic.Hotkeys.StartRecording="Felvétel indítása"
-Basic.Hotkeys.StopRecording="Felvétel Leállítása"
+Basic.Hotkeys.StopRecording="Felvétel leállítása"
 Basic.Hotkeys.SelectScene="Jelenethez kapcsolás"
 
 Hotkeys.Insert="Beszúrás"

obs/data/locale/it-IT.ini

@@ -8,6 +8,7 @@ Cancel="Annulla"
 Close="Chiudi"
 Save="Salva"
 Discard="Ignora"
+Disable="Disabilita"
 Yes="Sì"
 No="No"
 Add="Aggiungi"
@@ -38,6 +39,12 @@ Untitled="Senza Titolo"
 New="Nuovo"
 Duplicate="Duplica"
 Enable="Abilita"
+DisableOSXVSync="Disabilita il V-Sync OSX"
+ResetOSXVSyncOnExit="Reimpostare V-Sync OSX in uscita"
+HighResourceUsage="Codifica in sovraccarico!  È consigliabile abbassare le impostazioni video o utilizzare un settaggio predefinito di codifica più veloce."
+Transition="Transizione"
+QuickTransitions="Transizioni rapide"
+
 
 
 
@@ -58,10 +65,9 @@ ConfirmExit.Text="OBS è attualmente attivo. Tutte le dirette/registrazioni sara
 ConfirmRemove.Title="Conferma la rimozione"
 ConfirmRemove.Text="Sei sicuro di voler rimuovere '$1'?"
 
-Output.ConnectFail.Title="Connessione fallita"
+Output.ConnectFail.Title="Impossibile connettersi"
 Output.ConnectFail.BadPath="Percorso o URL di connessione non valido. Controlla le tue impostazioni per confermare che siano valide."
 Output.ConnectFail.ConnectFailed="Connessione al server fallita"
-Output.ConnectFail.InvalidStream="Impossibile accedere al canale o alla chiave di streaming specificata. La chiave e/o il canale potrebbero non essere validi, o il server potrebbe crederti ancora autenticato."
 Output.ConnectFail.Error="Si è verificato un errore non previsto durante la connessione al server. Controlla il file di log per più informazioni."
 Output.ConnectFail.Disconnected="Disconnesso dal server."
 
@@ -88,7 +94,6 @@ LicenseAgreement.Exit="Esci"
 Remux.SourceFile="Registrazione OBS"
 Remux.TargetFile="File di destinazione"
 Remux.Remux="Converti"
-Remux.RecordingPattern="Registrazione OBS (*.flv)"
 Remux.FinishedTitle="Conversione finita"
 Remux.Finished="Registrazione convertita"
 Remux.FinishedError="Registrazione convertita, ma il file potrebbe essere incompleta"
@@ -114,6 +119,7 @@ Basic.DisplayCapture="Mostra cattura"
 
 Basic.Main.PreviewConextMenu.Enable="Abilita Anteprima"
 
+
 Basic.Main.AddSceneDlg.Title="Aggiungi scena"
 Basic.Main.AddSceneDlg.Text="Inserisci il nome della scena"
 
@@ -326,6 +332,8 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Encoder Audio"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Impostazioni codifica audio (se presente)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Impostazioni Muxer (se possibile)"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Adattatore video:"
 Basic.Settings.Video.BaseResolution="Risoluzione base (Canvas):"
@@ -359,6 +367,7 @@ Basic.Settings.Audio.EnablePushToMute="Abilita Push-to-mute"
 Basic.Settings.Audio.PushToMuteDelay="Ritardo Push-to-mute"
 Basic.Settings.Audio.EnablePushToTalk="Abilita Push-to-talk"
 Basic.Settings.Audio.PushToTalkDelay="Ritardo Push-to-talk"
+Basic.Settings.Audio.UnknownAudioDevice="[Dispositivo non collegato o non disponibile]"
 
 Basic.Settings.Advanced="Avanzate"
 Basic.Settings.Advanced.FormatWarning="Attenzione: I formati colore diversi da NV12 sono principalmente pensati per la registrazione, e non sono consigliati durante le dirette. Lo streaming può avere un utilizzo maggiore delle CPU a causa della conversione del formato del colore."

obs/data/locale/ja-JP.ini

@@ -8,6 +8,7 @@ Cancel="キャンセル"
 Close="閉じる"
 Save="保存"
 Discard="破棄"
+Disable="無効化"
 Yes="はい"
 No="いいえ"
 Add="追加"
@@ -27,9 +28,9 @@ Browse="参照"
 Mono="モノラル"
 Stereo="ステレオ"
 DroppedFrames="ドロップしたフレーム %1 (%2%)"
-PreviewProjector="全画面プロジェクター（プレビュー）"
+PreviewProjector="全画面プロジェクター (プレビュー)"
-SceneProjector="全画面プロジェクター（シーン）"
+SceneProjector="全画面プロジェクター (シーン)"
-SourceProjector="全画面プロジェクター（ソース）"
+SourceProjector="全画面プロジェクター (ソース)"
 Clear="クリア"
 Revert="元に戻す"
 Show="表示"
@@ -38,11 +39,15 @@ Untitled="無題"
 New="新規"
 Duplicate="複製"
 Enable=" 有効にする"
-DisableOSXVSync="OSXのV-同期を無効にする"
+DisableOSXVSync="OSX の V-Sync を無効にする"
-ResetOSXVSyncOnExit="終了時にOSXのV-同期をリセットする"
+ResetOSXVSyncOnExit="終了時に OSX の V-Sync をリセットする"
 HighResourceUsage="エンコードが高負荷です!  ビデオ設定を下げるかより高速のエンコードプリセットの使用を検討してください。"
 Transition="トランジション"
 QuickTransitions="クイックトランジション"
+Left="左"
+Right="右"
+Top="上"
+Bottom="下"
 
 QuickTransitions.SwapScenes="トランジション後にプレビュー/出力シーンを入れ替え"
 QuickTransitions.SwapScenesTT="(出力のオリジナルシーンがまだ存在する場合)、トランジション後のプレビューと出力シーンを入れ替えます。\nこれは出力のオリジナルシーンに加えられた可能性があるすべての変更を元に戻しません。"
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="ソースを複製"
 QuickTransitions.EditPropertiesTT="同じシーンを編集する場合、出力を変更することなくソースの変換/表示設定を編集することが出来ます。\nこの機能は'シーン複製'が有効になっている場合にのみ使用可能です。\n(キャプチャやメディア ソース) などのある種のソースはこの機能をサポートしておらず別々に編集できません。\nこの値の変更は (もしまだ存在する場合) 現在の出力シーンをリセットします。\n\n警告: ソースが複製されるため、余分なシステムまたはビデオ リソースを必要とします。"
 QuickTransitions.HotkeyName="クイックトランジション: %1"
 
+Basic.AddTransition="構成可能なトランジションを追加"
+Basic.RemoveTransition="構成可能なトランジションを削除"
+Basic.TransitionProperties="トランジションのプロパティ"
 Basic.SceneTransitions="シーントランジション"
 Basic.TransitionDuration="期間"
 Basic.TogglePreviewProgramMode="スタジオモード"
 
+TransitionNameDlg.Text="トランジションの名前を入力してください"
+TransitionNameDlg.Title="トランジション名"
+
 TitleBar.Profile="プロファイル"
 TitleBar.Scenes="シーン"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="'$1' を削除してもよろしいですか？"
 Output.ConnectFail.Title="接続失敗"
 Output.ConnectFail.BadPath="パスかURLが無効です。再確認して下さい。"
 Output.ConnectFail.ConnectFailed="サーバーへの接続に失敗しました"
-Output.ConnectFail.InvalidStream="指定されたチャンネルかストリームキーにアクセスできませんでした。ストリームキーかチャンネルが間違ってるか、サーバーにすでに接続されている可能性があります。"
+Output.ConnectFail.InvalidStream="指定したチャンネルまたはストリームキーにアクセスできませんでした。ストリームキーを再確認してください。 それが正しい場合は、サーバーへの接続に問題があります。"
 Output.ConnectFail.Error="サーバー接続時に予期しないエラーが発生しました。ログファイルを確認して下さい。"
 Output.ConnectFail.Disconnected="サーバーから切断されました。"
 
@@ -107,7 +118,7 @@ LicenseAgreement.Exit="終了"
 Remux.SourceFile="OBS録画"
 Remux.TargetFile="対象ファイル"
 Remux.Remux="再多重化"
-Remux.RecordingPattern="OBS録画(*.flv)"
+Remux.OBSRecording="OBS 録画"
 Remux.FinishedTitle="再多重化完了"
 Remux.Finished="録画が再多重化されました"
 Remux.FinishedError="録画が再多重化されましたが、ファイルが未完成の可能性があります"
@@ -116,7 +127,7 @@ Remux.SelectTarget="対象ファイルを選択 ..."
 Remux.FileExistsTitle="対象ファイルが存在しています"
 Remux.FileExists="対象ファイルが存在しています、置き換えますか？"
 Remux.ExitUnfinishedTitle="再多重化が進行中です"
-Remux.ExitUnfinished="再多重化が完了しておらず、今停止すると対象ファイルが使用不能になる可能性があります。\n再多重化を停止しますか？。"
+Remux.ExitUnfinished="再多重化が完了しておらず、今停止すると対象ファイルが使用不能になる可能性があります。\n再多重化を停止しますか？"
 
 UpdateAvailable="更新が利用可能"
 UpdateAvailable.Text="バージョン %1.%2.%3 が利用可能です。<a href='%4'>ダウンロードはこちら</a>"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="画面キャプチャ"
 
 Basic.Main.PreviewConextMenu.Enable="プレビュー有効化"
 
+Deinterlacing="インターレース解除"
+Deinterlacing.Discard="破棄"
+Deinterlacing.Retro="レトロ"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="トップフィールドが先"
+Deinterlacing.BottomFieldFirst="ボトムフィールドが先"
+
 Basic.Main.AddSceneDlg.Title="シーン追加"
 Basic.Main.AddSceneDlg.Text="シーンの名前を入力してください"
 
@@ -198,6 +221,7 @@ Basic.TransformWindow.Alignment="位置揃え"
 Basic.TransformWindow.BoundsType="バウンディングボックスの種類"
 Basic.TransformWindow.BoundsAlignment="バウンディングボックス内の配置"
 Basic.TransformWindow.Bounds="バウンディングボックスのサイズ"
+Basic.TransformWindow.Crop="クロップ"
 
 Basic.TransformWindow.Alignment.TopLeft="左上"
 Basic.TransformWindow.Alignment.TopCenter="中央上"
@@ -284,15 +308,21 @@ Basic.Settings.General.Theme="テーマ"
 Basic.Settings.General.Language="言語"
 Basic.Settings.General.WarnBeforeStartingStream="配信を開始するときに確認ダイアログを表示する"
 Basic.Settings.General.WarnBeforeStoppingStream="配信を停止するときに確認ダイアログを表示する"
+Basic.Settings.General.Snapping="ソース配置のスナップ"
+Basic.Settings.General.ScreenSnapping="画面の端にソースをスナップする"
+Basic.Settings.General.CenterSnapping="水平方向および垂直方向の中心にソースをスナップする"
+Basic.Settings.General.SourceSnapping="他のソースにソースをスナップする"
+Basic.Settings.General.SnapDistance="スナップ感度"
 
 Basic.Settings.Stream="配信"
 Basic.Settings.Stream.StreamType="配信種別"
 
 Basic.Settings.Output="出力"
 Basic.Settings.Output.Format="録画フォーマット"
-Basic.Settings.Output.Encoder="エンコーダー"
+Basic.Settings.Output.Encoder="エンコーダ"
 Basic.Settings.Output.SelectDirectory="録画ディレクトリを選択"
 Basic.Settings.Output.SelectFile="録画ファイルを選択"
+Basic.Settings.Output.EnforceBitrate="配信サービスのビットレートを制限する"
 Basic.Settings.Output.Mode="出力モード"
 Basic.Settings.Output.Mode.Simple="基本"
 Basic.Settings.Output.Mode.Adv="詳細"
@@ -303,20 +333,25 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="配信と同じ"
 Basic.Settings.Output.Simple.RecordingQuality.Small="高品質、ファイルサイズ中"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="超高品質、ファイルサイズ大"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="無損失品質、ファイルサイズ特大"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="警告: 配信の映像ビットレートは %1 に設定され、これは現在の配信サービスの上限です。 %1 より大きい値に設定する場合、高度なエンコーダオプションを有効にして「配信サービスのビットレートを制限する」のチェックをオフにしてください。"
+Basic.Settings.Output.Simple.Warn.AudioBitrate="警告: 配信の音声ビットレートは %1 に設定され、これは現在の配信サービスの上限です。 %1 より大きい値に設定する場合、高度なエンコーダオプションを有効にして「配信サービスのビットレートを制限する」のチェックをオフにしてください。"
 Basic.Settings.Output.Simple.Warn.Encoder="警告: 配信と録画を同時に行う場合に配信と異なる品質でソフトウェアエンコーダで録画する場合にはさらなるCPU 使用率が必要になります。"
 Basic.Settings.Output.Simple.Warn.Lossless="警告: 無損失品質は途方もなく大きなファイルサイズになります！無損失品質は高解像度と高フレーム レートで 1 分あたり7 ギガバイト以上のディスク容量を使用します。 非常に大量のディスクの空き容量がない場合の長時間録画には無損失設定の使用はお勧めしません。"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="無損失品質を使用してもよろしいですか？"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="無損失品質警告!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="警告: 配信と同時に録画する場合複数の独立した QSV エンコーダは使用できません。 配信と同時に録画したい場合、配信エンコーダか録画エンコーダのどちらかを変更してください。"
 Basic.Settings.Output.Simple.Encoder.Software="ソフトウェア (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="ハードウェア (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="ハードウェア (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="ソフトウェア (x264 CPU使用率の低いプリセット、ファイルサイズ増加)"
 Basic.Settings.Output.VideoBitrate="映像ビットレート"
 Basic.Settings.Output.AudioBitrate="音声ビットレート"
 Basic.Settings.Output.Reconnect="自動的に再接続"
 Basic.Settings.Output.RetryDelay="再試行の遅延 (秒)"
 Basic.Settings.Output.MaxRetries="最大再試行回数"
-Basic.Settings.Output.Advanced="高度なエンコーダーの設定を有効にする"
+Basic.Settings.Output.Advanced="高度なエンコーダの設定を有効にする"
-Basic.Settings.Output.EncoderPreset="エンコーダープリセット (上にいくほど = CPU使用低い)"
+Basic.Settings.Output.EncoderPreset="エンコーダプリセット (上にいくほど = CPU使用低い)"
-Basic.Settings.Output.CustomEncoderSettings="エンコーダーのカスタム設定"
+Basic.Settings.Output.CustomEncoderSettings="エンコーダのカスタム設定"
 Basic.Settings.Output.CustomMuxerSettings="カスタムマルチプレクサーの設定"
 Basic.Settings.Output.NoSpaceFileName="スペースなしのファイル名を生成"
 
@@ -333,7 +368,9 @@ Basic.Settings.Output.Adv.Recording="録画"
 Basic.Settings.Output.Adv.Recording.Type="種別"
 Basic.Settings.Output.Adv.Recording.Type.Standard="標準"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="カスタム出力 (FFmpeg)"
-Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(ストリームエンコーダーを使用)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(ストリームエンコーダを使用)"
+Basic.Settings.Output.Adv.Recording.Filename="ファイル名書式設定"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="ファイルが存在する場合は上書き"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg の出力の種類"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="URL に出力"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="ファイルに出力"
@@ -349,11 +386,15 @@ Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="ファイルパスまたは URL
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="既定のエンコーダ"
 Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="エンコーダを無効にする"
 Basic.Settings.Output.Adv.FFmpeg.VEncoder="映像エンコーダ"
-Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="映像エンコーダー設定 (ある場合)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="映像エンコーダ設定 (ある場合)"
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="音声エンコーダ"
-Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="音声エンコーダー設定 (ある場合)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="音声エンコーダ設定 (ある場合)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="マルチプレクサーの設定 (ある場合)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		年, 4桁\n%YY		年, 下2桁 (00-99)\n%MM		月 数値 (01-12)\n%DD		日, 0埋め (01-31)\n%hh		時 24時間形式 (00-23)\n%mm		分 (00-59)\n%ss		秒 (00-61)\n%%		A % 記号\n%a		曜日 省略名\n%A		曜日 完全名\n%b		月 省略名\n%B		月 完全名\n%d		日, 0埋め (01-31)\n%H		時 24時間形式 (00-23)\n%I		時 12時間形式 (01-12)\n%m		月 数値 (01-12)\n%M		分 (00-59)\n%p		午前または午後の指定\n%S		秒 (00-61)\n%y		年, 下2桁 (00-99)\n%Y		年\n%z		ISO 8601 UTCタイムゾーンからのオフセット\n		名前または省略名\n%Z		タイムゾーン名または省略名\n"
+
 Basic.Settings.Video="映像"
 Basic.Settings.Video.Adapter="ビデオアダプター:"
 Basic.Settings.Video.BaseResolution="基本 (キャンバス) 解像度:"
@@ -371,9 +412,9 @@ Basic.Settings.Video.InvalidResolution="解像度の値が不正です。[幅]x[
 Basic.Settings.Video.CurrentlyActive="映像出力中です。映像設定を変更するには出力を停止してください。"
 Basic.Settings.Video.DisableAero="Aeroを無効にする"
 
-Basic.Settings.Video.DownscaleFilter.Bilinear="バイリニア（スケーリングする場合ぼやけているが最速）"
+Basic.Settings.Video.DownscaleFilter.Bilinear="バイリニア (スケーリングする場合ぼやけているが最速)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="バイキュービック（先鋭化スケーリング、16 のサンプル）"
+Basic.Settings.Video.DownscaleFilter.Bicubic="バイキュービック (先鋭化スケーリング、16 のサンプル)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="ランチョス（先鋭化スケーリング、32 のサンプル）"
+Basic.Settings.Video.DownscaleFilter.Lanczos="ランチョス (先鋭化スケーリング、32 のサンプル)"
 
 Basic.Settings.Audio="音声"
 Basic.Settings.Audio.SampleRate="サンプリングレート"

obs/data/locale/ko-KR.ini

@@ -8,6 +8,7 @@ Cancel="취소"
 Close="닫기"
 Save="저장"
 Discard="저장 안함"
+Disable="사용 안함"
 Yes="예"
 No="아니오"
 Add="추가"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="종료 시 OSX 수직동기화 재설정"
 HighResourceUsage="인코딩 과부하! 비디오 설정을 낮추거나 더 빠른 인코딩 사전설정을 사용하는 것을 고려하세요."
 Transition="전환"
 QuickTransitions="빠른 전환"
+Left="왼쪽"
+Right="오른쪽"
+Top="위"
+Bottom="아래"
 
 QuickTransitions.SwapScenes="전환 후 미리 보기/출력 장면을 교체"
 QuickTransitions.SwapScenesTT="(만약 출력 쪽 원본 장면이 있을 때) 전환 작업 이후 미리 보기와 출력 장면을 교체합니다. \n출력 쪽 원본 장면에서 변경한 내용은 사라지지 않습니다."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="소스 복제"
 QuickTransitions.EditPropertiesTT="같은 장면을 편집하고 있을 때 출력하고 있는 영상을 수정하지 않고도, 소스의 속성을 수정할 수 있습니다.\n이런 방법으로 편집하려면 '장면 복제'를 켜세요.\n특정 소스(예를 들어 캡처 혹은 미디어 소스)는 이 기능을 지원하지 않고 따로따로 편집할 수 없습니다.\n이 값을 변경하면 현재 출력하고 있는 장면(만약 여전히 존재한다면)을 초기화합니다.\n\n경고: 소스를 복제하기 때문에 여분의 시스템 혹은 비디오 자원이 필요할 수 있습니다."
 QuickTransitions.HotkeyName="빠른 전환: %1"
 
+Basic.AddTransition="설정 가능한 화면 전환 추가"
+Basic.RemoveTransition="설정 가능한 화면 전환 제거"
+Basic.TransitionProperties="화면 전환 속성"
 Basic.SceneTransitions="장면 전환"
 Basic.TransitionDuration="지속 기간"
 Basic.TogglePreviewProgramMode="스튜디오 모드"
 
+TransitionNameDlg.Text="이 화면 전환의 이름을 입력하세요"
+TransitionNameDlg.Title="화면 전환 이름"
+
 TitleBar.Profile="프로파일"
 TitleBar.Scenes="장면"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="'$1'을 정말로 제거하시겠습니까?"
 Output.ConnectFail.Title="연결에 실패했음"
 Output.ConnectFail.BadPath="잘못된 경로 혹은 연결 주소입니다. 유효한 값인지 설정을 확인하시기 바랍니다. "
 Output.ConnectFail.ConnectFailed="서버에 연결하지 못했습니다"
-Output.ConnectFail.InvalidStream="지정한 채널 혹은 스트림 키로 엑세스할 수 없었습니다. 키/채널 정보가 올바르지 않거나, 접속하려는 서버가 여전히 사용자가 로그인하고 있다고 인지하고 있습니다."
+Output.ConnectFail.InvalidStream="지정한 채널 혹은 스트림 키에 접근할 수 없습니다. 스트림 키를 다시 확인하세요. 키가 올바르다면 서버 접속에 문제가 있을 수 있습니다."
 Output.ConnectFail.Error="예기치 않은 오류가 서버에 접속을 시도하는 과정에서 발생했습니다. 자세한 정보는 기록 파일을 조회하십시오. "
 Output.ConnectFail.Disconnected="서버로부터 접속이 끊겼습니다. "
 
@@ -107,7 +118,7 @@ LicenseAgreement.Exit="끝내기"
 Remux.SourceFile="OBS 녹화"
 Remux.TargetFile="대상 파일"
 Remux.Remux="재다중화"
-Remux.RecordingPattern="OBS 녹화 (*.flv)"
+Remux.OBSRecording="OBS 녹화"
 Remux.FinishedTitle="재다중화 작업 완료"
 Remux.Finished="녹화가 재다중화 처리되었음"
 Remux.FinishedError="녹화가 재다중화 처리되었으나 파일이 완성되지 않을 수 있습니다"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="캡처 표시"
 
 Basic.Main.PreviewConextMenu.Enable="미리보기 활성화"
 
+Deinterlacing="디인터레이싱"
+Deinterlacing.Discard="저장 안함"
+Deinterlacing.Retro="레트로"
+Deinterlacing.Blend="블렌드"
+Deinterlacing.Blend2x="블렌드 2x"
+Deinterlacing.Linear="선형"
+Deinterlacing.Linear2x="선형 2x"
+Deinterlacing.Yadif="야디프"
+Deinterlacing.Yadif2x="야디프 2x"
+Deinterlacing.TopFieldFirst="상위 필드 우선"
+Deinterlacing.BottomFieldFirst="하단 필드 우선"
+
 Basic.Main.AddSceneDlg.Title="장면 추가"
 Basic.Main.AddSceneDlg.Text="장면의 이름을 입력하십시오"
 
@@ -198,6 +221,7 @@ Basic.TransformWindow.Alignment="위치 정렬"
 Basic.TransformWindow.BoundsType="경계 상자 유형"
 Basic.TransformWindow.BoundsAlignment="상자 내부 정렬"
 Basic.TransformWindow.Bounds="경계 상자 크기"
+Basic.TransformWindow.Crop="자르기"
 
 Basic.TransformWindow.Alignment.TopLeft="왼쪽 상단"
 Basic.TransformWindow.Alignment.TopCenter="중앙 상단"
@@ -284,6 +308,11 @@ Basic.Settings.General.Theme="테마"
 Basic.Settings.General.Language="언어"
 Basic.Settings.General.WarnBeforeStartingStream="방송을 시작할 때 확인 대화 상자 표시"
 Basic.Settings.General.WarnBeforeStoppingStream="방송을 중단할 때 확인 대화 상자 표시"
+Basic.Settings.General.Snapping="소스를 자석처럼 달라붙여서 정렬"
+Basic.Settings.General.ScreenSnapping="소스를 화면 변두리에 붙임"
+Basic.Settings.General.CenterSnapping="소스를 수평과 수직 중앙에 붙임"
+Basic.Settings.General.SourceSnapping="소스를 다른 소스에 붙임"
+Basic.Settings.General.SnapDistance="자석 감도"
 
 Basic.Settings.Stream="방송"
 Basic.Settings.Stream.StreamType="방송 형식"
@@ -293,6 +322,7 @@ Basic.Settings.Output.Format="녹화 형식"
 Basic.Settings.Output.Encoder="인코더"
 Basic.Settings.Output.SelectDirectory="녹화 경로 선택"
 Basic.Settings.Output.SelectFile="녹화 파일 선택"
+Basic.Settings.Output.EnforceBitrate="방송 서비스의 비트레이트 제한 적용"
 Basic.Settings.Output.Mode="출력 모드"
 Basic.Settings.Output.Mode.Simple="단순"
 Basic.Settings.Output.Mode.Adv="고급"
@@ -303,11 +333,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="방송 품질과 동일하
 Basic.Settings.Output.Simple.RecordingQuality.Small="높은 품질, 중간 파일 크기"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="무손실 상태와 비교하여 거의 차이가 없는 품질, 큰 파일 크기"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="무손실 품질, 아주 큰 파일 크기"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="경고: 비디오 비트레이트가 선택한 스트리밍 서비스의 상한선인 %1으로 적용됩니다. %1이상으로 설정하려면 인코더 설정을 고급으로 전환한 다음 \"방송 서비스의 비트레이트 제한 적용\" 설정을 끄십시오."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="경고: 오디오 비트레이트가 선택한 스트리밍 서비스의 상한선인 %1으로 적용됩니다. %1이상으로 설정하려면 인코더 설정을 고급으로 전환한 다음 \"방송 서비스의 비트레이트 제한 적용\" 설정을 끄십시오."
 Basic.Settings.Output.Simple.Warn.Encoder="경고: 방송과 녹화를 동시에 진행할 때 다음을 주의하십시오. 소프트웨어 인코더로 방송과 다른 품질로 녹화하면 더 많은 CPU 부담이 발생합니다."
 Basic.Settings.Output.Simple.Warn.Lossless="경고: 무손실 품질로 녹화하면 파일 크기가 엄청나게 커집니다! 해당 설정은 높은 해상도 및 프레임에서 분당 7기가바이트 이상 필요합니다. 따라서 디스크에 아주 큰 공간을 확보하지 않는 이상 장시간 녹화에는 추천하지 않습니다."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="정말로 무손실 품질로 녹화하겠습니까?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="무손실 품질 설정 경고!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="경고: 방송과 녹화를 동시에 하고 있을 때 여러 개의 독립된 QSV 인코더를 사용할 수 없습니다. 두 작업을 동시에 하려면 녹화 혹은 방송 인코더 둘 중 하나를 바꿔야 합니다."
 Basic.Settings.Output.Simple.Encoder.Software="소프트웨어 (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="하드웨어 (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="하드웨어 (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="소프트웨어 (x264 CPU 부담이 적지만 파일 크기가 증가)"
 Basic.Settings.Output.VideoBitrate="비디오 비트레이트"
 Basic.Settings.Output.AudioBitrate="오디오 비트레이트"
@@ -334,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="형식"
 Basic.Settings.Output.Adv.Recording.Type.Standard="표준"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="임의 출력 (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(스트림 인코더 사용)"
+Basic.Settings.Output.Adv.Recording.Filename="파일명 형식"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="파일이 있는 경우 덮어쓰기"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg 출력 형식"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="URL로 보냄"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="파일로 보냄"
@@ -354,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="오디오 인코더"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="오디오 인코더 설정 (지원되는 경우)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="다중화 설정 (제공되는 경우)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		연도, 네 자리\n%YY		연도, 마지막 두 자리 (00-99)\n%MM		월 십진법 (01-12)\n%DD		일, 선행 0 포함 (01-31)\n%hh		시 24 시간 형식 (00-23)\n%mm		Minute (00-59)\n%ss		초 (00-61)\n%%		A % sign\n%a		요일 축약\n%A		요일\n%b		월 축약\n%B		월\n%d		일, 선행 0 포함 (01-31)\n%H		시 24 시간 형식 (00-23)\n%I		시 12 시간 형식 (01-12)\n%m		월 십진법 (01-12)\n%M		분 (00-59)\n%p		AM 혹은 PM 구분\n%S		초 (00-61)\n%y		연도, 마지막 두 자리 (00-99)\n%Y		연도\n%z		UTC에서 ISO 8601 기준만큼 조정 혹은 시간대\n		이름 혹은 축약\n%Z		시간대 이름 혹은 축약\n"
+
 Basic.Settings.Video="비디오"
 Basic.Settings.Video.Adapter="비디오 어댑터:"
 Basic.Settings.Video.BaseResolution="기본 (캔버스) 해상도:"

obs/data/locale/lt-LT.ini

@@ -0,0 +1,198 @@
+
+Language="Anglų"
+Region="Jungtinės Valstijos"
+
+OK="ОК"
+Apply="Pritaikyti"
+Cancel="Atšaukti"
+Close="Užverti"
+Save="Išsaugoti"
+Discard="Atmesti"
+Disable="Išjungti"
+Yes="Taip"
+No="Ne"
+Add="Pridėti"
+Remove="Pašalinti"
+Rename="Pervardinti"
+Interact="Sąveikauti"
+Filters="Filtrai"
+Properties="Savybės"
+MoveUp="Perkelti aukštyn"
+MoveDown="Perkelti žemyn"
+Settings="Nustatymai"
+Display="Ekranas"
+Name="Vardas"
+Exit="Išeiti"
+Mixer="Mikseris"
+Browse="Naršyti"
+Mono="Mono"
+Stereo="Stereo"
+DroppedFrames="Atmesti kadrai %1 (%2%)"
+PreviewProjector="Pilno ekrano projektorius (Peržiūra)"
+SceneProjector="Pilno ekrano projektorius (Scena)"
+SourceProjector="Pilno ekrano projektorius (Šaltinis)"
+Clear="Išvalyti"
+Revert="Atstatyti"
+Show="Parodyti"
+Hide="Paslėpti"
+Untitled="Nepavadintas"
+New="Naujas"
+Duplicate="Dubliuoti"
+Enable="Įjungti"
+DisableOSXVSync="Išjungti OSX V-Sync"
+ResetOSXVSyncOnExit="Iš naujo nustatyti OSX V-Sync išeinant"
+HighResourceUsage="Kodavimas perkrautas!  Mažinkite vaizdo parametrus arba naudokite greitesnę kodavimo parengtį."
+Transition="Perėjimas"
+QuickTransitions="Greitieji perėjimai"
+Left="Iš kairės"
+Right="Iš dešinės"
+Top="Iš viršaus"
+Bottom="Iš apačios"
+
+QuickTransitions.SwapScenes="Sukeisti Peržiūros/Išvesties scenas po Perėjimo"
+QuickTransitions.SwapScenesTT="Sukeičia peržiūros ir išvesties scenas po perėjimo įvykdymo (jei originali išvesties scena vis dar egzistuoja).\nTai neatšauks jokių pakeitimų kurie galima buvo atlikti originalioje išvesties scenoje."
+QuickTransitions.DuplicateScene="Dubliuoti Sceną"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+Remux.TargetFile="Paskirties failas"
+Remux.Remux="Permiksuoti"
+Remux.FinishedTitle="Permiksavimas baigtas"
+Remux.Finished="Įrašas permiksuotas"
+Remux.FinishedError="Įrašas permiksuotas, tačiau failas gali būti neužbaigtas"
+Remux.SelectRecording="Pasirinkite OBS įrašą …"
+Remux.SelectTarget="Pasirinkite paskirties failą …"
+Remux.FileExistsTitle="Toks paskirties failas jau yra"
+Remux.FileExists="Toks paskirties failas jau yra, ar norite jį pakeisti?"
+Remux.ExitUnfinishedTitle="Vyksta permiksavimimas"
+Remux.ExitUnfinished="Permiksavimas nebaigtas. Sustabdžius dabar, paskirites failas gali būti nepanaudojamas.\nAr esate tikras, kad norite sustabdyti permiksavimą?"
+
+UpdateAvailable="Galimas atnaujinimas"
+UpdateAvailable.Text="Naujausia versija: %1.%2.%3. <a href='%4'>Spauskite čia, kad parsisiųstumėte</a>"
+
+Basic.DesktopDevice1="Darbastalio garsas"
+Basic.DesktopDevice2="Darbastalio garsas 2"
+Basic.AuxDevice1="Mic/Aux"
+Basic.AuxDevice2="Mic/Aux 2"
+Basic.AuxDevice3="Mic/Aux 3"
+Basic.AuxDevice4="Mic/Aux 4"
+
+Basic.Scene="Scena"
+Basic.DisplayCapture="Ekrano perėmimas"
+
+Basic.Main.PreviewConextMenu.Enable="Įjungti peržiūrą"
+
+Deinterlacing="Perėjimo šalinimas"
+Deinterlacing.Discard="Atmesti"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Sulieti"
+Deinterlacing.Blend2x="Sulieti 2x"
+Deinterlacing.Linear="Linijinis"
+Deinterlacing.Linear2x="Linijinis 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Piršutinis puskadris pirmas"
+Deinterlacing.BottomFieldFirst="Apatinis puskadris pirmas"
+
+Basic.Main.AddSceneDlg.Title="Pridėti sceną"
+Basic.Main.AddSceneDlg.Text="Įveskite pasirinktą scenos pavadinimą"
+
+Basic.Main.DefaultSceneName.Text="Scena %1"
+
+Basic.Main.AddSceneCollection.Title="Pridėti scenų rinkinį"
+Basic.Main.AddSceneCollection.Text="Įveskite pasirinktą scenų rinkinio pavadinimą"
+
+Basic.Main.RenameSceneCollection.Title="Pervardinti scenų rinkinį"
+
+AddProfile.Title="Pridėti profilį"
+AddProfile.Text="Įveskite pasirinktą profilio pavadinimą"
+
+RenameProfile.Title="Pervardinti profilį"
+
+Basic.Main.PreviewDisabled="Peržiūra šiuo metu išjungta"
+
+Basic.SourceSelect="Sukurti/Pasirinkti šaltinį"
+Basic.SourceSelect.CreateNew="Sukurti naują"
+Basic.SourceSelect.AddExisting="Pridėti esamą"
+Basic.SourceSelect.AddVisible="Padaryti šaltinį matomu"
+
+Basic.PropertiesWindow="'%1' savybės"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (automatinis pasirinkimas: %2)"
+
+
+
+
+
+
+
+
+Basic.Main.AddSourceHelp.Text="Turite turėti bent 1 sceną, kad galėtumėte pridėti šaltinį."
+
+Basic.Main.Scenes="Scenos"
+Basic.Main.Sources="Šaltiniai"
+Basic.Main.Connecting="Jungiamasi..."
+Basic.Main.StartRecording="Pradėti įrašymą"
+Basic.Main.StartStreaming="Pradėti transliavimą"
+Basic.Main.StopRecording="Stabdyti įrašymą"
+Basic.Main.StopStreaming="Stabdyti transliavimą"
+Basic.Main.ForceStopStreaming="Stabdyti transliavimą (atmesti vėlavimą)"
+
+Basic.MainMenu.File="&Failas"
+Basic.MainMenu.File.Export="&Eksportuoti"
+Basic.MainMenu.File.Import="&Importuoti"
+Basic.MainMenu.File.ShowRecordings="Parodyti Į&rašus"
+Basic.MainMenu.File.Remux="Per&miksuoti įrašus"
+Basic.MainMenu.File.Settings="Nu&statymai"
+Basic.MainMenu.File.ShowSettingsFolder="Parodyti nustatymų katalogą"
+Basic.MainMenu.File.ShowProfileFolder="Parodyti profilių katalogą"
+Basic.MainMenu.AlwaysOnTop="Visuomet &viršuje"
+Basic.MainMenu.File.Exit="Iš&eiti"
+
+Basic.MainMenu.Edit="&Redaguoti"
+Basic.MainMenu.Edit.Undo="&Atšaukti"
+Basic.MainMenu.Edit.Redo="&Gražinti atšaukimą"
+Basic.MainMenu.Edit.UndoAction="&Atšaukti $1"
+Basic.MainMenu.Edit.RedoAction="&Gražinti atšaukimą $1"
+Basic.MainMenu.Edit.Transform="&Transformuoti"
+Basic.MainMenu.Edit.Transform.EditTransform="&Redaguoti transformaciją..."
+Basic.MainMenu.Edit.Transform.ResetTransform="&Atšaukti transformaciją"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Pasukti 90 laipsnių pagal LL"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Pasukti 90 laipsnių prieš LL"
+Basic.MainMenu.Edit.Transform.Rotate180="Pasukti 180 laipsnių"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Apversti &horizontaliai"
+Basic.MainMenu.Edit.Transform.FlipVertical="Apversti &vertikaliai"
+Basic.MainMenu.Edit.Transform.FitToScreen="Sutalpinti į ekraną"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

obs/data/locale/ms-MY.ini

@@ -8,13 +8,14 @@ Cancel="Batal"
 Close="Tutup"
 Save="Simpan"
 Discard="Buang"
+Disable="Nyahaktifkan"
 Yes="Ya"
 No="Tidak"
 Add="Tambah"
 Remove="Buang"
 Rename="Namakan Semula"
 Interact="Interaksi"
-Filters="Penapis"
+Filters="Tapisan-tapisan"
 Properties="Sifat-sifat"
 MoveUp="Gerakkan ke atas"
 MoveDown="Gerakkan ke bawah"
@@ -38,11 +39,36 @@ Untitled="Tiada tajuk"
 New="Baru"
 Duplicate="Salin"
 Enable="Benarkan"
+DisableOSXVSync="Nyahaktifkan OSX V-Sync"
+ResetOSXVSyncOnExit="Tetapkan semula OSX V-Sync apabila keluar"
+HighResourceUsage="Pengekodan terbeban! Cuba turunkan tetapan video ataupun gunakan pratetapan pengekodan yang lebih cepat."
+Transition="Peralihan"
+QuickTransitions="Peralihan Pantas"
+Left="Kiri"
+Right="Kanan"
+Top="Atas"
+Bottom="Bawah"
 
+QuickTransitions.SwapScenes="Tukar Pratonton/Output Adegan-adegan Selepas Peralihan"
+QuickTransitions.SwapScenesTT="Menukarkan pratonton dan output adegan-adegan sleeps peralihan(jika output adegan mash wujud).\nIni tidak akan mengundurkan semarang perubahan yang mungkin telah dibuat pada output adegan yang asal."
+QuickTransitions.DuplicateScene="Klonkan Adegan"
+QuickTransitions.DuplicateSceneTT="Apabila menyunting adegan yang sama, ini membolehkan penyuntingan perubahan/keterlihatan tanpa mengubah output..\nUntuk edit sifat-sifat adegan-adegan tanpa mengubah suai output, aktifkan 'Klonkan Adegan'.\nPengubahan nilai ini akan menetapkan semula output adegan (jika adegan masih wujud)."
+QuickTransitions.EditProperties="Klonkan Sumber"
+QuickTransitions.EditPropertiesTT="Apabila menyunting adegan yang sama, ini membolehkan penyuntingan sumber-sumber tanpa mengubah output.\nIni hanya boleh dilakukan jika 'Klonkan Adegan' diaktifkan.\nSebahagian sumber (seperti sumber-sumber tangkapan atau media) tidak menyokong tetapan ini dan tidak boleh disunting secara berasingan.\nPenukaran nilai ini akan menetapkan semula output adegan yang sedang digunakan (jika adegan masih wujud).\n\nAmaran: Kerana sumber-sumber akan diklonkan, ini mungkin memerlukan penambahan sumber-sumber sistem/video."
+QuickTransitions.HotkeyName="Peralihan Pantas: %1"
 
+Basic.AddTransition="Tambah Peralihan Yang Boleh Diubahsuai"
+Basic.RemoveTransition="Buang Peralihan Yang Boleh Diubahsuai"
+Basic.TransitionProperties="Sifat-sifat Peralihan"
+Basic.SceneTransitions="Peralihan-peralihan Adegan"
+Basic.TransitionDuration="Tempoh"
+Basic.TogglePreviewProgramMode="Mod Studio"
+
+TransitionNameDlg.Text="Sila taip nama peralihan"
+TransitionNameDlg.Title="Nama Peralihan"
 
 TitleBar.Profile="Profil"
-TitleBar.Scenes="'Scenes'"
+TitleBar.Scenes="Adegan-adegan"
 
 NameExists.Title="Nama sudah wujud"
 NameExists.Text="Nama ini sudah digunakan."
@@ -50,18 +76,21 @@ NameExists.Text="Nama ini sudah digunakan."
 NoNameEntered.Title="Sila taip nama yang sah"
 NoNameEntered.Text="Anda tidak boleh membiarkan ruang nama kosong."
 
+ConfirmStart.Title="Mulakan 'Stream'?"
+ConfirmStart.Text="Adakah anda pasti anda mahu memulakan 'stream'?"
 
+ConfirmStop.Title="Berhenti 'Stream'?"
+ConfirmStop.Text="Adakah anda pasti anda mahu menghentikan 'stream'?"
 
 ConfirmExit.Title="Tutup OBS?"
-ConfirmExit.Text="OBS kini sedang aktif. Semua 'streams'/rakaman akan ditutup. Adakah anda pasti anda mahu tutup(OBS)?"
+ConfirmExit.Text="OBS kini sedang aktif. Semua 'stream'/rakaman akan ditutup. Adakah anda pasti anda mahu tutup(OBS)?"
 
-ConfirmRemove.Title="Pengesahan untuk buang"
+ConfirmRemove.Title="Pengesahan untuk Buang"
 ConfirmRemove.Text="Adakah anda pasti untuk buang '$1'?"
 
-Output.ConnectFail.Title="Gagal menyambung"
+Output.ConnectFail.Title="Penyambungan gagal"
-Output.ConnectFail.BadPath="Sambungan URL atau laluan yang tidak sah.Sila semak semula tetapan anda to mengesahkan bahawa semuanya sah."
+Output.ConnectFail.BadPath="Sambungan URL atau Laluan yang tidak sah. Sila semak semula tetapan anda to mengesahkan bahawa semuanya sah."
-Output.ConnectFail.ConnectFailed="Gagal menyambung ke pelayan"
+Output.ConnectFail.ConnectFailed="Penyambungan ke pelayan gagal"
-Output.ConnectFail.InvalidStream="Tidak dapat mengakses kunci saluran atau 'stream' ditetapkan. Ini mungkin disebabkan kunci/saluran tidak sah, atau pelayan masih menganggap anda telah log masuk."
 Output.ConnectFail.Error="Ralat tidak dijangka berlaku sewaktu percubaan menyambung ke pelayan. Maklumat lanjut di dalam fail log."
 Output.ConnectFail.Disconnected="Terputus daripada pelayan."
 
@@ -87,7 +116,6 @@ LicenseAgreement.Exit="Keluar"
 
 Remux.SourceFile="Rakaman OBS"
 Remux.TargetFile="Fail sasaran"
-Remux.RecordingPattern="Rakaman OBS (*.flv)"
 Remux.SelectRecording="Pilih Rakaman OBS …"
 Remux.SelectTarget="Pilih fail sasaran …"
 Remux.FileExistsTitle="Fail sasaran wujud"
@@ -107,6 +135,7 @@ Basic.Scene="Adegan"
 
 Basic.Main.PreviewConextMenu.Enable="Benarkan Pratonton"
 
+
 Basic.Main.AddSceneDlg.Title="Tambah Adegan"
 Basic.Main.AddSceneDlg.Text="Sila taip nama adegan"
 
@@ -218,6 +247,8 @@ Basic.Settings.Output.Adv.FFmpeg.Type="Jenis Output FFmpeg"
 
 
 
+
+
 Basic.Settings.Advanced.FormatWarning="Amaran:Format warna selain daripada 'NV12' lebih digunakan untuk rakaman,dan tidak disyorkan apabila 'streaming'.'Streaming' mungkin menyebabkan peningkatan penggunaan CPU disebabkan oleh penukaran format warna."
 
 

obs/data/locale/nb-NO.ini

@@ -38,6 +38,8 @@ Untitled="Uten navn"
 New="Ny"
 Duplicate="Dupliser"
 Enable="Aktiver"
+Transition="Overgang"
+
 
 
 
@@ -61,7 +63,6 @@ ConfirmRemove.Text="Er du sikker på at du vil fjerne '$1'?"
 Output.ConnectFail.Title="Tilkobling misklytes"
 Output.ConnectFail.BadPath="Ugyldig filbane eller tilkoblings-URL. Vennligst bekreft at instillingene dine er riktige."
 Output.ConnectFail.ConnectFailed="Kunne ikke koble til tjener."
-Output.ConnectFail.InvalidStream="Fikk ikke adgang til den etterspurte kanalen. Årsaken kan være ugyldig nøkkel eller kanalnavn, eller at serveren tror du fortsatt er pålogget denne kanalen."
 Output.ConnectFail.Error="En uventet feil oppstod ved tilkobling til serveren. Detaljert informasjon kan du finne i loggfila."
 Output.ConnectFail.Disconnected="Koblet fra tjeneren."
 
@@ -88,7 +89,6 @@ LicenseAgreement.Exit="Avslutt"
 Remux.SourceFile="OBS-opptak"
 Remux.TargetFile="Målfil"
 Remux.Remux="Remuks"
-Remux.RecordingPattern="OBS-opptak (*.flv)"
 Remux.FinishedTitle="Remuksing ferdig"
 Remux.Finished="Opptak remukset"
 Remux.FinishedError="Opptak remukset, men filen kan være ufullstendig."
@@ -114,6 +114,7 @@ Basic.DisplayCapture="Skjermopptak"
 
 Basic.Main.PreviewConextMenu.Enable="Aktiver forhåndsvisning"
 
+
 Basic.Main.AddSceneDlg.Title="Ny Scene"
 Basic.Main.AddSceneDlg.Text="Vennligst gi et navn til scenen."
 
@@ -326,6 +327,8 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Lydkoder"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Lydkoderinstillinger (om noen)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Mukserinstillinger (om noen)"
 
+
+
 Basic.Settings.Video="Bilde"
 Basic.Settings.Video.Adapter="Bildeadapter:"
 Basic.Settings.Video.BaseResolution="Grunnoppløsning (lerret):"

obs/data/locale/nl-NL.ini

@@ -8,6 +8,7 @@ Cancel="Annuleren"
 Close="Afsluiten"
 Save="Opslaan"
 Discard="Verwerpen"
+Disable="Uitschakelen"
 Yes="Ja"
 No="Nee"
 Add="Toevoegen"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="OSX V-Sync resetten bij afsluiten"
 HighResourceUsage="Encoden overbelast! Overweeg de video-instellingen te verlagen of een snellere encoder preset te gebruiken."
 Transition="Overgang"
 QuickTransitions="Snelle overgangen"
+Left="Links"
+Right="Rechts"
+Top="Boven"
+Bottom="Onder"
 
 QuickTransitions.SwapScenes="Preview-/uitvoerscenes verwisselen na overgang"
 QuickTransitions.SwapScenesTT="Verwisselt de preview- en uitvoercenes na een overgang (als de originele uitvoerscène nog bestaat.)\nDit zal geen veranderingen ongedaan maken die mogelijk zijn gemaakt aan de originele uitvoerscène."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Bronnen Dupliceren"
 QuickTransitions.EditPropertiesTT="Wanneer je dezelfde scène bewerkt, staat dit het bewerken van eigenschappen van bronnen toe zonder de uitvoerscène aan te passen.\nDit kan alleen worden gebruikt als 'Scène Dupliceren' is ingeschakeld.\nSommige bronnen (zoals opname- of mediabronnen) ondersteunen dit niet en kunnen niet onafhankelijk worden bewerkt.\nHet veranderen van deze waarden zal de huidige scène resetten (als deze nog bestaat).\n\nWaarschuwing: Omdat bronnen zullen worden gedupliceerd kan dit extra systeem of video rekenkracht verbruiken."
 QuickTransitions.HotkeyName="Snelle overgang: %1"
 
+Basic.AddTransition="Instelbare overgang toevoegen"
+Basic.RemoveTransition="Instelbare overgang verwijderen"
+Basic.TransitionProperties="Overgang-eigenschappen"
 Basic.SceneTransitions="Scène-overgangen"
 Basic.TransitionDuration="Duur"
 Basic.TogglePreviewProgramMode="Studiomodus"
 
+TransitionNameDlg.Text="Voer a.u.b. de naam van de transitie in"
+TransitionNameDlg.Title="Naam van de overgang"
+
 TitleBar.Profile="Profiel"
 TitleBar.Scenes="Scènes"
 
@@ -107,7 +118,7 @@ LicenseAgreement.Exit="Afsluiten"
 Remux.SourceFile="OBS Opname"
 Remux.TargetFile="Doelbestand"
 Remux.Remux="Remuxen"
-Remux.RecordingPattern="OBS Opname (*.flv)"
+Remux.OBSRecording="OBS Opname"
 Remux.FinishedTitle="Remuxen voltooid"
 Remux.Finished="Opname geremuxt"
 Remux.FinishedError="Opname geremuxt, maar het bestand zou incompleet kunnen zijn"
@@ -133,6 +144,18 @@ Basic.DisplayCapture="Beeldschermcapture"
 
 Basic.Main.PreviewConextMenu.Enable="Preview inschakelen"
 
+Deinterlacing="Deinterlacing"
+Deinterlacing.Discard="Verwerpen"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Blend"
+Deinterlacing.Blend2x="Blend 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Bovenste Veld Eerst"
+Deinterlacing.BottomFieldFirst="Onderste Veld Eerst"
+
 Basic.Main.AddSceneDlg.Title="Scène Toevoegen"
 Basic.Main.AddSceneDlg.Text="Voer a.u.b. de naam van de scène in"
 
@@ -198,6 +221,7 @@ Basic.TransformWindow.Alignment="Positionele uitlijning"
 Basic.TransformWindow.BoundsType="Bounding Box Type"
 Basic.TransformWindow.BoundsAlignment="Uitlijning in Bounding Box"
 Basic.TransformWindow.Bounds="Bounding Box Grootte"
+Basic.TransformWindow.Crop="Bijsnijden"
 
 Basic.TransformWindow.Alignment.TopLeft="Linksboven"
 Basic.TransformWindow.Alignment.TopCenter="Boven"
@@ -284,6 +308,11 @@ Basic.Settings.General.Theme="Thema"
 Basic.Settings.General.Language="Taal"
 Basic.Settings.General.WarnBeforeStartingStream="Laat bevestigingsvenster zien bij het starten van streams"
 Basic.Settings.General.WarnBeforeStoppingStream="Laat bevestiginsvenster zien bij het stoppen van streams"
+Basic.Settings.General.Snapping="Bronuitlijning"
+Basic.Settings.General.ScreenSnapping="Bronnen uitlijnen op de rand van het scherm"
+Basic.Settings.General.CenterSnapping="Bronnen uitlijnen op het horizontale en verticale midden"
+Basic.Settings.General.SourceSnapping="Bronnen uitlijnen op andere bronnen"
+Basic.Settings.General.SnapDistance="Gevoeligheid"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Stream Type"
@@ -293,6 +322,7 @@ Basic.Settings.Output.Format="Opnameformaat"
 Basic.Settings.Output.Encoder="Encoder"
 Basic.Settings.Output.SelectDirectory="Selecteer Opnamemap"
 Basic.Settings.Output.SelectFile="Selecteer Opnamebestand"
+Basic.Settings.Output.EnforceBitrate="Forceer bandbreedtelimieten van streaming dienst"
 Basic.Settings.Output.Mode="Uitvoermodus"
 Basic.Settings.Output.Mode.Simple="Simpel"
 Basic.Settings.Output.Mode.Adv="Geavanceerd"
@@ -303,11 +333,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Hetzelfde als de stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Hoge Kwaliteit, Gemiddelde Bestandsgrootte"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Ononderscheidbare Kwaliteit, Grote Bestandsgrootte"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Lossless Kwaliteit, Enorm Grote Bestandsgrootte"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Waaschuwing: De video bitrate zal worden ingesteld op %1, dit is de bovengrens van de huidige streaming dienst. Als je zeker weet dat je hoger wil gaan dan %1, schakel dan de geavanceerde encoder-opties in en vink de optie \"Forceer bandbreedtelimieten van streaming dienst\" uit."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Waaschuwing: De audio bitrate zal worden ingesteld op %1, dit is de bovengrens van de huidige streaming dienst. Als je zeker weet dat je hoger wil gaan dan %1, schakel dan de geavanceerde encoder-opties in en vink de optie \"Forceer bandbreedtelimieten van streaming dienst\" uit."
 Basic.Settings.Output.Simple.Warn.Encoder="Waarschuwing: Opname met een software-encoder op een andere kwaliteit dan de stream vergt extra cpu-gebruik als je zowel aan het streamen en aan het opnemen bent."
 Basic.Settings.Output.Simple.Warn.Lossless="Waarschuwing: Lossless kwaliteit genereert erg grote bestanden! Lossless kwaliteit kan tot wel 7 GB aan schijfruimte per minuut gebruiken bij hoge resoluties en framerates. Lossless kwaliteit is niet aanbevolen voor lange opnames tenzij er een grote hoeveelheid schijfruimte beschikbaar is."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Weet je zeker dat je lossless kwaliteit wilt gebruiken?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Lossless kwaliteit waarschuwing!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Waarschuwing: Je kunt niet meerdere QSV encoders gebruiken wanneer je tegelijkertijd aan het streamen en opnemen bent. Als je tegelijkertijd wil streamen en opnemen, verander dan de opname- of streamencoder."
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (x264 laag cpu gebruik, verhoogt bestandsgrootte)"
 Basic.Settings.Output.VideoBitrate="Video Bitrate"
 Basic.Settings.Output.AudioBitrate="Audio Bitrate"
@@ -334,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="Type"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standaard"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Aangepaste Uitvoer (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Gebruik stream encoder)"
+Basic.Settings.Output.Adv.Recording.Filename="Bestandsnaamformaat"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Overschrijven als bestand bestaat"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg Uitvoertype"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Uitvoer naar URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Uitvoer naar Bestand"
@@ -354,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Audio Encoder"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Audio Encoderinstellingen (indien gewenst)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxerinstellingen (indien aanwezig)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Jaar, vier cijfers\n%YY		Jaar, laatste twee cijfers (00-99)\n%MM		Maand, cijfer (0-12)\n%DD		Dag van de maand, nul aangevuld (01-31)\n%hh		Uur in 24h formaat (00-23)\n%mm		Minuut (00-59)\n%ss		Seconde (00-61)\n%%		Een % teken\n%a		Dag van de week afgekort\n%A		Dag van de week volledig\n%b		Maand, afgekorte naam\n%B		Maand, volledige naam\n%d		Dag van de maand, nul aangevuld (01-31)\n%H		Uur in 24h formaat (00-23)\n%I		Uur in 12h formaat (01-12)\n%m		Maand, cijfer (01-12)\n%M		Minuut (00-59)\n%p		AM of PM\n%S		Second e(00-61)\n%y		Jaar, laatste twee cijfers (00-99)\n%Y		Jaar\n%z		ISO 8601 afstand van UTC of tijdzone\n		naam of afkorting\n%Z		naam of afkorting van tijdzone\n"
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Videoadapter:"
 Basic.Settings.Video.BaseResolution="Basisresolutie (Canvas):"

obs/data/locale/pl-PL.ini

@@ -8,6 +8,7 @@ Cancel="Anuluj"
 Close="Zamknij"
 Save="Zapisz"
 Discard="Odrzuć"
+Disable="Wyłączone"
 Yes="Tak"
 No="Nie"
 Add="Dodaj"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Przywróć synchronizację pionową OSX po zamknięciu apli
 HighResourceUsage="Enkodowanie przeciążone! Zmień ustawienia video lub użyj szybszego presetu enkodowania."
 Transition="Efekt przejścia"
 QuickTransitions="Szybkie efekty przejścia"
+Left="Od lewej"
+Right="Od prawej"
+Top="Od góry"
+Bottom="Od dołu"
 
 QuickTransitions.SwapScenes="Zamień podgląd/wyjście scen po przejściu"
 QuickTransitions.SwapScenesTT="Zamienia podgląd i wyjście scen po przejściu (jeżeli wyjście oryginalnej sceny istnieje).\nNie przywraca to zmian jakie zostały dokonane w oryginalnej scenie."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Duplikuj źródła"
 QuickTransitions.EditPropertiesTT="Edytując tę samą scenę, opcja ta pozwala na edycję źródeł bez modyfikacji wyjścia sceny.\nMożliwe to jest jedynie przy włączonej opcji 'Duplikuj scenę'.\nNiektóre źródła (np. przechwytywanie obrazu lub źródła mediów) nie obsługując tej funkcjonalności i nie mogą być edytowane oddzielnie.\nZmiana tej opcji zresetuje wyjście obecnej sceny, jeżeli takowa istnieje.\n\nUwaga: Ponieważ źródła są duplikowane, może to oznaczać zwiększenie obciążenia komputera i tychże źródeł."
 QuickTransitions.HotkeyName="Szybkie przejście: %1"
 
+Basic.AddTransition="Dodaj konfigurowalne przejście"
+Basic.RemoveTransition="Usuń konfigurowalne przejście"
+Basic.TransitionProperties="Właściwości przejścia"
 Basic.SceneTransitions="Efekty przejścia scen"
 Basic.TransitionDuration="Czas trwania"
 Basic.TogglePreviewProgramMode="Tryb studia"
 
+TransitionNameDlg.Text="Proszę podać nazwę przejścia"
+TransitionNameDlg.Title="Nazwa przejścia"
+
 TitleBar.Profile="Profile"
 TitleBar.Scenes="Sceny"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Czy na pewno chcesz usunąć '$1'?"
 Output.ConnectFail.Title="Nie udało się połączyć"
 Output.ConnectFail.BadPath="Nieprawidłowa ścieżka lub adres URL połączenia. Sprawdź poprawność ustawień."
 Output.ConnectFail.ConnectFailed="Nie udało się połączyć z serwerem"
-Output.ConnectFail.InvalidStream="Nie można uzyskać dostępu do kanału lub klucza streamu. Możliwe, że klucz/kanał jest nieprawidłowy lub serwer nadal uważa, że jesteś zalogowany."
+Output.ConnectFail.InvalidStream="Nie można uzyskać dostępu do wybranego kanału lub klucza streamu. Proszę sprawdzić klucz streamu. Jeżeli jest poprawny, to problemem może być połączenie do serwera."
 Output.ConnectFail.Error="Wystąpił nieoczekiwany błąd podczas próby połączenia z serwerem.  Więcej informacji w pliku dziennika."
 Output.ConnectFail.Disconnected="Utracono połączenie z serwerem."
 
@@ -107,7 +118,6 @@ LicenseAgreement.Exit="Wyjście"
 Remux.SourceFile="Nagrywanie OBS"
 Remux.TargetFile="Plik docelowy"
 Remux.Remux="Przepakowanie (remux)"
-Remux.RecordingPattern="Nagranie OBS (*.flv)"
 Remux.FinishedTitle="Przepakowanie zakończone"
 Remux.Finished="Nagranie przepakowane"
 Remux.FinishedError="Nagranie przepakowane ale może być niekompletne"
@@ -133,6 +143,18 @@ Basic.DisplayCapture="Przechwytywanie obrazu"
 
 Basic.Main.PreviewConextMenu.Enable="Włącz podgląd"
 
+Deinterlacing="Usuwanie przeplotu"
+Deinterlacing.Discard="Odrzuć"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Wtapianie"
+Deinterlacing.Blend2x="Wtapianie 2x"
+Deinterlacing.Linear="Liniowe"
+Deinterlacing.Linear2x="Liniowe 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Najpierw pole górne"
+Deinterlacing.BottomFieldFirst="Najpierw pole dolne"
+
 Basic.Main.AddSceneDlg.Title="Dodaj scenę"
 Basic.Main.AddSceneDlg.Text="Podaj nazwę sceny"
 
@@ -198,6 +220,7 @@ Basic.TransformWindow.Alignment="Wyrównanie"
 Basic.TransformWindow.BoundsType="Typ ograniczenia"
 Basic.TransformWindow.BoundsAlignment="Wyrównanie w obwiedni"
 Basic.TransformWindow.Bounds="Rozmiar obwiedni"
+Basic.TransformWindow.Crop="Kadrowanie"
 
 Basic.TransformWindow.Alignment.TopLeft="Lewy/górny"
 Basic.TransformWindow.Alignment.TopCenter="Środek/górny"
@@ -284,6 +307,11 @@ Basic.Settings.General.Theme="Motyw"
 Basic.Settings.General.Language="Język"
 Basic.Settings.General.WarnBeforeStartingStream="Pokaż komunikat potwierdzenia uruchomienia streamowania"
 Basic.Settings.General.WarnBeforeStoppingStream="Pokaż komunikat potwierdzenia zatrzymania streamowania"
+Basic.Settings.General.Snapping="Przyciąganie elementów źródłowych"
+Basic.Settings.General.ScreenSnapping="Przyciągaj do krawędzi ekranu"
+Basic.Settings.General.CenterSnapping="Przyciągaj do poziomego i pionowego środka"
+Basic.Settings.General.SourceSnapping="Przyciągaj źródła do innych źródeł"
+Basic.Settings.General.SnapDistance="Czułość przyciągania"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Typ streamu"
@@ -293,6 +321,7 @@ Basic.Settings.Output.Format="Format nagrywania"
 Basic.Settings.Output.Encoder="Enkoder"
 Basic.Settings.Output.SelectDirectory="Wybierz katalog nagrywania"
 Basic.Settings.Output.SelectFile="Wybierz plik nagrania"
+Basic.Settings.Output.EnforceBitrate="Wymuś limity przepływności wybranego serwisu"
 Basic.Settings.Output.Mode="Tryb wyjścia"
 Basic.Settings.Output.Mode.Simple="Proste"
 Basic.Settings.Output.Mode.Adv="Zaawansowane"
@@ -303,11 +332,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Taki sam jak stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Wysoka jakość, średni rozmiar pliku"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Jakość nie do odróżnienia, duża wielkość pliku"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Jakość bezstratna, ogromna wielkość pliku"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Ostrzeżenie: Przepływność (bitrate) obrazu ustawiona jest na wartość %1. Jest to górna granica wartości dozwolonych dla wybranej usługi streamingowej. Aby ustawić wartość przepływności większą niż %1 przejdź do zaawansowanych ustawień dekoder i odznacz opcję \"Wymuś limity przepływności wybranego serwisu\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Ostrzeżenie: Przepływność (bitrate) dźwięku ustawiona jest na wartość %1. Jest to górna granica wartości dozwolonych dla wybranej usługi streamingowej. Aby ustawić wartość przepływności większą niż %1, przejdź do zaawansowanych ustawień dekoder i odznacz opcję \"Wymuś limity przepływności wybranego serwisu\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Ostrzeżenie: Nagrywanie przy użyciu enkodera programowego z jakością inną niż stream wymagać będzie dodatkowej mocy procesora w przypadku jednoczesnego streamowania i nagrywania."
 Basic.Settings.Output.Simple.Warn.Lossless="Ostrzeżenie: Jakość bezstratna generuje bardzo duże pliki! Przy dużych rozdzielczościach i szybkości klatek rozmiar pliku może sięgać 7GB na minutę nagrania. Jakość ta nie jest zalecana w przypadku długich nagrań, chyba że masz bardzo dużo wolnego miejsca na dysku."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Czy na pewno chcesz użyć bezstratnej jakości?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Ostrzeżenie o bezstratnej jakości!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Ostrzeżenie: Korzystanie z wielu różnych enkoderów QSV do streamowania i nagrywania jest niedozwolone. Jeżeli chcesz streamować i nagrywać w tym samym czasie, zmień ustawienia enkodera nagrywania bądź streamowania."
 Basic.Settings.Output.Simple.Encoder.Software="Programowy (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Sprzętowy (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Sprzętowy (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Programowy (x264 ustawienia małego zużycia procesora, zwiększa wielkość pliku)"
 Basic.Settings.Output.VideoBitrate="Bitrate obrazu"
 Basic.Settings.Output.AudioBitrate="Bitrate dźwięku"
@@ -334,6 +368,8 @@ Basic.Settings.Output.Adv.Recording.Type="Typ"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standardowe"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Niestandardowe ustawienia (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Użyj enkodera streamu)"
+Basic.Settings.Output.Adv.Recording.Filename="Format nazwy pliku"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Nadpisz istniejący plik"
 Basic.Settings.Output.Adv.FFmpeg.Type="Tryb wyjścia FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Wyjście do adresu URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Wyjście do pliku"
@@ -354,6 +390,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Enkoder dźwięku"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ustawienia enkodera audio (jeśli są)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Ustawienia muxera (jeżeli są)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Rok, cztery cyfry\n%YY		Rok, ostatnie dwie cyfry (00-99)\n%MM		Miesiąc, liczba dziesiętna, dwie cyfry (01-12)\n%DD		Dzień, liczba dziesiętna, dwie cyfry (01-31)\n%hh		Godzina, format 24-godzinny, dwie cyfry (00-23)\n%mm		Minuta (00-59)\n%ss		Sekunda (00-61)\n%%		Znak %\n%a		Dzień tygodnia, skrót\n%A		Dzień tygodnia, pełna nazwa\n%b		Nazwa miesiąca, skrót\n%B		Nazwa miesiąca, pełna nazwa\n%d		Dzień miesiąca, dwie cyfry (01-31)\n%H		Godzina, format 24-godzinny, dwie cyfry (00-23)\n%I		Godzina, format 12-godzinny, dwie cyfry (01-12)\n%m		Miesiąc, dwie cyfry (01-12)\n%M		Minuta (00-59)\n%p		oznaczenie przed lub po południu\n%S		Sekunda (00-61)\n%y		Rok, ostatnie dwie cyfry (00-99)\n%Y		Rok\n%z		ISO 8601, przesunięcie od czasu UTC\n		nazwa lub skrót\n%Z		Nazwa lub skrót strefy czasowej\n"
+
 Basic.Settings.Video="Obraz"
 Basic.Settings.Video.Adapter="Karta graficzna:"
 Basic.Settings.Video.BaseResolution="Rozdzielczość bazowa (obraz):"

obs/data/locale/pt-BR.ini

@@ -8,6 +8,7 @@ Cancel="Cancelar"
 Close="Fechar"
 Save="Salvar"
 Discard="Não Salvar"
+Disable="Desabilitar"
 Yes="Sim"
 No="Não"
 Add="Adicionar"
@@ -38,8 +39,32 @@ Untitled="Sem nome"
 New="Novo"
 Duplicate="Duplicar"
 Enable="Habilitar"
+DisableOSXVSync="Desabilitar V-Sync em OSX"
+ResetOSXVSyncOnExit="Resetar V-Sync em OSX ao Sair"
+HighResourceUsage="Codificação sobrecarregada! Considere abaixar as configurações de vídeo ou usar um padrão de codificação mais rápido."
+Transition="Transição"
+QuickTransitions="Transições Rápidas"
+Left="Esquerda"
+Right="Direita"
+Top="Topo"
+Bottom="Baixo"
 
+QuickTransitions.SwapScenes="Trocar Cenas de Prévia/Saída após a Transição"
+QuickTransitions.SwapScenesTT="Troca a preview e a saída após transicionar (se a a cena original de saída ainda exisitr).\nIsto não irá desfazer nenhuma mudança que foi feita na cena original da saída."
+QuickTransitions.DuplicateScene="Duplicar Cena"
+QuickTransitions.DuplicateSceneTT="Quando estiver editando a mesma cena, permite editar a visibilidade/transformação de fontes sem modificar a saída.\nPara editar as propriedades das fontes sem modificar a saída, habilite 'Fontes Duplicadas'.\nMudar este valor irá resetar a cena atual de saída (se ainda existir)."
+QuickTransitions.EditProperties="Duplicar Fontes"
+QuickTransitions.HotkeyName="Transição Rápida: %1"
 
+Basic.AddTransition="Adicionar Transição Configurável"
+Basic.RemoveTransition="Remover Transição Configurável"
+Basic.TransitionProperties="Propriedades da Transição"
+Basic.SceneTransitions="Transições de Cena"
+Basic.TransitionDuration="Duração"
+Basic.TogglePreviewProgramMode="Modo Estúdio"
+
+TransitionNameDlg.Text="Por favor, insira o nome da transição"
+TransitionNameDlg.Title="Nome da Transição"
 
 TitleBar.Profile="Perfil"
 TitleBar.Scenes="Cenas"
@@ -50,7 +75,11 @@ NameExists.Text="O Nome já está em uso."
 NoNameEntered.Title="Por favor digite um nome válido"
 NoNameEntered.Text="Você não pode usar nomes vazios."
 
+ConfirmStart.Title="Iniciar Transmissão?"
+ConfirmStart.Text="Tens certeza de que queres iniciar a transmissão?"
 
+ConfirmStop.Title="Parar Transmissão?"
+ConfirmStop.Text="Tens certeza de que queres parar a transmissão?"
 
 ConfirmExit.Title="Sair do OBS?"
 ConfirmExit.Text="OBS está ativo no momento.  Todos as streams/gravações serão encerradas.  Tem certeza que deseja sair?"
@@ -61,7 +90,7 @@ ConfirmRemove.Text="Tem certeza que deseja remover '$1'?"
 Output.ConnectFail.Title="Falha ao conectar"
 Output.ConnectFail.BadPath="Caminho inválido ou URL inválida. Por favor verifique se as configurações estão válidas."
 Output.ConnectFail.ConnectFailed="Falha ao conectar com o Servidor"
-Output.ConnectFail.InvalidStream="Não foi possível acessar o canal especificado ou a chave da stream. Isto pode ser porque o canal/chave é inválido, ou porque o servidor ainda acha que você está logado."
+Output.ConnectFail.InvalidStream="Não foi possível acessar o canal especificado ou a chave de transmissão, por favor, verifique sua chave de transimissão. Se estiver correta, pode haver um problema em conectar ao servidor."
 Output.ConnectFail.Error="Um erro inesperado ocorreu ao tentar se conectar com o servidor. Veja o arquivo de Log para mais informações."
 Output.ConnectFail.Disconnected="Desconectado do Servidor."
 
@@ -88,7 +117,6 @@ LicenseAgreement.Exit="Sair"
 Remux.SourceFile="OBS Gravando"
 Remux.TargetFile="Arquivo de destino"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS Gravando (*.flv)"
 Remux.FinishedTitle="Remux finalizado"
 Remux.Finished="Remux da gravação finalizado"
 Remux.FinishedError="Remux da gravação finalizado, mas o arquivo pode estar incompleto"
@@ -110,10 +138,19 @@ Basic.AuxDevice3="Mic/Aux 3"
 Basic.AuxDevice4="Mic/Aux 4"
 
 Basic.Scene="Cena"
-Basic.DisplayCapture="Captura de Exposição"
+Basic.DisplayCapture="Captura de tela"
 
 Basic.Main.PreviewConextMenu.Enable="Ativar pré-vizualização"
 
+Deinterlacing.Discard="Descartar"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Misturar"
+Deinterlacing.Blend2x="Misturar 2x"
+Deinterlacing.Linear="Linear"
+Deinterlacing.Linear2x="Linear 2x"
+Deinterlacing.TopFieldFirst="Campo Superior Primeiro"
+Deinterlacing.BottomFieldFirst="Campo Inferior Primeiro"
+
 Basic.Main.AddSceneDlg.Title="Adicionar Cena"
 Basic.Main.AddSceneDlg.Text="Por favor, digite o nome da cena"
 
@@ -134,7 +171,7 @@ Basic.Main.PreviewDisabled="A pré-visualização esta desativada"
 Basic.SourceSelect="Criar/Selecionar Fonte"
 Basic.SourceSelect.CreateNew="Criar Nova"
 Basic.SourceSelect.AddExisting="Adicionar Existente"
-Basic.SourceSelect.AddVisible="Tornar a fonte visível"
+Basic.SourceSelect.AddVisible="Tornar a Fonte visível"
 
 Basic.PropertiesWindow="Propriedades para '%1'"
 Basic.PropertiesWindow.AutoSelectFormat="%1 (seleção automática: %2)"
@@ -149,7 +186,7 @@ Basic.PropertiesWindow.AddEditableListFiles="Adicionar arquivos para '%1'"
 Basic.PropertiesWindow.AddEditableListEntry="Adicionar entrada a '%1'"
 Basic.PropertiesWindow.EditEditableListEntry="Editar a entrada de '%1'"
 
-Basic.PropertiesView.FPS.Simple="Valores de FPS simples"
+Basic.PropertiesView.FPS.Simple="Valores de FPS Simples"
 Basic.PropertiesView.FPS.Rational="Valores de FPS racionais"
 Basic.PropertiesView.FPS.ValidFPSRanges="Intervalos de FPS válidos:"
 
@@ -179,6 +216,7 @@ Basic.TransformWindow.Alignment="Alinhamento da Posição"
 Basic.TransformWindow.BoundsType="Tipo da caixa delimitadora"
 Basic.TransformWindow.BoundsAlignment="Alinhamento na caixa delimitadora"
 Basic.TransformWindow.Bounds="Tamanho da Caixa Delimitadora"
+Basic.TransformWindow.Crop="Cortar"
 
 Basic.TransformWindow.Alignment.TopLeft="Superior esquerdo"
 Basic.TransformWindow.Alignment.TopCenter="Superior Central"
@@ -218,6 +256,7 @@ Basic.MainMenu.File.Remux="Re&mux gravações"
 Basic.MainMenu.File.Settings="&Configurações"
 Basic.MainMenu.File.ShowSettingsFolder="Mostrar pasta de configurações"
 Basic.MainMenu.File.ShowProfileFolder="Mostrar pasta de perfil"
+Basic.MainMenu.AlwaysOnTop="&Sempre no Topo"
 Basic.MainMenu.File.Exit="&Sair"
 
 Basic.MainMenu.Edit="&Editar"
@@ -262,6 +301,12 @@ Basic.Settings.Confirm="Você tem alterações não salvas.  Salvar as alteraç
 Basic.Settings.General="Geral"
 Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Idioma"
+Basic.Settings.General.WarnBeforeStartingStream="Mostrar diálogo de confirmação quando iniciar transmissões"
+Basic.Settings.General.WarnBeforeStoppingStream="Mostrar diálogo de confirmação quando terminar transmissões"
+Basic.Settings.General.ScreenSnapping="Encaixar Fontes ás bordas da tela"
+Basic.Settings.General.CenterSnapping="Encaixar Fontes aos centros vertical e horizontal"
+Basic.Settings.General.SourceSnapping="Encaixar fontes com outras fontes"
+Basic.Settings.General.SnapDistance="Sensibilidade de Encaixamento"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Tipo de Stream"
@@ -271,6 +316,7 @@ Basic.Settings.Output.Format="Formato de gravação"
 Basic.Settings.Output.Encoder="Encoder"
 Basic.Settings.Output.SelectDirectory="Selecione o diretório de gravação"
 Basic.Settings.Output.SelectFile="Selecione o arquivo de gravação"
+Basic.Settings.Output.EnforceBitrate="Impor limites de bitrate do serviço de transmissão"
 Basic.Settings.Output.Mode="Modo de Saída"
 Basic.Settings.Output.Mode.Simple="Simples"
 Basic.Settings.Output.Mode.Adv="Avançado"
@@ -281,6 +327,8 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Mesmo que a stream"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Alta qualidade, tamanho médio"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Qualidade indistinguível, Tamanho grande"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Qualidade Lossless, tremendamente grande"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Aviso: O bitrate de vídeo da transmissão será definido para %1, que é o limite superior para o serviço de transmissão atual.  Se você tem certeza que quer ir acima de %1, habilite opções de codificação avançadas e desmarque \"Impor limites de bitrate do serviço de transmissão\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Aviso: O bitrate de áudio da transmissão será definido para %1, que é o limite superior para o serviço de transmissão atual.  Se você tem certeza que quer ir acima de %1, habilite opções de codificação avançadas e desmarque \"Impor limites de bitrate do serviço de transmissão\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Aviso: Gravar com um codificador de software em uma qualidade diferente do que a stream vai exigir mais da CPU se você transmitir e gravar ao mesmo tempo."
 Basic.Settings.Output.Simple.Warn.Lossless="Aviso: Qualidade Lossless gera arquivos muito grandes!  A qualidade Lossless pode usar mais de 7 gigabytes de espaço em disco por minuto em altas resoluções e framerates.  Lossless não é recomendada para gravações longas, a menos que se tenha uma grande quantidade de espaço em disco disponível."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Tem certeza que deseja usar qualidade lossless?"
@@ -295,6 +343,7 @@ Basic.Settings.Output.MaxRetries="Número Máximo de Tentativas"
 Basic.Settings.Output.Advanced="Ativar as configurações avançadas do encoder"
 Basic.Settings.Output.EncoderPreset="Predefinição de codificação (maior = menor uso de CPU)"
 Basic.Settings.Output.CustomEncoderSettings="Configurações de codificador personalizadas"
+Basic.Settings.Output.NoSpaceFileName="Gerar Nome de Arquivo sem Espaços"
 
 Basic.Settings.Output.Adv.Rescale="Redimensionar a saída"
 Basic.Settings.Output.Adv.AudioTrack="Faixa de áudio"
@@ -310,6 +359,8 @@ Basic.Settings.Output.Adv.Recording.Type="Tipo"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Padrão"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Saída personalizada (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Utilizar o codificador da transmissão)"
+Basic.Settings.Output.Adv.Recording.Filename="Formatação de Nome de Arquivo"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Substituir, se o arquivo existir"
 Basic.Settings.Output.Adv.FFmpeg.Type="Tipo de saída FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Saída para URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Exportar para arquivo"
@@ -330,6 +381,9 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador de áudio"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Configurações do codificador de áudio(se houver)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Configurações do Muxer (se houver)"
 
+
+FilenameFormatting.TT="%CCYY		Ano, quatro dígitos\n%YY		Ano, dois dígitos (00-99)\n%MM		Mês como um número decimal (01-12)\n%DD		Dia do mês, começando com 0 (01-31)\n%hh		Hora, em formato de 24h (00-23)\n%mm		Minuto (00-59)\n%ss		Segundo (00-61)\n%%		A % sign\n%a		Dia da Semana abreviado\n%A		Nome da Semana completo\n%b		Nome do Mês abreviado\n%B		Nome do Mês completo\n%d		Dia do Mês, começando com 0 (01-31)\n%H		Hora, no formato de 24h (00-23)\n%I		Hora no formato de 12h (01-12)\n%m		Mês como um número decimal (01-12)\n%M		Minuto (00-59)\n%p		Designação AM ou PM\n%S		Segundo (00-61)\n%y		Ano, últimos dois dígitos (00-99)\n%Y		Ano\n%z		ISO 8601 diferença de fuso horário ou de UTC\n		nome ou abreviação\n%Z		Nome do Fuso Horário ou abreviação\n"
+
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de Vídeo:"
 Basic.Settings.Video.BaseResolution="Resolução de base (tela):"
@@ -363,6 +417,7 @@ Basic.Settings.Audio.EnablePushToMute="Ativar pressionar-para-mutar"
 Basic.Settings.Audio.PushToMuteDelay="Delay do Pressionar-para-mutar"
 Basic.Settings.Audio.EnablePushToTalk="Ativar pressionar-para-falar"
 Basic.Settings.Audio.PushToTalkDelay="Delay do pressionar-para-falar"
+Basic.Settings.Audio.UnknownAudioDevice="[Dispositivo nao conectado ou não disponível]"
 
 Basic.Settings.Advanced="Avançado"
 Basic.Settings.Advanced.FormatWarning="Aviso: Formatos de cor diferentes do NV12 destinam-se principalmente para gravação e não são recomendados para transmissão. Durante a transmissão pode ocorrer aumento do uso da CPU devido a conversão do formato de cor."

obs/data/locale/pt-PT.ini

@@ -8,6 +8,7 @@ Cancel="Cancelar"
 Close="Fechar"
 Save="Guardar"
 Discard="Rejeitar"
+Disable="Desativar"
 Yes="Sim"
 No="Não"
 Add="Adicionar"
@@ -38,7 +39,17 @@ Untitled="Sem título"
 New="Novo"
 Duplicate="Duplicar"
 Enable="Ativar"
+Transition="Transição"
+QuickTransitions="Transições rápidas"
+Left="Esquerda"
+Right="Direita"
+Top="Cima"
+Bottom="Baixo"
 
+QuickTransitions.DuplicateScene="Duplicar cena"
+
+Basic.RemoveTransition="Remover transição configurável"
+Basic.TransitionProperties="Propriedades da transição"
 
 
 TitleBar.Profile="Perfil"
@@ -59,9 +70,8 @@ ConfirmRemove.Title="Comfirmar Remover"
 ConfirmRemove.Text="Tem a certeza que quer remover '$1'?"
 
 Output.ConnectFail.Title="Falha ao ligar"
-Output.ConnectFail.BadPath="Caminho inválido ou erro no endereço. Por favor verifiique as definições e confirme que são válidas."
+Output.ConnectFail.BadPath="Caminho ou endereço de ligação inválido. Por favor, verifique as suas definições para confirmar que são válidas."
 Output.ConnectFail.ConnectFailed="Falhou a ligação ao servidor"
-Output.ConnectFail.InvalidStream="Sem acesso ao canal ou chave de stream. Pode ser porque a chave ou o canal é inválido, ou porque o servidor pensa que voçê ainda encontra-se ligado."
 Output.ConnectFail.Error="Ocurreu um erro inesperado ao ligar-se ao servidor. Mais informação no ficheiro Log."
 Output.ConnectFail.Disconnected="Desligado do servidor."
 
@@ -76,7 +86,7 @@ Output.BadPath.Title="Caminho de Ficheiro de Gravação Inválido"
 Output.BadPath.Text="O caminho de ficheiro de gravação definido é inválido. Por favor verifique as definições e confirme que um caminho válido foi introduzido."
 
 LogReturnDialog="Envio de Log Sucedido"
-LogReturnDialog.CopyURL="Copiar endereçoCopy URL"
+LogReturnDialog.CopyURL="Copiar endereço"
 LogReturnDialog.ErrorUploadingLog="Erro no envio de ficheiro Log"
 
 LicenseAgreement="Termos e condições da licença"
@@ -88,7 +98,6 @@ LicenseAgreement.Exit="Sair"
 Remux.SourceFile="Gravação do OBS"
 Remux.TargetFile="Ficheiro de destino"
 Remux.Remux="Remisturar"
-Remux.RecordingPattern="Gravação do OBS (*.flv)"
 Remux.FinishedTitle="Remistura concluída"
 Remux.Finished="Gravação remisturada"
 Remux.FinishedError="Gravação remisturada, mas o ficheiro pode estar incompleto"
@@ -100,7 +109,7 @@ Remux.ExitUnfinishedTitle="Remistura em progresso"
 Remux.ExitUnfinished="A remistura não está concluída. Ao parar agora pode tornar o ficheiro de destino inutilizável.\nTem a certeza de que pretende para a remistura?"
 
 UpdateAvailable="Nova atualização disponível"
-UpdateAvailable.Text="Versão %1. %2. %3 está agora disponível.  <a href='%4'> clique aqui para baixar</a>"
+UpdateAvailable.Text="Versão %1.%2.%3 está agora disponível.  <a href='%4'>Clique aqui para descarregar</a>"
 
 Basic.DesktopDevice1="Desktop Audio"
 Basic.DesktopDevice2="Desktop Audio 2"
@@ -114,6 +123,7 @@ Basic.DisplayCapture="Captura de Ecrã"
 
 Basic.Main.PreviewConextMenu.Enable="Ativar pré-visualização"
 
+
 Basic.Main.AddSceneDlg.Title="Adicionar Cena"
 Basic.Main.AddSceneDlg.Text="Por favor introduza o nome da cena"
 
@@ -205,9 +215,9 @@ Basic.Main.Scenes="Cenas"
 Basic.Main.Sources="Fontes"
 Basic.Main.Connecting="A ligar..."
 Basic.Main.StartRecording="Começar Gravação"
-Basic.Main.StartStreaming="Começar Stream"
+Basic.Main.StartStreaming="Iniciar transmissão"
 Basic.Main.StopRecording="Parar Gravação"
-Basic.Main.StopStreaming="Parar Stream"
+Basic.Main.StopStreaming="Parar transmissão"
 Basic.Main.ForceStopStreaming="Parar transmissão (ignorar atraso)"
 
 Basic.MainMenu.File="&Ficheiro"
@@ -253,7 +263,7 @@ Basic.MainMenu.Help.Logs.ShowLogs="Most&rar ficheiros de registo"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Enviar Ficheiro &Currente de Log"
 Basic.MainMenu.Help.Logs.UploadLastLog="Enviar Ultímo Ficheiro de &Log"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Ver registo atual"
-Basic.MainMenu.Help.CheckForUpdates="Verificar se há atualizações"
+Basic.MainMenu.Help.CheckForUpdates="Procurar atualizações"
 
 Basic.Settings.ProgramRestart="O programa necessita de ser reinicializado para estas alterações terem efeito."
 Basic.Settings.ConfirmTitle="Confirmar Alterações"
@@ -263,15 +273,15 @@ Basic.Settings.General="Geral"
 Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Idioma"
 
-Basic.Settings.Stream="Stream"
+Basic.Settings.Stream="Transmissão"
-Basic.Settings.Stream.StreamType="Tipo de Stream"
+Basic.Settings.Stream.StreamType="Tipo de transmissão"
 
-Basic.Settings.Output="Saída Output"
+Basic.Settings.Output="Saída"
 Basic.Settings.Output.Format="Formato de gravação"
 Basic.Settings.Output.Encoder="Codificador"
 Basic.Settings.Output.SelectDirectory="Selecione o diretório de gravação"
 Basic.Settings.Output.SelectFile="Selecione ficheiro de gravação"
-Basic.Settings.Output.Mode="Modo de Saída"
+Basic.Settings.Output.Mode="Modo de saída"
 Basic.Settings.Output.Mode.Simple="Simples"
 Basic.Settings.Output.Mode.Adv="Avançado"
 Basic.Settings.Output.Mode.FFmpeg="Saída FFmpeg"
@@ -323,6 +333,8 @@ Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Definições do codificador d
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificador de áudio"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Definições do codificador de áudio (se houver)"
 
+
+
 Basic.Settings.Video="Vídeo"
 Basic.Settings.Video.Adapter="Adaptador de Vídeo:"
 Basic.Settings.Video.DownscaleFilter="Filtro de Escalamento:"

obs/data/locale/ro-RO.ini

@@ -2,425 +2,464 @@
 Language="Română"
 Region="România"
 
-OK="OK"
+OK="Ok"
 Apply="Aplică"
-Cancel="Anulare"
+Cancel="Anulează"
-Close="Inchide"
+Close="Închide"
-Save="Salvaţi"
+Save="Salvează"
-Discard="Renunţă"
+Discard="Înlătură"
+Disable="Dezactivează"
 Yes="Da"
 No="Nu"
 Add="Adaugă"
-Remove="Eliminaţi"
+Remove="Elimină"
-Rename="Redenumiţi"
+Rename="Redenumește"
-Interact="Interacţioneaza"
+Interact="Interacționează"
 Filters="Filtre"
-Properties="Proprietăţi"
+Properties="Proprietăți"
 MoveUp="Mută în sus"
 MoveDown="Mută în jos"
 Settings="Setări"
 Display="Display"
 Name="Nume"
-Exit="Ieșire"
+Exit="Ieși"
 Mixer="Mixer"
-Browse="Căutare"
+Browse="Răsfoiește"
 Mono="Mono"
 Stereo="Stereo"
-DroppedFrames="Cadre Pierdute %1 (%2%)"
+DroppedFrames="Cadre pierdute %1 (%2%)"
 PreviewProjector="Proiector pe tot ecranul (Previzualizare)"
-SceneProjector="Proiector pe tot ecranul (Scena)"
+SceneProjector="Proiector pe tot ecranul (Scenă)"
-SourceProjector="Proiector pe tot ecranul (Sursa)"
+SourceProjector="Proiector pe tot ecranul (Sursă)"
-Clear="Ştergeţi"
+Clear="Șterge"
-Revert="Inverseaza"
+Revert="Inversează"
 Show="Arată"
 Hide="Ascunde"
-Untitled="Fără Nume"
+Untitled="Fără nume"
 New="Nou"
 Duplicate="Duplică"
 Enable="Activează"
-DisableOSXVSync="Dezactivaţi OSX V-Sync"
+DisableOSXVSync="Dezactivează OSX V-Sync"
-ResetOSXVSyncOnExit="Resetare OSX V-Sync la Ieşire"
+ResetOSXVSyncOnExit="Resetează OSX V-Sync la ieșire"
-HighResourceUsage="Codificarea supraîncărcata!  Luaţi în considerare reducerea setărilor video sau folosirea unui preset de codare mai rapid."
+HighResourceUsage="Codificare supraîncărcată!  Ia în considerare reducerea setărilor video sau folosirea unei presetări de codare mai rapidă."
-Transition="Tranziţie"
+Transition="Tranziție"
-QuickTransitions="Tranziţii rapide"
+QuickTransitions="Tranziții rapide"
+Left="Stânga"
+Right="Dreapta"
+Top="Sus"
+Bottom="Jos"
 
-QuickTransitions.SwapScenes="Schimba Previzualizarea/Scena de Output dupa Tranzitionare"
+QuickTransitions.SwapScenes="Comută între previzualizare/scenele de ieșire după tranziționare"
 QuickTransitions.SwapScenesTT="Schimba previzualizarea si scenele de output dupa tranzitionare (în cazul în care încă există outputul scenei originale). \nAceasta nu va anula nicio modificăre care au fost făcute la outputul scenei originale."
-QuickTransitions.DuplicateScene="Scena Dublata"
+QuickTransitions.DuplicateScene="Duplică scena"
 QuickTransitions.DuplicateSceneTT="La editarea aceleiaşi scene, permite editarea transformarii/vizibilitatii surselor fără modificarea output-ului. \nPentru a edita proprietăţile surselor fără a modifica output-ul, activaţi 'Surse Dublate'. \nSchimband această valoare va reseta outputul scenei curente (în cazul în care încă mai există)."
-QuickTransitions.EditProperties="Surse Dublate"
+QuickTransitions.EditProperties="Surse duplicate"
 QuickTransitions.EditPropertiesTT="La editarea aceleiaşi scene, permite editarea proprietăţilor surselor fără modificareaa outputului. \nAceasta poate fi utilizat doar dacă este activată 'Scena Dublata'. \nAnumite surse (cum ar fi sursele de captare sau mass-media) nu acceptă acest lucru şi nu poate fi editat separat. \nSchimband această valoare va reseta outputul scenei curente (în cazul în care încă mai există).\n\nAtentie: deoarece sursele vor fi dublate, aceasta poate solicita suplimentar sistemul sau resursele video."
-QuickTransitions.HotkeyName="Tranziţie rapidă: %1"
+QuickTransitions.HotkeyName="Tranziție rapidă: %1"
 
-Basic.SceneTransitions="Tranzitii de Scene"
+Basic.AddTransition="Adaugă tranziție configurabilă"
-Basic.TransitionDuration="Durata"
+Basic.RemoveTransition="Elimină tranziția configurabilă"
-Basic.TogglePreviewProgramMode="Modul de studio"
+Basic.TransitionProperties="Proprietăți pentru tranziții"
+Basic.SceneTransitions="Tranziții pentru scene"
+Basic.TransitionDuration="Durată"
+Basic.TogglePreviewProgramMode="Mod studio"
+
+TransitionNameDlg.Text="Te rugăm să introduci numele tranziției"
+TransitionNameDlg.Title="Numele tranziției"
 
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scene"
 
 NameExists.Title="Numele există deja"
-NameExists.Text="Acest nume este deja folosit."
+NameExists.Text="Numele este deja în uz."
 
-NoNameEntered.Title="Va rugăm introduceţi un nume valid"
+NoNameEntered.Title="Te rugăm să introduci un nume valid"
-NoNameEntered.Text="Nu puteți utiliza un nume gol."
+NoNameEntered.Text="Nu poți folosi nume necompletate."
 
-ConfirmStart.Title="Pornire Stream?"
+ConfirmStart.Title="Începi streamul?"
-ConfirmStart.Text="Sunteţi sigur că doriţi să începeţi streamul?"
+ConfirmStart.Text="Sigur dorești să pornești streamul?"
 
-ConfirmStop.Title="Oprire Stream?"
+ConfirmStop.Title="Oprești streamul?"
-ConfirmStop.Text="Sunteţi sigur că doriţi să opriţi streamul?"
+ConfirmStop.Text="Sigur dorești să oprești streamul?"
 
-ConfirmExit.Title="Ieşiţi din OBS?"
+ConfirmExit.Title="Ieși din OBS?"
-ConfirmExit.Text="OBS este în prezent activ.  Toate stream-urile/înregistrările vor fi închise.  Sunteţi sigur că doriţi să ieşiţi?"
+ConfirmExit.Text="OBS este în prezent activ.  Toate streamurile/înregistrările vor fi închise.  Sigur dorești să ieși?"
 
-ConfirmRemove.Title="Confirmă Ştergere"
+ConfirmRemove.Title="Confirmă eliminarea"
-ConfirmRemove.Text="Sigur eliminaţi '$1'?"
+ConfirmRemove.Text="Sigur dorești să elimini „$1”?"
 
-Output.ConnectFail.Title="Nu a reuşit să se conecteze"
+Output.ConnectFail.Title="Eșec la conectare"
-Output.ConnectFail.BadPath="Link URL sau rută greșită.  Vă rugăm să verificaţi setările pentru a confirma că sunt corecte."
+Output.ConnectFail.BadPath="URL-ul conexiunii sau calea este invalidă.  Te rugăm să verifici setările pentru a confirma că acestea sunt valide."
-Output.ConnectFail.ConnectFailed="Nu a reușit conectarea la server"
+Output.ConnectFail.ConnectFailed="Nu se poate conecta la server"
-Output.ConnectFail.InvalidStream="Nu s-a putut accesa canalul sau codul de stream.  Acest lucru s-ar putea întampla deoarece canalul/codul nu este valid, sau pentru că serverul încă mai crede că sunteţi logat."
+Output.ConnectFail.InvalidStream="Nu a putut fi accesat canalul sau cheia de stream respectiva, vă rugăm să verificaţi cheia de stream.  Dacă aceasta este corectă, poate fi o problemă la conectarea la server."
 Output.ConnectFail.Error="Eroare neașteptată la încercarea de a conecta la server.  Mai multe informaţii în fişierul jurnal."
 Output.ConnectFail.Disconnected="Deconectat de la server."
 
-Output.RecordFail.Title="Inregistrarea nu a putut fi pornita"
+Output.RecordFail.Title="Eșec la pornirea înregistrării"
 Output.RecordFail.Unsupported="Formatul de ieşire este fie neacceptat sau nu acceptă mai multe piese audio.  Vă rugăm să verificaţi setările şi încercaţi din nou."
-Output.RecordNoSpace.Title="Spațiu insuficient"
+Output.RecordNoSpace.Title="Spațiu insuficient pe disc"
-Output.RecordNoSpace.Msg="Nu este suficient spațiu pentru a continua înregistrarea."
+Output.RecordNoSpace.Msg="Nu există spațiu suficient pe disc pentru a continua înregistrarea."
 Output.RecordError.Title="Eroare de înregistrare"
-Output.RecordError.Msg="O eroare nespecificată a avut loc în timpul înregistrarii."
+Output.RecordError.Msg="S-a produs o eroare nespecificată în timpul înregistrării."
 
-Output.BadPath.Title="Calea de fişier greşita"
+Output.BadPath.Title="Calea fișierului greșită"
 Output.BadPath.Text="Calea de ieşire pentru fişiere invalidă.  Vă rugăm să verificaţi setările pentru a confirma că s-a stabilit o cale de fişier validă."
 
 LogReturnDialog="Jurnal incărcat cu succes"
-LogReturnDialog.CopyURL="Copiază URL"
+LogReturnDialog.CopyURL="Copiază URL-ul"
-LogReturnDialog.ErrorUploadingLog="Eroare la încărcarea fişierul jurnal"
+LogReturnDialog.ErrorUploadingLog="Eroare la încărcarea fișierului jurnal"
 
-LicenseAgreement="Acord de licenţă"
+LicenseAgreement="Acord de licență"
 LicenseAgreement.PleaseReview="Vă rugăm să revedeţi termenii de licenţă înainte de a utiliza OBS.  Utilizând acest program, confirmaţi că aţi citit şi sunt de acord cu termenii <a href='http://www.gnu.org/licenses/gpl-2.0.html'> Licenței Publice Generale GNU v2.0</a>.  Vă rugăm să derulaţi în jos pentru a vedea restul acordului."
 LicenseAgreement.ClickIAgreeToContinue="Dacă acceptaţi termenii acordului, faceţi clic pe Sunt de acord să continuaţi.  Trebuie să acceptaţi acordul pentru a utiliza OBS."
 LicenseAgreement.IAgree="Sunt de acord"
 LicenseAgreement.Exit="Ieși"
 
 Remux.SourceFile="Înregistrare OBS"
-Remux.TargetFile="Fişierul ţintă"
+Remux.TargetFile="Fișier țintă"
 Remux.Remux="Remux"
-Remux.RecordingPattern="Înregistrare OBS (*.flv)"
+Remux.FinishedTitle="Remuxing încheiat"
-Remux.FinishedTitle="Remux terminat"
+Remux.Finished="Înregistrare remuxată"
-Remux.Finished="Înregistrare remuxata"
+Remux.FinishedError="Înregistrare remuxată, însă fișierul poate fi incomplet"
-Remux.FinishedError="Înregistrare remuxata, dar fişierul poate fi incomplet"
+Remux.SelectRecording="Selectează înregistrarea OBS …"
-Remux.SelectRecording="Selectaţi înregistrarea OBS …"
+Remux.SelectTarget="Selectează fișierul țintă …"
-Remux.SelectTarget="Selectaţi fişierul ţintă …"
 Remux.FileExistsTitle="Fișierul țintă există"
-Remux.FileExists="Fişierul ţintă există, doriţi să-l înlocuiască?"
+Remux.FileExists="Fișierul țintă există, dorești să-l înlocuiești?"
-Remux.ExitUnfinishedTitle="Remuxing în curs de desfăşurare"
+Remux.ExitUnfinishedTitle="Remuxing în desfășurare"
-Remux.ExitUnfinished="Remuxing nu este terminat, oprirea imediata poate face fişierul ţintă inutilizabil. \nSunteți sigur că doriţi să opriţi remuxing?"
+Remux.ExitUnfinished="Remuxingul nu este încheiat, oprirea în acest moment poate face fișierul țintă inutilizabil.\nSigur dorești să oprești remuxingul?"
 
-UpdateAvailable="O Nouă Actualizare Este Disponibilă"
+UpdateAvailable="Actualizare nouă disponibilă"
-UpdateAvailable.Text="Versiunea %1.%2.%3 este acum disponibilă.  <a href='%4'> Click aici pentru a descarca</a>"
+UpdateAvailable.Text="Versiunea %1.%2.%3 este acum disponibilă.  <a href='%4'> Clic aici pentru a descărca</a>"
 
-Basic.DesktopDevice1="Desktop Audio"
+Basic.DesktopDevice1="Desktop audio"
-Basic.DesktopDevice2="Desktop Audio 2"
+Basic.DesktopDevice2="Desktop audio 2"
 Basic.AuxDevice1="Microfon/Aux"
 Basic.AuxDevice2="Microfon/Aux 2"
 Basic.AuxDevice3="Microfon/Aux 3"
 Basic.AuxDevice4="Microfon/Aux 4"
 
-Basic.Scene="Scena"
+Basic.Scene="Scenă"
-Basic.DisplayCapture="Captura de ecran"
+Basic.DisplayCapture="Captură de display"
 
-Basic.Main.PreviewConextMenu.Enable="Activeaza previzualizarea"
+Basic.Main.PreviewConextMenu.Enable="Activează previzualizarea"
 
-Basic.Main.AddSceneDlg.Title="Adauga scena"
+Deinterlacing="Deîntrețesere"
-Basic.Main.AddSceneDlg.Text="Vă rugăm să introduceţi numele de scena"
+Deinterlacing.Discard="Înlătură"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Amestecare"
+Deinterlacing.Blend2x="Amestecare 2x"
+Deinterlacing.Linear="Liniară"
+Deinterlacing.Linear2x="Liniară 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Câmpul de sus prima oară"
+Deinterlacing.BottomFieldFirst="Câmpul de jos prima oară"
+
+Basic.Main.AddSceneDlg.Title="Adaugă scenă"
+Basic.Main.AddSceneDlg.Text="Te rugăm să introduci numele scenei"
 
 Basic.Main.DefaultSceneName.Text="Scena %1"
 
-Basic.Main.AddSceneCollection.Title="Adauga o colectie de scene"
+Basic.Main.AddSceneCollection.Title="Adaugă colecție de scene"
-Basic.Main.AddSceneCollection.Text="Vă rugăm să introduceţi numele colectiei de scene"
+Basic.Main.AddSceneCollection.Text="Te rugăm să introduci numele colecției de scene"
 
-Basic.Main.RenameSceneCollection.Title="Redenumiţi colectia de scene"
+Basic.Main.RenameSceneCollection.Title="Redenumește colecția de scene"
 
 AddProfile.Title="Adaugă profil"
-AddProfile.Text="Vă rugăm să introduceţi numele profilului"
+AddProfile.Text="Te rugăm să introduci numele profilului"
 
-RenameProfile.Title="Redenumește profil"
+RenameProfile.Title="Redenumește profilul"
 
 Basic.Main.PreviewDisabled="Previzualizarea este în prezent dezactivată"
 
-Basic.SourceSelect="Creaţi/Selectaţi Sursa"
+Basic.SourceSelect="Creează/Selectează sursa"
 Basic.SourceSelect.CreateNew="Creează nouă"
 Basic.SourceSelect.AddExisting="Adaugă existentă"
-Basic.SourceSelect.AddVisible="Faceți vizibilă sursa"
+Basic.SourceSelect.AddVisible="Fă sursa vizibilă"
 
-Basic.PropertiesWindow="Proprietăţi pentru '%1'"
+Basic.PropertiesWindow="Proprietăți pentru '%1'"
-Basic.PropertiesWindow.AutoSelectFormat="%1 (Selectare automată: %2)"
+Basic.PropertiesWindow.AutoSelectFormat="%1 (autoselectare: %2)"
-Basic.PropertiesWindow.SelectColor="Selectaţi culoarea"
+Basic.PropertiesWindow.SelectColor="Selectează culoarea"
-Basic.PropertiesWindow.SelectFont="Selectează Fontul"
+Basic.PropertiesWindow.SelectFont="Selectează fontul"
-Basic.PropertiesWindow.ConfirmTitle="Setări Schimbate"
+Basic.PropertiesWindow.ConfirmTitle="Setări schimbate"
-Basic.PropertiesWindow.Confirm="Există modificări nesalvate.  Vrei să le păstrezi?"
+Basic.PropertiesWindow.Confirm="Există modificări nesalvate.  Dorești să le păstrezi?"
-Basic.PropertiesWindow.NoProperties="Nicio proprietate disponibila"
+Basic.PropertiesWindow.NoProperties="Nicio proprietate disponibilă"
-Basic.PropertiesWindow.AddFiles="Adăugaţi fişiere"
+Basic.PropertiesWindow.AddFiles="Adaugă fișiere"
-Basic.PropertiesWindow.AddURL="Adauga calea/URL"
+Basic.PropertiesWindow.AddURL="Adaugă cale/URL"
-Basic.PropertiesWindow.AddEditableListFiles="Adăuga fişiere la \"%1\""
+Basic.PropertiesWindow.AddEditableListFiles="Adaugă fișiere la '%1'"
-Basic.PropertiesWindow.AddEditableListEntry="Adăugaţi intrare la \"%1\""
+Basic.PropertiesWindow.AddEditableListEntry="Adaugă intrare la '%1'"
-Basic.PropertiesWindow.EditEditableListEntry="Editeaza intrarea de la \"%1\""
+Basic.PropertiesWindow.EditEditableListEntry="Editează intrarea de la '%1'"
 
-Basic.PropertiesView.FPS.Simple="Valori FPS Simple"
+Basic.PropertiesView.FPS.Simple="Valori FPS simple"
-Basic.PropertiesView.FPS.Rational="Valori FPS Raţionale"
+Basic.PropertiesView.FPS.Rational="Valori FPS raționale"
-Basic.PropertiesView.FPS.ValidFPSRanges="Intervale de FPS valabile:"
+Basic.PropertiesView.FPS.ValidFPSRanges="Intervale FPS valide:"
 
 Basic.InteractionWindow="Interacționează cu '%1'"
 
-Basic.StatusBar.Reconnecting="Deconectat, reconectare în %2 secunda(e) (încercarea %1)"
+Basic.StatusBar.Reconnecting="Deconectat, se reconectează în %2 secunda(e) (încercarea %1)"
-Basic.StatusBar.AttemptingReconnect="Încearcă să se reconecteze... (încercarea %1)"
+Basic.StatusBar.AttemptingReconnect="Se încearcă reconectarea... (încercarea %1)"
-Basic.StatusBar.ReconnectSuccessful="Reconectat cu succes"
+Basic.StatusBar.ReconnectSuccessful="Reconectare cu succes"
 Basic.StatusBar.Delay="Întârziere (%1 secunde)"
-Basic.StatusBar.DelayStartingIn="Întârziere (începând cu %1 sec)"
+Basic.StatusBar.DelayStartingIn="Întârziere (începând în %1 sec)"
-Basic.StatusBar.DelayStoppingIn="Întârziere (oprirea în %1 sec)"
+Basic.StatusBar.DelayStoppingIn="Întârziere (oprindu-se în %1 sec)"
-Basic.StatusBar.DelayStartingStoppingIn="Întârziere (oprindu-se în %1 sec, începând in %2 sec)"
+Basic.StatusBar.DelayStartingStoppingIn="Întârziere (oprindu-se în %1 sec, începând în %2 sec)"
 
 Basic.Filters="Filtre"
-Basic.Filters.AsyncFilters="Filtre audio/Video"
+Basic.Filters.AsyncFilters="Filtre audio/video"
 Basic.Filters.AudioFilters="Filtre audio"
 Basic.Filters.EffectFilters="Filtre de efect"
-Basic.Filters.Title="Filtre pentru \"%1\""
+Basic.Filters.Title="Filtre pentru „%1”"
-Basic.Filters.AddFilter.Title="Denumire filtru"
+Basic.Filters.AddFilter.Title="Numele filtrului"
-Basic.Filters.AddFilter.Text="Vă rugăm să specificaţi numele filtrului"
+Basic.Filters.AddFilter.Text="Te rugăm să specifici numele filtrului"
 
-Basic.TransformWindow="Scena de transformare a obiectelor"
+Basic.TransformWindow="Transformare a elementelor pentru scene"
-Basic.TransformWindow.Position="Poziţie"
+Basic.TransformWindow.Position="Poziție"
 Basic.TransformWindow.Rotation="Rotație"
 Basic.TransformWindow.Size="Dimensiune"
-Basic.TransformWindow.Alignment="Alinierea poziţiei"
+Basic.TransformWindow.Alignment="Aliniere pozițională"
-Basic.TransformWindow.BoundsType="Tip caseta de încadrare"
+Basic.TransformWindow.BoundsType="Tipul casetei de încadrare"
-Basic.TransformWindow.BoundsAlignment="Alinierea în caseta de încadrare"
+Basic.TransformWindow.BoundsAlignment="Aliniere în caseta de încadrare"
-Basic.TransformWindow.Bounds="Dimensiunea casetei de încadrare"
+Basic.TransformWindow.Bounds="Mărime pentru caseta de încadrare"
+Basic.TransformWindow.Crop="Trunchiază"
 
 Basic.TransformWindow.Alignment.TopLeft="Stânga sus"
-Basic.TransformWindow.Alignment.TopCenter="Mijloc Sus"
+Basic.TransformWindow.Alignment.TopCenter="Centru sus"
 Basic.TransformWindow.Alignment.TopRight="Dreapta sus"
 Basic.TransformWindow.Alignment.CenterLeft="Centru stânga"
 Basic.TransformWindow.Alignment.Center="Centru"
 Basic.TransformWindow.Alignment.CenterRight="Centru dreapta"
 Basic.TransformWindow.Alignment.BottomLeft="Stânga jos"
-Basic.TransformWindow.Alignment.BottomCenter="Mijloc jos"
+Basic.TransformWindow.Alignment.BottomCenter="Centru jos"
 Basic.TransformWindow.Alignment.BottomRight="Dreapta jos"
 
 Basic.TransformWindow.BoundsType.None="Fără limite"
 Basic.TransformWindow.BoundsType.MaxOnly="Doar dimensiunea maximă"
 Basic.TransformWindow.BoundsType.ScaleInner="Scalează la limitele interioare"
 Basic.TransformWindow.BoundsType.ScaleOuter="Scalează la limitele exterioare"
-Basic.TransformWindow.BoundsType.ScaleToWidth="Scalează la lăţimea limitei"
+Basic.TransformWindow.BoundsType.ScaleToWidth="Scalează la lățimea limitei"
-Basic.TransformWindow.BoundsType.ScaleToHeight="Scalează la înălţimea limitei"
+Basic.TransformWindow.BoundsType.ScaleToHeight="Scalează la înălțimea limitei"
 Basic.TransformWindow.BoundsType.Stretch="Întinde la limite"
 
-Basic.Main.AddSourceHelp.Title="Imposibil de adăugat sursa"
+Basic.Main.AddSourceHelp.Title="Nu se poate adăuga sursă"
-Basic.Main.AddSourceHelp.Text="Trebuie să aveţi cel puţin o scena pentru a adăuga o sursă."
+Basic.Main.AddSourceHelp.Text="Trebuie să ai cel puțin 1 scenă pentru a adăuga o sursă."
 
 Basic.Main.Scenes="Scene"
 Basic.Main.Sources="Surse"
-Basic.Main.Connecting="Conectare..."
+Basic.Main.Connecting="Se conectează..."
-Basic.Main.StartRecording="Începe înregistrarea"
+Basic.Main.StartRecording="Pornește înregistrarea"
-Basic.Main.StartStreaming="Porneşte Stream"
+Basic.Main.StartStreaming="Pornește streamingul"
 Basic.Main.StopRecording="Oprește înregistrarea"
-Basic.Main.StopStreaming="Oprește streaming-ul"
+Basic.Main.StopStreaming="Oprește streamingul"
-Basic.Main.ForceStopStreaming="Oprire Streaming (renunţaţi la întârziere)"
+Basic.Main.ForceStopStreaming="Oprește streamingul (renunță la întârziere)"
 
-Basic.MainMenu.File="&Fişier"
+Basic.MainMenu.File="&Fișier"
-Basic.MainMenu.File.Export="&Export"
+Basic.MainMenu.File.Export="&Exportă"
-Basic.MainMenu.File.Import="&Import"
+Basic.MainMenu.File.Import="&Importă"
-Basic.MainMenu.File.ShowRecordings="Arată &Înregistrări"
+Basic.MainMenu.File.ShowRecordings="Arată în&registrări"
-Basic.MainMenu.File.Remux="Înregistrări &Remux"
+Basic.MainMenu.File.Remux="Înregistrări re&mux"
 Basic.MainMenu.File.Settings="&Setări"
-Basic.MainMenu.File.ShowSettingsFolder="Arată Folderul Setări"
+Basic.MainMenu.File.ShowSettingsFolder="Arată folderul cu setări"
-Basic.MainMenu.File.ShowProfileFolder="Arată Folderul Profiluri"
+Basic.MainMenu.File.ShowProfileFolder="Arată folderul cu profil"
-Basic.MainMenu.AlwaysOnTop="&Întotdeauna Deasupra"
+Basic.MainMenu.AlwaysOnTop="Întotde&auna deasupra"
 Basic.MainMenu.File.Exit="Ieșire (&X)"
 
 Basic.MainMenu.Edit="&Editare"
-Basic.MainMenu.Edit.Undo="&Inapoi"
+Basic.MainMenu.Edit.Undo="An&ulează acțiunea"
-Basic.MainMenu.Edit.Redo="&Refacere"
+Basic.MainMenu.Edit.Redo="&Refă acțiunea"
-Basic.MainMenu.Edit.UndoAction="&Inapoi $1"
+Basic.MainMenu.Edit.UndoAction="An&ulează $1"
-Basic.MainMenu.Edit.RedoAction="&Refaceţi $1"
+Basic.MainMenu.Edit.RedoAction="&Refă $1"
 Basic.MainMenu.Edit.Transform="&Transformare"
-Basic.MainMenu.Edit.Transform.EditTransform="&Editare transformare..."
+Basic.MainMenu.Edit.Transform.EditTransform="&Editează transformarea..."
-Basic.MainMenu.Edit.Transform.ResetTransform="&Resetare transformare"
+Basic.MainMenu.Edit.Transform.ResetTransform="&Resetează transformarea"
-Basic.MainMenu.Edit.Transform.Rotate90CW="Rotire la 90 de grade conform acelor de ceasornic"
+Basic.MainMenu.Edit.Transform.Rotate90CW="Rotește la 90° (în sensul acelor ceasornicului)"
-Basic.MainMenu.Edit.Transform.Rotate90CCW="Rotire la 90 de grade invers acelor de ceasornic"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="Rotește la 90° (în sensul contrar acelor ceasornicului)"
-Basic.MainMenu.Edit.Transform.Rotate180="Rotește 180 de grade"
+Basic.MainMenu.Edit.Transform.Rotate180="Rotește la 180°"
-Basic.MainMenu.Edit.Transform.FlipHorizontal="Răstoarnă &Orizontal"
+Basic.MainMenu.Edit.Transform.FlipHorizontal="Răstoarnă &orizontal"
-Basic.MainMenu.Edit.Transform.FlipVertical="Răstoarnă &Vertical"
+Basic.MainMenu.Edit.Transform.FlipVertical="Răstoarnă &vertical"
 Basic.MainMenu.Edit.Transform.FitToScreen="&Potrivește pe ecran"
-Basic.MainMenu.Edit.Transform.StretchToScreen="&Intinde pe ecran"
+Basic.MainMenu.Edit.Transform.StretchToScreen="În&tinde pe ecran"
 Basic.MainMenu.Edit.Transform.CenterToScreen="&Centrează pe ecran"
-Basic.MainMenu.Edit.Order="&Ordine"
+Basic.MainMenu.Edit.Order="&Ordonare"
-Basic.MainMenu.Edit.Order.MoveUp="Mută &Sus"
+Basic.MainMenu.Edit.Order.MoveUp="Mută &sus"
-Basic.MainMenu.Edit.Order.MoveDown="Mută &Jos"
+Basic.MainMenu.Edit.Order.MoveDown="Mută &jos"
-Basic.MainMenu.Edit.Order.MoveToTop="Mută &Prima"
+Basic.MainMenu.Edit.Order.MoveToTop="Mu&tă în vârf"
-Basic.MainMenu.Edit.Order.MoveToBottom="Mută &Ultima"
+Basic.MainMenu.Edit.Order.MoveToBottom="Mută la fu&nd"
-Basic.MainMenu.Edit.AdvAudio="&Proprietăţi Audio Avansate"
+Basic.MainMenu.Edit.AdvAudio="Proprietăți audio &avansate"
 
-Basic.MainMenu.SceneCollection="Colectia de &Scene"
+Basic.MainMenu.SceneCollection="Colecție de &scene"
 Basic.MainMenu.Profile="&Profil"
 
 Basic.MainMenu.Help="&Ajutor"
-Basic.MainMenu.Help.Website="Vizitați site-ul &web"
+Basic.MainMenu.Help.Website="Vizitează site-ul &web"
-Basic.MainMenu.Help.Logs="&Fişierele jurnal"
+Basic.MainMenu.Help.Logs="Fișiere jurna&l"
-Basic.MainMenu.Help.Logs.ShowLogs="&Arată fişierele jurnal"
+Basic.MainMenu.Help.Logs.ShowLogs="Arată &fișierele jurnal"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Încărcaţi &fişierul de Log curent"
 Basic.MainMenu.Help.Logs.UploadLastLog="Încărcaţi &ultimul fișier log"
-Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vezi log-ul curent"
+Basic.MainMenu.Help.Logs.ViewCurrentLog="&Vezi log-ul actual"
-Basic.MainMenu.Help.CheckForUpdates="Verifică pentru Actualizare"
+Basic.MainMenu.Help.CheckForUpdates="Caută actualizări"
 
 Basic.Settings.ProgramRestart="Programul trebuie repornit pentru ca aceste setări să aibă efect."
-Basic.Settings.ConfirmTitle="Confirmare modificări"
+Basic.Settings.ConfirmTitle="Confirmă modificările"
-Basic.Settings.Confirm="Ai modificări nesalvate.  Salvați modificările?"
+Basic.Settings.Confirm="Ai modificări nesalvate.  Salvezi modificările?"
 
-Basic.Settings.General="General"
+Basic.Settings.General="Generale"
 Basic.Settings.General.Theme=" Temă"
 Basic.Settings.General.Language="Limbă"
-Basic.Settings.General.WarnBeforeStartingStream="Arata dialog de confirmare la pornirea streamului"
+Basic.Settings.General.WarnBeforeStartingStream="Arată dialog de confirmare când pornește streamul"
-Basic.Settings.General.WarnBeforeStoppingStream="Arata dialog de confirmare la oprirea streamului"
+Basic.Settings.General.WarnBeforeStoppingStream="Arată dialog de confirmare când se oprește streamul"
+Basic.Settings.General.Snapping="Alipire la alinierea cu sursa"
+Basic.Settings.General.ScreenSnapping="Aliniază sursele la marginea ecranului"
+Basic.Settings.General.CenterSnapping="Aliniază sursele la centrul vertical și orizontal"
+Basic.Settings.General.SourceSnapping="Aliniază sursele la alte surse"
+Basic.Settings.General.SnapDistance="Sensibilitatea alinierii"
 
 Basic.Settings.Stream="Stream"
-Basic.Settings.Stream.StreamType="Tip de Stream"
+Basic.Settings.Stream.StreamType="Tipul streamului"
 
-Basic.Settings.Output="Ieşire"
+Basic.Settings.Output="Ieșire"
 Basic.Settings.Output.Format="Format de înregistrare"
 Basic.Settings.Output.Encoder="Codificator"
-Basic.Settings.Output.SelectDirectory="Selectati folderul de Inregistrari"
+Basic.Settings.Output.SelectDirectory="Selectează folderul de înregistrări"
-Basic.Settings.Output.SelectFile="Selectati fisierul de Inregistrari"
+Basic.Settings.Output.SelectFile="Selectează fișierul de înregistrări"
-Basic.Settings.Output.Mode="Modul de ieşire"
+Basic.Settings.Output.EnforceBitrate="Forțează limitele ratei de biți pentru streaming"
+Basic.Settings.Output.Mode="Mod de ieșire"
 Basic.Settings.Output.Mode.Simple="Simplu"
 Basic.Settings.Output.Mode.Adv="Avansat"
-Basic.Settings.Output.Mode.FFmpeg="Ieşire FFmpeg"
+Basic.Settings.Output.Mode.FFmpeg="Ieșire FFmpeg"
-Basic.Settings.Output.Simple.SavePath="Calea de înregistrare"
+Basic.Settings.Output.Simple.SavePath="Cale de înregistrare"
-Basic.Settings.Output.Simple.RecordingQuality="Calitatea înregistrarii"
+Basic.Settings.Output.Simple.RecordingQuality="Calitatea înregistrării"
-Basic.Settings.Output.Simple.RecordingQuality.Stream="La fel ca stream-ul"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="La fel cu cea a streamului"
-Basic.Settings.Output.Simple.RecordingQuality.Small="Calitate înaltă, Marime medie"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Calitate înaltă, dimensiune medie a fișierului"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Calitate imposibil de distins, Marime mare"
-Basic.Settings.Output.Simple.RecordingQuality.Lossless="Calitate fara pierderi (lossless), Marime enorm de mare"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Calitate lossless, dimensiune extrem de mare a fișierelor"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Atentie: Bitrate-ul pentru video stream va fi setat la %1, care este limita superioară pentru serviciul de streaming actual.  Dacă sunteţi sigur că doriţi să depasiţi %1, permiteţi opțiuni codare avansate şi debifaţi \"Forteaza limite de bitrate pentru stream\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Atentie: Bitrate-ul pentru audio stream va fi setat la %1, care este limita superioară pentru serviciul de streaming actual.  Dacă sunteţi sigur că doriţi să depasiţi %1, permiteţi opțiuni codare avansate şi debifaţi \"Forteaza limite de bitrate pentru stream\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Atenție: Înregistrarea cu un encoder software la o calitate diferită decât stream-ul va necesita o utilizare CPU crescută dacă faci stream şi înregistrezi în acelaşi timp."
-Basic.Settings.Output.Simple.Warn.Lossless="Atenţie: Calitatea Lossless generează dimensiuni de fişier extrem de mari!  Calitatea Lossless poate utiliza peste 7GB pe minut, la frame-uri şi rezolutii mari. Lossless nu este recomandat pentru  înregistrări lungi decât dacă aveţi o cantitate foarte mare de spaţiu disponibil."
+Basic.Settings.Output.Simple.Warn.Lossless="Avertisment: Calitatea lossless generează dimensiuni extrem de mari de fișiere! Calitatea lossless poate utiliza până la 7GB spațiu de disc per minut la frecvențe de cadre și rezoluții ridicate. Lossless nu este recomandat pentru înregistrări lungi decât dacă ai o cantitate foarte mare de spațiu disponibil pe disc."
-Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sunteţi sigur că doriţi să utilizaţi calitatea lossless?"
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="Sigur dorești să folosești calitatea lossless?"
-Basic.Settings.Output.Simple.Warn.Lossless.Title="Avertizare calitate lossless!"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Avertizare privind calitatea lossless!"
 Basic.Settings.Output.Simple.Encoder.Software="Software (x264)"
-Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (preset x264 cu utilizare scazuta CPU, creşte dimensiunea fişierului)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hardware (QSV)"
-Basic.Settings.Output.VideoBitrate="Video Bitrate"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hardware (NVENC)"
-Basic.Settings.Output.AudioBitrate="Audio Bitrate"
+Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Software (presetare x264 cu utilizare scăzută de CPU, crește dimensiunea fișierului)"
-Basic.Settings.Output.Reconnect="Reconectare Automată"
+Basic.Settings.Output.VideoBitrate="Rată de biți video"
-Basic.Settings.Output.RetryDelay="Intârziere reincercare (secunde)"
+Basic.Settings.Output.AudioBitrate="Rată de biți audio"
-Basic.Settings.Output.MaxRetries="Maxim de reîncercări"
+Basic.Settings.Output.Reconnect="Reconectare automată"
-Basic.Settings.Output.Advanced="Activează Setări Codare Avansate"
+Basic.Settings.Output.RetryDelay="Întârziere pentru reîncercare (secunde)"
-Basic.Settings.Output.EncoderPreset="Preset Codare (mai mare = mai puţin CPU)"
+Basic.Settings.Output.MaxRetries="Încercări maxime"
-Basic.Settings.Output.CustomEncoderSettings="Setări Particularizate Codare"
+Basic.Settings.Output.Advanced="Activează setările avansate ale codificatorului"
-Basic.Settings.Output.CustomMuxerSettings="Setări particularizate pentru Muxer"
+Basic.Settings.Output.EncoderPreset="Presetare a codificatorului (mai mare = mai puțin CPU)"
-Basic.Settings.Output.NoSpaceFileName="Generează nume de fişier fără spaţiu"
+Basic.Settings.Output.CustomEncoderSettings="Setări particularizate ale codificatorului"
+Basic.Settings.Output.CustomMuxerSettings="Setări particularizate ale muxerului"
+Basic.Settings.Output.NoSpaceFileName="Generează nume de fișier fără spațiu"
 
-Basic.Settings.Output.Adv.Rescale="Rescaleaza Fisierul de iesire"
+Basic.Settings.Output.Adv.Rescale="Rescalează ieșirea"
-Basic.Settings.Output.Adv.AudioTrack="Piesa Audio"
+Basic.Settings.Output.Adv.AudioTrack="Pistă audio"
 Basic.Settings.Output.Adv.Streaming="Streaming"
-Basic.Settings.Output.Adv.ApplyServiceSettings="Aplica setarile serviciului de codare pentru stream"
+Basic.Settings.Output.Adv.ApplyServiceSettings="Aplică setările codificatorului pentru serviciul de streaming"
-Basic.Settings.Output.Adv.Audio.Track1="Piesa 1"
+Basic.Settings.Output.Adv.Audio.Track1="Pistă 1"
-Basic.Settings.Output.Adv.Audio.Track2="Piesa 2"
+Basic.Settings.Output.Adv.Audio.Track2="Pistă 2"
-Basic.Settings.Output.Adv.Audio.Track3="Piesa 3"
+Basic.Settings.Output.Adv.Audio.Track3="Pistă 3"
-Basic.Settings.Output.Adv.Audio.Track4="Piesa 4"
+Basic.Settings.Output.Adv.Audio.Track4="Pistă 4"
 
 Basic.Settings.Output.Adv.Recording="Înregistrare"
 Basic.Settings.Output.Adv.Recording.Type="Tip"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
-Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Output Personalizat (FFmpeg)"
+Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Ieșire personalizată (FFmpeg)"
-Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Utilizaţi codare stream)"
+Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Folosește codificatorul de stream)"
-Basic.Settings.Output.Adv.FFmpeg.Type="Tipul de ieşire FFmpeg"
+Basic.Settings.Output.Adv.Recording.Filename="Formatarea numelui de fișier"
-Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ieşire la URL"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Suprascrie dacă fișierul există"
-Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ieşire la fişier"
+Basic.Settings.Output.Adv.FFmpeg.Type="Tipul ieșirii FFmpeg"
-Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Formate de înregistrare"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ieșire spre URL"
-Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Toate fişierele"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ieșire spre fișier"
-Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Calea fisierului sau URL-ul"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Formate comune de înregistrare"
-Basic.Settings.Output.Adv.FFmpeg.Format="Format de recipient"
+Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Toate fișierele"
+Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Calea fișierului sau URL-ul"
+Basic.Settings.Output.Adv.FFmpeg.Format="Format container"
 Basic.Settings.Output.Adv.FFmpeg.FormatAudio="Audio"
 Basic.Settings.Output.Adv.FFmpeg.FormatVideo="Video"
-Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Formatul implicit"
+Basic.Settings.Output.Adv.FFmpeg.FormatDefault="Format implicit"
 Basic.Settings.Output.Adv.FFmpeg.FormatDesc="Descriere Format Recipient"
 Basic.Settings.Output.Adv.FFmpeg.FormatDescDef="Codecul Audio/Video ghicit din calea fisierului sau URL-ul"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Encoder implicit"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDefault="Codificator implicit"
-Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Dezactivaţi Encoder"
+Basic.Settings.Output.Adv.FFmpeg.AVEncoderDisable="Dezactivează codificatorul"
-Basic.Settings.Output.Adv.FFmpeg.VEncoder="Encoder Video"
+Basic.Settings.Output.Adv.FFmpeg.VEncoder="Codificator video"
-Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Setările video Encoder (dacă există)"
+Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Setările codificatorului video (dacă există)"
-Basic.Settings.Output.Adv.FFmpeg.AEncoder="Encoder Audio"
+Basic.Settings.Output.Adv.FFmpeg.AEncoder="Codificator audio"
-Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Setările audio Encoder (dacă există)"
+Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Setările codificatorului audio (dacă există)"
-Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Setări Muxer (dacă există)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Setările muxerului (dacă există)"
+
+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"
+
+FilenameFormatting.TT="%CCYY		An, patru cifre\n%YY		An, ultimele 2 cifre (00-99)\n%MM		Luna ca numar decimal (01-12)\n%DD		Ziua lunii, prefixat cu 0 (01-31)\n%hh		Ora in format 24h (00-23)\n%mm		Minut (00-59)\n%ss		Secunda (00-61)\n%%		Un % semn\n%a		Numele zilei abreviat\n%A		Numele zilei full\n%b		Numele lunii abreviat\n%B		Numele lunii full\n%d		Ziua lunii, prefixat cu 0 (01-31)\n%H		Ora in format 24h (00-23)\n%I		Ora in format 12h (01-12)\n%m		Luna ca numar decimal (01-12)\n%M		Minut (00-59)\n%p		Desemnari AM or PM\n%S		Secunda (00-61)\n%y		An, ultimele 2 cifre (00-99)\n%Y		An\n%z		ISO 8601 compensare UTC or fus orar\n		nume sau abreviere\n%Z		Numele fusului orar sau abreviere\n"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Adaptor video:"
-Basic.Settings.Video.BaseResolution="Rezoluţia de bază (panza):"
+Basic.Settings.Video.BaseResolution="Rezoluție (canvas) de bază:"
-Basic.Settings.Video.ScaledResolution="Ieşire rezoluţie (scalată):"
+Basic.Settings.Video.ScaledResolution="Rezoluție (scalată) la ieșire:"
-Basic.Settings.Video.DownscaleFilter="Filtru descalare:"
+Basic.Settings.Video.DownscaleFilter="Filtru pentru descalare:"
-Basic.Settings.Video.DisableAeroWindows="Dezactivare Aero (numai Windows)"
+Basic.Settings.Video.DisableAeroWindows="Dezactivează Aero (Numai Windows)"
 Basic.Settings.Video.FPS="FPS:"
-Basic.Settings.Video.FPSCommon="Valorile comune ale FPS"
+Basic.Settings.Video.FPSCommon="Valori FPS comune"
-Basic.Settings.Video.FPSInteger="Număr întreg valoare FPS"
+Basic.Settings.Video.FPSInteger="Valoare cu număr întreg pentru FPS"
-Basic.Settings.Video.FPSFraction="Valoare FPS fracţionată"
+Basic.Settings.Video.FPSFraction="Valoare FPS fracționată"
-Basic.Settings.Video.Numerator="Numărătorul:"
+Basic.Settings.Video.Numerator="Numărător:"
-Basic.Settings.Video.Denominator="Numitorul:"
+Basic.Settings.Video.Denominator="Numitor:"
-Basic.Settings.Video.Renderer="Randare:"
+Basic.Settings.Video.Renderer="Renderer:"
 Basic.Settings.Video.InvalidResolution="Valoare rezoluţie invalidă.  Trebuie să fie [latime]x[înălţime] (de exemplu, 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Ieşirea video este în prezent activă.  Vă rugăm să opriţi orice ieşiri pentru a schimba setările video."
-Basic.Settings.Video.DisableAero="Dezactivare Aero"
+Basic.Settings.Video.DisableAero="Dezactivează Aero"
 
-Basic.Settings.Video.DownscaleFilter.Bilinear="Biliniar (mai rapid, dar neclar la scalare)"
+Basic.Settings.Video.DownscaleFilter.Bilinear="Biliniar (Cel mai rapid, dar neclar în cazul scalării)"
-Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Scalare ascutita, 16 mostre)"
+Basic.Settings.Video.DownscaleFilter.Bicubic="Bicubic (Scalare ascuțită, 16 mostre)"
-Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Scalare ascutita, 32 de mostre)"
+Basic.Settings.Video.DownscaleFilter.Lanczos="Lanczos (Scalare ascuțită, 32 de mostre)"
 
 Basic.Settings.Audio="Audio"
-Basic.Settings.Audio.SampleRate="Rata de eşantionare"
+Basic.Settings.Audio.SampleRate="Rată de eșantionare"
 Basic.Settings.Audio.Channels="Canale"
-Basic.Settings.Audio.DesktopDevice="Dispozitiv Audio Desktop"
+Basic.Settings.Audio.DesktopDevice="Dispozitiv audio desktop"
-Basic.Settings.Audio.DesktopDevice2="Dispozitiv Audio Desktop 2"
+Basic.Settings.Audio.DesktopDevice2="Dispozitiv audio desktop 2"
-Basic.Settings.Audio.AuxDevice="Dispozitiv Audio microfon/auxiliar"
+Basic.Settings.Audio.AuxDevice="Dispozitiv audio microfon/auxiliar"
-Basic.Settings.Audio.AuxDevice2="Dispozitiv Audio microfon/auxiliar 2"
+Basic.Settings.Audio.AuxDevice2="Dispozitiv audio microfon/auxiliar 2"
-Basic.Settings.Audio.AuxDevice3="Dispozitiv Audio microfon/auxiliar 3"
+Basic.Settings.Audio.AuxDevice3="Dispozitiv audio microfon/auxiliar 3"
-Basic.Settings.Audio.EnablePushToMute="Porneste Push-to-mute"
+Basic.Settings.Audio.EnablePushToMute="Pornește push-to-mute"
-Basic.Settings.Audio.PushToMuteDelay="Intarziere Push-to-mute"
+Basic.Settings.Audio.PushToMuteDelay="Întârziere push-to-mute"
-Basic.Settings.Audio.EnablePushToTalk="Permite Push-to-talk"
+Basic.Settings.Audio.EnablePushToTalk="Activează push-to-talk"
-Basic.Settings.Audio.PushToTalkDelay="Intarziere Push-to-talk"
+Basic.Settings.Audio.PushToTalkDelay="Întârziere push-to-talk"
 Basic.Settings.Audio.UnknownAudioDevice="[Dispozitivul nu este disponibil sau nu este conectat]"
 
-Basic.Settings.Advanced="Avansat"
+Basic.Settings.Advanced="Avansate"
 Basic.Settings.Advanced.FormatWarning="Atentie: Formatele de culori diferite de NV12 sunt facute pentru inregistrare si nu sunt recomandate in cazul streaming-ului. Streaming-ul e posibil sa ceara mai multe resurse CPU datorita conversiei formatului culorii."
-Basic.Settings.Advanced.Audio.BufferingTime="Timp tampon Audio"
+Basic.Settings.Advanced.Audio.BufferingTime="Timp de buffering pentru audio"
 Basic.Settings.Advanced.Video.ColorFormat="Format de culoare"
-Basic.Settings.Advanced.Video.ColorSpace="Spaţiul de culoare YUV"
+Basic.Settings.Advanced.Video.ColorSpace="Spațiu de culori YUV"
-Basic.Settings.Advanced.Video.ColorRange="Gama de culori YUV"
+Basic.Settings.Advanced.Video.ColorRange="Gamă de culori YUV"
-Basic.Settings.Advanced.Video.ColorRange.Partial="Parţial"
+Basic.Settings.Advanced.Video.ColorRange.Partial="Parțială"
-Basic.Settings.Advanced.Video.ColorRange.Full="Full"
+Basic.Settings.Advanced.Video.ColorRange.Full="Completă"
-Basic.Settings.Advanced.StreamDelay="Intârziere/delay stream"
+Basic.Settings.Advanced.StreamDelay="Întârziere pentru stream"
-Basic.Settings.Advanced.StreamDelay.Duration="Durata (secunde)"
+Basic.Settings.Advanced.StreamDelay.Duration="Durată (secunde)"
-Basic.Settings.Advanced.StreamDelay.Preserve="Păstrează punctul de taiere (creştere întârziere) la reconectare"
+Basic.Settings.Advanced.StreamDelay.Preserve="Păstrează punctul de tăiere (crește întârzierea) la reconectare"
-Basic.Settings.Advanced.StreamDelay.MemoryUsage="Estimare Folosire Memorie: %1 MB"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Utilizare estimată a memoriei: %1 MB"
 
-Basic.AdvAudio="Proprietăţi Audio Avansate"
+Basic.AdvAudio="Proprietăți audio avansate"
 Basic.AdvAudio.Name="Nume"
 Basic.AdvAudio.Volume="Volum (%)"
-Basic.AdvAudio.Mono="Transformă in Mono"
+Basic.AdvAudio.Mono="Transformă în mono"
 Basic.AdvAudio.Panning="Panning"
-Basic.AdvAudio.SyncOffset="Compensare Sincronizare (ms)"
+Basic.AdvAudio.SyncOffset="Decalajul sincronizării (ms)"
-Basic.AdvAudio.AudioTracks="Piese"
+Basic.AdvAudio.AudioTracks="Piste"
 
-Basic.Settings.Hotkeys="Taste Rapide/Hotkeys"
+Basic.Settings.Hotkeys="Taste rapide"
-Basic.Settings.Hotkeys.Pair="Combinaţiile de taste în comun cu \"%1\" acţionează precum un comutator"
+Basic.Settings.Hotkeys.Pair="Combinațiile de taste partajate cu '%1' acționează ca comutatoare"
 
-Basic.Hotkeys.StartStreaming="Porneşte Stream"
+Basic.Hotkeys.StartStreaming="Pornește streamingul"
-Basic.Hotkeys.StopStreaming="Oprește streaming-ul"
+Basic.Hotkeys.StopStreaming="Oprește streamingul"
-Basic.Hotkeys.StartRecording="Începe înregistrarea"
+Basic.Hotkeys.StartRecording="Pornește înregistrarea"
 Basic.Hotkeys.StopRecording="Oprește înregistrarea"
-Basic.Hotkeys.SelectScene="Comutaţi la scena"
+Basic.Hotkeys.SelectScene="Comută la scenă"
 
-Hotkeys.Insert="Inserare"
+Hotkeys.Insert="Inserează"
-Hotkeys.Delete="Ştergeţi"
+Hotkeys.Delete="Șterge"
 Hotkeys.Home="Home"
 Hotkeys.End="End"
 Hotkeys.PageUp="Page Up"
@@ -440,29 +479,29 @@ Hotkeys.Windows="Windows"
 Hotkeys.Super="Super"
 Hotkeys.Menu="Meniu"
 Hotkeys.Space="Space"
-Hotkeys.NumpadNum="NumPad %1"
+Hotkeys.NumpadNum="Numpad %1"
 Hotkeys.NumpadMultiply="Numpad Multiplica"
 Hotkeys.NumpadDivide="Numpad Divide"
 Hotkeys.NumpadAdd="Numpad Aduna"
 Hotkeys.NumpadSubtract="Numpad Scade"
 Hotkeys.NumpadDecimal="Numpad Zecimal"
-Hotkeys.AppleKeypadNum="%1 (Keypad)"
+Hotkeys.AppleKeypadNum="%1 (Tastatură numerică)"
-Hotkeys.AppleKeypadMultiply="* (Tastatura)"
+Hotkeys.AppleKeypadMultiply="* (Tastatură numerică)"
-Hotkeys.AppleKeypadDivide="/ (Tastatura)"
+Hotkeys.AppleKeypadDivide="/ (Tastatură numerică)"
-Hotkeys.AppleKeypadAdd="+ (Tastatura)"
+Hotkeys.AppleKeypadAdd="+ (Tastatură numerică)"
-Hotkeys.AppleKeypadSubtract="- (Tastatura)"
+Hotkeys.AppleKeypadSubtract="- (Tastatură numerică)"
-Hotkeys.AppleKeypadDecimal=". (Tastatura)"
+Hotkeys.AppleKeypadDecimal=". (Tastatură numerică)"
-Hotkeys.AppleKeypadEqual="= (Tastatura)"
+Hotkeys.AppleKeypadEqual="= (Tastatură numerică)"
 Hotkeys.MouseButton="Mouse %1"
 
-Mute="Mut"
+Mute="Pune pe mut"
-Unmute="Dezactiveaza Mut"
+Unmute="Scoate de pe mut"
-Push-to-mute="Push-to-mut"
+Push-to-mute="Push-to-mute"
 Push-to-talk="Push-to-talk"
 
-SceneItemShow="Arată \"%1\""
+SceneItemShow="Arată „%1”"
-SceneItemHide="Ascunde \"%1\""
+SceneItemHide="Ascunde „%1”"
 
-OutputWarnings.NoTracksSelected="Trebuie să selectaţi cel puţin o piesa"
+OutputWarnings.NoTracksSelected="Trebuie să selectezi cel puțin o pistă"
-OutputWarnings.MultiTrackRecording="Atentie: Anumite formate (precum FLV) nu acceptă mai multe piese pentru înregistrare"
+OutputWarnings.MultiTrackRecording="Atenție: Anumite formate (precum FLV) nu suportă multiple piste per înregistrare"
 

obs/data/locale/ru-RU.ini

@@ -8,6 +8,7 @@ Cancel="Отмена"
 Close="Закрыть"
 Save="Сохранить"
 Discard="Отклонить"
+Disable="Отключить"
 Yes="Да"
 No="Нет"
 Add="Добавить"
@@ -38,15 +39,34 @@ Untitled="Безымянный"
 New="Создать"
 Duplicate="Дублировать"
 Enable="Включить"
+DisableOSXVSync="Отключить OSX V-Sync"
+ResetOSXVSyncOnExit="Сброс OSX V-Sync на выходе"
 HighResourceUsage="Кодировщик перегружен! Попробуйте понизить настройки видео или использовать более быстрые настройки кодировщика."
 Transition="Переход"
 QuickTransitions="Быстрые переходы"
+Left="Слева"
+Right="Справа"
+Top="Сверху"
+Bottom="Снизу"
 
+QuickTransitions.SwapScenes="Замена Просмотра/Вывода Сцены После Перехода"
+QuickTransitions.SwapScenesTT="Замена просмотра и вывода сцены после перехода (если выходная оригинальная сцена до сих пор существует).\nЭто будет не отмена каких-либо изменений, что, возможно, было сделано в выходной оригинальной сцены."
+QuickTransitions.DuplicateScene="Повторяющиеся Сцены"
+QuickTransitions.DuplicateSceneTT="При редактировании одной и той же сцены, функция позволяет трансформировать редактирования/видимости источников без изменения выхода.\nДля редактирования свойств источников без изменения выходного сигнала, включить \"дублировать источники'.\nИзменение этого параметра приведет к сбросу выходного сигнала в сцене (если оно еще существует)."
+QuickTransitions.EditProperties="Дублировать Источники"
+QuickTransitions.EditPropertiesTT="При редактировании одной и той же сцены, функция позволяет редактировать свойства источников без изменения выхода.\nЭто может только использоваться, если \"Повторяющиеся Сцены\" включен.\nНекоторые источники (такие как захват или медиа-источники) не поддерживаются и не могут быть отредактированы отдельно.\nИзменение этого параметра приведет к сбросу выходного сигнала в сцене (если оно еще существует).\n\nПредупреждение: поскольку источники будут дублироваться, это может потребовать дополнительных системных ресурсов или видео."
 QuickTransitions.HotkeyName="Быстрый переход: %1"
 
+Basic.AddTransition="Добавить настраиваемый переход"
+Basic.RemoveTransition="Удалить настраиваемый переход"
+Basic.TransitionProperties="Параметры перехода"
+Basic.SceneTransitions="Переходы между сценами"
 Basic.TransitionDuration="Длительность"
 Basic.TogglePreviewProgramMode="Режим студии"
 
+TransitionNameDlg.Text="Пожалуйста, введите имя перехода"
+TransitionNameDlg.Title="Имя перехода"
+
 TitleBar.Profile="Профиль"
 TitleBar.Scenes="Сцены"
 
@@ -71,7 +91,7 @@ ConfirmRemove.Text="Вы уверены, что хотите удалить '$1'
 Output.ConnectFail.Title="Не удалось подключиться"
 Output.ConnectFail.BadPath="Неверный путь или URL соединения. Пожалуйста, проверьте настройки, чтобы подтвердить, что они являются действительными."
 Output.ConnectFail.ConnectFailed="Не удалось подключиться к серверу"
-Output.ConnectFail.InvalidStream="Не удалось получить доступ к указанному каналу или к stream key. Это может быть, потому что ключ/канал является недействительным, или потому, что сервер все еще думает, что вы зашли"
+Output.ConnectFail.InvalidStream="Не удалось получить доступ к указанному ключу канала или стрима, пожалуйста, перепроверьте ключ. Если он правильный, проблема может быть с подключением к серверу."
 Output.ConnectFail.Error="Произошла непредвиденная ошибка при попытке подключиться к серверу. Более подробная информация в лог-файле."
 Output.ConnectFail.Disconnected="Отключен от сервера."
 
@@ -98,7 +118,7 @@ LicenseAgreement.Exit="Выход"
 Remux.SourceFile="OBS Запись"
 Remux.TargetFile="Конечный файл"
 Remux.Remux="Ремультиплексирование"
-Remux.RecordingPattern="OBS запись (*.flv)"
+Remux.OBSRecording="OBS Запись"
 Remux.FinishedTitle="Ремультиплексирование завершено"
 Remux.Finished="Запись ремультиплексирована"
 Remux.FinishedError="Запись ремультиплексирована, но файл может быть неполон"
@@ -124,6 +144,18 @@ Basic.DisplayCapture="Захват экрана"
 
 Basic.Main.PreviewConextMenu.Enable="Включить предпросмотр"
 
+Deinterlacing="Устранение чересстрочности"
+Deinterlacing.Discard="Отклонить"
+Deinterlacing.Retro="Ретро"
+Deinterlacing.Blend="Смешивание"
+Deinterlacing.Blend2x="Смешивание 2x"
+Deinterlacing.Linear="Линейно"
+Deinterlacing.Linear2x="Линейно 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Верхнее поле первое"
+Deinterlacing.BottomFieldFirst="Нижнее поле первое"
+
 Basic.Main.AddSceneDlg.Title="Добавить сцену"
 Basic.Main.AddSceneDlg.Text="Пожалуйста, введите название сцены"
 
@@ -189,6 +221,7 @@ Basic.TransformWindow.Alignment="Выравнивание позиции"
 Basic.TransformWindow.BoundsType="Тип ограничителя"
 Basic.TransformWindow.BoundsAlignment="Выравнивание внутри ограничителя"
 Basic.TransformWindow.Bounds="Размер ограничителя"
+Basic.TransformWindow.Crop="Обрезка"
 
 Basic.TransformWindow.Alignment.TopLeft="Сверху слева"
 Basic.TransformWindow.Alignment.TopCenter="Сверху по центру"
@@ -275,6 +308,11 @@ Basic.Settings.General.Theme="Тема"
 Basic.Settings.General.Language="Язык"
 Basic.Settings.General.WarnBeforeStartingStream="Показывать окно подтверждения при запуске трансляции"
 Basic.Settings.General.WarnBeforeStoppingStream="Показывать окно подтверждения при остановке трансляции"
+Basic.Settings.General.Snapping="Привязка расположения источника"
+Basic.Settings.General.ScreenSnapping="Привязка к краю экрана"
+Basic.Settings.General.CenterSnapping="Привязка к центру по горизонтали и вертикали"
+Basic.Settings.General.SourceSnapping="Привязка к другим источникам"
+Basic.Settings.General.SnapDistance="Чувствительность привязки"
 
 Basic.Settings.Stream="Вещание"
 Basic.Settings.Stream.StreamType="Тип вещания"
@@ -284,6 +322,7 @@ Basic.Settings.Output.Format="Формат записи"
 Basic.Settings.Output.Encoder="Кодировщик"
 Basic.Settings.Output.SelectDirectory="Выбрать каталог записи"
 Basic.Settings.Output.SelectFile="Выбрать файл записи"
+Basic.Settings.Output.EnforceBitrate="Следовать ограничениям битрейта, накладываемые потоковой службой"
 Basic.Settings.Output.Mode="Режим вывода"
 Basic.Settings.Output.Mode.Simple="Простой"
 Basic.Settings.Output.Mode.Adv="Расширенные"
@@ -294,11 +333,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="То же, что у тр
 Basic.Settings.Output.Simple.RecordingQuality.Small="Высокое качество, средний размер файла"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Неотличимое качество, большой размер файла"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Без потери качества, чрезвычайно большой размер файла"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Предупреждение: битрейт видео при вещании будет установлен на %1, что является максимумом для текущей потоковой службы. Если вы уверены, что хотите получить битрейт больше %1, включите дополнительные настройки кодировщика и снимите флажок с \"Принудительно использовать ограничения битрейта потоковой службы\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Предупреждение: битрейт аудио при вещании будет установлен на %1, что является максимумом для текущей потоковой службы. Если вы уверены, что хотите получить битрейт больше %1, включите дополнительные настройки кодировщика и снимите флажок с \"Принудительно использовать ограничения битрейта потоковой службы\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Предупреждение: Запись с программным кодировщиком в качестве, отличным от качества трансляции, потребует дополнительной нагрузки на ЦП, если записывать и транслировать одновременно."
 Basic.Settings.Output.Simple.Warn.Lossless="Предупреждение: Качество без потерь создает чрезвычайно большие файлы! Такое качество может использовать свыше 7 гигабайт дискового пространства в минуту при высоком разрешении и частоте кадров. Оно не рекомендуется для долгой записи, если у Вас нет очень много места на диске."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Вы уверены, что хотите записывать без потери качества?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Предупреждение о качестве без потерь!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Предупреждение: вы не можете использовать несколько различных QSV-кодировщиков при одновременной трансляции и записи. Если вы хотите одновременно и транслировать, и записывать, поменяйте либо кодировщик вещания, либо кодировщик записи."
 Basic.Settings.Output.Simple.Encoder.Software="Программный (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Аппаратный (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Аппаратный (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Программный (x264 с низкой нагрузкой на ЦП, увеличивает размер файла)"
 Basic.Settings.Output.VideoBitrate="Видео битрейт"
 Basic.Settings.Output.AudioBitrate="Аудио битрейт"
@@ -325,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="Тип"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Обычный"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Пользовательский вывод (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Использовать кодировщик потока)"
+Basic.Settings.Output.Adv.Recording.Filename="Формат имени файла"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Заменять, если файл уже существует"
 Basic.Settings.Output.Adv.FFmpeg.Type="Тип вывода FFmpeg"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="На указанный адрес (URL)"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="В файл"
@@ -345,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Кодировщик аудио"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Настройки кодировщика аудио (если есть)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Настройки мультиплексора (если есть)"
 
+FilenameFormatting.completer="%DD-%MM-%CCYY %hh-%mm-%ss\n%DD-%MM-%YY %hh-%mm-%ss\n%d-%m-%Y %H-%M-%S\n%d-%m-%y %H-%M-%S\n%a %d-%m-%Y %H-%M-%S\n%A %d-%m-%Y %H-%M-%S\n%d-%b-%Y %H-%M-%S\n%d-%B-%Y %H-%M-%S"
+
+FilenameFormatting.TT="%CCYY	Год, четыре знака\n%YY		Год, последние два знака (00-99)\n%MM		Месяц в числовом значении (01-12)\n%DD		День месяца, ноль не опускается (01-31)\n%hh		Час в 24-часовом формате (00-23)\n%mm		Минута (00-59)\n%ss		Секунда (00-61)\n%%		Знак '%'\n%a		Сокращенное название дня недели\n%A		Полное название дня недели\n%b		Сокращенное название месяца\n%B		Полное название месяца\n%d		День месяца, ноль не опускается (01-31)\n%H		Час в 24 часовом формате (00-23)\n%I		Час в 12 часовом формате (01-12)\n%m		Месяц в числовом значении (01-12)\n%M		Минута (00-59)\n%p		Обозначение AM или PM\n%S		Секунда (00-61)\n%y		Год, последние два знака (00-99)\n%Y		Год\n%z		ISO 8601 смещение от UTC или\n		название или сокращение часового пояса\n%Z		Название или сокращение часового пояса\n"
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видеоадаптер:"
 Basic.Settings.Video.BaseResolution="Базовое (основа) разрешение:"

obs/data/locale/sk-SK.ini

@@ -35,6 +35,7 @@ Enable="Povoliť"
 
 
 
+
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scéna"
 
@@ -67,7 +68,6 @@ LicenseAgreement.Exit="Ukončiť"
 
 Remux.SourceFile="OBS nahrávka"
 Remux.TargetFile="Cieľový súbor"
-Remux.RecordingPattern="OBS nahrávka (*.flv)"
 Remux.SelectRecording="Vybrať OBS nahrávku …"
 Remux.SelectTarget="Vyberte cieľový súbor …"
 Remux.FileExistsTitle="Cieľový súbor existuje"
@@ -81,6 +81,7 @@ Basic.Scene="Scéna"
 Basic.DisplayCapture="Zachytávanie monitora"
 
 
+
 Basic.Main.AddSceneDlg.Title="Pridať scénu"
 Basic.Main.AddSceneDlg.Text="Prosím, zadajte názov scény"
 
@@ -199,6 +200,8 @@ Basic.Settings.Output.Advanced="Povoliť pokročilé nastavenia enkodéra"
 
 
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adaptér:"
 Basic.Settings.Video.DisableAeroWindows="Vypnúť Aero (len Windows)"

obs/data/locale/sl-SI.ini

@@ -30,6 +30,7 @@ DroppedFrames="Izpuščene sličice %1 (%2 %)"
 
 
 
+
 NameExists.Title="Ime že obstaja"
 NameExists.Text="Ime je že v uporabi."
 
@@ -46,7 +47,6 @@ ConfirmRemove.Text="Ali ste prepričani, da želite odstraniti '$ 1'?"
 Output.ConnectFail.Title="Povezava ni uspela"
 Output.ConnectFail.BadPath="Neveljavna pot ali URL povezava. Prosimo, preverite vaše nastavitve za potrditev, da so veljavne."
 Output.ConnectFail.ConnectFailed="Ni uspelo povezati s strežnikom"
-Output.ConnectFail.InvalidStream="Dostop do kanala oz. ključa streama ni mogoč. Mogoče je, da je ključ/kanal napačen ali pa ker ste na serverju še vedno vpisani."
 Output.ConnectFail.Error="Med poskusom povezave s strežnikom je prišlo do nepričakovane napake. Več informacij v log datoteko."
 Output.ConnectFail.Disconnected="Odklopiti od strežnika."
 
@@ -79,6 +79,7 @@ Basic.Scene="Scena"
 Basic.DisplayCapture="Zajemanje zaslona"
 
 
+
 Basic.Main.AddSceneDlg.Title="Dodaj seceno"
 Basic.Main.AddSceneDlg.Text="Prosimo, vnesite ime scene"
 
@@ -199,6 +200,8 @@ Basic.Settings.Output.Advanced="Omogoči napredne nastavitve kodiranja"
 
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Vse datoteke"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Grafična kartica:"
 Basic.Settings.Video.DownscaleFilter="Pomanjševalni filter:"

obs/data/locale/sr-CS.ini

@@ -8,6 +8,7 @@ Cancel="Otkaži"
 Close="Zatvori"
 Save="Sačuvaj"
 Discard="Odbaci"
+Disable="Onemogući"
 Yes="Da"
 No="Ne"
 Add="Dodaj"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Povrati OSX vertikalnu sinhronizaciju po izlasku"
 HighResourceUsage="Enkodiranje preopterećeno! Razmotrite snižavanje video podešavanja ili korišćenje bržeg šablona za enkodiranje."
 Transition="Prelaz"
 QuickTransitions="Brzi prelazi"
+Left="Sleva"
+Right="Zdesna"
+Top="Odozgo"
+Bottom="Odozdo"
 
 QuickTransitions.SwapScenes="Zameni scene pregleda/izlaza nakon prelaza"
 QuickTransitions.SwapScenesTT="Zamenjuje scene pregleda i izlaza nakon prelaza (ako originalna scena izlaza još uvek postoji).\nOvo neće poništiti promene koje su načinjene nad originalnom scenom izlaza."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Dupliraj izvore"
 QuickTransitions.EditPropertiesTT="Kada se menja ista scena, dozvoli promenu svojstava izvora bez promene izlaza.\nOvo može biti upotrebljeno samo ako je 'Dupliraj scene' omogućeno.\nOdređeni izvori (kao što su video hvatanja ili medija izvori) ne podržavaju ovo i ne mogu biti izmenjeni zasebno.\nPromena ove vrednosti će poništiti trenutnu scenu izlaza (ako i dalje postoji).\n\nUpozorenje: Zbog toga što izvori mogu biti duplirani, ovo može zahtevati dodatne sistemske ili video resurse."
 QuickTransitions.HotkeyName="Brzi prelaz: %1"
 
+Basic.AddTransition="Dodaj podesivi prelaz"
+Basic.RemoveTransition="Ukloni podesivi prelaz"
+Basic.TransitionProperties="Svojstva prelaza"
 Basic.SceneTransitions="Prelazi scena"
 Basic.TransitionDuration="Trajanje"
 Basic.TogglePreviewProgramMode="Studijski režim"
 
+TransitionNameDlg.Text="Molim unesite ime prelaza"
+TransitionNameDlg.Title="Ime prelaza"
+
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scene"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Da li ste sigurni da želite izbaciti '$1'?"
 Output.ConnectFail.Title="Neuspešno povezivanje"
 Output.ConnectFail.BadPath="Neispravna putanja ili URL konekcije. Molim proverite vaša podešavanja da potvrdite njihovu ispravnost."
 Output.ConnectFail.ConnectFailed="Neuspešno povezivanje na server"
-Output.ConnectFail.InvalidStream="Ne mogu pristupiti određenom kanalu ili strim ključu. Ovo je moguće, zato što je uneti ključ ili kanal pogrešan, ili zato što server misli da ste i dalje ulogovani."
+Output.ConnectFail.InvalidStream="Ne mogu pristupiti navedenom kanalu ili strim ključu, molim proverite vaš strim ključ. Ako je ispravan, možda postoji problem pri povezivanju na server."
 Output.ConnectFail.Error="Neočekivana greška u povezivanju sa serverom. Više informacija se nalazi u log datoteci."
 Output.ConnectFail.Disconnected="Prekinuta veza sa serverom."
 
@@ -107,7 +118,6 @@ LicenseAgreement.Exit="Izlaz"
 Remux.SourceFile="OBS snimak"
 Remux.TargetFile="Datoteka"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS snimci (*.flv)"
 Remux.FinishedTitle="Remux završen"
 Remux.Finished="Završen remux snimka"
 Remux.FinishedError="Remux završen, ali datoteka možda nije kompletirana"
@@ -133,6 +143,18 @@ Basic.DisplayCapture="Prikaži ulaz"
 
 Basic.Main.PreviewConextMenu.Enable="Omogući pregled"
 
+Deinterlacing="Deinterlejsing"
+Deinterlacing.Discard="Odbaci"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Blend="Stapanje"
+Deinterlacing.Blend2x="Stapanje 2x"
+Deinterlacing.Linear="Linearno"
+Deinterlacing.Linear2x="Linearno 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Prvo gornje polje"
+Deinterlacing.BottomFieldFirst="Prvo donje polje"
+
 Basic.Main.AddSceneDlg.Title="Dodaj scenu"
 Basic.Main.AddSceneDlg.Text="Molim unesite ime scene"
 
@@ -198,6 +220,7 @@ Basic.TransformWindow.Alignment="Poziciono poravnanje"
 Basic.TransformWindow.BoundsType="Tip okvira"
 Basic.TransformWindow.BoundsAlignment="Poravnanje u okviru"
 Basic.TransformWindow.Bounds="Veličina okvira"
+Basic.TransformWindow.Crop="Isecanje"
 
 Basic.TransformWindow.Alignment.TopLeft="Gore levo"
 Basic.TransformWindow.Alignment.TopCenter="Gore centar"
@@ -284,6 +307,11 @@ Basic.Settings.General.Theme="Tema"
 Basic.Settings.General.Language="Jezik"
 Basic.Settings.General.WarnBeforeStartingStream="Prikaži prozor za potvrdu kada se započinju strimovi"
 Basic.Settings.General.WarnBeforeStoppingStream="Prikaži prozor za potvrdu kada se zaustavljaju strimovi"
+Basic.Settings.General.Snapping="Poravnavanje privlačenjem izvora"
+Basic.Settings.General.ScreenSnapping="Privuci izvore ivici ekrana"
+Basic.Settings.General.CenterSnapping="Privuci izvore horizontalnoj i vertikalnoj sredini"
+Basic.Settings.General.SourceSnapping="Privlačenje izvora ka drugim izvorima"
+Basic.Settings.General.SnapDistance="Osetljivost privlačenja"
 
 Basic.Settings.Stream="Strim"
 Basic.Settings.Stream.StreamType="Vrsta strima"
@@ -293,6 +321,7 @@ Basic.Settings.Output.Format="Format snimanja"
 Basic.Settings.Output.Encoder="Enkoder"
 Basic.Settings.Output.SelectDirectory="Odaberi direktorijum za snimanje"
 Basic.Settings.Output.SelectFile="Odaberi datoteku za snimanje"
+Basic.Settings.Output.EnforceBitrate="Sprovedi ograničenja u protoku striming servisa"
 Basic.Settings.Output.Mode="Režim izlaza"
 Basic.Settings.Output.Mode.Simple="Jednostavno"
 Basic.Settings.Output.Mode.Adv="Napredno"
@@ -303,11 +332,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Isto kao strim"
 Basic.Settings.Output.Simple.RecordingQuality.Small="Visoki kvalitet, osrednja veličina datoteke"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Kvalitet sa neprimetnim razlikama, velika datoteka"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Kvalitet bez gubitka, izričito velika datoteka"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Upozorenje: Video protok strima će biti postavljen na %1, što je gornja granica za trenutni striming servis. Ako ste sigurni da želite ići preko %1, omogućite napredne opcije enkodera i isključite \"Sprovedi ograničenja u protoku striming servisa\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Upozorenje: Zvučni protok strima će biti postavljen na %1, što je gornja granica za trenutni striming servis. Ako ste sigurni da želite ići preko %1, omogućite napredne opcije enkodera i isključite \"Sprovedi ograničenja u protoku striming servisa\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Upozorenje: Snimanje sa softverskim enkoderom drugačijeg kvaliteta u odnosu na strim će zahtevati dodatnu procesorsku snagu ako strimujete i snimate u isto vreme."
 Basic.Settings.Output.Simple.Warn.Lossless="Upozorenje: Kvalitet bez gubitka stvara izričito velike datoteke! Kvalitet bez gubitka može koristiti više od 7 gigabajta prostora na disku po minutu pri visokim rezolucijama i framerate-om. Kvalitet bez gubitka nije preporučen za duže snimanje osim ako imate veliku količinu slobodnog prostora na disku."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Da li ste sigurni da želite koristiti kvalitet bez gubitka?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Upozorenje za kvalitet bez gubitka!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Upozorenje: Ne možete koristi više odvojenih QSV enkodera kada emitujete i snimate u isto vreme. Ako želite da emitujete i snimate u isto vreme, molim promenite ili enkoder snimanja ili enkoder emitovanja."
 Basic.Settings.Output.Simple.Encoder.Software="Softverski (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Mašinski (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Mašinski (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Softverski (x264 niska upotreba procesora, povećava veličinu datoteke)"
 Basic.Settings.Output.VideoBitrate="Protok videa"
 Basic.Settings.Output.AudioBitrate="Protok zvuka"
@@ -334,6 +368,8 @@ Basic.Settings.Output.Adv.Recording.Type="Vrsta"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Uobičajeni"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Prilagođeni izlaz (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Koristi strim enkoder)"
+Basic.Settings.Output.Adv.Recording.Filename="Oblikovanje imena datoteke"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Prepiši ako postoji datoteka"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg vrsta ispisa"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Ispis na URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Ispis u datoteku"
@@ -354,6 +390,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Zvučni enkoder"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Podešavanja zvučnog enkodera (ako postoje)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Podešavanja muxer-a (ako postoje)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Godina, četiri cifre\n%YY		Godina, poslednje dve cifre (00-99)\n%MM		Mesec kao decimalni broj (01-12)\n%DD		Dan u mesecu, sa nulom ispred (01-31)\n%hh		Sat u 24-časovnom zapisu (00-23)\n%mm		Minut (00-59)\n%ss		Sekunda (00-61)\n%%		Znak procenta\n%a		Skraćeno ime dana u nedelji\n%A		Puno ime dana u nedelji\n%b		Skraćeno ime meseca\n%B		Puno ime meseca\n%d		Dan u mesecu, sa nulom ispred (01-31)\n%H		Sat u 24-časovnom zapisu (00-23)\n%I		Sat u 12-časovnom zapisu (01-12)\n%m		Mesec kao decimalni broj (01-12)\n%M		Minut (00-59)\n%p		Oznaka za pre ili posle podne\n%S		Sekunda (00-61)\n%y		Godina, poslednje dve cifre (00-99)\n%Y		Godina\n%z		ISO 8601 odstupanje od UTC ili ime\n		vremenske zone ili skraćenica\n%Z		Ime vremenske zone ili skraćenica\n"
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video adapter:"
 Basic.Settings.Video.BaseResolution="Osnovna (površinska) rezolucija:"

obs/data/locale/sr-SP.ini

@@ -8,6 +8,7 @@ Cancel="Откажи"
 Close="Затвори"
 Save="Сачувај"
 Discard="Одбаци"
+Disable="Онемогући"
 Yes="Да"
 No="Не"
 Add="Додај"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="Поврати OSX вертикалну синхрониз
 HighResourceUsage="Енкодирање преоптерећено! Размотрите снижавање видео подешавања ли коришћење бржег шаблона за енкодирање."
 Transition="Прелаз"
 QuickTransitions="Брзи прелази"
+Left="Слева"
+Right="Здесна"
+Top="Одозго"
+Bottom="Одоздо"
 
 QuickTransitions.SwapScenes="Замени сцене прегледа/излаза након прелаза"
 QuickTransitions.SwapScenesTT="Замењује сцене прегледа и излаза након прелаза (ако оригинална сцена још увек постоји).\nОво неће поништити промене које су начињене над оригиналном сценом излаза."
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="Дуплирај изворе"
 QuickTransitions.EditPropertiesTT="Када се мења иста сцена, дозволи промену својстава извора без промене излаза.\nОво може бити употребљено само ако је 'Дуплирај сцене' омогућено.\nОдређени извори (као што су видео хватања или медија извори) не подржавају ово и не могу бити измењени засебно.\nПромена ове вредности ће поништити тренутну сцену излаза (ако и даље постоји).\n\nУпозорење: Због тога што извори могу бити дуплирани, ово може захтевати додатне системске или видео ресурсе."
 QuickTransitions.HotkeyName="Брзи прелаз: %1"
 
+Basic.AddTransition="Додај подесиви прелаз"
+Basic.RemoveTransition="Уклони подесиви прелаз"
+Basic.TransitionProperties="Својства прелаза"
 Basic.SceneTransitions="Прелази сцена"
 Basic.TransitionDuration="Трајање"
 Basic.TogglePreviewProgramMode="Студијски режим"
 
+TransitionNameDlg.Text="Молим унесите име прелаза"
+TransitionNameDlg.Title="Име прелаза"
+
 TitleBar.Profile="Профил"
 TitleBar.Scenes="Сцене"
 
@@ -80,7 +91,7 @@ ConfirmRemove.Text="Да ли сте сигурни да желите избац
 Output.ConnectFail.Title="Неуспешно повезивање"
 Output.ConnectFail.BadPath="Неисправна путања или URL конекције. Молим проверите ваша подешавања да потврдите њихову исправност."
 Output.ConnectFail.ConnectFailed="Неуспешно повезивање на сервер"
-Output.ConnectFail.InvalidStream="Не могу приступити одређеном каналу или стрим кључу. Ово је могуће, зато што је унети кључ или канал погрешан, или зато што сервер мисли да сте и даље улоговани."
+Output.ConnectFail.InvalidStream="Не могу приступити наведеном каналу или стрим кључу, молим проверите ваш стрим кључ. Ако је исправан, можда постоји проблем при повезивању на сервер."
 Output.ConnectFail.Error="Неочекивана грешка у повезивању са сервером. Више информација се налази у лог датотеци."
 Output.ConnectFail.Disconnected="Прекинута веза са сервером."
 
@@ -107,7 +118,6 @@ LicenseAgreement.Exit="Излаз"
 Remux.SourceFile="OBS снимак"
 Remux.TargetFile="Датотека"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS снимци (*.flv)"
 Remux.FinishedTitle="Remux завршен"
 Remux.Finished="Завршен remux снимка"
 Remux.FinishedError="Remux завршен, али датотека можда није комплетирана"
@@ -133,6 +143,18 @@ Basic.DisplayCapture="Прикажи улаз"
 
 Basic.Main.PreviewConextMenu.Enable="Омогући преглед"
 
+Deinterlacing="Деинтерлејсинг"
+Deinterlacing.Discard="Одбаци"
+Deinterlacing.Retro="Ретро"
+Deinterlacing.Blend="Стапање"
+Deinterlacing.Blend2x="Стапање 2x"
+Deinterlacing.Linear="Линеарно"
+Deinterlacing.Linear2x="Линеарно 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="Прво горње поље"
+Deinterlacing.BottomFieldFirst="Прво доње поље"
+
 Basic.Main.AddSceneDlg.Title="Додај сцену"
 Basic.Main.AddSceneDlg.Text="Молим унесите име сцене"
 
@@ -198,6 +220,7 @@ Basic.TransformWindow.Alignment="Позиционо поравнање"
 Basic.TransformWindow.BoundsType="Тип оквира"
 Basic.TransformWindow.BoundsAlignment="Поравнање у оквиру"
 Basic.TransformWindow.Bounds="Величина оквира"
+Basic.TransformWindow.Crop="Исецање"
 
 Basic.TransformWindow.Alignment.TopLeft="Горе лево"
 Basic.TransformWindow.Alignment.TopCenter="Горе центар"
@@ -284,6 +307,11 @@ Basic.Settings.General.Theme="Тема"
 Basic.Settings.General.Language="Језик"
 Basic.Settings.General.WarnBeforeStartingStream="Прикажи прозор за потврду када се започињу стримови"
 Basic.Settings.General.WarnBeforeStoppingStream="Прикажи прозор за потврду када се заустављају стримови"
+Basic.Settings.General.Snapping="Поравнавање привлачењем извора"
+Basic.Settings.General.ScreenSnapping="Привуци изворе ивици екрана"
+Basic.Settings.General.CenterSnapping="Привуци изворе хоризонталној и вертикалној средини"
+Basic.Settings.General.SourceSnapping="Привлачење извора ка другим изворима"
+Basic.Settings.General.SnapDistance="Осетљивост привлачења"
 
 Basic.Settings.Stream="Стрим"
 Basic.Settings.Stream.StreamType="Врста стрима"
@@ -293,6 +321,7 @@ Basic.Settings.Output.Format="Формат снимања"
 Basic.Settings.Output.Encoder="Енкодер"
 Basic.Settings.Output.SelectDirectory="Одабери директоријум за снимање"
 Basic.Settings.Output.SelectFile="Одабери датотеку за снимање"
+Basic.Settings.Output.EnforceBitrate="Спроведи ограничења у протоку стриминг сервиса"
 Basic.Settings.Output.Mode="Режим излаза"
 Basic.Settings.Output.Mode.Simple="Једноставно"
 Basic.Settings.Output.Mode.Adv="Напредно"
@@ -303,11 +332,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="Исто као стрим
 Basic.Settings.Output.Simple.RecordingQuality.Small="Високи квалитет, осредња величина датотеке"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="Квалитет са неприметним разликама, велика датотека"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="Квалитет без губитка, изричито велика датотека"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="Упозорење: Видео проток стрима ће бити постављен на %1, што је горња граница за тренутни стриминг сервис. Ако сте сигурни да желите ићи преко %1, омогућите напредне опције енкодера и искључите \"Спроведи ограничења у протоку стриминг сервиса\"."
+Basic.Settings.Output.Simple.Warn.AudioBitrate="Упозорење: Звучни проток стрима ће бити постављен на %1, што је горња граница за тренутни стриминг сервис. Ако сте сигурни да желите ићи преко %1, омогућите напредне опције енкодера и искључите \"Спроведи ограничења у протоку стриминг сервиса\"."
 Basic.Settings.Output.Simple.Warn.Encoder="Упозорење: Снимање са софтверским енкодером другачијег квалитета у односу на стрим ће захтевати додатну процесорску снагу ако стримујете и снимате у исто време."
 Basic.Settings.Output.Simple.Warn.Lossless="Упозорење: Квалитет без губитка ствара изричито велике датотеке! Квалитет без губитка може користити више од 7 гигабајта простора на диску по минуту при високим резолуцијама и framerate-ом. Квалитет без губитка није препоручен за дуже снимање осим ако имате велику количину слободног простора на диску."
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="Да ли сте сигурни да желите користити квалитет без губитка?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="Упозорење за квалитет без губитка!"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="Упозорење: Не можете користити више одвојених QSV енкодера када емитујете и снимате у исто време. Ако желите да емитујете и снимате у исто време, молим промените или енкодер снимања или енкодер емитовања."
 Basic.Settings.Output.Simple.Encoder.Software="Софтверски (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Машински (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Машински (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="Софтверски (x264 ниска употреба процесора, повећава величину датотеке)"
 Basic.Settings.Output.VideoBitrate="Проток видеа"
 Basic.Settings.Output.AudioBitrate="Проток звука"
@@ -334,6 +368,8 @@ Basic.Settings.Output.Adv.Recording.Type="Врста"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Уобичајени"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Прилагођени излаз (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Користи стрим енкодер)"
+Basic.Settings.Output.Adv.Recording.Filename="Обликовање имена датотеке"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Препиши ако постоји датотека"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg врста исписа"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="Испис на URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Испис у датотеку"
@@ -354,6 +390,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Звучни енкодер"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Подешавања звучног енкодера (ако постоје)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Подешавања muxer-а (ако постоје)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		Година, четири цифре\n%YY		Година, последње две цифре (00-99)\n%MM		Месец као децимални број (01-12)\n%DD		Дан у месецу, са нулом испред (01-31)\n%hh		Сат у 24-часовном запису (00-23)\n%mm		Минут (00-59)\n%ss		Секунда (00-61)\n%%		Знак процента\n%a		Скраћено име дана у недељи\n%A		Пуно име дана у недељи\n%b		Скраћено име месеца\n%B		Пуно име месеца\n%d		Дан у месецу, са нулом испред (01-31)\n%H		Сат 24-часовном запису (00-23)\n%I		Сат у 12-часовном запису (01-12)\n%m		Месец као децимални број (01-12)\n%M		Минут (00-59)\n%p		Ознака за пре или после подне\n%S		Секунда (00-61)\n%y		Година, последње две цифре (00-99)\n%Y		Година\n%z		ISO 8601 одступање од UTC или име\n		временске зоне ли скраћеница\n%Z		Име временске зоне или скраћеница\n"
+
 Basic.Settings.Video="Видео"
 Basic.Settings.Video.Adapter="Видео адаптер:"
 Basic.Settings.Video.BaseResolution="Основна (површинска) резолуција:"

obs/data/locale/sv-SE.ini

@@ -3,11 +3,12 @@ Language="Svenska"
 Region="Sverige"
 
 OK="OK"
-Apply="Bekräfta"
+Apply="Verkställ"
 Cancel="Avbryt"
 Close="Stäng"
 Save="Spara"
 Discard="Radera"
+Disable="Inaktivera"
 Yes="Ja"
 No="Nej"
 Add="Lägg till"
@@ -38,8 +39,28 @@ Untitled="Namnlös"
 New="Ny"
 Duplicate="Duplicera"
 Enable="Aktivera"
+DisableOSXVSync="Inaktivera OSX V-Sync"
+ResetOSXVSyncOnExit="Återställ OSX V-Sync vid avslutning"
+Transition="Övergång"
+QuickTransitions="Snabba övergångar"
+Left="Vänster"
+Right="Höger"
+Top="Överkant"
+Bottom="Nederkant"
 
+QuickTransitions.DuplicateScene="Duplicera scen"
+QuickTransitions.EditProperties="Duplicera källa"
+QuickTransitions.HotkeyName="Snabba övergång: %1"
 
+Basic.AddTransition="Lägg till konfigurerbar övergång"
+Basic.RemoveTransition="Ta bort konfigurerbar övergång"
+Basic.TransitionProperties="Övergångsegenskaper"
+Basic.SceneTransitions="Scenövergångar"
+Basic.TransitionDuration="Varaktighet"
+Basic.TogglePreviewProgramMode="Studioläge"
+
+TransitionNameDlg.Text="Skriv in namnet på övergången"
+TransitionNameDlg.Title="Övergångsnamn"
 
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Scener"
@@ -50,7 +71,11 @@ NameExists.Text="Det namnet används redan."
 NoNameEntered.Title="Vänligen ange ett giltigt namn"
 NoNameEntered.Text="Du måste ange ett namn."
 
+ConfirmStart.Title="Börja strömma?"
+ConfirmStart.Text="Är du säker på att du vill börja strömma?"
 
+ConfirmStop.Title="Sluta strömma?"
+ConfirmStop.Text="Är du säker på att du vill sluta strömma?"
 
 ConfirmExit.Title="Avsluta OBS?"
 ConfirmExit.Text="OBS är aktivt.  Alla strömmar/inspelningar kommer att stängas av.  Är du säker på att du vill avsluta?"
@@ -61,7 +86,6 @@ ConfirmRemove.Text="Vill du verkligen ta bort '$1'?"
 Output.ConnectFail.Title="Anslutning misslyckades"
 Output.ConnectFail.BadPath="Ogiltig sökväg eller anslutnings-URL. Kontrollera att dina inställningar är korrekta."
 Output.ConnectFail.ConnectFailed="Kunde inte ansluta till servern"
-Output.ConnectFail.InvalidStream="Kunde inte komma åt den angivna kanalen eller streamnyckeln. Din angivna streamnyckel/kanal kan vara ogiltig, eller så tror servern att du fortfarande är inloggad på din tidigare anslutning."
 Output.ConnectFail.Error="Ett oväntat fel uppstod vid anslutning till servern. Se loggfilen för ytterligare information."
 Output.ConnectFail.Disconnected="Nedkopplad från servern."
 
@@ -88,7 +112,7 @@ LicenseAgreement.Exit="Avsluta"
 Remux.SourceFile="OBS Inspelning"
 Remux.TargetFile="Målfil"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS Inspelning (*.flv)"
+Remux.OBSRecording="OBS Inspelning"
 Remux.FinishedTitle="Remuxing färdig"
 Remux.Finished="Inspelning remuxed"
 Remux.FinishedError="Inspelning remuxed, men filen kan vara ofullständig"
@@ -114,6 +138,13 @@ Basic.DisplayCapture="Bildskärmskälla"
 
 Basic.Main.PreviewConextMenu.Enable="Förhandsvisa"
 
+Deinterlacing.Discard="Avfärda"
+Deinterlacing.Retro="Retro"
+Deinterlacing.Linear="Linjär"
+Deinterlacing.Linear2x="Linjär 2x"
+Deinterlacing.TopFieldFirst="Övre fältet först"
+Deinterlacing.BottomFieldFirst="Nedre fältet först"
+
 Basic.Main.AddSceneDlg.Title="Lägg till scen"
 Basic.Main.AddSceneDlg.Text="Vänligen ange ett namn för scenen"
 
@@ -145,11 +176,21 @@ Basic.PropertiesWindow.Confirm="Det finns osparade ändringar.  Vill du behålla
 Basic.PropertiesWindow.NoProperties="Inga inställningar tillgängliga"
 Basic.PropertiesWindow.AddFiles="Lägg till Filer"
 Basic.PropertiesWindow.AddURL="Lägg till Sökväg/URL"
+Basic.PropertiesWindow.AddEditableListFiles="Lägg till filer i '%1'"
 
+Basic.PropertiesView.FPS.Simple="Enkla bildfrekvensvärden"
+Basic.PropertiesView.FPS.Rational="Rationella bildfrekvensvärden"
+Basic.PropertiesView.FPS.ValidFPSRanges="Giltiga bildfrekvensintervall:"
 
 Basic.InteractionWindow="Interagerar med '%1'"
 
+Basic.StatusBar.Reconnecting="Frånkopplad, återansluter om %2 sekund(er) (försök %1)"
+Basic.StatusBar.AttemptingReconnect="Försöker att återansluta... (försök %1)"
 Basic.StatusBar.ReconnectSuccessful="Återanslutning lyckades"
+Basic.StatusBar.Delay="Fördröjning (%1 s)"
+Basic.StatusBar.DelayStartingIn="Fördröjning (börjar om %1 s)"
+Basic.StatusBar.DelayStoppingIn="Fördröjning (stoppar efter %1 s)"
+Basic.StatusBar.DelayStartingStoppingIn="Fördröjning (stoppar efter %1 s, börjar om %2 s)"
 
 Basic.Filters="Filter"
 Basic.Filters.AsyncFilters="Audio/Video filter"
@@ -167,6 +208,7 @@ Basic.TransformWindow.Alignment="Positionsjustering"
 Basic.TransformWindow.BoundsType="Avgränsningsramstyp"
 Basic.TransformWindow.BoundsAlignment="Justering i avgränsningsramen"
 Basic.TransformWindow.Bounds="Avgränsningsramstorlek"
+Basic.TransformWindow.Crop="Beskär"
 
 Basic.TransformWindow.Alignment.TopLeft="Överst till vänster"
 Basic.TransformWindow.Alignment.TopCenter="Centrerad mot övre kant"
@@ -193,16 +235,20 @@ Basic.Main.Scenes="Scener"
 Basic.Main.Sources="Källor"
 Basic.Main.Connecting="Ansluter..."
 Basic.Main.StartRecording="Starta inspelning"
-Basic.Main.StartStreaming="Börja streama"
+Basic.Main.StartStreaming="Börja strömma"
 Basic.Main.StopRecording="Stoppa inspelning"
-Basic.Main.StopStreaming="Sluta streama"
+Basic.Main.StopStreaming="Sluta strömma"
+Basic.Main.ForceStopStreaming="Sluta strömma (ignorera fördröjning)"
 
 Basic.MainMenu.File="&Arkiv"
 Basic.MainMenu.File.Export="&Exportera"
 Basic.MainMenu.File.Import="&Importera"
-Basic.MainMenu.File.ShowRecordings="Visa &Inspelningar"
+Basic.MainMenu.File.ShowRecordings="Visa &inspelningar"
 Basic.MainMenu.File.Remux="Re&mux Inspelningar"
 Basic.MainMenu.File.Settings="&Inställningar"
+Basic.MainMenu.File.ShowSettingsFolder="Visa inställningsmapp"
+Basic.MainMenu.File.ShowProfileFolder="Visa profilmapp"
+Basic.MainMenu.AlwaysOnTop="&Alltid överst"
 Basic.MainMenu.File.Exit="&Avsluta"
 
 Basic.MainMenu.Edit="&Redigera"
@@ -228,8 +274,11 @@ Basic.MainMenu.Edit.Order.MoveToTop="Lägg &överst"
 Basic.MainMenu.Edit.Order.MoveToBottom="Lägg unders&t"
 Basic.MainMenu.Edit.AdvAudio="&Avancerade ljudinställningar"
 
+Basic.MainMenu.SceneCollection="&Scensamling"
+Basic.MainMenu.Profile="&Profil"
 
 Basic.MainMenu.Help="&Hjälp"
+Basic.MainMenu.Help.Website="Besök &webbplats"
 Basic.MainMenu.Help.Logs="&Loggfiler"
 Basic.MainMenu.Help.Logs.ShowLogs="&Visa loggfiler"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="Ladda upp &aktuell loggfil"
@@ -244,11 +293,18 @@ Basic.Settings.Confirm="Du har osparade ändringar. Vill du spara ändringarna?"
 Basic.Settings.General="Allmänt"
 Basic.Settings.General.Theme=" Tema"
 Basic.Settings.General.Language="Språk"
+Basic.Settings.General.WarnBeforeStartingStream="Visa bekräftelsedialog när ström startas"
+Basic.Settings.General.WarnBeforeStoppingStream="Visa bekräftelsedialog när ström stoppas"
+Basic.Settings.General.ScreenSnapping="Fäst källor till skärmens kant"
+Basic.Settings.General.CenterSnapping="Fäst källor till den horisontala och vertikala mittenlinjen"
+Basic.Settings.General.SourceSnapping="Fäst källor till andra källor"
+Basic.Settings.General.SnapDistance="Fästkänslighet"
 
 Basic.Settings.Stream="Stream"
 Basic.Settings.Stream.StreamType="Streamtyp"
 
 Basic.Settings.Output="Utmatning"
+Basic.Settings.Output.Format="Inspelningsformat"
 Basic.Settings.Output.Encoder="Kodare"
 Basic.Settings.Output.SelectDirectory="Välj inspelningsplats"
 Basic.Settings.Output.SelectFile="Välj inspelningsfil"
@@ -256,6 +312,18 @@ Basic.Settings.Output.Mode="Utmatningsläge"
 Basic.Settings.Output.Mode.Simple="Simpel"
 Basic.Settings.Output.Mode.Adv="Avancerat"
 Basic.Settings.Output.Mode.FFmpeg="FFmpeg-utmatning"
+Basic.Settings.Output.Simple.SavePath="Inspelningssökväg"
+Basic.Settings.Output.Simple.RecordingQuality="Inspelningskvalitet"
+Basic.Settings.Output.Simple.RecordingQuality.Stream="Samma som ström"
+Basic.Settings.Output.Simple.RecordingQuality.Small="Hög kvalitet, mellanstor filstorlek"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="Oskiljbar kvalitet, stor filstorlek"
+Basic.Settings.Output.Simple.RecordingQuality.Lossless="Förlustfri kvalitet, oerhört stor filstorlek"
+Basic.Settings.Output.Simple.Warn.Lossless="Varning: Förlustfri kvalitet generar oerhört stora filstorlekar!  Förlustfri kvalitet kan använda upp till 7 gigabyte hårddiskutrymme per minut vid höga upplösningar och bildfrekvenser.  Detta rekommenderas inte för långa inspelningar såvida du har riktigt mycket hårddiskutrymme tillgängligt."
+Basic.Settings.Output.Simple.Warn.Lossless.Msg="Är du säker på att du vill använda förlustfri kvalitet?"
+Basic.Settings.Output.Simple.Warn.Lossless.Title="Varning angående förlustfri kvalitet!"
+Basic.Settings.Output.Simple.Encoder.Software="Programvara (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="Hårdvara (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="Hårdvara (NVENC)"
 Basic.Settings.Output.VideoBitrate="Bithastighet för video"
 Basic.Settings.Output.AudioBitrate="Bithastighet för ljud"
 Basic.Settings.Output.Reconnect="Automatisk återanslutning"
@@ -264,6 +332,8 @@ Basic.Settings.Output.MaxRetries="Maximalt antal försök"
 Basic.Settings.Output.Advanced="Aktivera avancerade kodarinställningar"
 Basic.Settings.Output.EncoderPreset="Kodarförinställning (högre = mindre CPU)"
 Basic.Settings.Output.CustomEncoderSettings="Inställningar för anpassade kodare"
+Basic.Settings.Output.CustomMuxerSettings="Anpassade muxerinställningar"
+Basic.Settings.Output.NoSpaceFileName="Generera filnamn utan mellanrum"
 
 Basic.Settings.Output.Adv.Rescale="Skala om utmatning"
 Basic.Settings.Output.Adv.AudioTrack="Ljudspår"
@@ -279,6 +349,11 @@ Basic.Settings.Output.Adv.Recording.Type="Typ"
 Basic.Settings.Output.Adv.Recording.Type.Standard="Standard"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="Anpassad utmatning (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(Använd strömkodare)"
+Basic.Settings.Output.Adv.Recording.Filename="Filnamnsformat"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="Skriv över om filen finns"
+Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg-utmatningstyp"
+Basic.Settings.Output.Adv.FFmpeg.Type.URL="Utmatning till URL"
+Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="Utmatning till fil"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.Common="Vanliga inspelningsformat"
 Basic.Settings.Output.Adv.FFmpeg.SaveFilter.All="Alla Filer"
 Basic.Settings.Output.Adv.FFmpeg.SavePathURL="Sökväg eller webbadress"
@@ -294,11 +369,17 @@ Basic.Settings.Output.Adv.FFmpeg.VEncoder="Videokodare"
 Basic.Settings.Output.Adv.FFmpeg.VEncoderSettings="Videokodar-inställningar (om något)"
 Basic.Settings.Output.Adv.FFmpeg.AEncoder="Ljudkodare"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ljudkodar-inställningar (om något)"
+Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxerinställningar (om det finns)"
+
+
+FilenameFormatting.TT="%CCYY		År, fyra siffror\n%YY		År, de två sista siffrorna (00-99)\n%MM		Månad som en siffra (01-12)\n%DD		Månadens dag, inledande nolla (01-31)\n%hh		Timme i 24-timmarsformat (00-23)\n%mm		Minut (00-59)\n%ss		Sekund (00-61)\n%%		Ett procenttecken\n%a		Förkortad veckodag\n%A		Fullständig veckodag\n%b		Förkortat månadsnamn\n%B		Fullständigt månadsnamn\n%d		Månadens dag, inledande nolla (01-31)\n%H		Timme i 24-timmarsformat (00-23)\n%I		Timme i 12-timmarsformat (01-12)\n%m		Månad som en siffra (01-12)\n%M		Minut (00-59)\n%p		AM eller PM\n%S		Sekund (00-61)\n%y		År, de två sista siffrorna (00-99)\n%Y		År\n%z		ISO 8601-offset från UTC eller tidszonens\n		namn eller förkortning\n%Z		Tidszonens namn eller förkortning\n"
 
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Grafikkort:"
+Basic.Settings.Video.BaseResolution="Grundupplösning (kanvas):"
+Basic.Settings.Video.ScaledResolution="Utdataupplösning (skalad):"
 Basic.Settings.Video.DownscaleFilter="Nedskalningsfilter:"
-Basic.Settings.Video.DisableAeroWindows="Avaktivera Aero (endast Windows)"
+Basic.Settings.Video.DisableAeroWindows="Inaktivera Aero (endast Windows)"
 Basic.Settings.Video.FPS="FPS:"
 Basic.Settings.Video.FPSCommon="Vanliga bildhastighetsvärden"
 Basic.Settings.Video.FPSInteger="Heltals-bildhastighetsvärde"
@@ -308,6 +389,7 @@ Basic.Settings.Video.Denominator="Nämnare:"
 Basic.Settings.Video.Renderer="Renderare:"
 Basic.Settings.Video.InvalidResolution="Ogiltig upplösning. Måste anges som [bredd]x[höjd] (t.ex 1920x1080)"
 Basic.Settings.Video.CurrentlyActive="Videoutmatning är aktiv. Stoppa alla utmatningar för att kunna ändra videoinställningar."
+Basic.Settings.Video.DisableAero="Inaktivera Aero"
 
 Basic.Settings.Video.DownscaleFilter.Bilinear="Bilinjär (snabbast, men suddigt om skalad)"
 Basic.Settings.Video.DownscaleFilter.Bicubic="Bikubisk (Vässd skalning, 16 prover)"
@@ -321,26 +403,71 @@ Basic.Settings.Audio.DesktopDevice2="Skrivbordsljudenhet 2"
 Basic.Settings.Audio.AuxDevice="Mikrofon/extra ljudenhet"
 Basic.Settings.Audio.AuxDevice2="Mikrofon/extra ljudenhet 2"
 Basic.Settings.Audio.AuxDevice3="Mikrofon/extra ljudenhet 3"
+Basic.Settings.Audio.EnablePushToMute="Aktivera tryck för att tysta"
+Basic.Settings.Audio.PushToMuteDelay="Fördröjning för tryck för att tysta"
+Basic.Settings.Audio.EnablePushToTalk="Aktivera tryck för att tala"
+Basic.Settings.Audio.PushToTalkDelay="Fördröjning för tryck för att tala"
+Basic.Settings.Audio.UnknownAudioDevice="[Enheten är inte ansluten eller tillgänglig]"
 
 Basic.Settings.Advanced="Avancerat"
+Basic.Settings.Advanced.FormatWarning="Varning: Andra färgformat än NV12 är avsedda för inspelning och rekommenderas inte för att strömma. Högre processoranvändning kan uppstå vid strömning p.g.a. konvertering av färgformat."
 Basic.Settings.Advanced.Audio.BufferingTime="Ljudbuffringstid"
 Basic.Settings.Advanced.Video.ColorFormat="Färgformat"
 Basic.Settings.Advanced.Video.ColorSpace="YUV-färgrymd"
 Basic.Settings.Advanced.Video.ColorRange="YUV färgområde"
 Basic.Settings.Advanced.Video.ColorRange.Partial="Partiell"
 Basic.Settings.Advanced.Video.ColorRange.Full="Full"
+Basic.Settings.Advanced.StreamDelay="Strömfördröjning"
+Basic.Settings.Advanced.StreamDelay.Duration="Varaktighet (sekunder)"
+Basic.Settings.Advanced.StreamDelay.MemoryUsage="Uppskattad minnesanvändning: %1 MB"
 
 Basic.AdvAudio="Avancerade ljudinställningar"
 Basic.AdvAudio.Name="Namn"
 Basic.AdvAudio.Volume="Volym (%)"
-Basic.AdvAudio.Mono="Downmixa till Mono"
+Basic.AdvAudio.Mono="Nedmixa till mono"
 Basic.AdvAudio.Panning="Panorering"
 Basic.AdvAudio.SyncOffset="Sync Offset (ms)"
 Basic.AdvAudio.AudioTracks="Spår"
 
+Basic.Settings.Hotkeys="Kortkommandon"
 
+Basic.Hotkeys.StartStreaming="Börja strömma"
+Basic.Hotkeys.StopStreaming="Sluta strömma"
+Basic.Hotkeys.StartRecording="Starta inspelning"
+Basic.Hotkeys.StopRecording="Stoppa inspelning"
+Basic.Hotkeys.SelectScene="Byt till scen"
 
+Hotkeys.Insert="Insert"
+Hotkeys.Delete="Delete"
+Hotkeys.Home="Home"
+Hotkeys.End="End"
+Hotkeys.PageUp="Page Up"
+Hotkeys.PageDown="Page Down"
+Hotkeys.NumLock="Num Lock"
+Hotkeys.ScrollLock="Scroll Lock"
+Hotkeys.CapsLock="Caps Lock"
+Hotkeys.Backspace="Backsteg"
+Hotkeys.Tab="Tabb"
+Hotkeys.Print="Print"
+Hotkeys.Pause="Pause"
+Hotkeys.Left="Vänster"
+Hotkeys.Right="Höger"
+Hotkeys.Up="Upp"
+Hotkeys.Down="Ned"
+Hotkeys.Windows="Windows"
+Hotkeys.Super="Super"
+Hotkeys.Menu="Meny"
+Hotkeys.Space="Mellanslag"
+Hotkeys.MouseButton="Musknapp %1"
 
+Mute="Stäng av ljud"
+Unmute="Slå på ljud"
+Push-to-mute="Tryck för att tysta"
+Push-to-talk="Tryck för att tala"
 
+SceneItemShow="Visa '%1'"
+SceneItemHide="Dölj '%1'"
 
+OutputWarnings.NoTracksSelected="Du måste välja minst ett spår"
+OutputWarnings.MultiTrackRecording="Varning: En del format (t.ex. FLV) stöder inte flera spår för varje inspelning"
 

obs/data/locale/ta-IN.ini

@@ -0,0 +1,89 @@
+
+Language="ஆங்கிலம்"
+Region="யூனைடெட் ஸ்டேட்ஸ்"
+
+OK="சரி"
+Apply="அமல்படுத்து"
+Cancel="ரத்துசெய்"
+Close="மூடு"
+Save="சேமி"
+Discard="புறக்கணி"
+Disable="செயல் நீக்கு"
+Yes="ஆம்"
+No="இல்லை"
+Add="சேர்க்க"
+Remove="அகற்ற"
+Rename="மறுபெயரிடு"
+Properties="பண்புகள்"
+MoveUp="மேலே நகர்த்து"
+MoveDown="கீழ் நகர்த்து"
+Settings="அமைப்புகள்"
+Name="பெயர்"
+Exit="வெளியேறு"
+Show="காட்டு"
+Hide="மறை"
+Untitled="தலைப்பிடாத"
+New="புதிய"
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

obs/data/locale/th-TH.ini

@@ -27,6 +27,7 @@ Stereo="สเตอริโอ"
 
 
 
+
 ConfirmRemove.Title="ยืนยันการลบ"
 ConfirmRemove.Text="คุณแน่ใจแล้วหรือที่จะลบ '$1'?"
 
@@ -48,6 +49,7 @@ LicenseAgreement.Exit="ออก"
 Basic.Scene="ฉาก"
 
 
+
 Basic.Main.AddSceneDlg.Title="เพิ่มฉาก"
 
 Basic.Main.DefaultSceneName.Text="ฉาก %1"
@@ -97,6 +99,8 @@ Basic.Settings.Stream.StreamType="รูปแบบการสตรีม"
 
 
 
+
+
 Basic.Settings.Video="วีดีโอ"
 Basic.Settings.Video.DisableAeroWindows="ปิดการใช้งาน Aero (เฉพาะ Windows เท่านั้น)"
 Basic.Settings.Video.FPS="FPS:"

obs/data/locale/tr-TR.ini

@@ -8,6 +8,7 @@ Cancel="İptal"
 Close="Kapat"
 Save="Kaydet"
 Discard="Vazgeç"
+Disable="Devre dışı bırak"
 Yes="Evet"
 No="Hayır"
 Add="Ekle"
@@ -19,9 +20,9 @@ Properties="Özellikler"
 MoveUp="Yukarı Taşı"
 MoveDown="Aşağı Taşı"
 Settings="Ayarlar"
-Display="Görüntü"
+Display="Görüntüle"
-Name="Adı"
+Name="İsim"
-Exit="Çıkış"
+Exit="Çık"
 Mixer="Karıştırıcı"
 Browse="Gözat"
 Mono="Mono"
@@ -31,28 +32,35 @@ PreviewProjector="Tam Ekran Yansıtması (Önizleme)"
 SceneProjector="Tam Ekran Yansıtması (Sahne)"
 SourceProjector="Tam Ekran Yansıtması (Kaynak)"
 Clear="Temizle"
-Revert="Sıfırla"
+Revert="Eski Haline Döndür"
 Show="Göster"
 Hide="Gizle"
 Untitled="İsimsiz"
 New="Yeni"
 Duplicate="Çoğalt"
 Enable="Etkinleştir"
+Transition="Geçiş"
+Left="Sol"
+Right="Sağ"
+Top="Üst"
+Bottom="Alt"
 
 
+Basic.TransitionDuration="Süre"
+
 
 TitleBar.Profile="Profil"
 TitleBar.Scenes="Sahneler"
 
-NameExists.Title="Bu ad zaten kullanılıyor"
+NameExists.Title="Bu isim zaten mevcut"
-NameExists.Text="Bu ad zaten kullanılıyor."
+NameExists.Text="Bu isim zaten kullanılıyor."
 
-NoNameEntered.Title="Lütfen geçerli bir ad girin"
+NoNameEntered.Title="Lütfen geçerli bir isim girin"
-NoNameEntered.Text="İsim boş olamaz."
+NoNameEntered.Text="İsmi boş kullanamazsınız."
 
 
 
-ConfirmExit.Title="OBS'den Çık?"
+ConfirmExit.Title="OBS'den Çıkılsın mı?"
 ConfirmExit.Text="OBS şu anda etkin. Tüm yayınlar / kayıtlar kapatılacak. Çıkmak istediğinize emin misiniz?"
 
 ConfirmRemove.Title="Kaldırmayı Onayla"
@@ -61,7 +69,6 @@ ConfirmRemove.Text="'$1''i kaldırmak istediğinizden emin misiniz?"
 Output.ConnectFail.Title="Bağlantı kurulamadı"
 Output.ConnectFail.BadPath="Bağlantı adresiniz geçersiz. Ayarlarınızı kontrol edin ve geçerli bir adres giriniz."
 Output.ConnectFail.ConnectFailed="Sunucuya bağlanılamadı"
-Output.ConnectFail.InvalidStream="Seçilen yayına veya yayın anahtarına erişilemedi. Bu sorun , yayın anahtarının veya kanalının yanlış olmasından veya sistemin hala oturum açmış olduğunuzu düşünmesinden kaynaklanıyor olabilir."
 Output.ConnectFail.Error="Sunucuya bağlanmaya çalışırken beklenmeyen bir hata oluştu.  Daha fazla bilgi için günlük dosyasına bakınız."
 Output.ConnectFail.Disconnected="Sunucu bağlantısı kesildi."
 
@@ -72,7 +79,7 @@ Output.RecordNoSpace.Msg="Kayıt'aa devam etmek yeterli disk alanı yok."
 Output.RecordError.Title="Kayıt Hatası"
 Output.RecordError.Msg="Kayıt anında bir hata oluştu."
 
-Output.BadPath.Title="Geçersiz Dosya Dizini"
+Output.BadPath.Title="Dosya Yolu Geçersiz"
 Output.BadPath.Text="Ayarlanan dosya kayıt yolu geçersiz. Lütfen ayarlarınızı kontrol ederek geçerli bir dosya yolunun girilmiş olduğundan emin olunuz."
 
 LogReturnDialog="Günlük Dosyası Başarıyla Karşıya Yüklendi"
@@ -83,12 +90,11 @@ LicenseAgreement="Lisans Sözleşmesi"
 LicenseAgreement.PleaseReview="Lütfen OBS'yi kullanmadan önce lisans sözleşmesini gözden geçiriniz. Bu programı kullanarak <a href='http://www.gnu.org/licenses/gpl-2.0.html'>GNU Genel Kamu Lisansı v2.0</a> okuyup anladığınızı kabul etmiş sayılırsınız. Sözleşmenin geri kalan kısmını görmek için lütfen sayfayı aşağı kaydırınız."
 LicenseAgreement.ClickIAgreeToContinue="Sözleşme koşullarını kabul ediyorsanız, devam etmek için Kabul Ediyoruma tıklayın. OBS'yi kullanmak için sözleşme koşullarını kabul etmelisiniz."
 LicenseAgreement.IAgree="Kabul Ediyorum"
-LicenseAgreement.Exit="Çıkış"
+LicenseAgreement.Exit="Çık"
 
-Remux.SourceFile="OBS Kaydediyor"
+Remux.SourceFile="OBS Kayıt ediyor"
 Remux.TargetFile="Hedef Dosya"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS Kaydı (*.flv)"
 Remux.FinishedTitle="Remux tamamlandı"
 Remux.Finished="Kayıt remux edildi"
 Remux.FinishedError="Kayıt remux edildi, ancak dosya tamamlanmamış olabilir"
@@ -100,7 +106,7 @@ Remux.ExitUnfinishedTitle="Remux işlemi devam etmekte"
 Remux.ExitUnfinished="Remux işlemi tamamlanmadı, şu anda durma dosyayı kullanılamaz hale getirebilir.\nRemux işlemini durdurmak istediğinizden emin misiniz?"
 
 UpdateAvailable="Yeni Güncelleştirme Mevcut"
-UpdateAvailable.Text="Versiyon %1.%2.%3 şimdi mevcut.  <a href='%4'>İndirmek için tıklayınız</a>"
+UpdateAvailable.Text="%1.%2.%3 sürümü şimdi kullanılabilir.  <a href='%4'>İndirmek için tıklayın</a>"
 
 Basic.DesktopDevice1="Masaüstü Ses"
 Basic.DesktopDevice2="Masaüstü Ses 2"
@@ -114,10 +120,11 @@ Basic.DisplayCapture="Ekran Yakalama"
 
 Basic.Main.PreviewConextMenu.Enable="Önizlemeyi Etkinleştir"
 
+
 Basic.Main.AddSceneDlg.Title="Sahne Ekle"
 Basic.Main.AddSceneDlg.Text="Lütfen sahne adını giriniz"
 
-Basic.Main.DefaultSceneName.Text="Sahne %1"
+Basic.Main.DefaultSceneName.Text="%1 Sahnesi"
 
 Basic.Main.AddSceneCollection.Title="Sahne Koleksiyonu Ekle"
 Basic.Main.AddSceneCollection.Text="Sahne koleksiyonunun isimini giriniz"
@@ -168,7 +175,7 @@ Basic.Filters.Title="'%1' için filtreler"
 Basic.Filters.AddFilter.Title="Filtre adı"
 Basic.Filters.AddFilter.Text="Lütfen filtrenin adını belirtin"
 
-Basic.TransformWindow="Sahne Eleman Dönüşümü"
+Basic.TransformWindow="Sahne Ögesini Dönüştür"
 Basic.TransformWindow.Position="Konum"
 Basic.TransformWindow.Rotation="Döndürme"
 Basic.TransformWindow.Size="Boyut"
@@ -219,13 +226,13 @@ Basic.MainMenu.File.Exit="Ç&ıkış"
 Basic.MainMenu.Edit="&Düzenle"
 Basic.MainMenu.Edit.Undo="&Geri al"
 Basic.MainMenu.Edit.Redo="&Tekrar Yap"
-Basic.MainMenu.Edit.UndoAction="&Geri al $1"
+Basic.MainMenu.Edit.UndoAction="&$1 Geri al"
-Basic.MainMenu.Edit.RedoAction="&Tekrar Yap $1"
+Basic.MainMenu.Edit.RedoAction="&$1 Yinele"
 Basic.MainMenu.Edit.Transform="&Dönüştür"
 Basic.MainMenu.Edit.Transform.EditTransform="&Dönüştürmeyi Düzenle..."
 Basic.MainMenu.Edit.Transform.ResetTransform="&Dönüştürmeyi Sıfırla"
-Basic.MainMenu.Edit.Transform.Rotate90CW="Saat yönünde 90 derece döndür"
+Basic.MainMenu.Edit.Transform.Rotate90CW="90 derece saat yönüne döndür"
-Basic.MainMenu.Edit.Transform.Rotate90CCW="Saatin tersi yönünde 90 derece döndür"
+Basic.MainMenu.Edit.Transform.Rotate90CCW="90 derece saatin tersi yönüne döndür"
 Basic.MainMenu.Edit.Transform.Rotate180="180 derece döndür"
 Basic.MainMenu.Edit.Transform.FlipHorizontal="&Yatay Döndür"
 Basic.MainMenu.Edit.Transform.FlipVertical="Dikey &Çevir"
@@ -249,11 +256,11 @@ Basic.MainMenu.Help.Logs.ShowLogs="&Günlük Dosyalarını Göster"
 Basic.MainMenu.Help.Logs.UploadCurrentLog="&Mevcut Günlük Dosyasını Karşıya Yükle"
 Basic.MainMenu.Help.Logs.UploadLastLog="&Son Günlük Dosyasını Karşıya Yükle"
 Basic.MainMenu.Help.Logs.ViewCurrentLog="&Şimdiki Günlüğü Göster"
-Basic.MainMenu.Help.CheckForUpdates="Güncelleştirmeleri Kontrol et"
+Basic.MainMenu.Help.CheckForUpdates="Güncellemeleri Kontrol et"
 
 Basic.Settings.ProgramRestart="Programın, bu ayarların etkinleşmesi için yeniden başlatılması gerekir."
 Basic.Settings.ConfirmTitle="Değişiklikleri Onayla"
-Basic.Settings.Confirm="Kaydedilmemiş değişiklikleriniz var. Değişiklikler kaydedilsin mi?"
+Basic.Settings.Confirm="Kayıt edilmemiş değişiklikleriniz var. Değişiklikler kayıt edilsin mi?"
 
 Basic.Settings.General="Genel"
 Basic.Settings.General.Theme="Tema"
@@ -323,14 +330,16 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Ses Kodlayıcı"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Ses Kodlayıcı Ayarları (var ise)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer Ayarları (eğer varsa)"
 
+
+
 Basic.Settings.Video="Video"
-Basic.Settings.Video.Adapter="Video Bağdaştırıcısi:"
+Basic.Settings.Video.Adapter="Video Bağdaştırıcı:"
 Basic.Settings.Video.BaseResolution="Temel (Tuval) Çözünürlüğü:"
 Basic.Settings.Video.ScaledResolution="Çıkış (Ölçekli) Çözünürlüğü:"
 Basic.Settings.Video.DownscaleFilter="Filtreyi Azalt:"
 Basic.Settings.Video.DisableAeroWindows="Aero'yu Devre Dışı Bırak (yalnızca Windows)"
 Basic.Settings.Video.FPS="FPS:"
-Basic.Settings.Video.FPSCommon="Yaygın FPS değerleri"
+Basic.Settings.Video.FPSCommon="Ortak FPS Değerleri"
 Basic.Settings.Video.FPSInteger="Tamsayı FPS değeri"
 Basic.Settings.Video.FPSFraction="Kesirli FPS değeri"
 Basic.Settings.Video.Numerator="Pay:"

obs/data/locale/uk-UA.ini

@@ -37,6 +37,7 @@ Enable="Увімкнути"
 
 
 
+
 TitleBar.Profile="Профіль"
 TitleBar.Scenes="Сцени"
 
@@ -106,6 +107,9 @@ Basic.Scene="Сцена"
 
 
 
+
+
+
 
 
 

obs/data/locale/vi-VN.ini

@@ -41,6 +41,7 @@ Enable="Kích hoạt"
 
 
 
+
 TitleBar.Profile="Hồ sơ cá nhân"
 TitleBar.Scenes="Cảnh"
 
@@ -61,7 +62,6 @@ ConfirmRemove.Text="Bạn có chắc bạn muốn loại bỏ '$1' không?"
 Output.ConnectFail.Title="Không thể kết nối"
 Output.ConnectFail.BadPath="URL không hợp lệ của đường dẫn hoặc kết nối.  Xin vui lòng kiểm tra cài đặt của bạn để xác nhận rằng họ là hợp lệ."
 Output.ConnectFail.ConnectFailed="Không thể kết nối tới hệ phục vụ"
-Output.ConnectFail.InvalidStream="'' stream key '' lỗi không xác định. Bạn nên đăng nhập để lấy lại key hoặc làm mới lại key."
 Output.ConnectFail.Error="Lỗi bất ngờ xảy ra khi thử kết nối tới hệ phục vụ.  Biết thêm thông tin trong các tập tin log."
 Output.ConnectFail.Disconnected="Ngắt kết nối từ máy chủ."
 
@@ -88,7 +88,6 @@ LicenseAgreement.Exit="Thoát"
 Remux.SourceFile="Ghi âm OBS"
 Remux.TargetFile="Tệp đích"
 Remux.Remux="Remux"
-Remux.RecordingPattern="OBS ghi âm (*.flv)"
 Remux.FinishedTitle="Remuxing đã hoàn thành"
 Remux.Finished="Ghi remuxed"
 Remux.FinishedError="Ghi âm remuxed, nhưng các tập tin có thể không đầy đủ"
@@ -114,6 +113,7 @@ Basic.DisplayCapture="Chụp màn hình"
 
 Basic.Main.PreviewConextMenu.Enable="Bật xem trước"
 
+
 Basic.Main.AddSceneDlg.Title="Thêm cảnh"
 Basic.Main.AddSceneDlg.Text="Vui lòng nhập tên của cảnh"
 
@@ -332,6 +332,8 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="Mã hóa âm thanh"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="Thiết đặt bộ mã hóa video (nếu có)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer cài đặt (nếu có)"
 
+
+
 Basic.Settings.Video="Video"
 Basic.Settings.Video.Adapter="Video Adapter:"
 Basic.Settings.Video.BaseResolution="Cơ sở (vải) độ phân giải:"

obs/data/locale/zh-CN.ini

@@ -8,13 +8,14 @@ Cancel="取消"
 Close="关闭"
 Save="保存"
 Discard="舍弃"
+Disable="禁用"
 Yes="是"
 No="否"
 Add="添加"
 Remove="移除"
 Rename="重命名"
 Interact="交互"
-Filters="过滤器"
+Filters="滤镜"
 Properties="属性"
 MoveUp="上移"
 MoveDown="下移"
@@ -26,7 +27,7 @@ Mixer="混音器"
 Browse="浏览"
 Mono="单声道​"
 Stereo="立体声​​​"
-DroppedFrames="掉帧 %1 (%2%)"
+DroppedFrames="丢帧 %1 (%2%)"
 PreviewProjector="全屏投影仪(预览)"
 SceneProjector="全屏投影仪 (现场)"
 SourceProjector="全屏投影仪(源)"
@@ -36,21 +37,37 @@ Show="显示"
 Hide="隐藏"
 Untitled="未命名"
 New="新建"
-Duplicate="重复"
+Duplicate="复制"
 Enable="启用"
 DisableOSXVSync="禁用 OSX V-Sync"
 ResetOSXVSyncOnExit="退出时重置 OSX V-Sync"
 HighResourceUsage="编码过载! 考虑下调低视频设置或使用更快的编码预设."
 Transition="过渡动画"
 QuickTransitions="快速过渡动画"
+Left="左"
+Right="右"
+Top="上"
+Bottom="下"
 
+QuickTransitions.SwapScenes="在过渡动画后交换预览/输出场景"
+QuickTransitions.SwapScenesTT="在过渡后,交换预览和输出场景(如果输出的原始场景仍然存在). \n 这个不会撤消任何可能对输出的原始场景的更改."
+QuickTransitions.DuplicateScene="复制场景"
+QuickTransitions.DuplicateSceneTT="当编辑同一场景, 允许编辑来源的可见性/变换而无需修改源输出. \n 为了编辑源属性而无需修改输出, 启动 ' 复制源'. \n 改变这个值将会重置当前的输出场景(如果它仍然存在)."
+QuickTransitions.EditProperties="复制源"
+QuickTransitions.EditPropertiesTT="当编辑同一场景, 允许编辑来源的属性而不修改输出. \n 只有启用了'复制场景',才能使用这项设置. \n 某些来源 (如捕获或媒体源) 并不支持这个, 并不能单独编辑. \n 修改这个值将重置当前输出场景 (如果它仍然存在). \n\n 警告: 因为源将被复制这可能需要额外的系统或视频资源."
 QuickTransitions.HotkeyName="快速过渡: %1"
 
+Basic.AddTransition="添加可配置的过渡动画"
+Basic.RemoveTransition="删除可配置的过渡动画"
+Basic.TransitionProperties="过渡动画属性"
 Basic.SceneTransitions="场景过渡"
 Basic.TransitionDuration="时长"
 Basic.TogglePreviewProgramMode="工作室模式"
 
-TitleBar.Profile="档案"
+TransitionNameDlg.Text="请输入过渡动画的名称"
+TransitionNameDlg.Title="过渡动画名称"
+
+TitleBar.Profile="配置文件"
 TitleBar.Scenes="场景"
 
 NameExists.Title="名称已存在"
@@ -66,15 +83,15 @@ ConfirmStop.Title="停止流?"
 ConfirmStop.Text="你确定你想要停止流?"
 
 ConfirmExit.Title="退出OBS?"
-ConfirmExit.Text="OBS当前活跃. 所有的流/录像将会停止. 你确定想要退出吗?"
+ConfirmExit.Text="OBS工作中. 所有的流/录像将会停止. 你确定想要退出吗?"
 
 ConfirmRemove.Title="确认移除"
-ConfirmRemove.Text="确实要删除 '$1' 吗？"
+ConfirmRemove.Text="确定要删除 '$1' 吗？"
 
 Output.ConnectFail.Title="连接失败"
 Output.ConnectFail.BadPath="无效的路径或URL。请检查您的设置以确认它们是有效的。"
 Output.ConnectFail.ConnectFailed="无法连接到服务器"
-Output.ConnectFail.InvalidStream="无法访问指定的通道或流密钥. 这可能是因为 密钥/通道 是无效的, 或者服务器认为你已经登录了."
+Output.ConnectFail.InvalidStream="无法访问指定的频道或流密钥, 请仔细检查您的密钥流.  如果它是正确的, 有可能是连接到服务器时出现问题."
 Output.ConnectFail.Error="试图连接到服务器时出现意外的错误。详细信息记录在日志文件中。"
 Output.ConnectFail.Disconnected="已从服务器断开。"
 
@@ -101,7 +118,7 @@ LicenseAgreement.Exit="退出"
 Remux.SourceFile="OBS 录像"
 Remux.TargetFile="目标文件"
 Remux.Remux="重新封装"
-Remux.RecordingPattern="OBS 录像(*.flv)"
+Remux.OBSRecording="OBS 录像"
 Remux.FinishedTitle="转封装完成"
 Remux.Finished="录像已经转封装"
 Remux.FinishedError="录像已经转封装, 但是文件可能不完整."
@@ -127,6 +144,18 @@ Basic.DisplayCapture="显示捕获"
 
 Basic.Main.PreviewConextMenu.Enable="开启预览"
 
+Deinterlacing="去隔行扫描"
+Deinterlacing.Discard="舍弃"
+Deinterlacing.Retro="复古"
+Deinterlacing.Blend="混合"
+Deinterlacing.Blend2x="混合 2x"
+Deinterlacing.Linear="线性"
+Deinterlacing.Linear2x="线性 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+Deinterlacing.TopFieldFirst="上场优先"
+Deinterlacing.BottomFieldFirst="下场优先"
+
 Basic.Main.AddSceneDlg.Title="添加场景"
 Basic.Main.AddSceneDlg.Text="请输入场景名称"
 
@@ -192,6 +221,7 @@ Basic.TransformWindow.Alignment="位置对齐"
 Basic.TransformWindow.BoundsType="边界框类型"
 Basic.TransformWindow.BoundsAlignment="边界框对齐方式"
 Basic.TransformWindow.Bounds="边界框大小"
+Basic.TransformWindow.Crop="裁剪"
 
 Basic.TransformWindow.Alignment.TopLeft="左上"
 Basic.TransformWindow.Alignment.TopCenter="顶上"
@@ -278,6 +308,11 @@ Basic.Settings.General.Theme="主题"
 Basic.Settings.General.Language="语言"
 Basic.Settings.General.WarnBeforeStartingStream="启动流时显示确认对话框"
 Basic.Settings.General.WarnBeforeStoppingStream="停止流时显示确认对话框"
+Basic.Settings.General.Snapping="源对齐方式"
+Basic.Settings.General.ScreenSnapping="对齐源到屏幕边缘"
+Basic.Settings.General.CenterSnapping="水平和垂直居中对齐源"
+Basic.Settings.General.SourceSnapping="对齐源跟其他的源"
+Basic.Settings.General.SnapDistance="对齐的敏感性"
 
 Basic.Settings.Stream="串流"
 Basic.Settings.Stream.StreamType="串流类型"
@@ -287,6 +322,7 @@ Basic.Settings.Output.Format="录像格式"
 Basic.Settings.Output.Encoder="编码器"
 Basic.Settings.Output.SelectDirectory="选择录像目录"
 Basic.Settings.Output.SelectFile="选择录像文件"
+Basic.Settings.Output.EnforceBitrate="强制执行流媒体服务比特率限制"
 Basic.Settings.Output.Mode="输出模式"
 Basic.Settings.Output.Mode.Simple="简单"
 Basic.Settings.Output.Mode.Adv="高级"
@@ -295,13 +331,18 @@ Basic.Settings.Output.Simple.SavePath="录像路径"
 Basic.Settings.Output.Simple.RecordingQuality="录像质量"
 Basic.Settings.Output.Simple.RecordingQuality.Stream="与流相同"
 Basic.Settings.Output.Simple.RecordingQuality.Small="高质量, 中等文件大小"
-Basic.Settings.Output.Simple.RecordingQuality.HQ="无法区分的质量, 大文件大小"
+Basic.Settings.Output.Simple.RecordingQuality.HQ="近似无损的质量, 大文件大小"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="无损的质量, 非常大的文件大小"
-Basic.Settings.Output.Simple.Warn.Encoder="警告: 使用一个软件编码器录像使用与流不同的质量, 将会需要额外的CPU使用, 如果你同时流传输跟录像. "
+Basic.Settings.Output.Simple.Warn.VideoBitrate="警告: 视频比特率将设置为 %1, 这是当前的流媒体服务的上限值. 如果你确定你想要超过 %1, 启用高级的编码器选项并取消选中\"强制流媒体服务比特率限制\"."
-Basic.Settings.Output.Simple.Warn.Lossless="警告: 无损质量产生非常大的文件大小! 无损的质量可以每分钟使用超过 7 千兆字节的磁盘空间在高分辨率和帧速率的情况。 无损不适合长时间录像，除非你有很大数量的可用磁盘空间。"
+Basic.Settings.Output.Simple.Warn.AudioBitrate="警告: 音频比特率将设置为 %1, 这是当前的流媒体服务的上限值. 如果你确定你想要超过 %1, 启用高级的编码器选项并取消选中\"强制流媒体服务比特率限制\"."
+Basic.Settings.Output.Simple.Warn.Encoder="警告: 同时传输流和录像, 并使用软件编码器编码与流不同的质量, 将会需要额外的CPU使用."
+Basic.Settings.Output.Simple.Warn.Lossless="警告: 无损质量产生的文件大小非常大! 无损质量在高分辨率和帧速率的情况下可以使用超过7GB的磁盘空间每分钟。 无损不适合长时间录像，除非你有很多可用的磁盘空间。"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="你确定你想要使用无损质量?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="无损质量警告!"
-Basic.Settings.Output.Simple.Encoder.Software="软件 (264)"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="警告: 当同时推流和录像时, 你不能使用多个单独的 QSV 编码器.  如果你想要同时推流和录像, 请更改录像的编码器或者推流的编码器."
+Basic.Settings.Output.Simple.Encoder.Software="软件 (x264)"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="硬件 (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="硬件 (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="软件 (x 264 低 CPU 使用率预设，增加文件大小)"
 Basic.Settings.Output.VideoBitrate="视频比特率"
 Basic.Settings.Output.AudioBitrate="音频比特率"
@@ -328,6 +369,8 @@ Basic.Settings.Output.Adv.Recording.Type="类型"
 Basic.Settings.Output.Adv.Recording.Type.Standard="标准"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="自定义输出 (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(使用流编码器)"
+Basic.Settings.Output.Adv.Recording.Filename="文件名格式"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="如果文件存在, 覆盖"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg 输出类型"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="输出到 URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="输出到文件"
@@ -348,6 +391,10 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="音频编码器"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="视频编码器设置 (如果有)"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer 设置 (如果有)"
 
+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"
+
+FilenameFormatting.TT="%CCYY		年, 4位\n%YY		年, 后两位 (00-99)\n%MM		月份 (01-12)\n%DD		日, 用0补充 (01-31)\n%hh		24小时制小时 (00-23)\n%mm		分钟 (00-59)\n%ss		秒 (00-61)\n%%		A % sign\n%a		缩写工作日名称\n%A		完整工作日名称\n%b		缩写月份名称\n%B		完整月份名称\n%d		日, 用0补充 (01-31)\n%H		24小时制小时 (00-23)\n%I		12小时制小时 (01-12)\n%m		月份 (01-12)\n%M		分支 (00-59)\n%p		AM 或 PM\n%S		秒 (00-61)\n%y		年, 后两位 (00-99)\n%Y		年\n%z		ISO 8601 offset from UTC 或者 时区\n		名称或缩写\n%Z		时区名称或缩写\n"
+
 Basic.Settings.Video="视频"
 Basic.Settings.Video.Adapter="视频适配器："
 Basic.Settings.Video.BaseResolution="基础 (Canvas) 分辨率:"

obs/data/locale/zh-TW.ini

@@ -8,13 +8,14 @@ Cancel="取消"
 Close="關閉"
 Save="儲存"
 Discard="捨棄"
+Disable="停用"
 Yes="是"
 No="否"
 Add="新增"
-Remove="刪除"
+Remove="移除"
 Rename="重新命名"
 Interact="互動"
-Filters="篩選器"
+Filters="濾鏡"
 Properties="屬性"
 MoveUp="向上移動"
 MoveDown="向下移動"
@@ -43,6 +44,10 @@ ResetOSXVSyncOnExit="離開時重製OSX垂直同步"
 HighResourceUsage="編碼過載！考慮降低影像設定或使用更快的編碼預設。"
 Transition="轉場"
 QuickTransitions="快速轉場"
+Left="左"
+Right="右"
+Top="上"
+Bottom="下"
 
 QuickTransitions.SwapScenes="轉場後交換預覽/輸出場景"
 QuickTransitions.SwapScenesTT="(如果輸出的原始場景仍然存在) 轉場後交換預覽和輸出場景。\n這並不會復原任何對輸出原始場景所作的改動。"
@@ -52,10 +57,16 @@ QuickTransitions.EditProperties="複製來源"
 QuickTransitions.EditPropertiesTT="在修改同樣的場景時，讓修改影像來源的屬性時不需要修改輸出。\n這只能在'複製場景'被啟動時使用。\n某些來源 (如擷取或是媒體來源) 並不支援此功能且無法被單獨修改。\n變更這個值將會 (如果還存在的話) 重置目前的輸出場景。\n\n警告：由於來源會被複製，這功能可能會使用額外的系統或是影像資源。"
 QuickTransitions.HotkeyName="快速轉場：%1"
 
+Basic.AddTransition="添加設置轉換動畫"
+Basic.RemoveTransition="移除設置轉換動畫"
+Basic.TransitionProperties="轉換動畫屬性"
 Basic.SceneTransitions="轉場特效"
 Basic.TransitionDuration="持續時間"
 Basic.TogglePreviewProgramMode="工作室模式"
 
+TransitionNameDlg.Text="請輸入轉換動畫名稱"
+TransitionNameDlg.Title="轉換動畫名稱"
+
 TitleBar.Profile="設定檔"
 TitleBar.Scenes="場景"
 
@@ -63,7 +74,7 @@ NameExists.Title="名稱已經存在"
 NameExists.Text="這個名稱已被使用。"
 
 NoNameEntered.Title="請輸入有效的名稱"
-NoNameEntered.Text="您使用的名稱不能為空。"
+NoNameEntered.Text="您不能使用空白的名稱。"
 
 ConfirmStart.Title="啟動串流？"
 ConfirmStart.Text="你確定你想要啟動串流？"
@@ -72,7 +83,7 @@ ConfirmStop.Title="停止串流？"
 ConfirmStop.Text="你確定你想要停止串流？"
 
 ConfirmExit.Title="離開OBS？"
-ConfirmExit.Text="正在使用 OBS，所有的錄製活動都將被關閉。您確定要退出嗎？"
+ConfirmExit.Text="正在使用 OBS，所有的串流/錄製都將被關閉。您確定要退出嗎？"
 
 ConfirmRemove.Title="確認刪除？"
 ConfirmRemove.Text="您確定要刪除「$1」？"
@@ -80,7 +91,7 @@ ConfirmRemove.Text="您確定要刪除「$1」？"
 Output.ConnectFail.Title="連線失敗"
 Output.ConnectFail.BadPath="無效的路徑或 URL。 請確認您的設定是正確的。"
 Output.ConnectFail.ConnectFailed="與伺服器連線失敗。"
-Output.ConnectFail.InvalidStream="無法存取指定的頻道或串流金鑰。 可能輸入了無效的金鑰或頻道，或伺服器認爲您已在發送串流中（已登入）。"
+Output.ConnectFail.InvalidStream="無法訪問指定的頻道或串流金鑰，請仔細檢查您的串流金鑰。 如果它是正確的有可能是連接到伺服器時出現問題。"
 Output.ConnectFail.Error="發生無法預期的連線錯誤。 參見 Log 檔以便獲取更多資訊。"
 Output.ConnectFail.Disconnected="與伺服器連線中斷。"
 
@@ -107,7 +118,6 @@ LicenseAgreement.Exit="離開"
 Remux.SourceFile="OBS 錄影"
 Remux.TargetFile="目標檔案"
 Remux.Remux="重新封裝"
-Remux.RecordingPattern="OBS 錄影 (*.flv)"
 Remux.FinishedTitle="重新封裝完成"
 Remux.Finished="錄影已被重新封裝"
 Remux.FinishedError="錄影已被重新封裝，但檔案可能不完整"
@@ -133,6 +143,16 @@ Basic.DisplayCapture="截取螢幕"
 
 Basic.Main.PreviewConextMenu.Enable="啟用預覽"
 
+Deinterlacing="去交錯"
+Deinterlacing.Discard="捨棄"
+Deinterlacing.Retro="復古"
+Deinterlacing.Blend="混合"
+Deinterlacing.Blend2x="混合 2x"
+Deinterlacing.Linear="線性"
+Deinterlacing.Linear2x="線性 2x"
+Deinterlacing.Yadif="Yadif"
+Deinterlacing.Yadif2x="Yadif 2x"
+
 Basic.Main.AddSceneDlg.Title="新增場景"
 Basic.Main.AddSceneDlg.Text="請輸入場景名稱"
 
@@ -182,8 +202,8 @@ Basic.StatusBar.DelayStartingIn="延遲（在 %1 秒內開始）"
 Basic.StatusBar.DelayStoppingIn="延遲（在 %1 秒內停止）"
 Basic.StatusBar.DelayStartingStoppingIn="延遲（在 %1 秒內停止，%2 秒後開始）"
 
-Basic.Filters="篩選器"
+Basic.Filters="濾鏡"
-Basic.Filters.AsyncFilters="音訊/影像 篩選器"
+Basic.Filters.AsyncFilters="音訊/影像 濾鏡"
 Basic.Filters.AudioFilters="音訊濾鏡"
 Basic.Filters.EffectFilters="特效濾鏡"
 Basic.Filters.Title="'%1' 的濾鏡"
@@ -198,6 +218,7 @@ Basic.TransformWindow.Alignment="位置原點"
 Basic.TransformWindow.BoundsType="外框類型"
 Basic.TransformWindow.BoundsAlignment="對齊外框"
 Basic.TransformWindow.Bounds="外框大小"
+Basic.TransformWindow.Crop="剪裁"
 
 Basic.TransformWindow.Alignment.TopLeft="左上角"
 Basic.TransformWindow.Alignment.TopCenter="水平靠上"
@@ -293,6 +314,7 @@ Basic.Settings.Output.Format="錄影格式"
 Basic.Settings.Output.Encoder="編碼器"
 Basic.Settings.Output.SelectDirectory="選擇錄影資料夾"
 Basic.Settings.Output.SelectFile="選擇錄影檔案"
+Basic.Settings.Output.EnforceBitrate="強制設定實況流量上限"
 Basic.Settings.Output.Mode="輸出模式"
 Basic.Settings.Output.Mode.Simple="簡易"
 Basic.Settings.Output.Mode.Adv="進階"
@@ -303,11 +325,16 @@ Basic.Settings.Output.Simple.RecordingQuality.Stream="與實況同等畫質"
 Basic.Settings.Output.Simple.RecordingQuality.Small="高畫質，檔案大小中等"
 Basic.Settings.Output.Simple.RecordingQuality.HQ="近乎無損畫質，檔案大小巨大"
 Basic.Settings.Output.Simple.RecordingQuality.Lossless="無損畫質，非常大的檔案"
+Basic.Settings.Output.Simple.Warn.VideoBitrate="警告：實況影像流量將會被設為 %1，他是目前實況流量的上限。如果您確定想要超過 %1 的限制，請開啟進階編碼器選項，並取消「強制設定實況流量上限」。"
+Basic.Settings.Output.Simple.Warn.AudioBitrate="警告：實況音訊流量將會被設為 %1，他是目前實況流量的上限。如果您確定想要超過 %1 的限制，請開啟進階編碼器選項，並取消「強制設定實況流量上限」。"
 Basic.Settings.Output.Simple.Warn.Encoder="警告：如果錄影與實況同時運作，並使用與實況不同的編碼品質設定將會增加額外的CPU使用量"
 Basic.Settings.Output.Simple.Warn.Lossless="警告：無損畫質將會產生大容量的暫存檔！無損畫質在高解析度或高幀率時，可能會每分鐘使用高達 7GB（gigabytes）的容量。除非您擁有海量的硬碟空間，否則不建議使用無損畫質錄製長時間的影片。"
 Basic.Settings.Output.Simple.Warn.Lossless.Msg="你確定你想要使用無損畫質?"
 Basic.Settings.Output.Simple.Warn.Lossless.Title="無損畫質警告！"
+Basic.Settings.Output.Simple.Warn.MultipleQSV="警告 ︰ 在同一時間串流和錄像，您不能使用多個單獨的 QSV 編碼器。 如果你想要在同一時間串流和錄像，請更改錄像編碼器或串流編碼器。"
 Basic.Settings.Output.Simple.Encoder.Software="軟體編碼（ x264 ）"
+Basic.Settings.Output.Simple.Encoder.Hardware.QSV="硬體 (QSV)"
+Basic.Settings.Output.Simple.Encoder.Hardware.NVENC="硬體 (NVENC)"
 Basic.Settings.Output.Simple.Encoder.SoftwareLowCPU="軟體編碼（ x264 預設低 CPU 使用率，將增加檔案容量 ）"
 Basic.Settings.Output.VideoBitrate="影像頻率（kbit/s）"
 Basic.Settings.Output.AudioBitrate="音效頻率（kbit/s）"
@@ -334,6 +361,8 @@ Basic.Settings.Output.Adv.Recording.Type="類型"
 Basic.Settings.Output.Adv.Recording.Type.Standard="標準"
 Basic.Settings.Output.Adv.Recording.Type.FFmpegOutput="自訂輸出 (FFmpeg)"
 Basic.Settings.Output.Adv.Recording.UseStreamEncoder="(使用串流編碼器)"
+Basic.Settings.Output.Adv.Recording.Filename="檔案名稱格式"
+Basic.Settings.Output.Adv.Recording.OverwriteIfExists="如果檔案存在就覆寫"
 Basic.Settings.Output.Adv.FFmpeg.Type="FFmpeg 輸出類型"
 Basic.Settings.Output.Adv.FFmpeg.Type.URL="輸出到 URL"
 Basic.Settings.Output.Adv.FFmpeg.Type.RecordToFile="輸出到檔案"
@@ -354,6 +383,9 @@ Basic.Settings.Output.Adv.FFmpeg.AEncoder="音效編碼器"
 Basic.Settings.Output.Adv.FFmpeg.AEncoderSettings="音效編碼設定（如果有才啟用）"
 Basic.Settings.Output.Adv.FFmpeg.MuxerSettings="Muxer 設定（如果有才啟用）"
 
+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"
+
+
 Basic.Settings.Video="影像"
 Basic.Settings.Video.Adapter="顯示卡："
 Basic.Settings.Video.BaseResolution="來源（全畫面）解析度："
@@ -384,7 +416,7 @@ Basic.Settings.Audio.AuxDevice="麥克風/輸入音效 1"
 Basic.Settings.Audio.AuxDevice2="麥克風/輸入音效 2"
 Basic.Settings.Audio.AuxDevice3="麥克風/輸入音效 3"
 Basic.Settings.Audio.EnablePushToMute="啟用 按壓時靜音"
-Basic.Settings.Audio.PushToMuteDelay="延遲 按壓時靜音"
+Basic.Settings.Audio.PushToMuteDelay="按壓時靜音 延遲"
 Basic.Settings.Audio.EnablePushToTalk="啟用 按壓時說話"
 Basic.Settings.Audio.PushToTalkDelay="按壓時說話 延遲"
 Basic.Settings.Audio.UnknownAudioDevice="[設備未連接或不可用]"

obs/dist/obs.desktop

@@ -3,6 +3,7 @@ Version=1.0
 Name=OBS
 GenericName=Streaming/Recording Software
 Comment=Free and Open Source Streaming/Recording Software
+Comment[ru]=Бесплатная программа с открытым кодом для записи/трансляции видео
 Exec=obs
 Icon=obs
 Terminal=false