From a30ee048418f5ce1afaf69acc4e0473b2530debe Mon Sep 17 00:00:00 2001 From: Dart Raiden Date: Sat, 7 Dec 2013 23:32:13 +0000 Subject: another portion of decapitalization in the core (6/5) :) that's all! Bass_interface: small decapitalization git-svn-id: http://svn.miranda-ng.org/main/trunk@7078 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c --- plugins/BASS_interface/src/Main.cpp | 4 ++-- src/modules/utils/utils.cpp | 34 +++++++++++++++++----------------- 2 files changed, 19 insertions(+), 19 deletions(-) diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp index c6219bd2b3..2c172d6a79 100644 --- a/plugins/BASS_interface/src/Main.cpp +++ b/plugins/BASS_interface/src/Main.cpp @@ -412,7 +412,7 @@ int ReloadColors(WPARAM wParam, LPARAM lParam) ColourIDT colourid = {0}; colourid.cbSize = sizeof(colourid); _tcscpy(colourid.group, _T(ModuleName)); - _tcscpy(colourid.name, LPGENT("Frame Background")); + _tcscpy(colourid.name, LPGENT("Frame background")); clBack = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, 0); if (hBkgBrush) @@ -460,7 +460,7 @@ void CreateFrame() colourid.cbSize = sizeof(ColourIDT); strcpy(colourid.dbSettingsGroup, ModuleName); strcpy(colourid.setting, "ColorFrame"); - _tcscpy(colourid.name, LPGENT("Frame Background")); + _tcscpy(colourid.name, LPGENT("Frame background")); _tcscpy(colourid.group, _T(ModuleName)); colourid.defcolour = GetSysColor(COLOR_3DFACE); ColourRegisterT(&colourid); diff --git a/src/modules/utils/utils.cpp b/src/modules/utils/utils.cpp index 8a62eed3f3..55fee346cb 100644 --- a/src/modules/utils/utils.cpp +++ b/src/modules/utils/utils.cpp @@ -75,14 +75,14 @@ static CountryListEntry countries[] = { {229, LPGEN("Benin"), "BJ"}, {1441, LPGEN("Bermuda"), "BM"}, {975, LPGEN("Bhutan"), "BT"}, - {591, LPGEN("Bolivia, Plurinational State of"), "BO"}, + {591, LPGEN("Bolivia"), "BO"}, {5997, LPGEN("Bonaire, Sint Eustatius and Saba"), "BQ"}, {387, LPGEN("Bosnia and Herzegovina"), "BA"}, {267, LPGEN("Botswana"), "BW"}, {55, LPGEN("Bouvet Island"), "BV"}, {55, LPGEN("Brazil"), "BR"}, {246, LPGEN("British Indian Ocean Territory"), "IO"}, - {673, LPGEN("Brunei Darussalam"), "BN"}, + {673, LPGEN("Brunei"), "BN"}, {359, LPGEN("Bulgaria"), "BG"}, {226, LPGEN("Burkina Faso"), "BF"}, {257, LPGEN("Burundi"), "BI"}, @@ -99,7 +99,7 @@ static CountryListEntry countries[] = { {61, LPGEN("Cocos (Keeling) Islands"), "CC"}, {57, LPGEN("Colombia"), "CO"}, {269, LPGEN("Comoros"), "KM"}, - {242, LPGEN("Congo"), "CG"}, + {242, LPGEN("Congo, Republic of the"), "CG"}, {243, LPGEN("Congo, the Democratic Republic of the"), "CD"}, {682, LPGEN("Cook Islands"), "CK"}, {506, LPGEN("Costa Rica"), "CR"}, @@ -127,7 +127,7 @@ static CountryListEntry countries[] = { {33, LPGEN("France"), "FR"}, {594, LPGEN("French Guiana"), "GF"}, {689, LPGEN("French Polynesia"), "PF"}, - {0xFFFE, LPGEN("French Southern Territories"), "TF"}, + {0xFFFE, LPGEN("French Southern and Antarctic Lands"), "TF"}, {241, LPGEN("Gabon"), "GA"}, {220, LPGEN("Gambia"), "GM"}, {995, LPGEN("Georgia"), "GE"}, @@ -146,7 +146,7 @@ static CountryListEntry countries[] = { {592, LPGEN("Guyana"), "GY"}, {509, LPGEN("Haiti"), "HT"}, {0xFFFE, LPGEN("Heard Island and McDonald Islands"), "HM"}, - {379, LPGEN("Holy See (Vatican City State)"), "VA"}, + {379, LPGEN("Holy See (Vatican City)"), "VA"}, {504, LPGEN("Honduras"), "HN"}, {852, LPGEN("Hong Kong"), "HK"}, {36, LPGEN("Hungary"), "HU"}, @@ -166,11 +166,11 @@ static CountryListEntry countries[] = { {76, LPGEN("Kazakhstan"), "KZ"}, {254, LPGEN("Kenya"), "KE"}, {686, LPGEN("Kiribati"), "KI"}, - {850, LPGEN("Korea, Democratic People's Republic of"), "KP"}, - {82, LPGEN("Korea, Republic of"), "KR"}, + {850, LPGEN("North Korea"), "KP"}, + {82, LPGEN("South Korea"), "KR"}, {965, LPGEN("Kuwait"), "KW"}, {996, LPGEN("Kyrgyzstan"), "KG"}, - {856, LPGEN("Lao People's Democratic Republic"), "LA"}, + {856, LPGEN("Laos"), "LA"}, {371, LPGEN("Latvia"), "LV"}, {961, LPGEN("Lebanon"), "LB"}, {266, LPGEN("Lesotho"), "LS"}, @@ -194,7 +194,7 @@ static CountryListEntry countries[] = { {262, LPGEN("Mayotte"), "YT"}, {52, LPGEN("Mexico"), "MX"}, {691, LPGEN("Micronesia, Federated States of"), "FM"}, - {373, LPGEN("Moldova, Republic of"), "MD"}, + {373, LPGEN("Moldova"), "MD"}, {377, LPGEN("Monaco"), "MC"}, {976, LPGEN("Mongolia"), "MN"}, {382, LPGEN("Montenegro"), "ME"}, @@ -218,13 +218,13 @@ static CountryListEntry countries[] = { {968, LPGEN("Oman"), "OM"}, {92, LPGEN("Pakistan"), "PK"}, {680, LPGEN("Palau"), "PW"}, - {970, LPGEN("Palestinian Territory, Occupied"), "PS"}, + {970, LPGEN("Palestinian Territories"), "PS"}, {507, LPGEN("Panama"), "PA"}, {675, LPGEN("Papua New Guinea"), "PG"}, {595, LPGEN("Paraguay"), "PY"}, {51, LPGEN("Peru"), "PE"}, {63, LPGEN("Philippines"), "PH"}, - {64, LPGEN("Pitcairn"), "PN"}, + {64, LPGEN("Pitcairn Islands"), "PN"}, {48, LPGEN("Poland"), "PL"}, {351, LPGEN("Portugal"), "PT"}, {1787, LPGEN("Puerto Rico"), "PR"}, @@ -265,10 +265,10 @@ static CountryListEntry countries[] = { {268, LPGEN("Swaziland"), "SZ"}, {46, LPGEN("Sweden"), "SE"}, {41, LPGEN("Switzerland"), "CH"}, - {963, LPGEN("Syrian Arab Republic"), "SY"}, + {963, LPGEN("Syria"), "SY"}, {886, LPGEN("Taiwan, Province of China"), "TW"}, {992, LPGEN("Tajikistan"), "TJ"}, - {255, LPGEN("Tanzania, United Republic of"), "TZ"}, + {255, LPGEN("Tanzania"), "TZ"}, {66, LPGEN("Thailand"), "TH"}, {670, LPGEN("Timor-Leste"), "TL"}, {228, LPGEN("Togo"), "TG"}, @@ -289,10 +289,10 @@ static CountryListEntry countries[] = { {598, LPGEN("Uruguay"), "UY"}, {998, LPGEN("Uzbekistan"), "UZ"}, {678, LPGEN("Vanuatu"), "VU"}, - {58, LPGEN("Venezuela, Bolivarian Republic of"), "VE"}, - {84, LPGEN("Viet Nam"), "VN"}, - {1284, LPGEN("Virgin Islands, British"), "VG"}, - {1340, LPGEN("Virgin Islands, U.S."), "VI"}, + {58, LPGEN("Venezuela"), "VE"}, + {84, LPGEN("Vietnam"), "VN"}, + {1284, LPGEN("Virgin Islands (British)"), "VG"}, + {1340, LPGEN("Virgin Islands (United States)"), "VI"}, {681, LPGEN("Wallis and Futuna"), "WF"}, {5289, LPGEN("Western Sahara"), "EH"}, {967, LPGEN("Yemen"), "YE"}, -- cgit v1.2.3