langpacks: update according to commit [6406]

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

87 files changed, 165 insertions, 268 deletions

diff --git a/langpacks/belarusian/=CORE=.txt b/langpacks/belarusian/=CORE=.txt
index 4a94b2f0d2..46bfee401c 100644
--- a/langpacks/belarusian/=CORE=.txt
+++ b/langpacks/belarusian/=CORE=.txt
@@ -2537,6 +2537,9 @@ ANSI плагін
 Малюнкі GIF

 [PNG Bitmaps]

 Выявы PNG

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

+[Avatars]

+Аватары

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

 [<unspecified>]

 <не паказана>

diff --git a/langpacks/belarusian/Plugins/AIM.txt b/langpacks/belarusian/Plugins/AIM.txt
index 46914335c5..9fab936136 100644
--- a/langpacks/belarusian/Plugins/AIM.txt
+++ b/langpacks/belarusian/Plugins/AIM.txt
@@ -136,9 +136,6 @@ AIM Усталяваць Instant Idle
 Паведамленне

 [Room]

 Чат-пакой

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

-[Avatars]

-Аватары

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

 [Me]

 Я

diff --git a/langpacks/belarusian/Plugins/Facebook.txt b/langpacks/belarusian/Plugins/Facebook.txt
index 940de5c0a7..11cc71f14e 100644
--- a/langpacks/belarusian/Plugins/Facebook.txt
+++ b/langpacks/belarusian/Plugins/Facebook.txt
@@ -181,8 +181,6 @@
 Навіны

 [Other Event]

 Іншая падзея

-[Avatars]

-Аватары

 [Network]

 Сеціва

 [Account]

diff --git a/langpacks/belarusian/Plugins/GG.txt b/langpacks/belarusian/Plugins/GG.txt
index 5f4e646774..43d2e90751 100644
--- a/langpacks/belarusian/Plugins/GG.txt
+++ b/langpacks/belarusian/Plugins/GG.txt
@@ -238,8 +238,6 @@ HTTP невядомая памылка
 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

 Злучэнне %s

-[Avatars]

-Аватары

 [Images]

 Выявы

 [Gadu-Gadu Number]

diff --git a/langpacks/belarusian/Plugins/ICQ.txt b/langpacks/belarusian/Plugins/ICQ.txt
index 1665791f26..c5ed59c60e 100644
--- a/langpacks/belarusian/Plugins/ICQ.txt
+++ b/langpacks/belarusian/Plugins/ICQ.txt
@@ -396,8 +396,6 @@ SNAC(4.1) Памылка SENDMSG (x%02x)
 [** 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.]

diff --git a/langpacks/belarusian/Plugins/Jabber.txt b/langpacks/belarusian/Plugins/Jabber.txt
index 87d043beeb..78ed14f782 100644
--- a/langpacks/belarusian/Plugins/Jabber.txt
+++ b/langpacks/belarusian/Plugins/Jabber.txt
@@ -851,8 +851,6 @@ Jabber Рэсурс
 Статуснае паведамленне

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

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

-[Avatars]

-Аватары

 [To]

 У

 [From]

diff --git a/langpacks/belarusian/Plugins/MSN.txt b/langpacks/belarusian/Plugins/MSN.txt
index 9c342f40fc..9e728a13f0 100644
--- a/langpacks/belarusian/Plugins/MSN.txt
+++ b/langpacks/belarusian/Plugins/MSN.txt
@@ -202,8 +202,6 @@ MSN Чат
 [&Start Netmeeting]

 Запусціць Netmeeting

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

-[Avatars]

-Аватары

 [Custom Smileys]

 Свае смайлы

 [Notify]

diff --git a/langpacks/belarusian/Plugins/New_GPG.txt b/langpacks/belarusian/Plugins/New_GPG.txt
index 2eb3ccc874..acf2a13e09 100644
--- a/langpacks/belarusian/Plugins/New_GPG.txt
+++ b/langpacks/belarusian/Plugins/New_GPG.txt
@@ -108,7 +108,7 @@
 Капір. свой ключ

 [Add tags to encoded and decoded messages]

 Дадаваць пазнакі да паведамленняў

-[Incomming message tags:]

+[Incoming message tags:]

 Дадаваць пазнакі да ўваходных паведамленьняў:

 [Outgoing message tags:]

 Дадаваць пазнакі выходным паведамленнях:

@@ -138,9 +138,9 @@
 Памылка

 [Warning]

 Папярэджанне

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

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

 Абраны вамі exe не GnuPG!\nРэкамэндуецца выкарыстоўваць GnuPG v1.xx з гэтым плагiнам.

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

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

 Ваша версія GnuPG не падтрымліваецца і можа працаваць не правільна!\nРэкамэндуецца выкарыстоўваць GnuPG v1.xx з гэтым плагiнам.

 [Info]

 Інфа

@@ -150,7 +150,7 @@
 Вылучыце дырэкторыю з GnuPG

 [please set keyring's home directory]

 Вылучыце дырэкторыю з ключамі GnuPG

-[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?]

 Атрыманы новы адкрыты ключ. Вы хочаце прыняць яго?

diff --git a/langpacks/belarusian/Plugins/Skype.txt b/langpacks/belarusian/Plugins/Skype.txt
index 8f87795e20..06b3f87df2 100644
--- a/langpacks/belarusian/Plugins/Skype.txt
+++ b/langpacks/belarusian/Plugins/Skype.txt
@@ -283,7 +283,5 @@ SkypeKit не запусціўся.
 Значэнне мае недапушчальнае слова

 [Password is too simple]

 Пароль занадта простай

-[Avatars]

-Аватары

 [Command "%s" is unsupported]

 Каманда "%s" не падтрымліваецца

diff --git a/langpacks/belarusian/Plugins/Twitter.txt b/langpacks/belarusian/Plugins/Twitter.txt
index ba6e506849..02485316f3 100644
--- a/langpacks/belarusian/Plugins/Twitter.txt
+++ b/langpacks/belarusian/Plugins/Twitter.txt
@@ -78,8 +78,6 @@ URL:
 [Failed to get Twitter Access Tokens, please go offline and try again. If this keeps happening, check your internet connection.]

 Не атрымалася атрымаць жэтоны доступу Twitter, выйдзице і паўтарыце спробу. Калі гэта адбываецца ўвесь час, праверце злучэнне з інтэрнэтам.

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

-[Avatars]

-Аватары

 [Send Tweet...]

 Паслаць твіт...

 [Network]

diff --git a/langpacks/belarusian/Plugins/Yahoo.txt b/langpacks/belarusian/Plugins/Yahoo.txt
index 704c47e69c..8cca731e62 100644
--- a/langpacks/belarusian/Plugins/Yahoo.txt
+++ b/langpacks/belarusian/Plugins/Yahoo.txt
@@ -88,9 +88,6 @@ Yahoo Японія
 Мэта запрашэння

 [Add]

 Дадаць

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

-[Avatars]

-Аватары

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

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

 (Miranda NG) Атрымана запрашэнне ў пакой %s:%s

diff --git a/langpacks/bulgarian/=CORE=.txt b/langpacks/bulgarian/=CORE=.txt
index 981d6a4910..e47cfdb6da 100644
--- a/langpacks/bulgarian/=CORE=.txt
+++ b/langpacks/bulgarian/=CORE=.txt
@@ -2543,6 +2543,11 @@ JPEG изображения
 GIF изображения

 [PNG Bitmaps]

 PNG изображения

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

+[Avatars]

+Аватари

+[Avatars root folder]

+

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

 [<unspecified>]

 <Неуточнено>

diff --git a/langpacks/bulgarian/Plugins/AIM.txt b/langpacks/bulgarian/Plugins/AIM.txt
index b5cea93423..3ff8f024ef 100644
--- a/langpacks/bulgarian/Plugins/AIM.txt
+++ b/langpacks/bulgarian/Plugins/AIM.txt
@@ -136,9 +136,6 @@ AIM настройки
 Съобщение

 [Room]

 Стая

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

-[Avatars]

-Аватари

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

 [Me]

 Аз

diff --git a/langpacks/bulgarian/Plugins/Facebook.txt b/langpacks/bulgarian/Plugins/Facebook.txt
index 9b3435fdfb..fd66209b10 100644
--- a/langpacks/bulgarian/Plugins/Facebook.txt
+++ b/langpacks/bulgarian/Plugins/Facebook.txt
@@ -199,8 +199,6 @@ URL:
 %s връзка със сървъра

 [Unable to get Netlib connection for Facebook]

 

-[Avatars]

-Аватари

 [Facebook ID must be numeric value.]

 

 [Network]

diff --git a/langpacks/bulgarian/Plugins/GG.txt b/langpacks/bulgarian/Plugins/GG.txt
index 520fe10518..2b2215021a 100644
--- a/langpacks/bulgarian/Plugins/GG.txt
+++ b/langpacks/bulgarian/Plugins/GG.txt
@@ -274,8 +274,6 @@ Gadu-Gadu номер:
 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

 %s връзка

-[Avatars]

-Аватари

 [Images]

 

 [Gadu-Gadu Number]

diff --git a/langpacks/bulgarian/Plugins/ICQ.txt b/langpacks/bulgarian/Plugins/ICQ.txt
index 5bd218ae06..a314d59e68 100644
--- a/langpacks/bulgarian/Plugins/ICQ.txt
+++ b/langpacks/bulgarian/Plugins/ICQ.txt
@@ -398,8 +398,6 @@ ICQ бележка
 [** 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.]

diff --git a/langpacks/bulgarian/Plugins/Jabber.txt b/langpacks/bulgarian/Plugins/Jabber.txt
index 1aa7a30b39..1588d9a134 100644
--- a/langpacks/bulgarian/Plugins/Jabber.txt
+++ b/langpacks/bulgarian/Plugins/Jabber.txt
@@ -1299,8 +1299,6 @@ Jabber източник
 ;file \protocols\JabberG\src\jabber_misc.cpp

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

 За конферентни разговори е необходима приставката CHAT. Инсталирайте я преди да чатите.

-[Avatars]

-Аватари

 [To]

 За

 [From]

diff --git a/langpacks/bulgarian/Plugins/MSN.txt b/langpacks/bulgarian/Plugins/MSN.txt
index d86015c0c1..7987a2ebba 100644
--- a/langpacks/bulgarian/Plugins/MSN.txt
+++ b/langpacks/bulgarian/Plugins/MSN.txt
@@ -202,8 +202,6 @@ Hotmail от %s
 [&Start Netmeeting]

 Иницииране на Netmeeting

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

-[Avatars]

-Аватари

 [Custom Smileys]

 

 [Notify]

diff --git a/langpacks/bulgarian/Plugins/New_GPG.txt b/langpacks/bulgarian/Plugins/New_GPG.txt
index da0d43b633..dfab378af5 100644
--- a/langpacks/bulgarian/Plugins/New_GPG.txt
+++ b/langpacks/bulgarian/Plugins/New_GPG.txt
@@ -36,7 +36,7 @@
 

 [Account:]

 Акаунт:

-[key id:]

+[Key id:]

 

 [Copy public key]

 

@@ -108,11 +108,11 @@
 

 [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)]

 

@@ -146,7 +146,7 @@
 

 [Add tags to encoded and decoded messages]

 

-[Incomming message tags:]

+[Incoming message tags:]

 

 [Outgoing message tags:]

 

@@ -208,29 +208,29 @@
 

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

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

+[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!\nrecommended to use GnuPG v1.x.x with this plugn.]

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

 

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

+["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?]

 

@@ -240,7 +240,7 @@
 

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

 

@@ -256,19 +256,19 @@
 

 [Failed to export public key.]

 

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

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

 

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

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

 

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

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

 

-[Home dir have not write access (plugin most probably will not work).\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 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).]

+[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 this problems]

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

 

 [GPG plugin problems]

 

@@ -276,11 +276,11 @@
 

 [ 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?]

 

@@ -299,9 +299,9 @@
 

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

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

 

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

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

 

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

 [Services]

@@ -342,38 +342,38 @@
 

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

 

@@ -389,7 +389,7 @@
 

 [Keys import result]

 

-[New passwords not match]

+[New passwords do not match]

 

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

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

 

diff --git a/langpacks/bulgarian/Plugins/Skype.txt b/langpacks/bulgarian/Plugins/Skype.txt
index e302104b51..c6ef409cc1 100644
--- a/langpacks/bulgarian/Plugins/Skype.txt
+++ b/langpacks/bulgarian/Plugins/Skype.txt
@@ -445,7 +445,5 @@
 

 [Value starts with an invalid character]

 

-[Avatars]

-Аватари

 [Command "%s" is unsupported]

 

diff --git a/langpacks/bulgarian/Plugins/Twitter.txt b/langpacks/bulgarian/Plugins/Twitter.txt
index 6ecfdc753b..e7a58edce2 100644
--- a/langpacks/bulgarian/Plugins/Twitter.txt
+++ b/langpacks/bulgarian/Plugins/Twitter.txt
@@ -80,8 +80,6 @@
 [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]

diff --git a/langpacks/bulgarian/Plugins/Yahoo.txt b/langpacks/bulgarian/Plugins/Yahoo.txt
index b1139147cf..b4849073f8 100644
--- a/langpacks/bulgarian/Plugins/Yahoo.txt
+++ b/langpacks/bulgarian/Plugins/Yahoo.txt
@@ -88,9 +88,6 @@ Yahoo списък за игнориране
 Причина за поканата

 [Add]

 Добавяне

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

-[Avatars]

-Аватари

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

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

 [Съобщение от Miranda NG] Получихте покана за чая стая "%s" с текст: %s

diff --git a/langpacks/chinese/=CORE=.txt b/langpacks/chinese/=CORE=.txt
index 86d4eda460..4b68b74188 100644
--- a/langpacks/chinese/=CORE=.txt
+++ b/langpacks/chinese/=CORE=.txt
@@ -2377,6 +2377,7 @@ JPEG 位图
 GIF 位图

 [PNG Bitmaps]

 PNG 位图

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

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

 [<unspecified>]

 <未指定>

diff --git a/langpacks/chinese/Plugins/AIM.txt b/langpacks/chinese/Plugins/AIM.txt
index 08a37a1fb6..ea154d1576 100644
--- a/langpacks/chinese/Plugins/AIM.txt
+++ b/langpacks/chinese/Plugins/AIM.txt
@@ -114,7 +114,6 @@ AIM 立即闲置
 消息

 [Room]

 房间

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

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

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

 [Invalid Screen Name or password.]

diff --git a/langpacks/chinese/Plugins/Yahoo.txt b/langpacks/chinese/Plugins/Yahoo.txt
index 0f2101df67..1ac6bc902f 100644
--- a/langpacks/chinese/Plugins/Yahoo.txt
+++ b/langpacks/chinese/Plugins/Yahoo.txt
@@ -56,7 +56,6 @@ Yahoo 忽略列表
 取消(&C)

 [Add]

 添加

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

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

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

  [miranda] 已获取房间会议邀请: %s, 消息是: %s

diff --git a/langpacks/dutch/Plugins/AIM.txt b/langpacks/dutch/Plugins/AIM.txt
index 9fc8430c99..4d5ca5c2e8 100644
--- a/langpacks/dutch/Plugins/AIM.txt
+++ b/langpacks/dutch/Plugins/AIM.txt
@@ -26,7 +26,6 @@ Annuleren
 Weigeren

 [Message]

 Bericht

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

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

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

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

diff --git a/langpacks/dutch/Plugins/Yahoo.txt b/langpacks/dutch/Plugins/Yahoo.txt
index ca1b0bbbc5..8d28b606d7 100644
--- a/langpacks/dutch/Plugins/Yahoo.txt
+++ b/langpacks/dutch/Plugins/Yahoo.txt
@@ -30,7 +30,6 @@ Weigeren
 Annuleren

 [Add]

 Toevoegen

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

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

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

 [Profile]

diff --git a/langpacks/estonian/Plugins/AIM.txt b/langpacks/estonian/Plugins/AIM.txt
index 1b16a637e8..b4b08aa3f0 100644
--- a/langpacks/estonian/Plugins/AIM.txt
+++ b/langpacks/estonian/Plugins/AIM.txt
@@ -30,7 +30,6 @@ Tegevusetus
 E-mail

 [Message]

 Teade

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

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

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

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

diff --git a/langpacks/estonian/Plugins/Yahoo.txt b/langpacks/estonian/Plugins/Yahoo.txt
index f2de70e3ec..ff0e5383b0 100644
--- a/langpacks/estonian/Plugins/Yahoo.txt
+++ b/langpacks/estonian/Plugins/Yahoo.txt
@@ -26,7 +26,6 @@ Tühista
 &Tühista

 [Add]

 Lisa

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

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

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

 [Mail]

diff --git a/langpacks/french/Plugins/AIM.txt b/langpacks/french/Plugins/AIM.txt
index 014ccbaed2..901c270590 100644
--- a/langpacks/french/Plugins/AIM.txt
+++ b/langpacks/french/Plugins/AIM.txt
@@ -62,7 +62,6 @@ Re&joindre
 Appliquer

 [&Deny]

 &Refuser

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

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

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

 [You are connecting too frequently. Try waiting 10 minutes to reconnect.]

diff --git a/langpacks/french/Plugins/Yahoo.txt b/langpacks/french/Plugins/Yahoo.txt
index 4c7d45423e..4d9a734d37 100644
--- a/langpacks/french/Plugins/Yahoo.txt
+++ b/langpacks/french/Plugins/Yahoo.txt
@@ -44,7 +44,6 @@ Re&joindre
 &Annuler

 [Add]

 Ajouter

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

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

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

 {Miranda} Invitation à la conférence ici : %s message : %s

diff --git a/langpacks/german/=CORE=.txt b/langpacks/german/=CORE=.txt
index b4d31bf4e6..7b98784381 100644
--- a/langpacks/german/=CORE=.txt
+++ b/langpacks/german/=CORE=.txt
@@ -2094,7 +2094,7 @@ Benutzername
 [FirstName LastName]

 Vorname Nachname

 [LastName FirstName]

-

+Nachname Vorname

 ['(Unknown Contact)' (not movable)]

 'Unbekannter Kontakt' (nicht verschiebbar)

 ['(Unknown Contact)']

@@ -2545,6 +2545,11 @@ JPEG-/JPG-Bilder
 GIF-Bilder

 [PNG Bitmaps]

 PNG-Bilder

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

+[Avatars]

+Avatare

+[Avatars root folder]

+

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

 [<unspecified>]

 <unspezifiziert>

diff --git a/langpacks/german/Plugins/AIM.txt b/langpacks/german/Plugins/AIM.txt
index e284a036e0..458d893b71 100644
--- a/langpacks/german/Plugins/AIM.txt
+++ b/langpacks/german/Plugins/AIM.txt
@@ -136,9 +136,6 @@ Ablehnen
 Nachricht

 [Room]

 Raum

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

-[Avatars]

-Avatare

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

 [Me]

 Ich

diff --git a/langpacks/german/Plugins/Facebook.txt b/langpacks/german/Plugins/Facebook.txt
index 15ad70c508..f2d570abed 100644
--- a/langpacks/german/Plugins/Facebook.txt
+++ b/langpacks/german/Plugins/Facebook.txt
@@ -212,8 +212,6 @@ Kontakt ist nicht mehr in Ihrer Server-Liste.
 %s Serververbindung

 [Unable to get Netlib connection for Facebook]

 Es konnte keine Netlib-Verbindung zu Facebook hergestellt werden

-[Avatars]

-Avatare

 [Facebook ID must be numeric value.]

 Facebook-ID muss ein numerischer Wert sein.

 [Network]

diff --git a/langpacks/german/Plugins/GG.txt b/langpacks/german/Plugins/GG.txt
index ef66a5e1d6..d9991d032b 100644
--- a/langpacks/german/Plugins/GG.txt
+++ b/langpacks/german/Plugins/GG.txt
@@ -274,8 +274,6 @@ Kontaktliste
 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

 %s-Verbindung

-[Avatars]

-Avatare

 [Images]

 Bilder

 [Gadu-Gadu Number]

diff --git a/langpacks/german/Plugins/ICQ.txt b/langpacks/german/Plugins/ICQ.txt
index d853a60613..bb48432dd6 100644
--- a/langpacks/german/Plugins/ICQ.txt
+++ b/langpacks/german/Plugins/ICQ.txt
@@ -398,8 +398,6 @@ Bestätigung
 [** Unknown missed message event.]

 ** Unbekanntes verpasstes Nachrichten-Ereignis.

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

-[Avatars]

-Avatare

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

 Fehler beim Upload des Avatars auf den Server, der Server ist vorübergehend nicht verfügbar.

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

diff --git a/langpacks/german/Plugins/Jabber.txt b/langpacks/german/Plugins/Jabber.txt
index 09deae3fc8..6f347dc659 100644
--- a/langpacks/german/Plugins/Jabber.txt
+++ b/langpacks/german/Plugins/Jabber.txt
@@ -1305,8 +1305,6 @@ Statusnachricht
 ;file \protocols\JabberG\src\jabber_misc.cpp

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

 StdChat.dll ist für Mehrbenutzerkonferenzen erforderlich. Bitte installieren Sie diese Datei nach.

-[Avatars]

-Avatare

 [To]

 An

 [From]

diff --git a/langpacks/german/Plugins/MRA.txt b/langpacks/german/Plugins/MRA.txt
index 4d6450431c..cca01b66cf 100644
--- a/langpacks/german/Plugins/MRA.txt
+++ b/langpacks/german/Plugins/MRA.txt
@@ -214,8 +214,6 @@ Fische
 ;file \protocols\MRA\src\MraAvatars.cpp

 [Avatars' plugin connections]

 Avatar Plugin-Verbindungen

-[Avatars]

-Avatare

 [Avatars: server return HTTP code: %lu]

 Avatare: Server gibt HTTP-Code %lu zurück.

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

@@ -366,6 +364,8 @@ Konto
 Verbindungen

 [Files]

 Dateien

+[Avatars]

+Avatare

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

 [Please, setup e-mail in options]

 Bitte E-Mail-Einstellungen unter Optionen einrichten

diff --git a/langpacks/german/Plugins/MSN.txt b/langpacks/german/Plugins/MSN.txt
index ba25f4abf2..c057acdfe8 100644
--- a/langpacks/german/Plugins/MSN.txt
+++ b/langpacks/german/Plugins/MSN.txt
@@ -202,8 +202,6 @@ Live &Alerts einstellen
 [&Start Netmeeting]

 NetMeeting &starten

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

-[Avatars]

-Avatare

 [Custom Smileys]

 Custom Smileys

 [Notify]

diff --git a/langpacks/german/Plugins/New_GPG.txt b/langpacks/german/Plugins/New_GPG.txt
index ab642c532b..dbe76cd895 100644
--- a/langpacks/german/Plugins/New_GPG.txt
+++ b/langpacks/german/Plugins/New_GPG.txt
@@ -36,7 +36,7 @@ Schlüssel löschen
 Generiere zufälligen Schlüssel

 [Account:]

 Konto:

-[key id:]

+[Key id:]

 Schlüssel-ID:

 [Copy public key]

 Öffentlichen Schlüssen kopieren

@@ -108,11 +108,11 @@ Wählen Sie den Keyserver für die Schlüsselsuche aus:
 Verschlüsselte Datei empfangen

 [Decrypt]

 Entschlüsseln

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

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

 Verschlüsselte Datei von Kontakt mit deaktivierter Verschlüsselung empfangen.

 [Remember choice]

 Auswahl merken

-[Choose which  keys to export]

+[Choose which keys to export]

 Wählen Sie die zu exportierenden Schlüssel aus

 [Export public keys (only set for contacts)]

 Öffentliche Schlüssel exportieren (nur für Kontakte gesetzt)

@@ -146,7 +146,7 @@ Auto Schlüsselaustausch
 Kopiere eig. Schlüssel

 [Add tags to encoded and decoded messages]

 Füge Tags zu ver- und entschlüsselten Nachrichten hinzu

-[Incomming message tags:]

+[Incoming message tags:]

 Eingehende Nachrichten-Tags:

 [Outgoing message tags:]

 Ausgehende Nachrichten-Tags:

@@ -208,29 +208,29 @@ Fehler
 Erstelle neuen zufälligen Schlüssel, bitte warten

 [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.]

 Das GPG-Verzeichnis wurde gefunden, allerdings der Englische Ort davon existiert nicht.\nEs ist sehr wichtig die \\gnupg.nls\\en@quot.mo im GnuPG-Ordner im Miranda NG Verzeichnis zu legen.\nOhne diese Datei haben Sie viele Probleme mit der GPG-Ausgabe auf englischen Systemen.\nEs kann evtl. nicht richtig funktionieren.\nSeien Sie gewarnt!

 [Warning]

 Warnung

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

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

 Ein falsches GPG-Verzeichnis wurde im System gefunden.\nBitte wählen Sie ein anderes Verzeichnis aus.

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

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

 Dies ist kein GnuPG Verzeichnis!\nEs wird empfohlen GnuPG v1.x.x mit diesem Plugin zu verwenden.

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

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

 Eine nicht unterstützte GnuPG-Version wurde gefunden, benutzen Sie diese auf eigenes Risiko!\nEs wird empfohlen, GnuPG v1.x.x mit diesem Plugin zu benutzen.

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

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

 

 [Info]

 Info

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

 Ihre GPG-Version wird unterstützt. Die Sprachdatei wurde gefunden.\nDas GPG-Plugin sollte funktionieren.\nKlicken Sie auf OK, um fortzufahren.

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

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

 GPG-Verzeichnis existiert nicht.\nBitte wählen Sie ein anderes Verzeichnis aus.

 [please choose gpg binary location]

 bitte wählen Sie das GPG-Hauptverzeichnis aus

 [please set keyring's home directory]

 bitte setzen Sie den Hauptordner für die Schlüssel

-[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?]

 Für diesen Kontakt existiert bereits ein Schlüssel, wollen Sie ihn durch einen neuen Schlüssel ersetzen?

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

 Ein neuer Schlüssel wurde empfangen, wollen Sie ihn importieren?

@@ -240,7 +240,7 @@ Ersetze
 Akzeptieren

 [Received key from ]

 Schlussel wurde empfangen von

-[You must set encryption algorythm first]

+[You must set encryption algorithm first]

 Sie müssen als Erstes einen Verschlüsselungsalgorithmus setzen

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

 Schlüssellänge muss zwischen 1024 und 4096 Bit betragen.

@@ -256,19 +256,19 @@ Ungültige E-Mail-Adresse
 Erzeuge neuen Schlüssel, bitte warten Sie...

 [Failed to export public key.]

 Konnte öffentlichen Schlüssel nicht exportieren.

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

-GPG-Programm ist gesetzt und gültig (das ist gut).\n

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

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

+GPG-Programm ist gesetzt und gültig (Das ist gut).\n

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

 GPG-Programm ist nicht gesetzt oder ungültig (Plugin wird nicht funktionieren).\n

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

-Schreibzugriff auf Benutzerverzeichnis gewährt (das ist gut).\n

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

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

+Schreibzugriff auf Benutzerverzeichnis gewährt (Das ist gut).\n

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

 Schreibzugriff auf Benutzerverzeichnis nicht gewährt (Plugin wird höchstwahrscheinlich nicht funktionieren).\n

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

-Schreibzugriff auf temporäres Verzeichnis gewährt (das ist gut).\n

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

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

+Schreibzugriff auf temporäres Verzeichnis gewährt (Das ist gut).\n

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

 Schreibzugriff auf temporäres Verzeichnis nicht gewährt (Plugin sollte funktionieren, aber könnte Probleme verursachen, Dateiübertragungen funktionieren nicht).

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

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

 \nGPG wird deaktiviert bis Sie dieses Problem beheben.

 [GPG plugin problems]

 GPG-Pluginprobleme

@@ -276,11 +276,11 @@ GPG-Pluginprobleme
 Ihr geheimer Schlüssel mit ID:

 [ for account ]

  für Konto 

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

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

  gelöscht vom GPG-Schlüsselring\nWollen Sie einen anderen Schlüssel setzen?

 [Own secret key warning]

 Eigener geheimer Schlüssen Warnung

-[ 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?]

 

@@ -299,9 +299,9 @@ Wollen Sie versuchen, die verschlüsselte Nachricht zu entschlüsseln?
 

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

 Sie versuchen, mit nicht vertrauenswürdigem Schlüssel zu verschlüsseln, wollen Sie diesem Schlüssel dauerhaft vertrauen?

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

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

 Konnte Nachricht nicht verschlüsseln, GPG gab einen Fehler zurück, schalten Sie den Debugverlauf für weitere Informationen ein

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

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

 Etwas läuft falsch, GPG versteht uns nicht, breche Verschlüsselung ab.

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

 [Services]

@@ -342,38 +342,38 @@ Setze Logdatei
 Logdateien

 [Choose gpg.exe]

 Wählen sie den Pfad zur gpg.exe aus

-[Set home diractory]

+[Set home directory]

 Setze Heimverzeichnis

 [Load Public GPG Key for ]

 Lade offentlichen GPG-Schlussel fur

 [Turn off encryption]

 Verschlüsselung deaktivieren

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

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

  gegenwärtig gefunden, er existiert im Hauptverzeichnis.)

 [Load Public GPG Key (Key ID: ]

 Lade offentlichen GPG-Schlussel (Schlussel-ID:

-[ found in prescense.)]

+[ found in presence.)]

 gegenwärtig gefunden.

 [This is not public or private key]

 Dies ist kein öffentlicher oder privater Schlüssel

-[Key already in scret key ring.]

+[Key already in secret keyring.]

 Der Schlüssel ist bereits im geheimen Hauptverzeichnis.

 [Set file containing GPG public key]

 Setzen Sie die Datei, die den GPG-Schlüssel enthält

 [GPG public key file]

 GPG öffentliche Schlüsseldatei

-[Where is no public or private key.]

+[There is no public or private key.]

 Wo ist der öffentliche oder private Schlüssel?

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

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

 Wollen Sie die Verschlüsselung für alle Unterkontakte wechseln?

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

 Die Zieldatei ist bereits vorhanden, wollen Sie diese ersetzen?

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

 Dateiübertragungswarnung

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

 

@@ -389,7 +389,7 @@ alle privaten Schlüssel
 

 [Keys import result]

 

-[New passwords not match]

+[New passwords do not match]

 Die neuen Passwörter stimmen nicht überein

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

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

 

diff --git a/langpacks/german/Plugins/Skype.txt b/langpacks/german/Plugins/Skype.txt
index 7913dc8831..ec9f028ab1 100644
--- a/langpacks/german/Plugins/Skype.txt
+++ b/langpacks/german/Plugins/Skype.txt
@@ -445,7 +445,5 @@ Wert enthält ungültiges Wort
 Passwort ist zu einfach

 [Value starts with an invalid character]

 Wert beginnt mit einem ungültigen Zeichen.

-[Avatars]

-Avatare

 [Command "%s" is unsupported]

 Kommando %s" wird nicht unterstützt

diff --git a/langpacks/german/Plugins/Twitter.txt b/langpacks/german/Plugins/Twitter.txt
index 7b2d1123e1..e51f173e15 100644
--- a/langpacks/german/Plugins/Twitter.txt
+++ b/langpacks/german/Plugins/Twitter.txt
@@ -80,8 +80,6 @@ Konnte Twitter-Zugriffstoken nicht holen, bitte gehen Sie offline und versuchen
 [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]

 Ihnen fehlt der Nick-Schlüssel in der Datenbank. Das ist wirklich keine große Sache, aber Sie werden einige kleinere Probleme bemerken (Selbstkontakt in der Liste, keine Hervorhebung ausgehender Nachrichten im Gruppenchat usw.). Um dies zu beheben, fügen Sie ihn entweder manuell hinzu oder setzen Sie Ihr Twitterkonto in den Kontooptionen zurück

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

-[Avatars]

-Avatare

 [Send Tweet...]

 Tweet senden...

 [Network]

diff --git a/langpacks/german/Plugins/Yahoo.txt b/langpacks/german/Plugins/Yahoo.txt
index 253f1bffa2..b1264bd930 100644
--- a/langpacks/german/Plugins/Yahoo.txt
+++ b/langpacks/german/Plugins/Yahoo.txt
@@ -88,9 +88,6 @@ Abbre&chen
 Grund der Einlad.

 [Add]

 Hinzufügen

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

-[Avatars]

-Avatare

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

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

 [Miranda] Chateinladung in Raum: %s mit Nachricht: %s

diff --git a/langpacks/german/Untranslated/=CORE=.txt b/langpacks/german/Untranslated/=CORE=.txt
index 713f221e95..5ae4a0090a 100644
--- a/langpacks/german/Untranslated/=CORE=.txt
+++ b/langpacks/german/Untranslated/=CORE=.txt
@@ -1 +1 @@
-[LastName FirstName]

+[Avatars root folder]

diff --git a/langpacks/german/Untranslated/New_GPG.txt b/langpacks/german/Untranslated/New_GPG.txt
index 1c40f95975..a4bfb9cd3b 100644
--- a/langpacks/german/Untranslated/New_GPG.txt
+++ b/langpacks/german/Untranslated/New_GPG.txt
@@ -1,12 +1,12 @@
 [Default private key id]

 [Failed to alocate memory]

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

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

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

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

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

-[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?]

-[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?]

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

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

 [Keys export result]

 [Keys import result]

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

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

diff --git a/langpacks/hebrew/Plugins/AIM.txt b/langpacks/hebrew/Plugins/AIM.txt
index 5cc7371fc7..37b496f126 100644
--- a/langpacks/hebrew/Plugins/AIM.txt
+++ b/langpacks/hebrew/Plugins/AIM.txt
@@ -76,7 +76,6 @@ AIM אפשרויות
 &דחה

 [Message]

 הודעה

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

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

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

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

diff --git a/langpacks/hebrew/Plugins/Yahoo.txt b/langpacks/hebrew/Plugins/Yahoo.txt
index 8e21c14852..5a1e141a49 100644
--- a/langpacks/hebrew/Plugins/Yahoo.txt
+++ b/langpacks/hebrew/Plugins/Yahoo.txt
@@ -46,7 +46,6 @@
 בטל

 [Add]

 הוסף

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

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

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

 [Mail]

diff --git a/langpacks/hungarian/Plugins/AIM.txt b/langpacks/hungarian/Plugins/AIM.txt
index 659bdbc224..287f94b16c 100644
--- a/langpacks/hungarian/Plugins/AIM.txt
+++ b/langpacks/hungarian/Plugins/AIM.txt
@@ -68,7 +68,6 @@ E-levél
 Visszautasít

 [Message]

 Üzenet

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

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

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

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

diff --git a/langpacks/hungarian/Plugins/Yahoo.txt b/langpacks/hungarian/Plugins/Yahoo.txt
index 099ca87867..1e4b151a79 100644
--- a/langpacks/hungarian/Plugins/Yahoo.txt
+++ b/langpacks/hungarian/Plugins/Yahoo.txt
@@ -46,7 +46,6 @@ Visszautasít
 &Mégse

 [Add]

 Új

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

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

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

 Konferenciameghívást kaptál ebbe a szobába: %s ezzel az üzenettel: %s

diff --git a/langpacks/italian/Plugins/AIM.txt b/langpacks/italian/Plugins/AIM.txt
index d71ced6ea1..2cacf0b567 100644
--- a/langpacks/italian/Plugins/AIM.txt
+++ b/langpacks/italian/Plugins/AIM.txt
@@ -58,7 +58,6 @@ Messaggio
 Messaggio

 [Message]

 Messaggio

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

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

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

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

diff --git a/langpacks/italian/Plugins/Yahoo.txt b/langpacks/italian/Plugins/Yahoo.txt
index 6179efbb0c..80d8cc5081 100644
--- a/langpacks/italian/Plugins/Yahoo.txt
+++ b/langpacks/italian/Plugins/Yahoo.txt
@@ -66,7 +66,6 @@ Annulla
 &Nega

 [&Cancel]

 &Annulla

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

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

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

 [Profile]

diff --git a/langpacks/japanese/Plugins/AIM.txt b/langpacks/japanese/Plugins/AIM.txt
index 5633309667..2b07bd2850 100644
--- a/langpacks/japanese/Plugins/AIM.txt
+++ b/langpacks/japanese/Plugins/AIM.txt
@@ -114,7 +114,6 @@ Cancel(&C)
 メッセージ

 [Room]

 ルーム

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

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

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

 [Invalid Screen Name or password.]

diff --git a/langpacks/japanese/Plugins/Yahoo.txt b/langpacks/japanese/Plugins/Yahoo.txt
index b93f7a7dfc..3b79b87527 100644
--- a/langpacks/japanese/Plugins/Yahoo.txt
+++ b/langpacks/japanese/Plugins/Yahoo.txt
@@ -62,7 +62,6 @@ Cancel
 Cancel(&C)

 [Add]

 追加

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

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

 [%s denied invitation with message: %s]

 %s はメッセージによる招待を拒否しました : %s

diff --git a/langpacks/korean/Plugins/AIM.txt b/langpacks/korean/Plugins/AIM.txt
index de0641af2e..b69e94fd07 100644
--- a/langpacks/korean/Plugins/AIM.txt
+++ b/langpacks/korean/Plugins/AIM.txt
@@ -18,7 +18,6 @@
 이메일

 [&Deny]

 &D 거부

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

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

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

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

diff --git a/langpacks/korean/Plugins/Yahoo.txt b/langpacks/korean/Plugins/Yahoo.txt
index 7e2d2ac7a7..9ab1c34b18 100644
--- a/langpacks/korean/Plugins/Yahoo.txt
+++ b/langpacks/korean/Plugins/Yahoo.txt
@@ -22,7 +22,6 @@
 &D 거부

 [&Cancel]

 &C 취소

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

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

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

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

diff --git a/langpacks/norwegian/Plugins/AIM.txt b/langpacks/norwegian/Plugins/AIM.txt
index ca2d17d05b..9c83e375c1 100644
--- a/langpacks/norwegian/Plugins/AIM.txt
+++ b/langpacks/norwegian/Plugins/AIM.txt
@@ -32,7 +32,6 @@ E-post
 Melding

 [Message]

 Melding

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

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

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

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

diff --git a/langpacks/norwegian/Plugins/Yahoo.txt b/langpacks/norwegian/Plugins/Yahoo.txt
index 85fd86ca78..d6b9d84b72 100644
--- a/langpacks/norwegian/Plugins/Yahoo.txt
+++ b/langpacks/norwegian/Plugins/Yahoo.txt
@@ -36,7 +36,6 @@ Avbryt
 &Avbryt

 [Add]

 Legg til

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

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

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

 [Profile]

diff --git a/langpacks/portuguese_br/Plugins/AIM.txt b/langpacks/portuguese_br/Plugins/AIM.txt
index f5e18eb089..6cbb09d0b9 100644
--- a/langpacks/portuguese_br/Plugins/AIM.txt
+++ b/langpacks/portuguese_br/Plugins/AIM.txt
@@ -88,7 +88,6 @@ E-mail
 Mensagem

 [Room]

 Salão

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

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

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

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

diff --git a/langpacks/portuguese_br/Plugins/Yahoo.txt b/langpacks/portuguese_br/Plugins/Yahoo.txt
index 3ee088aee2..3bc63a2b5d 100644
--- a/langpacks/portuguese_br/Plugins/Yahoo.txt
+++ b/langpacks/portuguese_br/Plugins/Yahoo.txt
@@ -92,7 +92,6 @@ Cancelar
 Adicionar

 [Add]

 Adicionar

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

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

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

 [Mail]

diff --git a/langpacks/russian/Plugins/New_GPG.txt b/langpacks/russian/Plugins/New_GPG.txt
index 37d3f25f9c..348d5d3e01 100644
--- a/langpacks/russian/Plugins/New_GPG.txt
+++ b/langpacks/russian/Plugins/New_GPG.txt
@@ -49,7 +49,7 @@
 Импорт ключа с сервера ключей

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

 Получен новый отрытый ключ. Вы хотите его принять?

-[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?]

 Получен ключ, но у контакта уже есть ключ. Вы хотите его заменить новым?

 [The new public key was recieved]

 Получен новый отрытый ключ.

@@ -65,9 +65,9 @@
 Использовать jabber api Miranda NG (Рекомендуется)

 [Current private key id]

 Закрытый ключ

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

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

 Выбранный вами exe не GnuPG!\nРекомендуется использовать GnuPG v1.x.x с этим плагином.

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

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

 Ваша версия GnuPG не поддерживается и может работать не правильно!\nРекомендуется использовать GnuPG v1.x.x с этим плагином.

 [Generate key]

 Сгенерировать

@@ -113,7 +113,7 @@
 Лист пользователей:

 [Add tags to encoded and decoded messages]

 Добавлять метки к сообщениям

-[Incomming message tags:]

+[Incoming message tags:]

 Добавлять метки к входящим сообщениям:

 [Outgoing message tags:]

 Добавлять метки исходящим сообщениям:

diff --git a/langpacks/russian/Plugins/Skype.txt b/langpacks/russian/Plugins/Skype.txt
index c8b623892f..f9c5e21eaf 100644
--- a/langpacks/russian/Plugins/Skype.txt
+++ b/langpacks/russian/Plugins/Skype.txt
@@ -331,7 +331,5 @@ SkypeKit не запустился.
 Значение имеет недопустимое слово

 [Password is too simple]

 Пароль слишком простой

-[Avatars]

-Аватары

 [Command "%s" is unsupported]

 Команда "%s" не поддерживается

diff --git a/langpacks/slovak/Plugins/AIM.txt b/langpacks/slovak/Plugins/AIM.txt
index e6ae05659f..10aea10e81 100644
--- a/langpacks/slovak/Plugins/AIM.txt
+++ b/langpacks/slovak/Plugins/AIM.txt
@@ -136,9 +136,6 @@ Reset
 

 [Room]

 

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

-[Avatars]

-

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

 [Me]

 

diff --git a/langpacks/slovak/Plugins/Facebook.txt b/langpacks/slovak/Plugins/Facebook.txt
index f0fc053f6a..38abe68f84 100644
--- a/langpacks/slovak/Plugins/Facebook.txt
+++ b/langpacks/slovak/Plugins/Facebook.txt
@@ -210,8 +210,6 @@ Neznáma chyba
 

 [Other Event]

 

-[Avatars]

-

 [Network]

 Sieť

 [Account]

diff --git a/langpacks/slovak/Plugins/GG.txt b/langpacks/slovak/Plugins/GG.txt
index 578f97c0da..c6164e2c61 100644
--- a/langpacks/slovak/Plugins/GG.txt
+++ b/langpacks/slovak/Plugins/GG.txt
@@ -272,8 +272,6 @@ Ignorovať
 ;file \protocols\Gadu-Gadu\src\gg_proto.cpp

 [%s connection]

 

-[Avatars]

-

 [Images]

 

 [Gadu-Gadu Number]

diff --git a/langpacks/slovak/Plugins/ICQ.txt b/langpacks/slovak/Plugins/ICQ.txt
index 7864286647..fefbe97a4e 100644
--- a/langpacks/slovak/Plugins/ICQ.txt
+++ b/langpacks/slovak/Plugins/ICQ.txt
@@ -396,8 +396,6 @@ ICQ poznámka
 [** 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.]

diff --git a/langpacks/slovak/Plugins/Jabber.txt b/langpacks/slovak/Plugins/Jabber.txt
index ead2802faf..59026c88f9 100644
--- a/langpacks/slovak/Plugins/Jabber.txt
+++ b/langpacks/slovak/Plugins/Jabber.txt
@@ -1299,8 +1299,6 @@ Osobná karta
 ;file \protocols\JabberG\src\jabber_misc.cpp

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

 

-[Avatars]

-

 [To]

 Do

 [From]

diff --git a/langpacks/slovak/Plugins/MRA.txt b/langpacks/slovak/Plugins/MRA.txt
index 79ea2f7c53..fdfb9f5045 100644
--- a/langpacks/slovak/Plugins/MRA.txt
+++ b/langpacks/slovak/Plugins/MRA.txt
@@ -215,8 +215,6 @@ Notifikácia
 ;file \protocols\MRA\src\MraAvatars.cpp

 [Avatars' plugin connections]

 

-[Avatars]

-

 [Avatars: server return HTTP code: %lu]

 

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

@@ -367,6 +365,8 @@ Sieť
 

 [Files]

 

+[Avatars]

+

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

 [Please, setup e-mail in options]

 

diff --git a/langpacks/slovak/Plugins/MSN.txt b/langpacks/slovak/Plugins/MSN.txt
index 0c41b4b0dc..7427aa84b7 100644
--- a/langpacks/slovak/Plugins/MSN.txt
+++ b/langpacks/slovak/Plugins/MSN.txt
@@ -198,8 +198,6 @@ Nastav prezívku
 [&Start Netmeeting]

 

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

-[Avatars]

-

 [Custom Smileys]

 

 [Notify]

diff --git a/langpacks/slovak/Plugins/New_GPG.txt b/langpacks/slovak/Plugins/New_GPG.txt
index ccc69bc9a5..57c35d8165 100644
--- a/langpacks/slovak/Plugins/New_GPG.txt
+++ b/langpacks/slovak/Plugins/New_GPG.txt
@@ -36,7 +36,7 @@ OK
 

 [Account:]

 

-[key id:]

+[Key id:]

 

 [Copy public key]

 

@@ -108,11 +108,11 @@ Heslo:
 

 [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)]

 

@@ -146,7 +146,7 @@ Heslo:
 

 [Add tags to encoded and decoded messages]

 

-[Incomming message tags:]

+[Incoming message tags:]

 

 [Outgoing message tags:]

 

@@ -208,29 +208,29 @@ Chyba
 

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

 Varovanie

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

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

+[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!\nrecommended to use GnuPG v1.x.x with this plugn.]

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

 

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

+["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?]

 

@@ -240,7 +240,7 @@ Varovanie
 Súhlas

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

 

@@ -256,19 +256,19 @@ Súhlas
 

 [Failed to export public key.]

 

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

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

 

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

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

 

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

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

 

-[Home dir have not write access (plugin most probably will not work).\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 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).]

+[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 this problems]

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

 

 [GPG plugin problems]

 

@@ -276,11 +276,11 @@ Súhlas
 

 [ 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?]

 

@@ -299,9 +299,9 @@ Súhlas
 

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

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

 

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

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

 

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

 [Services]

@@ -342,38 +342,38 @@ Kontakt
 

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

 

@@ -389,7 +389,7 @@ Kontakt
 

 [Keys import result]

 

-[New passwords not match]

+[New passwords do not match]

 

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

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

 

diff --git a/langpacks/slovak/Plugins/Skype.txt b/langpacks/slovak/Plugins/Skype.txt
index 8620b67cd4..11f15d3986 100644
--- a/langpacks/slovak/Plugins/Skype.txt
+++ b/langpacks/slovak/Plugins/Skype.txt
@@ -411,7 +411,5 @@ Kontakt
 

 [Value starts with an invalid character]

 

-[Avatars]

-

 [Command "%s" is unsupported]

 

diff --git a/langpacks/slovak/Plugins/Twitter.txt b/langpacks/slovak/Plugins/Twitter.txt
index 95d6f2de52..caa4802769 100644
--- a/langpacks/slovak/Plugins/Twitter.txt
+++ b/langpacks/slovak/Plugins/Twitter.txt
@@ -80,8 +80,6 @@ OK
 [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]

diff --git a/langpacks/slovak/Plugins/Yahoo.txt b/langpacks/slovak/Plugins/Yahoo.txt
index 8f7355f5ec..6265c91bdd 100644
--- a/langpacks/slovak/Plugins/Yahoo.txt
+++ b/langpacks/slovak/Plugins/Yahoo.txt
@@ -86,9 +86,6 @@ Storno
 

 [Add]

 

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

-[Avatars]

-

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

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

 

diff --git a/langpacks/slovak/Untranslated/AIM.txt b/langpacks/slovak/Untranslated/AIM.txt
index 98ede7f352..b93e8bc776 100644
--- a/langpacks/slovak/Untranslated/AIM.txt
+++ b/langpacks/slovak/Untranslated/AIM.txt
@@ -58,7 +58,6 @@
 [&Deny]

 [Message]

 [Room]

-[Avatars]

 [Me]

 [Others]

 [&Invite user...]

diff --git a/langpacks/slovak/Untranslated/Facebook.txt b/langpacks/slovak/Untranslated/Facebook.txt
index 9b5a0fd904..4471321c52 100644
--- a/langpacks/slovak/Untranslated/Facebook.txt
+++ b/langpacks/slovak/Untranslated/Facebook.txt
@@ -88,7 +88,6 @@
 [Notification]

 [News Feed]

 [Other Event]

-[Avatars]

 [Account]

 [Popups]

 [Loading newsfeeds...]

diff --git a/langpacks/slovak/Untranslated/GG.txt b/langpacks/slovak/Untranslated/GG.txt
index b232b86b75..8be506cc43 100644
--- a/langpacks/slovak/Untranslated/GG.txt
+++ b/langpacks/slovak/Untranslated/GG.txt
@@ -100,7 +100,6 @@
 [&Block]

 [Contact list]

 [%s connection]

-[Avatars]

 [Images]

 [Gadu-Gadu Number]

 [Open &conference...]

diff --git a/langpacks/slovak/Untranslated/ICQ.txt b/langpacks/slovak/Untranslated/ICQ.txt
index 7a151f0a34..59366c3c24 100644
--- a/langpacks/slovak/Untranslated/ICQ.txt
+++ b/langpacks/slovak/Untranslated/ICQ.txt
@@ -140,7 +140,6 @@
 [** This message was blocked by the ICQ server ** The sender has flooded the server.]

 [** This message was blocked by the ICQ server ** You are too evil.]

 [** Unknown missed message event.]

-[Avatars]

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

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

 [Afghanistan]

diff --git a/langpacks/slovak/Untranslated/Jabber.txt b/langpacks/slovak/Untranslated/Jabber.txt
index 31373a10ce..0dcd64df2b 100644
--- a/langpacks/slovak/Untranslated/Jabber.txt
+++ b/langpacks/slovak/Untranslated/Jabber.txt
@@ -561,7 +561,6 @@
 [Highest priority (server's choice)]

 [Status Message]

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

-[Avatars]

 [From]

 [Both]

 [Errors]

diff --git a/langpacks/slovak/Untranslated/MRA.txt b/langpacks/slovak/Untranslated/MRA.txt
index 38b6e8acda..a71ef30f40 100644
--- a/langpacks/slovak/Untranslated/MRA.txt
+++ b/langpacks/slovak/Untranslated/MRA.txt
@@ -75,7 +75,6 @@
 [Aquarius]

 [Pisces]

 [Avatars' plugin connections]

-[Avatars]

 [Avatars: server return HTTP code: %lu]

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

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

@@ -143,6 +142,7 @@
 [Account]

 [Connections]

 [Files]

+[Avatars]

 [Please, setup e-mail in options]

 [Please, setup password in options]

 [Logon error: invalid login/password]

diff --git a/langpacks/slovak/Untranslated/MSN.txt b/langpacks/slovak/Untranslated/MSN.txt
index f080182863..d7b8fa5ca5 100644
--- a/langpacks/slovak/Untranslated/MSN.txt
+++ b/langpacks/slovak/Untranslated/MSN.txt
@@ -74,7 +74,6 @@
 [Setup Live &Alerts]

 [&Block]

 [&Start Netmeeting]

-[Avatars]

 [Custom Smileys]

 [Protocol icon]

 [Hotmail Inbox]

diff --git a/langpacks/slovak/Untranslated/New_GPG.txt b/langpacks/slovak/Untranslated/New_GPG.txt
index 6ec908710c..b9460c68f1 100644
--- a/langpacks/slovak/Untranslated/New_GPG.txt
+++ b/langpacks/slovak/Untranslated/New_GPG.txt
@@ -12,7 +12,7 @@
 [Delete key]

 [Generate and use random key]

 [Account:]

-[key id:]

+[Key id:]

 [Copy public key]

 [Export private key]

 [Change password]

@@ -44,9 +44,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]

@@ -63,7 +63,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:]

@@ -90,21 +90,21 @@
 [Failed to open file]

 [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.]

-[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.]

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

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

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

@@ -112,19 +112,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: ]

 [ 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?]

@@ -133,8 +133,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.]

 [Services]

 [Main]

 [GnuPG Variables]

@@ -152,22 +152,22 @@
 [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.]

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

@@ -175,5 +175,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/slovak/Untranslated/Skype.txt b/langpacks/slovak/Untranslated/Skype.txt
index a142be01f9..774f6ffb49 100644
--- a/langpacks/slovak/Untranslated/Skype.txt
+++ b/langpacks/slovak/Untranslated/Skype.txt
@@ -171,5 +171,4 @@
 [Value contains invalid word]

 [Password is too simple]

 [Value starts with an invalid character]

-[Avatars]

 [Command "%s" is unsupported]

diff --git a/langpacks/slovak/Untranslated/Twitter.txt b/langpacks/slovak/Untranslated/Twitter.txt
index 8143e6931d..1ff019f9b6 100644
--- a/langpacks/slovak/Untranslated/Twitter.txt
+++ b/langpacks/slovak/Untranslated/Twitter.txt
@@ -28,7 +28,6 @@
 [OAuth variables are out of sequence, they have been reset. Please reconnect and reauthorise Miranda to Twitter.com (do the PIN stuff again)]

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

-[Avatars]

 [Send Tweet...]

 [Basic]

 [Popups]

diff --git a/langpacks/slovak/Untranslated/Yahoo.txt b/langpacks/slovak/Untranslated/Yahoo.txt
index 19b9a413dc..7d741f016d 100644
--- a/langpacks/slovak/Untranslated/Yahoo.txt
+++ b/langpacks/slovak/Untranslated/Yahoo.txt
@@ -29,7 +29,6 @@
 [&Cancel]

 [Invitation reason]

 [Add]

-[Avatars]

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

 [%s denied invitation with message: %s]

 [Me]

diff --git a/langpacks/spanish/Plugins/AIM.txt b/langpacks/spanish/Plugins/AIM.txt
index 560a218a86..ac46de6a1e 100644
--- a/langpacks/spanish/Plugins/AIM.txt
+++ b/langpacks/spanish/Plugins/AIM.txt
@@ -34,7 +34,6 @@ Guardar cambios
 &Negar

 [Message]

 Mensaje

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

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

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

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

diff --git a/langpacks/spanish/Plugins/Yahoo.txt b/langpacks/spanish/Plugins/Yahoo.txt
index c9360f0ee4..e1351a9924 100644
--- a/langpacks/spanish/Plugins/Yahoo.txt
+++ b/langpacks/spanish/Plugins/Yahoo.txt
@@ -52,7 +52,6 @@ Cancelar
 &Cancelar

 [Add]

 Agregar

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

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

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

 [Mail]

diff --git a/langpacks/turkish/Plugins/AIM.txt b/langpacks/turkish/Plugins/AIM.txt
index a7a05a2902..e6136855ea 100644
--- a/langpacks/turkish/Plugins/AIM.txt
+++ b/langpacks/turkish/Plugins/AIM.txt
@@ -72,7 +72,6 @@ E-posta
 Re&ddet

 [Message]

 İleti

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

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

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

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

diff --git a/langpacks/turkish/Plugins/Yahoo.txt b/langpacks/turkish/Plugins/Yahoo.txt
index c7e36a5010..2cc9d37bbd 100644
--- a/langpacks/turkish/Plugins/Yahoo.txt
+++ b/langpacks/turkish/Plugins/Yahoo.txt
@@ -52,7 +52,6 @@ Re&ddet
 İ&ptal

 [Add]

 Ekle

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

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

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

 [Mail]