NewEventNotify moved to Unicode(patch from person), langpack_english files updated.

git-svn-id: http://svn.miranda-ng.org/main/trunk@635 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
author: Vadim Dashevskiy <watcherhd@gmail.com> 2012-06-25 15:46:46 +0000
committer: Vadim Dashevskiy <watcherhd@gmail.com> 2012-06-25 15:46:46 +0000
commit: 2113b6675af6f78916ea050a17cfe9370d29a134 (patch)
tree: b8d0b639c534feede13cf2c0d621bc574f631448 /plugins
parent: a716d39a60b0197cc7944e713b3ecd3ea055dfef (diff)
31 files changed, 431 insertions, 202 deletions
diff --git a/plugins/AutoRun/autorun-translation.txt b/plugins/AutoRun/autorun-translation.txt
index 4f9f573b7d..4dcc7415b2 100644
--- a/plugins/AutoRun/autorun-translation.txt
+++ b/plugins/AutoRun/autorun-translation.txt
@@ -6,5 +6,5 @@
 ;[Launch Miranda IM at system startup]
 ;[Note: At startup Miranda IM will use current profile]
 
-; ../../plugins/AutoRun/main.c
+; ../../plugins/AutoRun/main.cpp
 ;[Plugins]
diff --git a/plugins/BasicHistory/basichistory-translation.txt b/plugins/BasicHistory/basichistory-translation.txt
index 4a03f942d4..c1be849b57 100644
--- a/plugins/BasicHistory/basichistory-translation.txt
+++ b/plugins/BasicHistory/basichistory-translation.txt
@@ -150,6 +150,7 @@
 ;[Authorization request]
 ;[Browse CSS file]
 ;[Browse WinSCP file]
+;[Contact list background]
 ;[Contacts recieved]
 ;[Daily]
 ;[Delta time (hours)]
@@ -165,6 +166,8 @@
 ;[File transfer]
 ;[Filter name exists]
 ;[Find]
+;[Find window]
+;[Find window background]
 ;[Friday]
 ;[Group list]
 ;[Group list background]
diff --git a/plugins/ChangeKeyboardLayout/changekeyboardlayout-translation.txt b/plugins/ChangeKeyboardLayout/changekeyboardlayout-translation.txt
index d28e7a8bdf..03dd47d661 100644
--- a/plugins/ChangeKeyboardLayout/changekeyboardlayout-translation.txt
+++ b/plugins/ChangeKeyboardLayout/changekeyboardlayout-translation.txt
@@ -1,6 +1,5 @@
 ; Common strings that belong to many files
 ;[Copy to clipboard]
-;[PopUps]
 
 ; ../../plugins/ChangeKeyboardLayout/ChangeKeyboardLayout.rc
 ;[Back]
@@ -36,11 +35,9 @@
 ;[Two-way changing layout (experimental)]
 ;[Windows colours]
 
-; ../../plugins/ChangeKeyboardLayout/hook_events.c
+; ../../plugins/ChangeKeyboardLayout/hook_events.cpp
 ;[Changing Case]
 ;[Changing Layout]
 ;[Plugins]
+;[PopUps]
 ;[Popup]
-
-; ../../plugins/ChangeKeyboardLayout/text_operations.c
-;[Change Keyboard Layout plugin was designed to be used with Miranda IM only. For use with any other application, please contact author.]
diff --git a/plugins/Chat/chat-translation.txt b/plugins/Chat/chat-translation.txt
index d8a8c9633e..24c8d5c97a 100644
--- a/plugins/Chat/chat-translation.txt
+++ b/plugins/Chat/chat-translation.txt
@@ -76,11 +76,11 @@
 ;[Words to highlight (wildcards allowed)]
 ;[Your name]
 
-; ../../plugins/Chat/clist.c
+; ../../plugins/Chat/clist.cpp
 ;[Join chat]
 ;[Open chat window]
 
-; ../../plugins/Chat/log.c
+; ../../plugins/Chat/log.cpp
 ;[ (set by %s on %s)]
 ;[ (set by %s)]
 ;[Notice from %s: ]
@@ -88,10 +88,10 @@
 ;[You are now known as %s]
 ;[You have joined %s]
 
-; ../../plugins/Chat/main.c
+; ../../plugins/Chat/main.cpp
 ;[Miranda could not load the Chat plugin because Microsoft Rich Edit v 3 is missing.\nIf you are using Windows 95/98/NT or WINE please upgrade your Rich Edit control.\n\nDo you want to download an update now?.]
 
-; ../../plugins/Chat/options.c
+; ../../plugins/Chat/options.cpp
 ;[Action (10x10)]
 ;[Action message]
 ;[Add Status (10x10)]
@@ -252,11 +252,11 @@
 ;[Window Icon]
 ;[Your nickname]
 
-; ../../plugins/Chat/services.c
+; ../../plugins/Chat/services.cpp
 ;[&Join]
 ;[&Leave]
 
-; ../../plugins/Chat/tools.c
+; ../../plugins/Chat/tools.cpp
 ;[%s %c %s\n]
 ;[%s %s\n]
 ;[%s disables \'%s\' status for %s in %s]
@@ -279,7 +279,7 @@
 ;[The topic is \'%s\' (set by %s)]
 ;[Topic change in %s]
 
-; ../../plugins/Chat/window.c
+; ../../plugins/Chat/window.cpp
 ;[%s: Chat Room (%u user)]
 ;[%s: Chat Room (%u users)]
 ;[%s: Message Session]
diff --git a/plugins/Clist_classic/clist_classic-translation.txt b/plugins/Clist_classic/clist_classic-translation.txt
new file mode 100644
index 0000000000..2ccfedb7e5
--- /dev/null
+++ b/plugins/Clist_classic/clist_classic-translation.txt
@@ -0,0 +1,166 @@
+; Common strings that belong to many files
+;[Contact List]
+;[Groups]
+;[Status Bar]
+;[Window]
+
+; ../../plugins/Clist_classic/clcfonts.cpp
+;[Background]
+;[Contacts which are 'not on list']
+;[Dividers]
+;[Group member counts]
+;[Hottrack Text]
+;[Offline contacts]
+;[Offline contacts to whom you have a different visibility]
+;[Online contacts to whom you have a different visibility]
+;[Quicksearch Text]
+;[Selected Text]
+;[Standard contacts]
+
+; ../../plugins/Clist_classic/clcopts.cpp
+;[Away]
+;[DND]
+;[Free for chat]
+;[Invisible]
+;[List]
+;[List Background]
+;[NA]
+;[Not focused]
+;[Occupied]
+;[Offline]
+;[On the phone]
+;[Online]
+;[Out to lunch]
+
+; ../../plugins/Clist_classic/clistopts.cpp
+;[Global]
+
+; ../../plugins/Clist_classic/resource.rc
+;[% of screen]
+;[&Away\tCtrl+2]
+;[&DND\tCtrl+5]
+;[&Delete Group]
+;[&Free for chat\tCtrl+6]
+;[&Hide Offline Users]
+;[&Hide Offline Users in here]
+;[&Hide/Show]
+;[&Invisible\tCtrl+7]
+;[&NA\tCtrl+3]
+;[&New Group]
+;[&New Subgroup]
+;[&Offline\tCtrl+0]
+;[&Rename Group]
+;[&Status]
+;['Hide Offline' means to hide:]
+;[Active opacity:]
+;[Always on top]
+;[Always show status in tooltip]
+;[Are you sure you want to delete %s?]
+;[Ask before deleting contacts]
+;[Automatically resize window to height of list]
+;[Background colour]
+;[Contact List Background]
+;[Contact List Sorting]
+;[Contact list background:]
+;[Contact list:]
+;[Cycle icons every]
+;[Delete Contact]
+;[Dim idle contacts]
+;[Disable &Groups]
+;[Disable drag and drop of items]
+;[Disable groups]
+;[Disable icon blinking]
+;[Disable rename of items by clicking twice]
+;[Draw a line alongside group names]
+;[E&xit]
+;[Easy move]
+;[Enable docking]
+;[Fade contact list in/out]
+;[Gamma correction]
+;[Grey out entire list when:]
+;[Group]
+;[Hide &Empty Groups]
+;[Hide &Offline Users out here]
+;[Hide Miranda]
+;[Hide contact list after it has been idle for]
+;[Hide empty groups]
+;[Hide from list only, in order to keep their history and ignore/visibility settings]
+;[Hide group counts when there are none online]
+;[Hide offline users]
+;[Hide vertical scroll bar]
+;[Hot track items as mouse passes over]
+;[If window is partially covered, bring iy to front]
+;[If window is partially covered, bring to front instead of hiding]
+;[Inactive opacity:]
+;[Indent groups by:]
+;[Items]
+;[Left margin:]
+;[Make sections equal width]
+;[Make selection highlight translucent]
+;[Minimize to tray]
+;[No]
+;[Nowhere]
+;[Occ&upied\tCtrl+4]
+;[On the &Phone\tCtrl+8]
+;[On&line\tCtrl+1]
+;[Only when statuses differ]
+;[Ordering:]
+;[Out to &Lunch\tCtrl+9]
+;[Pin to desktop]
+;[Quicksearch in open groups only]
+;[Right click opens Miranda IM menu]
+;[Right click opens status menu]
+;[Row height:]
+;[Scroll list smoothly]
+;[Scroll with text]
+;[Selection colour]
+;[Show]
+;[Show bevels on panels]
+;[Show counts of number of contacts in a group]
+;[Show divider between online and offline contacts]
+;[Show drop shadow (restart required)]
+;[Show icons]
+;[Show menu bar]
+;[Show multiple icons]
+;[Show protocol names]
+;[Show resize grip indicator]
+;[Show selection even when list is not focused]
+;[Show status bar]
+;[Show status text]
+;[Show title bar]
+;[Single click interface]
+;[Size upwards]
+;[Slider2]
+;[Sort contacts by name]
+;[Sort contacts by protocol]
+;[Sort contacts by status]
+;[Sort groups alphabetically]
+;[Spin1]
+;[Spin5]
+;[Stretch proportionally]
+;[Stretch to height]
+;[Stretch to width]
+;[System tray icon]
+;[System tray icon when using multiple protocols]
+;[This will erase all history and settings for this contact!]
+;[Tile horizontally]
+;[Tile vertically]
+;[Time:]
+;[Title bar text:]
+;[Tool style main window]
+;[Translucency options (Windows 2000/XP only)]
+;[Transparent contact list]
+;[Tray]
+;[Use Options->Ignore (expert mode) to unhide contacts.]
+;[Use Windows colours]
+;[Use background image]
+;[Visual]
+;[Window:]
+;[Yes]
+;[icon when statuses differ]
+;[maximum]
+;[milliseconds]
+;[ms delay]
+;[pixels]
+;[seconds]
+;[seconds, when statuses differ]
diff --git a/plugins/Console/console-translation.txt b/plugins/Console/console-translation.txt
index 70874638bc..b590fbda35 100644
--- a/plugins/Console/console-translation.txt
+++ b/plugins/Console/console-translation.txt
@@ -1,7 +1,7 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/Console/Console.c
+; ../../plugins/Console/Console.cpp
 ;[&Help]
 ;[*** Console cleared ***]
 ;[*** Console paused ***]
diff --git a/plugins/CountryFlags/countryflags-translation.txt b/plugins/CountryFlags/countryflags-translation.txt
index a07ce75333..6643235c2a 100644
--- a/plugins/CountryFlags/countryflags-translation.txt
+++ b/plugins/CountryFlags/countryflags-translation.txt
@@ -1,11 +1,11 @@
 ; Common strings that belong to many files
 ;[Country Flags]
 
-; ../../plugins/CountryFlags/extraimg.c
+; ../../plugins/CountryFlags/extraimg.cpp
 ;[Advanced #%u]
 ;[Contact List]
 
-; ../../plugins/CountryFlags/main.c
+; ../../plugins/CountryFlags/main.cpp
 ;[Country Flags Plugin]
 ;[The Country Flags Plugin can not be loaded. It requires Miranda IM %hs or later.]
 
diff --git a/plugins/Db3x/db3x-translation.txt b/plugins/Db3x/db3x-translation.txt
index e08a272b4f..e7f834f1e1 100644
--- a/plugins/Db3x/db3x-translation.txt
+++ b/plugins/Db3x/db3x-translation.txt
@@ -1,7 +1,7 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/Db3x/database.c
+; ../../plugins/Db3x/database.cpp
 ;[Database Panic]
 ;[Miranda has detected corruption in your database. This corruption maybe fixed by DBTool.  Please download it from http://www.miranda-im.org. Miranda will now shutdown.]
 
diff --git a/plugins/Db3x_mmap/db3x_mmap-translation.txt b/plugins/Db3x_mmap/db3x_mmap-translation.txt
index 6b8820f7ab..cd23ce15ba 100644
--- a/plugins/Db3x_mmap/db3x_mmap-translation.txt
+++ b/plugins/Db3x_mmap/db3x_mmap-translation.txt
@@ -1,7 +1,7 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/Db3x_mmap/database.c
+; ../../plugins/Db3x_mmap/database.cpp
 ;[Database Error]
 ;[Database Panic]
 ;[Database failure. Miranda will now shutdown.]
diff --git a/plugins/Db_autobackups/db_autobackups-translation.txt b/plugins/Db_autobackups/db_autobackups-translation.txt
index daa678584c..c9281a611a 100644
--- a/plugins/Db_autobackups/db_autobackups-translation.txt
+++ b/plugins/Db_autobackups/db_autobackups-translation.txt
@@ -1,7 +1,7 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/Db_autobackups/backup.c
+; ../../plugins/Db_autobackups/backup.cpp
 ;[All Files]
 ;[Backup in Progress]
 ;[Copying database file...]
@@ -25,12 +25,12 @@
 ;[When Miranda exits]
 ;[When Miranda starts]
 
-; ../../plugins/Db_autobackups/main.c
+; ../../plugins/Db_autobackups/main.cpp
 ;[Backup Profile]
 ;[Database]
 ;[Save Profile As...]
 
-; ../../plugins/Db_autobackups/options.c
+; ../../plugins/Db_autobackups/options.cpp
 ;[Database AutoBackups]
 ;[Days]
 ;[Error Creating Backup Folder]
diff --git a/plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt b/plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt
index 4074188070..a89cd1b8ea 100644
--- a/plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt
+++ b/plugins/Dbx_mmap_SA/dbx_mmap_sa-translation.txt
@@ -159,7 +159,7 @@
 ;[Elapsed time: %d sec]
 ;[Processing aborted by user]
 
-; ../../plugins/Dbx_mmap_SA/Import_SA/main.c
+; ../../plugins/Dbx_mmap_SA/Import_SA/main.cpp
 ;[&Import...]
 ;[Added %s contact %s]
 ;[Added %s contact %s, '%s']
@@ -168,7 +168,7 @@
 ;[Ignored event from/to self]
 ;[Skipping duplicate group %s.]
 
-; ../../plugins/Dbx_mmap_SA/Import_SA/mirabilis.c
+; ../../plugins/Dbx_mmap_SA/Import_SA/mirabilis.cpp
 ;[Added %d events and skipped %d duplicates.]
 ;[All groups may not have not been imported.]
 ;[Attempting to parse group list, type %d.]
@@ -228,7 +228,7 @@
 ;[This looks like a ICQ 99b database.]
 ;[default]
 
-; ../../plugins/Dbx_mmap_SA/Import_SA/miranda.c
+; ../../plugins/Dbx_mmap_SA/Import_SA/miranda.cpp
 ;[Added %d contacts, %d groups and %d events.]
 ;[Could not open file.]
 ;[DEBUG: Deleted setting treated as 0-length setting]
@@ -310,10 +310,10 @@
 ;[Warning: Mirabilis ICQ running. Import may not be reliable.]
 ;[You will probably never need to use this wizard again, so you can save memory by not loading it every time you start Miranda. This will mean that the import menu item will no longer be available.]
 
-; ../../plugins/Dbx_mmap_SA/Import_SA/wizard.c
+; ../../plugins/Dbx_mmap_SA/Import_SA/wizard.cpp
 ;[Finish]
 
-; ../../plugins/Dbx_mmap_SA/database.c
+; ../../plugins/Dbx_mmap_SA/database.cpp
 ;[Database Error]
 ;[Database Panic]
 ;[Database failure. Miranda will now shutdown.]
@@ -357,7 +357,7 @@
 ;[Yes]
 ;[to the value]
 
-; ../../plugins/Dbx_mmap_SA/dialogs.c
+; ../../plugins/Dbx_mmap_SA/dialogs.cpp
 ;[Database Features]
 ;[Dll]
 ;[Name]
@@ -369,11 +369,11 @@
 ;[Version]
 ;[Wrong password!]
 
-; ../../plugins/Dbx_mmap_SA/init.c
+; ../../plugins/Dbx_mmap_SA/init.cpp
 ;[Running mmap_sa is forbidden under license violating products, sorry]
 ;[Warning!]
 
-; ../../plugins/Dbx_mmap_SA/security.c
+; ../../plugins/Dbx_mmap_SA/security.cpp
 ;[Crypto module hasn't been chosen, using first one found]
 ;[Crypto modules not found]
 ;[DB is already secured!]
diff --git a/plugins/HistoryLinkListPlus/historylinklistplus-translation.txt b/plugins/HistoryLinkListPlus/historylinklistplus-translation.txt
index e5a74b97f9..cd419cb143 100644
--- a/plugins/HistoryLinkListPlus/historylinklistplus-translation.txt
+++ b/plugins/HistoryLinkListPlus/historylinklistplus-translation.txt
@@ -1,7 +1,7 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/HistoryLinkListPlus/linklist.c
+; ../../plugins/HistoryLinkListPlus/linklist.cpp
 ;[&Create Linklist]
 ;[Could not allocate memory!]
 ;[Could not create window!]
@@ -62,10 +62,10 @@
 ;[Web addresses only]
 ;[link]
 
-; ../../plugins/HistoryLinkListPlus/linklist_dlg.c
+; ../../plugins/HistoryLinkListPlus/linklist_dlg.cpp
 ;[Linklist Plugin]
 
-; ../../plugins/HistoryLinkListPlus/linklist_fct.c
+; ../../plugins/HistoryLinkListPlus/linklist_fct.cpp
 ;[Matches for searchtext]
 ;[No messages found!\nPlease change current filter options.]
 ;[Processing list...]
diff --git a/plugins/HistorySweeperLight/historysweeperlight-translation.txt b/plugins/HistorySweeperLight/historysweeperlight-translation.txt
index 4a9536ee73..5601d12f3b 100644
--- a/plugins/HistorySweeperLight/historysweeperlight-translation.txt
+++ b/plugins/HistorySweeperLight/historysweeperlight-translation.txt
@@ -8,7 +8,7 @@
 ;[History Sweeper Light]
 ;[Sweep history for this contacts:]
 
-; ../../plugins/HistorySweeperLight/options.c
+; ../../plugins/HistorySweeperLight/options.cpp
 ;[*** Defaut Action ***]
 ;[*** System History ***]
 ;[History]
diff --git a/plugins/Import/import-translation.txt b/plugins/Import/import-translation.txt
index 37489bef6a..18838c6ad9 100644
--- a/plugins/Import/import-translation.txt
+++ b/plugins/Import/import-translation.txt
@@ -6,7 +6,7 @@
 ;[Importing groups.]
 ;[The given file does not exist. Please check that you have entered the name correctly.]
 
-; ../../plugins/Import/main.c
+; ../../plugins/Import/main.cpp
 ;[&Import...]
 ;[Added %s contact %s]
 ;[Added %s contact %s, '%s']
@@ -15,7 +15,7 @@
 ;[Ignored event from/to self]
 ;[Skipping duplicate group %s.]
 
-; ../../plugins/Import/mirabilis.c
+; ../../plugins/Import/mirabilis.cpp
 ;[Added %d events and skipped %d duplicates.]
 ;[All groups may not have not been imported.]
 ;[Attempting to parse group list, type %d.]
@@ -75,7 +75,7 @@
 ;[This looks like a ICQ 99b database.]
 ;[default]
 
-; ../../plugins/Import/miranda.c
+; ../../plugins/Import/miranda.cpp
 ;[Added %d contacts, %d groups and %d events.]
 ;[Could not open file.]
 ;[DEBUG: Deleted setting treated as 0-length setting]
@@ -160,5 +160,5 @@
 ;[Warning: Mirabilis ICQ running. Import may not be reliable.]
 ;[You will probably never need to use this wizard again, so you can save memory by not loading it every time you start Miranda. This will mean that the import menu item will no longer be available.]
 
-; ../../plugins/Import/wizard.c
+; ../../plugins/Import/wizard.cpp
 ;[Finish]
diff --git a/plugins/MenuItemEx/menuitemex-translation.txt b/plugins/MenuItemEx/menuitemex-translation.txt
index 5f8f34cad7..e894e19776 100644
--- a/plugins/MenuItemEx/menuitemex-translation.txt
+++ b/plugins/MenuItemEx/menuitemex-translation.txt
@@ -22,7 +22,7 @@
 ;[Trim too long ID]
 ;[Visibility]
 
-; ../../plugins/MenuItemEx/main.c
+; ../../plugins/MenuItemEx/main.cpp
 ;[Activity text]
 ;[Activity title]
 ;[All]
@@ -47,7 +47,7 @@
 ;[XStatus title]
 ;[You Were Added]
 
-; ../../plugins/MenuItemEx/options.c
+; ../../plugins/MenuItemEx/options.cpp
 ;[Customize]
 
 ; ../../plugins/MenuItemEx/resource.rc
diff --git a/plugins/MetaContacts/metacontacts-translation.txt b/plugins/MetaContacts/metacontacts-translation.txt
index d7b8a937ea..9a4e07a013 100644
--- a/plugins/MetaContacts/metacontacts-translation.txt
+++ b/plugins/MetaContacts/metacontacts-translation.txt
@@ -59,7 +59,7 @@
 ;[Use subcontact message windows]
 ;[but only for the current conversation]
 
-; ../../plugins/MetaContacts/addto.c
+; ../../plugins/MetaContacts/addto.cpp
 ;[Adding %s...]
 ;[Assignment failure]
 ;[Assignment to the MetaContact failed.]
@@ -77,7 +77,7 @@
 ;[This contact is a MetaContact.\nYou can't add a MetaContact to another MetaContact.\n\nPlease choose another.]
 ;[This contact is already associated to a MetaContact.\nYou cannot add a contact to multiple MetaContacts.]
 
-; ../../plugins/MetaContacts/edit.c
+; ../../plugins/MetaContacts/edit.cpp
 ;[Contact]
 ;[Id]
 ;[No]
@@ -85,10 +85,10 @@
 ;[Send Offline]
 ;[Yes]
 
-; ../../plugins/MetaContacts/meta_main.c
+; ../../plugins/MetaContacts/meta_main.cpp
 ;[Error - Database corruption.\nPlugin disabled.]
 
-; ../../plugins/MetaContacts/meta_menu.c
+; ../../plugins/MetaContacts/meta_menu.cpp
 ;[Are you sure?]
 ;[Delete MetaContact]
 ;[Error]
@@ -98,10 +98,10 @@
 ;[This will remove the MetaContact permanently.\n\nProceed Anyway?]
 ;[Unforce Default]
 
-; ../../plugins/MetaContacts/meta_options.c
+; ../../plugins/MetaContacts/meta_options.cpp
 ;[<default>]
 
-; ../../plugins/MetaContacts/meta_services.c
+; ../../plugins/MetaContacts/meta_services.cpp
 ;[Context]
 ;[General]
 ;[History]
@@ -110,7 +110,7 @@
 ;[No online contacts found.]
 ;[Priorities]
 
-; ../../plugins/MetaContacts/meta_utils.c
+; ../../plugins/MetaContacts/meta_utils.cpp
 ;[(Unknown Contact)]
 ;[Assignment Error]
 ;[Away]
diff --git a/plugins/NewEventNotify/main.c b/plugins/NewEventNotify/main.c
index 5b019f0b5a..c6240c0402 100644
--- a/plugins/NewEventNotify/main.c
+++ b/plugins/NewEventNotify/main.c
@@ -289,36 +289,38 @@ int CheckMsgWnd(HANDLE hContact)
 		else 
 			return 0;
 	}
-	else 
+	/*else 
 	{	// old way: find it by using the window class & title
-		char newtitle[256];
-		char *szProto,*szStatus,*contactName;
+		TCHAR *newtitle = _T("");
+		TCHAR *szStatus, *contactName;
+		char *szProto;
 
-		szProto= (char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact,0);
-		contactName= (char*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact,0);
-		szStatus= (char*)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto?DBGetContactSettingWord(hContact,szProto,"Status",ID_STATUS_OFFLINE):ID_STATUS_OFFLINE,0);
+		szProto= (char *)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact,0);
+		contactName= (TCHAR *)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact,0);
+		szStatus= (TCHAR *)CallService(MS_CLIST_GETSTATUSMODEDESCRIPTION, szProto ? DBGetContactSettingWord(hContact,szProto,"Status",ID_STATUS_OFFLINE) : ID_STATUS_OFFLINE,0);
 
 	// vj: This code was added by preeze and it does not work:
 	// vlko: it maybe work with other plugins 
-		_snprintf(newtitle,sizeof(newtitle),"%s  (%s)",contactName,szStatus);
-		if(FindWindow("TMsgWindow",newtitle))
+		_sntprintf(newtitle,sizeof(newtitle),_T("%s  (%s)"),contactName,szStatus);
+		if(FindWindowA("TMsgWindow",(char *)newtitle))
 			return 2;
 
-		_snprintf(newtitle,sizeof(newtitle),"[%s  (%s)]",contactName,szStatus);
-		if(FindWindow("TfrmContainer",newtitle))
+		_sntprintf(newtitle,sizeof(newtitle),_T("[%s  (%s)]"),contactName,szStatus);
+		if(FindWindowA("TfrmContainer",(char *)newtitle))
 			return 1;
 
 	// vj: I have restored this code from original plugin's source: (NewEventNotify 0.0.4)
-		_snprintf(newtitle,sizeof(newtitle),"%s (%s): %s",contactName,szStatus,Translate("Message Session"));
-		if(FindWindow("#32770",newtitle)) // JK, this works for old SRMMs (1.0.4.x) and for mine SRMMJ
+		_sntprintf(newtitle,sizeof(newtitle),_T("%s (%s): %s"),contactName,szStatus,Translate("Message Session"));
+		if(FindWindowA("#32770",(char *)newtitle)) // JK, this works for old SRMMs (1.0.4.x) and for mine SRMMJ
 			return 1;
 
-		_snprintf(newtitle,sizeof(newtitle),"%s (%s): %s",contactName,szStatus,Translate("Message Received"));
-		if(FindWindow("#32770",newtitle))
+		_sntprintf(newtitle,sizeof(newtitle),_T("%s (%s): %s"),contactName,szStatus,Translate("Message Received"));
+		if(FindWindowA("#32770",(char *)newtitle))
 			return 2;
 
 		return 0;
-	}
+	}*/
+	return 1;
 }
 
 
diff --git a/plugins/NewEventNotify/neweventnotify-translation.txt b/plugins/NewEventNotify/neweventnotify-translation.txt
new file mode 100644
index 0000000000..3df8e8a907
--- /dev/null
+++ b/plugins/NewEventNotify/neweventnotify-translation.txt
@@ -0,0 +1,56 @@
+; Common strings that belong to many files
+;[]
+
+; ../../plugins/NewEventNotify/main.c
+;[Message Received]
+;[Message Session]
+
+; ../../plugins/NewEventNotify/menuitem.c
+;[PopUps]
+
+; ../../plugins/NewEventNotify/popup.c
+;[ added you to the contact list]
+;[ requested authorization]
+;[Number of new message: ]
+;[Plugin Test]
+;[Received %d contacts.]
+;[This is a sample URL event ;-)]
+;[This is a sample file event :-D]
+;[This is a sample message event :-)]
+;[This is a sample other event ;-D]
+
+; ../../plugins/NewEventNotify/resource.rc
+;[Background]
+;[Dismiss Event]
+;[Dismiss Popup]
+;[Don't show Popup when Message-Dialog is already open]
+;[Edit]
+;[File]
+;[General Options]
+;[Hide Popup when sending new message]
+;[Last message display first]
+;[Last message display last]
+;[Left Click Actions]
+;[Merge popups from one user]
+;[Message]
+;[Message-Event only]
+;[No popups for RSS contacts]
+;[No popups for read messages]
+;[Notify me of ...]
+;[Number of begin shown messages]
+;[Open Event]
+;[Open Reply-Dialog instead of reading the Message]
+;[Others]
+;[Popup Options]
+;[Preview]
+;[Right Click Actions]
+;[Show Date]
+;[Show Headers]
+;[Show Preview of Event in Popup]
+;[Show Time]
+;[Show entry in the PopUps menu]
+;[Temporarily disable Event Popups]
+;[Text]
+;[Time Expires Actions]
+;[Time to expires]
+;[URL]
diff --git a/plugins/NewEventNotify/neweventnotify.h b/plugins/NewEventNotify/neweventnotify.h
index cf1fed29c0..b70ecbb38a 100644
--- a/plugins/NewEventNotify/neweventnotify.h
+++ b/plugins/NewEventNotify/neweventnotify.h
@@ -118,15 +118,15 @@
 //---------------------------
 //---Translateable Strings
 
-#define POPUP_COMMENT_MESSAGE "Message"
-#define POPUP_COMMENT_URL "URL"
-#define POPUP_COMMENT_FILE "File"
-#define POPUP_COMMENT_CONTACTS "Contacts"
-#define POPUP_COMMENT_ADDED "You were added!"
-#define POPUP_COMMENT_AUTH "Requests your authorisation"
-#define POPUP_COMMENT_WEBPAGER "ICQ Web pager"
-#define POPUP_COMMENT_EMAILEXP "ICQ Email express"
-#define POPUP_COMMENT_OTHER "Unknown Event"
+#define POPUP_COMMENT_MESSAGE _T("Message")
+#define POPUP_COMMENT_URL _T("URL")
+#define POPUP_COMMENT_FILE _T("File")
+#define POPUP_COMMENT_CONTACTS _T("Contacts")
+#define POPUP_COMMENT_ADDED _T("You were added!")
+#define POPUP_COMMENT_AUTH _T("Requests your authorisation")
+#define POPUP_COMMENT_WEBPAGER _T("ICQ Web pager")
+#define POPUP_COMMENT_EMAILEXP _T("ICQ Email express")
+#define POPUP_COMMENT_OTHER _T("Unknown Event")
 
 #define OPTIONS_GROUP "PopUps"
 #define OPTIONS_TITLE "Event Notify"
diff --git a/plugins/NewEventNotify/neweventnotify.vcxproj b/plugins/NewEventNotify/neweventnotify.vcxproj
index ea2c4b1c0f..d8741c62c3 100644
--- a/plugins/NewEventNotify/neweventnotify.vcxproj
+++ b/plugins/NewEventNotify/neweventnotify.vcxproj
@@ -26,24 +26,24 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
     <WholeProgramOptimization>true</WholeProgramOptimization>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseOfMfc>false</UseOfMfc>
-    <CharacterSet>MultiByte</CharacterSet>
+    <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <ImportGroup Label="ExtensionSettings">
@@ -78,7 +78,8 @@
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <OutDir>$(SolutionDir)$(Configuration)\Plugins\</OutDir>
     <IntDir>$(SolutionDir)$(Configuration)\Obj\$(ProjectName)\</IntDir>
-    <LinkIncremental>false</LinkIncremental>
+    <LinkIncremental>
+    </LinkIncremental>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
     <OutDir>$(SolutionDir)$(Configuration)64\Plugins\</OutDir>
@@ -110,7 +111,8 @@
     <ResourceCompile>
       <Culture>0x0415</Culture>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
     </ResourceCompile>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -122,6 +124,7 @@
       <SubSystem>Console</SubSystem>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -147,7 +150,8 @@
     <ResourceCompile>
       <Culture>0x0415</Culture>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
     </ResourceCompile>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -156,7 +160,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkDLL>true</LinkDLL>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
@@ -166,13 +170,15 @@
       <RuntimeLibrary>MultiThreadedDLL</RuntimeLibrary>
       <InlineFunctionExpansion>OnlyExplicitInline</InlineFunctionExpansion>
       <StringPooling>true</StringPooling>
-      <FunctionLevelLinking>true</FunctionLevelLinking>
+      <FunctionLevelLinking>false</FunctionLevelLinking>
       <Optimization>Full</Optimization>
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <WarningLevel>Level3</WarningLevel>
       <AdditionalIncludeDirectories>..\..\include;..\ExternalAPI;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
       <PreprocessorDefinitions>WIN32;NDEBUG;_WINDOWS;_USRDLL;NEWEVENTNOTIFY_EXPORTS;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <FavorSizeOrSpeed>Size</FavorSizeOrSpeed>
+      <BufferSecurityCheck>false</BufferSecurityCheck>
+      <PrecompiledHeader>NotUsing</PrecompiledHeader>
     </ClCompile>
     <Midl>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -184,7 +190,8 @@
     <ResourceCompile>
       <Culture>0x0415</Culture>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
     </ResourceCompile>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -193,11 +200,12 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkDLL>true</LinkDLL>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OptimizeReferences>true</OptimizeReferences>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <RandomizedBaseAddress>true</RandomizedBaseAddress>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -222,7 +230,8 @@
     <ResourceCompile>
       <Culture>0x0415</Culture>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
-      <IgnoreStandardIncludePath>..\..\include\msapi</IgnoreStandardIncludePath>
+      <IgnoreStandardIncludePath>
+      </IgnoreStandardIncludePath>
     </ResourceCompile>
     <Bscmake>
       <SuppressStartupBanner>true</SuppressStartupBanner>
@@ -231,7 +240,7 @@
       <SuppressStartupBanner>true</SuppressStartupBanner>
       <LinkDLL>true</LinkDLL>
       <GenerateDebugInformation>true</GenerateDebugInformation>
-      <SubSystem>Console</SubSystem>
+      <SubSystem>Windows</SubSystem>
       <ImportLibrary>$(IntDir)$(TargetName).lib</ImportLibrary>
       <AdditionalDependencies>odbc32.lib;odbccp32.lib;%(AdditionalDependencies)</AdditionalDependencies>
       <OptimizeReferences>true</OptimizeReferences>
diff --git a/plugins/NewEventNotify/options.c b/plugins/NewEventNotify/options.c
index 5e45cee607..401ab0941d 100644
--- a/plugins/NewEventNotify/options.c
+++ b/plugins/NewEventNotify/options.c
@@ -308,7 +308,7 @@ int OptionsAdd(HINSTANCE hInst, WPARAM addInfo)
 	odp.cbSize = sizeof(odp);
 //	odp.position = 100000000;
 	odp.hInstance = hInst;
-	odp.pszTemplate = MAKEINTRESOURCE(IDD_OPT);
+	odp.pszTemplate = (char *)MAKEINTRESOURCE(IDD_OPT);
 	odp.ptszTitle = NENTranslateT(OPTIONS_TITLE, wsTitle);
 	odp.ptszGroup = NENTranslateT(OPTIONS_GROUP, wsGroup);
 //	odp.groupPosition = 910000000;
diff --git a/plugins/NewEventNotify/popup.c b/plugins/NewEventNotify/popup.c
index 3ba52fded7..966b0630fe 100644
--- a/plugins/NewEventNotify/popup.c
+++ b/plugins/NewEventNotify/popup.c
@@ -99,12 +99,12 @@ static void FreePopupEventData(PLUGIN_DATA* pdata)
 		if (eventData->next)
 		{
 			eventData = eventData->next;
-			free(eventData->prev);
+			mir_free(eventData->prev);
 			eventData->prev = NULL;
 		}
 		else
 		{
-			free(eventData);
+			mir_free(eventData);
 			eventData = NULL;
 		}
 	}		
@@ -195,7 +195,7 @@ static BOOL CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
       break;
 		case UM_FREEPLUGINDATA:
 			PopupCount--;
-      free(pdata);
+      mir_free(pdata);
 			return TRUE;
 		case UM_INITPOPUP:
 			pdata->hWnd = hWnd;
@@ -234,9 +234,9 @@ static BOOL CALLBACK PopupDlgProc(HWND hWnd, UINT message, WPARAM wParam, LPARAM
 
 static TCHAR* event_to_tchar(char* pBlob, DWORD flags)
 {
-  if (flags & DBEF_UTF)
-    return utf8_to_tchar(pBlob);
-  else
+//  if (flags & DBEF_UTF)
+//    return utf8_to_tchar(pBlob);
+//  else
     return ansi_to_tchar(pBlob);
 }
 
@@ -257,15 +257,15 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
         { // utf-8 in blob
           comment1 = utf8_to_tchar(dbei->pBlob);
         } 
-        else if (dbei->cbBlob == (strlennull(dbei->pBlob)+1)*(sizeof(WCHAR)+1))
+        else if (dbei->cbBlob == (strlennull((char *)dbei->pBlob)+1)*(sizeof(WCHAR)+1))
         { // wchar in blob (the old hack)
           if (g_UnicodeCore)
-            comment1 = strdupT((TCHAR*)(dbei->pBlob + strlennull(dbei->pBlob) + 1));
+            comment1 = strdupT((TCHAR*)(dbei->pBlob + strlennull((char *)dbei->pBlob) + 1));
           else
             comment1 = strdupT((TCHAR*)dbei->pBlob);
         } 
         else
-          comment1 = ansi_to_tchar(dbei->pBlob);
+          comment1 = (TCHAR *)(dbei->pBlob);
       }
       commentFix = POPUP_COMMENT_MESSAGE;
       break;
@@ -273,17 +273,17 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 
 		case EVENTTYPE_URL:
       // url
-			if (dbei->pBlob) comment2 = ansi_to_tchar(dbei->pBlob);
+			if (dbei->pBlob) comment2 = (TCHAR *)(dbei->pBlob);
       // comment
-			if (dbei->pBlob) comment1 = ansi_to_tchar(dbei->pBlob + strlennull(dbei->pBlob) + 1);
+			if (dbei->pBlob) comment1 = (TCHAR *)(dbei->pBlob + strlennull((char *)dbei->pBlob) + 1);
 			commentFix = POPUP_COMMENT_URL;
 			break;
 
 		case EVENTTYPE_FILE:
       // filenames
-			if (dbei->pBlob) comment2 = event_to_tchar(dbei->pBlob + 4, dbei->flags);
+			if (dbei->pBlob) comment2 = event_to_tchar((char *)dbei->pBlob + 4, dbei->flags);
       // description
-			if (dbei->pBlob) comment1 = event_to_tchar(dbei->pBlob + strlennull(dbei->pBlob + 4) + 1, dbei->flags);
+			if (dbei->pBlob) comment1 = event_to_tchar((char *)dbei->pBlob + strlennull((char *)dbei->pBlob + 4) + 1, dbei->flags);
 			commentFix = POPUP_COMMENT_FILE;
 			break;
 
@@ -293,8 +293,8 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
     case EVENTTYPE_CONTACTS:
       if (dbei->pBlob)
       { // count contacts in event
-        char* pcBlob = dbei->pBlob;
-        char* pcEnd = dbei->pBlob + dbei->cbBlob;
+        char* pcBlob = (char *)dbei->pBlob;
+        char* pcEnd = (char *)dbei->pBlob + dbei->cbBlob;
         int nContacts;
         TCHAR szBuf[512];
         WCHAR szTmp[512];
@@ -310,11 +310,11 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
         }
         if (g_UnicodeCore)
         {
-          _snwprintf((WCHAR*)szBuf, SIZEOF(szBuf), (WCHAR*)NENTranslateT("Received %d contacts.", szTmp), nContacts);
+          _sntprintf((WCHAR*)szBuf, SIZEOF(szBuf), (WCHAR*)NENTranslateT("Received %d contacts.", szTmp), nContacts);
           ((WCHAR*)szBuf)[255] = 0;
         }
         else
-          _snprintfT(szBuf, SIZEOF(szBuf), NENTranslateT("Received %d contacts.", szTmp), nContacts);
+          _snprintfT(szBuf, SIZEOF(szBuf), (char *)NENTranslateT("Received %d contacts.", szTmp), nContacts);
         comment1 = strdupT(szBuf);
       }
       commentFix = POPUP_COMMENT_CONTACTS;
@@ -330,27 +330,27 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
     case EVENTTYPE_ADDED:
       if (dbei->pBlob)
       {
-        char szUin[16];
+        TCHAR szUin[16];
         TCHAR szBuf[2048];
         TCHAR* szNick = NULL;
-        char *pszNick = dbei->pBlob + 8;
-        char *pszFirst = pszNick + strlennull(pszNick) + 1;
-        char *pszLast = pszFirst + strlennull(pszFirst) + 1;
-        char *pszEmail = pszLast + strlennull(pszLast) + 1;
-
-        _snprintf(szUin, 16, "%d", *((DWORD*)dbei->pBlob));
-        if (strlennull(pszNick) > 0)
-          szNick = event_to_tchar(pszNick, dbei->flags);
-        else if (strlennull(pszEmail) > 0)
-          szNick = event_to_tchar(pszEmail, dbei->flags);
+        TCHAR *pszNick = (TCHAR *)dbei->pBlob + 8;
+        TCHAR *pszFirst = pszNick + strlennull((char *)pszNick) + 1;
+        TCHAR *pszLast = pszFirst + strlennull((char *)pszFirst) + 1;
+        TCHAR *pszEmail = pszLast + strlennull((char *)pszLast) + 1;
+
+        _sntprintf(szUin, 16, _T("%d"), *((DWORD*)dbei->pBlob));
+        if (strlennull((char *)pszNick) > 0)
+          szNick = pszNick;
+        else if (strlennull((char *)pszEmail) > 0)
+          szNick = pszEmail;
         else if (*((DWORD*)dbei->pBlob) > 0)
-          szNick = ansi_to_tchar(szUin);
+          szNick = szUin;
 
         if (szNick)
         {
           strcpyT(szBuf, szNick);
           strcatT(szBuf, NENTranslateT(" added you to the contact list", (WCHAR*)szBuf + strlenT(szBuf) + 1));
-          free(szNick);
+          mir_free(szNick);
           comment1 = strdupT(szBuf);
         }
       }
@@ -360,27 +360,27 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 		case EVENTTYPE_AUTHREQUEST:
       if (dbei->pBlob)
       {
-        char szUin[16];
+        TCHAR szUin[16];
         TCHAR szBuf[2048];
         TCHAR* szNick = NULL;
-        char *pszNick = dbei->pBlob + 8;
-        char *pszFirst = pszNick + strlennull(pszNick) + 1;
-        char *pszLast = pszFirst + strlennull(pszFirst) + 1;
-        char *pszEmail = pszLast + strlennull(pszLast) + 1;
-
-        _snprintf(szUin, 16, "%d", *((DWORD*)dbei->pBlob));
-        if (strlennull(pszNick) > 0)
-          szNick = event_to_tchar(pszNick, dbei->flags);
-        else if (strlennull(pszEmail) > 0)
-          szNick = event_to_tchar(pszEmail, dbei->flags);
+        TCHAR *pszNick = (TCHAR *)dbei->pBlob + 8;
+        TCHAR *pszFirst = pszNick + strlennull((char *)pszNick) + 1;
+        TCHAR *pszLast = pszFirst + strlennull((char *)pszFirst) + 1;
+        TCHAR *pszEmail = pszLast + strlennull((char *)pszLast) + 1;
+
+        _snwprintf(szUin, 16, _T("%d"), *((DWORD*)dbei->pBlob));
+        if (strlennull((char *)pszNick) > 0)
+          szNick = pszNick;
+        else if (strlennull((char *)pszEmail) > 0)
+          szNick = pszEmail;
         else if (*((DWORD*)dbei->pBlob) > 0)
-          szNick = ansi_to_tchar(szUin);
+          szNick = szUin;
 
         if (szNick)
         {
           strcpyT(szBuf, szNick);
           strcatT(szBuf, NENTranslateT(" requested authorization", (WCHAR*)szBuf + strlenT(szBuf) + 1));
-          free(szNick);
+          mir_free(szNick);
           comment1 = strdupT(szBuf);
         }
       }
@@ -392,7 +392,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 //ASCIIZ    from name
 //ASCIIZ    from e-mail
     case ICQEVENTTYPE_WEBPAGER:
-			if (dbei->pBlob) comment1 = ansi_to_tchar(dbei->pBlob);
+			if (dbei->pBlob) comment1 = (TCHAR *)(dbei->pBlob);
 //			if (dbei->pBlob) comment1 = dbei->pBlob + strlennull(comment2) + 1;
 		  commentFix = POPUP_COMMENT_WEBPAGER;
 		  break;
@@ -402,7 +402,7 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
 //ASCIIZ    from name
 //ASCIIZ    from e-mail
     case ICQEVENTTYPE_EMAILEXPRESS:
-			if (dbei->pBlob) comment1 = ansi_to_tchar(dbei->pBlob);
+			if (dbei->pBlob) comment1 = (TCHAR *)(dbei->pBlob);
 //			if (dbei->pBlob) comment1 = dbei->pBlob + strlennull(comment2) + 1;
 		  commentFix = POPUP_COMMENT_EMAILEXP;
       break;
@@ -411,48 +411,50 @@ static TCHAR* GetEventPreview(DBEVENTINFO *dbei)
     {
       if (ServiceExists(MS_DB_EVENT_GETTYPE))
       {
-        DBEVENTTYPEDESCR* pei = (DBEVENTTYPEDESCR*)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
-        if (pei && pei->cbSize >= DBEVENTTYPEDESCR_SIZE_V1)
+        DBEVENTTYPEDESCR *pei = (DBEVENTTYPEDESCR *)CallService(MS_DB_EVENT_GETTYPE, (WPARAM)dbei->szModule, (LPARAM)dbei->eventType);
+		if ((pei && pei->cbSize) >= DBEVENTTYPEDESCR_SIZE)
         { // support for custom database event types
           if (dbei->pBlob)
           { // preview requested
             DBEVENTGETTEXT svc = {dbei, g_UnicodeCore ? DBVT_WCHAR : DBVT_ASCIIZ, CP_ACP};
-            TCHAR *pet = (TCHAR*)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&svc);
+            char *pet = (char *)CallService(MS_DB_EVENT_GETTEXT, 0, (LPARAM)&svc);
             if (pet)
             { // we've got event text, move to our memory space
-              comment1 = strdupT(pet);
-              mir_free(pet);
+              comment1 = strdupT((TCHAR *)pet);
+              mir_free(&pet);
             }
           }
-          commentFix = pei->descr;
+          commentFix = (TCHAR *)pei->descr;
         }
         else
           commentFix = POPUP_COMMENT_OTHER;
-      }
-      else
-        commentFix = POPUP_COMMENT_OTHER;
+		
+		break;
+	  }
+     // else
+       // commentFix = POPUP_COMMENT_OTHER;
+
 
-      break;
     }
   }
 
   if (strlenT(comment1) > 0)
   {
-    free(comment2);
+    mir_free(comment2);
     return comment1;
   }
   if (strlenT(comment2) > 0)
   {
-    free(comment1);
+    mir_free(comment1);
     return comment2;
   }
-  free(comment1);
-  free(comment2);
+  mir_free(comment1);
+  mir_free(comment2);
 
   {
     WCHAR tmp[MAX_PATH];
 
-    return strdupT(NENTranslateT(commentFix, tmp));
+    return strdupT(NENTranslateT((char *)commentFix, tmp));
   }
 }
 
@@ -463,7 +465,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
   PLUGIN_DATA* pdata;
   DBEVENTINFO dbe = {0};
 	EVENT_DATA_EX* eventData;
-	TCHAR* sampleEvent;
+	char* sampleEvent;
 	long iSeconds;
   
 	//there has to be a maximum number of popups shown at the same time
@@ -483,7 +485,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorMsg ? 0 : pluginOptions->colBackMsg;
 				pudw.colorText = pluginOptions->bDefaultColorMsg ? 0 : pluginOptions->colTextMsg;
 				iSeconds = pluginOptions->iDelayMsg;
-				sampleEvent = "This is a sample message event :-)";
+				sampleEvent = LPGEN("This is a sample message event :-)");
         break;
       case EVENTTYPE_URL:
         if (!(pluginOptions->maskNotify&MASK_URL)) return 1;
@@ -491,7 +493,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorUrl ? 0 : pluginOptions->colBackUrl;
 				pudw.colorText = pluginOptions->bDefaultColorUrl ? 0 : pluginOptions->colTextUrl;
 				iSeconds = pluginOptions->iDelayUrl;
-				sampleEvent = "This is a sample URL event ;-)";
+				sampleEvent = LPGEN("This is a sample URL event ;-)");
         break;
       case EVENTTYPE_FILE:
         if (!(pluginOptions->maskNotify&MASK_FILE)) return 1;
@@ -499,7 +501,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorFile ? 0 : pluginOptions->colBackFile;
 				pudw.colorText = pluginOptions->bDefaultColorFile ? 0 : pluginOptions->colTextFile;
 				iSeconds = pluginOptions->iDelayFile;
-				sampleEvent = "This is a sample file event :-D";
+				sampleEvent = LPGEN("This is a sample file event :-D");
         break;
       default:
         if (!(pluginOptions->maskNotify&MASK_OTHER)) return 1;
@@ -507,7 +509,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 				pudw.colorBack = pluginOptions->bDefaultColorOthers ? 0 : pluginOptions->colBackOthers;
 				pudw.colorText = pluginOptions->bDefaultColorOthers ? 0 : pluginOptions->colTextOthers;
 				iSeconds = pluginOptions->iDelayOthers;
-				sampleEvent = "This is a sample other event ;-D";
+				sampleEvent = LPGEN("This is a sample other event ;-D");
    			break;
     }
 
@@ -551,7 +553,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 	if ((hContact == NULL) && (hEvent == NULL))
 	{
 		strncpyT((TCHAR*)pudw.lptzContactName, NENTranslateT("Plugin Test", pudw.lpwzContactName), MAX_CONTACTNAME);
-		strncpyT((TCHAR*)pudw.lptzText, NENTranslateT(sampleEvent, pudw.lpwzText), MAX_SECONDLINE);
+		strncpyT((TCHAR*)pudw.lptzText, NENTranslateT((char *)sampleEvent, pudw.lpwzText), MAX_SECONDLINE);
 	}
 	else
 	{	// get the needed event data
@@ -560,7 +562,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
     strncpyT((TCHAR*)pudw.lptzContactName, (TCHAR*)CallService(MS_CLIST_GETCONTACTDISPLAYNAME, (WPARAM)hContact, g_UnicodeCore ? GCDNF_UNICODE : 0), MAX_CONTACTNAME);
     szEventPreview = GetEventPreview(&dbe);
 		strncpyT((TCHAR*)pudw.lptzText, szEventPreview, MAX_SECONDLINE);
-    free(szEventPreview);
+    mir_free(szEventPreview);
 	}
     
 	PopupCount++;
@@ -574,7 +576,7 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
 		if (CallService(MS_POPUP_ADDPOPUPW, (WPARAM)&pudw, 0) < 0)
 		{ // popup creation failed, release popupdata
 			FreePopupEventData(pdata);
-			free(pdata);
+			mir_free(pdata);
 		}
 	}
 	else // convert to ansi
@@ -595,22 +597,22 @@ int PopupShow(PLUGIN_OPTIONS* pluginOptions, HANDLE hContact, HANDLE hEvent, UIN
         strncpy(puda.lpzContactName, szAnsi, MAX_CONTACTNAME);
       else
         strcpy(puda.lpzContactName, "");
-      free(szAnsi);
+      mir_free(szAnsi);
       szAnsi = tchar_to_ansi((TCHAR*)pudw.lptzText);
       if (szAnsi)
         strncpy(puda.lpzText, szAnsi, MAX_SECONDLINE);
       else
         strcpy(puda.lpzText, "");
-      free(szAnsi);
+      mir_free(szAnsi);
     }
 		if (CallService(MS_POPUP_ADDPOPUPEX, (WPARAM)&puda, 0) < 0)
 		{ // popup creation failed, release popupdata
 			FreePopupEventData(pdata);
-			free(pdata);
+			mir_free(pdata);
 		}
 	}
 	if (dbe.pBlob)
-		free(dbe.pBlob);
+		mir_free(dbe.pBlob);
 
 	return 0;
 }
@@ -621,7 +623,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 	PLUGIN_DATA* pdata;
 	DBEVENTINFO dbe = {0};
 	EVENT_DATA_EX* eventData;
-	TCHAR lpzText[MAX_SECONDLINE*2] = "\0\0";
+	TCHAR lpzText[MAX_SECONDLINE*2] = _T("\0\0");
 	char timestamp[MAX_DATASIZE] = "";
 	char formatTime[MAX_DATASIZE] = "";
 	int iEvent = 0;
@@ -696,7 +698,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 				strncpy(formatTime, "%Y.%m.%d ", sizeof(formatTime));
 			if (pdata->pluginOptions->bShowTime)
 				strncat(formatTime, "%H:%M", sizeof(formatTime));
-			strftime(timestamp,sizeof(timestamp), formatTime, localtime(&dbe.timestamp));
+			strftime(timestamp,sizeof(timestamp), formatTime, localtime((time_t *)&dbe.timestamp));
 			if (g_UnicodeCore)
 				_snprintfT(lpzText, SIZEOF(lpzText), "%s[b][i]%S[/i][/b]\n", lpzText, timestamp);
 			else
@@ -706,10 +708,10 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 			TCHAR* szEventPreview = GetEventPreview(&dbe);
 
 			_snprintfT(lpzText, SIZEOF(lpzText), "%s%s", lpzText, szEventPreview);
-			free(szEventPreview);
+			mir_free(szEventPreview);
 		}
 		if (dbe.pBlob)
-			free(dbe.pBlob);
+			mir_free(dbe.pBlob);
 		if (doReverse)
 		{
 			if ((iEvent >= pdata->pluginOptions->iNumberMsg && pdata->pluginOptions->iNumberMsg) || !eventData->next)
@@ -735,7 +737,7 @@ int PopupUpdate(HANDLE hContact, HANDLE hEvent)
 	{
 		char* szAnsi = tchar_to_ansi(lpzText);
 		CallService(MS_POPUP_CHANGETEXT, (WPARAM)pdata->hWnd, (LPARAM)szAnsi);
-		free(szAnsi);
+		mir_free(szAnsi);
 	}
 	return 0;
 }
diff --git a/plugins/NewEventNotify/utils.c b/plugins/NewEventNotify/utils.c
index 2e8abb08a3..750bb9b4ff 100644
--- a/plugins/NewEventNotify/utils.c
+++ b/plugins/NewEventNotify/utils.c
@@ -133,7 +133,7 @@ TCHAR* __fastcall NENTranslateT(const char* src, const WCHAR* unibuf)
 
   if (!strlennull(src))
   { // for the case of empty strings
-    return "";
+    return _T("");
   }
 
   if (g_UnicodeCore)
@@ -369,7 +369,7 @@ int utf8_encode(const char *from, char **to)
     return -1;
   }
 
-  unicode = (wchar_t*)_alloca((wchars + 1) * sizeof(unsigned short));
+  unicode = (wchar_t*)mir_alloc((wchars + 1) * sizeof(unsigned short));
   unicode[wchars] = 0;
 
   err = MultiByteToWideChar(CP_ACP, MB_PRECOMPOSED, from,
@@ -407,7 +407,7 @@ int utf8_decode(const char *from, char **to)
     WCHAR *wszTemp = NULL;
     int inlen = strlennull(from);
 
-    wszTemp = (WCHAR *)_alloca(sizeof(WCHAR) * (inlen + 1));
+    wszTemp = (WCHAR *)mir_alloc(sizeof(WCHAR) * (inlen + 1));
 
     // Convert the UTF-8 string to UCS
     if (MultiByteToWideChar(CP_UTF8, 0, from, -1, wszTemp, inlen + 1))
diff --git a/plugins/ProfileManager/profilemanager-translation.txt b/plugins/ProfileManager/profilemanager-translation.txt
index e6319bc955..52329c17db 100644
--- a/plugins/ProfileManager/profilemanager-translation.txt
+++ b/plugins/ProfileManager/profilemanager-translation.txt
@@ -1,6 +1,2 @@
 ; Common strings that belong to many files
 ;[]
-
-; ../../plugins/ProfileManager/pmanagerEx.c
-;[Change profile]
-;[Load profile]
diff --git a/plugins/QuickMessages/quickmessages-translation.txt b/plugins/QuickMessages/quickmessages-translation.txt
index 1e39733b34..e61ab90adc 100644
--- a/plugins/QuickMessages/quickmessages-translation.txt
+++ b/plugins/QuickMessages/quickmessages-translation.txt
@@ -1,7 +1,7 @@
 ; Common strings that belong to many files
 ;[Quick Messages]
 
-; ../../plugins/QuickMessages/options.c
+; ../../plugins/QuickMessages/options.cpp
 ;[New Button]
 ;[New Menu Entry]
 ;[Plugins]
diff --git a/plugins/SRMM/srmm-translation.txt b/plugins/SRMM/srmm-translation.txt
index a0fcd00381..95e4acd75e 100644
--- a/plugins/SRMM/srmm-translation.txt
+++ b/plugins/SRMM/srmm-translation.txt
@@ -1,26 +1,26 @@
 ; Common strings that belong to many files
 ;[Messaging]
 
-; ../../plugins/SRMM/cmdlist.c
+; ../../plugins/SRMM/cmdlist.cpp
 ;[The message send timed out.]
 
-; ../../plugins/SRMM/globals.c
+; ../../plugins/SRMM/globals.cpp
 ;[Incoming message (10x10)]
 ;[Notice (10x10)]
 ;[Outgoing message (10x10)]
 
-; ../../plugins/SRMM/msgdialog.c
+; ../../plugins/SRMM/msgdialog.cpp
 ;[%s is typing a message...]
 ;[Last message received on %s at %s.]
 ;[is now %s (was %s)]
 ;[signed off (was %s)]
 ;[signed on (%s)]
 
-; ../../plugins/SRMM/msglog.c
+; ../../plugins/SRMM/msglog.cpp
 ;[File received]
 ;[File sent]
 
-; ../../plugins/SRMM/msgoptions.c
+; ../../plugins/SRMM/msgoptions.cpp
 ;[** New contacts **]
 ;[** Unknown contacts **]
 ;[Away]
@@ -50,7 +50,7 @@
 ;[Show balloon popup (unsupported system)]
 ;[Typing Notify]
 
-; ../../plugins/SRMM/msgs.c
+; ../../plugins/SRMM/msgs.cpp
 ;[%s is typing a message]
 ;[&Message]
 ;[Incoming (Focused Window)]
@@ -64,7 +64,7 @@
 ;[Outgoing]
 ;[Typing Notification]
 
-; ../../plugins/SRMM/msgtimedout.c
+; ../../plugins/SRMM/msgtimedout.cpp
 ;[An unknown error has occured.]
 
 ; ../../plugins/SRMM/resource.rc
diff --git a/plugins/Scriver/scriver-translation.txt b/plugins/Scriver/scriver-translation.txt
index 2b9a42b060..bfb171472f 100644
--- a/plugins/Scriver/scriver-translation.txt
+++ b/plugins/Scriver/scriver-translation.txt
@@ -31,22 +31,22 @@
 ;[User has joined]
 ;[User has left]
 
-; ../../plugins/Scriver/chat/clist.c
+; ../../plugins/Scriver/chat/clist.cpp
 ;[Join chat]
 ;[Open chat window]
 
-; ../../plugins/Scriver/chat/log.c
+; ../../plugins/Scriver/chat/log.cpp
 ;[ (set by %s on %s)]
 ;[ (set by %s)]
 ;[The topic is \'%s%s\']
 ;[You are now known as %s]
 ;[You have joined %s]
 
-; ../../plugins/Scriver/chat/main.c
+; ../../plugins/Scriver/chat/main.cpp
 ;[&Join]
 ;[&Leave]
 
-; ../../plugins/Scriver/chat/options.c
+; ../../plugins/Scriver/chat/options.cpp
 ;[Add \':\' to auto-completed names]
 ;[Appearance]
 ;[Appearance and functionality of chat windows]
@@ -64,7 +64,6 @@
 ;[Limit user names to 20 characters]
 ;[Message is highlighted]
 ;[Only prefix with timestamp if it has changed]
-;[Pop-ups to display]
 ;[Popups]
 ;[Prefix all events with a timestamp]
 ;[Select Folder]
@@ -141,7 +140,7 @@
 ;[year with century, 1901-9999]
 ;[year without century, 01-  99]
 
-; ../../plugins/Scriver/chat/tools.c
+; ../../plugins/Scriver/chat/tools.cpp
 ;[%s %c %s\r\n]
 ;[%s %s\r\n]
 ;[%s disables \'%s\' status for %s in %s]
@@ -161,7 +160,7 @@
 ;[The topic is \'%s\' (set by %s)]
 ;[Topic change in %s]
 
-; ../../plugins/Scriver/chat/window.c
+; ../../plugins/Scriver/chat/window.cpp
 ;[%s: Chat Room (%u user)]
 ;[%s: Chat Room (%u users)]
 ;[%s: Message Session]
@@ -180,7 +179,7 @@
 ;[Status]
 ;[Unique id]
 
-; ../../plugins/Scriver/globals.c
+; ../../plugins/Scriver/globals.cpp
 ;[Action (10x10)]
 ;[Add Status (10x10)]
 ;[Add contact]
@@ -229,7 +228,7 @@
 ;[User's history]
 ;[Window Icon]
 
-; ../../plugins/Scriver/msgdialog.c
+; ../../plugins/Scriver/msgdialog.cpp
 ;[%s is typing a message...]
 ;[Add Contact Permanently to List]
 ;[Insert Emoticon]
@@ -243,7 +242,7 @@
 ;[signed off (was %s)]
 ;[signed on (%s)]
 
-; ../../plugins/Scriver/msglog.c
+; ../../plugins/Scriver/msglog.cpp
 ;[File received]
 ;[File sent]
 ;[Today]
@@ -252,7 +251,7 @@
 ;[Unknown Contact]
 ;[Yesterday]
 
-; ../../plugins/Scriver/msgoptions.c
+; ../../plugins/Scriver/msgoptions.cpp
 ;[** New contacts **]
 ;[** Unknown contacts **]
 ;[Action message]
@@ -308,7 +307,7 @@
 ;[User list members (online)]
 ;[Your nickname]
 
-; ../../plugins/Scriver/msgs.c
+; ../../plugins/Scriver/msgs.cpp
 ;[%s is typing a message]
 ;[Incoming (Focused Window)]
 ;[Incoming (New Session)]
@@ -319,10 +318,10 @@
 ;[Outgoing]
 ;[Typing Notification]
 
-; ../../plugins/Scriver/msgtimedout.c
+; ../../plugins/Scriver/msgtimedout.cpp
 ;[An unknown error has occured.]
 
-; ../../plugins/Scriver/msgwindow.c
+; ../../plugins/Scriver/msgwindow.cpp
 ;[Always On Top]
 
 ; ../../plugins/Scriver/resource.rc
@@ -471,5 +470,5 @@
 ;[seconds.]
 ;[while sending the following message:]
 
-; ../../plugins/Scriver/sendqueue.c
+; ../../plugins/Scriver/sendqueue.cpp
 ;[The message send timed out.]
diff --git a/plugins/SeenPlugin/seenplugin-translation.txt b/plugins/SeenPlugin/seenplugin-translation.txt
index 14c7cf2c31..67bbc30ebf 100644
--- a/plugins/SeenPlugin/seenplugin-translation.txt
+++ b/plugins/SeenPlugin/seenplugin-translation.txt
@@ -2,20 +2,20 @@
 ;[<unknown>]
 ;[Last seen]
 
-; ../../plugins/SeenPlugin/history.c
+; ../../plugins/SeenPlugin/history.cpp
 ;[Send Instant Message]
 ;[User Menu]
 ;[View User's Details]
 ;[last seen history]
 
-; ../../plugins/SeenPlugin/main.c
+; ../../plugins/SeenPlugin/main.cpp
 ;[Changed to Online]
 ;[LastSeen]
 ;[User Logged In]
 ;[User Logged Off]
 ;[User status change]
 
-; ../../plugins/SeenPlugin/options.c
+; ../../plugins/SeenPlugin/options.cpp
 ;[Last Seen Variables]
 ;[PopUps]
 ;[Services]
@@ -96,6 +96,6 @@
 ;[year (2 digits)]
 ;[year (4 digits)]
 
-; ../../plugins/SeenPlugin/utils.c
+; ../../plugins/SeenPlugin/utils.cpp
 ;[<never seen>]
 ;[Idle]
diff --git a/plugins/TopToolBar/toptoolbar-translation.txt b/plugins/TopToolBar/toptoolbar-translation.txt
index fbbc5be47e..fcc295b539 100644
--- a/plugins/TopToolBar/toptoolbar-translation.txt
+++ b/plugins/TopToolBar/toptoolbar-translation.txt
@@ -1,5 +1,5 @@
 ; Common strings that belong to many files
-;[]
+;[Default]
 
 ; ../../plugins/TopToolBar/InternalButtons.cpp
 ;[Disable Sounds]
@@ -11,8 +11,9 @@
 ;[Add Launch]
 ;[Add Separator]
 ;[Background colour:]
-;[Button Height:]
-;[Button Width: ]
+;[Button Gap ]
+;[Button Height]
+;[Button Width ]
 ;[Buttons Order && Visibility]
 ;[Buttons order:]
 ;[Del Sep/Launch Button]
@@ -31,7 +32,6 @@
 ;[Use background bitmap]
 
 ; ../../plugins/TopToolBar/toolbar.cpp
-;[Default]
 ;[Frames Services not found - plugin disabled.You need MultiWindow plugin.]
 
 ; ../../plugins/TopToolBar/ttbopt.cpp
diff --git a/plugins/UserGuide/userguide-translation.txt b/plugins/UserGuide/userguide-translation.txt
index 2680b0ff11..73bd66f0ac 100644
--- a/plugins/UserGuide/userguide-translation.txt
+++ b/plugins/UserGuide/userguide-translation.txt
@@ -1,5 +1,5 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/UserGuide/main.c
+; ../../plugins/UserGuide/main.cpp
 ;[User Guide]
diff --git a/plugins/ZeroNotification/zeronotification-translation.txt b/plugins/ZeroNotification/zeronotification-translation.txt
index 74bb03e19c..e62104e8f8 100644
--- a/plugins/ZeroNotification/zeronotification-translation.txt
+++ b/plugins/ZeroNotification/zeronotification-translation.txt
@@ -1,8 +1,7 @@
 ; Common strings that belong to many files
 ;[]
 
-; ../../plugins/ZeroNotification/main.c
-;[Please update "PLUGINNAME" to ANSI Version]
+; ../../plugins/ZeroNotification/main.cpp
 ;[Plugins]
 ;[Zero Notifications]
author	Vadim Dashevskiy <watcherhd@gmail.com>	2012-06-25 15:46:46 +0000
committer	Vadim Dashevskiy <watcherhd@gmail.com>	2012-06-25 15:46:46 +0000
commit	2113b6675af6f78916ea050a17cfe9370d29a134 (patch)
tree	b8d0b639c534feede13cf2c0d621bc574f631448 /plugins
parent	a716d39a60b0197cc7944e713b3ecd3ea055dfef (diff)