diff --git a/assets/lang/en_US.ini b/assets/lang/en_US.ini
index a85a5904f6..1e11bfbe47 100644
--- a/assets/lang/en_US.ini
+++ b/assets/lang/en_US.ini
@@ -55,6 +55,7 @@ Auto-centering analog stick = Auto-centering analog stick
 Auto-hide buttons after seconds = Auto-hide buttons after seconds
 Auto-rotation speed = Auto-rotation speed
 Auto-switch = Auto-switch
+Base tilt position = Base tilt position
 Binds = Binds
 Button Binding = Button Binding
 Button Opacity = Buttons opacity
@@ -672,23 +673,41 @@ An.Right = Analog Right
 An.Up = Analog Up
 Analog limiter = Analog limiter
 Analog Stick = Analog stick
+Arrow down = ลูกศรลง
+Arrow left = ลูกศรซ้าย
+Arrow right = ลูกศรขวา
+Arrow up = ลูกศรขึ้น
 Audio/Video Recording = Audio/Video recording
 Auto Analog Rotation (CCW) = Auto analog rotation (CCW)
 Auto Analog Rotation (CW) = Auto analog rotation (CW)
 AxisSwap = Axis swap
 Circle = Circle
 Cross = Cross
+Custom 1 = Custom 1
+Custom 2 = Custom 2
+Custom 3 = Custom 3
+Custom 4 = Custom 4
+Custom 5 = Custom 5
+Custom 6 = Custom 6
+Custom 7 = Custom 7
+Custom 8 = Custom 8
+Custom 9 = Custom 9
+Custom 10 = Custom 10
 D-pad down = D-pad down
 D-pad left = D-pad left
 D-pad right = D-pad right
 D-pad up = D-pad up
 DevMenu = DevMenu
+Double tap button = Double tap button
 Down = Dpad Down
+Down Triangle = Down Triangle
 Dpad = Dpad
 Frame Advance = Frame advance
+Gear = Gear
 Hold = Hold
 Home = Home
 L = L
+L button = L button
 Left = Dpad Left
 Load State = Load state
 Mute toggle = Mute toggle
@@ -697,12 +716,17 @@ None = None
 Note = Note
 OpenChat = Open chat
 Pause = Pause
+Plus = Plus
 R = R
+R button = R button
 RapidFire = Rapid-fire
+Record = Record
+Rectangle = Rectangle
 Remote hold = Remote hold
 Rewind = Rewind
+Rhombus = Rhombus
 Right = Dpad Right
-Right Analog Stick (tap to customize) = Right analog stick (tap to customize)
+Right Analog Stick = Right Analog Stick
 RightAn.Down = RightAn.Down
 RightAn.Left = RightAn.Left
 RightAn.Right = RightAn.Right
@@ -716,6 +740,11 @@ Select = Select
 SpeedToggle = Speed toggle
 Square = Square
 Start = Start
+Swipe Down = Swipe Down
+Swipe Left = Swipe Left
+Swipe Right = Swipe Right
+Swipe Up = Swipe Up
+tap to customize = tap to customize
 Texture Dumping = Texture dumping
 Texture Replacement = Texture replacement
 Toggle Fullscreen = Toggle fullscreen
@@ -723,6 +752,7 @@ Toggle mode = Toggle mode
 Triangle = Triangle
 Fast-forward = Fast-forward
 Up = Dpad Up
+Vertical Rectangle = Vertical Rectangle
 Vol + = Vol +
 Vol - = Vol -
 Wlan = WLAN
@@ -765,6 +795,7 @@ Invalid IP or hostname = Invalid IP or hostname
 Minimum Timeout = Minimum timeout (override in ms, 0 = default)
 Misc = Miscellaneous (default = PSP compatibility)
 Network Initialized = Network initialized
+None = None
 Please change your Port Offset = Please change your port offset
 Port offset = Port offset (0 = PSP compatibility)
 PPSSPP Ad-Hoc Wiki Page = PPSSPP Ad-Hoc Wiki Page
@@ -801,6 +832,8 @@ Rewind = Rewind
 Save State = Save state
 Settings = Settings
 Switch UMD = Switch UMD
+Undo last load = Undo last load
+Undo last save = Undo last save
 
 [PostShaders]
 (duplicated setting, previous slider will be used) = (duplicated setting, previous slider will be used)
@@ -831,6 +864,7 @@ Scanlines = Scanlines (CRT)
 Sharpen = Sharpen
 SSAA(Gauss) = Supersampling AA (Gauss)
 Tex4xBRZ = 4xBRZ
+TexMMPX = TexMMPX
 UpscaleSpline36 = Spline36 Upscaler
 VideoSmoothingAA = Video Smoothing AA
 Vignette = Vignette
@@ -888,9 +922,11 @@ EasyUSBAccess = Easy USB access
 Failed to move some files! = Failed to move some files!
 Failed to save config = Failed to save config
 Free space = Free space
+Manually specify PSP folder = Manually specify PSP folder
 MemoryStickDescription = Choose where to keep PSP data (Memory Stick)
 Move Data = Move Data
 Selected PSP Data Folder = Selected PSP Data Folder
+Skip for now = Skip for now
 No data will be changed = No data will be changed
 PPSSPP will restart after the change = PPSSPP will restart after the change
 Starting move... = Starting move...
@@ -924,6 +960,8 @@ Stopping.. = Stopping...
 
 [Reporting]
 Bad = Bad
+FeedbackCRCCalculating = FeedbackCRCCalculating
+FeedbackCRCValue = FeedbackCRCValue
 FeedbackDelayInfo = Your data is being submitted in the background.
 FeedbackDesc = How's the emulation? Let us and the community know!
 FeedbackDisabled = Compatibility server reports must be enabled.
@@ -949,6 +987,7 @@ Perfect Description = Flawless emulation for the entire game - great!
 Plays = Plays
 Plays Description = Fully playable but might be with glitches
 ReportButton = Report feedback
+Show disc CRC = Show disc CRC
 Speed = Speed
 Submit Feedback = Submit feedback
 SuggestionConfig = See reports on website for good settings.
@@ -983,6 +1022,8 @@ In menu = In menu
 Load savestate failed = Load savestate failed
 Loaded State = State loaded
 Loaded. Save in game, restart, and load for less bugs. = Loaded. Save in game, restart, and load for less bugs.
+Loaded. Game may refuse to save over different savedata = Loaded. Game may refuse to save over different savedata
+Loaded. Game may refuse to save over newer savedata = Loaded. Game may refuse to save over newer savedata
 LoadStateDoesntExist = Failed to load state: Savestate doesn't exist!
 LoadStateWrongVersion = Failed to load state: Savestate is for an older version of PPSSPP!
 norewind = No rewind save states available.
@@ -1029,6 +1070,7 @@ D3DCompiler Version = D3DCompiler version
 Debug = Debug
 Debugger Present = Debugger present
 Device Info = Device info
+Directories = Directories
 Display Information = Display information
 Driver Version = Driver version
 EGL Extensions = EGL extensions
@@ -1052,6 +1094,7 @@ Release = Release
 RW/RX exclusive = RW/RX exclusive
 Sample rate = Sample rate
 Shading Language = Shading language
+Storage = Storage
 Sustained perf mode = Sustained perf mode
 System Information = System information
 System Name = Name
@@ -1101,6 +1144,7 @@ Failed to load state. Error in the file system. = Failed to load state. Error in
 Failed to save state. Error in the file system. = Failed to save state. Error in the file system.
 Fast (lag on slow storage) = Fast (lag on slow storage)
 Fast Memory = Fast memory (unstable)
+Floating symbols = Floating symbols
 Force real clock sync (slower, less lag) = Force real clock sync (slower, less lag)
 frames, 0:off = frames, 0 = off
 Games list settings = Games list settings
@@ -1118,11 +1162,14 @@ Memory Stick Folder = Memory Stick folder
 Memory Stick inserted = Memory Stick inserted
 MHz, 0:default = MHz, 0 = default
 MMDDYYYY = MMDDYYYY
+Moving background = Moving background
 Newest Save = Newest save
 No animation = No animation
 Not a PSP game = Not a PSP game
 Off = Off
 Oldest Save = Oldest save
+Path does not exist! = Path does not exist!
+PSP Memory Stick = PSP Memory Stick
 PSP Model = PSP model
 PSP Settings = PSP settings
 PSP-1000 = PSP-1000
@@ -1154,6 +1201,7 @@ UI = UI
 UI Sound = UI sound
 UI background animation = UI background animation
 undo %c = backup %c
+USB = USB
 Use Lossless Video Codec (FFV1) = Use lossless video codec (FFV1)
 Use O to confirm = Use O as confirmation button
 Use output buffer (with overlay) for recording = Use output buffer (with overlay) for recording
@@ -1162,6 +1210,7 @@ Use X to confirm = Use X as confirmation button
 VersionCheck = Check for new versions of PPSSPP
 WARNING: Android battery save mode is on = WARNING: Android battery save mode is On
 WARNING: Battery save mode is on = WARNING: Battery save mode is on
+Waves = Waves
 YYYYMMDD = YYYYMMDD
 
 [Upgrade]
diff --git a/assets/lang/th_TH.ini b/assets/lang/th_TH.ini
index 26532a66b3..f2a5835951 100644
--- a/assets/lang/th_TH.ini
+++ b/assets/lang/th_TH.ini
@@ -703,7 +703,6 @@ Remote hold = หยุดการใช้รีโมท
 Rewind = โหลดสเตทพื้นหลัง
 Rhombus = สี่เหลี่ยมเปียกปูน
 Right = ลูกศรขวา
-Right Analog Stick (tap to customize) = Right analog stick (tap to customize)
 Right Analog Stick = ปุ่มอนาล็อกขวา
 RightAn.Down = อนาล็อก(ขวา)ลง
 RightAn.Left = อนาล็อก(ขวา)ซ้าย
@@ -902,9 +901,7 @@ Free space = พื้นที่ว่าง
 Manually specify PSP folder = ใช้โฟลเดอร์ PSP แบบกำหนดเส้นทางเอง
 MemoryStickDescription = เลือกแหล่งที่เก็บข้อมูล PSP (เม็มโมรี่ สติ๊ก)
 Move Data = ย้ายข้อมูล
-New PSP Data Folder = โฟลเดอร์เก็บข้อมูล PSP อันใหม่
 No data will be changed = ไม่มีข้อมูลอะไรถูกเปลี่ยนแปลง
-Old PSP Data Folder = โฟลเดอร์เก็บข้อมูล PSP อันเก่า
 PPSSPP will restart after the change = PPSSPP จะรีสตาร์ทใหม่หลังจากปรับเปลี่ยนตั้งค่า
 Selected PSP Data Folder = โฟลเดอร์ข้อมูล PSP ที่เลือกไว้
 Skip for now = ข้ามไปก่อน