Merge branch 'v4.8.x' into master

diff --cc backend.c
index d6b293b,e68b3af..295b600
--- 1/backend.c
--- 2/backend.c
+++ b/backend.c
@@@ -7361,11 -7322,11 +7363,11 @@@ CanPromote (ChessSquare piece, int y
        if(IS_SHOGI(gameInfo.variant)          || gameInfo.variant == VariantXiangqi ||
           gameInfo.variant == VariantSuper    || gameInfo.variant == VariantGreat   ||
           gameInfo.variant == VariantShatranj || gameInfo.variant == VariantCourier ||
-          gameInfo.variant == VariantMakruk   || gameInfo.variant == VariantASEAN) return FALSE;
+          gameInfo.variant == VariantMakruk) return FALSE;
        return (piece == BlackPawn && y <= zone ||
                piece == WhitePawn && y >= BOARD_HEIGHT-1-zone ||
 -              piece == BlackLance && y == 1 ||
 -              piece == WhiteLance && y == BOARD_HEIGHT-2 );
 +              piece == BlackLance && y <= zone ||
 +              piece == WhiteLance && y >= BOARD_HEIGHT-1-zone );
  }
  
  void

diff --cc gtk/xboard.c
index b2c080c,ef35f2a..dbcc9e5
--- 1/gtk/xboard.c
--- 2/gtk/xboard.c
+++ b/gtk/xboard.c
@@@ -2319,8 -2319,11 +2319,14 @@@ void FileNamePopUpWrapper(label, def, f
    char *cp;
    char curDir[MSG_SIZ];
  
 +  StartDir(filter, NULL); // change to start directory for this file type
 +
+   if(def && *def && def[strlen(def)-1] == '/') {
+     getcwd(curDir, MSG_SIZ);
+     chdir(def);
+   }
+ 
++
    /* make a copy of the filter string, so that strtok can work with it*/
    cp = strdup(filter);
  

diff --cc menus.c
Simple merge

diff --cc moves.c
Simple merge

diff --cc po/LINGUAS
index aaf1d8a,80d877b..c2e114e
--- 1/po/LINGUAS
--- 2/po/LINGUAS
+++ b/po/LINGUAS
@@@ -1,3 -1,3 +1,3 @@@
  # whitespace separated list of translated languages goes below
  # note: zh translations are untested; xboard fails to create a fontset for them
- da de es fr it nl pl ru tr uk vi zh_CN zh_HK zh_TW
 -da de es it nl pl ru sr tr uk vi zh_CN zh_HK zh_TW
++da de es fr it nl pl ru sr tr uk vi zh_CN zh_HK zh_TW