From: Arun Persaud <arun@nubati.net>
Date: Sun, 5 Jan 2014 18:51:08 +0000 (-0800)
Subject: Merge branch 'v4.7.x' into master
X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=commitdiff_plain;h=e6e38912837a4fe2464356408d10dee950b3121c

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
---

e6e38912837a4fe2464356408d10dee950b3121c
diff --cc gtk/xoptions.c
index c8bbd07,8fb5dca..b618013
--- a/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 po/ru.po
index 7fb7281,52b3d30..2cc7e05
--- a/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 ""