Added Turin's new brush-pictures.

Changed the menu names to file and edit.

Changed the color to magenta when the same terrain is selected as both
foreground and background.

data/themes/editor.cfg

@@ -215,7 +215,7 @@ height=600
 	[menu]
 	title=edit_main_menu
 	image=lite
-	items=editnewmap,editloadmap,editsaveas,editsavemap,editrevert,undo,redo,preferences,editquit
+	items=editnewmap,editloadmap,editsaveas,editsavemap,editrevert,preferences,editquit
 	rect=3,1,107,22
 	xanchor=fixed
 	yanchor=fixed
@@ -224,7 +224,7 @@ height=600
  	[menu]
 	title=edit_operations_menu
 	image=lite
- 	items=editcut,editcopy,editselectall,editfillselection,editresize,editflip
+ 	items=undo,redo,editcut,editcopy,editselectall,editfillselection,editresize,editflip
 	rect=120,1,107,22
  	[/menu]
 

data/translations/english.cfg

@@ -729,8 +729,8 @@ edit_resize_map_title="Resize Map"
 edit_x_axis="X-Axis"
 edit_y_axis="Y-Axis"
 edit_flip_around="Flip around (this may change the dimensions of the map):"
-edit_operations_menu="Operations"
-edit_main_menu="Main Menu"
+edit_operations_menu="Edit"
+edit_main_menu="File"
 edit_foreground_short="FG"
 edit_background_short="BG"
 

src/editor/editor_palettes.cpp

@@ -260,7 +260,7 @@ void terrain_palette::draw(bool force) {
 
 		SDL_BlitSurface(image, NULL, screen, &dstrect);
 		if (terrain == selected_bg_terrain() && terrain == selected_fg_terrain()) {
-			gui::draw_rectangle(dstrect.x, dstrect.y, image->w, image->h, 0x0F00, screen);
+			gui::draw_rectangle(dstrect.x, dstrect.y, image->w, image->h, 0xF0F0, screen);
 		}
 		else if (terrain == selected_bg_terrain()) {
 			gui::draw_rectangle(dstrect.x, dstrect.y, image->w, image->h, 0x00F0, screen);