From 5fdbf0569c9015e842612e341f075566a2c203f1 Mon Sep 17 00:00:00 2001
From: Dart Raiden <wowemuh@gmail.com>
Date: Sun, 15 Nov 2015 23:37:50 +0000
Subject: langpacks/english: update

langpacks/russian: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@15739 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c
---
 langpacks/english/Plugins/AVS.txt            | 2 +-
 langpacks/english/Plugins/BossKey.txt        | 2 +-
 langpacks/english/Plugins/Db_autobackups.txt | 2 +-
 langpacks/english/Plugins/ICQ.txt            | 2 +-
 langpacks/english/Plugins/Jabber.txt         | 2 +-
 langpacks/english/Plugins/MRA.txt            | 2 +-
 langpacks/english/Plugins/Msg_Export.txt     | 1 +
 langpacks/english/Plugins/PackUpdater.txt    | 2 +-
 langpacks/english/Plugins/Ping.txt           | 2 +-
 langpacks/english/Plugins/PluginUpdater.txt  | 2 +-
 langpacks/english/Plugins/Tox.txt            | 2 +-
 langpacks/english/Plugins/VKontakte.txt      | 3 ++-
 12 files changed, 13 insertions(+), 11 deletions(-)

(limited to 'langpacks/english')

diff --git a/langpacks/english/Plugins/AVS.txt b/langpacks/english/Plugins/AVS.txt
index 9dad1296a6..636bb1e037 100644
--- a/langpacks/english/Plugins/AVS.txt
+++ b/langpacks/english/Plugins/AVS.txt
@@ -10,7 +10,7 @@
 [The pictures you can set here are used as default avatars\nfor contacts that don't have their own.\nUse the checkboxes to enable/disable showing avatars for the protocols.]
 [Set default picture]
 [Delete default picture]
-[CAUTION: These pictures are NOT your own avatars.\nTo set your own Avatar go to Main menu | View/change my details | Avatars.]
+[CAUTION: These pictures are NOT your own avatars.\nTo set your own avatar go to Main menu -> View/change my details -> Avatars.]
 [Try to draw avatar background transparent (for images without transparency)]
 [Number of points to define background:]
 [Color difference allowed:]
diff --git a/langpacks/english/Plugins/BossKey.txt b/langpacks/english/Plugins/BossKey.txt
index 4db712cfdf..c705888472 100644
--- a/langpacks/english/Plugins/BossKey.txt
+++ b/langpacks/english/Plugins/BossKey.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [Anti-Boss plugin. Makes your Miranda NG hidden or password-protected.]
 ;file \plugins\BossKeyPlus\res\BossKey.rc
-[Go to Customize -> Hotkeys to change the hotkey]
+[Go to Options -> Customize -> Hotkeys to change the hotkey]
 [When I press the hotkey:]
 [Change status to]
 [Change only if current status is Online]
diff --git a/langpacks/english/Plugins/Db_autobackups.txt b/langpacks/english/Plugins/Db_autobackups.txt
index a16583a629..c1ca64e92c 100644
--- a/langpacks/english/Plugins/Db_autobackups.txt
+++ b/langpacks/english/Plugins/Db_autobackups.txt
@@ -18,7 +18,7 @@
 [Number of backups to keep:]
 [Backup to folder:]
 [Browse...]
-[Go to the "Customize -> Folders" to change settings]
+[Go to the "Options -> Customize -> Folders" to change settings]
 [Compress backup to zip-archive]
 [Disable progress bar]
 [Disable popups]
diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 0f77c4da31..8fcbcb6116 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -785,7 +785,7 @@
 ;file \protocols\IcqOscarJ\src\icq_server.cpp
 [Unable to connect to ICQ login server, SSL could not be negotiated]
 [Unable to connect to ICQ login server]
-[Miranda was unable to allocate a port to listen for direct peer-to-peer connections between clients. You will be able to use most of the ICQ network without problems but you may be unable to send or receive files.\n\nIf you have a firewall this may be blocking Miranda, in which case you should configure your firewall to leave some ports open and tell Miranda which ports to use in Options -> ICQ -> Network.]
+[Miranda was unable to allocate a port to listen for direct peer-to-peer connections between clients. You will be able to use most of the ICQ network without problems but you may be unable to send or receive files.\n\nIf you have a firewall this may be blocking Miranda, in which case you should configure your firewall to leave some ports open and tell Miranda which ports to use in Options -> Network -> <UIN> client-to-client connections -> Port range.]
 [Connection failed.\nLogin sequence failed for unknown reason.\nTry again later.]
 [Your connection with the ICQ server was abortively closed]
 ;file \protocols\IcqOscarJ\src\icq_servlist.cpp
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index b6b0d9738e..27cba0fecd 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -505,7 +505,7 @@
 [Status Message]
 ;file \protocols\JabberG\src\jabber_message_handlers.cpp
 ;file \protocols\JabberG\src\jabber_misc.cpp
-[CHAT plugin is required for conferences. Install it before chatting]
+[Chat plugin is required for conferences. Install it before chatting]
 [To]
 [From]
 [Both]
diff --git a/langpacks/english/Plugins/MRA.txt b/langpacks/english/Plugins/MRA.txt
index 056e13563a..6c279aa93a 100644
--- a/langpacks/english/Plugins/MRA.txt
+++ b/langpacks/english/Plugins/MRA.txt
@@ -114,7 +114,7 @@
 [Avatars: server return HTTP code: %lu]
 [Avatars: can't open file %s, error]
 ;file \protocols\MRA\src\MraChat.cpp
-[CHAT plugin is required for conferences. Install it before chatting]
+[Chat plugin is required for conferences. Install it before chatting]
 [invite sender]
 [invite new members]
 ;file \protocols\MRA\src\MraConstans.h
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index dcc7b2171a..1dae6f801a 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -140,3 +140,4 @@
 [Failed to write Unknown event to the file :\n]
 [User has been deleted. Do you want to delete the file?]
 [Failed to delete the file]
+[No_Nick]
diff --git a/langpacks/english/Plugins/PackUpdater.txt b/langpacks/english/Plugins/PackUpdater.txt
index b4d05588e6..7e70094b0f 100644
--- a/langpacks/english/Plugins/PackUpdater.txt
+++ b/langpacks/english/Plugins/PackUpdater.txt
@@ -18,7 +18,7 @@
 [On startup]
 [Remind about not installed pack update]
 [Hotkey]
-[Go to Customize -> Hotkeys to change the hotkey]
+[Go to Options -> Customize -> Hotkeys to change the hotkey]
 [Notifications]
 [Message boxes]
 [Errors]
diff --git a/langpacks/english/Plugins/Ping.txt b/langpacks/english/Plugins/Ping.txt
index 8f4050612e..d0e3e0f7d0 100644
--- a/langpacks/english/Plugins/Ping.txt
+++ b/langpacks/english/Plugins/Ping.txt
@@ -21,7 +21,7 @@
 [Browse...]
 [Interface]
 [Do not change icon when testing]
-[Use Options -> Customize -> Fonts to change text size and color.]
+[Use Options -> Customize -> Fonts and colors to change text size and color.]
 [Indent:]
 [Row height:]
 [Repeats for success/failure:]
diff --git a/langpacks/english/Plugins/PluginUpdater.txt b/langpacks/english/Plugins/PluginUpdater.txt
index bdd94af4bb..9cab3e9c28 100644
--- a/langpacks/english/Plugins/PluginUpdater.txt
+++ b/langpacks/english/Plugins/PluginUpdater.txt
@@ -15,7 +15,7 @@
 [Select &all]
 [Select &none]
 [Hotkey]
-[Go to Customize -> Hotkeys to change the hotkey]
+[Go to Options -> Customize -> Hotkeys to change the hotkey]
 [Update options]
 [On startup]
 [(but only once a day)]
diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 87d78f133a..324ee6134f 100644
--- a/langpacks/english/Plugins/Tox.txt
+++ b/langpacks/english/Plugins/Tox.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: Tox.dll
 ;  Plugin: Tox protocol
-;  Version: 0.11.1.14
+;  Version: 0.11.1.15
 ;  Authors: Miranda NG Team
 ;============================================================
 [Tox protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/VKontakte.txt b/langpacks/english/Plugins/VKontakte.txt
index 8743b61dcd..6f312525f1 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.1.18
+;  Version: 0.1.1.19
 ;  Authors: Miranda NG Team
 ;============================================================
 [VKontakte protocol support for Miranda NG.]
@@ -178,6 +178,7 @@
 [&User details]
 [Visit profile]
 [&Kick]
+[%s is typing a message...]
 ;file \protocols\VKontakte\src\vk_feed.cpp
 [New news]
 [New notifications]
-- 
cgit v1.2.3