translation fix

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

5 files changed, 232 insertions, 231 deletions

diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp
index 62de2039b7..8833030c5c 100644
--- a/protocols/JabberG/src/jabber_caps.cpp
+++ b/protocols/JabberG/src/jabber_caps.cpp
@@ -28,53 +28,53 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "version.h"

 

 const JabberFeatCapPair g_JabberFeatCapPairs[] = {

-	{	_T(JABBER_FEAT_DISCO_INFO),           JABBER_CAPS_DISCO_INFO,           _T("Supports Service Discovery info") },

-	{	_T(JABBER_FEAT_DISCO_ITEMS),          JABBER_CAPS_DISCO_ITEMS,          _T("Supports Service Discovery items list") },

-	{	_T(JABBER_FEAT_ENTITY_CAPS),          JABBER_CAPS_ENTITY_CAPS,          _T("Can inform about its Jabber capabilities") },

-	{	_T(JABBER_FEAT_SI),                   JABBER_CAPS_SI,                   _T("Supports stream initiation (for filetransfers for ex.)") },

-	{	_T(JABBER_FEAT_SI_FT),                JABBER_CAPS_SI_FT,                _T("Supports stream initiation for file transfers") },

-	{	_T(JABBER_FEAT_BYTESTREAMS),          JABBER_CAPS_BYTESTREAMS,          _T("Supports file transfers via SOCKS5 Bytestreams") },

-	{	_T(JABBER_FEAT_IBB),                  JABBER_CAPS_IBB,                  _T("Supports file transfers via In-Band Bytestreams") },

-	{	_T(JABBER_FEAT_OOB),                  JABBER_CAPS_OOB,                  _T("Supports file transfers via Out-of-Band Bytestreams") },

-	{	_T(JABBER_FEAT_OOB2),                 JABBER_CAPS_OOB,                  _T("Supports file transfers via Out-of-Band Bytestreams") },

-	{	_T(JABBER_FEAT_COMMANDS),             JABBER_CAPS_COMMANDS,             _T("Supports execution of Ad-Hoc commands") },

-	{	_T(JABBER_FEAT_REGISTER),             JABBER_CAPS_REGISTER,             _T("Supports in-band registration") },

-	{	_T(JABBER_FEAT_MUC),                  JABBER_CAPS_MUC,                  _T("Supports multi-user chat") },

-	{	_T(JABBER_FEAT_CHATSTATES),           JABBER_CAPS_CHATSTATES,           _T("Can report chat state in a chat session") },

-	{	_T(JABBER_FEAT_LAST_ACTIVITY),        JABBER_CAPS_LAST_ACTIVITY,        _T("Can report information about the last activity of the user") },

-	{	_T(JABBER_FEAT_VERSION),              JABBER_CAPS_VERSION,              _T("Can report own version information") },

-	{	_T(JABBER_FEAT_ENTITY_TIME),          JABBER_CAPS_ENTITY_TIME,          _T("Can report local time of the user") },

-	{	_T(JABBER_FEAT_PING),                 JABBER_CAPS_PING,                 _T("Can send and receive ping requests") },

-	{	_T(JABBER_FEAT_DATA_FORMS),           JABBER_CAPS_DATA_FORMS,           _T("Supports data forms") },

-	{	_T(JABBER_FEAT_MESSAGE_EVENTS),       JABBER_CAPS_MESSAGE_EVENTS,       _T("Can request and respond to events relating to the delivery, display, and composition of messages") },

-	{	_T(JABBER_FEAT_VCARD_TEMP),           JABBER_CAPS_VCARD_TEMP,           _T("Supports vCard") },

-	{	_T(JABBER_FEAT_AVATAR),               JABBER_CAPS_AVATAR,               _T("Supports iq-based avatars") },

-	{	_T(JABBER_FEAT_XHTML),                JABBER_CAPS_XHTML,                _T("Supports XHTML formatting of chat messages") },

-	{	_T(JABBER_FEAT_AGENTS),               JABBER_CAPS_AGENTS,               _T("Supports Jabber Browsing") },

-	{	_T(JABBER_FEAT_BROWSE),               JABBER_CAPS_BROWSE,               _T("Supports Jabber Browsing") },

-	{	_T(JABBER_FEAT_FEATURE_NEG),          JABBER_CAPS_FEATURE_NEG,          _T("Can negotiate options for specific features") },

-	{	_T(JABBER_FEAT_AMP),                  JABBER_CAPS_AMP,                  _T("Can request advanced processing of message stanzas") },

-	{	_T(JABBER_FEAT_USER_MOOD),            JABBER_CAPS_USER_MOOD,            _T("Can report information about user moods") },

-	{	_T(JABBER_FEAT_USER_MOOD_NOTIFY),     JABBER_CAPS_USER_MOOD_NOTIFY,     _T("Receives information about user moods") },

-	{	_T(JABBER_FEAT_PUBSUB),               JABBER_CAPS_PUBSUB,               _T("Supports generic publish-subscribe functionality") },

-	{	_T(JABBER_FEAT_SECUREIM),             JABBER_CAPS_SECUREIM,             _T("Supports SecureIM plugin for Miranda NG") },

-	{	_T(JABBER_FEAT_MIROTR),               JABBER_CAPS_MIROTR,               _T("Supports MirOTR plugin for Miranda NG") },

-	{	_T(JABBER_FEAT_NEWGPG),               JABBER_CAPS_NEWGPG,               _T("Supports New_GPG plugin for Miranda NG") },

-	{	_T(JABBER_FEAT_PRIVACY_LISTS),        JABBER_CAPS_PRIVACY_LISTS,        _T("Can block communications from particular other users using Privacy lists") },

-	{	_T(JABBER_FEAT_MESSAGE_RECEIPTS),     JABBER_CAPS_MESSAGE_RECEIPTS,     _T("Supports Message Receipts") },

-	{	_T(JABBER_FEAT_USER_TUNE),            JABBER_CAPS_USER_TUNE,            _T("Can report information about the music to which a user is listening") },

-	{	_T(JABBER_FEAT_USER_TUNE_NOTIFY),     JABBER_CAPS_USER_TUNE_NOTIFY,     _T("Receives information about the music to which a user is listening") },

-	{	_T(JABBER_FEAT_PRIVATE_STORAGE),      JABBER_CAPS_PRIVATE_STORAGE,      _T("Supports private XML Storage (for bookmakrs and other)") },

-	{	_T(JABBER_FEAT_ATTENTION),            JABBER_CAPS_ATTENTION,            _T("Supports attention requests ('nudge')") },

-	{	_T(JABBER_FEAT_ATTENTION_0),          JABBER_CAPS_ATTENTION_0,          _T("Supports attention requests ('nudge')") },

-	{	_T(JABBER_FEAT_ARCHIVE_AUTO),         JABBER_CAPS_ARCHIVE_AUTO,         _T("Supports chat history retrieving") },

-	{	_T(JABBER_FEAT_ARCHIVE_MANAGE),       JABBER_CAPS_ARCHIVE_MANAGE,       _T("Supports chat history management") },

-	{	_T(JABBER_FEAT_USER_ACTIVITY),        JABBER_CAPS_USER_ACTIVITY,        _T("Can report information about user activity") },

-	{	_T(JABBER_FEAT_USER_ACTIVITY_NOTIFY), JABBER_CAPS_USER_ACTIVITY_NOTIFY, _T("Receives information about user activity") },

-	{	_T(JABBER_FEAT_MIRANDA_NOTES),        JABBER_CAPS_MIRANDA_NOTES,        _T("Supports Miranda NG notes extension") },

-	{	_T(JABBER_FEAT_JINGLE),               JABBER_CAPS_JINGLE,               _T("Supports Jingle") },

-	{	_T(JABBER_FEAT_ROSTER_EXCHANGE),      JABBER_CAPS_ROSTER_EXCHANGE,      _T("Supports Roster Exchange") },

-	{	_T(JABBER_FEAT_GTALK_PMUC),           JABBER_CAPS_GTALK_PMUC,           _T("Supports GTalk private multi-user chat") },

+	{	_T(JABBER_FEAT_DISCO_INFO),           JABBER_CAPS_DISCO_INFO,           LPGENT("Supports Service Discovery info") },

+	{	_T(JABBER_FEAT_DISCO_ITEMS),          JABBER_CAPS_DISCO_ITEMS,          LPGENT("Supports Service Discovery items list") },

+	{	_T(JABBER_FEAT_ENTITY_CAPS),          JABBER_CAPS_ENTITY_CAPS,          LPGENT("Can inform about its Jabber capabilities") },

+	{	_T(JABBER_FEAT_SI),                   JABBER_CAPS_SI,                   LPGENT("Supports stream initiation (for filetransfers for ex.)") },

+	{	_T(JABBER_FEAT_SI_FT),                JABBER_CAPS_SI_FT,                LPGENT("Supports stream initiation for file transfers") },

+	{	_T(JABBER_FEAT_BYTESTREAMS),          JABBER_CAPS_BYTESTREAMS,          LPGENT("Supports file transfers via SOCKS5 Bytestreams") },

+	{	_T(JABBER_FEAT_IBB),                  JABBER_CAPS_IBB,                  LPGENT("Supports file transfers via In-Band Bytestreams") },

+	{	_T(JABBER_FEAT_OOB),                  JABBER_CAPS_OOB,                  LPGENT("Supports file transfers via Out-of-Band Bytestreams") },

+	{	_T(JABBER_FEAT_OOB2),                 JABBER_CAPS_OOB,                  LPGENT("Supports file transfers via Out-of-Band Bytestreams") },

+	{	_T(JABBER_FEAT_COMMANDS),             JABBER_CAPS_COMMANDS,             LPGENT("Supports execution of Ad-Hoc commands") },

+	{	_T(JABBER_FEAT_REGISTER),             JABBER_CAPS_REGISTER,             LPGENT("Supports in-band registration") },

+	{	_T(JABBER_FEAT_MUC),                  JABBER_CAPS_MUC,                  LPGENT("Supports multi-user chat") },

+	{	_T(JABBER_FEAT_CHATSTATES),           JABBER_CAPS_CHATSTATES,           LPGENT("Can report chat state in a chat session") },

+	{	_T(JABBER_FEAT_LAST_ACTIVITY),        JABBER_CAPS_LAST_ACTIVITY,        LPGENT("Can report information about the last activity of the user") },

+	{	_T(JABBER_FEAT_VERSION),              JABBER_CAPS_VERSION,              LPGENT("Can report own version information") },

+	{	_T(JABBER_FEAT_ENTITY_TIME),          JABBER_CAPS_ENTITY_TIME,          LPGENT("Can report local time of the user") },

+	{	_T(JABBER_FEAT_PING),                 JABBER_CAPS_PING,                 LPGENT("Can send and receive ping requests") },

+	{	_T(JABBER_FEAT_DATA_FORMS),           JABBER_CAPS_DATA_FORMS,           LPGENT("Supports data forms") },

+	{	_T(JABBER_FEAT_MESSAGE_EVENTS),       JABBER_CAPS_MESSAGE_EVENTS,       LPGENT("Can request and respond to events relating to the delivery, display, and composition of messages") },

+	{	_T(JABBER_FEAT_VCARD_TEMP),           JABBER_CAPS_VCARD_TEMP,           LPGENT("Supports vCard") },

+	{	_T(JABBER_FEAT_AVATAR),               JABBER_CAPS_AVATAR,               LPGENT("Supports iq-based avatars") },

+	{	_T(JABBER_FEAT_XHTML),                JABBER_CAPS_XHTML,                LPGENT("Supports XHTML formatting of chat messages") },

+	{	_T(JABBER_FEAT_AGENTS),               JABBER_CAPS_AGENTS,               LPGENT("Supports Jabber Browsing") },

+	{	_T(JABBER_FEAT_BROWSE),               JABBER_CAPS_BROWSE,               LPGENT("Supports Jabber Browsing") },

+	{	_T(JABBER_FEAT_FEATURE_NEG),          JABBER_CAPS_FEATURE_NEG,          LPGENT("Can negotiate options for specific features") },

+	{	_T(JABBER_FEAT_AMP),                  JABBER_CAPS_AMP,                  LPGENT("Can request advanced processing of message stanzas") },

+	{	_T(JABBER_FEAT_USER_MOOD),            JABBER_CAPS_USER_MOOD,            LPGENT("Can report information about user moods") },

+	{	_T(JABBER_FEAT_USER_MOOD_NOTIFY),     JABBER_CAPS_USER_MOOD_NOTIFY,     LPGENT("Receives information about user moods") },

+	{	_T(JABBER_FEAT_PUBSUB),               JABBER_CAPS_PUBSUB,               LPGENT("Supports generic publish-subscribe functionality") },

+	{	_T(JABBER_FEAT_SECUREIM),             JABBER_CAPS_SECUREIM,             LPGENT("Supports SecureIM plugin for Miranda NG") },

+	{	_T(JABBER_FEAT_MIROTR),               JABBER_CAPS_MIROTR,               LPGENT("Supports MirOTR plugin for Miranda NG") },

+	{	_T(JABBER_FEAT_NEWGPG),               JABBER_CAPS_NEWGPG,               LPGENT("Supports New_GPG plugin for Miranda NG") },

+	{	_T(JABBER_FEAT_PRIVACY_LISTS),        JABBER_CAPS_PRIVACY_LISTS,        LPGENT("Can block communications from particular other users using Privacy lists") },

+	{	_T(JABBER_FEAT_MESSAGE_RECEIPTS),     JABBER_CAPS_MESSAGE_RECEIPTS,     LPGENT("Supports Message Receipts") },

+	{	_T(JABBER_FEAT_USER_TUNE),            JABBER_CAPS_USER_TUNE,            LPGENT("Can report information about the music to which a user is listening") },

+	{	_T(JABBER_FEAT_USER_TUNE_NOTIFY),     JABBER_CAPS_USER_TUNE_NOTIFY,     LPGENT("Receives information about the music to which a user is listening") },

+	{	_T(JABBER_FEAT_PRIVATE_STORAGE),      JABBER_CAPS_PRIVATE_STORAGE,      LPGENT("Supports private XML Storage (for bookmakrs and other)") },

+	{	_T(JABBER_FEAT_ATTENTION),            JABBER_CAPS_ATTENTION,            LPGENT("Supports attention requests ('nudge')") },

+	{	_T(JABBER_FEAT_ATTENTION_0),          JABBER_CAPS_ATTENTION_0,          LPGENT("Supports attention requests ('nudge')") },

+	{	_T(JABBER_FEAT_ARCHIVE_AUTO),         JABBER_CAPS_ARCHIVE_AUTO,         LPGENT("Supports chat history retrieving") },

+	{	_T(JABBER_FEAT_ARCHIVE_MANAGE),       JABBER_CAPS_ARCHIVE_MANAGE,       LPGENT("Supports chat history management") },

+	{	_T(JABBER_FEAT_USER_ACTIVITY),        JABBER_CAPS_USER_ACTIVITY,        LPGENT("Can report information about user activity") },

+	{	_T(JABBER_FEAT_USER_ACTIVITY_NOTIFY), JABBER_CAPS_USER_ACTIVITY_NOTIFY, LPGENT("Receives information about user activity") },

+	{	_T(JABBER_FEAT_MIRANDA_NOTES),        JABBER_CAPS_MIRANDA_NOTES,        LPGENT("Supports Miranda NG notes extension") },

+	{	_T(JABBER_FEAT_JINGLE),               JABBER_CAPS_JINGLE,               LPGENT("Supports Jingle") },

+	{	_T(JABBER_FEAT_ROSTER_EXCHANGE),      JABBER_CAPS_ROSTER_EXCHANGE,      LPGENT("Supports Roster Exchange") },

+	{	_T(JABBER_FEAT_GTALK_PMUC),           JABBER_CAPS_GTALK_PMUC,           LPGENT("Supports GTalk private multi-user chat") },

 	{	NULL,                                 0,                                NULL}

 };

 

diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp
index 3f6e51a2aa..c36c5dd748 100644
--- a/protocols/JabberG/src/jabber_chat.cpp
+++ b/protocols/JabberG/src/jabber_chat.cpp
@@ -100,7 +100,7 @@ static TRoleOrAffiliationInfo sttRoleItems[] =
 /////////////////////////////////////////////////////////////////////////////////////////

 // JabberGcInit - initializes the new chat

 

-static const TCHAR *sttStatuses[] = { _T("Visitors"), _T("Participants"), _T("Moderators"), _T("Owners") };

+static const TCHAR *sttStatuses[] = { LPGENT("Visitors"), LPGENT("Participants"), LPGENT("Moderators"), LPGENT("Owners") };

 

 int JabberGcGetStatus(JABBER_GC_AFFILIATION a, JABBER_GC_ROLE r)

 {

diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp
index d47e416d85..be9afd0603 100644
--- a/protocols/JabberG/src/jabber_disco.cpp
+++ b/protocols/JabberG/src/jabber_disco.cpp
@@ -1192,37 +1192,38 @@ void CJabberProto::ServiceDiscoveryShowMenu(CJabberSDNode *pNode, HTREELISTITEM
 		SD_FLG_HASUSER			= 0x100

 	};

 

-	static struct

+	struct

 	{

 		TCHAR *feature;

 		TCHAR *title;

 		int action;

 		DWORD flags;

-	} items[] =

+	}

+	static items[] =

 	{

-		{NULL,							_T("Contact Menu..."),		SD_ACT_USERMENU,			SD_FLG_NONODE},

-		{NULL,							_T("View vCard"),			SD_ACT_VCARD,				SD_FLG_NONODE},

-		{_T(JABBER_FEAT_MUC),			_T("Join chatroom"),		SD_ACT_JOIN,				SD_FLG_NORESOURCE},

-		{0},

-		{NULL,							_T("Refresh Info"),			SD_ACT_REFRESH},

-		{NULL,							_T("Refresh Children"),		SD_ACT_REFRESHCHILDREN},

-		{0},

-		{NULL,							_T("Add to favorites"),		SD_ACT_FAVORITE},

-		{NULL,							_T("Add to roster"),		SD_ACT_ROSTER,				SD_FLG_NONODE|SD_FLG_NOTONROSTER},

-		{_T(JABBER_FEAT_MUC),			_T("Bookmark chatroom"),	SD_ACT_BOOKMARK,			SD_FLG_NORESOURCE|SD_FLG_HASUSER},

-		{_T("jabber:iq:search"),		_T("Add search directory"),	SD_ACT_ADDDIRECTORY},

-		{_T(JABBER_FEAT_BYTESTREAMS),	_T("Use this proxy"),		SD_ACT_PROXY},

-		{0},

-		{_T(JABBER_FEAT_REGISTER),		_T("Register"),				SD_ACT_REGISTER},

-		{_T("jabber:iq:gateway"),		_T("Unregister"),			SD_ACT_UNREGISTER,			SD_FLG_ONROSTER|SD_FLG_SUBSCRIBED},

-		{_T(JABBER_FEAT_COMMANDS),		_T("Commands..."),			SD_ACT_ADHOC},

-		{0},

-		{_T("jabber:iq:gateway"),		_T("Logon"),				SD_ACT_LOGON,				SD_FLG_ONROSTER|SD_FLG_SUBSCRIBED|SD_FLG_ONLINE},

-		{_T("jabber:iq:gateway"),		_T("Logoff"),				SD_ACT_LOGOFF,				SD_FLG_ONROSTER|SD_FLG_SUBSCRIBED|SD_FLG_NOTONLINE},

-		{0},

-		{NULL,							_T("Copy JID"),				SD_ACT_COPYJID},

-		{NULL,							_T("Copy node name"),		SD_ACT_COPYNODE},

-		{NULL,							_T("Copy node information"),SD_ACT_COPYINFO},

+		{ NULL,                        LPGENT("Contact Menu..."),       SD_ACT_USERMENU,         SD_FLG_NONODE},

+      { NULL,                        LPGENT("View vCard"),            SD_ACT_VCARD,            SD_FLG_NONODE},

+      { _T(JABBER_FEAT_MUC),         LPGENT("Join chatroom"),         SD_ACT_JOIN,             SD_FLG_NORESOURCE},

+      {0},

+      { NULL,                        LPGENT("Refresh Info"),          SD_ACT_REFRESH},

+      { NULL,                        LPGENT("Refresh Children"),      SD_ACT_REFRESHCHILDREN},

+      {0},

+      { NULL,                        LPGENT("Add to favorites"),      SD_ACT_FAVORITE},

+      { NULL,                        LPGENT("Add to roster"),         SD_ACT_ROSTER,           SD_FLG_NONODE|SD_FLG_NOTONROSTER},

+      { _T(JABBER_FEAT_MUC),         LPGENT("Bookmark chatroom"),     SD_ACT_BOOKMARK,         SD_FLG_NORESOURCE|SD_FLG_HASUSER},

+      { _T("jabber:iq:search"),      LPGENT("Add search directory"),  SD_ACT_ADDDIRECTORY},

+      { _T(JABBER_FEAT_BYTESTREAMS), LPGENT("Use this proxy"),        SD_ACT_PROXY},

+      {0},

+      { _T(JABBER_FEAT_REGISTER),    LPGENT("Register"),              SD_ACT_REGISTER},

+      { _T("jabber:iq:gateway"),     LPGENT("Unregister"),            SD_ACT_UNREGISTER,       SD_FLG_ONROSTER|SD_FLG_SUBSCRIBED},

+      { _T(JABBER_FEAT_COMMANDS),    LPGENT("Commands..."),           SD_ACT_ADHOC},

+      {0},

+      { _T("jabber:iq:gateway"),     LPGENT("Logon"),                 SD_ACT_LOGON,            SD_FLG_ONROSTER|SD_FLG_SUBSCRIBED|SD_FLG_ONLINE},

+      { _T("jabber:iq:gateway"),     LPGENT("Logoff"),                SD_ACT_LOGOFF,           SD_FLG_ONROSTER|SD_FLG_SUBSCRIBED|SD_FLG_NOTONLINE},

+      {0},

+      { NULL,                        LPGENT("Copy JID"),              SD_ACT_COPYJID},

+      { NULL,                        LPGENT("Copy node name"),        SD_ACT_COPYNODE},

+      { NULL,                        LPGENT("Copy node information"), SD_ACT_COPYINFO},

 	};

 

 	HMENU hMenu = CreatePopupMenu();

diff --git a/protocols/JabberG/src/jabber_form2.cpp b/protocols/JabberG/src/jabber_form2.cpp
index 79314edba9..a8d62506a3 100644
--- a/protocols/JabberG/src/jabber_form2.cpp
+++ b/protocols/JabberG/src/jabber_form2.cpp
@@ -36,105 +36,105 @@ namespace NSJabberRegistry
 	// http://jabber.org/network/serverinfo

 	static TJabberDataFormRegisry_Field form_type_serverinfo[] =

 	{

-		{ _T("abuse-addresses"),		JDFT_LIST_MULTI,		_T("One or more addresses for communication related to abusive traffic") },

-		{ _T("feedback-addresses"),		JDFT_LIST_MULTI,		_T("One or more addresses for customer feedback") },

-		{ _T("sales-addresses"),		JDFT_LIST_MULTI,		_T("One or more addresses for communication related to sales and marketing") },

-		{ _T("security-addresses"),		JDFT_LIST_MULTI,		_T("One or more addresses for communication related to security concerns") },

-		{ _T("support-addresses"),		JDFT_LIST_MULTI,		_T("One or more addresses for customer support") },

+		{ _T("abuse-addresses"),		JDFT_LIST_MULTI,		LPGENT("One or more addresses for communication related to abusive traffic") },

+		{ _T("feedback-addresses"),		JDFT_LIST_MULTI,		LPGENT("One or more addresses for customer feedback") },

+		{ _T("sales-addresses"),		JDFT_LIST_MULTI,		LPGENT("One or more addresses for communication related to sales and marketing") },

+		{ _T("security-addresses"),		JDFT_LIST_MULTI,		LPGENT("One or more addresses for communication related to security concerns") },

+		{ _T("support-addresses"),		JDFT_LIST_MULTI,		LPGENT("One or more addresses for customer support") },

 	};

 

 	// http://jabber.org/protocol/admin

 	static TJabberDataFormRegisry_Field form_type_admin[] =

 	{

-		{ _T("accountjid"),				JDFT_JID_SINGLE,	_T("The Jabber ID of a single entity to which an operation applies") },

-		{ _T("accountjids"),			JDFT_JID_MULTI,		_T("The Jabber ID of one or more entities to which an operation applies") },

-		{ _T("activeuserjids"),			JDFT_JID_MULTI,		_T("The Jabber IDs associated with active sessions") },

-		{ _T("activeusersnum"),			JDFT_TEXT_SINGLE,	_T("The number of online entities that are active") },

-		{ _T("adminjids"),				JDFT_JID_MULTI,		_T("A list of entities with administrative privileges") },

-		{ _T("announcement"),			JDFT_TEXT_MULTI,	_T("The text of an announcement to be sent to active users or all users") },

-		{ _T("blacklistjids"),			JDFT_JID_MULTI,		_T("A list of entities with whom communication is blocked") },

-		{ _T("delay"),					JDFT_LIST_MULTI,	_T("The number of seconds to delay before applying a change") },

-		{ _T("disableduserjids"),		JDFT_JID_MULTI,		_T("The Jabber IDs that have been disabled") },

-		{ _T("disabledusersnum"),		JDFT_TEXT_SINGLE,	_T("The number of disabled entities") },

-		{ _T("email"),					JDFT_TEXT_SINGLE,	_T("The email address for a user") },

-		{ _T("given_name"),				JDFT_TEXT_SINGLE,	_T("The given (first) name of a user") },

-		{ _T("idleusersnum"),			JDFT_TEXT_SINGLE,	_T("The number of online entities that are idle") },

-		{ _T("ipaddresses"),			JDFT_LIST_MULTI,	_T("The IP addresses of an account's online sessions") },

-		{ _T("lastlogin"),				JDFT_TEXT_SINGLE,	_T("The last login time (per XEP-0082) of a user") },

-		{ _T("loginsperminute"),		JDFT_TEXT_SINGLE,	_T("The number of logins per minute for an account") },

-		{ _T("max_items"),				JDFT_LIST_SINGLE,	_T("The maximum number of items associated with a search or list") },

-		{ _T("motd"),					JDFT_TEXT_MULTI,	_T("The text of a message of the day") },

-		{ _T("onlineresources"),		JDFT_TEXT_SINGLE,	_T("The names of an account's online sessions") },

-		{ _T("onlineuserjids"),			JDFT_JID_MULTI,		_T("The Jabber IDs associated with online users") },

-		{ _T("onlineusersnum"),			JDFT_TEXT_SINGLE,	_T("The number of online entities") },

-		{ _T("password"),				JDFT_TEXT_PRIVATE,	_T("The password for an account") },

-		{ _T("password-verify"),		JDFT_TEXT_PRIVATE,	_T("Password verification") },

-		{ _T("registereduserjids"),		JDFT_JID_MULTI,		_T("A list of registered entities") },

-		{ _T("registeredusersnum"),		JDFT_TEXT_SINGLE,	_T("The number of registered entities") },

-		{ _T("rostersize"),				JDFT_TEXT_SINGLE,	_T("Number of roster items for an account") },

-		{ _T("stanzaspersecond"),		JDFT_TEXT_SINGLE,	_T("The number of stanzas being sent per second by an account") },

-		{ _T("surname"),				JDFT_TEXT_SINGLE,	_T("The family (last) name of a user") },

-		{ _T("welcome"),				JDFT_TEXT_MULTI,	_T("The text of a welcome message") },

-		{ _T("whitelistjids"),			JDFT_JID_MULTI,		_T("A list of entities with whom communication is allowed") },

+		{ _T("accountjid"),				JDFT_JID_SINGLE,	LPGENT("The Jabber ID of a single entity to which an operation applies") },

+		{ _T("accountjids"),			JDFT_JID_MULTI,		LPGENT("The Jabber ID of one or more entities to which an operation applies") },

+		{ _T("activeuserjids"),			JDFT_JID_MULTI,		LPGENT("The Jabber IDs associated with active sessions") },

+		{ _T("activeusersnum"),			JDFT_TEXT_SINGLE,	LPGENT("The number of online entities that are active") },

+		{ _T("adminjids"),				JDFT_JID_MULTI,		LPGENT("A list of entities with administrative privileges") },

+		{ _T("announcement"),			JDFT_TEXT_MULTI,	LPGENT("The text of an announcement to be sent to active users or all users") },

+		{ _T("blacklistjids"),			JDFT_JID_MULTI,		LPGENT("A list of entities with whom communication is blocked") },

+		{ _T("delay"),					JDFT_LIST_MULTI,	LPGENT("The number of seconds to delay before applying a change") },

+		{ _T("disableduserjids"),		JDFT_JID_MULTI,		LPGENT("The Jabber IDs that have been disabled") },

+		{ _T("disabledusersnum"),		JDFT_TEXT_SINGLE,	LPGENT("The number of disabled entities") },

+		{ _T("email"),					JDFT_TEXT_SINGLE,	LPGENT("The email address for a user") },

+		{ _T("given_name"),				JDFT_TEXT_SINGLE,	LPGENT("The given (first) name of a user") },

+		{ _T("idleusersnum"),			JDFT_TEXT_SINGLE,	LPGENT("The number of online entities that are idle") },

+		{ _T("ipaddresses"),			JDFT_LIST_MULTI,	LPGENT("The IP addresses of an account's online sessions") },

+		{ _T("lastlogin"),				JDFT_TEXT_SINGLE,	LPGENT("The last login time (per XEP-0082) of a user") },

+		{ _T("loginsperminute"),		JDFT_TEXT_SINGLE,	LPGENT("The number of logins per minute for an account") },

+		{ _T("max_items"),				JDFT_LIST_SINGLE,	LPGENT("The maximum number of items associated with a search or list") },

+		{ _T("motd"),					JDFT_TEXT_MULTI,	LPGENT("The text of a message of the day") },

+		{ _T("onlineresources"),		JDFT_TEXT_SINGLE,	LPGENT("The names of an account's online sessions") },

+		{ _T("onlineuserjids"),			JDFT_JID_MULTI,		LPGENT("The Jabber IDs associated with online users") },

+		{ _T("onlineusersnum"),			JDFT_TEXT_SINGLE,	LPGENT("The number of online entities") },

+		{ _T("password"),				JDFT_TEXT_PRIVATE,	LPGENT("The password for an account") },

+		{ _T("password-verify"),		JDFT_TEXT_PRIVATE,	LPGENT("Password verification") },

+		{ _T("registereduserjids"),		JDFT_JID_MULTI,		LPGENT("A list of registered entities") },

+		{ _T("registeredusersnum"),		JDFT_TEXT_SINGLE,	LPGENT("The number of registered entities") },

+		{ _T("rostersize"),				JDFT_TEXT_SINGLE,	LPGENT("Number of roster items for an account") },

+		{ _T("stanzaspersecond"),		JDFT_TEXT_SINGLE,	LPGENT("The number of stanzas being sent per second by an account") },

+		{ _T("surname"),				JDFT_TEXT_SINGLE,	LPGENT("The family (last) name of a user") },

+		{ _T("welcome"),				JDFT_TEXT_MULTI,	LPGENT("The text of a welcome message") },

+		{ _T("whitelistjids"),			JDFT_JID_MULTI,		LPGENT("A list of entities with whom communication is allowed") },

 	};

 

 	// http://jabber.org/protocol/muc#register

 	static TJabberDataFormRegisry_Field form_type_muc_register[] =

 	{

-		{ _T("muc#register_first"),		JDFT_TEXT_SINGLE,	_T("First Name") },

-		{ _T("muc#register_last"),		JDFT_TEXT_SINGLE,	_T("Last Name") },

-		{ _T("muc#register_roomnick"),	JDFT_TEXT_SINGLE,	_T("Desired Nickname") },

-		{ _T("muc#register_url"),		JDFT_TEXT_SINGLE,	_T("Your URL") },

-		{ _T("muc#register_email"),		JDFT_TEXT_SINGLE,	_T("Email Address") },

-		{ _T("muc#register_faqentry"),	JDFT_TEXT_MULTI,	_T("FAQ Entry") },

+		{ _T("muc#register_first"),		JDFT_TEXT_SINGLE,	LPGENT("First Name") },

+		{ _T("muc#register_last"),		JDFT_TEXT_SINGLE,	LPGENT("Last Name") },

+		{ _T("muc#register_roomnick"),	JDFT_TEXT_SINGLE,	LPGENT("Desired Nickname") },

+		{ _T("muc#register_url"),		JDFT_TEXT_SINGLE,	LPGENT("Your URL") },

+		{ _T("muc#register_email"),		JDFT_TEXT_SINGLE,	LPGENT("Email Address") },

+		{ _T("muc#register_faqentry"),	JDFT_TEXT_MULTI,	LPGENT("FAQ Entry") },

 	};

 

 	// http://jabber.org/protocol/muc#roomconfig

 	static TJabberDataFormRegisry_Field form_type_muc_roomconfig[] =

 	{

-		{ _T("muc#roomconfig_allowinvites"),			JDFT_BOOLEAN,		_T("Whether to Allow Occupants to Invite Others") },

-		{ _T("muc#roomconfig_changesubject"),			JDFT_BOOLEAN,		_T("Whether to Allow Occupants to Change Subject") },

-		{ _T("muc#roomconfig_enablelogging"),			JDFT_BOOLEAN,		_T("Whether to Enable Logging of Room Conversations") },

-		{ _T("muc#roomconfig_lang"),					JDFT_TEXT_SINGLE,	_T("Natural Language for Room Discussions") },

-		{ _T("muc#roomconfig_maxusers"),				JDFT_LIST_SINGLE,	_T("Maximum Number of Room Occupants") },

-		{ _T("muc#roomconfig_membersonly"),				JDFT_BOOLEAN,		_T("Whether an Make Room Members-Only") },

-		{ _T("muc#roomconfig_moderatedroom"),			JDFT_BOOLEAN,		_T("Whether to Make Room Moderated") },

-		{ _T("muc#roomconfig_passwordprotectedroom"),	JDFT_BOOLEAN,		_T("Whether a Password is Required to Enter") },

-		{ _T("muc#roomconfig_persistentroom"),			JDFT_BOOLEAN,		_T("Whether to Make Room Persistent") },

-		{ _T("muc#roomconfig_presencebroadcast"),		JDFT_LIST_MULTI,	_T("Roles for which Presence is Broadcast") },

-		{ _T("muc#roomconfig_publicroom"),				JDFT_BOOLEAN,		_T("Whether to Allow Public Searching for Room") },

-		{ _T("muc#roomconfig_roomadmins"),				JDFT_JID_MULTI,		_T("Full List of Room Admins") },

-		{ _T("muc#roomconfig_roomdesc"),				JDFT_TEXT_SINGLE,	_T("Short Description of Room") },

-		{ _T("muc#roomconfig_roomname"),				JDFT_TEXT_SINGLE,	_T("Natural-Language Room Name") },

-		{ _T("muc#roomconfig_roomowners"),				JDFT_JID_MULTI,		_T("Full List of Room Owners") },

-		{ _T("muc#roomconfig_roomsecret"),				JDFT_TEXT_PRIVATE,	_T("The Room Password") },

-		{ _T("muc#roomconfig_whois"),					JDFT_LIST_SINGLE,	_T("Affiliations that May Discover Real JIDs of Occupants") },

+		{ _T("muc#roomconfig_allowinvites"),			JDFT_BOOLEAN,		LPGENT("Whether to Allow Occupants to Invite Others") },

+		{ _T("muc#roomconfig_changesubject"),			JDFT_BOOLEAN,		LPGENT("Whether to Allow Occupants to Change Subject") },

+		{ _T("muc#roomconfig_enablelogging"),			JDFT_BOOLEAN,		LPGENT("Whether to Enable Logging of Room Conversations") },

+		{ _T("muc#roomconfig_lang"),					JDFT_TEXT_SINGLE,	LPGENT("Natural Language for Room Discussions") },

+		{ _T("muc#roomconfig_maxusers"),				JDFT_LIST_SINGLE,	LPGENT("Maximum Number of Room Occupants") },

+		{ _T("muc#roomconfig_membersonly"),				JDFT_BOOLEAN,		LPGENT("Whether an Make Room Members-Only") },

+		{ _T("muc#roomconfig_moderatedroom"),			JDFT_BOOLEAN,		LPGENT("Whether to Make Room Moderated") },

+		{ _T("muc#roomconfig_passwordprotectedroom"),	JDFT_BOOLEAN,		LPGENT("Whether a Password is Required to Enter") },

+		{ _T("muc#roomconfig_persistentroom"),			JDFT_BOOLEAN,		LPGENT("Whether to Make Room Persistent") },

+		{ _T("muc#roomconfig_presencebroadcast"),		JDFT_LIST_MULTI,	LPGENT("Roles for which Presence is Broadcast") },

+		{ _T("muc#roomconfig_publicroom"),				JDFT_BOOLEAN,		LPGENT("Whether to Allow Public Searching for Room") },

+		{ _T("muc#roomconfig_roomadmins"),				JDFT_JID_MULTI,		LPGENT("Full List of Room Admins") },

+		{ _T("muc#roomconfig_roomdesc"),				JDFT_TEXT_SINGLE,	LPGENT("Short Description of Room") },

+		{ _T("muc#roomconfig_roomname"),				JDFT_TEXT_SINGLE,	LPGENT("Natural-Language Room Name") },

+		{ _T("muc#roomconfig_roomowners"),				JDFT_JID_MULTI,		LPGENT("Full List of Room Owners") },

+		{ _T("muc#roomconfig_roomsecret"),				JDFT_TEXT_PRIVATE,	LPGENT("The Room Password") },

+		{ _T("muc#roomconfig_whois"),					JDFT_LIST_SINGLE,	LPGENT("Affiliations that May Discover Real JIDs of Occupants") },

 	};

 

 	// http://jabber.org/protocol/pubsub#publish-options

 	static TJabberDataFormRegisry_Field form_type_publish_options[] =

 	{

-		{ _T("pubsub#access_model"),	JDFT_LIST_SINGLE,	_T("Precondition: node configuration with the specified access model") },

+		{ _T("pubsub#access_model"),	JDFT_LIST_SINGLE,	LPGENT("Precondition: node configuration with the specified access model") },

 	};

 

 	// http://jabber.org/protocol/pubsub#subscribe_authorization

 	static TJabberDataFormRegisry_Field form_type_subscribe_auth[] =

 	{

-		{ _T("pubsub#allow"),			JDFT_BOOLEAN,		_T("Whether to allow the subscription") },

-		{ _T("pubsub#subid"),			JDFT_TEXT_SINGLE,	_T("The SubID of the subscription") },

-		{ _T("pubsub#node"),			JDFT_TEXT_SINGLE,	_T("The NodeID of the relevant node") },

-		{ _T("pubsub#subscriber_jid"),	JDFT_JID_SINGLE,	_T("The address (JID) of the subscriber") },

+		{ _T("pubsub#allow"),			JDFT_BOOLEAN,		LPGENT("Whether to allow the subscription") },

+		{ _T("pubsub#subid"),			JDFT_TEXT_SINGLE,	LPGENT("The SubID of the subscription") },

+		{ _T("pubsub#node"),			JDFT_TEXT_SINGLE,	LPGENT("The NodeID of the relevant node") },

+		{ _T("pubsub#subscriber_jid"),	JDFT_JID_SINGLE,	LPGENT("The address (JID) of the subscriber") },

 	};

 

 	// http://jabber.org/protocol/pubsub#subscribe_options

 	static TJabberDataFormRegisry_Field form_type_subscribe_options[] =

 	{

-		{ _T("pubsub#deliver"),				JDFT_BOOLEAN,		_T("Whether an entity wants to receive or disable notifications") },

-		{ _T("pubsub#digest"),				JDFT_BOOLEAN,		_T("Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually") },

-		{ _T("pubsub#digest_frequency"),	JDFT_TEXT_SINGLE,	_T("The minimum number of milliseconds between sending any two notification digests") },

-		{ _T("pubsub#expire"),				JDFT_TEXT_SINGLE,	_T("The DateTime at which a leased subscription will end or has ended") },

-		{ _T("pubsub#include_body"),		JDFT_BOOLEAN,		_T("Whether an entity wants to receive an XMPP message body in addition to the payload format") },

-		{ _T("pubsub#show-values"),			JDFT_LIST_MULTI,	_T("The presence states for which an entity wants to receive notifications") },

+		{ _T("pubsub#deliver"),				JDFT_BOOLEAN,		LPGENT("Whether an entity wants to receive or disable notifications") },

+		{ _T("pubsub#digest"),				JDFT_BOOLEAN,		LPGENT("Whether an entity wants to receive digests (aggregations) of notifications or all notifications individually") },

+		{ _T("pubsub#digest_frequency"),	JDFT_TEXT_SINGLE,	LPGENT("The minimum number of milliseconds between sending any two notification digests") },

+		{ _T("pubsub#expire"),				JDFT_TEXT_SINGLE,	LPGENT("The DateTime at which a leased subscription will end or has ended") },

+		{ _T("pubsub#include_body"),		JDFT_BOOLEAN,		LPGENT("Whether an entity wants to receive an XMPP message body in addition to the payload format") },

+		{ _T("pubsub#show-values"),			JDFT_LIST_MULTI,	LPGENT("The presence states for which an entity wants to receive notifications") },

 		{ _T("pubsub#subscription_type"),	JDFT_LIST_SINGLE,	_T("") },

 		{ _T("pubsub#subscription_depth"),	JDFT_LIST_SINGLE,	_T("") },

 	};

@@ -142,103 +142,103 @@ namespace NSJabberRegistry
 	// http://jabber.org/protocol/pubsub#node_config

 	static TJabberDataFormRegisry_Field form_type_node_config[] =

 	{

-		{ _T("pubsub#access_model"),					JDFT_LIST_SINGLE,	_T("Who may subscribe and retrieve items") },

-		{ _T("pubsub#body_xslt"),						JDFT_TEXT_SINGLE,	_T("The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.") },

-		{ _T("pubsub#collection"),						JDFT_TEXT_SINGLE,	_T("The collection with which a node is affiliated") },

-		{ _T("pubsub#dataform_xslt"),					JDFT_TEXT_SINGLE,	_T("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") },

-		{ _T("pubsub#deliver_payloads"),				JDFT_BOOLEAN,		_T("Whether to deliver payloads with event notifications") },

-		{ _T("pubsub#itemreply"),						JDFT_LIST_SINGLE,	_T("Whether owners or publisher should receive replies to items") },

-		{ _T("pubsub#children_association_policy"),		JDFT_LIST_SINGLE,	_T("Who may associate leaf nodes with a collection") },

-		{ _T("pubsub#children_association_whitelist"),	JDFT_JID_MULTI,		_T("The list of JIDs that may associated leaf nodes with a collection") },

-		{ _T("pubsub#children"),						JDFT_TEXT_MULTI,	_T("The child nodes (leaf or collection) associated with a collection") },

-		{ _T("pubsub#children_max"),					JDFT_TEXT_SINGLE,	_T("The maximum number of child nodes that can be associated with a collection") },

-		{ _T("pubsub#max_items"),						JDFT_TEXT_SINGLE,	_T("The maximum number of items to persist") },

-		{ _T("pubsub#max_payload_size"),				JDFT_TEXT_SINGLE,	_T("The maximum payload size in bytes") },

-		{ _T("pubsub#node_type"),						JDFT_LIST_SINGLE,	_T("Whether the node is a leaf (default) or a collection") },

-		{ _T("pubsub#notify_config"),					JDFT_BOOLEAN,		_T("Whether to notify subscribers when the node configuration changes") },

-		{ _T("pubsub#notify_delete"),					JDFT_BOOLEAN,		_T("Whether to notify subscribers when the node is deleted") },

-		{ _T("pubsub#notify_retract"),					JDFT_BOOLEAN,		_T("Whether to notify subscribers when items are removed from the node") },

-		{ _T("pubsub#persist_items"),					JDFT_BOOLEAN,		_T("Whether to persist items to storage") },

-		{ _T("pubsub#presence_based_delivery"),			JDFT_BOOLEAN,		_T("Whether to deliver notifications to available users only") },

-		{ _T("pubsub#publish_model"),					JDFT_LIST_SINGLE,	_T("The publisher model") },

-		{ _T("pubsub#replyroom"),						JDFT_JID_MULTI,		_T("The specific multi-user chat rooms to specify for replyroom") },

-		{ _T("pubsub#replyto"),							JDFT_JID_MULTI,		_T("The specific JID(s) to specify for replyto") },

-		{ _T("pubsub#roster_groups_allowed"),			JDFT_LIST_MULTI,	_T("The roster group(s) allowed to subscribe and retrieve items") },

-		{ _T("pubsub#send_item_subscribe"),				JDFT_BOOLEAN,		_T("Whether to send items to new subscribers") },

-		{ _T("pubsub#subscribe"),						JDFT_BOOLEAN,		_T("Whether to allow subscriptions") },

-		{ _T("pubsub#title"),							JDFT_TEXT_SINGLE,	_T("A friendly name for the node") },

-		{ _T("pubsub#type"),							JDFT_TEXT_SINGLE,	_T("The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single") },

+		{ _T("pubsub#access_model"),					JDFT_LIST_SINGLE,	LPGENT("Who may subscribe and retrieve items") },

+		{ _T("pubsub#body_xslt"),						JDFT_TEXT_SINGLE,	LPGENT("The URL of an XSL transformation which can be applied to payloads in order to generate an appropriate message body element.") },

+		{ _T("pubsub#collection"),						JDFT_TEXT_SINGLE,	LPGENT("The collection with which a node is affiliated") },

+		{ _T("pubsub#dataform_xslt"),					JDFT_TEXT_SINGLE,	LPGENT("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") },

+		{ _T("pubsub#deliver_payloads"),				JDFT_BOOLEAN,		LPGENT("Whether to deliver payloads with event notifications") },

+		{ _T("pubsub#itemreply"),						JDFT_LIST_SINGLE,	LPGENT("Whether owners or publisher should receive replies to items") },

+		{ _T("pubsub#children_association_policy"),		JDFT_LIST_SINGLE,	LPGENT("Who may associate leaf nodes with a collection") },

+		{ _T("pubsub#children_association_whitelist"),	JDFT_JID_MULTI,		LPGENT("The list of JIDs that may associated leaf nodes with a collection") },

+		{ _T("pubsub#children"),						JDFT_TEXT_MULTI,	LPGENT("The child nodes (leaf or collection) associated with a collection") },

+		{ _T("pubsub#children_max"),					JDFT_TEXT_SINGLE,	LPGENT("The maximum number of child nodes that can be associated with a collection") },

+		{ _T("pubsub#max_items"),						JDFT_TEXT_SINGLE,	LPGENT("The maximum number of items to persist") },

+		{ _T("pubsub#max_payload_size"),				JDFT_TEXT_SINGLE,	LPGENT("The maximum payload size in bytes") },

+		{ _T("pubsub#node_type"),						JDFT_LIST_SINGLE,	LPGENT("Whether the node is a leaf (default) or a collection") },

+		{ _T("pubsub#notify_config"),					JDFT_BOOLEAN,		LPGENT("Whether to notify subscribers when the node configuration changes") },

+		{ _T("pubsub#notify_delete"),					JDFT_BOOLEAN,		LPGENT("Whether to notify subscribers when the node is deleted") },

+		{ _T("pubsub#notify_retract"),					JDFT_BOOLEAN,		LPGENT("Whether to notify subscribers when items are removed from the node") },

+		{ _T("pubsub#persist_items"),					JDFT_BOOLEAN,		LPGENT("Whether to persist items to storage") },

+		{ _T("pubsub#presence_based_delivery"),			JDFT_BOOLEAN,		LPGENT("Whether to deliver notifications to available users only") },

+		{ _T("pubsub#publish_model"),					JDFT_LIST_SINGLE,	LPGENT("The publisher model") },

+		{ _T("pubsub#replyroom"),						JDFT_JID_MULTI,		LPGENT("The specific multi-user chat rooms to specify for replyroom") },

+		{ _T("pubsub#replyto"),							JDFT_JID_MULTI,		LPGENT("The specific JID(s) to specify for replyto") },

+		{ _T("pubsub#roster_groups_allowed"),			JDFT_LIST_MULTI,	LPGENT("The roster group(s) allowed to subscribe and retrieve items") },

+		{ _T("pubsub#send_item_subscribe"),				JDFT_BOOLEAN,		LPGENT("Whether to send items to new subscribers") },

+		{ _T("pubsub#subscribe"),						JDFT_BOOLEAN,		LPGENT("Whether to allow subscriptions") },

+		{ _T("pubsub#title"),							JDFT_TEXT_SINGLE,	LPGENT("A friendly name for the node") },

+		{ _T("pubsub#type"),							JDFT_TEXT_SINGLE,	LPGENT("The type of node data, usually specified by the namespace of the payload (if any); MAY be list-single rather than text-single") },

 	};

 

 	// http://jabber.org/protocol/pubsub#meta-data

 	static TJabberDataFormRegisry_Field form_type_metadata[] =

 	{

-		{ _T("pubsub#contact"),			JDFT_JID_MULTI,		_T("The JIDs of those to contact with questions") },

-		{ _T("pubsub#creation_date"),	JDFT_TEXT_SINGLE,	_T("The datetime when the node was created") },

-		{ _T("pubsub#creator"),			JDFT_JID_SINGLE,	_T("The JID of the node creator") },

-		{ _T("pubsub#description"),		JDFT_TEXT_SINGLE,	_T("A description of the node") },

-		{ _T("pubsub#language"),		JDFT_TEXT_SINGLE,	_T("The default language of the node") },

-		{ _T("pubsub#num_subscribers"),	JDFT_TEXT_SINGLE,	_T("The number of subscribers to the node") },

-		{ _T("pubsub#owner"),			JDFT_JID_MULTI,		_T("The JIDs of those with an affiliation of owner") },

-		{ _T("pubsub#publisher"),		JDFT_JID_MULTI,		_T("The JIDs of those with an affiliation of publisher") },

-		{ _T("pubsub#title"),			JDFT_TEXT_SINGLE,	_T("The name of the node") },

-		{ _T("pubsub#type"),			JDFT_TEXT_SINGLE,	_T("Payload type") },

+		{ _T("pubsub#contact"),			JDFT_JID_MULTI,		LPGENT("The JIDs of those to contact with questions") },

+		{ _T("pubsub#creation_date"),	JDFT_TEXT_SINGLE,	LPGENT("The datetime when the node was created") },

+		{ _T("pubsub#creator"),			JDFT_JID_SINGLE,	LPGENT("The JID of the node creator") },

+		{ _T("pubsub#description"),		JDFT_TEXT_SINGLE,	LPGENT("A description of the node") },

+		{ _T("pubsub#language"),		JDFT_TEXT_SINGLE,	LPGENT("The default language of the node") },

+		{ _T("pubsub#num_subscribers"),	JDFT_TEXT_SINGLE,	LPGENT("The number of subscribers to the node") },

+		{ _T("pubsub#owner"),			JDFT_JID_MULTI,		LPGENT("The JIDs of those with an affiliation of owner") },

+		{ _T("pubsub#publisher"),		JDFT_JID_MULTI,		LPGENT("The JIDs of those with an affiliation of publisher") },

+		{ _T("pubsub#title"),			JDFT_TEXT_SINGLE,	LPGENT("The name of the node") },

+		{ _T("pubsub#type"),			JDFT_TEXT_SINGLE,	LPGENT("Payload type") },

 	};

 

 	// http://jabber.org/protocol/rc

 	static TJabberDataFormRegisry_Field form_type_rc[] =

 	{

-		{ _T("auto-auth"),			JDFT_BOOLEAN,		_T("Whether to automatically authorize subscription requests") },

-		{ _T("auto-files"),			JDFT_BOOLEAN,		_T("Whether to automatically accept file transfers") },

-		{ _T("auto-msg"),			JDFT_BOOLEAN,		_T("Whether to automatically open new messages") },

-		{ _T("auto-offline"),		JDFT_BOOLEAN,		_T("Whether to automatically go offline when idle") },

-		{ _T("sounds"),				JDFT_BOOLEAN,		_T("Whether to play sounds") },

-		{ _T("files"),				JDFT_LIST_MULTI,	_T("A list of pending file transfers") },

-		{ _T("groupchats"),			JDFT_LIST_MULTI,	_T("A list of joined groupchat rooms") },

-		{ _T("status"),				JDFT_LIST_SINGLE,	_T("A presence or availability status") },

-		{ _T("status-message"),		JDFT_TEXT_MULTI,	_T("The status message text") },

-		{ _T("status-priority"),	JDFT_TEXT_SINGLE,	_T("The new priority for the client") },

+		{ _T("auto-auth"),			JDFT_BOOLEAN,		LPGENT("Whether to automatically authorize subscription requests") },

+		{ _T("auto-files"),			JDFT_BOOLEAN,		LPGENT("Whether to automatically accept file transfers") },

+		{ _T("auto-msg"),			JDFT_BOOLEAN,		LPGENT("Whether to automatically open new messages") },

+		{ _T("auto-offline"),		JDFT_BOOLEAN,		LPGENT("Whether to automatically go offline when idle") },

+		{ _T("sounds"),				JDFT_BOOLEAN,		LPGENT("Whether to play sounds") },

+		{ _T("files"),				JDFT_LIST_MULTI,	LPGENT("A list of pending file transfers") },

+		{ _T("groupchats"),			JDFT_LIST_MULTI,	LPGENT("A list of joined groupchat rooms") },

+		{ _T("status"),				JDFT_LIST_SINGLE,	LPGENT("A presence or availability status") },

+		{ _T("status-message"),		JDFT_TEXT_MULTI,	LPGENT("The status message text") },

+		{ _T("status-priority"),	JDFT_TEXT_SINGLE,	LPGENT("The new priority for the client") },

 	};

 

 	// jabber:iq:register

 	static TJabberDataFormRegisry_Field form_type_register[] =

 	{

-		{ _T("username"),	JDFT_TEXT_SINGLE,	_T("Account name associated with the user") },

-		{ _T("nick"),		JDFT_TEXT_SINGLE,	_T("Familiar name of the user") },

-		{ _T("password"),	JDFT_TEXT_PRIVATE,	_T("Password or secret for the user") },

-		{ _T("name"),		JDFT_TEXT_SINGLE,	_T("Full name of the user") },

-		{ _T("first"),		JDFT_TEXT_SINGLE,	_T("First name or given name of the user") },

-		{ _T("last"),		JDFT_TEXT_SINGLE,	_T("Last name, surname, or family name of the user") },

-		{ _T("email"),		JDFT_TEXT_SINGLE,	_T("Email address of the user") },

-		{ _T("address"),	JDFT_TEXT_SINGLE,	_T("Street portion of a physical or mailing address") },

-		{ _T("city"),		JDFT_TEXT_SINGLE,	_T("Locality portion of a physical or mailing address") },

-		{ _T("state"),		JDFT_TEXT_SINGLE,	_T("Region portion of a physical or mailing address") },

-		{ _T("zip"),		JDFT_TEXT_SINGLE,	_T("Postal code portion of a physical or mailing address") },

+		{ _T("username"),	JDFT_TEXT_SINGLE,	LPGENT("Account name associated with the user") },

+		{ _T("nick"),		JDFT_TEXT_SINGLE,	LPGENT("Familiar name of the user") },

+		{ _T("password"),	JDFT_TEXT_PRIVATE,	LPGENT("Password or secret for the user") },

+		{ _T("name"),		JDFT_TEXT_SINGLE,	LPGENT("Full name of the user") },

+		{ _T("first"),		JDFT_TEXT_SINGLE,	LPGENT("First name or given name of the user") },

+		{ _T("last"),		JDFT_TEXT_SINGLE,	LPGENT("Last name, surname, or family name of the user") },

+		{ _T("email"),		JDFT_TEXT_SINGLE,	LPGENT("Email address of the user") },

+		{ _T("address"),	JDFT_TEXT_SINGLE,	LPGENT("Street portion of a physical or mailing address") },

+		{ _T("city"),		JDFT_TEXT_SINGLE,	LPGENT("Locality portion of a physical or mailing address") },

+		{ _T("state"),		JDFT_TEXT_SINGLE,	LPGENT("Region portion of a physical or mailing address") },

+		{ _T("zip"),		JDFT_TEXT_SINGLE,	LPGENT("Postal code portion of a physical or mailing address") },

 	};

 

 	// jabber:iq:search

 	static TJabberDataFormRegisry_Field form_type_search[] =

 	{

-		{ _T("first"),	JDFT_TEXT_SINGLE,	_T("First Name") },

-		{ _T("last"),	JDFT_TEXT_SINGLE,	_T("Family Name") },

-		{ _T("nick"),	JDFT_TEXT_SINGLE,	_T("Nickname") },

-		{ _T("email"),	JDFT_TEXT_SINGLE,	_T("Email Address") },

+		{ _T("first"),	JDFT_TEXT_SINGLE,	LPGENT("First Name") },

+		{ _T("last"),	JDFT_TEXT_SINGLE,	LPGENT("Family Name") },

+		{ _T("nick"),	JDFT_TEXT_SINGLE,	LPGENT("Nickname") },

+		{ _T("email"),	JDFT_TEXT_SINGLE,	LPGENT("Email Address") },

 	};

 

 	// urn:xmpp:ssn

 	static TJabberDataFormRegisry_Field form_type_ssn[] =

 	{

-		{ _T("accept"),									JDFT_BOOLEAN,		_T("Whether to accept the invitation") },

-		{ _T("continue"),								JDFT_TEXT_SINGLE,	_T("Another resource with which to continue the session") },

-		{ _T("disclosure"),								JDFT_LIST_SINGLE,	_T("Disclosure of content, decryption keys or identities") },

-		{ _T("http://jabber.org/protocol/chatstates"),	JDFT_LIST_SINGLE,	_T("Whether may send Chat State Notifications per XEP-0085") },

-		{ _T("http://jabber.org/protocol/xhtml-im"),	JDFT_LIST_SINGLE,	_T("Whether allowed to use XHTML-IM formatting per XEP-0071") },

-		{ _T("language"),								JDFT_LIST_SINGLE,	_T("Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)") },

-		{ _T("logging"),								JDFT_LIST_SINGLE,	_T("Whether allowed to log messages (i.e., whether Off-The-Record mode is required)") },

-		{ _T("renegotiate"),							JDFT_BOOLEAN,		_T("Whether to renegotiate the session") },

-		{ _T("security"),								JDFT_LIST_SINGLE,	_T("Minimum security level") },

-		{ _T("terminate"),								JDFT_BOOLEAN,		_T("Whether to terminate the session") },

-		{ _T("urn:xmpp:receipts"),						JDFT_BOOLEAN,		_T("Whether to enable Message Receipts per XEP-0184") },

+		{ _T("accept"),									JDFT_BOOLEAN,		LPGENT("Whether to accept the invitation") },

+		{ _T("continue"),								JDFT_TEXT_SINGLE,	LPGENT("Another resource with which to continue the session") },

+		{ _T("disclosure"),								JDFT_LIST_SINGLE,	LPGENT("Disclosure of content, decryption keys or identities") },

+		{ _T("http://jabber.org/protocol/chatstates"),	JDFT_LIST_SINGLE,	LPGENT("Whether may send Chat State Notifications per XEP-0085") },

+		{ _T("http://jabber.org/protocol/xhtml-im"),	JDFT_LIST_SINGLE,	LPGENT("Whether allowed to use XHTML-IM formatting per XEP-0071") },

+		{ _T("language"),								JDFT_LIST_SINGLE,	LPGENT("Primary written language of the chat (each value appears in order of preference and conforms to RFC 4646 and the IANA registry)") },

+		{ _T("logging"),								JDFT_LIST_SINGLE,	LPGENT("Whether allowed to log messages (i.e., whether Off-The-Record mode is required)") },

+		{ _T("renegotiate"),							JDFT_BOOLEAN,		LPGENT("Whether to renegotiate the session") },

+		{ _T("security"),								JDFT_LIST_SINGLE,	LPGENT("Minimum security level") },

+		{ _T("terminate"),								JDFT_BOOLEAN,		LPGENT("Whether to terminate the session") },

+		{ _T("urn:xmpp:receipts"),						JDFT_BOOLEAN,		LPGENT("Whether to enable Message Receipts per XEP-0184") },

 	};

 

 	TJabberDataFormRegisry_Form form_types[] =

diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp
index 35acf12005..e5f875bb3f 100644
--- a/protocols/JabberG/src/jabber_util.cpp
+++ b/protocols/JabberG/src/jabber_util.cpp
@@ -530,23 +530,23 @@ struct tagErrorCodeToStr {
 	TCHAR* str;

 }

 static JabberErrorCodeToStrMapping[] = {

-	{ JABBER_ERROR_REDIRECT,               _T("Redirect") },

-	{ JABBER_ERROR_BAD_REQUEST,            _T("Bad request") },

-	{ JABBER_ERROR_UNAUTHORIZED,           _T("Unauthorized") },

-	{ JABBER_ERROR_PAYMENT_REQUIRED,       _T("Payment required") },

-	{ JABBER_ERROR_FORBIDDEN,              _T("Forbidden") },

-	{ JABBER_ERROR_NOT_FOUND,              _T("Not found") },

-	{ JABBER_ERROR_NOT_ALLOWED,            _T("Not allowed") },

-	{ JABBER_ERROR_NOT_ACCEPTABLE,         _T("Not acceptable") },

-	{ JABBER_ERROR_REGISTRATION_REQUIRED,  _T("Registration required") },

-	{ JABBER_ERROR_REQUEST_TIMEOUT,        _T("Request timeout") },

-	{ JABBER_ERROR_CONFLICT,               _T("Conflict") },

-	{ JABBER_ERROR_INTERNAL_SERVER_ERROR,  _T("Internal server error") },

-	{ JABBER_ERROR_NOT_IMPLEMENTED,        _T("Not implemented") },

-	{ JABBER_ERROR_REMOTE_SERVER_ERROR,    _T("Remote server error") },

-	{ JABBER_ERROR_SERVICE_UNAVAILABLE,    _T("Service unavailable") },

-	{ JABBER_ERROR_REMOTE_SERVER_TIMEOUT,  _T("Remote server timeout") },

-	{ -1,                                  _T("Unknown error") }

+	{ JABBER_ERROR_REDIRECT,               LPGENT("Redirect") },

+	{ JABBER_ERROR_BAD_REQUEST,            LPGENT("Bad request") },

+	{ JABBER_ERROR_UNAUTHORIZED,           LPGENT("Unauthorized") },

+	{ JABBER_ERROR_PAYMENT_REQUIRED,       LPGENT("Payment required") },

+	{ JABBER_ERROR_FORBIDDEN,              LPGENT("Forbidden") },

+	{ JABBER_ERROR_NOT_FOUND,              LPGENT("Not found") },

+	{ JABBER_ERROR_NOT_ALLOWED,            LPGENT("Not allowed") },

+	{ JABBER_ERROR_NOT_ACCEPTABLE,         LPGENT("Not acceptable") },

+	{ JABBER_ERROR_REGISTRATION_REQUIRED,  LPGENT("Registration required") },

+	{ JABBER_ERROR_REQUEST_TIMEOUT,        LPGENT("Request timeout") },

+	{ JABBER_ERROR_CONFLICT,               LPGENT("Conflict") },

+	{ JABBER_ERROR_INTERNAL_SERVER_ERROR,  LPGENT("Internal server error") },

+	{ JABBER_ERROR_NOT_IMPLEMENTED,        LPGENT("Not implemented") },

+	{ JABBER_ERROR_REMOTE_SERVER_ERROR,    LPGENT("Remote server error") },

+	{ JABBER_ERROR_SERVICE_UNAVAILABLE,    LPGENT("Service unavailable") },

+	{ JABBER_ERROR_REMOTE_SERVER_TIMEOUT,  LPGENT("Remote server timeout") },

+	{ -1,                                  LPGENT("Unknown error") }

 };

 

 TCHAR* __stdcall JabberErrorStr(int errorCode)