Merge branch 'v4.7.x' into master

Conflicts:
	dialogs.c
	gtk/xboard.c
	gtk/xoptions.c
	po/es.po
	winboard/config.h
	winboard/winboard.c

diff --cc args.h
Simple merge

diff --cc backend.c
Simple merge

diff --cc backend.h
Simple merge

diff --cc board.c
Simple merge

diff --cc common.h
Simple merge

diff --cc configure.ac
Simple merge

diff --cc dialogs.c
Simple merge

diff --cc draw.c
Simple merge

diff --cc frontend.h
Simple merge

diff --cc gamelist.c
Simple merge

diff --cc gtk/xboard.c
Simple merge

diff --cc gtk/xoptions.c
index c8bbd07,8fb5dca..b618013
--- 1/gtk/xoptions.c
--- 2/gtk/xoptions.c
+++ b/gtk/xoptions.c
@@@ -449,7 -449,7 +449,7 @@@ CreateMenuPopup (Option *opt, int n, in
            if(accelerator_mods & GDK_CONTROL_MASK) {  // in OSX use Meta where Linux uses Ctrl
                accelerator_mods &= ~GDK_CONTROL_MASK; // clear Ctrl flag
                accelerator_mods |= GDK_META_MASK;     // set Meta flag
--          } 
++          }
  #endif
            gtk_widget_add_accelerator (GTK_WIDGET(entry), "activate",GtkAccelerators,
                                        accelerator_key, accelerator_mods, GTK_ACCEL_VISIBLE);
@@@ -1511,7 -1511,7 +1511,7 @@@ if(appData.debugMode) printf("n=%d, h=%
                gtkosx_application_set_menu_bar(theApp, GTK_MENU_SHELL(menuBar));
                gtkosx_application_insert_app_menu_item(theApp, GTK_MENU_ITEM(helpMenu[8].handle), 0); // hack
                gtkosx_application_sync_menubar(theApp);
--          } 
++          }
  #endif
            break;
          case BoxEnd:

diff --cc menus.c
Simple merge

diff --cc moves.c
Simple merge

diff --cc moves.h
Simple merge

diff --cc nengineoutput.c
Simple merge

diff --cc parser.c
Simple merge

diff --cc po/ru.po
index 7fb7281,52b3d30..2cc7e05
--- 1/po/ru.po
--- 2/po/ru.po
+++ b/po/ru.po
@@@ -16,9 -16,9 +16,9 @@@ msgstr "
  "MIME-Version: 1.0\n"
  "Content-Type: text/plain; charset=UTF-8\n"
  "Content-Transfer-Encoding: 8bit\n"
+ "Language: ru\n"
  
 -#: args.h:820
 +#: args.h:821
  #, c-format
  msgid "%s in settings file\n"
  msgstr ""

diff --cc usounds.c
Simple merge

diff --cc usystem.c
Simple merge

diff --cc winboard/defaults.h
Simple merge

diff --cc winboard/wclipbrd.c
Simple merge

diff --cc winboard/wedittags.c
Simple merge

diff --cc winboard/winboard.c
Simple merge

diff --cc winboard/winboard.rc
Simple merge

diff --cc winboard/woptions.c
Simple merge

diff --cc winboard/wsettings.c
Simple merge

diff --cc xaw/xboard.c
Simple merge

diff --cc xaw/xengineoutput.c
Simple merge

diff --cc xaw/xoptions.c
Simple merge

diff --cc xboard2.h
Simple merge