summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/russian/Plugins/FavContacts.txt8
-rw-r--r--plugins/FavContacts/res/resource.rc4
-rw-r--r--plugins/FavContacts/src/Version.h4
-rw-r--r--plugins/FavContacts/src/favlist.h2
-rw-r--r--plugins/FavContacts/src/headers.h2
-rw-r--r--plugins/FavContacts/src/main.cpp24
-rw-r--r--plugins/FavContacts/src/resource.h2
7 files changed, 23 insertions, 23 deletions
diff --git a/langpacks/russian/Plugins/FavContacts.txt b/langpacks/russian/Plugins/FavContacts.txt
index 9ef3d08b81..b41611a191 100644
--- a/langpacks/russian/Plugins/FavContacts.txt
+++ b/langpacks/russian/Plugins/FavContacts.txt
@@ -1,13 +1,13 @@
#muuid {ce2c0401-f9e0-40d7-8e95-1a4197d7ab04}
;============================================================
; File: favcontacts.dll
-; Module: Favourite Contacts
+; Module: Favorite Contacts
; Versions: v.0.0.0.6
; URL: http://addons.miranda-im.org/details.php?action=viewfile&id=4191
; Source: http://miranda-plugins.googlecode.com/svn/trunk/FavContacts/
; Authors: nullbie
;============================================================
-[Favourite contacts menu.]
+[Favorite contacts menu.]
Меню избранных контактов.
[px.]
пикс.
@@ -15,7 +15,7 @@
Меню по горячей кл. в центре экрана
[Hide for transparent avatars]
Скрыть у прозрачных аватар
-[Favourite Contacts]
+[Favorite Contacts]
Избранные контакты
[Draw avatar border]
Рамка на аватарах
@@ -43,5 +43,5 @@
Обычный контакт
[Dim idle contact icons]
Затемнить контакты в ожидании
-[Show favourite contacts]
+[Show favorite contacts]
Показать избранные контакты \ No newline at end of file
diff --git a/plugins/FavContacts/res/resource.rc b/plugins/FavContacts/res/resource.rc
index df0ff22540..c4dde40526 100644
--- a/plugins/FavContacts/res/resource.rc
+++ b/plugins/FavContacts/res/resource.rc
@@ -28,7 +28,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
-IDI_FAVOURITE ICON "favorite.ico"
+IDI_FAVORITE ICON "favorite.ico"
IDI_REGULAR ICON "regular.ico"
/////////////////////////////////////////////////////////////////////////////
@@ -55,7 +55,7 @@ BEGIN
"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,151,139,10
LTEXT "Menu item preview:",IDC_STATIC,11,176,141,8
CONTROL "",IDC_CANVAS,"Static",SS_OWNERDRAW,20,188,132,26
- GROUPBOX "Favourite Contacts",IDC_STATIC,161,5,150,241
+ GROUPBOX "Favorite Contacts",IDC_STATIC,161,5,150,241
CONTROL "",IDC_CLIST,"CListControl",WS_TABSTOP | 0x1,167,17,138,223,WS_EX_CLIENTEDGE
CONTROL "Enable groups",IDC_CHK_GROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,17,141,10
CONTROL "Multicolumn menu",IDC_CHK_GROUPCOLUMS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,30,132,10
diff --git a/plugins/FavContacts/src/Version.h b/plugins/FavContacts/src/Version.h
index 41fe2cfe22..ecb84caf58 100644
--- a/plugins/FavContacts/src/Version.h
+++ b/plugins/FavContacts/src/Version.h
@@ -5,9 +5,9 @@
#define __FILEVERSION_STRING __MAJOR_VERSION,__MINOR_VERSION,__RELEASE_NUM,__BUILD_NUM
-#define __PLUGIN_NAME "Favourite contacts"
+#define __PLUGIN_NAME "Favorite contacts"
#define __FILENAME "FavContacts.dll"
-#define __DESCRIPTION "Favourite contacts menu."
+#define __DESCRIPTION "Favorite contacts menu."
#define __AUTHOR "Victor Pavlychko"
#define __AUTHOREMAIL "nullbie@gmail.com"
#define __AUTHORWEB "http://miranda-ng.org/p/FavContacts/"
diff --git a/plugins/FavContacts/src/favlist.h b/plugins/FavContacts/src/favlist.h
index a9db3fb3dd..04ed0d20e2 100644
--- a/plugins/FavContacts/src/favlist.h
+++ b/plugins/FavContacts/src/favlist.h
@@ -30,7 +30,7 @@ public:
group = mir_tstrdup(TranslateT("<no group>"));
} else
{
- group = mir_tstrdup(TranslateT("Favourite Contacts"));
+ group = mir_tstrdup(TranslateT("Favorite Contacts"));
}
status = db_get_w(hContact, GetContactProto(hContact), "Status", ID_STATUS_OFFLINE);
}
diff --git a/plugins/FavContacts/src/headers.h b/plugins/FavContacts/src/headers.h
index 4b12d2ba63..f705c9a5d1 100644
--- a/plugins/FavContacts/src/headers.h
+++ b/plugins/FavContacts/src/headers.h
@@ -1,5 +1,5 @@
/*
-Favourite Contacts for Miranda IM
+Favorite Contacts for Miranda IM
Copyright 2007 Victor Pavlychko
diff --git a/plugins/FavContacts/src/main.cpp b/plugins/FavContacts/src/main.cpp
index 7bd76ff5fc..52d5aea131 100644
--- a/plugins/FavContacts/src/main.cpp
+++ b/plugins/FavContacts/src/main.cpp
@@ -1,5 +1,5 @@
/*
-Favourite Contacts for Miranda IM
+Favorite Contacts for Miranda IM
Copyright 2007 Victor Pavlychko
@@ -42,7 +42,7 @@ PLUGININFOEX pluginInfo = {
static IconItem iconList[] =
{
- { LPGEN("Favourite Contact"), "favcontacts_favourite", IDI_FAVOURITE },
+ { LPGEN("Favorite Contact"), "favcontacts_favorite", IDI_FAVORITE },
{ LPGEN("Regular Contact"), "favcontacts_regular", IDI_REGULAR },
};
@@ -97,7 +97,7 @@ static __forceinline COLORREF sttShadeColor(COLORREF clLine1, COLORREF clBack)
int ProcessTBLoaded(WPARAM wParam, LPARAM lParam)
{
TTBButton ttb = { sizeof(ttb) };
- ttb.pszTooltipUp = ttb.name = LPGEN("Favourite Contacts");
+ ttb.pszTooltipUp = ttb.name = LPGEN("Favorite Contacts");
ttb.pszService = MS_FAVCONTACTS_SHOWMENU;
ttb.dwFlags = TTBBF_SHOWTOOLTIP | TTBBF_VISIBLE;
ttb.hIconHandleUp = iconList[0].hIcolib;
@@ -113,7 +113,7 @@ int ProcessReloadFonts(WPARAM wParam, LPARAM lParam)
LOGFONT lf = {0};
FontIDT fontid = {0};
fontid.cbSize = sizeof(fontid);
- lstrcpy(fontid.group, LPGENT("Favourite Contacts"));
+ lstrcpy(fontid.group, LPGENT("Favorite Contacts"));
lstrcpy(fontid.name, LPGENT("Contact name"));
g_Options.clLine1 = CallService(MS_FONT_GETT, (WPARAM)&fontid, (LPARAM)&lf);
@@ -131,7 +131,7 @@ int ProcessReloadFonts(WPARAM wParam, LPARAM lParam)
ColourIDT colourid = {0};
colourid.cbSize = sizeof(colourid);
- lstrcpy(colourid.group, LPGENT("Favourite Contacts"));
+ lstrcpy(colourid.group, LPGENT("Favorite Contacts"));
lstrcpy(colourid.name, LPGENT("Background"));
g_Options.clBack = CallService(MS_COLOUR_GETT, (WPARAM)&colourid, (LPARAM)&lf);
@@ -148,7 +148,7 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam)
StatusIconData sid = { sizeof(sid) };
sid.szModule = "FavContacts";
- sid.szTooltip = LPGEN("Favourite Contacts");
+ sid.szTooltip = LPGEN("Favorite Contacts");
sid.hIcon = Skin_GetIconByHandle(iconList[0].hIcolib);
sid.hIconDisabled = Skin_GetIconByHandle(iconList[1].hIcolib);
Srmm_AddIcon(&sid);
@@ -160,7 +160,7 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam)
FontIDT fontid = {0};
fontid.cbSize = sizeof(fontid);
- lstrcpy(fontid.group, LPGENT("Favourite Contacts"));
+ lstrcpy(fontid.group, LPGENT("Favorite Contacts"));
lstrcpyA(fontid.dbSettingsGroup, "FavContacts");
lstrcpy(fontid.backgroundGroup, LPGENT("Favourite Contacts"));
fontid.flags = FIDF_DEFAULTVALID;
@@ -201,7 +201,7 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam)
ColourIDT colourid = {0};
colourid.cbSize = sizeof(colourid);
- lstrcpy(colourid.group, LPGENT("Favourite Contacts"));
+ lstrcpy(colourid.group, LPGENT("Favorite Contacts"));
lstrcpyA(colourid.dbSettingsGroup, "FavContacts");
lstrcpy(colourid.name, LPGENT("Background"));
@@ -223,7 +223,7 @@ int ProcessModulesLoaded(WPARAM wParam, LPARAM lParam)
HOTKEYDESC hotkey = {0};
hotkey.cbSize = sizeof(hotkey);
hotkey.pszName = "FavContacts/ShowMenu";
- hotkey.pszDescription = LPGEN("Show favourite contacts");
+ hotkey.pszDescription = LPGEN("Show favorite contacts");
hotkey.pszSection = "Contacts";
hotkey.pszService = MS_FAVCONTACTS_SHOWMENU_CENTERED;
hotkey.DefHotKey = MAKEWORD('Q', HOTKEYF_EXT);
@@ -245,7 +245,7 @@ int ProcessOptInitialise(WPARAM wParam, LPARAM lParam)
odp.hInstance = g_hInst;
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS);
odp.pszGroup = LPGEN("Contacts");
- odp.pszTitle = LPGEN("Favourites");
+ odp.pszTitle = LPGEN("Favorites");
odp.groupPosition = 910000000;
odp.flags = ODPF_BOLDGROUPS;
odp.pfnDlgProc = OptionsDlgProc;
@@ -284,7 +284,7 @@ extern "C" __declspec(dllexport) int Load(void)
/////////////////////////////////////////////////////////////////////////////////////
- Icon_Register(g_hInst, LPGEN("Favourites"), iconList, SIZEOF(iconList));
+ Icon_Register(g_hInst, LPGEN("Favorites"), iconList, SIZEOF(iconList));
LoadHttpApi();
@@ -292,7 +292,7 @@ extern "C" __declspec(dllexport) int Load(void)
CLISTMENUITEM mi = { sizeof(mi) };
mi.icolibItem = LoadSkinnedIconHandle(SKINICON_OTHER_OPTIONS);
mi.position = 1900000000;
- mi.pszName = LPGEN("&Favourite Contacts...");
+ mi.pszName = LPGEN("&Favorite Contacts...");
mi.pszService = MS_FAVCONTACTS_SHOWMENU;
Menu_AddMainMenuItem(&mi);
#endif
diff --git a/plugins/FavContacts/src/resource.h b/plugins/FavContacts/src/resource.h
index ca419ff8ef..099847ed80 100644
--- a/plugins/FavContacts/src/resource.h
+++ b/plugins/FavContacts/src/resource.h
@@ -2,7 +2,7 @@
// Microsoft Visual C++ generated include file.
// Used by resource.rc
//
-#define IDI_FAVOURITE 101
+#define IDI_FAVORITE 101
#define IDI_REGULAR 102
#define IDD_OPTIONS 107
#define IDC_CLIST 1001