From fcb8561d6c9d802e09f58985f9d996c25d05ad63 Mon Sep 17 00:00:00 2001
From: jp9000 <obs.jim@gmail.com>
Date: Mon, 19 Jan 2015 03:41:27 -0800
Subject: [PATCH] UI: Rename 'x264 Preset' to 'Encoder Preset'

In the future, encoders other than x264 may end up filling this preset
list with their own values.
---
 obs/data/locale/en-US.ini     | 2 +-
 obs/forms/OBSBasicSettings.ui | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/obs/data/locale/en-US.ini b/obs/data/locale/en-US.ini
index 090dee777..d5c982fdf 100644
--- a/obs/data/locale/en-US.ini
+++ b/obs/data/locale/en-US.ini
@@ -226,7 +226,7 @@ Basic.Settings.Output.Reconnect="Automatically Reconnect"
 Basic.Settings.Output.RetryDelay="Retry Delay (seconds)"
 Basic.Settings.Output.MaxRetries="Maximum Retries"
 Basic.Settings.Output.Advanced="Enable Advanced Encoder Settings"
-Basic.Settings.Output.X264Preset="x264 Preset"
+Basic.Settings.Output.EncoderPreset="Encoder Preset"
 Basic.Settings.Output.CustomEncoderSettings="Custom Encoder Settings"
 Basic.Settings.Output.UseCBR="Use Constant Bitrate"
 
diff --git a/obs/forms/OBSBasicSettings.ui b/obs/forms/OBSBasicSettings.ui
index b5738bb53..5c84562eb 100644
--- a/obs/forms/OBSBasicSettings.ui
+++ b/obs/forms/OBSBasicSettings.ui
@@ -540,7 +540,7 @@
                       <bool>true</bool>
                      </property>
                      <property name="text">
-                      <string>Basic.Settings.Output.X264Preset</string>
+                      <string>Basic.Settings.Output.EncoderPreset</string>
                      </property>
                     </widget>
                    </item>