summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--langpacks/english/Plugins/Facebook.txt2
-rw-r--r--langpacks/english/Plugins/Tipper.txt2
-rw-r--r--langpacks/english/Plugins/VKontakte.txt10
-rw-r--r--langpacks/russian/Plugins/Facebook.txt2
-rw-r--r--langpacks/russian/Plugins/Tipper.txt2
-rw-r--r--langpacks/russian/Plugins/VKontakte.txt18
-rw-r--r--protocols/VKontakte/src/vk_thread.cpp2
7 files changed, 31 insertions, 7 deletions
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index e716430132..6e8a14ab31 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.9.0
+; Version: 0.2.9.1
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/Tipper.txt b/langpacks/english/Plugins/Tipper.txt
index 8533f048b4..ce5c71bff9 100644
--- a/langpacks/english/Plugins/Tipper.txt
+++ b/langpacks/english/Plugins/Tipper.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tipper.dll
; Plugin: Tipper
-; Version: 2.1.0.5
+; Version: 2.1.0.6
; Authors: Scott Ellis, yaho
;============================================================
[Tool Tip notification windows.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 1c1a9c346f..280a359798 100644
--- a/langpacks/english/Plugins/VKontakte.txt
+++ b/langpacks/english/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.11
+; Version: 0.1.0.12
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -17,6 +17,9 @@
[Server-side delivery confirmation]
[Hide chats on startup]
[Automatically wipe local contacts missing in your Friends list]
+[Always notify as unread for all incoming message]
+[Mark read on reply]
+[Automatically sync last messages ]
[Bots challenge test]
[Instruction:]
[Submit]
@@ -50,7 +53,12 @@
;file \protocols\VKontakte\src\vk_proto.cpp
[%s server connection]
[Create new chat]
+[Reload all messages from vk.com]
;file \protocols\VKontakte\src\vk_thread.cpp
+[Are you sure to reload all messages from vk.com?\n]
+[Local contact history will be deleted and reloaded from the server.\n]
+[It may take a long time. \nDo you want to continue?]
+[Attention!]
[Attachments:]
[Photo]
[Audio]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index a3e623d7bb..06441cf060 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.9.0
+; Version: 0.2.9.1
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/Tipper.txt b/langpacks/russian/Plugins/Tipper.txt
index c1ce5074d0..f067caee61 100644
--- a/langpacks/russian/Plugins/Tipper.txt
+++ b/langpacks/russian/Plugins/Tipper.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Tipper.dll
; Plugin: Tipper
-; Version: 2.1.0.5
+; Version: 2.1.0.6
; Authors: Scott Ellis, yaho
;============================================================
[Tool Tip notification windows.]
diff --git a/langpacks/russian/Plugins/VKontakte.txt b/langpacks/russian/Plugins/VKontakte.txt
index 3d3a7f3e4f..c2020f2a93 100644
--- a/langpacks/russian/Plugins/VKontakte.txt
+++ b/langpacks/russian/Plugins/VKontakte.txt
@@ -2,7 +2,7 @@
;============================================================
; File: VKontakte.dll
; Plugin: VKontakte protocol
-; Version: 0.1.0.11
+; Version: 0.1.0.12
; Authors: Miranda NG Team
;============================================================
[VKontakte protocol support for Miranda NG.]
@@ -27,6 +27,12 @@ E-mail или номер телефона:
Не открывать окна комнат чата при входе
[Automatically wipe local contacts missing in your Friends list]
Автоматически очищать локальные контакты, которых нет в списке друзей
+[Always notify as unread for all incoming message]
+Помечать все входящие сообщения как "Непрочитанное"
+[Mark read on reply]
+Помечать как "Прочитанное" при ответе
+[Automatically sync last messages ]
+Автоматически синхронизировать последние сообщения\s
[Bots challenge test]
Защита от ботов
[Instruction:]
@@ -83,6 +89,16 @@ Cоздать комнату чата
Подключение к серверу %s
[Create new chat]
Создать новый чат
+[Reload all messages from vk.com]
+Загрузить историю с сайта
+[Are you sure to reload all messages from vk.com?\n]
+Вы уверены, что хотите загрузить все сообщения с сайта vk.com?\n
+[Local contact history will be deleted and reloaded from the server.\n]
+Локальная история контакта будет удалена и загружена с сервера.\n
+[It may take a long time. \nDo you want to continue?]
+Это может занять много времени. \nВы уверены, что хотите продолжить?
+[Attention!]
+Внимание!
[Attachments:]
Вложения:
[Photo]
diff --git a/protocols/VKontakte/src/vk_thread.cpp b/protocols/VKontakte/src/vk_thread.cpp
index 92c7237fb5..01c59856ea 100644
--- a/protocols/VKontakte/src/vk_thread.cpp
+++ b/protocols/VKontakte/src/vk_thread.cpp
@@ -656,7 +656,7 @@ void CVkProto::OnReceivePollingInfo(NETLIBHTTPREQUEST *reply, AsyncHttpRequest *
INT_PTR __cdecl CVkProto::SvcGetAllServerHistory(WPARAM wParam, LPARAM)
{
LPCWSTR str = LPGENT("Are you sure to reload all messages from vk.com?\n")
- LPGENT("Local contact history will be delete and reload from the server.\n")
+ LPGENT("Local contact history will be deleted and reloaded from the server.\n")
LPGENT("It may take a long time. \nDo you want to continue?");
if (IDNO==MessageBox(NULL, str,
LPGENT("Attention!"), MB_ICONWARNING|MB_YESNO))