From 8c0bdd71d981180c3429a529d43f72d6cf1fbdc1 Mon Sep 17 00:00:00 2001
From: Talkashie <26035046+Talkashie@users.noreply.github.com>
Date: Sat, 11 Nov 2017 06:56:59 -0600
Subject: [PATCH] Correct two typos and a couple of other nitpicky things
 (#3721)

Correct two typos and a couple of other nitpicky things
---
 rpcs3/Json/tooltips.json             | 2 +-
 rpcs3/rpcs3qt/pad_settings_dialog.ui | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/rpcs3/Json/tooltips.json b/rpcs3/Json/tooltips.json
index 98e78b819e..cc42c77fb2 100644
--- a/rpcs3/Json/tooltips.json
+++ b/rpcs3/Json/tooltips.json
@@ -47,7 +47,7 @@
 		"logProg": "Dump game shaders to file. Only useful to developers.\nIf unsure, don't use this option.",
 		"disableOcclusionQueries": "Disables running occlusion queries. Minor to moderate performance boost.\nMight introduce issues with broken occlusion e.g missing geometry and extreme pop-in.",
 		"disableVertexCache": "Disables the vertex cache.\nMight resolve missing or flickering graphics output.\nMay degrade performance.",
-		"forceCpuBlitEmulation": "Forces emulation of all blit and image manipulation operations on the cpu.\nRequires 'Write Color Buffers' option to also be enabled in most cases to avoid missing graphics.\nSignificatly degrades performance but is more accurate in some cases.\nThis setting overrides the 'GPU texture scaling' option."
+		"forceCpuBlitEmulation": "Forces emulation of all blit and image manipulation operations on the CPU.\nRequires 'Write Color Buffers' option to also be enabled in most cases to avoid missing graphics.\nSignificantly degrades performance but is more accurate in some cases.\nThis setting overrides the 'GPU texture scaling' option."
 	},
 	"emulator": {
 		"gui": {
diff --git a/rpcs3/rpcs3qt/pad_settings_dialog.ui b/rpcs3/rpcs3qt/pad_settings_dialog.ui
index 1f739778a7..b67b7d4f61 100644
--- a/rpcs3/rpcs3qt/pad_settings_dialog.ui
+++ b/rpcs3/rpcs3qt/pad_settings_dialog.ui
@@ -11,7 +11,7 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>Configure keyboard</string>
+   <string>Configure Keyboard</string>
   </property>
   <property name="windowIcon">
    <iconset resource="../resources.qrc">
@@ -1161,7 +1161,7 @@
            <bool>false</bool>
           </property>
           <property name="text">
-           <string>Sixaixs</string>
+           <string>Sixaxis</string>
           </property>
           <property name="checkable">
            <bool>true</bool>