17 files changed, 10 insertions, 68 deletions
diff --git a/langpacks/english/=CORE=.txt b/langpacks/english/=CORE=.txt
index ef84f7fd33..e3d6dbfc6b 100644
--- a/langpacks/english/=CORE=.txt
+++ b/langpacks/english/=CORE=.txt
@@ -82,7 +82,6 @@
 [Run now]
 [Show this dialog box when Miranda NG starts]
 [Save as default]
-[Ok]
 [SSL Traffic]
 [Sounds]
 [&Change...]
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index a08fc8f7db..d0739e696c 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -83,7 +83,6 @@
 [Run now]
 [Show this dialog box when Miranda NG starts]
 [Save as default]
-[Ok]
 [SSL Traffic]
 [Sounds]
 [&Change...]
@@ -3471,7 +3470,7 @@
 [Include groups]
 [Show contacts in groups]
 [Include status modes]
-[Ok]
+[OK]
 [Cancel]
 [Sticky contacts]
 [Clear all]
@@ -4362,7 +4361,6 @@
 [New]
 [Include groups]
 [Include status modes]
-[Ok]
 [Cancel]
 [Apply]
 [Sticky contacts]
@@ -4976,7 +4974,7 @@
 [GnuPG Plugin - Passphrase]
 [Enter passphrase for the secret key of user:]
 [User ID]
-[Ok]
+[OK]
 [Cancel]
 [GnuPG Plugin - Select public key]
 [Refresh]
@@ -5205,7 +5203,6 @@
 [Edit &Dwords in Hex]
 [&Restore position]
 [&Open Options]
-[Item context]
 [&Edit / Rename]
 [NEW]
 [&Byte]
@@ -5222,26 +5219,20 @@
 [Encrypt String]
 [&Watch]
 [&Delete]
-[Null Mod context]
 [&Rename]
 [Copy To Contact]
 [Export Module]
 [Add To Known Modules]
-[Contact menu]
 [&Clone]
 [Export Contact]
 [Import Settings]
 [From a file]
 [From pasted text]
 [&Add Module]
-[NULL contact menu]
 [Export Settings]
-[Contacts menu]
 [Export Contacts]
 [Import Contacts]
-[Contact Mod context]
 [Export Module from all contacts]
-[new item]
 [Watch Window]
 [Reload Watch List]
 ;file \plugins\DbEditorPP\src\addeditsettingsdlg.cpp
@@ -5762,7 +5753,6 @@
 ;file \protocols\FacebookRM\src\process.cpp
 [Contact is back on server-list.]
 [Contact is no longer on server-list.]
-[Attachments:]
 ;file \protocols\FacebookRM\src\proto.cpp
 [Show Mind Window]
 [%s server connection]
@@ -8206,10 +8196,6 @@
 [Message Sessions]
 [IEView]
 [Skins]
-[320 x 205]
-[480 x 385]
-[560 x 349]
-[640 x 390]
 [Template]
 [All Files]
 [All Images]
@@ -10711,11 +10697,10 @@
 ;file \plugins\MetaContacts\res\MetaContacts.rc
 [Add to Existing MetaContact]
 [Please select a MetaContact:]
-[&Ok]
+[&OK]
 [&Cancel]
 [Sort Alphabetically]
 [Editing]
-[&OK]
 [Name:]
 [Information]
 [Contacts]
@@ -10891,7 +10876,6 @@
 [Socialist Millionaires Protocol\r\nVerification]
 [&No]
 [&Yes]
-[MirOTR]
 [OTR status]
 [&Start OTR session]
 [&Refresh OTR session]
@@ -11762,7 +11746,6 @@
 [Show account cycle button]
 [Set My Status Message for All Status]
 [Status Message:]
-[Status popup]
 [&Offline]
 [On&line]
 [&Away]
@@ -11773,7 +11756,6 @@
 [&Invisible]
 [On the &Phone]
 [Out to &Lunch]
-[Context popup]
 [Set My Avatar...]
 [Set My Nickname...]
 [Set My Status Message...]
@@ -11782,10 +11764,6 @@
 [Show previous account]
 [Cycle through accounts]
 [Don't cycle through accounts]
-[Nick popup]
-[Status message popup]
-[Avatar popup]
-[ListeningTo popup]
 ;file \plugins\MyDetails\src\data.cpp
 [<no status name>]
 ;file \plugins\MyDetails\src\frame.cpp
@@ -12221,7 +12199,6 @@
 [Recieved encrypted file form contact whith disabled encryption.]
 [Remember choice]
 [Choose which  keys to export]
-[Ok]
 [Export public keys (only set for contacts)]
 [Export all private keys]
 [Export public and private keys]
@@ -14074,7 +14051,7 @@
 [Hide userlist]
 [Show userlist]
 [Status 1 (10x10)]
-[Status 2 (10x10]
+[Status 2 (10x10)]
 [Status 3 (10x10)]
 [Status 4 (10x10)]
 [Status 5 (10x10)]
@@ -14469,7 +14446,6 @@
 [Cancel]
 [SecureIM plugin Passphrase of private key]
 [Enter passphrase for the secret key:]
-[Ok]
 [Mode]
 [Native SecureIM]
 [PGP SecureIM]
@@ -14859,7 +14835,6 @@
 [Prev]
 [Next]
 [Update]
-[Ok]
 [Apply]
 [Down arrow]
 ;file \plugins\SendScreenshotPlus\src\mir_icolib.h
@@ -16412,7 +16387,6 @@
 [You can export and import all your color and font settings here. This allows you to create a Theme file which can be shared between different profiles or with your buddies.]
 [Export to a file...]
 [Import from a file...]
-[Ok]
 [Icons]
 [Event type icons in the message log]
 [Text symbols as event markers]
@@ -16512,7 +16486,6 @@
 [Global Setting]
 [Force Off]
 [Unread Menu]
-[Traycontext]
 [Recent Sessions]
 [Favorites]
 [Show the Tray Icon]
@@ -16538,7 +16511,6 @@
 [Add Contact to Favorites]
 [Remove Contact from Favorites]
 [dummy]
-[Splitter context]
 [Set Position for this Session]
 [Set and Save for all Sessions]
 [Set and Save for this Contact only]
@@ -18113,7 +18085,7 @@
 [Origin]
 [&Update]
 [Updating]
-[Ok]
+[OK]
 [Cancel]
 [Apply]
 [Nick:]
@@ -18231,7 +18203,6 @@
 [Setting/Event (20/100)]
 [John Doe (1/10)]
 [Dialog]
-[OK]
 [All]
 [None]
 [Show Menu Item]
diff --git a/langpacks/english/Plugins/Clist_modern.txt b/langpacks/english/Plugins/Clist_modern.txt
index 2e377e8884..f1851774e8 100644
--- a/langpacks/english/Plugins/Clist_modern.txt
+++ b/langpacks/english/Plugins/Clist_modern.txt
@@ -75,7 +75,7 @@
 [Include groups]
 [Show contacts in groups]
 [Include status modes]
-[Ok]
+[OK]
 [Cancel]
 [Sticky contacts]
 [Clear all]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index f952057ce3..3d3040043a 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -168,7 +168,6 @@
 [New]
 [Include groups]
 [Include status modes]
-[Ok]
 [Cancel]
 [Apply]
 [Sticky contacts]
diff --git a/langpacks/english/Plugins/CryptoPP.txt b/langpacks/english/Plugins/CryptoPP.txt
index c5ca14baee..88190adb26 100644
--- a/langpacks/english/Plugins/CryptoPP.txt
+++ b/langpacks/english/Plugins/CryptoPP.txt
@@ -10,7 +10,7 @@
 [GnuPG Plugin - Passphrase]
 [Enter passphrase for the secret key of user:]
 [User ID]
-[Ok]
+[OK]
 [Cancel]
 [GnuPG Plugin - Select public key]
 [Refresh]
diff --git a/langpacks/english/Plugins/DbEditorPP.txt b/langpacks/english/Plugins/DbEditorPP.txt
index f804eaaf63..7db421bbec 100644
--- a/langpacks/english/Plugins/DbEditorPP.txt
+++ b/langpacks/english/Plugins/DbEditorPP.txt
@@ -80,7 +80,6 @@
 [Edit &Dwords in Hex]
 [&Restore position]
 [&Open Options]
-[Item context]
 [&Edit / Rename]
 [NEW]
 [&Byte]
@@ -97,26 +96,20 @@
 [Encrypt String]
 [&Watch]
 [&Delete]
-[Null Mod context]
 [&Rename]
 [Copy To Contact]
 [Export Module]
 [Add To Known Modules]
-[Contact menu]
 [&Clone]
 [Export Contact]
 [Import Settings]
 [From a file]
 [From pasted text]
 [&Add Module]
-[NULL contact menu]
 [Export Settings]
-[Contacts menu]
 [Export Contacts]
 [Import Contacts]
-[Contact Mod context]
 [Export Module from all contacts]
-[new item]
 [Watch Window]
 [Reload Watch List]
 ;file \plugins\DbEditorPP\src\addeditsettingsdlg.cpp
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 84e3910994..df0740ba98 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -96,7 +96,6 @@
 ;file \protocols\FacebookRM\src\process.cpp
 [Contact is back on server-list.]
 [Contact is no longer on server-list.]
-[Attachments:]
 ;file \protocols\FacebookRM\src\proto.cpp
 [Show Mind Window]
 [%s server connection]
diff --git a/langpacks/english/Plugins/IEView.txt b/langpacks/english/Plugins/IEView.txt
index 9909eadd40..f94bb20ba8 100644
--- a/langpacks/english/Plugins/IEView.txt
+++ b/langpacks/english/Plugins/IEView.txt
@@ -69,10 +69,6 @@
 [Message Sessions]
 [IEView]
 [Skins]
-[320 x 205]
-[480 x 385]
-[560 x 349]
-[640 x 390]
 [Template]
 [All Files]
 [All Images]
diff --git a/langpacks/english/Plugins/MetaContacts.txt b/langpacks/english/Plugins/MetaContacts.txt
index c60576585b..05c6576bb3 100644
--- a/langpacks/english/Plugins/MetaContacts.txt
+++ b/langpacks/english/Plugins/MetaContacts.txt
@@ -9,11 +9,10 @@
 ;file \plugins\MetaContacts\res\MetaContacts.rc
 [Add to Existing MetaContact]
 [Please select a MetaContact:]
-[&Ok]
+[&OK]
 [&Cancel]
 [Sort Alphabetically]
 [Editing]
-[&OK]
 [Name:]
 [Information]
 [Contacts]
diff --git a/langpacks/english/Plugins/MirOTR.txt b/langpacks/english/Plugins/MirOTR.txt
index 9233e5a6a6..8d388f9811 100644
--- a/langpacks/english/Plugins/MirOTR.txt
+++ b/langpacks/english/Plugins/MirOTR.txt
@@ -39,7 +39,6 @@
 [Socialist Millionaires Protocol\r\nVerification]
 [&No]
 [&Yes]
-[MirOTR]
 [OTR status]
 [&Start OTR session]
 [&Refresh OTR session]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 2cee907fa6..575a4559f0 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -43,7 +43,6 @@
 [Show account cycle button]
 [Set My Status Message for All Status]
 [Status Message:]
-[Status popup]
 [&Offline]
 [On&line]
 [&Away]
@@ -54,7 +53,6 @@
 [&Invisible]
 [On the &Phone]
 [Out to &Lunch]
-[Context popup]
 [Set My Avatar...]
 [Set My Nickname...]
 [Set My Status Message...]
@@ -63,10 +61,6 @@
 [Show previous account]
 [Cycle through accounts]
 [Don't cycle through accounts]
-[Nick popup]
-[Status message popup]
-[Avatar popup]
-[ListeningTo popup]
 ;file \plugins\MyDetails\src\data.cpp
 [<no status name>]
 ;file \plugins\MyDetails\src\frame.cpp
diff --git a/langpacks/english/Plugins/New_GPG.txt b/langpacks/english/Plugins/New_GPG.txt
index e946a70634..8abc002745 100644
--- a/langpacks/english/Plugins/New_GPG.txt
+++ b/langpacks/english/Plugins/New_GPG.txt
@@ -60,7 +60,6 @@
 [Recieved encrypted file form contact whith disabled encryption.]
 [Remember choice]
 [Choose which  keys to export]
-[Ok]
 [Export public keys (only set for contacts)]
 [Export all private keys]
 [Export public and private keys]
diff --git a/langpacks/english/Plugins/Scriver.txt b/langpacks/english/Plugins/Scriver.txt
index e16a9269c3..fd46bcec8e 100644
--- a/langpacks/english/Plugins/Scriver.txt
+++ b/langpacks/english/Plugins/Scriver.txt
@@ -189,7 +189,7 @@
 [Hide userlist]
 [Show userlist]
 [Status 1 (10x10)]
-[Status 2 (10x10]
+[Status 2 (10x10)]
 [Status 3 (10x10)]
 [Status 4 (10x10)]
 [Status 5 (10x10)]
diff --git a/langpacks/english/Plugins/SecureIM.txt b/langpacks/english/Plugins/SecureIM.txt
index b12970efe0..ffc4ca0f75 100644
--- a/langpacks/english/Plugins/SecureIM.txt
+++ b/langpacks/english/Plugins/SecureIM.txt
@@ -72,7 +72,6 @@
 [Cancel]
 [SecureIM plugin Passphrase of private key]
 [Enter passphrase for the secret key:]
-[Ok]
 [Mode]
 [Native SecureIM]
 [PGP SecureIM]
diff --git a/langpacks/english/Plugins/SendSS.txt b/langpacks/english/Plugins/SendSS.txt
index 27c8150403..cfb6bede72 100644
--- a/langpacks/english/Plugins/SendSS.txt
+++ b/langpacks/english/Plugins/SendSS.txt
@@ -98,7 +98,6 @@
 [Prev]
 [Next]
 [Update]
-[Ok]
 [Apply]
 [Down arrow]
 ;file \plugins\SendScreenshotPlus\src\mir_icolib.h
diff --git a/langpacks/english/Plugins/TabSRMM.txt b/langpacks/english/Plugins/TabSRMM.txt
index 95d5ccaa99..cd6d666bb5 100644
--- a/langpacks/english/Plugins/TabSRMM.txt
+++ b/langpacks/english/Plugins/TabSRMM.txt
@@ -300,7 +300,6 @@
 [You can export and import all your color and font settings here. This allows you to create a Theme file which can be shared between different profiles or with your buddies.]
 [Export to a file...]
 [Import from a file...]
-[Ok]
 [Icons]
 [Event type icons in the message log]
 [Text symbols as event markers]
@@ -400,7 +399,6 @@
 [Global Setting]
 [Force Off]
 [Unread Menu]
-[Traycontext]
 [Recent Sessions]
 [Favorites]
 [Show the Tray Icon]
@@ -426,7 +424,6 @@
 [Add Contact to Favorites]
 [Remove Contact from Favorites]
 [dummy]
-[Splitter context]
 [Set Position for this Session]
 [Set and Save for all Sessions]
 [Set and Save for this Contact only]
diff --git a/langpacks/english/Plugins/UInfoEx.txt b/langpacks/english/Plugins/UInfoEx.txt
index 11a7351e33..9987ecf08e 100644
--- a/langpacks/english/Plugins/UInfoEx.txt
+++ b/langpacks/english/Plugins/UInfoEx.txt
@@ -12,7 +12,7 @@
 [Origin]
 [&Update]
 [Updating]
-[Ok]
+[OK]
 [Cancel]
 [Apply]
 [Nick:]
@@ -130,7 +130,6 @@
 [Setting/Event (20/100)]
 [John Doe (1/10)]
 [Dialog]
-[OK]
 [All]
 [None]
 [Show Menu Item]