- Another portion of _T replacement (patch from person)

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

12 files changed, 104 insertions, 107 deletions

diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp
index 318e4f13e0..0039df55bb 100644
--- a/plugins/Console/src/Console.cpp
+++ b/plugins/Console/src/Console.cpp
@@ -1259,10 +1259,10 @@ static int OnSystemModulesLoaded(WPARAM wParam,LPARAM lParam)
 		CLISTMENUITEM mi = { sizeof(mi) };

 		mi.flags = CMIF_TCHAR;

 		mi.hIcon = hIcons[0];

-		mi.ptszPopupName = _T("&Help");

+		mi.ptszPopupName = LPGENT("&Help");

 		mi.popupPosition = 2000090000;

 		mi.position = 1000000000;

-		mi.ptszName = (IsWindowVisible(hwndConsole)) ? _T("Hide Console") : _T("Show Console");

+		mi.ptszName = (IsWindowVisible(hwndConsole)) ? LPGENT("Hide Console") : LPGENT("Show Console");

 		mi.pszService = MS_CONSOLE_SHOW_HIDE;

 		hMenu = Menu_AddMainMenuItem(&mi);

 

diff --git a/plugins/Dbx_tree/src/FileAccess.cpp b/plugins/Dbx_tree/src/FileAccess.cpp
index a0aa85aecb..fe23293f3f 100644
--- a/plugins/Dbx_tree/src/FileAccess.cpp
+++ b/plugins/Dbx_tree/src/FileAccess.cpp
@@ -275,14 +275,14 @@ void CFileAccess::InitJournal()
 		if (hfilebackup || hjrnfilebackup)

 		{

 			LOG(logWARNING,

-		      _T("Journal \"%s\" was found on start.\nBackup \"%s\"%s created and backup \"%s\"%s created.\nYou may delete these file(s) after successful start from \"%s\"."),

+		      TranslateT("Journal \"%s\" was found on start.\nBackup \"%s\"%s created and backup \"%s\"%s created.\nYou may delete these file(s) after successful start from \"%s\"."),

 			    fn?fn+1:m_Journal.FileName, 

-			    bfn?bfn+1:bckname, (hfilebackup!=INVALID_HANDLE_VALUE)?_T(" was successfully"):_T(" could not be"),

-			    jrn?jrn+1:bckjrnname, (hjrnfilebackup!=INVALID_HANDLE_VALUE)?_T(" was successfully"):_T(" could not be"),

+			    bfn?bfn+1:bckname, (hfilebackup!=INVALID_HANDLE_VALUE)?TranslateT(" was successfully"):TranslateT(" could not be"),

+			    jrn?jrn+1:bckjrnname, (hjrnfilebackup!=INVALID_HANDLE_VALUE)?TranslateT(" was successfully"):TranslateT(" could not be"),

 			    path);

 			} else {

 			LOG(logWARNING,

-					_T("Journal \"%s\" was found on start.\nBackups \"%s\"and \"%s\" could not be created in \"%s\"."),

+					TranslateT("Journal \"%s\" was found on start.\nBackups \"%s\"and \"%s\" could not be created in \"%s\"."),

 					fn?fn+1:m_Journal.FileName, 

 					bfn?bfn+1:bckname,

 					jrn?jrn+1:bckjrnname,

diff --git a/plugins/FTPFileYM/src/job_generic.cpp b/plugins/FTPFileYM/src/job_generic.cpp
index 17d9257e41..5ce7d3c504 100644
--- a/plugins/FTPFileYM/src/job_generic.cpp
+++ b/plugins/FTPFileYM/src/job_generic.cpp
@@ -48,7 +48,7 @@ int GenericJob::openFileDialog()
 	OPENFILENAME ofn = {0};

 	ofn.lStructSize = sizeof(ofn);

 	ofn.hwndOwner = 0;

-	ofn.lpstrFilter = _T("All Files (*.*)\0*.*\0");

+	ofn.lpstrFilter = TranslateT("All Files (*.*)\0*.*\0");

 	ofn.nFilterIndex = 1;

 	ofn.lpstrFile = this->stzFilePath;

 	ofn.lpstrTitle = TranslateT("FTP File - Select files");

diff --git a/plugins/FTPFileYM/src/job_packer.cpp b/plugins/FTPFileYM/src/job_packer.cpp
index bcc8ab02dc..2e81e57c89 100644
--- a/plugins/FTPFileYM/src/job_packer.cpp
+++ b/plugins/FTPFileYM/src/job_packer.cpp
@@ -256,10 +256,10 @@ void PackerJob::updateStats()
 		this->lastUpdateTick = dwNewTick;

 

 		double speed = ((double)this->uiReaded / 1024)/(time(NULL) - this->startTS);

-		mir_sntprintf(this->tab->stzSpeed, SIZEOF(this->tab->stzSpeed), _T("%0.1f kB/s"), speed);

+		mir_sntprintf(this->tab->stzSpeed, SIZEOF(this->tab->stzSpeed), TranslateT("%0.1f kB/s"), speed);

 

 		double perc = this->uiFileSize ? ((double)this->uiReaded / this->uiFileSize) * 100 : 0;

-		mir_sntprintf(this->tab->stzComplet, SIZEOF(this->tab->stzComplet), _T("%0.1f%% (%d kB/%d kB)"), perc, (int)this->uiReaded/1024, (int)this->uiFileSize/1024);

+		mir_sntprintf(this->tab->stzComplet, SIZEOF(this->tab->stzComplet), TranslateT("%0.1f%% (%d kB/%d kB)"), perc, (int)this->uiReaded/1024, (int)this->uiFileSize/1024);

 

 		TCHAR buff[256];

 		long s = (this->uiFileSize - this->uiReaded) / (long)(speed * 1024); 

@@ -270,7 +270,7 @@ void PackerJob::updateStats()
 

 		if (d > 0) mir_sntprintf(buff, SIZEOF(buff), _T("%dd %02d:%02d:%02d"), d, h, m, s);

 		else mir_sntprintf(buff, SIZEOF(buff), _T("%02d:%02d:%02d"), h, m, s);

-		mir_sntprintf(this->tab->stzRemain, SIZEOF(this->tab->stzRemain), _T("%s (%d kB/%d kB)"), buff, (this->uiFileSize - this->uiReaded)/1024, this->uiFileSize/1024);

+		mir_sntprintf(this->tab->stzRemain, SIZEOF(this->tab->stzRemain), TranslateT("%s (%d kB/%d kB)"), buff, (this->uiFileSize - this->uiReaded)/1024, this->uiFileSize/1024);

 

 		this->refreshTab(false);		

 	}

diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 98b54270d6..44a08b7ae5 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -94,11 +94,8 @@ bool CoreCheck()
 		(g_mirandaVersion >= PLUGIN_MAKE_VERSION(1,0,0,0)))

 	{

 		MessageBoxA(0,

-			Translate(

-				"Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\n"

-				"For use with any other application, please contact author.\n"

-				),

-			"Favourite Contacts Error",

+			Translate("Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\nFor use with any other application, please contact author.\n"),

+			Translate("Favourite Contacts Error"),

 			MB_ICONSTOP|MB_OK);

 		return false;

 	}

diff --git a/plugins/FileAsMessage/src/main.cpp b/plugins/FileAsMessage/src/main.cpp
index 4deee87182..23170b405f 100644
--- a/plugins/FileAsMessage/src/main.cpp
+++ b/plugins/FileAsMessage/src/main.cpp
@@ -156,7 +156,7 @@ int OnOptInitialise(WPARAM wParam, LPARAM lParam)
 	odp.hInstance = hInst;

 	odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);

 	odp.ptszTitle = _T(SERVICE_TITLE);

-	odp.ptszGroup = _T("Plugins");

+	odp.ptszGroup = LPGENT("Plugins");

 	odp.flags = ODPF_BOLDGROUPS|ODPF_TCHAR;

 	odp.pfnDlgProc = OptionsDlgProc;

 	Options_AddPage(wParam, &odp);

diff --git a/protocols/GTalkExt/src/menu.cpp b/protocols/GTalkExt/src/menu.cpp
index bf81e0f5dd..0f04ae8d5c 100644
--- a/protocols/GTalkExt/src/menu.cpp
+++ b/protocols/GTalkExt/src/menu.cpp
@@ -26,7 +26,7 @@
 #include "inbox.h"

 

 static const LPSTR MS_GTALKEXT_OPENMAILBOX = SHORT_PLUGIN_NAME "/OpenMailbox";

-static const LPTSTR _T(OPEN_MAILBOX_ITEM_CAPTION) = _T("Open mailbox");

+static const LPTSTR _T(OPEN_MAILBOX_ITEM_CAPTION) = LPGENT("Open mailbox");

 

 HANDLE hOpenMailboxService = 0;

 HANDLE hOpenMailboxMenuItem = 0;

diff --git a/protocols/GTalkExt/src/notifications.cpp b/protocols/GTalkExt/src/notifications.cpp
index 9a1819a7f1..e9252aad7a 100644
--- a/protocols/GTalkExt/src/notifications.cpp
+++ b/protocols/GTalkExt/src/notifications.cpp
@@ -27,7 +27,7 @@
 #include "inbox.h"

 

 static const LPTSTR TEMP_WINDOW_CLASS_NAME = _T("AntiShittyFullscreenDetectionWindowClass");

-static const LPTSTR _T(NUMBER_EMAILS_MESSAGE) = _T("You've received an e-mail\n%s unread threads");

+static const LPTSTR _T(NUMBER_EMAILS_MESSAGE) = LPGENT("You've received an e-mail\n%s unread threads");

 

 static const LPTSTR PLUGIN_DATA_PROP_NAME = _T("{DB5CE833-C3AC-4851-831C-DDEBD9FA0508}");

 static const LPTSTR EVT_DELETED_HOOK_PROP_NAME = _T("{87CBD2BC-8806-413C-8FD5-1D61ABCA4AF8}");

diff --git a/protocols/GTalkExt/src/options.cpp b/protocols/GTalkExt/src/options.cpp
index 9bbd16a8f2..7f9291cd8f 100644
--- a/protocols/GTalkExt/src/options.cpp
+++ b/protocols/GTalkExt/src/options.cpp
@@ -25,8 +25,8 @@
 static const LPTSTR ACCOUNT_PROP_NAME = _T("{BF447EBA-27AE-4DB7-893C-FC42A3F74D75}");

 static const LPTSTR DIALOG_INITIALIZED_PROP_NAME = _T("{5EE59FE5-679A-4A29-B0A1-03092E7AC20E}");

 

-static const LPTSTR POPUPS_OPTIONS_GROUP = _T("PopUps");

-static const LPTSTR NETWORK_OPTIONS_GROUP = _T("Network");

+static const LPTSTR POPUPS_OPTIONS_GROUP = LPGENT("PopUps");

+static const LPTSTR NETWORK_OPTIONS_GROUP = LPGENT("Network");

 

 static const LPSTR NOTIFY_SETTINGS_FROM_MOD_NAME = SHORT_PLUGIN_NAME ".NotifySettingsFromModName";

 

@@ -34,11 +34,11 @@ static const LPTSTR TEST_LETTER_SUBJECT = _T("Why C sucks");
 static const LPTSTR TEST_LETTER_INBOX = _T("brickstrace@gmail.com [1]");

 static const LPTSTR TEST_LETTER_SENDER = _T("    bems <bems@vingrad.ru>\n");

 static const LPTSTR TEST_LETTER_SNIP =

-	_T("* Primitive type system\n")

-	_T("* No overloading\n")

-	_T("* Limited possibility of data abstraction, polymorphism, subtyping and code reuse\n")

-	_T("* No metaprogramming except preprocessor macros\n")

-	_T("* No exceptions");

+	LPGENT("* Primitive type system\n")

+	LPGENT("* No overloading\n")

+	LPGENT("* Limited possibility of data abstraction, polymorphism, subtyping and code reuse\n")

+	LPGENT("* No metaprogramming except preprocessor macros\n")

+	LPGENT("* No exceptions");

 

 HANDLE hOptionsHook = 0;

 extern HINSTANCE hInst;

diff --git a/protocols/GTalkExt/src/options.h b/protocols/GTalkExt/src/options.h
index bc720e22ed..2b0c215dd3 100644
--- a/protocols/GTalkExt/src/options.h
+++ b/protocols/GTalkExt/src/options.h
@@ -23,9 +23,9 @@
 

 #include "resources.h"

 

-static const LPTSTR MAIL_NOTIFICATIONS = _T("GMail notifications");

-static const LPTSTR FULL_NOTIFICATION_FORMAT = _T("subject\n    %s\nfrom\n%s\n%s\n");

-static const LPTSTR SHORT_NOTIFICATION_FORMAT = _T("subject\n    %s\nfrom\n%s");

+static const LPTSTR MAIL_NOTIFICATIONS = LPGENT("GMail notifications");

+static const LPTSTR FULL_NOTIFICATION_FORMAT = LPGENT("subject\n    %s\nfrom\n%s\n%s\n");

+static const LPTSTR SHORT_NOTIFICATION_FORMAT = LPGENT("subject\n    %s\nfrom\n%s");

 

 static const LPSTR PSEUDOCONTACT_LINK = "GTalkExtNotifyContact";

 static const LPSTR PSEUDOCONTACT_FLAG = "IsNotifyContact";

diff --git a/protocols/GTalkExt/src/tipper_items.cpp b/protocols/GTalkExt/src/tipper_items.cpp
index f09be10b32..5483f82aa3 100644
--- a/protocols/GTalkExt/src/tipper_items.cpp
+++ b/protocols/GTalkExt/src/tipper_items.cpp
@@ -42,7 +42,7 @@ static LPSTR TipperItemProps[MAX_TIPPER_ITEM_PROP] = {
 static const LPSTR TIPPER_ITEMS_MOD_NAME = "Tipper_Items";

 static const LPSTR TIPPER_ITEM_COUNT_SETTING = "DINumValues";

 static const LPTSTR UNREAD_THREADS_RAW = _T("%raw:") _T(SHORT_PLUGIN_NAME) _T("/UnreadThreads%");

-static const LPTSTR UNREAD_THREADS_LABEL = _T("Unread threads:");

+static const LPTSTR UNREAD_THREADS_LABEL = LPGENT("Unread threads:");

 

 void ShiftTipperSettings(LPSTR buff, int count, LPSTR format)

 {

diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp
index 9974f080ca..de76a2d27e 100644
--- a/protocols/JabberG/src/jabber_xstatus.cpp
+++ b/protocols/JabberG/src/jabber_xstatus.cpp
@@ -791,84 +791,84 @@ struct
 }

 static g_arrActivities[] =

 {

-	{ "doing_chores", NULL,       _T("Doing chores"),       ACTIVITY_ICON(0,  0) },

-	{ NULL, "buying_groceries",   _T("buying groceries"),   ACTIVITY_ICON(0,  1) },

-	{ NULL, "cleaning",           _T("cleaning"),           ACTIVITY_ICON(0,  2) },

-	{ NULL, "cooking",            _T("cooking"),            ACTIVITY_ICON(0,  3) },

-	{ NULL, "doing_maintenance",  _T("doing maintenance"),  ACTIVITY_ICON(0,  4) },

-	{ NULL, "doing_the_dishes",   _T("doing the dishes"),   ACTIVITY_ICON(0,  5) },

-	{ NULL, "doing_the_laundry",  _T("doing the laundry"),  ACTIVITY_ICON(0,  6) },

-	{ NULL, "gardening",          _T("gardening"),          ACTIVITY_ICON(0,  7) },

-	{ NULL, "running_an_errand",  _T("running an errand"),  ACTIVITY_ICON(0,  8) },

-	{ NULL, "walking_the_dog",    _T("walking the dog"),    ACTIVITY_ICON(0,  9) },

-	{ "drinking", NULL,           _T("Drinking"),           ACTIVITY_ICON(1,  0) },

-	{ NULL, "having_a_beer",      _T("having a beer"),      ACTIVITY_ICON(1,  1) },

-	{ NULL, "having_coffee",      _T("having coffee"),      ACTIVITY_ICON(1,  2) },

-	{ NULL, "having_tea",         _T("having tea"),         ACTIVITY_ICON(1,  3) },

-	{ "eating", NULL,             _T("Eating"),             ACTIVITY_ICON(2,  0) },

-	{ NULL, "having_a_snack",     _T("having a snack"),     ACTIVITY_ICON(2,  1) },

-	{ NULL, "having_breakfast",   _T("having breakfast"),   ACTIVITY_ICON(2,  2) },

-	{ NULL, "having_dinner",      _T("having dinner"),      ACTIVITY_ICON(2,  3) },

-	{ NULL, "having_lunch",       _T("having lunch"),       ACTIVITY_ICON(2,  4) },

-	{ "exercising", NULL,         _T("Exercising"),         ACTIVITY_ICON(3,  0) },

-	{ NULL, "cycling",            _T("cycling"),            ACTIVITY_ICON(3,  1) },

-	{ NULL, "dancing",            _T("dancing"),            ACTIVITY_ICON(3,  2) },

-	{ NULL, "hiking",             _T("hiking"),             ACTIVITY_ICON(3,  3) },

-	{ NULL, "jogging",            _T("jogging"),            ACTIVITY_ICON(3,  4) },

-	{ NULL, "playing_sports",     _T("playing sports"),     ACTIVITY_ICON(3,  5) },

-	{ NULL, "running",            _T("running"),            ACTIVITY_ICON(3,  6) },

-	{ NULL, "skiing",             _T("skiing"),             ACTIVITY_ICON(3,  7) },

-	{ NULL, "swimming",           _T("swimming"),           ACTIVITY_ICON(3,  8) },

-	{ NULL, "working_out",        _T("working out"),        ACTIVITY_ICON(3,  9) },

-	{ "grooming", NULL,           _T("Grooming"),           ACTIVITY_ICON(4,  0) },

-	{ NULL, "at_the_spa",         _T("at the spa"),         ACTIVITY_ICON(4,  1) },

-	{ NULL, "brushing_teeth",     _T("brushing teeth"),     ACTIVITY_ICON(4,  2) },

-	{ NULL, "getting_a_haircut",  _T("getting a haircut"),  ACTIVITY_ICON(4,  3) },

-	{ NULL, "shaving",            _T("shaving"),            ACTIVITY_ICON(4,  4) },

-	{ NULL, "taking_a_bath",      _T("taking a bath"),      ACTIVITY_ICON(4,  5) },

-	{ NULL, "taking_a_shower",    _T("taking a shower"),    ACTIVITY_ICON(4,  6) },

-	{ "having_appointment", NULL, _T("Having appointment"), ACTIVITY_ICON(5,  0) },

-	{ "inactive", NULL,           _T("Inactive"),           ACTIVITY_ICON(6,  0) },

-	{ NULL, "day_off",            _T("day off"),            ACTIVITY_ICON(6,  1) },

-	{ NULL, "hanging_out",        _T("hanging out"),        ACTIVITY_ICON(6,  2) },

-	{ NULL, "hiding",             _T("hiding"),             ACTIVITY_ICON(6,  3) },

-	{ NULL, "on_vacation",        _T("on vacation"),        ACTIVITY_ICON(6,  4) },

-	{ NULL, "praying",            _T("praying"),            ACTIVITY_ICON(6,  5) },

-	{ NULL, "scheduled_holiday",  _T("scheduled holiday"),  ACTIVITY_ICON(6,  6) },

-	{ NULL, "sleeping",           _T("sleeping"),           ACTIVITY_ICON(6,  7) },

-	{ NULL, "thinking",           _T("thinking"),           ACTIVITY_ICON(6,  8) },

-	{ "relaxing", NULL,           _T("Relaxing"),           ACTIVITY_ICON(7,  0) },

-	{ NULL, "fishing",            _T("fishing"),            ACTIVITY_ICON(7,  1) },

-	{ NULL, "gaming",             _T("gaming"),             ACTIVITY_ICON(7,  2) },

-	{ NULL, "going_out",          _T("going out"),          ACTIVITY_ICON(7,  3) },

-	{ NULL, "partying",           _T("partying"),           ACTIVITY_ICON(7,  4) },

-	{ NULL, "reading",            _T("reading"),            ACTIVITY_ICON(7,  5) },

-	{ NULL, "rehearsing",         _T("rehearsing"),         ACTIVITY_ICON(7,  6) },

-	{ NULL, "shopping",           _T("shopping"),           ACTIVITY_ICON(7,  7) },

-	{ NULL, "smoking",            _T("smoking"),            ACTIVITY_ICON(7,  8) },

-	{ NULL, "socializing",        _T("socializing"),        ACTIVITY_ICON(7,  9) },

-	{ NULL, "sunbathing",         _T("sunbathing"),         ACTIVITY_ICON(7,  10) },

-	{ NULL, "watching_tv",        _T("watching TV"),        ACTIVITY_ICON(7,  11) },

-	{ NULL, "watching_a_movie",   _T("watching a movie"),   ACTIVITY_ICON(7,  12) },

-	{ "talking", NULL,            _T("Talking"),            ACTIVITY_ICON(8,  0) },

-	{ NULL, "in_real_life",       _T("in real life"),       ACTIVITY_ICON(8,  1) },

-	{ NULL, "on_the_phone",       _T("on the phone"),       ACTIVITY_ICON(8,  2) },

-	{ NULL, "on_video_phone",     _T("on video phone"),     ACTIVITY_ICON(8,  3) },

-	{ "traveling", NULL,          _T("Traveling"),          ACTIVITY_ICON(9,  0) },

-	{ NULL, "commuting",          _T("commuting"),          ACTIVITY_ICON(9,  1) },

-	{ NULL, "cycling",            _T("cycling"),            ACTIVITY_ICON(9,  2) },

-	{ NULL, "driving",            _T("driving"),            ACTIVITY_ICON(9,  3) },

-	{ NULL, "in_a_car",           _T("in a car"),           ACTIVITY_ICON(9,  4) },

-	{ NULL, "on_a_bus",           _T("on a bus"),           ACTIVITY_ICON(9,  5) },

-	{ NULL, "on_a_plane",         _T("on a plane"),         ACTIVITY_ICON(9,  6) },

-	{ NULL, "on_a_train",         _T("on a train"),         ACTIVITY_ICON(9,  7) },

-	{ NULL, "on_a_trip",          _T("on a trip"),          ACTIVITY_ICON(9,  8) },

-	{ NULL, "walking",            _T("walking"),            ACTIVITY_ICON(9,  9) },

-	{ "working", NULL,            _T("Working"),            ACTIVITY_ICON(10,  0) },

-	{ NULL, "coding",             _T("coding"),             ACTIVITY_ICON(10,  1) },

-	{ NULL, "in_a_meeting",       _T("in a meeting"),       ACTIVITY_ICON(10,  2) },

-	{ NULL, "studying",           _T("studying"),           ACTIVITY_ICON(10,  3) },

-	{ NULL, "writing",            _T("writing"),            ACTIVITY_ICON(10,  4) },

+	{ "doing_chores", NULL,       LPGENT("Doing chores"),       ACTIVITY_ICON(0,  0) },

+	{ NULL, "buying_groceries",   LPGENT("buying groceries"),   ACTIVITY_ICON(0,  1) },

+	{ NULL, "cleaning",           LPGENT("cleaning"),           ACTIVITY_ICON(0,  2) },

+	{ NULL, "cooking",            LPGENT("cooking"),            ACTIVITY_ICON(0,  3) },

+	{ NULL, "doing_maintenance",  LPGENT("doing maintenance"),  ACTIVITY_ICON(0,  4) },

+	{ NULL, "doing_the_dishes",   LPGENT("doing the dishes"),   ACTIVITY_ICON(0,  5) },

+	{ NULL, "doing_the_laundry",  LPGENT("doing the laundry"),  ACTIVITY_ICON(0,  6) },

+	{ NULL, "gardening",          LPGENT("gardening"),          ACTIVITY_ICON(0,  7) },

+	{ NULL, "running_an_errand",  LPGENT("running an errand"),  ACTIVITY_ICON(0,  8) },

+	{ NULL, "walking_the_dog",    LPGENT("walking the dog"),    ACTIVITY_ICON(0,  9) },

+	{ "drinking", NULL,           LPGENT("Drinking"),           ACTIVITY_ICON(1,  0) },

+	{ NULL, "having_a_beer",      LPGENT("having a beer"),      ACTIVITY_ICON(1,  1) },

+	{ NULL, "having_coffee",      LPGENT("having coffee"),      ACTIVITY_ICON(1,  2) },

+	{ NULL, "having_tea",         LPGENT("having tea"),         ACTIVITY_ICON(1,  3) },

+	{ "eating", NULL,             LPGENT("Eating"),             ACTIVITY_ICON(2,  0) },

+	{ NULL, "having_a_snack",     LPGENT("having a snack"),     ACTIVITY_ICON(2,  1) },

+	{ NULL, "having_breakfast",   LPGENT("having breakfast"),   ACTIVITY_ICON(2,  2) },

+	{ NULL, "having_dinner",      LPGENT("having dinner"),      ACTIVITY_ICON(2,  3) },

+	{ NULL, "having_lunch",       LPGENT("having lunch"),       ACTIVITY_ICON(2,  4) },

+	{ "exercising", NULL,         LPGENT("Exercising"),         ACTIVITY_ICON(3,  0) },

+	{ NULL, "cycling",            LPGENT("cycling"),            ACTIVITY_ICON(3,  1) },

+	{ NULL, "dancing",            LPGENT("dancing"),            ACTIVITY_ICON(3,  2) },

+	{ NULL, "hiking",             LPGENT("hiking"),             ACTIVITY_ICON(3,  3) },

+	{ NULL, "jogging",            LPGENT("jogging"),            ACTIVITY_ICON(3,  4) },

+	{ NULL, "playing_sports",     LPGENT("playing sports"),     ACTIVITY_ICON(3,  5) },

+	{ NULL, "running",            LPGENT("running"),            ACTIVITY_ICON(3,  6) },

+	{ NULL, "skiing",             LPGENT("skiing"),             ACTIVITY_ICON(3,  7) },

+	{ NULL, "swimming",           LPGENT("swimming"),           ACTIVITY_ICON(3,  8) },

+	{ NULL, "working_out",        LPGENT("working out"),        ACTIVITY_ICON(3,  9) },

+	{ "grooming", NULL,           LPGENT("Grooming"),           ACTIVITY_ICON(4,  0) },

+	{ NULL, "at_the_spa",         LPGENT("at the spa"),         ACTIVITY_ICON(4,  1) },

+	{ NULL, "brushing_teeth",     LPGENT("brushing teeth"),     ACTIVITY_ICON(4,  2) },

+	{ NULL, "getting_a_haircut",  LPGENT("getting a haircut"),  ACTIVITY_ICON(4,  3) },

+	{ NULL, "shaving",            LPGENT("shaving"),            ACTIVITY_ICON(4,  4) },

+	{ NULL, "taking_a_bath",      LPGENT("taking a bath"),      ACTIVITY_ICON(4,  5) },

+	{ NULL, "taking_a_shower",    LPGENT("taking a shower"),    ACTIVITY_ICON(4,  6) },

+	{ "having_appointment", NULL, LPGENT("Having appointment"), ACTIVITY_ICON(5,  0) },

+	{ "inactive", NULL,           LPGENT("Inactive"),           ACTIVITY_ICON(6,  0) },

+	{ NULL, "day_off",            LPGENT("day off"),            ACTIVITY_ICON(6,  1) },

+	{ NULL, "hanging_out",        LPGENT("hanging out"),        ACTIVITY_ICON(6,  2) },

+	{ NULL, "hiding",             LPGENT("hiding"),             ACTIVITY_ICON(6,  3) },

+	{ NULL, "on_vacation",        LPGENT("on vacation"),        ACTIVITY_ICON(6,  4) },

+	{ NULL, "praying",            LPGENT("praying"),            ACTIVITY_ICON(6,  5) },

+	{ NULL, "scheduled_holiday",  LPGENT("scheduled holiday"),  ACTIVITY_ICON(6,  6) },

+	{ NULL, "sleeping",           LPGENT("sleeping"),           ACTIVITY_ICON(6,  7) },

+	{ NULL, "thinking",           LPGENT("thinking"),           ACTIVITY_ICON(6,  8) },

+	{ "relaxing", NULL,           LPGENT("Relaxing"),           ACTIVITY_ICON(7,  0) },

+	{ NULL, "fishing",            LPGENT("fishing"),            ACTIVITY_ICON(7,  1) },

+	{ NULL, "gaming",             LPGENT("gaming"),             ACTIVITY_ICON(7,  2) },

+	{ NULL, "going_out",          LPGENT("going out"),          ACTIVITY_ICON(7,  3) },

+	{ NULL, "partying",           LPGENT("partying"),           ACTIVITY_ICON(7,  4) },

+	{ NULL, "reading",            LPGENT("reading"),            ACTIVITY_ICON(7,  5) },

+	{ NULL, "rehearsing",         LPGENT("rehearsing"),         ACTIVITY_ICON(7,  6) },

+	{ NULL, "shopping",           LPGENT("shopping"),           ACTIVITY_ICON(7,  7) },

+	{ NULL, "smoking",            LPGENT("smoking"),            ACTIVITY_ICON(7,  8) },

+	{ NULL, "socializing",        LPGENT("socializing"),        ACTIVITY_ICON(7,  9) },

+	{ NULL, "sunbathing",         LPGENT("sunbathing"),         ACTIVITY_ICON(7,  10) },

+	{ NULL, "watching_tv",        LPGENT("watching TV"),        ACTIVITY_ICON(7,  11) },

+	{ NULL, "watching_a_movie",   LPGENT("watching a movie"),   ACTIVITY_ICON(7,  12) },

+	{ "talking", NULL,            LPGENT("Talking"),            ACTIVITY_ICON(8,  0) },

+	{ NULL, "in_real_life",       LPGENT("in real life"),       ACTIVITY_ICON(8,  1) },

+	{ NULL, "on_the_phone",       LPGENT("on the phone"),       ACTIVITY_ICON(8,  2) },

+	{ NULL, "on_video_phone",     LPGENT("on video phone"),     ACTIVITY_ICON(8,  3) },

+	{ "traveling", NULL,          LPGENT("Traveling"),          ACTIVITY_ICON(9,  0) },

+	{ NULL, "commuting",          LPGENT("commuting"),          ACTIVITY_ICON(9,  1) },

+	{ NULL, "cycling",            LPGENT("cycling"),            ACTIVITY_ICON(9,  2) },

+	{ NULL, "driving",            LPGENT("driving"),            ACTIVITY_ICON(9,  3) },

+	{ NULL, "in_a_car",           LPGENT("in a car"),           ACTIVITY_ICON(9,  4) },

+	{ NULL, "on_a_bus",           LPGENT("on a bus"),           ACTIVITY_ICON(9,  5) },

+	{ NULL, "on_a_plane",         LPGENT("on a plane"),         ACTIVITY_ICON(9,  6) },

+	{ NULL, "on_a_train",         LPGENT("on a train"),         ACTIVITY_ICON(9,  7) },

+	{ NULL, "on_a_trip",          LPGENT("on a trip"),          ACTIVITY_ICON(9,  8) },

+	{ NULL, "walking",            LPGENT("walking"),            ACTIVITY_ICON(9,  9) },

+	{ "working", NULL,            LPGENT("Working"),            ACTIVITY_ICON(10,  0) },

+	{ NULL, "coding",             LPGENT("coding"),             ACTIVITY_ICON(10,  1) },

+	{ NULL, "in_a_meeting",       LPGENT("in a meeting"),       ACTIVITY_ICON(10,  2) },

+	{ NULL, "studying",           LPGENT("studying"),           ACTIVITY_ICON(10,  3) },

+	{ NULL, "writing",            LPGENT("writing"),            ACTIVITY_ICON(10,  4) },

 	{ NULL, NULL, NULL } // the end, don't delete this

 };