Fix:Android:Corrected and added keycodes

[navit-package] / navit / country.c

diff --git a/navit/country.c b/navit/country.c
index 0fa7a08..1bcaad1 100644 (file)
--- a/navit/country.c
+++ b/navit/country.c
@@ -1,12 +1,31 @@
+/**
+ * Navit, a modular navigation system.
+ * Copyright (C) 2005-2008 Navit Team
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * version 2 as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the
+ * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Boston, MA  02110-1301, USA.
+ */
+
 #include <string.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <glib.h>
-#include <libintl.h>
 #include "debug.h"
 #include "item.h"
 #include "country.h"
 #include "search.h"
+#include "navit_nls.h"
 
 struct country {
        int id;
@@ -16,10 +35,6 @@ struct country {
        char *name;
 };
 
-#define gettext_noop(String) String
-#define _(STRING)    gettext(STRING)
-#define _n(STRING)    gettext_noop(STRING)
-
 static struct country country[]= {
   { 20,        "AND",  "AD", "AND", /* 020 */ _n("Andorra")},
   {784,        "UAE",  "AE", "ARE", /* 784 */ _n("United Arab Emirates")},
@@ -267,6 +282,7 @@ static struct country country[]= {
   {710,        "ZA",   "ZA", "ZAF", /* 710 */ _n("South Africa") },
   {894,        "Z",    "ZM", "ZMB", /* 894 */ _n("Zambia")},
   {716,        "ZW",   "ZW", "ZWE", /* 716 */ _n("Zimbabwe")},
+  {999, "*",    "*",  "*",             _n("* Unknown, add is_in tags to those cities")},
 };