Merge pull request #12 from diamante0018/patch-1

fix(str): update localize string value fix menu bug too

iw4x/iw4x_00/localizedstrings/iw4x_english.str

@@ -360,7 +360,7 @@ REFERENCE			MENU_FRIENDNOTIFY
 LANG_ENGLISH		"Friend Notifications"
 
 REFERENCE			MPUI_DESC_FRIENDNOTIFY
-LANG_ENGLISH		"When should the friend status notifications be displayed?"
+LANG_ENGLISH		"Should you send status notifications to your friends?"
 
 REFERENCE			MPUI_DESC_OPTIONS
 LANG_ENGLISH		"Set your game options."
@@ -620,9 +620,6 @@ LANG_ENGLISH		"CHANGELOG"
 REFERENCE			MPUI_DESC_CHANGELOG
 LANG_ENGLISH		"See what's new."
 
-REFERENCE			MPUI_DESC_CHANGELOG
-LANG_ENGLISH		"See what's new."
-
 REFERENCE			MPUI_DESC_NOBORDER
 LANG_ENGLISH		"Do not use a border in windowed mode."
 
@@ -1304,6 +1301,25 @@ LANG_ENGLISH		"SAS eliminated"
 REFERENCE			MP_SAS_FORFEITED
 LANG_ENGLISH		"SAS forfeited"
 
+REFERENCE           MENU_DESC_BUTTON_LAYOUT
+LANG_ENGLISH        "Change the button layout for the gamepad"
 
+REFERENCE           MENU_DESC_THUMBSTICK_LAYOUT
+LANG_ENGLISH        "Change the thumbstick layout for the gamepad"
+
+REFERENCE           MENU_DESC_LOOK_SENSITIVITY_PRESET
+LANG_ENGLISH        "Choose different sensitivity presets"
+
+REFERENCE           MENU_DESC_MAXPACKETS
+LANG_ENGLISH        "Maximum number of packets sent per frame"
+
+REFERENCE           MENU_DESC_SNAPS
+LANG_ENGLISH        "Snapshot rate"
+
+REFERENCE           MENU_DESC_DRAWFPS
+LANG_ENGLISH        "Draw frames per second"
+
+REFERENCE           MENU_DESC_FPSLABELS
+LANG_ENGLISH        "Draw viewpos"
 
 ENDMARKER

iw4x/iw4x_00/ui_mp/pc_options_gamepad.menu

@@ -110,7 +110,7 @@
 			{"@MENU_DEFAULT"; "thumbstick_default";
 			"@MENU_SOUTHPAW"; "thumbstick_southpaw";
 			"@MENU_LEGACY"; "thumbstick_legacy";
-			"@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+			"@MENU_LEGACY_SOUTHPAW"; "thumbstick_legacysouthpaw"}, execNow "bindgpsticksconfigs";, "@MENU_DESC_THUMBSTICK_LAYOUT", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 		PC_OPTIONS_STRLIST_RAW(3, "@MENU_BUTTON_LAYOUT", "gpad_buttonConfig", 
 			{"@MENU_DEFAULT"; "buttons_default";
 			"@MENU_TACTICAL"; "buttons_tactical";
@@ -119,7 +119,7 @@
 			"@MENU_DEFAULT_ALT"; "buttons_default_alt";
 			"@MENU_TACTICAL_ALT"; "buttons_tactical_alt";
 			"@MENU_LEFTY_ALT"; "buttons_lefty_alt";
-			"@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+			"@MENU_NOMAD_ALT"; "buttons_nomad_alt"}, execNow "bindgpbuttonsconfigs";, "@MENU_DESC_BUTTON_LAYOUT", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 		PC_OPTIONS_FLOATLIST_RAW(4, "@MENU_GPAD_STYLE", "gpad_style", {"@MENU_GPAD_XBOX_CAPS" 0 "@MENU_GPAD_PS_CAPS" 1}, ;, "@MPUI_DESC_GPAD_STYLE", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 		PC_OPTIONS_DVARYESNO_RAW(5, "@MENU_SLOWDOWN_ENABLED", "gpad_slowdown_enabled", ;, "@MPUI_DESC_SLOWDOWN_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 		PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_LOCKON_ENABLED", "gpad_lockon_enabled", ;, "@MPUI_DESC_LOCKON_ENABLED", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
@@ -129,6 +129,6 @@
 			{"@MENU_SENSITIVITY_LOW_CAPS" SENSITIVITY_1 "@MENU_SENSITIVITY_MEDIUM_CAPS" SENSITIVITY_2 "3" SENSITIVITY_3
 			"@MENU_SENSITIVITY_HIGH_CAPS" SENSITIVITY_4 "5" SENSITIVITY_5 "6" SENSITIVITY_6
 			"@MENU_SENSITIVITY_VERY_HIGH_CAPS" SENSITIVITY_7 "8" SENSITIVITY_8 "9" SENSITIVITY_9 "@MENU_SENSITIVITY_INSANE_CAPS" SENSITIVITY_10}, 
-			;, ;, ON_GPAD_DISABLED, ON_GPAD_ENABLED)
+			;, "@MENU_DESC_LOOK_SENSITIVITY_PRESET", ON_GPAD_DISABLED, ON_GPAD_ENABLED)
 	}
 }

iw4x/iw4x_00/ui_mp/pc_options_multi.menu

@@ -84,18 +84,18 @@
 
 		PC_OPTIONS_SEPERATOR(0)
 
-		PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, ;, when(0), 1)
+		PC_OPTIONS_FLOATLIST_RAW(1, "@MENU_MAXPACKETS", "cl_maxpackets", {"30" 30 "100" 100 "125" 125}, ;, "@MENU_DESC_MAXPACKETS", when(0), 1)
-		PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, ;, when(0), 1)
+		PC_OPTIONS_FLOATLIST_RAW(2, "@MENU_SNAPS", "snaps", {"20" 20 "30" 30}, ;, "@MENU_DESC_SNAPS", when(0), 1)
 
 		PC_OPTIONS_SEPERATOR(2)
 
 		PC_OPTIONS_DVARYESNO(3, "@MENU_LAGOMETER", "drawLagometer", ;, when(0))
-		PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, ;, when(0), 1)
+		PC_OPTIONS_STRLIST_RAW(4, "@MENU_DRAWFPS", "cg_drawFPS", {"Off"; "Off"; "Simple"; "Simple"; "SimpleRanges"; "SimpleRanges"; "Verbose"; "Verbose"; "Verbose+Viewpos"; "Verbose+Viewpos"}, ;, "@MENU_DESC_DRAWFPS", when(0), 1)
-		PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", ;, when(0))
+		PC_OPTIONS_DVARYESNO(5, "@MENU_FPSLABELS", "cg_drawFPSLabels", "@MENU_DESC_FPSLABELS", when(0))
 
 		PC_OPTIONS_SEPERATOR(5)
 
 		PC_OPTIONS_DVARYESNO_RAW(6, "@MENU_STREAMFRIENDLY_UI", "ui_streamFriendly", ;, "@MPUI_DESC_STREAM_FRIENDLY_UI", when(0), 1)
-		PC_OPTIONS_FLOATLIST_RAW(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", {"Always" -1 "Never" 0 "in Menu" 1}, ;, "@MPUI_DESC_FRIENDNOTIFY", when(dvarBool("ui_streamFriendly")), 1)
+		PC_OPTIONS_DVARYESNO(7, "@MENU_FRIENDNOTIFY", "cl_notifyFriendState", "@MPUI_DESC_FRIENDNOTIFY", when(0))
 	}
 }

iw4x/iw4x_00/ui_mp/popup_cac_primary_camo.menu

@@ -15,7 +15,7 @@
 		allowedBinding "+talk"
 		visible when ( localvarint( "ui_tabDepth" ) == localvarint( "ui_popup_cac_primary_camo_tabDepth" ) )
 		exp rect y ( localvarfloat( "ui_popupYPos" ) + localvarint( "ui_tabDepth" ) * 20 )
-		execKey 168
+		execKeyInt 168
 		{
 			if ( localvarstring( "ui_selected_ref" ) != "none" && !isitemunlocked( getplayerdata( "customClasses" , localvarint( "classIndex" ) , "weaponSetups" , 0 , "weapon" ) + " " + localvarstring( "ui_selected_ref" ) ) )
 			{