9 files changed, 61 insertions, 21 deletions
diff --git a/langpacks/serbian/Untranslated/Dbx_mdbx.txt b/langpacks/serbian/Untranslated/Dbx_mdbx.txt
index 682afa9e41..39d2b40407 100644
--- a/langpacks/serbian/Untranslated/Dbx_mdbx.txt
+++ b/langpacks/serbian/Untranslated/Dbx_mdbx.txt
@@ -12,7 +12,7 @@
 [Standard]
 [Total]
 [Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted. Fast and effective, suitable for the most cases]
-[All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoid users]
+[All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a database in case of losing password. Recommended only for paranoid users]
 [Set password]
 [Change/remove password]
 [Wrong old password entered!]
diff --git a/langpacks/serbian/Untranslated/Dbx_mmap.txt b/langpacks/serbian/Untranslated/Dbx_mmap.txt
index 7e2686467f..7e238f165c 100644
--- a/langpacks/serbian/Untranslated/Dbx_mmap.txt
+++ b/langpacks/serbian/Untranslated/Dbx_mmap.txt
@@ -11,7 +11,7 @@
 [Standard]
 [Total]
 [Only critical data are encrypted (passwords, security tokens, etc). All other settings and history remains unencrypted. Fast and effective, suitable for the most cases]
-[All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a profile in case of losing password. Recommended only for paranoid users]
+[All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of losing everything you've stored in a database in case of losing password. Recommended only for paranoid users]
 [Set password]
 [Miranda has detected corruption in your database. Miranda will now shut down.]
 [Disk is full. Miranda will now shut down.]
diff --git a/langpacks/serbian/Untranslated/GG.txt b/langpacks/serbian/Untranslated/GG.txt
index 1106628fe7..beafeb7963 100644
--- a/langpacks/serbian/Untranslated/GG.txt
+++ b/langpacks/serbian/Untranslated/GG.txt
@@ -81,8 +81,6 @@
 [You need to specify your registration e-mail first.]
 [Your password will be sent to your registration e-mail.\nDo you want to continue?]
 [You should disconnect before making any permanent changes with your account.\nDo you want to disconnect now?]
-[Allow]
-[Ask]
 [Your details has been uploaded to the public directory.]
 [You have to be logged in before you can change your details.]
 [Conference]
@@ -149,6 +147,8 @@
 [Export List To &Text File...]
 [Gadu-Gadu account chooser]
 [Gadu-Gadu Link Protocol]
+[Allow]
+[Ask]
 [Password could not be reminded because of error:\n\t%s (Error: %d)]
 [Password was sent to your e-mail.]
 [Notify]
diff --git a/langpacks/serbian/Untranslated/Import.txt b/langpacks/serbian/Untranslated/Import.txt
index 4ae4fc0ae3..541a58dcf4 100644
--- a/langpacks/serbian/Untranslated/Import.txt
+++ b/langpacks/serbian/Untranslated/Import.txt
@@ -65,9 +65,9 @@
 [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]
 [Skipping duplicate group %s.]
 [Import...]
diff --git a/langpacks/serbian/Untranslated/MirLua.txt b/langpacks/serbian/Untranslated/MirLua.txt
index 22dce1542c..39fd752a3c 100644
--- a/langpacks/serbian/Untranslated/MirLua.txt
+++ b/langpacks/serbian/Untranslated/MirLua.txt
@@ -8,6 +8,7 @@
 [Failed]
 [Open]
 [Reload]
+[Compile]
 [Common scripts]
 [Services]
 [C libs folder]
diff --git a/langpacks/serbian/Untranslated/ProxySwitch.txt b/langpacks/serbian/Untranslated/ProxySwitch.txt
new file mode 100644
index 0000000000..39b460bf99
--- /dev/null
+++ b/langpacks/serbian/Untranslated/ProxySwitch.txt
@@ -0,0 +1,40 @@
+[Watches IP address changes, displays popups, and adjusts the proxy settings of Miranda, Internet Explorer and Firefox.]
+[Network addresses]
+[Direct connection]
+[Use proxy]
+[Manage Miranda NG proxy]
+[Manage Internet Explorer proxy]
+[Manage Firefox proxy]
+[Reconnect if IP address changes]
+[Display 'Show my IP' in menu]
+[Display 'Proxy && IP' submenu]
+[Hide interfaces]
+[Popup options]
+[Enable popups]
+[Use default popup colors]
+[Show proxy status on change]
+[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 program 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]
+[\nMiranda	]
+[Proxy]
+[Direct]
+[\nExplorer	]
+[\nFirefox	]
+[Cannot retrieve IP or adapter data.]
+[Cannot allocate memory for pAddresses]
+[GetAdaptersAddresses sizing failed]
+[Cannot allocate memory for pAdapterInfo]
+[GetAdaptersInfo sizing failed]
+[disconnected]
+[Current IP address]
+[Proxy settings && interfaces]
+[Enable &IP change notification]
+[Disable &IP change notification]
+[Show my &IP addresses]
+[Disable proxy]
+[Enable proxy]
+[IP change notification]
+[Services]
+[ProxySwitch]
diff --git a/langpacks/serbian/Untranslated/SmileyAdd.txt b/langpacks/serbian/Untranslated/SmileyAdd.txt
index 493c6acffc..e4ff6eee3b 100644
--- a/langpacks/serbian/Untranslated/SmileyAdd.txt
+++ b/langpacks/serbian/Untranslated/SmileyAdd.txt
@@ -17,8 +17,6 @@
 [Input area]
 [Enable smileys]
 [Don't replace at cursor]
-[Built-in message dialog support]
-[Enable]
 [Surround inserted smiley with spaces]
 [Use first smiley for selection size]
 [IEView style window]
@@ -30,7 +28,6 @@
 [Button smiley]
 [Assign smiley category]
 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]
-[Hide]
 [Smiley packs]
 [Smileys]
 [Protocol specific]
diff --git a/langpacks/serbian/Untranslated/StatusManager.txt b/langpacks/serbian/Untranslated/StatusManager.txt
index 321530e735..8aaf208afa 100644
--- a/langpacks/serbian/Untranslated/StatusManager.txt
+++ b/langpacks/serbian/Untranslated/StatusManager.txt
@@ -17,17 +17,21 @@
 [Continuously check for internet connection]
 [Do so by pinging host]
 [Confirm status]
-[Account]
+[Account:]
+[Away mode]
 [when full-screen mode is active]
 [when screen saver engages]
 [when workstation is locked]
+[when terminal session is disconnected]
 [after]
 [minutes of inactivity]
+[After away]
 [minutes of level 1 mode]
 [only set when inactive]
 [Monitor Miranda's activity only]
 [Reset status on return]
 [Confirm resetting status]
+[Enter idle mode]
 [Only set if current status is]
 [Command line]
 [Copy to clipboard]
@@ -80,7 +84,6 @@
 [Ignore Caps Lock, Num Lock and Scroll Lock keys]
 [Check interval (secs)]
 [Confirm dialog timeout (secs)]
-[This options are ignored because you enabled "Change my status mode to" in the "Idle" options dialog.]
 [Monitor keyboard activity]
 [Monitor mouse activity]
 [Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
@@ -88,6 +91,7 @@
 [Enable checking]
 [Disable checking]
 [Set status message]
+[Account]
 [Add...]
 [Create a TopToolBar button]
 [Show confirm dialog when loading]
@@ -118,14 +122,13 @@
 [TriggerData]
 [Becoming active without status change]
 [Leaving second auto-away status]
+[minutes of %s mode]
+[Auto away]
+[Rules]
 [Set %s message for %s.]
 [<last>]
 [<current>]
 [<n/a>]
-[Status manager]
-[minutes of %s mode]
-[Auto away]
-[Rules]
 [%s connected from another location]
 [%s login error, cancel reconnecting]
 [%s login error (next retry (%d) in %d s)]
@@ -140,6 +143,7 @@
 [Giving up]
 [You broke the Internet!]
 [Basic]
+[Status manager]
 [Right]
 [size: %d x %d]
 [loc: %d x %d]
diff --git a/langpacks/serbian/Untranslated/TabSRMM.txt b/langpacks/serbian/Untranslated/TabSRMM.txt
index ee727977ec..d81d9d350a 100644
--- a/langpacks/serbian/Untranslated/TabSRMM.txt
+++ b/langpacks/serbian/Untranslated/TabSRMM.txt
@@ -408,7 +408,6 @@
 [Nickchange (10x10)]
 [Group chat windows]
 [Group chat log]
-[Chat rooms]
 [Voiced]
 [Half operators]
 [Channel operators]
@@ -417,6 +416,7 @@
 [Selection background]
 [Incremental search highlight]
 [Fields background]
+[Chat rooms]
 [nick of current contact (if defined)]
 [protocol name of current contact (if defined). Account name is used when protocol supports multiple accounts]
 [user-defined account name of current contact (if defined).]
@@ -445,6 +445,10 @@
 [No markers]
 [Show as icons]
 [Show as text symbols]
+[Settings]
+[Log formatting]
+[Events and filters]
+[Highlighting]
 [%s%s says:%s %s]
 [Expand or collapse the side bar]
 [The filter cannot be enabled, because there are no event types selected either global or for this chat room]
@@ -648,10 +652,6 @@
 [Message window]
 [Load and apply]
 [Window layout tweaks]
-[Settings]
-[Log formatting]
-[Events and filters]
-[Highlighting]
 [Choose status modes]
 [A message delivery has failed.\nClick to open the message window.]
 [Message Log Options]
@@ -746,7 +746,6 @@
 [Error feedback]
 [Enable typing sounds]
 [Close current tab on send]
-[Automatic keyboard layout: Do not load the system default for new contacts]
 [Enable unattended send (experimental feature, required for multisend and send later) (*)]
 [Show client description in info panel]
 [On tab control]
@@ -810,7 +809,6 @@
 [New windows are minimized (the option above MUST be active)]
 [Activate a minimized window when a new tab is created inside it]
 [Automatically switch existing tabs in minimized windows on incoming messages (ignored when using Aero Peek task bar features)]
-[Remember and set keyboard layout per contact]
 [Close button only hides message windows]
 [Allow TAB key in typing area (this will disable focus selection by TAB key)]
 [Add offline contacts to multisend list]