langpacks: update

12 files changed, 0 insertions, 32 deletions

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