summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--langpacks/english/Plugins/ChangeKeyboardLayout.txt2
-rw-r--r--langpacks/english/Plugins/NewXstatusNotify.txt2
-rw-r--r--langpacks/english/Plugins/PluginUpdater.txt2
-rw-r--r--langpacks/russian/=CORE=.txt2
-rw-r--r--langpacks/russian/Plugins/ChangeKeyboardLayout.txt4
-rw-r--r--langpacks/russian/Plugins/CrashDumper.txt2
-rw-r--r--langpacks/russian/Plugins/Facebook.txt6
-rw-r--r--langpacks/russian/Plugins/ICQ.txt2
-rw-r--r--langpacks/russian/Plugins/NewXstatusNotify.txt4
-rw-r--r--langpacks/russian/Plugins/PluginUpdater.txt4
-rw-r--r--langpacks/russian/Plugins/Scriver.txt2
-rw-r--r--langpacks/russian/Plugins/SmileyAdd.txt2
-rw-r--r--langpacks/russian/Untranslated/Facebook.txt3
-rw-r--r--langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt4
-rw-r--r--langpacks/ukrainian/Plugins/NewXstatusNotify.txt4
-rw-r--r--langpacks/ukrainian/Plugins/PluginUpdater.txt2
-rw-r--r--plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc2
-rw-r--r--plugins/NewXstatusNotify/res/resource.rc2
-rw-r--r--plugins/PluginUpdater/src/Utils.cpp2
19 files changed, 27 insertions, 26 deletions
diff --git a/langpacks/english/Plugins/ChangeKeyboardLayout.txt b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
index 5c7aec4a9f..d9038d2e50 100644
--- a/langpacks/english/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/english/Plugins/ChangeKeyboardLayout.txt
@@ -25,7 +25,7 @@
[Set Caps Lock state when inverting lettercase:]
[Change active keyboard layout in system]
[Colors]
-[Popup colors]
+[Use default colors]
[Windows colors]
[Custom colors]
[Back]
diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index 781ad44b0a..caa04cfe5e 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -53,7 +53,7 @@
[Colors]
[Use custom colors]
[Use Windows colors]
-[Use Popup colors]
+[Use default colors]
[Popup text]
[Show contact group name]
[Show status description]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index b77f44c87e..d169427717 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -98,6 +98,6 @@
[Update failed]
;file \plugins\PluginUpdater\src\Utils.cpp
[Plugin info]
-[Plugin Updater HTTP connection]
+[Plugin Updater HTTP connections]
[An error occurred while checking for new updates.]
;file \plugins\PluginUpdater\src\Compat\compat.h
diff --git a/langpacks/russian/=CORE=.txt b/langpacks/russian/=CORE=.txt
index 696ec7309d..a8b1fc037f 100644
--- a/langpacks/russian/=CORE=.txt
+++ b/langpacks/russian/=CORE=.txt
@@ -422,7 +422,7 @@ Miranda NG перезапускается.\nПожалуйста, подожди
[Select the extra icons to be shown in the contact list:]
Выберите, какие экстра значки будут отображаться в списке контактов:
[*only the first %d icons will be shown]
-*будут отображаться только первые %d значков
+* будут отображаться только первые %d значков
[You can group/ungroup icons by selecting them (CTRL+left click) and using the popup menu (right click)]
Вы можете группировать/разгруппировывать значки, выделяя их (CTRL+клик левой кнопкой мыши) и вызывая меню с помощью правой кнопки мыши.
[Add to existing metacontact]
diff --git a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
index 1cda09790e..80eda8141a 100644
--- a/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/russian/Plugins/ChangeKeyboardLayout.txt
@@ -43,8 +43,8 @@
Менять активную раскладку клавиатуры
[Colors]
Цвета
-[Popup colors]
-Цвета вспл.окон
+[Use default colors]
+Цвета по умолчанию
[Windows colors]
Цвета Windows
[Custom colors]
diff --git a/langpacks/russian/Plugins/CrashDumper.txt b/langpacks/russian/Plugins/CrashDumper.txt
index 5530eb5186..48d0b15d25 100644
--- a/langpacks/russian/Plugins/CrashDumper.txt
+++ b/langpacks/russian/Plugins/CrashDumper.txt
@@ -98,4 +98,4 @@ Miranda NG была завершена аварийно. Отчёт сохран
[Cannot upload Version Info. Host unreachable.]
Нельзя загрузить информацию о версиях. Хост недоступен
[Crash Dumper HTTP connections]
-HTTP подключение Crash Dumper
+HTTP подключения Crash Dumper
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 6b1626f6c6..b55156552a 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -57,6 +57,8 @@
Уведомления клиента
[Friendship notifications]
Уведомления о дружбе
+[Ticker feeds]
+Тиккер
[Use this server for opening links:]
Тип сайта для открытия ссылок:
[Use balloon notifications in system tray instead of popups]
@@ -213,6 +215,8 @@ Facebook потребовал чистки компьютера и плагин
Пример уведомления
[Sample friendship]
Пример уведомления о дружбе
+[Sample ticker]
+Образец тиккера
[a sticker]
стикер
[files]
@@ -238,7 +242,7 @@ Facebook потребовал чистки компьютера и плагин
[Contact is no longer on server-list.]
Контакта больше нет в списке на сервере.
[%s server connection]
-%s подключение к серверу
+Подключение к серверу %s
[Unable to initialize Netlib for %s.]
Невозможно создать подключение Netlib для %s.
[Video call]
diff --git a/langpacks/russian/Plugins/ICQ.txt b/langpacks/russian/Plugins/ICQ.txt
index 1a750ba13a..78846fbc7b 100644
--- a/langpacks/russian/Plugins/ICQ.txt
+++ b/langpacks/russian/Plugins/ICQ.txt
@@ -1514,7 +1514,7 @@ Web-службы
[%s server connection]
%s подключение к серверу
[%s client-to-client connections]
-%s подключения между клиентами
+%s соединения между клиентами
[User ID]
ID пользователя
[You have not entered an ICQ number.\nConfigure this in Options->Network->ICQ and try again.]
diff --git a/langpacks/russian/Plugins/NewXstatusNotify.txt b/langpacks/russian/Plugins/NewXstatusNotify.txt
index 0847610e5d..d175d1ec0f 100644
--- a/langpacks/russian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/russian/Plugins/NewXstatusNotify.txt
@@ -99,8 +99,8 @@ xСтатус
Задать цвета
[Use Windows colors]
Цвета Windows
-[Use Popup colors]
-Цвета всплывающих окон
+[Use default colors]
+Цвета по умолчанию
[Popup text]
Текст всплывающих окон
[Show contact group name]
diff --git a/langpacks/russian/Plugins/PluginUpdater.txt b/langpacks/russian/Plugins/PluginUpdater.txt
index aad3d3c1c4..635839a2df 100644
--- a/langpacks/russian/Plugins/PluginUpdater.txt
+++ b/langpacks/russian/Plugins/PluginUpdater.txt
@@ -173,7 +173,7 @@
Сбой обновления
[Plugin info]
Информация о плагинах
-[Plugin Updater HTTP connection]
-HTTP подключение Plugin Updater
+[Plugin Updater HTTP connections]
+HTTP подключения Plugin Updater
[An error occurred while checking for new updates.]
Во время проверки обновления произошла ошибка.
diff --git a/langpacks/russian/Plugins/Scriver.txt b/langpacks/russian/Plugins/Scriver.txt
index 02b0de82ef..7a64172c02 100644
--- a/langpacks/russian/Plugins/Scriver.txt
+++ b/langpacks/russian/Plugins/Scriver.txt
@@ -704,7 +704,7 @@ Miranda не смогла загрузить встроенную систему
[Show icon in tray for status changes]
Смены статусов
[Show popups only when the chat room is not active]
-Смена темы
+Показывать всплывающие окна если окно чата не активено
[Show popup for topic changes]
Смена темы
[Show popup for users joining]
diff --git a/langpacks/russian/Plugins/SmileyAdd.txt b/langpacks/russian/Plugins/SmileyAdd.txt
index f30d9a7026..f82c5e096a 100644
--- a/langpacks/russian/Plugins/SmileyAdd.txt
+++ b/langpacks/russian/Plugins/SmileyAdd.txt
@@ -64,7 +64,7 @@
[Smiley cache]
Кэш смайлов
[SmileyAdd HTTP connections]
-HTTP-подключение SmileyAdd
+HTTP-подключения SmileyAdd
[Button smiley]
Кнопка смайла
[Assign smiley category]
diff --git a/langpacks/russian/Untranslated/Facebook.txt b/langpacks/russian/Untranslated/Facebook.txt
index 028f5c50ae..4d2147c4cb 100644
--- a/langpacks/russian/Untranslated/Facebook.txt
+++ b/langpacks/russian/Untranslated/Facebook.txt
@@ -1,4 +1 @@
[URL:]
-[Ticker feeds]
-[Sample ticker]
-[a link]
diff --git a/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt b/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt
index d019019540..a02b025719 100644
--- a/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt
+++ b/langpacks/ukrainian/Plugins/ChangeKeyboardLayout.txt
@@ -43,8 +43,8 @@
Змінювати активну розкладку клавіатури
[Colors]
Кольори
-[Popup colors]
-Кольори сплив. вікон
+[Use default colors]
+Кольори за замовчанням
[Windows colors]
Кольори Windows
[Custom colors]
diff --git a/langpacks/ukrainian/Plugins/NewXstatusNotify.txt b/langpacks/ukrainian/Plugins/NewXstatusNotify.txt
index 8beaad820a..b205a40185 100644
--- a/langpacks/ukrainian/Plugins/NewXstatusNotify.txt
+++ b/langpacks/ukrainian/Plugins/NewXstatusNotify.txt
@@ -99,8 +99,8 @@ xСтатуси
Вказати кольори
[Use Windows colors]
Кольори Windows
-[Use Popup colors]
-Кольори спливаючих вікон
+[Use default colors]
+Кольори за замовчанням
[Popup text]
Текст спливаючих вікон
[Show contact group name]
diff --git a/langpacks/ukrainian/Plugins/PluginUpdater.txt b/langpacks/ukrainian/Plugins/PluginUpdater.txt
index 1938ff1947..f4b595e493 100644
--- a/langpacks/ukrainian/Plugins/PluginUpdater.txt
+++ b/langpacks/ukrainian/Plugins/PluginUpdater.txt
@@ -173,7 +173,7 @@
Помилка оновлення
[Plugin info]
Інформація
-[Plugin Updater HTTP connection]
+[Plugin Updater HTTP connections]
HTTP-з'єднання PluginUpdater
[An error occurred while checking for new updates.]
Під час перевірки оновлень сталася помилка.
diff --git a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
index ec14ed7b0e..73c18e1dfb 100644
--- a/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
+++ b/plugins/ChangeKeyboardLayout/res/ChangeKeyboardLayout.rc
@@ -184,7 +184,7 @@ EXSTYLE WS_EX_CONTROLPARENT
FONT 8, "MS Shell Dlg", 0, 0, 0x1
BEGIN
GROUPBOX "Colors",IDC_GROUP_COLOURS,2,2,91,72,WS_GROUP
- CONTROL "Popup colors",IDC_RADIO_COLOURS_POPUP,"Button",
+ CONTROL "Use default colors",IDC_RADIO_COLOURS_POPUP,"Button",
BS_AUTORADIOBUTTON,6,12,82,10
CONTROL "Windows colors",IDC_RADIO_COLOURS_WINDOWS,"Button",
BS_AUTORADIOBUTTON,6,23,82,10
diff --git a/plugins/NewXstatusNotify/res/resource.rc b/plugins/NewXstatusNotify/res/resource.rc
index 524a3129f0..7590645455 100644
--- a/plugins/NewXstatusNotify/res/resource.rc
+++ b/plugins/NewXstatusNotify/res/resource.rc
@@ -149,7 +149,7 @@ BEGIN
GROUPBOX "Colors",IDC_STATIC,144,3,162,42,WS_GROUP
CONTROL "Use custom colors",IDC_USEOWNCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,13,148,8
CONTROL "Use Windows colors",IDC_USEWINCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,33,148,8
- CONTROL "Use Popup colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,23,148,8
+ CONTROL "Use default colors",IDC_USEPOPUPCOLORS,"Button",BS_AUTORADIOBUTTON | BS_MULTILINE | BS_NOTIFY,151,23,148,8
GROUPBOX "Popup text",IDC_STATIC,144,45,162,72,WS_GROUP
CONTROL "Show contact group name",IDC_SHOWGROUP,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,57,148,8
CONTROL "Show status description",IDC_SHOWSTATUS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,151,69,148,8
diff --git a/plugins/PluginUpdater/src/Utils.cpp b/plugins/PluginUpdater/src/Utils.cpp
index 4f0c806ce9..ac05ae7844 100644
--- a/plugins/PluginUpdater/src/Utils.cpp
+++ b/plugins/PluginUpdater/src/Utils.cpp
@@ -43,7 +43,7 @@ void InitNetlib()
NETLIBUSER nlu = {0};
nlu.cbSize = sizeof(nlu);
nlu.flags = NUF_OUTGOING | NUF_INCOMING | NUF_HTTPCONNS | NUF_TCHAR; // | NUF_HTTPGATEWAY;
- nlu.ptszDescriptiveName = TranslateT("Plugin Updater HTTP connection");
+ nlu.ptszDescriptiveName = TranslateT("Plugin Updater HTTP connections");
nlu.szSettingsModule = MODNAME;
hNetlibUser = (HANDLE)CallService(MS_NETLIB_REGISTERUSER, 0, (LPARAM)&nlu);
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 17:50:26 +0000