- Recommit Kaiden's class item cap fix r1790 (lost during meager of Big Maps Project code) & other related variables from INT16 to INT32; increased the class item limit in mapeditor (by Buggler)

- Map Editor: Items - Hotkeys (by Buggler)
o Hotkeys ',': Left Scroll
o Hotkeys '.': Right Scroll
o ('Shift': Jump 1 page; 'Ctrl': Jump 10 pages; 'Ctrl + Shift': Jump to first/last page)
- Changed saveloadscreen previous/next hotkey to ','/'.' due to interference with input_box navigation using arrow keys (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5877 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Editor/Editor Taskbar Creation.cpp

@@ -45,6 +45,7 @@ void InitEditorItemStatsButtons()
 	iEditorButton[ ITEMSTATS_DELETE_BTN ] =
 		CreateTextButton( iEditorItemStatsButtonsText[0], FONT10ARIAL, FONT_RED, FONT_BLACK, BUTTON_USE_DEFAULT,
 		iScreenWidthOffset + 600, 2 * iScreenHeightOffset + 441, 36, 16, BUTTON_NO_TOGGLE, MSYS_PRIORITY_NORMAL+1, DEFAULT_MOVE_CALLBACK, ItemStatsDeleteCallback );
+	SetButtonFastHelpText( iEditorButton[ ITEMSTATS_DELETE_BTN ], iEditorItemStatsButtonsText[1]);
 }
 
 void InitEditorMercsToolbar()
@@ -595,8 +596,10 @@ void InitEditorItemsToolbar()
 
 	iEditorButton[ITEMS_LEFTSCROLL] =
 		CreateEasyNoToggleButton( iScreenWidthOffset + 1, 2 * iScreenHeightOffset + 361,"EDITOR//leftscroll.sti", ItemsLeftScrollCallback);
+	SetButtonFastHelpText(iEditorButton[ITEMS_LEFTSCROLL], iEditorItemsToolbarText[11]);
 	iEditorButton[ITEMS_RIGHTSCROLL] =
 		CreateEasyNoToggleButton( iScreenWidthOffset + 50, 2 * iScreenHeightOffset + 361,"EDITOR//rightscroll.sti", ItemsRightScrollCallback);
+	SetButtonFastHelpText(iEditorButton[ITEMS_RIGHTSCROLL], iEditorItemsToolbarText[12]);
 
 }
 

Editor/EditorItems.cpp

@@ -230,7 +230,7 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 	UINT32 uiVideoObjectIndex;
 	UINT16 usUselessWidth, usUselessHeight;
 	INT16 sWidth, sOffset, sStart;
-	INT16 i, x, y;
+	INT32 i, x, y;
 	UINT16 usCounter;
 	CHAR16 pStr[ 100 ];//, pStr2[ 100 ];
 	CHAR16 pItemName[SIZE_ITEM_NAME];
@@ -332,7 +332,7 @@ void InitEditorItemsInfo(UINT32 uiItemType)
 	//every pair of items (odd rounded up) requires 60 pixels for width.
 	//the minimum buffer size is 420.	Height is always 80 pixels.
 
-	eInfo.sWidth = (eInfo.sNumItems > 12) ? ((eInfo.sNumItems+1)/2)*60 : SCREEN_HEIGHT - 120;
+	eInfo.sWidth = (eInfo.sNumItems > 12) ? (((INT32) eInfo.sNumItems+1)/2)*60 : SCREEN_HEIGHT - 120;
 	eInfo.sHeight = 80;
 	// Create item buffer
 	GetCurrentVideoSettings( &usUselessWidth, &usUselessHeight, &ubBitDepth );

Editor/EditorItems.h

@@ -12,8 +12,8 @@ typedef struct{
 	UINT16 *pusItemIndex;		//a dynamic array of Item indices
 	UINT32	uiBuffer;		//index of buffer
 	UINT32	uiItemType; //Weapons, ammo, armour, explosives, equipment
-	INT16		sWidth, sHeight;	//width and height of buffer
-	//Kaiden: was previously INT16 - Fix for number of items capped by class
+	//Kaiden/Buggler: was previously INT16 - Fix for number of items capped by class in editor
+	INT32		sWidth, sHeight;	//width and height of buffer
 	INT16	sNumItems;	//total number of items in the current class of item.
 	INT16		sSelItemIndex;	//currently selected item index.
 	INT16	sHilitedItemIndex;

Editor/editscreen.cpp

@@ -1997,23 +1997,172 @@ void HandleKeyboardShortcuts( )
 					iCurrentAction = ACTION_NEXT_SELECTIONTYPE;
 					break;
 				case ',':
-					gusSelectionType = LINESELECTION;
-					gusPreserveSelectionWidth--;
-					if( !gusPreserveSelectionWidth )
-						gusPreserveSelectionWidth = 8;
+					// item left scroll
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex )
+						{
+							if( EditorInputEvent.usKeyState & CTRL_DOWN )
+								eInfo.sScrollIndex = __max(eInfo.sScrollIndex - 60, 0);
+							else
+								eInfo.sScrollIndex--;
+							
+							if( !eInfo.sScrollIndex )
+								DisableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex < ((eInfo.sNumItems+1)/2)-6 )
+								EnableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					else
+					{
+						gusSelectionType = LINESELECTION;
+						gusPreserveSelectionWidth--;
+						if( !gusPreserveSelectionWidth )
+							gusPreserveSelectionWidth = 8;
+					}
 					gfRenderTaskbar = TRUE;
 					break;
 				case '.':
-					gusSelectionType = LINESELECTION;
-					gusPreserveSelectionWidth++;
-					if( gusPreserveSelectionWidth > 8 )
-						gusPreserveSelectionWidth = 1;
+					// item right scroll
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
+						{
+							if( EditorInputEvent.usKeyState & CTRL_DOWN )
+								eInfo.sScrollIndex = __min(eInfo.sScrollIndex + 60, (eInfo.sNumItems+1)/2-6);
+							else
+								eInfo.sScrollIndex++;
+							
+							EnableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex == max( ((eInfo.sNumItems+1)/2)-6, 0) )
+								DisableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					else
+					{
+						gusSelectionType = LINESELECTION;
+						gusPreserveSelectionWidth++;
+						if( gusPreserveSelectionWidth > 8 )
+							gusPreserveSelectionWidth = 1;
+					}
 					gfRenderTaskbar = TRUE;
+					break;
+				case '<':
+					// item left scroll by page
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex )
+						{
+							if( EditorInputEvent.usKeyState & CTRL_DOWN )
+								eInfo.sScrollIndex = 0;
+							else
+								eInfo.sScrollIndex = __max(eInfo.sScrollIndex - 6, 0);
+							
+							if( !eInfo.sScrollIndex )
+								DisableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex < ((eInfo.sNumItems+1)/2)-6 )
+								EnableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					gfRenderTaskbar = TRUE;
+					break;
+				case '>':
+					// item right scroll by page
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
+						{
+							if( EditorInputEvent.usKeyState & CTRL_DOWN )
+								eInfo.sScrollIndex = max( ((eInfo.sNumItems+1)/2)-6, 0);
+							else
+								eInfo.sScrollIndex = __min(eInfo.sScrollIndex + 6, (eInfo.sNumItems+1)/2-6);
+							
+							EnableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex == max( ((eInfo.sNumItems+1)/2)-6, 0) )
+								DisableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					gfRenderTaskbar = TRUE;
+					break;
 				default:
 					iCurrentAction = ACTION_NULL;
 					break;
 			}
 		}
+		else if ( !HandleSummaryInput( &EditorInputEvent ) && !HandleTextInput( &EditorInputEvent ) && EditorInputEvent.usEvent == KEY_REPEAT )
+		{	
+			switch( EditorInputEvent.usParam )
+			{
+				case ',':
+					// item left scroll
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex )
+						{
+							if( EditorInputEvent.usKeyState & CTRL_DOWN )
+								eInfo.sScrollIndex = __max(eInfo.sScrollIndex - 60, 0);
+							else
+								eInfo.sScrollIndex--;
+							
+							if( !eInfo.sScrollIndex )
+								DisableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex < ((eInfo.sNumItems+1)/2)-6 )
+								EnableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					gfRenderTaskbar = TRUE;
+					break;
+				case '.':
+					// item right scroll
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
+						{
+							if( EditorInputEvent.usKeyState & CTRL_DOWN )
+								eInfo.sScrollIndex = __min(eInfo.sScrollIndex + 60, (eInfo.sNumItems+1)/2-6);
+							else
+								eInfo.sScrollIndex++;
+							
+							EnableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex == max( ((eInfo.sNumItems+1)/2)-6, 0) )
+								DisableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					gfRenderTaskbar = TRUE;
+					break;
+				case '<':
+					// item left scroll by page
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex )
+						{
+							eInfo.sScrollIndex = __max(eInfo.sScrollIndex - 6, 0);
+							
+							if( !eInfo.sScrollIndex )
+								DisableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex < ((eInfo.sNumItems+1)/2)-6 )
+								EnableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					gfRenderTaskbar = TRUE;
+					break;
+				case '>':
+					// item right scroll by page
+					if( iCurrentTaskbar == TASK_ITEMS )
+					{
+						if( eInfo.sScrollIndex < max( ((eInfo.sNumItems+1)/2)-6, 0) )
+						{
+							eInfo.sScrollIndex = __min(eInfo.sScrollIndex + 6, (eInfo.sNumItems+1)/2-6);
+							
+							EnableButton( iEditorButton[ITEMS_LEFTSCROLL] );
+							if( eInfo.sScrollIndex == max( ((eInfo.sNumItems+1)/2)-6, 0) )
+								DisableButton( iEditorButton[ITEMS_RIGHTSCROLL] );
+						}
+					}
+					gfRenderTaskbar = TRUE;
+					break;
+			}
+		}
 	}
 }
 

SaveLoadScreen.cpp

@@ -1069,8 +1069,8 @@ void GetSaveLoadScreenUserInput()
 					MoveSelectionUpOrDown( FALSE );
 					break;
 				
-				case LEFTARROW:
-					// previous page
+				case ',':
+					// previous page, LEFTARROW not used due to interference with textbox navigation
 					if ( PAGE_SLOT > 0 )
 					{
 						PAGE_SLOT = PAGE_SLOT - 1;
@@ -1097,8 +1097,8 @@ void GetSaveLoadScreenUserInput()
 					}
 					break;
 				
-				case RIGHTARROW:
-					// next page
+				case '.':
+					// next page, RIGHTARROW not used due to interference with textbox navigation
 					if ( PAGE_SLOT < MAX_PAGE_SLOT )
 					{
 						PAGE_SLOT = PAGE_SLOT + 1;

Standard Gaming Platform/vsurface.h

@@ -117,8 +117,8 @@ typedef struct
 {
 	UINT32				fCreateFlags;						// Specifies creation flags like from file or not
 	SGPFILENAME		ImageFile;							// Filename of image data to use
-	UINT16				usWidth;								// Width, ignored if given from file
-	UINT16				usHeight;								// Height, ignored if given from file
+	UINT32				usWidth;								// Width, ignored if given from file
+	UINT32				usHeight;								// Height, ignored if given from file
 	UINT8					ubBitDepth;							// BPP, ignored if given from file
 
 } VSURFACE_DESC;

Utils/_ChineseText.cpp

@@ -317,6 +317,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -354,11 +355,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc (|S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -463,7 +464,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -491,7 +494,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",

Utils/_DutchText.cpp

@@ -318,6 +318,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -355,11 +356,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc (|S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -464,7 +465,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -492,7 +495,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",

Utils/_EnglishText.cpp

@@ -317,6 +317,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -354,11 +355,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc (|S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -463,7 +464,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -491,7 +494,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",

Utils/_FrenchText.cpp

@@ -322,6 +322,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Supprimer",
+	L"Article supprimer (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -359,11 +360,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Calendrier mode",
  L"Calendrier mode",
  L"SUPPRIMER",
- L"Supprimer le mercenaire sélectionné (SUPPR).",
+ L"Supprimer le mercenaire sélectionné (|S|u|p|p|r)",
  L"SUIVANT", //20
- L"Mercenaire suivant (ESPACE).",
+ L"Mercenaire suivant (|E|s|p|a|c|e)",
  L"Changer l'existance prioritaire",
- L"Changer si le placement a/naccès à toutes les portes.",
+ L"Changer si le placement a/naccès à toutes les portes",
  
  //Orders
  L"STATIONNAIRE",
@@ -468,7 +469,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Détentes",
 	L"Clés",
-	L"Rnd",	// TODO.Translate
+	L"Rnd",	//10 // TODO.Translate
+	L"Précédent (|,)",		// previous page
+	L"Suivant (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -496,7 +499,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Charger la carte",
 	L"Sélectionner un tileset",
 	L"Quitter le mode éditeur",
-	L"Quitter le jeu.",
+	L"Quitter le jeu",
 	L"Créer un carte de radar",
 	L"Une fois la carte vérifiée, elle sera sauvée sous le format original JA2.\nCette option est seulement valable sur les cartes de taille 'normale' qui ne font pas référence aux nombre de réseaux (ex: réseau de sortie) > 25600.",
 	L"Une fois la carte vérifiée et chargée, elle sera élargie automatiquement selon les rangées et colonnes choisies.",

Utils/_GermanText.cpp

@@ -341,6 +341,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -378,11 +379,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc (|S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -487,7 +488,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",	// TODO.Translate
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -515,7 +518,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",

Utils/_ItalianText.cpp

@@ -316,6 +316,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -353,11 +354,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc (|S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -462,7 +463,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",	// TODO.Translate
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -490,7 +493,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",

Utils/_PolishText.cpp

@@ -323,6 +323,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Usuń",
+	L"Przedmiot usuń (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -360,11 +361,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Tryb planowania",
  L"Tryb planowania",
  L"Usuń",
- L"Usuń zaznaczonego najemnika (DEL).",
+ L"Usuń zaznaczonego najemnika (|D|e|l)",
  L"Kolejny", //20
- L"Znajdź następnego najemnika (SPACE).",
+ L"Znajdź następnego najemnika (|S|p|a|c|e)",
  L"Włącz priorytet egzystencji",
- L"Postać ma dostęp do wszystkich zamkniętych drzwi.",
+ L"Postać ma dostęp do wszystkich zamkniętych drzwi",
  
  //Orders
  L"STACJONARNY",
@@ -469,7 +470,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Włączniki",
 	L"Klucze",
-	L"Rnd",	// TODO.Translate
+	L"Rnd",	//10 // TODO.Translate
+	L"Previous (|,)",		// previous page // TODO.Translate
+	L"Next (|.)",		// next page // TODO.Translate
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -497,7 +500,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Wczytaj mapę",
 	L"Wybierz zestaw",
 	L"Wyjdź z trybu edycji do trybu gry",
-	L"Wyjdź z trybu edycji.",
+	L"Wyjdź z trybu edycji",
 	L"Utwórz mapę radaru",
 	L"Kiedy zaznaczone, mapa będzie zapisana w oryginalnym formacie JA2.\nTa opcja jest ważna przy normalnych wielkoŚciach map, których numery siatki nie są (siatki wyjŚcia) > 25600.",
 	L"Kiedy zaznaczone, wczytana mapa lub nowa, będzie powiększona automatycznie do wybranych rozmiarów.",

Utils/_RussianText.cpp

@@ -318,6 +318,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -355,11 +356,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc (|S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -464,7 +465,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",	// TODO.Translate
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -492,7 +495,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",

Utils/_TaiwaneseText.cpp

@@ -316,6 +316,7 @@ STR16			BoxFilter[] =
 STR16 iEditorItemStatsButtonsText[] =
 {
 	L"Delete",
+	L"Delete item (|D|e|l)",
 };
 
 STR16 FaceDirs[8] = 
@@ -353,11 +354,11 @@ STR16 iEditorMercsToolbarText[] =
  L"Schedule mode",
  L"Schedule mode",
  L"DELETE",
- L"Delete currently selected merc (DEL).",
+ L"Delete currently selected merc (|D|e|l)",
  L"NEXT", //20
- L"Find next merc (SPACE).",
+ L"Find next merc |S|p|a|c|e)",
  L"Toggle priority existance",
- L"Toggle whether or not placement has/naccess to all doors.",
+ L"Toggle whether or not placement has/naccess to all doors",
  
  //Orders
  L"STATIONARY",
@@ -462,7 +463,9 @@ STR16 iEditorItemsToolbarText[] =
 	L"E3",
 	L"Triggers",
 	L"Keys",
-	L"Rnd",	// TODO.Translate
+	L"Rnd", //10
+	L"Previous (|,)",		// previous page
+	L"Next (|.)",		// next page
 };
 
 STR16 iEditorMapInfoToolbarText[] =
@@ -490,7 +493,7 @@ STR16 iEditorOptionsToolbarText[]=
 	L"Load map",
 	L"Select tileset",
 	L"Leave Editor mode",
-	L"Exit game.",
+	L"Exit game",
 	L"Create radar map",
 	L"When checked, the map will be saved in original JA2 map format.\nThis option is only valid on 'normal' size maps that do not reference grid numbers (e.g: exit grids) > 25600.",
 	L"When checked and you load a map, the map will be enlarged automatically depending on the selected Rows and Cols.",