From dea292f3901bd760e02d7b040c49c2285ab3ad79 Mon Sep 17 00:00:00 2001
From: Helmut Karlowski <helmut.karlowski@ish.de>
Date: Fri, 18 Jan 2013 16:39:22 +0000
Subject: [PATCH] exchange countrycodes of ru (Russia-  now 19) and lv (Latvia
 - now 32).

---
 sys/keyboard.c      |  6 +++---
 xaaes/src.km/init.c | 15 +++++----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/sys/keyboard.c b/sys/keyboard.c
index d946d5ce1..8c703be4a 100644
--- a/sys/keyboard.c
+++ b/sys/keyboard.c
@@ -100,13 +100,13 @@
  *  0 = USA          8 = Ger.Suisse    16 = Hungary    24 = Romania
  *  1 = Germany      9 = Turkey        17 = Poland     25 = Bulgaria
  *  2 = France      10 = Finnland      18 = Lituania   26 = Slovenia
- *  3 = England     11 = Norway        19 = Latvia     27 = Croatia
+ *  3 = England     11 = Norway        19 = Russia     27 = Croatia
  *  4 = Spain       12 = Danmark       20 = Estonia    28 = Serbia
  *  5 = Italy       13 = S. Arabia     21 = Bialorus   29 = Montenegro
  *  6 = Sweden      14 = Netherlands   22 = Ukraina    30 = Macedonia
  *  7 = Fr.Suisse   15 = Czech         23 = Slovakia   31 = Greece
  *
- * 32 = Russia      40 = Vietnam       48 = Bangladesh
+ * 32 = Latvia      40 = Vietnam       48 = Bangladesh
  * 33 = Israel      41 = India
  * 34 = Sou. Africa 42 = Iran
  * 35 = Portugal    43 = Mongolia
@@ -117,7 +117,7 @@
  *
  * The rest of codes are reserved for future extensions. Add ones,
  * if you find a missing one. Consider there are various countries
- * which all speak the same language, like all the South America
+ * which all speak the same language, like all South America
  * speaks Spanish or Portughese, the North America English or French
  * etc.
  *
diff --git a/xaaes/src.km/init.c b/xaaes/src.km/init.c
index 997b3e3a3..11afe3027 100644
--- a/xaaes/src.km/init.c
+++ b/xaaes/src.km/init.c
@@ -160,13 +160,13 @@ sysfile_exists(const char *sd, char *fn)
  *  0 = USA          8 = Ger.Suisse    16 = Hungary    24 = Romania
  *  1 = Germany      9 = Turkey        17 = Poland     25 = Bulgaria
  *  2 = France      10 = Finnland      18 = Lituania   26 = Slovenia
- *  3 = England     11 = Norway        19 = Latvia     27 = Croatia
+ *  3 = England     11 = Norway        19 = Russia     27 = Croatia
  *  4 = Spain       12 = Danmark       20 = Estonia    28 = Serbia
  *  5 = Italy       13 = S. Arabia     21 = Bialorus   29 = Montenegro
  *  6 = Sweden      14 = Netherlands   22 = Ukraina    30 = Macedonia
  *  7 = Fr.Suisse   15 = Czech         23 = Slovakia   31 = Greece
  *
- * 32 = Russia      40 = Vietnam       48 = Bangladesh
+ * 32 = Latvia      40 = Vietnam       48 = Bangladesh
  * 33 = Israel      41 = India
  * 34 = Sou. Africa 42 = Iran
  * 35 = Portugal    43 = Mongolia
@@ -175,15 +175,10 @@ sysfile_exists(const char *sd, char *fn)
  * 38 = China       46 = Kambodja
  * 39 = Korea       47 = Indonesia
  */
-/*
-	"us","de","fr","en","es","it","se","fs","gs","tr","fi",
-	"no","dk","sa","nl","cs","hu","pl","lt","lv","ee",
-	"by","ua","sk","ro","bg","sl","hr","cs","cs","mk",
-	"gr","ru","il","za","pt","be","jp","cn","kp","vn",
-	"in","ir","mn","np","la","kh","id","bd",
-*/
 #define MaX_COUNTRYCODE 48
-static char countrycodes[] = "endefrukesitsefsgstrfinodksanlczhuplltlveebyuaskrobgslhrcscsmkgrruilzaptbejpcnkpvninirmnnplakhidbd";
+static char countrycodes[] =
+  "endefrukesitsefsgstrfinodksanlczhuplltrueebyuaskrobgslhrcscsmkgrlvilzaptbejpcnkpvninirmnnplakhidbd";
+/* 0 1 2 3 4 5 6 7 8 9 1 1 2 3 4 5 6 7 8 9 2 1 2 3 4 5 6 7 8 9 3 1 2 3 4 5 6 7 8 9 4 1 2 3 4 5 6 7 8 */
 static short search_code( char *lang )
 {
 	short i;