summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordartraiden <wowemuh@gmail.com>2017-12-01 03:26:11 +0300
committerdartraiden <wowemuh@gmail.com>2017-12-01 03:26:11 +0300
commit4d30ea7bc3eadfa252766c559feb7a00d006dcc7 (patch)
treeedab0c4f10cf0c97eaae77d525e8693e19c39f94
parent7902551c661c307bcfb1844c85c2c74d5012de9b (diff)
remove Tlen completely
-rw-r--r--README.md1
-rw-r--r--docs/mirandaboot.ini4
-rw-r--r--langpacks/belarusian/Deprecated/Tlen.txt (renamed from langpacks/belarusian/Plugins/Tlen.txt)0
-rw-r--r--langpacks/belarusian/NoTranslated.txt3
-rw-r--r--langpacks/bulgarian/Deprecated/Tlen.txt (renamed from langpacks/bulgarian/Plugins/Tlen.txt)0
-rw-r--r--langpacks/bulgarian/Untranslated/Tlen.txt92
-rw-r--r--langpacks/croatian/Plugins/Tlen.txt327
-rw-r--r--langpacks/croatian/Untranslated/Tlen.txt149
-rw-r--r--langpacks/czech/Deprecated/Tlen.txt (renamed from langpacks/czech/Plugins/Tlen.txt)0
-rw-r--r--langpacks/english/Plugins/Tlen.txt173
-rw-r--r--langpacks/english_gb/Plugins/Tlen.txt23
-rw-r--r--langpacks/french/Deprecated/Tlen.txt (renamed from langpacks/french/Plugins/Tlen.txt)0
-rw-r--r--langpacks/french/Untranslated/Tlen.txt39
-rw-r--r--langpacks/german/Deprecated/Tlen.txt (renamed from langpacks/german/Plugins/Tlen.txt)0
-rw-r--r--langpacks/polish/Deprecated/Tlen.txt (renamed from langpacks/polish/Plugins/Tlen.txt)0
-rw-r--r--langpacks/russian/Deprecated/Tlen.txt (renamed from langpacks/russian/Plugins/Tlen.txt)0
-rw-r--r--langpacks/russian/Untranslated/Tlen.txt3
-rw-r--r--langpacks/serbian/Plugins/Tlen.txt327
-rw-r--r--langpacks/serbian/Untranslated/Tlen.txt127
-rw-r--r--langpacks/spanish/Plugins/Tlen.txt83
-rw-r--r--langpacks/spanish/Untranslated/Tlen.txt116
-rw-r--r--langpacks/ukrainian/Deprecated/Tlen.txt (renamed from langpacks/ukrainian/Plugins/Tlen.txt)0
-rw-r--r--plugins/AddContactPlus/src/addcontact.cpp24
-rw-r--r--plugins/AssocMgr/src/version.h2
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.icobin1150 -> 0 bytes
-rw-r--r--plugins/FingerprintNG/iconpacks/res/fp_icons.rc6
-rw-r--r--plugins/FingerprintNG/res/resource.rc1
-rw-r--r--plugins/FingerprintNG/src/finger_groups.h5
-rw-r--r--plugins/FingerprintNG/src/masks.cpp11
-rw-r--r--plugins/FingerprintNG/src/options.cpp1
-rw-r--r--plugins/FingerprintNG/src/resource.h7
-rw-r--r--plugins/FingerprintNG/src/stdafx.h1
-rw-r--r--plugins/IEHistory/src/version.h3
-rw-r--r--plugins/Nudge/res/NudgeTlen.icobin1150 -> 0 bytes
-rw-r--r--plugins/Nudge/res/resource.rc1
-rw-r--r--plugins/Nudge/src/resource.h1
-rw-r--r--plugins/Variables/src/stdafx.h2
-rw-r--r--src/mir_app/src/db_ini.cpp2
-rw-r--r--tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini4
-rw-r--r--tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini4
-rw-r--r--tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini4
-rw-r--r--tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini4
-rw-r--r--tools/lpgen/lpgen.js4
48 files changed, 18 insertions, 1536 deletions
diff --git a/README.md b/README.md
index b60835ad1d..0b11e925f6 100644
--- a/README.md
+++ b/README.md
@@ -21,7 +21,6 @@ fast.
- Sametime
- Skype
- Steam
-- Tlen
- Tox
- Twitter
- VKontakte
diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini
index 82fa8860de..f42e8ef5e3 100644
--- a/docs/mirandaboot.ini
+++ b/docs/mirandaboot.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList SkinSounds
;Unsafe
;A space-separated list of database module names that could be altered for
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System administrators may find it desirable to install settings without prompting
diff --git a/langpacks/belarusian/Plugins/Tlen.txt b/langpacks/belarusian/Deprecated/Tlen.txt
index 274f4d5552..274f4d5552 100644
--- a/langpacks/belarusian/Plugins/Tlen.txt
+++ b/langpacks/belarusian/Deprecated/Tlen.txt
diff --git a/langpacks/belarusian/NoTranslated.txt b/langpacks/belarusian/NoTranslated.txt
index 2a144f41e4..433c90d0b7 100644
--- a/langpacks/belarusian/NoTranslated.txt
+++ b/langpacks/belarusian/NoTranslated.txt
@@ -17,9 +17,6 @@
[Gadu-Gadu v10 client]
[Gadu-Gadu v9 client]
[Gadu-Gadu v8 client]
-[Tlen 7.x overlay]
-[Tlen 6.x overlay]
-[Tlen 5.x overlay]
[TM/QQ 2012 overlay]
[TM/QQ 2011 overlay]
[TM/QQ 2010 overlay]
diff --git a/langpacks/bulgarian/Plugins/Tlen.txt b/langpacks/bulgarian/Deprecated/Tlen.txt
index fcc6512356..fcc6512356 100644
--- a/langpacks/bulgarian/Plugins/Tlen.txt
+++ b/langpacks/bulgarian/Deprecated/Tlen.txt
diff --git a/langpacks/bulgarian/Untranslated/Tlen.txt b/langpacks/bulgarian/Untranslated/Tlen.txt
deleted file mode 100644
index a0cd2d233b..0000000000
--- a/langpacks/bulgarian/Untranslated/Tlen.txt
+++ /dev/null
@@ -1,92 +0,0 @@
-[Tlen protocol support for Miranda NG.]
-[Automatically reconnect after unintentional disconnection]
-[Leave status message after disconnection]
-[Ignore advertisements]
-[Show offline users with status messages as invisible in contact list]
-[Send and receive client version information]
-[Alert policy]
-[Use Nudge plugin]
-[Log alerts as messages]
-[Group chat policy]
-[Image transfer policy]
-[Voice Chats]
-[Voice chat policy]
-[Recording device:]
-[Playback device:]
-[Expert Options]
-[Connection Host:]
-[Enable Always Visible and Never Visible]
-[P2P Connections]
-[Use proxy for incoming connections]
-[Proxy type:]
-[Proxy server:]
-[Proxy requires authorization]
-[Mail Notification]
-[Enable incoming mail notification]
-[&From popup plugin]
-[Tlen Password]
-[Year of birth:]
-[School:]
-[Looking for:]
-[Voice chats]
-[Publicly visible status]
-[Public avatar]
-[Tlen login:]
-[Subscription:]
-[Software:]
-[System:]
-[Personal Information]
-[Extra Search Criteria]
-[Plan:]
-[Tlen Voice Chat]
-[In]
-[Out]
-[Tlen Voice Chat Invitation]
-[The following invitation to join a voice chat is received.]
-[Tlen inbox]
-[Tlen chats]
-[Voice chat]
-[Microphone]
-[Speaker]
-[Send image]
-[Incoming mail]
-[Alert]
-[Tlen Mail]
-[Send picture]
-[Voice Chat]
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-[Error while setting avatar on Tlen account (no response)]
-[Error while setting avatar on Tlen account (invalid response)]
-[Error while setting avatar on Tlen account]
-[1 File]
-[Tlen Authentication]
-[Tlen Protocol Option]
-[Accept all alerts]
-[Ignore alerts from unauthorized contacts]
-[Ignore all alerts]
-[Always ask me]
-[Accept invitations from authorized contacts]
-[Accept all invitations]
-[Ignore invitations from unauthorized contacts]
-[Ignore all invitation]
-[Accept all images]
-[Ignore images from unauthorized contacts]
-[Ignore all images]
-[<Last message>]
-[Forwarding]
-[Image sent file://%s]
-[Image received file://%s]
-[Tlen login]
-[You need to be connected to Tlen account to set avatar.]
-[Tlen Connection Error]
-[%s Web Messages]
-[Web message]
-[An alert has been received.]
-[Private conference]
-[...Connecting...]
-[...Waiting for connection...]
-[...Finished...]
-[...Error...]
-[...Denied...]
-[%s SOCKS connection]
diff --git a/langpacks/croatian/Plugins/Tlen.txt b/langpacks/croatian/Plugins/Tlen.txt
deleted file mode 100644
index 33678cfe67..0000000000
--- a/langpacks/croatian/Plugins/Tlen.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-#muuid {748f8934-781a-528d-5208-001265404ab3}
-;============================================================
-; File: Tlen.dll
-; Plugin: Tlen protocol
-; Version: 2.1.0.0
-; Authors: Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki
-;============================================================
-[Tlen protocol support for Miranda NG.]
-
-;file \protocols\Tlen\res\tlen.rc
-[Username:]
-
-[Password:]
-
-[Save password]
-
-[Create new account]
-
-[Options]
-opcije
-[Automatically reconnect after unintentional disconnection]
-
-[Leave status message after disconnection]
-
-[Ignore advertisements]
-
-[Automatically delete contacts not in my roster]
-
-[Show offline users with status messages as invisible in contact list]
-
-[Enable avatars]
-
-[Send and receive client version information]
-
-[Alert policy]
-
-[Use Nudge plugin]
-
-[Log alerts as messages]
-
-[Group chat policy]
-
-[Image transfer policy]
-
-[Voice Chats]
-
-[Voice chat policy]
-
-[Recording device:]
-
-[Playback device:]
-
-[Expert Options]
-
-[Login server:]
-
-[Connection Host:]
-
-[Port:]
-
-[Keep connection alive]
-
-[Enable encryption]
-
-[Enable Always Visible and Never Visible]
-
-[P2P Connections]
-
-[Use proxy for incoming connections]
-
-[Proxy type:]
-
-[Proxy server:]
-
-[Proxy requires authorization]
-
-[Mail Notification]
-
-[Enable incoming mail notification]
-
-[Colors]
-
-[Background]
-Pozadina
-[Text]
-tekst
-[Delay]
-
-[&From popup plugin]
-
-[&Custom]
-
-[P&ermanent]
-
-[Preview]
-
-[Tlen Password]
-
-[Cancel]
-
-[Nickname:]
-
-[First name:]
-
-[Last name:]
-
-[E-mail:]
-
-[Gender:]
-
-[Year of birth:]
-
-[City:]
-
-[School:]
-
-[Occupation:]
-
-[Looking for:]
-
-[Voice chats]
-
-[Publicly visible status]
-
-[Save changes]
-
-[Avatar]
-
-[Avatar Options]
-
-[Public avatar]
-
-[Tlen login:]
-
-[Subscription:]
-
-[Software:]
-
-[Version:]
-
-[System:]
-
-[Personal Information]
-
-[Age:]
-
-[to]
-
-[Extra Search Criteria]
-
-[Status:]
-
-[Plan:]
-
-[Tlen Voice Chat]
-
-[Quality]
-
-[In]
-
-[Out]
-
-[Finish]
-
-[Tlen Voice Chat Invitation]
-
-[&Accept]
-
-[From:]
-
-[The following invitation to join a voice chat is received.]
-
-;file \protocols\Tlen\src\tlen.cpp
-[Protocol icon]
-
-[Tlen inbox]
-
-[Group chats]
-
-[Tlen chats]
-
-[Voice chat]
-
-[Microphone]
-
-[Speaker]
-
-[Send image]
-
-[Incoming mail]
-
-[Alert]
-
-[Multi-User Conference]
-
-[Tlen Mail]
-
-[Send picture]
-
-[Voice Chat]
-
-[Request authorization]
-Zahtjevaj autorizaciju
-[Grant authorization]
-Autoriziraj
-;file \protocols\Tlen\src\tlen_avatar.cpp
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-
-[Error while setting avatar on Tlen account (no response)]
-
-[Error while setting avatar on Tlen account (invalid response)]
-
-[Error while setting avatar on Tlen account]
-
-;file \protocols\Tlen\src\tlen_file.cpp
-[1 File]
-
-[%d Files]
-
-;file \protocols\Tlen\src\tlen_iqid.cpp
-[Authentication failed for %s@%s.]
-
-[Tlen Authentication]
-
-;file \protocols\Tlen\src\tlen_opt.cpp
-[General]
-
-[Advanced]
-
-[Notifications]
-
-[Network]
-
-[These changes will take effect the next time you connect to the Tlen network.]
-
-[Tlen Protocol Option]
-
-[Accept all alerts]
-
-[Ignore alerts from unauthorized contacts]
-
-[Ignore all alerts]
-
-[Always ask me]
-
-[Accept invitations from authorized contacts]
-
-[Accept all invitations]
-
-[Ignore invitations from unauthorized contacts]
-
-[Ignore all invitation]
-
-[Accept all images]
-
-[Ignore images from unauthorized contacts]
-
-[Ignore all images]
-
-[<Last message>]
-
-[Forwarding]
-
-[%S mail]
-
-;file \protocols\Tlen\src\tlen_picture.cpp
-[Image sent file://%s]
-
-[Image received file://%s]
-
-;file \protocols\Tlen\src\tlen_svc.cpp
-[Tlen login]
-
-[You need to be connected to Tlen account to set avatar.]
-
-;file \protocols\Tlen\src\tlen_thread.cpp
-[Enter password for %s]
-
-[Tlen Connection Error]
-
-[%s Web Messages]
-
-[Web message]
-
-[From]
-
-[E-mail]
-
-[An alert has been received.]
-
-[Private conference]
-
-[%s mail]
-
-[Subject]
-
-;file \protocols\Tlen\src\tlen_userinfo.cpp
-[Account]
-
-[both]
-
-[from]
-
-[none]
-
-[not on roster]
-
-;file \protocols\Tlen\src\tlen_voice.cpp
-[...Connecting...]
-
-[...Waiting for connection...]
-
-[...Finished...]
-
-[...Error...]
-
-[...Denied...]
-
-[Default]
-
-;file \protocols\Tlen\src\tlen_ws.cpp
-[%s connection]
-
-[%s SOCKS connection]
-
diff --git a/langpacks/croatian/Untranslated/Tlen.txt b/langpacks/croatian/Untranslated/Tlen.txt
deleted file mode 100644
index ec3c5dbb9f..0000000000
--- a/langpacks/croatian/Untranslated/Tlen.txt
+++ /dev/null
@@ -1,149 +0,0 @@
-[Tlen protocol support for Miranda NG.]
-[Username:]
-[Password:]
-[Save password]
-[Create new account]
-[Automatically reconnect after unintentional disconnection]
-[Leave status message after disconnection]
-[Ignore advertisements]
-[Automatically delete contacts not in my roster]
-[Show offline users with status messages as invisible in contact list]
-[Enable avatars]
-[Send and receive client version information]
-[Alert policy]
-[Use Nudge plugin]
-[Log alerts as messages]
-[Group chat policy]
-[Image transfer policy]
-[Voice Chats]
-[Voice chat policy]
-[Recording device:]
-[Playback device:]
-[Expert Options]
-[Login server:]
-[Connection Host:]
-[Port:]
-[Keep connection alive]
-[Enable encryption]
-[Enable Always Visible and Never Visible]
-[P2P Connections]
-[Use proxy for incoming connections]
-[Proxy type:]
-[Proxy server:]
-[Proxy requires authorization]
-[Mail Notification]
-[Enable incoming mail notification]
-[Colors]
-[Delay]
-[&From popup plugin]
-[&Custom]
-[P&ermanent]
-[Preview]
-[Tlen Password]
-[Cancel]
-[Nickname:]
-[First name:]
-[Last name:]
-[E-mail:]
-[Gender:]
-[Year of birth:]
-[City:]
-[School:]
-[Occupation:]
-[Looking for:]
-[Voice chats]
-[Publicly visible status]
-[Save changes]
-[Avatar]
-[Avatar Options]
-[Public avatar]
-[Tlen login:]
-[Subscription:]
-[Software:]
-[Version:]
-[System:]
-[Personal Information]
-[Age:]
-[to]
-[Extra Search Criteria]
-[Status:]
-[Plan:]
-[Tlen Voice Chat]
-[Quality]
-[In]
-[Out]
-[Finish]
-[Tlen Voice Chat Invitation]
-[&Accept]
-[From:]
-[The following invitation to join a voice chat is received.]
-[Protocol icon]
-[Tlen inbox]
-[Group chats]
-[Tlen chats]
-[Voice chat]
-[Microphone]
-[Speaker]
-[Send image]
-[Incoming mail]
-[Alert]
-[Multi-User Conference]
-[Tlen Mail]
-[Send picture]
-[Voice Chat]
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-[Error while setting avatar on Tlen account (no response)]
-[Error while setting avatar on Tlen account (invalid response)]
-[Error while setting avatar on Tlen account]
-[1 File]
-[%d Files]
-[Authentication failed for %s@%s.]
-[Tlen Authentication]
-[General]
-[Advanced]
-[Notifications]
-[Network]
-[These changes will take effect the next time you connect to the Tlen network.]
-[Tlen Protocol Option]
-[Accept all alerts]
-[Ignore alerts from unauthorized contacts]
-[Ignore all alerts]
-[Always ask me]
-[Accept invitations from authorized contacts]
-[Accept all invitations]
-[Ignore invitations from unauthorized contacts]
-[Ignore all invitation]
-[Accept all images]
-[Ignore images from unauthorized contacts]
-[Ignore all images]
-[<Last message>]
-[Forwarding]
-[%S mail]
-[Image sent file://%s]
-[Image received file://%s]
-[Tlen login]
-[You need to be connected to Tlen account to set avatar.]
-[Enter password for %s]
-[Tlen Connection Error]
-[%s Web Messages]
-[Web message]
-[From]
-[E-mail]
-[An alert has been received.]
-[Private conference]
-[%s mail]
-[Subject]
-[Account]
-[both]
-[from]
-[none]
-[not on roster]
-[...Connecting...]
-[...Waiting for connection...]
-[...Finished...]
-[...Error...]
-[...Denied...]
-[Default]
-[%s connection]
-[%s SOCKS connection]
diff --git a/langpacks/czech/Plugins/Tlen.txt b/langpacks/czech/Deprecated/Tlen.txt
index 34a3ade59d..34a3ade59d 100644
--- a/langpacks/czech/Plugins/Tlen.txt
+++ b/langpacks/czech/Deprecated/Tlen.txt
diff --git a/langpacks/english/Plugins/Tlen.txt b/langpacks/english/Plugins/Tlen.txt
deleted file mode 100644
index cd4a6560f9..0000000000
--- a/langpacks/english/Plugins/Tlen.txt
+++ /dev/null
@@ -1,173 +0,0 @@
-#muuid {748f8934-781a-528d-5208-001265404ab3}
-;============================================================
-; File: Tlen.dll
-; Plugin: Tlen protocol
-; Version: 2.1.0.0
-; Authors: Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki
-;============================================================
-[Tlen protocol support for Miranda NG.]
-;file \protocols\Tlen\res\tlen.rc
-[Username:]
-[Password:]
-[Save password]
-[Create new account]
-[Options]
-[Automatically reconnect after unintentional disconnection]
-[Leave status message after disconnection]
-[Ignore advertisements]
-[Automatically delete contacts not in my roster]
-[Show offline users with status messages as invisible in contact list]
-[Enable avatars]
-[Send and receive client version information]
-[Alert policy]
-[Use Nudge plugin]
-[Log alerts as messages]
-[Group chat policy]
-[Image transfer policy]
-[Voice Chats]
-[Voice chat policy]
-[Recording device:]
-[Playback device:]
-[Expert Options]
-[Login server:]
-[Connection Host:]
-[Port:]
-[Keep connection alive]
-[Enable encryption]
-[Enable Always Visible and Never Visible]
-[P2P Connections]
-[Use proxy for incoming connections]
-[Proxy type:]
-[Proxy server:]
-[Proxy requires authorization]
-[Mail Notification]
-[Enable incoming mail notification]
-[Colors]
-[Background]
-[Text]
-[Delay]
-[&From popup plugin]
-[&Custom]
-[P&ermanent]
-[Preview]
-[Tlen Password]
-[Cancel]
-[Nickname:]
-[First name:]
-[Last name:]
-[E-mail:]
-[Gender:]
-[Year of birth:]
-[City:]
-[School:]
-[Occupation:]
-[Looking for:]
-[Voice chats]
-[Publicly visible status]
-[Save changes]
-[Avatar]
-[Avatar Options]
-[Public avatar]
-[Tlen login:]
-[Subscription:]
-[Software:]
-[Version:]
-[System:]
-[Personal Information]
-[Age:]
-[to]
-[Extra Search Criteria]
-[Status:]
-[Plan:]
-[Tlen Voice Chat]
-[Quality]
-[In]
-[Out]
-[Finish]
-[Tlen Voice Chat Invitation]
-[&Accept]
-[From:]
-[The following invitation to join a voice chat is received.]
-;file \protocols\Tlen\src\tlen.cpp
-[Protocol icon]
-[Tlen inbox]
-[Group chats]
-[Tlen chats]
-[Voice chat]
-[Microphone]
-[Speaker]
-[Send image]
-[Incoming mail]
-[Alert]
-[Multi-User Conference]
-[Tlen Mail]
-[Send picture]
-[Voice Chat]
-[Request authorization]
-[Grant authorization]
-;file \protocols\Tlen\src\tlen_avatar.cpp
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-[Error while setting avatar on Tlen account (no response)]
-[Error while setting avatar on Tlen account (invalid response)]
-[Error while setting avatar on Tlen account]
-;file \protocols\Tlen\src\tlen_file.cpp
-[1 File]
-[%d Files]
-;file \protocols\Tlen\src\tlen_iqid.cpp
-[Authentication failed for %s@%s.]
-[Tlen Authentication]
-;file \protocols\Tlen\src\tlen_opt.cpp
-[General]
-[Advanced]
-[Notifications]
-[Network]
-[These changes will take effect the next time you connect to the Tlen network.]
-[Tlen Protocol Option]
-[Accept all alerts]
-[Ignore alerts from unauthorized contacts]
-[Ignore all alerts]
-[Always ask me]
-[Accept invitations from authorized contacts]
-[Accept all invitations]
-[Ignore invitations from unauthorized contacts]
-[Ignore all invitation]
-[Accept all images]
-[Ignore images from unauthorized contacts]
-[Ignore all images]
-[<Last message>]
-[Forwarding]
-[%S mail]
-;file \protocols\Tlen\src\tlen_picture.cpp
-[Image sent file://%s]
-[Image received file://%s]
-;file \protocols\Tlen\src\tlen_svc.cpp
-[Tlen login]
-[You need to be connected to Tlen account to set avatar.]
-;file \protocols\Tlen\src\tlen_thread.cpp
-[Enter password for %s]
-[Tlen Connection Error]
-[%s Web Messages]
-[Web message]
-[From]
-[E-mail]
-[An alert has been received.]
-[Private conference]
-[%s mail]
-[Subject]
-;file \protocols\Tlen\src\tlen_userinfo.cpp
-[Account]
-[both]
-[from]
-[none]
-[not on roster]
-;file \protocols\Tlen\src\tlen_voice.cpp
-[...Connecting...]
-[...Waiting for connection...]
-[...Finished...]
-[...Error...]
-[...Denied...]
-[Default]
-;file \protocols\Tlen\src\tlen_ws.cpp
-[%s connection]
-[%s SOCKS connection]
diff --git a/langpacks/english_gb/Plugins/Tlen.txt b/langpacks/english_gb/Plugins/Tlen.txt
deleted file mode 100644
index 037567e4dd..0000000000
--- a/langpacks/english_gb/Plugins/Tlen.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-#muuid {748f8934-781a-528d-5208-001265404ab3}
-;============================================================
-; File: Tlen.dll
-; Plugin: Tlen protocol
-; Version: 2.1.0.0
-; Authors: Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki
-;============================================================
-[Proxy requires authorization]
-Proxy requires authorisation
-[Colors]
-Colours
-[Request authorization]
-Request authorisation
-[Grant authorization]
-Grant authorisation
-[Ignore alerts from unauthorized contacts]
-Ignore alerts from unauthorised contacts
-[Accept invitations from authorized contacts]
-Accept invitations from authorised contacts
-[Ignore invitations from unauthorized contacts]
-Ignore invitations from unauthorised contacts
-[Ignore images from unauthorized contacts]
-Ignore images from unauthorised contacts
diff --git a/langpacks/french/Plugins/Tlen.txt b/langpacks/french/Deprecated/Tlen.txt
index 9da4ceffdc..9da4ceffdc 100644
--- a/langpacks/french/Plugins/Tlen.txt
+++ b/langpacks/french/Deprecated/Tlen.txt
diff --git a/langpacks/french/Untranslated/Tlen.txt b/langpacks/french/Untranslated/Tlen.txt
deleted file mode 100644
index 0156c7d52a..0000000000
--- a/langpacks/french/Untranslated/Tlen.txt
+++ /dev/null
@@ -1,39 +0,0 @@
-[Automatically reconnect after unintentional disconnection]
-[Enable avatars]
-[Log alerts as messages]
-[Group chat policy]
-[Image transfer policy]
-[Voice chat policy]
-[Login server:]
-[Mail Notification]
-[Delay]
-[P&ermanent]
-[Tlen Password]
-[Public avatar]
-[Version:]
-[Finish]
-[Protocol icon]
-[Tlen inbox]
-[Tlen chats]
-[Send image]
-[Multi-User Conference]
-[Tlen Mail]
-[Send picture]
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-[Error while setting avatar on Tlen account (no response)]
-[Error while setting avatar on Tlen account (invalid response)]
-[Error while setting avatar on Tlen account]
-[Authentication failed for %s@%s.]
-[Accept all images]
-[Ignore images from unauthorized contacts]
-[Ignore all images]
-[%S mail]
-[Image sent file://%s]
-[Image received file://%s]
-[You need to be connected to Tlen account to set avatar.]
-[%s mail]
-[Subject]
-[not on roster]
-[%s connection]
-[%s SOCKS connection]
diff --git a/langpacks/german/Plugins/Tlen.txt b/langpacks/german/Deprecated/Tlen.txt
index b2fe10aeb4..b2fe10aeb4 100644
--- a/langpacks/german/Plugins/Tlen.txt
+++ b/langpacks/german/Deprecated/Tlen.txt
diff --git a/langpacks/polish/Plugins/Tlen.txt b/langpacks/polish/Deprecated/Tlen.txt
index df2f10c14a..df2f10c14a 100644
--- a/langpacks/polish/Plugins/Tlen.txt
+++ b/langpacks/polish/Deprecated/Tlen.txt
diff --git a/langpacks/russian/Plugins/Tlen.txt b/langpacks/russian/Deprecated/Tlen.txt
index 742c3dd9c0..742c3dd9c0 100644
--- a/langpacks/russian/Plugins/Tlen.txt
+++ b/langpacks/russian/Deprecated/Tlen.txt
diff --git a/langpacks/russian/Untranslated/Tlen.txt b/langpacks/russian/Untranslated/Tlen.txt
deleted file mode 100644
index d8c5845c4f..0000000000
--- a/langpacks/russian/Untranslated/Tlen.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-[Image transfer policy]
-[Tlen login]
-[Web message]
diff --git a/langpacks/serbian/Plugins/Tlen.txt b/langpacks/serbian/Plugins/Tlen.txt
deleted file mode 100644
index 14fa339ba0..0000000000
--- a/langpacks/serbian/Plugins/Tlen.txt
+++ /dev/null
@@ -1,327 +0,0 @@
-#muuid {748f8934-781a-528d-5208-001265404ab3}
-;============================================================
-; File: Tlen.dll
-; Plugin: Tlen protocol
-; Version: 2.1.0.0
-; Authors: Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki
-;============================================================
-[Tlen protocol support for Miranda NG.]
-
-;file \protocols\Tlen\res\tlen.rc
-[Username:]
-Korisničko ime:
-[Password:]
-Šifra
-[Save password]
-
-[Create new account]
-Otvaranje naloga
-[Options]
-Podešavanja
-[Automatically reconnect after unintentional disconnection]
-
-[Leave status message after disconnection]
-
-[Ignore advertisements]
-
-[Automatically delete contacts not in my roster]
-
-[Show offline users with status messages as invisible in contact list]
-
-[Enable avatars]
-
-[Send and receive client version information]
-
-[Alert policy]
-
-[Use Nudge plugin]
-
-[Log alerts as messages]
-
-[Group chat policy]
-
-[Image transfer policy]
-
-[Voice Chats]
-
-[Voice chat policy]
-
-[Recording device:]
-
-[Playback device:]
-
-[Expert Options]
-
-[Login server:]
-
-[Connection Host:]
-
-[Port:]
-Port:
-[Keep connection alive]
-
-[Enable encryption]
-
-[Enable Always Visible and Never Visible]
-
-[P2P Connections]
-
-[Use proxy for incoming connections]
-
-[Proxy type:]
-
-[Proxy server:]
-
-[Proxy requires authorization]
-
-[Mail Notification]
-
-[Enable incoming mail notification]
-
-[Colors]
-
-[Background]
-Pozadina
-[Text]
-Tekst
-[Delay]
-
-[&From popup plugin]
-
-[&Custom]
-
-[P&ermanent]
-
-[Preview]
-
-[Tlen Password]
-
-[Cancel]
-Otkazivanje
-[Nickname:]
-Nadimak:
-[First name:]
-Ime:
-[Last name:]
-Prezime:
-[E-mail:]
-E-mail:
-[Gender:]
-Pol:
-[Year of birth:]
-
-[City:]
-Grad:
-[School:]
-
-[Occupation:]
-
-[Looking for:]
-
-[Voice chats]
-
-[Publicly visible status]
-
-[Save changes]
-
-[Avatar]
-
-[Avatar Options]
-
-[Public avatar]
-
-[Tlen login:]
-
-[Subscription:]
-
-[Software:]
-
-[Version:]
-
-[System:]
-
-[Personal Information]
-
-[Age:]
-Godine:
-[to]
-U
-[Extra Search Criteria]
-
-[Status:]
-
-[Plan:]
-
-[Tlen Voice Chat]
-
-[Quality]
-
-[In]
-
-[Out]
-
-[Finish]
-
-[Tlen Voice Chat Invitation]
-
-[&Accept]
-
-[From:]
-Od koga:
-[The following invitation to join a voice chat is received.]
-
-;file \protocols\Tlen\src\tlen.cpp
-[Protocol icon]
-
-[Tlen inbox]
-
-[Group chats]
-Sobe za razgovor
-[Tlen chats]
-
-[Voice chat]
-
-[Microphone]
-
-[Speaker]
-
-[Send image]
-
-[Incoming mail]
-
-[Alert]
-
-[Multi-User Conference]
-
-[Tlen Mail]
-
-[Send picture]
-
-[Voice Chat]
-
-[Request authorization]
-Zatraži autorizaciju
-[Grant authorization]
-Autorizuj
-;file \protocols\Tlen\src\tlen_avatar.cpp
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-
-[Error while setting avatar on Tlen account (no response)]
-
-[Error while setting avatar on Tlen account (invalid response)]
-
-[Error while setting avatar on Tlen account]
-
-;file \protocols\Tlen\src\tlen_file.cpp
-[1 File]
-
-[%d Files]
-%d datoteka
-;file \protocols\Tlen\src\tlen_iqid.cpp
-[Authentication failed for %s@%s.]
-
-[Tlen Authentication]
-
-;file \protocols\Tlen\src\tlen_opt.cpp
-[General]
-Uopšteno
-[Advanced]
-Napredno
-[Notifications]
-
-[Network]
-Mreža
-[These changes will take effect the next time you connect to the Tlen network.]
-
-[Tlen Protocol Option]
-
-[Accept all alerts]
-
-[Ignore alerts from unauthorized contacts]
-
-[Ignore all alerts]
-
-[Always ask me]
-
-[Accept invitations from authorized contacts]
-
-[Accept all invitations]
-
-[Ignore invitations from unauthorized contacts]
-
-[Ignore all invitation]
-
-[Accept all images]
-
-[Ignore images from unauthorized contacts]
-
-[Ignore all images]
-
-[<Last message>]
-
-[Forwarding]
-
-[%S mail]
-
-;file \protocols\Tlen\src\tlen_picture.cpp
-[Image sent file://%s]
-
-[Image received file://%s]
-
-;file \protocols\Tlen\src\tlen_svc.cpp
-[Tlen login]
-
-[You need to be connected to Tlen account to set avatar.]
-
-;file \protocols\Tlen\src\tlen_thread.cpp
-[Enter password for %s]
-
-[Tlen Connection Error]
-
-[%s Web Messages]
-
-[Web message]
-
-[From]
-
-[E-mail]
-E-mail
-[An alert has been received.]
-
-[Private conference]
-
-[%s mail]
-
-[Subject]
-
-;file \protocols\Tlen\src\tlen_userinfo.cpp
-[Account]
-
-[both]
-
-[from]
-
-[none]
-Nema
-[not on roster]
-
-;file \protocols\Tlen\src\tlen_voice.cpp
-[...Connecting...]
-
-[...Waiting for connection...]
-
-[...Finished...]
-
-[...Error...]
-
-[...Denied...]
-
-[Default]
-Standardno
-;file \protocols\Tlen\src\tlen_ws.cpp
-[%s connection]
-
-[%s SOCKS connection]
-
diff --git a/langpacks/serbian/Untranslated/Tlen.txt b/langpacks/serbian/Untranslated/Tlen.txt
deleted file mode 100644
index 2e8aeba150..0000000000
--- a/langpacks/serbian/Untranslated/Tlen.txt
+++ /dev/null
@@ -1,127 +0,0 @@
-[Tlen protocol support for Miranda NG.]
-[Save password]
-[Automatically reconnect after unintentional disconnection]
-[Leave status message after disconnection]
-[Ignore advertisements]
-[Automatically delete contacts not in my roster]
-[Show offline users with status messages as invisible in contact list]
-[Enable avatars]
-[Send and receive client version information]
-[Alert policy]
-[Use Nudge plugin]
-[Log alerts as messages]
-[Group chat policy]
-[Image transfer policy]
-[Voice Chats]
-[Voice chat policy]
-[Recording device:]
-[Playback device:]
-[Expert Options]
-[Login server:]
-[Connection Host:]
-[Keep connection alive]
-[Enable encryption]
-[Enable Always Visible and Never Visible]
-[P2P Connections]
-[Use proxy for incoming connections]
-[Proxy type:]
-[Proxy server:]
-[Proxy requires authorization]
-[Mail Notification]
-[Enable incoming mail notification]
-[Colors]
-[Delay]
-[&From popup plugin]
-[&Custom]
-[P&ermanent]
-[Preview]
-[Tlen Password]
-[Year of birth:]
-[School:]
-[Occupation:]
-[Looking for:]
-[Voice chats]
-[Publicly visible status]
-[Save changes]
-[Avatar]
-[Avatar Options]
-[Public avatar]
-[Tlen login:]
-[Subscription:]
-[Software:]
-[Version:]
-[System:]
-[Personal Information]
-[Extra Search Criteria]
-[Status:]
-[Plan:]
-[Tlen Voice Chat]
-[Quality]
-[In]
-[Out]
-[Finish]
-[Tlen Voice Chat Invitation]
-[&Accept]
-[The following invitation to join a voice chat is received.]
-[Protocol icon]
-[Tlen inbox]
-[Tlen chats]
-[Voice chat]
-[Microphone]
-[Speaker]
-[Send image]
-[Incoming mail]
-[Alert]
-[Multi-User Conference]
-[Tlen Mail]
-[Send picture]
-[Voice Chat]
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-[Error while setting avatar on Tlen account (no response)]
-[Error while setting avatar on Tlen account (invalid response)]
-[Error while setting avatar on Tlen account]
-[1 File]
-[Authentication failed for %s@%s.]
-[Tlen Authentication]
-[Notifications]
-[These changes will take effect the next time you connect to the Tlen network.]
-[Tlen Protocol Option]
-[Accept all alerts]
-[Ignore alerts from unauthorized contacts]
-[Ignore all alerts]
-[Always ask me]
-[Accept invitations from authorized contacts]
-[Accept all invitations]
-[Ignore invitations from unauthorized contacts]
-[Ignore all invitation]
-[Accept all images]
-[Ignore images from unauthorized contacts]
-[Ignore all images]
-[<Last message>]
-[Forwarding]
-[%S mail]
-[Image sent file://%s]
-[Image received file://%s]
-[Tlen login]
-[You need to be connected to Tlen account to set avatar.]
-[Enter password for %s]
-[Tlen Connection Error]
-[%s Web Messages]
-[Web message]
-[From]
-[An alert has been received.]
-[Private conference]
-[%s mail]
-[Subject]
-[Account]
-[both]
-[from]
-[not on roster]
-[...Connecting...]
-[...Waiting for connection...]
-[...Finished...]
-[...Error...]
-[...Denied...]
-[%s connection]
-[%s SOCKS connection]
diff --git a/langpacks/spanish/Plugins/Tlen.txt b/langpacks/spanish/Plugins/Tlen.txt
deleted file mode 100644
index 4c84771db7..0000000000
--- a/langpacks/spanish/Plugins/Tlen.txt
+++ /dev/null
@@ -1,83 +0,0 @@
-#muuid {748f8934-781a-528d-5208-001265404ab3}
-;============================================================
-; File: Tlen.dll
-; Plugin: Tlen protocol
-; Version: 2.1.0.0
-; Authors: Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki
-;============================================================
-[Username:]
-Usuario:
-[Password:]
-Contraseña:
-[Save password]
-Guardar contraseña
-[Create new account]
-Crear nueva cuenta
-[Options]
-Opciones
-[Automatically delete contacts not in my roster]
-Eliminar automáticamente los contactos que no están en mi lista
-[Port:]
-Puerto:
-[Keep connection alive]
-Mantener viva la conexión
-[Colors]
-Colores
-[Background]
-Fondo
-[Text]
-Texto
-[Delay]
-Retardo
-[Preview]
-Previsualizar
-[Cancel]
-Cancelar
-[Nickname:]
-Apodo:
-[First name:]
-Primer nombre:
-[Last name:]
-Apellido:
-[E-mail:]
-E-mail:
-[Gender:]
-Género:
-[City:]
-Ciudad
-[Occupation:]
-Ocupación:
-[Version:]
-Versión
-[Age:]
-Edad:
-[to]
-a
-[From:]
-De:
-[Group chats]
-Grupo de chats
-[Request authorization]
-Solicitar autorización
-[Grant authorization]
-Conceder autorización
-[%d Files]
-%d archivos
-[General]
-General
-[Advanced]
-Avanzado
-[Notifications]
-Notificaciones
-[Network]
-Red
-[E-mail]
-E-mail
-[Subject]
-Sujeto
-[Account]
-Cuenta
-[none]
-ninguno
-[Default]
-Por defecto
diff --git a/langpacks/spanish/Untranslated/Tlen.txt b/langpacks/spanish/Untranslated/Tlen.txt
deleted file mode 100644
index f948ddfcf7..0000000000
--- a/langpacks/spanish/Untranslated/Tlen.txt
+++ /dev/null
@@ -1,116 +0,0 @@
-[Tlen protocol support for Miranda NG.]
-[Automatically reconnect after unintentional disconnection]
-[Leave status message after disconnection]
-[Ignore advertisements]
-[Show offline users with status messages as invisible in contact list]
-[Enable avatars]
-[Send and receive client version information]
-[Alert policy]
-[Use Nudge plugin]
-[Log alerts as messages]
-[Group chat policy]
-[Image transfer policy]
-[Voice Chats]
-[Voice chat policy]
-[Recording device:]
-[Playback device:]
-[Expert Options]
-[Login server:]
-[Connection Host:]
-[Enable encryption]
-[Enable Always Visible and Never Visible]
-[P2P Connections]
-[Use proxy for incoming connections]
-[Proxy type:]
-[Proxy server:]
-[Proxy requires authorization]
-[Mail Notification]
-[Enable incoming mail notification]
-[&From popup plugin]
-[&Custom]
-[P&ermanent]
-[Tlen Password]
-[Year of birth:]
-[School:]
-[Looking for:]
-[Voice chats]
-[Publicly visible status]
-[Save changes]
-[Avatar]
-[Avatar Options]
-[Public avatar]
-[Tlen login:]
-[Subscription:]
-[Software:]
-[System:]
-[Personal Information]
-[Extra Search Criteria]
-[Status:]
-[Plan:]
-[Tlen Voice Chat]
-[Quality]
-[In]
-[Out]
-[Finish]
-[Tlen Voice Chat Invitation]
-[&Accept]
-[The following invitation to join a voice chat is received.]
-[Protocol icon]
-[Tlen inbox]
-[Tlen chats]
-[Voice chat]
-[Microphone]
-[Speaker]
-[Send image]
-[Incoming mail]
-[Alert]
-[Multi-User Conference]
-[Tlen Mail]
-[Send picture]
-[Voice Chat]
-[Cannot create avatars cache directory. ERROR: %d: %s\n%s]
-[Cannot save new avatar file "%s" Error:\n\t%s (Error: %d)]
-[Error while setting avatar on Tlen account (no response)]
-[Error while setting avatar on Tlen account (invalid response)]
-[Error while setting avatar on Tlen account]
-[1 File]
-[Authentication failed for %s@%s.]
-[Tlen Authentication]
-[These changes will take effect the next time you connect to the Tlen network.]
-[Tlen Protocol Option]
-[Accept all alerts]
-[Ignore alerts from unauthorized contacts]
-[Ignore all alerts]
-[Always ask me]
-[Accept invitations from authorized contacts]
-[Accept all invitations]
-[Ignore invitations from unauthorized contacts]
-[Ignore all invitation]
-[Accept all images]
-[Ignore images from unauthorized contacts]
-[Ignore all images]
-[<Last message>]
-[Forwarding]
-[%S mail]
-[Image sent file://%s]
-[Image received file://%s]
-[Tlen login]
-[You need to be connected to Tlen account to set avatar.]
-[Enter password for %s]
-[Tlen Connection Error]
-[%s Web Messages]
-[Web message]
-[From]
-[An alert has been received.]
-[Private conference]
-[%s mail]
-[both]
-[from]
-[not on roster]
-[...Connecting...]
-[...Waiting for connection...]
-[...Finished...]
-[...Error...]
-[...Denied...]
-[%s connection]
-[%s SOCKS connection]
diff --git a/langpacks/ukrainian/Plugins/Tlen.txt b/langpacks/ukrainian/Deprecated/Tlen.txt
index 06064166e8..06064166e8 100644
--- a/langpacks/ukrainian/Plugins/Tlen.txt
+++ b/langpacks/ukrainian/Deprecated/Tlen.txt
diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp
index 0337c30753..85bab9265a 100644
--- a/plugins/AddContactPlus/src/addcontact.cpp
+++ b/plugins/AddContactPlus/src/addcontact.cpp
@@ -31,12 +31,6 @@ struct AddDialogParam : public MZeroedObject
PROTOSEARCHRESULT *psr;
};
-// Tlen protocol
-struct TLEN_SEARCH_RESULT : public PROTOSEARCHRESULT
-{
- char jid[256];
-};
-
void AddContactDlgOpts(HWND hdlg, const char* szProto, BOOL bAuthOptsOnly = FALSE)
{
DWORD flags = (szProto) ? CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_4, 0) : 0;
@@ -249,22 +243,8 @@ INT_PTR CALLBACK AddContactDlgProc(HWND hdlg, UINT msg, WPARAM wparam, LPARAM)
}
PROTOSEARCHRESULT *psr;
- if (strstr(acs->proto, "TLEN")) { // Tlen protocol
- if (wcschr(szUserId, '@') == nullptr) {
- MessageBox(nullptr,
- TranslateT("The contact cannot be added to your contact list. Please make sure the contact ID is entered correctly."),
- TranslateT("Add contact"), MB_OK | MB_ICONWARNING | MB_SETFOREGROUND | MB_TOPMOST);
- break;
- }
- psr = (PROTOSEARCHRESULT*)mir_calloc(sizeof(TLEN_SEARCH_RESULT));
- psr->cbSize = sizeof(TLEN_SEARCH_RESULT);
- mir_snprintf(((TLEN_SEARCH_RESULT*)psr)->jid, _countof(((TLEN_SEARCH_RESULT*)psr)->jid), "%S", szUserId);
- }
- else {
- psr = (PROTOSEARCHRESULT*)mir_calloc(sizeof(PROTOSEARCHRESULT));
- psr->cbSize = sizeof(PROTOSEARCHRESULT);
- }
-
+ psr = (PROTOSEARCHRESULT*)mir_calloc(sizeof(PROTOSEARCHRESULT));
+ psr->cbSize = sizeof(PROTOSEARCHRESULT);
psr->flags = PSR_UNICODE;
psr->id.w = mir_wstrdup(szUserId);
acs->psr = psr;
diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h
index 0ca2ab609c..a44ef73797 100644
--- a/plugins/AssocMgr/src/version.h
+++ b/plugins/AssocMgr/src/version.h
@@ -28,7 +28,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __PLUGIN_NAME "File association manager"
#define __FILENAME "AssocMgr.dll"
-#define __DESCRIPTION "Handles file type associations and URLs like aim, gg, mirpu, tlen, wpmsg, xmpp, ymsgr."
+#define __DESCRIPTION "Handles file type associations and URLs like aim, gg, mirpu, wpmsg, xmpp, ymsgr."
#define __AUTHOR "H. Herkenrath"
#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/AssocMgr/"
diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.ico
deleted file mode 100644
index 2ae790eada..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_Tlen.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.ico
deleted file mode 100644
index 0ff15c93c5..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/Tlen.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.ico
deleted file mode 100644
index 538b14dfcf..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v5.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.ico
deleted file mode 100644
index 2180a6d17c..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v6.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.ico
deleted file mode 100644
index a416896eaa..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v7.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.ico b/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.ico
deleted file mode 100644
index 74e53fd11d..0000000000
--- a/plugins/FingerprintNG/iconpacks/res/Tlen/overlay_Tlen_v8.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
index 08bbb0e0ca..498d408065 100644
--- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
+++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc
@@ -492,11 +492,6 @@ IDI_ATOM3 ICON "rss\\Atom 3.ico"
IDI_RSS09 ICON "rss\\RSS 0.9.ico"
IDI_RSS1 ICON "rss\\RSS 1.ico"
IDI_RSS2 ICON "rss\\RSS 2.ico"
-IDI_TLEN ICON "Tlen\\Tlen.ico"
-IDI_TLEN5_OVERLAY ICON "Tlen\\overlay_Tlen_v5.ico"
-IDI_TLEN6_OVERLAY ICON "Tlen\\overlay_Tlen_v6.ico"
-IDI_TLEN7_OVERLAY ICON "Tlen\\overlay_Tlen_v7.ico"
-IDI_TLEN8_OVERLAY ICON "Tlen\\overlay_Tlen_v8.ico"
IDI_AMSN ICON "MSN\\aMSN.ico"
IDI_MSN_MAC ICON "MSN\\MSN Mac.ico"
IDI_MSN_45 ICON "MSN\\MSN v4.5-v5.x.ico"
@@ -558,7 +553,6 @@ IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.
IDI_MAILRU_OVERLAY ICON "overlays\\overlay_proto_MRA.ico"
IDI_MSN_OVERLAY ICON "overlays\\overlay_proto_MSN.ico"
IDI_QQ_OVERLAY ICON "overlays\\overlay_proto_QQ.ico"
-IDI_TLEN_OVERLAY ICON "overlays\\overlay_proto_Tlen.ico"
IDI_YAHOO_OVERLAY ICON "overlays\\overlay_proto_Yahoo.ico"
IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico"
IDI_SKYPE_OVERLAY ICON "overlays\\overlay_proto_skype.ico"
diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc
index f9f4c607b3..0187107716 100644
--- a/plugins/FingerprintNG/res/resource.rc
+++ b/plugins/FingerprintNG/res/resource.rc
@@ -87,7 +87,6 @@ BEGIN
CONTROL "MSN clients",IDC_GROUP_MSN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10
CONTROL "QQ clients",IDC_GROUP_QQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,160,120,10
CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10
- CONTROL "Tlen clients",IDC_GROUP_TLEN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10
CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10
CONTROL "Yahoo clients",IDC_GROUP_YAHOO,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,200,120,10
CONTROL "Facebook clients",IDC_GROUP_FACEBOOK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,170,90,120,10
diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h
index 965a1938f1..d0ac9b3b30 100644
--- a/plugins/FingerprintNG/src/finger_groups.h
+++ b/plugins/FingerprintNG/src/finger_groups.h
@@ -63,11 +63,6 @@ case RSS_CASE:
return LPGENW("Client icons") L"/" LPGENW("RSS clients");
break;
-case TLEN_CASE:
- if (db_get_b(NULL, MODULENAME, "GroupTlen", 1))
- return LPGENW("Client icons") L"/" LPGENW("Tlen clients");
- break;
-
case WEATHER_CASE:
if (db_get_b(NULL, MODULENAME, "GroupWeather", 1))
return LPGENW("Client icons") L"/" LPGENW("Weather clients");
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp
index 19ed3f5950..53df4a768b 100644
--- a/plugins/FingerprintNG/src/masks.cpp
+++ b/plugins/FingerprintNG/src/masks.cpp
@@ -580,11 +580,6 @@ KN_FP_MASK def_kn_fp_mask[] =
{ "client_GG", L"|Gadu-Gadu*|GG*", LPGENW("Gadu-Gadu client"), IDI_GG, GG_CASE },
//#########################################################################################################################################################################
- //################################# TLEN ##############################################################################################################################
- //#########################################################################################################################################################################
- { "client_Tlen", L"*Tlen*", LPGENW("Tlen.pl client"), IDI_TLEN, TLEN_CASE },
-
- //#########################################################################################################################################################################
//################################# Facebook ##########################################################################################################################
//#########################################################################################################################################################################
{ "client_Facebook_other", L"*Facebook*other*", L"Facebook (other)", IDI_FACEBOOK_OTHER, FACEBOOK_CASE },
@@ -693,7 +688,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{ "client_Jabber_overlay", L"|^jabber*|Miranda*Jabber*|py*jabb*", LPGENW("Jabber overlay"), IDI_JABBER_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_MSN_overlay", L"|^MSN*|*Miranda*MSN*", LPGENW("MSN overlay"), IDI_MSN_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_QQ_overlay", L"|Miranda*QQ*|MIM*QQ*", LPGENW("QQ overlay"), IDI_QQ_OVERLAY, OVERLAYS_PROTO_CASE },
- { "client_Tlen_overlay", L"|^tlen*|*tlen*", LPGENW("Tlen.pl overlay"), IDI_TLEN_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_Yahoo_overlay", L"|^Yahoo*|*yahoo*", LPGENW("Yahoo overlay"), IDI_YAHOO_OVERLAY, OVERLAYS_PROTO_CASE },
{ "client_MRA_overlay", L"|^MRA*|^Mail.ru*"
L"|*MRA*|*Mail.ru*IM*|Mrim*"
@@ -720,11 +714,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] =
{ "client_GG_9", L"|Gadu-Gadu*9*|GG*9*", LPGENW("Gadu-Gadu v9 client"), IDI_GG9_OVERLAY, GG_CASE },
{ "client_GG_8", L"|Gadu-Gadu*8*|GG*8*", LPGENW("Gadu-Gadu v8 client"), IDI_GG8_OVERLAY, GG_CASE },
- // {"client_Tlen_8", L"Tlen Protocol 1?", LPGENW("Tlen 8.x overlay"), IDI_TLEN8_OVERLAY, TLEN_CASE },
- { "client_Tlen_7", L"Tlen Protocol 16", LPGENW("Tlen 7.x overlay"), IDI_TLEN7_OVERLAY, TLEN_CASE },
- { "client_Tlen_6", L"Tlen Protocol 10", LPGENW("Tlen 6.x overlay"), IDI_TLEN6_OVERLAY, TLEN_CASE },
- { "client_Tlen_5", L"Tlen Protocol 7", LPGENW("Tlen 5.x overlay"), IDI_TLEN5_OVERLAY, TLEN_CASE },
-
{ "client_QQ_2012", L"|QQ2012*|TM2012*", LPGENW("TM/QQ 2012 overlay"), IDI_QQ_2012_OVERLAY, QQ_CASE },
{ "client_QQ_2011", L"|QQ2011*|TM2011*", LPGENW("TM/QQ 2011 overlay"), IDI_QQ_2011_OVERLAY, QQ_CASE },
{ "client_QQ_2010", L"|QQ2010*|TM2010*", LPGENW("TM/QQ 2010 overlay"), IDI_QQ_2010_OVERLAY, QQ_CASE },
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp
index dc99d8e59d..5ec7b7a793 100644
--- a/plugins/FingerprintNG/src/options.cpp
+++ b/plugins/FingerprintNG/src/options.cpp
@@ -42,7 +42,6 @@ static settings[] =
{ IDC_GROUP_MSN, TRUE, "GroupMSN" },
{ IDC_GROUP_QQ, TRUE, "GroupQQ" },
{ IDC_GROUP_RSS, TRUE, "GroupRSS" },
- { IDC_GROUP_TLEN, TRUE, "GroupTlen" },
{ IDC_GROUP_WEATHER, TRUE, "GroupWeather" },
{ IDC_GROUP_YAHOO, TRUE, "GroupYahoo" },
{ IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" },
diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h
index bd597c7935..8420af7194 100644
--- a/plugins/FingerprintNG/src/resource.h
+++ b/plugins/FingerprintNG/src/resource.h
@@ -64,7 +64,6 @@
#define IDI_MAILRU_OVERLAY 85
#define IDI_MSN_OVERLAY 86
#define IDI_QQ_OVERLAY 87
-#define IDI_TLEN_OVERLAY 88
#define IDI_YAHOO_OVERLAY 89
#define IDI_VK_OVERLAY 90
#define IDI_SKYPE_OVERLAY 91
@@ -413,11 +412,6 @@
#define IDI_GG9_OVERLAY 726
#define IDI_GG10_OVERLAY 727
#define IDI_GG11_OVERLAY 728
-#define IDI_TLEN 731
-#define IDI_TLEN5_OVERLAY 732
-#define IDI_TLEN6_OVERLAY 733
-#define IDI_TLEN7_OVERLAY 734
-#define IDI_TLEN8_OVERLAY 735
#define IDI_AMSN 741
#define IDI_MSN_MAC 742
#define IDI_MSN_45 743
@@ -600,7 +594,6 @@
#define IDC_GROUP_MRA 10036
#define IDC_GROUP_QQ 10037
#define IDC_GROUP_RSS 10038
-#define IDC_GROUP_TLEN 10039
#define IDC_GROUP_WEATHER 10040
#define IDC_GROUP_YAHOO 10041
#define IDC_GROUP_FACEBOOK 10042
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h
index f19c447c67..a44ede6da4 100644
--- a/plugins/FingerprintNG/src/stdafx.h
+++ b/plugins/FingerprintNG/src/stdafx.h
@@ -83,7 +83,6 @@ typedef struct _foundInfo
#define MSN_CASE 3012 // MSN clients
#define QQ_CASE 3013 // QQ clients (+ versions)
#define RSS_CASE 3014 // RSS clients
-#define TLEN_CASE 3015 // Tlen clients (+ versions)
#define WEATHER_CASE 3016 // Weather clients
#define YAHOO_CASE 3017 // Yahoo clients (+ versions)
#define FACEBOOK_CASE 3018 // Facebook clients
diff --git a/plugins/IEHistory/src/version.h b/plugins/IEHistory/src/version.h
index e84bd1a658..34d50e6bcf 100644
--- a/plugins/IEHistory/src/version.h
+++ b/plugins/IEHistory/src/version.h
@@ -30,8 +30,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define __DESC "Shows the history for a given contact using IEView."
#define __AUTHOR "Cristian Libotean, Miranda NG team"
-//#define __AUTHOREMAIL "eblis102@yahoo.com"
-#define __AUTHOREMAIL ""
+#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __COPYRIGHT "© 2006 Cristian Libotean, 2014-17 Miranda NG team"
#define __AUTHORWEB "https://miranda-ng.org/p/IEHistory"
#define __PLUGIN_DISPLAY_NAME "IEView history viewer"
diff --git a/plugins/Nudge/res/NudgeTlen.ico b/plugins/Nudge/res/NudgeTlen.ico
deleted file mode 100644
index 8f0d89dda9..0000000000
--- a/plugins/Nudge/res/NudgeTlen.ico
+++ /dev/null
Binary files differ
diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc
index ae06a8dd88..6cda0a870b 100644
--- a/plugins/Nudge/res/resource.rc
+++ b/plugins/Nudge/res/resource.rc
@@ -184,7 +184,6 @@ IDI_NUDGE ICON "Nudge.ico"
IDI_NUGDE_YAHOO ICON "NudgeYahoo.ico"
IDI_NUDGE_IRC ICON "NudgeIRC.ico"
IDI_NUDGE_MSN ICON "NudgeMSN.ico"
-IDI_NUDGE_TLEN ICON "NudgeTlen.ico"
IDI_NUDGE_META ICON "NudgeMeta.ico"
#endif // Neutral resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Nudge/src/resource.h b/plugins/Nudge/src/resource.h
index f12f8b8e40..6236ae9500 100644
--- a/plugins/Nudge/src/resource.h
+++ b/plugins/Nudge/src/resource.h
@@ -7,7 +7,6 @@
#define IDI_NUGDE_YAHOO 107
#define IDI_NUDGE_IRC 109
#define IDI_NUDGE_MSN 110
-#define IDI_NUDGE_TLEN 111
#define IDI_NUDGE_META 113
#define IDD_SHAKEOPT 126
#define IDD_OPT_NUDGE 126
diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h
index 87b596ae77..9f62ae75ec 100644
--- a/plugins/Variables/src/stdafx.h
+++ b/plugins/Variables/src/stdafx.h
@@ -118,7 +118,7 @@ The contact function will return either a unique contact according to the argume
// Messages you can send to the help window:
#define VARM_PARSE (WM_APP+11) // wParam=lParam=0
#define VARM_SETINPUTTEXT (WM_APP+12)
-#define VARM_GETINPUTTEXT (WM_APP+13)
+#define VARM_GETINPUTTEXT (WM_APP+13)
#define VARM_GETINPUTTEXTLENGTH (WM_APP+14)
#define VARM_SETSUBJECT (WM_APP+15)
#define VARM_GETSUBJECT (WM_APP+16) // wParam=MCONTACT hContact
diff --git a/src/mir_app/src/db_ini.cpp b/src/mir_app/src/db_ini.cpp
index 5e0ad49146..dac3cc202f 100644
--- a/src/mir_app/src/db_ini.cpp
+++ b/src/mir_app/src/db_ini.cpp
@@ -516,7 +516,7 @@ static void DoAutoExec(void)
if (!mir_wstrcmpi(szUse, L"no")) return;
GetPrivateProfileString(L"AutoExec", L"Safe", L"CLC Icons CLUI CList SkinSounds", buf, _countof(buf), mirandabootini);
ptrA szSafeSections(mir_u2a(buf));
- GetPrivateProfileString(L"AutoExec", L"Unsafe", L"AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte", buf, _countof(buf), mirandabootini);
+ GetPrivateProfileString(L"AutoExec", L"Unsafe", L"AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte", buf, _countof(buf), mirandabootini);
ptrA szUnsafeSections(mir_u2a(buf));
GetPrivateProfileString(L"AutoExec", L"Warn", L"notsafe", szSecurity, _countof(szSecurity), mirandabootini);
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
index def769090c..15ec526273 100644
--- a/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
+++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_default.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
index 6586a1079f..e0497130f8 100644
--- a/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
+++ b/tools/installer_ng/Common/Files/Settings/mirandaboot_portable.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini
index def769090c..15ec526273 100644
--- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini
+++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_default.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini
index 6586a1079f..e0497130f8 100644
--- a/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini
+++ b/tools/installer_ng_stable/Common/Files/Settings/mirandaboot_portable.ini
@@ -70,8 +70,8 @@ Safe=CLC Icons CLUI CList Skin SkinSounds TopToolBar
;Unsafe
;A space-separated list of database module names that could be alter to
;malicious purposes (e.g., by faking a login server to steal passwords).
-;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
-Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE Tlen TWITTER VKontakte
+;Default: AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
+Unsafe=AIM Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte
;OverrideSecurityFilename
;System admins may find it desirable to install settings without prompting
diff --git a/tools/lpgen/lpgen.js b/tools/lpgen/lpgen.js
index c463fec70a..4149762b3c 100644
--- a/tools/lpgen/lpgen.js
+++ b/tools/lpgen/lpgen.js
@@ -419,7 +419,7 @@ function ParseRCFile(FileTextVar,array) {
//now make a job, till end of matching regexp
while ((string = find.exec(FileTextVar)) != null) {
// check for some garbage like "List1","Tab1" etc. in *.rc files, we do not need this.
- onestring=string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|SMS|SSL|Steam|Steam Guard|Tlen|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g,"");
+ onestring=string[2].replace(/^(((List|Tab|Tree|Spin|Custom|Slider|DateTimePicker|Radio|Check|HotKey|Progress)\d)|(whiterect|IndSndList|&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|Google Talk|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|S.ms|SMS|SSL|Steam|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400|&\w)|(%.(.*%)?))$/g,"");
// ignore some popup menu craps
if (string[1]=="POPUP" && onestring.match(/^([a-zA-Z ]*(menu|context|popup(?!s)))|([A-Z][a-z]+([A-Z][a-z]*)+)|(new item)$/g))
continue;
@@ -465,7 +465,7 @@ function ParseSourceFile (FileTextVar,array) {
//filter _T() function results
function filter_T(string) {
//filter for exact matched strings
-var filter1=/^(&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|SMS|SSL|SteamID|Steam Guard|Tlen|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;
+var filter1=/^(&?[Oo][Kk]|AOL|APOP|BBS|Bing|CTCP|DCC|Foodnetwork|Google|GPG|Hotmail|ICQ|ICQ Corp|ID|IP|ISDN|iTunes|Jabber|JID|Miranda|MirandaG15|Miranda NG|mRadio|MSN|NickServ|OSD|OTR|PCS|PGP|SMS|SSL|SteamID|Steam Guard|Tox|Twitter|Yahoo|Winamp \(\*\)|Windows|X400)$/g;
//filter string starting from following words
var filter2=/^(SOFTWARE\\|SYSTEM\\|http|ftp|UTF-|utf-|TEXT|EXE|exe|txt|css|html|dat[^a]|txt|MS\x20|CLVM|TM_|CLCB|CLSID|CLUI|HKEY_|MButton|BUTTON|WindowClass|MHeader|RichEdit|RICHEDIT|STATIC|EDIT|CList|listbox|LISTBOX|combobox|COMBOBOX|TitleB|std\w|iso-|windows-|<div|<html|<img|<span|<hr|<a\x20|<table|<td|miranda_|kernel32|user32|muc|pubsub|shlwapi|Tahoma|NBRichEdit|CreatePopup|&?[Oo][Kk]|<\/|<\w>|\w\\\w|urn\:|<\?xml|<\!|h\d|\.!\.).*$/g;
//filter string ending with following words