Popup+ translation: final variant

1 files changed, 5 insertions, 7 deletions

diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp
index fcd88ad902..8476c85fa9 100644
--- a/plugins/Popup/src/notifications.cpp
+++ b/plugins/Popup/src/notifications.cpp
@@ -43,7 +43,7 @@ void LoadNotifications()
 	notification.lpActions = nullptr;

 

 	mir_strncpy(notification.lpzGroup, LPGEN("Misc"), sizeof(notification.lpzName));

-	mir_strncpy(notification.lpzName, "Warning", sizeof(notification.lpzName));

+	mir_strncpy(notification.lpzName, LPGEN("Warning"), sizeof(notification.lpzName));

 	notification.lchIcoLib = g_plugin.getIconHandle(IDI_MB_WARN);

 	notification.colorBack = RGB(210, 210, 150);

 	notification.colorText = RGB(0, 0, 0);

@@ -51,7 +51,7 @@ void LoadNotifications()
 	g_hntfWarning = RegisterNotification(&notification);

 

 	mir_strncpy(notification.lpzGroup, LPGEN("Misc"), sizeof(notification.lpzName));

-	mir_strncpy(notification.lpzName, "Notification", sizeof(notification.lpzName));

+	mir_strncpy(notification.lpzName, LPGEN("Notification"), sizeof(notification.lpzName));

 	notification.lchIcoLib = g_plugin.getIconHandle(IDI_MB_INFO);

 	notification.colorBack = RGB(230, 230, 230);

 	notification.colorText = RGB(0, 0, 0);

@@ -59,7 +59,7 @@ void LoadNotifications()
 	g_hntfNotification = RegisterNotification(&notification);

 

 	mir_strncpy(notification.lpzGroup, LPGEN("Misc"), sizeof(notification.lpzName));

-	mir_strncpy(notification.lpzName, "Error", sizeof(notification.lpzName));

+	mir_strncpy(notification.lpzName, LPGEN("Error"), sizeof(notification.lpzName));

 	notification.lchIcoLib = g_plugin.getIconHandle(IDI_MB_STOP);

 	notification.colorBack = RGB(191, 0, 0);

 	notification.colorText = RGB(255, 245, 225);

@@ -189,16 +189,14 @@ HANDLE RegisterNotification(POPUPNOTIFICATION *notification)
 	fontid.deffontsettings.colour = ptd->notification.colorText;

 	fontid.deffontsettings.size = -11;

 	mir_strncpy(fontid.deffontsettings.szFace, "MS Shell Dlg", _countof(fontid.deffontsettings.szFace));

-	fontid.deffontsettings.style = 0;

-	mir_snprintf(fontid.name, "%s (colors only)", notification->lpzName);

+	mir_strncpy(fontid.name, notification->lpzName, _countof(fontid.name));

 	mir_snprintf(fontid.setting, "{%s/%s}text", notification->lpzGroup, notification->lpzName);

-	fontid.deffontsettings.style = 0;

 	g_plugin.addFont(&fontid);

 

 	ColourID colourid = {};

 	mir_snprintf(colourid.group, PU_FNT_AND_COLOR"/%s", notification->lpzGroup);

 	mir_strcpy(colourid.dbSettingsGroup, "PopupNotifications");

-	mir_snprintf(colourid.name, "%s (colors only)", notification->lpzName);

+	mir_strncpy(colourid.name, notification->lpzName, _countof(colourid.name));

 	mir_snprintf(colourid.setting, "{%s/%s}backColor", notification->lpzGroup, notification->lpzName);

 	colourid.defcolour = ptd->notification.colorBack;

 	g_plugin.addColor(&colourid);