5 files changed, 32 insertions, 55 deletions
diff --git a/langpacks/serbian/Untranslated/Import.txt b/langpacks/serbian/Untranslated/Import.txt
index 541a58dcf4..955036700b 100644
--- a/langpacks/serbian/Untranslated/Import.txt
+++ b/langpacks/serbian/Untranslated/Import.txt
@@ -29,6 +29,8 @@
 [Select items to import:]
 [Only since:]
 [Choose appropriate accounts for import]
+[Enter file name for import:]
+[Check duplicates]
 [<New account>]
 [Old account]
 [Protocol %S is not loaded, skipping account %s creation]
@@ -65,10 +67,12 @@
 [Skipped %d contacts.]
 [Skipped %d duplicates and %d filtered events.]
 [&Import...]
-[Miranda NG database]
 [The given file does not exist. Please check that you have entered the name correctly.]
 [Miranda Import]
+[Miranda NG database]
 [You cannot import your current profile into itself]
+[Import history for]
+[JSON file]
 [Skipping duplicate group %s.]
 [Import...]
 [Finish]
diff --git a/langpacks/serbian/Untranslated/Msg_Export.txt b/langpacks/serbian/Untranslated/Msg_Export.txt
index 7bce57cb6a..25b8fc4577 100644
--- a/langpacks/serbian/Untranslated/Msg_Export.txt
+++ b/langpacks/serbian/Untranslated/Msg_Export.txt
@@ -1,22 +1,23 @@
 [Exports every message, URL or file you receive to a text file.]
+[Export directory]
 [Browse]
+[Default file]
+[File viewer]
 [Use internal viewer]
 [Replace Miranda history]
+[Export format]
+[Max column width]
+[Note: 0 = no limit]
+[Time format]
+[Use JSON format for export]
 [Use UTF8 in new files]
 [Append extra new line]
 [Use << and >>]
 [Auto filename]
 [Clear all]
 [Export all history]
-[Export directory]
-[Max column width]
-[Note: 0 = no limit]
-[Time format]
-[Export format]
-[Default file]
-[File viewer]
 [Exporting old messages]
-[History file for %s (%s format %s)]
+[History file for %s (%s, format %s)]
 [&External]
 [When filename changes]
 [Prompt for action]
@@ -27,37 +28,25 @@
 [Debug]
 [Export selected]
 [Set to default filename]
-[Failed to write to the Rich Edit the buffer was to small.]
-[Error: Optimal buffer size decreased to a too low size!]
 [Internal error! (lExtraRead >= 0)]
-[Failed to execute external file view]
-[Failed to load Rich Edit (Msftedit.dll)]
-[Failed to get handle to Rich Edit!]
-[Failed to open file\r\n%s\r\n\r\nContact handle is invalid]
-[Failed to open file\r\n%s\r\n\r\nMiranda database contains %d events]
+[Miranda database contains %d events]
 [With scroll to bottom %d\n]
 [Search string was not found!]
 [Save as RTF]
 [Color...]
 [Font...]
 [Syntax highlight]
-[Failed to save file]
 [History was saved successfully in file\r\n]
-[Failed to create history dialog]
 [Open E&xported History]
 [Reading database information (Phase 1 of 2)]
 [Sorting and writing database information (Phase 2 of 2)]
-[Failed to open or create file :\n]
-[No contacts found to export]
-[Failed to export at least one contact]
+[Failed to open or create file:\n]
 [Max line width must be at least %d. Or use 0 for no limit.]
 [You need to restart Miranda to change the history function]
+[Select Destination Directory]
 [Proto]
 [UIN]
-[You have not applied the changes, do you wish to apply them first?]
-[Failed to get the shells allocator!]
-[Failed to Allocate buffer space]
-[Select Destination Directory]
+[No contacts found to export]
 [Export Protocols]
 [Message export]
 [Additional]
@@ -69,48 +58,31 @@
 [\nMessage has not been saved!\n]
 [Do you wish to save debug information?]
 [All\0*.*\0Text\0*.TXT\0\0]
-[Failed to move to the end of the file :\n]
-[Failed to UTF8 byte order code to file :\n]
-[      History for\r\n]
-[User      : %User%\r\n]
-[Protocol  : %Proto%\r\n]
-[UIN       : %UIN%\r\n]
-[FirstName : %FirstName%\r\n]
-[LastName  : %LastName%\r\n]
-[Age       : %Age%\r\n]
-[Gender    : %Gender%\r\n]
-[e-mail    : %e-mail%\r\n]
-[Nick      : %Nick%\r\n]
-[City      : %City%\r\n]
-[State     : %State%\r\n]
-[Phone     : %Phone%\r\n]
-[Homepage  : %Homepage%\r\n]
-[- About -\r\n%About%\r\n]
-[Failed to write user details to file :\n]
-[Failed to write timestamp and username to file :\n]
-[Failed to write message to the file :\n]
+[Age]
+[Gender]
+[City]
+[State]
+[Phone]
+[Homepage]
+[About]
+[      History for]
+[User]
 [URL: ]
 [File: ]
 [Description: ]
-[Failed to write URL/File to the file :\n]
 [Nick      :]
 [FirstName :]
 [LastName  :]
 [e-mail    :]
 [Reason    :]
 [Invalid Database event received. Type %d, size %d]
-[Failed to write Invalid Database event the file :\n]
 [The following user made an authorization request:]
 [The following user added you to their contact list:]
 [UIN       :]
-[Failed to write AUTHREQUEST or ADDED to the file :\n]
 [EmailExpress from:]
 [WebPager from:]
 [No from address]
-[Failed to write EmailExpress to the file :\n]
-[Failed to write SMS to the file :\n]
 [Unknown event type %d, size %d]
-[Failed to write Unknown event to the file :\n]
 [User has been deleted. Do you want to delete the file?]
 [Failed to delete the file]
 [No_Nick]
diff --git a/langpacks/serbian/Untranslated/Omegle.txt b/langpacks/serbian/Untranslated/Omegle.txt
index 11d51c45c3..e8872ddad2 100644
--- a/langpacks/serbian/Untranslated/Omegle.txt
+++ b/langpacks/serbian/Untranslated/Omegle.txt
@@ -13,12 +13,12 @@
 [Load count of users on actual server after connection]
 [Meet strangers with common interests]
 [Your interests (separated by commas):]
+[There are three different modes of chatting:\n1) Standard mode\t - You chat with random stranger privately\n2) Question mode\t - You ask two strangers a question and see how they discuss it (you can't join their conversation, only watch)\n3) Spy mode\t - You and stranger got a question to discuss from third stranger (he can't join your conversation, only watch)\n\nSend '/commands' for available commands.]
+[You can use different commands:\n/help\t - show info about chat modes\n/new\t - start standard mode\n/ask <question> - start question mode with your question\n/ask\t - start question mode with your last asked question\n/spy\t - start spy mode\n/quit\t - disconnect from stranger or stop connecting\n/asl\t - send your predefined ASL message\n\nNote: You can reconnect to different stranger without disconnecting from current one.]
 [Server]
 [Last question is empty.]
 [Your question is too short.]
 [Your '/asl' setting is empty.]
-[There are three different modes of chatting:\n1) Standard mode\t - You chat with random stranger privately\n2) Question mode\t - You ask two strangers a question and see how they discuss it (you can't join their conversation, only watch)\n3) Spy mode\t - You and stranger got a question to discuss from third stranger (he can't join your conversation, only watch)\n\nSend '/commands' for available commands.]
-[You can use different commands:\n/help\t - show info about chat modes\n/new\t - start standard mode\n/ask <question> - start question mode with your question\n/ask\t - start question mode with your last asked question\n/spy\t - start spy mode\n/quit\t - disconnect from stranger or stop connecting\n/asl\t - send your predefined ASL message\n\nNote: You can reconnect to different stranger without disconnecting from current one.]
 [Unknown command. Send '/commands' for list.]
 [You aren't connected to any stranger. Send '/help' or '/commands' for help.]
 [You can't send messages in question mode.]
diff --git a/langpacks/serbian/Untranslated/PluginUpdater.txt b/langpacks/serbian/Untranslated/PluginUpdater.txt
index 4af39641c2..57c1104e49 100644
--- a/langpacks/serbian/Untranslated/PluginUpdater.txt
+++ b/langpacks/serbian/Untranslated/PluginUpdater.txt
@@ -14,11 +14,12 @@
 [Backup database before update (requires Db_autobackups plugin)]
 [Files source]
 [Stable version]
+[Stable version with debug symbols]
 [Development version (less stable)]
 [Development version with debug symbols]
 [Custom version]
-[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]
 [Change platform to 32-bit]
+[Some component(s) was updated.\nYou need to restart your Miranda to apply installed updates.]
 [Notifications]
 [Restart]
 [Errors]
diff --git a/langpacks/serbian/Untranslated/ProxySwitch.txt b/langpacks/serbian/Untranslated/ProxySwitch.txt
index 87f6fac550..708700807f 100644
--- a/langpacks/serbian/Untranslated/ProxySwitch.txt
+++ b/langpacks/serbian/Untranslated/ProxySwitch.txt
@@ -14,7 +14,7 @@
 [Restart of Miranda NG is required.]
 [Enter semicolon (;) separated list of IP network addresses in any of the formats below:\n\tIP/bits\t(10.0.0.1/24)\t\tIP/mask\t(10.0.0.1/255.255.255.0)\n\tIP1-2\t(10.0.0.1-50)\t\tIP1-IP2\t(10.0.0.1-10.0.2.255)]
 [Any entry in the 'Use proxy' list can be prefixed by an exclamation mark (!) to increase its priority. Entries with wrong syntax will be ignored. The plugin checks the IP addresses in the following way:]
-[\t1) Use proxy if any interface has prioritized 'Use proxy' address\n\t2) Don't use proxy if any interface has 'Direct connection' address\n\t3) Use proxy if any interface has 'Use proxy' address\n\t4) Do nothing if unknown or any at all addresses found]
+[\t1) Use proxy if any interface has prioritized 'Use proxy' address\n\t2) Don't use proxy if any interface has 'Direct connection' address\n\t3) Use proxy if any interface has 'Use proxy' address\n\t4) Do nothing if unknown or no address found]
 [Proxy]
 [Direct]
 [disconnected]