281a282
>   {"auto", "--Generic--"},
284a286
>   {"ax", "Aland Islands"},
285a288,289
>   {"br", "Brazil"},
>   {"ca", "Canada"},
309a314
>   {"si", "Slovenia"},
370,373c375,384
<     displayname = name + 3;
<     buf[0] = name[0];
<     buf[1] = name[1];
<     buf[2] = 0;
---
>     l = 0;
>     c = 0;
>     while(*name && c != '-') {
>       c = *name++;
>       if (c != '-') {
>         buf[l++] = c;
>       }
>     }
>     buf[l] = 0;
>     displayname = name;