- langpacks/english: updated

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

1 files changed, 3 insertions, 195 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 214b31692b..1c77850a15 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -625,10 +625,6 @@
 [Department:]
 [Position:]
 [Website:]
-;file \src\core\miranda.cpp
-[restart]
-[memdebug]
-[\\StringFileInfo\\000004b0\\ProductVersion]
 ;file \src\core\stdauth\auth.cpp
 [%s requests authorization]
 [%u requests authorization]
@@ -667,7 +663,6 @@
 [idleeeeeeee]
 [Status]
 ;file \src\core\stdchat\src\clist.cpp
-[Chat rooms]
 [Join chat]
 [Open chat window]
 ;file \src\core\stdchat\src\colorchooser.cpp
@@ -688,9 +683,7 @@
 [%s disables '%s' status for %s]
 [<invalid>]
 ;file \src\core\stdchat\src\options.cpp
-[Terminal]
 [Others nicknames]
-[Verdana]
 [Your nickname]
 [User has joined]
 [User has left]
@@ -835,14 +828,12 @@
 [Icons to display in the tray]
 [Pop-ups to display]
 [Select Folder]
-[Logs\\]
 [Message Sessions]
 [Group chats]
 [General]
 [Chat Log]
 [Chat]
 [Popups]
-[%miranda_logpath%\\Chat]
 [Message is highlighted]
 [User has performed an action]
 [User has kicked some other user]
@@ -852,7 +843,6 @@
 [The topic has been changed]
 ;file \src\core\stdchat\src\services.cpp
 [&Join]
-[Server: %s]
 ;file \src\core\stdchat\src\tools.cpp
 [%s wants your attention in %s]
 [%s speaks in %s]
@@ -871,7 +861,6 @@
 [Notice from %s: %s]
 [The topic is '%s']
 [The topic is '%s' (set by %s)]
-[at+]
 [Look up '%s':]
 ;file \src\core\stdchat\src\window.cpp
 [Insert a smiley]
@@ -885,15 +874,10 @@
 [Control this room (CTRL+O)]
 [Enable/disable the event filter (CTRL+F)]
 [Close current tab (CTRL+F4)]
-[AQGglo]
 [%s: Chat Room (%u user)]
 [%s: Chat Room (%u users)]
 [%s: Message Session]
 [%s: Message Session (%u users)]
-[%s: Server]
-[AQGgl']
-[AQGg']
-[open]
 ;file \src\core\stdclist\src\clcfonts.cpp
 [Selected Text]
 [Hottrack Text]
@@ -913,7 +897,6 @@
 ;file \src\core\stdclist\src\clistopts.cpp
 [Global]
 ;file \src\core\stdclist\src\cluiopts.cpp
-[Progman]
 ;file \src\core\stdemail\email.cpp
 [User has not registered an e-mail address]
 [Send e-mail]
@@ -921,9 +904,6 @@
 ;file \src\core\stdfile\file.cpp
 [File from %s]
 [bytes]
-[ KB]
-[ GB]
-[ MB]
 [&File]
 [File &Transfers...]
 [Incoming]
@@ -932,50 +912,17 @@
 [Denied]
 ;file \src\core\stdfile\fileexistsdlg.cpp
 [%s File]
-[Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Icons]
-[\\DefaultIcon]
 [All Files]
 ;file \src\core\stdfile\fileopts.cpp
-[Network Associates/McAfee VirusScan]
-[Scan32EXE]
-["%s" %%f /nosplash /comp /autoscan /autoexit /noboot]
-[Dr Solomon's VirusScan (Network Associates)]
-[szScannerExe]
-["%s" %%f /uinone /noboot /comp /prompt /autoexit]
-[Norton AntiVirus]
-["%s" %%f /b- /m- /s+ /noresults]
-[Computer Associates/Inoculate IT]
-[Software\\Antivirus]
-[ImageFilename]
-["%s" %%f /display = progress /exit]
-[Computer Associates eTrust]
-[VetPath]
-[Kaspersky Anti-Virus]
-["%s" /S /Q %%f]
-[KAV8]
-["%savp.exe" SCAN %%f]
-[KAV9]
-[AntiVir PersonalEdition Classic]
-[Path]
-["%savscan.exe" /GUIMODE = 2 /PATH = "%%f"]
-[ESET NOD32 Antivirus]
-[InstallDir]
-["%secls.exe" /log-all /aind /no-boots /adware /sfx /unsafe /unwanted /heur /adv-heur /action = clean "%%f"]
 [Executable Files]
 [Events]
 ;file \src\core\stdfile\filerecvdlg.cpp
 [My Received Files]
-[nick]
-[userid]
-[proto]
 [View User's History]
 [User Menu]
-[t d]
 [Cancelled]
 ;file \src\core\stdfile\filesenddlg.cpp
-[%d file]
 [%d files]
-[%d directory]
 [%d directories]
 ;file \src\core\stdfile\filexferdlg.cpp
 [This file has not yet been scanned for viruses. Are you certain you want to open it?]
@@ -985,7 +932,6 @@
 [Unable to initiate transfer.]
 [sec]
 [remaining]
-[%.*s (%u)%s]
 [Decision sent]
 [Connecting...]
 [Connecting to proxy...]
@@ -1005,7 +951,6 @@
 ;file \src\core\stdfile\ftmanager.cpp
 [Outgoing]
 ;file \src\core\stdhelp\about.cpp
-[\\StringFileInfo\\000004b0\\LegalCopyright]
 [< Copyright]
 ;file \src\core\stdhelp\help.cpp
 [&About...]
@@ -1013,7 +958,6 @@
 [&Miranda NG Homepage]
 [&Report Bug]
 ;file \src\core\stdidle\idle.cpp
-[WorkerW]
 [Idle]
 ;file \src\core\stdmsg\src\cmdlist.cpp
 [The message send timed out.]
@@ -1026,13 +970,11 @@
 [signed on (%s)]
 [is now %s (was %s)]
 [%s is typing a message...]
-[mailto:]
 ;file \src\core\stdmsg\src\msglog.cpp
 [File sent]
 [File received]
 ;file \src\core\stdmsg\src\msgoptions.cpp
 [Outgoing messages]
-[Arial]
 [Incoming messages]
 [Outgoing name]
 [Outgoing time]
@@ -1089,13 +1031,10 @@
 [Mobile]
 [Work Phone]
 [Work Fax]
-[ SMS]
-[mailto:%s]
 ;file \src\core\stduserinfo\stdinfo.cpp
 [Male]
 [Female]
 [<not specified>]
-[Courier New]
 [Summary]
 [Contact]
 [Location]
@@ -1104,17 +1043,9 @@
 [Notes]
 ;file \src\core\stduserinfo\userinfo.cpp
 [Owner]
-[%.*s%s%.*s]
 [View/Change My &Details...]
 ;file \src\core\stduseronline\useronline.cpp
 [%s is Online]
-;file \src\mir_core\langpack.cpp
-[static]
-[hyperlink]
-[button]
-[edit]
-;file \src\mir_core\miranda.cpp
-[ComboLBox]
 ;file \src\modules\addcontact\addcontact.cpp
 [Add Contact]
 [Please authorize my request and add me to your contact list.]
@@ -1123,20 +1054,13 @@
 [Custom status]
 [%s (locked)]
 ;file \src\modules\clist\clistmod.cpp
-[Connecting]
-[Connecting (attempt %d)]
 [This plugin requires db3x plugin version 0.5.1.0 or later]
 ;file \src\modules\clist\clistsettings.cpp
 [(Unknown Contact)]
 ;file \src\modules\clist\clisttray.cpp
-[%s%s<b>%-12.12s</b>\t%s%s%-24.24s]
-[%s%s<b>%-12.12s</b>\t%s]
-[TaskbarCreated]
-[TaskbarButtonCreated]
 [&Main Menu]
 ;file \src\modules\clist\clui.cpp
 [This contact is on an instant messaging system which stores its contact list on a central server. The contact will be removed from the server and from your contact list when you next connect to that network.]
-[Miranda::ProcessProfile]
 [De&lete]
 [&Rename]
 [&Add permanently to list]
@@ -1151,9 +1075,6 @@
 ['(Unknown Contact)' (not moveable)]
 ['(Unknown Contact)']
 [Contact names]
-;file \src\modules\clist\genmenu.cpp
-[%s (%d, id %x)]
-[Menu Icons/%s]
 ;file \src\modules\clist\genmenuopt.cpp
 [Menus]
 [Customize]
@@ -1166,7 +1087,6 @@
 [This group]
 ;file \src\modules\clist\keyboard.cpp
 [Show Hide Contact List]
-[Main]
 [Read Message]
 [Open Options Page]
 [Open Logging Options]
@@ -1175,15 +1095,6 @@
 [&Move to Group]
 [<Root Group>]
 ;file \src\modules\database\database.cpp
-[Database]
-[ProfileDir]
-[%miranda_path%\\Profiles]
-[ShowProfileMgr]
-[never]
-[yes]
-[AutoCreate]
-[DefaultProfile]
-[profile]
 [Miranda is trying upgrade your profile structure.\n]
 [It cannot move profile %s to the new location %s\n]
 [Because profile with this name already exist. Please resolve the issue manually.]
@@ -1191,10 +1102,6 @@
 [Most likely due to insufficient privileges. Please move profile manually.]
 [Profile cannot be placed into Miranda root folder.\n]
 [Please move Miranda profile to some other location.]
-[ForceShowPM]
-[The profile '%s' already exists. Do you want to move it to the ]
-[Recycle Bin? \n\nWARNING: The profile will be deleted if Recycle Bin is disabled.\n]
-[WARNING: A profile may contain confidential information and should be properly deleted.]
 [The profile already exists]
 [Couldn't move '%s' to the Recycle Bin, Please select another profile name.]
 [Problem moving profile]
@@ -1207,35 +1114,13 @@
 [Miranda was unable to open '%s'\nIt's inaccessible or used by other application or Miranda instance]
 [Miranda can't open that profile]
 ;file \src\modules\database\dbini.cpp
-[AutoExec]
-[Warn]
-[notsafe]
-[all]
 [Security systems to prevent malicious changes are in place and you will be warned before every change that is made.]
-[onlyunsafe]
 [Security systems to prevent malicious changes are in place and you will be warned before changes that are known to be unsafe.]
-[none]
 [Security systems to prevent malicious changes have been disabled. You will receive no further warnings.]
 [This change is known to be safe.]
 [This change is known to be potentially hazardous.]
 [This change is not known to be safe.]
 [Invalid setting type. The first character of every value must be b, w, d, l, s, e, u, g, h or n.]
-[Use]
-[prompt]
-[Safe]
-[CLC Icons CLUI CList SkinSounds]
-[Unsafe]
-[ICQ MSN]
-[OverrideSecurityFilename]
-[OnCreateFilename]
-[Glob]
-[OnCompletion]
-[recycle]
-[delete]
-[rename]
-[RenamePrefix]
-[done_]
-[ask]
 ;file \src\modules\database\profilemanager.cpp
 [&Create]
 [<In Use>]
@@ -1263,8 +1148,6 @@
 [Handle]
 [&Find/Add Contacts...]
 ;file \src\modules\findadd\searchresults.cpp
-[First Name]
-[Last Name]
 [Could not start a search on '%s', there was a problem - is %s connected?]
 [Could not search on any of the protocols, are you online?]
 [Problem with search]
@@ -1273,76 +1156,29 @@
 [No users found]
 ;file \src\modules\fonts\FontOptions.cpp
 [Failed to create file]
-[<none>]
-[Shadow at left]
-[Shadow at right]
-[Outline]
-[Outline smooth]
-[Smooth bump]
-[Contour thin]
-[Contour heavy]
-[abc]
 [Configuration Files]
 [Text Files]
-[ini]
 [Error writing file]
 [Fonts & Colors]
 [Sample Text]
 [Fonts]
 [Installed Plugins]
-;file \src\modules\fonts\FontService.cpp
-[Headers]
-[Generic text]
-[Small text]
-;file \src\modules\fonts\FontService.h
-[Incoming nick]
-[Outgoing nick]
-[Incoming timestamp]
-[Outgoing timestamp]
-;file \src\modules\icolib\skin2icons.cpp
-[*StaticIcon_%d]
 ;file \src\modules\icolib\skin2opts.cpp
 [Icon Sets]
-[dll]
 ;file \src\modules\ignore\ignore.cpp
 [** All contacts **]
 [Contacts]
-;file \src\modules\netlib\netlibhttp.cpp
-[(no user)]
-[(exist)]
-[(no psw)]
 ;file \src\modules\netlib\netliblog.cpp
-[No times]
-[Standard hh:mm:ss times]
-[Times in milliseconds]
-[Times in microseconds]
 [(Miranda Core Logging)]
 [Select where log file will be created]
 [Select program to be run]
 ;file \src\modules\netlib\netlibopts.cpp
-[<mixed>]
-[SOCKS4]
-[SOCKS5]
-[HTTP]
-[HTTPS]
-[Internet Explorer]
 [<All connections>]
 [Network]
-;file \src\modules\netlib\netlibsecurity.cpp
-[Basic]
-[GSSAPI]
-[Kerberos]
 ;file \src\modules\netlib\netlibssl.cpp
 [Client cannot decode host message. Possible causes: Host does not support SSL or requires not existing security package]
 [Host we are connecting to is not the one certificate was issued for]
-[SSL connection failure (%x %u): %s]
-;file \src\modules\options\filter.cpp
-[SysTreeView32]
-[SysListView32]
 ;file \src\modules\options\options.cpp
-[<all modules>]
-[<core modules>]
-[Button]
 [Loading... %d%%]
 [%s options]
 [Miranda NG Options]
@@ -1351,24 +1187,18 @@
 [Core plugin '%s' cannot be loaded or missing. Miranda will exit now]
 [Fatal error]
 [No messaging plugins loaded. Please install/enable one of the messaging plugins, for instance, "srmm.dll"]
-[srmm_mod (no Unicode).dll]
 ['%s' is disabled, re-enable?]
 [Re-enable Miranda plugin?]
-[Core]
-[Plugins]
-[\\Plugins\\%s]
 [Unable to load plugin in Service Mode!]
-[svc]
-[PluginLoader]
-[AskAboutIgnoredPlugins]
 [Unable to start any of the installed contact list plugins, I even ignored your preferences for which contact list couldn't load any.]
 [Can't find a contact list plugin! you need clist_classic or any other clist plugin.]
 ;file \src\modules\plugins\pluginopts.cpp
-[%s\\Plugins\\%s]
 [Plugin]
 [Version]
+[<none>]
 [Miranda NG must be restarted to apply changes for these plugins:]
 [Do you want to restart it now?]
+[Plugins]
 ;file \src\modules\protocols\protoopts.cpp
 [Create new account]
 [Editing account]
@@ -1390,13 +1220,7 @@
 [Account %s is being deleted]
 [You need to disable plugin to delete this account]
 [&Accounts...]
-;file \src\modules\skin\hotkeys.cpp
-[MirandaHotkeyHostWnd]
 ;file \src\modules\skin\hotkey_opts.cpp
-[Ctrl + ]
-[Alt + ]
-[Shift + ]
-[Win + ]
 [Remove shortcut]
 [Add another shortcut]
 [Scope:]
@@ -1410,6 +1234,7 @@
 [User Online]
 [Group (Open)]
 [Group (Closed)]
+[Connecting]
 [User Details]
 [History]
 [Down Arrow]
@@ -1441,11 +1266,8 @@
 [Always invisible]
 [Locked status]
 [%s Icons]
-[%s\\Icons\\proto_]
-[%s\\Plugins\\]
 ;file \src\modules\skin\sounds.cpp
 [Sound Files]
-[wav]
 ;file \src\modules\utils\bmpfilter.cpp
 [You need an image services plugin to process PNG images.]
 [All Bitmaps]
@@ -1453,20 +1275,6 @@
 [JPEG Bitmaps]
 [GIF Bitmaps]
 [PNG Bitmaps]
-;file \src\modules\utils\openurl.cpp
-[file:///%s]
-;file \src\modules\utils\path.cpp
-[%s\\%s\\AvatarCache]
-[%s\\%s\\Logs]
 ;file \src\modules\utils\timezones.cpp
-[UTC]
 [<unspecified>]
-[MUI_%s]
-[TZI]
-[Display]
-[Std]
-[Dlt]
-;file \src\modules\utils\utils.cpp
-["%s" /restart:%d /profile=%s]
-["%s" /restart:%d]
 ;file \src\modules\visibility\visibility.cpp