7 files changed, 25 insertions, 16 deletions
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 9f3ec8082b..f771aa1595 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -29,9 +29,10 @@
 [Created by:]
 [Backup in progress]
 [Copying database file...]
+[Uploading to Dropbox failed]
+[Error]
 [Database backed up]
 [Database back up in process...]
-[Error]
 ;file \plugins\Db_autobackups\src\main.cpp
 [Miranda NG databases]
 [Compressed Miranda NG databases]
diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index 7172f94363..ca09096b76 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -20,18 +20,20 @@
 [Autosend download link to contact]
 [Paste download link into message input area]
 [Copy download link to clipboard]
-[Here you can choose the protocols in which dropbox will be used instead of regular file transfers (sending), used by this protocol.]
+[Here you can choose the protocols in which Dropbox will be used instead of regular file transfers (sending), used by this protocol.]
 ;file \plugins\Dropbox\src\dropbox.cpp
 [in process...]
 [server does not respond]
 [you have been authorized]
 ;file \plugins\Dropbox\src\dropbox_commands.cpp
 [Dropbox supports the following commands:]
-[shows all files in folder "path" ("path" is relative from root folder)]
+[shows all files in folder "path" ("path" is relative from root and can be omitted for root folder)]
 [returns download link for file or folder with specified path ("path" is relative from root folder)]
+[searches for file or folder matched by query ("query" is split on spaces into multiple tokens)]
 [deletes file or folder with specified path ("path" is relative from root folder)]
 ["%s" command has invalid parameter.\nUse "/help" for more info.]
 [is empty]
+[is not found]
 [is deleted]
 ;file \plugins\Dropbox\src\dropbox_events.cpp
 [Upload files to Dropbox]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index d54760a520..15a75ecf61 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Import.dll
 ;  Plugin: Import contacts and messages
-;  Version: 0.95.4.2
+;  Version: 0.95.4.3
 ;  Authors: Miranda team
 ;============================================================
 [Imports contacts and messages from another Miranda profile or from an external program.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 2268a2c59a..00c9eea452 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -768,6 +768,7 @@
 [Google Talk!]
 [LiveJournal Talk]
 [Odnoklassniki]
+[Yandex]
 [Some changes will take effect the next time you connect to the Jabber network.]
 ;file \protocols\JabberG\src\jabber_password.cpp
 [Set New Password for %s@%S]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 851457d6a6..0163759c89 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.2.3.18
+;  Version: 0.2.4.1
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
@@ -45,13 +45,12 @@
 [Background color]
 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]
 ;file \plugins\SmileyAdd\src\options.cpp
-[Smileys]
-[Customize]
 [Off]
-[Top]
-[Bottom]
+[On]
 [Smiley packs]
 [All files]
+[Smileys]
+[Customize]
 ;file \plugins\SmileyAdd\src\services.cpp
 [Protocol specific]
 ;file \plugins\SmileyAdd\src\smileys.cpp
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 35d0d05ad2..f4bdbd258c 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -555,16 +555,16 @@
 ;file \plugins\UserInfoEx\src\svc_email.cpp
 [Send e-mail]
 [Memory allocation error!]
-[E-mail (uinfoex)]
+[E-mail (UInfoEx)]
 ;file \plugins\UserInfoEx\src\svc_gender.cpp
-[Gender (uinfoex)]
+[Gender (UInfoEx)]
 ;file \plugins\UserInfoEx\src\svc_homepage.cpp
 [User has no valid homepage]
 [View Homepage]
 [&Homepage]
-[Homepage (uinfoex)]
+[Homepage (UInfoEx)]
 ;file \plugins\UserInfoEx\src\svc_phone.cpp
-[Phone (uinfoex)]
+[Phone (UInfoEx)]
 ;file \plugins\UserInfoEx\src\svc_refreshci.cpp
 [[b]%s (%S)...[/b]\n%d Contacts remaining]
 [Abort Refreshing Contact Details]
@@ -591,7 +591,7 @@
 [Birthday reminder]
 [Birthday reminder: it's coming]
 [Anniversary Reminder]
-[Reminder (uinfoex)]
+[Reminder (UInfoEx)]
 ;file \plugins\UserInfoEx\src\ex_import\classExImContactBase.cpp
 [contact identification]
 [The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?]
@@ -639,5 +639,5 @@
 [added contacts: %u / %u\nadded settings: %u / %u\nadded events %u / %u\nduplicated events: %u]
 [FATAL: An exception was thrown while importing contacts from xmlCard!]
 ;file \plugins\UserInfoEx\src\Flags\svc_flags.cpp
-[Flags (uinfoex)]
+[Flags (UInfoEx)]
 ;file \plugins\UserInfoEx\src\Flags\svc_flagsicons.cpp
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 1a6a5acd8e..ac4fa6fdd3 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.1.22
+;  Version: 0.1.1.23
 ;  Authors: Miranda NG Team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
@@ -214,6 +214,11 @@
 ;file \protocols\VKontakte\src\vk_history.cpp
 [Are you sure to reload all messages from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a long time.\nDo you want to continue?]
 [Attention!]
+[Are you sure you want to reload all messages for all contacts from vk.com?\nLocal contact history will be deleted and reloaded from the server.\nIt may take a very long time and/or corrupt Miranda database.\nWe recommend check your database before reloading messages and after it (Miranda32.exe /svc:dbchecker or Miranda64.exe /svc:dbchecker).\nDo you want to continue?]
+[Error loading message history from server]
+[Loading messages for all contacts is completed]
+[Loading history]
+[Loading messages for %s is completed]
 ;file \protocols\VKontakte\src\vk_options.cpp
 [I'm back]
 [Network]
@@ -227,6 +232,7 @@
 [Status message]
 [Send message to my wall]
 [Load news from VK]
+[Load history for all contacts from VK]
 [Wipe contacts missing in friend list]
 [Mark messages as read]
 [Send message to user\'s wall]