- langpacks/english: update;

- langpacks/russian: update;


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

21 files changed, 81 insertions, 89 deletions

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 76251e024c..fc39f8ae4f 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -40,7 +40,7 @@
 [Tile vertically]

 [Scroll with text]

 [Stretch proportionally]

-[Tile vertically according to Row Height]

+[Tile vertically according to row height]

 [Use Windows Colors]

 [Available skins]

 [Rescan]

@@ -95,7 +95,7 @@
 [Horizontal Align]

 [Multiline status bar:]

 [Accounts per line]

-[* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show TitleBar then pull appeared title of status bar up or down.]

+[* To increase Status Bar height:\nSet in Main menu: Frames->Status Bar->Show title then pull appeared title of status bar up or down.]

 [Hold [Shift] to inverse [Right Click] behavior]

 [[Ctrl]+[Left Click] to filter only protocol. Click on empty space to show all]

 [Set options per account]

@@ -256,7 +256,7 @@
 [Use extra status icon instead protocol]

 [Draw normal status as overlay]

 [Right-To-Left reading mode (mirror template)]

-[Replace smileys in clist]

+[Replace smileys in contact list]

 [Use protocol smileys]

 [Draw smileys on first line]

 [Resize smileys and 'Listening to' icon]

@@ -337,10 +337,10 @@
 [Avatar Overlay]

 [Status Overlay]

 [Contact List smileys]

-[List Background]

-[Menu Background]

-[StatusBar Background]

-[Frames TitleBar BackGround]

+[List background]

+[Menu background]

+[Status bar background]

+[Frames title bar background]

 [Do you want contact '%s' to be converted to MetaContact and '%s' be added to it?]

 [Converting to MetaContact]

 [Do you want contact '%s' to be converted to MetaContact and '%s' be added to it (remove it from '%s')?]

@@ -387,11 +387,7 @@
 [Menu text]

 [Selected menu text]

 [Frame title text]

-[Statusbar text]

 [3rd party frames transparent back color]

-[General]

-[List]

-[Window]

 [Not focused]

 [Offline]

 [Online]

@@ -413,8 +409,12 @@
 [Hide to tray]

 [Behind left edge]

 [Behind right edge]

+[General]

+[List]

+[Window]

+[List Background]

 ;file \plugins\Clist_modern\src\modern_clistevents.cpp

-[Event Area Background]

+[Event area background]

 [Event Area]

 [No Events]

 ;file \plugins\Clist_modern\src\modern_clistmenus.cpp

@@ -520,8 +520,8 @@
 [Enable sounds]

 [Disable sounds]

 [Minimize]

-[To view a toolbar in Clist Modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue]

-[ToolBar Background]

+[To view a toolbar in Clist_modern you need the TopToolBar plugin. Click Yes to download it or Cancel to continue]

+[Toolbar background]

 [Toolbar upgrade]

 ;file \plugins\Clist_modern\src\modern_viewmodebar.cpp

 [Ungrouped contacts]

@@ -564,10 +564,9 @@
 [&Up]

 [&Down]

 [Show All Frames]

-[Show All Titlebars]

-[Hide All Titlebars]

+[Show all title bars]

+[Hide all title bars]

 [Lock Frame]

-[Show TitleBar]

 ;file \plugins\Clist_modern\src\CLUIFrames\framesmenu.cpp

 [Frame menu]

 ;file \plugins\Clist_modern\src\CLUIFrames\groupmenu.cpp

diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index e35cd52654..502eea1d05 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -3,7 +3,7 @@
 ;  File: Clist_mw.dll

 ;  Plugin: MultiWindow contact list

 ;  Version: 0.9.0.0

-;  Authors: 

+;  Authors: Bethoven

 ;============================================================

 [Displays contacts, event notifications, protocol status with MW modifications.]

 ;file \plugins\Clist_mw\res\resource.rc

@@ -104,7 +104,7 @@
 [Gray out entire list when:]

 [Dim idle contacts]

 [Hide vertical scrollbar]

-[Contact List Background]

+[Contact list background]

 [Use 'Meta' protocol icons for Metacontacts]

 [Avoid doubleclick expand]

 [Hide all 'Extra icons' for subcontacts]

@@ -122,7 +122,7 @@
 [Show size grip]

 [Show bevel effect on panels]

 [Use connecting Icon]

-[Use New Drawer for StatusBar]

+[Use new drawer for status bar]

 [&Main menu]

 [E&xit]

 [&Status]

@@ -153,6 +153,10 @@
 ;file \plugins\Clist_mw\src\BkgrCfg.cpp

 [Customize]

 [Backgrounds]

+;file \plugins\Clist_mw\src\clc.cpp

+[Status bar background]

+[List background]

+[Frames title bar background]

 ;file \plugins\Clist_mw\src\clcfonts.cpp

 [Standard contacts]

 [Online contacts to whom you have a different visibility]

@@ -169,10 +173,9 @@
 [Hottrack Text]

 [Quicksearch Text]

 ;file \plugins\Clist_mw\src\clcopts.cpp

+[Contact list]

 [List]

-[List Background]

 [List MetaContacts]

-[StatusBar Background]

 [Not focused]

 [Offline]

 [Online]

@@ -207,7 +210,7 @@
 ;file \plugins\Clist_mw\src\CLUIFrames\cluiframes.cpp

 [&FrameTitle]

 [&Visible]

-[&Show TitleBar]

+[&Show title bar]

 [&Locked]

 [&Collapsed]

 [&Floating Mode]

@@ -221,11 +224,10 @@
 [&Down]

 [Frames]

 [Show All Frames]

-[Show All Titlebars]

-[Hide All Titlebars]

+[Show all title bars]

+[Hide all title bars]

 [Lock Frame]

 [Visible]

-[Show TitleBar]

 [Floating]

 ;file \plugins\Clist_mw\src\CLUIFrames\framesmenu.cpp

 [Frame menu]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index ea990925ff..af3058035d 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -197,7 +197,7 @@
 [Corner radius]

 [Skin options]

 [Group top padding]

-[Frame titlebar height]

+[Frame title bar height]

 [Ignore selection for groups]

 [Load from skin file]

 [Export to skin file]

@@ -389,8 +389,8 @@
 [Thin border]

 [No border]

 ;file \plugins\Clist_nicer\src\Docking.cpp

-[The clist cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]

-[Clist docking]

+[The contact list cannot be docked when using the default title bar and border. Use a toolwindow or borderless style instead.]

+[Contact list docking]

 ;file \plugins\Clist_nicer\src\extBackg.cpp

 [Load and apply]

 ;file \plugins\Clist_nicer\src\init.cpp

@@ -420,7 +420,7 @@
 ;file \plugins\Clist_nicer\src\CLUIFrames\cluiframes.cpp

 [&FrameTitle]

 [&Visible]

-[&Show TitleBar]

+[&Show title bar]

 [&Locked]

 [&Collapsed]

 [&Floating Mode]

@@ -435,11 +435,11 @@
 [&Down]

 [Frames]

 [Show All Frames]

-[Show All Titlebars]

-[Hide All Titlebars]

+[Show all title bars]

+[Hide all title bars]

 [Lock Frame]

 [Visible]

-[Show TitleBar]

+[Show title bar]

 [Skinned frame]

 [Floating]

 ;file \plugins\Clist_nicer\src\CLUIFrames\framesmenu.cpp

diff --git a/langpacks/english/Plugins/CmdLine.txt b/langpacks/english/Plugins/CmdLine.txt
index 5b6b634291..e8c765ebd7 100644
--- a/langpacks/english/Plugins/CmdLine.txt
+++ b/langpacks/english/Plugins/CmdLine.txt
@@ -37,7 +37,7 @@
 [Configures proxy settings either globally or per account.\nUsage: proxy (global|<account>) <setting> [<params>].\n<Setting> is one of the following settings:\n  status (disable | enable | toggle)\n  server <proxy type> <server> <port>.]

 [Allows you to search/list contacts or open a message windows for specified contacts.\nUsage:\n  contacts list [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will search all contacts and display the ones matching the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'.\n  contacts open [<keyword> [account:<account>] [id:<id>] [status:<status>] [<keyword> [...]]].\nThe command will open a message window for all contacts that match the search criteria. To search for a specific account use the keyword 'account:<account>'. To search for contacts that have a certain ID use the keyword 'id:<id>'. To search for contacts that have a certain status use 'status:<status>'. If no keyword is specified the command will open a message window for all contacts that have unread messages.]

 [Shows history or unread messages for a contact.\nUsage: history <command> <contact>.\n<Command> is one of the following commands:\n  unread - show unread messages for that contact.\n  show <contact> <start> <finish> - show history from event number <start> to <finish>. If any number is negative it is interpreted as a relative index from the last event number +1 (so the last event for a contact is -1).]

-[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]

+[Shows version information for Miranda and CmdLine plugin. If VersionInfo plugin is installed it will use its report instead.\nUsage: version.\nThe command will print Miranda's and CmdLine's version numbers or, if VersionInfo plugin is installed, it will show VersionInfo's report.]

 [Changes the user's nickname on the given protocol to the new name.\nUsage: setnickname <protocol> new_nickname.]

 [Ignores or removes ignore flags for specific contacts.\nUsage:\n  ignore (block | unblock) <contact> [<contact> [<contact> [...]]].\nThe command will set or remove ignore flags for the specified contacts]

 ;file \plugins\CmdLine\src\mimcmd_handlers.cpp

diff --git a/langpacks/english/Plugins/Dbx_mmap.txt b/langpacks/english/Plugins/Dbx_mmap.txt
index 6cc429cf35..9573ac88d9 100644
--- a/langpacks/english/Plugins/Dbx_mmap.txt
+++ b/langpacks/english/Plugins/Dbx_mmap.txt
@@ -21,7 +21,7 @@
 [Database encryption mode]

 [Standard]

 [Total]

-[Only critical data are encrypted (passwords, security tokens etc). All another settings and history remains unencrypted. Fast and effective, suitable for the most cases]

+[Only critical data are encrypted (passwords, security tokens, etc). All another settings and history remains unencrypted. Fast and effective, suitable for the most cases]

 [All string settings and all events in histories are encrypted. It also makes Miranda much slower and creates a risk of loosing everything you've stored in a profile in case of loosing password. Recommended only for paranoidal users]

 ;file \plugins\Db3x_mmap\src\database.cpp

 [Disk is full. Miranda will now shutdown.]

diff --git a/langpacks/english/Plugins/Folders.txt b/langpacks/english/Plugins/Folders.txt
index 8c8f18fb15..2de9731ca0 100644
--- a/langpacks/english/Plugins/Folders.txt
+++ b/langpacks/english/Plugins/Folders.txt
@@ -22,11 +22,11 @@
 [be saved to the database, they will only be valid for this session.]

 [Variable string]

 [What it expands to:]

-[Expands to your Miranda path (e.g: c:\\program files\\miranda ng).]

+[Expands to your Miranda path (e.g., c:\\program files\\miranda ng).]

 [Expands to your profile path - the value found in mirandaboot.ini,]

 [ProfileDir section (usually inside Miranda's folder).]

 [Expands to your current profile name without the extenstion.]

-[(e.g. default if your your profile is default.dat).]

+[(e.g., default if your your profile is default.dat).]

 [Environment variables]

 [The plugin can also expand environment variables; the variables are specified like in any other]

 [program that can use environment variables, i.e. %<env variable>%.]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 66f6cd7b69..85ed7c0bd7 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -292,7 +292,6 @@
 [Join channel]

 [Please enter a channel to join]

 [Please select IRC network and enter the password if needed]

-[Change nick name]

 [Please enter a unique nickname]

 [Please enter your authentification code]

 [Authentificate nick]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 0ab135a7d0..80be1f48f4 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Jabber.dll

 ;  Plugin: Jabber Protocol

-;  Version: 0.11.0.3

+;  Version: 0.11.0.4

 ;  Authors: George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura

 ;============================================================

 [Jabber protocol support for Miranda NG.]

@@ -83,7 +83,7 @@
 [ZIP:]

 [Country:]

 [Full name:]

-[Nick name:]

+[Nickname:]

 [First name:]

 [Middle:]

 [Last name:]

@@ -146,7 +146,6 @@
 [<room jid>\nIncoming group chat invitation.]

 [You are invited to conference room by]

 [with following reason:]

-[Nickname:]

 [&Accept]

 [Jabber Bookmarks]

 [Server side bookmarks\nStore conference rooms and web links on server.]

@@ -300,6 +299,7 @@
 [Supports Miranda NG notes extension]

 [Supports Jingle]

 [Supports Roster Exchange]

+[Supports direct chat invitations (XEP-0249)]

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

 [Enter the text you see]

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

@@ -651,7 +651,6 @@
 [Services...]

 [Registered Transports]

 [Local Server Transports]

-[Browse Chatrooms]

 [Create/Join group chat]

 [Roster editor]

 [Resource priority]

@@ -916,7 +915,6 @@
 [Status changes]

 [Don't notify history messages]

 [JID]

-[Nick Name]

 [Group]

 [Subscription]

 [Uploading...]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 220d317bf4..a7eeece0d6 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -69,7 +69,7 @@
 [Userlist:]

 [Export PubKey]

 [Turn on debug log]

-[Use Jabber api on Miranda NG (recommended)]

+[Use Jabber API on Miranda NG (recommended)]

 [Default key]

 [Encrypt file transfers]

 [Automatic key exchange]

diff --git a/langpacks/english/Plugins/NimContact.txt b/langpacks/english/Plugins/NimContact.txt
index f58b0a4355..b07be12fc2 100644
--- a/langpacks/english/Plugins/NimContact.txt
+++ b/langpacks/english/Plugins/NimContact.txt
@@ -25,7 +25,7 @@
 [O&pen File]

 [O&pen Folder]

 [Link Settings]

-[CList Settings]

+[Contact list settings]

 [Group:]

 [Status Icon]

 [Group\\Sub-Group]

@@ -67,7 +67,7 @@
 ;file \plugins\Non-IM Contact\src\dialog.cpp

 [String replacing variables....\r\nThe following are all the valid variables that can be used. Refer to the readme for a proper explanation.\r\n\r\nfile(X)\t\t<- specifies the file to read from. MUST be followed by either start() or end() or wholeline()\r\nfilename(X)\t<- copies the filename of file X.\r\nstart(...)\t\t<- specifies where to start copying from.\r\nend(...)\t\t<- specifies where to stop copying.\r\nwholeline(line(...))\t<- specifies a whole line to copy\r\n\r\nstart() and end() explained\r\n.........................\r\nMUST start with line() followed by a number or a string inside " marks, OR csv(separatorX) variable. The number specifies which character in the line to start/end copying. The string specifies a string in the line to start/end copying.\r\n\r\ncsv(seperatorX) explained...\r\nSeperator is either "tab" or "space" or any SINGLE character. X is the Xth seperator to pass before copying, (or to stop before).\r\n\r\nLastly the line(...) variable...\r\nInside the brackets must be either a number (to specify the line number), or a string inside " marks (to use the line with that string), or lastline(X). The X in lastline is the Xth line above the last line i.e. lastline(1) will use the 2nd last line of the file. If searching for a line with "some words" you may put a + or - X after the closing ) i.e. line("some words")+3 to go 3 lines after the line with "some words".\r\n\r\nSome Examples...\r\nfilename(0)    <- will display the filename of the 0th file\r\nfile(0)wholeline(line(0)))    <- will display the whole first line of the 0th file\r\nfile(0)wholeline(line("hello")-1)))    <- the wholeline above the first occurrence of "hello" in the file\r\nfile(0)start(line(lastline(1))csv(tab2))end(line(lastline())csv(tab4)))    <- starts at the 2nd last line of the file, from the 2nd tab variable, until the 4th tab variable in the last line (in the 0th file)\r\nfile(0)start(line("hello")+1"zzzz")end(line(6)17))    <- starts from the first occurrence of zzzz in the line after the first occurrence of hello, until the 17th character in the 6th line (starting from line 0) of the 0th file.\r\n]

 [Contacts Display Info]

-[Link and CList Settings]

+[Link and Contact list Settings]

 [Copy Contact]

 [Files]

 [Edit Non-IM Contact "%s"]

diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 80ee409815..a45888238c 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -2,10 +2,10 @@
 ;============================================================

 ;  File: Nudge.dll

 ;  Plugin: Nudge

-;  Version: 0.0.2.0

+;  Version: 0.1.0.0

 ;  Authors: Tweety/GouZ, FREAK_THEMIGHTY

 ;============================================================

-[Plugin to shake the clist and chat window.]

+[Plugin to shake the contact list and chat window.]

 ;file \plugins\Nudge\res\resource.rc

 [Protocol options]

 [Specify options for each protocol]

@@ -37,7 +37,7 @@
 [Invisible]

 [On the phone]

 [Out to lunch]

-[Shaking Clist Options]

+[Shaking contact list options]

 [Number of moves]

 [Width of move]

 [Static]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index a7cae844ca..dedad66b6d 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Scriver.dll

 ;  Plugin: Scriver

-;  Version: 2.10.0.2

+;  Version: 2.10.1.0

 ;  Authors: Miranda NG Development Team

 ;============================================================

 [Scriver - send and receive instant messages.]

@@ -32,10 +32,10 @@
 [Use separate windows for group chats]

 [Limit number of group chats tabs per window to]

 [Layout]

-[Show titlebar]

+[Show title bar]

 [Show status bar]

 [Show toolbar]

-[Show infobar]

+[Show info bar]

 [Show avatars]

 [Use the contact's status icon as the window icon]

 [Show progress indicator]

@@ -46,7 +46,6 @@
 [lines]

 [Message Window Event Log]

 [Enable IEView]

-[Log status changes]

 [Show icons]

 [Show time]

 [Show seconds]

@@ -239,16 +238,16 @@
 [Navigate: Previous Tab]

 [Navigate: Next Tab]

 [Navigate: Tab %d]

-[Window: Toggle Statusbar]

-[Window: Toggle Titlebar]

-[Window: Toggle Toolbar]

-[Window: Toggle Infobar]

-[Window: Clear Log]

+[Window: Toggle status bar]

+[Window: Toggle title bar]

+[Window: Toggle toolbar]

+[Window: Toggle info bar]

+[Window: Clear log]

 [Window: Minimize]

-[Window: Close Tab]

+[Window: Close tab]

 [Action: Quote]

-[Action: Send to All]

-[Action: Paste & Send]

+[Action: Send to all]

+[Action: Paste and send]

 ;file \plugins\Scriver\src\msgdialog.cpp

 [Quote]

 [Smiley]

@@ -266,9 +265,6 @@
 [Insert Emoticon]

 [Send Message]

 [User Menu - %s]

-[signed off (was %s)]

-[signed on (%s)]

-[is now %s (was %s)]

 [Sending in progress: %d message(s) left...]

 [%s is typing a message...]

 [Last message received on %s at %s.]

@@ -304,9 +300,9 @@
 [Input area background]

 [Outgoing URL]

 [Incoming URL]

-[Infobar contact name]

-[Infobar background]

-[Infobar status message]

+[Info bar contact name]

+[Info bar background]

+[Info bar status message]

 [Others nicknames]

 [Your nickname]

 [User has joined]

@@ -514,7 +510,7 @@
 [Show/hide the nicklist (CTRL+N)]

 [Control this room (CTRL+O)]

 [Enable/disable the event filter (CTRL+F)]

-[Nick name]

+[Nickname]

 [Unique ID]

 [Status]

 [%s: Chat Room (%u user)]

diff --git a/langpacks/english/Plugins/Sessions.txt b/langpacks/english/Plugins/Sessions.txt
index b8b50e9ea7..e6b18a597d 100644
--- a/langpacks/english/Plugins/Sessions.txt
+++ b/langpacks/english/Plugins/Sessions.txt
@@ -26,7 +26,7 @@
 [Misc]

 [Exclude hidden contacts from session on exit]

 [Warn, when some of LastSession contacts are hidden]

-[Show other warnings ("session already opened" etc.)]

+[Show other warnings ("session already opened", etc.)]

 [Crash Recovery mode]

 [Restore Session]

 [&Restore Session]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 503f87f4a5..3950e6210c 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: TabSRMM.dll

 ;  Plugin: TabSRMM

-;  Version: 3.2.0.0

+;  Version: 3.2.0.1

 ;  Authors: The Miranda developers team and contributors

 ;============================================================

 [IM and group chat module for Miranda NG.]

@@ -54,8 +54,8 @@
 [Names to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces]

 [Highlight message text]

 [Enable highlighting for message text]

-[Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nick name.]

-[Highlight messages containing my own nick name]

+[Words to highlight, wildcards like * and ? are allowed, separate multiple entries with spaces. Leave it empty if you only want to highlight your own nickname.]

+[Highlight messages containing my own nickname]

 [List]

 [&Message]

 [Log]

@@ -489,7 +489,6 @@
 [Channel manager]

 [<Separator>]

 ;file \plugins\TabSRMM\src\container.cpp

-[Hide titlebar]

 [Message Session...]

 [Default container]

 [Attach to]

@@ -889,7 +888,7 @@
 [Draw grid lines]

 [Use Incoming/Outgoing Icons]

 [Use Message Grouping]

-[Simple text formatting (*bold* etc.)]

+[Simple text formatting (*bold*, etc.)]

 [Support BBCode formatting]

 [Place a separator in the log after a window lost its foreground status]

 [Only place a separator when an incoming event is announced with a popup]

@@ -1162,7 +1161,6 @@
 [Highlight User...]

 [Edit Highlight List...]

 ;file \plugins\TabSRMM\src\chat\window.cpp

-[Nick name]

 [Unique ID]

 [Nick]

 [%s: Chat Room (%u user%s)]

diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index c23947140a..3ca6795761 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -146,7 +146,7 @@
 [Extra status]

 [Listening to]

 [Miranda uptime]

-[Clist event]

+[Contact list event]

 [Jabber activity]

 [Gender]

 [Country flag]

diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
index ea357ab59b..d88689acbb 100644
--- a/langpacks/english/Plugins/Tlen.txt
+++ b/langpacks/english/Plugins/Tlen.txt
@@ -54,7 +54,7 @@
 [Tlen Password]

 [OK]

 [Cancel]

-[Nick name:]

+[Nickname:]

 [First name:]

 [Last name:]

 [E-mail:]

@@ -76,7 +76,6 @@
 [Version:]

 [System:]

 [Personal Information]

-[Nickname:]

 [Age:]

 [to]

 [Extra Search Criterias]

diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index 2c57231da4..3b34db7213 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -23,6 +23,7 @@
 [Set]

 ;file \plugins\TopToolBar\src\toolbar.cpp

 [Default]

+[TopToolBar Background]

 [Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- MultiWindow (MW)\n- Nicer+\nYou can get them at http://miranda-ng.org/]

 [TopToolBar]

 ;file \plugins\TopToolBar\src\ttbopt.cpp

diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index d951627303..729da0f781 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: UInfoEx.dll

 ;  Plugin: User info ext

-;  Version: 0.8.4.2

+;  Version: 0.8.5.0

 ;  Authors: DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol

 ;============================================================

 [Extended UserInfo module for Miranda NG. Provides interface to edit all contact information.]

@@ -50,7 +50,7 @@
 [Or enter a full international number:]

 [Phone can receive SMS text messages]

 [Add E-Mail]

-[Enter your full e-mail address.\n(e.g.: john.doe@provider.com)]

+[Enter your full e-mail address.\n(e.g., john.doe@provider.com)]

 [Enter a representitive name for the e-mail address here.]

 [Enter the e-mail address here.]

 [Show menu items]

@@ -234,8 +234,8 @@
 [Ignore]

 [Error]

 ;file \plugins\UserInfoEx\src\dlg_propsheet.cpp

-[Protocol '%s' is offline]

 [Upload Details]

+[Protocol '%s' is offline]

 [You are not currently connected to the ICQ network.\nYou must be online in order to update your information on the server.\n\nYour changes will be saved to database only.]

 [Uploading]

 [Creating the imagelist failed!]

@@ -268,12 +268,12 @@
 [Export: Modules]

 [Export: Folder]

 [Default]

-[Details Infobar]

-[Phone Infobar]

-[E-Mail Infobar]

+[Details info bar]

+[Phone info bar]

+[E-Mail info bar]

 [Export VCard]

 [Import VCard]

-[Anniversary Infobar]

+[Anniversary info bar]

 [Update]

 [Export]

 [Goto]

@@ -595,7 +595,7 @@
 [Anniversary Reminder]

 ;file \plugins\UserInfoEx\src\ex_import\classExImContactBase.cpp

 [contact identificaion]

-[The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your clist with the same nick and protocol.\nDo you wish to use this contact?]

+[The contact %s(%s) has no unique ID in the vCard,\nbut there is a contact in your contact list with the same nick and protocol.\nDo you wish to use this contact?]

 ;file \plugins\UserInfoEx\src\ex_import\classExImContactXML.cpp

 [Importing a new contact was aborted!]

 [You aborted import of a new contact.\nSome information may be missing for this contact.\n\nDo you want to delete the incomplete contact?]

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 4e2d7b2a3c..71e575bdb7 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -36,7 +36,7 @@
 [icons.dll]

 [Blocked User List]

 [This list contains all your blocked Xfire users. You can remove one, if you wanna allow him to send you a friend request.]

-[You can simply block someone, if you right click on his friend request in clist and choose Block User...]

+[You can simply block someone, if you right click on his friend request in contact list and choose Block User...]

 [This file is used for the game search, game detection and game ID resolving. It contains all Xfire supported games.]

 [This file contains all original game icons. You can also activate the option for icon downloading, if you don't have it.]

 [Be sure you put these files in following folder:]

diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index 16e46b9920..360dfff559 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -34,7 +34,7 @@
 [Auto retrieve body]

 [Check from menu]

 [Use contact notification for this account]

-[Replace nick name]

+[Replace nickname]

 [Disable Events]

 [Notifications]

 [New Mail]

diff --git a/langpacks/english/Plugins/ZeroNotify.txt b/langpacks/english/Plugins/ZeroNotify.txt
index e10ac6872e..bdb41a3967 100644
--- a/langpacks/english/Plugins/ZeroNotify.txt
+++ b/langpacks/english/Plugins/ZeroNotify.txt
@@ -8,7 +8,7 @@
 [Adds options to automatically disable notifications when a protocol is in a certain status.]

 ;file \plugins\ZeroNotification\res\ZeroNotify.rc

 [No sounds when:]

-[No CLIST blink when:]

+[No CList blink when:]

 [No SysTray blink when:]

 [Hide the "toggle sound" menu item (requires restart of Miranda)]

 ;file \plugins\ZeroNotification\src\common.h