- langpacks/english: updated

git-svn-id: http://svn.miranda-ng.org/main/trunk@4467 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

14 files changed, 504 insertions, 72 deletions

diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 5757161fb6..08c731c58e 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -1868,13 +1868,6 @@
 [Enable checking]

 [Disable checking]

 [Set status message]

-[Trigger when connection loss is detected]

-[Trigger when reconnection attempt is made]

-[Trigger when successfull reconnected]

-[Trigger when giving up reconnecting]

-[Trigger when reconnected from another location]

-[Pre-conditions]

-[Trigger when a login error occurs]

 [Status]

 [Add...]

 [Delete]

@@ -1906,6 +1899,7 @@
 [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]

 ;file \plugins\StatusPlugins\AdvancedAutoAway\options.cpp

@@ -2341,9 +2335,9 @@
 [Autorun]

 [Launch Miranda NG at system startup]

 [Note: At startup Miranda NG will use current profile]

-;file \plugins\AutoRun\src\autorun.h

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

 [Services]

+;file \plugins\AutoRun\src\stdafx.h

 #muuid {9de24579-5c5c-49aa-80e8-4d38e4344e63}

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

 ;  File: AutoShutdown.dll

@@ -2965,9 +2959,6 @@
 ;============================================================

 [Anti-Boss plugin.]

 ;file \plugins\BossKeyPlus\res\BossKey.rc

-[Trigger when Miranda is hiding]

-[Trigger when Miranda is showing]

-[Pre-conditions]

 [BossKey]

 [Go to Customize -> Hotkeys to change the hotkey]

 [When I press the hotkey:]

@@ -5838,7 +5829,6 @@
 [Other icons]

 [Show client icon in message window status bar]

 ;file \plugins\FingerprintNG\src\fingerprint.cpp

-[Client icon]

 [Fingerprint]

 ;file \plugins\FingerprintNG\src\finger_groups.h

 [Client icons]

@@ -5956,7 +5946,7 @@
 ;============================================================

 ;  File: Flags.dll

 ;  Plugin: Country flags

-;  Version: 0.1.0.3

+;  Version: 0.1.0.4

 ;  Authors: H. Herkenrath

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

 [Service offering misc country utilities as flag icons and a IP-to-Country database.]

@@ -5967,8 +5957,9 @@
 [Use &IP-to-country database for country detection]

 [Use &unknown flag if the country can not be determined]

 ;file \plugins\CountryFlags\src\extraimg.cpp

-[Icons]

 [Country flag]

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

+[Icons]

 #muuid {72765a6f-b017-42f1-b30f-5e0941273a3f}

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

 ;  File: FlashAvatars.dll

@@ -8703,7 +8694,7 @@
 ;============================================================

 ;  File: Jabber.dll

 ;  Plugin: Jabber

-;  Version: 0.11.0.1

+;  Version: 0.11.0.2

 ;  Authors: 

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

 ;file \protocols\JabberG\res\jabber.rc

@@ -8956,6 +8947,51 @@
 [Links]

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

 [Bytestream Proxy not available]

+;file \protocols\JabberG\src\jabber_caps.cpp

+[Supports Service Discovery info]

+[Supports Service Discovery items list]

+[Can inform about its Jabber capabilities]

+[Supports stream initiation (for filetransfers for ex.)]

+[Supports stream initiation for file transfers]

+[Supports file transfers via SOCKS5 Bytestreams]

+[Supports file transfers via In-Band Bytestreams]

+[Supports file transfers via Out-of-Band Bytestreams]

+[Supports execution of Ad-Hoc commands]

+[Supports in-band registration]

+[Supports multi-user chat]

+[Can report chat state in a chat session]

+[Can report information about the last activity of the user]

+[Can report own version information]

+[Can report local time of the user]

+[Can send and receive ping requests]

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

+[Can request advanced processing of message stanzas]

+[Can report information about user moods]

+[Receives information about user moods]

+[Supports generic publish-subscribe functionality]

+[Supports SecureIM plugin for Miranda NG]

+[Supports MirOTR plugin for Miranda NG]

+[Supports New_GPG plugin for Miranda NG]

+[Can block communications from particular other users using Privacy lists]

+[Supports Message Receipts]

+[Can report information about the music to which a user is listening]

+[Receives information about the music to which a user is listening]

+[Supports private XML Storage (for bookmakrs and other)]

+[Supports attention requests ('nudge')]

+[Supports chat history retrieving]

+[Supports chat history management]

+[Can report information about user activity]

+[Receives information about user activity]

+[Supports Miranda NG notes extension]

+[Supports Jingle]

+[Supports Roster Exchange]

+[Supports GTalk private multi-user chat]

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

 [Enter the text you see]

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

@@ -8966,6 +9002,10 @@
 [Visitor]

 [Participant]

 [Moderator]

+[Visitors]

+[Participants]

+[Moderators]

+[Owners]

 [User %s in now banned.]

 [User %s changed status to %s with message: %s]

 [User %s changed status to %s]

@@ -9047,6 +9087,22 @@
 [Registered transports]

 [Browse local transports]

 [Browse chatrooms]

+[Contact Menu...]

+[View vCard]

+[Join chatroom]

+[Refresh Info]

+[Refresh Children]

+[Add to favorites]

+[Add to roster]

+[Bookmark chatroom]

+[Add search directory]

+[Use this proxy]

+[Commands...]

+[Logon]

+[Logoff]

+[Copy JID]

+[Copy node name]

+[Copy node information]

 ;file \protocols\JabberG\src\jabber_disco.h

 [Identities]

 [category]

@@ -9056,6 +9112,145 @@
 [Supported features]

 [Info request error]

 [Items request error]

+;file \protocols\JabberG\src\jabber_form2.cpp

+[One or more addresses for communication related to abusive traffic]

+[One or more addresses for customer feedback]

+[One or more addresses for communication related to sales and marketing]

+[One or more addresses for communication related to security concerns]

+[One or more addresses for customer support]

+[The Jabber ID of a single entity to which an operation applies]

+[The Jabber ID of one or more entities to which an operation applies]

+[The Jabber IDs associated with active sessions]

+[The number of online entities that are active]

+[A list of entities with administrative privileges]

+[The text of an announcement to be sent to active users or all users]

+[A list of entities with whom communication is blocked]

+[The number of seconds to delay before applying a change]

+[The Jabber IDs that have been disabled]

+[The number of disabled entities]

+[The email address for a user]

+[The given (first) name of a user]

+[The number of online entities that are idle]

+[The IP addresses of an account's online sessions]

+[The last login time (per XEP-0082) of a user]

+[The number of logins per minute for an account]

+[The maximum number of items associated with a search or list]

+[The text of a message of the day]

+[The names of an account's online sessions]

+[The Jabber IDs associated with online users]

+[The number of online entities]

+[The password for an account]

+[Password verification]

+[A list of registered entities]

+[The number of registered entities]

+[Number of roster items for an account]

+[The number of stanzas being sent per second by an account]

+[The family (last) name of a user]

+[The text of a welcome message]

+[A list of entities with whom communication is allowed]

+[First Name]

+[Last Name]

+[Desired Nickname]

+[Your URL]

+[Email Address]

+[FAQ Entry]

+[Whether to Allow Occupants to Invite Others]

+[Whether to Allow Occupants to Change Subject]

+[Whether to Enable Logging of Room Conversations]

+[Natural Language for Room Discussions]

+[Maximum Number of Room Occupants]

+[Whether an Make Room Members-Only]

+[Whether to Make Room Moderated]

+[Whether a Password is Required to Enter]

+[Whether to Make Room Persistent]

+[Roles for which Presence is Broadcast]

+[Whether to Allow Public Searching for Room]

+[Full List of Room Admins]

+[Short Description of Room]

+[Natural-Language Room Name]

+[Full List of Room Owners]

+[The Room Password]

+[Affiliations that May Discover Real JIDs of Occupants]

+[Precondition: node configuration with the specified access model]

+[Whether to allow the subscription]

+[The SubID of the subscription]

+[The NodeID of the relevant node]

+[The address (JID) of the subscriber]

+[Whether an entity wants to receive or disable notifications]

+[Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually]

+[The minimum number of milliseconds between sending any two notification digests]

+[The DateTime at which a leased subscription will end or has ended]

+[Whether an entity wants to receive an XMPP message body in addition to the payload format]

+[The presence states for which an entity wants to receive notifications]

+[Who may subscribe and retrieve items]

+[The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.]

+[The collection with which a node is affiliated]

+[The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine]

+[Whether to deliver payloads with event notifications]

+[Whether owners or publisher should receive replies to items]

+[Who may associate leaf nodes with a collection]

+[The list of JIDs that may associated leaf nodes with a collection]

+[The child nodes (leaf or collection) associated with a collection]

+[The maximum number of child nodes that can be associated with a collection]

+[The maximum number of items to persist]

+[The maximum payload size in bytes]

+[Whether the node is a leaf (default) or a collection]

+[Whether to notify subscribers when the node configuration changes]

+[Whether to notify subscribers when the node is deleted]

+[Whether to notify subscribers when items are removed from the node]

+[Whether to persist items to storage]

+[Whether to deliver notifications to available users only]

+[The publisher model]

+[The specific multi-user chat rooms to specify for replyroom]

+[The specific JID(s) to specify for replyto]

+[The roster group(s) allowed to subscribe and retrieve items]

+[Whether to send items to new subscribers]

+[Whether to allow subscriptions]

+[A friendly name for the node]

+[The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single]

+[The JIDs of those to contact with questions]

+[The datetime when the node was created]

+[The JID of the node creator]

+[A description of the node]

+[The default language of the node]

+[The number of subscribers to the node]

+[The JIDs of those with an affiliation of owner]

+[The JIDs of those with an affiliation of publisher]

+[The name of the node]

+[Payload type]

+[Whether to automatically authorize subscription requests]

+[Whether to automatically accept file transfers]

+[Whether to automatically open new messages]

+[Whether to automatically go offline when idle]

+[Whether to play sounds]

+[A list of pending file transfers]

+[A list of joined groupchat rooms]

+[A presence or availability status]

+[The status message text]

+[The new priority for the client]

+[Account name associated with the user]

+[Familiar name of the user]

+[Password or secret for the user]

+[Full name of the user]

+[First name or given name of the user]

+[Last name, surname, or family name of the user]

+[Email address of the user]

+[Street portion of a physical or mailing address]

+[Locality portion of a physical or mailing address]

+[Region portion of a physical or mailing address]

+[Postal code portion of a physical or mailing address]

+[Family Name]

+[Whether to accept the invitation]

+[Another resource with which to continue the session]

+[Disclosure of content, decryption keys or identities]

+[Whether may send Chat State Notifications per XEP-0085]

+[Whether allowed to use XHTML-IM formatting per XEP-0071]

+[Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)]

+[Whether allowed to log messages (i.e., whether Off-The-Record mode is required)]

+[Whether to renegotiate the session]

+[Minimum security level]

+[Whether to terminate the session]

+[Whether to enable Message Receipts per XEP-0184]

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

 [Failed to retrieve room list from server.]

 [No rooms available on server.]

@@ -9078,7 +9273,6 @@
 [Grant authorization]

 [Revoke authorization]

 [Convert to room]

-[Add to roster]

 [Login/logout]

 [Resolve nicks]

 [Send note]

@@ -9589,6 +9783,23 @@
 [<No photo>]

 [Photo]

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

+[Redirect]

+[Bad request]

+[Unauthorized]

+[Payment required]

+[Forbidden]

+[Not found]

+[Not allowed]

+[Not acceptable]

+[Registration required]

+[Request timeout]

+[Conflict]

+[Internal server error]

+[Not implemented]

+[Remote server error]

+[Service unavailable]

+[Remote server timeout]

+[Unknown error]

 [Error]

 [Unknown error message]

 [Advanced Status]

@@ -9880,13 +10091,6 @@
 [Enable checking]

 [Disable checking]

 [Set status message]

-[Trigger when connection loss is detected]

-[Trigger when reconnection attempt is made]

-[Trigger when successfull reconnected]

-[Trigger when giving up reconnecting]

-[Trigger when reconnected from another location]

-[Pre-conditions]

-[Trigger when a login error occurs]

 [Status]

 [Add...]

 [Delete]

@@ -9918,6 +10122,7 @@
 [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]

 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp

@@ -10533,9 +10738,6 @@
 [&Refresh OTR session]

 [Sto&p OTR session]

 [&Verify Fingerprint]

-;file \plugins\MirOTR\MirOTR\src\dllmain.cpp

-[OTR Info]

-[Your SRMM plugin does not support status icons. Not all OTR-functions are available!]

 ;file \plugins\MirOTR\MirOTR\src\language.h

 [Start OTR]

 [Stop OTR]

@@ -10652,13 +10854,21 @@
 [Switch to classic options]

 [Advanced]

 ;file \plugins\ModernOpt\src\modernopt.cpp

+[Home]

 [Miranda NG configuration center]

+[Accounts]

 [Setup your account information to start messaging.]

+[Style]

 [Change the look of Miranda NG according to your taste.]

+[Contacts]

 [Configure behaviour of your contact list.]

+[Chats]

 [Customize look&&feel of your chat windows here.]

+[Ignore]

 [Ban those users and events, you are annoyed with.]

+[Status]

 [Set your status messages and idle reporting.]

+[Addons]

 [Miranda NG is all about plugins. Manage all the plugins you have here.]

 [You have some unsaved changes here.\n Do you wish to apply settings before switching?]

 #muuid {e7c48bab-8ace-4cb3-8446-d4b73481f497}

@@ -12399,8 +12609,6 @@
 [Width of move]

 [Static]

 [Shaking Message Window Options]

-[Shake the contact list]

-[Shake the chat window]

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

 [You are not allowed to send too much nudge (only 1 each %d sec, %d sec left)]

 [Nudge]

@@ -14785,6 +14993,21 @@
 [That'll be the phone.]

 [Mmm...food.]

 [idleeeeeeee]

+#muuid {2925520b-6677-4658-8bad-5661d13e4692}

+;============================================================

+;  File: SkypeStatusChange.dll

+;  Plugin: SkypeStatusChange

+;  Version: 0.0.0.18

+;  Authors: Dioksin

+;============================================================

+[Skype Status Change according to miranda-Status]

+;file \plugins\SkypeStatusChange\res\SkypeStatusChange.rc

+[Synchronize status message]

+[&Check any protocol or any status to exclude it from synchronization:]

+[Synchronize if current status differs from previous one]

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

+[Change Skype Status]

+[Plugins]

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

 ;  File: smcn.dll, smcnotify.dll (???)

 ;  Module: StatusMessageChangeNotify

@@ -15196,13 +15419,6 @@
 [Enable checking]

 [Disable checking]

 [Set status message]

-[Trigger when connection loss is detected]

-[Trigger when reconnection attempt is made]

-[Trigger when successfull reconnected]

-[Trigger when giving up reconnecting]

-[Trigger when reconnected from another location]

-[Pre-conditions]

-[Trigger when a login error occurs]

 [Status]

 [Add...]

 [Delete]

@@ -15234,6 +15450,7 @@
 [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]

 ;file \plugins\StatusPlugins\StartupStatus\options.cpp

@@ -18081,7 +18298,6 @@
 [Parse the following string at startup]

 [Auto parse]

 [Parse]

-[Trigger when the following string changes]

 [Please enter your input below]

 [Don't set a contact]

 [Set to the following contact]

diff --git a/langpacks/english/Plugins/AdvancedAutoAway.txt b/langpacks/english/Plugins/AdvancedAutoAway.txt
index b2dc6bcc79..310fb5073b 100644
--- a/langpacks/english/Plugins/AdvancedAutoAway.txt
+++ b/langpacks/english/Plugins/AdvancedAutoAway.txt
@@ -102,13 +102,6 @@
 [Enable checking]

 [Disable checking]

 [Set status message]

-[Trigger when connection loss is detected]

-[Trigger when reconnection attempt is made]

-[Trigger when successfull reconnected]

-[Trigger when giving up reconnecting]

-[Trigger when reconnected from another location]

-[Pre-conditions]

-[Trigger when a login error occurs]

 [Status]

 [Add...]

 [Delete]

@@ -140,6 +133,7 @@
 [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]

 ;file \plugins\StatusPlugins\AdvancedAutoAway\options.cpp

diff --git a/langpacks/english/Plugins/AutoRun.txt b/langpacks/english/Plugins/AutoRun.txt
index dbd3d14d8a..da588c6e94 100644
--- a/langpacks/english/Plugins/AutoRun.txt
+++ b/langpacks/english/Plugins/AutoRun.txt
@@ -10,6 +10,6 @@
 [Autorun]

 [Launch Miranda NG at system startup]

 [Note: At startup Miranda NG will use current profile]

-;file \plugins\AutoRun\src\autorun.h

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

 [Services]

+;file \plugins\AutoRun\src\stdafx.h

diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 81195e47a5..8aad989b94 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -7,9 +7,6 @@
 ;============================================================

 [Anti-Boss plugin.]

 ;file \plugins\BossKeyPlus\res\BossKey.rc

-[Trigger when Miranda is hiding]

-[Trigger when Miranda is showing]

-[Pre-conditions]

 [BossKey]

 [Go to Customize -> Hotkeys to change the hotkey]

 [When I press the hotkey:]

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index 22bf6a109a..cb1ae4547e 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -34,7 +34,6 @@
 [Other icons]

 [Show client icon in message window status bar]

 ;file \plugins\FingerprintNG\src\fingerprint.cpp

-[Client icon]

 [Fingerprint]

 ;file \plugins\FingerprintNG\src\finger_groups.h

 [Client icons]

diff --git a/langpacks/english/Plugins/Flags.txt b/langpacks/english/Plugins/Flags.txt
index 8ae3d73343..64b7cec7dc 100644
--- a/langpacks/english/Plugins/Flags.txt
+++ b/langpacks/english/Plugins/Flags.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Flags.dll

 ;  Plugin: Country flags

-;  Version: 0.1.0.3

+;  Version: 0.1.0.4

 ;  Authors: H. Herkenrath

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

 [Service offering misc country utilities as flag icons and a IP-to-Country database.]

@@ -13,5 +13,6 @@
 [Use &IP-to-country database for country detection]

 [Use &unknown flag if the country can not be determined]

 ;file \plugins\CountryFlags\src\extraimg.cpp

-[Icons]

 [Country flag]

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

+[Icons]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index de2d6334e6..d54db11950 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Jabber.dll

 ;  Plugin: Jabber

-;  Version: 0.11.0.1

+;  Version: 0.11.0.2

 ;  Authors: 

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

 ;file \protocols\JabberG\res\jabber.rc

@@ -255,6 +255,51 @@
 [Links]

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

 [Bytestream Proxy not available]

+;file \protocols\JabberG\src\jabber_caps.cpp

+[Supports Service Discovery info]

+[Supports Service Discovery items list]

+[Can inform about its Jabber capabilities]

+[Supports stream initiation (for filetransfers for ex.)]

+[Supports stream initiation for file transfers]

+[Supports file transfers via SOCKS5 Bytestreams]

+[Supports file transfers via In-Band Bytestreams]

+[Supports file transfers via Out-of-Band Bytestreams]

+[Supports execution of Ad-Hoc commands]

+[Supports in-band registration]

+[Supports multi-user chat]

+[Can report chat state in a chat session]

+[Can report information about the last activity of the user]

+[Can report own version information]

+[Can report local time of the user]

+[Can send and receive ping requests]

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

+[Can request advanced processing of message stanzas]

+[Can report information about user moods]

+[Receives information about user moods]

+[Supports generic publish-subscribe functionality]

+[Supports SecureIM plugin for Miranda NG]

+[Supports MirOTR plugin for Miranda NG]

+[Supports New_GPG plugin for Miranda NG]

+[Can block communications from particular other users using Privacy lists]

+[Supports Message Receipts]

+[Can report information about the music to which a user is listening]

+[Receives information about the music to which a user is listening]

+[Supports private XML Storage (for bookmakrs and other)]

+[Supports attention requests ('nudge')]

+[Supports chat history retrieving]

+[Supports chat history management]

+[Can report information about user activity]

+[Receives information about user activity]

+[Supports Miranda NG notes extension]

+[Supports Jingle]

+[Supports Roster Exchange]

+[Supports GTalk private multi-user chat]

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

 [Enter the text you see]

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

@@ -265,6 +310,10 @@
 [Visitor]

 [Participant]

 [Moderator]

+[Visitors]

+[Participants]

+[Moderators]

+[Owners]

 [User %s in now banned.]

 [User %s changed status to %s with message: %s]

 [User %s changed status to %s]

@@ -346,6 +395,22 @@
 [Registered transports]

 [Browse local transports]

 [Browse chatrooms]

+[Contact Menu...]

+[View vCard]

+[Join chatroom]

+[Refresh Info]

+[Refresh Children]

+[Add to favorites]

+[Add to roster]

+[Bookmark chatroom]

+[Add search directory]

+[Use this proxy]

+[Commands...]

+[Logon]

+[Logoff]

+[Copy JID]

+[Copy node name]

+[Copy node information]

 ;file \protocols\JabberG\src\jabber_disco.h

 [Identities]

 [category]

@@ -355,6 +420,145 @@
 [Supported features]

 [Info request error]

 [Items request error]

+;file \protocols\JabberG\src\jabber_form2.cpp

+[One or more addresses for communication related to abusive traffic]

+[One or more addresses for customer feedback]

+[One or more addresses for communication related to sales and marketing]

+[One or more addresses for communication related to security concerns]

+[One or more addresses for customer support]

+[The Jabber ID of a single entity to which an operation applies]

+[The Jabber ID of one or more entities to which an operation applies]

+[The Jabber IDs associated with active sessions]

+[The number of online entities that are active]

+[A list of entities with administrative privileges]

+[The text of an announcement to be sent to active users or all users]

+[A list of entities with whom communication is blocked]

+[The number of seconds to delay before applying a change]

+[The Jabber IDs that have been disabled]

+[The number of disabled entities]

+[The email address for a user]

+[The given (first) name of a user]

+[The number of online entities that are idle]

+[The IP addresses of an account's online sessions]

+[The last login time (per XEP-0082) of a user]

+[The number of logins per minute for an account]

+[The maximum number of items associated with a search or list]

+[The text of a message of the day]

+[The names of an account's online sessions]

+[The Jabber IDs associated with online users]

+[The number of online entities]

+[The password for an account]

+[Password verification]

+[A list of registered entities]

+[The number of registered entities]

+[Number of roster items for an account]

+[The number of stanzas being sent per second by an account]

+[The family (last) name of a user]

+[The text of a welcome message]

+[A list of entities with whom communication is allowed]

+[First Name]

+[Last Name]

+[Desired Nickname]

+[Your URL]

+[Email Address]

+[FAQ Entry]

+[Whether to Allow Occupants to Invite Others]

+[Whether to Allow Occupants to Change Subject]

+[Whether to Enable Logging of Room Conversations]

+[Natural Language for Room Discussions]

+[Maximum Number of Room Occupants]

+[Whether an Make Room Members-Only]

+[Whether to Make Room Moderated]

+[Whether a Password is Required to Enter]

+[Whether to Make Room Persistent]

+[Roles for which Presence is Broadcast]

+[Whether to Allow Public Searching for Room]

+[Full List of Room Admins]

+[Short Description of Room]

+[Natural-Language Room Name]

+[Full List of Room Owners]

+[The Room Password]

+[Affiliations that May Discover Real JIDs of Occupants]

+[Precondition: node configuration with the specified access model]

+[Whether to allow the subscription]

+[The SubID of the subscription]

+[The NodeID of the relevant node]

+[The address (JID) of the subscriber]

+[Whether an entity wants to receive or disable notifications]

+[Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually]

+[The minimum number of milliseconds between sending any two notification digests]

+[The DateTime at which a leased subscription will end or has ended]

+[Whether an entity wants to receive an XMPP message body in addition to the payload format]

+[The presence states for which an entity wants to receive notifications]

+[Who may subscribe and retrieve items]

+[The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.]

+[The collection with which a node is affiliated]

+[The URL of an XSL transformation which can be applied to the payload format in order to generate a valid Data Forms result that the client could display using a generic Data Forms rendering engine]

+[Whether to deliver payloads with event notifications]

+[Whether owners or publisher should receive replies to items]

+[Who may associate leaf nodes with a collection]

+[The list of JIDs that may associated leaf nodes with a collection]

+[The child nodes (leaf or collection) associated with a collection]

+[The maximum number of child nodes that can be associated with a collection]

+[The maximum number of items to persist]

+[The maximum payload size in bytes]

+[Whether the node is a leaf (default) or a collection]

+[Whether to notify subscribers when the node configuration changes]

+[Whether to notify subscribers when the node is deleted]

+[Whether to notify subscribers when items are removed from the node]

+[Whether to persist items to storage]

+[Whether to deliver notifications to available users only]

+[The publisher model]

+[The specific multi-user chat rooms to specify for replyroom]

+[The specific JID(s) to specify for replyto]

+[The roster group(s) allowed to subscribe and retrieve items]

+[Whether to send items to new subscribers]

+[Whether to allow subscriptions]

+[A friendly name for the node]

+[The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single]

+[The JIDs of those to contact with questions]

+[The datetime when the node was created]

+[The JID of the node creator]

+[A description of the node]

+[The default language of the node]

+[The number of subscribers to the node]

+[The JIDs of those with an affiliation of owner]

+[The JIDs of those with an affiliation of publisher]

+[The name of the node]

+[Payload type]

+[Whether to automatically authorize subscription requests]

+[Whether to automatically accept file transfers]

+[Whether to automatically open new messages]

+[Whether to automatically go offline when idle]

+[Whether to play sounds]

+[A list of pending file transfers]

+[A list of joined groupchat rooms]

+[A presence or availability status]

+[The status message text]

+[The new priority for the client]

+[Account name associated with the user]

+[Familiar name of the user]

+[Password or secret for the user]

+[Full name of the user]

+[First name or given name of the user]

+[Last name, surname, or family name of the user]

+[Email address of the user]

+[Street portion of a physical or mailing address]

+[Locality portion of a physical or mailing address]

+[Region portion of a physical or mailing address]

+[Postal code portion of a physical or mailing address]

+[Family Name]

+[Whether to accept the invitation]

+[Another resource with which to continue the session]

+[Disclosure of content, decryption keys or identities]

+[Whether may send Chat State Notifications per XEP-0085]

+[Whether allowed to use XHTML-IM formatting per XEP-0071]

+[Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)]

+[Whether allowed to log messages (i.e., whether Off-The-Record mode is required)]

+[Whether to renegotiate the session]

+[Minimum security level]

+[Whether to terminate the session]

+[Whether to enable Message Receipts per XEP-0184]

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

 [Failed to retrieve room list from server.]

 [No rooms available on server.]

@@ -377,7 +581,6 @@
 [Grant authorization]

 [Revoke authorization]

 [Convert to room]

-[Add to roster]

 [Login/logout]

 [Resolve nicks]

 [Send note]

@@ -888,6 +1091,23 @@
 [<No photo>]

 [Photo]

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

+[Redirect]

+[Bad request]

+[Unauthorized]

+[Payment required]

+[Forbidden]

+[Not found]

+[Not allowed]

+[Not acceptable]

+[Registration required]

+[Request timeout]

+[Conflict]

+[Internal server error]

+[Not implemented]

+[Remote server error]

+[Service unavailable]

+[Remote server timeout]

+[Unknown error]

 [Error]

 [Unknown error message]

 [Advanced Status]

diff --git a/langpacks/english/Plugins/KeepStatus.txt b/langpacks/english/Plugins/KeepStatus.txt
index 43d28236d4..9f3c42093b 100644
--- a/langpacks/english/Plugins/KeepStatus.txt
+++ b/langpacks/english/Plugins/KeepStatus.txt
@@ -102,13 +102,6 @@
 [Enable checking]

 [Disable checking]

 [Set status message]

-[Trigger when connection loss is detected]

-[Trigger when reconnection attempt is made]

-[Trigger when successfull reconnected]

-[Trigger when giving up reconnecting]

-[Trigger when reconnected from another location]

-[Pre-conditions]

-[Trigger when a login error occurs]

 [Status]

 [Add...]

 [Delete]

@@ -140,6 +133,7 @@
 [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]

 ;file \plugins\StatusPlugins\KeepStatus\keepstatus.cpp

diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 012c0e78fc..9233e5a6a6 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -45,9 +45,6 @@
 [&Refresh OTR session]

 [Sto&p OTR session]

 [&Verify Fingerprint]

-;file \plugins\MirOTR\MirOTR\src\dllmain.cpp

-[OTR Info]

-[Your SRMM plugin does not support status icons. Not all OTR-functions are available!]

 ;file \plugins\MirOTR\MirOTR\src\language.h

 [Start OTR]

 [Stop OTR]

diff --git a/langpacks/english/Plugins/ModernOpt.txt b/langpacks/english/Plugins/ModernOpt.txt
index 40cf501691..4296be683f 100644
--- a/langpacks/english/Plugins/ModernOpt.txt
+++ b/langpacks/english/Plugins/ModernOpt.txt
@@ -17,12 +17,20 @@
 [Switch to classic options]

 [Advanced]

 ;file \plugins\ModernOpt\src\modernopt.cpp

+[Home]

 [Miranda NG configuration center]

+[Accounts]

 [Setup your account information to start messaging.]

+[Style]

 [Change the look of Miranda NG according to your taste.]

+[Contacts]

 [Configure behaviour of your contact list.]

+[Chats]

 [Customize look&&feel of your chat windows here.]

+[Ignore]

 [Ban those users and events, you are annoyed with.]

+[Status]

 [Set your status messages and idle reporting.]

+[Addons]

 [Miranda NG is all about plugins. Manage all the plugins you have here.]

 [You have some unsaved changes here.\n Do you wish to apply settings before switching?]

diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 85b28ebf9d..692f1b0aaa 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -42,8 +42,6 @@
 [Width of move]

 [Static]

 [Shaking Message Window Options]

-[Shake the contact list]

-[Shake the chat window]

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

 [You are not allowed to send too much nudge (only 1 each %d sec, %d sec left)]

 [Nudge]

diff --git a/langpacks/english/Plugins/SkypeStatusChange.txt b/langpacks/english/Plugins/SkypeStatusChange.txt
new file mode 100644
index 0000000000..9639b2b0cd
--- /dev/null
+++ b/langpacks/english/Plugins/SkypeStatusChange.txt
@@ -0,0 +1,15 @@
+#muuid {2925520b-6677-4658-8bad-5661d13e4692}

+;============================================================

+;  File: SkypeStatusChange.dll

+;  Plugin: SkypeStatusChange

+;  Version: 0.0.0.18

+;  Authors: Dioksin

+;============================================================

+[Skype Status Change according to miranda-Status]

+;file \plugins\SkypeStatusChange\res\SkypeStatusChange.rc

+[Synchronize status message]

+[&Check any protocol or any status to exclude it from synchronization:]

+[Synchronize if current status differs from previous one]

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

+[Change Skype Status]

+[Plugins]

diff --git a/langpacks/english/Plugins/StartupStatus.txt b/langpacks/english/Plugins/StartupStatus.txt
index f192bfcf6c..9753f5948a 100644
--- a/langpacks/english/Plugins/StartupStatus.txt
+++ b/langpacks/english/Plugins/StartupStatus.txt
@@ -102,13 +102,6 @@
 [Enable checking]

 [Disable checking]

 [Set status message]

-[Trigger when connection loss is detected]

-[Trigger when reconnection attempt is made]

-[Trigger when successfull reconnected]

-[Trigger when giving up reconnecting]

-[Trigger when reconnected from another location]

-[Pre-conditions]

-[Trigger when a login error occurs]

 [Status]

 [Add...]

 [Delete]

@@ -140,6 +133,7 @@
 [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]

 ;file \plugins\StatusPlugins\StartupStatus\options.cpp

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 24f8182c06..1ef80431e3 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -16,7 +16,6 @@
 [Parse the following string at startup]

 [Auto parse]

 [Parse]

-[Trigger when the following string changes]

 [Please enter your input below]

 [Don't set a contact]

 [Set to the following contact]