summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--langpacks/russian/=CORE=.txt6
-rw-r--r--langpacks/russian/=DUPES=.txt4
-rw-r--r--langpacks/russian/Plugins/WinterSpeak.txt2
-rw-r--r--plugins/IEView/src/Options.cpp2
-rw-r--r--plugins/Scriver/src/globals.cpp2
-rw-r--r--plugins/Scriver/src/msgoptions.cpp6
-rw-r--r--plugins/TabSRMM/src/chat/options.cpp8
-rw-r--r--plugins/TabSRMM/src/msgoptions.cpp2
-rw-r--r--plugins/WinterSpeak/res/Speak.rc2
-rw-r--r--src/core/stdchat/src/options.cpp6
-rw-r--r--src/core/stduihist/history.cpp4
11 files changed, 22 insertions, 22 deletions
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 846e83976c..d7fd9112d3 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -717,7 +717,7 @@ URL:
Входящий файл
[Incoming File]
Входящий файл
-[Incoming Message]
+[Incoming message]
Входящее сообщение
[Incoming nick]
Имя собеседника
@@ -935,7 +935,7 @@ Miranda NG не может открыть '%s'\nОн недоступен или
Исходящие соединения
[Outgoing File]
Исходящий файл
-[Outgoing Message]
+[Outgoing message]
Исходящее сообщение
[Outgoing nick]
Ваше имя
@@ -2496,3 +2496,5 @@ Miranda не смогла загрузить встроенную систему
Обед&аю\tCtrl+9
[No profile support installed!]
Нет установленных плагинов базы!
+[Group сhats log]
+Групповые чаты \ No newline at end of file
diff --git a/langpacks/russian/=DUPES=.txt b/langpacks/russian/=DUPES=.txt
index d9450aa771..88b98cf56f 100644
--- a/langpacks/russian/=DUPES=.txt
+++ b/langpacks/russian/=DUPES=.txt
@@ -1283,8 +1283,6 @@ Web-страница
Изменять размер смайлов
[Show avatars]
Аватары
-[Group Chats]
-Чаты
[Group chats]
Чаты
[Instant messages]
@@ -2235,7 +2233,7 @@ ID пользователя:
Тема '%s'
[The topic is '%s' (set by %s)]
Тема '%s' (установлена %s)
-[User list members (Online)]
+[User list members (online)]
Пользователи (в сети)
[Flash window when someone speaks]
Мигать окном, если есть новое сообщение
diff --git a/langpacks/russian/Plugins/WinterSpeak.txt b/langpacks/russian/Plugins/WinterSpeak.txt
index 2117ec95d1..e6327f4056 100644
--- a/langpacks/russian/Plugins/WinterSpeak.txt
+++ b/langpacks/russian/Plugins/WinterSpeak.txt
@@ -19,7 +19,7 @@
Тест
[Occurring Events]
Произошедшие события
-[Incoming Message]
+[Incoming message]
Входящее сообщение
[Incoming URL]
Входящая ссылка
diff --git a/plugins/IEView/src/Options.cpp b/plugins/IEView/src/Options.cpp
index a74c703ce1..9c9959e24e 100644
--- a/plugins/IEView/src/Options.cpp
+++ b/plugins/IEView/src/Options.cpp
@@ -44,7 +44,7 @@ static tabPages[] =
{
{ IEViewGeneralOptDlgProc, IDD_GENERAL_OPTIONS, LPGENT("General") },
{ IEViewSRMMOptDlgProc, IDD_SRMM_OPTIONS, LPGENT("Message Log") },
- { IEViewGroupChatsOptDlgProc, IDD_SRMM_OPTIONS, LPGENT("Group Chats") },
+ { IEViewGroupChatsOptDlgProc, IDD_SRMM_OPTIONS, LPGENT("Group chats") },
{ IEViewHistoryOptDlgProc, IDD_SRMM_OPTIONS, LPGENT("History") }
};
diff --git a/plugins/Scriver/src/globals.cpp b/plugins/Scriver/src/globals.cpp
index 8444feee69..6db8274071 100644
--- a/plugins/Scriver/src/globals.cpp
+++ b/plugins/Scriver/src/globals.cpp
@@ -101,7 +101,7 @@ void RegisterIcons(void)
HookEvent(ME_SKIN2_ICONSCHANGED, IconsChanged);
Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList, 16);
- Icon_Register(g_hInst, LPGEN("Group Chats"), iconList+16, 20);
+ Icon_Register(g_hInst, LPGEN("Group chats"), iconList+16, 20);
Icon_Register(g_hInst, LPGEN("Single Messaging"), iconList+36, 14);
}
diff --git a/plugins/Scriver/src/msgoptions.cpp b/plugins/Scriver/src/msgoptions.cpp
index 6faf689160..83fc9ca47e 100644
--- a/plugins/Scriver/src/msgoptions.cpp
+++ b/plugins/Scriver/src/msgoptions.cpp
@@ -182,8 +182,8 @@ void RegisterChatFonts( void )
char idstr[10];
int index = 0, i;
fid.cbSize = sizeof(FontIDT);
- mir_sntprintf(fid.group, SIZEOF(fid.group), _T("%s/%s"), LPGENT("Messaging"), LPGENT("Group Chats"));
- mir_sntprintf(fid.backgroundGroup, SIZEOF(fid.backgroundGroup), _T("%s/%s"), LPGENT("Messaging"), LPGENT("Group Chats"));
+ mir_sntprintf(fid.group, SIZEOF(fid.group), _T("%s/%s"), LPGENT("Messaging"), LPGENT("Group chats"));
+ mir_sntprintf(fid.backgroundGroup, SIZEOF(fid.backgroundGroup), _T("%s/%s"), LPGENT("Messaging"), LPGENT("Group chats"));
strncpy(fid.dbSettingsGroup, "ChatFonts", sizeof(fid.dbSettingsGroup));
fid.flags = FIDF_ALLOWREREGISTER | FIDF_DEFAULTVALID | FIDF_NEEDRESTART;
for (i = 0; i < SIZEOF(chatFontOptionsList); i++) {
@@ -207,7 +207,7 @@ void RegisterChatFonts( void )
strncpy(colourid.setting, "ColorLogBG", SIZEOF(colourid.setting));
_tcsncpy(colourid.name, LPGENT("Background"), SIZEOF(colourid.name));
- mir_sntprintf(colourid.group, SIZEOF(colourid.group), _T("%s/%s"), LPGENT("Messaging"), LPGENT("Group Chats"));
+ mir_sntprintf(colourid.group, SIZEOF(colourid.group), _T("%s/%s"), LPGENT("Messaging"), LPGENT("Group chats"));
colourid.defcolour = GetSysColor(COLOR_WINDOW);
ColourRegisterT(&colourid);
diff --git a/plugins/TabSRMM/src/chat/options.cpp b/plugins/TabSRMM/src/chat/options.cpp
index 6bbcd2d849..7648b6fa63 100644
--- a/plugins/TabSRMM/src/chat/options.cpp
+++ b/plugins/TabSRMM/src/chat/options.cpp
@@ -63,7 +63,7 @@ struct ColorOptionsList
* (GetSysColor(default_color & 0x00ffffff)), not a rgb value.
*/
static ColorOptionsList _clrs[] = {
- 0, LPGENT("Message Sessions")_T("/")LPGENT("Group Chats"), LPGENT("Group chat log background"), SRMSGSET_BKGCOLOUR_MUC, SRMSGDEFSET_BKGCOLOUR,
+ 0, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), LPGENT("Group chat log background"), SRMSGSET_BKGCOLOUR_MUC, SRMSGDEFSET_BKGCOLOUR,
1, LPGENT("Message Sessions"), LPGENT("Input area background"), "inputbg", SRMSGDEFSET_BKGCOLOUR,
2, LPGENT("Message Sessions"), LPGENT("Log background"), SRMSGSET_BKGCOLOUR, SRMSGDEFSET_BKGCOLOUR,
0, LPGENT("Message Sessions")_T("/")LPGENT("Single Messaging"), LPGENT("Outgoing background"), "outbg", SRMSGDEFSET_BKGOUTCOLOUR,
@@ -721,7 +721,7 @@ void RegisterFontServiceFonts() {
fontOptionsList = CHAT_fontOptionsList;
fid.flags = FIDF_DEFAULTVALID|FIDF_ALLOWEFFECTS;
fid.flags&=~FIDF_SAVEPOINTSIZE;
- _tcsncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group Chats"), SIZEOF(fid.group));
+ _tcsncpy(fid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), SIZEOF(fid.group));
strncpy(fid.dbSettingsGroup, CHAT_FONTMODULE, SIZEOF(fid.dbSettingsGroup));
for (int i=0; i < msgDlgFontCount; i++) {
LoadMsgDlgFont(FONTSECTION_CHAT, i , &lf, &fontOptionsList[i].colour, CHAT_FONTMODULE);
@@ -735,14 +735,14 @@ void RegisterFontServiceFonts() {
fid.flags = fid.flags & ~FIDF_CLASSMASK | (fid.deffontsettings.style&FONTF_BOLD ? FIDF_CLASSHEADER : FIDF_CLASSGENERAL);
fid.deffontsettings.charset = lf.lfCharSet;
_tcsncpy(fid.deffontsettings.szFace, lf.lfFaceName, LF_FACESIZE);
- _tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Group Chats"), SIZEOF(fid.backgroundGroup));
+ _tcsncpy(fid.backgroundGroup, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), SIZEOF(fid.backgroundGroup));
_tcsncpy(fid.backgroundName, LPGENT("Group chat log background"), SIZEOF(fid.backgroundName));
if (i == 18 || i == 19)
_tcsncpy(fid.backgroundName, LPGENT("Userlist background"), SIZEOF(fid.backgroundName));
FontRegisterT(&fid);
}
- _tcsncpy(cid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group Chats"), SIZEOF(cid.group));
+ _tcsncpy(cid.group, LPGENT("Message Sessions")_T("/")LPGENT("Group chats"), SIZEOF(cid.group));
strncpy(cid.dbSettingsGroup, "Chat", SIZEOF(cid.dbSettingsGroup));
for (int i=0; i <= 7; i++) {
mir_snprintf(szTemp, SIZEOF(szTemp), "NickColor%d", i);
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp
index 82268570b9..1fcdddafe8 100644
--- a/plugins/TabSRMM/src/msgoptions.cpp
+++ b/plugins/TabSRMM/src/msgoptions.cpp
@@ -1322,7 +1322,7 @@ static int OptInitialise(WPARAM wParam, LPARAM lParam)
odp.pszGroup = LPGEN("Message Sessions");
odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPTIONS1);
- odp.pszTitle = LPGEN("Group Chats");
+ odp.pszTitle = LPGEN("Group chats");
odp.pszTab = LPGEN("Settings");
odp.pfnDlgProc = DlgProcOptions1;
Options_AddPage(wParam, &odp);
diff --git a/plugins/WinterSpeak/res/Speak.rc b/plugins/WinterSpeak/res/Speak.rc
index 7d558d2518..5c159b926a 100644
--- a/plugins/WinterSpeak/res/Speak.rc
+++ b/plugins/WinterSpeak/res/Speak.rc
@@ -61,7 +61,7 @@ BEGIN
CONTROL "Free for chat",IDC_STATUS_FREEFORCHAT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,85,85,10
CONTROL "Invisible",IDC_STATUS_INVISIBLE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,96,85,10
GROUPBOX "Occurring Events",IDC_STATIC,7,117,99,74
- CONTROL "Incoming Message",IDC_EVENT_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,131,85,10
+ CONTROL "Incoming message",IDC_EVENT_MESSAGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,131,85,10
CONTROL "Incoming URL",IDC_EVENT_URL,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,142,85,10
CONTROL "Incoming File",IDC_EVENT_FILE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,153,85,10
CONTROL "Authorization request",IDC_EVENT_AUTHREQUEST,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,15,164,85,10
diff --git a/src/core/stdchat/src/options.cpp b/src/core/stdchat/src/options.cpp
index 1ee629ff4e..097dded947 100644
--- a/src/core/stdchat/src/options.cpp
+++ b/src/core/stdchat/src/options.cpp
@@ -68,7 +68,7 @@ static const fontOptionsList[] = {
{ LPGENT("Action message"), RGB(160, 90, 160), _T("Verdana"), DEFAULT_CHARSET, 0, -12},
{ LPGENT("Highlighted message"), RGB(180, 150, 80), _T("Verdana"), DEFAULT_CHARSET, 0, -12},
{ LPGENT("Message typing area"), RGB(0, 0, 40), _T("Verdana"), DEFAULT_CHARSET, 0, -12},
- { LPGENT("User list members (Online)"), RGB(0,0, 0), _T("Verdana"), DEFAULT_CHARSET, 0, -12},
+ { LPGENT("User list members (online)"), RGB(0,0, 0), _T("Verdana"), DEFAULT_CHARSET, 0, -12},
{ LPGENT("User list members (away)"), RGB(170, 170, 170), _T("Verdana"), DEFAULT_CHARSET, 0, -12},
};
@@ -469,8 +469,8 @@ static IconItem iconList[] =
void AddIcons(void)
{
- Icon_Register(g_hInst, LPGEN("Messaging") "/" LPGEN("Group Chats"), iconList, 21);
- Icon_Register(g_hInst, LPGEN("Messaging") "/" LPGEN("Group Chats Log"), iconList+21, 14);
+ Icon_Register(g_hInst, LPGEN("Messaging") "/" LPGEN("Group chats"), iconList, 21);
+ Icon_Register(g_hInst, LPGEN("Messaging") "/" LPGEN("Group chats log"), iconList+21, 14);
}
// load icons from the skinning module if available
diff --git a/src/core/stduihist/history.cpp b/src/core/stduihist/history.cpp
index e21e9cf21f..9f2eac9836 100644
--- a/src/core/stduihist/history.cpp
+++ b/src/core/stduihist/history.cpp
@@ -100,8 +100,8 @@ static void GetObjectSummary(DBEVENTINFO *dbei, TCHAR* str, int cbStr)
switch(dbei->eventType) {
case EVENTTYPE_MESSAGE:
- if (dbei->flags & DBEF_SENT) pszSrc = TranslateT("Outgoing Message");
- else pszSrc = TranslateT("Incoming Message");
+ if (dbei->flags & DBEF_SENT) pszSrc = TranslateT("Outgoing message");
+ else pszSrc = TranslateT("Incoming message");
break;
case EVENTTYPE_URL:
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-30 19:50:10 +0000