langpacks/english: update

51 files changed, 109 insertions, 163 deletions

diff --git a/langpacks/english/Plugins/AvatarHistory.txt b/langpacks/english/Plugins/AvatarHistory.txt
index 4b938c43e1..e271bd9901 100644
--- a/langpacks/english/Plugins/AvatarHistory.txt
+++ b/langpacks/english/Plugins/AvatarHistory.txt
@@ -25,8 +25,8 @@
 [Text color]

 [Use Windows colors]

 [Use default colors]

-[Delay]

-[From popup plugin]

+[Timeout]

+[Default]

 [Custom]

 [Permanent]

 [Actions]

diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index c9fdfeff67..1f5a110c85 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -24,8 +24,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[On the phone]

-[Out to lunch]

 [Preview]

 ;file \plugins\BASS_interface\src\Main.cpp

 [Un4seen's BASS version: %d.%d.%d.%d]

diff --git a/langpacks/english/Plugins/BuddyExpectator.txt b/langpacks/english/Plugins/BuddyExpectator.txt
index 958062e73c..4fb538faa6 100644
--- a/langpacks/english/Plugins/BuddyExpectator.txt
+++ b/langpacks/english/Plugins/BuddyExpectator.txt
@@ -22,7 +22,7 @@
 [Colors]

 [Background]

 [Text]

-[Use Popups colors]

+[Use default colors]

 [Use Windows colors]

 [Delay]

 [Default]

diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index 98beb5ea69..6f427b08b2 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -44,8 +44,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[On the phone]

-[Out to lunch]

 [Send If Their Status changes]

 [From Offline]

 [To Online]

@@ -55,8 +53,6 @@
 [To Do not disturb]

 [To Free for chat]

 [To Invisible]

-[To On the phone]

-[To Out to lunch]

 [The Message    (%d Characters)]

 [error......]

 [Couldn't allocate enough memory]

diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index f9620c0400..feb80e57aa 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -26,12 +26,11 @@
 [Change active keyboard layout in system]

 [Colors]

 [Use default colors]

-[Windows colors]

-[Custom colors]

+[Use Windows colors]

+[Use custom colors]

 [Back]

 [Text]

 [Timeout]

-[From popup plugin]

 [Permanent]

 [Custom]

 [On left click]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index 1d816e023d..c5bbf7ad8e 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -96,8 +96,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[Out to lunch]

-[On the phone]

 [Group: %name% %count% [%mode%]]

 [Divider: %s]

 [Info: %s]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index c7a2320af6..65efec137e 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -339,8 +339,6 @@
 [Occupied contacts]

 [Free for chat contacts]

 [Invisible contacts]

-[On the phone contacts]

-[Out to lunch contacts]

 [Offline contacts]

 [Online contacts to whom you have a different visibility]

 [Offline contacts to whom you have a different visibility]

@@ -372,8 +370,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[Out to lunch]

-[On the phone]

 [Name]

 [Name (use locale settings)]

 [Last message time]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index fe840236bf..2f9a138903 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -217,8 +217,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[Out to lunch]

-[On the phone]

 [Always left]

 [Always right]

 [Automatic (RTL)]

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index bb610c4799..6ee96fa8fa 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -10,7 +10,7 @@
 [Could not initialize CmdLine plugin properly]

 [Error]

 ;file \plugins\CmdLine\src\mimcmd_data.h

-[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible, onthephone, outtolunch.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.]

+[Changes account status either globally or per account.\nUsage: status <status> [<account>].\nPossible values for <status> are: offline, online, away, dnd, na, occupied, freechat, invisible.\n<Account> is an optional parameter specifying the account to set the status for. If it's not specified then the command will issue a global status change.]

 [Changes away message either globally or per account.\nUsage: awaymsg <message> [<account>].\n<Message> is the new away message.\n<Account> is an optional parameter specifying the account to set the away message for. If not specified then the away message will be set globally.]

 [Changes extended status either globally or per account.\nUsage: xstatus <xStatus> [<account>].\n<xStatus> is the new extended status to set. Possible values are: ...\n<Account> is an optional parameter specifying the account for which extended status is set. If not specified then extended status for all accounts will be changed.\nNOTE: Not all accounts/protocols support extended status.]

 [Disables or enables popups display.\nUsage: popups (disable | enable | toggle).\nThe command will either enable or disable popups display.]

diff --git a/langpacks/english/Plugins/ConnectionNotify.txt b/langpacks/english/Plugins/ConnectionNotify.txt
index eb144e583c..9eb7d8198c 100644
--- a/langpacks/english/Plugins/ConnectionNotify.txt
+++ b/langpacks/english/Plugins/ConnectionNotify.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ConnectionNotify.dll

 ;  Plugin: Connection Notify

-;  Version: 0.1.0.5

+;  Version: 0.1.0.6

 ;  Authors: MaKaR

 ;============================================================

 [Notify with popup if some connection established]

@@ -15,7 +15,6 @@
 [sec (0 default, -1 disabled)]

 [Settings]

 [try resolve addresses]

-[Version:]

 [Show notification if no filter defined]

 [Attempt interval (ms)]

 [Delete]

@@ -32,16 +31,17 @@
 [* and ? wildcard characters also available (for port enter number or *)]

 [Remote IP:Port]

 ;file \protocols\ConnectionNotify\src\ConnectionNotify.cpp

-[Show]

-[Hide]

+[New Connection Notification]

+;file \protocols\ConnectionNotify\src\filter.cpp

 [Always show popup]

 [Never show popup]

+[First close options window]

+;file \protocols\ConnectionNotify\src\options.cpp

+[Show]

+[Hide]

 [Status]

 [Application]

 [Internal socket]

 [External socket]

 [Action]

 [Plugins]

-[New Connection Notification]

-;file \protocols\ConnectionNotify\src\filter.cpp

-[First close options window]

diff --git a/langpacks/english/Plugins/CurrencyRates.txt b/langpacks/english/Plugins/CurrencyRates.txt
index fef473e857..94b6c3d4ad 100644
--- a/langpacks/english/Plugins/CurrencyRates.txt
+++ b/langpacks/english/Plugins/CurrencyRates.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: CurrencyRates.dll

 ;  Plugin: Currency Rates

-;  Version: 0.2.0.3

+;  Version: 0.2.1.0

 ;  Authors: Dioksin

 ;============================================================

 [Shows currency rates.]

@@ -32,14 +32,14 @@
 [Convert]

 [Info provided by <a href="http://www.google.com">Google</a>]

 [Close]

-[Popup Window Settings]

+[Popup settings]

 [Colors]

 [Use default colors]

-[Use user-defined colors]

+[Use custom colors]

 [Background color]

 [Text color]

-[Delay]

-[From popup plugin]

+[Timeout]

+[Default]

 [Custom]

 [Permanent]

 [Do not add to popup's history]

diff --git a/langpacks/english/Plugins/Dbx_mdbx.txt b/langpacks/english/Plugins/Dbx_mdbx.txt
index f5c2629f50..e866c474c1 100644
--- a/langpacks/english/Plugins/Dbx_mdbx.txt
+++ b/langpacks/english/Plugins/Dbx_mdbx.txt
@@ -24,6 +24,10 @@
 [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 database in case of losing password. Recommended only for paranoid users]

 [Set password]

+;file \plugins\Dbx_mdbx\src\dbcrypt.cpp

+[Too many errors!]

+[Password is not correct!]

+[Please type in your password]

 ;file \plugins\Dbx_mdbx\src\dbintf.h

 [Change/remove password]

 ;file \plugins\Dbx_mdbx\src\ui.cpp

@@ -31,10 +35,5 @@
 [Password is too short!]

 [Passwords do not match!]

 [Database]

-[Compact]

-;file \plugins\Dbx_mdbx\src\ui.h

 [Logo]

-[Password]

-[Too many errors!]

-[Password is not correct!]

-[Please type in your password]

+[Compact]

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 3e47530369..481acdfeb4 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -42,7 +42,6 @@
 [Attempt to create database '%s' failed with error code %d]

 ;file \plugins\Db3x_mmap\src\ui.cpp

 [Logo]

-[Password]

 [Too many errors!]

 [Password is not correct!]

 [Please type in your password]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index def9ab7f90..31d4bdd660 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Facebook.dll

 ;  Plugin: Facebook

-;  Version: 0.4.2.1

+;  Version: 0.4.2.4

 ;  Authors: Michal Zelinka, Robert Pösel

 ;============================================================

 [Facebook protocol support for Miranda NG.]

@@ -199,7 +199,6 @@
 [Friendship details]

 [Conversation]

 [Message read]

-[Captcha form icon]

 [Angry]

 [Haha]

 [Like]

diff --git a/langpacks/english/Plugins/HistorySweeperLight.txt b/langpacks/english/Plugins/HistorySweeperLight.txt
index 42360fa7b7..ba7129595d 100644
--- a/langpacks/english/Plugins/HistorySweeperLight.txt
+++ b/langpacks/english/Plugins/HistorySweeperLight.txt
@@ -18,6 +18,8 @@
 [Keep all events]

 [Delete all events]

 ;file \plugins\HistorySweeperLight\src\options.cpp

+[Default Action]

+[Delete All]

 [Delete older than 1 day]

 [Delete older than 3 days]

 [Delete older than 7 days]

@@ -32,8 +34,6 @@
 [Keep 10 last events]

 [Keep 20 last events]

 [Keep 50 last events]

-[Default Action]

-[Delete All]

 [*** Default Action ***]

 [*** System History ***]

 [History]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index a540f63a6c..b29c39a8df 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ICQ.dll

 ;  Plugin: ICQ-WIM protocol

-;  Version: 0.95.11.4

+;  Version: 0.95.11.5

 ;  Authors: George Hazan

 ;============================================================

 [ICQ protocol support for Miranda NG.]

@@ -12,8 +12,9 @@
 [Sign in/sign up using phone]

 [Do not open chat windows on creation]

 [Use tray icon notifications]

-[E-mail]

 [Launch mailbox in a browser on click]

+[Show error popups]

+[Notifications]

 [If a contact goes Offline, set this status instead and cache it for given timeout in seconds (0 - disabled)]

 [After that, set this status to a contact and move it offline after specified timeout in seconds (0 - disabled)]

 [Send group chat invitation]

@@ -29,16 +30,15 @@
 [Nick:]

 [Member since:]

 [Last seen:]

-[Ignore list editor]

+[Enter ICQ Password]

+[Enter a password:]

+[Remember this session password]

 ;file \protocols\ICQ-WIM\src\groupchats.cpp

 [&Invite a user]

 [&Leave/destroy chat]

-;file \protocols\ICQ-WIM\src\ignore.cpp

-[Do you really want to remove it from ignore list?]

 ;file \protocols\ICQ-WIM\src\main.cpp

+[E-mail]

 [E-mail notification]

-[Ignore]

-[Remove Ignore]

 ;file \protocols\ICQ-WIM\src\options.cpp

 [Network]

 [General]

@@ -49,10 +49,9 @@
 ;file \protocols\ICQ-WIM\src\proto.cpp

 [%s server connection]

 [Synchronize server groups]

-[Edit ignore list]

 [UIN/e-mail/phone]

 ;file \protocols\ICQ-WIM\src\server.cpp

-[You have not entered an ICQ number.\nConfigure this in Options -> Network -> ICQ and try again.]

+[You have not entered an ICQ number or password.\nConfigure this in Options -> Network -> ICQ and try again.]

 [Connection failed.\nYour ICQ number or password was rejected (%d).]

 [Connection failed.\nThe server is temporarily unavailable (%d).]

 [Connection failed.\nUnknown error during sign on: %d]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 6c7066cd7c..53b4b65ab2 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -266,8 +266,6 @@
 [Event: Occupied]

 [Event: Do not disturb]

 [Event: Free for chat]

-[Event: On the phone]

-[Event: Out for lunch]

 [Event: Disconnect]

 [ALL NETWORKS]

 [Click to set commands that will be performed for this event]

diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index 0db96313b5..ad95ea64cb 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -2,13 +2,11 @@
 ;============================================================

 ;  File: Import.dll

 ;  Plugin: Import contacts and messages

-;  Version: 0.95.10.1

+;  Version: 0.95.11.1

 ;  Authors: Miranda team

 ;============================================================

 [Imports contacts and messages from another Miranda profile or from an external program.]

 ;file \plugins\Import\res\resource.rc

-[Choose how you would like to import:]

-[From a Miranda NG database.]

 [This wizard will help you import contacts and message history from another Miranda profile or from an external program.]

 [Click "Next" to choose the information you wish to import, or click "Cancel" to exit the wizard and continue using Miranda.]

 [It is recommended that you create a backup of your current Miranda profile before importing.]

@@ -17,8 +15,9 @@
 [Do not load the import plugin at startup again]

 [Import completed]

 [If at a future date you wish to use the wizard again, you can make it load again by going to the Plugins section of the Options dialog box.]

-[Miranda has found Miranda profiles with the following names. Please select the one you wish to import, or click "Other Profile" if your profile is not listed, or if the list is empty.]

-[&Other Profile...]

+[Choose import type:]

+[Choose directory]

+[Choose file]

 [&Filename:]

 [Now importing...]

 [Import Information Wizard]

@@ -44,6 +43,7 @@
 [File Transfers]

 [Other]

 [Choose appropriate accounts for import]

+[Choose file type:]

 [Enter file name for import:]

 [Copy]

 ;file \plugins\Import\src\import.cpp

@@ -85,11 +85,19 @@
 ;file \plugins\Import\src\main.cpp

 [&Import...]

 ;file \plugins\Import\src\miranda.cpp

+[Miranda NG database]

 [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]

+[Importing whole directory]

+;file \plugins\Import\src\patterns.cpp

+[Invalid file header]

+[Cannot parse file header, skipping file]

+[Loading file '%s'...]

+[Failed to open file <%s> for import: %d]

+[Failed to mmap file <%s> for import: %d]

+[Failed to map view of file <%s> for import: %d]

 ;file \plugins\Import\src\ui.cpp

 [Import history for %s]

 [JSON file]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index de1c2f5834..ae1e23fc2c 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -236,7 +236,6 @@
 [Supports data forms]

 [Can request and respond to events relating to the delivery, display, and composition of messages]

 [Supports vCard]

-[Supports iq-based avatars]

 [Supports XHTML formatting of chat messages]

 [Supports Jabber Browsing]

 [Can negotiate options for specific features]

@@ -277,7 +276,6 @@
 [Moderators]

 [Participants]

 [Visitors]

-[Role of %s was changed to '%s'.]

 [Change &nickname]

 [&Invite a user]

 [&Roles]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 2b6321ddef..b0215236b2 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -36,8 +36,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[On the phone]

-[Out to lunch]

 [Pending Events]

 [Remind me every]

 [minutes]

diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt
index f5a4a715d1..418f9703a3 100644
--- a/langpacks/english/Plugins/MenuEx.txt
+++ b/langpacks/english/Plugins/MenuEx.txt
@@ -25,17 +25,17 @@
 [* Use Ctrl+click to see popup with the copied text]

 [Hide contact on 'Ignore all']

 ;file \plugins\MenuItemEx\src\main.cpp

+[Always visible]

+[Never visible]

+[Copy to Account]

+[Show in list]

+[Copy xStatus Message]

 [Status message]

 [xStatus title]

 [xStatus message]

 [Listening to]

 [Activity title]

 [Activity text]

-[Show in list]

-[Always visible]

-[Never visible]

-[Copy to Account]

-[Copy xStatus Message]

 [All]

 [Messages]

 [Files]

diff --git a/langpacks/english/Plugins/MinecraftDynmap.txt b/langpacks/english/Plugins/MinecraftDynmap.txt
index faa4882cf5..ba59c5e505 100644
--- a/langpacks/english/Plugins/MinecraftDynmap.txt
+++ b/langpacks/english/Plugins/MinecraftDynmap.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MinecraftDynmap.dll

 ;  Plugin: Minecraft Dynmap protocol

-;  Version: 0.0.0.2

+;  Version: 0.1.0.1

 ;  Authors: Robert Pösel

 ;============================================================

 [Minecraft Dynmap support for Miranda NG.]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 609390543d..6d3f88fb83 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -50,8 +50,6 @@
 [&Do not disturb]

 [&Free for chat]

 [&Invisible]

-[On the &phone]

-[Out to &lunch]

 [Set my avatar...]

 [Set my nickname...]

 [Set my status message...]

diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index 96e0fc37df..b2e905e9aa 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -25,8 +25,6 @@
 [&Do not disturb]

 [&Free for chat]

 [&Invisible]

-[On the &phone]

-[Out to &lunch]

 [Autoreply format:]

 [V]

 [%extratext% is your status message]

@@ -117,10 +115,6 @@
 [I'm a chatbot!]

 [Invisible]

 [I'm hiding from the mafia.]

-[On the phone]

-[I've been on the phone since %nas_awaysince_time%, give me a sec!]

-[Out to lunch]

-[Been having ?ifgreater(?ctime(H),2,?ifgreater(?ctime(H),10,?ifgreater(?ctime(H),16,supper,dinner),breakfast),supper) since %nas_awaysince_time%.]

 ;file \plugins\NewAwaySysMod\src\AwaySys.cpp

 [Toggle Off]

 [Toggle On]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index db9f9be92d..fd8856851f 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -16,8 +16,6 @@
 [Not available]

 [Occupied]

 [Do not disturb]

-[Out to lunch]

-[On the phone]

 [Always when changing from offline]

 [Notify when contact changes]

 [Extra status]

@@ -164,14 +162,6 @@
 [(F) doesn't want to be disturbed!]

 [(U) doesn't want to be disturbed!]

 [User: Do not disturb]

-[(M) is eating something]

-[(F) is eating something]

-[(U) is eating something]

-[User: Out to lunch]

-[(M) had to answer the phone]

-[(F) had to answer the phone]

-[(U) had to answer the phone]

-[User: On the phone]

 [User: from offline (has priority!)]

 [Status message removed]

 [Status message changed]

diff --git a/langpacks/english/Plugins/NotesReminders.txt b/langpacks/english/Plugins/NotesReminders.txt
index b9d6fa63fc..3e5adc6807 100644
--- a/langpacks/english/Plugins/NotesReminders.txt
+++ b/langpacks/english/Plugins/NotesReminders.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: NotesReminders.dll

 ;  Plugin: Sticky Notes & Reminders

-;  Version: 0.2.0.2

+;  Version: 0.2.0.4

 ;  Authors: Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer

 ;============================================================

 [Sticky Notes & Reminders Implementation for Miranda NG.]

@@ -149,7 +149,6 @@
 [Day]

 [Days]

 [Week]

-[The specified time offset is invalid.]

 [&Update Reminder]

 [Every]

 [Seconds]

@@ -157,8 +156,8 @@
 [Default]

 [Alternative 1]

 [Alternative 2]

-[Reminder text]

 [Date of activation]

+[Reminder text]

 [Are you sure you want to delete all reminders?]

 [Are you sure you want to delete this reminder?]

 ;file \plugins\NotesAndReminders\src\stdafx.h

diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 3361d056ab..30e2cf9acc 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -35,8 +35,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[On the phone]

-[Out to lunch]

 [Shaking contact list options]

 [Number of moves]

 [Width of move]

diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index 00c1b230e7..8bb0a435b3 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -86,15 +86,14 @@
 ;file \plugins\PluginUpdater\src\Events.cpp

 [Plugin updater URI scheme]

 ;file \plugins\PluginUpdater\src\Notifications.cpp

-;file \plugins\PluginUpdater\src\Notifications.h

-[Close popup]

-[Do nothing]

 ;file \plugins\PluginUpdater\src\Options.cpp

 [Backup database before update]

 [Stable version (incompatible with current development version)]

 [hours]

 [days]

 [Change platform to 64-bit]

+[Close popup]

+[Do nothing]

 [Test]

 [Services]

 ;file \plugins\PluginUpdater\src\PluginUpdater.cpp

diff --git a/langpacks/english/Plugins/PopupPlus.txt b/langpacks/english/Plugins/PopupPlus.txt
index 06e895d5b3..1f083ff275 100644
--- a/langpacks/english/Plugins/PopupPlus.txt
+++ b/langpacks/english/Plugins/PopupPlus.txt
@@ -179,8 +179,6 @@
 [Occupied]

 [Do not disturb]

 [Free for chat]

-[Out to lunch]

-[On the phone]

 [Width]

 [Upper left corner]

 [Lower left corner]

diff --git a/langpacks/english/Plugins/ProxySwitch.txt b/langpacks/english/Plugins/ProxySwitch.txt
index f134db5185..efc28b763d 100644
--- a/langpacks/english/Plugins/ProxySwitch.txt
+++ b/langpacks/english/Plugins/ProxySwitch.txt
@@ -20,7 +20,7 @@
 [Enable popups]

 [Text color]

 [Background color]

-[Use default popup colors]

+[Use default 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)]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index ccdebd5b88..d0fb70248a 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -359,8 +359,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[Out to lunch]

-[On the phone]

 [Enter]

 [Double 'Enter']

 [Ctrl+Enter]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 809e5be93a..749c0d47fd 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SeenPlugin.dll

 ;  Plugin: Last seen

-;  Version: 5.0.5.4

+;  Version: 5.0.5.5

 ;  Authors: Heiko Schillinger, YB

 ;============================================================

 [Logs when a user was last seen online and which users were online while you were away.]

@@ -29,8 +29,6 @@
 [Not available]

 [Occupied]

 [Do not disturb]

-[On the phone]

-[Out to lunch]

 [Free for chat]

 [Invisible]

 [Offline]

diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt
index 3f557bc7e1..e046fdf6a3 100644
--- a/langpacks/english/Plugins/Sessions.txt
+++ b/langpacks/english/Plugins/Sessions.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Sessions.dll

 ;  Plugin: Sessions

-;  Version: 0.1.3.2

+;  Version: 0.1.4.0

 ;  Authors: MaD_CLuSTeR

 ;============================================================

 [Sessions Manager for Miranda NG.]

diff --git a/langpacks/english/Plugins/ShlExt.txt b/langpacks/english/Plugins/ShlExt.txt
index 7725c40ee1..750d14fbef 100644
--- a/langpacks/english/Plugins/ShlExt.txt
+++ b/langpacks/english/Plugins/ShlExt.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: ShlExt.dll

 ;  Plugin: Shell extension

-;  Version: 2.2.0.3

+;  Version: 2.2.0.4

 ;  Authors: Sam Kothari, Miranda NG team

 ;============================================================

 [Windows Explorer extension for Miranda NG.]

diff --git a/langpacks/english/Plugins/SimpleAR.txt b/langpacks/english/Plugins/SimpleAR.txt
index b55ae04b5b..eba196e166 100644
--- a/langpacks/english/Plugins/SimpleAR.txt
+++ b/langpacks/english/Plugins/SimpleAR.txt
@@ -18,8 +18,6 @@
 [I am currently very busy and can't spare any time to talk with you. Sorry...]

 [I am not available right now.]

 [I am now doing something, I will talk to you later.]

-[I am on the phone right now. I will get back to you very soon.]

-[I am having meal right now. I will get back to you very soon.]

 [Disable Auto&reply]

 [Enable Auto&reply]

 [Turn off Autoanswer]

diff --git a/langpacks/english/Plugins/SimpleStatusMsg.txt b/langpacks/english/Plugins/SimpleStatusMsg.txt
index e3940e582c..abc0f016d6 100644
--- a/langpacks/english/Plugins/SimpleStatusMsg.txt
+++ b/langpacks/english/Plugins/SimpleStatusMsg.txt
@@ -139,6 +139,4 @@
 [Yep, I'm here.]

 [Nope, not here.]

 [I'm hiding from the mafia.]

-[That'll be the phone.]

-[Mmm... food.]

 [idleeeeeeee]

diff --git a/langpacks/english/Plugins/SkypeWeb.txt b/langpacks/english/Plugins/SkypeWeb.txt
index 69efb642af..8da391479b 100644
--- a/langpacks/english/Plugins/SkypeWeb.txt
+++ b/langpacks/english/Plugins/SkypeWeb.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: SkypeWeb.dll

 ;  Plugin: Skype protocol (Web)

-;  Version: 0.12.3.3

+;  Version: 0.12.3.4

 ;  Authors: Miranda NG team

 ;============================================================

 [Skype protocol support for Miranda NG. Based on new Skype for Web.]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index e843e23407..57dd790f66 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.1.1

+;  Version: 0.3.1.2

 ;  Authors: Peacow, nightwish, bid, borkra

 ;============================================================

 [Smiley support for Miranda NG.]

@@ -33,9 +33,10 @@
 ;file \plugins\SmileyAdd\src\dlgboxsubclass.cpp

 [Show smiley selection window]

 ;file \plugins\SmileyAdd\src\download.cpp

+[SmileyAdd HTTP connections]

 [SmileyAdd]

+[Smiley packs' folder]

 [Smiley cache]

-[SmileyAdd HTTP connections]

 ;file \plugins\SmileyAdd\src\main.cpp

 [Button smiley]

 [Assign smiley category]

diff --git a/langpacks/english/Plugins/Spamotron.txt b/langpacks/english/Plugins/Spamotron.txt
index ed6bb6e848..d29b8ed169 100644
--- a/langpacks/english/Plugins/Spamotron.txt
+++ b/langpacks/english/Plugins/Spamotron.txt
@@ -56,8 +56,8 @@
 [Contact blocked]

 [Contact approved]

 [Challenge sent]

-[Default colors]

-[Windows colors]

+[Use default colors]

+[Use Windows colors]

 [Default timeout]

 [Preview]

 ;file \plugins\Spamotron\src\bayes.cpp

diff --git a/langpacks/english/Plugins/StatusChange.txt b/langpacks/english/Plugins/StatusChange.txt
index 961165e73d..56564875fd 100644
--- a/langpacks/english/Plugins/StatusChange.txt
+++ b/langpacks/english/Plugins/StatusChange.txt
@@ -15,8 +15,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[On the phone]

-[Out to lunch]

 [On events...]

 [Send]

 [Receive]

diff --git a/langpacks/english/Plugins/StatusManager.txt b/langpacks/english/Plugins/StatusManager.txt
index 523180e84e..8f1b7d2563 100644
--- a/langpacks/english/Plugins/StatusManager.txt
+++ b/langpacks/english/Plugins/StatusManager.txt
@@ -82,7 +82,6 @@
 [Text color]

 [Use Windows colors]

 [Use default colors]

-[Delay]

 [On left click]

 [On right click]

 [Do nothing]

@@ -95,7 +94,7 @@
 [Show when a connection attempt is made]

 [Show when reconnection has finished]

 [Show other messages]

-[From popup plugin]

+[Default]

 [Custom]

 [Permanent]

 [Show additional information in popups]

diff --git a/langpacks/english/Plugins/Steam.txt b/langpacks/english/Plugins/Steam.txt
index b2523f2bdd..6e922318a2 100644
--- a/langpacks/english/Plugins/Steam.txt
+++ b/langpacks/english/Plugins/Steam.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Steam.dll

 ;  Plugin: Steam protocol

-;  Version: 0.11.6.5

+;  Version: 0.11.6.6

 ;  Authors: Miranda NG team, Robert Pösel

 ;============================================================

 [Steam protocol support for Miranda NG.]

@@ -31,7 +31,6 @@
 [Steam game]

 ;file \protocols\Steam\src\steam_contacts.cpp

 [Looking to play]

-[Looking to trade]

 [ (Non-Steam)]

 [ on server %s]

 [Playing]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 2ca2f1613b..e598062c28 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.13

+;  Version: 3.5.0.14

 ;  Authors: The Miranda developers team and contributors

 ;============================================================

 [IM and group chat module for Miranda NG.]

@@ -87,7 +87,7 @@
 [Background]

 [Timeout (seconds, 0 = default, -1 = no timeout)]

 [Message]

-[Default colors]

+[Use default colors]

 [Others]

 [Preview]

 [Group chats]

@@ -212,21 +212,20 @@
 [Windows Aero settings]

 [Use Aero UI elements (only when not using a custom skin)]

 [Use Windows 7 task bar enhancements (restart required)]

-[Popups]

+[Colors]

 [...is &typing]

 [...stopped t&yping]

-[Back]

-[U&se Popup colors]

-[&Use Windows colors]

+[Use &default colors]

+[Use &Windows colors]

 [Only &one popup for each contact]

 [Show &entry in the main menu]

 [...is typing]

-[From popup plugin]

+[Default]

 [From protocol]

 [Permanent]

 [Custom]

 [...stopped typing]

-[Popups timeout]

+[Timeout]

 [Templates]

 [Edit template]

 [Double click a template to edit it. Select a template from the list box and click "Update preview" to show a preview message.]

@@ -318,7 +317,6 @@
 [Container options...]

 [Close container]

 [Show contact picture]

-[Default]

 [Hidden for this contact]

 [Visible for this contact]

 [Contact picture settings...]

@@ -646,6 +644,7 @@
 [New messages: ]

 [Unknown module or contact]

 [Event notifications]

+[Popups]

 ;file \plugins\TabSRMM\src\generic_msghandlers.cpp

 [Rich Edit file]

 [No status message]

@@ -816,6 +815,7 @@
 [Normal - close tab, if last tab is closed also close the window]

 [Minimize the window to the task bar]

 [Close or hide window, depends on the close button setting above]

+[Do nothing (ignore Esc key)]

 [Choose status modes]

 [General]

 [Tabs and layout]

diff --git a/langpacks/english/Plugins/TrafficCounter.txt b/langpacks/english/Plugins/TrafficCounter.txt
index c61760e121..8acaf69aec 100644
--- a/langpacks/english/Plugins/TrafficCounter.txt
+++ b/langpacks/english/Plugins/TrafficCounter.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TrafficCounter.dll

 ;  Plugin: Traffic counter

-;  Version: 0.1.1.8

+;  Version: 0.1.1.9

 ;  Authors: Ghost, Mironych

 ;============================================================

 [Adding traffic and time counters.]

@@ -19,7 +19,7 @@
 [Text color:]

 [Reset to default]

 [Popup timeout]

-[From popup plugin]

+[Default]

 [Custom]

 [Test]

 [Show now]

@@ -71,11 +71,11 @@
 [Couldn't read statistics file]

 [Traffic Counter]

 ;file \plugins\TrafficCounter\src\TrafficCounter.cpp

-[Font]

-[Show/Hide frame]

-[Hide traffic window]

-[Clear the current (Now:) value]

 [Toggle traffic counter]

 [Traffic counter notification]

 [%d kilobytes sent]

 [%d kilobytes received]

+[Font]

+[Show/Hide frame]

+[Hide traffic window]

+[Clear the current (Now:) value]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index d1b34126a4..dd05854d00 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Twitter.dll

 ;  Plugin: Twitter protocol

-;  Version: 1.3.0.2

+;  Version: 1.3.0.3

 ;  Authors: dentist, omniwolf, Thief

 ;============================================================

 [Twitter protocol support for Miranda NG.]

@@ -26,12 +26,12 @@
 [Enable popup notifications for tweets]

 [Colors]

 [Use Windows colors]

-[Use Popup colors]

+[Use default colors]

 [Use custom colors]

 [Back]

 [Text]

-[Timeouts]

-[Use default]

+[Timeout]

+[Default]

 [Custom]

 [Permanent]

 [Preview]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index c49777031b..f18a85e242 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -70,8 +70,8 @@
 [Text color]

 [Use Windows colors]

 [Use default colors]

-[Delay]

-[From popup plugin]

+[Timeout]

+[Default]

 [Custom]

 [Permanent]

 [Show reminder messages as popups (if reminder is enabled)]

@@ -259,9 +259,7 @@
 [Check anniversaries]

 ;file \plugins\UserInfoEx\src\mir_icolib.cpp

 [Main]

-[Default]

 [IM naming]

-[Password]

 [Timezone]

 [Marital status]

 [Address]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 6cc5bdbbcd..a183565b7a 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: VKontakte.dll

 ;  Plugin: VKontakte protocol

-;  Version: 0.1.9.1

+;  Version: 0.1.9.2

 ;  Authors: Miranda NG team

 ;============================================================

 [VKontakte protocol support for Miranda NG.]

@@ -105,7 +105,6 @@
 [URL:]

 [Only for friends]

 ;file \protocols\VKontakte\src\misc.cpp

-[Captcha form icon]

 [Notification icon]

 [Read message icon]

 [Visit profile icon]

@@ -160,6 +159,7 @@
 [Audio]

 [Video]

 [Link]

+[Audio message]

 [Document]

 [Wall post]

 [Product]

@@ -189,10 +189,13 @@
 [chat action not supported]

 [Unknown]

 [Enter new chat title]

+[Adding bots to MUC is not supported]

+[Not supported]

 [This chat is going to be destroyed forever with all its contents. This action cannot be undone. Are you sure?]

 [Warning]

 [You've been kicked by ]

 [Chat]

+[Kick bots is not supported]

 [&Invite a user]

 [View/change &title]

 [&Destroy room]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 8e204852d0..e9084eca5b 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Weather.dll

 ;  Plugin: Weather

-;  Version: 0.4.0.4

+;  Version: 0.4.0.5

 ;  Authors: Miranda NG team

 ;============================================================

 [Retrieves weather information and displays it in your contact list.]

@@ -77,15 +77,14 @@
 [Popup Actions]

 [Left Click]

 [Right Click]

-[Popup Delay]

-[Delay]

+[Popup timeout]

+[Timeout]

 [seconds]

-[From popup plugin]

+[Default]

 [Permanent]

 [Popup Text]

 [Popup Title]

 [Variables]

-[Default]

 [Preview]

 [Updates]

 [Alerts]

diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index 15a3e04f57..f3d9f91704 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -69,9 +69,9 @@
 [Log file:]

 [Append data to file]

 [Save as raw data]

-[Popup delay]

+[Popup timeout]

 [Delay]

-[From popup plugin]

+[Default]

 [Permanent]

 [Preview]

 [Colors]

diff --git a/langpacks/english/Plugins/WhoUsesMyFiles.txt b/langpacks/english/Plugins/WhoUsesMyFiles.txt
index ecdcbc10e1..7b446f20e3 100644
--- a/langpacks/english/Plugins/WhoUsesMyFiles.txt
+++ b/langpacks/english/Plugins/WhoUsesMyFiles.txt
@@ -9,17 +9,17 @@
 ;file \plugins\WhoUsesMyFiles\res\resource.rc

 [WUMF: Current connections]

 [Popup delay settings]

-[Popup Delay (seconds)]

+[Timeout (seconds)]

 [Background color]

 [Text color]

 [Previe&w]

 [Show infinitely]

-[Default Popup delay]

-[Choose delay time]

+[Default]

+[Custom]

 [Popup color settings]

-[Use windows colors]

-[Use default Popup colors]

-[Choose colors]

+[Use Windows colors]

+[Use default colors]

+[Use custom colors]

 [File access filter && logging settings]

 [Log into text file]

 [Log folders access]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 2ee0aad159..dca69d620c 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -55,8 +55,6 @@
 [Do not disturb]

 [Free for chat]

 [Invisible]

-[On the phone]

-[Out to lunch]

 [YAMN General Options]

 [TopToolBar button "Check mail"]

 [Enable YAMN Main Menu]

@@ -187,6 +185,6 @@
 [Cannot allocate memory space for new account]

 [Memory error]

 [Account Test]

-[Account Test (failed)]

 [You have N new mail messages]

+[Account Test (failed)]

 [Connection failed message]