From 7c4b56fcd5fd49db1300a6e43e77adbd49c9ed92 Mon Sep 17 00:00:00 2001
From: Vadim Dashevskiy <watcherhd@gmail.com>
Date: Wed, 18 Sep 2013 18:41:32 +0000
Subject: Translation fixes (patch from Wishmaster)

git-svn-id: http://svn.miranda-ng.org/main/trunk@6128 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 plugins/TrafficCounter/src/options.cpp | 33 +++++++++++----------------------
 src/modules/skin/skinicons.cpp         |  2 +-
 2 files changed, 12 insertions(+), 23 deletions(-)

diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp
index 0c7e16389e..755eaa5108 100644
--- a/plugins/TrafficCounter/src/options.cpp
+++ b/plugins/TrafficCounter/src/options.cpp
@@ -126,24 +126,15 @@ static INT_PTR CALLBACK DlgProcPopupsTraffic(HWND hwndDlg, UINT msg, WPARAM wPar
 
 static OPTTREE_OPTION options[] =
 {
-	{0,	LPGENT("Display/") LPGENT("Icon"),
-			OPTTREE_CHECK,	OPTTREE_INVISIBLE,	NULL,	"DrawProtoIcon"},
-	{0,	LPGENT("Display/") LPGENT("Account name"),
-			OPTTREE_CHECK,	OPTTREE_INVISIBLE,	NULL,	"DrawProtoName"},
-	{0,	LPGENT("Display/") LPGENT("Current traffic"),
-			OPTTREE_CHECK,	OPTTREE_INVISIBLE,	NULL,	"DrawCurrentTraffic"},
-	{0,	LPGENT("Display/") LPGENT("Total traffic"),
-			OPTTREE_CHECK,	OPTTREE_INVISIBLE,	NULL,	"DrawTotalTraffic"},
-	{0,	LPGENT("Display/") LPGENT("Current online"),
-			OPTTREE_CHECK,	OPTTREE_INVISIBLE,	NULL,	"DrawCurrentTime"},
-	{0,	LPGENT("Display/") LPGENT("Total online"),
-			OPTTREE_CHECK,	OPTTREE_INVISIBLE,	NULL,	"DrawTotalTime"},
-	{0,	LPGENT("General/") LPGENT("Draw frame as skin element"),
-			OPTTREE_CHECK,	1,	NULL,	"DrawFrmAsSkin"},
-	{0,	LPGENT("General/") LPGENT("Show tooltip in traffic window"),
-			OPTTREE_CHECK,	1,	NULL,	"ShowTooltip"},
-	{0,	LPGENT("General/") 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},
@@ -178,10 +169,8 @@ static OPTTREE_OPTION options[] =
 	{0,	NULL, OPTTREE_CHECK, OPTTREE_INVISIBLE,	NULL, NULL},
 	{0,	NULL, OPTTREE_CHECK, OPTTREE_INVISIBLE,	NULL, NULL},
 	{0,	NULL, OPTTREE_CHECK, OPTTREE_INVISIBLE,	NULL, NULL},
-	{0,	LPGENT("Visible accounts/") LPGENT("Summary traffic for visible accounts"),
-			OPTTREE_CHECK,	1,	NULL,	"ShowSummary"},
-	{0,	LPGENT("Visible accounts/") LPGENT("Overall traffic"),
-			OPTTREE_CHECK,	1,	NULL,	"ShowOverall"},
+	{0,	LPGENT("Visible accounts")_T("/") LPGENT("Summary traffic for visible accounts"), OPTTREE_CHECK, 1, NULL, "ShowSummary"},
+	{0,	LPGENT("Visible accounts")_T("/") LPGENT("Overall traffic"), OPTTREE_CHECK, 1, NULL, "ShowOverall"},
 };
 
 static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lParam)
diff --git a/src/modules/skin/skinicons.cpp b/src/modules/skin/skinicons.cpp
index ecd474a1d1..7a2222338b 100644
--- a/src/modules/skin/skinicons.cpp
+++ b/src/modules/skin/skinicons.cpp
@@ -109,7 +109,7 @@ const char mainIconsFmt[] = "core_main_";
 const char statusIconsFmt[] = "core_status_";
 const char protoIconsFmt[] = LPGEN("%s Icons");
 
-#define PROTOCOLS_PREFIX LPGEN("Status Icons/")
+#define PROTOCOLS_PREFIX LPGEN("Status Icons")"/"
 #define GLOBAL_PROTO_NAME "*"
 
 // load small icon (shared) it's not need to be destroyed
-- 
cgit v1.2.3