summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--plugins/Clist_ng/SRC/clui.cpp6
-rw-r--r--plugins/Clist_nicer/src/clui.cpp6
-rw-r--r--plugins/FingerprintNG/src/finger_groups.h50
-rw-r--r--plugins/NewAwaySysMod/src/AwaySys.cpp18
-rw-r--r--plugins/Popup/src/opt_skins.cpp2
-rw-r--r--plugins/Scriver/src/chat/main.cpp2
-rw-r--r--plugins/SecureIM/src/loadicons.cpp36
-rw-r--r--plugins/SpellChecker/src/spellchecker.cpp2
-rw-r--r--plugins/TabSRMM/src/chat/main.cpp2
-rw-r--r--plugins/TabSRMM/src/chat/options.cpp56
-rw-r--r--plugins/TrafficCounter/src/options.cpp18
-rw-r--r--protocols/JabberG/src/jabber_xstatus.cpp4
-rw-r--r--protocols/MRA/src/MraIcons.cpp2
-rw-r--r--protocols/Xfire/src/main.cpp18
14 files changed, 111 insertions, 111 deletions
diff --git a/plugins/Clist_ng/SRC/clui.cpp b/plugins/Clist_ng/SRC/clui.cpp
index 500a0af195..a5a9409c7a 100644
--- a/plugins/Clist_ng/SRC/clui.cpp
+++ b/plugins/Clist_ng/SRC/clui.cpp
@@ -326,13 +326,13 @@ static void CacheClientIcons()
static void InitIcoLib()
{
- Icon_RegisterT(g_hInst, LPGENT("Contact list")_T("/")LPGENT("Default"),myIcons, _countof(myIcons));
+ Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Default"), myIcons, _countof(myIcons));
for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) {
char szBuffer[128];
mir_snprintf(szBuffer, _countof(szBuffer), "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE));
IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };
- Icon_RegisterT(g_hInst, LPGENT("Contact list")_T("/")LPGENT("Overlay icons"), &icon, 1);
+ Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Overlay icons"), &icon, 1);
}
PROTOACCOUNT **accs = NULL;
@@ -345,7 +345,7 @@ static void InitIcoLib()
TCHAR szDescr[128];
mir_sntprintf(szDescr, _countof(szDescr), TranslateT("%s connecting"), accs[k]->tszAccountName);
IconItemT icon = { szDescr, "conn", IDI_PROTOCONNECTING };
- Icon_RegisterT(g_hInst, LPGENT("Contact list")_T("/")LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName);
+ Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName);
}
}
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index ec0cf9dc97..59a506a4f1 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -253,13 +253,13 @@ static void CacheClientIcons()
static void InitIcoLib()
{
- Icon_Register(g_hInst, LPGEN("Contact list")"/"LPGEN("Default"), myIcons, _countof(myIcons));
+ Icon_Register(g_hInst, LPGEN("Contact list") "/" LPGEN("Default"), myIcons, _countof(myIcons));
for (int i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) {
char szBuffer[128];
mir_snprintf(szBuffer, _countof(szBuffer), "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE));
IconItemT icon = { pcli->pfnGetStatusModeDescription(ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE), 0), szBuffer, i };
- Icon_RegisterT(g_hInst, LPGENT("Contact list")_T("/")LPGENT("Overlay icons"), &icon, 1);
+ Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Overlay icons"), &icon, 1);
}
PROTOACCOUNT **accs = NULL;
@@ -272,7 +272,7 @@ static void InitIcoLib()
TCHAR szDescr[128];
mir_sntprintf(szDescr, _countof(szDescr), TranslateT("%s connecting"), accs[k]->tszAccountName);
IconItemT icon = { szDescr, "conn", IDI_PROTOCONNECTING };
- Icon_RegisterT(g_hInst, LPGENT("Contact list")_T("/")LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName);
+ Icon_RegisterT(g_hInst, LPGENT("Contact list") _T("/") LPGENT("Connecting icons"), &icon, 1, accs[k]->szModuleName);
}
}
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index 8fcc64c38e..1df6b7f92c 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -1,126 +1,126 @@
case MIRANDA_CASE:
if (db_get_b(NULL, MODULENAME, "GroupMiranda", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Miranda clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Miranda clients");
break;
case MIRANDA_VERSION_CASE:
if (db_get_b(NULL, MODULENAME, "GroupMirandaVersion", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Miranda clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Miranda clients");
break;
case MIRANDA_PACKS_CASE:
if (db_get_b(NULL, MODULENAME, "GroupMirandaPacks", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Miranda clients")_T("/")LPGENT("Pack overlays");
+ return LPGENT("Client icons") _T("/") LPGENT("Miranda clients") _T("/") LPGENT("Pack overlays");
break;
case MULTI_CASE:
if (db_get_b(NULL, MODULENAME, "GroupMulti", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Multi-proto clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Multi-proto clients");
break;
case AIM_CASE:
if (db_get_b(NULL, MODULENAME, "GroupAIM", 1))
- return LPGENT("Client icons")_T("/")LPGENT("AIM clients");
+ return LPGENT("Client icons") _T("/") LPGENT("AIM clients");
break;
case GG_CASE:
if (db_get_b(NULL, MODULENAME, "GroupGG", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Gadu-Gadu clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Gadu-Gadu clients");
break;
case ICQ_CASE:
if (db_get_b(NULL, MODULENAME, "GroupICQ", 1))
- return LPGENT("Client icons")_T("/")LPGENT("ICQ clients");
+ return LPGENT("Client icons") _T("/") LPGENT("ICQ clients");
break;
case IRC_CASE:
if (db_get_b(NULL, MODULENAME, "GroupIRC", 1))
- return LPGENT("Client icons")_T("/")LPGENT("IRC clients");
+ return LPGENT("Client icons") _T("/") LPGENT("IRC clients");
break;
case JABBER_CASE:
if (db_get_b(NULL, MODULENAME, "GroupJabber", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Jabber clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Jabber clients");
break;
case MRA_CASE:
if (db_get_b(NULL, MODULENAME, "GroupMRA", 1))
- return LPGENT("Client icons")_T("/")LPGENT("MRA clients");
+ return LPGENT("Client icons") _T("/") LPGENT("MRA clients");
break;
case MSN_CASE:
if (db_get_b(NULL, MODULENAME, "GroupMSN", 1))
- return LPGENT("Client icons")_T("/")LPGENT("MSN clients");
+ return LPGENT("Client icons") _T("/") LPGENT("MSN clients");
break;
case QQ_CASE:
if (db_get_b(NULL, MODULENAME, "GroupQQ", 1))
- return LPGENT("Client icons")_T("/")LPGENT("QQ clients");
+ return LPGENT("Client icons") _T("/") LPGENT("QQ clients");
break;
case RSS_CASE:
if (db_get_b(NULL, MODULENAME, "GroupRSS", 1))
- return LPGENT("Client icons")_T("/")LPGENT("RSS clients");
+ return LPGENT("Client icons") _T("/") LPGENT("RSS clients");
break;
case TLEN_CASE:
if (db_get_b(NULL, MODULENAME, "GroupTlen", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Tlen clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Tlen clients");
break;
case WEATHER_CASE:
if (db_get_b(NULL, MODULENAME, "GroupWeather", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Weather clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Weather clients");
break;
case YAHOO_CASE:
if (db_get_b(NULL, MODULENAME, "GroupYahoo", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Yahoo clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Yahoo clients");
break;
case FACEBOOK_CASE:
if (db_get_b(NULL, MODULENAME, "GroupFacebook", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Facebook clients");
+ return LPGENT("Client icons") _T("/") LPGENT("Facebook clients");
break;
case VK_CASE:
if (db_get_b(NULL, MODULENAME, "GroupVK", 1))
- return LPGENT("Client icons")_T("/")LPGENT("VKontakte clients");
+ return LPGENT("Client icons") _T("/") LPGENT("VKontakte clients");
break;
case OTHER_PROTOS_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOtherProtos", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Other protocols");
+ return LPGENT("Client icons") _T("/") LPGENT("Other protocols");
break;
case OTHERS_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOthers", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Other icons");
+ return LPGENT("Client icons") _T("/") LPGENT("Other icons");
break;
case OVERLAYS_RESOURCE_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOverlaysResource", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Resource");
+ return LPGENT("Client icons") _T("/") LPGENT("Overlays") _T("/") LPGENT("Resource");
break;
case OVERLAYS_PLATFORM_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOverlaysPlatform", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Platform");
+ return LPGENT("Client icons") _T("/") LPGENT("Overlays") _T("/") LPGENT("Platform");
break;
case OVERLAYS_UNICODE_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOverlaysUnicode", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Platform");
+ return LPGENT("Client icons") _T("/") LPGENT("Overlays") _T("/") LPGENT("Platform");
break;
case OVERLAYS_SECURITY_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOverlaysSecurity", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Security");
+ return LPGENT("Client icons") _T("/") LPGENT("Overlays") _T("/") LPGENT("Security");
break;
case OVERLAYS_PROTO_CASE:
if (db_get_b(NULL, MODULENAME, "GroupOverlaysProtos", 1))
- return LPGENT("Client icons")_T("/")LPGENT("Overlays")_T("/")LPGENT("Protocol");
+ return LPGENT("Client icons") _T("/") LPGENT("Overlays") _T("/") LPGENT("Protocol");
break;
default:
diff --git a/plugins/NewAwaySysMod/src/AwaySys.cpp b/plugins/NewAwaySysMod/src/AwaySys.cpp
index db811ac233..39fd513119 100644
--- a/plugins/NewAwaySysMod/src/AwaySys.cpp
+++ b/plugins/NewAwaySysMod/src/AwaySys.cpp
@@ -453,15 +453,15 @@ struct
}
static Variables[] =
{
- { VAR_AWAYSINCE_TIME, LPGEN("New Away System")"\t(x)\t"LPGEN("Away since time in default format; ?nas_awaysince_time(x) in format x"), TRF_FIELD | TRF_FUNCTION },
- { VAR_AWAYSINCE_DATE, LPGEN("New Away System")"\t(x)\t"LPGEN("Away since date in default format; ?nas_awaysince_date(x) in format x"), TRF_FIELD | TRF_FUNCTION },
- { VAR_STATDESC, LPGEN("New Away System")"\t"LPGEN("Status description"), TRF_FIELD | TRF_FUNCTION },
- { VAR_MYNICK, LPGEN("New Away System")"\t"LPGEN("Your nick for current protocol"), TRF_FIELD | TRF_FUNCTION },
- { VAR_REQUESTCOUNT, LPGEN("New Away System")"\t"LPGEN("Number of status message requests from the contact"), TRF_FIELD | TRF_FUNCTION },
- { VAR_MESSAGENUM, LPGEN("New Away System")"\t"LPGEN("Number of messages from the contact"), TRF_FIELD | TRF_FUNCTION },
- { VAR_TIMEPASSED, LPGEN("New Away System")"\t"LPGEN("Time passed until request"), TRF_FIELD | TRF_FUNCTION },
- { VAR_PREDEFINEDMESSAGE, LPGEN("New Away System")"\t(x)\t"LPGEN("Returns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)"), TRF_FUNCTION },
- { VAR_PROTOCOL, LPGEN("New Away System")"\t"LPGEN("Current protocol name"), TRF_FIELD | TRF_FUNCTION }
+ { VAR_AWAYSINCE_TIME, LPGEN("New Away System") "\t(x)\t" LPGEN("Away since time in default format; ?nas_awaysince_time(x) in format x"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_AWAYSINCE_DATE, LPGEN("New Away System") "\t(x)\t" LPGEN("Away since date in default format; ?nas_awaysince_date(x) in format x"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_STATDESC, LPGEN("New Away System") "\t" LPGEN("Status description"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_MYNICK, LPGEN("New Away System") "\t" LPGEN("Your nick for current protocol"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_REQUESTCOUNT, LPGEN("New Away System") "\t" LPGEN("Number of status message requests from the contact"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_MESSAGENUM, LPGEN("New Away System") "\t" LPGEN("Number of messages from the contact"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_TIMEPASSED, LPGEN("New Away System") "\t" LPGEN("Time passed until request"), TRF_FIELD | TRF_FUNCTION },
+ { VAR_PREDEFINEDMESSAGE, LPGEN("New Away System") "\t(x)\t" LPGEN("Returns one of your predefined messages by its title: ?nas_predefinedmessage(creepy)"), TRF_FUNCTION },
+ { VAR_PROTOCOL, LPGEN("New Away System") "\t" LPGEN("Current protocol name"), TRF_FIELD | TRF_FUNCTION }
};
INT_PTR srvVariablesHandler(WPARAM, LPARAM lParam)
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp
index 92b43c4892..a2d2fe4a30 100644
--- a/plugins/Popup/src/opt_skins.cpp
+++ b/plugins/Popup/src/opt_skins.cpp
@@ -203,7 +203,7 @@ int SkinOptionList_AddSkin(OPTTREE_OPTION* &options, int *OptionsCount, int pos
static LPTSTR mainOption[] = {
LPGENT("Show clock"),
LPGENT("Drop shadow effect"),
- LPGENT("Drop shadow effect")_T("/")LPGENT("non rectangular"),
+ LPGENT("Drop shadow effect") _T("/") LPGENT("non rectangular"),
LPGENT("Enable Aero Glass (Vista+)"),
LPGENT("Use Windows colors"),
LPGENT("Use advanced text render") };
diff --git a/plugins/Scriver/src/chat/main.cpp b/plugins/Scriver/src/chat/main.cpp
index a96facf35f..f3aba794c7 100644
--- a/plugins/Scriver/src/chat/main.cpp
+++ b/plugins/Scriver/src/chat/main.cpp
@@ -154,7 +154,7 @@ static void OnLoadSettings()
int Chat_Load()
{
- CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Messaging")_T("/")LPGENT("Group chats"), FONTMODE_SKIP };
+ CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Messaging") _T("/") LPGENT("Group chats"), FONTMODE_SKIP };
mir_getCI(&data);
saveCI = *pci;
diff --git a/plugins/SecureIM/src/loadicons.cpp b/plugins/SecureIM/src/loadicons.cpp
index d13a3a746e..a36986d8d9 100644
--- a/plugins/SecureIM/src/loadicons.cpp
+++ b/plugins/SecureIM/src/loadicons.cpp
@@ -12,34 +12,34 @@ struct
static icons[] =
{
// Contact List
- { IDI_CL_DIS, TBL_IEC, IEC_CL_DIS, MODULENAME"/"LPGEN("Contact List"), "sim_cl_dis", LPGEN("Connection Disabled") },
- { IDI_CL_EST, TBL_IEC, IEC_CL_EST, MODULENAME"/"LPGEN("Contact List"), "sim_cl_est", LPGEN("Connection Established") },
+ { IDI_CL_DIS, TBL_IEC, IEC_CL_DIS, MODULENAME "/" LPGEN("Contact List"), "sim_cl_dis", LPGEN("Connection Disabled") },
+ { IDI_CL_EST, TBL_IEC, IEC_CL_EST, MODULENAME "/" LPGEN("Contact List"), "sim_cl_est", LPGEN("Connection Established") },
// Contact Menu
- { IDI_CM_DIS, TBL_ICO, ICO_CM_DIS, MODULENAME"/"LPGEN("Contact Menu"), "sim_cm_dis", LPGEN("Disable Secure Connection") },
- { IDI_CM_EST, TBL_ICO, ICO_CM_EST, MODULENAME"/"LPGEN("Contact Menu"), "sim_cm_est", LPGEN("Establish Secure Connection") },
+ { IDI_CM_DIS, TBL_ICO, ICO_CM_DIS, MODULENAME "/" LPGEN("Contact Menu"), "sim_cm_dis", LPGEN("Disable Secure Connection") },
+ { IDI_CM_EST, TBL_ICO, ICO_CM_EST, MODULENAME "/" LPGEN("Contact Menu"), "sim_cm_est", LPGEN("Establish Secure Connection") },
// Message Window
- { IDI_MW_DIS, TBL_ICO, ICO_MW_DIS, MODULENAME"/"LPGEN("Message Window"), "sim_mw_dis", LPGEN("Connection Disabled") },
- { IDI_MW_EST, TBL_ICO, ICO_MW_EST, MODULENAME"/"LPGEN("Message Window"), "sim_mw_est", LPGEN("Connection Established") },
+ { IDI_MW_DIS, TBL_ICO, ICO_MW_DIS, MODULENAME "/" LPGEN("Message Window"), "sim_mw_dis", LPGEN("Connection Disabled") },
+ { IDI_MW_EST, TBL_ICO, ICO_MW_EST, MODULENAME "/" LPGEN("Message Window"), "sim_mw_est", LPGEN("Connection Established") },
// popup's
- { IDI_PU_DIS, TBL_POP, POP_PU_DIS, MODULENAME"/"LPGEN("Popups"), "sim_pu_dis", LPGEN("Secure Connection Disabled") },
- { IDI_PU_EST, TBL_POP, POP_PU_EST, MODULENAME"/"LPGEN("Popups"), "sim_pu_est", LPGEN("Secure Connection Established") },
- { IDI_PU_PRC, TBL_POP, POP_PU_PRC, MODULENAME"/"LPGEN("Popups"), "sim_pu_prc", LPGEN("Secure Connection In Process") },
- { IDI_PU_MSG, TBL_POP, POP_PU_MSR, MODULENAME"/"LPGEN("Popups"), "sim_pu_msr", LPGEN("Recv Secured Message") },
- { IDI_PU_MSG, TBL_POP, POP_PU_MSS, MODULENAME"/"LPGEN("Popups"), "sim_pu_mss", LPGEN("Sent Secured Message") },
+ { IDI_PU_DIS, TBL_POP, POP_PU_DIS, MODULENAME "/" LPGEN("Popups"), "sim_pu_dis", LPGEN("Secure Connection Disabled") },
+ { IDI_PU_EST, TBL_POP, POP_PU_EST, MODULENAME "/" LPGEN("Popups"), "sim_pu_est", LPGEN("Secure Connection Established") },
+ { IDI_PU_PRC, TBL_POP, POP_PU_PRC, MODULENAME "/" LPGEN("Popups"), "sim_pu_prc", LPGEN("Secure Connection In Process") },
+ { IDI_PU_MSG, TBL_POP, POP_PU_MSR, MODULENAME "/" LPGEN("Popups"), "sim_pu_msr", LPGEN("Recv Secured Message") },
+ { IDI_PU_MSG, TBL_POP, POP_PU_MSS, MODULENAME "/" LPGEN("Popups"), "sim_pu_mss", LPGEN("Sent Secured Message") },
// statuses
- { IDI_ST_DIS, TBL_ICO, ICO_ST_DIS, MODULENAME"/"LPGEN("Menu State"), "sim_st_dis", LPGEN("Disabled") },
- { IDI_ST_ENA, TBL_ICO, ICO_ST_ENA, MODULENAME"/"LPGEN("Menu State"), "sim_st_ena", LPGEN("Enabled") },
- { IDI_ST_TRY, TBL_ICO, ICO_ST_TRY, MODULENAME"/"LPGEN("Menu State"), "sim_st_try", LPGEN("Always Try") },
+ { IDI_ST_DIS, TBL_ICO, ICO_ST_DIS, MODULENAME "/" LPGEN("Menu State"), "sim_st_dis", LPGEN("Disabled") },
+ { IDI_ST_ENA, TBL_ICO, ICO_ST_ENA, MODULENAME "/" LPGEN("Menu State"), "sim_st_ena", LPGEN("Enabled") },
+ { IDI_ST_TRY, TBL_ICO, ICO_ST_TRY, MODULENAME "/" LPGEN("Menu State"), "sim_st_try", LPGEN("Always Try") },
// overlay
- { IDI_OV_NAT, TBL_ICO, ICO_OV_NAT, MODULENAME"/"LPGEN("Overlays"), "sim_ov_nat", LPGEN("Native mode") },
- { IDI_OV_PGP, TBL_ICO, ICO_OV_PGP, MODULENAME"/"LPGEN("Overlays"), "sim_ov_pgp", LPGEN("PGP mode") },
- { IDI_OV_GPG, TBL_ICO, ICO_OV_GPG, MODULENAME"/"LPGEN("Overlays"), "sim_ov_gpg", LPGEN("GPG mode") },
- { IDI_OV_RSA, TBL_ICO, ICO_OV_RSA, MODULENAME"/"LPGEN("Overlays"), "sim_ov_rsa", LPGEN("RSA/AES mode") },
+ { IDI_OV_NAT, TBL_ICO, ICO_OV_NAT, MODULENAME "/" LPGEN("Overlays"), "sim_ov_nat", LPGEN("Native mode") },
+ { IDI_OV_PGP, TBL_ICO, ICO_OV_PGP, MODULENAME "/" LPGEN("Overlays"), "sim_ov_pgp", LPGEN("PGP mode") },
+ { IDI_OV_GPG, TBL_ICO, ICO_OV_GPG, MODULENAME "/" LPGEN("Overlays"), "sim_ov_gpg", LPGEN("GPG mode") },
+ { IDI_OV_RSA, TBL_ICO, ICO_OV_RSA, MODULENAME "/" LPGEN("Overlays"), "sim_ov_rsa", LPGEN("RSA/AES mode") },
};
HINSTANCE LoadIconsPack(const char* szIconsPack)
diff --git a/plugins/SpellChecker/src/spellchecker.cpp b/plugins/SpellChecker/src/spellchecker.cpp
index 80d2a599ad..69f26fee80 100644
--- a/plugins/SpellChecker/src/spellchecker.cpp
+++ b/plugins/SpellChecker/src/spellchecker.cpp
@@ -143,7 +143,7 @@ static int ModulesLoaded(WPARAM, LPARAM)
SKINICONDESC sid = { 0 };
sid.flags = SIDF_ALL_TCHAR | SIDF_SORTED;
- sid.section.t = LPGENT("Spell Checker")_T("/")LPGENT("Flags");
+ sid.section.t = LPGENT("Spell Checker") _T("/") LPGENT("Flags");
// Get language flags
for (int i = 0; i < languages.getCount(); i++) {
diff --git a/plugins/TabSRMM/src/chat/main.cpp b/plugins/TabSRMM/src/chat/main.cpp
index 2831e517d7..5b077eda95 100644
--- a/plugins/TabSRMM/src/chat/main.cpp
+++ b/plugins/TabSRMM/src/chat/main.cpp
@@ -266,7 +266,7 @@ int Chat_Load()
{
CheckUpdate();
- CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), FONTMODE_ALTER };
+ CHAT_MANAGER_INITDATA data = { &g_Settings, sizeof(MODULEINFO), sizeof(SESSION_INFO), LPGENT("Message Sessions") _T("/") LPGENT("Group chats"), FONTMODE_ALTER };
mir_getCI(&data);
saveCI = *pci;
pci->OnCreateModule = OnCreateModule;
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 2debcdbdc2..45e7c0bd19 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -60,32 +60,32 @@ struct ColorOptionsList
static ColorOptionsList _clrs[] = {
{ 0, LPGENT("Message Sessions"), LPGENT("Input area background"), "inputbg", SRMSGDEFSET_BKGCOLOUR },
{ 1, LPGENT("Message Sessions"), LPGENT("Log background"), SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR },
- { 0, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Outgoing background"), "outbg", SRMSGDEFSET_BKGOUTCOLOUR },
- { 1, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Incoming background"), "inbg", SRMSGDEFSET_BKGINCOLOUR },
- { 2, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Status background"), "statbg", SRMSGDEFSET_BKGCOLOUR },
- { 3, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Incoming background(old)"), "oldinbg", SRMSGDEFSET_BKGINCOLOUR },
- { 4, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Outgoing background(old)"), "oldoutbg", SRMSGDEFSET_BKGOUTCOLOUR },
- { 5, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Horizontal Grid Lines"), "hgrid", RGB(224, 224, 224) },
- { 0, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), LPGENT("Panel background low"), "ipfieldsbg", 0x62caff },
- { 1, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), LPGENT("Panel background high"), "ipfieldsbgHigh", 0xf0f0f0 },
- { 0, LPGENT("Message Sessions")_T("/")LPGENT("Common colors"), LPGENT("Toolbar background high"), "tbBgHigh", 0 },
- { 1, LPGENT("Message Sessions")_T("/")LPGENT("Common colors"), LPGENT("Toolbar background low"), "tbBgLow", 0 },
- { 2, LPGENT("Message Sessions")_T("/")LPGENT("Common colors"), LPGENT("Window fill color"), "fillColor", 0 },
- { 3, LPGENT("Message Sessions")_T("/")LPGENT("Common colors"), LPGENT("Text area borders"), "cRichBorders", 0 },
- { 4, LPGENT("Message Sessions")_T("/")LPGENT("Common colors"), LPGENT("Aero glow effect"), "aeroGlow", RGB(40, 40, 255) },
- { 4, LPGENT("Message Sessions")_T("/")LPGENT("Common colors"), LPGENT("Generic text color (only when fill color is set)"), "genericTxtClr", 0xff000000 | COLOR_BTNTEXT },
+ { 0, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Outgoing background"), "outbg", SRMSGDEFSET_BKGOUTCOLOUR },
+ { 1, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Incoming background"), "inbg", SRMSGDEFSET_BKGINCOLOUR },
+ { 2, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Status background"), "statbg", SRMSGDEFSET_BKGCOLOUR },
+ { 3, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Incoming background(old)"), "oldinbg", SRMSGDEFSET_BKGINCOLOUR },
+ { 4, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Outgoing background(old)"), "oldoutbg", SRMSGDEFSET_BKGOUTCOLOUR },
+ { 5, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), LPGENT("Horizontal Grid Lines"), "hgrid", RGB(224, 224, 224) },
+ { 0, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), LPGENT("Panel background low"), "ipfieldsbg", 0x62caff },
+ { 1, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), LPGENT("Panel background high"), "ipfieldsbgHigh", 0xf0f0f0 },
+ { 0, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Toolbar background high"), "tbBgHigh", 0 },
+ { 1, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Toolbar background low"), "tbBgLow", 0 },
+ { 2, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Window fill color"), "fillColor", 0 },
+ { 3, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Text area borders"), "cRichBorders", 0 },
+ { 4, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Aero glow effect"), "aeroGlow", RGB(40, 40, 255) },
+ { 4, LPGENT("Message Sessions") _T("/") LPGENT("Common colors"), LPGENT("Generic text color (only when fill color is set)"), "genericTxtClr", 0xff000000 | COLOR_BTNTEXT },
};
static ColorOptionsList _tabclrs[] = {
- { 0, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Normal text"), "tab_txt_normal", 0xff000000 | COLOR_BTNTEXT },
- { 1, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Active text"), "tab_txt_active", 0xff000000 | COLOR_BTNTEXT },
- { 2, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Hovered text"), "tab_txt_hottrack", 0xff000000 | COLOR_HOTLIGHT },
- { 3, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Unread text"), "tab_txt_unread", 0xff000000 | COLOR_HOTLIGHT },
-
- { 4, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Normal background"), "tab_bg_normal", 0xff000000 | COLOR_3DFACE },
- { 5, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Active background"), "tab_bg_active", 0xff000000 | COLOR_3DFACE },
- { 6, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Hovered background"), "tab_bg_hottrack", 0xff000000 | COLOR_3DFACE },
- { 7, LPGENT("Message Sessions")_T("/")LPGENT("Tabs"), LPGENT("Unread background"), "tab_bg_unread", 0xff000000 | COLOR_3DFACE }
+ { 0, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Normal text"), "tab_txt_normal", 0xff000000 | COLOR_BTNTEXT },
+ { 1, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Active text"), "tab_txt_active", 0xff000000 | COLOR_BTNTEXT },
+ { 2, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Hovered text"), "tab_txt_hottrack", 0xff000000 | COLOR_HOTLIGHT },
+ { 3, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Unread text"), "tab_txt_unread", 0xff000000 | COLOR_HOTLIGHT },
+
+ { 4, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Normal background"), "tab_bg_normal", 0xff000000 | COLOR_3DFACE },
+ { 5, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Active background"), "tab_bg_active", 0xff000000 | COLOR_3DFACE },
+ { 6, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Hovered background"), "tab_bg_hottrack", 0xff000000 | COLOR_3DFACE },
+ { 7, LPGENT("Message Sessions") _T("/") LPGENT("Tabs"), LPGENT("Unread background"), "tab_bg_unread", 0xff000000 | COLOR_3DFACE }
};
extern LOGFONT lfDefault;
@@ -509,8 +509,8 @@ void RegisterFontServiceFonts()
fid.deffontsettings.charset = lf.lfCharSet;
fid.flags = fid.flags & ~FIDF_CLASSMASK | (fid.deffontsettings.style&FONTF_BOLD ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL);
_tcsncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);
- _tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), _countof(fid.backgroundGroup));
- _tcsncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), _countof(fid.group));
+ _tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), _countof(fid.backgroundGroup));
+ _tcsncpy(fid.group, LPGENT("Message Sessions") _T("/") LPGENT("Single Messaging"), _countof(fid.group));
switch (i) {
case MSGFONTID_MYMSG:
case 1:
@@ -557,8 +557,8 @@ void RegisterFontServiceFonts()
fontOptionsList = IP_fontOptionsList;
fid.flags = FIDF_DEFAULTVALID | FIDF_ALLOWEFFECTS;
- _tcsncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), _countof(fid.group));
- _tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Info Panel"), _countof(fid.backgroundGroup));
+ _tcsncpy(fid.group, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), _countof(fid.group));
+ _tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions") _T("/") LPGENT("Info Panel"), _countof(fid.backgroundGroup));
_tcsncpy(fid.backgroundName, LPGENT("Fields background"), _countof(fid.backgroundName));
for (int i = 0; i < IPFONTCOUNT; i++) {
LoadMsgDlgFont(FONTSECTION_IP, i + 100, &lf, &fontOptionsList[i].colour, FONTMODULE);
@@ -581,7 +581,7 @@ void RegisterFontServiceFonts()
FontRegisterT(&fid);
}
- _tcsncpy(cid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), _countof(cid.group));
+ _tcsncpy(cid.group, LPGENT("Message Sessions") _T("/") LPGENT("Group chats"), _countof(cid.group));
strncpy(cid.dbSettingsGroup, CHAT_MODULE, _countof(cid.dbSettingsGroup));
for (int i = 0; i <= 7; i++) {
mir_snprintf(szTemp, "NickColor%d", i);
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp
index 8765a4adca..3d383cb86d 100644
--- a/plugins/TrafficCounter/src/options.cpp
+++ b/plugins/TrafficCounter/src/options.cpp
@@ -126,15 +126,15 @@ static INT_PTR CALLBACK DlgProcPopupsTraffic(HWND hwndDlg, UINT msg, WPARAM wPar
static OPTTREE_OPTION options[] =
{
- {0, LPGENT("Display")_T("/")LPGENT("Icon"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawProtoIcon"},
- {0, LPGENT("Display")_T("/")LPGENT("Account name"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawProtoName"},
- {0, LPGENT("Display")_T("/")LPGENT("Current traffic"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawCurrentTraffic"},
- {0, LPGENT("Display")_T("/")LPGENT("Total traffic"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawTotalTraffic"},
- {0, LPGENT("Display")_T("/")LPGENT("Current online"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawCurrentTime"},
- {0, LPGENT("Display")_T("/")LPGENT("Total online"),OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawTotalTime"},
- {0, LPGENT("General")_T("/")LPGENT("Draw frame as skin element"), OPTTREE_CHECK, 1, NULL, "DrawFrmAsSkin"},
- {0, LPGENT("General")_T("/")LPGENT("Show tooltip in traffic window"), OPTTREE_CHECK, 1, NULL, "ShowTooltip"},
- {0, LPGENT("General")_T("/")LPGENT("\"Toggle traffic counter\" in main menu"), OPTTREE_CHECK, 1, NULL, "ShowMainMenuItem"},
+ {0, LPGENT("Display") _T("/") LPGENT("Icon"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawProtoIcon"},
+ {0, LPGENT("Display") _T("/") LPGENT("Account name"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawProtoName"},
+ {0, LPGENT("Display") _T("/") LPGENT("Current traffic"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawCurrentTraffic"},
+ {0, LPGENT("Display") _T("/") LPGENT("Total traffic"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawTotalTraffic"},
+ {0, LPGENT("Display") _T("/") LPGENT("Current online"), OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawCurrentTime"},
+ {0, LPGENT("Display") _T("/") LPGENT("Total online"),OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, "DrawTotalTime"},
+ {0, LPGENT("General") _T("/") LPGENT("Draw frame as skin element"), OPTTREE_CHECK, 1, NULL, "DrawFrmAsSkin"},
+ {0, LPGENT("General") _T("/") LPGENT("Show tooltip in traffic window"), OPTTREE_CHECK, 1, NULL, "ShowTooltip"},
+ {0, LPGENT("General") _T("/") LPGENT("\"Toggle traffic counter\" in main menu"), OPTTREE_CHECK, 1, NULL, "ShowMainMenuItem"},
// Резервируем место под активные и видимые протоколы
// Максимум 16 позиций видимых и 16 активных
{0, NULL, OPTTREE_CHECK, OPTTREE_INVISIBLE, NULL, NULL},
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 5e532fb7c5..5c830ca8c2 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -1508,12 +1508,12 @@ void g_XstatusIconsInit()
mir_tstrcpy(p + 1, _T("..\\Icons\\xstatus_jabber.dll"));
TCHAR szSection[100];
- mir_tstrcpy(szSection, _T("Protocols/Jabber/")LPGENT("Moods"));
+ mir_tstrcpy(szSection, _T("Protocols/Jabber/") LPGENT("Moods"));
for (int i = 1; i < _countof(g_arrMoods); i++)
g_MoodIcons.RegisterIcon(g_arrMoods[i].szTag, szFile, -(200 + i), szSection, TranslateTS(g_arrMoods[i].szName));
- mir_tstrcpy(szSection, _T("Protocols/Jabber/")LPGENT("Activities"));
+ mir_tstrcpy(szSection, _T("Protocols/Jabber/") LPGENT("Activities"));
for (int k = 0; k < _countof(g_arrActivities); k++) {
if (g_arrActivities[k].szFirst)
g_ActivityIcons.RegisterIcon(g_arrActivities[k].szFirst, szFile, g_arrActivities[k].iconid, szSection, TranslateTS(g_arrActivities[k].szTitle));
diff --git a/protocols/MRA/src/MraIcons.cpp b/protocols/MRA/src/MraIcons.cpp
index 17eaded5e0..e3ab42fa65 100644
--- a/protocols/MRA/src/MraIcons.cpp
+++ b/protocols/MRA/src/MraIcons.cpp
@@ -101,7 +101,7 @@ void InitXStatusIcons()
GetModuleFileName((g_hDLLXStatusIcons != NULL) ? g_hDLLXStatusIcons : g_hInstance, szBuff, _countof(szBuff));
SKINICONDESC sid = { 0 };
- sid.section.t = LPGENT("Protocols")_T("/")LPGENT("MRA")_T("/")LPGENT("Custom Status");
+ sid.section.t = LPGENT("Protocols")_T("/") LPGENT("MRA") _T("/") LPGENT("Custom Status");
sid.defaultFile.t = szBuff;
sid.flags = SIDF_ALL_TCHAR;
diff --git a/protocols/Xfire/src/main.cpp b/protocols/Xfire/src/main.cpp
index b4d234d3c1..0f237313ce 100644
--- a/protocols/Xfire/src/main.cpp
+++ b/protocols/Xfire/src/main.cpp
@@ -904,42 +904,42 @@ static int OnSystemModulesLoaded(WPARAM wParam, LPARAM lParam)
tr.szTokenString = "xfiregame";
tr.parseFunction = Varxfiregame;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("Current Game");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("Current Game");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "myxfiregame";
tr.parseFunction = Varmyxfiregame;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Current Game");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Current Game");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "xfireserverip";
tr.parseFunction = Varxfireserverip;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("ServerIP");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("ServerIP");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "myxfireserverip";
tr.parseFunction = Varmyxfireserverip;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Current ServerIP");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Current ServerIP");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "xfirevoice";
tr.parseFunction = Varxfirevoice;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("Voice");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("Voice");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "myxfirevoice";
tr.parseFunction = Varmyxfirevoice;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Current Voice");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Current Voice");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "xfirevoiceip";
tr.parseFunction = Varxfirevoiceip;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("Voice ServerIP");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("Voice ServerIP");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
tr.szTokenString = "myxfirevoiceip";
tr.parseFunction = Varmyxfirevoiceip;
- tr.szHelpText = LPGEN("XFire")"\t"LPGEN("My Voice ServerIP");
+ tr.szHelpText = LPGEN("XFire") "\t" LPGEN("My Voice ServerIP");
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&tr);
}
@@ -1221,7 +1221,7 @@ extern "C" __declspec(dllexport) int Load(void)
XFireLog("Wasn't able to get GetExtendedUdpTable function");
}
- Icon_Register(hinstance, LPGEN("Protocols")"/"LPGEN("XFire"), &icon, 1);
+ Icon_Register(hinstance, LPGEN("Protocols") "/" LPGEN("XFire"), &icon, 1);
hExtraIcon1 = ExtraIcon_Register("xfire_game", LPGEN("XFire game icon"), "", NULL, ExtraImageApply1);
hExtraIcon2 = ExtraIcon_Register("xfire_voice", LPGEN("XFire voice icon"), "", NULL, ExtraImageApply2);
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-15 18:31:04 +0000