langpacks/english: update

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

26 files changed, 39 insertions, 41 deletions

diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index 1e6ec12778..c727bfcd46 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -208,7 +208,7 @@
 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

 [&Away\tCtrl+2]

-[&NA\tCtrl+3]

+[&N/A\tCtrl+3]

 [Occ&upied\tCtrl+4]

 [&DND\tCtrl+5]

 [&Free for chat\tCtrl+6]

@@ -838,7 +838,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index 61b2a50e07..9438026a8f 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -19,7 +19,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index 1b7ecc39e7..4ea914163d 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -39,24 +39,24 @@
 [Any]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

-[Free For Chat]

+[Free for chat]

 [Invisible]

-[On The Phone]

-[Out To Lunch]

+[On the phone]

+[Out to lunch]

 [Send If Their Status changes]

 [From Offline]

 [To Online]

 [To Away]

-[To NA]

+[To N/A]

 [To Occupied]

 [To DND]

-[To Free For Chat]

+[To Free for chat]

 [To Invisible]

-[To On The Phone]

-[To Out To Lunch]

+[To On the phone]

+[To Out to lunch]

 [The Message    (%d Characters)]

 [error......]

 [Couldn't allocate enough memory]

diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index b8eec5ce83..efae529a72 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -92,7 +92,7 @@
 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

 [&Away\tCtrl+2]

-[&NA\tCtrl+3]

+[&N/A\tCtrl+3]

 [Occ&upied\tCtrl+4]

 [&DND\tCtrl+5]

 [&Free for chat\tCtrl+6]

@@ -118,7 +118,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index debe5f64bc..57293c76e1 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -292,7 +292,7 @@
 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

 [&Away\tCtrl+2]

-[&NA\tCtrl+3]

+[&N/A\tCtrl+3]

 [Occ&upied\tCtrl+4]

 [&DND\tCtrl+5]

 [&Free for chat\tCtrl+6]

@@ -353,7 +353,7 @@
 [Standard contacts]

 [Away contacts]

 [DND contacts]

-[NA contacts]

+[N/A contacts]

 [Occupied contacts]

 [Free for chat contacts]

 [Invisible contacts]

@@ -385,7 +385,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 9ad14ec649..83a8f86cfd 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -228,7 +228,7 @@
 [&Offline\tCtrl+0]

 [On&line\tCtrl+1]

 [&Away\tCtrl+2]

-[&NA\tCtrl+3]

+[&N/A\tCtrl+3]

 [Occ&upied\tCtrl+4]

 [&DND\tCtrl+5]

 [&Free for chat\tCtrl+6]

@@ -253,7 +253,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/Dropbox.txt b/langpacks/english/Plugins/Dropbox.txt
index c744a1a79a..474caae862 100644
--- a/langpacks/english/Plugins/Dropbox.txt
+++ b/langpacks/english/Plugins/Dropbox.txt
@@ -20,8 +20,6 @@
 [Autosend download link to contact]

 [Paste download link into message input area]

 [Copy download link to clipboard]

-;file \plugins\Dropbox\proto_dropbox\src\resource.h

-[Error loading module list]

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

 [Free %ld of %ld MB]

 [in process...]

diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index 76ddf3804c..20108ff7ca 100644
--- a/langpacks/english/Plugins/HTTPServer.txt
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -31,7 +31,7 @@
 [%ExternalIP% variable]

 [Test]

 [Transfer limit (Kb/s)]

-[No control when Away/NA]

+[No control when Away or N/A]

 [Connection control]

 [Index creation]

 [Disable]

diff --git a/langpacks/english/Plugins/ICQ.txt b/langpacks/english/Plugins/ICQ.txt
index 41ab8d0d58..20631ea60a 100644
--- a/langpacks/english/Plugins/ICQ.txt
+++ b/langpacks/english/Plugins/ICQ.txt
@@ -884,7 +884,7 @@
 [Kitty]

 [Sumo]

 [Broken hearted]

-[Free for Chat]

+[Free for chat]

 [@home]

 [@work]

 [Strawberry]

diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index 25532737bd..ae54f2330e 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -299,7 +299,6 @@
 [Di&sconnect]

 [&Add to ignore list]

 [%s (%s) is requesting a client-to-client chat connection.]

-[Please enter the hostmask (nick!user@host) \nNOTE! Contacts on your contact list are never ignored]

 [Join channel]

 [Please enter a channel to join]

 [Please select IRC network and enter the password if needed]

diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index 6be1a490f3..c98c56bd1d 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -320,7 +320,7 @@
 [&Send presence]

 [Online]

 [Away]

-[NA]

+[N/A]

 [DND]

 [Free for chat]

 [&Leave chat session]

@@ -850,8 +850,8 @@
 [Change Status]

 [Choose the status and status message]

 [Status]

-[Extended Away (N/A)]

-[Do Not Disturb]

+[Extended away (N/A)]

+[Do not disturb (DND)]

 [Invisible]

 [Offline]

 [Priority]

diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index a29daf2950..18f4397bf0 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -33,7 +33,7 @@
 [Online]

 [Away]

 [Occupied]

-[NA]

+[N/A]

 [DND]

 [Free for chat]

 [Invisible]

diff --git a/langpacks/english/Plugins/MirLua.txt b/langpacks/english/Plugins/MirLua.txt
index b58c249a52..f44282c7d1 100644
--- a/langpacks/english/Plugins/MirLua.txt
+++ b/langpacks/english/Plugins/MirLua.txt
@@ -13,7 +13,6 @@
 [General]

 [Popup on obsolete methods]

 ;file \plugins\MirLua\src\main.cpp

-[C libs folder]

 [Scripts folder]

 ;file \plugins\MirLua\src\mlua_icons.cpp

 [Script]

diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index d4b41c5c9e..fd26342dee 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -45,7 +45,7 @@
 [&Offline]

 [On&line]

 [&Away]

-[&NA]

+[&N/A]

 [Occ&upied]

 [&DND]

 [&Free for chat]

diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index 95c77f2825..87732b48bf 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -20,7 +20,7 @@
 [Disable autoreply when...]

 [On&line]

 [&Away]

-[&NA]

+[&N/A]

 [Occ&upied]

 [&DND]

 [&Free for chat]

@@ -110,7 +110,7 @@
 [Yep, I'm here.]

 [Away]

 [Been gone since %nas_awaysince_time%, will be back later.]

-[NA]

+[N/A]

 [Give it up, I'm not in!]

 [Occupied]

 [Not right now.]

diff --git a/langpacks/english/Plugins/NewXstatusNotify.txt b/langpacks/english/Plugins/NewXstatusNotify.txt
index caa04cfe5e..c7598c8757 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -13,7 +13,7 @@
 [Invisible]

 [Free for chat]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Out to lunch]

diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index c1be590956..00d2e4d9a6 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -30,7 +30,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/Sametime.txt b/langpacks/english/Plugins/Sametime.txt
index 8753a198a3..39ee98a4bd 100644
--- a/langpacks/english/Plugins/Sametime.txt
+++ b/langpacks/english/Plugins/Sametime.txt
@@ -2,7 +2,7 @@
 ;============================================================

 ;  File: Sametime.dll

 ;  Plugin: Sametime protocol

-;  Version: 0.7.0.0

+;  Version: 0.7.0.3

 ;  Authors: Scott Ellis, Szymon Tokarz

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

 [Implementation of instant messaging for the Lotus Sametime protocol.]

diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index 3b6fbf7a87..334f70d307 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -299,7 +299,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index 35c059f15e..d1715d5e75 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -26,7 +26,7 @@
 [Popup Colors]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [On the phone]

diff --git a/langpacks/english/Plugins/SmileyAdd.txt b/langpacks/english/Plugins/SmileyAdd.txt
index 03bf922ed8..851457d6a6 100644
--- a/langpacks/english/Plugins/SmileyAdd.txt
+++ b/langpacks/english/Plugins/SmileyAdd.txt
@@ -29,7 +29,6 @@
 [Built-in message dialog support]

 [Disable]

 [Smiley button]

-[Background\ncolor]

 [Surround inserted smiley with spaces]

 [Use first smiley for selection size]

 [IEView style window]

@@ -43,6 +42,7 @@
 ;file \plugins\SmileyAdd\src\main.cpp

 [Button smiley]

 [Assign smiley category]

+[Background color]

 [Only one instance of SmileyAdd could be executed.\nRemove duplicate instances from 'Plugins' directory]

 ;file \plugins\SmileyAdd\src\options.cpp

 [Smileys]

diff --git a/langpacks/english/Plugins/StatusChange.txt b/langpacks/english/Plugins/StatusChange.txt
index eeae372e65..60fb4e9511 100644
--- a/langpacks/english/Plugins/StatusChange.txt
+++ b/langpacks/english/Plugins/StatusChange.txt
@@ -10,7 +10,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]

diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 3005ceb23a..d55429782f 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -1013,11 +1013,13 @@
 [Indent the second line of a message]

 [Limit user names in the message log to 20 characters]

 [Add a colon (:) to auto-completed user names]

+[Add a comma instead of a colon to auto-completed user names]

 [Start private conversation on double click in nick list (insert nick if unchecked)]

 [Strip colors from messages in the log]

 [Enable the 'event filter' for new rooms]

 [Use IRC style status indicators in the log]

 [Allow clickable user names in the message log]

+[Add new line after names]

 [Colorize user names in message log]

 [Scale down icons to 10x10 pixels in the chat log]

 [Window Icon]

diff --git a/langpacks/english/Plugins/Tox.txt b/langpacks/english/Plugins/Tox.txt
index 68e0bc35dc..3407e709d2 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.18

+;  Version: 0.11.1.19

 ;  Authors: Miranda NG Team

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

 [Tox protocol support for Miranda NG.]

diff --git a/langpacks/english/Plugins/WinterSpeak.txt b/langpacks/english/Plugins/WinterSpeak.txt
index f4333fc9eb..66069011bf 100644
--- a/langpacks/english/Plugins/WinterSpeak.txt
+++ b/langpacks/english/Plugins/WinterSpeak.txt
@@ -21,7 +21,7 @@
 [Online]

 [Away]

 [DND]

-[NA]

+[N/A]

 [Occupied]

 [Free for chat]

 [Invisible]

diff --git a/langpacks/english/Plugins/YARelay.txt b/langpacks/english/Plugins/YARelay.txt
index 46e9b1dc0a..e8214a3f5f 100644
--- a/langpacks/english/Plugins/YARelay.txt
+++ b/langpacks/english/Plugins/YARelay.txt
@@ -14,7 +14,7 @@
 [Offline]

 [Online]

 [Away]

-[NA]

+[N/A]

 [Occupied]

 [DND]

 [Free for chat]