Spell "fräulein" and "señor*" correctly. Add "doktor". Add "af".

2005-12-08  Tor Lillqvist  <tml@novell.com>

	* libebook/e-name-western-tables.h: Spell "fräulein" and "señor*"
	correctly. Add "doktor". Add "af".

diff --git a/addressbook/ChangeLog b/addressbook/ChangeLog
index b129c68..36753f0 100644 (file)
--- a/addressbook/ChangeLog
+++ b/addressbook/ChangeLog
@@ -1,5 +1,8 @@
 2005-12-08  Tor Lillqvist  <tml@novell.com>
 
+       * libebook/e-name-western-tables.h: Spell "fräulein" and "señor*"
+       correctly. Add "doktor". Add "af".
+
        * backends/file/e-book-backend-file.c: Use gstdio wrappers. On
        Win32, register own open and close methods for libdb so that the
        UTF-8 file names that we use will work. (A small patch to libdb

diff --git a/addressbook/libebook/e-name-western-tables.h b/addressbook/libebook/e-name-western-tables.h
index de2130d..7f2308a 100644 (file)
--- a/addressbook/libebook/e-name-western-tables.h
+++ b/addressbook/libebook/e-name-western-tables.h
@@ -39,14 +39,14 @@ char *e_name_western_pfx_table[] = {
        /*
         * German
         */
-       "herr", "frau", "fraulein", "herr doktor", "doktor frau", "doktor frau doktor",
+       "herr", "frau", "fräulein", "doktor", "herr doktor", "doktor frau", "doktor frau doktor",
        "frau doktor",
  
 
        /*
         * Spanish.
         */
-       "senor", "senora", "sra.", "senorita", "srita.", 
+       "señor", "señora", "sra.", "señorita", "srita.", 
 
        NULL};
 
@@ -55,10 +55,11 @@ char *e_name_western_sfx_table[]  = {
        /*
         * English.
         */
-         "junior", "senior", "jr", "sr", "I", "II", "III", "IV", "V",
+         "junior", "senior", "jr", "jr.", "sr", "sr.",
+        "I", "II", "III", "IV", "V",
         "VI", "VII", "VIII", "IX", "X", "XI", "XII", "XIII", "XIV",
         "XV", "XVI", "XVII", "XVIII", "XIX", "XX", "XXI", "XXII",
-        "phd", "ms", "md", "esq", "esq.", "esquire",
+        "phd", "ms", "md", "m.d.", "esq", "esq.", "esquire",
 
        NULL};
 
@@ -71,7 +72,7 @@ char *e_name_western_twopart_sfx_table[] = {
 
        NULL};
 
-char *e_name_western_complex_last_table[] = {"van", "von", "de", "di", NULL};
+char *e_name_western_complex_last_table[] = {"van", "von", "de", "di", "af", NULL};
 
 G_END_DECLS