- langpacks/english: updated, langpacks/russian: TabSRMM.txt +2 lines

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

1 files changed, 24 insertions, 19 deletions

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 2794ad7578..b51f675225 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -242,8 +242,8 @@
 [In progress. Please Wait...]

 [Execute]

 [Requesting command list. Please wait...]

-[Jabber Ad-Hoc commands at]

-[Sending Ad-Hoc command to]

+[Jabber Ad-Hoc commands at %s]

+[Sending Ad-Hoc command to %s]

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

 [No message]

 [Please wait...]

@@ -314,7 +314,7 @@
 [Participants]

 [Moderators]

 [Owners]

-[User %s in now banned.]

+[User %s is now banned.]

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

 [User %s changed status to %s]

 [Room configuration was changed.]

@@ -370,17 +370,17 @@
 [Copy real &JID]

 [Copy in-room JID]

 [Real &JID: %s]

-[Send groupchat invitation.]

-[not on roster]

-[Member Info:]

-[from]

+[%s\nSend groupchat invitation.]

+[%s (not on roster)]

+[Member Info: %s]

+[Member Information\n%s from %s]

 [Real JID not available]

-[Reason to kick]

-[Reason to ban]

+[Reason to kick %s]

+[Reason to ban %s]

 [Invite %s to %s]

-[Set topic for]

-[Change nickname in]

-[Reason to destroy]

+[Set topic for %s]

+[Change nickname in %s]

+[Reason to destroy %s]

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

 [Can't send data while you are offline.]

 [Jabber Error]

@@ -568,8 +568,9 @@
 [Please wait for room list to download.]

 [Please specify groupchat directory first.]

 [Bookmarks...]

+[Change nickname in <%s>]

 [has set the subject to:]

-[Incoming groupchat invitation.]

+[%s\nIncoming groupchat invitation.]

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

 [transport]

 [Notes]

@@ -613,7 +614,7 @@
 [Discovery]

 [Privacy]

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

-[Authentication failed for]

+[Authentication failed for %s.]

 [Jabber Authentication]

 [Registration successful]

 [Password is successfully changed. Don't forget to update your password in the Jabber protocol option.]

@@ -627,7 +628,8 @@
 [Ban List]

 [Admin List]

 [Owner List]

-[Removing]

+[Reason to ban]

+[Removing %s?]

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

 [Http authentication request received]

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

@@ -657,7 +659,7 @@
 [Open bookmarks]

 [Privacy lists]

 [Service discovery]

-[Last active]

+[Last active (%s)]

 [No activity yet, use server's choice]

 [Highest priority (server's choice)]

 [Status Message]

@@ -867,7 +869,7 @@
 [Jabber Protocol Option]

 [Confirm password]

 [Passwords do not match.]

-[This operation will kill your account, roster and all another information stored at the server. Are you ready to do that?]

+[This operation will kill your account, roster and all other information stored at the server. Are you ready to do that?]

 [Account removal warning]

 [You can change your password only when you are online]

 [You must be online]

@@ -934,7 +936,7 @@
 [Odnoklassniki]

 [Some changes will take effect the next time you connect to the Jabber network.]

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

-[Set New Password for]

+[Set New Password for %s@%S]

 [New password does not match.]

 [Current password is incorrect.]

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

@@ -1044,11 +1046,12 @@
 [sent error presence]

 [sent unknown presence type]

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

-[Enter password for]

+[Enter password for %s]

 [Error: Not enough memory]

 [Error: Cannot connect to the server]

 [Error: Connection lost]

 [Requesting registration instruction...]

+[Authentication failed for %s@%S.]

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

 [Sending registration information...]

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

@@ -1071,6 +1074,7 @@
 [Tune]

 [both]

 [to]

+[from]

 [none]

 [Last logoff time]

 [Uptime]

@@ -1108,6 +1112,7 @@
 [Advanced Status]

 [Set mood...]

 [Set activity...]

+[OK (%d)]

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

 [Male]

 [Female]