summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDart Raiden <wowemuh@gmail.com>2013-12-13 13:44:10 +0000
committerDart Raiden <wowemuh@gmail.com>2013-12-13 13:44:10 +0000
commitf1f642b3e77402b1f40ec287dff3d43f089b61be (patch)
tree6d2884006ca53cce4740efb09d15ae80956fa600
parentab06f83a076ece3aba4a47a107203829b11974db (diff)
country names tuning
git-svn-id: http://svn.miranda-ng.org/main/trunk@7175 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
-rw-r--r--langpacks/russian/=CORE=.txt12
-rw-r--r--src/modules/utils/utils.cpp4
2 files changed, 8 insertions, 8 deletions
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index b507f249a2..b56656f58c 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -2549,6 +2549,8 @@ ANSI плагин
Доминика
[Dominican Republic]
Доминиканская республика
+[East Timor]
+Восточный Тимор
[Ecuador]
Эквадор
[Egypt]
@@ -2574,7 +2576,7 @@ ANSI плагин
[France]
Франция
[French Guiana]
-Французская Гвиана
+Гвиана
[French Polynesia]
Французская Полинезия
[French Southern and Antarctic Lands]
@@ -2679,7 +2681,7 @@ ANSI плагин
Литва
[Luxembourg]
Люксембург
-[Macao]
+[Macau]
Макао
[Macedonia]
Македония
@@ -2861,8 +2863,6 @@ ANSI плагин
Танзания
[Thailand]
Тайланд
-[Timor-Leste]
-Восточный Тимор
[Togo]
Того
[Tokelau]
@@ -2906,9 +2906,9 @@ ANSI плагин
[Vietnam]
Вьетнам
[Virgin Islands (British)]
-Британские Виргинские о-ва
+Виргинские о-ва (Британские)
[Virgin Islands (United States)]
-Виргинские о-ва (США)
+Виргинские о-ва (Американские)
[Wallis and Futuna]
о-ва Уоллис и Футуна
[Western Sahara]
diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp
index 3eab411815..ed9a59c9a4 100644
--- a/src/modules/utils/utils.cpp
+++ b/src/modules/utils/utils.cpp
@@ -113,6 +113,7 @@ static CountryListEntry countries[] = {
{253, LPGEN("Djibouti"), "DJ"},
{1767, LPGEN("Dominica"), "DM"},
{1809, LPGEN("Dominican Republic"), "DO"},
+ {670, LPGEN("East Timor"), "TL"},
{593, LPGEN("Ecuador"), "EC"},
{20, LPGEN("Egypt"), "EG"},
{503, LPGEN("El Salvador"), "SV"},
@@ -178,7 +179,7 @@ static CountryListEntry countries[] = {
{423, LPGEN("Liechtenstein"), "LI"},
{370, LPGEN("Lithuania"), "LT"},
{352, LPGEN("Luxembourg"), "LU"},
- {853, LPGEN("Macao"), "MO"},
+ {853, LPGEN("Macau"), "MO"},
{389, LPGEN("Macedonia"), "MK"},
{261, LPGEN("Madagascar"), "MG"},
{265, LPGEN("Malawi"), "MW"},
@@ -269,7 +270,6 @@ static CountryListEntry countries[] = {
{992, LPGEN("Tajikistan"), "TJ"},
{255, LPGEN("Tanzania"), "TZ"},
{66, LPGEN("Thailand"), "TH"},
- {670, LPGEN("Timor-Leste"), "TL"},
{228, LPGEN("Togo"), "TG"},
{690, LPGEN("Tokelau"), "TK"},
{676, LPGEN("Tonga"), "TO"},