12 files changed, 138 insertions, 135 deletions
diff --git a/langpacks/en/Plugins/CSList.txt b/langpacks/en/Plugins/CSList.txt
index b8cb171f1d..d97dfacf85 100644
--- a/langpacks/en/Plugins/CSList.txt
+++ b/langpacks/en/Plugins/CSList.txt
@@ -1,4 +1,4 @@
-;#muuid not found, please specify manually!
+#muuid {c8cc7414-6507-4af6-925a-83c1d2f7be8c}
 ;langpack template for CSList
 ;file E:\Sources\myranda\plugins\CSList\res\cslist.rc
 [A]
@@ -15,13 +15,12 @@
 [Cancel]
 [List settings]
 [Confirm deletion of items]
-[Delete entries in ICQ Custom status menu after Import]
-[Allow extra ICQ Custom status items (ICQ Plus only)]
+[Delete entries in Custom status menu after Import]
 [Remember last window position]
-[Note: Menu items are only visible when at least one ICQ account is properly set. Check if you have at least one account with UIN filled in.]
+[Note: Menu items are only visible when at least one account is properly set. Check if you have at least one account with UIN filled in.]
 ;file E:\Sources\myranda\plugins\CSList\src\cslist.cpp
-[Custom Status List]
 [Status]
+[Custom Status List]
 [%s (locked)]
 [Add new item]
 [Add]
@@ -36,87 +35,21 @@
 [Do you really want to delete selected item?]
 [Do you want old database entries to be deleted after Import?]
 ;file E:\Sources\myranda\plugins\CSList\src\cslist.h
-[Afraid]
-[Amazed]
-[Amorous]
-[Angry]
-[Annoyed]
-[Anxious]
-[Aroused]
-[Ashamed]
-[Bored]
-[Brave]
-[Calm]
-[Cautious]
-[Cold]
-[Confident]
-[Confused]
-[Contemplative]
-[Contented]
-[Cranky]
-[Crazy]
-[Creative]
-[Curious]
-[Dejected]
-[Depressed]
-[Disappointed]
-[Disgusted]
-[Dismayed]
-[Distracted]
-[Embarrassed]
-[Envious]
-[Excited]
-[Flirtatious]
-[Frustrated]
-[Grateful]
-[Grieving]
-[Grumpy]
-[Guilty]
-[Happy]
-[Hopeful]
-[Hot]
-[Humbled]
-[Humiliated]
-[Hungry]
-[Hurt]
-[Impressed]
-[In awe]
-[In love]
-[Indignant]
-[Interested]
-[Intoxicated]
-[Invincible]
-[Jealous]
-[Lonely]
-[Lost]
-[Lucky]
-[Mean]
-[Moody]
-[Nervous]
-[Neutral]
-[Offended]
-[Outraged]
-[Playful]
-[Proud]
-[Relaxed]
-[Relieved]
-[Remorseful]
-[Restless]
-[Sad]
-[Sarcastic]
-[Satisfied]
-[Serious]
-[Shocked]
-[Shy]
-[Sick]
-[Sleepy]
-[Spontaneous]
-[Stressed]
-[Strong]
-[Surprised]
-[Thankful]
-[Thirsty]
-[Tired]
-[Undefined]
-[Weak]
-[Worried]
+[Main Menu]
+[Main Icon]
+[Modify selected item]
+[Delete selected item]
+[Remove]
+[Set/unset current item as favorite]
+[Favourite]
+[Undo changes]
+[Import statuses from database]
+[Import]
+[Filter list]
+[Filter]
+[Close without changing custom status]
+[No change]
+[Clear custom status (reset to None) and close]
+[Clear]
+[Set custom status to selected one and close]
+[Set]
diff --git a/langpacks/en/Plugins/Clist_modern.txt b/langpacks/en/Plugins/Clist_modern.txt
index d23c9218de..b2d0149c2c 100644
--- a/langpacks/en/Plugins/Clist_modern.txt
+++ b/langpacks/en/Plugins/Clist_modern.txt
@@ -470,8 +470,6 @@
 [SubContainerWindow]
 [FramesContainer]
 [Shell_TrayWnd]
-;file E:\Sources\myranda\plugins\Clist_modern\src\modern_commonheaders.cpp
-[Error]
 ;file E:\Sources\myranda\plugins\Clist_modern\src\modern_docking.cpp
 [user32]
 ;file E:\Sources\myranda\plugins\Clist_modern\src\modern_groupmenu.cpp
@@ -556,6 +554,8 @@
 [Toolbar]
 [To view a toolbar in Clist Modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue]
 [Toolbar upgrade]
+;file E:\Sources\myranda\plugins\Clist_modern\src\modern_utils.cpp
+[Error]
 ;file E:\Sources\myranda\plugins\Clist_modern\src\modern_viewmodebar.cpp
 [Ungrouped contacts]
 [And]
diff --git a/langpacks/en/Plugins/Contacts.txt b/langpacks/en/Plugins/Contacts.txt
index 6138c08e5f..60af135d82 100644
--- a/langpacks/en/Plugins/Contacts.txt
+++ b/langpacks/en/Plugins/Contacts.txt
@@ -20,6 +20,6 @@
 [User Details]
 [Send Message]
 ;file E:\Sources\myranda\plugins\ContactsPlus\src\main.cpp
-[Contacts received from", tmp), (TCHAR*)GetContactDisplayNameT(hContact));\r\n\r\n    cle.ptszTooltip = caToolTip;\r\n    if (g_UnicodeCore)\r\n      cle.flags |= CLEF_UNICODE;\r\n    CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);\r\n  }\r\n  return 0; //continue processing by other hooks\r\n}\r\n\r\n\r\nstatic void ProcessUnreadEvents(void)\r\n{\r\n  DBEVENTINFO dbei = {0};\r\n  HANDLE hDbEvent,hContact;\r\n\r\n  dbei.cbSize = sizeof(dbei);\r\n\r\n  hContact = SRCFindFirstContact();\r\n  while (hContact)\r\n  {\r\n    hDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDFIRSTUNREAD,(WPARAM)hContact,0);\r\n\r\n    while (hDbEvent)\r\n    {\r\n      dbei.cbBlob=0;\r\n      CallService(MS_DB_EVENT_GET,(WPARAM)hDbEvent,(LPARAM)&dbei);\r\n      if (!(dbei.flags&(DBEF_SENT|DBEF_READ)) && dbei.eventType==EVENTTYPE_CONTACTS)\r\n      { //process the event\r\n        HookDBEventAdded((WPARAM)hContact, (LPARAM)hDbEvent);\r\n      }\r\n      hDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT,(WPARAM)hDbEvent,0);\r\n    }\r\n    hContact = SRCFindNextContact(hContact);\r\n  }\r\n}\r\n\r\n\r\nstatic bool CheckContactsServiceSupport(const char* szProto)\r\n{\r\n  if (g_NewProtoAPI)\r\n  { // there is no way to determine if the service exists (only proto_interface call is supported by 0.8+)\r\n    if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_CONTACTSEND)\r\n      return true;\r\n  }\r\n  else\r\n  { // check the real send service (only 0.7.x and older)\r\n    char serstr[MAX_PATH+30];\r\n\r\n    strcpy(serstr, szProto);\r\n    strcat(serstr, PSS_CONTACTS);\r\n    if (ServiceExists(serstr))\r\n      return true;\r\n  }\r\n  return false;\r\n}\r\n\r\n\r\nstatic int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam)\r\n{\r\n  HANDLE hContact = (HANDLE)wParam;\r\n  char* szProto = GetContactProto(hContact);\r\n  int bVisible = FALSE;\r\n\r\n  if (szProto && CheckContactsServiceSupport(szProto))\r\n  { // known protocol, protocol supports contacts sending\r\n    // check the selected contact if it supports contacts receive\r\n    if (CallProtoService(szProto, PS_GETCAPS, PFLAG_MAXCONTACTSPERPACKET, (LPARAM)hContact))\r\n      bVisible = TRUE;\r\n  }\r\n\r\n  { // update contact menu item's visibility\r\n    CLISTMENUITEM mi = {0};\r\n\r\n    mi.cbSize = sizeof(mi);\r\n    if (bVisible)\r\n      mi.flags = CMIM_FLAGS;\r\n    else\r\n      mi.flags = CMIM_FLAGS | CMIF_HIDDEN;\r\n\r\n    CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hContactMenuItem, (LPARAM)&mi);\r\n  }\r\n\r\n  return 0;\r\n}\r\n\r\n\r\nstatic int HookModulesLoaded(WPARAM wParam, LPARAM lParam)\r\n{\r\n  char* modules[2] = {0};\r\n  WCHAR tmp[MAX_PATH];\r\n\r\n  modules[0] = MODULENAME;\r\n  CallService("DBEditorpp/RegisterModule",(WPARAM)modules,(LPARAM)1);\r\n\r\n  CLISTMENUITEM mi = {0};\r\n  mi.cbSize = sizeof(mi);\r\n  mi.ptszName = SRCTranslateT("Contacts", tmp);\r\n  mi.position = -2000009990;  //position in menu\r\n  mi.flags = CMIF_KEEPUNTRANSLATED;\r\n  if (g_UnicodeCore)\r\n    mi.flags |= CMIF_UNICODE;\r\n  mi.pszService = MS_CONTACTS_SEND;\r\n  mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));\r\n  hContactMenuItem = Menu_AddContactMenuItem(&mi);\r\n\r\n  hHookPreBuildContactMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, HookPreBuildContactMenu);\r\n\r\n  ghSendWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); // no need to destroy this\r\n  ghRecvWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); // no need to destroy this\r\n\r\n\r\n  ProcessUnreadEvents();\r\n  return 0;\r\n}\r\n\r\n\r\nstatic int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)\r\n{\r\n  DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;\r\n  char *szProto = GetContactProto((HANDLE)wParam);\r\n\r\n  if (strcmpnull(cws->szModule,"CList]
+[Contacts received from", tmp), (TCHAR*)GetContactDisplayNameT(hContact));\r\n\r\n    cle.ptszTooltip = caToolTip;\r\n    if (g_UnicodeCore)\r\n      cle.flags |= CLEF_UNICODE;\r\n    CallService(MS_CLIST_ADDEVENT, 0, (LPARAM)&cle);\r\n  }\r\n  return 0; //continue processing by other hooks\r\n}\r\n\r\n\r\nstatic void ProcessUnreadEvents(void)\r\n{\r\n  DBEVENTINFO dbei = {0};\r\n  HANDLE hDbEvent,hContact;\r\n\r\n  dbei.cbSize = sizeof(dbei);\r\n\r\n  hContact = SRCFindFirstContact();\r\n  while (hContact)\r\n  {\r\n    hDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDFIRSTUNREAD,(WPARAM)hContact,0);\r\n\r\n    while (hDbEvent)\r\n    {\r\n      dbei.cbBlob=0;\r\n      CallService(MS_DB_EVENT_GET,(WPARAM)hDbEvent,(LPARAM)&dbei);\r\n      if (!(dbei.flags&(DBEF_SENT|DBEF_READ)) && dbei.eventType==EVENTTYPE_CONTACTS)\r\n      { //process the event\r\n        HookDBEventAdded((WPARAM)hContact, (LPARAM)hDbEvent);\r\n      }\r\n      hDbEvent = (HANDLE)CallService(MS_DB_EVENT_FINDNEXT,(WPARAM)hDbEvent,0);\r\n    }\r\n    hContact = SRCFindNextContact(hContact);\r\n  }\r\n}\r\n\r\n\r\nstatic bool CheckContactsServiceSupport(const char* szProto)\r\n{\r\n  if (g_NewProtoAPI)\r\n  { // there is no way to determine if the service exists (only proto_interface call is supported by 0.8+)\r\n    if (CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_CONTACTSEND)\r\n      return true;\r\n  }\r\n  else\r\n  { // check the real send service (only 0.7.x and older)\r\n    char serstr[MAX_PATH+30];\r\n\r\n    strcpy(serstr, szProto);\r\n    strcat(serstr, PSS_CONTACTS);\r\n    if (ServiceExists(serstr))\r\n      return true;\r\n  }\r\n  return false;\r\n}\r\n\r\n\r\nstatic int HookPreBuildContactMenu(WPARAM wParam, LPARAM lParam)\r\n{\r\n  HANDLE hContact = (HANDLE)wParam;\r\n  char* szProto =GetContactProto(hContact);\r\n  int bVisible = FALSE;\r\n\r\n  if (szProto && CheckContactsServiceSupport(szProto))\r\n  { // known protocol, protocol supports contacts sending\r\n    // check the selected contact if it supports contacts receive\r\n    if (CallProtoService(szProto, PS_GETCAPS, PFLAG_MAXCONTACTSPERPACKET, (LPARAM)hContact))\r\n      bVisible = TRUE;\r\n  }\r\n\r\n  { // update contact menu item's visibility\r\n    CLISTMENUITEM mi = {0};\r\n\r\n    mi.cbSize = sizeof(mi);\r\n    if (bVisible)\r\n      mi.flags = CMIM_FLAGS;\r\n    else\r\n      mi.flags = CMIM_FLAGS | CMIF_HIDDEN;\r\n\r\n    CallService(MS_CLIST_MODIFYMENUITEM, (WPARAM)hContactMenuItem, (LPARAM)&mi);\r\n  }\r\n\r\n  return 0;\r\n}\r\n\r\n\r\nstatic int HookModulesLoaded(WPARAM wParam, LPARAM lParam)\r\n{\r\n  char* modules[2] = {0};\r\n  WCHAR tmp[MAX_PATH];\r\n\r\n  modules[0] = MODULENAME;\r\n  CallService("DBEditorpp/RegisterModule",(WPARAM)modules,(LPARAM)1);\r\n\r\n  CLISTMENUITEM mi = {0};\r\n  mi.cbSize = sizeof(mi);\r\n  mi.ptszName = SRCTranslateT("Contacts", tmp);\r\n  mi.position = -2000009990;  //position in menu\r\n  mi.flags = CMIF_KEEPUNTRANSLATED;\r\n  if (g_UnicodeCore)\r\n    mi.flags |= CMIF_UNICODE;\r\n  mi.pszService = MS_CONTACTS_SEND;\r\n  mi.hIcon = LoadIcon(hInst, MAKEINTRESOURCE(IDI_CONTACTS));\r\n  hContactMenuItem = Menu_AddContactMenuItem(&mi);\r\n\r\n  hHookPreBuildContactMenu = HookEvent(ME_CLIST_PREBUILDCONTACTMENU, HookPreBuildContactMenu);\r\n\r\n  ghSendWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); // no need to destroy this\r\n  ghRecvWindowList = (HANDLE)CallService(MS_UTILS_ALLOCWINDOWLIST, 0, 0); // no need to destroy this\r\n\r\n\r\n  ProcessUnreadEvents();\r\n  return 0;\r\n}\r\n\r\n\r\nstatic int HookContactSettingChanged(WPARAM wParam, LPARAM lParam)\r\n{\r\n  DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;\r\n  char *szProto =GetContactProto((HANDLE)wParam);\r\n\r\n  if (strcmpnull(cws->szModule,"CList]
 [Incoming Contacts]
 [Outgoing Contacts]
diff --git a/langpacks/en/Plugins/GG.txt b/langpacks/en/Plugins/GG.txt
index 7f840d5a54..d6a36d2041 100644
--- a/langpacks/en/Plugins/GG.txt
+++ b/langpacks/en/Plugins/GG.txt
@@ -136,6 +136,7 @@
 [HTTP failed reading]
 [HTTP failed writing]
 [Unknown HTTP error]
+[%s\\*.(null)]
 [&Unblock]
 [&Block]
 [Contact list]
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
diff --git a/langpacks/en/Plugins/MobileState.txt b/langpacks/en/Plugins/MobileState.txt
index 8982ab35d3..d00c975c93 100644
--- a/langpacks/en/Plugins/MobileState.txt
+++ b/langpacks/en/Plugins/MobileState.txt
@@ -18,5 +18,6 @@
 [iphone]
 [ipad]
 [im+]
+[bayan]
 ;file E:\Sources\myranda\plugins\MobileState\src\main.cpp
 [Mobile State]
diff --git a/langpacks/en/Plugins/PluginUpdater.txt b/langpacks/en/Plugins/PluginUpdater.txt
index 7f5dbd9051..b863e3ffc4 100644
--- a/langpacks/en/Plugins/PluginUpdater.txt
+++ b/langpacks/en/Plugins/PluginUpdater.txt
@@ -79,6 +79,8 @@
 [Plugins\\versioninfo.dll]
 [import_sa.dll]
 [Plugins\\import.dll]
+[newnr.dll]
+[Plugins\\notesreminders.dll]
 [dbtool.exe]
 [Plugins\\dbchecker.dll]
 [dbtool_sa.exe]
@@ -91,8 +93,7 @@
 [.dll]
 [.exe]
 [%s\\Temp\\%s.zip]
-[%s/%s]
-[.zip]
+[%s/%s.zip]
 [platform]
 [Downloading version info...]
 [%s/hashes.zip]
diff --git a/langpacks/en/Plugins/Quotes.txt b/langpacks/en/Plugins/Quotes.txt
index 7e555c0092..4de461d292 100644
--- a/langpacks/en/Plugins/Quotes.txt
+++ b/langpacks/en/Plugins/Quotes.txt
@@ -99,8 +99,6 @@
 [Export]
 [Swap button]
 [Import]
-[%s/%s]
-[Protocols]
 ;file E:\Sources\myranda\protocols\Quotes\src\ImportExport.cpp
 [Value]
 [Name]
diff --git a/langpacks/en/Plugins/UInfoEx.txt b/langpacks/en/Plugins/UInfoEx.txt
index 9f2e1f411b..d6a2db5bf7 100644
--- a/langpacks/en/Plugins/UInfoEx.txt
+++ b/langpacks/en/Plugins/UInfoEx.txt
@@ -652,4 +652,3 @@
 [FATAL: An exception was thrown while importing contacts from xmlCard!]
 ;file E:\Sources\myranda\plugins\UserInfoEx\src\Flags\svc_flagsicons.cpp
 [PNG]
-[d:\\CD-Archiv\\Miranda\\trunk\\miranda\\bin9\\Debug Unicode\\Plugins\\dib_ico.bmp]
diff --git a/langpacks/en/Plugins/WhenWasIt.txt b/langpacks/en/Plugins/WhenWasIt.txt
index 959e738396..27692530c0 100644
--- a/langpacks/en/Plugins/WhenWasIt.txt
+++ b/langpacks/en/Plugins/WhenWasIt.txt
@@ -55,7 +55,7 @@
 [Please select the module where you want the date of birth to be saved.\r\n"UserInfo" is the default location.\r\nUse "Protocol module" to make the data visible in User Details.\n"mBirthday module" uses the same module as mBirthday plugin.]
 [Set birthday for %s:]
 [mBirthday]
-[%S protocol]
+[%S szProto]
 [Birthday Reminder]
 [UserInfo]
 [mICQBirthday]
@@ -79,8 +79,6 @@
 [Check for birthdays]
 [When Was It]
 [Contact List]
-;file E:\Sources\myranda\plugins\WhenWasIt\src\icons.cpp
-[WhenWasIt birthday reminder]
 ;file E:\Sources\myranda\plugins\WhenWasIt\src\notifiers.cpp
 [No upcoming birthdays.]
 [%s has birthday in %d days.]
@@ -95,11 +93,10 @@
 [%s\n%s will be %d years old.]
 [%s\n%s just turned %d.]
 ;file E:\Sources\myranda\plugins\WhenWasIt\src\services.cpp
-[Error #%d while trying to create add birthday dialog]
-[Error]
 [Starting to refresh user details]
 [Done refreshing user details]
 [Could not create worker thread. Error#%d - threadID %d]
+[Error]
 [%s (*]
 [)%c*]
 [Birthdays files]
diff --git a/langpacks/en/Plugins/Xfire.txt b/langpacks/en/Plugins/Xfire.txt
index 26151ffa2e..ab5b6c4f47 100644
--- a/langpacks/en/Plugins/Xfire.txt
+++ b/langpacks/en/Plugins/Xfire.txt
@@ -156,8 +156,8 @@
 [No Loginname is set!]
 [No Password is set!]
 [Last game: %s playtime: %.2d:%.2d:%.2d]
-[%s playing %s.]
-[%s playing %s on server %d.%d.%d.%d:%d.]
+[%s is playing %s.]
+[%s is playing %s on server %d.%d.%d.%d:%d.]
 [Playing]
 [Do you really want delete your friend %s?]
 [Confirm Delete]
@@ -169,10 +169,6 @@
 [Hidden]
 [Messagebox]
 [Popup]
-[Advanced #1 (ICQ X-Status)]
-[Advanced #2]
-[Advanced #3]
-[Advanced #4]
 [On every start]
 [Daily]
 [<Root Group>]
diff --git a/langpacks/en/Plugins/mradio.txt b/langpacks/en/Plugins/mradio.txt
index c55607eb28..cdfd3e08f1 100644
--- a/langpacks/en/Plugins/mradio.txt
+++ b/langpacks/en/Plugins/mradio.txt
@@ -48,8 +48,5 @@
 [Delete]
 ;file E:\Sources\myranda\protocols\mRadio\i_service.inc
 [Radio station URL]
-;file E:\Sources\myranda\protocols\mRadio\i_tray_api.inc
-[Stop]
-[Play Station]
 ;file E:\Sources\myranda\protocols\mRadio\mradio.dpr
 [%s server connection]