13 files changed, 35 insertions, 67 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index eb7878da01..f63812c9b2 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -141,9 +141,10 @@
 [Try again]
 [Cancel]
 [&Send]
-[Load unread events only]
-[Load number of previous events]
-[Load previous events less than]
+[Preload history events on window opening]
+[Preload unread events only]
+[Preload number of previous events]
+[Preload previous events less than]
 [minutes old]
 [Message window event log]
 [Show names]
@@ -152,7 +153,6 @@
 [Show dates]
 [Show formatting]
 [Automatically copy selected text]
-[Load history events]
 [Use a tabbed interface]
 [Close tab on double click]
 [Show tabs at the bottom]
@@ -288,8 +288,14 @@
 [Custom name:]
 [Group:]
 [Authorization request]
+[Remove contact from server too]
+[Remove server history]
+[Remove history for everyone]
 [&Yes]
 [&No]
+[Empty history]
+[Are you sure to wipe the history for %s?]
+[This will erase all history for this contact!]
 [Contact display options]
 [Instead of displaying contacts by their nickname,\ndrag to choose another order:]
 [Miranda NG profile manager]
@@ -367,9 +373,6 @@
 [Only the ticked contacts will be shown on the main contact list]
 [Ignore]
 [Typing]
-[Visibility]
-[You are visible to this person even when in invisible mode]
-[You are never visible to this person]
 [Icon index]
 [Icon library:]
 [Drag icons to main list to assign them:]
@@ -608,27 +611,13 @@
 [Command line:]
 [%f will be replaced by the file or folder name to be scanned]
 [Warn me before opening a file that has not been scanned]
-[&Hide/Show]
-[E&xit]
-[Nowhere]
-[&New group]
-[&Hide offline users]
-[Hide &offline users out here]
-[Hide &empty groups]
-[Disable &groups]
-[Hide Miranda]
-[Group]
-[&New subgroup]
-[&Hide offline users in here]
-[&Rename group]
-[&Delete group]
-[&Reset to default]
-[find/add]
 [&Add to list]
 [Send &message]
 [&Open link]
 [&Copy link]
 [Cancel change]
+[&Reset to default]
+[Group]
 [Ungroup]
 [List]
 [&Message]
@@ -639,6 +628,7 @@
 [Google Maps]
 [Google Translate]
 [&Main menu]
+[E&xit]
 [&Status]
 [&Offline\tCtrl+0]
 [On&line\tCtrl+1]
@@ -1255,11 +1245,9 @@
 [Frame menu]
 ;file \src\mir_app\src\menu_groups.cpp
 [Group menu]
+[New subgroup]
 [Hide offline users out here]
 [Disable groups]
-[Exit]
-[Subgroup menu]
-[New subgroup]
 [Hide offline users in here]
 ;file \src\mir_app\src\menu_options.cpp
 [New submenu]
@@ -1456,6 +1444,7 @@
 [Unicode plugin]
 [ANSI plugin]
 [Show/Hide]
+[Exit]
 [Join chat]
 [Leave chat]
 [Move to group]
@@ -1466,8 +1455,6 @@
 [Add group]
 [Warning]
 [Blank]
-[Always visible]
-[Always invisible]
 [Locked status]
 [Status icons]
 [%s icons]
@@ -1498,8 +1485,6 @@
 [Look up '%s':]
 [No word to look up]
 ;file \src\mir_app\src\srmm_main.cpp
-[Are you sure to remove all events from history?]
-[Empty history]
 [Empty system history]
 ;file \src\mir_app\src\srmm_toolbar.cpp
 [<Separator>]
@@ -1757,7 +1742,6 @@
 [Yemen]
 [Zambia]
 [Zimbabwe]
-;file \src\mir_app\src\visibility.cpp
 ;file \src\mir_core\src\bitmaps.cpp
 [Windows bitmaps]
 [JPEG bitmaps]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 024b1a3544..a1a07d45a6 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -257,11 +257,6 @@
 [Hide all title bars]
 ;file \plugins\Clist_modern\src\groupmenu.cpp
 [&Hide/show]
-[&Find/add contacts...]
-[&Main menu]
-[&Status]
-[&Options...]
-[&About]
 [&Show offline users in here]
 ;file \plugins\Clist_modern\src\modern_cachefuncs.cpp
 [Last seen]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 5031aa377b..38225bf2bf 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -312,9 +312,6 @@
 [Show additional buttons]
 [Draw sunken frame]
 [&Hide/show]
-[&Find/add contacts...]
-[&Main menu]
-[&Status]
 [Appearance]
 [&Options...]
 ;file \plugins\Clist_nicer\src\viewmodes.cpp
diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 2f7d5396f8..39d1ab6b6b 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -78,7 +78,6 @@
 [View information on active concurrent sessions]
 [Sign out all sessions]
 ;file \protocols\Gadu-Gadu\src\avatar.cpp
-[Cannot create avatar file. ERROR: %d: %s\n%s]
 [Cannot open avatar file. ERROR: %d: %s\n%s]
 ;file \protocols\Gadu-Gadu\src\core.cpp
 [Miranda was unable to resolve the name of the Gadu-Gadu server to its numeric address.]
diff --git a/langpacks/english/Plugins/GmailNotifier.txt b/langpacks/english/Plugins/GmailNotifier.txt
index 94a597de58..d5b46f0f94 100644
--- a/langpacks/english/Plugins/GmailNotifier.txt
+++ b/langpacks/english/Plugins/GmailNotifier.txt
@@ -34,7 +34,6 @@
 [Checking...]
 [Can't send account data!]
 [Wrong name or password!]
-[Can't get RSS feed!]
 ;file \protocols\GmailNotifier\src\main.cpp
 [Other]
 [Gmail: New thread(s)]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 24ca420dbe..dd53d27932 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: ICQ.dll
 ;  Plugin: ICQ-WIM protocol
-;  Version: 0.96.4.1
+;  Version: 0.96.5.1
 ;  Authors: George Hazan
 ;============================================================
 [ICQ protocol support for Miranda NG.]
@@ -69,7 +69,7 @@
 [Connection failed.\nYour login or password was rejected (%d).]
 [Connection failed.\nThe server is temporarily unavailable (%d).]
 [Connection failed.\nUnknown error during sign on: %d]
-[Conferences]
+[Message was deleted]
 [Favorites]
 [Buddy addition failed]
 ;file \protocols\ICQ-WIM\src\utils.cpp
diff --git a/langpacks/english/Plugins/Import.txt b/langpacks/english/Plugins/Import.txt
index cb5f0302d7..ab4b795e6f 100644
--- a/langpacks/english/Plugins/Import.txt
+++ b/langpacks/english/Plugins/Import.txt
@@ -70,8 +70,6 @@
 [Error loading source file, exiting.]
 [Number of contacts in database: %d]
 [Error mapping accounts, exiting.]
-[Importing groups.]
-[Group import failed.]
 [Importing contacts.]
 [Skipping new contacts import.]
 [Importing system history.]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index a3bf27263b..37151fe78b 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -935,6 +935,7 @@
 [Uptime]
 [Logoff message]
 [Last active resource]
+[Received vCard does not contain any information.]
 [Please switch online to see more details.]
 [Copy]
 [Copy only this value]
diff --git a/langpacks/english/Plugins/MenuEx.txt b/langpacks/english/Plugins/MenuEx.txt
index 418f9703a3..09298a0e72 100644
--- a/langpacks/english/Plugins/MenuEx.txt
+++ b/langpacks/english/Plugins/MenuEx.txt
@@ -8,7 +8,6 @@
 [Adds some useful options to a contacts menu.]
 ;file \plugins\MenuItemEx\res\resource.rc
 [Shown menu items]
-[Visibility]
 [Show alpha icons]
 [Hide from list]
 [Ignore]
diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index 4304bfca33..b81f7e4305 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -10,7 +10,6 @@
 [Enable autoreply]
 [On event...]
 [Don't reply to ICQ contacts]
-[Don't reply when I'm invisible to the contact]
 [Save autoreply to the history]
 [Reply only when Idle]
 [Reply only when contact's message window is closed]
diff --git a/langpacks/english/Plugins/NewStory.txt b/langpacks/english/Plugins/NewStory.txt
index 79923a1d16..e6f8f6d6ec 100644
--- a/langpacks/english/Plugins/NewStory.txt
+++ b/langpacks/english/Plugins/NewStory.txt
@@ -27,6 +27,12 @@
 [Edit template:]
 [Text preview:]
 [Graphic preview:]
+[Empty history]
+[Are you sure to remove selected event(s)?]
+[Remove server history]
+[Remove history for everyone]
+[&Yes]
+[&No]
 [Filter]
 [Show all events]
 [Show incoming events only]
@@ -68,19 +74,7 @@
 [Search]
 [Search forward]
 [Search backward]
-[Are you sure to remove selected event(s)?]
 ;file \plugins\NewStory\src\history_dlg.cpp
-[FirstName]
-[LastName]
-[e-mail]
-[Nick]
-[Age]
-[Gender]
-[City]
-[State]
-[Phone]
-[Homepage]
-[About]
 [Global history search]
 [System history]
 [All results]
@@ -96,21 +90,25 @@
 [Find previous]
 [Conversations]
 [Bookmarks]
+[You need to install the Import plugin to export events]
 [No more occuurences found]
 [Passed the end of history]
+[The required plugin 'Import' isn't loaded to perform this operation.]
+[Do you want to install it using Plugin Updater?]
+[Missing plugin]
 [It is metacontact. For export use one of this subcontacts:\r\n%s]
 [Export warning]
 [JSON files]
-[Export %s history]
+[Export history]
 [Complete]
 [History export]
 [Passed the beginning of history]
 ;file \plugins\NewStory\src\history_menus.cpp
-[Copy file path]
-[Copy URL]
 [History]
 [Global search]
 [Copy text]
+[Copy URL]
+[Copy file path]
 [Show in folder]
 [Quote]
 [Save as]
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index a3daf3b0e3..94d5741801 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -138,9 +138,10 @@
 [Try to keep original size]
 [Help on this]
 [Reset all hidden warnings]
-[Load unread events only]
-[Load number of previous events]
-[Load previous events less than]
+[Preload history events on window opening]
+[Preload unread events only]
+[Preload number of previous events]
+[Preload previous events less than]
 [minutes old]
 [Indent values]
 [Left/Right]
@@ -148,7 +149,6 @@
 [Template sets]
 [Standard templates...]
 [RTL templates...]
-[Load history events]
 [Typing notification options]
 [Send typing notifications to the following users when you are typing a message to them:]
 [        Show typing notifications in the message window]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 40bf53922a..fb38a00dc0 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -64,7 +64,6 @@
 [Advanced options]
 [Show tooltip after all content is ready (avatar && status message)]
 [Retrieve new status message]
-[Disable in invisible status]
 [Retrieve xStatus details if auto-retrieve is disabled]
 [Status bar and tray tooltip]
 [Limit status messages in status bar and tray tooltips to:]