X-Git-Url: http://winboard.nl/cgi-bin?a=blobdiff_plain;f=winboard%2Fwinboard.c;h=34832f0d018b1213c5a69406c192ecf6379a156a;hb=4d4d6305b409a21e22162ca25175aa6d60dc8916;hp=08284bc90764bc74f8b396624bbadaaaae3e814e;hpb=bb9df81fd2e6eb72f968308cab940535936279fe;p=xboard.git

diff --git a/winboard/winboard.c b/winboard/winboard.c
index 08284bc..34832f0 100644
--- a/winboard/winboard.c
+++ b/winboard/winboard.c
@@ -345,6 +345,7 @@ LoadLanguageFile(char *name)
 
     if(!name || name[0] == NULLCHAR) return;
       snprintf(buf, MSG_SIZ, "%s%s", name, strchr(name, '.') ? "" : ".lng"); // auto-append lng extension
+    appData.language = oldLanguage;
     if(!strcmp(buf, oldLanguage)) { barbaric = 1; return; } // this language already loaded; just switch on
     if((f = fopen(buf, "r")) == NULL) return;
     while((k = fgetc(f)) != EOF) {
@@ -443,7 +444,7 @@ TranslateMenus(int addLanguage)
     int i;
     WIN32_FIND_DATA fileData;
     HANDLE hFind;
-#define IDM_English 1895
+#define IDM_English 1970
     if(1) {
         HMENU mainMenu = GetMenu(hwndMain);
         for (i=GetMenuItemCount(mainMenu)-1; i>=0; i--) {
@@ -4705,7 +4706,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       f = OpenFileDialog(hwnd, "wb", defName,
 			 "bmp",
 			 DIAGRAM_FILT,
-			 "Save Diagram to File", NULL, fileTitle, NULL);
+			 _("Save Diagram to File"), NULL, fileTitle, NULL);
       if (f != NULL) {
 	SaveDiagram(f);
       }
@@ -5383,7 +5384,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     case IDM_English:
-      barbaric = 0;
+      barbaric = 0; appData.language = "";
       TranslateMenus(0);
       CheckMenuItem(GetMenu(hwndMain), lastChecked, MF_BYCOMMAND|MF_UNCHECKED);
       CheckMenuItem(GetMenu(hwndMain), IDM_English, MF_BYCOMMAND|MF_CHECKED);
@@ -5391,7 +5392,7 @@ WndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)
       break;
 
     default:
-      if(wmId > IDM_English && wmId < IDM_English+5) {
+      if(wmId > IDM_English && wmId < IDM_English+20) {
           LoadLanguageFile(languageFile[wmId - IDM_English - 1]);
           TranslateMenus(0);
           CheckMenuItem(GetMenu(hwndMain), lastChecked, MF_BYCOMMAND|MF_UNCHECKED);