10 files changed, 100 insertions, 44 deletions
diff --git a/langpacks/english/Plugins/Dbx_mdbx.txt b/langpacks/english/Plugins/Dbx_mdbx.txt
index 37d7b3ad47..450a2b7489 100644
--- a/langpacks/english/Plugins/Dbx_mdbx.txt
+++ b/langpacks/english/Plugins/Dbx_mdbx.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Dbx_mdbx.dll
 ;  Plugin: Miranda NG MDBX database driver
-;  Version: 0.95.8.7
+;  Version: 0.95.9.1
 ;  Authors: Miranda-NG project
 ;============================================================
 [Provides Miranda database support: global settings, contacts, history, settings per contact.]
@@ -22,7 +22,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]
 ;file \plugins\Dbx_mdbx\src\dbintf.h
 [Change/remove password]
diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index a3abb242f2..f4c7505153 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -21,7 +21,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]
 ;file \plugins\Db3x_mmap\src\database.cpp
 [Miranda has detected corruption in your database. Miranda will now shut down.]
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 9ed79d16a8..fe3d970621 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -118,9 +118,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]
-[Ignore]
 [Your details has been uploaded to the public directory.]
 [You have to be logged in before you can change your details.]
 [Network]
@@ -202,6 +199,10 @@
 ;file \protocols\Gadu-Gadu\src\links.cpp
 [Gadu-Gadu account chooser]
 [Gadu-Gadu Link Protocol]
+;file \protocols\Gadu-Gadu\src\options.cpp
+[Allow]
+[Ask]
+[Ignore]
 ;file \protocols\Gadu-Gadu\src\ownerinfo.cpp
 [Password could not be reminded because of error:\n\t%s (Error: %d)]
 [Password was sent to your e-mail.]
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 8f8c3aed4f..96c92bdf71 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -83,11 +83,11 @@
 [Skipped %d duplicates and %d filtered events.]
 ;file \plugins\Import\src\main.cpp
 [&Import...]
+[Miranda NG database]
+[All Files]
 ;file \plugins\Import\src\miranda.cpp
 [The given file does not exist. Please check that you have entered the name correctly.]
 [Miranda Import]
-[Miranda NG database]
-[All Files]
 [You cannot import your current profile into itself]
 ;file \plugins\Import\src\utils.cpp
 [Skipping duplicate group %s.]
diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index dcab09a783..b6e53854be 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: MirLua.dll
 ;  Plugin: MirLua
-;  Version: 0.11.8.9
+;  Version: 0.11.9.0
 ;  Authors: Miranda NG team
 ;============================================================
 [Extends Miranda NG functionality with Lua scripts.]
@@ -18,6 +18,7 @@
 [Failed]
 [Open]
 [Reload]
+[Compile]
 ;file \plugins\MirLua\src\options.cpp
 [Common scripts]
 [Services]
diff --git a/langpacks/english/Plugins/ProxySwitch.txt b/langpacks/english/Plugins/ProxySwitch.txt
new file mode 100644
index 0000000000..abf0f83b70
--- /dev/null
+++ b/langpacks/english/Plugins/ProxySwitch.txt
@@ -0,0 +1,55 @@
+#muuid {4df0c267-6efb-4410-b651-385f87158509}
+;============================================================
+;  File: ProxySwitch.dll
+;  Plugin: ProxySwitch
+;  Version: 1.0.0.1
+;  Authors: Petr Smejkal
+;============================================================
+[Watches IP address changes, displays popups, and adjusts the proxy settings of Miranda, Internet Explorer and Firefox.]
+;file \plugins\ProxySwitch\res\resource.rc
+[Network addresses]
+[Direct connection]
+[Use proxy]
+[General]
+[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]
+[Text color]
+[Background color]
+[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]
+;file \plugins\ProxySwitch\src\ip.cpp
+[\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]
+;file \plugins\ProxySwitch\src\main.cpp
+[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]
+[Popups]
+;file \plugins\ProxySwitch\src\opt.cpp
+[Services]
+[ProxySwitch]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index c01ea961b9..c2c96d12fe 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Scriver.dll
 ;  Plugin: Scriver
-;  Version: 3.0.1.8
+;  Version: 3.0.1.10
 ;  Authors: Miranda NG team
 ;============================================================
 [Scriver - send and receive instant messages.]
@@ -18,9 +18,7 @@
 [Delete temporary contacts on closing]
 [Show warning when message has not been received after]
 [seconds]
-[Send message on 'Enter']
-[Send message on double 'Enter']
-[Send message on 'Ctrl+Enter']
+[Send message on:]
 [Tabs]
 [Enable tabs]
 [Always show tab bar]
@@ -366,6 +364,10 @@
 [Invisible]
 [Out to lunch]
 [On the phone]
+[Enter]
+[Double 'Enter']
+[Ctrl+Enter]
+[Shift+Enter]
 [** New contacts **]
 [** Unknown contacts **]
 [Message sessions]
diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index c0c60a4938..2dea1f26e1 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: SmileyAdd.dll
 ;  Plugin: SmileyAdd
-;  Version: 0.3.0.2
+;  Version: 0.3.1.0
 ;  Authors: Peacow, nightwish, bid, borkra
 ;============================================================
 [Smiley support for Miranda NG.]
@@ -26,9 +26,6 @@
 [Input area]
 [Enable smileys]
 [Don't replace at cursor]
-[Built-in message dialog support]
-[Enable]
-[Smiley button]
 [Surround inserted smiley with spaces]
 [Use first smiley for selection size]
 [IEView style window]
@@ -45,8 +42,6 @@
 [Background color]
 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]
 ;file \plugins\SmileyAdd\src\options.cpp
-[Hide]
-[Show]
 [Smiley packs]
 [All files]
 [Smileys]
diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 0df4c26eec..ab52b4018c 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: StatusManager.dll
 ;  Plugin: Status manager
-;  Version: 1.2.0.1
+;  Version: 1.2.0.3
 ;  Authors: P Boon
 ;============================================================
 [A connection checker and auto away module. Also allows you to define the status Miranda should set on startup, configurable per protocol.]
@@ -31,18 +31,22 @@
 [Cancel]
 [Profile]
 [Message]
-[Account]
+[Account:]
+[Away mode]
 [Set]
 [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]
@@ -104,7 +108,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]
@@ -113,6 +116,7 @@
 [Enable checking]
 [Disable checking]
 [Set status message]
+[Account]
 [Status]
 [Add...]
 [Delete]
@@ -146,6 +150,11 @@
 [TriggerData]
 [Becoming active without status change]
 [Leaving second auto-away status]
+;file \plugins\StatusManager\src\aaa_options.cpp
+[minutes of %s mode]
+[Auto away]
+[Rules]
+[Status messages]
 ;file \plugins\StatusManager\src\confirmdialog.cpp
 [Set %s message for %s.]
 [<last>]
@@ -153,14 +162,7 @@
 [<n/a>]
 [Protocol]
 [Closing in %d]
-;file \plugins\StatusManager\src\options.cpp
-[Status manager]
-;file \plugins\StatusManager\src\AdvancedAutoAway\aaa_options.cpp
-[minutes of %s mode]
-[Auto away]
-[Rules]
-[Status messages]
-;file \plugins\StatusManager\src\KeepStatus\keepstatus.cpp
+;file \plugins\StatusManager\src\keepstatus.cpp
 [%s connected from another location]
 [%s login error, cancel reconnecting]
 [%s login error (next retry (%d) in %d s)]
@@ -173,12 +175,14 @@
 [No internet connection seems available... (next retry (%d) in %d s)]
 [Status was set ok]
 [Giving up]
-;file \plugins\StatusManager\src\KeepStatus\ks_options.cpp
+;file \plugins\StatusManager\src\ks_options.cpp
 [You broke the Internet!]
 [Basic]
 [Advanced]
 [Popups]
-;file \plugins\StatusManager\src\StartupStatus\ss_options.cpp
+;file \plugins\StatusManager\src\options.cpp
+[Status manager]
+;file \plugins\StatusManager\src\ss_options.cpp
 [<unknown>]
 [Right]
 [None]
@@ -192,7 +196,7 @@
 [unknown]
 [At least one profile must exist]
 [Your default profile will be changed]
-;file \plugins\StatusManager\src\StartupStatus\ss_profiles.cpp
-;file \plugins\StatusManager\src\StartupStatus\ss_toolbars.cpp
+;file \plugins\StatusManager\src\ss_profiles.cpp
+;file \plugins\StatusManager\src\ss_toolbars.cpp
 [Pressed toolbar icon]
 [Released toolbar icon]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index b281fa0d08..69fb4d5d7f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: TabSRMM.dll
 ;  Plugin: TabSRMM
-;  Version: 3.5.0.9
+;  Version: 3.5.0.10
 ;  Authors: The Miranda developers team and contributors
 ;============================================================
 [IM and group chat module for Miranda NG.]
@@ -536,9 +536,6 @@
 [Message Sessions]
 [Group chat windows]
 [Group chat log]
-[Appearance and functionality of chat room windows]
-[Appearance of the message log]
-[Chat rooms]
 [Voiced]
 [Half operators]
 [Channel operators]
@@ -550,6 +547,9 @@
 [Fields background]
 [Nick list background]
 [Group chat log background]
+[Appearance and functionality of chat room windows]
+[Appearance of the message log]
+[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).]
@@ -580,6 +580,10 @@
 [No markers]
 [Show as icons]
 [Show as text symbols]
+[Settings]
+[Log formatting]
+[Events and filters]
+[Highlighting]
 ;file \plugins\TabSRMM\src\chat_tools.cpp
 [%s%s says:%s %s]
 ;file \plugins\TabSRMM\src\chat_window.cpp
@@ -823,10 +827,6 @@
 [Message window]
 [Load and apply]
 [Window layout tweaks]
-[Settings]
-[Log formatting]
-[Events and filters]
-[Highlighting]
 [Choose status modes]
 ;file \plugins\TabSRMM\src\msgs.cpp
 [A message delivery has failed.\nClick to open the message window.]
@@ -941,7 +941,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]
@@ -1010,7 +1009,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]