russian & ukrainian translation update

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

1 files changed, 18 insertions, 18 deletions

diff --git a/protocols/JabberG/src/jabber_form2.cpp b/protocols/JabberG/src/jabber_form2.cpp
index 895458a678..d8e6938ba8 100644
--- a/protocols/JabberG/src/jabber_form2.cpp
+++ b/protocols/JabberG/src/jabber_form2.cpp
@@ -93,23 +93,23 @@ namespace NSJabberRegistry
 	// http://jabber.org/protocol/muc#roomconfig

 	static TJabberDataFormRegisry_Field form_type_muc_roomconfig[] =

 	{

-		{ _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") },

+		{ _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

@@ -133,7 +133,7 @@ namespace NSJabberRegistry
 		{ _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#expire"),				JDFT_TEXT_SINGLE,	LPGENT("The date and time 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("") },