26 files changed, 975 insertions, 236 deletions
diff --git a/README.md b/README.md
index d56aa7ed..d3175662 100644
--- a/README.md
+++ b/README.md
@@ -5,26 +5,91 @@
 
 ## Intro
 
-The aim of this project is to reverse GTA III for PC by replacing
-parts of the game [one by one](https://en.wikipedia.org/wiki/Ship_of_Theseus)
-such that we have a working game at all times.
+In this repository you'll find the fully reversed source code for GTA III ([master](tree/master) branch) and GTA VC ([miami](tree/miami) branch).
 
-## How can I try it?
+It has been tested and works on Windows, Linux and FreeBSD, on x86, amd64, arm and arm64.\
+Rendering is handled either by original RenderWare (D3D8)
+or the reimplementation [librw](https://github.com/aap/librw) (D3D9, OpenGL 2.1 or above, OpenGL ES 2.0 or above).\
+Audio is done with MSS (using dlls from original GTA) or OpenAL.
 
-- re3 requires game assets to work, so you **must** own [a copy of GTA III](https://store.steampowered.com/app/12100/Grand_Theft_Auto_III/).
-- Build re3 or download [the latest nightly build](https://github.com/GTAmodding/re3/actions) (You must be logged in.)
-- (Optional) If you want to use optional features like Russian language or menu map, copy the files in /gamefiles folder to your game root folder.
-- Move re3 executable to GTA 3 directory and run it.
+The project has also been ported to the [Nintendo Switch](https://github.com/AGraber/re3-nx/),
+[Playstation Vita](https://github.com/Rinnegatamante/re3) and
+[Nintendo Wii U](https://github.com/GaryOderNichts/re3-wiiu/).
+
+We cannot build for PS2 or Xbox yet. If you're interested in doing so, get in touch with us.
 
-## Latest standalone executables to download 
+## Installation
 
-(Put content of selected archive into gamedir)
+- re3 requires PC game assets to work, so you **must** own [a copy of GTA III](https://store.steampowered.com/app/12100/Grand_Theft_Auto_III/).
+- Build re3 or download the latest nightly build:
+  - [Windows D3D9 MSS 32bit](https://nightly.link/GTAmodding/re3/workflows/re3_msvc_x86/master/re3_Release_win-x86-librw_d3d9-mss.zip)
+  - [Windows D3D9 64bit](https://nightly.link/GTAmodding/re3/workflows/re3_msvc_amd64/master/re3_Release_win-amd64-librw_d3d9-oal.zip)
+  - [Windows OpenGL 64bit](https://nightly.link/GTAmodding/re3/workflows/re3_msvc_amd64/master/re3_Release_win-amd64-librw_gl3_glfw-oal.zip)
+  - [Linux 64bit](https://nightly.link/GTAmodding/re3/workflows/build-cmake-conan/master/ubuntu-latest-gl3.zip)
+  - [MacOS 64bit](https://nightly.link/GTAmodding/re3/workflows/build-cmake-conan/master/macos-latest-gl3.zip)
+- Copy the files from the `gamefiles` directory to your game root directory. (This is not strictly necessary but very much recommended)
+- Move re3 executable to GTA 3 directory and run it.
 
-- [Windows D3D9 MSS 32bit](https://nightly.link/GTAmodding/re3/workflows/re3_msvc_x86/master/re3_Release_win-x86-librw_d3d9-mss.zip)
-- [Windows D3D9 64bit](https://nightly.link/GTAmodding/re3/workflows/re3_msvc_amd64/master/re3_Release_win-amd64-librw_d3d9-oal.zip)
-- [Windows OpenGL 64bit](https://nightly.link/GTAmodding/re3/workflows/re3_msvc_amd64/master/re3_Release_win-amd64-librw_gl3_glfw-oal.zip)
-- [Linux 64bit](https://nightly.link/GTAmodding/re3/workflows/build-cmake-conan/master/ubuntu-latest-gl3.zip)
-- [MacOS 64bit](https://nightly.link/GTAmodding/re3/workflows/build-cmake-conan/master/macos-latest-gl3.zip)
+## Screenshots
+
+![re3 2021-02-11 22-57-03-23](https://user-images.githubusercontent.com/1521437/107704085-fbdabd00-6cbc-11eb-8406-8951a80ccb16.png)
+![re3 2021-02-11 22-43-44-98](https://user-images.githubusercontent.com/1521437/107703339-cbdeea00-6cbb-11eb-8f0b-07daa105d470.png)
+![re3 2021-02-11 22-46-33-76](https://user-images.githubusercontent.com/1521437/107703343-cd101700-6cbb-11eb-9ccd-012cb90524b7.png)
+![re3 2021-02-11 22-50-29-54](https://user-images.githubusercontent.com/1521437/107703348-d00b0780-6cbb-11eb-8afd-054249c2b95e.png)
+
+## Improvements
+
+We have implemented a number of changes and improvements to the original game.
+They can be configured in `core/config.h`.
+Some of them can be toggled at runtime, some cannot.
+
+* Fixed a lot of smaller and bigger bugs
+* User files (saves and settings) stored in GTA root directory
+* Settings stored in re3.ini file instead of gta3.set
+* Debug menu to do and change various things (Ctrl-M to open)
+* Debug camera (Ctrl-B to toggle)
+* Rotatable camera
+* Xinput controller support (Windows)
+* No loading screens between islands ("map memory usage" in menu)
+* Skinned ped support (models from Xbox or Mobile)
+* Rendering
+  * Widescreen support (properly scaled HUD, Menu and FOV)
+  * PS2 MatFX (vehicle reflections)
+  * PS2 alpha test (better rendering of transparency)
+  * PS2 particles
+  * Xbox vehicle rendering
+  * Xbox world lightmap rendering (needs Xbox map)
+  * Xbox ped rim light
+  * Xbox screen rain droplets
+  * More customizable colourfilter
+* Menu
+  * Map
+  * More options
+  * Controller configuration menu
+  * ...
+* Can load DFFs and TXDs from other platforms, possibly with a performance penalty
+* ...
+
+## To-Do
+
+The following things would be nice to have/do:
+
+* Fix physics for high FPS
+* Compare code with PS2 code (tedious, no good decompiler)
+* [PS2 port](https://github.com/GTAmodding/re3/wiki/PS2-port)
+* Xbox port (not quite as important)
+* reverse remaining unused/debug functions
+* compare Codewarrior build with original binary for more accurate code (very tedious)
+
+## Modding
+
+Asset modifications (models, texture, handling, script, ...) should work the same way as with original GTA for the most part.
+
+Mods that make changes to the code (dll/asi, CLEO, limit adjusters) will *not* work.
+Some things these mods do are already implemented in re3 (much of SkyGFX, GInput, SilentPatch, Widescreen fix),
+others can easily be achieved (increasing limis, see `config.h`),
+others will simply have to be rewritten and integrated into the code directly.
+Sorry for the inconvenience.
 
 ## Building from Source  
 
@@ -78,21 +143,12 @@ Assuming you have Visual Studio:
 > :information_source: **Did you notice librw?** re3 uses completely homebrew RenderWare-replacement rendering engine; [librw](https://github.com/aap/librw/). librw comes as submodule of re3, but you also can use LIBRW enviorenment variable to specify path to your own librw.
 
 ## Contributing
-Please read the [Coding Style](https://github.com/GTAmodding/re3/blob/master/CODING_STYLE.md) Document
+We have a [Coding Style](https://github.com/GTAmodding/re3/blob/master/CODING_STYLE.md) document that isn't followed or enforced very well.
 
-### Unreversed / incomplete classes (at least the ones we know)
-The following classes have only unused or practically unused code left:
-```
-NameGrid.cpp - only on mobile (a player name grid, either a very early player name code ala GTA1 or a multiplayer leftover)
-PedDebug.cpp - only on mobile (debug code)
-HandlingMgr.cpp - debug functions from mobile
-CFormationInfo - unused PedAI class that could be found on mobile
-CVehicle::ProcessBikeWheel - early bike code (only on mobile)
-CAutomobile::DebugCode - debug function from mobile
-CBoat::DebugCode - debug function from mobile
-CBoat::ModifyHandlingValue - debug function from mobile
-CBoat::DisplayHandlingData - debug function from mobile
-CStreaming::PrintRequestList - debug function from mobile
-d3d8raster.c - only on PC (slight RW modification that we don't actually need)
-```
+Do not use features from C++11 or later.
+
+
+## License
 
+We don't feel like we're in a position to give this code a license.
+If we were, it would be MIT licensed.
diff --git a/gamefiles/TEXT/american.gxt b/gamefiles/TEXT/american.gxt
index c45d3779..ebd1ac39 100644
--- a/gamefiles/TEXT/american.gxt
+++ b/gamefiles/TEXT/american.gxt
diff --git a/gamefiles/TEXT/french.gxt b/gamefiles/TEXT/french.gxt
index e5573e39..5b4c9e05 100644
--- a/gamefiles/TEXT/french.gxt
+++ b/gamefiles/TEXT/french.gxt
diff --git a/gamefiles/TEXT/german.gxt b/gamefiles/TEXT/german.gxt
index 102866d8..88c54095 100644
--- a/gamefiles/TEXT/german.gxt
+++ b/gamefiles/TEXT/german.gxt
diff --git a/gamefiles/TEXT/italian.gxt b/gamefiles/TEXT/italian.gxt
index 55fe2e82..746f07da 100644
--- a/gamefiles/TEXT/italian.gxt
+++ b/gamefiles/TEXT/italian.gxt
diff --git a/gamefiles/TEXT/polish.gxt b/gamefiles/TEXT/polish.gxt
index ca151bf4..5519c290 100755
--- a/gamefiles/TEXT/polish.gxt
+++ b/gamefiles/TEXT/polish.gxt
diff --git a/gamefiles/TEXT/russian.gxt b/gamefiles/TEXT/russian.gxt
index cdef1697..aeb3f0b5 100644
--- a/gamefiles/TEXT/russian.gxt
+++ b/gamefiles/TEXT/russian.gxt
diff --git a/gamefiles/TEXT/spanish.gxt b/gamefiles/TEXT/spanish.gxt
index 936639cc..be659528 100644
--- a/gamefiles/TEXT/spanish.gxt
+++ b/gamefiles/TEXT/spanish.gxt
diff --git a/gamefiles/models/frontend_ds3.txd b/gamefiles/models/frontend_ds3.txd
index 1e5da6e1..7481e9b9 100644
--- a/gamefiles/models/frontend_ds3.txd
+++ b/gamefiles/models/frontend_ds3.txd
diff --git a/gamefiles/models/frontend_ds4.txd b/gamefiles/models/frontend_ds4.txd
index e3cd2bff..594de328 100644
--- a/gamefiles/models/frontend_ds4.txd
+++ b/gamefiles/models/frontend_ds4.txd
diff --git a/gamefiles/models/frontend_x360.txd b/gamefiles/models/frontend_x360.txd
index 9ba773f2..a57b8d13 100644
--- a/gamefiles/models/frontend_x360.txd
+++ b/gamefiles/models/frontend_x360.txd
diff --git a/gamefiles/models/frontend_xone.txd b/gamefiles/models/frontend_xone.txd
index 848580e3..03dfefda 100644
--- a/gamefiles/models/frontend_xone.txd
+++ b/gamefiles/models/frontend_xone.txd
diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp
index ed5b149c..069cbdef 100644
--- a/src/core/MenuScreensCustom.cpp
+++ b/src/core/MenuScreensCustom.cpp
@@ -731,7 +731,7 @@ CMenuScreenCustom aScreens[MENUPAGES] = {
 		MENUACTION_LOADRADIO,		"FET_AUD", { nil, SAVESLOT_NONE, MENUPAGE_SOUND_SETTINGS },
 		MENUACTION_CHANGEMENU,		"FET_DIS", { nil, SAVESLOT_NONE, MENUPAGE_DISPLAY_SETTINGS },
 #ifdef GRAPHICS_MENU_OPTIONS
-		MENUACTION_CHANGEMENU,		"FET_GRA", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS },
+		MENUACTION_CHANGEMENU,		"FET_GFX", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS },
 #endif
 		MENUACTION_CHANGEMENU,		"FET_LAN", { nil, SAVESLOT_NONE, MENUPAGE_LANGUAGE_SETTINGS },
 		MENUACTION_PLAYERSETUP,		"FET_PSU", { nil, SAVESLOT_NONE, MENUPAGE_SKIN_SELECT },
@@ -858,7 +858,7 @@ CMenuScreenCustom aScreens[MENUPAGES] = {
 
 #ifdef GRAPHICS_MENU_OPTIONS
 	// MENUPAGE_GRAPHICS_SETTINGS
-	{ "FET_GRA", MENUPAGE_OPTIONS, MENUPAGE_OPTIONS,
+	{ "FET_GFX", MENUPAGE_OPTIONS, MENUPAGE_OPTIONS,
 		new CCustomScreenLayout({MENUSPRITE_MAINMENU, 50, 0, 20, FONT_HEADING, FESCREEN_LEFT_ALIGN, true, MEDIUMTEXT_X_SCALE, MEDIUMTEXT_Y_SCALE}), GraphicsGoBack,
 
 		MENUACTION_SCREENRES,	"FED_RES", { nil, SAVESLOT_NONE, MENUPAGE_GRAPHICS_SETTINGS },
diff --git a/src/core/main.cpp b/src/core/main.cpp
index 65ae5290..37a87859 100644
--- a/src/core/main.cpp
+++ b/src/core/main.cpp
@@ -1,8 +1,10 @@
 #include "common.h"
+#include <time.h>
 #include "rpmatfx.h"
 #include "rphanim.h"
 #include "rpskin.h"
 #include "rtbmp.h"
+#include "rtpng.h"
 #ifdef ANISOTROPIC_FILTERING
 #include "rpanisot.h"
 #endif
@@ -360,7 +362,11 @@ RwGrabScreen(RwCamera *camera, RwChar *filename)
 	strcpy(temp, CFileMgr::GetRootDirName());
 	strcat(temp, filename);
 
+#ifndef LIBRW
 	if (RtBMPImageWrite(pImage, &temp[0]) == nil)
+#else
+	if (RtPNGImageWrite(pImage, &temp[0]) == nil)
+#endif
 		result = false;
 	RwImageDestroy(pImage);
 	return result;
@@ -379,6 +385,7 @@ DoRWStuffEndOfFrame(void)
 	RsCameraShowRaster(Scene.camera);
 #ifndef MASTER
 	char s[48];
+#ifdef THIS_IS_STUPID
 	if (CPad::GetPad(1)->GetLeftShockJustDown()) {
 		// try using both controllers for this thing... crazy bastards
 		if (CPad::GetPad(0)->GetRightStickY() > 0) {
@@ -390,6 +397,12 @@ DoRWStuffEndOfFrame(void)
 			RwGrabScreen(Scene.camera, s);
 		}
 	}
+#else
+	if (CPad::GetPad(1)->GetLeftShockJustDown() || CPad::GetPad(0)->GetFJustDown(11)) {
+		sprintf(s, "screen_%11lld.png", time(nil));
+		RwGrabScreen(Scene.camera, s);
+	}
+#endif
 #endif // !MASTER
 }
 
diff --git a/src/fakerw/fake.cpp b/src/fakerw/fake.cpp
index 366dcf3e..1d4c881f 100644
--- a/src/fakerw/fake.cpp
+++ b/src/fakerw/fake.cpp
@@ -945,6 +945,43 @@ RtBMPImageRead(const RwChar *imageName)
 #endif
 }
 
+
+RwImage *
+RtPNGImageWrite(RwImage *image, const RwChar *imageName)
+{
+#ifndef _WIN32
+	char *r = casepath(imageName);
+	if (r) {
+		rw::writePNG(image, r);
+		free(r);
+	} else {
+		rw::writePNG(image, imageName);
+	}
+	
+#else
+	rw::writePNG(image, imageName);
+#endif
+	return image;
+}
+RwImage *
+RtPNGImageRead(const RwChar *imageName)
+{
+#ifndef _WIN32
+	RwImage *image;
+	char *r = casepath(imageName);
+	if (r) {
+		image = rw::readPNG(r);
+		free(r);
+	} else {
+		image = rw::readPNG(imageName);
+	}
+	return image;
+
+#else
+	return rw::readPNG(imageName);
+#endif
+}
+
 #include "rtquat.h"
 
 RtQuat *RtQuatRotate(RtQuat * quat, const RwV3d * axis, RwReal angle, RwOpCombineType combineOp) { return (RtQuat*)((rw::Quat*)quat)->rotate(axis, angle/180.0f*3.14159f, (CombineOp)combineOp); }
diff --git a/src/fakerw/rtpng.h b/src/fakerw/rtpng.h
new file mode 100644
index 00000000..80f29020
--- /dev/null
+++ b/src/fakerw/rtpng.h
@@ -0,0 +1,4 @@
+#pragma once
+
+RwImage *RtPNGImageWrite(RwImage * image, const RwChar * imageName);
+RwImage *RtPNGImageRead(const RwChar * imageName);
diff --git a/src/skel/glfw/glfw.cpp b/src/skel/glfw/glfw.cpp
index b413a1ce..b44e5750 100644
--- a/src/skel/glfw/glfw.cpp
+++ b/src/skel/glfw/glfw.cpp
@@ -204,6 +204,7 @@ psGrabScreen(RwCamera *pCamera)
 	}
 #else
 	rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+	image->removeMask();
 	if(image)
 		return image;
 #endif
diff --git a/src/skel/win/win.cpp b/src/skel/win/win.cpp
index c00d6075..7317356c 100644
--- a/src/skel/win/win.cpp
+++ b/src/skel/win/win.cpp
@@ -259,6 +259,7 @@ psGrabScreen(RwCamera *pCamera)
 	}
 #else
 	rw::Image *image = RwCameraGetRaster(pCamera)->toImage();
+	image->removeMask();
 	if(image)
 		return image;
 #endif
diff --git a/utils/gxt/american.txt b/utils/gxt/american.txt
index e04e92a8..cf71c958 100644
--- a/utils/gxt/american.txt
+++ b/utils/gxt/american.txt
@@ -7216,9 +7216,6 @@ CONNECTION
 [FET_AUD]
 AUDIO SETUP
 
-[FET_GFX]
-GFX SETUP
-
 [FET_DIS]
 DISPLAY SETUP
 
@@ -7930,7 +7927,7 @@ POLISH
 RUSSIAN
 
 { new display menus }
-[FET_GRA]
+[FET_GFX]
 GRAPHICS SETUP
 
 [FED_MIP]
@@ -7995,6 +7992,7 @@ REPLAY MISSION
 [FESZ_RM]
 RETRY?
 
+{ more graphics }
 [FED_VPL]
 VEHICLE PIPELINE
 
@@ -8034,12 +8032,14 @@ PS2
 [FEM_XBX]
 XBOX
 
-[FEM_AUT]
+[FEM_AUT] { aspect ratio related }
 AUTO
 
+{ controls }
 [FEC_IVP]
 INVERT PAD VERTICALLY
 
+{ map }
 [FEM_TWP]
 Toggle Waypoint
 
diff --git a/utils/gxt/french.txt b/utils/gxt/french.txt
index 833f4d33..09a1f5c2 100644
--- a/utils/gxt/french.txt
+++ b/utils/gxt/french.txt
@@ -1,4 +1,11 @@
-[LETTER1]
+{
+    New strings are at the bottom of file.
+    Do not change the order of strings.
+    You can fix the typos of existing translation but please refrain from
+    unnecessary edits like rephasing because you think it suits better for your taste.
+}
+
+[LETTER1]
 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"$,.'-?!!SDBF
 
 [DEFNAM]
@@ -2452,33 +2459,6 @@ Accélérateur
 [FEC_SMT]
 Déclencheur de mission spéciale
 
-[FEC_CCF]
-Configuration:
-
-[FEC_CF1]
-Config1
-
-[FEC_CF2]
-Config2
-
-[FEC_CF3]
-Config3
-
-[FEC_CF4]
-Config4
-
-[FEC_CDP]
-Affichage de la manette:
-
-[FEC_ONF]
-A pied
-
-[FEC_INC]
-Dans un véhicule
-
-[FEC_VIB]
-Vibrations:
-
 [FEA_OUT]
 Sortie audio:
 
@@ -7504,9 +7484,6 @@ CONNEXION
 [FET_AUD]
 CONFIG. AUDIO
 
-[FET_GFX]
-CONFIG. EFFETS SPECIAUX
-
 [FET_DIS]
 CONFIG. AFFICHAGE
 
@@ -8217,9 +8194,176 @@ POLONAIS
 [FEL_RUS]
 RUSSE
 
+{ new display menus }
+[FET_GFX] { this probably needs to be retranslated }
+CONFIG. EFFETS SPECIAUX
+
+[FED_MIP]
+MIP MAPPING
+
+[FED_AAS]
+ANTI ALIASING
+
+[FED_FIL]
+TEXTURE FILTERING
+
+[FED_BIL]
+BILINEAR
+
+[FED_TRL]
+TRILINEAR
+
+[FED_WND]
+WINDOWED
+
+[FED_FLS]
+FULLSCREEN
+
+[FEM_CSB]
+CUTSCENE BORDERS
+
+[FEM_SCF]
+SCREEN FORMAT
+
+[FEM_ISL]
+MAP MEMORY USAGE
+
+[FEM_LOW]
+LOW
+
+[FEM_MED]
+MEDIUM
+
+[FEM_HIG]
+HIGH
+
+[FEM_2PR]
+PS2 ALPHA TEST
+
+[FEC_FRC]
+FREE CAM
+
+{ Linux joy detection }
+[FEC_JOD]
+DETECT JOYSTICK
+
+[FEC_JPR]
+Press any key on the joystick of your choice that you want to use on the game, and it will be selected.
+
+[FEC_JDE]
+Detected joystick
+
+{ mission restart }
+[FET_RMS]
+REJOUER MISSION
+
+[FESZ_RM]
+REJOUER?
+
+{ more graphics }
+[FED_VPL]
+VEHICLE PIPELINE
+
+[FED_PRM]
+PED RIM LIGHT
+
+[FED_RGL]
+ROAD GLOSS
+
+[FED_CLF]
+COLOUR FILTER
+
+[FED_WLM]
+WORLD LIGHTMAPS
+
+[FED_MBL]
+MOTION BLUR
+
+[FEM_SIM]
+SIMPLE
+
+[FEM_NRM]
+NORMAL
+
+[FEM_MOB]
+MOBILE
+
+[FED_MFX]
+MATFX
+
+[FED_NEO]
+NEO
+
+[FEM_PS2]
+PS2
+
+[FEM_XBX]
+XBOX
+
+[FEM_AUT] { aspect ratio related }
+AUTO
+
+{ controls }
+[FEC_IVP]
+INVERT PAD VERTICALLY
+
+{ map }
+[FEM_TWP]
+Toggle Waypoint
+
 [FEA_FMN]
 RADIO ETEINTE
 
+[FEC_DS2]
+DUALSHOCK 2
+
+[FEC_DS3]
+DUALSHOCK 3
+
+[FEC_DS4]
+DUALSHOCK 4
+
+[FEC_360]
+XBOX 360 CONTROLLER
+
+[FEC_ONE]
+XBOX ONE CONTROLLER
+
+[FEC_TYP]
+GAMEPAD TYPE
+
+[FEC_CCF]
+CONFIGURATION
+
+[FEC_CF1]
+CONFIGURATION 1
+
+[FEC_CF2]
+CONFIGURATION 2
+
+[FEC_CF3]
+CONFIGURATION 3
+
+[FEC_CF4]
+CONFIGURATION 4
+
+[FEC_CDP]
+AFFICHAGE DE LA MANETTE
+
+[FEC_ONF]
+A PIED
+
+[FEC_INC]
+DANS UN VÉHICULE
+
+[FEC_VIB]
+VIBRATIONS
+
+[FET_AGS]
+GAMEPAD SETTINGS
+
+{ end of file }
+
 [DUMMY]
 THIS LABEL NEEDS TO BE HERE !!!
 AS THE LAST LABEL DOES NOT GET COMPILED
 \ No newline at end of file
diff --git a/utils/gxt/german.txt b/utils/gxt/german.txt
index cb2a63da..2ab4df6a 100644
--- a/utils/gxt/german.txt
+++ b/utils/gxt/german.txt
@@ -1,4 +1,11 @@
-[LETTER1]
+{
+    New strings are at the bottom of file.
+    Do not change the order of strings.
+    You can fix the typos of existing translation but please refrain from
+    unnecessary edits like rephasing because you think it suits better for your taste.
+}
+
+[LETTER1]
 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"$,.'-?!!SDBF
 
 [DEFNAM]
@@ -2488,33 +2495,6 @@ Beschleunigen
 [FEC_SMT]
 Spezialmission aktivieren
 
-[FEC_CCF]
-Konfiguration:
-
-[FEC_CF1]
-Konfig1
-
-[FEC_CF2]
-Konfig2
-
-[FEC_CF3]
-Konfig3
-
-[FEC_CF4]
-Konfig4
-
-[FEC_CDP]
-Controller-Anzeige:
-
-[FEC_ONF]
-Zu Fuß
-
-[FEC_INC]
-Im Auto
-
-[FEC_VIB]
-Vibration:
-
 [FEA_OUT]
 Tonausgabe:
 
@@ -7327,9 +7307,6 @@ VERBINDUNG
 [FET_AUD]
 AUDIO-SETUP
 
-[FET_GFX]
-GRAFIK-SETUP
-
 [FET_DIS]
 ANZEIGEN-SETUP
 
@@ -8034,9 +8011,174 @@ POLNISCH
 [FEL_RUS]
 RUSSISCH
 
+{ new display menus }
+[FET_GFX]
+GRAFIK-SETUP
+
+[FED_MIP]
+MIP MAPPING
+
+[FED_AAS]
+ANTI ALIASING
+
+[FED_FIL]
+TEXTURE FILTERING
+
+[FED_BIL]
+BILINEAR
+
+[FED_TRL]
+TRILINEAR
+
+[FED_WND]
+WINDOWED
+
+[FED_FLS]
+FULLSCREEN
+
+[FEM_CSB]
+CUTSCENE BORDERS
+
+[FEM_SCF]
+SCREEN FORMAT
+
+[FEM_ISL]
+MAP MEMORY USAGE
+
+[FEM_LOW]
+LOW
+
+[FEM_MED]
+MEDIUM
+
+[FEM_HIG]
+HIGH
+
+[FEM_2PR]
+PS2 ALPHA TEST
+
+[FEC_FRC]
+FREE CAM
+
+{ Linux joy detection }
+[FEC_JOD]
+DETECT JOYSTICK
+
+[FEC_JPR]
+Press any key on the joystick of your choice that you want to use on the game, and it will be selected.
+
+[FEC_JDE]
+Detected joystick
+
+{ mission restart }
+[FET_RMS]
+MISSION WIEDERHOLEN
+
+[FESZ_RM]
+WIEDERHOLEN?
+
+{ more graphics }
+[FED_VPL]
+VEHICLE PIPELINE
+
+[FED_PRM]
+PED RIM LIGHT
+
+[FED_RGL]
+ROAD GLOSS
+
+[FED_CLF]
+COLOUR FILTER
+
+[FED_WLM]
+WORLD LIGHTMAPS
+
+[FED_MBL]
+MOTION BLUR
+
+[FEM_SIM]
+SIMPLE
+
+[FEM_NRM]
+NORMAL
+
+[FEM_MOB]
+MOBILE
+
+[FED_MFX]
+MATFX
+
+[FED_NEO]
+NEO
+
+[FEM_PS2]
+PS2
+
+[FEM_XBX]
+XBOX
+
+[FEM_AUT] { aspect ratio related }
+AUTO
+
+{ controls }
+[FEC_IVP]
+INVERT PAD VERTICALLY
+
+{ map }
+[FEM_TWP]
+Toggle Waypoint
+
 [FEA_FMN]
 RADIO AUS
 
+[FEC_DS2]
+DUALSHOCK 2
+
+[FEC_DS3]
+DUALSHOCK 3
+
+[FEC_DS4]
+DUALSHOCK 4
+
+[FEC_360]
+XBOX 360 CONTROLLER
+
+[FEC_ONE]
+XBOX ONE CONTROLLER
+
+[FEC_TYP]
+GAMEPAD TYPE
+
+[FEC_CCF]
+KONFIGURATION
+
+[FEC_CF1]
+KONFIGURATION 1
+
+[FEC_CF2]
+KONFIGURATION 2
+
+[FEC_CF3]
+KONFIGURATION 3
+
+[FEC_CF4]
+KONFIGURATION 4
+
+[FEC_CDP]
+CONTROLLER-ANZEIGE
+
+[FEC_ONF]
+ZU FUß
+
+[FEC_INC]
+IM AUTO
+
+[FEC_VIB]
+VIBRATION
+
+[FET_AGS]
+GAMEPAD SETTINGS
+
 [DUMMY]
 THIS LABEL NEEDS TO BE HERE !!!
 AS THE LAST LABEL DOES NOT GET COMPILED
 \ No newline at end of file
diff --git a/utils/gxt/italian.txt b/utils/gxt/italian.txt
index 34f05573..54c9fee8 100644
--- a/utils/gxt/italian.txt
+++ b/utils/gxt/italian.txt
@@ -1,4 +1,11 @@
-[LETTER1]
+{
+    New strings are at the bottom of file.
+    Do not change the order of strings.
+    You can fix the typos of existing translation but please refrain from
+    unnecessary edits like rephasing because you think it suits better for your taste.
+}
+
+[LETTER1]
 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789"$,.'-?!!SDBFàèéìòùÀÈÉÌÒÙ
 
 [DEFNAM]
@@ -2479,33 +2486,6 @@ Accelera
 [FEC_SMT]
 Attivatore missione speciale
 
-[FEC_CCF]
-Configurazione:
-
-[FEC_CF1]
-Config1
-
-[FEC_CF2]
-Config2
-
-[FEC_CF3]
-Config3
-
-[FEC_CF4]
-Config4
-
-[FEC_CDP]
-Schermata controller:
-
-[FEC_ONF]
-A piedi
-
-[FEC_INC]
-In macchina
-
-[FEC_VIB]
-Vibrazione:
-
 [FEA_OUT]
 Uscita:
 
@@ -7333,9 +7313,6 @@ CONNESSIONE
 [FET_AUD]
 IMPOSTAZIONI AUDIO
 
-[FET_GFX]
-IMPOSTAZIONI GRAFICA
-
 [FET_DIS]
 IMPOSTAZIONI VIDEO
 
@@ -8046,9 +8023,174 @@ POLACCO
 [FEL_RUS]
 RUSSO
 
+{ new display menus }
+[FET_GFX]
+IMPOSTAZIONI GRAFICA
+
+[FED_MIP]
+MIP MAPPING
+
+[FED_AAS]
+ANTI ALIASING
+
+[FED_FIL]
+TEXTURE FILTERING
+
+[FED_BIL]
+BILINEAR
+
+[FED_TRL]
+TRILINEAR
+
+[FED_WND]
+WINDOWED
+
+[FED_FLS]
+FULLSCREEN
+
+[FEM_CSB]
+CUTSCENE BORDERS
+
+[FEM_SCF]
+SCREEN FORMAT
+
+[FEM_ISL]
+MAP MEMORY USAGE
+
+[FEM_LOW]
+LOW
+
+[FEM_MED]
+MEDIUM
+
+[FEM_HIG]
+HIGH
+
+[FEM_2PR]
+PS2 ALPHA TEST
+
+[FEC_FRC]
+FREE CAM
+
+{ Linux joy detection }
+[FEC_JOD]
+DETECT JOYSTICK
+
+[FEC_JPR]
+Press any key on the joystick of your choice that you want to use on the game, and it will be selected.
+
+[FEC_JDE]
+Detected joystick
+
+{ mission restart }
+[FET_RMS]
+RIGIOCA MISSIONE
+
+[FESZ_RM]
+RIGIOCA?
+
+{ more graphics }
+[FED_VPL]
+VEHICLE PIPELINE
+
+[FED_PRM]
+PED RIM LIGHT
+
+[FED_RGL]
+ROAD GLOSS
+
+[FED_CLF]
+COLOUR FILTER
+
+[FED_WLM]
+WORLD LIGHTMAPS
+
+[FED_MBL]
+MOTION BLUR
+
+[FEM_SIM]
+SIMPLE
+
+[FEM_NRM]
+NORMAL
+
+[FEM_MOB]
+MOBILE
+
+[FED_MFX]
+MATFX
+
+[FED_NEO]
+NEO
+
+[FEM_PS2]
+PS2
+
+[FEM_XBX]
+XBOX
+
+[FEM_AUT] { aspect ratio related }
+AUTO
+
+{ controls }
+[FEC_IVP]
+INVERT PAD VERTICALLY
+
+{ map }
+[FEM_TWP]
+Toggle Waypoint
+
 [FEA_FMN]
 RADIO SPENTA
 
+[FEC_DS2]
+DUALSHOCK 2
+
+[FEC_DS3]
+DUALSHOCK 3
+
+[FEC_DS4]
+DUALSHOCK 4
+
+[FEC_360]
+XBOX 360 CONTROLLER
+
+[FEC_ONE]
+XBOX ONE CONTROLLER
+
+[FEC_TYP]
+GAMEPAD TYPE
+
+[FEC_CCF]
+CONFIGURAZIONE
+
+[FEC_CF1]
+CONFIGURAZIONE 1
+
+[FEC_CF2]
+CONFIGURAZIONE 2
+
+[FEC_CF3]
+CONFIGURAZIONE 3
+
+[FEC_CF4]
+CONFIGURAZIONE 4
+
+[FEC_CDP]
+SCHERMATA CONTROLLER
+
+[FEC_ONF]
+A PIEDI
+
+[FEC_INC]
+IN MACCHINA
+
+[FEC_VIB]
+VIBRAZIONE
+
+[FET_AGS]
+GAMEPAD SETTINGS
+
 [DUMMY]
 THIS LABEL NEEDS TO BE HERE !!!
 AS THE LAST LABEL DOES NOT GET COMPILED
 \ No newline at end of file
diff --git a/utils/gxt/polish.txt b/utils/gxt/polish.txt
index 7bd3d28f..39727554 100755
--- a/utils/gxt/polish.txt
+++ b/utils/gxt/polish.txt
@@ -1,4 +1,11 @@
-[LETTER1]
+{
+    New strings are at the bottom of file.
+    Do not change the order of strings.
+    You can fix the typos of existing translation but please refrain from
+    unnecessary edits like rephasing because you think it suits better for your taste.
+}
+
+[LETTER1]
 abcdefghijklmnopqrstuvwxyz ABCDEFGHIJKLMNOPQRSTUVWXYZ 0123456789'$,.'-?!!SDBF
 	
 [DEFNAM]
@@ -2440,33 +2447,6 @@ Przyspieszenie
 [FEC_SMT]
 Włączenie misji specjalnych
 	
-[FEC_CCF]
-Konfiguracja:
-	
-[FEC_CF1]
-Setup1
-	
-[FEC_CF2]
-Setup2
-	
-[FEC_CF3]
-Setup3
-	
-[FEC_CF4]
-Setup4
-	
-[FEC_CDP]
-Sterownik ekranu:
-	
-[FEC_ONF]
-Pieszo
-	
-[FEC_INC]
-W aucie
-	
-[FEC_VIB]
-Wibracja:
-	
 [FEA_OUT]
 Wyjście:
 	
@@ -7243,9 +7223,6 @@ POŁĄCZENIE
 [FET_AUD]
 KONFIGURACJA DŻWIĘKU
 	
-[FET_GFX]
-KONFIGURACJA EFEKTÓW
-	
 [FET_DIS]
 KONFIGURACJA EKRANU
 	
@@ -7956,8 +7933,8 @@ POLSKI
 [FEL_RUS]
 ROSYJSKI
 	
-{ new display menus }	
-[FET_GRA]
+{ new display menus }
+[FET_GFX]
 USTAWIENIA GRAFIKI
 	
 [FED_MIP]
@@ -8022,6 +7999,7 @@ PONÓW MISJĘ
 [FESZ_RM]
 PONOWIĆ?
 	
+{ more graphics }
 [FED_VPL]
 POTOK POJAZDÓW
 	
@@ -8060,10 +8038,68 @@ PS2
 	
 [FEM_XBX]
 XBOX
+
+[FEM_AUT] { aspect ratio related }
+AUTO
 	
 [FEC_IVP]
 ODWRÓĆ OŚ PADA W PIONIE
+
+{ map }
+[FEM_TWP]
+Toggle Waypoint
+
+[FEA_FMN]
+RADIO OFF
+
+[FEC_DS2]
+DUALSHOCK 2
+
+[FEC_DS3]
+DUALSHOCK 3
+
+[FEC_DS4]
+DUALSHOCK 4
+
+[FEC_360]
+XBOX 360 CONTROLLER
+
+[FEC_ONE]
+XBOX ONE CONTROLLER
+
+[FEC_TYP]
+GAMEPAD TYPE
+	
+[FEC_CCF]
+KONFIGURACJA
+	
+[FEC_CF1]
+SETUP1
+	
+[FEC_CF2]
+SETUP2
+	
+[FEC_CF3]
+SETUP3
 	
+[FEC_CF4]
+SETUP4
+	
+[FEC_CDP]
+STEROWNIK EKRANU
+	
+[FEC_ONF]
+PIESZO
+	
+[FEC_INC]
+W AUCIE
+	
+[FEC_VIB]
+WIBRACJA
+
+[FET_AGS]
+GAMEPAD SETTINGS
+
 { end of file }	
 	
 [DUMMY]
diff --git a/utils/gxt/russian.txt b/utils/gxt/russian.txt
index 2a61c7c1..59fff069 100644
--- a/utils/gxt/russian.txt
+++ b/utils/gxt/russian.txt
@@ -1,4 +1,11 @@
-[1000]
+{
+    New strings are at the bottom of file.
+    Do not change the order of strings.
+    You can fix the typos of existing translation but please refrain from
+    unnecessary edits like rephasing because you think it suits better for your taste.
+}
+
+[1000]
 ТЫ ПОКОЙНИК
 
 [1001]
@@ -2425,30 +2432,12 @@ FLASHBACK 95.6
 [FEC_CAW]
 Оружие в машине
 
-[FEC_CCF]
-Конфигурация:
-
 [FEC_CCM]
 Поставить камеру сзади игрока.
 
-[FEC_CDP]
-Показ контроллера:
-
 [FEC_CEN]
 Центровка камеры
 
-[FEC_CF1]
-Setup1
-
-[FEC_CF2]
-Setup2
-
-[FEC_CF3]
-Setup3
-
-[FEC_CF4]
-Setup4
-
 [FEC_CLE]
 Прокрутка оружия влево
 
@@ -2569,9 +2558,6 @@ HOME
 [FEC_IBT]
 -
 
-[FEC_INC]
-В машине
-
 [FEC_IRT]
 INS
 
@@ -2743,8 +2729,6 @@ NUMLOCK
 [FEC_OMS]
 Для действия можно задать лишь одну кнопку мыши
 
-[FEC_ONF]
-Пешком
 
 [FEC_ORR]
 или
@@ -2962,9 +2946,6 @@ Toggle Pad Game/Debug
 [FEC_VES]
 Управление машиной
 
-[FEC_VIB]
-Vibration:
-
 [FEC_WAR]
 Внимание!
 
@@ -3692,7 +3673,7 @@ No Memory Card (PS2) in MEMORY CARD slot 1.
 УДАЛЕНИЕ ИГРЫ
 
 [FET_DIS]
-НАСТРОЙКА ГРАФИКИ
+НАСТРОЙКА ДИСПЛЕЯ
 
 [FET_DSN]
 Обычная}одежда.bmp
@@ -3706,9 +3687,6 @@ No Memory Card (PS2) in MEMORY CARD slot 1.
 [FET_FIL]
 Фильтр
 
-[FET_GFX]
-НАСТРОЙКА ГРАФИКИ
-
 [FET_GT]
 ТИП ИГРЫ
 
@@ -7957,6 +7935,9 @@ PS: УМРИ, ПАРШИВЫЙ ПЕС, УМРИ!
 РУССКИЙ
 
 { new display menus }
+[FET_GFX]
+НАСТРОЙКА ГРАФИКИ
+
 [FED_MIP]
 МИП-МАППИНГ
 
@@ -7972,6 +7953,155 @@ PS: УМРИ, ПАРШИВЫЙ ПЕС, УМРИ!
 [FED_TRL]
 ТРИЛИНЕЙНАЯ
 
+[FED_WND]
+ОКОННЫЙ
+
+[FED_FLS]
+ПОЛНОЭКРАННЫЙ
+
+[FEM_CSB]
+CUTSCENE BORDERS
+
+[FEM_SCF]
+ФОРМАТ ОКНА
+
+[FEM_ISL]
+MAP MEMORY USAGE
+
+[FEM_LOW]
+LOW
+
+[FEM_MED]
+MEDIUM
+
+[FEM_HIG]
+HIGH
+
+[FEM_2PR]
+PS2 ALPHA TEST
+
+[FEC_FRC]
+СВОБОДНАЯ КАМЕРА
+
+{ Linux joy detection }
+[FEC_JOD]
+DETECT JOYSTICK
+
+[FEC_JPR]
+Press any key on the joystick of your choice that you want to use on the game, and it will be selected.
+
+[FEC_JDE]
+Detected joystick
+
+{ mission restart }
+[FET_RMS]
+ПОВТОРИТЬ ЗАДАНИЕ
+
+[FESZ_RM]
+НАЧАТЬ ЗАНОВО?
+
+{ more graphics }
+[FED_VPL]
+VEHICLE PIPELINE
+
+[FED_PRM]
+PED RIM LIGHT
+
+[FED_RGL]
+ROAD GLOSS
+
+[FED_CLF]
+COLOUR FILTER
+
+[FED_WLM]
+WORLD LIGHTMAPS
+
+[FED_MBL]
+MOTION BLUR
+
+[FEM_SIM]
+SIMPLE
+
+[FEM_NRM]
+NORMAL
+
+[FEM_MOB]
+MOBILE
+
+[FED_MFX]
+MATFX
+
+[FED_NEO]
+NEO
+
+[FEM_PS2]
+PS2
+
+[FEM_XBX]
+XBOX
+
+[FEM_AUT] { aspect ratio related }
+АВТО
+
+{ controls }
+[FEC_IVP]
+ИНВЕРТИРОВАТЬ ВЕРТИКАЛЬНУЮ ОСЬ
+
+{ map }
+[FEM_TWP]
+Поставить метку
+
+[FEA_FMN]
+РАДИО ВЫКЛ
+
+[FEC_DS2]
+DUALSHOCK 2
+
+[FEC_DS3]
+DUALSHOCK 3
+
+[FEC_DS4]
+DUALSHOCK 4
+
+[FEC_360]
+КОНТРОЛЛЕР XBOX 360
+
+[FEC_ONE]
+КОНТРОЛЛЕР XBOX ONE
+
+[FEC_TYP]
+ГЕЙМПАД
+
+[FEC_CCF]
+КОНФИГУРАЦИЯ
+
+[FEC_CF1]
+СХЕМА 1
+
+[FEC_CF2]
+СХЕМА 2
+
+[FEC_CF3]
+СХЕМА 3
+
+[FEC_CF4]
+СХЕМА 4
+
+[FEC_CDP]
+ТИП УПРАВЛЕНИЯ
+
+[FEC_ONF]
+ПЕШКОМ
+
+[FEC_INC]
+В МАШИНЕ
+
+[FEC_VIB]
+ВИБРАЦИЯ
+
+[FET_AGS]
+НАСТРОЙКИ ГЕЙМПАДА
+
 { end of file }
 
 [DUMMY]
diff --git a/utils/gxt/spanish.txt b/utils/gxt/spanish.txt
index 2dbd2495..b2e418dd 100644
--- a/utils/gxt/spanish.txt
+++ b/utils/gxt/spanish.txt
@@ -1,4 +1,16 @@
-{ Grand Theft Auto III Spanish (Spain) Translation }
+{
+    New strings are at the bottom of file.
+    Do not change the order of strings.
+    You can fix the typos of existing translation but please refrain from
+    unnecessary edits like rephasing because you think it suits better for your taste.
+
+    SPANISH NOTE:
+    This is European Spanish, do not mix it with Latin American Spanish.
+    If you want the Latin American Spanish translation you'd have to create
+    a separate txt for it.
+}
+
+{ Grand Theft Auto III Spanish (Spain) Translation }
 { Contains some of the official fixes made by Rockstar for the iOS port }
 { Additional translation rewrites, corrections and fixes by IlDucci }
 
@@ -372,7 +384,7 @@ Playa de Portland
 Saint Mark's
 
 [REDLIGH]
-Barrio rojo
+Red Light District
 
 [TOWERS]
 Cerros de Hepburn
@@ -636,7 +648,7 @@ Puedes practicar disparando a estas dianas. Vuelve a la misión cuando hayas ter
 ~g~Busca un cliente.
 
 [FARE1]
-~g~Ve al ~w~club Sex Kitten Meeouch ~g~en el barrio rojo.
+~g~Ve al ~w~club Sex Kitten Meeouch ~g~en el Red Light District.
 
 [FARE2]
 ~g~Ve a ~w~Supa Save ~g~en Portland View.
@@ -648,13 +660,13 @@ Puedes practicar disparando a estas dianas. Vuelve a la misión cuando hayas ter
 ~g~Ve a la ~w~cafetería Greasy Joe ~g~en Callahan Point.
 
 [FARE5]
-~g~Ve a la ~w~tienda de armas Ammu-Nation ~g~en el barrio rojo.
+~g~Ve a la ~w~tienda de armas Ammu-Nation ~g~en el Red Light District.
 
 [FARE6]
 ~g~Ve a ~w~Easy Credit Autos ~g~en Saint Mark's.
 
 [FARE7]
-~g~Ve al ~w~bar de topless de Woody ~g~en el barrio rojo.
+~g~Ve al ~w~bar de topless de Woody ~g~en el Red Light District.
 
 [FARE8]
 ~g~Ve al ~w~restaurante Marcos ~g~en Saint Mark's.
@@ -756,7 +768,7 @@ Pulsa ~h~~k~~TOGGLE_SUBMISSIONS~~w~ para activar o desactivar las misiones del c
 ¡Has volado durante ~1~ segundos!
 
 [EBAL_A]
-Conozco un lugar en las afueras del barrio rojo donde podemos escondernos,
+Conozco un lugar en las afueras del Red Light District donde podemos escondernos,
 
 [EBAL_A1]
 pero mis manos están destrozadas, así que conduce tú, hermano.
@@ -1553,7 +1565,7 @@ Eso no es un masajeador.
 ~r~Muy bonito, ¡has asustado al objetivo! ¿Y te consideras un asesino?
 
 [AM1_5]
-~g~Ve al barrio rojo y espera a que Salvatore salga del club.
+~g~Ve al Red Light District y espera a que Salvatore salga del club.
 
 [AM1_7]
 ~r~Salvatore está en su casita, sano y salvo, tomándose un cóctel. ¡Nadie te va a llamar ''Chacal''!
@@ -2466,33 +2478,6 @@ Acelerar
 [FEC_SMT]
 Activar misión especial
 
-[FEC_CCF]
-Configuración:
-
-[FEC_CF1]
-Ajuste1
-
-[FEC_CF2]
-Ajuste2
-
-[FEC_CF3]
-Ajuste3
-
-[FEC_CF4]
-Ajuste4
-
-[FEC_CDP]
-Controles a mostrar:
-
-[FEC_ONF]
-A pie
-
-[FEC_INC]
-En vehículos
-
-[FEC_VIB]
-Vibración:
-
 [FEA_OUT]
 Salida:
 
@@ -4447,7 +4432,7 @@ tomándolos por el camino.
 ¡Cuando alcances a ese bandido espaciado con SPANK, chíngatelo!
 
 [DIAB4_H]
-Luego reparte mis revistas XXX por el barrio rojo.
+Luego reparte mis revistas XXX por el Red Light District.
 
 [DIAB4_1]
 ~g~Lleva la furgoneta a la parte de atrás de Revistas XXX.
@@ -4579,7 +4564,7 @@ si no les doy una parte.
 He dejado un coche dentro de la fábrica.
 
 [MEA2_G]
-Ve a recogerles con él en su territorio, en el barrio rojo.
+Ve a recogerles con él en su territorio, en el Red Light District.
 
 [MEA2_H]
 Luego tráelos a la fábrica para que conozcan la opinión de Marty.
@@ -7153,7 +7138,7 @@ Color del jugador
 Liberty City
 
 [FEM_MA1]
-Barrio rojo
+Red Light District
 
 [FEM_MA2]
 Chinatown
@@ -7305,9 +7290,6 @@ CONEXIÓN
 [FET_AUD]
 AJUSTES DE AUDIO
 
-[FET_GFX]
-AJUSTES GRÁFICOS
-
 [FET_DIS]
 AJUSTES DE PANTALLA
 
@@ -8015,7 +7997,7 @@ POLACO
 RUSO
 
 { new display menus }
-[FET_GRA]
+[FET_GFX]
 AJUSTES GRÁFICOS
 
 [FED_MIP]
@@ -8119,6 +8101,9 @@ PS2
 [FEM_XBX]
 XBOX
 
+[FEM_AUT]
+AUTOM.
+
 [FEC_IVP]
 INVERTIR VERTICALIDAD MANDO
 
@@ -8128,6 +8113,54 @@ Poner o quitar punto de referencia
 [FEA_FMN]
 RADIO APAGADA
 
+[FEC_DS2]
+DUALSHOCK 2
+
+[FEC_DS3]
+DUALSHOCK 3
+
+[FEC_DS4]
+DUALSHOCK 4
+
+[FEC_360]
+MANDO DE XBOX 360
+
+[FEC_ONE]
+MANDO DE XBOX ONE
+
+[FEC_TYP]
+TIPO DE MANDO
+
+[FEC_CCF]
+CONFIGURACIÓN
+
+[FEC_CF1]
+AJUSTE 1
+
+[FEC_CF2]
+AJUSTE 2
+
+[FEC_CF3]
+AJUSTE 3
+
+[FEC_CF4]
+AJUSTE 4
+
+[FEC_CDP]
+CONTROLES A MOSTRAR
+
+[FEC_ONF]
+A PIE
+
+[FEC_INC]
+EN VEHÍCULO
+
+[FEC_VIB]
+VIBRACIÓN
+
+[FET_AGS]
+AJUSTES DE MANDO
+
 { end of file }
 
 [DUMMY]
diff --git a/vendor/librw b/vendor/librw
-Subproject 5c95300890559c85a2764bc200361f904cd4f9f
+Subproject 4c77fb57546e89da1e6f3bad3c582848de9f5c9