8 files changed, 244 insertions, 30 deletions
diff --git a/langpacks/english/Langpack_english.txt b/langpacks/english/Langpack_english.txt
index 64cf22e7fd..0887ea35a3 100644
--- a/langpacks/english/Langpack_english.txt
+++ b/langpacks/english/Langpack_english.txt
@@ -2640,7 +2640,7 @@ Miranda Language Pack Version 1
 ;============================================================
 ;  File: BASS_interface.dll
 ;  Plugin: BASS interface
-;  Version: 0.0.0.13
+;  Version: 0.0.0.14
 ;  Authors: tico-tico
 ;============================================================
 [un4seen's BASS interface Miranda NG plugin.]
@@ -4271,6 +4271,8 @@ Miranda Language Pack Version 1
 [Set status modes]
 [The requested action requires a valid contact selection. Please select a contact from the contact list and repeat]
 [Parameter mismatch]
+[The service %s specified by the %s button definition was not found. You may need to install additional plugins]
+[Service failure]
 [EventAreaClass]
 [Frame titles]
 [Contact list local time]
@@ -5391,6 +5393,8 @@ Miranda Language Pack Version 1
 ;file \plugins\FavContacts\src\main.cpp
 [Favourite Contact]
 [Regular Contact]
+[Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\nFor use with any other application, please contact author.\n]
+[Favourite Contacts Error]
 [Contact name]
 [Second line]
 [Selected contact name (color)]
@@ -7281,6 +7285,101 @@ Miranda Language Pack Version 1
 [*** Defaut Action ***]
 [*** System History ***]
 [History]
+#muuid {67848b07-83d2-49e9-8844-7e3de268e304}
+;langpack template for HTTPServer
+;file \plugins\HTTPServer\res\resource.rc
+[IPAddress1]
+[IPAddress2]
+[Max downloads]
+[Address]
+[Mask]
+[Share name]
+[Allowed IP]
+[Display hidden shares]
+[New share]
+[Show HTTP server statistics]
+[Set to default]
+[External server name]
+[This is the link pasted to the message window]
+[Write log file]
+[Enable / Disable HTTP server]
+[Main menu items]
+[Open log]
+[Show popups]
+[Page keyword]
+[URL address]
+[%ExternalIP% variable]
+[Test]
+[Transfer limit (kb/sec)]
+[No control when Away/NA]
+[Connection control]
+[Index creation]
+[Disable]
+[Create HTML (compatibility)]
+[Create XML]
+[Notifications]
+[Total connection limit]
+[Connections per user limit]
+[Default download limit]
+[&Edit share]
+[&Remove share]
+[&Open in Browser]
+[&Copy link]
+;file \plugins\HTTPServer\src\Glob.h
+[Miranda (HTTPServer.dll)]
+;file \plugins\HTTPServer\src\GuiElements.cpp
+[Share Current Directory]
+[All Files (*.*)\0*.*\0]
+[Specify a file to share]
+[Failed to share new file]
+[Max Downloads]
+[Allowed Mask]
+[Real path]
+[User]
+[Agent]
+[Completed]
+[Speed]
+[Selected link size is 0]
+[Failed to get access to clipboard]
+[Failed to get close the clipboard]
+[Failed to set clipboard data]
+[ListView_GetItem failed]
+[No share selected]
+[Current IP Address: ]
+[Current Address: ]
+[IP Adress: ]
+[You are browsing from]
+[<HTML><BODY>]
+[You external ip was detected as %d.%d.%d.%d\r\nby: %s]
+[You need to restart miranda to change the main menu]
+[HTTP Server]
+[Network]
+[Failed to CreateServiceFunction MS_SHARE_NEW_FILE]
+[Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW]
+[HTTP Share new file]
+[Failed to add contact menu item]
+[Failed to HookEvent ME_OPT_INITIALISE]
+;file \plugins\HTTPServer\src\HttpUser.cpp
+[Share removed]
+;file \plugins\HTTPServer\src\main.cpp
+[Failed to open or create log file]
+[Failed to move to the end of the log file]
+[Failed to write some part of the log file]
+[Failed to open or create file ]
+[Failed to write xml header to file ]
+[Failed to write xml data to file ]
+[Failed to write xml tail to file ]
+[Failed to get NETLIBUSERSETTINGS using MS_NETLIB_GETUSERSETTINGS]
+[Failed to bind to port %s\r\nThis is most likely because another program or service is using this port]
+[Disable HTTP server]
+[Enable HTTP server]
+[Failed to register NetLib user]
+[Failed to CreateServiceFunction MS_HTTP_ACCEPT_CONNECTIONS]
+[Failed to CreateServiceFunction MS_HTTP_ADD_CHANGE_REMOVE]
+[Failed to CreateServiceFunction MS_HTTP_GET_SHARE]
+[Failed to CreateServiceFunction MS_HTTP_GET_ALL_SHARES]
+[Failed to HookEvent ME_SYSTEM_MODULESLOADED]
+[Failed to HookEvent ME_SYSTEM_PRESHUTDOWN]
 #muuid {73a9615c-7d4e-4555-badb-ee05dc928eff}
 ;============================================================
 ;  File: ICQ.dll
@@ -11020,17 +11119,25 @@ Miranda Language Pack Version 1
 [Open in new Window]
 [Copy to Clipboard]
 [Show Message]
+;file \plugins\HistoryLinkListPlus\src\language.h
+[History Linklist]
+[History is empty!]
+[There are no links in history!]
+[Error]
+[incoming]
+[outgoing]
+[Filter]
+[no filter]
+[Search Filter]
+[no settings]
 ;file \plugins\HistoryLinkListPlus\src\linklist.cpp
 [Unable to load the Rich Edit control!]
-[Error]
 [&Create Linklist]
 [Progressbar]
 [History]
-[History Linklist]
 [Processing history...]
 [Could not create window!]
 [Could not allocate memory!]
-[There are no links in history!]
 ;file \plugins\HistoryLinkListPlus\src\linklist_dlg.cpp
 [Linklist Plugin]
 [mailto:]
@@ -11880,7 +11987,7 @@ Miranda Language Pack Version 1
 [History was saved successfully in file\r\n]
 [Failed to create history dialog]
 ;file \plugins\Msg_Export\src\Glob.h
-[Miranda (Msg_Export.dll)]
+[Miranda NG (Message Export Plugin)]
 ;file \plugins\Msg_Export\src\main.cpp
 [Failed to HookEvent ME_DB_EVENT_ADDED]
 [Failed to HookEvent ME_DB_CONTACT_DELETED]
@@ -11894,7 +12001,7 @@ Miranda Language Pack Version 1
 [Failed to CreateServiceFunction MS_SHOW_EXPORT_HISTORY]
 ;file \plugins\Msg_Export\src\options.cpp
 [No contacts found to export]
-[Reading database information ( Phase 1 of 2 )]
+[Reading database information (Phase 1 of 2)]
 [Failed to export at least one contact]
 [Sorting and writing database information ( Phase 2 of 2 )]
 [Max line width must be at least %d]
@@ -11909,7 +12016,7 @@ Miranda Language Pack Version 1
 [%dbpath%\\MsgExport\\%group%\\]
 [You have unapplyed changes do you wish to apply these first ?]
 [Executable files (*.exe;*.com;*.bat;*.cmd)\0*.exe;*.com;*.bat;*.cmd\0All files(*.*)\0*.*\0]
-[Failed to get the shells allocator !]
+[Failed to get the shells allocator!]
 [Failed to Allocate buffer space]
 [Select Destination Directory]
 [Export Protocols]
@@ -11926,14 +12033,14 @@ Miranda Language Pack Version 1
 [\r\nGetFilePathFromUser( NULL ) :]
 [The language pack you are using has an error in the transalation of\r\n]
 [\r\n---------------      It was translated to      ---------------\r\n]
-[\r\nErrorCode : %d\r\n]
+[\r\nErrorCode: %d\r\n]
 [DB: Attempt to get wrong type of value, string]
 [(Unknown Contact)]
-[File name for the user "%s" has changed !\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file ?]
+[File name for the user "%s" has changed!\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file?]
 [Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s]
-[\nError :]
-[Message has not been saved !\n]
-[Do you wish to save debug information ?]
+[\nError: ]
+[\nMessage has not been saved!\n]
+[Do you wish to save debug information?]
 [All\0*.*\0Text\0*.TXT\0\0]
 [TXT]
 [Failed to open or create file :\n]
@@ -11981,7 +12088,7 @@ Miranda Language Pack Version 1
 [Failed to write Unknown event to the file :\n]
 [Programming error writing UTF8 string to ansi file]
 [Programming error on line __LINE__ please report this]
-[User has been deleted do you want to delete the file ?]
+[User has been deleted do you want to delete the file?]
 [Failed to delete the file]
 #muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d}
 ;============================================================
@@ -12189,13 +12296,11 @@ Miranda Language Pack Version 1
 [Bottom:]
 [Left:]
 [Right:]
-[Background Color:]
 [Avatar]
 [Custom size:]
 [pixels]
 [Allow it to grow]
 [Draw border on avatar]
-[Border Color:]
 [Round corners of avatars]
 [Custom corner size:]
 [Use free space (under avatar) to other texts]
@@ -12233,7 +12338,9 @@ Miranda Language Pack Version 1
 [Status]
 [Status Message]
 [Listening To]
+[Background]
 [My Details]
+[Avatar Border]
 [Show My Details]
 [Enable Listening To for %s]
 [Set My Avatar for %s...]
diff --git a/langpacks/english/Plugins/BASS_interface.txt b/langpacks/english/Plugins/BASS_interface.txt
index 9c228a05ea..2b80857798 100644
--- a/langpacks/english/Plugins/BASS_interface.txt
+++ b/langpacks/english/Plugins/BASS_interface.txt
@@ -2,7 +2,7 @@
 ;============================================================
 ;  File: BASS_interface.dll
 ;  Plugin: BASS interface
-;  Version: 0.0.0.13
+;  Version: 0.0.0.14
 ;  Authors: tico-tico
 ;============================================================
 [un4seen's BASS interface Miranda NG plugin.]
diff --git a/langpacks/english/Plugins/Clist_nicer.txt b/langpacks/english/Plugins/Clist_nicer.txt
index 313937dfdc..cd059a81fa 100644
--- a/langpacks/english/Plugins/Clist_nicer.txt
+++ b/langpacks/english/Plugins/Clist_nicer.txt
@@ -387,6 +387,8 @@
 [Set status modes]
 [The requested action requires a valid contact selection. Please select a contact from the contact list and repeat]
 [Parameter mismatch]
+[The service %s specified by the %s button definition was not found. You may need to install additional plugins]
+[Service failure]
 [EventAreaClass]
 [Frame titles]
 [Contact list local time]
diff --git a/langpacks/english/Plugins/FavContacts.txt b/langpacks/english/Plugins/FavContacts.txt
index dfc55fd330..50806dd148 100644
--- a/langpacks/english/Plugins/FavContacts.txt
+++ b/langpacks/english/Plugins/FavContacts.txt
@@ -24,6 +24,8 @@
 ;file \plugins\FavContacts\src\main.cpp
 [Favourite Contact]
 [Regular Contact]
+[Favourite Contacts plugin was designed to be used with Miranda IM and Miranda NG only.\nFor use with any other application, please contact author.\n]
+[Favourite Contacts Error]
 [Contact name]
 [Second line]
 [Selected contact name (color)]
diff --git a/langpacks/english/Plugins/HTTPServer.txt b/langpacks/english/Plugins/HTTPServer.txt
new file mode 100644
index 0000000000..4c8050903c
--- /dev/null
+++ b/langpacks/english/Plugins/HTTPServer.txt
@@ -0,0 +1,95 @@
+#muuid {67848b07-83d2-49e9-8844-7e3de268e304}
+;langpack template for HTTPServer
+;file \plugins\HTTPServer\res\resource.rc
+[IPAddress1]
+[IPAddress2]
+[Max downloads]
+[Address]
+[Mask]
+[Share name]
+[Allowed IP]
+[Display hidden shares]
+[New share]
+[Show HTTP server statistics]
+[Set to default]
+[External server name]
+[This is the link pasted to the message window]
+[Write log file]
+[Enable / Disable HTTP server]
+[Main menu items]
+[Open log]
+[Show popups]
+[Page keyword]
+[URL address]
+[%ExternalIP% variable]
+[Test]
+[Transfer limit (kb/sec)]
+[No control when Away/NA]
+[Connection control]
+[Index creation]
+[Disable]
+[Create HTML (compatibility)]
+[Create XML]
+[Notifications]
+[Total connection limit]
+[Connections per user limit]
+[Default download limit]
+[&Edit share]
+[&Remove share]
+[&Open in Browser]
+[&Copy link]
+;file \plugins\HTTPServer\src\Glob.h
+[Miranda (HTTPServer.dll)]
+;file \plugins\HTTPServer\src\GuiElements.cpp
+[Share Current Directory]
+[All Files (*.*)\0*.*\0]
+[Specify a file to share]
+[Failed to share new file]
+[Max Downloads]
+[Allowed Mask]
+[Real path]
+[User]
+[Agent]
+[Completed]
+[Speed]
+[Selected link size is 0]
+[Failed to get access to clipboard]
+[Failed to get close the clipboard]
+[Failed to set clipboard data]
+[ListView_GetItem failed]
+[No share selected]
+[Current IP Address: ]
+[Current Address: ]
+[IP Adress: ]
+[You are browsing from]
+[<HTML><BODY>]
+[You external ip was detected as %d.%d.%d.%d\r\nby: %s]
+[You need to restart miranda to change the main menu]
+[HTTP Server]
+[Network]
+[Failed to CreateServiceFunction MS_SHARE_NEW_FILE]
+[Failed to CreateServiceFunction MS_SHOW_STATISTICS_VIEW]
+[HTTP Share new file]
+[Failed to add contact menu item]
+[Failed to HookEvent ME_OPT_INITIALISE]
+;file \plugins\HTTPServer\src\HttpUser.cpp
+[Share removed]
+;file \plugins\HTTPServer\src\main.cpp
+[Failed to open or create log file]
+[Failed to move to the end of the log file]
+[Failed to write some part of the log file]
+[Failed to open or create file ]
+[Failed to write xml header to file ]
+[Failed to write xml data to file ]
+[Failed to write xml tail to file ]
+[Failed to get NETLIBUSERSETTINGS using MS_NETLIB_GETUSERSETTINGS]
+[Failed to bind to port %s\r\nThis is most likely because another program or service is using this port]
+[Disable HTTP server]
+[Enable HTTP server]
+[Failed to register NetLib user]
+[Failed to CreateServiceFunction MS_HTTP_ACCEPT_CONNECTIONS]
+[Failed to CreateServiceFunction MS_HTTP_ADD_CHANGE_REMOVE]
+[Failed to CreateServiceFunction MS_HTTP_GET_SHARE]
+[Failed to CreateServiceFunction MS_HTTP_GET_ALL_SHARES]
+[Failed to HookEvent ME_SYSTEM_MODULESLOADED]
+[Failed to HookEvent ME_SYSTEM_PRESHUTDOWN]
diff --git a/langpacks/english/Plugins/LinkList.txt b/langpacks/english/Plugins/LinkList.txt
index df2edba922..2c20658688 100644
--- a/langpacks/english/Plugins/LinkList.txt
+++ b/langpacks/english/Plugins/LinkList.txt
@@ -45,17 +45,25 @@
 [Open in new Window]
 [Copy to Clipboard]
 [Show Message]
+;file \plugins\HistoryLinkListPlus\src\language.h
+[History Linklist]
+[History is empty!]
+[There are no links in history!]
+[Error]
+[incoming]
+[outgoing]
+[Filter]
+[no filter]
+[Search Filter]
+[no settings]
 ;file \plugins\HistoryLinkListPlus\src\linklist.cpp
 [Unable to load the Rich Edit control!]
-[Error]
 [&Create Linklist]
 [Progressbar]
 [History]
-[History Linklist]
 [Processing history...]
 [Could not create window!]
 [Could not allocate memory!]
-[There are no links in history!]
 ;file \plugins\HistoryLinkListPlus\src\linklist_dlg.cpp
 [Linklist Plugin]
 [mailto:]
diff --git a/langpacks/english/Plugins/Msg_Export.txt b/langpacks/english/Plugins/Msg_Export.txt
index 8f50bc9a8a..a953a4a1a7 100644
--- a/langpacks/english/Plugins/Msg_Export.txt
+++ b/langpacks/english/Plugins/Msg_Export.txt
@@ -56,7 +56,7 @@
 [History was saved successfully in file\r\n]
 [Failed to create history dialog]
 ;file \plugins\Msg_Export\src\Glob.h
-[Miranda (Msg_Export.dll)]
+[Miranda NG (Message Export Plugin)]
 ;file \plugins\Msg_Export\src\main.cpp
 [Failed to HookEvent ME_DB_EVENT_ADDED]
 [Failed to HookEvent ME_DB_CONTACT_DELETED]
@@ -70,7 +70,7 @@
 [Failed to CreateServiceFunction MS_SHOW_EXPORT_HISTORY]
 ;file \plugins\Msg_Export\src\options.cpp
 [No contacts found to export]
-[Reading database information ( Phase 1 of 2 )]
+[Reading database information (Phase 1 of 2)]
 [Failed to export at least one contact]
 [Sorting and writing database information ( Phase 2 of 2 )]
 [Max line width must be at least %d]
@@ -85,7 +85,7 @@
 [%dbpath%\\MsgExport\\%group%\\]
 [You have unapplyed changes do you wish to apply these first ?]
 [Executable files (*.exe;*.com;*.bat;*.cmd)\0*.exe;*.com;*.bat;*.cmd\0All files(*.*)\0*.*\0]
-[Failed to get the shells allocator !]
+[Failed to get the shells allocator!]
 [Failed to Allocate buffer space]
 [Select Destination Directory]
 [Export Protocols]
@@ -102,14 +102,14 @@
 [\r\nGetFilePathFromUser( NULL ) :]
 [The language pack you are using has an error in the transalation of\r\n]
 [\r\n---------------      It was translated to      ---------------\r\n]
-[\r\nErrorCode : %d\r\n]
+[\r\nErrorCode: %d\r\n]
 [DB: Attempt to get wrong type of value, string]
 [(Unknown Contact)]
-[File name for the user "%s" has changed !\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file ?]
+[File name for the user "%s" has changed!\n\nfrom:\t%s\nto:\t%s\n\nDo you wish to rename file?]
 [Failed to rename file\n\nfrom:\t%s\nto:\t%s\n\nFailed with error: %s]
-[\nError :]
-[Message has not been saved !\n]
-[Do you wish to save debug information ?]
+[\nError: ]
+[\nMessage has not been saved!\n]
+[Do you wish to save debug information?]
 [All\0*.*\0Text\0*.TXT\0\0]
 [TXT]
 [Failed to open or create file :\n]
@@ -157,5 +157,5 @@
 [Failed to write Unknown event to the file :\n]
 [Programming error writing UTF8 string to ansi file]
 [Programming error on line __LINE__ please report this]
-[User has been deleted do you want to delete the file ?]
+[User has been deleted do you want to delete the file?]
 [Failed to delete the file]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 710183ec62..ec48cb7294 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -22,13 +22,11 @@
 [Bottom:]
 [Left:]
 [Right:]
-[Background Color:]
 [Avatar]
 [Custom size:]
 [pixels]
 [Allow it to grow]
 [Draw border on avatar]
-[Border Color:]
 [Round corners of avatars]
 [Custom corner size:]
 [Use free space (under avatar) to other texts]
@@ -66,7 +64,9 @@
 [Status]
 [Status Message]
 [Listening To]
+[Background]
 [My Details]
+[Avatar Border]
 [Show My Details]
 [Enable Listening To for %s]
 [Set My Avatar for %s...]