summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/Plugins/SendSS.txt40
-rw-r--r--langpacks/english/Plugins/VKontakte.txt44
-rw-r--r--langpacks/russian/Plugins/SendSS.txt52
-rw-r--r--langpacks/russian/Plugins/VKontakte.txt86
-rw-r--r--langpacks/russian/Untranslated/SendSS.txt8
-rw-r--r--protocols/VKontakte/res/resource.rc2
6 files changed, 119 insertions, 113 deletions
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 4484cf89d0..84819e47a6 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SendSS.dll
; Plugin: Send ScreenShot+
-; Version: 0.8.7.0
+; Version: 0.8.9.0
; Authors: Merlin
;============================================================
[Take a screenshot and send it to a contact.]
@@ -16,7 +16,7 @@
[Ti&med capture]
[Time (secs):]
[&Format:]
-[Send B&y:]
+[Send b&y:]
[E&xplore]
[&Fill description textbox.]
[Delete &after send]
@@ -30,9 +30,9 @@
[Edit]
[Caption:]
[Size (HxW):]
-[C&lient Area]
-[indirect capture]
-[Target Tool]
+[C&lient area]
+[Indirect capture]
+[Target tool]
[File:]
[Description:]
[Result]
@@ -94,20 +94,7 @@
;file \plugins\SendScreenshotPlus\src\global.h
[SendScreenshot - Error]
;file \plugins\SendScreenshotPlus\src\Main.cpp
-[Fatal error, image services not found. SendScreenshot will be disabled.]
-[Open SendSS+]
-[SendSS]
-[Screenshots]
-[SendSS HTTP connections]
-[Could not create main dialog.]
-[Send Screenshot]
-[Send desktop screenshot]
-[Take a screenshot]
-[Could not register Miranda service.]
-[Could not create Screenshot folder (error code: %d):\n%s\nDo you have write permissions?]
-;file \plugins\SendScreenshotPlus\src\mir_icolib.cpp
-[Screenshot Icon1]
-[Screenshot Icon2]
+[Main Icon]
[Target Cursor]
[Target Desktop]
[Help]
@@ -123,9 +110,17 @@
[BBC]
[BBC link]
[Down arrow]
-;file \plugins\SendScreenshotPlus\src\mir_icolib.h
+[Could not create screenshot folder (error code: %d):\n%s\nDo you have write permissions?]
+[Could not create main dialog.]
+[SendSS HTTP connections]
+[SendSS]
+[Screenshots]
+[Image services (AdvaImg) not found.\nSendSS disabled.]
[Buttons]
-[Overlays]
+[Could not register Miranda service.]
+[Take a screenshot]
+[Send desktop screenshot]
+[Open SendSS+]
;file \plugins\SendScreenshotPlus\src\UAboutForm.cpp
[Credits]
[< Copyright]
@@ -150,10 +145,11 @@
[Fill description textbox.]
[Delete after send]
[Capture]
-[Can't create a Screenshot]
+[Couldn't take a screenshot]
[Select a file]
[Select a target window.]
[Screenshot ]
[for Client area ]
[of "]
[" Window]
+[Send screenshot?]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 6517764158..65d99d58d8 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,11 +2,21 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.35
+; Version: 0.1.0.36
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
;file \protocols\VKontakte\res\resource.rc
+[[img] BBCode support for image ]
+[off]
+[for original size images]
+[for preview max 130px*130px]
+[for preview max 604px*604px]
+[BBCode support on news and event notifications]
+[basic ([b], [i], [u], [s])]
+[advanced (+[url], [size], [color])]
+[Other]
+[Process stickers as smileys]
[News and event notifications]
[WARNING: Causes excessive network traffic!!!]
[Enable news feeds]
@@ -14,15 +24,12 @@
[Enable event notifications]
[Interval for notification updates (min):]
[Special contact always enabled]
-[BBCode support on news and event notifications]
[E-mail or phone number:]
[Password:]
[Open VKontakte site]
[Advanced]
[Hide chats on startup]
[Always notify as unread for all incoming message]
-[Add [img] BBCode for graphical attachments]
-[Process stickers as smileys]
[Force online status upon user activity]
[When I ban user...]
[Report abuse]
@@ -30,7 +37,6 @@
[Remove from friend list]
[Remove from contact list]
[Broadcast music...]
-[off]
[as regular status for unknown music and audio status otherwise]
[as audio status only]
[as regular status only]
@@ -59,8 +65,6 @@
[Mark users you want to invite to a new chat]
[New chat's title:]
;file \protocols\VKontakte\src\misc.cpp
-[Error %d. Data will not be sent or received.]
-[Error]
[Captcha form icon]
[Notification icon]
[Read message icon]
@@ -73,6 +77,8 @@
[Broadcast icon]
[Protocols]
[VKontakte]
+[Error %d. Data will not be sent or received.]
+[Error]
[Message read: %s]
[commented on your post]
[commented on your photo]
@@ -91,6 +97,15 @@
[shared your post]
[shared your photo]
[shared your video]
+[Photo]
+[Attachments:]
+[Audio]
+[Video]
+[Document]
+[Wall post]
+[Link]
+[Image]
+[Unsupported or unknown attachment type: %s]
;file \protocols\VKontakte\src\vk_captcha.cpp
[Enter the text you see]
;file \protocols\VKontakte\src\vk_chats.cpp
@@ -110,12 +125,9 @@
[&User details]
[&Kick]
;file \protocols\VKontakte\src\vk_feed.cpp
-[Photo]
[User was tagged in these photos:]
-[News from %s%s%s (%s)\n%s]
-[\tRepost from %s%s%s (%s)\n%s]
-[\nNews link: %s]
-[Link]
+[News from %s\n%s]
+[\tRepost from %s\n%s]
;file \protocols\VKontakte\src\vk_files.cpp
[Couldn't save file]
[Invalid album id]
@@ -134,6 +146,7 @@
[Network]
[Account]
[News and notifications]
+[View settings]
;file \protocols\VKontakte\src\vk_proto.cpp
[%s server connection]
[Create new chat]
@@ -168,10 +181,3 @@
[Are you sure to ban %s? %s%sContinue?]
[\nIt will also]
[Are you sure to report abuse on %s?]
-[Attachments:]
-[Audio]
-[Video]
-[Document]
-[Wall post]
-[Image]
-[Unsupported or unknown attachment type: %s]
diff --git a/langpacks/russian/Plugins/SendSS.txt b/langpacks/russian/Plugins/SendSS.txt
index d32c8fb5ac..3482fed550 100644
--- a/langpacks/russian/Plugins/SendSS.txt
+++ b/langpacks/russian/Plugins/SendSS.txt
@@ -2,7 +2,7 @@
;============================================================
; File: SendSS.dll
; Plugin: Send ScreenShot+
-; Version: 0.8.7.0
+; Version: 0.8.9.0
; Authors: Merlin
;============================================================
[Take a screenshot and send it to a contact.]
@@ -23,7 +23,7 @@
Секунд:
[&Format:]
&Формат:
-[Send B&y:]
+[Send b&y:]
Че&рез:
[E&xplore]
Об&зор
@@ -49,9 +49,9 @@
Заголовок:
[Size (HxW):]
Размер (ВxШ):
-[C&lient Area]
+[C&lient area]
Сод&ержимое
-[indirect capture]
+[Indirect capture]
косвенный захват
[File:]
Файл:
@@ -113,30 +113,6 @@
Игнорировать
[SendScreenshot - Error]
SendScreenshot - Ошибка
-[Fatal error, image services not found. SendScreenshot will be disabled.]
-Критическая ошибка, не найдена служба изображений. Плагин SendScreenshot будет отключен.
-[Open SendSS+]
-Открыть SendSS+
-[SendSS]
-Отправить скриншот
-[Screenshots]
-Снимки экрана
-[SendSS HTTP connections]
-HTTP подключение SendSS
-[Could not create main dialog.]
-Невозможно создать главный диалог.
-[Send Screenshot]
-Отправить скриншот
-[Send desktop screenshot]
-Отправить скриншот экрана
-[Take a screenshot]
-Сделать скриншот
-[Could not create Screenshot folder (error code: %d):\n%s\nDo you have write permissions?]
-Не удалось создать папку для скриншотов (код ошибки: %d):\n%s\nУ вас точно есть права на запись?
-[Screenshot Icon1]
-Значок снимка 1
-[Screenshot Icon2]
-Значок снимка 2
[Target Cursor]
Курсор цель
[Target Desktop]
@@ -161,10 +137,24 @@ HTTP подключение SendSS
Обновить
[Down arrow]
Вниз
+[Could not create screenshot folder (error code: %d):\n%s\nDo you have write permissions?]
+Не удалось создать папку для скриншотов (код ошибки: %d):\n%s\nУ вас точно есть права на запись?
+[Could not create main dialog.]
+Невозможно создать главный диалог.
+[SendSS HTTP connections]
+HTTP подключение SendSS
+[SendSS]
+Отправить скриншот
+[Screenshots]
+Снимки экрана
[Buttons]
Кнопки
-[Overlays]
-Оверлеи
+[Take a screenshot]
+Сделать скриншот
+[Send desktop screenshot]
+Отправить скриншот экрана
+[Open SendSS+]
+Открыть SendSS+
[Credits]
Кредиты
[< Copyright]
@@ -199,8 +189,6 @@ Upload Pie (1 нед)
Информация
[Delete after send]
Удалить после отправки
-[Can't create a Screenshot]
-Невозможно создать скриншот
[Select a file]
Выберите файл
[Select a target window.]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index ceafcd0302..77b62fcf3b 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -2,11 +2,31 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.35
+; Version: 0.1.0.36
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
Поддержка протокола ВКонтакте в Miranda NG.
+[[img] BBCode support for image ]
+Поддержка BB-кода [img] для изображений
+[off]
+отключена
+[for original size images]
+для оригинального размера
+[for preview max 130px*130px]
+для предпросмотра в 130px*130px
+[for preview max 604px*604px]
+для предпросмотра в 604px*604px
+[BBCode support on news and event notifications]
+Поддержка BB-кодов для новостей и уведомлений
+[basic ([b], [i], [u], [s])]
+базовая ([b], [i], [u], [s])
+[advanced (+[url], [size], [color])]
+продвинутая (+[url], [size], [color])
+[Other]
+Другое
+[Process stickers as smileys]
+Обрабатывать стикеры как смайлы
[News and event notifications]
Новости и уведомления
[WARNING: Causes excessive network traffic!!!]
@@ -21,8 +41,6 @@
Интервал обновлений уведомлений (мин):
[Special contact always enabled]
Псевдоконтакт всегда включён
-[BBCode support on news and event notifications]
-Поддержка BB-кодов для новостей и уведомлений
[E-mail or phone number:]
E-mail или номер телефона:
[Password:]
@@ -35,10 +53,6 @@ E-mail или номер телефона:
Не открывать окна комнат чата при входе
[Always notify as unread for all incoming message]
Помечать все входящие сообщения как "Непрочитанное"
-[Add [img] BBCode for graphical attachments]
-Добавлять BBCode [img] для графических вложений
-[Process stickers as smileys]
-Обрабатывать стикеры как смайлы
[Force online status upon user activity]
Переводить статус контакта в онлайн при его активности
[When I ban user...]
@@ -53,8 +67,6 @@ E-mail или номер телефона:
Удалить из списка контактов
[Broadcast music...]
Трансляция музыки...
-[off]
-отключена
[as regular status for unknown music and audio status otherwise]
как обычный статус для неизвестных композиций, иначе как аудио статус
[as audio status only]
@@ -109,10 +121,6 @@ Cоздать комнату чата
Отметить пользователей для приглашения в комнату чата
[New chat's title:]
Звголовок новой комнаты
-[Error %d. Data will not be sent or received.]
-Ошибка %d. Данные не будут приняты или отправлены.
-[Error]
-Ошибка
[Captcha form icon]
Значок формы с капчей
[Notification icon]
@@ -137,6 +145,10 @@ Cоздать комнату чата
Протоколы
[VKontakte]
ВКонтакте
+[Error %d. Data will not be sent or received.]
+Ошибка %d. Данные не будут приняты или отправлены.
+[Error]
+Ошибка
[Message read: %s]
Сообщение прочтено в: %s
[commented on your post]
@@ -173,6 +185,24 @@ Cоздать комнату чата
поделился вашей фотографией
[shared your video]
поделился вашим видео
+[Photo]
+Фото
+[Attachments:]
+Вложения:
+[Audio]
+Аудио
+[Video]
+Видео
+[Document]
+Документ
+[Wall post]
+Запись на стене
+[Link]
+Ссылка
+[Image]
+Изображение
+[Unsupported or unknown attachment type: %s]
+Неподдерживаемый или неизвестный тип вложения: %s
[Enter the text you see]
Введите текст, который видите
[Participants]
@@ -205,18 +235,12 @@ Cоздать комнату чата
Информация о &контакте
[&Kick]
&Выкинуть
-[Photo]
-Фото
[User was tagged in these photos:]
Пользователь был отмечен на этих фотографиях
-[News from %s%s%s (%s)\n%s]
-Новость от %s%s%s (%s)\n%s
-[\tRepost from %s%s%s (%s)\n%s]
-\tРепост от %s%s%s (%s)\n%s
-[\nNews link: %s]
-\nСсылка на новость: %s
-[Link]
-Ссылка
+[News from %s\n%s]
+Новость от %s\n%s
+[\tRepost from %s\n%s]
+\tРепост от %s\n%s
[Couldn't save file]
Невозможно сохранить файл
[Invalid album id]
@@ -247,6 +271,8 @@ Cоздать комнату чата
Учётная запись
[News and notifications]
Новости и уведомления
+[View settings]
+Настройки вида
[%s server connection]
Подключение к серверу %s
[Create new chat]
@@ -311,17 +337,3 @@ Cоздать комнату чата
\nЭто также
[Are you sure to report abuse on %s?]
Вы уверены, что хотите отправить жалобу на %s?
-[Attachments:]
-Вложения:
-[Audio]
-Аудио
-[Video]
-Видео
-[Document]
-Документ
-[Wall post]
-Запись на стене
-[Image]
-Изображение
-[Unsupported or unknown attachment type: %s]
-Неподдерживаемый или неизвестный тип вложения: %s
diff --git a/langpacks/russian/Untranslated/SendSS.txt b/langpacks/russian/Untranslated/SendSS.txt
index cf24f88fcb..78cb34da0f 100644
--- a/langpacks/russian/Untranslated/SendSS.txt
+++ b/langpacks/russian/Untranslated/SendSS.txt
@@ -1,6 +1,6 @@
[Send screenshot to\n<unknown>]
[%s\nv%s]
-[Target Tool]
+[Target tool]
[Resulting URL from\n]
[Copy BBCode]
[Copy BBCode w/ link]
@@ -19,16 +19,20 @@
[Image upload]
[HTTPServer transfer]
[%s (%i):\nCould not add a share to the HTTP Server plugin.]
-[Could not register Miranda service.]
+[Main Icon]
[Edit on]
[BBC]
[BBC link]
+[Image services (AdvaImg) not found.\nSendSS disabled.]
+[Could not register Miranda service.]
[Send screenshot to\n]
[<Entire Desktop>]
[<Only save>]
[Fill description textbox.]
[Capture]
+[Couldn't take a screenshot]
[Screenshot ]
[for Client area ]
[of "]
[" Window]
+[Send screenshot?]
diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc
index 892a0f6997..4fe62b9895 100644
--- a/protocols/VKontakte/res/resource.rc
+++ b/protocols/VKontakte/res/resource.rc
@@ -124,7 +124,7 @@ BEGIN
CONTROL "for preview max 604px*604px",IDC_IMG_604,"Button",BS_AUTORADIOBUTTON,154,30,129,10
GROUPBOX "BBCode support on news and event notifications",IDC_STATIC,4,50,294,38
CONTROL "off",IDC_NEWSBBC_OFF,"Button",BS_AUTORADIOBUTTON,12,61,129,10
- CONTROL "basic ([b], [i], [u], [s]) ",IDC_NEWSBBC_BASIC,"Button",BS_AUTORADIOBUTTON,12,72,129,10
+ CONTROL "basic ([b], [i], [u], [s])",IDC_NEWSBBC_BASIC,"Button",BS_AUTORADIOBUTTON,12,72,129,10
CONTROL "advanced (+[url], [size], [color])",IDC_NEWSBBC_ADV,
"Button",BS_AUTORADIOBUTTON,154,61,129,10
GROUPBOX "Other",IDC_STATIC,4,90,293,26