Unify icon names

3 files changed, 32 insertions, 32 deletions

diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 546374c9b1..d3b03fb516 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -27,22 +27,22 @@ GlobalMessageData g_dat;
 

 static IconItem iconList1[] =

 {

-	{ LPGEN("Add contact"),               "ADD",           IDI_ADDCONTACT  }, //  1

-	{ LPGEN("User's details"),            "USERDETAILS",   IDI_USERDETAILS }, //  2

-	{ LPGEN("User's history"),            "HISTORY",       IDI_HISTORY     }, //  3

-	{ LPGEN("Send message"),              "SEND",          IDI_SEND        }, //  4

-	{ LPGEN("Smiley button"),             "SMILEY",        IDI_SMILEY      }, //  5

-	{ LPGEN("User is typing"),            "TYPING",        IDI_TYPING      }, //  6

-	{ LPGEN("Typing notification off"),   "TYPINGOFF",     IDI_TYPINGOFF   }, //  7

-	{ LPGEN("Sending"),                   "DELIVERING",    IDI_TIMESTAMP   }, //  8

-	{ LPGEN("Quote button"),              "QUOTE",         IDI_QUOTE       }, //  9

-	{ LPGEN("Close button"),              "CLOSEX",        IDI_CLOSEX      }, // 10

-	{ LPGEN("Icon overlay"),              "OVERLAY",       IDI_OVERLAY     }, // 11

-	{ LPGEN("Incoming message (10x10)"),  "INCOMING",      IDI_INCOMING, 10}, // 12

-	{ LPGEN("Outgoing message (10x10)"),  "OUTGOING",      IDI_OUTGOING, 10}, // 13  

-	{ LPGEN("Notice (10x10)"),            "NOTICE",        IDI_NOTICE,   10}, // 14

-	{ LPGEN("Secure message (10x10)"),            "SECURE",        IDI_SECURE,   10}, // 15

-	{ LPGEN("Secure message (verified) (10x10)"), "STRONG",        IDI_STRONG,   10}, // 16 

+	{ LPGEN("Add contact"),                     "ADD",         IDI_ADDCONTACT  }, //  1

+	{ LPGEN("User's details"),                  "USERDETAILS", IDI_USERDETAILS }, //  2

+	{ LPGEN("User's history"),                  "HISTORY",     IDI_HISTORY     }, //  3

+	{ LPGEN("Send message"),                    "SEND",        IDI_SEND        }, //  4

+	{ LPGEN("Smiley button"),                   "SMILEY",      IDI_SMILEY      }, //  5

+	{ LPGEN("User is typing"),                  "TYPING",      IDI_TYPING      }, //  6

+	{ LPGEN("Typing notification off"),         "TYPINGOFF",   IDI_TYPINGOFF   }, //  7

+	{ LPGEN("Sending"),                         "DELIVERING",  IDI_TIMESTAMP   }, //  8

+	{ LPGEN("Quote button"),                    "QUOTE",       IDI_QUOTE       }, //  9

+	{ LPGEN("Close button"),                    "CLOSEX",      IDI_CLOSEX      }, // 10

+	{ LPGEN("Icon overlay"),                    "OVERLAY",     IDI_OVERLAY     }, // 11

+	{ LPGEN("Incoming message (10x10)"),        "INCOMING",    IDI_INCOMING, 10}, // 12

+	{ LPGEN("Outgoing message (10x10)"),        "OUTGOING",    IDI_OUTGOING, 10}, // 13  

+	{ LPGEN("Notice (10x10)"),                  "NOTICE",      IDI_NOTICE,   10}, // 14

+	{ LPGEN("Secure message (10x10)"),          "SECURE",      IDI_SECURE,   10}, // 15

+	{ LPGEN("Secure verified message (10x10)"), "STRONG",      IDI_STRONG,   10}, // 16 

 };

 

 static IconItem iconList2[] =

@@ -65,20 +65,20 @@ static IconItem iconList2[] =
 

 static IconItem iconList3[] =

 {

-	{ LPGEN("Message in (10x10)"),     "log_message_in",   IDI_INCOMING, 10}, //  1

-	{ LPGEN("Message out (10x10)"),    "log_message_out",  IDI_OUTGOING, 10}, //  2

-	{ LPGEN("Action (10x10)"),         "log_action",       IDI_ACTION,   10}, //  3

-	{ LPGEN("Add Status (10x10)"),     "log_addstatus",    IDI_ADDSTATUS,10}, //  4

-	{ LPGEN("Remove status (10x10)"),  "log_removestatus", IDI_REMSTATUS,10}, //  5

-	{ LPGEN("Join (10x10)"),           "log_join",         IDI_JOIN,     10}, //  6

-	{ LPGEN("Leave (10x10)"),          "log_part",         IDI_PART,     10}, //  7

-	{ LPGEN("Quit (10x10)"),           "log_quit",         IDI_QUIT,     10}, //  8

-	{ LPGEN("Kick (10x10)"),           "log_kick",         IDI_KICK,     10}, //  9

-	{ LPGEN("Nick change (10x10)"),     "log_nick",        IDI_NICK,     10}, // 10

+	{ LPGEN("Message in (10x10)"),     "log_message_in",   IDI_INCOMING,    10}, //  1

+	{ LPGEN("Message out (10x10)"),    "log_message_out",  IDI_OUTGOING,    10}, //  2

+	{ LPGEN("Action (10x10)"),         "log_action",       IDI_ACTION,      10}, //  3

+	{ LPGEN("Add Status (10x10)"),     "log_addstatus",    IDI_ADDSTATUS,   10}, //  4

+	{ LPGEN("Remove status (10x10)"),  "log_removestatus", IDI_REMSTATUS,   10}, //  5

+	{ LPGEN("Join (10x10)"),           "log_join",         IDI_JOIN,        10}, //  6

+	{ LPGEN("Leave (10x10)"),          "log_part",         IDI_PART,        10}, //  7

+	{ LPGEN("Quit (10x10)"),           "log_quit",         IDI_QUIT,        10}, //  8

+	{ LPGEN("Kick (10x10)"),           "log_kick",         IDI_KICK,        10}, //  9

+	{ LPGEN("Nick change (10x10)"),     "log_nick",        IDI_NICK,        10}, // 10

 	{ LPGEN("Notice (10x10)"),         "log_notice",       IDI_CHAT_NOTICE, 10}, // 11

-	{ LPGEN("Topic (10x10)"),          "log_topic",        IDI_TOPIC,    10}, // 12

-	{ LPGEN("Highlight (10x10)"),      "log_highlight",    IDI_NOTICE,   10}, // 13

-	{ LPGEN("Information (10x10)"),    "log_info",         IDI_INFO,     10}, // 14

+	{ LPGEN("Topic (10x10)"),          "log_topic",        IDI_TOPIC,       10}, // 12

+	{ LPGEN("Highlight (10x10)"),      "log_highlight",    IDI_NOTICE,      10}, // 13

+	{ LPGEN("Information (10x10)"),    "log_info",         IDI_INFO,        10}, // 14

 };

 

 void RegisterIcons(void)

diff --git a/plugins/TabSRMM/TabSRMM_icons/resource.h b/plugins/TabSRMM/TabSRMM_icons/resource.h
index 343e6f2ead..77c3886dd3 100644
--- a/plugins/TabSRMM/TabSRMM_icons/resource.h
+++ b/plugins/TabSRMM/TabSRMM_icons/resource.h
@@ -34,8 +34,8 @@
 #define IDI_ICONOUT         111         /* outgoing message icon */

 #define IDI_STATUSCHANGE    112         /* status changes */

 #define IDI_MSGERROR        113         /* error message */

-#define IDI_SECURE          114         /* encrypted message */

-#define IDI_STRONG          115         /* strongly encrypted message */

+#define IDI_SECURE          114         /* secure message */

+#define IDI_STRONG          115         /* strongly secure message */

 

  // misc icons, status bar etc.

            

diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp
index ce2d585d10..28bd1946af 100644
--- a/plugins/TabSRMM/src/msgs.cpp
+++ b/plugins/TabSRMM/src/msgs.cpp
@@ -469,7 +469,7 @@ static TIconDesc _logicons[] =
 	{ "tabSRMM_out", LPGEN("Outgoing message"), &PluginConfig.g_iconOut, -IDI_ICONOUT, 0 },

 	{ "tabSRMM_status", LPGEN("Status change"), &PluginConfig.g_iconStatus, -IDI_STATUSCHANGE, 0 },

 	{ "tabSRMM_secure", LPGEN("Secure message"), &PluginConfig.g_iconSecure, -IDI_SECURE, 0 },

-	{ "tabSRMM_strong", LPGEN("Secure message (verified)"), &PluginConfig.g_iconStrong, -IDI_STRONG, 0 },

+	{ "tabSRMM_strong", LPGEN("Secure verified message"), &PluginConfig.g_iconStrong, -IDI_STRONG, 0 },

 };

 

 static TIconDesc _deficons[] =