- langpacks/english: updated

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

1 files changed, 2 insertions, 53 deletions

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 5308c48977..2fc35c1f0a 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -200,7 +200,6 @@
 [Send]

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

 [Jabber Link Protocol]

-[%d.%d.%d.%d]

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

 [I'm happy Miranda NG user. Get it at http://miranda-ng.org/.]

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

@@ -229,7 +228,6 @@
 [button]

 [Execute]

 [Requesting command list. Please wait...]

-[%s %s]

 [Jabber Ad-Hoc commands at]

 [Sending Ad-Hoc command to]

 [prev]

@@ -322,8 +320,6 @@
 [Supports GTalk private multi-user chat]

 [feature]

 [var]

-[%s/%s]

-[%s#%s]

 [Bombus]

 [BombusMod]

 [neos]

@@ -427,7 +423,6 @@
 [invite]

 [reason]

 [Send groupchat invitation.]

-[%s (%s)]

 [not on roster]

 [Member Info:]

 [Member Information]

@@ -444,7 +439,6 @@
 [moderator]

 [groupchat]

 [body]

-[%s: ]

 [Reason to kick]

 [Reason to ban]

 [outcast]

@@ -561,16 +555,10 @@
 [subscription]

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

 [Jid: %s\r\n]

-[%s: %s\r\n]

-[\r\n%s:\r\n]

 [Identities]

-[ %c %s (%s: %s, %s: %s)\r\n]

-[ %c %s: %s, %s: %s\r\n]

 [Category]

 [Type]

 [Supported features]

-[ %c %s\r\n]

-[\r\n%s: %s\r\n]

 [Info request error]

 [Items request error]

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

@@ -587,7 +575,6 @@
 [fixed]

 [static]

 [edit]

-[\r\n]

 [option]

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

 [abuse-addresses]

@@ -811,19 +798,16 @@
 [no-valid-streams]

 [bad-profile]

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

-[%s@%s/%s]

 [history]

 [since]

 [Failed to retrieve room list from server.]

 [No rooms available on server.]

 [Room list request timed out.]

-[%s@%s (%s)]

 [<no nick>]

 [Loading...]

 [Please wait for room list to download.]

 [Please specify groupchat directory first.]

 [Bookmarks...]

-[%s <%s>]

 [available]

 [away]

 [dnd]

@@ -857,7 +841,6 @@
 [meinvz*]

 [Protocols/Jabber/Accounts]

 [Status Icons/%s/]

-[ %s]

 [transport]

 [Privacy Lists]

 [Notes]

@@ -916,7 +899,6 @@
 [jabber:iq:auth]

 [digest]

 [resource]

-[%s %s.]

 [Authentication failed for]

 [Jabber Authentication]

 [session]

@@ -926,7 +908,6 @@
 [NICKNAME]

 [EMAIL]

 [BDAY]

-[%d-%d-%d]

 [GENDER]

 [ADR]

 [TEL]

@@ -957,7 +938,6 @@
 [Ban List]

 [Admin List]

 [Owner List]

-[%s %s?]

 [Removing]

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

 [Miranda NG Jabber]

@@ -981,7 +961,6 @@
 [Server's Choice]

 [&Convert to Contact]

 [&Convert to Chat Room]

-[%s [%s, %d]]

 [subscribed]

 [unsubscribed]

 [Options...]

@@ -1003,16 +982,13 @@
 [Highest priority (server's choice)]

 [Status Message]

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

-[%s:\n%s\n%s]

-[%s:\n%s]

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

 [event]

 [normal]

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

 [CHAT plugin is required for conferences. Install it before chatting]

 [%%miranda_avatarcache%%\\Jabber]

-[%miranda_avatarcache%]

-[%s@]

+[%s\\Jabber]

 [ avatar.]

 [Miranda IM Jabber]

 [GTalk]

@@ -1023,7 +999,6 @@
 [ (SecureIM)]

 [Miranda IM]

 [Miranda NG]

-[ [%s]]

 [From]

 [Both]

 [Errors]

@@ -1043,7 +1018,6 @@
 [offline]

 [Incoming note]

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

-[%s %s@%S:%d?]

 [Afar]

 [Abkhazian]

 [Afrikaans]

@@ -1229,7 +1203,6 @@
 [Yoruba]

 [Zhuang; Chuang]

 [Zulu]

-[%s@%s]

 [Office]

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

 [Jabber Protocol Option]

@@ -1286,7 +1259,6 @@
 [Subscription]

 [Uploading...]

 [Downloading...]

-[%s (*.xml)%c*.xml%c%c]

 [XML for MS Excel (UTF-8 encoded)]

 [xml]

 [Workbook]

@@ -1317,7 +1289,6 @@
 [Vkontakte]

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

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

-[%s %s@]

 [Set New Password for]

 [New password does not match.]

 [Current password is incorrect.]

@@ -1366,7 +1337,6 @@
 [presence-in]

 [presence-out]

 [queries]

-[%s %s %s]

 [allow]

 [List has no rules, empty lists will be deleted then changes applied]

 [allow ]

@@ -1402,14 +1372,13 @@
 [add]

 [No compatible file transfer machanism exist]

 [Protocol is offline or no jid]

+[[This message is encrypted.]]

 [jabber:x:encrypted]

-[): ]

 [paused]

 [composing]

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

 [rid]

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

-[%u%u]

 [bad-sessionid]

 [Command completed successfully]

 [info]

@@ -1484,7 +1453,6 @@
 [On the phone]

 [Out to lunch]

 [Idle]

-[ | ]

 [Nick:]

 [Status:]

 [Status text:]

@@ -1529,7 +1497,6 @@
 [failure]

 [stream:error]

 [item/tune[@xmlns=']

-[%02d:%02d:%02d]

 [received]

 [Subject: ]

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

@@ -1553,7 +1520,6 @@
 [service-unavailable]

 [Sending registration information...]

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

-[%s: %s]

 [Resource]

 [<not specified>]

 [Software]

@@ -1586,15 +1552,11 @@
 [format]

 [GIF %s (*.gif)]

 [JPEG %s (*.jpg;*.jpeg)]

-[%s (*.*)]

 [Unknown format]

-[*.*]

 [<Photo not available while offline>]

 [<No photo>]

 [Photo]

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

-[%%%02X]

-[%2x]

 [Redirect]

 [Bad request]

 [Unauthorized]

@@ -1612,26 +1574,18 @@
 [Service unavailable]

 [Remote server timeout]

 [Unknown error]

-[%s -1: %s]

 [Error]

 [Unknown error message]

-[%s %d: %s\r\n%s]

-[%s %d: %s]

-[%d:%d:%d]

 [priority]

 [photo]

 [show]

 [Advanced Status]

 [Set mood...]

 [Set activity...]

-[%04d-%02d-%02dT%02d:%02d:%02dZ]

-[%04d-%02d-%02dT%02d:%02d:%02d.%dZ]

-[%s (%d)]

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

 [prodid]

 [Male]

 [Female]

-[.\\]

 [jab]

 [Only JPG, GIF, and BMP image files smaller than 40 KB are supported.]

 [Jabber vCard]

@@ -1658,8 +1612,6 @@
 ;file \protocols\JabberG\src\jabber_xml.h

 [Hello]

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

-[%s [%s]]

-[...%s]

 [publish]

 [current]

 [<advanced status slot>]

@@ -1839,8 +1791,6 @@
 [source]

 [track]

 [uri]

-[%title% - %artist%]

-[%s - %s]

 [listening_to]

 [Listening To]

 [Protocols/Jabber/Moods]

@@ -1849,4 +1799,3 @@
 [items]

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

 [Set filter...]

-[%s [%s: %s]]