diff -Nur gcal-3.01-orig/doc/de/texi/gcal.texi gcal-3.01/doc/de/texi/gcal.texi --- gcal-3.01-orig/doc/de/texi/gcal.texi 2000-06-24 03:00:01.000000000 +0200 +++ gcal-3.01/doc/de/texi/gcal.texi 2006-07-26 11:32:07.000000000 +0200 @@ -2231,44 +2231,44 @@ @item CG Republik Kongo # -@item CH_AA -Schweiz/Appenzell-Ausserrhoden - @item CH_AG Schweiz/Aargau @item CH_AI Schweiz/Appenzell-Innerrhoden -@item CH_BL -Schweiz/Basel-Land +@item CH_AR +Schweiz/Appenzell-Ausserrhoden -@item CH_BN +@item CH_BE Schweiz/Bern +@item CH_BL +Schweiz/Basel-Land + @item CH_BS Schweiz/Basel-Stadt -@item CH_FB +@item CH_FR Schweiz/Freiburg -@item CH_GB -Schweiz/Graub@"unden +@item CH_GE +Schweiz/Genf @item CH_GL Schweiz/Glarus -@item CH_GV -Schweiz/Genf +@item CH_GR +Schweiz/Graub@"unden -@item CH_JR +@item CH_JU Schweiz/Jura -@item CH_LZ +@item CH_LU Schweiz/Luzern -@item CH_NC -Schweiz/Neuch@^atel +@item CH_NE +Schweiz/Neuenburg @item CH_NW Schweiz/Nidwalden @@ -2279,31 +2279,34 @@ @item CH_SG Schweiz/St.@: Gallen -@item CH_ST +@item CH_SH +Schweiz/Schaffhausen + +@item CH_SO Schweiz/Solothurn -@item CH_SW +@item CH_SZ Schweiz/Schwyz -@item CH_TC -Schweiz/Ticino - @item CH_TG Schweiz/Thurgau -@item CH_UI +@item CH_TI +Schweiz/Tessin + +@item CH_UR Schweiz/Uri @item CH_VD -Schweiz/Vaud +Schweiz/Waadt -@item CH_VL -Schweiz/Valais +@item CH_VS +Schweiz/Wallis @item CH_ZG Schweiz/Zug -@item CH_ZR +@item CH_ZH Schweiz/Z@"urich @item CI @@ -2342,31 +2345,31 @@ @item CZ Tschechien -@item DE_BA -Deutschland/Bayern - @item DE_BB Deutschland/Brandenburg -@item DE_BL +@item DE_BE Deutschland/Berlin -@item DE_BR -Deutschland/Bremen - @item DE_BW -Deutschland/Baden-W@"urttenberg +Deutschland/Baden-W@"urttemberg -@item DE_HA -Deutschland/Hamburg +@item DE_BY +Deutschland/Bayern + +@item DE_HB +Deutschland/Bremen -@item DE_HS +@item DE_HE Deutschland/Hessen +@item DE_HH +Deutschland/Hamburg + @item DE_MV Deutschland/Mecklenburg-Vorpommern -@item DE_NS +@item DE_NI Deutschland/Niedersachsen @item DE_NW @@ -2375,9 +2378,6 @@ @item DE_RP Deutschland/Rheinland-Pfalz -@item DE_SA -Deutschland/Sachsen-Anhalt - @item DE_SH Deutschland/Schleswig-Holstein @@ -2387,7 +2387,10 @@ @item DE_SN Deutschland/Sachsen -@item DE_TR +@item DE_ST +Deutschland/Sachsen-Anhalt + +@item DE_TH Deutschland/Th@"uringen @item DJ diff -Nur gcal-3.01-orig/doc/en/texi/gcal.texi gcal-3.01/doc/en/texi/gcal.texi --- gcal-3.01-orig/doc/en/texi/gcal.texi 2000-06-24 03:00:01.000000000 +0200 +++ gcal-3.01/doc/en/texi/gcal.texi 2006-07-26 11:32:07.000000000 +0200 @@ -1861,43 +1861,43 @@ @item CG Republic of Congo # -@item CH_AA -Switzerland/Appenzell Ausserrhoden - @item CH_AG Switzerland/Aargau @item CH_AI Switzerland/Appenzell Innerrhoden -@item CH_BL -Switzerland/Basel-Land +@item CH_AR +Switzerland/Appenzell Ausserrhoden -@item CH_BN +@item CH_BE Switzerland/Bern +@item CH_BL +Switzerland/Basel-Land + @item CH_BS Switzerland/Basel-Stadt -@item CH_FB +@item CH_FR Switzerland/Fribourg -@item CH_GB -Switzerland/Graub@"unden +@item CH_GE +Switzerland/Gen@`eve @item CH_GL Switzerland/Glarus -@item CH_GV -Switzerland/Gen@`eve +@item CH_GR +Switzerland/Graub@"unden -@item CH_JR +@item CH_JU Switzerland/Jura -@item CH_LZ +@item CH_LU Switzerland/Luzern -@item CH_NC +@item CH_NE Switzerland/Neuch@^atel @item CH_NW @@ -1909,31 +1909,34 @@ @item CH_SG Switzerland/St Gallen -@item CH_ST +@item CH_SH +Switzerland/Schaffhausen + +@item CH_SO Switzerland/Solothurn -@item CH_SW +@item CH_SZ Switzerland/Schwyz -@item CH_TC -Switzerland/Ticino - @item CH_TG Switzerland/Thurgau -@item CH_UI +@item CH_TI +Switzerland/Ticino + +@item CH_UR Switzerland/Uri @item CH_VD Switzerland/Vaud -@item CH_VL +@item CH_VS Switzerland/Valais @item CH_ZG Switzerland/Zug -@item CH_ZR +@item CH_ZH Switzerland/Z@"urich @item CI @@ -1972,31 +1975,31 @@ @item CZ Czech Republic -@item DE_BA -Germany/Bavaria - @item DE_BB Germany/Brandenburg -@item DE_BL +@item DE_BE Germany/Berlin -@item DE_BR -Germany/Bremen - @item DE_BW Germany/Baden-W@"urttemberg -@item DE_HA -Germany/Hamburg +@item DE_BY +Germany/Bavaria -@item DE_HS +@item DE_HB +Germany/Bremen + +@item DE_HE Germany/Hesse +@item DE_HH +Germany/Hamburg + @item DE_MV Germany/Mecklenburg-West Pomerania -@item DE_NS +@item DE_NI Germany/Lower Saxony @item DE_NW @@ -2005,9 +2008,6 @@ @item DE_RP Germany/Rhineland Palatinate -@item DE_SA -Germany/Saxony-Anhalt - @item DE_SH Germany/Schleswig-Holstein @@ -2017,7 +2017,10 @@ @item DE_SN Germany/Saxony -@item DE_TR +@item DE_ST +Germany/Saxony-Anhalt + +@item DE_TH Germany/Thuringia @item DJ diff -Nur gcal-3.01-orig/misc/gcalltx/gcalltxp.in gcal-3.01/misc/gcalltx/gcalltxp.in --- gcal-3.01-orig/misc/gcalltx/gcalltxp.in 1999-12-23 11:23:18.000000000 +0100 +++ gcal-3.01/misc/gcalltx/gcalltxp.in 2006-07-26 11:32:07.000000000 +0200 @@ -268,7 +268,7 @@ #v--- -longsample # if ($typeswitch eq '-longsample') { - $longsamplecodes="AD+AE+AF+AG+AI+AL+AM+AN_BO+AN_CU+AN_MA+AN_SA+AO+AR+AS+AT+AU_CT+AU_NT+AU_QU+AU_SA+AU_SW+AU_TA+AU_VI+AU_WA+AW+AZ+BA+BB+BD+BE+BF+BG+BH+BI+BJ+BM+BN+BO+BR+BS+BT+BV+BW+BY+BZ+CA_AL+CA_BC+CA_MA+CA_NB+CA_NF+CA_NS+CA_NW+CA_ON+CA_PE+CA_QU+CA_SA+CA_YU+CC+CD+CF+CG+CH_AA+CH_AG+CH_AI+CH_BL+CH_BN+CH_BS+CH_FB+CH_GB+CH_GL+CH_GV+CH_JR+CH_LZ+CH_NC+CH_NW+CH_OW+CH_SG+CH_ST+CH_SW+CH_TC+CH_TG+CH_UI+CH_VD+CH_VL+CH_ZG+CH_ZR+CI+CK+CL+CM+CN+CO+CR+CU+CV+CX+CY+CZ+DE_BA+DE_BB+DE_BL+DE_BR+DE_BW+DE_HA+DE_HS+DE_MV+DE_NS+DE_NW+DE_RP+DE_SA+DE_SH+DE_SL+DE_SN+DE_TR+DJ+DK+DM+DO+DZ+EC+EE+EG+EH+ER+ES+ET+FI+FJ+FK+FM+FO+FR+GA+GB_EN+GB_NI+GB_SL+GD+GE+GF+GH+GI+GL+GM+GN+GP+GQ+GR+GS+GT+GU+GW+GY+HK+HM+HN+HR+HT+HU+ID+IE+IL+IN+IQ+IR+IS+IT+JM+JO+JP+KE+KG+KH+KI+KM+KN+KP+KR+KW+KY+KZ+LA+LB+LC+LI+LK+LR+LS+LT+LU+LV+LY+MA+MC+MD+MG+MH+MK+ML+MN+MO+MP+MQ+MR+MS+MT+MU+MV+MW+MX+MY+MZ+NA+NC+NE+NF+NG+NI+NL+NM+NO+NP+NR+NU+NZ+OM+PA+PE+PF+PG+PH+PK+PL+PM+PN+PR+PT+PW+PY+QA+RE+RO+RU+RW+SA+SB+SC+SD+SE+SG+SH+SI+SJ+SK+SL+SM+SN+SO+SR+ST+SV+SY+SZ+TC+TD+TG+TH+TJ+TK+TM+TN+TO+TR+TT+TV+TW+TZ+UA+UG+US_AK+US_AL+US_AR+US_AZ+US_CA+US_CO+US_CT+US_DC+US_DE+US_FL+US_GA+US_HI+US_IA+US_ID+US_IL+US_IN+US_KS+US_KY+US_LA+US_MA+US_MD+US_ME+US_MI+US_MN+US_MO+US_MS+US_MT+US_NC+US_ND+US_NE+US_NH+US_NJ+US_NM+US_NV+US_NY+US_OH+US_OK+US_OR+US_PA+US_RI+US_SC+US_SD+US_TN+US_TX+US_UT+US_VA+US_VT+US_WA+US_WI+US_WV+US_WY+UY+UZ+VC+VE+VG+VI+VN+VU+WF+WS+YE+YT+YU+ZA+ZM+ZW+"; + $longsamplecodes="AD+AE+AF+AG+AI+AL+AM+AN_BO+AN_CU+AN_MA+AN_SA+AO+AR+AS+AT+AU_CT+AU_NT+AU_QU+AU_SA+AU_SW+AU_TA+AU_VI+AU_WA+AW+AZ+BA+BB+BD+BE+BF+BG+BH+BI+BJ+BM+BN+BO+BR+BS+BT+BV+BW+BY+BZ+CA_AL+CA_BC+CA_MA+CA_NB+CA_NF+CA_NS+CA_NW+CA_ON+CA_PE+CA_QU+CA_SA+CA_YU+CC+CD+CF+CG+CH_AG+CH_AI+CH_AR+CH_BE+CH_BL+CH_BS+CH_FR+CH_GE+CH_GL+CH_GR+CH_JU+CH_LU+CH_NE+CH_NW+CH_OW+CH_SG+CH_SH+CH_SO+CH_SZ+CH_TG+CH_TI+CH_UR+CH_VD+CH_VS+CH_ZG+CH_ZH+CI+CK+CL+CM+CN+CO+CR+CU+CV+CX+CY+CZ+DE_BB+DE_BE+DE_BW+DE_BY+DE_HB+DE_HE+DE_HH+DE_MV+DE_NI+DE_NW+DE_RP+DE_SH+DE_SL+DE_SN+DE_ST+DE_TH+DJ+DK+DM+DO+DZ+EC+EE+EG+EH+ER+ES+ET+FI+FJ+FK+FM+FO+FR+GA+GB_EN+GB_NI+GB_SL+GD+GE+GF+GH+GI+GL+GM+GN+GP+GQ+GR+GS+GT+GU+GW+GY+HK+HM+HN+HR+HT+HU+ID+IE+IL+IN+IQ+IR+IS+IT+JM+JO+JP+KE+KG+KH+KI+KM+KN+KP+KR+KW+KY+KZ+LA+LB+LC+LI+LK+LR+LS+LT+LU+LV+LY+MA+MC+MD+MG+MH+MK+ML+MN+MO+MP+MQ+MR+MS+MT+MU+MV+MW+MX+MY+MZ+NA+NC+NE+NF+NG+NI+NL+NM+NO+NP+NR+NU+NZ+OM+PA+PE+PF+PG+PH+PK+PL+PM+PN+PR+PT+PW+PY+QA+RE+RO+RU+RW+SA+SB+SC+SD+SE+SG+SH+SI+SJ+SK+SL+SM+SN+SO+SR+ST+SV+SY+SZ+TC+TD+TG+TH+TJ+TK+TM+TN+TO+TR+TT+TV+TW+TZ+UA+UG+US_AK+US_AL+US_AR+US_AZ+US_CA+US_CO+US_CT+US_DC+US_DE+US_FL+US_GA+US_HI+US_IA+US_ID+US_IL+US_IN+US_KS+US_KY+US_LA+US_MA+US_MD+US_ME+US_MI+US_MN+US_MO+US_MS+US_MT+US_NC+US_ND+US_NE+US_NH+US_NJ+US_NM+US_NV+US_NY+US_OH+US_OK+US_OR+US_PA+US_RI+US_SC+US_SD+US_TN+US_TX+US_UT+US_VA+US_VT+US_WA+US_WI+US_WV+US_WY+UY+UZ+VC+VE+VG+VI+VN+VU+WF+WS+YE+YT+YU+ZA+ZM+ZW+"; #print "debugsamplecodes: $longsamplecodes"; } else { diff -Nur gcal-3.01-orig/po/de.po gcal-3.01/po/de.po --- gcal-3.01-orig/po/de.po 2000-07-01 17:13:28.000000000 +0200 +++ gcal-3.01/po/de.po 2006-07-26 11:32:07.000000000 +0200 @@ -569,7 +569,7 @@ #: src/hd-data.c:534 msgid "Switzerland/Neuchâtel" -msgstr "Schweiz/Neuchâtel" +msgstr "Schweiz/Neuenburg" #: src/hd-data.c:535 msgid "Switzerland/Nidwalden" @@ -588,12 +588,16 @@ msgstr "Schweiz/Solothurn" #: src/hd-data.c:539 +msgid "Switzerland/Schaffhausen" +msgstr "Schweiz/Schaffhausen" + +#: src/hd-data.c:539 msgid "Switzerland/Schwyz" msgstr "Schweiz/Schwyz" #: src/hd-data.c:540 msgid "Switzerland/Ticino" -msgstr "Schweiz/Ticino" +msgstr "Schweiz/Tessin" #: src/hd-data.c:541 msgid "Switzerland/Thurgau" @@ -605,11 +609,11 @@ #: src/hd-data.c:543 msgid "Switzerland/Vaud" -msgstr "Schweiz/Vaud" +msgstr "Schweiz/Waadt" #: src/hd-data.c:544 msgid "Switzerland/Valais" -msgstr "Schweiz/Valais" +msgstr "Schweiz/Wallis" #: src/hd-data.c:545 msgid "Switzerland/Zug" @@ -681,7 +685,7 @@ #: src/hd-data.c:563 msgid "Germany/Baden-Württemberg" -msgstr "Deutschland/Baden-Württenberg" +msgstr "Deutschland/Baden-Württemberg" #: src/hd-data.c:564 msgid "Germany/Hamburg" diff -Nur gcal-3.01-orig/src/hd-data2.c gcal-3.01/src/hd-data2.c --- gcal-3.01-orig/src/hd-data2.c 2000-06-14 03:00:01.000000000 +0200 +++ gcal-3.01/src/hd-data2.c 2006-07-26 11:32:07.000000000 +0200 @@ -2592,7 +2592,7 @@ PUBLIC void -ch_aa_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_ar_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2604,7 +2604,7 @@ Manages all specific holidays celebrated in Switzerland/Appenzell-Ausserrhoden. */ { - ptr_cc_id = "CH_AA"; + ptr_cc_id = "CH_AR"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_CIVIC_HOLIDAY].ht_text), ptr_cc_id, "+", 13, MONTH_MIN, year, hd_elems, fday, count); @@ -2689,7 +2689,7 @@ PUBLIC void -ch_bn_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_be_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2704,7 +2704,7 @@ register int i; - ptr_cc_id = "CH_BN"; + ptr_cc_id = "CH_BE"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); for (i=3 ; i ; i--) holiday (*init_data, detected, _(hd_text[HD_CARNIVAL].ht_text), @@ -2735,7 +2735,7 @@ PUBLIC void -ch_fb_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_fr_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2747,7 +2747,7 @@ Manages all specific holidays celebrated in Switzerland/Fribourg. */ { - ptr_cc_id = "CH_FB"; + ptr_cc_id = "CH_FR"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; ch_ai_hdy (init_data, detected, easter, year, hd_elems, fday, count); @@ -2757,7 +2757,7 @@ PUBLIC void -ch_gb_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_gr_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2769,7 +2769,7 @@ Manages all specific holidays celebrated in Switzerland/Graub"unden. */ { - ptr_cc_id = "CH_GB"; + ptr_cc_id = "CH_GR"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); } @@ -2805,7 +2805,7 @@ PUBLIC void -ch_gv_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_ge_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2820,7 +2820,7 @@ register int day; - ptr_cc_id = "CH_GV"; + ptr_cc_id = "CH_GE"; use_other_cc = !use_other_cc; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; @@ -2842,7 +2842,7 @@ PUBLIC void -ch_jr_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_ju_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2854,7 +2854,7 @@ Manages all specific holidays celebrated in Switzerland/Jura. */ { - ptr_cc_id = "CH_JR"; + ptr_cc_id = "CH_JU"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_LABOUR_DAY].ht_text), ptr_cc_id, "+", DAY_MIN, 5, year, hd_elems, fday, count); @@ -2871,7 +2871,7 @@ PUBLIC void -ch_lz_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_lu_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2883,7 +2883,7 @@ Manages all specific holidays celebrated in Switzerland/Luzern. */ { - ptr_cc_id = "CH_LZ"; + ptr_cc_id = "CH_LU"; ch_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_ASH_MONDAY].ht_text), ptr_cc_id, "+", easter-48, 0, year, hd_elems, fday, count); @@ -2904,7 +2904,7 @@ PUBLIC void -ch_nc_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_ne_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -2919,7 +2919,7 @@ register int day; - ptr_cc_id = "CH_NC"; + ptr_cc_id = "CH_NE"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); day = eval_holiday (DAY_MIN, 9, year, DAY_MAX, TRUE) + (2 * DAY_MAX) + 1; holiday (*init_data, detected, _(hd_text[HD_CIVIC_HOLIDAY].ht_text), @@ -3005,7 +3005,28 @@ PUBLIC void -ch_st_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_sh_hdy (init_data, detected, easter, year, hd_elems, fday, count) + Bool *init_data; + const Bool detected; + int easter; + const int year; + int *hd_elems; + const int fday; + const int count; +/* + Manages all specific holidays celebrated in Switzerland/Schaffhausen. +*/ +{ + ptr_cc_id = "CH_SH"; + ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); + holiday (*init_data, detected, _(hd_text[HD_LABOUR_DAY].ht_text), + ptr_cc_id, "+", DAY_MIN, 5, year, hd_elems, fday, count); +} + + + + PUBLIC void +ch_so_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -3017,7 +3038,7 @@ Manages all specific holidays celebrated in Switzerland/Solothurn. */ { - ptr_cc_id = "CH_ST"; + ptr_cc_id = "CH_SO"; ch_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_ALL_SAINTS_DAY].ht_text), ptr_cc_id, "+", DAY_MIN, 11, year, hd_elems, fday, count); @@ -3028,7 +3049,7 @@ PUBLIC void -ch_sw_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_sz_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -3040,7 +3061,7 @@ Manages all specific holidays celebrated in Switzerland/Schwyz. */ { - ptr_cc_id = "CH_SW"; + ptr_cc_id = "CH_SZ"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_ALL_SAINTS_DAY].ht_text), ptr_cc_id, "+", DAY_MIN, 11, year, hd_elems, fday, count); @@ -3057,7 +3078,7 @@ PUBLIC void -ch_tc_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_ti_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -3069,7 +3090,7 @@ Manages all specific holidays celebrated in Switzerland/Ticino. */ { - ptr_cc_id = "CH_TC"; + ptr_cc_id = "CH_TI"; use_other_cc = !use_other_cc; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); ch_ai_hdy (init_data, detected, easter, year, hd_elems, fday, count); @@ -3114,7 +3135,7 @@ PUBLIC void -ch_ui_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_ur_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -3126,7 +3147,7 @@ Manages all specific holidays celebrated in Switzerland/Uri. */ { - ptr_cc_id = "CH_UI"; + ptr_cc_id = "CH_UR"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; ch_ai_hdy (init_data, detected, easter, year, hd_elems, fday, count); @@ -3167,7 +3188,7 @@ PUBLIC void -ch_vl_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_vs_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -3179,7 +3200,7 @@ Manages all specific holidays celebrated in Switzerland/Valais. */ { - ptr_cc_id = "CH_VL"; + ptr_cc_id = "CH_VS"; use_other_cc = !use_other_cc; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; @@ -3224,7 +3245,7 @@ PUBLIC void -ch_zr_hdy (init_data, detected, easter, year, hd_elems, fday, count) +ch_zh_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -3240,7 +3261,7 @@ register int i; - ptr_cc_id = "CH_ZR"; + ptr_cc_id = "CH_ZH"; ch_base_hdy (init_data, detected, easter, year, hd_elems, fday, count); for (i=3 ; i ; i--) holiday (*init_data, detected, _(hd_text[HD_CARNIVAL].ht_text), diff -Nur gcal-3.01-orig/src/hd-data2.h gcal-3.01/src/hd-data2.h --- gcal-3.01-orig/src/hd-data2.h 2000-06-14 03:00:01.000000000 +0200 +++ gcal-3.01/src/hd-data2.h 2006-07-26 11:32:07.000000000 +0200 @@ -514,7 +514,7 @@ const int fday, const int count)); EXPORT void -ch_aa_hdy __P_(( Bool *init_data, +ch_ar_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -546,7 +546,7 @@ const int fday, const int count)); EXPORT void -ch_bn_hdy __P_(( Bool *init_data, +ch_be_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -562,7 +562,7 @@ const int fday, const int count)); EXPORT void -ch_fb_hdy __P_(( Bool *init_data, +ch_fr_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -570,7 +570,7 @@ const int fday, const int count)); EXPORT void -ch_gb_hdy __P_(( Bool *init_data, +ch_gr_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -586,7 +586,7 @@ const int fday, const int count)); EXPORT void -ch_gv_hdy __P_(( Bool *init_data, +ch_ge_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -594,7 +594,7 @@ const int fday, const int count)); EXPORT void -ch_jr_hdy __P_(( Bool *init_data, +ch_ju_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -602,7 +602,7 @@ const int fday, const int count)); EXPORT void -ch_lz_hdy __P_(( Bool *init_data, +ch_lu_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -610,7 +610,7 @@ const int fday, const int count)); EXPORT void -ch_nc_hdy __P_(( Bool *init_data, +ch_ne_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -642,7 +642,7 @@ const int fday, const int count)); EXPORT void -ch_st_hdy __P_(( Bool *init_data, +ch_sh_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -650,7 +650,7 @@ const int fday, const int count)); EXPORT void -ch_sw_hdy __P_(( Bool *init_data, +ch_so_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -658,7 +658,15 @@ const int fday, const int count)); EXPORT void -ch_tc_hdy __P_(( Bool *init_data, +ch_sz_hdy __P_(( Bool *init_data, + const Bool detected, + int easter, + const int year, + int *hd_elems, + const int fday, + const int count)); +EXPORT void +ch_ti_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -674,7 +682,7 @@ const int fday, const int count)); EXPORT void -ch_ui_hdy __P_(( Bool *init_data, +ch_ur_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -690,7 +698,7 @@ const int fday, const int count)); EXPORT void -ch_vl_hdy __P_(( Bool *init_data, +ch_vs_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -706,7 +714,7 @@ const int fday, const int count)); EXPORT void -ch_zr_hdy __P_(( Bool *init_data, +ch_zh_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, diff -Nur gcal-3.01-orig/src/hd-data3.c gcal-3.01/src/hd-data3.c --- gcal-3.01-orig/src/hd-data3.c 2000-06-14 03:00:01.000000000 +0200 +++ gcal-3.01/src/hd-data3.c 2006-07-26 11:32:07.000000000 +0200 @@ -63,7 +63,7 @@ * All other D-L countries specific holiday management functions. */ PUBLIC void -de_ba_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_by_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -75,7 +75,7 @@ Manages all specific holidays celebrated in Germany/Bavaria. */ { - ptr_cc_id = "DE_BA"; + ptr_cc_id = "DE_BY"; use_other_cc = !use_other_cc; de_nw_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; @@ -123,7 +123,7 @@ PUBLIC void -de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -140,7 +140,7 @@ if (!use_other_cc) { - ptr_cc_id = "DE_BL"; + ptr_cc_id = "DE_BE"; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); } day = weekday_of_date (DAY_MIN, 11, year); @@ -152,7 +152,7 @@ PUBLIC void -de_br_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_hb_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -164,9 +164,9 @@ Manages all specific holidays celebrated in Germany/Bremen. */ { - ptr_cc_id = "DE_BR"; + ptr_cc_id = "DE_HB"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); } @@ -198,7 +198,7 @@ PUBLIC void -de_ha_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_hh_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -210,9 +210,9 @@ Manages all specific holidays celebrated in Germany/Hamburg. */ { - ptr_cc_id = "DE_HA"; + ptr_cc_id = "DE_HH"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); } @@ -220,7 +220,7 @@ PUBLIC void -de_hs_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_he_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -232,9 +232,9 @@ Manages all specific holidays celebrated in Germany/Hessen. */ { - ptr_cc_id = "DE_HS"; + ptr_cc_id = "DE_HE"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_FEAST_OF_CORPUS_CHRISTI].ht_text), @@ -265,7 +265,7 @@ PUBLIC void -de_ns_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_ni_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -277,9 +277,9 @@ Manages all specific holidays celebrated in Germany/Lower Saxony. */ { - ptr_cc_id = "DE_NS"; + ptr_cc_id = "DE_NI"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); } @@ -303,7 +303,7 @@ { ptr_cc_id = "DE_NW"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); } @@ -340,7 +340,7 @@ PUBLIC void -de_sa_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_st_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -352,7 +352,7 @@ Manages all specific holidays celebrated in Germany/Saxony-Anhalt. */ { - ptr_cc_id = "DE_SA"; + ptr_cc_id = "DE_ST"; use_other_cc = !use_other_cc; de_bb_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; @@ -377,7 +377,7 @@ { ptr_cc_id = "DE_SH"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); } @@ -399,7 +399,7 @@ { ptr_cc_id = "DE_SL"; use_other_cc = !use_other_cc; - de_bl_hdy (init_data, detected, easter, year, hd_elems, fday, count); + de_be_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; de_hdy (init_data, detected, easter, year, hd_elems, fday, count); holiday (*init_data, detected, _(hd_text[HD_ALL_SAINTS_DAY].ht_text), @@ -449,7 +449,7 @@ PUBLIC void -de_tr_hdy (init_data, detected, easter, year, hd_elems, fday, count) +de_th_hdy (init_data, detected, easter, year, hd_elems, fday, count) Bool *init_data; const Bool detected; int easter; @@ -461,7 +461,7 @@ Manages all specific holidays celebrated in Germany/Thuringia. */ { - ptr_cc_id = "DE_TR"; + ptr_cc_id = "DE_TH"; use_other_cc = !use_other_cc; de_bb_hdy (init_data, detected, easter, year, hd_elems, fday, count); use_other_cc = !use_other_cc; diff -Nur gcal-3.01-orig/src/hd-data3.h gcal-3.01/src/hd-data3.h --- gcal-3.01-orig/src/hd-data3.h 2000-06-14 03:00:01.000000000 +0200 +++ gcal-3.01/src/hd-data3.h 2006-07-26 11:32:07.000000000 +0200 @@ -42,7 +42,7 @@ ************************************************** Defined in `hd-data3.c'. */ EXPORT void -de_ba_hdy __P_(( Bool *init_data, +de_by_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -58,7 +58,7 @@ const int fday, const int count)); EXPORT void -de_bl_hdy __P_(( Bool *init_data, +de_be_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -66,7 +66,7 @@ const int fday, const int count)); EXPORT void -de_br_hdy __P_(( Bool *init_data, +de_hb_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -82,7 +82,7 @@ const int fday, const int count)); EXPORT void -de_ha_hdy __P_(( Bool *init_data, +de_hh_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -90,7 +90,7 @@ const int fday, const int count)); EXPORT void -de_hs_hdy __P_(( Bool *init_data, +de_he_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -106,7 +106,7 @@ const int fday, const int count)); EXPORT void -de_ns_hdy __P_(( Bool *init_data, +de_ni_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -130,7 +130,7 @@ const int fday, const int count)); EXPORT void -de_sa_hdy __P_(( Bool *init_data, +de_st_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, @@ -162,7 +162,7 @@ const int fday, const int count)); EXPORT void -de_tr_hdy __P_(( Bool *init_data, +de_th_hdy __P_(( Bool *init_data, const Bool detected, int easter, const int year, diff -Nur gcal-3.01-orig/src/hd-data.c gcal-3.01/src/hd-data.c --- gcal-3.01-orig/src/hd-data.c 2000-06-24 03:00:01.000000000 +0200 +++ gcal-3.01/src/hd-data.c 2006-07-26 11:32:07.000000000 +0200 @@ -174,31 +174,32 @@ { "CD", "Demokratische Republik Kongo #", cd_hdy }, { "CF", "Zentralafrikanische Republik #", cf_hdy }, { "CG", "Republik Kongo #", cg_hdy }, - { "CH_AA", "Schweiz/Appenzell-Ausserrhoden", ch_aa_hdy }, { "CH_AG", "Schweiz/Aargau", ch_ag_hdy }, { "CH_AI", "Schweiz/Appenzell-Innerrhoden", ch_ai_hdy }, + { "CH_AR", "Schweiz/Appenzell-Ausserrhoden", ch_ar_hdy }, + { "CH_BE", "Schweiz/Bern", ch_be_hdy }, { "CH_BL", "Schweiz/Basel-Land", ch_bl_hdy }, - { "CH_BN", "Schweiz/Bern", ch_bn_hdy }, { "CH_BS", "Schweiz/Basel-Stadt", ch_bs_hdy }, - { "CH_FB", "Schweiz/Freiburg", ch_fb_hdy }, - { "CH_GB", "Schweiz/Graub"UE"nden", ch_gb_hdy }, + { "CH_FR", "Schweiz/Freiburg", ch_fr_hdy }, + { "CH_GE", "Schweiz/Genf", ch_ge_hdy }, { "CH_GL", "Schweiz/Glarus", ch_gl_hdy }, - { "CH_GV", "Schweiz/Genf", ch_gv_hdy }, - { "CH_JR", "Schweiz/Jura", ch_jr_hdy }, - { "CH_LZ", "Schweiz/Luzern", ch_lz_hdy }, - { "CH_NC", "Schweiz/Neuch"ADG"tel", ch_nc_hdy }, + { "CH_GR", "Schweiz/Graub"UE"nden", ch_gr_hdy }, + { "CH_JU", "Schweiz/Jura", ch_ju_hdy }, + { "CH_LU", "Schweiz/Luzern", ch_lu_hdy }, + { "CH_NE", "Schweiz/Neuenburg", ch_ne_hdy }, { "CH_NW", "Schweiz/Nidwalden", ch_nw_hdy }, { "CH_OW", "Schweiz/Obwalden", ch_ow_hdy }, { "CH_SG", "Schweiz/St. Gallen", ch_sg_hdy }, - { "CH_ST", "Schweiz/Solothurn", ch_st_hdy }, - { "CH_SW", "Schweiz/Schwyz", ch_sw_hdy }, - { "CH_TC", "Schweiz/Ticino", ch_tc_hdy }, + { "CH_SH", "Schweiz/Schaffhausen", ch_sh_hdy }, + { "CH_SO", "Schweiz/Solothurn", ch_so_hdy }, + { "CH_SZ", "Schweiz/Schwyz", ch_sz_hdy }, { "CH_TG", "Schweiz/Thurgau", ch_tg_hdy }, - { "CH_UI", "Schweiz/Uri", ch_ui_hdy }, - { "CH_VD", "Schweiz/Vaud", ch_vd_hdy }, - { "CH_VL", "Schweiz/Valais", ch_vl_hdy }, + { "CH_TI", "Schweiz/Tessin", ch_ti_hdy }, + { "CH_UR", "Schweiz/Uri", ch_ur_hdy }, + { "CH_VD", "Schweiz/Waadt", ch_vd_hdy }, + { "CH_VS", "Schweiz/Wallis", ch_vs_hdy }, { "CH_ZG", "Schweiz/Zug", ch_zg_hdy }, - { "CH_ZR", "Schweiz/Z"UE"rich", ch_zr_hdy }, + { "CH_ZH", "Schweiz/Z"UE"rich", ch_zh_hdy }, { "CI", "Elfenbeink"UE"ste", ci_hdy }, { "CK", "Cook-Inseln", ck_hdy }, { "CL", "Chile", cl_hdy }, @@ -211,22 +212,22 @@ { "CX", "Christmas-Inseln", cx_hdy }, { "CY", "Zypern", cy_hdy }, { "CZ", "Tschechien", cz_hdy }, - { "DE_BA", "Deutschland/Bayern", de_ba_hdy }, { "DE_BB", "Deutschland/Brandenburg", de_bb_hdy }, - { "DE_BL", "Deutschland/Berlin", de_bl_hdy }, - { "DE_BR", "Deutschland/Bremen", de_br_hdy }, - { "DE_BW", "Deutschland/Baden-W"UE"rttenberg", de_bw_hdy }, - { "DE_HA", "Deutschland/Hamburg", de_ha_hdy }, - { "DE_HS", "Deutschland/Hessen", de_hs_hdy }, + { "DE_BE", "Deutschland/Berlin", de_be_hdy }, + { "DE_BW", "Deutschland/Baden-W"UE"rttemberg", de_bw_hdy }, + { "DE_BY", "Deutschland/Bayern", de_by_hdy }, + { "DE_HB", "Deutschland/Bremen", de_hb_hdy }, + { "DE_HE", "Deutschland/Hessen", de_he_hdy }, + { "DE_HH", "Deutschland/Hamburg", de_hh_hdy }, { "DE_MV", "Deutschland/Mecklenburg-Vorpommern", de_mv_hdy }, - { "DE_NS", "Deutschland/Niedersachsen", de_ns_hdy }, + { "DE_NI", "Deutschland/Niedersachsen", de_ni_hdy }, { "DE_NW", "Deutschland/Nordrhein-Westfalen", de_nw_hdy }, { "DE_RP", "Deutschland/Rheinland-Pfalz", de_rp_hdy }, - { "DE_SA", "Deutschland/Sachsen-Anhalt", de_sa_hdy }, { "DE_SH", "Deutschland/Schleswig-Holstein", de_sh_hdy }, { "DE_SL", "Deutschland/Saarland", de_sl_hdy }, { "DE_SN", "Deutschland/Sachsen", de_sn_hdy }, - { "DE_TR", "Deutschland/Th"UE"ringen", de_tr_hdy }, + { "DE_ST", "Deutschland/Sachsen-Anhalt", de_st_hdy }, + { "DE_TH", "Deutschland/Th"UE"ringen", de_th_hdy }, { "DJ", "Djibouti", dj_hdy }, { "DK", "D"AE"nemark", dk_hdy }, { "DM", "Dominica", dm_hdy }, @@ -519,31 +520,32 @@ { "CD", N_("Democratic Republic of Congo #"), cd_hdy }, { "CF", N_("Central African Republic #"), cf_hdy }, { "CG", N_("Republic of Congo #"), cg_hdy }, - { "CH_AA", N_("Switzerland/Appenzell Ausserrhoden"), ch_aa_hdy }, { "CH_AG", N_("Switzerland/Aargau"), ch_ag_hdy }, { "CH_AI", N_("Switzerland/Appenzell Innerrhoden"), ch_ai_hdy }, + { "CH_AR", N_("Switzerland/Appenzell Ausserrhoden"), ch_ar_hdy }, + { "CH_BE", N_("Switzerland/Bern"), ch_be_hdy }, { "CH_BL", N_("Switzerland/Basel-Land"), ch_bl_hdy }, - { "CH_BN", N_("Switzerland/Bern"), ch_bn_hdy }, { "CH_BS", N_("Switzerland/Basel-Stadt"), ch_bs_hdy }, - { "CH_FB", N_("Switzerland/Fribourg"), ch_fb_hdy }, - { "CH_GB", N_("Switzerland/Graubünden"), ch_gb_hdy }, + { "CH_FR", N_("Switzerland/Fribourg"), ch_fr_hdy }, + { "CH_GE", N_("Switzerland/Genève"), ch_ge_hdy }, { "CH_GL", N_("Switzerland/Glarus"), ch_gl_hdy }, - { "CH_GV", N_("Switzerland/Genève"), ch_gv_hdy }, - { "CH_JR", N_("Switzerland/Jura"), ch_jr_hdy }, - { "CH_LZ", N_("Switzerland/Luzern"), ch_lz_hdy }, - { "CH_NC", N_("Switzerland/Neuchâtel"), ch_nc_hdy }, + { "CH_GR", N_("Switzerland/Graubünden"), ch_gr_hdy }, + { "CH_JU", N_("Switzerland/Jura"), ch_ju_hdy }, + { "CH_LU", N_("Switzerland/Luzern"), ch_lu_hdy }, + { "CH_NE", N_("Switzerland/Neuchâtel"), ch_ne_hdy }, { "CH_NW", N_("Switzerland/Nidwalden"), ch_nw_hdy }, { "CH_OW", N_("Switzerland/Obwalden"), ch_ow_hdy }, { "CH_SG", N_("Switzerland/St Gallen"), ch_sg_hdy }, - { "CH_ST", N_("Switzerland/Solothurn"), ch_st_hdy }, - { "CH_SW", N_("Switzerland/Schwyz"), ch_sw_hdy }, - { "CH_TC", N_("Switzerland/Ticino"), ch_tc_hdy }, + { "CH_SH", N_("Switzerland/Schaffhausen"), ch_sh_hdy }, + { "CH_SO", N_("Switzerland/Solothurn"), ch_so_hdy }, + { "CH_SZ", N_("Switzerland/Schwyz"), ch_sz_hdy }, { "CH_TG", N_("Switzerland/Thurgau"), ch_tg_hdy }, - { "CH_UI", N_("Switzerland/Uri"), ch_ui_hdy }, + { "CH_TI", N_("Switzerland/Ticino"), ch_ti_hdy }, + { "CH_UR", N_("Switzerland/Uri"), ch_ur_hdy }, { "CH_VD", N_("Switzerland/Vaud"), ch_vd_hdy }, - { "CH_VL", N_("Switzerland/Valais"), ch_vl_hdy }, + { "CH_VS", N_("Switzerland/Valais"), ch_vs_hdy }, { "CH_ZG", N_("Switzerland/Zug"), ch_zg_hdy }, - { "CH_ZR", N_("Switzerland/Zürich"), ch_zr_hdy }, + { "CH_ZH", N_("Switzerland/Zürich"), ch_zh_hdy }, { "CI", N_("Côte d'Ivoire"), ci_hdy }, { "CK", N_("Cook Islands"), ck_hdy }, { "CL", N_("Chile"), cl_hdy }, @@ -556,22 +558,22 @@ { "CX", N_("Christmas Islands"), cx_hdy }, { "CY", N_("Cyprus"), cy_hdy }, { "CZ", N_("Czech Republic"), cz_hdy }, - { "DE_BA", N_("Germany/Bavaria"), de_ba_hdy }, { "DE_BB", N_("Germany/Brandenburg"), de_bb_hdy }, - { "DE_BL", N_("Germany/Berlin"), de_bl_hdy }, - { "DE_BR", N_("Germany/Bremen"), de_br_hdy }, + { "DE_BE", N_("Germany/Berlin"), de_be_hdy }, { "DE_BW", N_("Germany/Baden-Württemberg"), de_bw_hdy }, - { "DE_HA", N_("Germany/Hamburg"), de_ha_hdy }, - { "DE_HS", N_("Germany/Hesse"), de_hs_hdy }, + { "DE_BY", N_("Germany/Bavaria"), de_by_hdy }, + { "DE_HB", N_("Germany/Bremen"), de_hb_hdy }, + { "DE_HE", N_("Germany/Hesse"), de_he_hdy }, + { "DE_HH", N_("Germany/Hamburg"), de_hh_hdy }, { "DE_MV", N_("Germany/Mecklenburg-West Pomerania"), de_mv_hdy }, - { "DE_NS", N_("Germany/Lower Saxony"), de_ns_hdy }, + { "DE_NI", N_("Germany/Lower Saxony"), de_ni_hdy }, { "DE_NW", N_("Germany/North Rhine-Westphalia"), de_nw_hdy }, { "DE_RP", N_("Germany/Rhineland Palatinate"), de_rp_hdy }, - { "DE_SA", N_("Germany/Saxony-Anhalt"), de_sa_hdy }, { "DE_SH", N_("Germany/Schleswig-Holstein"), de_sh_hdy }, { "DE_SL", N_("Germany/Saar"), de_sl_hdy }, { "DE_SN", N_("Germany/Saxony"), de_sn_hdy }, - { "DE_TR", N_("Germany/Thuringia"), de_tr_hdy }, + { "DE_ST", N_("Germany/Saxony-Anhalt"), de_st_hdy }, + { "DE_TH", N_("Germany/Thuringia"), de_th_hdy }, { "DJ", N_("Djibouti"), dj_hdy }, { "DK", N_("Denmark"), dk_hdy }, { "DM", N_("Dominica"), dm_hdy },