8 files changed, 130 insertions, 213 deletions
diff --git a/langpacks/serbian/=CORE=.txt b/langpacks/serbian/=CORE=.txt
index e5b49a359a..94fc527a14 100644
--- a/langpacks/serbian/=CORE=.txt
+++ b/langpacks/serbian/=CORE=.txt
@@ -2567,8 +2567,7 @@ Izmenjeno
 Moji profili
 [New profile]
 Napravi profil
-;file \src\mir_app\src\protocolorder.cpp
-;file \src\mir_app\src\protoopts.cpp
+;file \src\mir_app\src\proto_opts.cpp
 [WARNING! The account is going to be deleted. It means that all its settings, contacts and histories will be also erased.\n\nAre you absolutely sure?]
 UPOZORENJE! Nalog će biti izbrisan. Sva podešavanja, kontakti i istorije razgovora će nestati.\n\nPotpuno ste sigurni?
 [Your account was successfully upgraded. To activate it, restart of Miranda is needed.\n\nIf you want to restart Miranda now, press Yes, if you want to upgrade another account, press No]
@@ -2619,6 +2618,10 @@ Nalog %s je obrisan.
 Za brisanje naloga potrebno je isključiti plug-in
 [&Accounts...]
 &Nalozi...
+;file \src\mir_app\src\proto_order.cpp
+;file \src\mir_app\src\proto_ui.cpp
+[Account]
+
 ;file \src\mir_app\src\searchresults.cpp
 [Could not start a search on '%s', there was a problem - is %s connected?]
 Pretraga '%s' bez uspeha, primećen problem - da li je %s na vezi?
@@ -3237,6 +3240,3 @@ JPEG slike
 GIF slike
 [PNG bitmaps]
 PNG slike
-;file \src\mir_core\src\ui_utils.cpp
-[Account]
-
diff --git a/langpacks/serbian/Plugins/DbEditorPP.txt b/langpacks/serbian/Plugins/DbEditorPP.txt
index 084e87eab6..e5bd54bb53 100644
--- a/langpacks/serbian/Plugins/DbEditorPP.txt
+++ b/langpacks/serbian/Plugins/DbEditorPP.txt
@@ -2,42 +2,36 @@
 ;============================================================
 ;  File: DbEditorPP.dll
 ;  Plugin: Database editor++
-;  Version: 3.2.0.2
+;  Version: 4.0.0.0
 ;  Authors: Bio, Jonathan Gordon
 ;============================================================
 [Advanced Database Editor.]
 
 ;file \plugins\DbEditorPP\res\resource.rc
-[Database Editor++ search and replace]
+[Search and replace]
 
 [Search for]
 
-[Text:]
-
-[In:]
-
-[Case sensitive]
+[Exact match]
 
+[&Search]
+&Pretraga
 [Module name]
 
-[Exact match]
-
 [Setting name]
 
 [Setting value]
 
-[&Search]
-&Pretraga
+[Case sensitive]
+
+[&Cancel]
+&Otkazivanje
 [Replace with]
 
 [Entirely]
 
-[Found field]
-
 [&Replace]
 
-[&Cancel]
-&Otkazivanje
 [Restore last opened position]
 
 [Automatically expand "Settings" when Database Editor++ starts]
@@ -60,9 +54,9 @@ Boja pozadine
 Otkazivanje
 [Edit setting]
 
-[Value name:]
-
-[Value data:]
+[Name]
+Naziv
+[Value]
 
 [Base]
 
@@ -88,13 +82,9 @@ Otkazivanje
 
 [Copy to all contacts (including Settings)]
 
-[Import module/settings]
-
-[Paste the settings to import here.]
-
 [Import]
 
-[Insert &CR/LF]
+[Paste the settings to import here:]
 
 [Database Editor++]
 
@@ -110,6 +100,8 @@ Otkazivanje
 
 [&Search and replace]
 
+[&Fix resident settings]
+
 [&Delete module]
 
 [&Watches]
@@ -148,13 +140,19 @@ Otkazivanje
 
 [Edit &Dwords in Hex]
 
+[&Inline edit]
+
 [&Restore position]
 
 [&Open options]
 
-[&Edit/rename]
-
-[New]
+[&Edit]
+&Izmeni
+[&Copy]
+&Kopiranje
+[&Delete]
+&Brisanje
+[Convert to]
 
 [&Byte]
 
@@ -166,30 +164,22 @@ Otkazivanje
 
 [&Unicode]
 
-[BL&OB]
-
-[&Convert to]
-
-[Encyption]
-
-[View decrypted string]
-
-[View encrypted string]
-
-[Decrypt string]
+[New]
 
-[Encrypt string]
+[BL&OB]
 
 [&Watch]
 
-[&Delete]
-&Brisanje
+[&Refresh]
+
 [&Rename]
 &Promeni naziv
 [Copy to contact]
 
 [Export module]
 
+[&Add module]
+
 [&Clone]
 
 [Export contact]
@@ -200,8 +190,6 @@ Otkazivanje
 
 [From pasted text]
 
-[&Add module]
-
 [Export settings]
 
 [Export contacts]
@@ -214,43 +202,12 @@ Otkazivanje
 
 [Reload watch list]
 
-;file \plugins\DbEditorPP\src\addeditsettingsdlg.cpp
-[Cannot Convert!]
-
-[New BYTE value]
-
-[Edit BYTE value]
-
-[New WORD value]
-
-[Edit WORD value]
-
-[New DWORD value]
-
-[Edit DWORD value]
-
-[New STRING value]
-
-[Edit STRING value]
-
-[New UNICODE value]
-
-[Edit UNICODE value]
-
-[New BLOB value]
-
-[Edit BLOB value]
-
-[Couldn't allocate enough memory!]
-
 ;file \plugins\DbEditorPP\src\copymodule.cpp
-[Settings]
+[Copy module "%s"]
 
 ;file \plugins\DbEditorPP\src\deletemodule.cpp
 [Are you sure you want to delete module "%s"?]
 
-[Confirm module deletion]
-
 [Delete module from database]
 
 [Delete module from database... Loading]
@@ -264,47 +221,43 @@ Otkazivanje
 Sve datoteke
 [Export to file]
 
-[Error loading module list]
-
 [Couldn't open file for writing]
 
+[Import to "%s"]
+
 [Import from files]
 
 ;file \plugins\DbEditorPP\src\findwindow.cpp
+[Result]
+
+[Contact]
+Kontakt
+[Module]
+
+[Setting]
+
 [Enter a string to search the database for]
 
 [Stop]
 
-[Replaced with]
+[Replaced]
 
 [Deleted]
 
 [Found]
 
-[%s Module "%s" in contact "%s"]
-
-[%s Setting "%s" in module "%s" in contact "%s" - "%s"]
-
-[%s Setting "%s" in module "%s" in contact "%s"]
-
-[%s "%s" in Setting "%s" in module "%s" in contact "%s"]
-
 [Searching...]
 
-[Error Loading Setting List]
-
-[Finished. %d items were found, %d items were deleted.]
-
-[Finished. %d items were found, %d items were replaced.]
-
-[Finished. %d items were found.]
+[Finished. Items found: %d / replaced: %d / deleted: %d]
 
 ;file \plugins\DbEditorPP\src\icons.cpp
 [Main icon]
 
-[Closed known module]
+[Closed module]
 
-[Open known module]
+[Open module]
+
+[Settings]
 
 [Contacts group]
 
@@ -314,6 +267,8 @@ Sve datoteke
 
 [Open user tree]
 
+[Empty setting]
+
 [BLOB setting]
 
 [Byte setting]
@@ -333,73 +288,57 @@ Koristeći
 
 [Open user tree in DBE++]
 
+[<UNKNOWN>]
+<NEPOZNATO>
+[[UNLOADED]]
+
 ;file \plugins\DbEditorPP\src\main_window.cpp
 [Are you sure you want to delete contact "%s"?]
 
-[Confirm contact delete]
+[Fix resident setting deleting them from DB ?]
+
+[Deleted orphaned items: %d]
+
+;file \plugins\DbEditorPP\src\modsettingenum.cpp
+[Error loading module list]
+
+[Error loading setting list]
 
-;file \plugins\DbEditorPP\src\modules.cpp
 ;file \plugins\DbEditorPP\src\moduletree.cpp
 [Loading contacts...]
 
 [Loading modules...]
 
-[Module tree not found]
-
 [Contacts]
 Kontakti
-[HANDLE]
-Koristeći
-[Add module to contact "%s"]
-
 ;file \plugins\DbEditorPP\src\options.cpp
 [Database]
 
-;file \plugins\DbEditorPP\src\settinglist.cpp
-[Name]
-Naziv
-[Data]
+;file \plugins\DbEditorPP\src\renamemodule.cpp
+[Add module to "%s"]
 
+;file \plugins\DbEditorPP\src\settinglist.cpp
 [Type]
 
 [Size]
 Veličina
-[*** encrypted ***]
+[Unable to store value in this data type!]
 
-[UNICODE]
+[Are you sure you want to delete setting(s): %d?]
 
-[BLOB]
-
-[BYTE]
-
-[WORD]
-
-[DWORD]
+[*** encrypted ***]
 
-[STRING]
+[*** buggy resident ***]
 
-[<unsupported>]
+;file \plugins\DbEditorPP\src\settingsdlg.cpp
+[Unknown DBVariant type!]
 
-[<unknown>]
-<nepoznato>
-[Decoded string..]
+[Edit setting (%s)]
 
-[Encoded string..]
+[New setting (%s)]
 
 ;file \plugins\DbEditorPP\src\watchedvars.cpp
-[Contact]
-Kontakt
-[Module]
-
-[Setting]
-
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (BYTE) %d]
-
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (WORD) %d]
-
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (DWORD) 0x%X]
-
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: "%s"]
+[*** resident ***]
 
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value (UTF8): "%s"]
+[Database Setting Changed: \nModule: "%s", Setting: "%s"\nNew Value (%s): "%s"]
 
diff --git a/langpacks/serbian/Plugins/MirLua.txt b/langpacks/serbian/Plugins/MirLua.txt
index 2de5ff8f15..6b9d0e1068 100644
--- a/langpacks/serbian/Plugins/MirLua.txt
+++ b/langpacks/serbian/Plugins/MirLua.txt
@@ -7,6 +7,9 @@
 ;============================================================
 [Allow you to extend Miranda NG functionality with lua scripts.]
 
+;file \plugins\MirLua\res\resource.rc
+[Reload]
+
 ;file \plugins\MirLua\src\main.cpp
 [Customize]
 Podešavanja
diff --git a/langpacks/serbian/Plugins/SkypeWeb.txt b/langpacks/serbian/Plugins/SkypeWeb.txt
index 9e3c28c52a..221f8459bb 100644
--- a/langpacks/serbian/Plugins/SkypeWeb.txt
+++ b/langpacks/serbian/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SkypeWeb.dll
 ;  Plugin: Skype protocol (Web)
-;  Version: 0.12.1.1
+;  Version: 0.12.1.2
 ;  Authors: Miranda NG Team
 ;============================================================
 [Skype protocol support for Miranda NG. Based on new Skype for Web.]
diff --git a/langpacks/serbian/Plugins/VKontakte.txt b/langpacks/serbian/Plugins/VKontakte.txt
index c608c0893e..a40b40035e 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.5
+;  Version: 0.1.1.7
 ;  Authors: Miranda NG Team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
@@ -32,6 +32,8 @@ Ostalo
 
 [Process stickers as smileys]
 
+[Shorten links for audio attachments]
+
 [News and event notifications]
 
 [WARNING: Causes excessive network traffic!!!]
@@ -303,6 +305,8 @@ Link
 
 [invite user]
 
+[returned to chat]
+
 [change chat title to]
 
 [chat action not supported]
@@ -329,6 +333,8 @@ Upozorenje
 
 [&User details]
 
+[Visit profile]
+
 [&Kick]
 
 ;file \protocols\VKontakte\src\vk_feed.cpp
@@ -390,8 +396,6 @@ Mreža
 
 [Load news from VK]
 
-[Visit profile]
-
 [Send message to user\'s wall]
 
 [Add as friend]
diff --git a/langpacks/serbian/Untranslated/DbEditorPP.txt b/langpacks/serbian/Untranslated/DbEditorPP.txt
index 28ec819ae5..346820c335 100644
--- a/langpacks/serbian/Untranslated/DbEditorPP.txt
+++ b/langpacks/serbian/Untranslated/DbEditorPP.txt
@@ -1,16 +1,13 @@
 [Advanced Database Editor.]
-[Database Editor++ search and replace]
+[Search and replace]
 [Search for]
-[Text:]
-[In:]
-[Case sensitive]
-[Module name]
 [Exact match]
+[Module name]
 [Setting name]
 [Setting value]
+[Case sensitive]
 [Replace with]
 [Entirely]
-[Found field]
 [&Replace]
 [Restore last opened position]
 [Automatically expand "Settings" when Database Editor++ starts]
@@ -21,8 +18,7 @@
 [Add a module named]
 [Add to all contacts (including Settings)]
 [Edit setting]
-[Value name:]
-[Value data:]
+[Value]
 [Base]
 [Hexadecimal]
 [Decimal]
@@ -35,16 +31,15 @@
 [Copy module to contact]
 [Contact to copy module and settings to]
 [Copy to all contacts (including Settings)]
-[Import module/settings]
-[Paste the settings to import here.]
 [Import]
-[Insert &CR/LF]
+[Paste the settings to import here:]
 [Database Editor++]
 [&Main]
 [&Refresh modules]
 [Refresh &settings]
 [&Actions]
 [&Search and replace]
+[&Fix resident settings]
 [&Delete module]
 [&Watches]
 [&View all]
@@ -63,83 +58,62 @@
 [Edit &Bytes in Hex]
 [Edit &Words in Hex]
 [Edit &Dwords in Hex]
+[&Inline edit]
 [&Restore position]
 [&Open options]
-[&Edit/rename]
-[New]
+[Convert to]
 [&Byte]
 [&Word]
 [&Dword]
 [&String]
 [&Unicode]
+[New]
 [BL&OB]
-[&Convert to]
-[Encyption]
-[View decrypted string]
-[View encrypted string]
-[Decrypt string]
-[Encrypt string]
 [&Watch]
+[&Refresh]
 [Copy to contact]
 [Export module]
+[&Add module]
 [&Clone]
 [Export contact]
 [Import settings]
 [From a file]
 [From pasted text]
-[&Add module]
 [Export settings]
 [Export contacts]
 [Import contacts]
 [Export module from all contacts]
 [Watch window]
 [Reload watch list]
-[Cannot Convert!]
-[New BYTE value]
-[Edit BYTE value]
-[New WORD value]
-[Edit WORD value]
-[New DWORD value]
-[Edit DWORD value]
-[New STRING value]
-[Edit STRING value]
-[New UNICODE value]
-[Edit UNICODE value]
-[New BLOB value]
-[Edit BLOB value]
-[Couldn't allocate enough memory!]
-[Settings]
+[Copy module "%s"]
 [Are you sure you want to delete module "%s"?]
-[Confirm module deletion]
 [Delete module from database]
 [Delete module from database... Loading]
 [Delete module from all contacts (including Setting)]
 [INI Files]
 [Export to file]
-[Error loading module list]
 [Couldn't open file for writing]
+[Import to "%s"]
 [Import from files]
+[Result]
+[Module]
+[Setting]
 [Enter a string to search the database for]
 [Stop]
-[Replaced with]
+[Replaced]
 [Deleted]
 [Found]
-[%s Module "%s" in contact "%s"]
-[%s Setting "%s" in module "%s" in contact "%s" - "%s"]
-[%s Setting "%s" in module "%s" in contact "%s"]
-[%s "%s" in Setting "%s" in module "%s" in contact "%s"]
 [Searching...]
-[Error Loading Setting List]
-[Finished. %d items were found, %d items were deleted.]
-[Finished. %d items were found, %d items were replaced.]
-[Finished. %d items were found.]
+[Finished. Items found: %d / replaced: %d / deleted: %d]
 [Main icon]
-[Closed known module]
-[Open known module]
+[Closed module]
+[Open module]
+[Settings]
 [Contacts group]
 [Unknown contact]
 [Known contact]
 [Open user tree]
+[Empty setting]
 [BLOB setting]
 [Byte setting]
 [Word setting]
@@ -148,29 +122,23 @@
 [Unicode setting]
 [Open Database Editor]
 [Open user tree in DBE++]
+[[UNLOADED]]
 [Are you sure you want to delete contact "%s"?]
-[Confirm contact delete]
+[Fix resident setting deleting them from DB ?]
+[Deleted orphaned items: %d]
+[Error loading module list]
+[Error loading setting list]
 [Loading contacts...]
 [Loading modules...]
-[Module tree not found]
-[Add module to contact "%s"]
 [Database]
-[Data]
+[Add module to "%s"]
 [Type]
+[Unable to store value in this data type!]
+[Are you sure you want to delete setting(s): %d?]
 [*** encrypted ***]
-[UNICODE]
-[BLOB]
-[BYTE]
-[WORD]
-[DWORD]
-[STRING]
-[<unsupported>]
-[Decoded string..]
-[Encoded string..]
-[Module]
-[Setting]
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (BYTE) %d]
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (WORD) %d]
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: (DWORD) 0x%X]
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value: "%s"]
-[Database Setting Changed: \nModule: "%s" , Setting: "%s"\nNew Value (UTF8): "%s"]
+[*** buggy resident ***]
+[Unknown DBVariant type!]
+[Edit setting (%s)]
+[New setting (%s)]
+[*** resident ***]
+[Database Setting Changed: \nModule: "%s", Setting: "%s"\nNew Value (%s): "%s"]
diff --git a/langpacks/serbian/Untranslated/MirLua.txt b/langpacks/serbian/Untranslated/MirLua.txt
index 0a370967c4..ef67f21ce5 100644
--- a/langpacks/serbian/Untranslated/MirLua.txt
+++ b/langpacks/serbian/Untranslated/MirLua.txt
@@ -1,4 +1,5 @@
 [Allow you to extend Miranda NG functionality with lua scripts.]
+[Reload]
 [Scripts]
 [Common scripts folder]
 [Custom scripts folder]
diff --git a/langpacks/serbian/Untranslated/VKontakte.txt b/langpacks/serbian/Untranslated/VKontakte.txt
index 0618aefe9d..54611bbbb3 100644
--- a/langpacks/serbian/Untranslated/VKontakte.txt
+++ b/langpacks/serbian/Untranslated/VKontakte.txt
@@ -9,6 +9,7 @@
 [Use this setting also for attachments on news and notifications]
 [BBCode support on attachments]
 [Process stickers as smileys]
+[Shorten links for audio attachments]
 [News and event notifications]
 [WARNING: Causes excessive network traffic!!!]
 [Enable news feeds]
@@ -136,6 +137,7 @@
 [kick user]
 [left chat]
 [invite user]
+[returned to chat]
 [change chat title to]
 [chat action not supported]
 [Enter new chat title]
@@ -147,6 +149,7 @@
 [View/change &title]
 [&Destroy room]
 [&User details]
+[Visit profile]
 [&Kick]
 [User was tagged in these photos:]
 [News from %s\n%s]
@@ -174,7 +177,6 @@
 [Status message]
 [Send message to my wall]
 [Load news from VK]
-[Visit profile]
 [Send message to user\'s wall]
 [Add as friend]
 [Delete from friend list]