11 files changed, 47 insertions, 42 deletions

diff --git a/langpacks/english/Plugins/AddContactPlus.txt b/langpacks/english/Plugins/AddContactPlus.txt
index b0cca16ae7..9eb1e919d4 100644
--- a/langpacks/english/Plugins/AddContactPlus.txt
+++ b/langpacks/english/Plugins/AddContactPlus.txt
@@ -7,8 +7,8 @@
 ;============================================================

 [Provides the ability to quickly add new contacts.]

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

-[Add Contact]

-[Add Contact\nAdd a contact to your contact list]

+[Add contact]

+[Add contact\nAdd a contact to your contact list]

 [Account:]

 [Contact ID:]

 [Custom name:]

@@ -24,7 +24,6 @@
 [Please authorize my request and add me to your contact list.]

 [None]

 [The contact cannot be added to your contact list. Please make sure the contact ID is entered correctly.]

-[Add contact]

 [The contact cannot be added to your contact list. If you are not logged into the selected account, please try to do so. Also, make sure the contact ID is entered correctly.]

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

 [&Add contact...]

diff --git a/langpacks/english/Plugins/AutoShutdown.txt b/langpacks/english/Plugins/AutoShutdown.txt
index efc0252692..0c3904f0eb 100644
--- a/langpacks/english/Plugins/AutoShutdown.txt
+++ b/langpacks/english/Plugins/AutoShutdown.txt
@@ -16,7 +16,7 @@
 [&Ignore hidden or temporary contacts when watching for all contacts being offline]

 [Critical Shutdown Events]

 [Automatically shutdown the computer and turn the power off when one of the following occurs:]

-[&Thunderstorm warning is issued  (Weather)]

+[&Thunderstorm warning is issued (Weather)]

 [&Harddrive overheats (HDD Info)]

 [Automatic Shutdown]

 [Select the automatic shutdown event]

@@ -54,22 +54,19 @@
 ;file \plugins\AutoShutdown\src\options.cpp

 [Events]

 ;file \plugins\AutoShutdown\src\settingsdlg.cpp

-[(current: %u%%)]

 [Second(s)]

 [Minute(s)]

 [Hour(s)]

 [Day(s)]

 [Week(s)]

 [Month(s)]

+[(current: %u%%)]

 [Start/Stop automatic shutdown]

-[Stop automatic shutdown]

 [Start automatic shutdown]

+[Stop automatic shutdown]

 [Stop automatic &shutdown]

 [Automatic &shutdown...]

 ;file \plugins\AutoShutdown\src\shutdownsvc.cpp

-[Automatic Shutdown Error]

-[The shutdown process failed!\nReason: %s]

-[Unknown]

 [Miranda NG is going to be automatically closed in %u second(s).]

 [All Miranda NG protocols are going to be set to offline in %u second(s).]

 [You will be logged off automatically in %u second(s).]

@@ -79,6 +76,9 @@
 [The workstation will automatically get locked in %u second(s).]

 [All dialup connections will be closed in %u second(s).]

 [The computer will automatically be shut down in %u second(s).]

+[Automatic Shutdown Error]

+[The shutdown process failed!\nReason: %s]

+[Unknown]

 [Inititiating the shutdown process failed!\nReason: %s]

 [Close Miranda NG]

 [Set Miranda NG offline]

diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index 5ad8afee03..ded07f86ed 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -26,7 +26,7 @@
 [Dialog]

 [Status]

 [Use Advanced Dialog]

-[The Message:       (Characters:  )]

+[The Message (characters: )]

 [Default Settings]

 [Show Delivery Messages]

 [These settings are also used when sending a "Simple" pounce]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index f0036862da..02ed8af5f6 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -97,7 +97,7 @@
 [Accounts per line]

 [* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show TitleBar then pull appeared title of status bar up or down.]

 [Hold [Shift] to inverse [Right Click] behaviour]

-[[Ctrl]+[Left Click] to filter only  protocol. Click on empty space to show all]

+[[Ctrl]+[Left Click] to filter only protocol. Click on empty space to show all]

 [Set options per account]

 [Enable custom account settings]

 [Hide account completely]

diff --git a/langpacks/english/Plugins/ShlExt.txt b/langpacks/english/Plugins/ShlExt.txt
index 4e31fbcc68..4f2d1b1796 100644
--- a/langpacks/english/Plugins/ShlExt.txt
+++ b/langpacks/english/Plugins/ShlExt.txt
@@ -1,25 +1,31 @@
-#muuid {72013a26-a94c-11d6-8540-a5e62932711d}

+#muuid {7993ab24-1fda-428c-a89b-be377a10be3a}

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

-;  File: shlext.dll

-;  Module: shlext - Shell context menus for transfers

-;  Versions: 1.0.0.6-1.0.6.6

-;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=534

+;  File: ShlExt.dll

+;  Plugin: ShlExt

+;  Version: 2.2.0.1

+;  Authors: Sam Kothari, Miranda NG Team

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

-[Click 'n' send support from Explorer/Common dialogs/Desktop, Right click on a file/folder to be presented with all your Miranda contact lists and then select the profile/contact you want to send to.]

-[Problem, registration missing/deleted.]

-[Successfully created shell registration.]

-[Not Approved]

-[Approved]

-[Are you sure? this will remove all the settings stored in your database and all registry entries created for shlext to work with Explorer]

-[Disable/Remove shlext]

-[Shell context menus]

+[Windows Explorer extension for Miranda NG.]

+;file \plugins\ShellExt\res\shldlgs.rc

 [Display contacts in their assigned groups (if any)]

 [Only if/when the contact list is using them]

 [Display hidden, ignored or temporary contacts]

+[Menus]

 [Shell Status]

+[Shell context menus]

 [Do not display the profile name in use]

-[Contact Status]

 [Show contacts that you have set privacy rules for]

+[Remove]

 [Do not show status icons in menus]

 [Do not show contacts that are offline, even if my contact list does]

-[Shell context menus for transfers]

+;file \plugins\ShellExt\src\options.cpp

+[Problem, registration missing/deleted.]

+[Successfully created shell registration.]

+[Not Approved]

+[Approved]

+[Are you sure? this will remove all the settings stored in your database && all registry entries created for shlext to work with Explorer]

+[Disable/Remove shlext]

+;file \plugins\ShellExt\src\shlcom.cpp

+[Miranda]

+[Recently]

+[Clear entries]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 595a57080a..a72adcb8fd 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -96,7 +96,7 @@
 [Tip: To use a custom size you can always drag the bottom edge of the panel]

 [Other options]

 [Note: All settings are applied immediately]

-[The container is using private settings. The panel  height  will not be shared with other containers.]

+[The container is using private settings. The panel height will not be shared with other containers.]

 [Show picture for this contact]

 [Advanced tweaks]

 [Message send timeout]

@@ -208,13 +208,13 @@
 [Global message log display]

 [Typing Notification]

 [Send typing notifications to the following users when you are typing a message to the them:]

-[          Show typing notifications in the message window]

+[        Show typing notifications in the message window]

 [Flash window once on typing events (only if flashing enabled)]

-[          Show typing notifications in the contact list and tray]

+[        Show typing notifications in the contact list and tray]

 [Show typing notification when message dialog is open]

 [Show typing notification when no message dialog is open]

 [Show balloon tooltip in the system tray]

-[          Show popups when a user is typing]

+[        Show popups when a user is typing]

 [More about typing notifications]

 [Tab options]

 [Miscellaneous options]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index ce110f5cc1..fe1b666f13 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -40,9 +40,9 @@
 [OK]

 [Enter the PIN provided by Twitter to complete your sign in. This is a one time process until you recreate your Miranda Twitter account.]

 ;file \protocols\Twitter\src\connection.cpp

-[OAuth variables are out of sequence, they have been reset.  Please reconnect and reauthorise Miranda to Twitter.com (do the PIN stuff again)]

-[Failed to get Twitter Access Tokens, please go offline and try again.  If this keeps happening, check your internet connection.]

-[You're missing the Nick key in the database.  This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc).  To fix it either add it manually or reset your twitter account in the miranda account options]

+[OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorise Miranda to Twitter.com (do the PIN stuff again)]

+[Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

+[You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your twitter account in the miranda account options]

 ;file \protocols\Twitter\src\proto.cpp

 [Avatars]

 [Send Tweet...]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 5a248f306e..a0fb4c5a91 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -167,7 +167,7 @@
 [Contact Information]

 [Contact History]

 [Select Modules]

-[Check the Modules in the TreeView which you want to export for the contact. To add    the file as a new list entry later you need to export at least the protocol module.]

+[Check the Modules in the TreeView which you want to export for the contact. To add the file as a new list entry later you need to export at least the protocol module.]

 [Check all]

 [Uncheck all]

 [&Export]

diff --git a/langpacks/english/Plugins/Weather.txt b/langpacks/english/Plugins/Weather.txt
index 59520e3ece..be6fd42b2e 100644
--- a/langpacks/english/Plugins/Weather.txt
+++ b/langpacks/english/Plugins/Weather.txt
@@ -111,7 +111,7 @@
 [More...]

 [Weather Protocol INI Setup]

 [Weather Protocol INI Setup\nInstall and load your weather ini file here]

-[Weather Protocol cannot find any weather INI file stored in your computer.  To setup weather INI and add weather stations, please follow the steps:]

+[Weather Protocol cannot find any weather INI file stored in your computer. To setup weather INI and add weather stations, please follow the steps:]

 [Click here to download a weather ini file from Miranda file listing]

 [Extract the weather ini file from archive to this directory]

 [Click here to load the data from the new ini file into memory]

@@ -181,7 +181,7 @@
 ;file \plugins\Weather\src\weather_contacts.cpp

 [Weather condition was not logged.]

 [The URL for complete forcast have not been set. You can set it from the Edit Settings dialog.]

-[The URL for weather map have not been set.  You can set it from the Edit Settings dialog.]

+[The URL for weather map have not been set. You can set it from the Edit Settings dialog.]

 [Get city name from ID]

 [Weather INI information]

 [Browse]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 06191b27d9..e144903dd1 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -64,7 +64,7 @@
 [YAMN General Options]

 [TopToolBar button "Check mail"]

 [Enable YAMN Main Menu]

-[Show YAMN as a Protocol  (Require Restart)]

+[Show YAMN as a Protocol (Require Restart)]

 [MailBrowser Options]

 [Enable Close on Delete Button]

 [Show long localised date]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index bb3e9e71bd..b3e16282ea 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -121,9 +121,9 @@
 [From: %s\nSubject: %s]

 [Yahoo System Message]

 [Yahoo Ping Error]

-[Could not log into Yahoo service - username not recognised.  Please verify that your username is correctly typed.]

-[Could not log into Yahoo service - password incorrect.  Please verify that your username and password are correctly typed.]

-[Could not log into Yahoo service.  Your account has been locked.\nVisit %s to reactivate it.]

+[Could not log into Yahoo service - username not recognised. Please verify that your username is correctly typed.]

+[Could not log into Yahoo service - password incorrect. Please verify that your username and password are correctly typed.]

+[Could not log into Yahoo service. Your account has been locked.\nVisit %s to reactivate it.]

 [You have been logged out of the yahoo service, possibly due to a duplicate login.]

 [Could not connect to the Yahoo service. Check your server/port and proxy settings.]

 [Could not log in, unknown reason: %d.]

@@ -132,7 +132,7 @@
 [%s is not available for the conference]

 [%s is already ignored]

 [%s is not in the ignore list]

-[%s is in buddy list - cannot ignore ]

+[%s is in buddy list - cannot ignore]

 [System Error: %s]

 [Server Connection Error: %s]

-[Could not connect to Yahoo server.  Please verify that you are connected to the net and the pager host and port are correctly entered.]

+[Could not connect to Yahoo server. Please verify that you are connected to the net and the pager host and port are correctly entered.]