langpacks/english: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@7150 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

5 files changed, 24 insertions, 22 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index dff9fd92b1..dcf4c0e095 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1369,7 +1369,7 @@
 [Colombia]

 [Comoros]

 [Congo, Republic of the]

-[Congo, the Democratic Republic of the]

+[Congo, Democratic Republic of the]

 [Cook Islands]

 [Costa Rica]

 [Cote d'Ivoire]

@@ -1415,14 +1415,13 @@
 [Guyana]

 [Haiti]

 [Heard Island and McDonald Islands]

-[Holy See (Vatican City)]

 [Honduras]

 [Hong Kong]

 [Hungary]

 [Iceland]

 [India]

 [Indonesia]

-[Iran, Islamic Republic of]

+[Iran]

 [Iraq]

 [Ireland]

 [Isle of Man]

@@ -1449,7 +1448,7 @@
 [Lithuania]

 [Luxembourg]

 [Macao]

-[Macedonia, The Former Yugoslav Republic of]

+[Macedonia]

 [Madagascar]

 [Malawi]

 [Malaysia]

@@ -1535,7 +1534,7 @@
 [Sweden]

 [Switzerland]

 [Syria]

-[Taiwan, Province of China]

+[Taiwan]

 [Tajikistan]

 [Tanzania]

 [Thailand]

@@ -1558,6 +1557,7 @@
 [Uruguay]

 [Uzbekistan]

 [Vanuatu]

+[Vatican City]

 [Venezuela]

 [Vietnam]

 [Virgin Islands (British)]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 6cf75730ce..c9aec9996b 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -251,19 +251,19 @@
 [Cameroon]

 [Canada]

 [Canary Islands]

-[Cape Verde Islands]

+[Cape Verde]

 [Cayman Islands]

 [Central African Republic]

 [Chad]

-[Chile, Republic of]

+[Chile]

 [China]

 [Colombia]

 [Comoros]

-[Congo, Democratic Republic of (Zaire)]

+[Congo, Democratic Republic of the]

 [Congo, Republic of the]

 [Cook Islands]

 [Costa Rica]

-[Cote d'Ivoire (Ivory Coast)]

+[Cote d'Ivoire]

 [Croatia]

 [Cuba]

 [Greek, Republic of South Cyprus]

@@ -281,7 +281,7 @@
 [Estonia]

 [Ethiopia]

 [Europe]

-[Faeroe Islands]

+[Faroe Islands]

 [Falkland Islands]

 [Fiji]

 [Finland]

@@ -311,7 +311,7 @@
 [Iceland]

 [India]

 [Indonesia]

-[Iran (Islamic Republic of)]

+[Iran]

 [Iraq]

 [Ireland]

 [Israel]

@@ -331,7 +331,7 @@
 [Lebanon]

 [Lesotho]

 [Liberia]

-[Libyan Arab Jamahiriya]

+[Libya]

 [Liechtenstein]

 [Lithuania]

 [Luxembourg]

@@ -347,10 +347,10 @@
 [Martinique]

 [Mauritania]

 [Mauritius]

-[Mayotte Island]

+[Mayotte]

 [Mexico]

 [Micronesia, Federated States of]

-[Moldova, Republic of]

+[Moldova]

 [Monaco]

 [Mongolia]

 [Montserrat]

@@ -387,7 +387,7 @@
 [Portugal]

 [Puerto Rico]

 [Qatar]

-[Reunion Island]

+[Reunion]

 [Romania]

 [Russia]

 [Rwanda]

@@ -419,7 +419,7 @@
 [Swaziland]

 [Sweden]

 [Switzerland]

-[Syrian Arab Republic]

+[Syria]

 [Taiwan]

 [Tajikistan]

 [Tanzania]

@@ -449,12 +449,12 @@
 [Virgin Islands (UK)]

 [Virgin Islands (USA)]

 [Wales]

-[Wallis and Futuna Islands]

+[Wallis and Futuna]

 [Yemen]

 [Yugoslavia]

-[Serbia, Republic of]

+[Serbia]

 [Kosovo, Republic of]

-[Montenegro, Republic of]

+[Montenegro]

 [Zambia]

 [Zimbabwe]

 [50's]

diff --git a/langpacks/english/Plugins/RecentContacts.txt b/langpacks/english/Plugins/RecentContacts.txt
index 4b54dfc4dc..bf84f5f417 100644
--- a/langpacks/english/Plugins/RecentContacts.txt
+++ b/langpacks/english/Plugins/RecentContacts.txt
@@ -9,7 +9,7 @@
 ;file \plugins\RecentContacts\res\resource.rc

 [Recent Contacts]

 [Plugin settings]

-[Number shown contacts:\n (0 to show all)]

+[Number of shown contacts:\n (0 to show all)]

 [Format of date and time\n(Look to readme for placeholders help)]

 [Hide offline contacts]

 ;file \plugins\RecentContacts\src\options.cpp

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 4b79a87ca9..d2b0119ea7 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -871,7 +871,6 @@
 [Remove popups under following conditions]

 [Message window behavior]

 [Sending messages]

-[Send on SHIFT - Enter]

 [Close the message window on send]

 [Always flash contact list and tray icon for new messages]

 [Delete temporary contacts on close]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index b89f542f7b..5d5b1c9c5b 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.0.5

+;  Version: 0.1.0.6

 ;  Authors: Miranda NG Team

 ;============================================================

 [VKontakte protocol support for Miranda NG.]

@@ -10,6 +10,9 @@
 [E-mail or phone number:]

 [Password:]

 [Open VKontakte site]

+[Login settings]

+[Advanced]

+[Server-side delivery confirmation]

 [Bots challenge test]

 [Instruction:]

 [Submit]