- langpacks/english: update;

- langpacks/russian: update;


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

12 files changed, 10 insertions, 17 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index d8339077f5..26d5ad4e7b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -789,7 +789,6 @@
 [Message sessions]

 [General]

 [Chat log]

-[Chat]

 [Popups]

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

 [Look up '%s':]

@@ -1011,7 +1010,6 @@
 [Highlighted message]

 [User list members (online)]

 [User list members (away)]

-[Userlist background]

 [Message typing area]

 [Chat log symbols (Webdings)]

 [Message is highlighted]

diff --git a/langpacks/english/Plugins/FTPFile.txt b/langpacks/english/Plugins/FTPFile.txt
index 674aab854a..d1c3665aa3 100644
--- a/langpacks/english/Plugins/FTPFile.txt
+++ b/langpacks/english/Plugins/FTPFile.txt
@@ -89,7 +89,6 @@
 [Zip and upload folder]

 [FTP File manager]

 [Show FTPFile manager]

-[FTP_ShowManager]

 [Upload file]

 [Zip and upload file]

 [You have to fill FTP server setting before upload a file.]

diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt
index 4cf8f8d946..0661e0aa61 100644
--- a/langpacks/english/Plugins/FavContacts.txt
+++ b/langpacks/english/Plugins/FavContacts.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: FavContacts.dll

 ;  Plugin: Favorite contacts

-;  Version: 0.0.0.6

+;  Version: 0.0.0.7

 ;  Authors: Victor Pavlychko

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

 [Favorite contacts menu.]

diff --git a/langpacks/english/Plugins/SpellChecker.txt b/langpacks/english/Plugins/SpellChecker.txt
index 154009ab92..131b2009f6 100644
--- a/langpacks/english/Plugins/SpellChecker.txt
+++ b/langpacks/english/Plugins/SpellChecker.txt
@@ -42,9 +42,7 @@
 [The correction can't be empty!]

 [The correction can't be equal to the wrong word!]

 ;file \plugins\SpellChecker\src\dictionary.cpp

-[tl_PH]

 [Tagalog (Philippines)]

-[de_frami_neu]

 [German (Germany)]

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

 [Message Sessions]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index be8637c909..f0c2dcc9cf 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -955,7 +955,6 @@
 [Add user to highlight list]

 [Edit user highlight list]

 ;file \plugins\TabSRMM\src\chat\options.cpp

-[Group chat log background]

 [Input area background]

 [Log background]

 [Single Messaging]

@@ -1075,6 +1074,7 @@
 [Incremental search highlight]

 [Fields background]

 [Userlist background]

+[Group chat log background]

 [nick of current contact (if defined)]

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

diff --git a/langpacks/english/Plugins/Xfire.txt b/langpacks/english/Plugins/Xfire.txt
index 71e575bdb7..24af7edaf5 100644
--- a/langpacks/english/Plugins/Xfire.txt
+++ b/langpacks/english/Plugins/Xfire.txt
@@ -112,6 +112,8 @@
 [Well, I would talk to you if Miranda ICQ supported chat]

 [That'll be the phone.]

 [Mmm... food.]

+;file \protocols\Xfire\src\baseProtocol.h

+[XFire Protocol]

 ;file \protocols\Xfire\src\iniupdater.cpp

 [The xfire_games.ini was updated.]

 [Error during xfire_games.ini update.]

@@ -153,7 +155,7 @@
 [&Activity Report]

 [&Rescan my games...]

 [Set &Nickname]

-[Protocols/XFire]

+[Protocols]

 [XFire game icon]

 [XFire voice icon]

 [XFire does not support offline messaging!]

diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 990b7af98a..4af8c436f5 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -1529,8 +1529,6 @@ Miranda NG перезапускается.\nПожалуйста, подожди
 Общее

 [Chat log]

 Журнал чата

-[Chat]

-Чат

 [Popups]

 Всплывающие окна

 [Look up '%s':]

diff --git a/langpacks/russian/Plugins/FavContacts.txt b/langpacks/russian/Plugins/FavContacts.txt
index 92e3449d23..c52875c6e4 100644
--- a/langpacks/russian/Plugins/FavContacts.txt
+++ b/langpacks/russian/Plugins/FavContacts.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: FavContacts.dll

 ;  Plugin: Favorite contacts

-;  Version: 0.0.0.6

+;  Version: 0.0.0.7

 ;  Authors: Victor Pavlychko

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

 [Favorite contacts menu.]

diff --git a/langpacks/russian/Plugins/TabSRMM.txt b/langpacks/russian/Plugins/TabSRMM.txt
index 5d234ff085..6d3456bb10 100644
--- a/langpacks/russian/Plugins/TabSRMM.txt
+++ b/langpacks/russian/Plugins/TabSRMM.txt
@@ -1805,8 +1805,6 @@ tabSRMM: %s
 %s выключает статус '%s' для %s

 [Add user to highlight list]

 Добавить пользователя в список подсветки

-[Group chat log background]

-Фон журнала чата

 [Input area background]

 Окна ввода текста

 [Log background]

@@ -2045,6 +2043,8 @@ IRC-стиль (текстовый) индикаторов ролей в жур�
 Фон полей

 [Userlist background]

 Фон списка пользователей

+[Group chat log background]

+Фон журнала чата

 [nick of current contact (if defined)]

 ник текущего контакта (если определен)

 [protocol name of current contact (if defined). Account name is used when protocol supports multiaccounts]

diff --git a/langpacks/russian/Untranslated/FTPFile.txt b/langpacks/russian/Untranslated/FTPFile.txt
index 7961cd64a2..16869bfaf4 100644
--- a/langpacks/russian/Untranslated/FTPFile.txt
+++ b/langpacks/russian/Untranslated/FTPFile.txt
@@ -5,7 +5,6 @@
 [File with the same name already exists on the server.]

 [How to proceed?]

 [Copy URL]

-[FTP_ShowManager]

 [You have to fill FTP server setting before upload a file.]

 [Error has occurred while trying to create a dialog!]

 [FTP File - Select a folder]

diff --git a/langpacks/russian/Untranslated/SpellChecker.txt b/langpacks/russian/Untranslated/SpellChecker.txt
index 20ec2e2294..558d7922c5 100644
--- a/langpacks/russian/Untranslated/SpellChecker.txt
+++ b/langpacks/russian/Untranslated/SpellChecker.txt
@@ -2,9 +2,7 @@
 [The wrong word can't be empty!]

 [The correction can't be empty!]

 [The correction can't be equal to the wrong word!]

-[tl_PH]

 [Tagalog (Philippines)]

-[de_frami_neu]

 [German (Germany)]

 [There are %d spelling errors. Are you sure you want to send this message?]

 [Your message window does not support SpellChecker Plugin.\nIf you use SRMM, TabSRMM or Scriver, please update them to the latest version,\notherwise ask the author of your message window plugin to add support for Spell Checker.]

diff --git a/langpacks/russian/Untranslated/Xfire.txt b/langpacks/russian/Untranslated/Xfire.txt
index 6d77a73ae8..a5f4828d77 100644
--- a/langpacks/russian/Untranslated/Xfire.txt
+++ b/langpacks/russian/Untranslated/Xfire.txt
@@ -28,6 +28,7 @@
 [Supported Games]

 [Custom game]

 [Well, I would talk to you if Miranda ICQ supported chat]

+[XFire Protocol]

 [The xfire_games.ini was updated.]

 [Error during xfire_games.ini update.]

 [There is a new Icons.dll online, do you want to update now?]

@@ -52,7 +53,7 @@
 [It seems that is the first time you use this plugin. Do you want to automatically download the latest available xfire_games.ini and icons.dll?\r\nWithout the xfire_games.ini Xfire can't detect any games on your computer.]

 [Away from Keyboard]

 [&Activity Report]

-[Protocols/XFire]

+[Protocols]

 [XFire does not support offline messaging!]

 [No Password is set!]

 [Last game: %s playtime: %.2d:%.2d:%.2d]