langpacks/english: update

14 files changed, 60 insertions, 89 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 63e2d7725a..52cb3cb71d 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -895,11 +895,6 @@
 ;file \src\core\stdmsg\src\srmm.cpp

 [StdMsg internal log]

 ;file \src\core\stdpopup\src\options.cpp

-[Example]

-[The quick brown fox jumped over the lazy dog.]

-[Example With a Long Title]

-[Thequickbrownfoxjumpedoverthelazydog.]

-[An avatar.]

 [Bottom right]

 [Bottom left]

 [Top right]

@@ -918,6 +913,11 @@
 [Horizontal animate]

 [Vertical animate]

 [You cannot set a default timeout of 0.\nValue has been reset.]

+[Example]

+[The quick brown fox jumps over the lazy dog.]

+[Example With a Long Title]

+[Thequickbrownfoxjumpsoverthelazydog.]

+[An avatar.]

 [Settings]

 [Classes]

 ;file \src\core\stdpopup\src\services.cpp

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 6575cf9201..e8d71b4239 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: AVS.dll

 ;  Plugin: Avatar service

-;  Version: 0.98.1.3

+;  Version: 0.98.1.4

 ;  Authors: Nightwish, Pescuma

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

 [Loads and manages contact pictures for other plugins.]

diff --git a/langpacks/english/Plugins/DbChecker.txt b/langpacks/english/Plugins/DbChecker.txt
index 25c7bc08b0..f12f4c1960 100644
--- a/langpacks/english/Plugins/DbChecker.txt
+++ b/langpacks/english/Plugins/DbChecker.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: DbChecker.dll
 ;  Plugin: Database checker
-;  Version: 0.95.13.2
+;  Version: 0.95.13.3
 ;  Authors: George Hazan
 ;============================================================
 [Miranda NG Database Checker.]
@@ -15,6 +15,7 @@
 [File name:]
 [Mark all events as read]
 [Fix UTF-8 encoding in old events]
+[Remove duplicate events]
 [Error Opening Database]
 [There was an error opening the profile database given.]
 [Click Next to try opening the file again, or click Back to select a new profile database to manipulate.]
@@ -36,6 +37,7 @@
 ;file \plugins\DbChecker\src\worker.cpp
 [Database worker thread activated]
 [%d events marked as read]
+[%d duplicate events removed]
 [Processing aborted by user]
 [Elapsed time: %d sec]
 [All tasks completed but with errors (%d)]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 0f401597c0..4b6b1da5df 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Db_autobackups.dll

 ;  Plugin: Db autobackuper

-;  Version: 0.1.0.5

+;  Version: 0.1.0.6

 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons

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

 [Database autobackuper plugin.]

diff --git a/langpacks/english/Plugins/GmailNotifier.txt b/langpacks/english/Plugins/GmailNotifier.txt
index 7c1b42c7a8..40993cc13d 100644
--- a/langpacks/english/Plugins/GmailNotifier.txt
+++ b/langpacks/english/Plugins/GmailNotifier.txt
@@ -38,9 +38,8 @@
 ;file \protocols\GmailNotifier\src\main.cpp

 [Other]

 [Gmail: New thread(s)]

-[Gmail Notifier]

+[GmailNotifier]

 [&Check all Gmail inboxes]

 [&Check Gmail inbox]

 ;file \protocols\GmailNotifier\src\options.cpp

-[GmailNotifier]

 [Network]

diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 1f91cdf480..c5be0e5a17 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: IEView.dll

 ;  Plugin: IEView

-;  Version: 1.6.0.4

+;  Version: 1.6.0.5

 ;  Authors: Piotr Piastucki, Francois Mean

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

 [IE Based Chat Log.]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index bff3479b44..07fde8ce8e 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -31,7 +31,6 @@
 [Change password]

 [Priority:]

 [Use hostname as resource]

-[List of public servers]

 [Port:]

 [Use SSL]

 [Use TLS]

@@ -908,6 +907,7 @@
 [Authentication failed for %s@%s.]

 [Message redirected from: %s\r\n]

 [Unable to decrypt a carbon copy of the encrypted outgoing message]

+[Description]

 [Registration canceled]

 [Sending registration information...]

 ;file \protocols\JabberG\src\jabber_userinfo.cpp

diff --git a/langpacks/english/Plugins/NewEventNotify.txt b/langpacks/english/Plugins/NewEventNotify.txt
index 791863a38f..c0e9c661d9 100644
--- a/langpacks/english/Plugins/NewEventNotify.txt
+++ b/langpacks/english/Plugins/NewEventNotify.txt
@@ -2,54 +2,61 @@
 ;============================================================

 ;  File: NewEventNotify.dll

 ;  Plugin: NewEventNotify

-;  Version: 0.2.2.4

+;  Version: 0.2.2.5

 ;  Authors: icebreaker, Prezes, vj, vlko, Joe @ Whale

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

 [Notifies you when you receive a message, URL, file or any other event by displaying a popup.]

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

-[General options]

-[Show entry in the Popups menu]

-[Temporarily disable event popups]

-[Show preview of event in popup]

+[Limit message preview to]

+[characters]

 [Popup options]

-[Message]

-[File]

-[Others]

 [Text]

 [Background]

 [Timeout]

-[Notify me of...]

-[Left click actions]

-[Dismiss popup]

-[Open event]

-[Dismiss event]

-[Right click actions]

-[Timeout actions]

-[Message event only]

+[Message]

+[File]

+[Errors]

+[Others]

+[Preview]

 [Don't show popup when message dialog is already open]

 [Hide popup when sending new message]

 [Open reply dialog instead of reading the message]

 [Merge popups from one user]

-[Preview]

 [Show date]

 [Show time]

 [Show headers]

-[Number of begin shown messages]

+[Number of messages being shown]

 [Last message display first]

 [Last message display last]

-[Edit]

-[No popups for RSS contacts]

-[No popups for read messages]

 ;file \plugins\NewEventNotify\src\menuitem.cpp

 [Popups]

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

+[General options]

+[Show entry in the Popups menu]

+[Show preview of event in popup]

+[Disable event notifications for instant messages]

+[Disable event notifications for group chats]

+[Notify me of...]

+[Error]

+[Left click actions]

+[Dismiss popup]

+[Open event]

+[Dismiss event]

+[Right click actions]

+[Timeout actions]

+[Misc options]

+[No popups for RSS contacts]

+[No popups for read messages]

 [Event Notify]

+[Main options]

+[Message events]

 ;file \plugins\NewEventNotify\src\popup.cpp

 [Received %d contacts.]

 [ added you to the contact list]

 [ requested authorization]

 [This is a sample message event :-)]

 [This is a sample file event :-D]

+[This is a sample error event :-D]

 [This is a sample other event ;-D]

 [Plugin Test]

 [[b]Number of new message(s): %d[/b]\n]

diff --git a/langpacks/english/Plugins/NewStory.txt b/langpacks/english/Plugins/NewStory.txt
index 2fea0f8762..a774c71039 100644
--- a/langpacks/english/Plugins/NewStory.txt
+++ b/langpacks/english/Plugins/NewStory.txt
@@ -107,6 +107,7 @@
 [Reset to default]
 [Variables help]
 [Test contact]
+[The quick brown fox jumps over the lazy dog.]
 [simply % character]
 [a "hard" line break (cr/lf - will break indent)]
 [my nickname]
diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 6cc8bd3115..986f73fd66 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -33,18 +33,18 @@
 [Up]

 [Down]

 [Edit Host]

-[Cancel]

+[Contact]

 [Address:]

 [Label:]

 [TCP Connect]

 [Port:]

+[Protocols]

 [Control Protocol:]

-[Set my status to:]

 [On success, if my status is:]

+[Set my status to:]

 [Execute the following command on double-click:]

-[Contact]

-[Protocols]

 [(Optional) Command Parameters:]

+[Cancel]

 [Menu]

 [Graph]

 [Enable]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 35722644c1..26c968ee8e 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.6.1.6

+;  Version: 3.6.2.1

 ;  Authors: The Miranda developers team and contributors

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

 [IM and group chat module for Miranda NG.]

@@ -571,38 +571,6 @@
 [enabled]

 [Sending typing notifications is %s.]

 [There are %d pending send jobs. Message length: %d bytes, message length limit: %d bytes\n\n%d messages are queued for later delivery]

-;file \plugins\TabSRMM\src\eventpopups.cpp

-[One of your popup actions is set to DISMISS EVENT.\nNote that this options may have unwanted side effects as it REMOVES the event from the unread queue.\nThis may lead to events not showing up as "new". If you don't want this behavior, please review the 'Event notifications' settings page.]

-[TabSRMM warning message]

-[Incoming file]

-[No description given]

-[Incoming file (invalid format)]

-[Unknown event]

-[New messages: ]

-[Unknown module or contact]

-[Show a preview of the event]

-[Don't announce event when message dialog is open]

-[Don't announce events from RSS protocols]

-[Merge new events for the same contact into existing popup]

-[Show headers]

-[Dismiss popup]

-[Open event]

-[Dismiss event]

-[Disable event notifications for instant messages]

-[Disable event notifications for group chats]

-[Disable notifications for non-message events]

-[Remove popups for a contact when the message window is focused]

-[Remove popups for a contact when I start typing a reply]

-[Remove popups for a contact when I send a reply]

-[Disable notifications]

-[System tray icon]

-[Left click actions (popups only)]

-[Right click actions (popups only)]

-[Timeout actions (popups only)]

-[Combine notifications for the same contact]

-[Remove popups under following conditions]

-[Event notifications]

-[Popups]

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

 [No status message]

 [You cannot edit user notes when there are unsent messages]

@@ -791,6 +759,10 @@
 [Automatically copy selected text]

 [Test contact]

 [Template set editor]

+[is now offline (was online)]

+[The quick brown fox jumps over the lazy dog.]

+[Sample error message]

+[My Nickname]

 [This will reset the template set to the default built-in templates. Are you sure you want to do this?]

 [Template set was successfully reset, please close and reopen all message windows. This template editor window will now close.]

 [Message log appearance]

@@ -957,6 +929,7 @@
 [Enable &typing notification]

 [...has stopped typing.]

 [...is typing a message.]

+[Popups]

 [Contact started typing]

 [Contact stopped typing]

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

@@ -973,3 +946,4 @@
 [Closing Window|You are about to close a window with multiple tabs open.\n\nProceed?]

 [Closing options dialog|To reflect the changes done by importing a theme in the options dialog, the dialog must be closed after loading a theme \\b1 and unsaved changes might be lost\\b0 .\n\nDo you want to continue?]

 [Loading a theme|Loading a color and font theme can overwrite the settings defined by your skin.\n\nDo you want to continue?]

+[TabSRMM warning message]

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 091d1ebc09..b2fadf4dd0 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: UInfoEx.dll

 ;  Plugin: User info ext

-;  Version: 0.9.0.1

+;  Version: 0.9.0.2

 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol

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

 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]

@@ -61,7 +61,6 @@
 [Enabled]

 [Perform check on each startup]

 [Time of last check:]

-[Birthday compatibility mode:]

 [Automatically backup and keep protocol based birthdays up to date]

 [Play sound]

 [Use ignore list]

@@ -140,8 +139,6 @@
 [Subgroup menu]

 [Account menu]

 [Misc]

-[Show 'Restart' menu item]

-[Use zodiac as default avatar]

 [Country flags]

 [Use &unknown flag if country cannot be determined]

 [Show country flag as &status icon on message window]

@@ -344,8 +341,6 @@
 [All settings are reset to default values now!]

 [Reminder disabled]

 [Everything]

-[mBirthday]

-[UserInfo (default)]

 [This is the reminder message]

 [Contacts]

 [Advanced]

diff --git a/langpacks/english/Plugins/WhenWasIt.txt b/langpacks/english/Plugins/WhenWasIt.txt
index 24f957fc15..bf9de01f85 100644
--- a/langpacks/english/Plugins/WhenWasIt.txt
+++ b/langpacks/english/Plugins/WhenWasIt.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: WhenWasIt.dll

 ;  Plugin: Birthday reminder

-;  Version: 0.3.3.5

+;  Version: 0.3.3.6

 ;  Authors: Cristian Libotean

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

 [Notifies you of upcoming birthdays.]

@@ -50,7 +50,6 @@
 [Current age]

 [UserInfo module]

 [Protocol module]

-[mBirthday module]

 [Nothing]

 [Dismiss]

 [Message window]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index ba1576d811..1129a902d5 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -2,16 +2,11 @@
 ;============================================================

 ;  File: YAMN.dll

 ;  Plugin: Mail Notifier

-;  Version: 0.1.2.6

+;  Version: 0.1.2.7

 ;  Authors: y_b, tweety, majvan

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

 [Mail notifier and browser for Miranda NG. Included POP3 protocol.]

 ;file \protocols\YAMN\res\YAMN.rc

-[Installed plugins]

-[Version:]

-[Description:]

-[Copyright:]

-[Homepage:]

 [Account]

 [Name:]

 [Server:]

@@ -161,11 +156,6 @@
 [Cannot read SSL data.]

 [Error %d-%d-%d-%d:]

 ;file \protocols\YAMN\src\proto\pop3\pop3opt.cpp

-[Network]

-[Accounts]

-[General]

-[Plugins]

-[Popups]

 [No account selected]

 [Time left to next check [s]: %d]

 [New Account]

@@ -186,3 +176,7 @@
 [You have N new mail messages]

 [Account Test (failed)]

 [Connection failed message]

+[Network]

+[Accounts]

+[General]

+[Popups]