- langpacks/en - update

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

1 files changed, 104 insertions, 24 deletions

diff --git a/langpacks/en/Plugins/Jabber.txt b/langpacks/en/Plugins/Jabber.txt
index 776f5415e5..fb593d75ec 100644
--- a/langpacks/en/Plugins/Jabber.txt
+++ b/langpacks/en/Plugins/Jabber.txt
@@ -208,8 +208,11 @@
 [action]

 [execute]

 [type]

+[error]

 [code]

+[Error %s %s]

 [result]

+[xmlns]

 [name]

 [Select Command]

 [Not supported]

@@ -217,8 +220,6 @@
 [completed]

 [executing]

 [Done]

-[error]

-[Error %s %s]

 [from]

 [sessionid]

 [In progress. Please Wait...]

@@ -233,12 +234,16 @@
 [complete]

 [PopupMenuHost]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_agent.cpp

+[No message]

+[Jabber Agent Registration]

+[Please wait...]

 [instructions]

 [key]

 [registered]

 [password]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_bookmarks.cpp

 [conference]

+[url]

 [storage]

 [storage:bookmarks]

 [Bookmark Name]

@@ -247,12 +252,11 @@
 [Conferences]

 [Links]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_byte.cpp

+[host]

+[port]

 [Bytestream Proxy not available]

 [sid]

 [streamhost]

-[host]

-[port]

-[xmlns]

 [%s%s%s]

 [ftproxy_%d]

 [auth]

@@ -319,6 +323,12 @@
 [var]

 [%s/%s]

 [%s#%s]

+[Bombus]

+[BombusMod]

+[neos]

+[sim]

+[http://miranda-im.org/caps]

+[0.7.0.13]

 [identity]

 [category]

 [client]

@@ -368,6 +378,8 @@
 [Outcast]

 [Affiliation of %s was changed to '%s'.]

 [Role of %s was changed to '%s'.]

+[because room is now members-only]

+[user banned]

 [presence]

 [unavailable]

 [Change &nickname]

@@ -440,10 +452,15 @@
 [groupchat]

 [body]

 [%s: ]

+[Reason to kick]

+[Reason to ban]

 [outcast]

 [Invite %s to %s]

 [jabber:x:conference]

+[Set topic for]

 [subject]

+[Change nickname in]

+[Reason to destroy]

 [destroy]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_console.cpp

 [JID]

@@ -568,7 +585,6 @@
 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_events.cpp

 [subscribe]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_file.cpp

-[url]

 [desc]

 [%s\\%s]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_form.cpp

@@ -868,6 +884,9 @@
 [listbox]

 [combobox]

 [JabberDataFormControl]

+;file E:\Sources\myranda\protocols\JabberG\src\jabber_frame.cpp

+[JabberInfoFrameClass]

+[Offline]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_ft.cpp

 [mime-type]

 [binary/octet-stream]

@@ -1007,10 +1026,13 @@
 [digest]

 [resource]

 [%s %s.]

+[Authentication failed for]

+[Jabber Authentication]

 [session]

 [urn:ietf:params:xml:ns:xmpp-session]

 [both]

 [vz:img]

+[Registration successful]

 [NICKNAME]

 [EMAIL]

 [BDAY]

@@ -1027,17 +1049,28 @@
 [nickname]

 [given]

 [family]

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

+[Change Password]

+[Password cannot be changed.]

 [mimetype]

 [vCard]

 [autojoin]

 [true]

+[Jabber Bookmarks Error]

 [time[@xmlns='%s']/tzo]

 [time[@xmlns='%s']/tz]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_iqid_muc.cpp

 [Jabber Conference Room Configuration]

+[JID List]

 [%s, %d items (%s)]

-[Reason to ban]

+[Voice List]

+[Member List]

+[Moderator List]

+[Ban List]

+[Admin List]

+[Owner List]

 [%s %s?]

+[Removing]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_iq_handlers.cpp

 [Miranda NG Jabber]

 [seconds]

@@ -1070,7 +1103,6 @@
 [Local Server Transports]

 [Browse Chatrooms]

 [Create/Join groupchat]

-[Change Password]

 [Roster editor]

 [Resource priority]

 [Resource priority [%d]]

@@ -1084,10 +1116,13 @@
 [Highest priority (server's choice)]

 [Status Message]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_message_handlers.cpp

+[%s:\n%s\n%s]

+[%s:\n%s]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_message_manager.cpp

 [event]

 [normal]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_misc.cpp

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

 [%%miranda_avatarcache%%\\Jabber]

 [%miranda_avatarcache%]

 [%s\\Jabber]

@@ -1104,11 +1139,11 @@
 [GTalk Bot]

 [http://www.android.com]

 [Android]

+[(SecureIM)]

+[ (SecureIM)]

 [Miranda IM]

 [Miranda NG]

 [ [%s]]

-[(SecureIM)]

-[ (SecureIM)]

 [From]

 [Both]

 [Errors]

@@ -1318,6 +1353,7 @@
 [jabber.org]

 [Office]

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

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

@@ -1405,13 +1441,16 @@
 [Vkontakte]

 [S.ms]

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

-[Jabber Protocol Option]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_password.cpp

 [%s %s@]

+[Set New Password for]

+[New password does not match.]

+[Current password is incorrect.]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_privacy.cpp

 [Warning: privacy lists were changed on server.]

 [Error occurred while applying changes]

 [Privacy lists successfully saved]

+[deny]

 [order]

 [Privacy list %s set as active]

 [Active privacy list successfully declined]

@@ -1439,10 +1478,15 @@
 [** Subsription: to **]

 [** Subsription: from **]

 [** Subsription: none **]

+[<none>]

 [Message]

 [Presence (in)]

 [Presence (out)]

 [Query]

+[If jabber id is '%s' then]

+[If group is '%s' then]

+[If subscription is '%s' then]

+[Else]

 [all]

 [messages]

 [presence-in]

@@ -1450,7 +1494,6 @@
 [queries]

 [%s %s %s]

 [allow]

-[deny]

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

 [allow ]

 [deny ]

@@ -1464,7 +1507,6 @@
 [If group is ']

 [If subscription is ']

 [then ]

-[<none>]

 [ (act., def.)]

 [ (active)]

 [ (default)]

@@ -1485,13 +1527,15 @@
 [xml:lang]

 [add]

 [No compatible file transfer machanism exist]

+[Protocol is offline or no jid]

 [[This message is encrypted.]]

 [jabber:x:encrypted]

-[ ): ]

+[): ]

 [paused]

 [composing]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_proxy.cpp

 [rid]

+[http://jabber.org/protocol/httpbind]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_rc.cpp

 [%u%u]

 [bad-sessionid]

@@ -1514,7 +1558,6 @@
 [Extended Away (N/A)]

 [Do Not Disturb]

 [Invisible]

-[Offline]

 [Priority]

 [Status message]

 [Change global status]

@@ -1549,8 +1592,8 @@
 [STATIC]

 [EDIT]

 [Error %s %s\r\nPlease select other server]

+[Error Unknown reply recieved\r\nPlease select other server]

 [fullname]

-[%s ( %s )]

 [reported]

 [Error %s %s\r\nTry to specify more detailed]

 [Search error]

@@ -1562,6 +1605,8 @@
 [GSSAPI]

 [NTLM]

 [secur32.dll]

+[xmpp/%s/%s@%s]

+[xmpp/%s@%s]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_svc.cpp

 [closed chat session]

 [sent subscription request]

@@ -1582,12 +1627,18 @@
 [Status:]

 [Status text:]

 [Real JID:]

+[body=]

+[join]

+[disco]

+[node=]

+[sendfile]

 [attention]

 [not-authorized]

 [urn:ietf:params:xml:xmpp-stanzas]

 [thread]

 [bcdfghjklmnpqrstvwxz0123456789]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_thread.cpp

+[Enter password for]

 [1.0]

 [encoding]

 [UTF-8]

@@ -1596,6 +1647,10 @@
 [xmlns:stream]

 [http://etherx.jabber.org/streams]

 [/%s]

+[Error: Not enough memory]

+[Error: Cannot connect to the server]

+[Error: Connection lost]

+[Requesting registration instruction...]

 [urn:ietf:params:xml:ns:xmpp-sasl]

 [mechanism]

 [starttls]

@@ -1648,13 +1703,20 @@
 [unknown-session]

 [urn:xmpp:jingle:errors:1]

 [service-unavailable]

+[Sending registration information...]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_userinfo.cpp

 [%s: %s]

 [Resource]

+[<not specified>]

+[Software]

+[Version]

+[System]

+[unknown]

 [Idle since]

+[Client capabilities]

+[Software information]

 [Operating system]

 [Operating system version]

-[Software]

 [Software version]

 [Miranda NG core version]

 [Unicode build]

@@ -1664,17 +1726,26 @@
 [Mood]

 [Activity]

 [Tune]

+[Last logoff time]

+[Uptime]

+[Logoff message]

+[<no information available>]

+[Last active resource]

 [Please switch online to see more details.]

 [Copy]

 [Copy only this value]

-[BMP %s ( *.bmp )]

+[BMP %s (*.bmp)]

+[format]

 [*.BMP]

-[GIF %s ( *.gif )]

+[GIF %s (*.gif)]

 [*.GIF]

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

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

 [*.JPG;*.JPEG]

-[%s ( *.* )]

+[%s (*.*)]

+[Unknown format]

 [*.*]

+[<Photo not available while offline>]

+[<No photo>]

 [Photo]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_util.cpp

 [%%%02X]

@@ -1697,6 +1768,8 @@
 [Remote server timeout]

 [Unknown error]

 [%s -1: %s]

+[Error]

+[Unknown error message]

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

 [%s %d: %s]

 [%d:%d:%d]

@@ -1704,6 +1777,7 @@
 [photo]

 [show]

 [false]

+[http://talk.google.com/xmpp/bot/caps]

 [Advanced Status]

 [Set mood...]

 [Set activity...]

@@ -1712,8 +1786,14 @@
 [prodid]

 [-//HandGen//NONSGML vGen v1.0//EN]

 [2.0]

+[Male]

+[Female]

 [.\\]

 [jab]

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

+[Jabber vCard]

+[Jabber vCard: Edit Email Address]

+[Jabber vCard: Edit Phone Number]

 [HOME]

 [WORK]

 [INTERNET]

@@ -1824,7 +1904,6 @@
 [Undefined]

 [Weak]

 [Worried]

-[Status Icons/%s/Moods]

 [retract]

 [item/mood[@xmlns=']

 [mood]

@@ -1907,7 +1986,6 @@
 [in a meeting]

 [studying]

 [writing]

-[Status Icons/%s/Activities]

 [item/activity[@xmlns=']

 [activity]

 [Activity: %s]

@@ -1922,7 +2000,9 @@
 [%s - %s]

 [listening_to]

 [Listening To]

-[JabberInfoFrameClass]

+[..\\Icons\\xstatus_jabber.dll]

+[Protocols/Jabber/Moods]

+[Protocols/Jabber/Activities]

 ;file E:\Sources\myranda\protocols\JabberG\src\jabber_xstatus.h

 [items]

 ;file E:\Sources\myranda\protocols\JabberG\src\ui_utils.cpp