langpacks\english: update (by RMN)

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

19 files changed, 88 insertions, 53 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index d121dc0c0c..7c974922ca 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -261,13 +261,12 @@
 [&Authorize]

 [&Deny]

 [Decide &Later]

-[&I]

+[User &details]

 [Reason:]

 [Denial Reason:]

 [Add to contact list if authorized]

 [You Were Added]

 [&Close]

-[&U]

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

 [%s Message for %s]

 [Retrieving %s message...]

@@ -282,6 +281,15 @@
 [Closing in %d]

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

 [&Send]

+[&Emoticons]

+[&Bold]

+[&Italic]

+[&Color]

+[&Background color]

+[&History]

+[&Filter]

+[&Room Settings]

+[&Show/hide nicklist]

 [Show these events only:]

 [Actions]

 [Nick changes]

@@ -300,7 +308,7 @@
 [Your name]

 [Enable highlighting]

 [Limit log text to (events):]

-[Trim to (kB)]

+[Trim to (KB)]

 [Words to highlight (wildcards allowed)]

 [Enable logging to disk]

 [Log directory]

@@ -432,6 +440,7 @@
 [If window is partially covered, bring it to front]

 [Window:]

 [Contact list background:]

+[&Main menu]

 [&Status]

 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

@@ -449,8 +458,7 @@
 [File(s):]

 [&Choose Again...]

 [Total size:]

-[&D]

-[&H]

+[&User menu]

 [Incoming File Transfer]

 [A&ccept]

 [&Decline]

@@ -458,10 +466,8 @@
 [Date:]

 [Files:]

 [Save to:]

-[&A]

-[Contact menu]

-[Open...]

-[Open folder]

+[&Open...]

+[Open &folder]

 [Transfer completed, open file(s).]

 [No data transferred]

 [File Already Exists]

@@ -478,6 +484,7 @@
 [Size:]

 [Last modified:]

 [Open file]

+[Open folder]

 [File properties]

 [File being received]

 [File Transfers]

@@ -548,6 +555,7 @@
 [while sending the following message:]

 [Try again]

 [Message Session]

+[&Details]

 [Message Window Event Log]

 [Show names]

 [Show timestamp]

@@ -931,6 +939,8 @@
 [Request sent, waiting for acceptance...]

 [Waiting for connection...]

 [Unable to initiate transfer.]

+[Contact menu]

+[Open...]

 [sec]

 [remaining]

 [Decision sent]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index 21fd24ab3b..9d95b28a81 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -86,6 +86,7 @@
 [Make sections equal width]

 [Show bevels on panels]

 [Show resize grip indicator]

+[&Main menu]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 333d4e3dba..bb37555f52 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -304,6 +304,7 @@
 [Move up]

 [Move down]

 [OPTION PAGE IS UNDER CONSTRUCTION Please DO NOT notice about any issues here.\n Only high-level design comments are applicable.]

+[&Main menu]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Clist_mw.txt b/langpacks/english/Plugins/Clist_mw.txt
index b299646300..7c9f3fd11f 100644
--- a/langpacks/english/Plugins/Clist_mw.txt
+++ b/langpacks/english/Plugins/Clist_mw.txt
@@ -123,6 +123,7 @@
 [Show bevel effect on panels]

 [Use connecting Icon]

 [Use New Drawer for StatusBar]

+[&Main menu]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index fd6650497c..2ef5971abd 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -223,6 +223,7 @@
 [Show 2nd line:]

 [Draw overlay icon on avatar]

 [Show local time]

+[&Main menu]

 [E&xit]

 [&Status]

 [&Offline\tCtrl+0]

diff --git a/langpacks/english/Plugins/Contacts.txt b/langpacks/english/Plugins/Contacts.txt
index 6fba9bb50d..bf883ff450 100644
--- a/langpacks/english/Plugins/Contacts.txt
+++ b/langpacks/english/Plugins/Contacts.txt
@@ -8,16 +8,16 @@
 [Allows you to send and receive contacts.]

 ;file \plugins\ContactsPlus\res\contacts.rc

 [Send contacts]

-[&A]

-[&D]

-[&H]

+[&Add]

+[&User menu]

+[User &details]

+[&History]

 [Choose contacts to be send:]

 [&Send]

 [Cancel]

 [&Select All]

 [Received contacts]

 [Add to &group:]

-[&Add]

 [&Details]

 [Close]

 [Contacts send error]

diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index de813f6a69..01430de469 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Db_autobackups.dll

 ;  Plugin: Db autobackuper

-;  Version: 0.0.0.9

+;  Version: 0.0.0.10

 ;  Authors: chaos.persei, sje, Kildor, Billy_Bons

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

 [Db autobackuper plugin.]

@@ -19,6 +19,7 @@
 [Backup to folder:]

 [Browse...]

 [Go to the "Customize -> Folders" to change settings]

+[Compress backup to zip-archive]

 [Disable progress bar]

 [Disable Popups]

 ;file \plugins\Db_autobackups\src\backup.cpp

diff --git a/langpacks/english/Plugins/Fingerprint.txt b/langpacks/english/Plugins/Fingerprint.txt
index cb1ae4547e..e3e5600652 100644
--- a/langpacks/english/Plugins/Fingerprint.txt
+++ b/langpacks/english/Plugins/Fingerprint.txt
@@ -46,8 +46,8 @@
 [Security]

 [Protocol]

 ;file \plugins\FingerprintNG\src\masks.cpp

-[MirandaNG stable]

-[MirandaIM (old versions)]

+[Miranda NG stable]

+[Miranda IM (old versions)]

 [Miranda (unknown)]

 [spam client]

 [PHP Jabber Client]

@@ -119,19 +119,19 @@
 [home overlay]

 [work overlay]

 [notebook overlay]

-[MirandaNG v0.6 #2 overlay]

-[MirandaNG v0.5 #2 overlay]

-[MirandaNG v0.4 #2 overlay]

-[MirandaNG v0.3 #2 overlay]

-[MirandaNG v0.2 #2 overlay]

-[MirandaNG v0.1 #2 overlay]

-[MirandaIM v0.10 #2 overlay]

-[MirandaIM v0.9 #2 overlay]

-[MirandaIM v0.8 #2 overlay]

-[MirandaIM v0.7 #2 overlay]

-[MirandaIM v0.6 #2 overlay]

-[MirandaIM v0.5 #2 overlay]

-[MirandaIM v0.4 #2 overlay]

+[Miranda NG v0.6 #2 overlay]

+[Miranda NG v0.5 #2 overlay]

+[Miranda NG v0.4 #2 overlay]

+[Miranda NG v0.3 #2 overlay]

+[Miranda NG v0.2 #2 overlay]

+[Miranda NG v0.1 #2 overlay]

+[Miranda IM v0.10 #2 overlay]

+[Miranda IM v0.9 #2 overlay]

+[Miranda IM v0.8 #2 overlay]

+[Miranda IM v0.7 #2 overlay]

+[Miranda IM v0.6 #2 overlay]

+[Miranda IM v0.5 #2 overlay]

+[Miranda IM v0.4 #2 overlay]

 [x64 overlay]

 [x32 overlay]

 [NewGPG overlay]

diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index ff784fbef6..bb82639040 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -30,7 +30,7 @@
 [URL address]

 [%ExternalIP% variable]

 [Test]

-[Transfer limit (kb/sec)]

+[Transfer limit (Kb/s)]

 [No control when Away/NA]

 [Connection control]

 [Index creation]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 4a16f13e83..6cf75730ce 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -198,7 +198,7 @@
 [Secure login failed.\nInvalid server response.]

 [Secure login failed.\nInvalid key length.]

 ;file \protocols\IcqOscarJ\src\icqosc_svcs.cpp

-[Are you sure you want to revoke user's authorization? This will remove you from his/her list on some clients.]

+[Are you sure you want to revoke user's authorization?\nThis will remove you from his/her list on some clients.]

 [Confirmation]

 [** This message was blocked by the ICQ server ** The message was invalid.]

 [** This message was blocked by the ICQ server ** The message was too long.]

@@ -983,6 +983,7 @@
 [Unknown value]

 [You've made some changes to your ICQ details but it has not been saved to the server. Are you sure you want to close this dialog?]

 [Upload in progress...]

+[Upload in progress...%d%%]

 [Upload complete]

 [Upload FAILED]

 ;file \protocols\IcqOscarJ\src\changeinfo\upload.cpp

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 8fcc67d4c6..3c58f2b15e 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -285,7 +285,7 @@
 [Receives information about user moods]

 [Supports generic publish-subscribe functionality]

 [Supports SecureIM plugin for Miranda NG]

-[Supports MirOTR plugin for Miranda NG]

+[Supports OTR (Off-the-Record Messaging)]

 [Supports New_GPG plugin for Miranda NG]

 [Can block communications from particular other users using Privacy lists]

 [Supports Message Receipts]

diff --git a/langpacks/english/Plugins/MobileState.txt b/langpacks/english/Plugins/MobileState.txt
index 6b06ac4d0f..e14be5c0f0 100644
--- a/langpacks/english/Plugins/MobileState.txt
+++ b/langpacks/english/Plugins/MobileState.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: MobileState.dll

 ;  Plugin: Mobile state

-;  Version: 0.0.1.2

+;  Version: 0.0.1.3

 ;  Authors: Robert Pösel

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

 [Plugin shows mobile icon in contact list next to contacts which are using mobile client.]

diff --git a/langpacks/english/Plugins/PasteIt.txt b/langpacks/english/Plugins/PasteIt.txt
index 2ee1daf4e8..a5bf31ee39 100644
--- a/langpacks/english/Plugins/PasteIt.txt
+++ b/langpacks/english/Plugins/PasteIt.txt
@@ -70,10 +70,10 @@
 ;file \plugins\PasteIt\src\PasteToWeb.cpp

 [You can only paste 1 file]

 [Cannot get data from clipboard]

-[File size is %dKB, do you realy want to paste such large file?]

+[File size is %d KB, do you realy want to paste such a large file?]

 [Are You sure?]

 [Cannot read file '%s']

-[File size is larger then 10MB, cannot be send]

+[File size is larger then 10 MB, cannot be sent]

 [Cannot open file '%s']

 [File '%s' is empty]

 ;file \plugins\PasteIt\src\PasteToWeb1.cpp

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 2a96d2c7cf..e6adda5a7d 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -80,16 +80,26 @@
 [Try again]

 [Cancel]

 [Message Session]

-[&U]

-[&D]

-[&E]

-[&H]

-[&Q]

+[&User menu]

+[User &details]

+[&Emoticons]

+[&Add]

+[&History]

+[&Quote]

+[&OK]

 [Send To All Tabs]

 [You are about to send a message to all open tabs.\nAre you sure?]

 [Remember my choice for this container]

 [Yes]

 [No]

+[&Bold]

+[&Italic]

+[&Underline]

+[&Color]

+[&Background color]

+[&Filter]

+[&Room Settings]

+[&Show/hide nicklist]

 [Show these events only:]

 [Actions]

 [Messages]

@@ -118,7 +128,7 @@
 [Save logs]

 [Location]

 [Trim to]

-[kB]

+[KB]

 [Group Chat]

 [Use same style as in the message log]

 [Use default colors]

@@ -437,8 +447,8 @@
 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

 [User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]

 [path to Miranda root folder]

-[path to current miranda profile]

-[name of current miranda profile (filename, without extension)]

+[path to current Miranda profile]

+[name of current Miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]

 [will return parsed string %miranda_userdata%\\Logs]

 [same as environment variable %APPDATA% for currently logged-on Windows user]

diff --git a/langpacks/english/Plugins/SkypeClassic.txt b/langpacks/english/Plugins/SkypeClassic.txt
index 8f603a5099..b3417b4710 100644
--- a/langpacks/english/Plugins/SkypeClassic.txt
+++ b/langpacks/english/Plugins/SkypeClassic.txt
@@ -49,7 +49,7 @@
 [Homepage:]

 [Save]

 [Enable Skype menu options (currently: Find/Add user)]

-[Use popup plugin for displaying messages ]

+[Use popup plugin for displaying messages]

 [Suppress all error messages (not recommended, but if it annoys you... ;)]

 [Use group chat interface for conversations (requires group chat module)]

 [Mark group chat message as read to avoid notification]

@@ -99,7 +99,7 @@
 [Incoming Skype Call]

 [Incoming call from %s]

 [Connection to Skype lost]

-[This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? (If you chose NO, you can always enable it in the plugin options later.]

+[This seems to be the first time that you're running the Skype protocol plugin. Do you want to enable the protocol for this Miranda profile? If you chose NO, you can always enable it in the plugin options later.]

 ;file \protocols\SkypeClassic\src\skypeopt.cpp

 [Preview Error Message]

 [Skype default]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 503310ca9e..c1bc3cf900 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -30,7 +30,7 @@
 [Log files]

 [Enable logging to disk]

 [Log directory]

-[Maximum size for log files (in kB)]

+[Maximum size for log files (in KB)]

 [Group chat log formatting]

 [Your name]

 [Other name]

@@ -80,6 +80,12 @@
 [&Close tab]

 [C&lose other tabs]

 [&Open at this position]

+;file \plugins\TabSRMM\res\msgwindow.rc

+[&Retry]

+[&Cancel]

+[&Send]

+[&Add]

+[&Remove]

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

 [TabSRMM exception]

 [Copy to clipboard]

@@ -1106,8 +1112,8 @@
 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

 [User ID of current contact (if defined). It is like UIN Number for ICQ, JID for Jabber, etc.]

 [path to Miranda root folder]

-[path to current miranda profile]

-[name of current miranda profile (filename, without extension)]

+[path to current Miranda profile]

+[name of current Miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]

 [will return parsed string %miranda_userdata%\\Logs]

 [same as environment variable %APPDATA% for currently logged-on Windows user]

diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 8427f20a3f..b89f542f7b 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -25,3 +25,6 @@
 [Account]

 ;file \protocols\VKontakte\src\vk_proto.cpp

 [%s server connection]

+;file \protocols\VKontakte\src\vk_thread.cpp

+[Attachments:]

+[Photo]

diff --git a/langpacks/english/Plugins/Variables.txt b/langpacks/english/Plugins/Variables.txt
index 0faaa8ae9a..9cb6d64185 100644
--- a/langpacks/english/Plugins/Variables.txt
+++ b/langpacks/english/Plugins/Variables.txt
@@ -95,8 +95,8 @@
 ;file \plugins\Variables\src\parse_miranda.cpp

 [Miranda Core Global]

 [path to Miranda root folder]

-[path to current miranda profile]

-[name of current miranda profile (filename, without extension)]

+[path to current Miranda profile]

+[name of current Miranda profile (filename, without extension)]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\AvatarCache]

 [will return parsed string %miranda_profile%\\Profiles\\%miranda_profilename%\\Logs]

diff --git a/langpacks/english/Plugins/WinterSpeak.txt b/langpacks/english/Plugins/WinterSpeak.txt
index 26e6269eaa..421a1ad9e2 100644
--- a/langpacks/english/Plugins/WinterSpeak.txt
+++ b/langpacks/english/Plugins/WinterSpeak.txt
@@ -20,10 +20,10 @@
 [Offline]

 [Online]

 [Away]

-[Do not Disturb]

-[Not Available]

+[DND]

+[NA]

 [Occupied]

-[Free for Chat]

+[Free for chat]

 [Invisible]

 [Occurring Events]

 [Incoming Message]