26 files changed, 159 insertions, 174 deletions

diff --git a/langpacks/belarusian/Plugins/VKontakte.txt b/langpacks/belarusian/Plugins/VKontakte.txt
index 700d161b68..a034ef117b 100644
--- a/langpacks/belarusian/Plugins/VKontakte.txt
+++ b/langpacks/belarusian/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@
 Падцверджанне дастаўкі з боку сервера

 [Hide chats on startup]

 Не адчыняць вокны пакояў пры далучэнні

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 Аўтаматычна выдаляць кантакты, якіх няма на серверы

 [Bots challenge test]

 Абарона ад ботаў

diff --git a/langpacks/belarusian/Plugins/WhatsApp.txt b/langpacks/belarusian/Plugins/WhatsApp.txt
index 7c2207923e..a10dd43621 100644
--- a/langpacks/belarusian/Plugins/WhatsApp.txt
+++ b/langpacks/belarusian/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@
 Код запыту

 [Register code]

 Код рэгістраці

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 Далучэнне па SSL (порт 443)

 [Cancel]

 Скасаваць

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 Абярыце код краіны.

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 Увядзіце нумар тэлефона без кода краіны

 [Please enter a nickname.]

 Увядзіце мянушку

@@ -35,7 +35,7 @@
 Калі ласка, увядзіце пароль.

 ;file \protocols\WhatsApp\src\contacts.cpp

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 Код рэгістрацыі прыйдзе на ваш тэлефон СМС-паведамленнем.\nМайце на ўвазе, што адначасовае выкарыстанне гэтага плагіна і сапраўднага WhatsApp немагчыма!\nПрацягнуць?

 [Please correctly specify your registration code received by SMS]

 Калі ласка, дакладна увядзіце свой код рэгістрацыі, атрыманы смс.

@@ -44,26 +44,26 @@
 Далучэнне да сервера %s

 [Unable to get Netlib connection for WhatsApp]

 Немагчыма стварыць далучэнне Netlib для WhatsApp

-[Network-connection error.]

+[Network connection error.]

 Памылка далучэння

 [Network]

 Сеціва

 [Account]

 Конт

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 Абразок WhatsApp

-[Add To Group]

+[Add to group]

 Дадаць у гурт

-[Create Chat Group]

+[Create chat group]

 Стварыць чат-гурт

-[Remove From Chat Group]

+[Remove from chat group]

 Выдаліць з чат-гурта

-[Leave And Delete Group]

+[Leave and delete group]

 Пакінуць гурт і выдаліць яго

-[Leave Group]

+[Leave group]

 Пакінуць гурт

-[Change Group Subject]

+[Change group subject]

 Змяніць тэму гурта

-[Create Group]

+[Create group]

 Стварыць гурт

diff --git a/langpacks/bulgarian/Plugins/VKontakte.txt b/langpacks/bulgarian/Plugins/VKontakte.txt
index 523e840a12..d4e8c544d3 100644
--- a/langpacks/bulgarian/Plugins/VKontakte.txt
+++ b/langpacks/bulgarian/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@
 

 [Hide chats on startup]

 

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 

 [Always notify as unread for all incoming message]

 

diff --git a/langpacks/bulgarian/Plugins/WhatsApp.txt b/langpacks/bulgarian/Plugins/WhatsApp.txt
index 7734d19b9b..f47594ec96 100644
--- a/langpacks/bulgarian/Plugins/WhatsApp.txt
+++ b/langpacks/bulgarian/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@
 

 [Register code]

 

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 

 [Cancel]

 Отказ

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 

 [Please enter a nickname.]

 

@@ -47,7 +47,7 @@
 [User '%s' has been removed from the group]

 

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 

 [Your password has been set automatically. You can proceed with login now]

 

@@ -58,7 +58,7 @@
 %s връзка със сървъра

 [Unable to get Netlib connection for WhatsApp]

 

-[Network-connection error.]

+[Network connection error.]

 

 [Registration]

 

@@ -77,19 +77,19 @@
 [Account]

 Акаунт

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 

-[Add To Group]

+[Add to group]

 

-[Create Chat Group]

+[Create chat group]

 

-[Remove From Chat Group]

+[Remove from chat group]

 

-[Leave And Delete Group]

+[Leave and delete group]

 

-[Leave Group]

+[Leave group]

 

-[Change Group Subject]

+[Change group subject]

 

-[Create Group]

+[Create group]

 

diff --git a/langpacks/french/Plugins/VKontakte.txt b/langpacks/french/Plugins/VKontakte.txt
index a3ce5762e2..8c4e010ae6 100644
--- a/langpacks/french/Plugins/VKontakte.txt
+++ b/langpacks/french/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@ Avancé
 

 [Hide chats on startup]

 

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 

 [Always notify as unread for all incoming message]

 

diff --git a/langpacks/french/Plugins/WhatsApp.txt b/langpacks/french/Plugins/WhatsApp.txt
index 8abeddeba7..e5b4fe8972 100644
--- a/langpacks/french/Plugins/WhatsApp.txt
+++ b/langpacks/french/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@ Pseudo
 

 [Register code]

 

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 

 [Cancel]

 Annuler

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 

 [Please enter a nickname.]

 

@@ -47,7 +47,7 @@ S'il vous plaît entrer un mot de passe.
 [User '%s' has been removed from the group]

 

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 

 [Your password has been set automatically. You can proceed with login now]

 

@@ -58,7 +58,7 @@ S'il vous plaît entrer un mot de passe.
 %s serveur connexion

 [Unable to get Netlib connection for WhatsApp]

 

-[Network-connection error.]

+[Network connection error.]

 

 [Registration]

 

@@ -77,19 +77,19 @@ Réseau
 [Account]

 Compte

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 

-[Add To Group]

+[Add to group]

 

-[Create Chat Group]

+[Create chat group]

 

-[Remove From Chat Group]

+[Remove from chat group]

 

-[Leave And Delete Group]

+[Leave and delete group]

 

-[Leave Group]

+[Leave group]

 

-[Change Group Subject]

+[Change group subject]

 

-[Create Group]

+[Create group]

 

diff --git a/langpacks/french/Untranslated/VKontakte.txt b/langpacks/french/Untranslated/VKontakte.txt
index c5accc1131..38eb7a146d 100644
--- a/langpacks/french/Untranslated/VKontakte.txt
+++ b/langpacks/french/Untranslated/VKontakte.txt
@@ -5,7 +5,7 @@
 [Contact list group:]

 [Server-side delivery confirmation]

 [Hide chats on startup]

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 [Always notify as unread for all incoming message]

 [Mark read on reply]

 [Mark read on typing]

diff --git a/langpacks/french/Untranslated/WhatsApp.txt b/langpacks/french/Untranslated/WhatsApp.txt
index 52f4192d00..adc6d168dc 100644
--- a/langpacks/french/Untranslated/WhatsApp.txt
+++ b/langpacks/french/Untranslated/WhatsApp.txt
@@ -2,9 +2,9 @@
 [SMS code]

 [Request code]

 [Register code]

-[Use SSL connection (443 port)]

-[Please enter a country-code.]

-[Please enter a phone-number without country code.]

+[Use SSL connection (port 443)]

+[Please enter a country code.]

+[Please enter a phone number without country code.]

 [Please enter a nickname.]

 [is now known as '%s']

 [Last seen on %x at %X]

@@ -12,22 +12,22 @@
 [User '%s' has been added to the group]

 [You have been removed from the group]

 [User '%s' has been removed from the group]

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 [Your password has been set automatically. You can proceed with login now]

 [Please correctly specify your registration code received by SMS]

 [Unable to get Netlib connection for WhatsApp]

-[Network-connection error.]

+[Network connection error.]

 [Registration]

 [Registration failed. Invalid server response.]

 [Registration failed due to stale code. Please request a new code]

 [Registration failed.]

 [Please try again in %i seconds]

 [Registration code has been sent to your phone.]

-[WhatsApp Icon]

-[Add To Group]

-[Create Chat Group]

-[Remove From Chat Group]

-[Leave And Delete Group]

-[Leave Group]

-[Change Group Subject]

-[Create Group]

+[WhatsApp icon]

+[Add to group]

+[Create chat group]

+[Remove from chat group]

+[Leave and delete group]

+[Leave group]

+[Change group subject]

+[Create group]

diff --git a/langpacks/german/Plugins/VKontakte.txt b/langpacks/german/Plugins/VKontakte.txt
index 73d20cc949..8a3024217e 100644
--- a/langpacks/german/Plugins/VKontakte.txt
+++ b/langpacks/german/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@ Erweitert
 Serverseitige Empfangsbestätigungen

 [Hide chats on startup]

 Chats beim Start verbergen

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 Lokale Kontakte, die nicht in Ihrer Freundesliste sind, automatisch löschen

 [Always notify as unread for all incoming message]

 Alle eingehenden Nachrichten immer als ungelesen benachrichtigen

diff --git a/langpacks/german/Plugins/WhatsApp.txt b/langpacks/german/Plugins/WhatsApp.txt
index ebd85e9f39..79214202db 100644
--- a/langpacks/german/Plugins/WhatsApp.txt
+++ b/langpacks/german/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@ SMS-Code:
 Code anfordern

 [Register code]

 Code registrieren

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 SSL-Verbindung verwenden (Port 443)

 [Cancel]

 Abbrechen

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 Bitte geben Sie einen Landescode ein.

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 Bitte geben Sie eine Telefonnummer ohne Landescode ein.

 [Please enter a nickname.]

 Bitte geben Sie einen Nicknamen ein.

@@ -47,7 +47,7 @@ Zuletzt gesehen am %x um %X
 [User '%s' has been removed from the group]

 

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 Eine SMS mit dem Registrierungscode wird an Ihr Mobiltelefon geschickt.\nBeachten Sie, dass Sie das richtige WhatsApp und dieses Plugin nicht gleichzeitig nutzen können.\nFortfahren?

 [Your password has been set automatically. You can proceed with login now]

 

@@ -58,7 +58,7 @@ Bitte geben Sie den korrekten Registrierungscode aus der SMS an.
 %s Serververbindung

 [Unable to get Netlib connection for WhatsApp]

 Konnte keine Netzwerkverbindung für WhatsApp herstellen.

-[Network-connection error.]

+[Network connection error.]

 Netzwerk Verbindungsfehler.

 [Registration]

 

@@ -77,19 +77,19 @@ Netzwerk
 [Account]

 Konto

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 WhatsApp Icon

-[Add To Group]

+[Add to group]

 Zu Gruppe hinzufügen

-[Create Chat Group]

+[Create chat group]

 Gruppenchat erstellen

-[Remove From Chat Group]

+[Remove from chat group]

 Aus Gruppenchat entfernen

-[Leave And Delete Group]

+[Leave and delete group]

 Gruppe verlassen und löschen

-[Leave Group]

+[Leave group]

 Gruppe verlassen

-[Change Group Subject]

+[Change group subject]

 Gruppenthema ändern

-[Create Group]

+[Create group]

 Gruppe erstellen

diff --git a/langpacks/polish/Plugins/VKontakte.txt b/langpacks/polish/Plugins/VKontakte.txt
index 5e210e2197..fe1b69cdc8 100644
--- a/langpacks/polish/Plugins/VKontakte.txt
+++ b/langpacks/polish/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@ Zaawansowane
 Potwierdzenie dostarczenia ze strony serwera

 [Hide chats on startup]

 Ukryj czaty podczas startu

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 Automatycznie czyść lokalne kontakty, których brak na twojej liście znajomych

 [Always notify as unread for all incoming message]

 Zawsze powiadamiaj o nieprzeczytanych wiadomościach dla wszystkich przychodzących

diff --git a/langpacks/polish/Plugins/WhatsApp.txt b/langpacks/polish/Plugins/WhatsApp.txt
index 0ad3b22275..9d9dba2a18 100644
--- a/langpacks/polish/Plugins/WhatsApp.txt
+++ b/langpacks/polish/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@ Kod SMS
 Poproś o kod

 [Register code]

 Zarejestruj kod

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 Używaj połączenia SSL (port 443)

 [Cancel]

 Anuluj

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 Proszę podać numer kierunkowy kraju.

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 Proszę podać numer telefonu bez kierunkowego kraju.

 [Please enter a nickname.]

 Proszę podać nick.

@@ -47,7 +47,7 @@ Zostałeś usunięty z grupy
 [User '%s' has been removed from the group]

 Użytkownik "%s" został usunięty z grupy

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 SMS z kodem weryfikacyjnym zostanie wysłany na twój telefon.\nUwaga: nie możesz używać prawdziwego WhatsApp i tej wtyczki równocześnie.\nKontynuować?

 [Your password has been set automatically. You can proceed with login now]

 Twoje hasło zostało ustawione automatycznie. Możesz teraz przejść do logowania

@@ -58,8 +58,8 @@ Proszę podać poprawny kod weryfikacyjny otrzymany SMSem.
 Połączenie %s

 [Unable to get Netlib connection for WhatsApp]

 Nie udało się uzyskać połączenia Netlib dla WhatsApp

-[Network-connection error.]

-Błąd połączenia sieciowego

+[Network connection error.]

+Błąd połączenia sieciowego.

 [Registration]

 Rejestracja

 [Registration failed. Invalid server response.]

@@ -77,19 +77,19 @@ Protokoły
 [Account]

 Konto

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 Ikona WhatsApp

-[Add To Group]

+[Add to group]

 Dodaj do grupy

-[Create Chat Group]

+[Create chat group]

 Utwórz czat grupowy

-[Remove From Chat Group]

+[Remove from chat group]

 Usuń z czatu grupowego

-[Leave And Delete Group]

+[Leave and delete group]

 Opuść i usuń grupę

-[Leave Group]

+[Leave group]

 Opuść grupę

-[Change Group Subject]

+[Change group subject]

 Zmień temat grupy

-[Create Group]

+[Create group]

 Utwórz grupę

diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index a56bf98d47..a3c23a7f97 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@ E-mail или номер телефона:
 [Hide chats on startup]

 Не открывать окна комнат чата при входе

 [Automatically wipe local contacts missing in your friend list]

-Автоматически очищать локальные контакты, которых нет в списке друзей

+Автоматически удалять локальные контакты, которых нет в списке друзей

 [Always notify as unread for all incoming message]

 Помечать все входящие сообщения как "Непрочитанное"

 [Mark read on reply]

diff --git a/langpacks/slovak/Plugins/VKontakte.txt b/langpacks/slovak/Plugins/VKontakte.txt
index 30a504ebf1..1fdef02ee7 100644
--- a/langpacks/slovak/Plugins/VKontakte.txt
+++ b/langpacks/slovak/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@ Podrobne
 

 [Hide chats on startup]

 

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 

 [Always notify as unread for all incoming message]

 

diff --git a/langpacks/slovak/Plugins/WhatsApp.txt b/langpacks/slovak/Plugins/WhatsApp.txt
index 1d918307be..c91a99f511 100644
--- a/langpacks/slovak/Plugins/WhatsApp.txt
+++ b/langpacks/slovak/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@ Prezívka
 

 [Register code]

 

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 

 [Cancel]

 Storno

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 

 [Please enter a nickname.]

 

@@ -47,7 +47,7 @@ Storno
 [User '%s' has been removed from the group]

 

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 

 [Your password has been set automatically. You can proceed with login now]

 

@@ -58,7 +58,7 @@ Storno
 

 [Unable to get Netlib connection for WhatsApp]

 

-[Network-connection error.]

+[Network connection error.]

 

 [Registration]

 

@@ -77,19 +77,19 @@ Sieť
 [Account]

 

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 

-[Add To Group]

+[Add to group]

 

-[Create Chat Group]

+[Create chat group]

 

-[Remove From Chat Group]

+[Remove from chat group]

 

-[Leave And Delete Group]

+[Leave and delete group]

 

-[Leave Group]

+[Leave group]

 

-[Change Group Subject]

+[Change group subject]

 

-[Create Group]

+[Create group]

 

diff --git a/langpacks/slovak/Untranslated/VKontakte.txt b/langpacks/slovak/Untranslated/VKontakte.txt
index 7f5e8ae084..c0aba4b527 100644
--- a/langpacks/slovak/Untranslated/VKontakte.txt
+++ b/langpacks/slovak/Untranslated/VKontakte.txt
@@ -5,7 +5,7 @@
 [Contact list group:]

 [Server-side delivery confirmation]

 [Hide chats on startup]

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 [Always notify as unread for all incoming message]

 [Mark read on reply]

 [Mark read on typing]

diff --git a/langpacks/slovak/Untranslated/WhatsApp.txt b/langpacks/slovak/Untranslated/WhatsApp.txt
index 68090e20f0..2a3ddd48c4 100644
--- a/langpacks/slovak/Untranslated/WhatsApp.txt
+++ b/langpacks/slovak/Untranslated/WhatsApp.txt
@@ -3,9 +3,9 @@
 [SMS code]

 [Request code]

 [Register code]

-[Use SSL connection (443 port)]

-[Please enter a country-code.]

-[Please enter a phone-number without country code.]

+[Use SSL connection (port 443)]

+[Please enter a country code.]

+[Please enter a phone number without country code.]

 [Please enter a nickname.]

 [Please enter a password.]

 [is now known as '%s']

@@ -14,12 +14,12 @@
 [User '%s' has been added to the group]

 [You have been removed from the group]

 [User '%s' has been removed from the group]

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 [Your password has been set automatically. You can proceed with login now]

 [Please correctly specify your registration code received by SMS]

 [%s server connection]

 [Unable to get Netlib connection for WhatsApp]

-[Network-connection error.]

+[Network connection error.]

 [Registration]

 [Registration failed. Invalid server response.]

 [Registration failed due to stale code. Please request a new code]

@@ -27,11 +27,11 @@
 [Please try again in %i seconds]

 [Registration code has been sent to your phone.]

 [Account]

-[WhatsApp Icon]

-[Add To Group]

-[Create Chat Group]

-[Remove From Chat Group]

-[Leave And Delete Group]

-[Leave Group]

-[Change Group Subject]

-[Create Group]

+[WhatsApp icon]

+[Add to group]

+[Create chat group]

+[Remove from chat group]

+[Leave and delete group]

+[Leave group]

+[Change group subject]

+[Create group]

diff --git a/langpacks/spanish/Plugins/VKontakte.txt b/langpacks/spanish/Plugins/VKontakte.txt
index 4fe6bcfabf..0894fc00bd 100644
--- a/langpacks/spanish/Plugins/VKontakte.txt
+++ b/langpacks/spanish/Plugins/VKontakte.txt
@@ -26,7 +26,7 @@ Avanzado
 

 [Hide chats on startup]

 

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 

 [Always notify as unread for all incoming message]

 

diff --git a/langpacks/spanish/Plugins/WhatsApp.txt b/langpacks/spanish/Plugins/WhatsApp.txt
index ef876230fe..96b76f92c1 100644
--- a/langpacks/spanish/Plugins/WhatsApp.txt
+++ b/langpacks/spanish/Plugins/WhatsApp.txt
@@ -20,14 +20,14 @@ Apodo
 

 [Register code]

 

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 

 [Cancel]

 Cancelar

 ;file \protocols\WhatsApp\src\connection.cpp

-[Please enter a country-code.]

+[Please enter a country code.]

 

-[Please enter a phone-number without country code.]

+[Please enter a phone number without country code.]

 

 [Please enter a nickname.]

 

@@ -47,7 +47,7 @@ Por favor, introduzca una contraseña.
 [User '%s' has been removed from the group]

 

 ;file \protocols\WhatsApp\src\dialogs.cpp

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 

 [Your password has been set automatically. You can proceed with login now]

 

@@ -58,7 +58,7 @@ Por favor, introduzca una contraseña.
 %s conexión al servidor

 [Unable to get Netlib connection for WhatsApp]

 

-[Network-connection error.]

+[Network connection error.]

 

 [Registration]

 

@@ -77,19 +77,19 @@ Red
 [Account]

 Cuenta

 ;file \protocols\WhatsApp\src\theme.cpp

-[WhatsApp Icon]

+[WhatsApp icon]

 

-[Add To Group]

+[Add to group]

 

-[Create Chat Group]

+[Create chat group]

 

-[Remove From Chat Group]

+[Remove from chat group]

 

-[Leave And Delete Group]

+[Leave and delete group]

 

-[Leave Group]

+[Leave group]

 

-[Change Group Subject]

+[Change group subject]

 

-[Create Group]

+[Create group]

 

diff --git a/langpacks/spanish/Untranslated/VKontakte.txt b/langpacks/spanish/Untranslated/VKontakte.txt
index 33fcdffc13..9bbd76a3d6 100644
--- a/langpacks/spanish/Untranslated/VKontakte.txt
+++ b/langpacks/spanish/Untranslated/VKontakte.txt
@@ -3,7 +3,7 @@
 [Contact list group:]

 [Server-side delivery confirmation]

 [Hide chats on startup]

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 [Always notify as unread for all incoming message]

 [Mark read on reply]

 [Mark read on typing]

diff --git a/langpacks/spanish/Untranslated/WhatsApp.txt b/langpacks/spanish/Untranslated/WhatsApp.txt
index 2813c16dab..c09d7e7c2d 100644
--- a/langpacks/spanish/Untranslated/WhatsApp.txt
+++ b/langpacks/spanish/Untranslated/WhatsApp.txt
@@ -4,9 +4,9 @@
 [SMS code]

 [Request code]

 [Register code]

-[Use SSL connection (443 port)]

-[Please enter a country-code.]

-[Please enter a phone-number without country code.]

+[Use SSL connection (port 443)]

+[Please enter a country code.]

+[Please enter a phone number without country code.]

 [Please enter a nickname.]

 [is now known as '%s']

 [Last seen on %x at %X]

@@ -14,22 +14,22 @@
 [User '%s' has been added to the group]

 [You have been removed from the group]

 [User '%s' has been removed from the group]

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 [Your password has been set automatically. You can proceed with login now]

 [Please correctly specify your registration code received by SMS]

 [Unable to get Netlib connection for WhatsApp]

-[Network-connection error.]

+[Network connection error.]

 [Registration]

 [Registration failed. Invalid server response.]

 [Registration failed due to stale code. Please request a new code]

 [Registration failed.]

 [Please try again in %i seconds]

 [Registration code has been sent to your phone.]

-[WhatsApp Icon]

-[Add To Group]

-[Create Chat Group]

-[Remove From Chat Group]

-[Leave And Delete Group]

-[Leave Group]

-[Change Group Subject]

-[Create Group]

+[WhatsApp icon]

+[Add to group]

+[Create chat group]

+[Remove from chat group]

+[Leave and delete group]

+[Leave group]

+[Change group subject]

+[Create group]

diff --git a/langpacks/ukrainian/Plugins/CmdLine.txt b/langpacks/ukrainian/Plugins/CmdLine.txt
index 64c9383dad..7a6aec9993 100644
--- a/langpacks/ukrainian/Plugins/CmdLine.txt
+++ b/langpacks/ukrainian/Plugins/CmdLine.txt
@@ -42,7 +42,7 @@ Miranda була закрита або сталася помилка при оч
 [Hides or shows the contact list window.\nUsage: clist (show | hide | toggle).\nThe command will either show or hide the contact list window.]

 Ховає або показує вiкно списку контактiв.\nВикористання: clist (show | hide | toggle)*\nКоманда або показує, або ховає вiкно списку контактiв.\n*show - показати\n*hide - сховати\n*toggle - перемкнути стан.

 [Closes Miranda.\nUsage: quit [wait].\nIf wait is used then the command will return only when CmdLine plugin has been unloaded by Miranda.]

-Закриває Miranda.\nВикористання: quit [wait].\nЯкщо [wait] вказано, повернення в консоль вiдбудеться тiльки пiсля того, як плагiн CmdLine буде вивантажений з Miranda.

+Закриває Miranda.\nВикористання: quit [wait].\nЯкщо wait вказано, повернення в консоль вiдбудеться тiльки пiсля того, як плагiн CmdLine буде вивантажений з Miranda.

 [Provides help on other commands.\nUsage: help [<command>].\nThe command will print help information for other commands. If run without any parameters it will print available commands.]

 Вiдображає допомогу по iншим командам.\nВикористання: help [<команда>].\nКоманда вiдобразить на екранi довiдкову iнформацiю по iншiй командi. При запуску без параметрiв вiдображає список доступних команд.

 [Notifies Exchange plugin to check for email.\nUsage: exchange check.]

diff --git a/langpacks/ukrainian/Plugins/VKontakte.txt b/langpacks/ukrainian/Plugins/VKontakte.txt
index 0fdfaa1a29..db9d2150b9 100644
--- a/langpacks/ukrainian/Plugins/VKontakte.txt
+++ b/langpacks/ukrainian/Plugins/VKontakte.txt
@@ -25,7 +25,7 @@
 Підтвердження доставки зі сторони серверу

 [Hide chats on startup]

 Не відкривати вікна чатів при старті

-[Automatically wipe local contacts missing in your Friends list]

+[Automatically wipe local contacts missing in your friend list]

 Автоматично видаляти локальні контакти, яких немає в списку друзів

 [Always notify as unread for all incoming message]

 Позначати всі вхідні повідомлення непрочитаними

diff --git a/langpacks/ukrainian/Plugins/WhatsApp.txt b/langpacks/ukrainian/Plugins/WhatsApp.txt
index e98207813a..9148c7c3df 100644
--- a/langpacks/ukrainian/Plugins/WhatsApp.txt
+++ b/langpacks/ukrainian/Plugins/WhatsApp.txt
@@ -19,14 +19,14 @@ SMS-код
 Запросити код

 [Register code]

 Реєструвати код

-[Use SSL connection (443 port)]

+[Use SSL connection (port 443)]

 Підключення по SSL (порт 443)

 [Cancel]

 Скасувати

-[Please enter a country-code.]

-Введіть код країни

-[Please enter a phone-number without country code.]

-Введіть номер телефону без коду країни

+[Please enter a country code.]

+Введіть код країни.

+[Please enter a phone number without country code.]

+Введіть номер телефону без коду країни.

 [Please enter a nickname.]

 Введіть нік

 [Please enter a password.]

@@ -43,7 +43,7 @@ SMS-код
 Вас видалили з групи

 [User '%s' has been removed from the group]

 Користувача %s видалили з групи

-[An SMS with registration-code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

+[An SMS with registration code will be sent to your mobile phone.\nNotice that you are not able to use the real WhatsApp and this plugin simultaneously!\nContinue?]

 SMS-повідомлення з реєстраційним кодом буде відправлено на ваш мобільний телефон.\nНагадуємо, що ви не зможете використовувати справжній WhatsApp і цей плагін одночасно!\nПродовжити?

 [Your password has been set automatically. You can proceed with login now]

 Ваш пароль встановлений автоматично, можете підключитися до протоколу.

@@ -53,7 +53,7 @@ SMS-повідомлення з реєстраційним кодом буде �
 З'єднання з сервером %s

 [Unable to get Netlib connection for WhatsApp]

 Не вдається встановити з'єднання для WhatsApp

-[Network-connection error.]

+[Network connection error.]

 Помилка з'єднання.

 [Registration]

 Реєстрація

@@ -71,19 +71,19 @@ SMS-повідомлення з реєстраційним кодом буде �
 Мережа

 [Account]

 Обліковий запис

-[WhatsApp Icon]

+[WhatsApp icon]

 Значок протоколу

-[Add To Group]

+[Add to group]

 Додати у групу

-[Create Chat Group]

+[Create chat group]

 Створити чат-групу

-[Remove From Chat Group]

+[Remove from chat group]

 Видалити з чат-групи

-[Leave And Delete Group]

+[Leave and delete group]

 Покинути та видалити групу

-[Leave Group]

+[Leave group]

 Покинути групу

-[Change Group Subject]

+[Change group subject]

 Змінити тему групи

-[Create Group]

+[Create group]

 Створити групу

diff --git a/langpacks/ukrainian/Untranslated/=CORE=.txt b/langpacks/ukrainian/Untranslated/=CORE=.txt
index 26813a1f2b..0945745b2d 100644
--- a/langpacks/ukrainian/Untranslated/=CORE=.txt
+++ b/langpacks/ukrainian/Untranslated/=CORE=.txt
@@ -1,6 +1,5 @@
 [OutputDebugString()]

 [Wikipedia]

-[Ctrl+Search add contact]

 [ID]

 [Ctrl + ]

 [Alt + ]

diff --git a/langpacks/ukrainian/Untranslated/VKontakte.txt b/langpacks/ukrainian/Untranslated/VKontakte.txt
deleted file mode 100644
index 25fbb3f627..0000000000
--- a/langpacks/ukrainian/Untranslated/VKontakte.txt
+++ /dev/null
@@ -1,14 +0,0 @@
-[Add as friend]

-[Delete from friend list]

-[Errors]

-[User added as friend]

-[You cannot add yourself as friend]

-[Cannot add this user to friends as they have put you on their blacklist]

-[Cannot add this user to friends as you put him on blacklist]

-[History import is complete]

-[History import]

-[Please authorize me to add you to my friend list.]

-[Are you sure to delete %s from your friend list?]

-[User was deleted from your friend list]

-[Friend request from the user declined]

-[Friend request suggestion for the user deleted]