25 files changed, 38 insertions, 52 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index c727bfcd46..f1385a4bc3 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]
-[&N/A\tCtrl+3]
+[&Not available\tCtrl+3]
 [Occ&upied\tCtrl+4]
 [&DND\tCtrl+5]
 [&Free for chat\tCtrl+6]
@@ -838,7 +838,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Actman.txt b/langpacks/english/Plugins/Actman.txt
index eda3eee41c..6cf582868f 100644
--- a/langpacks/english/Plugins/Actman.txt
+++ b/langpacks/english/Plugins/Actman.txt
@@ -277,7 +277,7 @@
 [Online]
 [Away]
 [DND]
-[NA]
+[Not available]
 [Occupied]
 [Free for Chat]
 [Invisible]
diff --git a/langpacks/english/Plugins/AuthState.txt b/langpacks/english/Plugins/AuthState.txt
index 58b6e736d9..2b43deeca9 100644
--- a/langpacks/english/Plugins/AuthState.txt
+++ b/langpacks/english/Plugins/AuthState.txt
@@ -7,7 +7,7 @@
 ;============================================================
 [If a contact didn't authorize you, this plugin puts an icon in front of the contact's name.]
 ;file \plugins\AuthState\res\authstate.rc
-[Show Auth icon]
+[Show Request icon]
 [Show Grant icon]
 [Plugin settings]
 [Enable menu item (restart required)]
@@ -15,9 +15,9 @@
 ;file \plugins\AuthState\src\main.cpp
 [Disable AuthState icons]
 [Enable AuthState icons]
-[Auth]
+[Request]
 [Grant]
-[Auth & Grant]
-[Auth State]
+[Request & Grant]
+[Auth state]
 ;file \plugins\AuthState\src\options.cpp
 [Icons]
diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index 9438026a8f..bbc2029082 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -19,7 +19,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/BuddyPounce.txt b/langpacks/english/Plugins/BuddyPounce.txt
index 4ea914163d..9527b81b14 100644
--- a/langpacks/english/Plugins/BuddyPounce.txt
+++ b/langpacks/english/Plugins/BuddyPounce.txt
@@ -39,7 +39,7 @@
 [Any]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
@@ -50,7 +50,7 @@
 [From Offline]
 [To Online]
 [To Away]
-[To N/A]
+[To Not available]
 [To Occupied]
 [To DND]
 [To Free for chat]
diff --git a/langpacks/english/Plugins/Clist_blind.txt b/langpacks/english/Plugins/Clist_blind.txt
index efae529a72..ffeb136f68 100644
--- a/langpacks/english/Plugins/Clist_blind.txt
+++ b/langpacks/english/Plugins/Clist_blind.txt
@@ -92,33 +92,19 @@
 [&Offline\tCtrl+0]
 [On&line\tCtrl+1]
 [&Away\tCtrl+2]
-[&N/A\tCtrl+3]
+[&Not available\tCtrl+3]
 [Occ&upied\tCtrl+4]
 [&DND\tCtrl+5]
 [&Free for chat\tCtrl+6]
 [&Invisible\tCtrl+7]
 [On the &phone\tCtrl+8]
 [Out to &lunch\tCtrl+9]
-[Tray]
-[&Hide/Show]
-[Nowhere]
-[&New group]
-[&Hide offline users]
-[Hide &offline users out here]
-[Hide &empty groups]
-[Disable &groups]
-[Hide Miranda]
-[Group]
-[&New subgroup]
-[&Hide offline users in here]
-[&Rename group]
-[&Delete group]
 ;file \plugins\Clist_blind\src\clcopts.cpp
 [Not focused]
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 57293c76e1..af176f99e5 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]
-[&N/A\tCtrl+3]
+[&Not available\tCtrl+3]
 [Occ&upied\tCtrl+4]
 [&DND\tCtrl+5]
 [&Free for chat\tCtrl+6]
@@ -353,7 +353,7 @@
 [Standard contacts]
 [Away contacts]
 [DND contacts]
-[N/A contacts]
+[Not available contacts]
 [Occupied contacts]
 [Free for chat contacts]
 [Invisible contacts]
@@ -385,7 +385,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 83a8f86cfd..a4d5d59740 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]
-[&N/A\tCtrl+3]
+[&Not available\tCtrl+3]
 [Occ&upied\tCtrl+4]
 [&DND\tCtrl+5]
 [&Free for chat\tCtrl+6]
@@ -253,7 +253,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
index 20108ff7ca..a6f32f2e55 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 or N/A]
+[No control when Away or Not available]
 [Connection control]
 [Index creation]
 [Disable]
diff --git a/langpacks/english/Plugins/IRC.txt b/langpacks/english/Plugins/IRC.txt
index ae54f2330e..a5e9ff83cf 100644
--- a/langpacks/english/Plugins/IRC.txt
+++ b/langpacks/english/Plugins/IRC.txt
@@ -259,7 +259,7 @@
 [<Local IP: ]
 [Event: Available]
 [Event: Away]
-[Event: N/A]
+[Event: Not available]
 [Event: Occupied]
 [Event: DND]
 [Event: Free for chat]
diff --git a/langpacks/english/Plugins/Jabber.txt b/langpacks/english/Plugins/Jabber.txt
index c98c56bd1d..ee69fec5e2 100644
--- a/langpacks/english/Plugins/Jabber.txt
+++ b/langpacks/english/Plugins/Jabber.txt
@@ -320,7 +320,7 @@
 [&Send presence]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [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 (DND)]
+[Extended away (Not available)]
+[Do not disturb]
 [Invisible]
 [Offline]
 [Priority]
diff --git a/langpacks/english/Plugins/KeyboardNotify.txt b/langpacks/english/Plugins/KeyboardNotify.txt
index 18f4397bf0..3727882883 100644
--- a/langpacks/english/Plugins/KeyboardNotify.txt
+++ b/langpacks/english/Plugins/KeyboardNotify.txt
@@ -33,7 +33,7 @@
 [Online]
 [Away]
 [Occupied]
-[N/A]
+[Not available]
 [DND]
 [Free for chat]
 [Invisible]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index fd26342dee..c4f298cbb5 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -45,7 +45,7 @@
 [&Offline]
 [On&line]
 [&Away]
-[&N/A]
+[&Not available]
 [Occ&upied]
 [&DND]
 [&Free for chat]
diff --git a/langpacks/english/Plugins/NewAwaySys.txt b/langpacks/english/Plugins/NewAwaySys.txt
index 87732b48bf..da4d935389 100644
--- a/langpacks/english/Plugins/NewAwaySys.txt
+++ b/langpacks/english/Plugins/NewAwaySys.txt
@@ -20,7 +20,7 @@
 [Disable autoreply when...]
 [On&line]
 [&Away]
-[&N/A]
+[&Not available]
 [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.]
-[N/A]
+[Not available]
 [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 c7598c8757..eb25f896ce 100644
--- a/langpacks/english/Plugins/NewXstatusNotify.txt
+++ b/langpacks/english/Plugins/NewXstatusNotify.txt
@@ -13,7 +13,7 @@
 [Invisible]
 [Free for chat]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Out to lunch]
diff --git a/langpacks/english/Plugins/NotifyAnything.txt b/langpacks/english/Plugins/NotifyAnything.txt
index c01aa74df7..1cb5004f7c 100644
--- a/langpacks/english/Plugins/NotifyAnything.txt
+++ b/langpacks/english/Plugins/NotifyAnything.txt
@@ -21,8 +21,8 @@
 [Message debugging]
 ;file \plugins\NotifyAnything\src\main.cpp
 [Notify Anything]
-[N/A: Failed to format error message]
-[N/A: FormatMessage failed, error code was 0x]
+[NotifyAnything: Failed to format error message]
+[NotifyAnything: FormatMessage failed, error code was 0x]
 [Error]
 ;file \plugins\NotifyAnything\src\options.cpp
 [Log (*.log)\0*.log\0Text (*.txt)\0*.txt\0All Files (*.*)\0*.*\0]
diff --git a/langpacks/english/Plugins/Nudge.txt b/langpacks/english/Plugins/Nudge.txt
index 00d2e4d9a6..336edf03db 100644
--- a/langpacks/english/Plugins/Nudge.txt
+++ b/langpacks/english/Plugins/Nudge.txt
@@ -30,7 +30,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Popup.txt b/langpacks/english/Plugins/Popup.txt
index 08071a1bcb..16b9930880 100644
--- a/langpacks/english/Plugins/Popup.txt
+++ b/langpacks/english/Plugins/Popup.txt
@@ -177,7 +177,7 @@
 [Online]
 [Invisible]
 [Away]
-[NA]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/Sametime.txt b/langpacks/english/Plugins/Sametime.txt
index 39ee98a4bd..d4850e254f 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.3
+;  Version: 0.7.0.5
 ;  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 334f70d307..18a4d5c47d 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -299,7 +299,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/SeenPlugin.txt b/langpacks/english/Plugins/SeenPlugin.txt
index d1715d5e75..09802f47dd 100644
--- a/langpacks/english/Plugins/SeenPlugin.txt
+++ b/langpacks/english/Plugins/SeenPlugin.txt
@@ -26,7 +26,7 @@
 [Popup Colors]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [On the phone]
diff --git a/langpacks/english/Plugins/StatusChange.txt b/langpacks/english/Plugins/StatusChange.txt
index 60fb4e9511..3a2f3cc373 100644
--- a/langpacks/english/Plugins/StatusChange.txt
+++ b/langpacks/english/Plugins/StatusChange.txt
@@ -10,7 +10,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/WinterSpeak.txt b/langpacks/english/Plugins/WinterSpeak.txt
index 66069011bf..9ff42b83e7 100644
--- a/langpacks/english/Plugins/WinterSpeak.txt
+++ b/langpacks/english/Plugins/WinterSpeak.txt
@@ -21,7 +21,7 @@
 [Online]
 [Away]
 [DND]
-[N/A]
+[Not available]
 [Occupied]
 [Free for chat]
 [Invisible]
diff --git a/langpacks/english/Plugins/YAMN.txt b/langpacks/english/Plugins/YAMN.txt
index d58c254738..a5652d6b12 100644
--- a/langpacks/english/Plugins/YAMN.txt
+++ b/langpacks/english/Plugins/YAMN.txt
@@ -53,7 +53,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]
diff --git a/langpacks/english/Plugins/YARelay.txt b/langpacks/english/Plugins/YARelay.txt
index e8214a3f5f..b98f0b292d 100644
--- a/langpacks/english/Plugins/YARelay.txt
+++ b/langpacks/english/Plugins/YARelay.txt
@@ -14,7 +14,7 @@
 [Offline]
 [Online]
 [Away]
-[N/A]
+[Not available]
 [Occupied]
 [DND]
 [Free for chat]