- langpacks/english: updated

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

12 files changed, 37 insertions, 45 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 8753442693..fc9461fd18 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -1315,6 +1315,9 @@
 [JPEG Bitmaps]

 [GIF Bitmaps]

 [PNG Bitmaps]

+;file \src\modules\utils\path.cpp

+[Avatars]

+[Avatars root folder]

 ;file \src\modules\utils\timezones.cpp

 [<unspecified>]

 ;file \src\modules\utils\utils.cpp

diff --git a/langpacks/english/Plugins/AIM.txt b/langpacks/english/Plugins/AIM.txt
index ae1aaf6c53..4f5177e419 100644
--- a/langpacks/english/Plugins/AIM.txt
+++ b/langpacks/english/Plugins/AIM.txt
@@ -71,8 +71,6 @@
 [&Deny]

 [Message]

 [Room]

-;file \protocols\AimOscar\src\avatars.cpp

-[Avatars]

 ;file \protocols\AimOscar\src\chat.cpp

 [Me]

 [Others]

diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 4b7283dee7..4ec776d1cf 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -114,7 +114,6 @@
 ;file \protocols\FacebookRM\src\proto.cpp

 [%s server connection]

 [Unable to get Netlib connection for Facebook]

-[Avatars]

 [Facebook ID must be numeric value.]

 [Network]

 [Account]

diff --git a/langpacks/english/Plugins/GG.txt b/langpacks/english/Plugins/GG.txt
index 4aead67b6d..13e6b834c8 100644
--- a/langpacks/english/Plugins/GG.txt
+++ b/langpacks/english/Plugins/GG.txt
@@ -143,7 +143,6 @@
 [Contact list]

 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

-[Avatars]

 [Images]

 [Gadu-Gadu Number]

 ;file \protocols\Gadu-Gadu\src\groupchat.cpp

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 3ef7d84634..22c4c18348 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -206,7 +206,6 @@
 [** This message was blocked by the ICQ server ** You are too evil.]

 [** Unknown missed message event.]

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

-[Avatars]

 [Error uploading avatar to server, server temporarily unavailable.]

 [Error uploading avatar to server, server refused to accept the image.]

 ;file \protocols\IcqOscarJ\src\icq_constants.h

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 1defd67dc9..99869b7e96 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -666,7 +666,6 @@
 ;file \protocols\JabberG\src\jabber_message_handlers.cpp

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

 [CHAT plugin is required for conferences. Install it before chatting]

-[Avatars]

 [To]

 [From]

 [Both]

diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 1775ff038a..f951256a0d 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -111,7 +111,6 @@
 [Pisces]

 ;file \protocols\MRA\src\MraAvatars.cpp

 [Avatars' plugin connections]

-[Avatars]

 [Avatars: server return HTTP code: %lu]

 [Avatars: can't open file %s, error]

 ;file \protocols\MRA\src\MraChat.cpp

@@ -191,6 +190,7 @@
 [Account]

 [Connections]

 [Files]

+[Avatars]

 ;file \protocols\MRA\src\Mra_proto.cpp

 [Please, setup e-mail in options]

 [Please, setup password in options]

diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt
index 83355fda6f..e641e9291f 100644
--- a/langpacks/english/Plugins/MSN.txt
+++ b/langpacks/english/Plugins/MSN.txt
@@ -108,7 +108,6 @@
 [Setup Live &Alerts]

 [&Start Netmeeting]

 ;file \protocols\MSN\src\msn_misc.cpp

-[Avatars]

 [Custom Smileys]

 [Notify]

 [Error]

diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index 6216638add..935ae678d0 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -21,7 +21,7 @@
 [Delete key]

 [Generate and use random key]

 [Account:]

-[key id:]

+[Key id:]

 [Copy public key]

 [Export private key]

 [Change password]

@@ -57,9 +57,9 @@
 [Select keyserver for key search:]

 [Recieved encrypted file]

 [Decrypt]

-[Recieved encrypted file form contact whith disabled encryption.]

+[Recieved encrypted file form contact with disabled encryption.]

 [Remember choice]

-[Choose which  keys to export]

+[Choose which keys to export]

 [Export public keys (only set for contacts)]

 [Export all private keys]

 [Export public and private keys]

@@ -76,7 +76,7 @@
 [Automatic key exchange]

 [Copy own key]

 [Add tags to encoded and decoded messages]

-[Incomming message tags:]

+[Incoming message tags:]

 [Outgoing message tags:]

 [Open:]

 [Close:]

@@ -108,23 +108,23 @@
 [Error]

 [Generating new random key, please wait]

 [Failed to alocate memory]

-[gpg binary found in miranda folder, but english locale does not exists.\nit's highly recommended to place \\gnupg.nls\\en@quot.mo in gnupg folder under miranda root.\nwithout this file you may expirense many problem with gpg output on non english systems.\nand plugin may completely do not work.\nyou have beed warned.]

+[GPG binary found in Miranda folder, but English locale does not exist.\nIt's highly recommended to place \\gnupg.nls\\en@quot.mo in GnuPG folder under Miranda root.\nWithout this file you may experience many problems with GPG output on non-English systems\nand plugin may completely not work.\nYou have beed warned.]

 [Warning]

-[wrong gpg binary location found in system.\nplease choose another location]

-[This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn.]

-[Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn.]

-[found "gpg" directory in MIranda root.\nassuming it's gpg home directory.\ngpg home directory set.]

+[Wrong GPG binary location found in system.\nPlease choose another location]

+[This is not GnuPG binary!\nIt is recommended to use GnuPG v1.x.x with this plugin.]

+[Unsupported GnuPG version found, use at you own risk!\nIt is recommended to use GnuPG v1.x.x with this plugin.]

+["GPG" directory found in Miranda root.\nAssuming it's GPG home directory.\nGPG home directory set.]

 [Info]

 [Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

-[gpg binary does not exists.\nplease choose another location]

+[GPG binary does not exist.\nPlease choose another location]

 [please choose gpg binary location]

 [please set keyring's home directory]

-[There is existing key for contact, would you like to replace with new key?]

+[There is existing key for contact, would you like to replace it with new key?]

 [New public key was received, do you want to import it?]

 [Replace]

 [Accept]

 [Received key from ]

-[You must set encryption algorythm first]

+[You must set encryption algorithm first]

 [Key length must be of length from 1024 to 4096 bits]

 [Invalid date]

 [Name must contain at least 5 characters]

@@ -132,19 +132,19 @@
 [Invalid Email]

 [Generating new key, please wait...]

 [Failed to export public key.]

-[GPG binary is set and valid (this is good).\n]

-[GPG binary unset or invalid (plugin will not work).\n]

-[Home dir write access granted (this is good).\n]

-[Home dir have not write access (plugin most probably will not work).\n]

-[Temp dir write access granted (this is good).\n]

-[Temp dir have not write access (plugin should work, but may have some problems, filetransfers will not work).]

-[\nGPG will be disabled until you solve this problems]

+[GPG binary is set and valid (This is good).\n]

+[GPG binary unset or invalid (Plugin will not work).\n]

+[Home dir write access granted (This is good).\n]

+[Home dir has no write access (Plugin most probably will not work).\n]

+[Temp dir write access granted (This is good).\n]

+[Temp dir has no write access (Plugin should work, but may have some problems, file transfers will not work).]

+[\nGPG will be disabled until you solve these problems]

 [GPG plugin problems]

-[Your secret key whith id: ]

+[Your secret key with id: ]

 [ for account ]

-[ deleted from gpg secret keyring\nDo you want to set another key?]

+[ deleted from GPG secret keyring.\nDo you want to set another key?]

 [Own secret key warning]

-[ expired and will not work\nDo you want to set another key?]

+[ expired and will not work.\nDo you want to set another key?]

 [You didn't set a private key.\nWould you like to set it now?]

 [Own private key warning]

 [Do you want to load key for all subcontacts?]

@@ -154,8 +154,8 @@
 [Do you want to try to decrypt encrypted message?]

 [failed to decrypt message, GPG returned error, turn on debug log for more details]

 [We're trying to encrypt with untrusted key. Do you want to trust this key permanently?]

-[failed o encrypt message, GPG returned error, turn on debug log for more details]

-[Something wrong, gpg does not understand us, aborting encryption.]

+[failed to encrypt message, GPG returned error, turn on debug log for more details]

+[Something is wrong, GPG does not understand us, aborting encryption.]

 ;file \plugins\New_GPG\src\options.cpp

 [Services]

 [Main]

@@ -176,23 +176,23 @@
 [Set log file]

 [LOG files]

 [Choose gpg.exe]

-[Set home diractory]

+[Set home directory]

 [Load Public GPG Key for ]

 [Turn off encryption]

-[ found in prescense, and exists in keyring.)]

+[ found in presence, and exists in keyring.)]

 [Load Public GPG Key (Key ID: ]

-[ found in prescense.)]

+[ found in presence.)]

 [This is not public or private key]

-[Key already in scret key ring.]

+[Key already in secret keyring.]

 [Set file containing GPG public key]

 [GPG public key file]

-[Where is no public or private key.]

+[There is no public or private key.]

 ;file \plugins\New_GPG\src\utilities.cpp

 [Do you want to toggle encryption for all subcontacts?]

 [Target file exists, do you want to replace it?]

-[Capability to decrypt file not found on other side\nRecipient may be unable to decrypt file(s)\nDo you want to encrypt file(s) anyway?]

+[Capability to decrypt file not found on other side.\nRecipient may be unable to decrypt file(s).\nDo you want to encrypt file(s) anyway?]

 [Filetransfer warning]

-[Unable to check encryption support on other side\nRecipient may be unable to decrypt file(s)\nCurrently capability check supported only for ICQ and Jabber protocols.\nIt will work for any other proto if Miranda with new_gpg used on other side.\nDo you want to encrypt file(s) anyway?]

+[Unable to check encryption support on other side.\nRecipient may be unable to decrypt file(s).\nCurrently capability check supported only for ICQ and Jabber protocols.\nIt will work for any other proto if Miranda with New_GPG is used on other side.\nDo you want to encrypt file(s) anyway?]

 [encrypting file for transfer]

 [we have succesfully exported]

 [public keys]

@@ -200,5 +200,5 @@
 [all private keys]

 [Keys export result]

 [Keys import result]

-[New passwords not match]

-[Old password not match, you can continue, but gpg will reject wrong password.\nDo you want to continue?]

+[New passwords do not match]

+[Old password does not match, you can continue, but GPG will reject wrong password.\nDo you want to continue?]

diff --git a/langpacks/english/Plugins/Skype.txt b/langpacks/english/Plugins/Skype.txt
index 9151e6b18d..a1edfd57ed 100644
--- a/langpacks/english/Plugins/Skype.txt
+++ b/langpacks/english/Plugins/Skype.txt
@@ -234,5 +234,4 @@
 [Value contains invalid word]

 [Password is too simple]

 [Value starts with an invalid character]

-[Avatars]

 [Command "%s" is unsupported]

diff --git a/langpacks/english/Plugins/Twitter.txt b/langpacks/english/Plugins/Twitter.txt
index fe1b666f13..380763a048 100644
--- a/langpacks/english/Plugins/Twitter.txt
+++ b/langpacks/english/Plugins/Twitter.txt
@@ -44,7 +44,6 @@
 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

 [You're missing the Nick key in the database. This isn't really a big deal, but you'll notice some minor quirks (self contact in list, no group chat outgoing message highlighting, etc). To fix it either add it manually or reset your twitter account in the miranda account options]

 ;file \protocols\Twitter\src\proto.cpp

-[Avatars]

 [Send Tweet...]

 [Network]

 [Basic]

diff --git a/langpacks/english/Plugins/Yahoo.txt b/langpacks/english/Plugins/Yahoo.txt
index b3e16282ea..cae9a77815 100644
--- a/langpacks/english/Plugins/Yahoo.txt
+++ b/langpacks/english/Plugins/Yahoo.txt
@@ -47,8 +47,6 @@
 [&Cancel]

 [Invitation reason]

 [Add]

-;file \protocols\Yahoo\src\avatar.cpp

-[Avatars]

 ;file \protocols\Yahoo\src\chat.cpp

 [[miranda] Got conference invite to room: %s with msg: %s]

 [%s denied invitation with message: %s]