langpacks\english: update

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

1 files changed, 118 insertions, 124 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1840adf14e..38cbaf483e 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -14,20 +14,20 @@
 [Group:]

 [Options]

 [Authorization request]

-[Delete Contact]

+[Delete contact]

 [&Yes]

 [&No]

 [Hide from list only, in order to keep their history and ignore/visibility settings]

 [Use Options->Contacts->Ignore to unhide contacts.]

 [Are you sure you want to delete %s?]

 [This will erase all history and settings for this contact!]

-[Contact Display Options]

+[Contact display options]

 [Instead of displaying contacts by their nickname,\ndrag to choose another order:]

 [Miranda NG Profile Manager]

 [&Run]

 [&Exit]

 [Start in Service Mode with]

-[Find/Add Contacts]

+[Find/Add contacts]

 [Search:]

 [E-mail address]

 [Name]

@@ -40,12 +40,12 @@
 [More options]

 [Add to list]

 [Custom]

-[Find/Add Contacts\nHere you can add contacts to your contact list]

+[Find/Add contacts\nHere you can add contacts to your contact list]

 [Options\nConfigure your Miranda NG options]

 [Apply]

 [Switch to simple options]

 [Please select a subentry from the list]

-[Install Database Settings]

+[Install database settings]

 [Yes]

 [No]

 [A file containing new database settings has been placed in the Miranda NG directory.]

@@ -53,21 +53,21 @@
 [No to all]

 [&View contents]

 [Security systems to prevent malicious changes are in place and you will be warned before changes that are not known to be safe.]

-[Database Setting Change]

+[Database setting change]

 [Database settings are being imported from]

 [This file wishes to change the setting]

 [to the value]

 [Do you want to allow this change?]

 [&Allow all further changes to this section]

-[Cancel Import]

-[Database Import Complete]

+[Cancel import]

+[Database import complete]

 [The import has completed from]

 [What do you want to do with the file now?]

 [&Recycle]

 [&Delete]

 [&Move/Rename]

 [&Leave]

-[Netlib Log Options]

+[Netlib log options]

 [Show]

 [Received bytes]

 [Sent bytes]

@@ -82,12 +82,12 @@
 [Run now]

 [Show this dialog box when Miranda NG starts]

 [Save as default]

-[SSL Traffic]

+[SSL traffic]

 [Sounds]

 [&Change...]

 [&Preview]

 [Download more sounds]

-[Sound Information]

+[Sound information]

 [Location:]

 [Name:]

 [Enable sound events]

@@ -100,18 +100,18 @@
 [Messages]

 [URLs]

 [Files]

-[Online Notification]

-[Auth Requests]

-[All Events]

+[Online notification]

+[Auth requests]

+[All events]

 [None]

 [Only the ticked contacts will be shown on the main contact list]

 [Ignore]

-[Added Notification]

+[Added notification]

 [Typing]

 [Visibility]

 [You are visible to this person even when in invisible mode]

 [You are never visible to this person]

-[Icon Index]

+[Icon index]

 [Icon library:]

 [Drag icons to main list to assign them:]

 [Import multiple]

@@ -120,20 +120,20 @@
 [<< &Import]

 [To default status icons]

 [Logging...]

-[Outgoing Connections]

+[Outgoing connections]

 [Use proxy server]

 [Type:]

 [Host:]

 [Port:]

 [(often %d)]

-[Use Custom Login (Domain login picked up automatically)]

+[Use custom login (domain login picked up automatically)]

 [Username:]

 [Password:]

 [Resolve hostnames through proxy]

-[Port Range:]

+[Port range:]

 [Example: 1050-1070, 2000-2010, 2500]

 [Validate SSL certificates]

-[Incoming Connections]

+[Incoming connections]

 [Enable UPnP port mapping]

 [You will need to reconnect for the changes you have made on this page to take effect.]

 [Please complete the following form to create a new user profile]

@@ -151,14 +151,14 @@
 [Unique ID:]

 [Copyright:]

 [Please restart Miranda NG for your changes to take effect.]

-[Fonts and Colors]

+[Fonts and colors]

 [Undo]

 [Reset]

 [Export...]

-[Color/Background]

-[Text Effect]

-[Text Color]

-[Choose Font]

+[(Background) Color]

+[Text effect]

+[Text color]

+[Choose font]

 [Font]

 [&Font:]

 [Font st&yle:]

@@ -173,26 +173,26 @@
 [Sc&ript:]

 [&Apply]

 [&Help]

-[Menu Objects]

-[Menu Items]

+[Menu objects]

+[Menu items]

 [Protocol menus]

 [Move to the main menu]

 [Move to the status bar]

-[Warning!\r\nThis MenuObject not support user defined options.]

+[Warning!\r\nThis menu object not support user defined options.]

 [Insert separator]

 [Service:]

 [Default]

 [Set]

 [Disable icons]

 [Show accounts in the following order,\ndrag to choose another order:]

-[Account Order && Visibility]

+[Account order and visibility]

 [Note: Miranda NG will have to be restarted for changes to take effect.]

-[Key Bindings]

+[Key bindings]

 [Shortcut:]

 [Add]

 [Remove]

-[Undo Changes]

-[Reset To Default]

+[Undo changes]

+[Reset to default]

 [Hotkeys]

 [Accounts]

 [Accounts\nConfigure your IM accounts]

@@ -207,7 +207,7 @@
 [&Remove...]

 [Miranda NG]

 [Miranda NG is being restarted.\nPlease wait...]

-[Error Console]

+[Error console]

 [Error notifications]

 [Headers:]

 [This font is used to display main section titles or text elements.]

@@ -218,65 +218,64 @@
 [Welcome to Miranda NG's account manager!\nHere you can set up your IM accounts.\n\nSelect an account from the list on the left to see the available options. Alternatively, just click on the Plus sign underneath the list to set up a new IM account.]

 [Event icon legend:]

 [Choose events you wish to ignore:]

-[Font Effect]

+[Font effect]

 [Effect:]

 [Base color:]

 [opacity:]

 [Secondary color:]

 [Select the extra icons to be shown in the contact list:]

-[* only the first %d icons will be shown]

+[*only the first %d icons will be shown]

 [You can group/ungroup icons by selecting them (CTRL+left click) and using the popup menu (right click)]

 [Tray]

 [&Hide/Show]

 [E&xit]

 [Nowhere]

-[&New Group]

-[&Hide Offline Users]

-[Hide &Offline Users out here]

-[Hide &Empty Groups]

-[Disable &Groups]

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

+[&New subgroup]

+[&Hide offline users in here]

+[&Rename group]

+[&Delete group]

 [&Reset to default]

 [find/add]

-[&Add to List]

+[&Add to list]

 [User &details]

-[Send &Message]

+[Send &message]

 [Log]

 [&Copy]

-[Co&py All]

-[Select &All]

-[C&lear Log]

+[Co&py all]

+[Select &all]

+[C&lear log]

 [Open in &new window]

 [&Open in existing window]

 [&Copy link]

-[Cancel Change]

-[&Reset To Default]

+[Cancel change]

 [Ungroup]

 ;file \src\core\stdauth\resource.rc

 [&Authorize]

 [&Deny]

-[Decide &Later]

+[Decide &later]

 [Reason:]

-[Denial Reason:]

+[Denial reason:]

 [Add to contact list if authorized]

-[You Were Added]

+[You were added]

 [&Close]

 ;file \src\core\stdaway\resource.rc

-[%s Message for %s]

+[%s message for %s]

 [Retrieving %s message...]

-[Status Messages]

+[Status messages]

 [Do not reply to requests for this message]

 [Do not pop up dialog asking for new message]

 [By default, use the same message as last time]

 [By default, use this message:]

 [Use %time% for the current time, %date% for the current date]

 [Status messages:]

-[Change %s Message]

+[Change %s message]

 [Closing in %d]

 ;file \src\core\stdchat\res\chat.rc

 [&Send]

@@ -287,8 +286,8 @@
 [&Background color]

 [&History]

 [&Filter]

-[&Room Settings]

-[&Show/hide nicklist]

+[&Room settings]

+[&Show/Hide nicklist]

 [Show these events only:]

 [Actions]

 [Nick changes]

@@ -300,7 +299,7 @@
 [Disconnects]

 [User kicks]

 [Notices]

-[Log Options]

+[Log options]

 [Log timestamp]

 [Timestamp]

 [Other name]

@@ -325,7 +324,6 @@
 [List]

 [&Message]

 [Clear lo&g]

-[Co&py all]

 [Word lookup]

 [Google]

 [Wikipedia]

@@ -337,7 +335,7 @@
 [Copy]

 [Cut]

 [Paste]

-[Select All]

+[Select all]

 [Clear]

 [Tabs]

 [&Close tab]

@@ -360,10 +358,10 @@
 [seconds, when statuses differ]

 [Show multiple icons]

 [Only when statuses differ]

-[Contact List]

+[Contact list]

 [System tray icon]

 [System tray icon when using multiple protocols]

-[Contact List Sorting]

+[Contact list sorting]

 [Window]

 [Always on top]

 [Tool style main window]

@@ -395,13 +393,13 @@
 [Show selection even when list is not focused]

 [Make selection highlight translucent]

 [Dim idle contacts]

-['Hide Offline' means to hide:]

+['Hide offline' means to hide:]

 [Groups]

 [Draw a line alongside group names]

 [Show counts of number of contacts in a group]

 [Hide group counts when there are none online]

 [Sort groups alphabetically]

-[Quicksearch in open groups only]

+[Quick search in open groups only]

 [Indent groups by:]

 [pixels]

 [Visual]

@@ -413,7 +411,7 @@
 [Row height:]

 [Gamma correction]

 [Gray out entire list when:]

-[Contact List Background]

+[Contact list background]

 [Background color]

 [Selection color]

 [Use background image]

@@ -424,7 +422,7 @@
 [Scroll with text]

 [Stretch proportionally]

 [Use Windows colors]

-[Status Bar]

+[Status bar]

 [Show status bar]

 [Show icons]

 [Show protocol names]

@@ -449,16 +447,16 @@
 [&DND\tCtrl+5]

 [&Free for chat\tCtrl+6]

 [&Invisible\tCtrl+7]

-[On the &Phone\tCtrl+8]

-[Out to &Lunch\tCtrl+9]

+[On the &phone\tCtrl+8]

+[Out to &lunch\tCtrl+9]

 ;file \src\core\stdfile\resource.rc

-[Send File(s)]

+[Send file(s)]

 [To:]

 [File(s):]

-[&Choose Again...]

+[&Choose again...]

 [Total size:]

 [&User menu]

-[Incoming File Transfer]

+[Incoming file transfer]

 [A&ccept]

 [&Decline]

 [From:]

@@ -469,7 +467,7 @@
 [Open &folder]

 [Transfer completed, open file(s).]

 [No data transferred]

-[File Already Exists]

+[File already exists]

 [Resume]

 [Resume all]

 [Overwrite]

@@ -486,12 +484,12 @@
 [Open folder]

 [File properties]

 [File being received]

-[File Transfers]

+[File transfers]

 [Clear completed]

 [Close]

 [Receiving files]

 [Received files folder:]

-[Variables Allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%]

+[Variables allowed: %userid%, %nick%, %proto%, %miranda_path%, %userprofile%]

 [Auto-accept incoming files from people on my contact list]

 [Minimize the file transfer window]

 [Close window when transfer completes]

@@ -524,7 +522,7 @@
 [for]

 [Change my status mode to:]

 [Do not set status back to online when returning from idle]

-[Idle Options]

+[Idle options]

 [Become idle if application full screen]

 [Disable sounds on idle]

 [Become idle if computer is left unattended for:]

@@ -544,18 +542,18 @@
 [Send message on 'Enter']

 [Show character count]

 [Show warning when message has not been received after]

-[Support control up/down in message area to show previously sent messages]

+[Support CTRL+Up/Down in message area to show previously sent messages]

 [Delete temporary contacts when closing message window]

 [Enable avatar support in the message window]

 [Limit avatar height to]

-[Max Number of Flashes]

-[Send Error]

+[Maximum number of flashes]

+[Send error]

 [An error has occurred. The protocol reported the following error:]

 [while sending the following message:]

 [Try again]

-[Message Session]

+[Message session]

 [&Details]

-[Message Window Event Log]

+[Message window event log]

 [Show names]

 [Show timestamp]

 [Show dates]

@@ -565,8 +563,8 @@
 [minutes old]

 [Show status changes]

 [Show seconds]

-[Load History Events]

-[Show Formatting]

+[Load history events]

+[Show formatting]

 [Send typing notifications to the following users when you are typing a message to them:]

 [Show typing notifications when a user is typing a message]

 [Update inactive message window icons when a user is typing]

@@ -577,23 +575,23 @@
 [Message window behavior:]

 [Messaging:]

 [&Open link]

-[Paste && Send]

+[Paste and send]

 [Delete]

 ;file \src\core\stduihist\resource.rc

 [Find]

-[&Find Next]

-[Find What:]

-[Message History]

+[&Find next]

+[Find what:]

+[Message history]

 [&Find...]

 ;file \src\core\stduserinfo\resource.rc

-[Add Phone Number]

+[Add phone number]

 [Enter country, area code and phone number:]

 [Or enter a full international number:]

 [Phone can receive SMS text messages]

-[Add E-Mail Address]

-[%s: User Details]

+[Add e-mail address]

+[%s: user details]

 [%s\nView personal user details and more]

-[Update Now]

+[Update now]

 [Updating]

 [Nickname:]

 [First name:]

@@ -629,21 +627,20 @@
 [Alerts]

 [Added event]

 ;file \src\core\stdauth\authdialogs.cpp

-[View User's Details]

-[Add Contact Permanently to List]

+[View user's details]

+[Add contact permanently to list]

 [<Unknown>]

 [%s added you to the contact list\n%u (%s) on %s]

 [%s added you to the contact list\n%u on %s]

 [%s added you to the contact list\n%s on %s]

 [(Unknown)]

-[View User Details]

 [%s requested authorization\n%u (%s) on %s]

 [%s requested authorization\n%u on %s]

 [%s requested authorization\n%s on %s]

 [Feature is not supported by protocol]

 ;file \src\core\stdaway\awaymsg.cpp

-[Re&ad %s Message]

-[Re&ad Status Message]

+[Re&ad %s message]

+[Re&ad status message]

 ;file \src\core\stdaway\sendmsg.cpp

 [I've been away since %time%.]

 [Give it up, I'm not in!]

@@ -661,7 +658,6 @@
 [Join chat]

 [Open chat window]

 ;file \src\core\stdchat\src\colorchooser.cpp

-[Text color]

 ;file \src\core\stdchat\src\log.cpp

 [%s has joined]

 [You have joined %s]

@@ -698,11 +694,11 @@
 [User list members (online)]

 [User list members (away)]

 [Use a tabbed interface]

-[Close tab on doubleclick]

+[Close tab on double click]

 [Restore previously open tabs when showing the window]

 [Show tabs at the bottom]

-[Send message by pressing the Enter key]

-[Send message by pressing the Enter key twice]

+[Send message by pressing the 'Enter' key]

+[Send message by pressing the 'Enter' key twice]

 [Flash window when someone speaks]

 [Flash window when a word is highlighted]

 [Show list of users in the chat room]

@@ -775,12 +771,12 @@
 [Show popup for name changes]

 [Show popup for information messages]

 [Show popup for status changes]

-[Chat Module]

-[Message Background]

-[Userlist Background]

-[Userlist Lines]

-[Userlist Background (selected)]

-[Window Icon]

+[Chat module]

+[Message background]

+[User list background]

+[User list lines]

+[User list background (selected)]

+[Window icon]

 [Bold]

 [Italics]

 [Underlined]

@@ -801,13 +797,13 @@
 [Message in (10x10)]

 [Message out (10x10)]

 [Action (10x10)]

-[Add Status (10x10)]

+[Add status (10x10)]

 [Remove status (10x10)]

 [Join (10x10)]

 [Leave (10x10)]

 [Quit (10x10)]

 [Kick (10x10)]

-[Nickchange (10x10)]

+[Nick change (10x10)]

 [Notice (10x10)]

 [Topic (10x10)]

 [Highlight (10x10)]

@@ -822,10 +818,10 @@
 [Icons to display in the message log]

 [Icons to display in the tray]

 [Popups to display]

-[Select Folder]

-[Message Sessions]

+[Select folder]

+[Message sessions]

 [General]

-[Chat Log]

+[Chat log]

 [Chat]

 [Popups]

 [Message is highlighted]

@@ -870,11 +866,11 @@
 [Control this room (CTRL+O)]

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

 [Close current tab (CTRL+F4)]

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

-[%s: Chat Room (%u users)]

-[%s: Message Session]

-[%s: Message Session (%u users)]

-[Nick name]

+[%s: chat room (%u user)]

+[%s: chat room (%u users)]

+[%s: message session]

+[%s: message session (%u users)]

+[Nickname]

 [Unique ID]

 ;file \src\core\stdclist\src\clcfonts.cpp

 [Standard contacts]

@@ -884,9 +880,9 @@
 [Group member counts]

 [Dividers]

 [Offline contacts to whom you have a different visibility]

-[Selected Text]

-[Hottrack Text]

-[Quicksearch Text]

+[Selected text]

+[Hottrack text]

+[Quicksearch text]

 ;file \src\core\stdclist\src\clcopts.cpp

 [Not focused]

 [Offline]

@@ -899,7 +895,7 @@
 [Invisible]

 [Out to lunch]

 [On the phone]

-[List Background]

+[List background]

 ;file \src\core\stdclist\src\clistopts.cpp

 [Global]

 ;file \src\core\stdclist\src\cluiopts.cpp

@@ -949,7 +945,6 @@
 [Connected]

 [Initializing...]

 [Moving to next file...]

-[File already exists]

 [Sending...]

 [Receiving...]

 [File transfer denied]

@@ -1177,7 +1172,6 @@
 [Configuration Files]

 [Text Files]

 [Error writing file]

-[Fonts & Colors]

 [Sample Text]

 [Fonts]

 ;file \src\modules\fonts\FontService.cpp

@@ -1273,7 +1267,7 @@
 [Group (Open)]

 [Group (Closed)]

 [Connecting]

-[User Details]

+[User details]

 [History]

 [Down Arrow]

 [Find User]