- translation fixes (patch from Basil)

git-svn-id: http://svn.miranda-ng.org/main/trunk@3972 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

28 files changed, 50 insertions, 50 deletions

diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 41dfc42dda..c3d2e29c83 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -359,7 +359,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_blind", "..\plugins\C
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartPosition", "..\plugins\StartPosition\StartPosition_10.vcxproj", "{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMS", "..\plugins\SMS\sms_10.vcxproj", "{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMS", "..\plugins\SMS\sms_10.vcxproj", "{A3EA507E-C77E-4966-9AEE-51442AF96E4D}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPServer", "..\plugins\HTTPServer\HTTPServer_10.vcxproj", "{F7A70398-AFA0-4A58-B645-85268F9517DE}"

 EndProject

@@ -1603,14 +1603,14 @@ Global
 		{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}.Release|Win32.Build.0 = Release|Win32

 		{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}.Release|x64.ActiveCfg = Release|x64

 		{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}.Release|x64.Build.0 = Release|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|Win32.Build.0 = Debug|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|x64.ActiveCfg = Debug|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|x64.Build.0 = Debug|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|Win32.ActiveCfg = Release|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|Win32.Build.0 = Release|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|x64.ActiveCfg = Release|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|x64.Build.0 = Release|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|Win32.Build.0 = Debug|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|x64.ActiveCfg = Debug|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|x64.Build.0 = Debug|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|Win32.ActiveCfg = Release|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|Win32.Build.0 = Release|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|x64.ActiveCfg = Release|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|x64.Build.0 = Release|x64

 		{F7A70398-AFA0-4A58-B645-85268F9517DE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F7A70398-AFA0-4A58-B645-85268F9517DE}.Debug|Win32.Build.0 = Debug|Win32

 		{F7A70398-AFA0-4A58-B645-85268F9517DE}.Debug|x64.ActiveCfg = Debug|x64

diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 02995af828..93ab0e6de3 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -395,7 +395,7 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_blind", "..\plugins\C
 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StartPosition", "..\plugins\StartPosition\StartPosition_10.vcxproj", "{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}"

 EndProject

-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMS", "..\plugins\SMS\sms_10.vcxproj", "{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}"

+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SMS", "..\plugins\SMS\sms_10.vcxproj", "{A3EA507E-C77E-4966-9AEE-51442AF96E4D}"

 EndProject

 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HTTPServer", "..\plugins\HTTPServer\HTTPServer_10.vcxproj", "{F7A70398-AFA0-4A58-B645-85268F9517DE}"

 EndProject

@@ -1639,14 +1639,14 @@ Global
 		{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}.Release|Win32.Build.0 = Release|Win32

 		{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}.Release|x64.ActiveCfg = Release|x64

 		{046C5F80-ABE5-488F-BFC8-B024D4AACC8C}.Release|x64.Build.0 = Release|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|Win32.ActiveCfg = Debug|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|Win32.Build.0 = Debug|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|x64.ActiveCfg = Debug|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Debug|x64.Build.0 = Debug|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|Win32.ActiveCfg = Release|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|Win32.Build.0 = Release|Win32

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|x64.ActiveCfg = Release|x64

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6}.Release|x64.Build.0 = Release|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|Win32.ActiveCfg = Debug|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|Win32.Build.0 = Debug|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|x64.ActiveCfg = Debug|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Debug|x64.Build.0 = Debug|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|Win32.ActiveCfg = Release|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|Win32.Build.0 = Release|Win32

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|x64.ActiveCfg = Release|x64

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D}.Release|x64.Build.0 = Release|x64

 		{F7A70398-AFA0-4A58-B645-85268F9517DE}.Debug|Win32.ActiveCfg = Debug|Win32

 		{F7A70398-AFA0-4A58-B645-85268F9517DE}.Debug|Win32.Build.0 = Debug|Win32

 		{F7A70398-AFA0-4A58-B645-85268F9517DE}.Debug|x64.ActiveCfg = Debug|x64

@@ -1810,7 +1810,7 @@ Global
 		{98DF7761-41D7-4C5C-9FFE-E5CCB3997783} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

 		{BAEBC482-CDA9-4053-A7D0-08222E85118E} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

 		{CEAD8BCF-1F22-4E00-9F6D-E33405B00552} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

-		{B5887781-C5FD-4A2C-BC5D-CC98E462ADA6} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

+		{A3EA507E-C77E-4966-9AEE-51442AF96E4D} = {0EF566FB-09FC-4F4D-9944-A0CDC82DF626}

 		{803DA965-4B1C-4BF3-A35E-A3A12D4121D3} = {76177119-A395-4739-AECE-25D4864198AD}

 		{3E6CEC79-5E93-4607-B10E-498586ECF6A6} = {76177119-A395-4739-AECE-25D4864198AD}

 		{3E727941-2854-4F64-ADA5-BF3BF104A4A3} = {76177119-A395-4739-AECE-25D4864198AD}

diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp
index 0731748322..7e21146fca 100644
--- a/plugins/AVS/src/main.cpp
+++ b/plugins/AVS/src/main.cpp
@@ -1990,8 +1990,8 @@ static int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 	SetThreadPriority(hLoaderThread, THREAD_PRIORITY_IDLE);

 

 	// Folders plugin support

-	hMyAvatarsFolder = FoldersRegisterCustomPathT("Avatars", "My Avatars", MIRANDA_USERDATAT _T("\\Avatars"));

-	hGlobalAvatarFolder = FoldersRegisterCustomPathT("Avatars", "My Global Avatar Cache", MIRANDA_USERDATAT _T("\\Avatars"));

+	hMyAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("My Avatars"), MIRANDA_USERDATAT _T("\\Avatars"));

+	hGlobalAvatarFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("My Global Avatar Cache"), MIRANDA_USERDATAT _T("\\Avatars"));

 

 	g_AvatarHistoryAvail = ServiceExists(MS_AVATARHISTORY_ENABLED);

 

diff --git a/plugins/BASS_interface/src/Main.cpp b/plugins/BASS_interface/src/Main.cpp
index 0d94cba08c..ad31987d7b 100644
--- a/plugins/BASS_interface/src/Main.cpp
+++ b/plugins/BASS_interface/src/Main.cpp
@@ -548,7 +548,7 @@ int OnFoldersChanged(WPARAM, LPARAM)
 

 int OnModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	if (hBASSFolder = FoldersRegisterCustomPathT("Bass Interface", "Bass library", PLUGINS_PATHT _T("\\Bass"))) {

+	if (hBASSFolder = FoldersRegisterCustomPathT(LPGEN("Bass Interface"), LPGEN("Bass library"), PLUGINS_PATHT _T("\\Bass"))) {

 		FoldersGetCustomPathT(hBASSFolder, CurrBassPath, MAX_PATH, _T(""));

 		_tcscat(CurrBassPath, _T("\\bass.dll"));

 	}

diff --git a/plugins/CrashDumper/src/crshdmp.cpp b/plugins/CrashDumper/src/crshdmp.cpp
index 5af1c0b20a..7d2af2bc90 100644
--- a/plugins/CrashDumper/src/crshdmp.cpp
+++ b/plugins/CrashDumper/src/crshdmp.cpp
@@ -246,8 +246,8 @@ static int ModulesLoaded(WPARAM, LPARAM)
 

 	SetExceptionHandler();

 

-	hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, "Crash Reports", CrashLogFolder);

-	hVerInfoFolder  = FoldersRegisterCustomPathT(PluginName, "Version Information", VersionInfoFolder);

+	hCrashLogFolder = FoldersRegisterCustomPathT(PluginName, LPGEN("Crash Reports"), CrashLogFolder);

+	hVerInfoFolder  = FoldersRegisterCustomPathT(PluginName, LPGEN("Version Information"), VersionInfoFolder);

 

 	FoldersPathChanged(0, 0);

 

diff --git a/plugins/Db_autobackups/src/main.cpp b/plugins/Db_autobackups/src/main.cpp
index d5c0116e75..b3122b99cb 100644
--- a/plugins/Db_autobackups/src/main.cpp
+++ b/plugins/Db_autobackups/src/main.cpp
@@ -42,7 +42,7 @@ static int FoldersGetBackupPath(WPARAM wParam, LPARAM lParam)
 

 static void FoldersInit(void)

 {

-	if (hFolder = FoldersRegisterCustomPathT("Database Backups", "Backup Folder", DIR SUB_DIR)) {

+	if (hFolder = FoldersRegisterCustomPathT(LPGEN("Database Backups"), LPGEN("Backup Folder"), DIR SUB_DIR)) {

 		HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersGetBackupPath);

 		FoldersGetBackupPath(0, 0);

 	}

diff --git a/plugins/FlashAvatars/src/cflash.cpp b/plugins/FlashAvatars/src/cflash.cpp
index 6f7b25eec0..e4eb392101 100644
--- a/plugins/FlashAvatars/src/cflash.cpp
+++ b/plugins/FlashAvatars/src/cflash.cpp
@@ -603,7 +603,7 @@ static int systemModulesLoaded(WPARAM /*wParam*/, LPARAM /*lParam*/)
 	// default for older Mirandas

 	else PathToAbsoluteT( _T("Flash\\"), path);

 

-	hAvatarsFolder = FoldersRegisterCustomPathT("Avatars", "Flash Avatars", path);

+	hAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("Flash Avatars"), path);

 	return 0;

 }

 

diff --git a/plugins/MirOTR/MirOTR/src/options.cpp b/plugins/MirOTR/MirOTR/src/options.cpp
index 75c63b92c8..98c7425504 100644
--- a/plugins/MirOTR/MirOTR/src/options.cpp
+++ b/plugins/MirOTR/MirOTR/src/options.cpp
@@ -40,7 +40,7 @@ int FoldersChanged(WPARAM wParam, LPARAM lParam)
 

 void LoadFilenames()

 {

-	if (hPATH_MIROTR = FoldersRegisterCustomPath(MODULENAME, "Private Data", DATA_DIRECTORY)) {

+	if (hPATH_MIROTR = FoldersRegisterCustomPath(MODULENAME, LPGEN("Private Data"), DATA_DIRECTORY)) {

 		HookEvent(ME_FOLDERS_PATH_CHANGED, FoldersChanged);

 

 		// get the path - above are only defaults - there may be a different value in the db

diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp
index d07448482b..682badbdda 100644
--- a/plugins/NewsAggregator/Src/Services.cpp
+++ b/plugins/NewsAggregator/Src/Services.cpp
@@ -51,7 +51,7 @@ int OnFoldersChanged(WPARAM, LPARAM)
 

 int NewsAggrInit(WPARAM wParam, LPARAM lParam)

 {

-	hNewsAggregatorFolder = FoldersRegisterCustomPathT("Avatars", "News Aggregator", MIRANDA_USERDATAT _T("\\Avatars\\")_T(DEFAULT_AVATARS_FOLDER));

+	hNewsAggregatorFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("News Aggregator"), MIRANDA_USERDATAT _T("\\Avatars\\")_T(DEFAULT_AVATARS_FOLDER));

 	if (hNewsAggregatorFolder)

 		FoldersGetCustomPathT(hNewsAggregatorFolder, tszRoot, MAX_PATH, _T(""));

 	else

diff --git a/plugins/PackUpdater/Src/PackUpdater.cpp b/plugins/PackUpdater/Src/PackUpdater.cpp
index 1dde3c429f..24086278ab 100644
--- a/plugins/PackUpdater/Src/PackUpdater.cpp
+++ b/plugins/PackUpdater/Src/PackUpdater.cpp
@@ -57,7 +57,7 @@ extern "C" __declspec(dllexport) int Load(void)
 	TCHAR* tszFolder = Utils_ReplaceVarsT(_T("%miranda_userdata%\\"DEFAULT_UPDATES_FOLDER));

 	lstrcpyn(tszRoot, tszFolder, SIZEOF(tszRoot));

 

-	hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Pack Updater", MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);

+	hPackUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Pack Updater"), MIRANDA_USERDATAT _T("\\")DEFAULT_UPDATES_FOLDER);

 	if (hPackUpdaterFolder)

 		FoldersGetCustomPathT(hPackUpdaterFolder, tszRoot, MAX_PATH, _T(""));

 

diff --git a/plugins/PluginUpdater/src/PluginUpdater.cpp b/plugins/PluginUpdater/src/PluginUpdater.cpp
index 59ec7969cc..610d87e284 100644
--- a/plugins/PluginUpdater/src/PluginUpdater.cpp
+++ b/plugins/PluginUpdater/src/PluginUpdater.cpp
@@ -85,7 +85,7 @@ extern "C" __declspec(dllexport) int Load(void)
 {

 	mir_getLP(&pluginInfoEx);

 #endif

-	hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, "Plugin Updater", MIRANDA_PATHT _T("\\")DEFAULT_UPDATES_FOLDER);

+	hPluginUpdaterFolder = FoldersRegisterCustomPathT(MODULEA, LPGEN("Plugin Updater"), MIRANDA_PATHT _T("\\")DEFAULT_UPDATES_FOLDER);

 	if (hPluginUpdaterFolder)

 		OnFoldersChanged(0, 0);

 	else

diff --git a/plugins/Popup/src/main.cpp b/plugins/Popup/src/main.cpp
index 7a3638ddf3..6e959b438b 100644
--- a/plugins/Popup/src/main.cpp
+++ b/plugins/Popup/src/main.cpp
@@ -292,7 +292,7 @@ static int ModulesLoaded(WPARAM wParam,LPARAM lParam)
 	HookEvent(ME_TTB_MODULELOADED, TTBLoaded);

 	//Folder plugin support

 	LPTSTR pszPath = mir_a2t(MIRANDA_PATH "\\Skins\\PopUp");

-	folderId = FoldersRegisterCustomPathT(MODULNAME_LONG, "Skins", pszPath);

+	folderId = FoldersRegisterCustomPathT(MODULNAME_LONG, LPGEN("Skins"), pszPath);

 	mir_free(pszPath);

 	//load skin

 	skins.load(_T("dir"));

diff --git a/plugins/SecureIM/src/main.cpp b/plugins/SecureIM/src/main.cpp
index 2c5aec0cb0..7ef088c832 100644
--- a/plugins/SecureIM/src/main.cpp
+++ b/plugins/SecureIM/src/main.cpp
@@ -160,7 +160,7 @@ int onModulesLoaded(WPARAM wParam, LPARAM lParam)
     Sent_NetLog("onModuleLoaded begin");

 #endif

 

-	 g_hFolders = FoldersRegisterCustomPathT(szModuleName, "Icons", _T(MIRANDA_PATH"\\icons"));

+	 g_hFolders = FoldersRegisterCustomPathT(szModuleName, LPGEN("Icons"), _T(MIRANDA_PATH"\\icons"));

 

 	 InitIcons();

 	 GetFlags();

diff --git a/plugins/SendScreenshotPlus/src/Main.cpp b/plugins/SendScreenshotPlus/src/Main.cpp
index 2a7c4912e1..362f698362 100644
--- a/plugins/SendScreenshotPlus/src/Main.cpp
+++ b/plugins/SendScreenshotPlus/src/Main.cpp
@@ -133,7 +133,7 @@ int hook_ModulesLoaded(WPARAM, LPARAM)
 	}

 

 	// Folders plugin support

-	hFolderScreenshot = FoldersRegisterCustomPathT("SendSS", "Screenshots",

+	hFolderScreenshot = FoldersRegisterCustomPathT(LPGEN("SendSS"), LPGEN("Screenshots"),

 							_T(PROFILE_PATH)_T("\\")_T(CURRENT_PROFILE)_T("\\Screenshots"));

 

 	return 0;

diff --git a/plugins/SmileyAdd/src/download.cpp b/plugins/SmileyAdd/src/download.cpp
index 4567422a9a..c0eed54ec6 100644
--- a/plugins/SmileyAdd/src/download.cpp
+++ b/plugins/SmileyAdd/src/download.cpp
@@ -224,7 +224,7 @@ int FolderChanged(WPARAM, LPARAM)
 

 void GetSmileyCacheFolder(void)

 {

-	hFolder = FoldersRegisterCustomPathT("SmileyAdd", "Smiley Cache", MIRANDA_USERDATAT _T("\\SmileyCache"));

+	hFolder = FoldersRegisterCustomPathT(LPGEN("SmileyAdd"), LPGEN("Smiley Cache"), MIRANDA_USERDATAT _T("\\SmileyCache"));

 	if (hFolder) {

 		FoldersGetCustomPathT(hFolder, cachepath, MAX_PATH, _T(""));

 		HookEvent(ME_FOLDERS_PATH_CHANGED, FolderChanged);

diff --git a/plugins/StopSpamMod/src/init.cpp b/plugins/StopSpamMod/src/init.cpp
index e6797ef11d..f7c524af3a 100755
--- a/plugins/StopSpamMod/src/init.cpp
+++ b/plugins/StopSpamMod/src/init.cpp
@@ -128,7 +128,7 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)
 		boost::thread *thr = new boost::thread(&CleanThread);

 	

 	// Folders plugin support

-	hStopSpamLogDirH = FoldersRegisterCustomPath("StopSpam", "StopSpam Logs", PROFILE_PATH "\\" CURRENT_PROFILE "\\StopSpamLog");

+	hStopSpamLogDirH = FoldersRegisterCustomPath(LPGEN("StopSpam"), LPGEN("StopSpam Logs"), PROFILE_PATH "\\" CURRENT_PROFILE "\\StopSpamLog");

 	return 0;

 }

 

diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp
index dbc529f4c5..f57c312a5a 100644
--- a/plugins/TabSRMM/src/mim.cpp
+++ b/plugins/TabSRMM/src/mim.cpp
@@ -314,10 +314,10 @@ int CMimAPI::FoldersPathChanged(WPARAM wParam, LPARAM lParam)
 

 void CMimAPI::configureCustomFolders()

 {

-	m_hDataPath = FoldersRegisterCustomPathT("TabSRMM", "Data path", const_cast<TCHAR *>(getDataPath()));

-	m_hSkinsPath = FoldersRegisterCustomPathT("TabSRMM", "Skins root", const_cast<TCHAR *>(getSkinPath()));

-	m_hAvatarsPath = FoldersRegisterCustomPathT("Avatars", "Saved TabSRMM avatars", const_cast<TCHAR *>(getSavedAvatarPath()));

-	m_hChatLogsPath = FoldersRegisterCustomPathT("TabSRMM", "Group chat logs root", const_cast<TCHAR *>(getChatLogPath()));

+	m_hDataPath = FoldersRegisterCustomPathT(LPGEN("TabSRMM"), LPGEN("Data path"), const_cast<TCHAR *>(getDataPath()));

+	m_hSkinsPath = FoldersRegisterCustomPathT(LPGEN("TabSRMM"), LPGEN("Skins root"), const_cast<TCHAR *>(getSkinPath()));

+	m_hAvatarsPath = FoldersRegisterCustomPathT(LPGEN("Avatars"), LPGEN("Saved TabSRMM avatars"), const_cast<TCHAR *>(getSavedAvatarPath()));

+	m_hChatLogsPath = FoldersRegisterCustomPathT(LPGEN("TabSRMM"), LPGEN("Group chat logs root"), const_cast<TCHAR *>(getChatLogPath()));

 

 	if (m_hDataPath)

 		HookEvent(ME_FOLDERS_PATH_CHANGED, CMimAPI::FoldersPathChanged);

diff --git a/plugins/TipperYM/src/tipper.cpp b/plugins/TipperYM/src/tipper.cpp
index bd583e1cfb..2a66af4804 100644
--- a/plugins/TipperYM/src/tipper.cpp
+++ b/plugins/TipperYM/src/tipper.cpp
@@ -260,7 +260,7 @@ int ModulesLoaded(WPARAM wParam, LPARAM lParam)
 

 	hFolderChanged = HookEvent(ME_FOLDERS_PATH_CHANGED, ReloadSkinFolder);

 

-	hSkinFolder = FoldersRegisterCustomPathT(MODULE, "Tipper skins", MIRANDA_PATHT _T("\\") _T(DEFAULT_SKIN_FOLDER));

+	hSkinFolder = FoldersRegisterCustomPathT(MODULE, LPGEN("Tipper skins"), MIRANDA_PATHT _T("\\") _T(DEFAULT_SKIN_FOLDER));

 	FoldersGetCustomPathT(hSkinFolder, SKIN_FOLDER, SIZEOF(SKIN_FOLDER), _T(DEFAULT_SKIN_FOLDER));

 

 	InitTipperSmileys();

diff --git a/plugins/VersionInfo/src/hooked_events.cpp b/plugins/VersionInfo/src/hooked_events.cpp
index 717aa6dda9..2173fff405 100644
--- a/plugins/VersionInfo/src/hooked_events.cpp
+++ b/plugins/VersionInfo/src/hooked_events.cpp
@@ -36,7 +36,7 @@ int HookEvents()
 

 int OnModulesLoaded(WPARAM wParam, LPARAM lParam)

 {

-	hOutputLocation = FoldersRegisterCustomPathT("VersionInfo", "Output folder", MIRANDA_PATHT);

+	hOutputLocation = FoldersRegisterCustomPathT(LPGEN("VersionInfo"), LPGEN("Output folder"), MIRANDA_PATHT);

 	

 	GetStringFromDatabase("UUIDCharMark", _T(DEF_UUID_CHARMARK), PLUGIN_UUID_MARK, cPLUGIN_UUID_MARK);

 	return 0;

diff --git a/protocols/AimOscar/src/avatars.cpp b/protocols/AimOscar/src/avatars.cpp
index f54a6b8d41..2e8ab42266 100644
--- a/protocols/AimOscar/src/avatars.cpp
+++ b/protocols/AimOscar/src/avatars.cpp
@@ -172,7 +172,7 @@ void CAimProto::init_custom_folders(void)
 	TCHAR AvatarsFolder[MAX_PATH];

 

 	mir_sntprintf(AvatarsFolder, SIZEOF(AvatarsFolder), _T("%%miranda_avatarcache%%\\%S"), m_szModuleName);

-	hAvatarsFolder = FoldersRegisterCustomPathT("Avatars", m_szModuleName, AvatarsFolder, m_tszUserName);

+	hAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, AvatarsFolder, m_tszUserName);

 	init_cst_fld_ran = true;

 }

 

diff --git a/protocols/FacebookRM/src/proto.cpp b/protocols/FacebookRM/src/proto.cpp
index b6e76229d5..8024127dbc 100644
--- a/protocols/FacebookRM/src/proto.cpp
+++ b/protocols/FacebookRM/src/proto.cpp
@@ -71,7 +71,7 @@ FacebookProto::FacebookProto(const char* proto_name,const TCHAR* username)
 	SkinAddNewSoundExT( "OtherEvent", m_tszUserName, LPGENT( "Other Event" ));

 

 	mir_sntprintf(descr, SIZEOF(descr), _T("%%miranda_avatarcache%%\\%s"), m_tszUserName);

-	hAvatarFolder_ = FoldersRegisterCustomPathT("Avatars", m_szModuleName, descr, m_tszUserName);

+	hAvatarFolder_ = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, descr, m_tszUserName);

 

 	// Set all contacts offline -- in case we crashed

 	SetAllContactStatuses( ID_STATUS_OFFLINE, true );

diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp
index 8a11ed38c7..f753f2a863 100644
--- a/protocols/Gadu-Gadu/src/gg_proto.cpp
+++ b/protocols/Gadu-Gadu/src/gg_proto.cpp
@@ -67,7 +67,7 @@ GGPROTO::GGPROTO(const char* pszProtoName, const TCHAR* tszUserName)
 

 	TCHAR szPath[MAX_PATH];

 	mir_sntprintf(szPath, MAX_PATH, _T("%s\\%s"), (TCHAR*)VARST( _T("%miranda_avatarcache%")), m_tszUserName);

-	hAvatarsFolder = FoldersRegisterCustomPathT("Avatars", m_szModuleName, szPath, m_tszUserName);

+	hAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, szPath, m_tszUserName);

 

 	mir_sntprintf(szPath, MAX_PATH, _T("%s\\%s\\ImageCache"), (TCHAR*)VARST( _T("%miranda_userdata%")), m_tszUserName);

 	hImagesFolder = FoldersRegisterCustomPathT("Images", m_szModuleName, szPath, m_tszUserName);

diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp
index 23299ad1ef..31edbd074b 100644
--- a/protocols/IcqOscarJ/src/icq_avatar.cpp
+++ b/protocols/IcqOscarJ/src/icq_avatar.cpp
@@ -93,7 +93,7 @@ void CIcqProto::InitAvatars()
 	// check if it does make sense

 	TCHAR tszPath[MAX_PATH * 2];

 	null_snprintf(tszPath, MAX_PATH * 2, _T("%%miranda_avatarcache%%\\%S"), m_szModuleName);

-	hAvatarsFolder = FoldersRegisterCustomPathT("Avatars", m_szModuleName, tszPath, m_tszUserName);

+	hAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, tszPath, m_tszUserName);

 }

 

 

diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp
index a67159a278..31f10ad5c5 100644
--- a/protocols/JabberG/src/jabber_misc.cpp
+++ b/protocols/JabberG/src/jabber_misc.cpp
@@ -254,7 +254,7 @@ void CJabberProto::InitCustomFolders(void)
 	m_bFoldersInitDone = true;

 	TCHAR AvatarsFolder[MAX_PATH];

 	mir_sntprintf(AvatarsFolder, SIZEOF(AvatarsFolder), _T("%%miranda_avatarcache%%\\%S"), m_szModuleName);

-	m_hJabberAvatarsFolder = FoldersRegisterCustomPathT("Avatars", m_szModuleName, AvatarsFolder, m_tszUserName);

+	m_hJabberAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, AvatarsFolder, m_tszUserName);

 }

 

 void CJabberProto::GetAvatarFileName(HANDLE hContact, TCHAR* pszDest, size_t cbLen)

diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp
index 4633ff809a..2fb7581f0c 100644
--- a/protocols/MRA/src/MraAvatars.cpp
+++ b/protocols/MRA/src/MraAvatars.cpp
@@ -90,7 +90,7 @@ DWORD CMraProto::MraAvatarsQueueInitialize(HANDLE *phAvatarsQueueHandle)
 		if (pmraaqAvatarsQueue->hNetlibUser) {

 			TCHAR tszPath[ MAX_PATH ];

 			mir_sntprintf( tszPath, SIZEOF(tszPath), _T("%%miranda_avatarcache%%\\%s"), m_tszUserName);

-			pmraaqAvatarsQueue->hAvatarsPath = FoldersRegisterCustomPathT("Avatars", m_szModuleName, tszPath, m_tszUserName);

+			pmraaqAvatarsQueue->hAvatarsPath = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, tszPath, m_tszUserName);

 

 			InterlockedExchange((volatile LONG*)&pmraaqAvatarsQueue->bIsRunning, TRUE);

 			pmraaqAvatarsQueue->hThreadEvent = CreateEvent(NULL, FALSE, FALSE, NULL);

diff --git a/protocols/Skype/src/skype_utils.cpp b/protocols/Skype/src/skype_utils.cpp
index ccf914ff95..d31b8b1ef6 100644
--- a/protocols/Skype/src/skype_utils.cpp
+++ b/protocols/Skype/src/skype_utils.cpp
@@ -331,7 +331,7 @@ void CSkypeProto::InitCustomFolders()
 

 	TCHAR AvatarsFolder[MAX_PATH];

 	mir_sntprintf(AvatarsFolder, SIZEOF(AvatarsFolder), _T("%%miranda_avatarcache%%\\%S"), this->m_szModuleName);

-	m_hAvatarsFolder = ::FoldersRegisterCustomPathT("Avatars", m_szModuleName, AvatarsFolder, m_tszUserName);

+	m_hAvatarsFolder = ::FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, AvatarsFolder, m_tszUserName);

 }

 

 wchar_t* CSkypeProto::GetContactAvatarFilePath(HANDLE hContact)

diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp
index 3f42a70d17..4c9d0db3a9 100644
--- a/protocols/Twitter/src/proto.cpp
+++ b/protocols/Twitter/src/proto.cpp
@@ -49,7 +49,7 @@ TwitterProto::TwitterProto(const char *proto_name,const TCHAR *username)
 	HookProtoEvent(ME_OPT_INITIALISE,           &TwitterProto::OnOptionsInit,        this);

 

 	tstring defFolder = std::tstring( _T("%miranda_avatarcache%\\")) + m_tszUserName;

-	hAvatarFolder_ = FoldersRegisterCustomPathT("Avatars", m_szModuleName, defFolder.c_str(), m_tszUserName);

+	hAvatarFolder_ = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, defFolder.c_str(), m_tszUserName);

 

 	// Initialize hotkeys

 	char text[512];

diff --git a/protocols/Yahoo/src/avatar.cpp b/protocols/Yahoo/src/avatar.cpp
index 163fbcb3ba..d9d32221e7 100644
--- a/protocols/Yahoo/src/avatar.cpp
+++ b/protocols/Yahoo/src/avatar.cpp
@@ -626,7 +626,7 @@ void CYahooProto::InitCustomFolders(void)
 

 	TCHAR AvatarsFolder[MAX_PATH];

 	mir_sntprintf(AvatarsFolder, MAX_PATH, _T("%%miranda_avatarcache%%\\%S"), m_szModuleName);

-	hYahooAvatarsFolder = FoldersRegisterCustomPathT("Avatars", m_szModuleName, AvatarsFolder, m_tszUserName);

+	hYahooAvatarsFolder = FoldersRegisterCustomPathT(LPGEN("Avatars"), m_szModuleName, AvatarsFolder, m_tszUserName);

 }

 

 void CYahooProto::GetAvatarFileName(HANDLE hContact, TCHAR* pszDest, int cbLen, int type)