13 files changed, 58 insertions, 32 deletions
diff --git a/langpacks/serbian/Plugins/Db_autobackups.txt b/langpacks/serbian/Plugins/Db_autobackups.txt
index 08e01bbd53..d5020cde1d 100644
--- a/langpacks/serbian/Plugins/Db_autobackups.txt
+++ b/langpacks/serbian/Plugins/Db_autobackups.txt
@@ -51,12 +51,14 @@ Otkazivanje
 
 [Copying database file...]
 
+[Uploading to Dropbox failed]
+
+[Error]
+Greška
 [Database backed up]
 
 [Database back up in process...]
 
-[Error]
-Greška
 ;file \plugins\Db_autobackups\src\main.cpp
 [Miranda NG databases]
 
diff --git a/langpacks/serbian/Plugins/Dropbox.txt b/langpacks/serbian/Plugins/Dropbox.txt
index c03cc4081d..6c1e387b48 100644
--- a/langpacks/serbian/Plugins/Dropbox.txt
+++ b/langpacks/serbian/Plugins/Dropbox.txt
@@ -34,7 +34,7 @@
 
 [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...]
@@ -46,16 +46,20 @@
 ;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
diff --git a/langpacks/serbian/Plugins/Import.txt b/langpacks/serbian/Plugins/Import.txt
index 7c86cee6e9..bf33893cf7 100644
--- a/langpacks/serbian/Plugins/Import.txt
+++ b/langpacks/serbian/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/serbian/Plugins/Jabber.txt b/langpacks/serbian/Plugins/Jabber.txt
index 6b68886c83..9a5c285706 100644
--- a/langpacks/serbian/Plugins/Jabber.txt
+++ b/langpacks/serbian/Plugins/Jabber.txt
@@ -1508,6 +1508,8 @@ Napredno
 
 [Odnoklassniki]
 
+[Yandex]
+
 [Some changes will take effect the next time you connect to the Jabber network.]
 
 ;file \protocols\JabberG\src\jabber_password.cpp
diff --git a/langpacks/serbian/Plugins/SmileyAdd.txt b/langpacks/serbian/Plugins/SmileyAdd.txt
index 70fd6a008c..790b4351b1 100644
--- a/langpacks/serbian/Plugins/SmileyAdd.txt
+++ b/langpacks/serbian/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.]
@@ -80,20 +80,18 @@ Boja pozadine
 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]
 
 ;file \plugins\SmileyAdd\src\options.cpp
-[Smileys]
-
-[Customize]
-Podešavanja
 [Off]
 Isklj.
-[Top]
-
-[Bottom]
-
+[On]
+Uklj.
 [Smiley packs]
 
 [All files]
 Sve datoteke
+[Smileys]
+
+[Customize]
+Podešavanja
 ;file \plugins\SmileyAdd\src\services.cpp
 [Protocol specific]
 
diff --git a/langpacks/serbian/Plugins/UInfoEx.txt b/langpacks/serbian/Plugins/UInfoEx.txt
index 91e4b7fcea..d1132f15b0 100644
--- a/langpacks/serbian/Plugins/UInfoEx.txt
+++ b/langpacks/serbian/Plugins/UInfoEx.txt
@@ -1083,10 +1083,10 @@ Balončići
 Slanje e-maila
 [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]
@@ -1095,10 +1095,10 @@ Slanje e-maila
 
 [&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]
@@ -1150,7 +1150,7 @@ Slanje e-maila
 
 [Anniversary Reminder]
 
-[Reminder (uinfoex)]
+[Reminder (UInfoEx)]
 
 ;file \plugins\UserInfoEx\src\ex_import\classExImContactBase.cpp
 [contact identification]
@@ -1238,6 +1238,6 @@ Dovršene
 [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/serbian/Plugins/VKontakte.txt b/langpacks/serbian/Plugins/VKontakte.txt
index 369a52020b..c95d037e16 100644
--- a/langpacks/serbian/Plugins/VKontakte.txt
+++ b/langpacks/serbian/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.]
@@ -416,6 +416,16 @@ Upozorenje
 
 [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]
 
@@ -440,6 +450,8 @@ Mreža
 
 [Load news from VK]
 
+[Load history for all contacts from VK]
+
 [Wipe contacts missing in friend list]
 
 [Mark messages as read]
diff --git a/langpacks/serbian/Untranslated/Db_autobackups.txt b/langpacks/serbian/Untranslated/Db_autobackups.txt
index df269fa727..f393837517 100644
--- a/langpacks/serbian/Untranslated/Db_autobackups.txt
+++ b/langpacks/serbian/Untranslated/Db_autobackups.txt
@@ -19,6 +19,7 @@
 [Created by:]
 [Backup in progress]
 [Copying database file...]
+[Uploading to Dropbox failed]
 [Database backed up]
 [Database back up in process...]
 [Miranda NG databases]
diff --git a/langpacks/serbian/Untranslated/Dropbox.txt b/langpacks/serbian/Untranslated/Dropbox.txt
index f675b4e760..0dbce01e74 100644
--- a/langpacks/serbian/Untranslated/Dropbox.txt
+++ b/langpacks/serbian/Untranslated/Dropbox.txt
@@ -12,16 +12,18 @@
 [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.]
 [in process...]
 [server does not respond]
 [you have been authorized]
 [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]
 [Upload files to Dropbox]
 [Protocol icon]
diff --git a/langpacks/serbian/Untranslated/Jabber.txt b/langpacks/serbian/Untranslated/Jabber.txt
index f6576e405b..7b837b489e 100644
--- a/langpacks/serbian/Untranslated/Jabber.txt
+++ b/langpacks/serbian/Untranslated/Jabber.txt
@@ -682,6 +682,7 @@
 [Google Talk!]
 [LiveJournal Talk]
 [Odnoklassniki]
+[Yandex]
 [Some changes will take effect the next time you connect to the Jabber network.]
 [Set New Password for %s@%S]
 [New password does not match.]
diff --git a/langpacks/serbian/Untranslated/SmileyAdd.txt b/langpacks/serbian/Untranslated/SmileyAdd.txt
index 3ca98e2f4c..f6d23828d2 100644
--- a/langpacks/serbian/Untranslated/SmileyAdd.txt
+++ b/langpacks/serbian/Untranslated/SmileyAdd.txt
@@ -30,10 +30,8 @@
 [Button smiley]
 [Assign smiley category]
 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]
-[Smileys]
-[Top]
-[Bottom]
 [Smiley packs]
+[Smileys]
 [Protocol specific]
 [Smiley pack %s for category "%s" not found.\nSelect correct smiley pack in the Options -> Customize -> Smileys.]
 [There were problems loading smiley pack (it should be corrected).\nSee network log for details.]
diff --git a/langpacks/serbian/Untranslated/UInfoEx.txt b/langpacks/serbian/Untranslated/UInfoEx.txt
index b6514ce0c4..fc228f977a 100644
--- a/langpacks/serbian/Untranslated/UInfoEx.txt
+++ b/langpacks/serbian/Untranslated/UInfoEx.txt
@@ -459,13 +459,13 @@
 [jun.]
 [sen.]
 [Memory allocation error!]
-[E-mail (uinfoex)]
-[Gender (uinfoex)]
+[E-mail (UInfoEx)]
+[Gender (UInfoEx)]
 [User has no valid homepage]
 [View Homepage]
 [&Homepage]
-[Homepage (uinfoex)]
-[Phone (uinfoex)]
+[Homepage (UInfoEx)]
+[Phone (UInfoEx)]
 [[b]%s (%S)...[/b]\n%d Contacts remaining]
 [Abort Refreshing Contact Details]
 [Do you want to cancel the current refresh procedure?]
@@ -490,7 +490,7 @@
 [Birthday reminder]
 [Birthday reminder: it's coming]
 [Anniversary Reminder]
-[Reminder (uinfoex)]
+[Reminder (UInfoEx)]
 [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?]
 [Importing a new contact was aborted!]
@@ -529,4 +529,4 @@
 [Import took %f ms]
 [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!]
-[Flags (uinfoex)]
+[Flags (UInfoEx)]
diff --git a/langpacks/serbian/Untranslated/VKontakte.txt b/langpacks/serbian/Untranslated/VKontakte.txt
index 5fd420a25b..2aeb5423a5 100644
--- a/langpacks/serbian/Untranslated/VKontakte.txt
+++ b/langpacks/serbian/Untranslated/VKontakte.txt
@@ -187,6 +187,11 @@
 [Unknown error occurred]
 [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]
 [I'm back]
 [Account]
 [News and notifications]
@@ -197,6 +202,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]