summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/belarusian/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/belarusian/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/bulgarian/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/bulgarian/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/croatian/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/croatian/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/czech/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/czech/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/english/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/french/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/french/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/german/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/german/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/polish/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/polish/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/russian/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/serbian/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/serbian/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/spanish/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/spanish/Untranslated/Db_autobackups.txt2
-rw-r--r--langpacks/ukrainian/Plugins/Db_autobackups.txt2
-rw-r--r--langpacks/ukrainian/Untranslated/Db_autobackups.txt2
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_Mobile.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_WebAgent.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_official.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_unknown.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_MRA.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/fp_icons.rc5
-rw-r--r--plugins/FingerprintNG/res/resource.rc1
-rw-r--r--plugins/FingerprintNG/src/finger_groups.h5
-rw-r--r--plugins/FingerprintNG/src/masks.cpp13
-rw-r--r--plugins/FingerprintNG/src/options.cpp1
-rw-r--r--plugins/FingerprintNG/src/resource.h6
-rw-r--r--plugins/FingerprintNG/src/stdafx.h1
34 files changed, 22 insertions, 54 deletions
diff --git a/langpacks/belarusian/Plugins/Db_autobackups.txt b/langpacks/belarusian/Plugins/Db_autobackups.txt
index b9cf3103ff..474e93abde 100644
--- a/langpacks/belarusian/Plugins/Db_autobackups.txt
+++ b/langpacks/belarusian/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@
Адкрыць...
[Go to the "Options -> Customize -> Folders" to change settings]
Адкрыйце "Тонкая налада -> Тэчкі" для змены налад
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
Сціск рэзервовай копіі ў архіў
diff --git a/langpacks/belarusian/Untranslated/Db_autobackups.txt b/langpacks/belarusian/Untranslated/Db_autobackups.txt
index 0426e88ee9..9d54e76eb4 100644
--- a/langpacks/belarusian/Untranslated/Db_autobackups.txt
+++ b/langpacks/belarusian/Untranslated/Db_autobackups.txt
@@ -1,4 +1,4 @@
-[Backup file mask]
+[Backup file mask:]
[Backup profile folder]
[Use CloudFile]
[Uploading to cloud failed]
diff --git a/langpacks/bulgarian/Plugins/Db_autobackups.txt b/langpacks/bulgarian/Plugins/Db_autobackups.txt
index 9f29d786ca..7f2f294c72 100644
--- a/langpacks/bulgarian/Plugins/Db_autobackups.txt
+++ b/langpacks/bulgarian/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@
Преглед...
[Go to the "Options -> Customize -> Folders" to change settings]
Можете да промените настройките от "Персонализиране > Папки"
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
Компресиране в .zip архив
diff --git a/langpacks/bulgarian/Untranslated/Db_autobackups.txt b/langpacks/bulgarian/Untranslated/Db_autobackups.txt
index 33c2017797..7351884d6f 100644
--- a/langpacks/bulgarian/Untranslated/Db_autobackups.txt
+++ b/langpacks/bulgarian/Untranslated/Db_autobackups.txt
@@ -1,5 +1,5 @@
[Database autobackuper plugin.]
-[Backup file mask]
+[Backup file mask:]
[Backup profile folder]
[Use CloudFile]
[Uploading to cloud failed]
diff --git a/langpacks/croatian/Plugins/Db_autobackups.txt b/langpacks/croatian/Plugins/Db_autobackups.txt
index 9747543ab5..3d56b4074e 100644
--- a/langpacks/croatian/Plugins/Db_autobackups.txt
+++ b/langpacks/croatian/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
diff --git a/langpacks/croatian/Untranslated/Db_autobackups.txt b/langpacks/croatian/Untranslated/Db_autobackups.txt
index b05077eaa0..d347356a53 100644
--- a/langpacks/croatian/Untranslated/Db_autobackups.txt
+++ b/langpacks/croatian/Untranslated/Db_autobackups.txt
@@ -8,7 +8,7 @@
[Backup to folder:]
[Browse...]
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
[Backup profile folder]
[Disable progress bar]
diff --git a/langpacks/czech/Plugins/Db_autobackups.txt b/langpacks/czech/Plugins/Db_autobackups.txt
index 82a3cb8ed4..af344682df 100644
--- a/langpacks/czech/Plugins/Db_autobackups.txt
+++ b/langpacks/czech/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@ Složka pro zálohování profilů:
Procházet...
[Go to the "Options -> Customize -> Folders" to change settings]
Nastavení změníte v Možnosti -> Vlastní úpravy -> Složky
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
Komprimovat zálohu do zip-archivu
diff --git a/langpacks/czech/Untranslated/Db_autobackups.txt b/langpacks/czech/Untranslated/Db_autobackups.txt
index b8c876921c..b76c946c96 100644
--- a/langpacks/czech/Untranslated/Db_autobackups.txt
+++ b/langpacks/czech/Untranslated/Db_autobackups.txt
@@ -1,2 +1,2 @@
-[Backup file mask]
+[Backup file mask:]
[Uploading to cloud failed]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index 0c4606f4dd..1e4bc7715d 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -16,7 +16,7 @@
[Backup to folder:]
[Browse...]
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
[Backup profile folder]
[Disable progress bar]
diff --git a/langpacks/french/Plugins/Db_autobackups.txt b/langpacks/french/Plugins/Db_autobackups.txt
index 7316d6f224..2ad0f7c8d1 100644
--- a/langpacks/french/Plugins/Db_autobackups.txt
+++ b/langpacks/french/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@ Dossier de sauvegarde :
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
diff --git a/langpacks/french/Untranslated/Db_autobackups.txt b/langpacks/french/Untranslated/Db_autobackups.txt
index 693c58b4aa..eab9b256e1 100644
--- a/langpacks/french/Untranslated/Db_autobackups.txt
+++ b/langpacks/french/Untranslated/Db_autobackups.txt
@@ -1,7 +1,7 @@
[Database autobackuper plugin.]
[Browse...]
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
[Backup profile folder]
[Disable popups]
diff --git a/langpacks/german/Plugins/Db_autobackups.txt b/langpacks/german/Plugins/Db_autobackups.txt
index 541d10f240..34188aaa84 100644
--- a/langpacks/german/Plugins/Db_autobackups.txt
+++ b/langpacks/german/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@ Ordner für Sicherungen:
Durchsuchen...
[Go to the "Options -> Customize -> Folders" to change settings]
Gehen Sie zu Customize -> Verzeichnisse, um die Einstellungen zu ändern.
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
Sicherungen in Zip-Archiven komprimieren
diff --git a/langpacks/german/Untranslated/Db_autobackups.txt b/langpacks/german/Untranslated/Db_autobackups.txt
index bfbe8554b3..648e6f872d 100644
--- a/langpacks/german/Untranslated/Db_autobackups.txt
+++ b/langpacks/german/Untranslated/Db_autobackups.txt
@@ -1 +1 @@
-[Backup file mask]
+[Backup file mask:]
diff --git a/langpacks/polish/Plugins/Db_autobackups.txt b/langpacks/polish/Plugins/Db_autobackups.txt
index 9a4551395d..6b99295ecf 100644
--- a/langpacks/polish/Plugins/Db_autobackups.txt
+++ b/langpacks/polish/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@ Zapisuj kopię do folderu:
Przeglądaj...
[Go to the "Options -> Customize -> Folders" to change settings]
Idź do Opcje -> Personalizacja -> Foldery aby zmienić ustawienia
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
Kompresuj kopię do archiwum zip
diff --git a/langpacks/polish/Untranslated/Db_autobackups.txt b/langpacks/polish/Untranslated/Db_autobackups.txt
index bfbe8554b3..648e6f872d 100644
--- a/langpacks/polish/Untranslated/Db_autobackups.txt
+++ b/langpacks/polish/Untranslated/Db_autobackups.txt
@@ -1 +1 @@
-[Backup file mask]
+[Backup file mask:]
diff --git a/langpacks/russian/Plugins/Db_autobackups.txt b/langpacks/russian/Plugins/Db_autobackups.txt
index c981f9c461..4fd5c4095e 100644
--- a/langpacks/russian/Plugins/Db_autobackups.txt
+++ b/langpacks/russian/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@
Обзор...
[Go to the "Options -> Customize -> Folders" to change settings]
Перейти в раздел "Тонкая настройка -> Папки"
-[Backup file mask]
+[Backup file mask:]
Маска имени файла:
[Compress backup to zip-archive]
Сжать резервную копию в zip-архив
diff --git a/langpacks/serbian/Plugins/Db_autobackups.txt b/langpacks/serbian/Plugins/Db_autobackups.txt
index b8bc41919a..b241b242c8 100644
--- a/langpacks/serbian/Plugins/Db_autobackups.txt
+++ b/langpacks/serbian/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
diff --git a/langpacks/serbian/Untranslated/Db_autobackups.txt b/langpacks/serbian/Untranslated/Db_autobackups.txt
index e996d05515..ed3005f651 100644
--- a/langpacks/serbian/Untranslated/Db_autobackups.txt
+++ b/langpacks/serbian/Untranslated/Db_autobackups.txt
@@ -8,7 +8,7 @@
[Backup to folder:]
[Browse...]
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
[Backup profile folder]
[Disable progress bar]
diff --git a/langpacks/spanish/Plugins/Db_autobackups.txt b/langpacks/spanish/Plugins/Db_autobackups.txt
index d5fc785ef2..dfd52013dc 100644
--- a/langpacks/spanish/Plugins/Db_autobackups.txt
+++ b/langpacks/spanish/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@ Desabilitado
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
diff --git a/langpacks/spanish/Untranslated/Db_autobackups.txt b/langpacks/spanish/Untranslated/Db_autobackups.txt
index 1a73914961..b613dd0490 100644
--- a/langpacks/spanish/Untranslated/Db_autobackups.txt
+++ b/langpacks/spanish/Untranslated/Db_autobackups.txt
@@ -7,7 +7,7 @@
[Backup to folder:]
[Browse...]
[Go to the "Options -> Customize -> Folders" to change settings]
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
[Backup profile folder]
[Disable progress bar]
diff --git a/langpacks/ukrainian/Plugins/Db_autobackups.txt b/langpacks/ukrainian/Plugins/Db_autobackups.txt
index 51d2faba71..f970240a26 100644
--- a/langpacks/ukrainian/Plugins/Db_autobackups.txt
+++ b/langpacks/ukrainian/Plugins/Db_autobackups.txt
@@ -26,7 +26,7 @@
Огляд...
[Go to the "Options -> Customize -> Folders" to change settings]
Відкрийте "Тонке налаштування -> Папки" для зміни налаштувань
-[Backup file mask]
+[Backup file mask:]
[Compress backup to zip-archive]
Стиснути резервну копію в zip-архів
diff --git a/langpacks/ukrainian/Untranslated/Db_autobackups.txt b/langpacks/ukrainian/Untranslated/Db_autobackups.txt
index b8c876921c..b76c946c96 100644
--- a/langpacks/ukrainian/Untranslated/Db_autobackups.txt
+++ b/langpacks/ukrainian/Untranslated/Db_autobackups.txt
@@ -1,2 +1,2 @@
-[Backup file mask]
+[Backup file mask:]
[Uploading to cloud failed]
diff --git a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_Mobile.ico b/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_Mobile.ico
deleted file mode 100644
index 50722b8194..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_Mobile.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_WebAgent.ico b/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_WebAgent.ico
deleted file mode 100644
index df08dc0959..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_WebAgent.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_official.ico b/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_official.ico
deleted file mode 100644
index 21d195d36a..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_official.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_unknown.ico b/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_unknown.ico
deleted file mode 100644
index 5f16aa20a1..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Mail.Ru/Mail.Ru_unknown.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_MRA.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_MRA.ico
deleted file mode 100644
index 5d9c14902a..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_MRA.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index eb0bd7e709..079622dd68 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -494,10 +494,6 @@ IDI_MSN ICON "MSN\\MSN v8.x.ico"
IDI_WEBMESSENGER ICON "MSN\\WebMessenger.ico"
IDI_WLM_9 ICON "MSN\\wlm9.ico"
IDI_WLM_10 ICON "MSN\\WLM10-11.ico"
-IDI_MAIL_RU_MOBILE ICON "Mail.Ru\\Mail.Ru_Mobile.ico"
-IDI_MAIL_RU_OFFICIAL ICON "Mail.Ru\\Mail.Ru_official.ico"
-IDI_MAIL_RU_UNKNOWN ICON "Mail.Ru\\Mail.Ru_unknown.ico"
-IDI_MAIL_RU_WEBAGENT ICON "Mail.Ru\\Mail.Ru_WebAgent.ico"
IDI_GG ICON "GG\\Gadu-Gadu.ico"
IDI_GG8_OVERLAY ICON "GG\\overlay_GG_v8.ico"
IDI_GG9_OVERLAY ICON "GG\\overlay_GG_v9.ico"
@@ -536,7 +532,6 @@ IDI_ICQJ_PLUS_OVERLAY ICON "overlays\\overlay_proto_ICQJ_Pl
IDI_IRC_OVERLAY ICON "overlays\\overlay_proto_IRC.ico"
IDI_JABBER_OVERLAY ICON "overlays\\overlay_proto_Jabber.ico"
IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.ico"
-IDI_MAILRU_OVERLAY ICON "overlays\\overlay_proto_MRA.ico"
IDI_MSN_OVERLAY ICON "overlays\\overlay_proto_MSN.ico"
IDI_QQ_OVERLAY ICON "overlays\\overlay_proto_QQ.ico"
IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico"
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index 700a5669f9..b1b6f94849 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -83,7 +83,6 @@ BEGIN
CONTROL "ICQ clients",IDC_GROUP_ICQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,110,120,10
CONTROL "IRC clients",IDC_GROUP_IRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10
CONTROL "Jabber clients",IDC_GROUP_JABBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,130,120,10
- CONTROL "MRA clients",IDC_GROUP_MRA,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,140,120,10
CONTROL "MSN clients",IDC_GROUP_MSN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10
CONTROL "QQ clients",IDC_GROUP_QQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10
CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index 99cad38788..46e2964cdf 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -38,11 +38,6 @@ case JABBER_CASE:
return LPGENW("Client icons") L"/" LPGENW("Jabber clients");
break;
-case MRA_CASE:
- if (g_plugin.getByte("GroupMRA", 1))
- return LPGENW("Client icons") L"/" LPGENW("MRA clients");
- break;
-
case MSN_CASE:
if (g_plugin.getByte("GroupMSN", 1))
return LPGENW("Client icons") L"/" LPGENW("MSN clients");
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index f97b0e77f3..46ea9aa2a2 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -502,16 +502,6 @@ KN_FP_MASK def_kn_fp_mask[] =
{ "client_MSN", L"|WLM*|MSN*|Windows Live*", L"MSN", IDI_MSN, MSN_CASE, TRUE },
//#########################################################################################################################################################################
- //################################# MAIL.RU ###########################################################################################################################
- //#########################################################################################################################################################################
- { "client_MRA_official", L"|magent*|Mail.ru Agent*official*"
- L"|Mail.ru Agent*PC*"
- L"|*agent.mail.ru*", LPGENW("Mail.Ru Agent (official)"), IDI_MAIL_RU_OFFICIAL, MRA_CASE, TRUE },
- { "client_MRA_Mobile", L"|MobileAgent*|Mail.ru Agent*Symbian*", L"Mail.Ru Mobile Agent", IDI_MAIL_RU_MOBILE, MRA_CASE, TRUE },
- { "client_MRA_web", L"|webagent*|*Web Agent*", L"Mail.Ru Web Agent", IDI_MAIL_RU_WEBAGENT, MRA_CASE, TRUE },
- { "client_MRA_unknown", L"|Mail.ru Agent*|MRA client", LPGENW("Mail.Ru (unknown client)"), IDI_MAIL_RU_UNKNOWN, MRA_CASE },
-
- //#########################################################################################################################################################################
//################################# WEATHER ###########################################################################################################################
//#########################################################################################################################################################################
{ "client_accu", L"*accuweather*", L"AccuWeather", IDI_ACCU, WEATHER_CASE, TRUE },
@@ -667,9 +657,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{ "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_MSN_overlay", L"|^MSN*|*Miranda*MSN*", LPGENW("MSN overlay"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_QQ_overlay", L"|Miranda*QQ*|MIM*QQ*", LPGENW("QQ overlay"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE },
- { "client_MRA_overlay", L"|^MRA*|^Mail.ru*"
- L"|*MRA*|*Mail.ru*IM*|Mrim*"
- L"|*DRQZ00fz5WPn1gH+*|*nxthUwJANorB6+*|ICQ client", LPGENW("Mail.Ru Agent overlay"), IDI_MAILRU_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_VK_overlay", L"|Miranda*VKontakte*", LPGENW("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_Skype_overlay", L"|Miranda*Skype*", LPGENW("Skype overlay"), IDI_SKYPE_OVERLAY, OVERLAYS_PROTO_CASE },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index 223157e8e0..05194cb4df 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -37,7 +37,6 @@ static settings[] =
{ IDC_GROUP_ICQ, TRUE, "GroupICQ" },
{ IDC_GROUP_IRC, TRUE, "GroupIRC" },
{ IDC_GROUP_JABBER, TRUE, "GroupJabber" },
- { IDC_GROUP_MRA, TRUE, "GroupMRA" },
{ IDC_GROUP_MSN, TRUE, "GroupMSN" },
{ IDC_GROUP_QQ, TRUE, "GroupQQ" },
{ IDC_GROUP_RSS, TRUE, "GroupRSS" },
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index e54b1ac4db..3f77658cb8 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -60,7 +60,6 @@
#define IDI_IRC_OVERLAY 82
#define IDI_JABBER_OVERLAY 83
#define IDI_JGTALK_OVERLAY 84
-#define IDI_MAILRU_OVERLAY 85
#define IDI_MSN_OVERLAY 86
#define IDI_QQ_OVERLAY 87
#define IDI_VK_OVERLAY 90
@@ -393,10 +392,6 @@
#define IDI_YAONLINE 607
#define IDI_YAXIM 608
#define IDI_OPENFIRE 609
-#define IDI_MAIL_RU_MOBILE 701
-#define IDI_MAIL_RU_OFFICIAL 702
-#define IDI_MAIL_RU_UNKNOWN 703
-#define IDI_MAIL_RU_WEBAGENT 704
#define IDI_GG 724
#define IDI_GG8_OVERLAY 725
#define IDI_GG9_OVERLAY 726
@@ -571,7 +566,6 @@
#define IDC_GROUP_IRC 10033
#define IDC_GROUP_JABBER 10034
#define IDC_GROUP_MSN 10035
-#define IDC_GROUP_MRA 10036
#define IDC_GROUP_QQ 10037
#define IDC_GROUP_RSS 10038
#define IDC_GROUP_WEATHER 10040
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index 16a45fb4a8..8b5a28b62e 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -81,7 +81,6 @@ struct FOUNDINFO
#define ICQ_CASE 3008 // ICQ clients
#define IRC_CASE 3009 // IRC clients
#define JABBER_CASE 3010 // Jabber clients
-#define MRA_CASE 3011 // Mail.Ru Agent clients
#define MSN_CASE 3012 // MSN clients
#define QQ_CASE 3013 // QQ clients (+ versions)
#define RSS_CASE 3014 // RSS clients