From 71cfe74d3618c15feab24032c7d4cd71d77129af Mon Sep 17 00:00:00 2001 From: dartraiden Date: Tue, 7 Apr 2020 22:57:27 +0300 Subject: MSN: moved to deprecated, banned, removed support from plugins, etc --- README.md | 1 - bin15/mir_full.sln | 11 - bin15/mir_icons.sln | 10 - bin15/miranda32.sln | 22 - bin16/mir_full.sln | 11 - bin16/mir_icons.sln | 10 - bin16/miranda32.sln | 22 - docs/mirandaboot.ini | 4 +- include/delphi/m_acc.inc | 2 +- include/delphi/m_protosvc.inc | 6 +- include/m_acc.h | 2 +- include/m_protosvc.h | 6 +- langpacks/belarusian/Deprecated/MSN.txt | 254 ++++ langpacks/belarusian/Plugins/MSN.txt | 254 ---- langpacks/belarusian/Untranslated/MSN.txt | 6 - langpacks/bulgarian/Deprecated/MSN.txt | 254 ++++ langpacks/bulgarian/Plugins/MSN.txt | 254 ---- langpacks/bulgarian/Untranslated/MSN.txt | 13 - langpacks/czech/Deprecated/MSN.txt | 254 ++++ langpacks/czech/Plugins/MSN.txt | 254 ---- langpacks/czech/Untranslated/MSN.txt | 6 - langpacks/english/Plugins/MSN.txt | 136 -- langpacks/english_gb/Plugins/MSN.txt | 9 - langpacks/french/Deprecated/MSN.txt | 254 ++++ langpacks/french/Plugins/MSN.txt | 254 ---- langpacks/french/Untranslated/MSN.txt | 64 - langpacks/german/Deprecated/MSN.txt | 254 ++++ langpacks/german/Plugins/MSN.txt | 254 ---- langpacks/polish/Deprecated/MSN.txt | 254 ++++ langpacks/polish/Plugins/MSN.txt | 254 ---- langpacks/polish/Untranslated/MSN.txt | 1 - langpacks/russian/Deprecated/MSN.txt | 254 ++++ langpacks/russian/Plugins/MSN.txt | 254 ---- langpacks/spanish/Plugins/MSN.txt | 254 ---- langpacks/spanish/Untranslated/MSN.txt | 95 -- langpacks/ukrainian/Deprecated/MSN.txt | 254 ++++ langpacks/ukrainian/Plugins/MSN.txt | 254 ---- langpacks/ukrainian/Untranslated/MSN.txt | 3 - plugins/ExternalAPI/delphi/m_ieview.inc | 2 +- plugins/ExternalAPI/delphi/m_smileyadd.inc | 6 +- plugins/ExternalAPI/m_smileyadd.h | 8 +- .../FingerprintNG/iconpacks/res/MSN/MSN Mac.ico | Bin 1150 -> 0 bytes .../iconpacks/res/MSN/MSN v4.5-v5.x.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico | Bin 1150 -> 0 bytes .../FingerprintNG/iconpacks/res/MSN/WLM10-11.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico | Bin 1150 -> 0 bytes .../iconpacks/res/MSN/WebMessenger.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico | Bin 1150 -> 0 bytes .../iconpacks/res/Overlays/overlay_proto_msn.ico | Bin 1150 -> 0 bytes plugins/FingerprintNG/iconpacks/res/fp_icons.rc | 11 - plugins/FingerprintNG/res/resource.rc | 1 - plugins/FingerprintNG/src/finger_groups.h | 5 - plugins/FingerprintNG/src/masks.cpp | 16 - plugins/FingerprintNG/src/options.cpp | 4 +- plugins/FingerprintNG/src/resource.h | 12 - plugins/FingerprintNG/src/stdafx.h | 1 - plugins/Nudge/res/NudgeMSN.ico | Bin 1150 -> 0 bytes plugins/Nudge/res/resource.rc | 1 - plugins/Nudge/src/resource.h | 1 - plugins/PluginUpdater/src/DlgUpdate.cpp | 1 + plugins/SmileyAdd/smileys/nova/MSN.msl | Bin 11390 -> 0 bytes plugins/SmileyAdd/src/smileys.cpp | 10 +- plugins/Variables/src/stdafx.h | 2 +- protocols/CMakeLists.txt | 1 - protocols/Dummy/src/main.cpp | 9 + protocols/MSN/CMakeLists.txt | 5 - protocols/MSN/docs/gpl.txt | 340 ----- protocols/MSN/docs/history.txt | 529 ------- protocols/MSN/docs/readme.txt | 125 -- protocols/MSN/docs/todo.txt | 10 - protocols/MSN/msn.vcxproj | 43 - protocols/MSN/msn.vcxproj.filters | 18 - protocols/MSN/proto_msn/CMakeLists.txt | 2 - protocols/MSN/proto_msn/Proto_MSN.vcxproj | 28 - protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters | 18 - protocols/MSN/proto_msn/res/Away.ico | Bin 5430 -> 0 bytes protocols/MSN/proto_msn/res/Invisible.ico | Bin 5430 -> 0 bytes protocols/MSN/proto_msn/res/Occupied.ico | Bin 5430 -> 0 bytes protocols/MSN/proto_msn/res/Offline.ico | Bin 5430 -> 0 bytes protocols/MSN/proto_msn/res/Online.ico | Bin 5430 -> 0 bytes protocols/MSN/proto_msn/res/Proto_MSN.rc | 74 - protocols/MSN/proto_msn/src/resource.h | 20 - protocols/MSN/res/inbox.ico | Bin 1150 -> 0 bytes protocols/MSN/res/invite.ico | Bin 1150 -> 0 bytes protocols/MSN/res/list_al.ico | Bin 1150 -> 0 bytes protocols/MSN/res/list_bl.ico | Bin 1150 -> 0 bytes protocols/MSN/res/list_fl.ico | Bin 1150 -> 0 bytes protocols/MSN/res/list_ph.ico | Bin 1150 -> 0 bytes protocols/MSN/res/list_rl.ico | Bin 1150 -> 0 bytes protocols/MSN/res/msn.ico | Bin 5430 -> 0 bytes protocols/MSN/res/msn.rc | 368 ----- protocols/MSN/res/msnblock.ico | Bin 1150 -> 0 bytes protocols/MSN/res/netmeeting.ico | Bin 1150 -> 0 bytes protocols/MSN/res/profile.ico | Bin 1150 -> 0 bytes protocols/MSN/res/services.ico | Bin 1150 -> 0 bytes protocols/MSN/res/version.rc | 9 - protocols/MSN/src/ezxml.c | 969 ------------ protocols/MSN/src/ezxml.h | 165 -- protocols/MSN/src/msn.cpp | 91 -- protocols/MSN/src/msn_auth.cpp | 1233 --------------- protocols/MSN/src/msn_avatar.cpp | 123 -- protocols/MSN/src/msn_chat.cpp | 605 -------- protocols/MSN/src/msn_commands.cpp | 1219 --------------- protocols/MSN/src/msn_contact.cpp | 269 ---- protocols/MSN/src/msn_errors.cpp | 126 -- protocols/MSN/src/msn_ieembed.cpp | 446 ------ protocols/MSN/src/msn_ieembed.h | 150 -- protocols/MSN/src/msn_libstr.cpp | 381 ----- protocols/MSN/src/msn_lists.cpp | 576 ------- protocols/MSN/src/msn_mail.cpp | 396 ----- protocols/MSN/src/msn_menu.cpp | 265 ---- protocols/MSN/src/msn_mime.cpp | 502 ------ protocols/MSN/src/msn_misc.cpp | 1112 -------------- protocols/MSN/src/msn_msgsplit.cpp | 118 -- protocols/MSN/src/msn_opts.cpp | 634 -------- protocols/MSN/src/msn_proto.cpp | 919 ----------- protocols/MSN/src/msn_proto.h | 474 ------ protocols/MSN/src/msn_skypeab.cpp | 415 ----- protocols/MSN/src/msn_soapab.cpp | 1608 -------------------- protocols/MSN/src/msn_soapstore.cpp | 731 --------- protocols/MSN/src/msn_srv.cpp | 350 ----- protocols/MSN/src/msn_ssl.cpp | 124 -- protocols/MSN/src/msn_std.cpp | 65 - protocols/MSN/src/msn_svcs.cpp | 426 ------ protocols/MSN/src/msn_threads.cpp | 500 ------ protocols/MSN/src/msn_ws.cpp | 102 -- protocols/MSN/src/resource.h | 100 -- protocols/MSN/src/skylogin/README.md | 2 - protocols/MSN/src/skylogin/common.c | 92 -- protocols/MSN/src/skylogin/common.h | 131 -- protocols/MSN/src/skylogin/crc.c | 113 -- protocols/MSN/src/skylogin/crc.h | 6 - protocols/MSN/src/skylogin/credentials.c | 167 -- protocols/MSN/src/skylogin/credentials.h | 3 - protocols/MSN/src/skylogin/login.c | 417 ----- protocols/MSN/src/skylogin/login.h | 2 - protocols/MSN/src/skylogin/objects.c | 252 --- protocols/MSN/src/skylogin/objects.h | 136 -- protocols/MSN/src/skylogin/platform.h | 6 - protocols/MSN/src/skylogin/platform_w32.c | 195 --- protocols/MSN/src/skylogin/random.c | 178 --- protocols/MSN/src/skylogin/random.h | 7 - protocols/MSN/src/skylogin/rc4comm.c | 83 - protocols/MSN/src/skylogin/rc4comm.h | 3 - protocols/MSN/src/skylogin/skylogin.c | 173 --- protocols/MSN/src/skylogin/skylogin.h | 62 - protocols/MSN/src/skylogin/uic.c | 105 -- protocols/MSN/src/skylogin/uic.h | 3 - protocols/MSN/src/stdafx.cxx | 18 - protocols/MSN/src/stdafx.h | 902 ----------- protocols/MSN/src/version.h | 33 - src/mir_app/src/db_ini.cpp | 2 +- src/mir_app/src/newplugins.cpp | 1 + .../bin15/z2_PackPluginUpdater_x32.txt | 2 - .../bin15/z2_PackPluginUpdater_x64.txt | 2 - tools/build_scripts/bin15/z3_PackArchives.txt | 2 - tools/build_scripts/z2_PackPluginUpdater.bat | 1 - .../Common/Files/Settings/autoexec_sounds.ini | 4 - .../Common/Files/Settings/mirandaboot_default.ini | 4 +- .../Common/Files/Settings/mirandaboot_portable.ini | 4 +- tools/installer_ng/MirandaNG.iss | 17 +- .../Common/Files/Settings/autoexec_sounds.ini | 4 - .../Common/Files/Settings/mirandaboot_default.ini | 4 +- .../Common/Files/Settings/mirandaboot_portable.ini | 4 +- tools/installer_ng_stable/MirandaNG.iss | 17 +- tools/lpgen/lpgen.js | 4 +- 169 files changed, 2077 insertions(+), 22716 deletions(-) create mode 100644 langpacks/belarusian/Deprecated/MSN.txt delete mode 100644 langpacks/belarusian/Plugins/MSN.txt delete mode 100644 langpacks/belarusian/Untranslated/MSN.txt create mode 100644 langpacks/bulgarian/Deprecated/MSN.txt delete mode 100644 langpacks/bulgarian/Plugins/MSN.txt delete mode 100644 langpacks/bulgarian/Untranslated/MSN.txt create mode 100644 langpacks/czech/Deprecated/MSN.txt delete mode 100644 langpacks/czech/Plugins/MSN.txt delete mode 100644 langpacks/czech/Untranslated/MSN.txt delete mode 100644 langpacks/english/Plugins/MSN.txt delete mode 100644 langpacks/english_gb/Plugins/MSN.txt create mode 100644 langpacks/french/Deprecated/MSN.txt delete mode 100644 langpacks/french/Plugins/MSN.txt delete mode 100644 langpacks/french/Untranslated/MSN.txt create mode 100644 langpacks/german/Deprecated/MSN.txt delete mode 100644 langpacks/german/Plugins/MSN.txt create mode 100644 langpacks/polish/Deprecated/MSN.txt delete mode 100644 langpacks/polish/Plugins/MSN.txt delete mode 100644 langpacks/polish/Untranslated/MSN.txt create mode 100644 langpacks/russian/Deprecated/MSN.txt delete mode 100644 langpacks/russian/Plugins/MSN.txt delete mode 100644 langpacks/spanish/Plugins/MSN.txt delete mode 100644 langpacks/spanish/Untranslated/MSN.txt create mode 100644 langpacks/ukrainian/Deprecated/MSN.txt delete mode 100644 langpacks/ukrainian/Plugins/MSN.txt delete mode 100644 langpacks/ukrainian/Untranslated/MSN.txt delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico delete mode 100644 plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico delete mode 100644 plugins/Nudge/res/NudgeMSN.ico delete mode 100644 plugins/SmileyAdd/smileys/nova/MSN.msl delete mode 100644 protocols/MSN/CMakeLists.txt delete mode 100644 protocols/MSN/docs/gpl.txt delete mode 100644 protocols/MSN/docs/history.txt delete mode 100644 protocols/MSN/docs/readme.txt delete mode 100644 protocols/MSN/docs/todo.txt delete mode 100644 protocols/MSN/msn.vcxproj delete mode 100644 protocols/MSN/msn.vcxproj.filters delete mode 100644 protocols/MSN/proto_msn/CMakeLists.txt delete mode 100644 protocols/MSN/proto_msn/Proto_MSN.vcxproj delete mode 100644 protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters delete mode 100644 protocols/MSN/proto_msn/res/Away.ico delete mode 100644 protocols/MSN/proto_msn/res/Invisible.ico delete mode 100644 protocols/MSN/proto_msn/res/Occupied.ico delete mode 100644 protocols/MSN/proto_msn/res/Offline.ico delete mode 100644 protocols/MSN/proto_msn/res/Online.ico delete mode 100644 protocols/MSN/proto_msn/res/Proto_MSN.rc delete mode 100644 protocols/MSN/proto_msn/src/resource.h delete mode 100644 protocols/MSN/res/inbox.ico delete mode 100644 protocols/MSN/res/invite.ico delete mode 100644 protocols/MSN/res/list_al.ico delete mode 100644 protocols/MSN/res/list_bl.ico delete mode 100644 protocols/MSN/res/list_fl.ico delete mode 100644 protocols/MSN/res/list_ph.ico delete mode 100644 protocols/MSN/res/list_rl.ico delete mode 100644 protocols/MSN/res/msn.ico delete mode 100644 protocols/MSN/res/msn.rc delete mode 100644 protocols/MSN/res/msnblock.ico delete mode 100644 protocols/MSN/res/netmeeting.ico delete mode 100644 protocols/MSN/res/profile.ico delete mode 100644 protocols/MSN/res/services.ico delete mode 100644 protocols/MSN/res/version.rc delete mode 100644 protocols/MSN/src/ezxml.c delete mode 100644 protocols/MSN/src/ezxml.h delete mode 100644 protocols/MSN/src/msn.cpp delete mode 100644 protocols/MSN/src/msn_auth.cpp delete mode 100644 protocols/MSN/src/msn_avatar.cpp delete mode 100644 protocols/MSN/src/msn_chat.cpp delete mode 100644 protocols/MSN/src/msn_commands.cpp delete mode 100644 protocols/MSN/src/msn_contact.cpp delete mode 100644 protocols/MSN/src/msn_errors.cpp delete mode 100644 protocols/MSN/src/msn_ieembed.cpp delete mode 100644 protocols/MSN/src/msn_ieembed.h delete mode 100644 protocols/MSN/src/msn_libstr.cpp delete mode 100644 protocols/MSN/src/msn_lists.cpp delete mode 100644 protocols/MSN/src/msn_mail.cpp delete mode 100644 protocols/MSN/src/msn_menu.cpp delete mode 100644 protocols/MSN/src/msn_mime.cpp delete mode 100644 protocols/MSN/src/msn_misc.cpp delete mode 100644 protocols/MSN/src/msn_msgsplit.cpp delete mode 100644 protocols/MSN/src/msn_opts.cpp delete mode 100644 protocols/MSN/src/msn_proto.cpp delete mode 100644 protocols/MSN/src/msn_proto.h delete mode 100644 protocols/MSN/src/msn_skypeab.cpp delete mode 100644 protocols/MSN/src/msn_soapab.cpp delete mode 100644 protocols/MSN/src/msn_soapstore.cpp delete mode 100644 protocols/MSN/src/msn_srv.cpp delete mode 100644 protocols/MSN/src/msn_ssl.cpp delete mode 100644 protocols/MSN/src/msn_std.cpp delete mode 100644 protocols/MSN/src/msn_svcs.cpp delete mode 100644 protocols/MSN/src/msn_threads.cpp delete mode 100644 protocols/MSN/src/msn_ws.cpp delete mode 100644 protocols/MSN/src/resource.h delete mode 100644 protocols/MSN/src/skylogin/README.md delete mode 100644 protocols/MSN/src/skylogin/common.c delete mode 100644 protocols/MSN/src/skylogin/common.h delete mode 100644 protocols/MSN/src/skylogin/crc.c delete mode 100644 protocols/MSN/src/skylogin/crc.h delete mode 100644 protocols/MSN/src/skylogin/credentials.c delete mode 100644 protocols/MSN/src/skylogin/credentials.h delete mode 100644 protocols/MSN/src/skylogin/login.c delete mode 100644 protocols/MSN/src/skylogin/login.h delete mode 100644 protocols/MSN/src/skylogin/objects.c delete mode 100644 protocols/MSN/src/skylogin/objects.h delete mode 100644 protocols/MSN/src/skylogin/platform.h delete mode 100644 protocols/MSN/src/skylogin/platform_w32.c delete mode 100644 protocols/MSN/src/skylogin/random.c delete mode 100644 protocols/MSN/src/skylogin/random.h delete mode 100644 protocols/MSN/src/skylogin/rc4comm.c delete mode 100644 protocols/MSN/src/skylogin/rc4comm.h delete mode 100644 protocols/MSN/src/skylogin/skylogin.c delete mode 100644 protocols/MSN/src/skylogin/skylogin.h delete mode 100644 protocols/MSN/src/skylogin/uic.c delete mode 100644 protocols/MSN/src/skylogin/uic.h delete mode 100644 protocols/MSN/src/stdafx.cxx delete mode 100644 protocols/MSN/src/stdafx.h delete mode 100644 protocols/MSN/src/version.h diff --git a/README.md b/README.md index ca3aa7f125..aee51c33e4 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,6 @@ fast. - IRC (Internet Relay Chat) - Jabber - MinecraftDynmap -- MSN - Omegle - Sametime - Skype diff --git a/bin15/mir_full.sln b/bin15/mir_full.sln index c518ab677f..0d25fef68c 100644 --- a/bin15/mir_full.sln +++ b/bin15/mir_full.sln @@ -32,8 +32,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC", "..\protocols\IRCG\IR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\Clist_nicer\clist_nicer.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Cln_skinedit\skinedit.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}" @@ -565,14 +563,6 @@ Global {33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2060,7 +2050,6 @@ Global {6DA1396F-2A44-4D5C-8442-012F71006217} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {3A12F777-56A8-42EC-BD17-8F325524241E} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {33276462-8313-4192-8306-13717ECCA60A} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {3C42510C-A29E-4A53-899C-203BFA874E0B} = {F9C41695-3353-4564-A154-58106829B19C} {987F026D-EB1F-4013-ADA8-2406ACCDA526} = {F9C41695-3353-4564-A154-58106829B19C} {DB315D7D-00BB-43B2-93A6-0430CA2B9F28} = {F9C41695-3353-4564-A154-58106829B19C} diff --git a/bin15/mir_icons.sln b/bin15/mir_icons.sln index b9220ad125..733fab3585 100644 --- a/bin15/mir_icons.sln +++ b/bin15/mir_icons.sln @@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Twitter", "..\protocols\Twitter\proto_twitter\Proto_Twitter.vcxproj", "{A82C682E-8596-4DCA-98A6-50436194714B}" @@ -120,14 +118,6 @@ Global {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|Win32.Build.0 = Release|Win32 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.ActiveCfg = Release|x64 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.Build.0 = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64 {33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.ActiveCfg = Debug|Win32 {33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.Build.0 = Debug|Win32 {33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/bin15/miranda32.sln b/bin15/miranda32.sln index f5dc2c5572..ea883f8494 100644 --- a/bin15/miranda32.sln +++ b/bin15/miranda32.sln @@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC", "..\protocols\IRCG\IR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\xStatus_Jabber.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}" @@ -42,8 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdUserInfo", "..\src\core\stduserinfo\stduserinfo.vcxproj", "{1C856B14-54CD-4D07-B18B-5F7DB073AB51}" @@ -247,14 +243,6 @@ Global {33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64 @@ -303,14 +291,6 @@ Global {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|Win32.Build.0 = Release|Win32 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.ActiveCfg = Release|x64 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.Build.0 = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64 {D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.ActiveCfg = Debug|Win32 {D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.Build.0 = Debug|Win32 {D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.ActiveCfg = Debug|x64 @@ -574,14 +554,12 @@ Global {6DA1396F-2A44-4D5C-8442-012F71006217} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {3A12F777-56A8-42EC-BD17-8F325524241E} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {33276462-8313-4192-8306-13717ECCA60A} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {3C42510C-A29E-4A53-899C-203BFA874E0B} = {6221EF9E-F53A-4381-B760-4C0208E5D597} {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {987F026D-EB1F-4013-ADA8-2406ACCDA526} = {6221EF9E-F53A-4381-B760-4C0208E5D597} {33912E32-3B68-4E2C-82AE-64C06EE987A7} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {DD667247-3712-4355-9774-7E6ACAF2275E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {1AA0A504-0644-4F00-A1AD-F55D69E50DD0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} - {7BC6C3E7-2B17-4718-A82E-084798710E14} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {6221EF9E-F53A-4381-B760-4C0208E5D597} {1C856B14-54CD-4D07-B18B-5F7DB073AB51} = {85220459-761D-4E24-A381-D35A95880254} {A5B558C6-C767-11E1-A335-F6EB6188709B} = {85220459-761D-4E24-A381-D35A95880254} diff --git a/bin16/mir_full.sln b/bin16/mir_full.sln index 5c26d09f5d..245fe87f02 100644 --- a/bin16/mir_full.sln +++ b/bin16/mir_full.sln @@ -32,8 +32,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC", "..\protocols\IRCG\IR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\Clist_nicer\clist_nicer.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Cln_skinedit", "..\plugins\Cln_skinedit\skinedit.vcxproj", "{987F026D-EB1F-4013-ADA8-2406ACCDA526}" @@ -565,14 +563,6 @@ Global {33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64 @@ -2060,7 +2050,6 @@ Global {6DA1396F-2A44-4D5C-8442-012F71006217} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {3A12F777-56A8-42EC-BD17-8F325524241E} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {33276462-8313-4192-8306-13717ECCA60A} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {A035B524-0F2D-45D0-BCF2-3C20279C77E2} {3C42510C-A29E-4A53-899C-203BFA874E0B} = {F9C41695-3353-4564-A154-58106829B19C} {987F026D-EB1F-4013-ADA8-2406ACCDA526} = {F9C41695-3353-4564-A154-58106829B19C} {DB315D7D-00BB-43B2-93A6-0430CA2B9F28} = {F9C41695-3353-4564-A154-58106829B19C} diff --git a/bin16/mir_icons.sln b/bin16/mir_icons.sln index 6eed7044d1..2600666b51 100644 --- a/bin16/mir_icons.sln +++ b/bin16/mir_icons.sln @@ -14,8 +14,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_GG", "..\protocols\Gadu-Gadu\proto_gg\Proto_GG.vcxproj", "{33912E32-3B68-4E2C-82AE-64C06EE987A7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Twitter", "..\protocols\Twitter\proto_twitter\Proto_Twitter.vcxproj", "{A82C682E-8596-4DCA-98A6-50436194714B}" @@ -120,14 +118,6 @@ Global {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|Win32.Build.0 = Release|Win32 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.ActiveCfg = Release|x64 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.Build.0 = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64 {33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.ActiveCfg = Debug|Win32 {33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|Win32.Build.0 = Debug|Win32 {33912E32-3B68-4E2C-82AE-64C06EE987A7}.Debug|x64.ActiveCfg = Debug|x64 diff --git a/bin16/miranda32.sln b/bin16/miranda32.sln index d2cf38de25..6a21230742 100644 --- a/bin16/miranda32.sln +++ b/bin16/miranda32.sln @@ -28,8 +28,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "IRC", "..\protocols\IRCG\IR EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Jabber", "..\protocols\JabberG\jabber.vcxproj", "{33276462-8313-4192-8306-13717ECCA60A}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "MSN", "..\protocols\MSN\msn.vcxproj", "{7B0F213E-C15E-4219-8AE5-49DD3D3D553D}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_nicer", "..\plugins\clist_nicer\clist_nicer.vcxproj", "{3C42510C-A29E-4A53-899C-203BFA874E0B}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "xStatus_Jabber", "..\protocols\JabberG\jabber_xstatus\xStatus_Jabber.vcxproj", "{6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E}" @@ -42,8 +40,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_IRC", "..\protocols\I EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_Jabber", "..\protocols\JabberG\proto_jabber\Proto_Jabber.vcxproj", "{1AA0A504-0644-4F00-A1AD-F55D69E50DD0}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Proto_MSN", "..\protocols\MSN\proto_msn\Proto_MSN.vcxproj", "{7BC6C3E7-2B17-4718-A82E-084798710E14}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Clist_modern", "..\plugins\Clist_modern\clist_modern.vcxproj", "{D9057E63-AAAA-4FE7-800A-20C02F4761F3}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "StdUserInfo", "..\src\core\stduserinfo\stduserinfo.vcxproj", "{1C856B14-54CD-4D07-B18B-5F7DB073AB51}" @@ -247,14 +243,6 @@ Global {33276462-8313-4192-8306-13717ECCA60A}.Release|Win32.Build.0 = Release|Win32 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.ActiveCfg = Release|x64 {33276462-8313-4192-8306-13717ECCA60A}.Release|x64.Build.0 = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.ActiveCfg = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|Win32.Build.0 = Debug|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.ActiveCfg = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Debug|x64.Build.0 = Debug|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.ActiveCfg = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|Win32.Build.0 = Release|Win32 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.ActiveCfg = Release|x64 - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D}.Release|x64.Build.0 = Release|x64 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.ActiveCfg = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|Win32.Build.0 = Debug|Win32 {3C42510C-A29E-4A53-899C-203BFA874E0B}.Debug|x64.ActiveCfg = Debug|x64 @@ -303,14 +291,6 @@ Global {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|Win32.Build.0 = Release|Win32 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.ActiveCfg = Release|x64 {1AA0A504-0644-4F00-A1AD-F55D69E50DD0}.Release|x64.Build.0 = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.ActiveCfg = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|Win32.Build.0 = Debug|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.ActiveCfg = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Debug|x64.Build.0 = Debug|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.ActiveCfg = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|Win32.Build.0 = Release|Win32 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.ActiveCfg = Release|x64 - {7BC6C3E7-2B17-4718-A82E-084798710E14}.Release|x64.Build.0 = Release|x64 {D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.ActiveCfg = Debug|Win32 {D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|Win32.Build.0 = Debug|Win32 {D9057E63-AAAA-4FE7-800A-20C02F4761F3}.Debug|x64.ActiveCfg = Debug|x64 @@ -574,14 +554,12 @@ Global {6DA1396F-2A44-4D5C-8442-012F71006217} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {3A12F777-56A8-42EC-BD17-8F325524241E} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {33276462-8313-4192-8306-13717ECCA60A} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D} = {812EF24D-9B76-4A94-ABE0-6F80C381C203} {3C42510C-A29E-4A53-899C-203BFA874E0B} = {6221EF9E-F53A-4381-B760-4C0208E5D597} {6BBEEA1E-3C87-6CD1-F32A-027C3EC5320E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {987F026D-EB1F-4013-ADA8-2406ACCDA526} = {6221EF9E-F53A-4381-B760-4C0208E5D597} {33912E32-3B68-4E2C-82AE-64C06EE987A7} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {DD667247-3712-4355-9774-7E6ACAF2275E} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {1AA0A504-0644-4F00-A1AD-F55D69E50DD0} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} - {7BC6C3E7-2B17-4718-A82E-084798710E14} = {949AF443-676D-4B48-B21E-9B6FC3A4808D} {D9057E63-AAAA-4FE7-800A-20C02F4761F3} = {6221EF9E-F53A-4381-B760-4C0208E5D597} {1C856B14-54CD-4D07-B18B-5F7DB073AB51} = {85220459-761D-4E24-A381-D35A95880254} {A5B558C6-C767-11E1-A335-F6EB6188709B} = {85220459-761D-4E24-A381-D35A95880254} diff --git a/docs/mirandaboot.ini b/docs/mirandaboot.ini index 23bd4360a5..5f251b134d 100644 --- a/docs/mirandaboot.ini +++ b/docs/mirandaboot.ini @@ -74,8 +74,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: Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte -Unsafe=Facebook GG ICQ IRC JABBER MRA MSN SKYPE TWITTER VKontakte +;Default: Facebook GG ICQ IRC JABBER MRA SKYPE TWITTER VKontakte +Unsafe=Facebook GG ICQ IRC JABBER MRA SKYPE TWITTER VKontakte ;OverrideSecurityFilename ;System administrators may find it desirable to install settings without prompting diff --git a/include/delphi/m_acc.inc b/include/delphi/m_acc.inc index 7556af5130..1aff95d4e2 100644 --- a/include/delphi/m_acc.inc +++ b/include/delphi/m_acc.inc @@ -38,7 +38,7 @@ const a previous call of AVATAR_SETCONTACT. wParam = not used lParam = (AnsiChar *) protcol name - Usage: SendMessage(hwnd, AVATAR_SETPROTOCOL, 0, (LPARAM) "MSN"); + Usage: SendMessage(hwnd, AVATAR_SETPROTOCOL, 0, (LPARAM) "ICQ"); Only works on AVATAR_CONTROL_CLASS controls } AVATAR_SETPROTOCOL = WM_USER+2; diff --git a/include/delphi/m_protosvc.inc b/include/delphi/m_protosvc.inc index a719fc5e38..69d9435a4e 100644 --- a/include/delphi/m_protosvc.inc +++ b/include/delphi/m_protosvc.inc @@ -100,9 +100,9 @@ const PFLAGNUM_2 = 2; // the status modes that the protocol supports PF2_ONLINE = $00000001; // an unadorned online mode PF2_INVISIBLE = $00000002; - PF2_SHORTAWAY = $00000004; // Away on ICQ, BRB on MSN - PF2_LONGAWAY = $00000008; // NA on ICQ, Away on MSN - PF2_LIGHTDND = $00000010; // Occupied on ICQ, Busy on MSN + PF2_SHORTAWAY = $00000004; // Away on ICQ + PF2_LONGAWAY = $00000008; // NA on ICQ + PF2_LIGHTDND = $00000010; // Occupied on ICQ PF2_HEAVYDND = $00000020; // DND on ICQ PF2_FREECHAT = $00000040; PF2_IDLE = $00000200; //added during 0.3.4 (2004/09/13) diff --git a/include/m_acc.h b/include/m_acc.h index 93be99d204..b0236b1aa6 100644 --- a/include/m_acc.h +++ b/include/m_acc.h @@ -37,7 +37,7 @@ Boston, MA 02111-1307, USA. // a previous call of AVATAR_SETCONTACT. // wParam = not used // lParam = (char *) protcol name -// Usage: SendMessage(hwnd, AVATAR_SETPROTOCOL, 0, (LPARAM) "MSN"); +// Usage: SendMessage(hwnd, AVATAR_SETPROTOCOL, 0, (LPARAM) "ICQ"); // Only works on AVATAR_CONTROL_CLASS controls #define AVATAR_SETPROTOCOL (WM_USER+2) diff --git a/include/m_protosvc.h b/include/m_protosvc.h index 8397be07cb..b44732fa18 100644 --- a/include/m_protosvc.h +++ b/include/m_protosvc.h @@ -90,9 +90,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define PF2_ONLINE 0x00000001 // an unadorned online mode #define PF2_INVISIBLE 0x00000002 -#define PF2_SHORTAWAY 0x00000004 // Away on ICQ, BRB on MSN -#define PF2_LONGAWAY 0x00000008 // NA on ICQ, Away on MSN -#define PF2_LIGHTDND 0x00000010 // Occupied on ICQ, Busy on MSN +#define PF2_SHORTAWAY 0x00000004 // Away on ICQ +#define PF2_LONGAWAY 0x00000008 // NA on ICQ +#define PF2_LIGHTDND 0x00000010 // Occupied on ICQ #define PF2_HEAVYDND 0x00000020 // DND on ICQ #define PF2_FREECHAT 0x00000040 #define PF2_IDLE 0x00000200 diff --git a/langpacks/belarusian/Deprecated/MSN.txt b/langpacks/belarusian/Deprecated/MSN.txt new file mode 100644 index 0000000000..e4205ff35c --- /dev/null +++ b/langpacks/belarusian/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Падтрымка пратаколу Microsoft Network (MSN). +;file \protocols\MSN\res\msn.rc +[Live ID:] + +[Password:] +Пароль: +[Nickname:] +Мянушка: +[Create a new Windows Live account] +Стварыць новы конт Windows Live +[Expert] +Эксперт +[Send message font color/size info inside messages] +Адпраўляць інфармацыю пра шрыфт/колеры ў паведамленні +[Disable all contacts not included into my contact list] +Адключыць усе кантакты не ў спісе кантактаў +[Manage server groups] +Кіраваць гуртамі на серверы +[Allow people on my contact list send messages to mobile device] +Дазволіць кантактам са спісу адпраўляць паведамленні на мабільнік +[Run the following application when new Hotmail arrives] +Запусціць прыкладанне пры з'яўленні новай пошты +[Connection settings] +Налады далучэння +[Direct:] +Сервер: +[Gateway:] +Шлюз: +[Reset] +Скід +[Notify me when a message delivery has failed] +Абвясціць, калі паведамленне не дайшло +[Incoming file transfers] +Прыем файлаў +[Your host (or router):] +Ваш хост (ці роўтар): +[Server List Manager] +Кіраванне спісам на серверы +[Contact is on your local list] +Кантакт у вашым лакальным спісе +[Contact is included into your server list] +Кантакт у вашым спісе на серверы +[Allowed (active) contact] +Дазволены кантакт +[Blocked contact] +Блакаваны +[Somebody included you in his/her server list] +Вы ў спісе кантакту на серверы +[Refresh] +Абнавіць +[Enable Popup notifications] +Уключыць абвесткі ўсплывальнымі вокнамі +[Enable Contact List notifications] +Уключыць абвесткі ў спісе кантактаў +[Enable Tray notifications] +Уключыць абвесткі ў трэі +[Ignore new messages not in Inbox folder] +Ігнараваць новыя лісты не з "Уваходных" +[Other] +Іншае +[Display errors using popups] +Паказваць памылкі ў вокнах +[Enable 'Chat Session Established' popup] +Усплывальнае вакно 'Чат сесія ўсталявана' +[Enable 'Contact left channel' popup] +Усплывальнае вакно 'Кантакт пакінуў канал' +[Set Nickname] +Мянушка +[Cancel] +Скасаваць +[Mobile Device (used for SMS)] +Мабільная прылада (SMS) +[Spouse/Partner] +Сужэнец(ца)/Партнёр +[Middle Name] +Імя па бацьку +[First Name] +Імя +[Last Name] +Прозвішча +[Anniversary] +Свята +[Birthday] +Дзень нараджэння +[Nickname] +Мянушка +[Place:] +Месца: +[MSN Delete Contact] +Выдаленне MSN-кантакту +[Remove from Hotmail Address book] +Выдаліць з адраснай кнігі Hotmail +[Block Contact] +Заблакаваць +[Invite Contact To Chat] +Запрасіць да чата +[Live ID] + +[&Invite] +Запрасіць +[&Cancel] +С&касаваць +[Add] +Дадаць +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Адмін +[User] +Карыстач +[Chat #] +Чат # +[&Invite user...] +&Запрасіць кантакт... +[&Leave chat session] +&Пакінуць сеанс +[User &details] +&Дадзеныя кантакту +[User &history] +&Гісторыя кантакта +[&Kick user] + +[&Op user] + +[&Deop user] + +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] + +[MSN Alert] +Абвестка MSN +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Кантакт не далучаны +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Кантакт %s быў выдалены з сервера.\nЦі хочаце вы пакінуць яго ў лакальным спісе, каб захаваць гісторыю? +[%s protocol] +%s конт +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Тэма: %s +[Hotmail from %s (%S)] +Пошта ад %s (%S) +[Hotmail from %s] +Пошта Hotmail ад %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Маецца непрачытаная пошта: %d уваходных пісьмаў і %d у іншых тэчках. +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +Разблакаваць +[&Block] +Блакаваць +[Open &Hotmail Inbox] +Адкрыць скрыню &Hotmail +[Send &Hotmail E-mail] +Адправіць пошту Hotmail +[Create &Chat] +Стварыць &чат +[Display &Hotmail Inbox] +Паказаць скрыню Hotmail +[View &Profile] +Прагледзець &профіль +[Setup Live &Alerts] +Налады Live &Alerts +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] +Свае смайлы +[Notifications] +Абвесткі +[Errors] +Памылкі +[MSN Protocol] +Пратакол MSN +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Абразок конту +[Hotmail Inbox] +Уваходныя Hotmail +[Profile] +Профіль +[MSN Services] +Службы MSN +[Block user] +Заблакаваць +[Invite to chat] +Запрасіць у чат +[Start Netmeeting] +Запусціць Netmeeting +[Contact list] +Спіс кантактаў +[Allowed list] +Спіс дазволеных +[Blocked list] +Спіс заблакаваных +[Relative list] +Спіс "вы ў спісе" +[Local list] +Лакальны спіс +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Імпарт гуртоў з сервера можа змяніць размяшчэнне кантактаў пасля наступнага ўваходу. Загрузіць гурты на сервер? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Змены будуць ужытыя пры наступным уваходзе ў MSN Messenger. +[MSN options] +Налады MSN +[Automatically obtain host/port] +Аўтаматычна атрымліваць хост/порт +[Manually specify host/port] +Паказваць хост/порт +[Disable] +Выключыць +[IP info available only after login] +Інфармацыя о IP даступная пасля ўваходу +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +Пратакол MSN патрабуе затрымцы адпраўкі паведамлення не меней 60 секунд. Выправіце налады. +[Network] +Сеціва +[Account] +Конт +[Connection] +Далучэнне +[Server list] +Спіс на серверы +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +Пошта Live +[Live Alert] +Абвестка Live +[%s plugin connections] +%s злучэнне з серверам +[Contact already in your contact list] +Кантакт ужо ў вашым спісе +[Protocol is offline] +Конт адключаны +[You cannot send message to yourself] +Вы не можаце пасылаць паведамленні самому сабе +[Message is too long: SMS page limited to 133 UTF8 chars] +Занадта вялікае паведамленне, максімум 133 знака UTF8 +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Паведамленні MSN абмежаваны 1202 знакамі UTF-8 +[Offline messaging is not allowed for LCS contacts] +Паведамленні адключаным LCS кантактам немагчымыя +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +Для MSN затрымка адпраўлення паведамлення павінна быць не меней, чым 60 секунд. Калі ласка, наладзьце ваш плагін гутаркі. +[Convert to Chat] +Канвертаваць у чат diff --git a/langpacks/belarusian/Plugins/MSN.txt b/langpacks/belarusian/Plugins/MSN.txt deleted file mode 100644 index 1fd328a34d..0000000000 --- a/langpacks/belarusian/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Падтрымка пратаколу Microsoft Network (MSN). -;file \protocols\MSN\res\msn.rc -[Live ID:] - -[Password:] -Пароль: -[Nickname:] -Мянушка: -[Create a new Windows Live account] -Стварыць новы конт Windows Live -[Expert] -Эксперт -[Send message font color/size info inside messages] -Адпраўляць інфармацыю пра шрыфт/колеры ў паведамленні -[Disable all contacts not included into my contact list] -Адключыць усе кантакты не ў спісе кантактаў -[Manage server groups] -Кіраваць гуртамі на серверы -[Allow people on my contact list send messages to mobile device] -Дазволіць кантактам са спісу адпраўляць паведамленні на мабільнік -[Run the following application when new Hotmail arrives] -Запусціць прыкладанне пры з'яўленні новай пошты -[Connection settings] -Налады далучэння -[Direct:] -Сервер: -[Gateway:] -Шлюз: -[Reset] -Скід -[Notify me when a message delivery has failed] -Абвясціць, калі паведамленне не дайшло -[Incoming file transfers] -Прыем файлаў -[Your host (or router):] -Ваш хост (ці роўтар): -[Server List Manager] -Кіраванне спісам на серверы -[Contact is on your local list] -Кантакт у вашым лакальным спісе -[Contact is included into your server list] -Кантакт у вашым спісе на серверы -[Allowed (active) contact] -Дазволены кантакт -[Blocked contact] -Блакаваны -[Somebody included you in his/her server list] -Вы ў спісе кантакту на серверы -[Refresh] -Абнавіць -[Enable Popup notifications] -Уключыць абвесткі ўсплывальнымі вокнамі -[Enable Contact List notifications] -Уключыць абвесткі ў спісе кантактаў -[Enable Tray notifications] -Уключыць абвесткі ў трэі -[Ignore new messages not in Inbox folder] -Ігнараваць новыя лісты не з "Уваходных" -[Other] -Іншае -[Display errors using popups] -Паказваць памылкі ў вокнах -[Enable 'Chat Session Established' popup] -Усплывальнае вакно 'Чат сесія ўсталявана' -[Enable 'Contact left channel' popup] -Усплывальнае вакно 'Кантакт пакінуў канал' -[Set Nickname] -Мянушка -[Cancel] -Скасаваць -[Mobile Device (used for SMS)] -Мабільная прылада (SMS) -[Spouse/Partner] -Сужэнец(ца)/Партнёр -[Middle Name] -Імя па бацьку -[First Name] -Імя -[Last Name] -Прозвішча -[Anniversary] -Свята -[Birthday] -Дзень нараджэння -[Nickname] -Мянушка -[Place:] -Месца: -[MSN Delete Contact] -Выдаленне MSN-кантакту -[Remove from Hotmail Address book] -Выдаліць з адраснай кнігі Hotmail -[Block Contact] -Заблакаваць -[Invite Contact To Chat] -Запрасіць да чата -[Live ID] - -[&Invite] -Запрасіць -[&Cancel] -С&касаваць -[Add] -Дадаць -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Адмін -[User] -Карыстач -[Chat #] -Чат # -[&Invite user...] -&Запрасіць кантакт... -[&Leave chat session] -&Пакінуць сеанс -[User &details] -&Дадзеныя кантакту -[User &history] -&Гісторыя кантакта -[&Kick user] - -[&Op user] - -[&Deop user] - -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] -Абвестка MSN -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Кантакт не далучаны -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Кантакт %s быў выдалены з сервера.\nЦі хочаце вы пакінуць яго ў лакальным спісе, каб захаваць гісторыю? -[%s protocol] -%s конт -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Тэма: %s -[Hotmail from %s (%S)] -Пошта ад %s (%S) -[Hotmail from %s] -Пошта Hotmail ад %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Маецца непрачытаная пошта: %d уваходных пісьмаў і %d у іншых тэчках. -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -Разблакаваць -[&Block] -Блакаваць -[Open &Hotmail Inbox] -Адкрыць скрыню &Hotmail -[Send &Hotmail E-mail] -Адправіць пошту Hotmail -[Create &Chat] -Стварыць &чат -[Display &Hotmail Inbox] -Паказаць скрыню Hotmail -[View &Profile] -Прагледзець &профіль -[Setup Live &Alerts] -Налады Live &Alerts -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -Свае смайлы -[Notifications] -Абвесткі -[Errors] -Памылкі -[MSN Protocol] -Пратакол MSN -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Абразок конту -[Hotmail Inbox] -Уваходныя Hotmail -[Profile] -Профіль -[MSN Services] -Службы MSN -[Block user] -Заблакаваць -[Invite to chat] -Запрасіць у чат -[Start Netmeeting] -Запусціць Netmeeting -[Contact list] -Спіс кантактаў -[Allowed list] -Спіс дазволеных -[Blocked list] -Спіс заблакаваных -[Relative list] -Спіс "вы ў спісе" -[Local list] -Лакальны спіс -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Імпарт гуртоў з сервера можа змяніць размяшчэнне кантактаў пасля наступнага ўваходу. Загрузіць гурты на сервер? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Змены будуць ужытыя пры наступным уваходзе ў MSN Messenger. -[MSN options] -Налады MSN -[Automatically obtain host/port] -Аўтаматычна атрымліваць хост/порт -[Manually specify host/port] -Паказваць хост/порт -[Disable] -Выключыць -[IP info available only after login] -Інфармацыя о IP даступная пасля ўваходу -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -Пратакол MSN патрабуе затрымцы адпраўкі паведамлення не меней 60 секунд. Выправіце налады. -[Network] -Сеціва -[Account] -Конт -[Connection] -Далучэнне -[Server list] -Спіс на серверы -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -Пошта Live -[Live Alert] -Абвестка Live -[%s plugin connections] -%s злучэнне з серверам -[Contact already in your contact list] -Кантакт ужо ў вашым спісе -[Protocol is offline] -Конт адключаны -[You cannot send message to yourself] -Вы не можаце пасылаць паведамленні самому сабе -[Message is too long: SMS page limited to 133 UTF8 chars] -Занадта вялікае паведамленне, максімум 133 знака UTF8 -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Паведамленні MSN абмежаваны 1202 знакамі UTF-8 -[Offline messaging is not allowed for LCS contacts] -Паведамленні адключаным LCS кантактам немагчымыя -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -Для MSN затрымка адпраўлення паведамлення павінна быць не меней, чым 60 секунд. Калі ласка, наладзьце ваш плагін гутаркі. -[Convert to Chat] -Канвертаваць у чат diff --git a/langpacks/belarusian/Untranslated/MSN.txt b/langpacks/belarusian/Untranslated/MSN.txt deleted file mode 100644 index eaf1275291..0000000000 --- a/langpacks/belarusian/Untranslated/MSN.txt +++ /dev/null @@ -1,6 +0,0 @@ -[Live ID:] -[Live ID] -[&Kick user] -[&Op user] -[&Deop user] -[%I64u bytes] diff --git a/langpacks/bulgarian/Deprecated/MSN.txt b/langpacks/bulgarian/Deprecated/MSN.txt new file mode 100644 index 0000000000..d3f7736fe5 --- /dev/null +++ b/langpacks/bulgarian/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Осигурява комуникация чрез протокола Microsoft Network (MSN) в Miranda NG. +;file \protocols\MSN\res\msn.rc +[Live ID:] +Live ID: +[Password:] +Парола: +[Nickname:] +Прякор: +[Create a new Windows Live account] +Създаване на Windows Live акаунт +[Expert] +Експерт +[Send message font color/size info inside messages] +Изпращане на информация за шрифта и размера на съобщението +[Disable all contacts not included into my contact list] +Изключване на контактите, които не са в списъка с контакти +[Manage server groups] +Управление групите на сървъра +[Allow people on my contact list send messages to mobile device] +Изпращане на съобщ. до мобилното ми устройство от хора в списъка с контакти +[Run the following application when new Hotmail arrives] +Изпълнение на следната програма при пристигане на ново писмо в Hotmail +[Connection settings] +Настройки за свързване +[Direct:] +Директно: +[Gateway:] +Шлюз: +[Reset] +Анулиране +[Notify me when a message delivery has failed] +Уведомяване при неуспешно доставяне на съобщение +[Incoming file transfers] +Входящо прехвърляне на файл +[Your host (or router):] +Ваш хост (или рутер): +[Server List Manager] +Диспечер на сървърния списък +[Contact is on your local list] +Контакт в местния списък с контакти +[Contact is included into your server list] +Контактът не е в списъка на сървъра +[Allowed (active) contact] + +[Blocked contact] +Блокиран контакт +[Somebody included you in his/her server list] +Потребител добавил ви в списъка си с контакти +[Refresh] +Обновяване +[Enable Popup notifications] +Уведомяване с Popup +[Enable Contact List notifications] + +[Enable Tray notifications] + +[Ignore new messages not in Inbox folder] +Игнориране на писмата в папки различни от Inbox +[Other] +Друго +[Display errors using popups] +Изобразяване на грешки чрез popups +[Enable 'Chat Session Established' popup] +popup при установяване на разговор +[Enable 'Contact left channel' popup] +popup при излизане на контакт от канал +[Set Nickname] +Задаване на прякор +[Cancel] +Отказ +[Mobile Device (used for SMS)] +Мобилно устройство (използва се за SMS-и) +[Spouse/Partner] +Съпруг(а)/Партньор +[Middle Name] +Презиме +[First Name] +Име +[Last Name] +Фамилия +[Anniversary] +Годишнина +[Birthday] +Рожден ден +[Nickname] +Прякор +[Place:] +Място: +[MSN Delete Contact] +MSN изтриване на контакт +[Remove from Hotmail Address book] +Премахване от книгата с адреси в Hotmail +[Block Contact] +Блокиране на контакта +[Invite Contact To Chat] +Поканете контакт +[Live ID] +Live ID +[&Invite] +Покана +[&Cancel] +Отказ +[Add] +Добавяне +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Администратор +[User] +Потребител +[Chat #] +Чат № +[&Invite user...] +Покани потребител... +[&Leave chat session] +Напускане от разговора +[User &details] +Подробности за потребителя +[User &history] +История на потребителя +[&Kick user] + +[&Op user] + +[&Deop user] + +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] + +[MSN Alert] +MSN уведовяване +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Потребителя не е на линия +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Контактът %s е премахнат от сървъра.\nЖелаете ли да бъде запазен като "Локален контакт" за да се съхрани историята на разговорите? +[%s protocol] +Протокол "%s" +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Тема: %s +[Hotmail from %s (%S)] +Hotmail от %s (%S) +[Hotmail from %s] +Hotmail от %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Непрочетени е-писма: %d в Inbox и %d в други папки +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +Деблокиране +[&Block] +Блокиране +[Open &Hotmail Inbox] + +[Send &Hotmail E-mail] + +[Create &Chat] +Създаване на чат +[Display &Hotmail Inbox] +Показване на пощата в Hotmail +[View &Profile] +Преглед на профила +[Setup Live &Alerts] + +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] + +[Notifications] +Уведомявания +[Errors] +Грешки +[MSN Protocol] +MSN протокол +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Икона на протокола +[Hotmail Inbox] + +[Profile] +Профил +[MSN Services] +MSN услуги +[Block user] +Блокиране +[Invite to chat] +Покана за чат +[Start Netmeeting] +Иницииране на Netmeeting +[Contact list] +Списък с контакти +[Allowed list] +Списък "Разрешени" +[Blocked list] +Списък "Блокирани" +[Relative list] + +[Local list] +Местен списък +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Внасянето на групите от сървъра може да измени положението на някои контакти при следващо вписване в MSN. Желаете ли вашите групи да бъдат качени на сървъра? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Промените ще бъдат осъществени при следващо свързване към мрежата MSN. +[MSN options] +MSN настройки +[Automatically obtain host/port] +Автоматично получаване на хост/порт +[Manually specify host/port] +Ръчно определяне на хост/порт +[Disable] +Изключване +[IP info available only after login] +IP информацията е налична само след вписване +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +Протоколът MSN изисква закъснението за съобщения да е не по-малко от 60 секунди. Поправете стойността. +[Network] +Мрежа +[Account] +Акаунт +[Connection] +Връзка +[Server list] +Списък на сървъра +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +Live поща +[Live Alert] +Live уведомяване +[%s plugin connections] +Връзки на приставката "%s" +[Contact already in your contact list] +Контактът вече присъства в списъка ви с контакти +[Protocol is offline] +Протоколът е извън линия +[You cannot send message to yourself] +Не е възможно изпращането на съобщения до себе си +[Message is too long: SMS page limited to 133 UTF8 chars] +Съобщението е твърде дълго: SMS страниците са ограничени до 133 UTF8 знака +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Съобщението е твърде дълго: MSN съобщенията са ограничени до 1202 UTF8 знака +[Offline messaging is not allowed for LCS contacts] +Изпращането на съобщения извън линия не е позволено за LCS контакти +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +Протоколът MSN изисква закъснението за съобщения да е не по-малко от 60 секунди. Поправете стойността. +[Convert to Chat] +Конвертиране в чат diff --git a/langpacks/bulgarian/Plugins/MSN.txt b/langpacks/bulgarian/Plugins/MSN.txt deleted file mode 100644 index d301b2fffb..0000000000 --- a/langpacks/bulgarian/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Осигурява комуникация чрез протокола Microsoft Network (MSN) в Miranda NG. -;file \protocols\MSN\res\msn.rc -[Live ID:] -Live ID: -[Password:] -Парола: -[Nickname:] -Прякор: -[Create a new Windows Live account] -Създаване на Windows Live акаунт -[Expert] -Експерт -[Send message font color/size info inside messages] -Изпращане на информация за шрифта и размера на съобщението -[Disable all contacts not included into my contact list] -Изключване на контактите, които не са в списъка с контакти -[Manage server groups] -Управление групите на сървъра -[Allow people on my contact list send messages to mobile device] -Изпращане на съобщ. до мобилното ми устройство от хора в списъка с контакти -[Run the following application when new Hotmail arrives] -Изпълнение на следната програма при пристигане на ново писмо в Hotmail -[Connection settings] -Настройки за свързване -[Direct:] -Директно: -[Gateway:] -Шлюз: -[Reset] -Анулиране -[Notify me when a message delivery has failed] -Уведомяване при неуспешно доставяне на съобщение -[Incoming file transfers] -Входящо прехвърляне на файл -[Your host (or router):] -Ваш хост (или рутер): -[Server List Manager] -Диспечер на сървърния списък -[Contact is on your local list] -Контакт в местния списък с контакти -[Contact is included into your server list] -Контактът не е в списъка на сървъра -[Allowed (active) contact] - -[Blocked contact] -Блокиран контакт -[Somebody included you in his/her server list] -Потребител добавил ви в списъка си с контакти -[Refresh] -Обновяване -[Enable Popup notifications] -Уведомяване с Popup -[Enable Contact List notifications] - -[Enable Tray notifications] - -[Ignore new messages not in Inbox folder] -Игнориране на писмата в папки различни от Inbox -[Other] -Друго -[Display errors using popups] -Изобразяване на грешки чрез popups -[Enable 'Chat Session Established' popup] -popup при установяване на разговор -[Enable 'Contact left channel' popup] -popup при излизане на контакт от канал -[Set Nickname] -Задаване на прякор -[Cancel] -Отказ -[Mobile Device (used for SMS)] -Мобилно устройство (използва се за SMS-и) -[Spouse/Partner] -Съпруг(а)/Партньор -[Middle Name] -Презиме -[First Name] -Име -[Last Name] -Фамилия -[Anniversary] -Годишнина -[Birthday] -Рожден ден -[Nickname] -Прякор -[Place:] -Място: -[MSN Delete Contact] -MSN изтриване на контакт -[Remove from Hotmail Address book] -Премахване от книгата с адреси в Hotmail -[Block Contact] -Блокиране на контакта -[Invite Contact To Chat] -Поканете контакт -[Live ID] -Live ID -[&Invite] -Покана -[&Cancel] -Отказ -[Add] -Добавяне -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Администратор -[User] -Потребител -[Chat #] -Чат № -[&Invite user...] -Покани потребител... -[&Leave chat session] -Напускане от разговора -[User &details] -Подробности за потребителя -[User &history] -История на потребителя -[&Kick user] - -[&Op user] - -[&Deop user] - -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] -MSN уведовяване -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Потребителя не е на линия -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Контактът %s е премахнат от сървъра.\nЖелаете ли да бъде запазен като "Локален контакт" за да се съхрани историята на разговорите? -[%s protocol] -Протокол "%s" -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Тема: %s -[Hotmail from %s (%S)] -Hotmail от %s (%S) -[Hotmail from %s] -Hotmail от %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Непрочетени е-писма: %d в Inbox и %d в други папки -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -Деблокиране -[&Block] -Блокиране -[Open &Hotmail Inbox] - -[Send &Hotmail E-mail] - -[Create &Chat] -Създаване на чат -[Display &Hotmail Inbox] -Показване на пощата в Hotmail -[View &Profile] -Преглед на профила -[Setup Live &Alerts] - -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] - -[Notifications] -Уведомявания -[Errors] -Грешки -[MSN Protocol] -MSN протокол -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Икона на протокола -[Hotmail Inbox] - -[Profile] -Профил -[MSN Services] -MSN услуги -[Block user] -Блокиране -[Invite to chat] -Покана за чат -[Start Netmeeting] -Иницииране на Netmeeting -[Contact list] -Списък с контакти -[Allowed list] -Списък "Разрешени" -[Blocked list] -Списък "Блокирани" -[Relative list] - -[Local list] -Местен списък -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Внасянето на групите от сървъра може да измени положението на някои контакти при следващо вписване в MSN. Желаете ли вашите групи да бъдат качени на сървъра? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Промените ще бъдат осъществени при следващо свързване към мрежата MSN. -[MSN options] -MSN настройки -[Automatically obtain host/port] -Автоматично получаване на хост/порт -[Manually specify host/port] -Ръчно определяне на хост/порт -[Disable] -Изключване -[IP info available only after login] -IP информацията е налична само след вписване -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -Протоколът MSN изисква закъснението за съобщения да е не по-малко от 60 секунди. Поправете стойността. -[Network] -Мрежа -[Account] -Акаунт -[Connection] -Връзка -[Server list] -Списък на сървъра -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -Live поща -[Live Alert] -Live уведомяване -[%s plugin connections] -Връзки на приставката "%s" -[Contact already in your contact list] -Контактът вече присъства в списъка ви с контакти -[Protocol is offline] -Протоколът е извън линия -[You cannot send message to yourself] -Не е възможно изпращането на съобщения до себе си -[Message is too long: SMS page limited to 133 UTF8 chars] -Съобщението е твърде дълго: SMS страниците са ограничени до 133 UTF8 знака -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Съобщението е твърде дълго: MSN съобщенията са ограничени до 1202 UTF8 знака -[Offline messaging is not allowed for LCS contacts] -Изпращането на съобщения извън линия не е позволено за LCS контакти -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -Протоколът MSN изисква закъснението за съобщения да е не по-малко от 60 секунди. Поправете стойността. -[Convert to Chat] -Конвертиране в чат diff --git a/langpacks/bulgarian/Untranslated/MSN.txt b/langpacks/bulgarian/Untranslated/MSN.txt deleted file mode 100644 index a216eca7be..0000000000 --- a/langpacks/bulgarian/Untranslated/MSN.txt +++ /dev/null @@ -1,13 +0,0 @@ -[Allowed (active) contact] -[Enable Contact List notifications] -[Enable Tray notifications] -[&Kick user] -[&Op user] -[&Deop user] -[%I64u bytes] -[Open &Hotmail Inbox] -[Send &Hotmail E-mail] -[Setup Live &Alerts] -[Custom Smileys] -[Hotmail Inbox] -[Relative list] diff --git a/langpacks/czech/Deprecated/MSN.txt b/langpacks/czech/Deprecated/MSN.txt new file mode 100644 index 0000000000..e6647869d0 --- /dev/null +++ b/langpacks/czech/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Microsoft Network (MSN) protokol pro Mirandu NG. +;file \protocols\MSN\res\msn.rc +[Live ID:] +Identifikátor: +[Password:] +Heslo: +[Nickname:] +Přezdívka: +[Create a new Windows Live account] +Zřídit nový účet v síti Windows Live +[Expert] +Pokročilé +[Send message font color/size info inside messages] +Ke zprávě přidat informaci o barvě a velikosti písma +[Disable all contacts not included into my contact list] +Vypnout všechny kontakty neuvedené v aktuálním seznamu +[Manage server groups] +Zapnout správu skupin na serveru +[Allow people on my contact list send messages to mobile device] +Lidem ze seznamu kontaktů povolit posílání zpráv na mobil +[Run the following application when new Hotmail arrives] +Spustit vybranou aplikaci (po příchodu nové pošty) +[Connection settings] +Možnosti připojení +[Direct:] +Přímé: +[Gateway:] +Brána: +[Reset] +Reset +[Notify me when a message delivery has failed] +Upozornit při nedoručení odeslané zprávy +[Incoming file transfers] +Přenos příchozích souborů +[Your host (or router):] +Počítač (nebo brána): +[Server List Manager] +Správa kontaktů na serveru +[Contact is on your local list] +Kontakt je ve vašem lokálním seznamu +[Contact is included into your server list] +Kontakt je umístěn v seznamu na serveru +[Allowed (active) contact] +Povolený kontakt +[Blocked contact] +Zablokovaný kontakt +[Somebody included you in his/her server list] +Kontakt vás má umístěn ve svém seznamu na serveru +[Refresh] +Aktualizovat +[Enable Popup notifications] +Povolit oznámení +[Enable Contact List notifications] + +[Enable Tray notifications] + +[Ignore new messages not in Inbox folder] +Ignorovat nové zprávy z jiné složky než Doručená pošta +[Other] +Ostatní +[Display errors using popups] +Zobrazit chybová hlášení jako oznámení +[Enable 'Chat Session Established' popup] +Zapnout oznámení typu 'Spojení navázáno' +[Enable 'Contact left channel' popup] +Zapnout oznámení typu 'Odchod z kanálu' +[Set Nickname] +Nastavit přezdívku +[Cancel] +Zrušit +[Mobile Device (used for SMS)] +Mobilní zařízení (použito pro SMS) +[Spouse/Partner] +Manžel(ka)/Partner +[Middle Name] +Prostřední jméno +[First Name] +Jméno +[Last Name] +Příjmení +[Anniversary] +Výročí +[Birthday] +Narozeniny +[Nickname] +Přezdívka +[Place:] +Místo: +[MSN Delete Contact] +Smazat kontakt (MSN) +[Remove from Hotmail Address book] +Odebrat z adresáře Hotmail +[Block Contact] +Zablokovat kontakt +[Invite Contact To Chat] +Pozvat k diskusi +[Live ID] +Identifikátor +[&Invite] +&Pozvat +[&Cancel] +&Zrušit +[Add] +Přidat +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Admin +[User] +Uživatel +[Chat #] +Diskuse č. +[&Invite user...] +Pozvat k d&iskusi... +[&Leave chat session] +&Opustit diskusi +[User &details] +&Detaily uživatele +[User &history] +Zobrazit &historii +[&Kick user] + +[&Op user] + +[&Deop user] + +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] + +[MSN Alert] +Upozornění MSN +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Uživatel není online +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Kontakt %s byl odebrán ze serveru.\nPřejete si kontakt ponechat uložený lokálně pro zachování historie? +[%s protocol] +%s protokol +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Předmět: %s +[Hotmail from %s (%S)] +Zpráva od %s (%S) +[Hotmail from %s] +Zpráva od: %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Máte neprečtenou poštu. Příchozí: %d, ostatní: %d. +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +Od&blokovat +[&Block] +Za&blokovat +[Open &Hotmail Inbox] +Přečíst poštu &Hotmail +[Send &Hotmail E-mail] +E-mail přes &Hotmail +[Create &Chat] +Začít &diskusi +[Display &Hotmail Inbox] +Přečíst poštu &Hotmail +[View &Profile] +Zobrazit profil +[Setup Live &Alerts] +N&astavit upozornění +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] +Vlastní smajlíky +[Notifications] +Upozornění +[Errors] +Chyby +[MSN Protocol] +Protokol MSN +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Ikona protokolu +[Hotmail Inbox] +Schránka Hotmail +[Profile] +Profil +[MSN Services] +Služby MSN +[Block user] +Zablokovat uživatele +[Invite to chat] +Pozvat k diskusi +[Start Netmeeting] +Spustit Netmeeting +[Contact list] +Seznam kontaktů +[Allowed list] +Seznam povolených +[Blocked list] +Seznam zablokovaných +[Relative list] +Seznam protistrany +[Local list] +Lokální seznam +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Import skupin ze serveru může při příštím přihlášení ovlivnit seznam\nkontaktů. Opravdu chcete zapnout správu skupin na serveru? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Provedené změny se projeví až při dalším připojení k síti MSN Messenger. +[MSN options] +MSN - možnosti +[Automatically obtain host/port] +Automaticky zjistit kombinaci hostitel/port +[Manually specify host/port] +Ručně zadat kombinaci hostitel/port +[Disable] +Vypnout +[IP info available only after login] +Informace o IP jsou dostupné až po přihlášení +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +MSN protokol vyžaduje časový interval pro odeslání zprávy 60 sek. a vyšší. Opravte nastavenou hodnotu. +[Network] +Sítě +[Account] +Účet +[Connection] +Spojení +[Server list] +Seznamy +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +Nová pošta (Live) +[Live Alert] +Upozornění (Live) +[%s plugin connections] +%s - spojení se serverem +[Contact already in your contact list] +Kontakt je již ve vašem seznamu +[Protocol is offline] +Protokol je offline +[You cannot send message to yourself] +Nemůžete poslat zprávu sami sobě. +[Message is too long: SMS page limited to 133 UTF8 chars] +Příliš dlouhá zpráva: Max. počet znaků je 133 (s diakritikou) +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Zpráva je příliš dlouhá. Protokol MSN umožňuje napsat max. 1202 znaků (v kódování UTF8). +[Offline messaging is not allowed for LCS contacts] +Pro LCS kontakty není umožněna offline komunikace +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +MSN protokol vyžaduje časový interval pro odeslání zprávy 60 sek. a vyšší. Opravte prosím nastavenou hodnotu. +[Convert to Chat] +Převést na chat diff --git a/langpacks/czech/Plugins/MSN.txt b/langpacks/czech/Plugins/MSN.txt deleted file mode 100644 index d269452113..0000000000 --- a/langpacks/czech/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Microsoft Network (MSN) protokol pro Mirandu NG. -;file \protocols\MSN\res\msn.rc -[Live ID:] -Identifikátor: -[Password:] -Heslo: -[Nickname:] -Přezdívka: -[Create a new Windows Live account] -Zřídit nový účet v síti Windows Live -[Expert] -Pokročilé -[Send message font color/size info inside messages] -Ke zprávě přidat informaci o barvě a velikosti písma -[Disable all contacts not included into my contact list] -Vypnout všechny kontakty neuvedené v aktuálním seznamu -[Manage server groups] -Zapnout správu skupin na serveru -[Allow people on my contact list send messages to mobile device] -Lidem ze seznamu kontaktů povolit posílání zpráv na mobil -[Run the following application when new Hotmail arrives] -Spustit vybranou aplikaci (po příchodu nové pošty) -[Connection settings] -Možnosti připojení -[Direct:] -Přímé: -[Gateway:] -Brána: -[Reset] -Reset -[Notify me when a message delivery has failed] -Upozornit při nedoručení odeslané zprávy -[Incoming file transfers] -Přenos příchozích souborů -[Your host (or router):] -Počítač (nebo brána): -[Server List Manager] -Správa kontaktů na serveru -[Contact is on your local list] -Kontakt je ve vašem lokálním seznamu -[Contact is included into your server list] -Kontakt je umístěn v seznamu na serveru -[Allowed (active) contact] -Povolený kontakt -[Blocked contact] -Zablokovaný kontakt -[Somebody included you in his/her server list] -Kontakt vás má umístěn ve svém seznamu na serveru -[Refresh] -Aktualizovat -[Enable Popup notifications] -Povolit oznámení -[Enable Contact List notifications] - -[Enable Tray notifications] - -[Ignore new messages not in Inbox folder] -Ignorovat nové zprávy z jiné složky než Doručená pošta -[Other] -Ostatní -[Display errors using popups] -Zobrazit chybová hlášení jako oznámení -[Enable 'Chat Session Established' popup] -Zapnout oznámení typu 'Spojení navázáno' -[Enable 'Contact left channel' popup] -Zapnout oznámení typu 'Odchod z kanálu' -[Set Nickname] -Nastavit přezdívku -[Cancel] -Zrušit -[Mobile Device (used for SMS)] -Mobilní zařízení (použito pro SMS) -[Spouse/Partner] -Manžel(ka)/Partner -[Middle Name] -Prostřední jméno -[First Name] -Jméno -[Last Name] -Příjmení -[Anniversary] -Výročí -[Birthday] -Narozeniny -[Nickname] -Přezdívka -[Place:] -Místo: -[MSN Delete Contact] -Smazat kontakt (MSN) -[Remove from Hotmail Address book] -Odebrat z adresáře Hotmail -[Block Contact] -Zablokovat kontakt -[Invite Contact To Chat] -Pozvat k diskusi -[Live ID] -Identifikátor -[&Invite] -&Pozvat -[&Cancel] -&Zrušit -[Add] -Přidat -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Admin -[User] -Uživatel -[Chat #] -Diskuse č. -[&Invite user...] -Pozvat k d&iskusi... -[&Leave chat session] -&Opustit diskusi -[User &details] -&Detaily uživatele -[User &history] -Zobrazit &historii -[&Kick user] - -[&Op user] - -[&Deop user] - -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] -Upozornění MSN -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Uživatel není online -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Kontakt %s byl odebrán ze serveru.\nPřejete si kontakt ponechat uložený lokálně pro zachování historie? -[%s protocol] -%s protokol -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Předmět: %s -[Hotmail from %s (%S)] -Zpráva od %s (%S) -[Hotmail from %s] -Zpráva od: %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Máte neprečtenou poštu. Příchozí: %d, ostatní: %d. -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -Od&blokovat -[&Block] -Za&blokovat -[Open &Hotmail Inbox] -Přečíst poštu &Hotmail -[Send &Hotmail E-mail] -E-mail přes &Hotmail -[Create &Chat] -Začít &diskusi -[Display &Hotmail Inbox] -Přečíst poštu &Hotmail -[View &Profile] -Zobrazit profil -[Setup Live &Alerts] -N&astavit upozornění -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -Vlastní smajlíky -[Notifications] -Upozornění -[Errors] -Chyby -[MSN Protocol] -Protokol MSN -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Ikona protokolu -[Hotmail Inbox] -Schránka Hotmail -[Profile] -Profil -[MSN Services] -Služby MSN -[Block user] -Zablokovat uživatele -[Invite to chat] -Pozvat k diskusi -[Start Netmeeting] -Spustit Netmeeting -[Contact list] -Seznam kontaktů -[Allowed list] -Seznam povolených -[Blocked list] -Seznam zablokovaných -[Relative list] -Seznam protistrany -[Local list] -Lokální seznam -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Import skupin ze serveru může při příštím přihlášení ovlivnit seznam\nkontaktů. Opravdu chcete zapnout správu skupin na serveru? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Provedené změny se projeví až při dalším připojení k síti MSN Messenger. -[MSN options] -MSN - možnosti -[Automatically obtain host/port] -Automaticky zjistit kombinaci hostitel/port -[Manually specify host/port] -Ručně zadat kombinaci hostitel/port -[Disable] -Vypnout -[IP info available only after login] -Informace o IP jsou dostupné až po přihlášení -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -MSN protokol vyžaduje časový interval pro odeslání zprávy 60 sek. a vyšší. Opravte nastavenou hodnotu. -[Network] -Sítě -[Account] -Účet -[Connection] -Spojení -[Server list] -Seznamy -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -Nová pošta (Live) -[Live Alert] -Upozornění (Live) -[%s plugin connections] -%s - spojení se serverem -[Contact already in your contact list] -Kontakt je již ve vašem seznamu -[Protocol is offline] -Protokol je offline -[You cannot send message to yourself] -Nemůžete poslat zprávu sami sobě. -[Message is too long: SMS page limited to 133 UTF8 chars] -Příliš dlouhá zpráva: Max. počet znaků je 133 (s diakritikou) -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Zpráva je příliš dlouhá. Protokol MSN umožňuje napsat max. 1202 znaků (v kódování UTF8). -[Offline messaging is not allowed for LCS contacts] -Pro LCS kontakty není umožněna offline komunikace -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -MSN protokol vyžaduje časový interval pro odeslání zprávy 60 sek. a vyšší. Opravte prosím nastavenou hodnotu. -[Convert to Chat] -Převést na chat diff --git a/langpacks/czech/Untranslated/MSN.txt b/langpacks/czech/Untranslated/MSN.txt deleted file mode 100644 index 5714d139d1..0000000000 --- a/langpacks/czech/Untranslated/MSN.txt +++ /dev/null @@ -1,6 +0,0 @@ -[Enable Contact List notifications] -[Enable Tray notifications] -[&Kick user] -[&Op user] -[&Deop user] -[%I64u bytes] diff --git a/langpacks/english/Plugins/MSN.txt b/langpacks/english/Plugins/MSN.txt deleted file mode 100644 index 5c679061dc..0000000000 --- a/langpacks/english/Plugins/MSN.txt +++ /dev/null @@ -1,136 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -;file \protocols\MSN\res\msn.rc -[Live ID:] -[Password:] -[Nickname:] -[Create a new Windows Live account] -[Expert] -[Send message font color/size info inside messages] -[Disable all contacts not included into my contact list] -[Manage server groups] -[Allow people on my contact list send messages to mobile device] -[Run the following application when new Hotmail arrives] -[Connection settings] -[Direct:] -[Gateway:] -[Reset] -[Notify me when a message delivery has failed] -[Incoming file transfers] -[Your host (or router):] -[Server List Manager] -[Contact is on your local list] -[Contact is included into your server list] -[Allowed (active) contact] -[Blocked contact] -[Somebody included you in his/her server list] -[Refresh] -[Enable Popup notifications] -[Enable Contact List notifications] -[Enable Tray notifications] -[Ignore new messages not in Inbox folder] -[Other] -[Display errors using popups] -[Enable 'Chat Session Established' popup] -[Enable 'Contact left channel' popup] -[Set Nickname] -[Cancel] -[Mobile Device (used for SMS)] -[Spouse/Partner] -[Middle Name] -[First Name] -[Last Name] -[Anniversary] -[Birthday] -[Nickname] -[Place:] -[MSN Delete Contact] -[Remove from Hotmail Address book] -[Block Contact] -[Invite Contact To Chat] -[Live ID] -[&Invite] -[&Cancel] -[Add] -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -[User] -[Chat #] -[&Invite user...] -[&Leave chat session] -[User &details] -[User &history] -[&Kick user] -[&Op user] -[&Deop user] -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] -[MSN Alert] -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -[%s protocol] -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -[Hotmail from %s (%S)] -[Hotmail from %s] -[Unread mail is available: %d in Inbox and %d in other folders.] -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -[&Block] -[Open &Hotmail Inbox] -[Send &Hotmail E-mail] -[Create &Chat] -[Display &Hotmail Inbox] -[View &Profile] -[Setup Live &Alerts] -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -[Notifications] -[Errors] -[MSN Protocol] -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -[Hotmail Inbox] -[Profile] -[MSN Services] -[Block user] -[Invite to chat] -[Start Netmeeting] -[Contact list] -[Allowed list] -[Blocked list] -[Relative list] -[Local list] -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -[These changes will take effect the next time you connect to the MSN Messenger network.] -[MSN options] -[Automatically obtain host/port] -[Manually specify host/port] -[Disable] -[IP info available only after login] -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -[Network] -[Account] -[Connection] -[Server list] -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -[Live Alert] -[%s plugin connections] -[Contact already in your contact list] -[Protocol is offline] -[You cannot send message to yourself] -[Message is too long: SMS page limited to 133 UTF-8 chars] -[Message is too long: MSN messages are limited by 1202 UTF-8 chars] -[Offline messaging is not allowed for LCS contacts] -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -[Convert to Chat] diff --git a/langpacks/english_gb/Plugins/MSN.txt b/langpacks/english_gb/Plugins/MSN.txt deleted file mode 100644 index c80145592c..0000000000 --- a/langpacks/english_gb/Plugins/MSN.txt +++ /dev/null @@ -1,9 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Send message font color/size info inside messages] -Send message font colour/size info inside messages diff --git a/langpacks/french/Deprecated/MSN.txt b/langpacks/french/Deprecated/MSN.txt new file mode 100644 index 0000000000..236782a6b4 --- /dev/null +++ b/langpacks/french/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Support du protocole Microsoft Network (MSN) pour Miranda NG. +;file \protocols\MSN\res\msn.rc +[Live ID:] + +[Password:] +Passe : +[Nickname:] +Pseudo : +[Create a new Windows Live account] + +[Expert] +Expert +[Send message font color/size info inside messages] +Envoyer les infos de couleur/taille dans les messages +[Disable all contacts not included into my contact list] +Désactiver tous les contacts non inclus dans ma liste +[Manage server groups] +Gestion des groupes sur le serveur +[Allow people on my contact list send messages to mobile device] +Autoriser les contacts de ma liste à m'envoyer des messages sur mon portable +[Run the following application when new Hotmail arrives] +Lancer l'application suivante quand un Hotmail arrive : +[Connection settings] + +[Direct:] + +[Gateway:] +Passage : +[Reset] +RAZ +[Notify me when a message delivery has failed] + +[Incoming file transfers] +Transferts de fichiers entrant +[Your host (or router):] + +[Server List Manager] +Gestion de la liste du serveur +[Contact is on your local list] + +[Contact is included into your server list] +Contact inclus dans ma liste du serveur +[Allowed (active) contact] +Contact autorisé +[Blocked contact] +Contact bloqué +[Somebody included you in his/her server list] +Vous êtes dans la liste de ce contact +[Refresh] +Actualiser +[Enable Popup notifications] +Activer les notifications par popup +[Enable Contact List notifications] + +[Enable Tray notifications] + +[Ignore new messages not in Inbox folder] + +[Other] +Autre +[Display errors using popups] + +[Enable 'Chat Session Established' popup] +Activer le popup "La connexion au salon est établie" +[Enable 'Contact left channel' popup] +Activer le popup "Le contact a quitter le salon" +[Set Nickname] + +[Cancel] +Annuler +[Mobile Device (used for SMS)] + +[Spouse/Partner] + +[Middle Name] + +[First Name] +Prénom +[Last Name] +Nom +[Anniversary] + +[Birthday] + +[Nickname] +Pseudo +[Place:] + +[MSN Delete Contact] + +[Remove from Hotmail Address book] + +[Block Contact] + +[Invite Contact To Chat] + +[Live ID] + +[&Invite] +&Inviter +[&Cancel] +&Annuler +[Add] +Ajouter +;file \protocols\MSN\src\msn_chat.cpp +[Admin] + +[User] +Utilisateur +[Chat #] + +[&Invite user...] +&Inviter l'utilisateur... +[&Leave chat session] + +[User &details] +&Détails du contact +[User &history] + +[&Kick user] + +[&Op user] + +[&Deop user] + +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] + +[MSN Alert] +Alerte MSN +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Contact non connecté +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] + +[%s protocol] +%s protocole +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Sujet : %s +[Hotmail from %s (%S)] +Hotmail de %s (%S) +[Hotmail from %s] +Hotmail de %s +[Unread mail is available: %d in Inbox and %d in other folders.] + +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] + +[&Block] + +[Open &Hotmail Inbox] + +[Send &Hotmail E-mail] + +[Create &Chat] + +[Display &Hotmail Inbox] + +[View &Profile] + +[Setup Live &Alerts] + +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] + +[Notifications] +Notifications +[Errors] +Erreurs +[MSN Protocol] +Protocole MSN +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] + +[Hotmail Inbox] + +[Profile] +Profil +[MSN Services] + +[Block user] + +[Invite to chat] + +[Start Netmeeting] + +[Contact list] +Liste de contacts +[Allowed list] + +[Blocked list] + +[Relative list] + +[Local list] + +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +L'importation des groupes du serveur devrait changer l'apparence de votre liste de contacts à la prochaine connexion. Voulez-vous enregistrer vos groupes sur le serveur ? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Ces changements ne prendront effet qu'à la prochaine connexion au réseau MSN Messenger. +[MSN options] +Options MSN +[Automatically obtain host/port] +Port et hôte automatique +[Manually specify host/port] +Port et hôte manuel +[Disable] + +[IP info available only after login] + +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] + +[Network] +Réseau +[Account] +Compte +[Connection] + +[Server list] +Liste côté serveur +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] + +[Live Alert] + +[%s plugin connections] + +[Contact already in your contact list] + +[Protocol is offline] + +[You cannot send message to yourself] +Vous ne pouvez vous envoyer de message à vous-même +[Message is too long: SMS page limited to 133 UTF8 chars] +Message trop long : les SMS sont limités à 133 caractères UTF-8 +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Message trop long : MSN les limite à 1202 caractères en UTF8 +[Offline messaging is not allowed for LCS contacts] + +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] + +[Convert to Chat] + diff --git a/langpacks/french/Plugins/MSN.txt b/langpacks/french/Plugins/MSN.txt deleted file mode 100644 index ceb5797245..0000000000 --- a/langpacks/french/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Support du protocole Microsoft Network (MSN) pour Miranda NG. -;file \protocols\MSN\res\msn.rc -[Live ID:] - -[Password:] -Passe : -[Nickname:] -Pseudo : -[Create a new Windows Live account] - -[Expert] -Expert -[Send message font color/size info inside messages] -Envoyer les infos de couleur/taille dans les messages -[Disable all contacts not included into my contact list] -Désactiver tous les contacts non inclus dans ma liste -[Manage server groups] -Gestion des groupes sur le serveur -[Allow people on my contact list send messages to mobile device] -Autoriser les contacts de ma liste à m'envoyer des messages sur mon portable -[Run the following application when new Hotmail arrives] -Lancer l'application suivante quand un Hotmail arrive : -[Connection settings] - -[Direct:] - -[Gateway:] -Passage : -[Reset] -RAZ -[Notify me when a message delivery has failed] - -[Incoming file transfers] -Transferts de fichiers entrant -[Your host (or router):] - -[Server List Manager] -Gestion de la liste du serveur -[Contact is on your local list] - -[Contact is included into your server list] -Contact inclus dans ma liste du serveur -[Allowed (active) contact] -Contact autorisé -[Blocked contact] -Contact bloqué -[Somebody included you in his/her server list] -Vous êtes dans la liste de ce contact -[Refresh] -Actualiser -[Enable Popup notifications] -Activer les notifications par popup -[Enable Contact List notifications] - -[Enable Tray notifications] - -[Ignore new messages not in Inbox folder] - -[Other] -Autre -[Display errors using popups] - -[Enable 'Chat Session Established' popup] -Activer le popup "La connexion au salon est établie" -[Enable 'Contact left channel' popup] -Activer le popup "Le contact a quitter le salon" -[Set Nickname] - -[Cancel] -Annuler -[Mobile Device (used for SMS)] - -[Spouse/Partner] - -[Middle Name] - -[First Name] -Prénom -[Last Name] -Nom -[Anniversary] - -[Birthday] - -[Nickname] -Pseudo -[Place:] - -[MSN Delete Contact] - -[Remove from Hotmail Address book] - -[Block Contact] - -[Invite Contact To Chat] - -[Live ID] - -[&Invite] -&Inviter -[&Cancel] -&Annuler -[Add] -Ajouter -;file \protocols\MSN\src\msn_chat.cpp -[Admin] - -[User] -Utilisateur -[Chat #] - -[&Invite user...] -&Inviter l'utilisateur... -[&Leave chat session] - -[User &details] -&Détails du contact -[User &history] - -[&Kick user] - -[&Op user] - -[&Deop user] - -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] -Alerte MSN -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Contact non connecté -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] - -[%s protocol] -%s protocole -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Sujet : %s -[Hotmail from %s (%S)] -Hotmail de %s (%S) -[Hotmail from %s] -Hotmail de %s -[Unread mail is available: %d in Inbox and %d in other folders.] - -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] - -[&Block] - -[Open &Hotmail Inbox] - -[Send &Hotmail E-mail] - -[Create &Chat] - -[Display &Hotmail Inbox] - -[View &Profile] - -[Setup Live &Alerts] - -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] - -[Notifications] -Notifications -[Errors] -Erreurs -[MSN Protocol] -Protocole MSN -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] - -[Hotmail Inbox] - -[Profile] -Profil -[MSN Services] - -[Block user] - -[Invite to chat] - -[Start Netmeeting] - -[Contact list] -Liste de contacts -[Allowed list] - -[Blocked list] - -[Relative list] - -[Local list] - -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -L'importation des groupes du serveur devrait changer l'apparence de votre liste de contacts à la prochaine connexion. Voulez-vous enregistrer vos groupes sur le serveur ? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Ces changements ne prendront effet qu'à la prochaine connexion au réseau MSN Messenger. -[MSN options] -Options MSN -[Automatically obtain host/port] -Port et hôte automatique -[Manually specify host/port] -Port et hôte manuel -[Disable] - -[IP info available only after login] - -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] - -[Network] -Réseau -[Account] -Compte -[Connection] - -[Server list] -Liste côté serveur -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] - -[Live Alert] - -[%s plugin connections] - -[Contact already in your contact list] - -[Protocol is offline] - -[You cannot send message to yourself] -Vous ne pouvez vous envoyer de message à vous-même -[Message is too long: SMS page limited to 133 UTF8 chars] -Message trop long : les SMS sont limités à 133 caractères UTF-8 -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Message trop long : MSN les limite à 1202 caractères en UTF8 -[Offline messaging is not allowed for LCS contacts] - -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] - -[Convert to Chat] - diff --git a/langpacks/french/Untranslated/MSN.txt b/langpacks/french/Untranslated/MSN.txt deleted file mode 100644 index 65e6728d1e..0000000000 --- a/langpacks/french/Untranslated/MSN.txt +++ /dev/null @@ -1,64 +0,0 @@ -[Live ID:] -[Create a new Windows Live account] -[Connection settings] -[Direct:] -[Notify me when a message delivery has failed] -[Your host (or router):] -[Contact is on your local list] -[Enable Contact List notifications] -[Enable Tray notifications] -[Ignore new messages not in Inbox folder] -[Display errors using popups] -[Set Nickname] -[Mobile Device (used for SMS)] -[Spouse/Partner] -[Middle Name] -[Anniversary] -[Birthday] -[Place:] -[MSN Delete Contact] -[Remove from Hotmail Address book] -[Block Contact] -[Invite Contact To Chat] -[Live ID] -[Admin] -[Chat #] -[&Leave chat session] -[User &history] -[&Kick user] -[&Op user] -[&Deop user] -[%I64u bytes] -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -[Unread mail is available: %d in Inbox and %d in other folders.] -[&Unblock] -[&Block] -[Open &Hotmail Inbox] -[Send &Hotmail E-mail] -[Create &Chat] -[Display &Hotmail Inbox] -[View &Profile] -[Setup Live &Alerts] -[Custom Smileys] -[Protocol icon] -[Hotmail Inbox] -[MSN Services] -[Block user] -[Invite to chat] -[Start Netmeeting] -[Allowed list] -[Blocked list] -[Relative list] -[Local list] -[Disable] -[IP info available only after login] -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -[Connection] -[Live Mail] -[Live Alert] -[%s plugin connections] -[Contact already in your contact list] -[Protocol is offline] -[Offline messaging is not allowed for LCS contacts] -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -[Convert to Chat] diff --git a/langpacks/german/Deprecated/MSN.txt b/langpacks/german/Deprecated/MSN.txt new file mode 100644 index 0000000000..577ce3b25f --- /dev/null +++ b/langpacks/german/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Microsoft Netzwerk (MSN) Protokollunterstützung für Miranda NG. +;file \protocols\MSN\res\msn.rc +[Live ID:] +Live-ID: +[Password:] +Passwort: +[Nickname:] +Nick: +[Create a new Windows Live account] +Ein neues Windows-Live-Konto erstellen +[Expert] +Experte +[Send message font color/size info inside messages] +Farbe und Größe der Nachrichtenschrift senden +[Disable all contacts not included into my contact list] +Alle Kontakte deaktivieren, die nicht in meiner Kontaktliste sind +[Manage server groups] +Serverseitige Gruppen verwalten +[Allow people on my contact list send messages to mobile device] +Kontakte auf meiner Kontaktliste dürfen Nachrichten auf mein mobiles Gerät senden +[Run the following application when new Hotmail arrives] +Führe folgendes Programm aus, sobald eine neue Hotmail eintrifft: +[Connection settings] +Verbindungseinstellungen +[Direct:] +Direkt: +[Gateway:] +Gateway: +[Reset] +Standard +[Notify me when a message delivery has failed] +Teile mir mit, wenn eine Nachricht nicht gesendet werden konnte +[Incoming file transfers] +Eingehende Dateiübertragungen +[Your host (or router):] +Ihr Host (oder Router): +[Server List Manager] +Serverliste verwalten +[Contact is on your local list] +Kontakt ist in Ihrer lokalen Liste +[Contact is included into your server list] +Kontakt ist in Ihrer Serverliste enthalten +[Allowed (active) contact] +Erlaubter Kontakt +[Blocked contact] +Blockierter Kontakt +[Somebody included you in his/her server list] +Jemand führt Sie in seiner/ihrer Serverliste +[Refresh] +Aktualisieren +[Enable Popup notifications] +Popup-Benachrichtigungen aktivieren +[Enable Contact List notifications] +Kontaktlisten-Benachrichtigungen aktivieren +[Enable Tray notifications] +Tray-Benachrichtigungen aktivieren +[Ignore new messages not in Inbox folder] +Neue Nachrichten außerhalb des Posteingangs ignorieren +[Other] +Sonstige +[Display errors using popups] +Fehler durch Popups anzeigen +[Enable 'Chat Session Established' popup] +Popup 'Chatsitzung eingeleitet' aktivieren +[Enable 'Contact left channel' popup] +Popup 'Benutzer hat Channel verlassen' aktivieren +[Set Nickname] +Nickname setzen +[Cancel] +Abbrechen +[Mobile Device (used for SMS)] +Mobiles Gerät (für SMS verwendet) +[Spouse/Partner] +Ehegatte/Partner +[Middle Name] +Zweiter Name +[First Name] +Vorname +[Last Name] +Nachname +[Anniversary] +Jahrestag +[Birthday] +Geburtstag +[Nickname] +Nickname +[Place:] +Ort: +[MSN Delete Contact] +MSN-Kontakt löschen +[Remove from Hotmail Address book] +Aus Hotmail-Adressbuch entfernen +[Block Contact] +Kontakt blockieren +[Invite Contact To Chat] +Kontakt zu Chat einladen +[Live ID] +Live-ID +[&Invite] +E&inladen +[&Cancel] +Abbre&chen +[Add] +Hinzufügen +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Administrator +[User] +Benutzer +[Chat #] +Chat # +[&Invite user...] +Kontakt e&inladen... +[&Leave chat session] +Chat ver&lassen +[User &details] +Kontaktprofil +[User &history] +Kontakt&verlauf +[&Kick user] +Benutzer &kicken +[&Op user] +Benutzer &Op geben +[&Deop user] +Benutzer Op &entziehen +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] +%I64u Bytes +[MSN Alert] +MSN Alert +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Benutzer nicht online +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Kontakt %s wurde vom Server entfernt.\nWollen Sie den Kontakt lokal behalten, um den Verlauf zu erhalten? +[%s protocol] +%s-Protokoll +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Betreff: %s +[Hotmail from %s (%S)] +Hotmail von %s (%S) +[Hotmail from %s] +Hotmail von %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Ungelesene E-Mails sind verfügbar: %d im Posteingang und %d in anderen Verzeichnissen. +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +Blockieren a&ufheben +[&Block] +&Blockieren +[Open &Hotmail Inbox] +&Hotmail-Posteingang öffnen +[Send &Hotmail E-mail] +&Hotmail E-Mail senden +[Create &Chat] +&Chat erstellen +[Display &Hotmail Inbox] +&Hotmail-Posteingang anzeigen +[View &Profile] +&Profil ansehen +[Setup Live &Alerts] +Live &Alerts einstellen +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] +Custom Smileys +[Notifications] +Benachrichtigungen +[Errors] +Fehler +[MSN Protocol] +MSN-Protokoll +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Protokollicon +[Hotmail Inbox] +Hotmail-Posteingang +[Profile] +Profil +[MSN Services] +MSN-Dienste +[Block user] +Blockiere Benutzer +[Invite to chat] +Zum Chat einladen +[Start Netmeeting] +Netmeeting starten +[Contact list] +Kontaktliste +[Allowed list] +Erlaubte Liste +[Blocked list] +Blockierliste +[Relative list] +Verwandte Liste +[Local list] +Lokale Liste +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Der Import von serverseitigen Gruppen wird Ihre Kontaktliste verändern. Wollen Sie Ihre Gruppen an den Server übermitteln? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Die Änderungen werden erst nach einer Neueinwahl ins MSN-Netzwerk aktiv. +[MSN options] +MSN-Einstellungen +[Automatically obtain host/port] +Host/Port automatisch ermitteln +[Manually specify host/port] +Host/Port manuell angeben +[Disable] +Deaktivieren +[IP info available only after login] +IP-Info ist nur nach Login verfügbar +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +Das MSN-Protokoll benötigt ein Nachrichtentimeout kleiner als 60 Sek. Korrigieren Sie das Timeout. +[Network] +Netzwerk +[Account] +Konto +[Connection] +Verbindung +[Server list] +Serverliste +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +Live Mail +[Live Alert] +Live Alert +[%s plugin connections] +%s Pluginverbindungen +[Contact already in your contact list] +Der Kontakt ist bereits in Ihrer Kontaktliste +[Protocol is offline] +Protokoll ist offline +[You cannot send message to yourself] +Sie können keine Nachricht zu sich selbst schicken! +[Message is too long: SMS page limited to 133 UTF8 chars] +Die Nachricht ist zu lang: Die SMS-Seite ist begrenzt auf 133 UTF8-Zeichen! +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Nachricht ist zu lang: MSN-Nachrichten dürfen maximal 1202 UTF8-Zeichen lang sein. +[Offline messaging is not allowed for LCS contacts] +Offline-Nachrichten sind nicht für LCS-Kontakte erlaubt! +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +MSN benötigt ein Timeout von weniger als 60 Sekunden in Ihrem Nachrichtenfensterplugin. Bitte korrigieren Sie das Timeout. +[Convert to Chat] +In Chat umwandeln diff --git a/langpacks/german/Plugins/MSN.txt b/langpacks/german/Plugins/MSN.txt deleted file mode 100644 index 7e1de0e9c4..0000000000 --- a/langpacks/german/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Microsoft Netzwerk (MSN) Protokollunterstützung für Miranda NG. -;file \protocols\MSN\res\msn.rc -[Live ID:] -Live-ID: -[Password:] -Passwort: -[Nickname:] -Nick: -[Create a new Windows Live account] -Ein neues Windows-Live-Konto erstellen -[Expert] -Experte -[Send message font color/size info inside messages] -Farbe und Größe der Nachrichtenschrift senden -[Disable all contacts not included into my contact list] -Alle Kontakte deaktivieren, die nicht in meiner Kontaktliste sind -[Manage server groups] -Serverseitige Gruppen verwalten -[Allow people on my contact list send messages to mobile device] -Kontakte auf meiner Kontaktliste dürfen Nachrichten auf mein mobiles Gerät senden -[Run the following application when new Hotmail arrives] -Führe folgendes Programm aus, sobald eine neue Hotmail eintrifft: -[Connection settings] -Verbindungseinstellungen -[Direct:] -Direkt: -[Gateway:] -Gateway: -[Reset] -Standard -[Notify me when a message delivery has failed] -Teile mir mit, wenn eine Nachricht nicht gesendet werden konnte -[Incoming file transfers] -Eingehende Dateiübertragungen -[Your host (or router):] -Ihr Host (oder Router): -[Server List Manager] -Serverliste verwalten -[Contact is on your local list] -Kontakt ist in Ihrer lokalen Liste -[Contact is included into your server list] -Kontakt ist in Ihrer Serverliste enthalten -[Allowed (active) contact] -Erlaubter Kontakt -[Blocked contact] -Blockierter Kontakt -[Somebody included you in his/her server list] -Jemand führt Sie in seiner/ihrer Serverliste -[Refresh] -Aktualisieren -[Enable Popup notifications] -Popup-Benachrichtigungen aktivieren -[Enable Contact List notifications] -Kontaktlisten-Benachrichtigungen aktivieren -[Enable Tray notifications] -Tray-Benachrichtigungen aktivieren -[Ignore new messages not in Inbox folder] -Neue Nachrichten außerhalb des Posteingangs ignorieren -[Other] -Sonstige -[Display errors using popups] -Fehler durch Popups anzeigen -[Enable 'Chat Session Established' popup] -Popup 'Chatsitzung eingeleitet' aktivieren -[Enable 'Contact left channel' popup] -Popup 'Benutzer hat Channel verlassen' aktivieren -[Set Nickname] -Nickname setzen -[Cancel] -Abbrechen -[Mobile Device (used for SMS)] -Mobiles Gerät (für SMS verwendet) -[Spouse/Partner] -Ehegatte/Partner -[Middle Name] -Zweiter Name -[First Name] -Vorname -[Last Name] -Nachname -[Anniversary] -Jahrestag -[Birthday] -Geburtstag -[Nickname] -Nickname -[Place:] -Ort: -[MSN Delete Contact] -MSN-Kontakt löschen -[Remove from Hotmail Address book] -Aus Hotmail-Adressbuch entfernen -[Block Contact] -Kontakt blockieren -[Invite Contact To Chat] -Kontakt zu Chat einladen -[Live ID] -Live-ID -[&Invite] -E&inladen -[&Cancel] -Abbre&chen -[Add] -Hinzufügen -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Administrator -[User] -Benutzer -[Chat #] -Chat # -[&Invite user...] -Kontakt e&inladen... -[&Leave chat session] -Chat ver&lassen -[User &details] -Kontaktprofil -[User &history] -Kontakt&verlauf -[&Kick user] -Benutzer &kicken -[&Op user] -Benutzer &Op geben -[&Deop user] -Benutzer Op &entziehen -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] -%I64u Bytes -[MSN Alert] -MSN Alert -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Benutzer nicht online -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Kontakt %s wurde vom Server entfernt.\nWollen Sie den Kontakt lokal behalten, um den Verlauf zu erhalten? -[%s protocol] -%s-Protokoll -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Betreff: %s -[Hotmail from %s (%S)] -Hotmail von %s (%S) -[Hotmail from %s] -Hotmail von %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Ungelesene E-Mails sind verfügbar: %d im Posteingang und %d in anderen Verzeichnissen. -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -Blockieren a&ufheben -[&Block] -&Blockieren -[Open &Hotmail Inbox] -&Hotmail-Posteingang öffnen -[Send &Hotmail E-mail] -&Hotmail E-Mail senden -[Create &Chat] -&Chat erstellen -[Display &Hotmail Inbox] -&Hotmail-Posteingang anzeigen -[View &Profile] -&Profil ansehen -[Setup Live &Alerts] -Live &Alerts einstellen -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -Custom Smileys -[Notifications] -Benachrichtigungen -[Errors] -Fehler -[MSN Protocol] -MSN-Protokoll -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Protokollicon -[Hotmail Inbox] -Hotmail-Posteingang -[Profile] -Profil -[MSN Services] -MSN-Dienste -[Block user] -Blockiere Benutzer -[Invite to chat] -Zum Chat einladen -[Start Netmeeting] -Netmeeting starten -[Contact list] -Kontaktliste -[Allowed list] -Erlaubte Liste -[Blocked list] -Blockierliste -[Relative list] -Verwandte Liste -[Local list] -Lokale Liste -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Der Import von serverseitigen Gruppen wird Ihre Kontaktliste verändern. Wollen Sie Ihre Gruppen an den Server übermitteln? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Die Änderungen werden erst nach einer Neueinwahl ins MSN-Netzwerk aktiv. -[MSN options] -MSN-Einstellungen -[Automatically obtain host/port] -Host/Port automatisch ermitteln -[Manually specify host/port] -Host/Port manuell angeben -[Disable] -Deaktivieren -[IP info available only after login] -IP-Info ist nur nach Login verfügbar -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -Das MSN-Protokoll benötigt ein Nachrichtentimeout kleiner als 60 Sek. Korrigieren Sie das Timeout. -[Network] -Netzwerk -[Account] -Konto -[Connection] -Verbindung -[Server list] -Serverliste -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -Live Mail -[Live Alert] -Live Alert -[%s plugin connections] -%s Pluginverbindungen -[Contact already in your contact list] -Der Kontakt ist bereits in Ihrer Kontaktliste -[Protocol is offline] -Protokoll ist offline -[You cannot send message to yourself] -Sie können keine Nachricht zu sich selbst schicken! -[Message is too long: SMS page limited to 133 UTF8 chars] -Die Nachricht ist zu lang: Die SMS-Seite ist begrenzt auf 133 UTF8-Zeichen! -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Nachricht ist zu lang: MSN-Nachrichten dürfen maximal 1202 UTF8-Zeichen lang sein. -[Offline messaging is not allowed for LCS contacts] -Offline-Nachrichten sind nicht für LCS-Kontakte erlaubt! -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -MSN benötigt ein Timeout von weniger als 60 Sekunden in Ihrem Nachrichtenfensterplugin. Bitte korrigieren Sie das Timeout. -[Convert to Chat] -In Chat umwandeln diff --git a/langpacks/polish/Deprecated/MSN.txt b/langpacks/polish/Deprecated/MSN.txt new file mode 100644 index 0000000000..718ae1231e --- /dev/null +++ b/langpacks/polish/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Zapewnia obsługę protokołu Microsoft Network (MSN). +;file \protocols\MSN\res\msn.rc +[Live ID:] +Identyfikator Live: +[Password:] +Hasło: +[Nickname:] +Nick: +[Create a new Windows Live account] +Utwórz nowe konto Windows Live +[Expert] +Zaawansowane +[Send message font color/size info inside messages] +Wyślij informacje o kolorze/rozmiarze czcionki w wiadomościach +[Disable all contacts not included into my contact list] +Wyłącz wszystkie kontakty nieznajdujące się na mojej liście +[Manage server groups] +Zarządzaj grupami serwera +[Allow people on my contact list send messages to mobile device] +Zezwalaj osobom z mojej listy na wysyłanie wiadomości na urządzenie mobilne +[Run the following application when new Hotmail arrives] +Uruchom następującą aplikację po otrzymaniu Hotmaila +[Connection settings] +Ustawienia połączenia +[Direct:] +Bezpośrednie: +[Gateway:] +Bramka: +[Reset] +Domyślne +[Notify me when a message delivery has failed] +Powiadom mnie jeśli nie uda się dostarczyć wiadomości +[Incoming file transfers] +Przychodzące transfery +[Your host (or router):] +Twój host(lub router): +[Server List Manager] +Zarządzanie listą na serwerze +[Contact is on your local list] +Kontakt znajduje się na lokalnej liście +[Contact is included into your server list] +Kontakt znajduje się na twojej liście na serwerze +[Allowed (active) contact] +Dozwolony (aktywny) kontakt +[Blocked contact] +Zablokowany kontakt +[Somebody included you in his/her server list] +Ktoś dodał cię do swojej listy na serwerze +[Refresh] +Odśwież +[Enable Popup notifications] +Włącz powiadomienia +[Enable Contact List notifications] +Włącz powiadomienia listy kontaktów +[Enable Tray notifications] +Włącz powiadomienia w zasobniku +[Ignore new messages not in Inbox folder] +Ignoruj nowe wiadomości nie będące w skrzynce odbiorczej +[Other] +Inne +[Display errors using popups] +Wyświetlaj błędy za pomocą popupów +[Enable 'Chat Session Established' popup] +Włącz popup "nawiązano sesję czatu" +[Enable 'Contact left channel' popup] +Włącz popup "kontakt opuścił kanał" +[Set Nickname] +Edytuj nick +[Cancel] +Anuluj +[Mobile Device (used for SMS)] +Urządzenie przenośne (używane do SMS) +[Spouse/Partner] +Małżonek(ka)/Partner +[Middle Name] +Drugie imię +[First Name] +Imię +[Last Name] +Nazwisko +[Anniversary] +Rocznica +[Birthday] +Urodziny +[Nickname] +Nick +[Place:] +Miejsce: +[MSN Delete Contact] +MSN usuń kontakt +[Remove from Hotmail Address book] +Usuń z książki adresowej Hotmail +[Block Contact] +Zablokuj kontakt +[Invite Contact To Chat] +Zaproś kontakt do czatu +[Live ID] +Live ID +[&Invite] +&Zaproś +[&Cancel] +&Anuluj +[Add] +Dodaj +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Admin +[User] +Użytkownik +[Chat #] +Czat # +[&Invite user...] +&Zaproś użytkownika... +[&Leave chat session] +&Opuść pokój +[User &details] +&Dane kontaktu +[User &history] +&Historia użytkownika +[&Kick user] +&Wyrzuć użytkownika +[&Op user] +&Mianuj opem +[&Deop user] +&zdejmij opa +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] + +[MSN Alert] +Alert MSN +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Użytkownik jest rozłączony +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Kontakt %s został usunięty z serwera.\nCzy chciałbyś pozostawić go na liście jako kontakt lokalny w celu zachowania historii? +[%s protocol] +Protokół %s +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Temat: %s +[Hotmail from %s (%S)] +Hotmail od %s (%S) +[Hotmail from %s] +Hotmail od %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Dostępna jest nieprzeczytana poczta (%d w skrzynce odbiorczej oraz %d w innych folderach) +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +&Odblokuj +[&Block] +&Zablokuj +[Open &Hotmail Inbox] +Otwórz skrzynkę &Hotmail +[Send &Hotmail E-mail] +Wyślij e-mail &Hotmail +[Create &Chat] +Utwórz &czat +[Display &Hotmail Inbox] +Wyświetl skrzynkę &Hotmail +[View &Profile] +Pokaż &profil +[Setup Live &Alerts] +Ustaw &alerty live +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] +Własne uśmieszki +[Notifications] +Powiadomienia +[Errors] +Błędy +[MSN Protocol] +Protokół MSN +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Ikona protokołu +[Hotmail Inbox] +Skrzynka Hotmail +[Profile] +Profil +[MSN Services] +Usługi MSN +[Block user] +Zablokuj użytkownika +[Invite to chat] +Zaproś do czatu +[Start Netmeeting] +Uruchom Netmeeting +[Contact list] +Lista kontaktów +[Allowed list] +Dozwolona lista +[Blocked list] +Lista zablokowanych +[Relative list] +Powiązana lista +[Local list] +Lista lokalna +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Import grup z serwera może zmienić układ twojej listy kontaktów po następnym zalogowaniu. Chcesz wczytać grupy z serwera? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Te zmiany zostaną wprowadzone gdy ponownie połączysz się z siecią MSN Messenger. +[MSN options] +Opcje MSN +[Automatically obtain host/port] +Automatycznie ustaw host/port +[Manually specify host/port] +Ręcznie ustaw host/port +[Disable] +Wyłącz +[IP info available only after login] +Informacje o IP jest dostępne tylko po zalogowaniu +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +Protokół MSN wymaga, by czas oczekiwania wiadomości był większy niż 60 s. Popraw ustawienia. +[Network] +Protokoły +[Account] +Konto +[Connection] +Połączenie +[Server list] +Lista na serwerze +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +E-mail - MSN +[Live Alert] +Alarm - MSN +[%s plugin connections] +Połączenie %s +[Contact already in your contact list] +Kontakt jest już na liście kontaktów +[Protocol is offline] +Protokół jest rozłączony +[You cannot send message to yourself] +Nie możesz wysłać wiadomości do samego siebie +[Message is too long: SMS page limited to 133 UTF8 chars] +Wiadomość jest za długa: SMS-y są ograniczone do 133 znaków UTF-8 +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Wiadomość jest za długa: Wiadomości MSN są ograniczone do 1202 znaków UTF-8 +[Offline messaging is not allowed for LCS contacts] +Wysyłanie wiadomości Offline nie jest dozwolone dla kontaktów LCS +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +MSN wymaga, aby limit czasu wysyłania wiadomości w opcjach wtyczki okna rozmowy nie był mniejszy niż 60 sekund. Proszę ustawić poprawną wartość. +[Convert to Chat] +Konwertuj do czatu diff --git a/langpacks/polish/Plugins/MSN.txt b/langpacks/polish/Plugins/MSN.txt deleted file mode 100644 index facee3bbcd..0000000000 --- a/langpacks/polish/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Zapewnia obsługę protokołu Microsoft Network (MSN). -;file \protocols\MSN\res\msn.rc -[Live ID:] -Identyfikator Live: -[Password:] -Hasło: -[Nickname:] -Nick: -[Create a new Windows Live account] -Utwórz nowe konto Windows Live -[Expert] -Zaawansowane -[Send message font color/size info inside messages] -Wyślij informacje o kolorze/rozmiarze czcionki w wiadomościach -[Disable all contacts not included into my contact list] -Wyłącz wszystkie kontakty nieznajdujące się na mojej liście -[Manage server groups] -Zarządzaj grupami serwera -[Allow people on my contact list send messages to mobile device] -Zezwalaj osobom z mojej listy na wysyłanie wiadomości na urządzenie mobilne -[Run the following application when new Hotmail arrives] -Uruchom następującą aplikację po otrzymaniu Hotmaila -[Connection settings] -Ustawienia połączenia -[Direct:] -Bezpośrednie: -[Gateway:] -Bramka: -[Reset] -Domyślne -[Notify me when a message delivery has failed] -Powiadom mnie jeśli nie uda się dostarczyć wiadomości -[Incoming file transfers] -Przychodzące transfery -[Your host (or router):] -Twój host(lub router): -[Server List Manager] -Zarządzanie listą na serwerze -[Contact is on your local list] -Kontakt znajduje się na lokalnej liście -[Contact is included into your server list] -Kontakt znajduje się na twojej liście na serwerze -[Allowed (active) contact] -Dozwolony (aktywny) kontakt -[Blocked contact] -Zablokowany kontakt -[Somebody included you in his/her server list] -Ktoś dodał cię do swojej listy na serwerze -[Refresh] -Odśwież -[Enable Popup notifications] -Włącz powiadomienia -[Enable Contact List notifications] -Włącz powiadomienia listy kontaktów -[Enable Tray notifications] -Włącz powiadomienia w zasobniku -[Ignore new messages not in Inbox folder] -Ignoruj nowe wiadomości nie będące w skrzynce odbiorczej -[Other] -Inne -[Display errors using popups] -Wyświetlaj błędy za pomocą popupów -[Enable 'Chat Session Established' popup] -Włącz popup "nawiązano sesję czatu" -[Enable 'Contact left channel' popup] -Włącz popup "kontakt opuścił kanał" -[Set Nickname] -Edytuj nick -[Cancel] -Anuluj -[Mobile Device (used for SMS)] -Urządzenie przenośne (używane do SMS) -[Spouse/Partner] -Małżonek(ka)/Partner -[Middle Name] -Drugie imię -[First Name] -Imię -[Last Name] -Nazwisko -[Anniversary] -Rocznica -[Birthday] -Urodziny -[Nickname] -Nick -[Place:] -Miejsce: -[MSN Delete Contact] -MSN usuń kontakt -[Remove from Hotmail Address book] -Usuń z książki adresowej Hotmail -[Block Contact] -Zablokuj kontakt -[Invite Contact To Chat] -Zaproś kontakt do czatu -[Live ID] -Live ID -[&Invite] -&Zaproś -[&Cancel] -&Anuluj -[Add] -Dodaj -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Admin -[User] -Użytkownik -[Chat #] -Czat # -[&Invite user...] -&Zaproś użytkownika... -[&Leave chat session] -&Opuść pokój -[User &details] -&Dane kontaktu -[User &history] -&Historia użytkownika -[&Kick user] -&Wyrzuć użytkownika -[&Op user] -&Mianuj opem -[&Deop user] -&zdejmij opa -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] -Alert MSN -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Użytkownik jest rozłączony -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Kontakt %s został usunięty z serwera.\nCzy chciałbyś pozostawić go na liście jako kontakt lokalny w celu zachowania historii? -[%s protocol] -Protokół %s -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Temat: %s -[Hotmail from %s (%S)] -Hotmail od %s (%S) -[Hotmail from %s] -Hotmail od %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Dostępna jest nieprzeczytana poczta (%d w skrzynce odbiorczej oraz %d w innych folderach) -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -&Odblokuj -[&Block] -&Zablokuj -[Open &Hotmail Inbox] -Otwórz skrzynkę &Hotmail -[Send &Hotmail E-mail] -Wyślij e-mail &Hotmail -[Create &Chat] -Utwórz &czat -[Display &Hotmail Inbox] -Wyświetl skrzynkę &Hotmail -[View &Profile] -Pokaż &profil -[Setup Live &Alerts] -Ustaw &alerty live -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -Własne uśmieszki -[Notifications] -Powiadomienia -[Errors] -Błędy -[MSN Protocol] -Protokół MSN -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Ikona protokołu -[Hotmail Inbox] -Skrzynka Hotmail -[Profile] -Profil -[MSN Services] -Usługi MSN -[Block user] -Zablokuj użytkownika -[Invite to chat] -Zaproś do czatu -[Start Netmeeting] -Uruchom Netmeeting -[Contact list] -Lista kontaktów -[Allowed list] -Dozwolona lista -[Blocked list] -Lista zablokowanych -[Relative list] -Powiązana lista -[Local list] -Lista lokalna -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Import grup z serwera może zmienić układ twojej listy kontaktów po następnym zalogowaniu. Chcesz wczytać grupy z serwera? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Te zmiany zostaną wprowadzone gdy ponownie połączysz się z siecią MSN Messenger. -[MSN options] -Opcje MSN -[Automatically obtain host/port] -Automatycznie ustaw host/port -[Manually specify host/port] -Ręcznie ustaw host/port -[Disable] -Wyłącz -[IP info available only after login] -Informacje o IP jest dostępne tylko po zalogowaniu -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -Protokół MSN wymaga, by czas oczekiwania wiadomości był większy niż 60 s. Popraw ustawienia. -[Network] -Protokoły -[Account] -Konto -[Connection] -Połączenie -[Server list] -Lista na serwerze -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -E-mail - MSN -[Live Alert] -Alarm - MSN -[%s plugin connections] -Połączenie %s -[Contact already in your contact list] -Kontakt jest już na liście kontaktów -[Protocol is offline] -Protokół jest rozłączony -[You cannot send message to yourself] -Nie możesz wysłać wiadomości do samego siebie -[Message is too long: SMS page limited to 133 UTF8 chars] -Wiadomość jest za długa: SMS-y są ograniczone do 133 znaków UTF-8 -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Wiadomość jest za długa: Wiadomości MSN są ograniczone do 1202 znaków UTF-8 -[Offline messaging is not allowed for LCS contacts] -Wysyłanie wiadomości Offline nie jest dozwolone dla kontaktów LCS -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -MSN wymaga, aby limit czasu wysyłania wiadomości w opcjach wtyczki okna rozmowy nie był mniejszy niż 60 sekund. Proszę ustawić poprawną wartość. -[Convert to Chat] -Konwertuj do czatu diff --git a/langpacks/polish/Untranslated/MSN.txt b/langpacks/polish/Untranslated/MSN.txt deleted file mode 100644 index 81ffe30cc9..0000000000 --- a/langpacks/polish/Untranslated/MSN.txt +++ /dev/null @@ -1 +0,0 @@ -[%I64u bytes] diff --git a/langpacks/russian/Deprecated/MSN.txt b/langpacks/russian/Deprecated/MSN.txt new file mode 100644 index 0000000000..35e0071256 --- /dev/null +++ b/langpacks/russian/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Поддержка протокола Microsoft Network (MSN) в Miranda NG. +;file \protocols\MSN\res\msn.rc +[Live ID:] +Live ID: +[Password:] +Пароль: +[Nickname:] +Ник: +[Create a new Windows Live account] +Создать новую учётную запись Windows Live +[Expert] +Эксперт +[Send message font color/size info inside messages] +Отправлять информацию о шрифте/цвете в сообщении +[Disable all contacts not included into my contact list] +Отключить все контакты не в списке контактов +[Manage server groups] +Управлять группами на сервере +[Allow people on my contact list send messages to mobile device] +Разрешить контактам из списка отправлять сообщения на мобильный телефон +[Run the following application when new Hotmail arrives] +Запустить приложение при появлении новой почты +[Connection settings] +Настройки подключения +[Direct:] +Сервер: +[Gateway:] +Шлюз: +[Reset] +Сброс +[Notify me when a message delivery has failed] +Уведомлять о неудачной доставке сообщений +[Incoming file transfers] +Приём файлов +[Your host (or router):] +Ваш хост (или роутер): +[Server List Manager] +Управление списком на сервере +[Contact is on your local list] +Контакт в вашем локальном списке +[Contact is included into your server list] +Контакт в вашем списке на сервере +[Allowed (active) contact] +Разрешённый контакт +[Blocked contact] +Блокированный +[Somebody included you in his/her server list] +Вы в списке контакта на сервере +[Refresh] +Обновить +[Enable Popup notifications] +Включить уведомления всплывающими окнами +[Enable Contact List notifications] +Включить уведомления в списке контактов +[Enable Tray notifications] +Включить уведомления в трее +[Ignore new messages not in Inbox folder] +Игнорировать новые письма не из "Входящих" +[Other] +Другое +[Display errors using popups] +Показывать ошибки в окнах +[Enable 'Chat Session Established' popup] +Всплывающее окно 'Чат сессия установлена' +[Enable 'Contact left channel' popup] +Всплывающее окно 'Контакт покинул канал' +[Set Nickname] +Ввод ника +[Cancel] +Отмена +[Mobile Device (used for SMS)] +Мобильное устройство (SMS) +[Spouse/Partner] +Супруг(а)/Партнёр +[Middle Name] +Отчество +[First Name] +Имя +[Last Name] +Фамилия +[Anniversary] +Праздник +[Birthday] +День рождения +[Nickname] +Ник +[Place:] +Место: +[MSN Delete Contact] +Удаление MSN-контакта +[Remove from Hotmail Address book] +Удалить из адресной книги Hotmail +[Block Contact] +Заблокировать +[Invite Contact To Chat] +Пригласить контакт в чат +[Live ID] +Live ID +[&Invite] +&Пригласить +[&Cancel] +О&тмена +[Add] +Добавить +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Админ +[User] +Пользователь +[Chat #] +Чат # +[&Invite user...] +П&ригласить пользователя... +[&Leave chat session] +&Покинуть чат +[User &details] +&Информация +[User &history] +&История пользователя +[&Kick user] +&Выкинуть пользователя +[&Op user] +&Сделать пользователя админом +[&Deop user] +&Снять с пользователя админ права +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] +%I64u байт(а) +[MSN Alert] +MSN уведомление +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Пользователь не в сети +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Контакт %s был удалён с сервера.\nХотите ли вы оставить его в локальном списке, чтобы сохранить историю? +[%s protocol] +Протокол %s +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Тема: %s +[Hotmail from %s (%S)] +Почта от %s (%S) +[Hotmail from %s] +Почта Hotmail от %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Имеется непрочитанная почта: %d входящих писем и %d в других папках. +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +&Разблокировать +[&Block] +&Блокировать +[Open &Hotmail Inbox] +Открыть ящик &Hotmail +[Send &Hotmail E-mail] +Отправить почту &Hotmail +[Create &Chat] +Создать &чат +[Display &Hotmail Inbox] +Показать ящик &Hotmail +[View &Profile] +Просмотреть &профиль +[Setup Live &Alerts] +Настройки Live &Alerts +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] +Смайлы +[Notifications] +Уведомления +[Errors] +Ошибки +[MSN Protocol] +Протокол MSN +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Значок протокола +[Hotmail Inbox] +Входящие Hotmail +[Profile] +Профиль +[MSN Services] +Службы MSN +[Block user] +Заблокировать +[Invite to chat] +Пригласить в чат +[Start Netmeeting] +Запустить Netmeeting +[Contact list] +Список контактов +[Allowed list] +Список разрешённых +[Blocked list] +Список заблокированных +[Relative list] +Список "вы в списке" +[Local list] +Локальный список +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Импорт групп с сервера может изменить расположение контактов после следующего входа. Загрузить группы на сервер? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Эти изменения вступят в силу при следующем подключении к сети MSN Messenger. +[MSN options] +Настройки MSN +[Automatically obtain host/port] +Автоматически получать хост/порт +[Manually specify host/port] +Указывать хост/порт +[Disable] +Выключить +[IP info available only after login] +Информация о IP доступна после входа +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +Протокол MSN требует таймаута отправки сообщения не менее 60 секунд. Исправьте настройки. +[Network] +Сеть +[Account] +Учётная запись +[Connection] +Подключение +[Server list] +Список на сервере +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +Почта +[Live Alert] +Уведомление +[%s plugin connections] +%s подключение к серверу +[Contact already in your contact list] +Контакт уже в вашем списке контактов +[Protocol is offline] +Протокол не в сети +[You cannot send message to yourself] +Вы не можете отправлять сообщения самому себе +[Message is too long: SMS page limited to 133 UTF-8 chars] +Слишком большое сообщение: максимум 133 символа UTF-8 +[Message is too long: MSN messages are limited by 1202 UTF-8 chars] +Слишком большое сообщение: максимум 1202 символа UTF-8 +[Offline messaging is not allowed for LCS contacts] +Сообщения отключённым LCS контактам невозможны +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +Для сети MSN таймаут отправления сообщения должен быть не менее, чем 60 секунд. Пожалуйста, настройте свой плагин сообщений. +[Convert to Chat] +Конвертировать в чат diff --git a/langpacks/russian/Plugins/MSN.txt b/langpacks/russian/Plugins/MSN.txt deleted file mode 100644 index 1e57498ea9..0000000000 --- a/langpacks/russian/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Поддержка протокола Microsoft Network (MSN) в Miranda NG. -;file \protocols\MSN\res\msn.rc -[Live ID:] -Live ID: -[Password:] -Пароль: -[Nickname:] -Ник: -[Create a new Windows Live account] -Создать новую учётную запись Windows Live -[Expert] -Эксперт -[Send message font color/size info inside messages] -Отправлять информацию о шрифте/цвете в сообщении -[Disable all contacts not included into my contact list] -Отключить все контакты не в списке контактов -[Manage server groups] -Управлять группами на сервере -[Allow people on my contact list send messages to mobile device] -Разрешить контактам из списка отправлять сообщения на мобильный телефон -[Run the following application when new Hotmail arrives] -Запустить приложение при появлении новой почты -[Connection settings] -Настройки подключения -[Direct:] -Сервер: -[Gateway:] -Шлюз: -[Reset] -Сброс -[Notify me when a message delivery has failed] -Уведомлять о неудачной доставке сообщений -[Incoming file transfers] -Приём файлов -[Your host (or router):] -Ваш хост (или роутер): -[Server List Manager] -Управление списком на сервере -[Contact is on your local list] -Контакт в вашем локальном списке -[Contact is included into your server list] -Контакт в вашем списке на сервере -[Allowed (active) contact] -Разрешённый контакт -[Blocked contact] -Блокированный -[Somebody included you in his/her server list] -Вы в списке контакта на сервере -[Refresh] -Обновить -[Enable Popup notifications] -Включить уведомления всплывающими окнами -[Enable Contact List notifications] -Включить уведомления в списке контактов -[Enable Tray notifications] -Включить уведомления в трее -[Ignore new messages not in Inbox folder] -Игнорировать новые письма не из "Входящих" -[Other] -Другое -[Display errors using popups] -Показывать ошибки в окнах -[Enable 'Chat Session Established' popup] -Всплывающее окно 'Чат сессия установлена' -[Enable 'Contact left channel' popup] -Всплывающее окно 'Контакт покинул канал' -[Set Nickname] -Ввод ника -[Cancel] -Отмена -[Mobile Device (used for SMS)] -Мобильное устройство (SMS) -[Spouse/Partner] -Супруг(а)/Партнёр -[Middle Name] -Отчество -[First Name] -Имя -[Last Name] -Фамилия -[Anniversary] -Праздник -[Birthday] -День рождения -[Nickname] -Ник -[Place:] -Место: -[MSN Delete Contact] -Удаление MSN-контакта -[Remove from Hotmail Address book] -Удалить из адресной книги Hotmail -[Block Contact] -Заблокировать -[Invite Contact To Chat] -Пригласить контакт в чат -[Live ID] -Live ID -[&Invite] -&Пригласить -[&Cancel] -О&тмена -[Add] -Добавить -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Админ -[User] -Пользователь -[Chat #] -Чат # -[&Invite user...] -П&ригласить пользователя... -[&Leave chat session] -&Покинуть чат -[User &details] -&Информация -[User &history] -&История пользователя -[&Kick user] -&Выкинуть пользователя -[&Op user] -&Сделать пользователя админом -[&Deop user] -&Снять с пользователя админ права -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] -%I64u байт(а) -[MSN Alert] -MSN уведомление -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Пользователь не в сети -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Контакт %s был удалён с сервера.\nХотите ли вы оставить его в локальном списке, чтобы сохранить историю? -[%s protocol] -Протокол %s -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Тема: %s -[Hotmail from %s (%S)] -Почта от %s (%S) -[Hotmail from %s] -Почта Hotmail от %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Имеется непрочитанная почта: %d входящих писем и %d в других папках. -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -&Разблокировать -[&Block] -&Блокировать -[Open &Hotmail Inbox] -Открыть ящик &Hotmail -[Send &Hotmail E-mail] -Отправить почту &Hotmail -[Create &Chat] -Создать &чат -[Display &Hotmail Inbox] -Показать ящик &Hotmail -[View &Profile] -Просмотреть &профиль -[Setup Live &Alerts] -Настройки Live &Alerts -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -Смайлы -[Notifications] -Уведомления -[Errors] -Ошибки -[MSN Protocol] -Протокол MSN -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Значок протокола -[Hotmail Inbox] -Входящие Hotmail -[Profile] -Профиль -[MSN Services] -Службы MSN -[Block user] -Заблокировать -[Invite to chat] -Пригласить в чат -[Start Netmeeting] -Запустить Netmeeting -[Contact list] -Список контактов -[Allowed list] -Список разрешённых -[Blocked list] -Список заблокированных -[Relative list] -Список "вы в списке" -[Local list] -Локальный список -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Импорт групп с сервера может изменить расположение контактов после следующего входа. Загрузить группы на сервер? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Эти изменения вступят в силу при следующем подключении к сети MSN Messenger. -[MSN options] -Настройки MSN -[Automatically obtain host/port] -Автоматически получать хост/порт -[Manually specify host/port] -Указывать хост/порт -[Disable] -Выключить -[IP info available only after login] -Информация о IP доступна после входа -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -Протокол MSN требует таймаута отправки сообщения не менее 60 секунд. Исправьте настройки. -[Network] -Сеть -[Account] -Учётная запись -[Connection] -Подключение -[Server list] -Список на сервере -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -Почта -[Live Alert] -Уведомление -[%s plugin connections] -%s подключение к серверу -[Contact already in your contact list] -Контакт уже в вашем списке контактов -[Protocol is offline] -Протокол не в сети -[You cannot send message to yourself] -Вы не можете отправлять сообщения самому себе -[Message is too long: SMS page limited to 133 UTF-8 chars] -Слишком большое сообщение: максимум 133 символа UTF-8 -[Message is too long: MSN messages are limited by 1202 UTF-8 chars] -Слишком большое сообщение: максимум 1202 символа UTF-8 -[Offline messaging is not allowed for LCS contacts] -Сообщения отключённым LCS контактам невозможны -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -Для сети MSN таймаут отправления сообщения должен быть не менее, чем 60 секунд. Пожалуйста, настройте свой плагин сообщений. -[Convert to Chat] -Конвертировать в чат diff --git a/langpacks/spanish/Plugins/MSN.txt b/langpacks/spanish/Plugins/MSN.txt deleted file mode 100644 index 851c974834..0000000000 --- a/langpacks/spanish/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] - -;file \protocols\MSN\res\msn.rc -[Live ID:] - -[Password:] -Contraseña: -[Nickname:] -Apodo: -[Create a new Windows Live account] - -[Expert] -Experto -[Send message font color/size info inside messages] - -[Disable all contacts not included into my contact list] - -[Manage server groups] - -[Allow people on my contact list send messages to mobile device] - -[Run the following application when new Hotmail arrives] - -[Connection settings] - -[Direct:] - -[Gateway:] - -[Reset] -Reiniciar -[Notify me when a message delivery has failed] - -[Incoming file transfers] - -[Your host (or router):] - -[Server List Manager] - -[Contact is on your local list] - -[Contact is included into your server list] - -[Allowed (active) contact] - -[Blocked contact] - -[Somebody included you in his/her server list] - -[Refresh] -Refrescar -[Enable Popup notifications] - -[Enable Contact List notifications] - -[Enable Tray notifications] - -[Ignore new messages not in Inbox folder] - -[Other] -Otro -[Display errors using popups] - -[Enable 'Chat Session Established' popup] - -[Enable 'Contact left channel' popup] - -[Set Nickname] - -[Cancel] -Cancelar -[Mobile Device (used for SMS)] - -[Spouse/Partner] - -[Middle Name] - -[First Name] - -[Last Name] - -[Anniversary] - -[Birthday] - -[Nickname] -Apodo -[Place:] -Lugar: -[MSN Delete Contact] - -[Remove from Hotmail Address book] - -[Block Contact] - -[Invite Contact To Chat] - -[Live ID] - -[&Invite] - -[&Cancel] -&Cancelar -[Add] -Añadir -;file \protocols\MSN\src\msn_chat.cpp -[Admin] - -[User] - -[Chat #] - -[&Invite user...] -&Invitar usuario... -[&Leave chat session] -&Abandonar sesión de charla -[User &details] -&Detalles del usuario -[User &history] -&Historial del usuario -[&Kick user] - -[&Op user] - -[&Deop user] - -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] - -;file \protocols\MSN\src\msn_errors.cpp -[User not online] - -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] - -[%s protocol] - -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] - -[Hotmail from %s (%S)] - -[Hotmail from %s] - -[Unread mail is available: %d in Inbox and %d in other folders.] - -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] - -[&Block] - -[Open &Hotmail Inbox] - -[Send &Hotmail E-mail] - -[Create &Chat] - -[Display &Hotmail Inbox] - -[View &Profile] - -[Setup Live &Alerts] - -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] - -[Notifications] -Notificaciones -[Errors] -Errores -[MSN Protocol] - -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] - -[Hotmail Inbox] - -[Profile] -Perfil -[MSN Services] - -[Block user] - -[Invite to chat] - -[Start Netmeeting] - -[Contact list] -Lista de contactos -[Allowed list] - -[Blocked list] - -[Relative list] - -[Local list] - -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] - -[These changes will take effect the next time you connect to the MSN Messenger network.] - -[MSN options] - -[Automatically obtain host/port] - -[Manually specify host/port] - -[Disable] -Deshabilitar -[IP info available only after login] - -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] - -[Network] -Red -[Account] -Cuenta -[Connection] -Conexión -[Server list] - -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] - -[Live Alert] - -[%s plugin connections] - -[Contact already in your contact list] - -[Protocol is offline] - -[You cannot send message to yourself] - -[Message is too long: SMS page limited to 133 UTF8 chars] - -[Message is too long: MSN messages are limited by 1202 UTF8 chars] - -[Offline messaging is not allowed for LCS contacts] - -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] - -[Convert to Chat] - diff --git a/langpacks/spanish/Untranslated/MSN.txt b/langpacks/spanish/Untranslated/MSN.txt deleted file mode 100644 index 5f8bf2cfec..0000000000 --- a/langpacks/spanish/Untranslated/MSN.txt +++ /dev/null @@ -1,95 +0,0 @@ -[Microsoft Network (MSN) protocol support for Miranda NG.] -[Live ID:] -[Create a new Windows Live account] -[Send message font color/size info inside messages] -[Disable all contacts not included into my contact list] -[Manage server groups] -[Allow people on my contact list send messages to mobile device] -[Run the following application when new Hotmail arrives] -[Connection settings] -[Direct:] -[Gateway:] -[Notify me when a message delivery has failed] -[Incoming file transfers] -[Your host (or router):] -[Server List Manager] -[Contact is on your local list] -[Contact is included into your server list] -[Allowed (active) contact] -[Blocked contact] -[Somebody included you in his/her server list] -[Enable Popup notifications] -[Enable Contact List notifications] -[Enable Tray notifications] -[Ignore new messages not in Inbox folder] -[Display errors using popups] -[Enable 'Chat Session Established' popup] -[Enable 'Contact left channel' popup] -[Set Nickname] -[Mobile Device (used for SMS)] -[Spouse/Partner] -[Middle Name] -[First Name] -[Last Name] -[Anniversary] -[Birthday] -[MSN Delete Contact] -[Remove from Hotmail Address book] -[Block Contact] -[Invite Contact To Chat] -[Live ID] -[&Invite] -[Admin] -[User] -[Chat #] -[&Kick user] -[&Op user] -[&Deop user] -[%I64u bytes] -[MSN Alert] -[User not online] -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -[%s protocol] -[Subject: %s] -[Hotmail from %s (%S)] -[Hotmail from %s] -[Unread mail is available: %d in Inbox and %d in other folders.] -[&Unblock] -[&Block] -[Open &Hotmail Inbox] -[Send &Hotmail E-mail] -[Create &Chat] -[Display &Hotmail Inbox] -[View &Profile] -[Setup Live &Alerts] -[Custom Smileys] -[MSN Protocol] -[Protocol icon] -[Hotmail Inbox] -[MSN Services] -[Block user] -[Invite to chat] -[Start Netmeeting] -[Allowed list] -[Blocked list] -[Relative list] -[Local list] -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -[These changes will take effect the next time you connect to the MSN Messenger network.] -[MSN options] -[Automatically obtain host/port] -[Manually specify host/port] -[IP info available only after login] -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -[Server list] -[Live Mail] -[Live Alert] -[%s plugin connections] -[Contact already in your contact list] -[Protocol is offline] -[You cannot send message to yourself] -[Message is too long: SMS page limited to 133 UTF8 chars] -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -[Offline messaging is not allowed for LCS contacts] -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -[Convert to Chat] diff --git a/langpacks/ukrainian/Deprecated/MSN.txt b/langpacks/ukrainian/Deprecated/MSN.txt new file mode 100644 index 0000000000..cb1ef53e5c --- /dev/null +++ b/langpacks/ukrainian/Deprecated/MSN.txt @@ -0,0 +1,254 @@ +#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} +;============================================================ +; File: MSN.dll +; Plugin: MSN protocol +; Version: 0.95.11.1 +; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher +;============================================================ +[Microsoft Network (MSN) protocol support for Miranda NG.] +Підтримка протоколу Microsoft Network (MSN) у Miranda NG. +;file \protocols\MSN\res\msn.rc +[Live ID:] + +[Password:] +Пароль: +[Nickname:] +Нік: +[Create a new Windows Live account] +Створити новий обліковий запис Windows Live +[Expert] +Експерт +[Send message font color/size info inside messages] +Відправляти інформацію про шрифт/колір у повідомленні +[Disable all contacts not included into my contact list] +Відключити всі контакти не в списку контактів +[Manage server groups] +Керувати групами на сервері +[Allow people on my contact list send messages to mobile device] +Дозволити контактам зі списку відправляти повідомлення на мобільний +[Run the following application when new Hotmail arrives] +Запуск програми при появі нової пошти +[Connection settings] +Налаштування підключення +[Direct:] +Сервер: +[Gateway:] +Шлюз: +[Reset] +Скинути +[Notify me when a message delivery has failed] +Сповіщати про невдалу доставку повідомлень +[Incoming file transfers] +Прийом файлів +[Your host (or router):] +Ваш хост (або роутер): +[Server List Manager] +Керування списком на сервері +[Contact is on your local list] +Контакт у вашому локальному списку +[Contact is included into your server list] +Контакт у вашому списку на сервері +[Allowed (active) contact] +Дозволений контакт +[Blocked contact] +Заблокований контакт +[Somebody included you in his/her server list] +Вас додали до списку контактів на сервері +[Refresh] +Оновити +[Enable Popup notifications] +Увімкнути сповіщення в спливаючих вікнах +[Enable Contact List notifications] +Увімкнути сповіщення в списку контактів +[Enable Tray notifications] +Увімкнути сповіщення в треї +[Ignore new messages not in Inbox folder] +Ігнорувати нові листи не з "Вхідних" +[Other] +Інше +[Display errors using popups] +Показувати помилки у вікнах +[Enable 'Chat Session Established' popup] +Спливаюче вікно "Чат-сесія встановлена" +[Enable 'Contact left channel' popup] +Спливаюче вікно "Контакт покинув канал" +[Set Nickname] +Введення ніка +[Cancel] +Скасувати +[Mobile Device (used for SMS)] +Мобільний пристрій (SMS) +[Spouse/Partner] +Чоловік/Партнер +[Middle Name] +По батькові +[First Name] +Ім'я +[Last Name] +Прізвище +[Anniversary] +Свято +[Birthday] +День народження +[Nickname] +Нік +[Place:] +Місце: +[MSN Delete Contact] +Видалення контакту MSN +[Remove from Hotmail Address book] +Видалити з адресної книги Hotmail +[Block Contact] +Заблокувати +[Invite Contact To Chat] +Запросити контакт у чат +[Live ID] + +[&Invite] +&Запросити +[&Cancel] +&Скасувати +[Add] +Додати +;file \protocols\MSN\src\msn_chat.cpp +[Admin] +Адмін +[User] +Користувач +[Chat #] +Чат # +[&Invite user...] +З&апросити користувача... +[&Leave chat session] +&Покинути сеанс +[User &details] +Дані &контакту +[User &history] +Історія користувача +[&Kick user] +&Вигнати +[&Op user] +Зробити користувача &адміном +[&Deop user] +&Забрати права адміністратора +;file \protocols\MSN\src\msn_commands.cpp +[%I64u bytes] + +[MSN Alert] +Сповіщення MSN +;file \protocols\MSN\src\msn_errors.cpp +[User not online] +Користувач не в мережі +;file \protocols\MSN\src\msn_lists.cpp +[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] +Контакт %s був видалений з сервера.\nХочете залишити його в локальному списку, щоб зберегти історію? +[%s protocol] +Протокол %s +;file \protocols\MSN\src\msn_mail.cpp +[Subject: %s] +Тема: %s +[Hotmail from %s (%S)] +Пошта від %s (%S) +[Hotmail from %s] +Пошта Hotmail від %s +[Unread mail is available: %d in Inbox and %d in other folders.] +Непрочитана пошта: %d вхідних листів і %d в інших папках. +;file \protocols\MSN\src\msn_menu.cpp +[&Unblock] +&Розблокувати +[&Block] +&Блокувати +[Open &Hotmail Inbox] +Відкрити скриньку &Hotmail +[Send &Hotmail E-mail] +Відправити пошту &Hotmail +[Create &Chat] +Створити &чат +[Display &Hotmail Inbox] +Показати скриньки &Hotmail +[View &Profile] +Переглянути &профіль +[Setup Live &Alerts] +Налаштування Live &Alerts +;file \protocols\MSN\src\msn_misc.cpp +[Custom Smileys] +Користувацькі смайли +[Notifications] +Сповіщення +[Errors] +Помилки +[MSN Protocol] +Протокол MSN +;file \protocols\MSN\src\msn_opts.cpp +[Protocol icon] +Значок протоколу +[Hotmail Inbox] +Вхідні Hotmail +[Profile] +Профіль +[MSN Services] +Служби MSN +[Block user] +Заблокувати +[Invite to chat] +Запросити в чат +[Start Netmeeting] +Запустити Netmeeting +[Contact list] +Список контактів +[Allowed list] +Список дозволених +[Blocked list] +Список заблокованих +[Relative list] +Список "ви у списку" +[Local list] +Локальний список +[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] +Імпорт груп з сервера може змінити розташування контактів після наступного входу. Завантажити групи на сервер? +[These changes will take effect the next time you connect to the MSN Messenger network.] +Зміни наберуть чинності при наступному вході в мережу MSN. +[MSN options] +Налаштування MSN +[Automatically obtain host/port] +Автоматично отримувати хост/порт +[Manually specify host/port] +Вказати хост/порт +[Disable] +Вимкнути +[IP info available only after login] +Інформація про IP доступна після входу +[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] +Протокол MSN вимагає таймауту відправки повідомлення не менше 60 секунд. Виправте налаштування. +[Network] +Мережа +[Account] +Обліковий запис +[Connection] +Підключення +[Server list] +Список на сервері +;file \protocols\MSN\src\msn_proto.cpp +[Live Mail] +Пошта Live +[Live Alert] +Сповіщення Live +[%s plugin connections] +З'єднання з сервером %s +[Contact already in your contact list] +Контакт у вашому списку +[Protocol is offline] +Протокол не в мережі +[You cannot send message to yourself] +Ви не можете надсилати повідомлення самому собі +[Message is too long: SMS page limited to 133 UTF8 chars] +Занадто велике повідомлення, максимум 133 символи UTF8 +[Message is too long: MSN messages are limited by 1202 UTF8 chars] +Повідомлення MSN обмежені 1202 символами UTF-8 +[Offline messaging is not allowed for LCS contacts] +Повідомлення відключеним LCS-контактам неможливі +;file \protocols\MSN\src\msn_svcs.cpp +[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] +Для мережі MSN таймаут відправлення повідомлення повинен бути не менш ніж 60 секунд. Будь ласка, налаштуйте свій плагін повідомлень. +[Convert to Chat] +Конвертувати в чат diff --git a/langpacks/ukrainian/Plugins/MSN.txt b/langpacks/ukrainian/Plugins/MSN.txt deleted file mode 100644 index 9c1cafa0a7..0000000000 --- a/langpacks/ukrainian/Plugins/MSN.txt +++ /dev/null @@ -1,254 +0,0 @@ -#muuid {97724af9-f3fb-47d3-a3bf-eaa935c74e6d} -;============================================================ -; File: MSN.dll -; Plugin: MSN protocol -; Version: 0.95.11.1 -; Authors: Boris Krasnovskiy, George Hazan, Richard Hughes, leecher -;============================================================ -[Microsoft Network (MSN) protocol support for Miranda NG.] -Підтримка протоколу Microsoft Network (MSN) у Miranda NG. -;file \protocols\MSN\res\msn.rc -[Live ID:] - -[Password:] -Пароль: -[Nickname:] -Нік: -[Create a new Windows Live account] -Створити новий обліковий запис Windows Live -[Expert] -Експерт -[Send message font color/size info inside messages] -Відправляти інформацію про шрифт/колір у повідомленні -[Disable all contacts not included into my contact list] -Відключити всі контакти не в списку контактів -[Manage server groups] -Керувати групами на сервері -[Allow people on my contact list send messages to mobile device] -Дозволити контактам зі списку відправляти повідомлення на мобільний -[Run the following application when new Hotmail arrives] -Запуск програми при появі нової пошти -[Connection settings] -Налаштування підключення -[Direct:] -Сервер: -[Gateway:] -Шлюз: -[Reset] -Скинути -[Notify me when a message delivery has failed] -Сповіщати про невдалу доставку повідомлень -[Incoming file transfers] -Прийом файлів -[Your host (or router):] -Ваш хост (або роутер): -[Server List Manager] -Керування списком на сервері -[Contact is on your local list] -Контакт у вашому локальному списку -[Contact is included into your server list] -Контакт у вашому списку на сервері -[Allowed (active) contact] -Дозволений контакт -[Blocked contact] -Заблокований контакт -[Somebody included you in his/her server list] -Вас додали до списку контактів на сервері -[Refresh] -Оновити -[Enable Popup notifications] -Увімкнути сповіщення в спливаючих вікнах -[Enable Contact List notifications] -Увімкнути сповіщення в списку контактів -[Enable Tray notifications] -Увімкнути сповіщення в треї -[Ignore new messages not in Inbox folder] -Ігнорувати нові листи не з "Вхідних" -[Other] -Інше -[Display errors using popups] -Показувати помилки у вікнах -[Enable 'Chat Session Established' popup] -Спливаюче вікно "Чат-сесія встановлена" -[Enable 'Contact left channel' popup] -Спливаюче вікно "Контакт покинув канал" -[Set Nickname] -Введення ніка -[Cancel] -Скасувати -[Mobile Device (used for SMS)] -Мобільний пристрій (SMS) -[Spouse/Partner] -Чоловік/Партнер -[Middle Name] -По батькові -[First Name] -Ім'я -[Last Name] -Прізвище -[Anniversary] -Свято -[Birthday] -День народження -[Nickname] -Нік -[Place:] -Місце: -[MSN Delete Contact] -Видалення контакту MSN -[Remove from Hotmail Address book] -Видалити з адресної книги Hotmail -[Block Contact] -Заблокувати -[Invite Contact To Chat] -Запросити контакт у чат -[Live ID] - -[&Invite] -&Запросити -[&Cancel] -&Скасувати -[Add] -Додати -;file \protocols\MSN\src\msn_chat.cpp -[Admin] -Адмін -[User] -Користувач -[Chat #] -Чат # -[&Invite user...] -З&апросити користувача... -[&Leave chat session] -&Покинути сеанс -[User &details] -Дані &контакту -[User &history] -Історія користувача -[&Kick user] -&Вигнати -[&Op user] -Зробити користувача &адміном -[&Deop user] -&Забрати права адміністратора -;file \protocols\MSN\src\msn_commands.cpp -[%I64u bytes] - -[MSN Alert] -Сповіщення MSN -;file \protocols\MSN\src\msn_errors.cpp -[User not online] -Користувач не в мережі -;file \protocols\MSN\src\msn_lists.cpp -[Contact %s has been removed from the server.\nWould you like to keep it as "Local Only" contact to preserve history?] -Контакт %s був видалений з сервера.\nХочете залишити його в локальному списку, щоб зберегти історію? -[%s protocol] -Протокол %s -;file \protocols\MSN\src\msn_mail.cpp -[Subject: %s] -Тема: %s -[Hotmail from %s (%S)] -Пошта від %s (%S) -[Hotmail from %s] -Пошта Hotmail від %s -[Unread mail is available: %d in Inbox and %d in other folders.] -Непрочитана пошта: %d вхідних листів і %d в інших папках. -;file \protocols\MSN\src\msn_menu.cpp -[&Unblock] -&Розблокувати -[&Block] -&Блокувати -[Open &Hotmail Inbox] -Відкрити скриньку &Hotmail -[Send &Hotmail E-mail] -Відправити пошту &Hotmail -[Create &Chat] -Створити &чат -[Display &Hotmail Inbox] -Показати скриньки &Hotmail -[View &Profile] -Переглянути &профіль -[Setup Live &Alerts] -Налаштування Live &Alerts -;file \protocols\MSN\src\msn_misc.cpp -[Custom Smileys] -Користувацькі смайли -[Notifications] -Сповіщення -[Errors] -Помилки -[MSN Protocol] -Протокол MSN -;file \protocols\MSN\src\msn_opts.cpp -[Protocol icon] -Значок протоколу -[Hotmail Inbox] -Вхідні Hotmail -[Profile] -Профіль -[MSN Services] -Служби MSN -[Block user] -Заблокувати -[Invite to chat] -Запросити в чат -[Start Netmeeting] -Запустити Netmeeting -[Contact list] -Список контактів -[Allowed list] -Список дозволених -[Blocked list] -Список заблокованих -[Relative list] -Список "ви у списку" -[Local list] -Локальний список -[Server groups import may change your contact list layout after next login. Do you want to upload your groups to the server?] -Імпорт груп з сервера може змінити розташування контактів після наступного входу. Завантажити групи на сервер? -[These changes will take effect the next time you connect to the MSN Messenger network.] -Зміни наберуть чинності при наступному вході в мережу MSN. -[MSN options] -Налаштування MSN -[Automatically obtain host/port] -Автоматично отримувати хост/порт -[Manually specify host/port] -Вказати хост/порт -[Disable] -Вимкнути -[IP info available only after login] -Інформація про IP доступна після входу -[MSN Protocol requires message timeout to be not less then 60 sec. Correct the timeout value.] -Протокол MSN вимагає таймауту відправки повідомлення не менше 60 секунд. Виправте налаштування. -[Network] -Мережа -[Account] -Обліковий запис -[Connection] -Підключення -[Server list] -Список на сервері -;file \protocols\MSN\src\msn_proto.cpp -[Live Mail] -Пошта Live -[Live Alert] -Сповіщення Live -[%s plugin connections] -З'єднання з сервером %s -[Contact already in your contact list] -Контакт у вашому списку -[Protocol is offline] -Протокол не в мережі -[You cannot send message to yourself] -Ви не можете надсилати повідомлення самому собі -[Message is too long: SMS page limited to 133 UTF8 chars] -Занадто велике повідомлення, максимум 133 символи UTF8 -[Message is too long: MSN messages are limited by 1202 UTF8 chars] -Повідомлення MSN обмежені 1202 символами UTF-8 -[Offline messaging is not allowed for LCS contacts] -Повідомлення відключеним LCS-контактам неможливі -;file \protocols\MSN\src\msn_svcs.cpp -[MSN requires message send timeout in your Message window plugin to be not less then 60 sec. Please correct the timeout value.] -Для мережі MSN таймаут відправлення повідомлення повинен бути не менш ніж 60 секунд. Будь ласка, налаштуйте свій плагін повідомлень. -[Convert to Chat] -Конвертувати в чат diff --git a/langpacks/ukrainian/Untranslated/MSN.txt b/langpacks/ukrainian/Untranslated/MSN.txt deleted file mode 100644 index 5ea913bf50..0000000000 --- a/langpacks/ukrainian/Untranslated/MSN.txt +++ /dev/null @@ -1,3 +0,0 @@ -[Live ID:] -[Live ID] -[%I64u bytes] diff --git a/plugins/ExternalAPI/delphi/m_ieview.inc b/plugins/ExternalAPI/delphi/m_ieview.inc index c0e203241c..23993ffe76 100644 --- a/plugins/ExternalAPI/delphi/m_ieview.inc +++ b/plugins/ExternalAPI/delphi/m_ieview.inc @@ -178,7 +178,7 @@ type // u can use your own protocol name. Smiley add will // automatically select the smileypack that is // defined for your protocol. Or, use "Standard" for - // standard smiley set. Or "ICQ", "MSN" if you + // standard smiley set. Or "ICQ" if you // prefer those icons. If not found or NULL: // "Standard" will be used xPosition : int; // Postition to place the selectwindow diff --git a/plugins/ExternalAPI/delphi/m_smileyadd.inc b/plugins/ExternalAPI/delphi/m_smileyadd.inc index 0cc064ea8f..0f54f3f989 100644 --- a/plugins/ExternalAPI/delphi/m_smileyadd.inc +++ b/plugins/ExternalAPI/delphi/m_smileyadd.inc @@ -36,7 +36,7 @@ type Protocolname :PAnsiChar; // protocol to use... if you have defined a // protocol, u can use your own protocol name. SmileyAdd will // automatically select the smileypack that is defined for your protocol. - // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN" + // Or, use "Standard" for standard smiley set. Or "ICQ" // if you prefer those icons. // If not found or NULL, "Standard" will be used flags :uint; // Flags (SAFLRE_*) that define the behaivior @@ -60,7 +60,7 @@ type Protocolname : PAnsiChar; // protocol to use... if you have defined a protocol, // you can use your own protocol name. Smiley add will automatically // select the smileypack that is defined for your protocol. - // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN" + // Or, use "Standard" for standard smiley set. Or "ICQ" // if you prefer those icons. // If not found or NULL: "Standard" will be used xPosition : int; // Postition to place the selectwindow @@ -120,7 +120,7 @@ type Protocolname:PAnsiChar; // protocol to use... if you have defined a protocol, u can // use your own protocol name. Smiley add wil automatically // select the smileypack that is defined for your protocol. - // Or, use "Standard" for standard smiley set. Or "ICQ", "MSN" + // Or, use "Standard" for standard smiley set. Or "ICQ" // if you prefer those icons. // If not found or NULL: "Standard" will be used str :TChar; // String to parse diff --git a/plugins/ExternalAPI/m_smileyadd.h b/plugins/ExternalAPI/m_smileyadd.h index f878cf8bf7..667ac2fea3 100644 --- a/plugins/ExternalAPI/m_smileyadd.h +++ b/plugins/ExternalAPI/m_smileyadd.h @@ -35,7 +35,7 @@ typedef struct const char* Protocolname; //protocol to use... if you have defined a protocol, u can //use your own protocol name. SmileyAdd will automatically //select the smileypack that is defined for your protocol. - //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN" + //Or, use "Standard" for standard smiley set. Or "ICQ" //if you prefer those icons. //If not found or NULL, "Standard" will be used unsigned flags; //Flags (SAFLRE_*) that define the behaivior @@ -56,8 +56,8 @@ typedef struct char* Protocolname; //protocol to use... if you have defined a protocol, you can //use your own protocol name. Smiley add will automatically //select the smileypack that is defined for your protocol. - //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN" - //if you prefer those icons. + //Or, use "Standard" for standard smiley set. Or "ICQ" + //if you prefer those icons. //If not found or NULL: "Standard" will be used int xPosition; //Postition to place the selectwindow int yPosition; // " @@ -120,7 +120,7 @@ typedef struct const char* Protocolname; //protocol to use... if you have defined a protocol, u can //use your own protocol name. Smiley add wil automatically //select the smileypack that is defined for your protocol. - //Or, use "Standard" for standard smiley set. Or "ICQ", "MSN" + //Or, use "Standard" for standard smiley set. Or "ICQ" //if you prefer those icons. //If not found or NULL: "Standard" will be used union { diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico deleted file mode 100644 index 4be8abe317..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/MSN Mac.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico deleted file mode 100644 index 2f1bb589d4..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v4.5-v5.x.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico deleted file mode 100644 index d4829d9294..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v6.x.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico deleted file mode 100644 index 960f8d36eb..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v7.x.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico deleted file mode 100644 index bbe052ed65..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/MSN v8.x.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico b/plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico deleted file mode 100644 index 959950e703..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/MSN.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico b/plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico deleted file mode 100644 index 5f6e68d9ad..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/WLM10-11.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico b/plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico deleted file mode 100644 index 0ccef8c3b1..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/WLM9.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico b/plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico deleted file mode 100644 index 94909a4ce0..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/WebMessenger.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico b/plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico deleted file mode 100644 index 7bb8276bc5..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/MSN/aMSN.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico b/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico deleted file mode 100644 index 9e28bf4e9e..0000000000 Binary files a/plugins/FingerprintNG/iconpacks/res/Overlays/overlay_proto_msn.ico and /dev/null differ diff --git a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc index a116ca8a91..a2337b0882 100644 --- a/plugins/FingerprintNG/iconpacks/res/fp_icons.rc +++ b/plugins/FingerprintNG/iconpacks/res/fp_icons.rc @@ -445,16 +445,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_AMSN ICON "MSN\\aMSN.ico" -IDI_MSN_MAC ICON "MSN\\MSN Mac.ico" -IDI_MSN_45 ICON "MSN\\MSN v4.5-v5.x.ico" -IDI_MSN_6 ICON "MSN\\MSN v6.x.ico" -IDI_MSN_7 ICON "MSN\\MSN v7.x.ico" -IDI_MSN_8 ICON "MSN\\MSN v8.x.ico" -IDI_MSN ICON "MSN\\MSN v8.x.ico" -IDI_WEBMESSENGER ICON "MSN\\WebMessenger.ico" -IDI_WLM_9 ICON "MSN\\wlm9.ico" -IDI_WLM_10 ICON "MSN\\WLM10-11.ico" IDI_GG ICON "GG\\Gadu-Gadu.ico" IDI_GG8_OVERLAY ICON "GG\\overlay_GG_v8.ico" IDI_GG9_OVERLAY ICON "GG\\overlay_GG_v9.ico" @@ -491,7 +481,6 @@ IDI_ICQ_OVERLAY ICON "overlays\\overlay_proto_ICQ.ico IDI_IRC_OVERLAY ICON "overlays\\overlay_proto_IRC.ico" IDI_JABBER_OVERLAY ICON "overlays\\overlay_proto_Jabber.ico" IDI_JGTALK_OVERLAY ICON "overlays\\overlay_proto_JGTalk.ico" -IDI_MSN_OVERLAY ICON "overlays\\overlay_proto_MSN.ico" IDI_VK_OVERLAY ICON "overlays\\overlay_proto_VK.ico" IDI_SKYPE_OVERLAY ICON "overlays\\overlay_proto_skype.ico" IDI_DEBUG_OVERLAY ICON "overlays\\overlay_resource_debug.ico" diff --git a/plugins/FingerprintNG/res/resource.rc b/plugins/FingerprintNG/res/resource.rc index bf2519d7d5..172afacd70 100644 --- a/plugins/FingerprintNG/res/resource.rc +++ b/plugins/FingerprintNG/res/resource.rc @@ -82,7 +82,6 @@ BEGIN CONTROL "ICQ clients",IDC_GROUP_ICQ,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,110,120,10 CONTROL "IRC clients",IDC_GROUP_IRC,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,120,120,10 CONTROL "Jabber clients",IDC_GROUP_JABBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,130,120,10 - CONTROL "MSN clients",IDC_GROUP_MSN,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,150,120,10 CONTROL "RSS clients",IDC_GROUP_RSS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,170,120,10 CONTROL "VKontakte clients",IDC_GROUP_VK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,180,120,10 CONTROL "Weather clients",IDC_GROUP_WEATHER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,20,190,120,10 diff --git a/plugins/FingerprintNG/src/finger_groups.h b/plugins/FingerprintNG/src/finger_groups.h index 685fafb1f2..19dbcf4fc9 100644 --- a/plugins/FingerprintNG/src/finger_groups.h +++ b/plugins/FingerprintNG/src/finger_groups.h @@ -38,11 +38,6 @@ case JABBER_CASE: return LPGENW("Client icons") L"/" LPGENW("Jabber clients"); break; -case MSN_CASE: - if (g_plugin.getByte("GroupMSN", 1)) - return LPGENW("Client icons") L"/" LPGENW("MSN clients"); - break; - case RSS_CASE: if (g_plugin.getByte("GroupRSS", 1)) return LPGENW("Client icons") L"/" LPGENW("RSS clients"); diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 57830d60d1..7e4be9c495 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -474,21 +474,6 @@ KN_FP_MASK def_kn_fp_mask[] = { "client_IRCUnknown", L"*IRC*", L"Unknown IRC client", IDI_IRC, IRC_CASE, TRUE }, - //######################################################################################################################################################################### - //################################# MSN ############################################################################################################################### - //######################################################################################################################################################################### - { "client_WLM11", L"WLM*2011*", L"Windows Live 11", IDI_WLM_10, MSN_CASE, TRUE }, - { "client_WLM10", L"WLM*2010*", L"Windows Live 10", IDI_WLM_10, MSN_CASE, TRUE }, - { "client_WLM9", L"WLM*9*", L"Windows Live v9.x", IDI_WLM_9, MSN_CASE, TRUE }, - { "client_MSN8", L"|WLM*8.*|MSN*8.*", L"Windows Live v8.x", IDI_MSN_8, MSN_CASE, TRUE }, - { "client_MSN7x", L"MSN*7.*", L"MSN Messenger v7.x", IDI_MSN_7, MSN_CASE, TRUE }, - { "client_MSN6x", L"MSN*6.*", L"MSN Messenger v6.x", IDI_MSN_6, MSN_CASE, TRUE }, - { "client_MSN45", L"MSN*4.x-5.x", L"MSN Messenger v4.x-5.x", IDI_MSN_45, MSN_CASE, TRUE }, - { "client_MSN4Mac", L"MSN*Mac*", L"MSN for Mac", IDI_MSN_MAC, MSN_CASE, TRUE }, - { "client_aMSN", L"*aMSN*", L"aMSN", IDI_AMSN, MSN_CASE, TRUE }, - { "client_MSN_Web", L"WebMessenger*", L"WebMessenger", IDI_WEBMESSENGER, MSN_CASE, TRUE }, - { "client_MSN", L"|WLM*|MSN*|Windows Live*", L"MSN", IDI_MSN, MSN_CASE, TRUE }, - //######################################################################################################################################################################### //################################# WEATHER ########################################################################################################################### //######################################################################################################################################################################### @@ -628,7 +613,6 @@ KN_FP_MASK def_kn_fp_overlays_mask[] = { "client_JGmail_overlay", L"*JGmail*", LPGENW("JGmail overlay"), IDI_GMAIL_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_JGTalk_overlay", L"*JGTalk*", LPGENW("JGTalk overlay"), IDI_JGTALK_OVERLAY, OVERLAYS_PROTO_CASE }, { "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_VK_overlay", L"|Miranda*VKontakte*", LPGENW("VK overlay"), IDI_VK_OVERLAY, OVERLAYS_PROTO_CASE }, { "client_Skype_overlay", L"|Miranda*Skype*", LPGENW("Skype overlay"), IDI_SKYPE_OVERLAY, OVERLAYS_PROTO_CASE }, diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index 9344497aa2..c1e5f780e7 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -37,7 +37,6 @@ static settings[] = { IDC_GROUP_ICQ, TRUE, "GroupICQ" }, { IDC_GROUP_IRC, TRUE, "GroupIRC" }, { IDC_GROUP_JABBER, TRUE, "GroupJabber" }, - { IDC_GROUP_MSN, TRUE, "GroupMSN" }, { IDC_GROUP_RSS, TRUE, "GroupRSS" }, { IDC_GROUP_WEATHER, TRUE, "GroupWeather" }, { IDC_GROUP_FACEBOOK, TRUE, "GroupFacebook" }, @@ -57,7 +56,7 @@ static settings[] = class COptDialog : public CDlgBase { CCtrlCheck m_chkMiranda, m_chkMirandaPacks, m_chkMirandaVer, m_chkOverRes, m_chkOverPlatf, m_chkOverProto, m_chkOverUnicode, m_chkOverSecur, - m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkMSN, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto, + m_chkFacebbok, m_chkGG, m_chkICQ, m_chkIRC, m_chkJabber, m_chkRSS, m_chkVK, m_chkWeather, m_chkMulti, m_chkOthersProto, m_chkOthers, m_chkStatusBar; void LoadDBCheckState(int idCtrl, LPCSTR szSetting, BYTE bDef) @@ -88,7 +87,6 @@ public: m_chkICQ(this, IDC_GROUP_ICQ), m_chkIRC(this, IDC_GROUP_IRC), m_chkJabber(this, IDC_GROUP_JABBER), - m_chkMSN(this, IDC_GROUP_MSN), m_chkRSS(this, IDC_GROUP_RSS), m_chkVK(this, IDC_GROUP_VK), m_chkWeather(this, IDC_GROUP_WEATHER), diff --git a/plugins/FingerprintNG/src/resource.h b/plugins/FingerprintNG/src/resource.h index a709145cb9..95787aa7b5 100644 --- a/plugins/FingerprintNG/src/resource.h +++ b/plugins/FingerprintNG/src/resource.h @@ -59,7 +59,6 @@ #define IDI_IRC_OVERLAY 82 #define IDI_JABBER_OVERLAY 83 #define IDI_JGTALK_OVERLAY 84 -#define IDI_MSN_OVERLAY 86 #define IDI_VK_OVERLAY 90 #define IDI_SKYPE_OVERLAY 91 #define IDI_SECUREIM_OVERLAY 95 @@ -380,16 +379,6 @@ #define IDI_GG9_OVERLAY 726 #define IDI_GG10_OVERLAY 727 #define IDI_GG11_OVERLAY 728 -#define IDI_AMSN 741 -#define IDI_MSN_MAC 742 -#define IDI_MSN_45 743 -#define IDI_MSN_6 744 -#define IDI_MSN_7 745 -#define IDI_MSN_8 746 -#define IDI_MSN 747 -#define IDI_WEBMESSENGER 748 -#define IDI_WLM_9 749 -#define IDI_WLM_10 750 #define IDI_ATOM1 761 #define IDI_ATOM3 762 #define IDI_RSS09 763 @@ -523,7 +512,6 @@ #define IDC_GROUP_ICQ 10032 #define IDC_GROUP_IRC 10033 #define IDC_GROUP_JABBER 10034 -#define IDC_GROUP_MSN 10035 #define IDC_GROUP_RSS 10038 #define IDC_GROUP_WEATHER 10040 #define IDC_GROUP_FACEBOOK 10042 diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index ae7d2dfdd4..a41b4c7a0a 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -82,7 +82,6 @@ struct FOUNDINFO #define ICQ_CASE 3008 // ICQ clients #define IRC_CASE 3009 // IRC clients #define JABBER_CASE 3010 // Jabber clients -#define MSN_CASE 3012 // MSN clients #define RSS_CASE 3014 // RSS clients #define WEATHER_CASE 3016 // Weather clients #define FACEBOOK_CASE 3018 // Facebook clients diff --git a/plugins/Nudge/res/NudgeMSN.ico b/plugins/Nudge/res/NudgeMSN.ico deleted file mode 100644 index 3ebbdcf87f..0000000000 Binary files a/plugins/Nudge/res/NudgeMSN.ico and /dev/null differ diff --git a/plugins/Nudge/res/resource.rc b/plugins/Nudge/res/resource.rc index 071d5b48f3..1d76fa5601 100644 --- a/plugins/Nudge/res/resource.rc +++ b/plugins/Nudge/res/resource.rc @@ -181,7 +181,6 @@ END 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_META ICON "NudgeMeta.ico" #endif // Neutral resources ///////////////////////////////////////////////////////////////////////////// diff --git a/plugins/Nudge/src/resource.h b/plugins/Nudge/src/resource.h index 34b0d091fd..fbca447b46 100644 --- a/plugins/Nudge/src/resource.h +++ b/plugins/Nudge/src/resource.h @@ -6,7 +6,6 @@ #define IDI_NUDGE 102 #define IDI_NUGDE_YAHOO 107 #define IDI_NUDGE_IRC 109 -#define IDI_NUDGE_MSN 110 #define IDI_NUDGE_META 113 #define IDD_SHAKEOPT 126 #define IDD_OPT_NUDGE 126 diff --git a/plugins/PluginUpdater/src/DlgUpdate.cpp b/plugins/PluginUpdater/src/DlgUpdate.cpp index 8a9850804e..37357ceed3 100644 --- a/plugins/PluginUpdater/src/DlgUpdate.cpp +++ b/plugins/PluginUpdater/src/DlgUpdate.cpp @@ -569,6 +569,7 @@ static renameTable[] = { L"metacontacts.dll", nullptr }, { L"mra.dll", nullptr }, { L"modernopt.dll", nullptr }, + { L"msn.dll", nullptr }, { L"msvcp100.dll", nullptr }, { L"msvcr100.dll", nullptr }, { L"mtextcontrol.dll", nullptr }, diff --git a/plugins/SmileyAdd/smileys/nova/MSN.msl b/plugins/SmileyAdd/smileys/nova/MSN.msl deleted file mode 100644 index d9c440f742..0000000000 Binary files a/plugins/SmileyAdd/smileys/nova/MSN.msl and /dev/null differ diff --git a/plugins/SmileyAdd/src/smileys.cpp b/plugins/SmileyAdd/src/smileys.cpp index 2f8ab68b0a..3264a36e2d 100644 --- a/plugins/SmileyAdd/src/smileys.cpp +++ b/plugins/SmileyAdd/src/smileys.cpp @@ -822,8 +822,6 @@ void SmileyCategoryListType::AddAccountAsCategory(PROTOACCOUNT *acc, const CMStr const char *packnam = acc->szProtoName; if (mir_strcmp(packnam, "JABBER") == 0) packnam = "JGMail"; - else if (strstr(packnam, "SIP") != nullptr) - packnam = "MSN"; wchar_t path[MAX_PATH]; mir_snwprintf(path, L"%s\\Smileys\\nova\\%S.msl", g_plugin.wszDefaultPath, packnam); @@ -844,8 +842,6 @@ void SmileyCategoryListType::AddProtoAsCategory(char *acc, const CMStringW &defa const char *packnam = acc; if (mir_strcmp(packnam, "JABBER") == 0) packnam = "JGMail"; - else if (strstr(packnam, "SIP") != nullptr) - packnam = "MSN"; // assemble default path CMStringW paths(FORMAT, L"%s\\Smileys\\nova\\%S.msl", g_plugin.wszDefaultPath, packnam); @@ -902,16 +898,12 @@ void SmileyCategoryListType::AddContactTransportAsCategory(MCONTACT hContact, co _strlwr(trsp); const char *packname = nullptr; - if (strstr(trsp, "msn") != nullptr) - packname = "msn"; - else if (strstr(trsp, "icq") != nullptr) + if (strstr(trsp, "icq") != nullptr) packname = "icq"; else if (strstr(trsp, "yahoo") != nullptr) packname = "yahoo"; else if (strstr(trsp, "aim") != nullptr) packname = "aim"; - else if (strstr(trsp, "lcs") != nullptr) - packname = "msn"; mir_free(trsp); diff --git a/plugins/Variables/src/stdafx.h b/plugins/Variables/src/stdafx.h index c124a6df5b..f7978e52b1 100644 --- a/plugins/Variables/src/stdafx.h +++ b/plugins/Variables/src/stdafx.h @@ -112,7 +112,7 @@ This will not parse the given string, any function, field or special character i This will add a comment in the formatting string. Everything from the # character to the end of the line will be removed. Example: %dbprofile% #this is a useless comment.\r\n\r\n\r\n\ --- Contacts ---\r\n\r\n\ Whenever a functions requires a contact as an argument, you can specify it in two ways:\r\n\r\n\ -(1) Using a unique ID (UIN for ICQ, email for MSN) or, a protocol ID followed by a unique ID in the form , for example or .\r\n\r\n\ +(1) Using a unique ID (UIN for ICQ, JID for Jabber) or, a protocol ID followed by a unique ID in the form , for example or .\r\n\r\n\ (2) Using the contact function:\r\n\ ?contact(x,y)\r\n\ A contact will be searched which will have value x for its property y, y can be one of the following:\r\n\ diff --git a/protocols/CMakeLists.txt b/protocols/CMakeLists.txt index 67d251f504..182f85ee47 100644 --- a/protocols/CMakeLists.txt +++ b/protocols/CMakeLists.txt @@ -8,7 +8,6 @@ add_subdirectory(ICQ-WIM) add_subdirectory(IRCG) add_subdirectory(JabberG) #add_subdirectory(MinecraftDynmap) -add_subdirectory(MSN) #add_subdirectory(Omegle) #add_subdirectory(Sametime) add_subdirectory(SkypeWeb) diff --git a/protocols/Dummy/src/main.cpp b/protocols/Dummy/src/main.cpp index cbb09493b0..41d0f276dd 100644 --- a/protocols/Dummy/src/main.cpp +++ b/protocols/Dummy/src/main.cpp @@ -112,3 +112,12 @@ struct CMPluginWhatsapp : public ACCPROTOPLUGIN } } static g_pluginWhatsapp; + +struct CMPluginMsn : public ACCPROTOPLUGIN +{ + CMPluginMsn() : ACCPROTOPLUGIN("MSN", pluginInfoEx) + { + SetUniqueId("wlid"); + } +} +static g_pluginMsn; diff --git a/protocols/MSN/CMakeLists.txt b/protocols/MSN/CMakeLists.txt deleted file mode 100644 index 58e247810b..0000000000 --- a/protocols/MSN/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -file(GLOB SOURCES "src/*.h" "src/skylogin/*.h" "src/*.cpp" "src/*.c" "src/skylogin/*.c" "res/*.rc") -set(TARGET MSN) -include(${CMAKE_SOURCE_DIR}/cmake/plugin.cmake) -target_link_libraries(${TARGET} libjson ${OPENSSL_LIBRARIES} comctl32.lib) -add_subdirectory(proto_msn) \ No newline at end of file diff --git a/protocols/MSN/docs/gpl.txt b/protocols/MSN/docs/gpl.txt deleted file mode 100644 index 45645b4b53..0000000000 --- a/protocols/MSN/docs/gpl.txt +++ /dev/null @@ -1,340 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. diff --git a/protocols/MSN/docs/history.txt b/protocols/MSN/docs/history.txt deleted file mode 100644 index b3f08ab339..0000000000 --- a/protocols/MSN/docs/history.txt +++ /dev/null @@ -1,529 +0,0 @@ -Legend: -[+] added -[*] changed -[-] deleted -[!] bug fixed - -Version 0.7.1.0 -=============== -[+] All bitmap processing routines were removed in honour of the loadavatars plugin - -Version 0.7.0.1 -=============== -[+] IcoLib Integration - -Version 0.5.0.3 -=============== -[+] added support for custom smileys -[!] bug 0001996 fixed: No Contact Idetification When an Unsupport Feature Even Occurs - -Version 0.5.0.1 -=============== -[!] bug 0002083 fixed: Filetransfer suddenly stops -[!] bug 0002067 fixed: MSN connection fails in gateway mode through http-proxy (with authentication) -[!] bug 0001584 fixed: Crash when sender cancels file send - -Version 0.4.3.1 -=============== -[!] bug 0001887 fixed: Sometimes getting Error 540 from server then disconnect. -[!] fix for the invalid chars in the MSN chat - -Version 0.4.3.0 -=============== -[+] first Unicode version of the MSN plugin -[!] wish 0001015: nudges (thanks Tweetie for a patch) -[!] bug 0001532 fixed: Hotmail does not open from miranda -[!] bug 0001536 fixed: Contacts displayed as online while MSN isn't connected yet - -Version 0.4.1.3 -=============== -[+] support for dropping idle switchboards was added - -Version 0.4.1.2 -=============== -[+] Unicode in the nicknames and groups. Requires clistw & Miranda -0.4.3 bld. 32 or later -[*] avatar setting dialog was moved to View/Change User Details section -[!] fix for initial email notification in the MSNP11 mode -[!] fix for the "User is already in your contact list" error -[!] bug 0001427 fixed: Error 540 during login on slow connections -[!] bug 0001468 fixed: MSN 7.5 users cannot load Miranda users avatar. -[!] BYE command was handled incorrectly -[!] fix for the old MSN file transfers: a received file cannot be opened - -Version 0.4.1.1 -=============== -[!] fixed a bug when Miranda hangs up on exit, when the -clist_modern plugin is installed - -Version 0.4.0.4 -=============== -[!] important bugfix: MSNP11 status messages may block the login -process. -[!] fix for the problems with the keep-alive thread -[*] numerous minor changes and bugfixes. - -Version 0.4.0.3 -=============== -[+] MSNP11 support added -[+] wish #0001239 fixed: MSN Personal Status Messages -[+] WebMessenger detection added -[!] fix for the GPF on exit - -Version 0.4.0.2 -=============== -[!] bug #0000913 fixed: no zero-termination after _snprintf (potential -security issue) -[!] bug #0001176 fixed: can't send messages to the MSN WebMessenger -[!] bug #0001202 fixed: Can't delete received file directory -[!] various memory leaks - -Version 0.4.0.1 -=============== -[+] wish #0000971 fixed: Block & Unblock actions must be separated -[+] wish #0000966 fixed: to show the warning when a contact tries -to establish a audio/video/webcam conference with you. -[-] removed support for old versions of Miranda. -[!] bug #0000996 fixed: File transfer fails when auto-accept is on -and file already exists in destination directory -[!] fixes for minor string allocation problems. - -WARNING!!! All versions since this one require Miranda 0.4.x core. -This is required by the project admins. - -Version 0.1.7.11 -================ -[+] full support for server-side groups and contacts -[+] wish #0000142 fixed: a popup for session disconnection -[+] wish #0000149 fixed: CHAT.DLL support was added for groupchats (thanks noname) -[!] bug #0000458 fixed: Messages disappear when sending to MSN. -[!] bug #0000684 fixed: a file with the Unicode name fails to open after -the successful transfer. -[!] bug #0000761 fixed: apply button in options->popups->msn enabled on -first showing of page -[!] minor fix for P2P file transfers over NAT - -Version 0.1.7.10 -================ -[!] multiple bugfixes for gateways & P2P file transfers -[*] login rules were changed a bit: now Miranda assigns its own -proxy address to SSL connection when the 'Use IE proxy settings' -option is turned off. If you don't use a proxy, nothing gets -changed. -[!] bug #0000580 fixed: the large messages disappear being sent. -[!] bug #0000601 fixed: files with incorrect file names aren't -saved during P2P file transfers. -[!] bug #0000565 fixed: avatar file names becomes different after -using the dbtool, that's why the MSN folder may have the same -avatars several times. -[!] bug #0000437 fixed: expert must have an option to choose the -needed status translation schema for Away, BRB & N/A statuses. -[!] bug #0000541 fixed: if Miranda asks to overwrite a file -during the f/t, a crash can occur when user cancels it. -[*] translation file modification. - -Version 0.1.7.9a -================ -[!] bug #0000564 fixed: MSN Messenger doesn't confirm a file -transfer from Miranda when it goes via the server - -Version 0.1.7.9 -=============== -[+] wish #000519: the ability to create avatars from PNG images. -[+] contact's phone numbers support was added -[+] options dialog was changed to allow a user to see his own avatar. -[-] mSN protocol v.9 support code was removed -[!] option 'File Transfers -> If a file already exists -> Rename' -doesn't work for MSN P2P transfers. -[!] bug #0000092 fixed: 'User Is Typing' event delay is too slow. -[!] bug #0000423 fixed: Send Message To Offline User Return Message Time -Out message -[!] bug #0000444 fixed: the passive P2P transfer fails if MSN Messenger -returns bad IP address -[!] bug #0000554 fixed: fake Hotmail notifications are shown, even -when there's no new mail available -[*] translation file modification. - -Version 0.1.7.8 -=============== -[+] 'View MSN services status' menu item was added to the main menu -[+] Massive improvements for P2P file transfers - -Version 0.1.7.7 -=============== -[!] fixed some bugs with file transfer cancellation. -[*] minor changes in MSN object id handling. -[*] internal changes to the threading mechanism to make it more stable - -Version 0.1.7.6 -=============== -[+] the support for v10 P2P incoming passive direct connections was -added. DC are used when a sender reports the 'Direct-Connect' -connection type in the 'Conn-Type' request fiels. -[+] the support for newly added avatar notifications was added -(works only under 0.3.4+ core). -[+] the MSN/GetAvatarInformation service was added to support the -external avatar readers like tabSRMM etc. -[*] incoming file transfers now use the standard settings for -ports: via Options -> Network, MSN plugin connections. The existing -settings are transferred, but you can use port ranges now to -establish several transfers (one transfer for each contact) -[-] the 'Incoming port' setting was deleted from MSN network options. -[*] blocked contacts from the server lists aren't temporary anymore. -It also avoids the contact list flickering during login. -[!] bugfix (error #0000331): incoming file transfers seem to fail -being initiated from the MSN Messenger; -[!] bugfix (error #0000333): contacts aren't deleted from server when -you press Del key in the contact list - -Version 0.1.7.5 -=============== -[+] full avatars support added: you can set your own avatar -and transfer it to another people. -[!] bugfix for error 0000319: MSN server list manager shall not display -contacts of another protocols, groups also shouldn't be displayed. -[!] bugfix: MSN plugin adds a contact to CL during a search by e-mail. -[!] bugfix: massive fixes for authorization, both for v.9 and v.10 - -Version 0.1.7.4 -=============== -[+] server lists manager was added to Options -> Network -[!] bugfix for timeouts caused by User-Is-Typing notifications. -[!] bugfix (error #000305): MSN protocol freezes Miranda under -Windows 98/ME after login (many thanks to Hilary Cheng for a solution) - -Version 0.1.7.3 -=============== -[!] bugfix for file transfers: the incorrect address was used -during sending a file. -[+] added a 'View profile' contacts popup menu item (thanks koobs for an idea) -[*] numerous fixes for MSN v10. - -Version 0.1.7.2 -=============== -[!] bugfix (error #0000222): you can add yourself using Find/Add contacts. -[!] bugfix (error #0000123): Away and N/A modes are switched. -[!] bugfix: e-mail, password and nickname can't be saved into the -empty profile database. -[!] bugfix: Cancel button does not close the png2dib d/l dialog. - -Version 0.1.7.1 -=============== -[!] critical bugfix (err.#50): typing notification can result to -the infinite timeouts during message sending. - -Version 0.1.7.0 -=============== -[*] plugin lost its compatibility with Miranda 0.2.x due to stability -reasons, version 0.3.x is required. -[+] first version of MSN avatars (user-defined pictures). -[+] added an option to support avatars and d/l the DLL. -[*] PNG support was moved from IE components to libpng. -[+] added an option not to get the nickname from a server, to allow -a user to identify his/her location via a nick. -[!] fixed a problem with the lack of diagnostics on error 715. -[!] some minor bugfixes to file transfers. -[-] support for MSNP v.8 was removed. -[*] translation file was slightly modified. - -Version 0.1.6.8 -=============== -[!] rarely occurred GPF fixed during file transfers -[!] MSN gateway access without a proxy breaks connections -when 'user-is-typing' messages are transferred first. -[!] MSN server closes connection if a PNG command is send to -a switchboard thread -[!] PNG command is not send when a proxy exists. - -Version 0.1.6.7 -=============== -Official version for Miranda 0.3.3 release -[!] minor interface fixes in the options dialog. - -Version 0.1.6.6 (requires SRMM Unicode 1.0.1.3!!!) -=============== -[*] keep-alive support was redesigned to avoid threading problems -[!] bugfix: rare GPF fixed after reconnecting to the MSN server -[!] bugfix for all plugins like AwaySys for sending non-Unicode -messages. - -Version 0.1.6.5 -=============== -[!] bugfix: file receiving was broken. - -Version 0.1.6.4 -=============== -[*] gateway support redesigned to provide the gateway access -without both proxies and MSN Gateway plugin. -[!] a few minor memory leaks were fixed. -[*] minor interface changes in the options dialogs, translation -file was synchronized with the current options dialogs. - -Version 0.1.6.3 -=============== -[!] bugfix: if both built-in gateway and 'Keep connection alive' checkbox -are enabled, disconnection occurs every 2 minutes. -[!] bugfix: a blocked contact becomes unblocked after relogin, if it's -not deleted. - -Version 0.1.6.2 -=============== -[+] option "Use IE proxy settings" was added to simplify life for -users of the MSN Gateway plugin. -[*] options page was divided into two ones: general MSN options and -network options. -[!] bugfix: option 'Disable all contacts not included...' could not be changed -[!] bugfix: GPF sometimes occurred when starting an external mailer -(thanks Daniel for kind cooperation) - -Version 0.1.6.1 -=============== -[+] built-in gateway added (requires Miranda 0.3.3 or later) -[+] 'User is typing' support added (requires SRMM or SRMM MOD plugin) -[+] Full Unicode support for messages was added (requires SRMM MOD Unicode) -[+] MSN main menu item is created in the same section with all -another protocols -[*] 'block/unlock' feature is integrated with Options->Status->Visible -[!] bugfix: a port remains opened after the file trasnfer cancel. -[!] bugfix: if a contact list is very long, all contacts can be -shown in the Offline mode. -[!] a whole bunch of minor bugfixes, changes and improvements. - -Version 0.1.5.11 -================ -[+] Netmeeting support added -[-] MSNP7 support is deleted and this option is locked -[+] option was added to launch a specific program when the new -Hotmail arrives. -[+] option was added to display errors as popups to avoid the -interface locking. -[*] additional diagnostics was added to handle the case when -Internet Explorer is in the Offline mode (thanks to Jonas Svensson). -[*] numerous minor changes in option dialogs and debug messages. - -Version 0.1.5.10 -================ -[!] bug fixed: the "Use MSN protocol v.8" option is not saved -correctly after pressing Apply/Ok in the options dialog if this -option was never saved in the database before. -[*] the source code was changed to allow the compilation without -the Platform SDK. - -Version 0.1.5.9 -=============== -[!] bug in new URL encode mechanism prevents messages from being sent -if the contact's email contains underscores. - -Version 0.1.5.8 -=============== -[+] new MSN Menu item was added to edit user's MSN profile in a browser -[!] bug fixed: authorization problems when many MSN accounts are -used in the same Miranda installation. -[!] bug fixed: if a password contains non-alphabetical characters -(like punctuation, ampersand, plus, etc) the MSNP8 login could return -error 401 Unauthorized. MSNP7 login works Ok. -[!] bug fixed: if a contact changes its status to Invisible, it's -not possible to send messages to him/her anymore. -[*] the popup displaying procedure was changed to avoid so called -'frozen popups'effect. -[*] the "Use MSN protocol v.8" option is now turned on by default. - -Version 0.1.5.7 -=============== -[*] the SSL autorization procedure was changed: now it uses -Internet Explorer's proxy settings to log in. It also resolves -problems with proxies that require authorization (previously you -could see the error 407 in the network log when trying to logon). -In this case MSN plugin tries automatically to apply the login and -the password from the Options -> Network -> MSN. -[*] cookies usage had been turned off, it means that you can logon -automatically into MSN Messenger and simultaneously logon using -Miranda under different account. -[*] error diagnostic has been slightly enhanced. -[*] WinInet.dll now gets unloaded from memory after login to use -less memory. -[!] bug fixed: attemp to find/add a contact that already exists in -your contact list resulted to strange error message. - -Version 0.1.5.6 -=============== -[+] added the external IP autodetection if the protocol v.8 is -used. It can significantly simplify life if you have the dynamic -external IP address. -[*] minor fixes in the Options dialog - -Version 0.1.5.5 -=============== -[!] bug fixed: 'Cancel' button does not stop the file transfer -[!] bug fixed: contacts with leading digits in the e-mail are not -processed properly. -[!] bug fixed: you cannot send messages to a person if you tried to -send the first message in the Invisible mode. - -Version 0.1.5.4 -=============== -[*] the file senging does not require to talk anymore -[!] bug fixed: fast sending of two or more messages results to the GPF - -Version 0.1.5.3 -=============== -[!] bug fixed: memory corruption in multichat mode - -Version 0.1.5.2 -=============== -[!] bug fixed: LastSeen plugin shows the incorrect time of contact's logout. -[!] bug fixed: you cannot block a contact if it's offline (even if you're online). -[!] bug fixed: when MSNP8 is used, some contacts are skipped at all during -the synchronization procedure. - -Version 0.1.5.1 -=============== -[!] bug fixed: 'Display menu' option does not really disable the MSN menu -[*] translate-msn.txt updated. -[+] minor changes in the options dialog - -Version 0.1.5.0 -=============== -[+] MSN Protocol v.8 support added. -[+] a "Invite to chat" contact menu item is added. -[*] multichat support is fully redesigned and fixed. -[*] multiple file transfers are fully redesigned and fixed. -[!] bug fixed: when you set your own nickname with spaces, it appears in -the options dialog URL-encoded (with %20 instead of a space char). -[!] bug fixed: opened switchboard sessions weren't closed when you go -offline without closing Miranda. - -Version 0.1.4.12 -================ -[!] bug fixed: Hotmail inbox is not shown after a clicking on a Hotmail -popup under Windows 9x -[!] bug fixed: a user's own nickname is not properly saved after changing. - -Version 0.1.4.11 -================ -[*] changed blocked user visualization method: nickname is never got -corrupted anymore, visibility mode is used now. M will show blocked -contacts in italic by default, but you can tune the font/color/style of -the 'invisible' users at the Options/Contact List/List text tab, for item -called "Online contacts for whom you have a different visibility". -[!] bug fixed: an authorization is rerequested after deleting a contact. -[!] bug fixed: the very long nickname can be set, and then cut off when -saving to the database or the server -[!] bug fixed: when viewing the user options, an 'Updating...' string is -blinking all the time. - -Version 0.1.4.10 -================ -[+] option added to block all another MSN contacts. Attention: you -must be online to edit this option. -[!] search-by-email mechanism fixed. -[!] bug fixed: user email is shown in popups instead of nickname -[!] bug fixed: when migrating from previous versions of MSN plugin -a lot of authorization requests are shown. - -Version 0.1.4.9 (May Day Build :) -=============== -[!] bug fixed: "First message delivered" displayed as a message -box if the Popup plugin is not installed. -[!] bug fixed: contact's e-mail is shown instead of a user's -nick name when "First message delivered" popup is shown - -Version 0.1.4.8 -=============== -[!] bug fixed: the first message get lost when another message -editor window is opened. -[+] "First message delivered" popup can be enabled separately. - -Version 0.1.4.7 -=============== -[+] separate timeout for Hotmail popups added -[*] options layout changed: all popup options are grouped on the -separate options page: Options/Popups/MSN. -[!] bug fixed: Hotmail popups got 'frozen' after being clicked - -Version 0.1.4.6 -=============== -[!] bug fixed: offline messages are get lost without notification - -Version 0.1.4.5 -=============== -[*] first message sending routine is changed to release message editor immediately. -This does not fix the delay problem completely, but user will never see the timeout -dialog again. If the Popup plugin is installed, user will be notified using a popup -message when the first message will be really delivered. -[!] bugfix: when you go offline from the online mode, both modes are disabled in -the plugin's statuses menu. -[!] minor interface bugfixes in the options dialog - -Version 0.1.4.4 -=============== -MSN plugin is added as a protocol to the Miranda's sources CVS tree. -[!] fixed a problem with sending raw data to the HTTP proxy. -[+] new option: popup timeouts. Requires Popup plugin v. 1.0.1.9 or later -[*] popups interface changed not to call Web browser when 'typing' popups are clicked -[*] FAQ is added to the readme.txt - -Version 0.1.4.3 -=============== -[+] new option: display 'user is typing' messages as popups if an appropriate plugin is installed -[+] new option: send a font color/style alongside with messages. This -option also fixes a problem with displaying messages in the standard -Windows Messenger using an ugly/incorrect font/size/style. -[!] fixed a memory leak when calling popups. - -Version 0.1.4.2 -=============== - -A couple of bugfixes from Pixador (thank him for a patch): -[!] multiple MSN plugins do not work together. -[!] GPF when user presses Block/Unblock several times; - -Version 0.1.4.1 -=============== - -Numerous bugfixes: -[!] file sending/receiving almost works now, excluding multi-file sending from Miranda to WM. -[!] a lot of memory leaks, double deletions, memory corruptions etc. fixed. - -Version 0.1.4.0 -=============== - -Entering next major release: -[+] proxy support added; -[+] network traffic logging added; -[!] fixed bug with 100% processor usage; -[!] fixed bug with displaying incorrect file names in the file accept dialog. - -Version 0.1.3.4 -=============== - -[*] code of Authorization/Deny changed to show an authorization request only once; -[!] memory corruption fixed; -[!] GPF with blocking/unblocking fixed. - -Version 0.1.3.3 -=============== - -[*] language of plugin is changed to C++; -[!] bug with offline authorization fixed; - -Version 0.1.3.0 -=============== - -[!] fixed a bug with GPF on exit; -[!] fixed a bug with contacts blocking/unblocking; -[!] fixed a bug with strange crashes time to time; -[!] fixed a memory leak; -[!] fixed the ANSI <-> UTF conversion scheme to avoid problems with old versions of Windows (like 95 OSR2). - -Version 0.1.2.1 -=============== - -Written by Rako Shizuka. -The second version with extended functionality: file transfers, blocking etc. - -Version 0.1.2.0 -=============== - -Written by Richard Hughes aka cyreve. -The first version with basic functionality diff --git a/protocols/MSN/docs/readme.txt b/protocols/MSN/docs/readme.txt deleted file mode 100644 index 8c0a035958..0000000000 --- a/protocols/MSN/docs/readme.txt +++ /dev/null @@ -1,125 +0,0 @@ -Protocol for the Miranda IM for communicating with users of -the MSN Messenger protocol. - -Copyright (C) 2003-5 George Hazan (ghazan@postman.ru) -Copyright (C) 2001-3 Richard Hughes (original version), - -Miranda IM: the free icq client for MS Windows -Copyright (C) 2002-5 Martin Oberg, Robert Rainwater, Sam Kothari, Lyon Lim -Copyright (C) 2000-2 Richard Hughes, Roland Rabien & Tristan Van de Vreede - -This program is free software; you can redistribute it and/or -modify it under the terms of the GNU General Public License -as published by the Free Software Foundation; either version 2 -of the License, or (at your option) any later version. - -This program is distributed in the hope that it will be useful, -but WITHOUT ANY WARRANTY; without even the implied warranty of -MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -GNU General Public License for more details. - -You should have received a copy of the GNU General Public License -along with this program; if not, write to the Free Software -Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. - -================================================================================ -Useful plugins which can help you to work with the MSN protocol -================================================================================ - -Popup 1.0.1.9 -(http://miranda-im.org/download/details.php?action=viewfile&id=299) -Popup Plus 2.0.3.8 -(http://miranda-im.org/download/details.php?action=viewfile&id=1170) ----------------------- -All notifications in the MSN plugin are made using the Popup -plugin. After the Popup plugin installation there will be some -options available for tuning, you will find them in -Options/Popups/MSN tab. - -Chat 0.2.0.2 -(http://miranda-im.org/download/details.php?action=viewfile&id=1309) ----------------------- -This plugin allows you to support group chats with many MSN users. Without -that plugin you can't leave a chat been being invited, so if you plan to -use groupchats, this plugin is essential. - -SRMM (Unicode) 1.0.4.3 -(http://miranda-im.org/download/details.php?action=viewfile&id=1136) -tabSRMM (Unicode) 0.9.9.95 -(http://hell.at.eu.org/forums) ----------------------- -They both are true Unicode-aware message editors. Using them you can -send/receive Unicode messages, so you won't be dependent on the -codepages, encodings etc. They work only under NT4/Win2k/XP/2003. - -Unicode History Viewer -(http://miranda-im.org/download/details.php?action=viewfile&id=1109) ----------------------- -If you work under NT4/Win2k/XP/2003, and you can send/receive messages -in Unicode, the standard history viewer will show question-marks when -Unicode characters cannot be mapped to the current codepage. In this -case you can use this plugin to have no problems at all. - -================================================================================ -Frequently asked questions. -================================================================================ - -Q1. I want to use the OpenSSL libraries, but plugin can't find or load -them. Where can I find the valid DLLs for Win32? - -A1. http://www.slproweb.com/products/Win32OpenSSL.html -Use the latest stable version. - ----------------------------------------------------------------- - -Q2. I get strange errors with connection, proxies, file sending/ -receiving. How can I find the reason of the problem? - -A2. Some useful information is grouped in the networking-msn.txt. -If it does not help, try to create a network log. Go to -Options/Network and press a "Log Options" button (the only button -in the upper-right corner). Very often this log helps users to -find a hidden diagnostic messages, or simply understand what is -happening concretely. If a problem persists, you can contact me, -and upon request, send me (zipped!) a piece of this log. - ----------------------------------------------------------------- - -Q3. My Miranda logged into the MSN network successfully, but I -cannot send a message, and a contact's menu item 'Message' is blocked. - -A3. The problem is in the Conversation Style Messaging plugin. -CSM plugin is incompatible with the MSN plugin because of the -error in it. Disable it and/or delete, if you want to use the MSN -protocol - ----------------------------------------------------------------- - -Q4. I want to compile your sources, but got a lot of errors. - -A4. First, you should download new Miranda's SDK sources, and -place the MSN plugin's sources into Protocol\MSN subdirectory -(accordingly to the Miranda's directory tree). Notice that MSN is -not a plugin anymore, it's stored among another protocols. Look at -http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/miranda-icq to -view the complete directory structure. - -Then download the Popup plugin, and unzip header file m_popup.h -to the SDK\headers_c directory. Then you should be able to compile -MSN plugin without problems. - -Installation of Microsoft Platform SDK is not required to -compile MSN plugin sources - ----------------------------------------------------------------- - -Q5. When I receive an authorization request, my own nickname is -shown in the contact list. Is it a bug? - -A5. Yes, it is, but it cannot be solved now. Miranda uses UINs -to identify a contact, but because MSN protocol have no UINs, -your own nickname (as a default one) is shown. - ----------------------------------------------------------------- - -WMBR, George Hazan (ghazan@postman.ru). diff --git a/protocols/MSN/docs/todo.txt b/protocols/MSN/docs/todo.txt deleted file mode 100644 index 627c0ae56b..0000000000 --- a/protocols/MSN/docs/todo.txt +++ /dev/null @@ -1,10 +0,0 @@ -There're most important problems and known bugs: - -1. File transfers: -- problems with the multihomed machines. -- better diagnostics. - -If you know a problem that is not listed here, report it via e-mail. - -WMBR, George Hazan -ghazan@postman.ru diff --git a/protocols/MSN/msn.vcxproj b/protocols/MSN/msn.vcxproj deleted file mode 100644 index 67ec5aa81b..0000000000 --- a/protocols/MSN/msn.vcxproj +++ /dev/null @@ -1,43 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - MSN - {7B0F213E-C15E-4219-8AE5-49DD3D3D553D} - - - - - - - libeay32.lib;%(AdditionalDependencies) - - - - - NotUsing - - - - - {f6a9340e-b8d9-4c75-be30-47dc66d0abc7} - - - diff --git a/protocols/MSN/msn.vcxproj.filters b/protocols/MSN/msn.vcxproj.filters deleted file mode 100644 index 7ef90967de..0000000000 --- a/protocols/MSN/msn.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Header Files - - - Source Files - - - Resource Files - - - Resource Files - - - diff --git a/protocols/MSN/proto_msn/CMakeLists.txt b/protocols/MSN/proto_msn/CMakeLists.txt deleted file mode 100644 index 7df814f1c5..0000000000 --- a/protocols/MSN/proto_msn/CMakeLists.txt +++ /dev/null @@ -1,2 +0,0 @@ -set(TARGET Proto_MSN) -include(${CMAKE_SOURCE_DIR}/cmake/icons.cmake) \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN.vcxproj b/protocols/MSN/proto_msn/Proto_MSN.vcxproj deleted file mode 100644 index 24dc5a353d..0000000000 --- a/protocols/MSN/proto_msn/Proto_MSN.vcxproj +++ /dev/null @@ -1,28 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - Proto_MSN - {7BC6C3E7-2B17-4718-A82E-084798710E14} - - - - - \ No newline at end of file diff --git a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters b/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters deleted file mode 100644 index 1ed30e13d0..0000000000 --- a/protocols/MSN/proto_msn/Proto_MSN.vcxproj.filters +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - Header Files - - - Source Files - - - Resource Files - - - Resource Files - - - \ No newline at end of file diff --git a/protocols/MSN/proto_msn/res/Away.ico b/protocols/MSN/proto_msn/res/Away.ico deleted file mode 100644 index 861c161ed1..0000000000 Binary files a/protocols/MSN/proto_msn/res/Away.ico and /dev/null differ diff --git a/protocols/MSN/proto_msn/res/Invisible.ico b/protocols/MSN/proto_msn/res/Invisible.ico deleted file mode 100644 index 382e3bf50d..0000000000 Binary files a/protocols/MSN/proto_msn/res/Invisible.ico and /dev/null differ diff --git a/protocols/MSN/proto_msn/res/Occupied.ico b/protocols/MSN/proto_msn/res/Occupied.ico deleted file mode 100644 index 47c63a4214..0000000000 Binary files a/protocols/MSN/proto_msn/res/Occupied.ico and /dev/null differ diff --git a/protocols/MSN/proto_msn/res/Offline.ico b/protocols/MSN/proto_msn/res/Offline.ico deleted file mode 100644 index d52328aa47..0000000000 Binary files a/protocols/MSN/proto_msn/res/Offline.ico and /dev/null differ diff --git a/protocols/MSN/proto_msn/res/Online.ico b/protocols/MSN/proto_msn/res/Online.ico deleted file mode 100644 index 7388d3928f..0000000000 Binary files a/protocols/MSN/proto_msn/res/Online.ico and /dev/null differ diff --git a/protocols/MSN/proto_msn/res/Proto_MSN.rc b/protocols/MSN/proto_msn/res/Proto_MSN.rc deleted file mode 100644 index c35fd121b9..0000000000 --- a/protocols/MSN/proto_msn/res/Proto_MSN.rc +++ /dev/null @@ -1,74 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "..\src\resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include "afxres.h" - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Russian (Russia) resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS) -LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\\src\\resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include ""afxres.h""\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_ICON1 ICON "Offline.ico" -IDI_ICON2 ICON "Online.ico" -IDI_ICON3 ICON "Away.ico" -IDI_ICON4 ICON "Invisible.ico" -IDI_ICON6 ICON "Occupied.ico" - -#endif // Russian (Russia) resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/protocols/MSN/proto_msn/src/resource.h b/protocols/MSN/proto_msn/src/resource.h deleted file mode 100644 index 72c197a868..0000000000 --- a/protocols/MSN/proto_msn/src/resource.h +++ /dev/null @@ -1,20 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by Proto_MSN.rc -// -#define IDI_ICON1 105 -#define IDI_ICON2 104 -#define IDI_ICON3 128 -#define IDI_ICON4 130 -#define IDI_ICON6 159 - -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_NEXT_RESOURCE_VALUE 109 -#define _APS_NEXT_COMMAND_VALUE 40001 -#define _APS_NEXT_CONTROL_VALUE 1001 -#define _APS_NEXT_SYMED_VALUE 101 -#endif -#endif diff --git a/protocols/MSN/res/inbox.ico b/protocols/MSN/res/inbox.ico deleted file mode 100644 index 7a5e461f6f..0000000000 Binary files a/protocols/MSN/res/inbox.ico and /dev/null differ diff --git a/protocols/MSN/res/invite.ico b/protocols/MSN/res/invite.ico deleted file mode 100644 index 25bd23be86..0000000000 Binary files a/protocols/MSN/res/invite.ico and /dev/null differ diff --git a/protocols/MSN/res/list_al.ico b/protocols/MSN/res/list_al.ico deleted file mode 100644 index 05bd93fac4..0000000000 Binary files a/protocols/MSN/res/list_al.ico and /dev/null differ diff --git a/protocols/MSN/res/list_bl.ico b/protocols/MSN/res/list_bl.ico deleted file mode 100644 index 58d39b6fcf..0000000000 Binary files a/protocols/MSN/res/list_bl.ico and /dev/null differ diff --git a/protocols/MSN/res/list_fl.ico b/protocols/MSN/res/list_fl.ico deleted file mode 100644 index fb77874fc4..0000000000 Binary files a/protocols/MSN/res/list_fl.ico and /dev/null differ diff --git a/protocols/MSN/res/list_ph.ico b/protocols/MSN/res/list_ph.ico deleted file mode 100644 index da5a991a0c..0000000000 Binary files a/protocols/MSN/res/list_ph.ico and /dev/null differ diff --git a/protocols/MSN/res/list_rl.ico b/protocols/MSN/res/list_rl.ico deleted file mode 100644 index 1e22656d1d..0000000000 Binary files a/protocols/MSN/res/list_rl.ico and /dev/null differ diff --git a/protocols/MSN/res/msn.ico b/protocols/MSN/res/msn.ico deleted file mode 100644 index 818824f3a0..0000000000 Binary files a/protocols/MSN/res/msn.ico and /dev/null differ diff --git a/protocols/MSN/res/msn.rc b/protocols/MSN/res/msn.rc deleted file mode 100644 index a59f01f92e..0000000000 --- a/protocols/MSN/res/msn.rc +++ /dev/null @@ -1,368 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#include "..\src\resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#include - -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -///////////////////////////////////////////////////////////////////////////// -// Neutral resources - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU) -LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL -#pragma code_page(1252) - -///////////////////////////////////////////////////////////////////////////// -// -// Dialog -// - -IDD_OPT_MSN DIALOGEX 0, 0, 304, 176 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "MSN",IDC_STMSNGROUP,5,0,298,84,WS_GROUP - RTEXT "Live ID:",IDC_STATIC,16,20,52,8 - EDITTEXT IDC_HANDLE,72,18,100,12,ES_AUTOHSCROLL - RTEXT "Password:",IDC_STATIC,16,36,52,8 - EDITTEXT IDC_PASSWORD,72,34,100,12,ES_PASSWORD | ES_AUTOHSCROLL - RTEXT "Nickname:",IDC_STATIC,16,52,52,8,NOT WS_VISIBLE - EDITTEXT IDC_HANDLE2,72,50,100,12,ES_AUTOHSCROLL | NOT WS_VISIBLE - CONTROL "Create a new Windows Live account",IDC_NEWMSNACCOUNTLINK, - "Hyperlink",WS_TABSTOP,21,68,208,8 - GROUPBOX "Expert",IDC_STATIC,4,84,298,88,WS_GROUP - CONTROL "Send message font color/size info inside messages",IDC_SENDFONTINFO, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,95,280,10 - CONTROL "Disable all contacts not included into my contact list",IDC_DISABLE_ANOTHER_CONTACTS, - "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,12,106,280,10 - CONTROL "Manage server groups",IDC_MANAGEGROUPS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,116,280,10 - CONTROL "Allow people on my contact list send messages to mobile device",IDC_MOBILESEND, - "Button",BS_AUTOCHECKBOX | NOT WS_VISIBLE | WS_TABSTOP,12,126,280,10 - CONTROL "Run the following application when new Hotmail arrives",IDC_RUN_APP_ON_HOTMAIL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,137,280,10 - EDITTEXT IDC_MAILER_APP,22,153,237,12,ES_AUTOHSCROLL - PUSHBUTTON "...",IDC_ENTER_MAILER_APP,265,153,15,12 -END - -IDD_OPT_MSN_CONN DIALOGEX 0, 0, 304, 127 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Connection settings",IDC_STATIC,4,3,298,64 - RTEXT "Direct:",IDC_STATIC,10,18,52,8 - EDITTEXT IDC_DIRECTSERVER,68,16,135,12,ES_AUTOHSCROLL - LTEXT " 443",IDC_STATIC,209,16,28,12,SS_SUNKEN - RTEXT "Gateway:",IDC_STATIC,10,32,52,8 - EDITTEXT IDC_GATEWAYSERVER,68,30,135,12,ES_AUTOHSCROLL - CONTROL " 443",IDC_STATIC,"Static",SS_SIMPLE | SS_SUNKEN | WS_GROUP,209,30,28,12 - PUSHBUTTON "Reset",IDC_RESETSERVER,244,16,48,12 - CONTROL "Notify me when a message delivery has failed",IDC_SLOWSEND, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,10,49,285,8 - GROUPBOX "Incoming file transfers",IDC_STATIC,4,74,298,48 - COMBOBOX IDC_HOSTOPT,10,86,285,30,CBS_DROPDOWNLIST | WS_TABSTOP - RTEXT "Your host (or router):",IDC_STATIC,10,103,90,8 - EDITTEXT IDC_YOURHOST,105,102,190,12,ES_AUTOHSCROLL -END - -IDD_LISTSMGR DIALOGEX 0, 0, 304, 228 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Server List Manager",IDC_STATIC,4,0,298,224 - CONTROL "",IDC_LIST,"CListControl",WS_TABSTOP | 0x1f3,9,12,287,169,WS_EX_CLIENTEDGE - ICON "",IDC_ICON_LC,10,184,20,20,SS_REALSIZEIMAGE - LTEXT "Contact is on your local list",IDC_STATIC,28,184,144,8 - ICON "",IDC_ICON_FL,10,197,20,20,SS_REALSIZEIMAGE - LTEXT "Contact is included into your server list",IDC_STATIC,28,197,144,8 - ICON "",IDC_ICON_AL,187,184,20,20,SS_REALSIZEIMAGE - LTEXT "Allowed (active) contact",IDC_STATIC,204,184,82,8 - ICON "",IDC_ICON_BL,187,196,20,20,SS_REALSIZEIMAGE - LTEXT "Blocked contact",IDC_STATIC,204,196,82,8 - ICON "",IDC_ICON_RL,10,209,21,20,SS_REALSIZEIMAGE - LTEXT "Somebody included you in his/her server list",IDC_STATIC,28,209,144,8 - PUSHBUTTON "Refresh",IDC_LISTREFRESH,218,209,80,13 -END - -IDD_OPT_NOTIFY DIALOGEX 0, 0, 289, 126 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - GROUPBOX "Hotmail",IDC_STATIC,5,7,262,60 - CONTROL "Enable Popup notifications",IDC_DISABLEHOTMAILPOPUP, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,18,245,10 - CONTROL "Enable Contact List notifications",IDC_DISABLEHOTMAILCL, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,30,245,10 - CONTROL "Enable Tray notifications",IDC_DISABLEHOTMAILTRAY, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,41,245,10 - CONTROL "Ignore new messages not in Inbox folder",IDC_DISABLEHOTJUNK, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,52,245,10 - GROUPBOX "Other",IDC_STATIC,5,68,262,49 - CONTROL "Display errors using popups",IDC_ERRORS_USING_POPUPS, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,79,245,10 - CONTROL "Enable 'Chat Session Established' popup",IDC_NOTIFY_FIRSTMSG, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,92,245,10 - CONTROL "Enable 'Contact left channel' popup",IDC_NOTIFY_ENDSESSION, - "Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,105,245,8 -END - -IDD_SETNICKNAME DIALOGEX 0, 0, 187, 42 -STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU -CAPTION "Set Nickname" -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - EDITTEXT IDC_NICKNAME,5,5,177,12,ES_AUTOHSCROLL - DEFPUSHBUTTON "OK",IDOK,36,23,50,14 - PUSHBUTTON "Cancel",IDCANCEL,102,23,50,14 -END - -IDD_USEROPTS DIALOGEX 0, 0, 224, 132 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 0, 0, 0x1 -BEGIN - CONTROL "",IDC_CCARD_TAB1,"SysTabControl32",0x0,0,0,223,117 -END - -IDD_CARD_GEN DIALOGEX 0, 0, 278, 130 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - LTEXT "Mobile Device (used for SMS)",IDC_STATIC,7,8,126,8 - EDITTEXT IDC_CARD_GEN_PHONE,7,17,122,12,ES_AUTOHSCROLL - EDITTEXT IDC_CARD_GEN_IM2,7,73,125,13,ES_AUTOHSCROLL - LTEXT "Spouse/Partner",IDC_STATIC,7,64,122,8 - EDITTEXT IDC_EDIT5,143,18,121,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT6,145,74,118,12,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT7,144,46,119,12,ES_AUTOHSCROLL - LTEXT "Middle Name",IDC_STATIC,145,35,117,8 - LTEXT "First Name",IDC_STATIC,143,8,120,8 - LTEXT "Last Name",IDC_STATIC,145,63,116,8 - COMBOBOX IDC_COMBO1,7,100,67,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO2,77,100,28,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_CARD_GEN_IM3,105,100,25,12,ES_AUTOHSCROLL - COMBOBOX IDC_COMBO3,144,100,67,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - COMBOBOX IDC_COMBO4,212,100,28,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP - EDITTEXT IDC_CARD_GEN_IM4,240,100,25,12,ES_AUTOHSCROLL - LTEXT "Anniversary",IDC_STATIC,7,91,123,8 - LTEXT "Birthday",IDC_STATIC,145,91,123,8 - EDITTEXT IDC_CARD_GEN_IM5,7,47,125,13,ES_AUTOHSCROLL - LTEXT "Nickname",IDC_STATIC,7,38,94,8 -END - -IDD_CARD_CONTACT DIALOGEX 0, 0, 344, 156 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_POPUP | WS_SYSMENU -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - EDITTEXT IDC_EDIT1,7,19,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT2,7,48,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT3,7,77,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT4,7,102,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT5,7,123,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT6,130,18,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT7,130,46,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT8,130,74,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT9,130,100,107,14,ES_AUTOHSCROLL - EDITTEXT IDC_EDIT10,130,121,107,14,ES_AUTOHSCROLL - LTEXT "Middle Name",IDC_STATIC,129,7,41,8 - LTEXT "First Name",IDC_STATIC,7,7,35,8 - LTEXT "Last Name",IDC_STATIC,7,36,34,8 -END - -IDD_ACCMGRUI DIALOGEX 0, 0, 186, 134 -STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD | WS_VISIBLE -EXSTYLE WS_EX_CONTROLPARENT -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - LTEXT "Live ID:",IDC_STATIC,0,0,53,12 - EDITTEXT IDC_HANDLE,54,0,131,12,ES_AUTOHSCROLL - LTEXT "Password:",IDC_STATIC,0,16,53,12 - EDITTEXT IDC_PASSWORD,54,16,131,12,ES_PASSWORD | ES_AUTOHSCROLL - CONTROL "Create a new Windows Live account",IDC_NEWMSNACCOUNTLINK, - "Hyperlink",WS_TABSTOP,0,60,183,12 - LTEXT "Place:",IDC_STATIC,0,31,53,12 - EDITTEXT IDC_PLACE,54,31,131,12,ES_AUTOHSCROLL -END - -IDD_DELETECONTACT DIALOGEX 0, 0, 213, 76 -STYLE DS_SETFONT | DS_MODALFRAME | DS_SETFOREGROUND | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION -CAPTION "MSN Delete Contact" -FONT 8, "MS Shell Dlg", 400, 0, 0x1 -BEGIN - DEFPUSHBUTTON "OK",IDOK,82,55,50,14 - CONTROL "Remove from Hotmail Address book",IDC_REMOVEHOT,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,32,199,10 - CONTROL "Block Contact",IDC_REMOVEBLOCK,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,18,199,10 -END - -IDD_CHATROOM_INVITE DIALOGEX 0, 0, 190, 179 -STYLE DS_SETFONT | DS_3DLOOK | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CLIPCHILDREN | WS_CAPTION | WS_SYSMENU -EXSTYLE WS_EX_TOPMOST -CAPTION "Invite Contact To Chat" -FONT 8, "MS Shell Dlg", 0, 0, 0x0 -BEGIN - LTEXT "Live ID",-1,7,128,43,9 - PUSHBUTTON "&Invite",IDOK,29,159,46,14 - PUSHBUTTON "&Cancel",IDCANCEL,112,159,45,14 - CONTROL "",IDC_CCLIST,"CListControl",WS_TABSTOP | 0x16f,7,4,174,119,WS_EX_CLIENTEDGE - EDITTEXT IDC_EDITSCR,7,138,121,12,ES_AUTOHSCROLL - PUSHBUTTON "Add",IDC_ADDSCR,133,136,49,14 -END - - -///////////////////////////////////////////////////////////////////////////// -// -// DESIGNINFO -// - -#ifdef APSTUDIO_INVOKED -GUIDELINES DESIGNINFO -BEGIN - IDD_OPT_MSN, DIALOG - BEGIN - VERTGUIDE, 12 - VERTGUIDE, 292 - END - - IDD_OPT_MSN_CONN, DIALOG - BEGIN - VERTGUIDE, 10 - VERTGUIDE, 68 - VERTGUIDE, 203 - VERTGUIDE, 209 - VERTGUIDE, 237 - VERTGUIDE, 295 - END - - IDD_LISTSMGR, DIALOG - BEGIN - END - - IDD_OPT_NOTIFY, DIALOG - BEGIN - RIGHTMARGIN, 276 - VERTGUIDE, 5 - VERTGUIDE, 14 - VERTGUIDE, 259 - VERTGUIDE, 267 - BOTTOMMARGIN, 123 - END - - IDD_SETNICKNAME, DIALOG - BEGIN - END - - IDD_USEROPTS, DIALOG - BEGIN - END - - IDD_CARD_GEN, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 271 - TOPMARGIN, 7 - BOTTOMMARGIN, 123 - END - - IDD_CARD_CONTACT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 337 - TOPMARGIN, 7 - BOTTOMMARGIN, 149 - END - - IDD_ACCMGRUI, DIALOG - BEGIN - RIGHTMARGIN, 183 - TOPMARGIN, 7 - BOTTOMMARGIN, 106 - END - - IDD_DELETECONTACT, DIALOG - BEGIN - LEFTMARGIN, 7 - RIGHTMARGIN, 206 - TOPMARGIN, 7 - BOTTOMMARGIN, 69 - END - - IDD_CHATROOM_INVITE, DIALOG - BEGIN - RIGHTMARGIN, 188 - TOPMARGIN, 4 - BOTTOMMARGIN, 173 - END -END -#endif // APSTUDIO_INVOKED - - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. -IDI_MSN ICON "msn.ico" -IDI_MSNBLOCK ICON "msnblock.ico" -IDI_SERVICES ICON "services.ico" -IDI_INBOX ICON "inbox.ico" -IDI_INVITE ICON "invite.ico" -IDI_NETMEETING ICON "netmeeting.ico" -IDI_PROFILE ICON "profile.ico" -IDI_LIST_FL ICON "list_fl.ico" -IDI_LIST_AL ICON "list_al.ico" -IDI_LIST_BL ICON "list_bl.ico" -IDI_LIST_RL ICON "list_rl.ico" -IDI_LIST_LC ICON "list_ph.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// - -1 TEXTINCLUDE -BEGIN - "..\\src\\resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#include \r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -#endif // Neutral resources -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED - diff --git a/protocols/MSN/res/msnblock.ico b/protocols/MSN/res/msnblock.ico deleted file mode 100644 index 26c0a6d040..0000000000 Binary files a/protocols/MSN/res/msnblock.ico and /dev/null differ diff --git a/protocols/MSN/res/netmeeting.ico b/protocols/MSN/res/netmeeting.ico deleted file mode 100644 index 40e341ec16..0000000000 Binary files a/protocols/MSN/res/netmeeting.ico and /dev/null differ diff --git a/protocols/MSN/res/profile.ico b/protocols/MSN/res/profile.ico deleted file mode 100644 index 2056f57798..0000000000 Binary files a/protocols/MSN/res/profile.ico and /dev/null differ diff --git a/protocols/MSN/res/services.ico b/protocols/MSN/res/services.ico deleted file mode 100644 index 2aca9a8bb4..0000000000 Binary files a/protocols/MSN/res/services.ico and /dev/null differ diff --git a/protocols/MSN/res/version.rc b/protocols/MSN/res/version.rc deleted file mode 100644 index 5a5ddd63ed..0000000000 --- a/protocols/MSN/res/version.rc +++ /dev/null @@ -1,9 +0,0 @@ -// Microsoft Visual C++ generated resource script. -// -#ifdef APSTUDIO_INVOKED -#error this file is not editable by Microsoft Visual C++ -#endif //APSTUDIO_INVOKED - -#include "..\src\version.h" - -#include "..\..\build\Version.rc" diff --git a/protocols/MSN/src/ezxml.c b/protocols/MSN/src/ezxml.c deleted file mode 100644 index 6f13194177..0000000000 --- a/protocols/MSN/src/ezxml.c +++ /dev/null @@ -1,969 +0,0 @@ -/* ezxml.c - * - * Copyright 2004-2006 Aaron Voisine - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be included - * in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. - * IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY - * CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, - * TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE - * SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - */ - -#if defined(_DEBUG) && !defined(__GNUC__) - #define _CRTDBG_MAP_ALLOC - #include - #include -#else - #include -#endif - -#include -#include -#include -#include -#include - -#include "ezxml.h" - -#ifndef SIZE_MAX -#define SIZE_MAX UINT_MAX -#endif - -#pragma warning(disable:4706) - -#define EZXML_WS "\t\r\n " // whitespace -#define EZXML_ERRL 128 // maximum error string length - -typedef struct ezxml_root *ezxml_root_t; -struct ezxml_root { // additional data for the root tag - struct ezxml xml; // is a super-struct built on top of ezxml struct - ezxml_t cur; // current xml tree insertion point - char *m; // original xml string - size_t len; // length of allocated memory for mmap, -1 for malloc - char *u; // UTF-8 conversion of string if original was UTF-16 - char *s; // start of work area - char *e; // end of work area - char **ent; // general entities (ampersand sequences) - char ***attr; // default attributes - char ***pi; // processing instructions - short standalone; // non-zero if - char err[EZXML_ERRL]; // error string -}; - -char *EZXML_NIL[] = { NULL }; // empty, null terminated array of strings - -// returns the first child tag with the given name or NULL if not found -ezxml_t ezxml_child(ezxml_t xml, const char *name) -{ - xml = (xml) ? xml->child : NULL; - while (xml && strcmp(name, xml->name)) xml = xml->sibling; - return xml; -} - -// returns the Nth tag with the same name in the same subsection or NULL if not -// found -ezxml_t ezxml_idx(ezxml_t xml, int idx) -{ - for (; xml && idx; idx--) xml = xml->next; - return xml; -} - -// returns the value of the requested tag attribute or NULL if not found -const char *ezxml_attr(ezxml_t xml, const char *attr) -{ - int i = 0, j = 1; - ezxml_root_t root = (ezxml_root_t)xml; - - if (! xml || ! xml->attr) return NULL; - while (xml->attr[i] && strcmp(attr, xml->attr[i])) i += 2; - if (xml->attr[i]) return xml->attr[i + 1]; // found attribute - - while (root->xml.parent) root = (ezxml_root_t)root->xml.parent; // root tag - for (i = 0; root->attr[i] && strcmp(xml->name, root->attr[i][0]); i++); - if (! root->attr[i]) return NULL; // no matching default attributes - while (root->attr[i][j] && strcmp(attr, root->attr[i][j])) j += 3; - return (root->attr[i][j]) ? root->attr[i][j + 1] : NULL; // found default -} - -// same as ezxml_get but takes an already initialized va_list -ezxml_t ezxml_vget(ezxml_t xml, va_list ap) -{ - char *name = va_arg(ap, char *); - int idx = -1; - - if (name && *name) { - idx = va_arg(ap, int); - xml = ezxml_child(xml, name); - } - return (idx < 0) ? xml : ezxml_vget(ezxml_idx(xml, idx), ap); -} - -// Traverses the xml tree to retrieve a specific subtag. Takes a variable -// length list of tag names and indexes. The argument list must be terminated -// by either an index of -1 or an empty string tag name. Example: -// title = ezxml_get(library, "shelf", 0, "book", 2, "title", -1); -// This retrieves the title of the 3rd book on the 1st shelf of library. -// Returns NULL if not found. -ezxml_t ezxml_get(ezxml_t xml, ...) -{ - va_list ap; - ezxml_t r; - - va_start(ap, xml); - r = ezxml_vget(xml, ap); - va_end(ap); - return r; -} - -// returns a null terminated array of processing instructions for the given -// target -const char **ezxml_pi(ezxml_t xml, const char *target) -{ - ezxml_root_t root = (ezxml_root_t)xml; - int i = 0; - - if (! root) return (const char **)EZXML_NIL; - while (root->xml.parent) root = (ezxml_root_t)root->xml.parent; // root tag - while (root->pi[i] && strcmp(target, root->pi[i][0])) i++; // find target - return (const char **)((root->pi[i]) ? root->pi[i] + 1 : EZXML_NIL); -} - -// set an error string and return root -ezxml_t ezxml_err(ezxml_root_t root, char *s, const char *err, ...) -{ - va_list ap; - int line = 1; - char *t, fmt[EZXML_ERRL]; - - for (t = root->s; t < s; t++) if (*t == '\n') line++; - _snprintf(fmt, EZXML_ERRL, "[error near line %d]: %s", line, err); - - va_start(ap, err); - _vsnprintf(root->err, EZXML_ERRL, fmt, ap); - va_end(ap); - - return &root->xml; -} - -// Recursively decodes entity and character references and normalizes new lines -// ent is a null terminated array of alternating entity names and values. set t -// to '&' for general entity decoding, '%' for parameter entity decoding, 'c' -// for cdata sections, ' ' for attribute normalization, or '*' for non-cdata -// attribute normalization. Returns s, or if the decoded string is longer than -// s, returns a malloced string that must be freed. -char *ezxml_decode(char *s, char **ent, char t) -{ - char *e, *r = s, *m = s; - long b, c, d, l; -/* - for (; *s; s++) { // normalize line endings - while (*s == '\r') { - *(s++) = '\n'; - if (*s == '\n') memmove(s, (s + 1), strlen(s)); - } - } -*/ - for (s = r; ; ) { - while (*s && *s != '&' && (*s != '%' || t != '%') && (*s & 0x80 || !isspace(*s))) s++; - - if (! *s) break; - else if (t != 'c' && ! strncmp(s, "&#", 2)) { // character reference - if (s[2] == 'x') c = strtol(s + 3, &e, 16); // base 16 - else c = strtol(s + 2, &e, 10); // base 10 - if (! c || *e != ';') { s++; continue; } // not a character ref - - if (c < 0x80) *(s++) = (char)c; // US-ASCII subset - else { // multi-byte UTF-8 sequence - for (b = 0, d = c; d; d /= 2) b++; // number of bits in c - b = (b - 2) / 5; // number of bytes in payload - *(s++) = (char)((0xFF << (7 - b)) | (c >> (6 * b))); // head - while (b) *(s++) = (char)(0x80 | ((c >> (6 * --b)) & 0x3F)); // payload - } - - memmove(s, strchr(s, ';') + 1, strlen(strchr(s, ';'))); - } - else if ((*s == '&' && (t == '&' || t == ' ' || t == '*')) || - (*s == '%' && t == '%')) { // entity reference - for (b = 0; ent[b] && strncmp(s + 1, ent[b], strlen(ent[b])); - b += 2); // find entity in entity list - - if (ent[b++]) { // found a match - if ((c = (long)strlen(ent[b])) - 1 > (e = strchr(s, ';')) - s) { - l = (d = (long)(s - r)) + c + (long)strlen(e); // new length - r = (r == m) ? strcpy(malloc(l), r) : realloc(r, l); - e = strchr((s = r + d), ';'); // fix up pointers - } - - memmove(s + c, e + 1, strlen(e)); // shift rest of string - strncpy(s, ent[b], c); // copy in replacement text - } - else s++; // not a known entity - } - else if ((t == ' ' || t == '*') && isspace(*s)) *(s++) = ' '; - else s++; // no decoding needed - } - - if (t == '*') { // normalize spaces for non-cdata attributes - for (s = r; *s; s++) { - if ((l = (long)strspn(s, " "))) memmove(s, s + l, strlen(s + l) + 1); - while (*s && *s != ' ') s++; - } - if (--s >= r && *s == ' ') *s = '\0'; // trim any trailing space - } - return r; -} - -// called when parser finds start of new tag -void ezxml_open_tag(ezxml_root_t root, char *name, char **attr) -{ - ezxml_t xml = root->cur; - - if (xml->name) xml = ezxml_add_child(xml, name, strlen(xml->txt)); - else xml->name = name; // first open tag - - xml->attr = attr; - root->cur = xml; // update tag insertion point -} - -// called when parser finds character content between open and closing tag -void ezxml_char_content(ezxml_root_t root, char *s, size_t len, char t) -{ - ezxml_t xml = root->cur; - char *m = s; - size_t l; - - if (! xml || ! xml->name || ! len) return; // sanity check - - s[len] = '\0'; // null terminate text (calling functions anticipate this) - len = strlen(s = ezxml_decode(s, root->ent, t)) + 1; - - if (! *(xml->txt)) xml->txt = s; // initial character content - else { // allocate our own memory and make a copy - xml->txt = (xml->flags & EZXML_TXTM) // allocate some space - ? realloc(xml->txt, (l = strlen(xml->txt)) + len) - : strcpy(malloc((l = strlen(xml->txt)) + len), xml->txt); - strcpy(xml->txt + l, s); // add new char content - if (s != m) free(s); // free s if it was malloced by ezxml_decode() - } - - if (xml->txt != m) ezxml_set_flag(xml, EZXML_TXTM); -} - -// called when parser finds closing tag -ezxml_t ezxml_close_tag(ezxml_root_t root, char *name, char *s) -{ - if (! root->cur || ! root->cur->name || strcmp(name, root->cur->name)) - return ezxml_err(root, s, "unexpected closing tag ", name); - - root->cur = root->cur->parent; - return NULL; -} - -// checks for circular entity references, returns non-zero if no circular -// references are found, zero otherwise -int ezxml_ent_ok(char *name, char *s, char **ent) -{ - int i; - - for (; ; s++) { - while (*s && *s != '&') s++; // find next entity reference - if (! *s) return 1; - if (! strncmp(s + 1, name, strlen(name))) return 0; // circular ref. - for (i = 0; ent[i] && strncmp(ent[i], s + 1, strlen(ent[i])); i += 2); - if (ent[i] && ! ezxml_ent_ok(name, ent[i + 1], ent)) return 0; - } -} - -// called when the parser finds a processing instruction -void ezxml_proc_inst(ezxml_root_t root, char *s, size_t len) -{ - int i = 0, j = 1; - char *target = s; - - s[len] = '\0'; // null terminate instruction - if (*(s += strcspn(s, EZXML_WS))) { - *s = '\0'; // null terminate target - s += strspn(s + 1, EZXML_WS) + 1; // skip whitespace after target - } - - if (! strcmp(target, "xml")) { // - if ((s = strstr(s, "standalone")) && ! strncmp(s + strspn(s + 10, - EZXML_WS "='\"") + 10, "yes", 3)) root->standalone = 1; - return; - } - - if (! root->pi[0]) *(root->pi = malloc(sizeof(char **))) = NULL; //first pi - - while (root->pi[i] && strcmp(target, root->pi[i][0])) i++; // find target - if (! root->pi[i]) { // new target - root->pi = realloc(root->pi, sizeof(char **) * (i + 2)); - root->pi[i] = malloc(sizeof(char *) * 3); - root->pi[i][0] = target; - root->pi[i][1] = (char *)(root->pi[i + 1] = NULL); // terminate pi list - root->pi[i][2] = _strdup(""); // empty document position list - } - - while (root->pi[i][j]) j++; // find end of instruction list for this target - root->pi[i] = realloc(root->pi[i], sizeof(char *) * (j + 3)); - root->pi[i][j + 2] = realloc(root->pi[i][j + 1], j + 1); - strcpy(root->pi[i][j + 2] + j - 1, (root->xml.name) ? ">" : "<"); - root->pi[i][j + 1] = NULL; // null terminate pi list for this target - root->pi[i][j] = s; // set instruction -} - -// called when the parser finds an internal doctype subset -short ezxml_internal_dtd(ezxml_root_t root, char *s, size_t len) -{ - char q, *c, *t, *n = NULL, *v, **ent, **pe; - int i, j; - - pe = memcpy(malloc(sizeof(EZXML_NIL)), EZXML_NIL, sizeof(EZXML_NIL)); - - for (s[len] = '\0'; s; ) { - while (*s && *s != '<' && *s != '%') s++; // find next declaration - - if (! *s) break; - else if (! strncmp(s, "'); - continue; - } - - for (i = 0, ent = (*c == '%') ? pe : root->ent; ent[i]; i++); - ent = realloc(ent, (i + 3) * sizeof(char *)); // space for next ent - if (*c == '%') pe = ent; - else root->ent = ent; - - *(++s) = '\0'; // null terminate name - if ((s = strchr(v, q))) *(s++) = '\0'; // null terminate value - ent[i + 1] = ezxml_decode(v, pe, '%'); // set value - ent[i + 2] = NULL; // null terminate entity list - if (! ezxml_ent_ok(n, ent[i + 1], ent)) { // circular reference - if (ent[i + 1] != v) free(ent[i + 1]); - ezxml_err(root, v, "circular entity declaration &%s", n); - break; - } - else ent[i] = n; // set entity name - } - else if (! strncmp(s, "")) == '>') continue; - else *s = '\0'; // null terminate tag name - for (i = 0; root->attr[i] && strcmp(n, root->attr[i][0]); i++); - - while (*(n = s + 1 + strspn(s + 1, EZXML_WS)) && *n != '>') { - if (*(s = n + strcspn(n, EZXML_WS))) *s = '\0'; // attr name - else { ezxml_err(root, t, "malformed ") - 1; - if (*c == ' ') continue; // cdata is default, nothing to do - v = NULL; - } - else if ((*s == '"' || *s == '\'') && // default value - (s = strchr(v = s + 1, *s))) *s = '\0'; - else { ezxml_err(root, t, "malformed attr[i]) { // new tag name - root->attr = (! i) ? malloc(2 * sizeof(char **)) - : realloc(root->attr, - (i + 2) * sizeof(char **)); - root->attr[i] = malloc(2 * sizeof(char *)); - root->attr[i][0] = t; // set tag name - root->attr[i][1] = (char *)(root->attr[i + 1] = NULL); - } - - for (j = 1; root->attr[i][j]; j += 3); // find end of list - root->attr[i] = realloc(root->attr[i], - (j + 4) * sizeof(char *)); - - root->attr[i][j + 3] = NULL; // null terminate list - root->attr[i][j + 2] = c; // is it cdata? - root->attr[i][j + 1] = (v) ? ezxml_decode(v, root->ent, *c) - : NULL; - root->attr[i][j] = n; // attribute name - } - } - else if (! strncmp(s, ""); // comments - else if (! strncmp(s, ""))) - ezxml_proc_inst(root, c, s++ - c); - } - else if (*s == '<') s = strchr(s, '>'); // skip other declarations - else if (*(s++) == '%' && ! root->standalone) break; - } - - free(pe); - return ! *root->err; -} - -// Converts a UTF-16 string to UTF-8. Returns a new string that must be freed -// or NULL if no conversion was needed. -char *ezxml_str2utf8(char **s, size_t *len) -{ - char *u; - size_t l = 0, sl, max = *len; - long c, d; - int b, be = (**s == '\xFE') ? 1 : (**s == '\xFF') ? 0 : -1; - - if (be == -1) return NULL; // not UTF-16 - - u = malloc(max); - for (sl = 2; sl < *len - 1; sl += 2) { - c = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF) //UTF-16BE - : (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF); //UTF-16LE - if (c >= 0xD800 && c <= 0xDFFF && (sl += 2) < *len - 1) { // high-half - d = (be) ? (((*s)[sl] & 0xFF) << 8) | ((*s)[sl + 1] & 0xFF) - : (((*s)[sl + 1] & 0xFF) << 8) | ((*s)[sl] & 0xFF); - c = (((c & 0x3FF) << 10) | (d & 0x3FF)) + 0x10000; - } - - while (l + 6 > max) u = realloc(u, max += EZXML_BUFSIZE); - if (c < 0x80) u[l++] = (char)c; // US-ASCII subset - else { // multi-byte UTF-8 sequence - for (b = 0, d = c; d; d /= 2) b++; // bits in c - b = (b - 2) / 5; // bytes in payload - u[l++] = (char)((0xFF << (7 - b)) | (c >> (6 * b))); // head - while (b) u[l++] = (char)(0x80 | ((c >> (6 * --b)) & 0x3F)); // payload - } - } - return *s = realloc(u, *len = l); -} - -// frees a tag attribute list -void ezxml_free_attr(char **attr) { - int i = 0; - char *m; - - if (! attr || attr == EZXML_NIL) return; // nothing to free - while (attr[i]) i += 2; // find end of attribute list - m = attr[i + 1]; // list of which names and values are malloced - for (i = 0; m[i]; i++) { - if (m[i] & EZXML_NAMEM) free(attr[i * 2]); - if (m[i] & EZXML_TXTM) free(attr[(i * 2) + 1]); - } - free(m); - free(attr); -} - -// parse the given xml string and return an ezxml structure -ezxml_t ezxml_parse_str(char *s, size_t len) -{ - ezxml_root_t root = (ezxml_root_t)ezxml_new(NULL); - char q, e, *d, **attr, **a = NULL; // initialize a to avoid compile warning - int l, i, j; - - root->m = s; - if (! len) return ezxml_err(root, NULL, "root tag missing"); - root->u = ezxml_str2utf8(&s, &len); // convert utf-16 to utf-8 - root->e = (root->s = s) + len; // record start and end of work area - - e = s[len - 1]; // save end char - s[len - 1] = '\0'; // turn end char into null terminator - - while (*s && *s != '<') s++; // find first tag - if (! *s) return ezxml_err(root, s, "root tag missing"); - - for (; ; ) { - attr = (char **)EZXML_NIL; - d = ++s; - - if (isalpha(*s) || *s == '_' || *s == ':' || *s < '\0') { // new tag - if (! root->cur) - return ezxml_err(root, d, "markup outside of root element"); - - s += strcspn(s, EZXML_WS "/>"); - while (isspace(*s)) *(s++) = '\0'; // null terminate tag name - - if (*s && *s != '/' && *s != '>') // find tag in default attr list - for (i = 0; (a = root->attr[i]) && strcmp(a[0], d); i++); - - for (l = 0; *s && *s != '/' && *s != '>'; l += 2) { // new attrib - attr = (l) ? realloc(attr, (l + 4) * sizeof(char *)) - : malloc(4 * sizeof(char *)); // allocate space - attr[l + 3] = (l) ? realloc(attr[l + 1], (l / 2) + 2) - : malloc(2); // mem for list of maloced vals - strcpy(attr[l + 3] + (l / 2), " "); // value is not malloced - attr[l + 2] = NULL; // null terminate list - attr[l + 1] = ""; // temporary attribute value - attr[l] = s; // set attribute name - - s += strcspn(s, EZXML_WS "=/>"); - if (*s == '=' || isspace(*s)) { - *(s++) = '\0'; // null terminate tag attribute name - q = *(s += strspn(s, EZXML_WS "=")); - if (q == '"' || q == '\'') { // attribute value - attr[l + 1] = ++s; - while (*s && *s != q) s++; - if (*s) *(s++) = '\0'; // null terminate attribute val - else { - ezxml_free_attr(attr); - return ezxml_err(root, d, "missing %c", q); - } - - for (j = 1; a && a[j] && strcmp(a[j], attr[l]); j +=3); - attr[l + 1] = ezxml_decode(attr[l + 1], root->ent, - (char)((a && a[j]) ? *a[j + 2] : ' ')); - if (attr[l + 1] < d || attr[l + 1] > s) - attr[l + 3][l / 2] = EZXML_TXTM; // value malloced - } - } - while (isspace(*s)) s++; - } - - if (*s == '/') { // self closing tag - *(s++) = '\0'; - if ((*s && *s != '>') || (! *s && e != '>')) { - if (l) ezxml_free_attr(attr); - return ezxml_err(root, d, "missing >"); - } - ezxml_open_tag(root, d, attr); - ezxml_close_tag(root, d, s); - } - else if ((q = *s) == '>' || (! *s && e == '>')) { // open tag - *s = '\0'; // temporarily null terminate tag name - ezxml_open_tag(root, d, attr); - *s = q; - } - else { - if (l) ezxml_free_attr(attr); - return ezxml_err(root, d, "missing >"); - } - } - else if (*s == '/') { // close tag - s += strcspn(d = s + 1, EZXML_WS ">") + 1; - if (! (q = *s) && e != '>') return ezxml_err(root, d, "missing >"); - *s = '\0'; // temporarily null terminate tag name - if (ezxml_close_tag(root, d, s)) return &root->xml; - if (isspace(*s = q)) s += strspn(s, EZXML_WS); - } - else if (! strncmp(s, "!--", 3)) { // xml comment - if (! (s = strstr(s + 3, "--")) || (*(s += 2) != '>' && *s) || - (! *s && e != '>')) return ezxml_err(root, d, "unclosed