5 files changed, 43 insertions, 172 deletions
diff --git a/langpacks/serbian/Plugins/SimpleStatusMsg.txt b/langpacks/serbian/Plugins/SimpleStatusMsg.txt
index f7464fa14a..136a7e6435 100644
--- a/langpacks/serbian/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/serbian/Plugins/SimpleStatusMsg.txt
@@ -96,7 +96,7 @@ Ostalo
 
 [Clear Predefined]
 
-[* This feature is available only when using StartupStatus plugin.]
+[* This feature is available only when using StatusManager plugin.]
 
 [Status on startup]
 
diff --git a/langpacks/serbian/Plugins/StatusManager.txt b/langpacks/serbian/Plugins/StatusManager.txt
index 9e45bf2843..114df09773 100644
--- a/langpacks/serbian/Plugins/StatusManager.txt
+++ b/langpacks/serbian/Plugins/StatusManager.txt
@@ -8,21 +8,21 @@
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
 
 ;file \plugins\StatusManager\res\resource.rc
+[General]
+Uopšteno
+[Show popups]
+
+[Account connection]
+
 [Check connection]
 
 [Maximum retries (0 - infinite)]
 
-[Account connection]
-
 [Delay between retries (secs)]
 
-[Show popups]
-
-[General]
-Uopšteno
 [Accounts to check]
 
-[Dial-Up]
+[Dial-up]
 
 [Don't reconnect if no internet connection seems available]
 
@@ -186,7 +186,7 @@ Izmenjeno
 
 [Confirm dialog timeout (secs)]
 
-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
+[This options are ignored because you enabled "Change my status mode to" in the "Idle" options dialog.]
 
 [Monitor keyboard activity]
 
@@ -222,32 +222,32 @@ Briši
 
 [In submenu]
 
-[Max. delay (secs)]
+[Timers]
+
+[Maximum delay (secs)]
+
+[Maximum account connecting time (secs)]
+
+[Reconnecting]
+
+[Ignore locked status of accounts]
 
 [Increase delay exponential]
 
+[Set account offline before a connection attempt]
+
 [Cancel all if an account connects from another location]
 
 [Reconnect on APM resume]
 
+[React on login errors]
+
 [Stop trying to reconnect]
 
 [Set delay to]
 
-[React on login errors]
-
 [seconds]
 sekundi
-[Set account offline before a connection attempt]
-
-[Max. account connecting time (secs)]
-
-[Timers]
-
-[Reconnecting]
-
-[Ignore locked status of accounts]
-
 [Consider connection lost after]
 
 [failed pings]
@@ -277,7 +277,7 @@ sekundi
 
 [Status messages]
 Statusna poruka
-[Auto Away]
+[Auto away]
 
 ;file \plugins\StatusManager\src\commonstatus.cpp
 [I've been away since %time%.]
@@ -340,7 +340,7 @@ Zatvaram (%d)
 
 [Giving up]
 
-[KeepStatus]
+[Keep status]
 
 ;file \plugins\StatusManager\src\ks_options.cpp
 [Basic]
@@ -376,10 +376,12 @@ Standardno
 Nepoznati
 [At least one profile must exist]
 
-[StartupStatus]
+[Status manager]
 
 [Your default profile will be changed]
 
+[Startup status]
+
 ;file \plugins\StatusManager\src\ss_profiles.cpp
 ;file \plugins\StatusManager\src\ss_toolbars.cpp
 [Pressed toolbar icon]
diff --git a/langpacks/serbian/Untranslated/KeepStatus.txt b/langpacks/serbian/Untranslated/KeepStatus.txt
deleted file mode 100644
index d34af81fb7..0000000000
--- a/langpacks/serbian/Untranslated/KeepStatus.txt
+++ /dev/null
@@ -1,132 +0,0 @@
-[KeepStatus, A connection checker, for use with (or without) StartupStatus and/or AdvancedAutoAway.]
-[Check connection]
-[Max. retries]
-[Account connection]
-[Delay between retries (secs)]
-[Show popups]
-[Accounts to check]
-[Dial-Up]
-[Don't reconnect if no internet connection seems available]
-[Continuously check for internet connection]
-[Do so by pinging host]
-[Confirm status]
-[Account]
-[when full-screen mode is active]
-[when screen saver engages]
-[when workstation is locked]
-[after]
-[minutes of inactivity]
-[minutes of level 1 mode]
-[only set when inactive]
-[Monitor Miranda's activity only]
-[Reset status on return]
-[Confirm resetting status]
-[Only set if current status is]
-[Command line]
-[Copy to clipboard]
-[Create shortcut]
-[Add new profile]
-[Profile name]
-[Set window state]
-[Show dialog]
-[Set status to offline before exit]
-[Show CMDL]
-[Activate status profile]
-[Set docked]
-[Status on startup]
-[ms]
-[Set after]
-[Timeout]
-[s]
-[Set window location]
-[Left]
-[Top]
-[Set window size]
-[Width]
-[Height]
-[Allow override]
-[Note: status profiles can be created in the 'Status profiles' options screen]
-[Window on startup]
-[Automatically dial on startup]
-[Automatically hang up on exit]
-[Dial-up (experimental)]
-[Delay]
-[On left click]
-[On right click]
-[Do nothing]
-[Close popup]
-[Cancel reconnecting]
-[Colors]
-[Preview]
-[Show when connection is lost]
-[Show when a connection attempt is made]
-[Show when reconnection has finished]
-[Show other messages]
-[From popup plugin]
-[Permanent]
-[Show additional information in popups]
-[Use Miranda's message setting]
-[Use this message:]
-[Variables...]
-[Specify settings for each account]
-[Use same settings for all accounts]
-[Ignore Caps Lock, Num Lock and Scroll Lock keys]
-[Check interval (secs)]
-[Confirm dialog timeout (secs)]
-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
-[Monitor keyboard activity]
-[Monitor mouse activity]
-[Ignore CTRL, ALT, SHIFT, TAB, ESC and Windows keys]
-[Ignore any key combination with above keys]
-[Enable checking]
-[Disable checking]
-[Set status message]
-[Add...]
-[Create a TopToolBar button]
-[Show confirm dialog when loading]
-[Create a main menu item]
-[Status profiles]
-[Hotkey]
-[In submenu]
-[Max. delay (secs)]
-[Increase delay exponential]
-[Cancel all if an account connects from another location]
-[Reconnect on APM resume]
-[Stop trying to reconnect]
-[Set delay to]
-[React on login errors]
-[Set account offline before a connection attempt]
-[Max. account connecting time (secs)]
-[Timers]
-[Reconnecting]
-[Ignore locked status of accounts]
-[Consider connection lost after]
-[failed pings]
-[Continuously check interval (secs)]
-[Entering first auto-away status]
-[Entering second auto-away status]
-[Leaving first auto-away status]
-[Leaving second auto-away status]
-[Becoming active without status change]
-[Pre-conditions]
-[TriggerData]
-[Status: The status the account will change to\r\nAccount: The account changing state]
-[%s connected from another location]
-[%s login error, cancel reconnecting]
-[%s login error (next retry (%d) in %d s)]
-[%s status error (next retry (%d) in %d s)]
-[Status error (next retry (%d) in %d s)]
-[%s\t(will be set to %s)\r\n]
-[Resetting status... (last try (%d))%s]
-[Resetting status... (next retry (%d) in %d s)%s]
-[No internet connection seems available... (last try (%d))]
-[No internet connection seems available... (next retry (%d) in %d s)]
-[Status was set ok]
-[Giving up]
-[KeepStatus]
-[Basic]
-[You broke the Internet!]
-[Set %s message for %s.]
-[<last>]
-[<current>]
-[<n/a>]
diff --git a/langpacks/serbian/Untranslated/SimpleStatusMsg.txt b/langpacks/serbian/Untranslated/SimpleStatusMsg.txt
index b877d03e08..7ae4d59511 100644
--- a/langpacks/serbian/Untranslated/SimpleStatusMsg.txt
+++ b/langpacks/serbian/Untranslated/SimpleStatusMsg.txt
@@ -37,7 +37,7 @@
 [Show 'Status message...' item in status menu]
 [Clear History]
 [Clear Predefined]
-[* This feature is available only when using StartupStatus plugin.]
+[* This feature is available only when using StatusManager plugin.]
 [Status on startup]
 [Set status after]
 [Protocol:]
diff --git a/langpacks/serbian/Untranslated/StatusManager.txt b/langpacks/serbian/Untranslated/StatusManager.txt
index 7048cb6e21..bfa4d87ad5 100644
--- a/langpacks/serbian/Untranslated/StatusManager.txt
+++ b/langpacks/serbian/Untranslated/StatusManager.txt
@@ -1,11 +1,11 @@
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
+[Show popups]
+[Account connection]
 [Check connection]
 [Maximum retries (0 - infinite)]
-[Account connection]
 [Delay between retries (secs)]
-[Show popups]
 [Accounts to check]
-[Dial-Up]
+[Dial-up]
 [Don't reconnect if no internet connection seems available]
 [Continuously check for internet connection]
 [Do so by pinging host]
@@ -73,7 +73,7 @@
 [Ignore Caps Lock, Num Lock and Scroll Lock keys]
 [Check interval (secs)]
 [Confirm dialog timeout (secs)]
-[You enabled "Change my status mode to" in the "Idle" options dialog, AdvancedAutoAway's options are ignored.]
+[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,18 +88,18 @@
 [Status profiles]
 [Hotkey]
 [In submenu]
-[Max. delay (secs)]
+[Timers]
+[Maximum delay (secs)]
+[Maximum account connecting time (secs)]
+[Reconnecting]
+[Ignore locked status of accounts]
 [Increase delay exponential]
+[Set account offline before a connection attempt]
 [Cancel all if an account connects from another location]
 [Reconnect on APM resume]
+[React on login errors]
 [Stop trying to reconnect]
 [Set delay to]
-[React on login errors]
-[Set account offline before a connection attempt]
-[Max. account connecting time (secs)]
-[Timers]
-[Reconnecting]
-[Ignore locked status of accounts]
 [Consider connection lost after]
 [failed pings]
 [Continuously check interval (secs)]
@@ -113,7 +113,7 @@
 [Status: The status the account will change to\r\nAccount: The account changing state]
 [minutes of %s mode]
 [Rules]
-[Auto Away]
+[Auto away]
 [Set %s message for %s.]
 [<last>]
 [<current>]
@@ -130,7 +130,7 @@
 [No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
-[KeepStatus]
+[Keep status]
 [Basic]
 [You broke the Internet!]
 [Right]
@@ -141,7 +141,8 @@
 [Normal]
 [Create a status menu item]
 [At least one profile must exist]
-[StartupStatus]
+[Status manager]
 [Your default profile will be changed]
+[Startup status]
 [Pressed toolbar icon]
 [Released toolbar icon]