langpack/english: update

git-svn-id: http://svn.miranda-ng.org/main/trunk@15792 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

14 files changed, 22 insertions, 17 deletions

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 2655de5c30..7a1542eea0 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -7,13 +7,13 @@
 ;============================================================

 [Displays contacts, event notifications, protocol status.]

 ;file \plugins\Clist_nicer\res\resource.rc

-[Clist Nicer exception]

+[Clist nicer exception]

 [Copy to clipboard]

 [Continue]

 [Exit Miranda]

 [Although the exception was caught and you may continue working with Miranda, you should restart the program as soon as possible. The exception may have damaged internal data structures and can have a serious impact on stability.]

-[About CList Nicer+]

-[Clist Nicer+]

+[About CList nicer]

+[Clist nicer]

 [Copyright © 2004-2010 by the Miranda IM project, 2012-2015 by the Miranda NG project. More detailed copyright information can be found in the included README file.]

 [Version]

 [Support and latest version information]

diff --git a/langpacks/english/Plugins/Cln_skinedit.txt b/langpacks/english/Plugins/Cln_skinedit.txt
index a8681520bc..11f0447bdd 100644
--- a/langpacks/english/Plugins/Cln_skinedit.txt
+++ b/langpacks/english/Plugins/Cln_skinedit.txt
@@ -1,11 +1,11 @@
 #muuid {21948c89-b549-4c9d-8b4f-3f3726ec6b4b}

 ;============================================================

 ;  File: Cln_skinedit.dll

-;  Plugin: Skin editor for clist nicer

+;  Plugin: Skin editor for Clist nicer

 ;  Version: 0.0.0.4

 ;  Authors: Nightwish, Pixel

 ;============================================================

-[Allows inline skin item editing for clist nicer.]

+[Allows inline skin item editing for Clist nicer.]

 ;file \plugins\Cln_skinedit\res\skinedit.rc

 [Skin items]

 [General]

diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index 3fb044ed2c..e1a4f68923 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -21,6 +21,7 @@
 [Paste download link into message input area]

 [Copy download link to clipboard]

 ;file \plugins\Dropbox\src\dropbox.cpp

+[Free %ld of %ld MB]

 [in process...]

 [server does not respond]

 [you have been authorized]

diff --git a/langpacks/english/Plugins/EmLanProto.txt b/langpacks/english/Plugins/EmLanProto.txt
index 0bfb39f6b2..2ec1842873 100644
--- a/langpacks/english/Plugins/EmLanProto.txt
+++ b/langpacks/english/Plugins/EmLanProto.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: EmLanProto.dll

 ;  Plugin: E-mage LAN protocol

-;  Version: 0.0.1.2

+;  Version: 0.1.0.1

 ;  Authors: kva

 ;============================================================

 [E-mage LAN protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/HwHotKeys.txt b/langpacks/english/Plugins/HwHotKeys.txt
index 5d4a3c971c..99ca4ea8fb 100644
--- a/langpacks/english/Plugins/HwHotKeys.txt
+++ b/langpacks/english/Plugins/HwHotKeys.txt
@@ -6,7 +6,7 @@
 ;  Authors: Eugene f2065

 ;============================================================

 ;file \plugins\HwHotKeys\res\HwHotKeys.rc

-[Hardware HotKeys plugin\r\nAllows you to assign expanded multimedia keys (only for PS/2 keyboards)]

+[Allows you to assign expanded multimedia keys (only for PS/2 keyboards).]

 [Close Miranda]

 [Assign]

 [Clear]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 8fcbcb6116..41ab8d0d58 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 -> Network -> <UIN> client-to-client connections -> Port range.]

+[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 -> ICQ client-to-client connections.]

 [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 27cba0fecd..6be1a490f3 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -969,6 +969,7 @@
 ;file \protocols\JabberG\src\jabber_ws.cpp

 [%s connection]

 ;file \protocols\JabberG\src\jabber_xstatus.cpp

+[<advanced status slot>]

 [Afraid]

 [Amazed]

 [Amorous]

diff --git a/langpacks/english/Plugins/ModernOpt.txt b/langpacks/english/Plugins/ModernOpt.txt
index 4052e0c87d..49715e3a6b 100644
--- a/langpacks/english/Plugins/ModernOpt.txt
+++ b/langpacks/english/Plugins/ModernOpt.txt
@@ -30,6 +30,6 @@
 [Ban those users and events, you are annoyed with.]

 [Status]

 [Set your status messages and idle reporting.]

-[Addons]

+[Plugins]

 [Miranda NG is all about plugins. Manage all the plugins you have here.]

 [You have some unsaved changes here.\n Do you wish to apply settings before switching?]

diff --git a/langpacks/english/Plugins/StartupSilence.txt b/langpacks/english/Plugins/StartupSilence.txt
index 83911fa30b..ff78be1237 100644
--- a/langpacks/english/Plugins/StartupSilence.txt
+++ b/langpacks/english/Plugins/StartupSilence.txt
@@ -41,5 +41,5 @@
 [Silence At Startup is ON]

 [Silence At Startup is OFF]

 [Toggle Silence At Startup]

-[You have to install "TopToolBar" to use this option.]

-[You have to install "YAPP" or "Popup+" to use this option.]

+[You have to install TopToolBar plugin to use this option.]

+[You have to install popup plugin to use this option.]

diff --git a/langpacks/english/Plugins/StopSpamMod.txt b/langpacks/english/Plugins/StopSpamMod.txt
index 67b43392c7..138a3106d4 100644
--- a/langpacks/english/Plugins/StopSpamMod.txt
+++ b/langpacks/english/Plugins/StopSpamMod.txt
@@ -25,7 +25,6 @@
 [Log spam to file]

 [Case insensitive answer checking]

 [Disable question in invisible mode]

-[Enable integration with DOS plugin]

 [Exclude contacts which we sending something from spam check]

 [Remove Excluded contacts after restart]

 [Add contacts to specified group:]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 541bfcffb3..ed867cfc9d 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -25,7 +25,6 @@
 [Tray]

 [Options]

 [Add new rooms to group:]

-[Chat integration is disabled. You can enable it here, and then you to NEED RESTART Miranda after making this change.\n\nYou MUST disable the standard chat plugin when you enable the group chat support here. Otherwise no group chat at all may work.]

 [Log files]

 [Enable logging to disk]

 [Log directory]

@@ -744,7 +743,7 @@
 [Clock symbol (for the info panel clock)]

 [Feature disabled (used as overlay)]

 [Feature enabled (used as overlay)]

-[The image service plugin (advaimg.dll) is not properly installed.\n\nTabSRMM is disabled.]

+[The image service plugin (AdvaImg) is not properly installed.\n\nTabSRMM is disabled.]

 [TabSRMM fatal error]

 ;file \plugins\TabSRMM\src\msgs.h

 [Message windows - IM]

diff --git a/langpacks/english/Plugins/TopToolBar.txt b/langpacks/english/Plugins/TopToolBar.txt
index 04919306ed..08548a6980 100644
--- a/langpacks/english/Plugins/TopToolBar.txt
+++ b/langpacks/english/Plugins/TopToolBar.txt
@@ -44,7 +44,7 @@
 ;file \plugins\TopToolBar\src\toolbar.cpp

 [Default]

 [TopToolBar background]

-[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- Nicer+\nYou can get them at http://wiki.miranda-ng.org/Download]

+[Frames service has not been found, so plugin will be disabled.\nTo run it you need to install and / or enable contact list plugin that supports it:\n- Modern contact list\n- Clist nicer\nYou can get them at http://wiki.miranda-ng.org/Download]

 [TopToolBar]

 ;file \plugins\TopToolBar\src\ttbopt.cpp

 [Contact list]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 324ee6134f..7dd3998585 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.15

+;  Version: 0.11.1.16

 ;  Authors: Miranda NG Team

 ;============================================================

 [Tox protocol support for Miranda NG.]

@@ -115,3 +115,8 @@
 [The profile is encrypted]

 [The data format is not valid]

 [Unknown error]

+[The friend number did not designate a valid friend]

+[This client is currently not connected to the friend]

+[An allocation error occurred while increasing the send queue size]

+[Message length exceeded TOX_MAX_MESSAGE_LENGTH]

+[Attempted to send a zero-length message]

diff --git a/langpacks/english/Plugins/WebView.txt b/langpacks/english/Plugins/WebView.txt
index 038804882c..f6621f9f93 100644
--- a/langpacks/english/Plugins/WebView.txt
+++ b/langpacks/english/Plugins/WebView.txt
@@ -26,7 +26,7 @@
 [Save individual window positions]

 [Error messages]

 [Suppress error messages]

-[Display using Popup or OSD plugin]

+[Display using popup or OSD plugin]

 [Expert options]

 [Disable download protection]

 [(not recommended)]