diff options
| author | Kirill Volinsky <mataes2007@gmail.com> | 2017-11-28 22:12:43 +0300 |
|---|---|---|
| committer | Kirill Volinsky <mataes2007@gmail.com> | 2017-11-28 22:12:43 +0300 |
| commit | 80221d816eeb98f0df38e0243390033c614952f3 (patch) | |
| tree | 7618176108093921b6934343bc2f76a66ea97730 | |
| parent | 25df99ba7462958f2cb9075020ec1c9a5a7c9f50 (diff) | |
Source files converted to utf-8
1228 files changed, 12268 insertions, 12267 deletions
diff --git a/include/m_addcontact.h b/include/m_addcontact.h index 7e68a59d45..cb669e5af9 100644 --- a/include/m_addcontact.h +++ b/include/m_addcontact.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_avatars.h b/include/m_avatars.h index c7e55dfb04..132059ac3f 100644 --- a/include/m_avatars.h +++ b/include/m_avatars.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_awaymsg.h b/include/m_awaymsg.h index ffea7897d3..0b78c921df 100644 --- a/include/m_awaymsg.h +++ b/include/m_awaymsg.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_button.h b/include/m_button.h index 40db65ab2c..3c45865284 100644 --- a/include/m_button.h +++ b/include/m_button.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_button_int.h b/include/m_button_int.h index f0a9769735..faed72b832 100644 --- a/include/m_button_int.h +++ b/include/m_button_int.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_clc.h b/include/m_clc.h index e4b272af8e..b65a3d17c6 100644 --- a/include/m_clc.h +++ b/include/m_clc.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_clistint.h b/include/m_clistint.h index a99c66a7df..b51cf30bf9 100644 --- a/include/m_clistint.h +++ b/include/m_clistint.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_cluiframes.h b/include/m_cluiframes.h index ca0c04412d..9b3fbbec90 100644 --- a/include/m_cluiframes.h +++ b/include/m_cluiframes.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-02 Richard Hughes, Roland Rabien & Tristan Van de Vreede
This program is free software; you can redistribute it and/or
diff --git a/include/m_contacts.h b/include/m_contacts.h index eca28bfbaa..4596476fb5 100644 --- a/include/m_contacts.h +++ b/include/m_contacts.h @@ -1,7 +1,7 @@ /*
Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/include/m_core.h b/include/m_core.h index eba11f2956..421dd12672 100644 --- a/include/m_core.h +++ b/include/m_core.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -109,9 +109,9 @@ MIR_CORE_DLL(HANDLE) HookEventParam(const char *name, MIRANDAHOOKPARAM hookProc MIR_CORE_DLL(HANDLE) HookEventObj(const char *name, MIRANDAHOOKOBJ hookProc, void* object);
MIR_CORE_DLL(HANDLE) HookEventObjParam(const char *name, MIRANDAHOOKOBJPARAM hookProc, void* object, LPARAM lParam);
MIR_CORE_DLL(HANDLE) HookEventMessage(const char *name, HWND hwnd, UINT message);
- -// executes the event handler if event is missing -MIR_CORE_DLL(HANDLE) HookTemporaryEvent(const char *name, MIRANDAHOOK hookProc); +
+// executes the event handler if event is missing
+MIR_CORE_DLL(HANDLE) HookTemporaryEvent(const char *name, MIRANDAHOOK hookProc);
MIR_CORE_DLL(int) UnhookEvent(HANDLE hHook);
MIR_CORE_DLL(void) KillObjectEventHooks(void* pObject);
diff --git a/include/m_crypto.h b/include/m_crypto.h index 9eb48e9cda..74dc0b4302 100644 --- a/include/m_crypto.h +++ b/include/m_crypto.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_database.h b/include/m_database.h index eb4bd3cbcf..82b4af6c93 100644 --- a/include/m_database.h +++ b/include/m_database.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_db_int.h b/include/m_db_int.h index cbc2e850fa..ceaf895f21 100644 --- a/include/m_db_int.h +++ b/include/m_db_int.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_descbutton.h b/include/m_descbutton.h index 74387e682b..6cb4ce81af 100644 --- a/include/m_descbutton.h +++ b/include/m_descbutton.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2007-12 Miranda ICQ/IM project,
Copyright (c) 2007 Artem Shpynov
diff --git a/include/m_email.h b/include/m_email.h index 4234c908d0..fe7e4d2bef 100644 --- a/include/m_email.h +++ b/include/m_email.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_extraicons.h b/include/m_extraicons.h index 7f94e690d1..30922d33bf 100644 --- a/include/m_extraicons.h +++ b/include/m_extraicons.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2009 Ricardo Pescuma Domenecci
This is free software; you can redistribute it and/or
diff --git a/include/m_file.h b/include/m_file.h index 6e6f285de3..e82065cb77 100644 --- a/include/m_file.h +++ b/include/m_file.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_findadd.h b/include/m_findadd.h index fff187d92d..99ad4ee066 100644 --- a/include/m_findadd.h +++ b/include/m_findadd.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_freeimage.h b/include/m_freeimage.h index 8685952343..b7f7e830eb 100644 --- a/include/m_freeimage.h +++ b/include/m_freeimage.h @@ -3,7 +3,7 @@ //
// Design and implementation by
// - Floris van den Berg (flvdberg@wxs.nl)
-// - Herv Drolon (drolon@infonie.fr)
+// - Hervй Drolon (drolon@infonie.fr)
//
// Contributors:
// - Adam Gates (radad@xoasis.com)
@@ -24,7 +24,7 @@ // - Petr Pytelka (pyta@lightcomp.com)
// - Riley McNiff (rmcniff@marexgroup.com)
// - Ryan Rubley (ryan@lostreality.org)
-// - Volker Grtner (volkerg@gmx.at)
+// - Volker Gдrtner (volkerg@gmx.at)
//
// This file is part of FreeImage 3
//
diff --git a/include/m_gui.h b/include/m_gui.h index 05e4021b3f..52415a2d9b 100644 --- a/include/m_gui.h +++ b/include/m_gui.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/include/m_history.h b/include/m_history.h index fe66eb7060..d87df16c5c 100644 --- a/include/m_history.h +++ b/include/m_history.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_hotkeys.h b/include/m_hotkeys.h index b15464f6d3..80219b57e3 100644 --- a/include/m_hotkeys.h +++ b/include/m_hotkeys.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_icolib.h b/include/m_icolib.h index da8b2c4c77..31cb01a60c 100644 --- a/include/m_icolib.h +++ b/include/m_icolib.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_iconheader.h b/include/m_iconheader.h index 662f0099de..c3d6db9f0d 100644 --- a/include/m_iconheader.h +++ b/include/m_iconheader.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-2007 Miranda ICQ/IM project,
Copyright (c) 2007 Artem Shpynov
diff --git a/include/m_icq.h b/include/m_icq.h index 8f1f8d932c..72a24c9fd7 100644 --- a/include/m_icq.h +++ b/include/m_icq.h @@ -4,9 +4,9 @@ //
// Copyright (c) 2000-01 Richard Hughes, Roland Rabien, Tristan Van de Vreede
// Copyright (c) 2001-02 Jon Keating, Richard Hughes
-// Copyright (c) 2002-04 Martin berg, Sam Kothari, Robert Rainwater
+// Copyright (c) 2002-04 Martin Цberg, Sam Kothari, Robert Rainwater
// Copyright (c) 2004-10 Joe Kucera
-// Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+// Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -178,24 +178,24 @@ typedef struct { // -1 delayed (rate control) - sequence unknown
#define PS_ICQ_REQUESTCUSTOMSTATUS "/RequestXStatusDetails"
-#define MAX_CAPNAME 64 -typedef struct -{ - int cbSize; - char caps[0x10]; - HANDLE hIcon; - char name[MAX_CAPNAME]; -} ICQ_CUSTOMCAP; - -// Add a custom icq capability. -// wParam = 0; -// lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap; -#define PS_ICQ_ADDCAPABILITY "/IcqAddCapability" - -// Check if capability is supportes. Only icqCustomCap.caps does matter. -// wParam = (WPARAM)(HANDLE)hContact; -// lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap; -// returns non-zero if capability is supported -#define PS_ICQ_CHECKCAPABILITY "/IcqCheckCapability" +#define MAX_CAPNAME 64
+typedef struct
+{
+ int cbSize;
+ char caps[0x10];
+ HANDLE hIcon;
+ char name[MAX_CAPNAME];
+} ICQ_CUSTOMCAP;
+
+// Add a custom icq capability.
+// wParam = 0;
+// lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap;
+#define PS_ICQ_ADDCAPABILITY "/IcqAddCapability"
+
+// Check if capability is supportes. Only icqCustomCap.caps does matter.
+// wParam = (WPARAM)(HANDLE)hContact;
+// lParam = (LPARAM)(ICQ_CUSTOMCAP *)&icqCustomCap;
+// returns non-zero if capability is supported
+#define PS_ICQ_CHECKCAPABILITY "/IcqCheckCapability"
#endif // M_ICQ_H__
diff --git a/include/m_idle.h b/include/m_idle.h index 720ff8de2d..4e46755eba 100644 --- a/include/m_idle.h +++ b/include/m_idle.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_ignore.h b/include/m_ignore.h index 4caccdb958..d0138b045b 100644 --- a/include/m_ignore.h +++ b/include/m_ignore.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_imgsrvc.h b/include/m_imgsrvc.h index e7869d1782..c4214d4621 100644 --- a/include/m_imgsrvc.h +++ b/include/m_imgsrvc.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_jabber.h b/include/m_jabber.h index 4fc555ee90..07b2cee7be 100644 --- a/include/m_jabber.h +++ b/include/m_jabber.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/include/m_json.h b/include/m_json.h index 6474e24e28..3c33d7569e 100644 --- a/include/m_json.h +++ b/include/m_json.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_langpack.h b/include/m_langpack.h index 12648c01c7..a5d7706d06 100644 --- a/include/m_langpack.h +++ b/include/m_langpack.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_message.h b/include/m_message.h index 3b484a8cb0..b75d539e5d 100644 --- a/include/m_message.h +++ b/include/m_message.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_metacontacts.h b/include/m_metacontacts.h index e9a2c09c7e..5fa1ec3e7a 100644 --- a/include/m_metacontacts.h +++ b/include/m_metacontacts.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2004-07 Scott Ellis (www.scottellis.com.au mail@scottellis.com.au)
Copyright (c) 2004 Universite Louis PASTEUR, STRASBOURG.
diff --git a/include/m_netlib.h b/include/m_netlib.h index 981e40016d..cf8b5e3af6 100644 --- a/include/m_netlib.h +++ b/include/m_netlib.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_options.h b/include/m_options.h index 4ef1f0921d..4e0286620a 100644 --- a/include/m_options.h +++ b/include/m_options.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_pluginupdater.h b/include/m_pluginupdater.h index 63f832f03b..1b200bb00e 100644 --- a/include/m_pluginupdater.h +++ b/include/m_pluginupdater.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_protocols.h b/include/m_protocols.h index aba7fb911f..2b8c980066 100644 --- a/include/m_protocols.h +++ b/include/m_protocols.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_protoint.h b/include/m_protoint.h index a5a6c042cb..1cba3cfd29 100644 --- a/include/m_protoint.h +++ b/include/m_protoint.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h index 4cb529a47e..fd27109018 100644 --- a/include/m_srmm_int.h +++ b/include/m_srmm_int.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org) +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org) Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/include/m_ssl.h b/include/m_ssl.h index 9734d31dda..fad495cdcc 100644 --- a/include/m_ssl.h +++ b/include/m_ssl.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_string.h b/include/m_string.h index b2a21bf432..1f1401ae68 100644 --- a/include/m_string.h +++ b/include/m_string.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_system.h b/include/m_system.h index 0a13bb5aea..c4cc6a25fc 100644 --- a/include/m_system.h +++ b/include/m_system.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_system_cpp.h b/include/m_system_cpp.h index 38aa6de2cf..ee30669a46 100644 --- a/include/m_system_cpp.h +++ b/include/m_system_cpp.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_timezones.h b/include/m_timezones.h index 1491cb28bb..4a1d159f48 100644 --- a/include/m_timezones.h +++ b/include/m_timezones.h @@ -2,8 +2,8 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
-Copyright () 2000-10 Miranda ICQ/IM project,
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2000-10 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_types.h b/include/m_types.h index ca6d8619c9..84c9cb19fc 100644 --- a/include/m_types.h +++ b/include/m_types.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_url.h b/include/m_url.h index eeeddbefa7..8ff6ada26b 100644 --- a/include/m_url.h +++ b/include/m_url.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_userinfo.h b/include/m_userinfo.h index 9813ec823b..67e188a63f 100644 --- a/include/m_userinfo.h +++ b/include/m_userinfo.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_utils.h b/include/m_utils.h index 567e9689a6..182ee2a124 100644 --- a/include/m_utils.h +++ b/include/m_utils.h @@ -3,7 +3,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-12 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_xml.h b/include/m_xml.h index 5c82d5475b..bbda38b856 100644 --- a/include/m_xml.h +++ b/include/m_xml.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/m_xstatus.h b/include/m_xstatus.h index ef73aa838d..72efbfd0fb 100644 --- a/include/m_xstatus.h +++ b/include/m_xstatus.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/newpluginapi.h b/include/newpluginapi.h index c63189d40f..91d002b561 100644 --- a/include/newpluginapi.h +++ b/include/newpluginapi.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/statusmodes.h b/include/statusmodes.h index 2ea5ac28dd..8e9dd397d9 100644 --- a/include/statusmodes.h +++ b/include/statusmodes.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/include/win2k.h b/include/win2k.h index afedf57c4b..99afe216d2 100644 --- a/include/win2k.h +++ b/include/win2k.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/hunspell/res/Hunspell.rc b/libs/hunspell/res/Hunspell.rc index b335392d00..3bb8aa26cb 100644 --- a/libs/hunspell/res/Hunspell.rc +++ b/libs/hunspell/res/Hunspell.rc @@ -17,7 +17,7 @@ BEGIN BEGIN
BLOCK "040904b0"
BEGIN
- VALUE "Comments", "Hunspell (http://hunspell.github.io/) by Lszl Nmeth"
+ VALUE "Comments", "Hunspell (http://hunspell.github.io/) by Lбszlу Nйmeth"
VALUE "CompanyName", "http://hunspell.github.io/"
VALUE "FileDescription", "libhunspell"
VALUE "FileVersion", "1.3.4"
diff --git a/libs/hunspell/src/resource.h b/libs/hunspell/src/resource.h index 630af7f47a..e1df211357 100644 --- a/libs/hunspell/src/resource.h +++ b/libs/hunspell/src/resource.h @@ -2,7 +2,7 @@ // Microsoft Visual C++ generated include file.
// Used by hunspell.rc
-//
+// Следующие стандартные значения для новых объектов
//
#ifdef APSTUDIO_INVOKED
#ifndef APSTUDIO_READONLY_SYMBOLS
diff --git a/libs/libaxolotl/src/stdafx.h b/libs/libaxolotl/src/stdafx.h index e2c778d5f7..6c105e52d3 100644 --- a/libs/libaxolotl/src/stdafx.h +++ b/libs/libaxolotl/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libcurl/src/libcurl.rc b/libs/libcurl/src/libcurl.rc index 47b944ac86..e1a819bcc2 100644 --- a/libs/libcurl/src/libcurl.rc +++ b/libs/libcurl/src/libcurl.rc @@ -51,7 +51,7 @@ BEGIN VALUE "OriginalFilename", "libcurl.dll\0" VALUE "ProductName", "The cURL library\0" VALUE "ProductVersion", LIBCURL_VERSION "\0" - VALUE "LegalCopyright", " " LIBCURL_COPYRIGHT "\0" + VALUE "LegalCopyright", "© " LIBCURL_COPYRIGHT "\0" VALUE "License", "http://curl.haxx.se/docs/copyright.html\0" END END diff --git a/libs/libjson/src/JSONChildren.cpp b/libs/libjson/src/JSONChildren.cpp index 2026a3ae5b..ce20ff239e 100644 --- a/libs/libjson/src/JSONChildren.cpp +++ b/libs/libjson/src/JSONChildren.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONDebug.cpp b/libs/libjson/src/JSONDebug.cpp index 48e8e6afda..de959e175a 100644 --- a/libs/libjson/src/JSONDebug.cpp +++ b/libs/libjson/src/JSONDebug.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONIterators.cpp b/libs/libjson/src/JSONIterators.cpp index ca6e6e498b..6dabfed462 100644 --- a/libs/libjson/src/JSONIterators.cpp +++ b/libs/libjson/src/JSONIterators.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONMemory.cpp b/libs/libjson/src/JSONMemory.cpp index 4fe4ce18e7..357edc4de8 100644 --- a/libs/libjson/src/JSONMemory.cpp +++ b/libs/libjson/src/JSONMemory.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONNode.cpp b/libs/libjson/src/JSONNode.cpp index 6a7feb02e5..b3bfcf871f 100644 --- a/libs/libjson/src/JSONNode.cpp +++ b/libs/libjson/src/JSONNode.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONNode_Mutex.cpp b/libs/libjson/src/JSONNode_Mutex.cpp index 90157de6f6..796e5de80e 100644 --- a/libs/libjson/src/JSONNode_Mutex.cpp +++ b/libs/libjson/src/JSONNode_Mutex.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONWorker.cpp b/libs/libjson/src/JSONWorker.cpp index 4b238abd43..ce37f19855 100644 --- a/libs/libjson/src/JSONWorker.cpp +++ b/libs/libjson/src/JSONWorker.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/JSONWriter.cpp b/libs/libjson/src/JSONWriter.cpp index f7b301d5c0..cb4ad5f829 100644 --- a/libs/libjson/src/JSONWriter.cpp +++ b/libs/libjson/src/JSONWriter.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/internalJSONNode.cpp b/libs/libjson/src/internalJSONNode.cpp index 61a57f451d..755417a7cd 100644 --- a/libs/libjson/src/internalJSONNode.cpp +++ b/libs/libjson/src/internalJSONNode.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/libJSON.cpp b/libs/libjson/src/libJSON.cpp index 6969ebd38d..bda9ebe3a6 100644 --- a/libs/libjson/src/libJSON.cpp +++ b/libs/libjson/src/libJSON.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/libs/libjson/src/stdafx.h b/libs/libjson/src/stdafx.h index 746f83e103..c087887bd2 100644 --- a/libs/libjson/src/stdafx.h +++ b/libs/libjson/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/acc.cpp b/plugins/AVS/src/acc.cpp index 94142a7895..d7496297d6 100644 --- a/plugins/AVS/src/acc.cpp +++ b/plugins/AVS/src/acc.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/main.cpp b/plugins/AVS/src/main.cpp index f691a0945d..ebc6943f66 100644 --- a/plugins/AVS/src/main.cpp +++ b/plugins/AVS/src/main.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/options.cpp b/plugins/AVS/src/options.cpp index 0ef9d71dd5..9425b78171 100644 --- a/plugins/AVS/src/options.cpp +++ b/plugins/AVS/src/options.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org) +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org) Copyright (c) 2000-04 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/AVS/src/services.cpp b/plugins/AVS/src/services.cpp index 458ab27664..75c73eade0 100644 --- a/plugins/AVS/src/services.cpp +++ b/plugins/AVS/src/services.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/stdafx.h b/plugins/AVS/src/stdafx.h index 37858de466..8b044e4239 100644 --- a/plugins/AVS/src/stdafx.h +++ b/plugins/AVS/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/AVS/src/version.h b/plugins/AVS/src/version.h index 39861366fb..0475c9ef0c 100644 --- a/plugins/AVS/src/version.h +++ b/plugins/AVS/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Nightwish, Pescuma"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/AVS/"
-#define __COPYRIGHT " 2000-2012 Miranda-IM project, 2012-17 Miranda NG team"
+#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012-17 Miranda NG team"
diff --git a/plugins/AddContactPlus/src/addcontact.cpp b/plugins/AddContactPlus/src/addcontact.cpp index f77bd1f5de..3fe323f590 100644 --- a/plugins/AddContactPlus/src/addcontact.cpp +++ b/plugins/AddContactPlus/src/addcontact.cpp @@ -1,7 +1,7 @@ /*
AddContact+ plugin for Miranda NG
-Copyright (C) 2007-11 Bartosz 'Dezeath' Biaek
+Copyright (C) 2007-11 Bartosz 'Dezeath' Biaіek
Copyright (C) 2012-17 Miranda NG Team
This program is free software; you can redistribute it and/or modify
diff --git a/plugins/AddContactPlus/src/main.cpp b/plugins/AddContactPlus/src/main.cpp index 26df21c584..568979e07a 100644 --- a/plugins/AddContactPlus/src/main.cpp +++ b/plugins/AddContactPlus/src/main.cpp @@ -1,7 +1,7 @@ /*
AddContact+ plugin for Miranda NG
-Copyright (C) 2007-11 Bartosz 'Dezeath' Biaek
+Copyright (C) 2007-11 Bartosz 'Dezeath' Biaіek
Copyright (C) 2012-17 Miranda NG Team
This program is free software; you can redistribute it and/or modify
diff --git a/plugins/AddContactPlus/src/stdafx.h b/plugins/AddContactPlus/src/stdafx.h index dbc03dde9c..a39d099e1d 100644 --- a/plugins/AddContactPlus/src/stdafx.h +++ b/plugins/AddContactPlus/src/stdafx.h @@ -1,7 +1,7 @@ /*
AddContact+ plugin for Miranda NG
-Copyright (C) 2007-11 Bartosz 'Dezeath' Biaek
+Copyright (C) 2007-11 Bartosz 'Dezeath' Biaіek
Copyright (C) 2012-17 Miranda NG Team
This program is free software; you can redistribute it and/or modify
diff --git a/plugins/AddContactPlus/src/version.h b/plugins/AddContactPlus/src/version.h index fff148510c..5d8de60cae 100644 --- a/plugins/AddContactPlus/src/version.h +++ b/plugins/AddContactPlus/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Bartosz 'Dezeath' Bialek" #define __AUTHOREMAIL "dezred@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/AddContactPlus/" -#define __COPYRIGHT " 2007-17 Bartosz 'Dezeath' Bialek, Miranda NG Team" +#define __COPYRIGHT "© 2007-17 Bartosz 'Dezeath' Bialek, Miranda NG Team" diff --git a/plugins/AdvaImg/src/FreeImage.h b/plugins/AdvaImg/src/FreeImage.h index fa70ea9f39..545c79ed8f 100644 --- a/plugins/AdvaImg/src/FreeImage.h +++ b/plugins/AdvaImg/src/FreeImage.h @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // Contributors: // - see changes log named 'Whatsnew.txt', see header of each .h and .cpp file diff --git a/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp b/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp index 347ad1f3e5..03c3fbb6a3 100644 --- a/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp +++ b/plugins/AdvaImg/src/FreeImage/BitmapAccess.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Detlev Vendt (detlev.vendt@brillit.de) // - Petr Supina (psup@centrum.cz) // - Carsten Klein (c.klein@datagis.com) diff --git a/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp b/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp index abaf2f1824..b0d7b97830 100644 --- a/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp +++ b/plugins/AdvaImg/src/FreeImage/Conversion16_555.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jani Kajala (janik@remedy.fi) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp b/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp index eb3dd9de3f..21b3631467 100644 --- a/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp +++ b/plugins/AdvaImg/src/FreeImage/Conversion16_565.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jani Kajala (janik@remedy.fi) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/Conversion24.cpp b/plugins/AdvaImg/src/FreeImage/Conversion24.cpp index 3b7a800696..aa791c1012 100644 --- a/plugins/AdvaImg/src/FreeImage/Conversion24.cpp +++ b/plugins/AdvaImg/src/FreeImage/Conversion24.cpp @@ -4,7 +4,7 @@ // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) // - Dale Larson (dlarson@norsesoft.com) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jani Kajala (janik@remedy.fi) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/Conversion32.cpp b/plugins/AdvaImg/src/FreeImage/Conversion32.cpp index 4874dcfaca..a4545cffd6 100644 --- a/plugins/AdvaImg/src/FreeImage/Conversion32.cpp +++ b/plugins/AdvaImg/src/FreeImage/Conversion32.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jani Kajala (janik@remedy.fi) // - Detlev Vendt (detlev.vendt@brillit.de) // diff --git a/plugins/AdvaImg/src/FreeImage/Conversion8.cpp b/plugins/AdvaImg/src/FreeImage/Conversion8.cpp index c4f9b22441..98d7bb4ed0 100644 --- a/plugins/AdvaImg/src/FreeImage/Conversion8.cpp +++ b/plugins/AdvaImg/src/FreeImage/Conversion8.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jani Kajala (janik@remedy.fi) // - Karl-Heinz Bussian (khbussian@moss.de) // - Carsten Klein (cklein05@users.sourceforge.net) diff --git a/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp b/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp index a36a6d423f..3abfbfe54e 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionFloat.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp index 9e28205688..89b32a23a8 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionRGB16.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp index 7924bd9684..6f47ee50f4 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionRGBA16.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp index 1e23aaa4ef..c277f9b43a 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionRGBAF.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Tanner Helland (tannerhelland@users.sf.net) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp b/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp index 230dd7b11b..85bbbba19f 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionRGBF.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/ConversionType.cpp b/plugins/AdvaImg/src/FreeImage/ConversionType.cpp index a2ca90ff9d..fee0e03d82 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionType.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionType.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Tanner Helland (tannerhelland@users.sf.net) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp b/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp index e6492aacd2..2b27437c25 100644 --- a/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp +++ b/plugins/AdvaImg/src/FreeImage/ConversionUINT16.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/FreeImage.cpp b/plugins/AdvaImg/src/FreeImage/FreeImage.cpp index 2de6077eed..3ff959c8d0 100644 --- a/plugins/AdvaImg/src/FreeImage/FreeImage.cpp +++ b/plugins/AdvaImg/src/FreeImage/FreeImage.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Karl-Heinz Bussian (khbussian@moss.de) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/Halftoning.cpp b/plugins/AdvaImg/src/FreeImage/Halftoning.cpp index 313cc26e15..2e4f6dd2ca 100644 --- a/plugins/AdvaImg/src/FreeImage/Halftoning.cpp +++ b/plugins/AdvaImg/src/FreeImage/Halftoning.cpp @@ -2,7 +2,7 @@ // Bitmap conversion routines // Thresholding and halftoning functions // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Dennis Lim (dlkj@users.sourceforge.net) // - Thomas Chmielewski (Chmielewski.Thomas@oce.de) // diff --git a/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp b/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp index 1776c3bfd2..2315aa8416 100644 --- a/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp +++ b/plugins/AdvaImg/src/FreeImage/J2KHelper.cpp @@ -2,7 +2,7 @@ // JPEG2000 helpers // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp b/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp index ed3664cf77..fcb8505014 100644 --- a/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp +++ b/plugins/AdvaImg/src/FreeImage/MNGHelper.cpp @@ -2,7 +2,7 @@ // MNG / JNG helpers // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp b/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp index e0997856a9..d7eb575eb3 100644 --- a/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp +++ b/plugins/AdvaImg/src/FreeImage/MemoryIO.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Ryan Rubley <ryan@lostreality.org> -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/MultiPage.cpp b/plugins/AdvaImg/src/FreeImage/MultiPage.cpp index 4fe76adb16..22e9435176 100644 --- a/plugins/AdvaImg/src/FreeImage/MultiPage.cpp +++ b/plugins/AdvaImg/src/FreeImage/MultiPage.cpp @@ -6,7 +6,7 @@ // - Laurent Rocher (rocherl@club-internet.fr) // - Steve Johnson (steve@parisgroup.net) // - Petr Pytelka (pyta@lightcomp.com) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Vadim Alexandrov (vadimalexandrov@users.sourceforge.net // - Martin Dyring-Andersen (mda@spamfighter.com) // - Volodymyr Goncharov (volodymyr.goncharov@gmail.com) diff --git a/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp b/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp index f907c41d55..d3d4587abf 100644 --- a/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp +++ b/plugins/AdvaImg/src/FreeImage/NNQuantizer.cpp @@ -22,12 +22,12 @@ // ------- // January 2001: Adaptation of the Neural-Net Quantization Algorithm // for the FreeImage 2 library -// Author: Herv Drolon (drolon@infonie.fr) +// Author: Hervй Drolon (drolon@infonie.fr) // March 2004: Adaptation for the FreeImage 3 library (port to big endian processors) -// Author: Herv Drolon (drolon@infonie.fr) +// Author: Hervй Drolon (drolon@infonie.fr) // April 2004: Algorithm rewritten as a C++ class. // Fixed a bug in the algorithm with handling of 4-byte boundary alignment. -// Author: Herv Drolon (drolon@infonie.fr) +// Author: Hervй Drolon (drolon@infonie.fr) /////////////////////////////////////////////////////////////////////// #include "Quantizers.h" diff --git a/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp b/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp index b5714b2929..4acf3c19c7 100644 --- a/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp +++ b/plugins/AdvaImg/src/FreeImage/PixelAccess.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Ryan Rubley (ryan@lostreality.org) // - Riley McNiff (rmcniff@marexgroup.com) // diff --git a/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp b/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp index 0ee1c5db30..4bb8783e6c 100644 --- a/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp +++ b/plugins/AdvaImg/src/FreeImage/PluginBMP.cpp @@ -5,7 +5,7 @@ // - Floris van den Berg (flvdberg@wxs.nl) // - Markus Loibl (markus.loibl@epost.de) // - Martin Weber (martweb@gmx.net) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Michal Novotny (michal@etc.cz) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp b/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp index ba67bc960b..d9b430eac5 100644 --- a/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp +++ b/plugins/AdvaImg/src/FreeImage/PluginGIF.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Ryan Rubley <ryan@lostreality.org> -// - Raphal Gaquer <raphael.gaquer@alcer.com> +// - Raphaлl Gaquer <raphael.gaquer@alcer.com> // - Aaron Shumate <aaron@shumate.us> // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/PluginICO.cpp b/plugins/AdvaImg/src/FreeImage/PluginICO.cpp index c818379f78..14a3b1fbf0 100644 --- a/plugins/AdvaImg/src/FreeImage/PluginICO.cpp +++ b/plugins/AdvaImg/src/FreeImage/PluginICO.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp b/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp index 573989c5df..b72b734fed 100644 --- a/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp +++ b/plugins/AdvaImg/src/FreeImage/PluginJPEG.cpp @@ -7,7 +7,7 @@ // - Jan L. Nauta (jln@magentammt.com) // - Markus Loibl (markus.loibl@epost.de) // - Karl-Heinz Bussian (khbussian@moss.de) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jascha Wetzel (jascha@mainia.de) // - Mihail Naydenov (mnaydenov@users.sourceforge.net) // diff --git a/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp b/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp index 124b25f64f..dfeab81081 100644 --- a/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp +++ b/plugins/AdvaImg/src/FreeImage/TIFFLogLuv.cpp @@ -2,7 +2,7 @@ // XYZ to RGB TIFF conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp b/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp index 27f8c95a07..6db196bd90 100644 --- a/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp +++ b/plugins/AdvaImg/src/FreeImage/ToneMapping.cpp @@ -2,7 +2,7 @@ // Tone mapping operators // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp b/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp index 66d37066bf..b44d6a311d 100644 --- a/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp +++ b/plugins/AdvaImg/src/FreeImage/WuQuantizer.cpp @@ -25,9 +25,9 @@ // ------- // July 2000: C++ Implementation of Wu's Color Quantizer // and adaptation for the FreeImage 2 Library -// Author: Herv Drolon (drolon@infonie.fr) +// Author: Hervй Drolon (drolon@infonie.fr) // March 2004: Adaptation for the FreeImage 3 library (port to big endian processors) -// Author: Herv Drolon (drolon@infonie.fr) +// Author: Hervй Drolon (drolon@infonie.fr) /////////////////////////////////////////////////////////////////////// #include "Quantizers.h" diff --git a/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp b/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp index 6b103a08c1..7f0c0c108c 100644 --- a/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp +++ b/plugins/AdvaImg/src/FreeImage/tmoColorConvert.cpp @@ -2,7 +2,7 @@ // High Dynamic Range bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Mihail Naydenov (mnaydenov@users.sourceforge.net) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp b/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp index d46a8c8426..a14cc99915 100644 --- a/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp +++ b/plugins/AdvaImg/src/FreeImage/tmoDrago03.cpp @@ -2,7 +2,7 @@ // Tone mapping operator (Drago, 2003) // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // @@ -40,7 +40,7 @@ biasFunction(const double b, const double x) { } /** -Pad approximation of log(x + 1) +Padй approximation of log(x + 1) x(6+x)/(6+4x) good if x < 1 x*(6 + 0.7662x)/(5.9897 + 3.7658x) between 1 and 2 See http://www.nezumi.demon.co.uk/consult/logx.htm @@ -94,7 +94,7 @@ ToneMappingDrago03(FIBITMAP *dib, const float maxLum, const float avgLum, float /** Normal tone mapping of every pixel - further acceleration is obtained by a Pad approximation of log(x + 1) + further acceleration is obtained by a Padй approximation of log(x + 1) */ BYTE *bits = (BYTE*)FreeImage_GetBits(dib); for(y = 0; y < height; y++) { @@ -121,7 +121,7 @@ ToneMappingDrago03(FIBITMAP *dib, const float maxLum, const float avgLum, float /** fast tone mapping split the image into 3x3 pixel tiles and perform the computation for each group of 9 pixels - further acceleration is obtained by a Pad approximation of log(x + 1) + further acceleration is obtained by a Padй approximation of log(x + 1) => produce artifacts and not so faster, so the code has been disabled */ #define PIXEL(x, y) image[y*fpitch + x].red diff --git a/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp b/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp index c63f91f762..946e014296 100644 --- a/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp +++ b/plugins/AdvaImg/src/FreeImage/tmoFattal02.cpp @@ -2,7 +2,7 @@ // Tone mapping operator (Fattal, 2002) // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp b/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp index f91b41c062..8365e240a4 100644 --- a/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp +++ b/plugins/AdvaImg/src/FreeImage/tmoReinhard05.cpp @@ -2,7 +2,7 @@ // Tone mapping operator (Reinhard, 2005) // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Mihail Naydenov (mnaydenov@users.sourceforge.net) // // This file is part of FreeImage 3 @@ -30,7 +30,7 @@ // [1] Erik Reinhard and Kate Devlin, 'Dynamic Range Reduction Inspired by Photoreceptor Physiology', // IEEE Transactions on Visualization and Computer Graphics, 11(1), Jan/Feb 2005. // [2] Erik Reinhard, 'Parameter estimation for photographic tone reproduction', -// Journal of Graphics Tools, vol. 7, no. 1, pp. 4551, 2003. +// Journal of Graphics Tools, vol. 7, no. 1, pp. 45–51, 2003. // ---------------------------------------------------------- /** diff --git a/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp b/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp index 690db87d8c..890f80b1f0 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/BSplineRotate.cpp @@ -2,9 +2,9 @@ // Bitmap rotation using B-Splines // // Design and implementation by -// - Philippe Thvenaz (philippe.thevenaz@epfl.ch) +// - Philippe Thйvenaz (philippe.thevenaz@epfl.ch) // Adaptation for FreeImage by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // @@ -25,7 +25,7 @@ ========================================================== This code was taken and adapted from the following reference : -[1] Philippe Thvenaz, Spline interpolation, a C source code +[1] Philippe Thйvenaz, Spline interpolation, a C source code implementation. http://bigwww.epfl.ch/thevenaz/ It implements ideas described in the following papers : diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp index 5f01ad815f..d2f6ceae9e 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Channels.cpp @@ -2,7 +2,7 @@ // Channel processing support // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp b/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp index 83c2f92123..0dd6b851e2 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/ClassicRotate.cpp @@ -2,7 +2,7 @@ // Bitmap rotation by means of 3 shears. // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Thorsten Radde (support@IdealSoftware.com) // - Mihail Naydenov (mnaydenov@users.sourceforge.net) // diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp index 67191768bb..2905ddbdd7 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Colors.cpp @@ -2,7 +2,7 @@ // Color manipulation routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Carsten Klein (c.klein@datagis.com) // - Mihail Naydenov (mnaydenov@users.sourceforge.net) // diff --git a/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp b/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp index d05a5dfdc8..5a069bb118 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/CopyPaste.cpp @@ -3,7 +3,7 @@ // // - Floris van den Berg (flvdberg@wxs.nl) // - Alexander Dymerets (sashad@te.net.ua) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Manfred Tausch (manfred.tausch@t-online.de) // - Riley McNiff (rmcniff@marexgroup.com) // - Carsten Klein (cklein05@users.sourceforge.net) diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp index 245c5c3a18..a694056e16 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Display.cpp @@ -2,7 +2,7 @@ // Display routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Filters.h b/plugins/AdvaImg/src/FreeImageToolkit/Filters.h index 7a45c493f4..3311a14dd9 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Filters.h +++ b/plugins/AdvaImg/src/FreeImageToolkit/Filters.h @@ -2,7 +2,7 @@ // Upsampling / downsampling filters // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp index c7898a7813..c470864104 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Flip.cpp @@ -3,7 +3,7 @@ // // Design and implementation by // - Floris van den Berg (flvdberg@wxs.nl) -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Jim Keir (jimkeir@users.sourceforge.net) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp b/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp index 3b577cbd0a..f8a523ad34 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/MultigridPoissonSolver.cpp @@ -2,7 +2,7 @@ // Poisson solver based on a full multigrid algorithm // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // Reference: // PRESS, W. H., TEUKOLSKY, S. A., VETTERLING, W. T., AND FLANNERY, B. P. // 1992. Numerical Recipes in C: The Art of Scientific Computing, 2nd ed. Cambridge University Press. @@ -292,7 +292,7 @@ static void fmg_addint(FIBITMAP *UF, FIBITMAP *UC, FIBITMAP *RES, int nf) { /** Full Multigrid Algorithm for solution of linear elliptic equation, here the model problem (19.0.6). -On input u[0..n-1][0..n-1] contains the right-hand side , while on output it returns the solution. +On input u[0..n-1][0..n-1] contains the right-hand side с, while on output it returns the solution. The dimension n must be of the form 2^j + 1 for some integer j. (j is actually the number of grid levels used in the solution, called ng below.) ncycle is the number of V-cycles to be used at each level. diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp index 4f885c29a5..9f19167088 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Rescale.cpp @@ -2,7 +2,7 @@ // Upsampling / downsampling routine // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Carsten Klein (cklein05@users.sourceforge.net) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp b/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp index dbc738ffd9..5eab287907 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp +++ b/plugins/AdvaImg/src/FreeImageToolkit/Resize.cpp @@ -2,7 +2,7 @@ // Upsampling / downsampling classes // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Detlev Vendt (detlev.vendt@brillit.de) // - Carsten Klein (cklein05@users.sourceforge.net) // diff --git a/plugins/AdvaImg/src/FreeImageToolkit/Resize.h b/plugins/AdvaImg/src/FreeImageToolkit/Resize.h index ce1d7328d7..90bc9257d4 100644 --- a/plugins/AdvaImg/src/FreeImageToolkit/Resize.h +++ b/plugins/AdvaImg/src/FreeImageToolkit/Resize.h @@ -2,7 +2,7 @@ // Upsampling / downsampling classes // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Detlev Vendt (detlev.vendt@brillit.de) // - Carsten Klein (cklein05@users.sourceforge.net) // diff --git a/plugins/AdvaImg/src/Metadata/Exif.cpp b/plugins/AdvaImg/src/Metadata/Exif.cpp index 35265cb2ab..35cc0539b7 100644 --- a/plugins/AdvaImg/src/Metadata/Exif.cpp +++ b/plugins/AdvaImg/src/Metadata/Exif.cpp @@ -3,7 +3,7 @@ // Exif metadata model // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // - Mihail Naydenov (mnaydenov@users.sourceforge.net) // // Based on the following implementations: @@ -974,12 +974,12 @@ RotateExif(FIBITMAP **dib) { if((tag != NULL) && (FreeImage_GetTagID(tag) == TAG_ORIENTATION)) { const WORD orientation = *((WORD *)FreeImage_GetTagValue(tag)); switch (orientation) { - case 1: // "top, left side" => 0 + case 1: // "top, left side" => 0° break; case 2: // "top, right side" => flip left-right FreeImage_FlipHorizontal(*dib); break; - case 3: // "bottom, right side" => -180 + case 3: // "bottom, right side" => -180° rotated = FreeImage_Rotate(*dib, 180); FreeImage_Unload(*dib); *dib = rotated; @@ -987,24 +987,24 @@ RotateExif(FIBITMAP **dib) { case 4: // "bottom, left side" => flip up-down FreeImage_FlipVertical(*dib); break; - case 5: // "left side, top" => +90 + flip up-down + case 5: // "left side, top" => +90° + flip up-down rotated = FreeImage_Rotate(*dib, 90); FreeImage_Unload(*dib); *dib = rotated; FreeImage_FlipVertical(*dib); break; - case 6: // "right side, top" => -90 + case 6: // "right side, top" => -90° rotated = FreeImage_Rotate(*dib, -90); FreeImage_Unload(*dib); *dib = rotated; break; - case 7: // "right side, bottom" => -90 + flip up-down + case 7: // "right side, bottom" => -90° + flip up-down rotated = FreeImage_Rotate(*dib, -90); FreeImage_Unload(*dib); *dib = rotated; FreeImage_FlipVertical(*dib); break; - case 8: // "left side, bottom" => +90 + case 8: // "left side, bottom" => +90° rotated = FreeImage_Rotate(*dib, 90); FreeImage_Unload(*dib); *dib = rotated; diff --git a/plugins/AdvaImg/src/Metadata/FIRational.cpp b/plugins/AdvaImg/src/Metadata/FIRational.cpp index d383c8d38f..1b3b59c16d 100644 --- a/plugins/AdvaImg/src/Metadata/FIRational.cpp +++ b/plugins/AdvaImg/src/Metadata/FIRational.cpp @@ -2,7 +2,7 @@ // Helper class for rational numbers // // Design and implementation by -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/Metadata/FIRational.h b/plugins/AdvaImg/src/Metadata/FIRational.h index bd3ee13e07..d7c0244209 100644 --- a/plugins/AdvaImg/src/Metadata/FIRational.h +++ b/plugins/AdvaImg/src/Metadata/FIRational.h @@ -2,7 +2,7 @@ // Helper class for rational numbers // // Design and implementation by -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp b/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp index cc12a5d16b..e140c4ed10 100644 --- a/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp +++ b/plugins/AdvaImg/src/Metadata/FreeImageTag.cpp @@ -2,7 +2,7 @@ // Tag manipulation functions // // Design and implementation by -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/Metadata/FreeImageTag.h b/plugins/AdvaImg/src/Metadata/FreeImageTag.h index 23073e4d8d..1128504383 100644 --- a/plugins/AdvaImg/src/Metadata/FreeImageTag.h +++ b/plugins/AdvaImg/src/Metadata/FreeImageTag.h @@ -2,7 +2,7 @@ // Tag manipulation functions // // Design and implementation by -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // // This file is part of FreeImage 3 // @@ -320,7 +320,7 @@ typedef struct tagTagInfo { /** -Class to hold tag information (based on Meyers Singleton).<br> +Class to hold tag information (based on Meyers’ Singleton).<br> Sample usage :<br> <code> diff --git a/plugins/AdvaImg/src/Metadata/IPTC.cpp b/plugins/AdvaImg/src/Metadata/IPTC.cpp index bde718c986..c0dea2b568 100644 --- a/plugins/AdvaImg/src/Metadata/IPTC.cpp +++ b/plugins/AdvaImg/src/Metadata/IPTC.cpp @@ -2,7 +2,7 @@ // Metadata functions implementation // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/Metadata/TagConversion.cpp b/plugins/AdvaImg/src/Metadata/TagConversion.cpp index bbba4442c2..c54cab0c28 100644 --- a/plugins/AdvaImg/src/Metadata/TagConversion.cpp +++ b/plugins/AdvaImg/src/Metadata/TagConversion.cpp @@ -2,7 +2,7 @@ // Tag to string conversion functions // // Design and implementation by -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/Metadata/TagLib.cpp b/plugins/AdvaImg/src/Metadata/TagLib.cpp index fb6da996c0..da7b2af8b0 100644 --- a/plugins/AdvaImg/src/Metadata/TagLib.cpp +++ b/plugins/AdvaImg/src/Metadata/TagLib.cpp @@ -2,7 +2,7 @@ // Tag library // // Design and implementation by -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/Quantizers.h b/plugins/AdvaImg/src/Quantizers.h index 3db12d387d..4ac3582815 100644 --- a/plugins/AdvaImg/src/Quantizers.h +++ b/plugins/AdvaImg/src/Quantizers.h @@ -2,7 +2,7 @@ // Quantizer objects and functions // // Design and implementation by: -// - Herv Drolon <drolon@infonie.fr> +// - Hervй Drolon <drolon@infonie.fr> // - Carsten Klein (cklein05@users.sourceforge.net) // // This file is part of FreeImage 3 diff --git a/plugins/AdvaImg/src/ToneMapping.h b/plugins/AdvaImg/src/ToneMapping.h index 0519933c68..c8a1224297 100644 --- a/plugins/AdvaImg/src/ToneMapping.h +++ b/plugins/AdvaImg/src/ToneMapping.h @@ -2,7 +2,7 @@ // High Dynamic Range bitmap conversion routines // // Design and implementation by -// - Herv Drolon (drolon@infonie.fr) +// - Hervй Drolon (drolon@infonie.fr) // // This file is part of FreeImage 3 // diff --git a/plugins/AdvaImg/src/version.h b/plugins/AdvaImg/src/version.h index fd6a0bfd08..e2da56456d 100644 --- a/plugins/AdvaImg/src/version.h +++ b/plugins/AdvaImg/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Nightwish, The FreeImage project (http://freeimage.sourceforge.net/)"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/AdvaImg/"
-#define __COPYRIGHT " 2000-2012 Miranda-IM project, 2012-17 Miranda NG project uses the FreeImage distribution"
+#define __COPYRIGHT "© 2000-2012 Miranda-IM project, 2012-17 Miranda NG project uses the FreeImage distribution"
diff --git a/plugins/Alarms/src/version.h b/plugins/Alarms/src/version.h index 3f6518bbbd..3c291c46d3 100755 --- a/plugins/Alarms/src/version.h +++ b/plugins/Alarms/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Scott Ellis" #define __AUTHOREMAIL "mail@scottellis.com.au" #define __AUTHORWEB "https://miranda-ng.org/p/Alarms/" -#define __COPYRIGHT " 2005 Scott Ellis" +#define __COPYRIGHT "© 2005 Scott Ellis" diff --git a/plugins/AsSingleWindow/src/Options.cpp b/plugins/AsSingleWindow/src/Options.cpp index 1885752561..80abf5b90f 100644 --- a/plugins/AsSingleWindow/src/Options.cpp +++ b/plugins/AsSingleWindow/src/Options.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" #include "AsSingleWindow.h" #include "Options.h" #include "resource.h" diff --git a/plugins/AsSingleWindow/src/version.h b/plugins/AsSingleWindow/src/version.h index 4c03112884..751dc2b189 100644 --- a/plugins/AsSingleWindow/src/version.h +++ b/plugins/AsSingleWindow/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Aleksey Smyrnov aka Soar" #define __AUTHOREMAIL "i@soar.name" #define __AUTHORWEB "https://miranda-ng.org/p/AsSingleWindow/" -#define __COPYRIGHT " 2010-2011 Soar, 2017 Miranda NG team" +#define __COPYRIGHT "© 2010-2011 Soar, 2017 Miranda NG team" diff --git a/plugins/AssocMgr/src/version.h b/plugins/AssocMgr/src/version.h index df73ec2cb1..0ca2ab609c 100644 --- a/plugins/AssocMgr/src/version.h +++ b/plugins/AssocMgr/src/version.h @@ -32,4 +32,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "H. Herkenrath"
#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/AssocMgr/"
-#define __COPYRIGHT " 2005-2007 H. Herkenrath"
+#define __COPYRIGHT "© 2005-2007 H. Herkenrath"
diff --git a/plugins/AuthState/src/version.h b/plugins/AuthState/src/version.h index 7253f1f316..2c5e7c555e 100644 --- a/plugins/AuthState/src/version.h +++ b/plugins/AuthState/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Thief, idea by snwbrdr"
#define __AUTHOREMAIL "thief@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/AuthState/"
-#define __COPYRIGHT " 2006-2010 Alexander Turyak"
+#define __COPYRIGHT "© 2006-2010 Alexander Turyak"
diff --git a/plugins/AutoRun/src/version.h b/plugins/AutoRun/src/version.h index 7a02abdc20..f20a747e70 100644 --- a/plugins/AutoRun/src/version.h +++ b/plugins/AutoRun/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Sergey V. Gershovich a.k.a. Jazzy$ (fixed by Wolfram3D)" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/AutoRun/" -#define __COPYRIGHT " 2002-2007 Sergey V. Gershovich a.k.a. Jazzy$" +#define __COPYRIGHT "© 2002-2007 Sergey V. Gershovich a.k.a. Jazzy$" diff --git a/plugins/AutoShutdown/src/version.h b/plugins/AutoShutdown/src/version.h index a56fd36d05..f5d42980ae 100644 --- a/plugins/AutoShutdown/src/version.h +++ b/plugins/AutoShutdown/src/version.h @@ -32,4 +32,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "H. Herkenrath"
#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/AutoShutdown/"
-#define __COPYRIGHT " 2004-2007 H. Herkenrath"
+#define __COPYRIGHT "© 2004-2007 H. Herkenrath"
diff --git a/plugins/AvatarHistory/src/version.h b/plugins/AvatarHistory/src/version.h index b2d04f8d3d..e5d722027d 100644 --- a/plugins/AvatarHistory/src/version.h +++ b/plugins/AvatarHistory/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Matthew Wild (MattJ), Ricardo Pescuma Domenecci" #define __AUTHOREMAIL "mwild1@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/AvatarHistory/" -#define __COPYRIGHT " 2006-2012 Matthew Wild, Ricardo Pescuma Domenecci" +#define __COPYRIGHT "© 2006-2012 Matthew Wild, Ricardo Pescuma Domenecci" diff --git a/plugins/BASS_interface/res/Bass.rc b/plugins/BASS_interface/res/Bass.rc index 7b09529eca..4937186c1d 100644 --- a/plugins/BASS_interface/res/Bass.rc +++ b/plugins/BASS_interface/res/Bass.rc @@ -15,7 +15,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -95,7 +95,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
#ifndef APSTUDIO_INVOKED
diff --git a/plugins/BASS_interface/src/version.h b/plugins/BASS_interface/src/version.h index d430a4e355..16d349601c 100644 --- a/plugins/BASS_interface/src/version.h +++ b/plugins/BASS_interface/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "tico-tico" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/BASS_interface/" -#define __COPYRIGHT " 2010, 2011 tico-tico" +#define __COPYRIGHT "© 2010, 2011 tico-tico" diff --git a/plugins/BasicHistory/src/version.h b/plugins/BasicHistory/src/version.h index c580041d05..c35aa19fb6 100644 --- a/plugins/BasicHistory/src/version.h +++ b/plugins/BasicHistory/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Krzysztof Kral"
#define __AUTHOREMAIL "krzysztof.kral@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/BasicHistory/"
-#define __COPYRIGHT " 2011-2012 Krzysztof Kral"
+#define __COPYRIGHT "© 2011-2012 Krzysztof Kral"
diff --git a/plugins/Boltun/src/Engine/Mind.cpp b/plugins/Boltun/src/Engine/Mind.cpp index 59ca243b41..33d2e7ad45 100644 --- a/plugins/Boltun/src/Engine/Mind.cpp +++ b/plugins/Boltun/src/Engine/Mind.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/Mind.h b/plugins/Boltun/src/Engine/Mind.h index 2b93c5fdcb..d1dec4ba41 100644 --- a/plugins/Boltun/src/Engine/Mind.h +++ b/plugins/Boltun/src/Engine/Mind.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.cpp b/plugins/Boltun/src/Engine/MyCodeCvt.cpp index 92e5046831..5c5a7a7a44 100644 --- a/plugins/Boltun/src/Engine/MyCodeCvt.cpp +++ b/plugins/Boltun/src/Engine/MyCodeCvt.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/MyCodeCvt.h b/plugins/Boltun/src/Engine/MyCodeCvt.h index e397a6a304..7344fe8390 100644 --- a/plugins/Boltun/src/Engine/MyCodeCvt.h +++ b/plugins/Boltun/src/Engine/MyCodeCvt.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/PerContactData.h b/plugins/Boltun/src/Engine/PerContactData.h index 75bc321b66..71dcec126d 100644 --- a/plugins/Boltun/src/Engine/PerContactData.h +++ b/plugins/Boltun/src/Engine/PerContactData.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/TalkEngine.cpp b/plugins/Boltun/src/Engine/TalkEngine.cpp index 7d1ca265ed..8ab48cd075 100644 --- a/plugins/Boltun/src/Engine/TalkEngine.cpp +++ b/plugins/Boltun/src/Engine/TalkEngine.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
@@ -94,7 +94,7 @@ wstring TalkBot::GetInitMessage(MCONTACT contact) wstring TalkBot::ReplaceAliases(const wstring &message)
{
- const wchar_t dividers[] = L" \t\n\r,./?\\|;:'\"~!#^&*()_-+=[{]}\1";
+ const wchar_t dividers[] = L" \t\n\r,./?\\|;:'\"~!#^&*()_-+=[{]}—\1";
wstring sentence = message;
wstring result;
map<size_t, wstring> sm;
@@ -490,7 +490,7 @@ const Mind& TalkBot::GetMind() const void TalkBot::SplitAndSortWords(wstring sentence, vector<wstring>& keywords,
vector<wstring>& otherwords, bool& isQuestion)
{
- const wchar_t dividers[] = L" \t\n\r,./?\\|;:'\"~!#^&*()_-+=[{]}";
+ const wchar_t dividers[] = L" \t\n\r,./?\\|;:'\"~!#^&*()_-+=[{]}—";
int len = (int)sentence.length();
vector<wstring> words;
map<size_t, wstring> sm;
diff --git a/plugins/Boltun/src/Engine/TalkEngine.h b/plugins/Boltun/src/Engine/TalkEngine.h index 7e0539c9e6..3ddeaf87b9 100644 --- a/plugins/Boltun/src/Engine/TalkEngine.h +++ b/plugins/Boltun/src/Engine/TalkEngine.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/UnrecentChooser.cpp b/plugins/Boltun/src/Engine/UnrecentChooser.cpp index 761adf10c4..058df6cdea 100644 --- a/plugins/Boltun/src/Engine/UnrecentChooser.cpp +++ b/plugins/Boltun/src/Engine/UnrecentChooser.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/UnrecentChooser.h b/plugins/Boltun/src/Engine/UnrecentChooser.h index ff82faf628..b312f668b9 100644 --- a/plugins/Boltun/src/Engine/UnrecentChooser.h +++ b/plugins/Boltun/src/Engine/UnrecentChooser.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/ValueChooser.h b/plugins/Boltun/src/Engine/ValueChooser.h index b65db2acea..acd63dfd8f 100644 --- a/plugins/Boltun/src/Engine/ValueChooser.h +++ b/plugins/Boltun/src/Engine/ValueChooser.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/WordsList.cpp b/plugins/Boltun/src/Engine/WordsList.cpp index 1efbdebc20..310eafa643 100644 --- a/plugins/Boltun/src/Engine/WordsList.cpp +++ b/plugins/Boltun/src/Engine/WordsList.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/Engine/WordsList.h b/plugins/Boltun/src/Engine/WordsList.h index dfda3b6c91..f8dffa4d3c 100644 --- a/plugins/Boltun/src/Engine/WordsList.h +++ b/plugins/Boltun/src/Engine/WordsList.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2008 Valentin Pavlyuchenko
+// Copyright © 2008 Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/actionQueue.h b/plugins/Boltun/src/actionQueue.h index 953b9a08f3..33e22c088c 100644 --- a/plugins/Boltun/src/actionQueue.h +++ b/plugins/Boltun/src/actionQueue.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
+// Copyright © 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/boltun.cpp b/plugins/Boltun/src/boltun.cpp index 0c9e889d7b..c0efda901f 100644 --- a/plugins/Boltun/src/boltun.cpp +++ b/plugins/Boltun/src/boltun.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
+// Copyright © 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/config.cpp b/plugins/Boltun/src/config.cpp index 7137a8af1a..50cfa462da 100644 --- a/plugins/Boltun/src/config.cpp +++ b/plugins/Boltun/src/config.cpp @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
+// Copyright © 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/config.h b/plugins/Boltun/src/config.h index 73587fe3e3..46fea99ffa 100644 --- a/plugins/Boltun/src/config.h +++ b/plugins/Boltun/src/config.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
+// Copyright © 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/stdafx.h b/plugins/Boltun/src/stdafx.h index 113bb4dc88..d82488d9e4 100644 --- a/plugins/Boltun/src/stdafx.h +++ b/plugins/Boltun/src/stdafx.h @@ -1,5 +1,5 @@ //***********************************************************
-// Copyright 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
+// Copyright © 2003-2008 Alexander S. Kiselev, Valentin Pavlyuchenko
//
// This file is part of Boltun.
//
diff --git a/plugins/Boltun/src/version.h b/plugins/Boltun/src/version.h index c4f7d95a15..7b357643f1 100644 --- a/plugins/Boltun/src/version.h +++ b/plugins/Boltun/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Alexander S. Kiselev, Valentin Pavlyuchenko" #define __AUTHOREMAIL "Valentin.Pavlyuchenko@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/Boltun/" -#define __COPYRIGHT " 2003-2008 Alexander S. Kiselev A.K.A. KAS, Valentin Pavlyuchenko" +#define __COPYRIGHT "© 2003-2008 Alexander S. Kiselev A.K.A. KAS, Valentin Pavlyuchenko" diff --git a/plugins/BossKeyPlus/src/BossKeyIdle.cpp b/plugins/BossKeyPlus/src/BossKeyIdle.cpp index 2bcb7fc61a..1f29ddd28b 100644 --- a/plugins/BossKeyPlus/src/BossKeyIdle.cpp +++ b/plugins/BossKeyPlus/src/BossKeyIdle.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/BossKeyPlus/src/version.h b/plugins/BossKeyPlus/src/version.h index 5ed5339f33..e945144c80 100644 --- a/plugins/BossKeyPlus/src/version.h +++ b/plugins/BossKeyPlus/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Goblineye Entertainment, Billy_Bons"
#define __AUTHOREMAIL "tatarinov.sergey@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/BossKey/"
-#define __COPYRIGHT " 2002-2003 Goblineye Entertainment, 2007-2010 Billy_Bons"
+#define __COPYRIGHT "© 2002-2003 Goblineye Entertainment, 2007-2010 Billy_Bons"
diff --git a/plugins/BuddyExpectator/src/version.h b/plugins/BuddyExpectator/src/version.h index 6c27f83ac7..1fa45b1cbd 100644 --- a/plugins/BuddyExpectator/src/version.h +++ b/plugins/BuddyExpectator/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Anar Ibragimoff, sje, Thief" #define __AUTHOREMAIL "thief@miranda.im" #define __AUTHORWEB "https://miranda-ng.org/p/BuddyExpectator/" -#define __COPYRIGHT " 2005 Anar Ibragimoff, 2006 Scott Ellis, 2007-2009 Alexander Turyak" +#define __COPYRIGHT "© 2005 Anar Ibragimoff, 2006 Scott Ellis, 2007-2009 Alexander Turyak" diff --git a/plugins/BuddyPounce/src/version.h b/plugins/BuddyPounce/src/version.h index 123d2cb73f..2d34dbc48c 100644 --- a/plugins/BuddyPounce/src/version.h +++ b/plugins/BuddyPounce/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Jonathan Gordon" #define __AUTHOREMAIL "jdgordy@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/BuddyPounce/" -#define __COPYRIGHT " 2004 Jonathan Gordon" +#define __COPYRIGHT "© 2004 Jonathan Gordon" diff --git a/plugins/CSList/src/cslist.cpp b/plugins/CSList/src/cslist.cpp index 10cfefe065..eda2793387 100644 --- a/plugins/CSList/src/cslist.cpp +++ b/plugins/CSList/src/cslist.cpp @@ -5,8 +5,8 @@ Custom Status List plugin for Miranda-IM (www.miranda-im.org) Follower of Custom Status History List by HANAX - Copyright 2006-2008 HANAX - Copyright 2007-2009 jarvis + Copyright © 2006-2008 HANAX + Copyright © 2007-2009 jarvis Occasionally rewritten in 2012 by George Hazan This program is free software; you can redistribute it and/or diff --git a/plugins/CSList/src/stdafx.h b/plugins/CSList/src/stdafx.h index e76d3aa296..435ab96c42 100644 --- a/plugins/CSList/src/stdafx.h +++ b/plugins/CSList/src/stdafx.h @@ -5,8 +5,8 @@ Custom Status List plugin for Miranda-IM (www.miranda-im.org)
Follower of Custom Status History List by HANAX
- Copyright 2006-2008 HANAX
- Copyright 2007-2009 jarvis
+ Copyright © 2006-2008 HANAX
+ Copyright © 2007-2009 jarvis
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CSList/src/version.h b/plugins/CSList/src/version.h index 97ac0eeecf..5f304453c5 100644 --- a/plugins/CSList/src/version.h +++ b/plugins/CSList/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Mataes, jarvis" #define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/CSList/" -#define __COPYRIGHT " 2010-17 Mataes, 2007-09 jarvis" +#define __COPYRIGHT "© 2010-17 Mataes, 2007-09 jarvis" diff --git a/plugins/ChangeKeyboardLayout/src/hook_events.cpp b/plugins/ChangeKeyboardLayout/src/hook_events.cpp index 0ec26cf5f8..77917a3851 100644 --- a/plugins/ChangeKeyboardLayout/src/hook_events.cpp +++ b/plugins/ChangeKeyboardLayout/src/hook_events.cpp @@ -97,7 +97,7 @@ int ModulesLoaded(WPARAM, LPARAM) {
LPCTSTR ptszEmptySting = L"";
- // . - .
+ // Заполняем конфигурационные строки из базы. Если их там нет - генерируем.
for (int i = 0; i < bLayNum; i++) {
LPTSTR ptszCurrLayout = GenerateLayoutString(hklLayouts[i]);
LPSTR ptszTemp = GetNameOfLayout(hklLayouts[i]);
@@ -115,17 +115,17 @@ int ModulesLoaded(WPARAM, LPARAM) mir_free(ptszTemp);
}
- //
+ // Прочитаем основные настройки
ReadMainOptions();
- //
+ // Прочитаем настройки попапов
ReadPopupOptions();
- //
+ // Зарегим звук
Skin_AddSound(SND_ChangeLayout, ModuleNameW, LPGENW("Changing Layout"));
Skin_AddSound(SND_ChangeCase, ModuleNameW, LPGENW("Changing Case"));
- //
+ // Хук на нажатие клавиши
kbHook_All = SetWindowsHookEx(WH_KEYBOARD, (HOOKPROC)Keyboard_Hook, nullptr, GetCurrentThreadId());
CreateServiceFunction(MS_CKL_CHANGELAYOUT, APIChangeLayout);
@@ -171,7 +171,7 @@ LRESULT CALLBACK Keyboard_Hook(int code, WPARAM wParam, LPARAM lParam) if ((wParam != VK_SHIFT) && (wParam != VK_MENU) && (wParam != VK_CONTROL) && (wParam != VK_LWIN) && (wParam != VK_RWIN))
lcode += wParam;
- // . - , 1.4
+ // Проверка на пустой хоткей. Иначе - пиздец, как в версии 1.4
if (lcode != 0) {
if ((lcode == moOptions.dwHotkey_Layout) && (!(lParam & 0x40000000))) {
ChangeLayout(nullptr, TOT_Layout, moOptions.CurrentWordLayout);
diff --git a/plugins/ChangeKeyboardLayout/src/options.cpp b/plugins/ChangeKeyboardLayout/src/options.cpp index b91115217a..1833095662 100644 --- a/plugins/ChangeKeyboardLayout/src/options.cpp +++ b/plugins/ChangeKeyboardLayout/src/options.cpp @@ -12,13 +12,13 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP MainDialogLock = TRUE;
TranslateDialogDefault(hWnd);
- //
- // ,
+ //Горячие клавиши
+ // Запрещаем вводить в контролы все, кроме обычных кнопок
SendDlgItemMessage(hWnd, IDC_HOTKEY_LAYOUT, HKM_SETRULES, 0xFF, 0);
SendDlgItemMessage(hWnd, IDC_HOTKEY_LAYOUT2, HKM_SETRULES, 0xFF, 0);
SendDlgItemMessage(hWnd, IDC_HOTKEY_CASE, HKM_SETRULES, 0xFF, 0);
- //
+ //Отображаем управляющие клавиши
CheckDlgButton(hWnd, IDC_CHECK_LAYOUT_SHIFT, (moOptions.dwHotkey_Layout&0x00000100) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_CHECK_LAYOUT_CTRL, (moOptions.dwHotkey_Layout&0x00000200) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_CHECK_LAYOUT_ALT, (moOptions.dwHotkey_Layout&0x00000400) ? BST_CHECKED : BST_UNCHECKED);
@@ -34,12 +34,12 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP CheckDlgButton(hWnd, IDC_CHECK_CASE_ALT, (moOptions.dwHotkey_Case&0x00000400) ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_CHECK_CASE_WIN, (moOptions.dwHotkey_Case&0x00000800) ? BST_CHECKED : BST_UNCHECKED);
- //
+ //Показываем символ из хоткея
SendDlgItemMessage(hWnd, IDC_HOTKEY_LAYOUT, HKM_SETHOTKEY, moOptions.dwHotkey_Layout&0x000000FF, 0);
SendDlgItemMessage(hWnd, IDC_HOTKEY_LAYOUT2, HKM_SETHOTKEY, moOptions.dwHotkey_Layout2&0x000000FF, 0);
SendDlgItemMessage(hWnd, IDC_HOTKEY_CASE, HKM_SETHOTKEY, moOptions.dwHotkey_Case&0x000000FF, 0);
- //
+ //Остальные опции
CheckDlgButton(hWnd, IDC_CHECK_LAYOUT_MODE, moOptions.CurrentWordLayout ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_CHECK_LAYOUT_MODE2, moOptions.CurrentWordLayout2 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_CHECK_CASE_MODE, moOptions.CurrentWordCase ? BST_CHECKED : BST_UNCHECKED);
@@ -48,7 +48,7 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP CheckDlgButton(hWnd, IDC_CHECK_CLIPBOARD, moOptions.CopyToClipboard ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_CHECK_POPUP, moOptions.ShowPopup ? BST_CHECKED : BST_UNCHECKED);
- // CapsLock
+ //Смена состояния CapsLock
switch (moOptions.bCaseOperations) {
case 1:
CheckDlgButton(hWnd, IDC_RADIO_OFFCAPS, BST_CHECKED);
@@ -61,20 +61,20 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP break;
}
- // .
+ // Отображаем пример конфиг.строки
ptszMemLay = ptszLayStrings[0];
SetDlgItemText(hWnd, IDC_EDIT_EXAMPLE, ptszMemLay);
ptszShortNameLay = GetShortNameOfLayout(hklLayouts[0]);
SetDlgItemText(hWnd, IDC_STATIC_EXAMPLE, ptszShortNameLay);
mir_free(ptszShortNameLay);
- //
+ // Заполняем комбобокс с текущими раскладками
for(i = 0; i < bLayNum; i++) {
ptszShortNameLay = GetShortNameOfLayout(hklLayouts[i]);
SendDlgItemMessage(hWnd, IDC_COMBO_LANG, CB_ADDSTRING, 0, (LPARAM)ptszShortNameLay);
mir_free(ptszShortNameLay);
}
- //
+ //Отображаем первую раскладку в списке
SendDlgItemMessage(hWnd, IDC_COMBO_LANG, CB_SETCURSEL, 0, 0);
ptszMemLay = ptszLayStrings[0];
SetDlgItemText(hWnd, IDC_EDIT_SET, ptszMemLay);
@@ -149,12 +149,12 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP case 0:
switch (((LPNMHDR)lParam)->code) {
case PSN_APPLY:
- //
+ // Прочитаем хоткеи
moOptions.dwHotkey_Layout = SendDlgItemMessage(hWnd, IDC_HOTKEY_LAYOUT, HKM_GETHOTKEY, 0, 0);
moOptions.dwHotkey_Layout2 = SendDlgItemMessage(hWnd, IDC_HOTKEY_LAYOUT2, HKM_GETHOTKEY, 0, 0);
moOptions.dwHotkey_Case = SendDlgItemMessage(hWnd, IDC_HOTKEY_CASE, HKM_GETHOTKEY, 0, 0);
- //
+ //Допишем к символам управляющие клавиши
if (IsDlgButtonChecked(hWnd, IDC_CHECK_LAYOUT_SHIFT))
moOptions.dwHotkey_Layout |= 0x00000100;
if (IsDlgButtonChecked(hWnd, IDC_CHECK_LAYOUT_CTRL))
@@ -183,7 +183,7 @@ INT_PTR CALLBACK DlgMainProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, LP moOptions.dwHotkey_Case |= 0x00000800;
- //
+ //Прочие опции
moOptions.CurrentWordLayout = IsDlgButtonChecked(hWnd, IDC_CHECK_LAYOUT_MODE);
moOptions.CurrentWordLayout2 = IsDlgButtonChecked(hWnd, IDC_CHECK_LAYOUT_MODE2);
moOptions.CurrentWordCase = IsDlgButtonChecked(hWnd, IDC_CHECK_CASE_MODE);
@@ -244,7 +244,7 @@ INT_PTR CALLBACK DlgPopupsProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, TranslateDialogDefault(hWnd);
poOptionsTemp = poOptions;
- //
+ //Цвета
SendDlgItemMessage(hWnd, IDC_CUSTOM_BACK, CPM_SETCOLOUR, 0, poOptionsTemp.crBackColour);
SendDlgItemMessage(hWnd, IDC_CUSTOM_TEXT, CPM_SETCOLOUR, 0, poOptionsTemp.crTextColour);
CheckDlgButton(hWnd, IDC_RADIO_COLOURS_POPUP, poOptionsTemp.bColourType == PPC_POPUP ? BST_CHECKED : BST_UNCHECKED);
@@ -253,17 +253,17 @@ INT_PTR CALLBACK DlgPopupsProcOptions(HWND hWnd, UINT uiMessage, WPARAM wParam, EnableWindow(GetDlgItem(hWnd, IDC_CUSTOM_BACK), poOptionsTemp.bColourType == PPC_CUSTOM);
EnableWindow(GetDlgItem(hWnd, IDC_CUSTOM_TEXT), poOptionsTemp.bColourType == PPC_CUSTOM);
- //
+ // Таймаут
CheckDlgButton(hWnd, IDC_RADIO_TIMEOUT_POPUP, poOptionsTemp.bTimeoutType == PPT_POPUP ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_RADIO_TIMEOUT_PERMANENT, poOptionsTemp.bTimeoutType == PPT_PERMANENT ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_RADIO_TIMEOUT_CUSTOM, poOptionsTemp.bTimeoutType == PPT_CUSTOM ? BST_CHECKED : BST_UNCHECKED);
SetDlgItemInt(hWnd, IDC_EDIT_TIMEOUT, poOptionsTemp.bTimeout, FALSE);
EnableWindow(GetDlgItem(hWnd, IDC_EDIT_TIMEOUT), poOptionsTemp.bTimeoutType == PPT_CUSTOM);
- //
+ // Клик левой
CheckDlgButton(hWnd, IDC_RADIO_LEFT_CLIPBOARD, poOptionsTemp.bLeftClick == 0 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_RADIO_LEFT_DISMISS, poOptionsTemp.bLeftClick == 1 ? BST_CHECKED : BST_UNCHECKED);
- //
+ // Клик правой
CheckDlgButton(hWnd, IDC_RADIO_RIGHT_CLIPBOARD, poOptionsTemp.bRightClick == 0 ? BST_CHECKED : BST_UNCHECKED);
CheckDlgButton(hWnd, IDC_RADIO_RIGHT_DISMISS, poOptionsTemp.bRightClick == 1 ? BST_CHECKED : BST_UNCHECKED);
PopupDialogLock = FALSE;
diff --git a/plugins/ChangeKeyboardLayout/src/stdafx.h b/plugins/ChangeKeyboardLayout/src/stdafx.h index 05f8314376..85223339b5 100644 --- a/plugins/ChangeKeyboardLayout/src/stdafx.h +++ b/plugins/ChangeKeyboardLayout/src/stdafx.h @@ -35,27 +35,27 @@ #define MS_HPP_EG_NAVIGATE "History++/ExtGrid/Navigate"
#define MS_HPP_EG_OPTIONSCHANGED "History++/ExtGrid/OptionsChanged"
-//
+// Типы окон
#define WTYPE_Unknown 0
#define WTYPE_HistoryPP 1
#define WTYPE_IEView 2
#define WTYPE_RichEdit 3
#define WTYPE_Edit 4
-//
+//Тип операции над текстом
#define TOT_Layout 0
#define TOT_Case 1
-//
+// Имена звуков
#define SND_ChangeLayout "ChangingLayout"
#define SND_ChangeCase "ChangingCase"
-//
+//Цвета попапов
#define PPC_POPUP 0
#define PPC_WINDOWS 1
#define PPC_CUSTOM 2
-//
+//Таймаут попапов
#define PPT_POPUP 0
#define PPT_PERMANENT 1
#define PPT_CUSTOM 2
diff --git a/plugins/ChangeKeyboardLayout/src/text_operations.cpp b/plugins/ChangeKeyboardLayout/src/text_operations.cpp index 90967c017e..678d7116ac 100644 --- a/plugins/ChangeKeyboardLayout/src/text_operations.cpp +++ b/plugins/ChangeKeyboardLayout/src/text_operations.cpp @@ -112,11 +112,11 @@ LPTSTR GenerateLayoutString(HKL hklLayout) bState[shVirtualKey & 0x00FF] = 0x80;
int iRes = ToUnicodeEx(shVirtualKey, iScanCode, bState, ptszTemp, 3, 0, hklLayout);
- // -
+ // Защита от дэд-кеев
if (iRes < 0)
ToUnicodeEx(shVirtualKey, iScanCode, bState, ptszTemp, 3, 0, hklLayout);
- // , , ""
+ // Если нам вернули нулевой символ, или не вернули ничего, то присвоим "звоночек"
if (ptszTemp[0] == 0)
ptszLayStr[i] = 3;
else
@@ -232,13 +232,13 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) if (hTextWnd == nullptr)
return 0;
- //-------------- -----------------
+ //--------------Определяем тип окна-----------------
IEVIEWEVENT ieEvent = { 0 };
ieEvent.cbSize = sizeof(IEVIEWEVENT);
ieEvent.iType = IEE_GET_SELECTION;
if (ServiceExists(MS_HPP_EG_EVENT)) {
- // History++
+ // То же самое для History++
ieEvent.hwnd = hTextWnd;
ptszInText = (wchar_t*)CallService(MS_HPP_EG_EVENT, 0, (LPARAM)&ieEvent);
@@ -247,7 +247,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) }
if ((WindowType == WTYPE_Unknown) && (ServiceExists(MS_IEVIEW_EVENT))) {
- // IEView
+ // Извращенное определение хэндла IEView
ieEvent.hwnd = GetParent(GetParent(hTextWnd));
ptszInText = (wchar_t*)CallService(MS_IEVIEW_EVENT, 0, (LPARAM)&ieEvent);
@@ -272,15 +272,15 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) WindowType = WTYPE_Edit;
}
- //
+ // Получим текст из Рича или обычного Едита
if (WindowType == WTYPE_RichEdit || WindowType == WTYPE_Edit) {
dwStartWord = dwEndWord = -1;
SendMessage(hTextWnd, WM_SETREDRAW, FALSE, 0);
- //
+ // Бэкап выделения
crTemp = crSelection;
- // ,
+ // Если имеется выделенный текст, то получим его
if (crSelection.cpMin != crSelection.cpMax) {
if (WindowType == WTYPE_RichEdit) {
EditStreamData esdData;
@@ -312,9 +312,9 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) }
}
}
- // ,
+ // Если выделения нет, то получим нужный текст
else {
- //
+ // Получаем весь текст в поле
if (WindowType == WTYPE_RichEdit) {
crTemp.cpMin = 0;
crTemp.cpMax = -1;
@@ -348,7 +348,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) return 1;
}
}
- //
+ // Получаем текущее слово
if (CurrentWord) {
for (dwStartWord = crSelection.cpMin; (dwStartWord > 0) && (wcschr(ptszSeparators, ptszInText[dwStartWord - 1]) == nullptr); dwStartWord--);
for (dwEndWord = crSelection.cpMin; (dwEndWord < (mir_wstrlen(ptszInText))) && (wcschr(ptszSeparators, ptszInText[dwEndWord]) == nullptr); dwEndWord++);
@@ -390,7 +390,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) }
}
- //--------------- --------------------
+ //---------------Выдаем результаты--------------------
WindowIsReadOnly = FALSE;
if (WindowType == WTYPE_IEView || WindowType == WTYPE_HistoryPP)
WindowIsReadOnly = TRUE;
@@ -400,7 +400,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) if (GetWindowLongPtr(hTextWnd, GWL_STYLE) & ES_READONLY)
WindowIsReadOnly = TRUE;
- // .
+ // Лог Иевью и ХисториПП в режиме эмуляции Иевью и поля только для чтения.
if (WindowType != WTYPE_Unknown && !IsBadStringPtr(ptszInText, MaxTextSize))
if (WindowIsReadOnly) {
ptrW ptszMBox((LPTSTR)mir_alloc(MaxTextSize*sizeof(wchar_t)));
@@ -443,7 +443,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) if (moOptions.CopyToClipboard)
CopyTextToClipboard(ptszMBox);
- //------------------------------- ------------------------------------------
+ //-------------------------------Покажем попапы------------------------------------------
if (moOptions.ShowPopup) {
LPTSTR ptszPopupText = (LPTSTR)mir_alloc(MaxTextSize*sizeof(wchar_t));
mir_wstrcpy(ptszPopupText, ptszMBox);
@@ -492,7 +492,7 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) }
}
}
- //------------------ ----------------------------
+ //------------------Редактируемые поля ----------------------------
else {
ptrW ptszOutText;
if (TextOperation == TOT_Layout) {
@@ -518,16 +518,16 @@ int ChangeLayout(HWND hTextWnd, BYTE TextOperation, BOOL CurrentWord) SendMessage(hTextWnd, EM_SETSEL, crSelection.cpMin, crSelection.cpMax);
}
- // Caps Lock
+ // Переключим раскладку или изменим состояние Caps Lock
if (TextOperation == TOT_Layout && hklToLay != nullptr && moOptions.ChangeSystemLayout)
ActivateKeyboardLayout(hklToLay, KLF_SETFORPROCESS);
else if (TextOperation == TOT_Case) {
- //
+ // Если нужно инвертнуть
if (moOptions.bCaseOperations == 0) {
keybd_event(VK_CAPITAL, 0x45, 0, 0);
keybd_event(VK_CAPITAL, 0x45, KEYEVENTF_KEYUP, 0);
}
- //
+ // Если нужно отключить
else if (moOptions.bCaseOperations == 1) {
if (GetKeyState(VK_CAPITAL) & 0x0001) {
keybd_event(VK_CAPITAL, 0x45, 0, 0);
diff --git a/plugins/ChangeKeyboardLayout/src/version.h b/plugins/ChangeKeyboardLayout/src/version.h index 97e6f6bfa2..6af003e08e 100644 --- a/plugins/ChangeKeyboardLayout/src/version.h +++ b/plugins/ChangeKeyboardLayout/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Yasnovidyashii" #define __AUTHOREMAIL "Yasnovidyashii@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/ChangeKeyboardLayout/" -#define __COPYRIGHT " 2006-2009 Mikhail Yur'ev" +#define __COPYRIGHT "© 2006-2009 Mikhail Yur'ev" diff --git a/plugins/ClientChangeNotify/src/version.h b/plugins/ClientChangeNotify/src/version.h index 0c89badf16..c47192ad2f 100644 --- a/plugins/ClientChangeNotify/src/version.h +++ b/plugins/ClientChangeNotify/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Deathdemon" #define __AUTHOREMAIL "dchervov@yahoo.com" #define __AUTHORWEB "https://miranda-ng.org/p/ClientChangeNotify/" -#define __COPYRIGHT " 2006-2008 Chervov Dmitry" +#define __COPYRIGHT "© 2006-2008 Chervov Dmitry" diff --git a/plugins/Clist_blind/res/resource.rc b/plugins/Clist_blind/res/resource.rc index 3e2416404f..41b18e0705 100644 --- a/plugins/Clist_blind/res/resource.rc +++ b/plugins/Clist_blind/res/resource.rc @@ -14,7 +14,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -338,7 +338,7 @@ BEGIN END
END
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Clist_blind/src/clc.h b/plugins/Clist_blind/src/clc.h index 701e498316..390fe838c9 100644 --- a/plugins/Clist_blind/src/clc.h +++ b/plugins/Clist_blind/src/clc.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/clcopts.cpp b/plugins/Clist_blind/src/clcopts.cpp index 3721ec3e13..8235ffcc54 100644 --- a/plugins/Clist_blind/src/clcopts.cpp +++ b/plugins/Clist_blind/src/clcopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/clcpaint.cpp b/plugins/Clist_blind/src/clcpaint.cpp index de6c0c2e7c..d4f41130b6 100644 --- a/plugins/Clist_blind/src/clcpaint.cpp +++ b/plugins/Clist_blind/src/clcpaint.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/clistmenus.cpp b/plugins/Clist_blind/src/clistmenus.cpp index 251391c8da..f06c50910a 100644 --- a/plugins/Clist_blind/src/clistmenus.cpp +++ b/plugins/Clist_blind/src/clistmenus.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/clistopts.cpp b/plugins/Clist_blind/src/clistopts.cpp index b2866b67e4..b66fd09a7e 100644 --- a/plugins/Clist_blind/src/clistopts.cpp +++ b/plugins/Clist_blind/src/clistopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/cluiopts.cpp b/plugins/Clist_blind/src/cluiopts.cpp index 3dc4c83b17..efae80e505 100644 --- a/plugins/Clist_blind/src/cluiopts.cpp +++ b/plugins/Clist_blind/src/cluiopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/contact.cpp b/plugins/Clist_blind/src/contact.cpp index 6270630213..a9aac5faa2 100644 --- a/plugins/Clist_blind/src/contact.cpp +++ b/plugins/Clist_blind/src/contact.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/init.cpp b/plugins/Clist_blind/src/init.cpp index eac2270f0d..6bcfda8508 100644 --- a/plugins/Clist_blind/src/init.cpp +++ b/plugins/Clist_blind/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/stdafx.h b/plugins/Clist_blind/src/stdafx.h index e64cc75f4c..30fe6047f6 100644 --- a/plugins/Clist_blind/src/stdafx.h +++ b/plugins/Clist_blind/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_blind/src/version.h b/plugins/Clist_blind/src/version.h index 7891d31dfb..acdb1e35d7 100644 --- a/plugins/Clist_blind/src/version.h +++ b/plugins/Clist_blind/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci, based on previous work from Miranda IM project" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/Clist_blind/" -#define __COPYRIGHT " 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013-17 Miranda NG project" +#define __COPYRIGHT "© 2000-2009 Miranda IM project, Ricardo Pescuma Domenecci, 2013-17 Miranda NG project" diff --git a/plugins/Clist_modern/src/cluiframes.cpp b/plugins/Clist_modern/src/cluiframes.cpp index f5e130c5e7..98f7826a47 100644 --- a/plugins/Clist_modern/src/cluiframes.cpp +++ b/plugins/Clist_modern/src/cluiframes.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/groupmenu.cpp b/plugins/Clist_modern/src/groupmenu.cpp index 3f1cc65679..82bea8a427 100644 --- a/plugins/Clist_modern/src/groupmenu.cpp +++ b/plugins/Clist_modern/src/groupmenu.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/init.cpp b/plugins/Clist_modern/src/init.cpp index 1143005d11..8ad2aeca89 100644 --- a/plugins/Clist_modern/src/init.cpp +++ b/plugins/Clist_modern/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_aniavatars.cpp b/plugins/Clist_modern/src/modern_aniavatars.cpp index 1cc510b4b5..d1fae4ab56 100644 --- a/plugins/Clist_modern/src/modern_aniavatars.cpp +++ b/plugins/Clist_modern/src/modern_aniavatars.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_awaymsg.cpp b/plugins/Clist_modern/src/modern_awaymsg.cpp index 3bb07bcdda..7c0312f921 100644 --- a/plugins/Clist_modern/src/modern_awaymsg.cpp +++ b/plugins/Clist_modern/src/modern_awaymsg.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_awaymsg.h b/plugins/Clist_modern/src/modern_awaymsg.h index 8580d9eb80..cbc37bbf05 100644 --- a/plugins/Clist_modern/src/modern_awaymsg.h +++ b/plugins/Clist_modern/src/modern_awaymsg.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_cache_funcs.h b/plugins/Clist_modern/src/modern_cache_funcs.h index 16ddbc9872..0e2f6464d2 100644 --- a/plugins/Clist_modern/src/modern_cache_funcs.h +++ b/plugins/Clist_modern/src/modern_cache_funcs.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clc.h b/plugins/Clist_modern/src/modern_clc.h index 3c8db0855f..810892ba0d 100644 --- a/plugins/Clist_modern/src/modern_clc.h +++ b/plugins/Clist_modern/src/modern_clc.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -29,7 +29,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "modern_image_array.h"
#include "m_xpTheme.h"
-// .
+// Новый формат настроек.
#define TRAY_ICON_MODE_GLOBAL 1
#define TRAY_ICON_MODE_ACC 2
#define TRAY_ICON_MODE_CYCLE 4
diff --git a/plugins/Clist_modern/src/modern_clcidents.cpp b/plugins/Clist_modern/src/modern_clcidents.cpp index d071c407f0..9170df412e 100644 --- a/plugins/Clist_modern/src/modern_clcidents.cpp +++ b/plugins/Clist_modern/src/modern_clcidents.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clcitems.cpp b/plugins/Clist_modern/src/modern_clcitems.cpp index a7f0588630..165053331f 100644 --- a/plugins/Clist_modern/src/modern_clcitems.cpp +++ b/plugins/Clist_modern/src/modern_clcitems.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clcmsgs.cpp b/plugins/Clist_modern/src/modern_clcmsgs.cpp index f09532cd54..32cbcd87ab 100644 --- a/plugins/Clist_modern/src/modern_clcmsgs.cpp +++ b/plugins/Clist_modern/src/modern_clcmsgs.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clcopts.cpp b/plugins/Clist_modern/src/modern_clcopts.cpp index 9a05de36c4..855a0fd6bb 100644 --- a/plugins/Clist_modern/src/modern_clcopts.cpp +++ b/plugins/Clist_modern/src/modern_clcopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clcutils.cpp b/plugins/Clist_modern/src/modern_clcutils.cpp index 405ecd5d4d..05fbaab4d4 100644 --- a/plugins/Clist_modern/src/modern_clcutils.cpp +++ b/plugins/Clist_modern/src/modern_clcutils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clist.h b/plugins/Clist_modern/src/modern_clist.h index f8774fb3d0..f5416acab4 100644 --- a/plugins/Clist_modern/src/modern_clist.h +++ b/plugins/Clist_modern/src/modern_clist.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp index 382590e0fd..c95eeb86ab 100644 --- a/plugins/Clist_modern/src/modern_clistevents.cpp +++ b/plugins/Clist_modern/src/modern_clistevents.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clistmenus.cpp b/plugins/Clist_modern/src/modern_clistmenus.cpp index 4148a30712..3a5de2fb98 100644 --- a/plugins/Clist_modern/src/modern_clistmenus.cpp +++ b/plugins/Clist_modern/src/modern_clistmenus.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clistmod.cpp b/plugins/Clist_modern/src/modern_clistmod.cpp index 4725dac959..9037e445a9 100644 --- a/plugins/Clist_modern/src/modern_clistmod.cpp +++ b/plugins/Clist_modern/src/modern_clistmod.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clistopts.cpp b/plugins/Clist_modern/src/modern_clistopts.cpp index 0c54ddf98c..97dc3919ea 100644 --- a/plugins/Clist_modern/src/modern_clistopts.cpp +++ b/plugins/Clist_modern/src/modern_clistopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clistsettings.cpp b/plugins/Clist_modern/src/modern_clistsettings.cpp index 33a6105608..bd61a902b9 100644 --- a/plugins/Clist_modern/src/modern_clistsettings.cpp +++ b/plugins/Clist_modern/src/modern_clistsettings.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_clisttray.cpp b/plugins/Clist_modern/src/modern_clisttray.cpp index fcb72f86dd..a43bd7300f 100644 --- a/plugins/Clist_modern/src/modern_clisttray.cpp +++ b/plugins/Clist_modern/src/modern_clisttray.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -318,14 +318,14 @@ int cliTrayIconInit(HWND hwnd) TimerID = 0;
}
- // ? , .
+ // Присутствуют ли в базе новые настройки? Если да, то обновление не нужно.
if (-1 == db_get_b(0, "CList", "tiModeS", -1))
SettingsMigrate();
- // .
+ // Нужно узнать количество годных аккаунтов и неодинаковость их статусов.
bool bDiffers;
pcli->trayIconCount = GetGoodAccNum(&bDiffers, nullptr);
- // , .
+ // Если таковых аккаунтов не нашлось вообще, то будем показывать основную иконку Миранды.
if (!pcli->trayIconCount) {
pcli->trayIconCount = 1;
pcli->trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * pcli->trayIconCount);
@@ -339,13 +339,13 @@ int cliTrayIconInit(HWND hwnd) else
OldMode = Mode = db_get_b(0, "CList", "tiModeV", TRAY_ICON_MODE_GLOBAL);
- // .
+ // Некоторые режимы всегда показывают единственную иконку.
if (Mode < 8)
pcli->trayIconCount = 1;
pcli->trayIcon = (trayIconInfo_t*)mir_calloc(sizeof(trayIconInfo_t) * pcli->trayIconCount);
- // .
+ // Добавляем иконки.
switch (Mode) {
case TRAY_ICON_MODE_GLOBAL:
pcli->pfnTrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0));
@@ -369,7 +369,7 @@ int cliTrayIconInit(HWND hwnd) pcli->pfnTrayIconAdd(hwnd, nullptr, nullptr, CListTray_GetGlobalStatus(0, 0));
pcli->cycleStep = 0;
cliTrayCycleTimerProc(nullptr, 0, 0, 0); // force icon update
- // ID pcli, fnTrayIconUpdateBase .
+ // Не сохраняем ID таймера в pcli, чтобы fnTrayIconUpdateBase не убивала его.
TimerID = CLUI_SafeSetTimer(nullptr, 0, db_get_w(0, "CList", "CycleTime", SETTING_CYCLETIME_DEFAULT) * 1000, cliTrayCycleTimerProc);
break;
@@ -419,7 +419,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) break;
case TRAY_ICON_MODE_ACC:
- // , szChangedProto.
+ // В этом режиме показывается иконка совершенно определённого аккаунта, и не всегда это szChangedProto.
{
ptrA szProto(db_get_sa(0, "CList", bDiffers ? "tiAccV" : "tiAccS"));
if (szProto == nullptr)
@@ -445,7 +445,7 @@ int cliTrayCalcChanged(const char *szChangedProto, int, int) break;
case TRAY_ICON_MODE_ALL:
- // , ?
+ // Какой индекс у аккаунта, который будем апдейтить?
for (; i < pcli->trayIconCount; i++)
if (!mir_strcmp(pcli->trayIcon[i].szProto, szChangedProto))
break;
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp index 521f49d15d..285dd487b7 100644 --- a/plugins/Clist_modern/src/modern_clui.cpp +++ b/plugins/Clist_modern/src/modern_clui.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -1588,7 +1588,7 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam) WINDOWPOS *wp = (WINDOWPOS*)lParam;
GetWindowRect(m_hWnd, &rcOldWindowRect);
- // by ZorG
+ // Прилипание к краям by ZorG
CLUI::SnappingToEdge(wp);
if ((rcOldWindowRect.bottom - rcOldWindowRect.top != wp->cy || rcOldWindowRect.right - rcOldWindowRect.left != wp->cx) && !(wp->flags&SWP_NOSIZE)) {
diff --git a/plugins/Clist_modern/src/modern_clui.h b/plugins/Clist_modern/src/modern_clui.h index 865b92ebaf..a1b439aa24 100644 --- a/plugins/Clist_modern/src/modern_clui.h +++ b/plugins/Clist_modern/src/modern_clui.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_cluiservices.cpp b/plugins/Clist_modern/src/modern_cluiservices.cpp index 5f923ec95c..2def6b30ca 100644 --- a/plugins/Clist_modern/src/modern_cluiservices.cpp +++ b/plugins/Clist_modern/src/modern_cluiservices.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_contact.cpp b/plugins/Clist_modern/src/modern_contact.cpp index b18b5e2651..12001d9160 100644 --- a/plugins/Clist_modern/src/modern_contact.cpp +++ b/plugins/Clist_modern/src/modern_contact.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_defsettings.h b/plugins/Clist_modern/src/modern_defsettings.h index 3035c45ffa..b322452cb0 100644 --- a/plugins/Clist_modern/src/modern_defsettings.h +++ b/plugins/Clist_modern/src/modern_defsettings.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
Copyright 2007 Artem Shpynov
diff --git a/plugins/Clist_modern/src/modern_docking.cpp b/plugins/Clist_modern/src/modern_docking.cpp index 2661747e72..cbf359a886 100644 --- a/plugins/Clist_modern/src/modern_docking.cpp +++ b/plugins/Clist_modern/src/modern_docking.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_global.cpp b/plugins/Clist_modern/src/modern_global.cpp index 43bc2ff63f..5d862c2237 100644 --- a/plugins/Clist_modern/src/modern_global.cpp +++ b/plugins/Clist_modern/src/modern_global.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_image_array.cpp b/plugins/Clist_modern/src/modern_image_array.cpp index 6be2a08d61..06d5a10246 100644 --- a/plugins/Clist_modern/src/modern_image_array.cpp +++ b/plugins/Clist_modern/src/modern_image_array.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_image_array.h b/plugins/Clist_modern/src/modern_image_array.h index 90d1b9315e..eb8c6aaa2f 100644 --- a/plugins/Clist_modern/src/modern_image_array.h +++ b/plugins/Clist_modern/src/modern_image_array.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_keyboard.cpp b/plugins/Clist_modern/src/modern_keyboard.cpp index 96e4c7a098..cfce0425fe 100644 --- a/plugins/Clist_modern/src/modern_keyboard.cpp +++ b/plugins/Clist_modern/src/modern_keyboard.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_newrowopts.cpp b/plugins/Clist_modern/src/modern_newrowopts.cpp index 6d0d574b6f..060352cc32 100644 --- a/plugins/Clist_modern/src/modern_newrowopts.cpp +++ b/plugins/Clist_modern/src/modern_newrowopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_row.cpp b/plugins/Clist_modern/src/modern_row.cpp index e5406aea4a..a8a0d51ecc 100644 --- a/plugins/Clist_modern/src/modern_row.cpp +++ b/plugins/Clist_modern/src/modern_row.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -31,14 +31,14 @@ void rowEqualize(ROWCELL* cell); void rowResetEmptyRects(ROWCELL* cell); void rowDeleteTree(ROWCELL* cell); -//extern ROWCELL * gl_RowRoot; // < contact> -//ROWOBJECTS RowTA; // , . -// - RowParce. rowParserGetParam +//extern ROWCELL * gl_RowRoot; // Указатель на корневой тэг < contact> в шаблоне +//ROWOBJECTS RowTA; // Структура, через которую осуществляется доступ к элементам контакта. +// Формируется при выполнении фу-и RowParce. Неявный параметр фуи rowParserGetParam -// - RowParce. rowParserGetParam +// Формируется при выполнении фу-и RowParce. Неявный параметр фуи rowParserGetParam -char *tmplbuf; // +char *tmplbuf; // Буфер для хранения шаблона в текстовом виде ROWCELL *cppInitModernRow(ROWCELL ** tabAccess) { @@ -98,10 +98,10 @@ void cppCalculateRowItemsPos(ROWCELL *RowRoot, int width) } // rowAddCell -// - . ROWCELL -// -// link - child next, ROWCELL -// cont - : , +// Выделяет необходимое кол-во дин. памяти для структуры ROWCELL +// и связывает ее с деревом описания контакта +// link - поле child или next, родительской структуры ROWCELL +// cont - тип контейнера: строка, столбец или корневой узел // // const ROWCELL * rowAddCell(ROWCELL* &link, int cont) @@ -113,8 +113,8 @@ const ROWCELL * rowAddCell(ROWCELL* &link, int cont) } // rowDeleteTree -// -// cell - +// Освобождает память занятую деревом описания контакта +// cell - адрес корневого узла дерева описания контакта // // void rowDeleteTree(ROWCELL* cell) @@ -130,13 +130,13 @@ void rowDeleteTree(ROWCELL* cell) } // rowParserGetNextWord -// ( ) . -// , : SP, < , >, ;, TAB, CR, LF -// ; . -// NOTE: ModernCL, -// , -// tbuf - -// hbuf - +// Выбирает из потока данных (сейчас файлового) очередное слово. +// Словом считается последовательность символов, ограниченная знаками: SP, < , >, ;, TAB, CR, LF +// символы от ; и до конца строки считаются комментарием. +// NOTE: Данная реализация не совсем подходит для включения ее в ModernCL, +// а по сему, тут надо будет переделывать +// tbuf - указатель на буфер содержащий текст шаблона +// hbuf - указатель буфера // // char * rowParserGetNextWord(char *tbuf, int &hbuf) @@ -192,10 +192,10 @@ char * rowParserGetNextWord(char *tbuf, int &hbuf) } // rowParserGetParam -// , -// cell - -// tbuf - -// hbuf - +// ищет и интерпретирует слова в шаблоне, заключенные между тэгами +// cell - указатель на текущий интерпретируемый контейнер шаблона +// tbuf - указатель на буфер содержащий текст шаблона +// hbuf - указатель буфера // // void rowParserGetParam(ROWCELL* &cell, char *tbuf, int &hbuf) @@ -293,13 +293,13 @@ void rowParserGetParam(ROWCELL* &cell, char *tbuf, int &hbuf) return; } // rowParse -// < contact>, < tr> < tc>, -// -// cell - child next -// parent - -// tbuf - -// hbuf - -// sequence - 0, +// Ищет в шаблоне теги < contact>, < tr> и < tc>, и добавляет соответствующие узлы +// в дерево описания контакта +// cell - поле child или next родительского контейнера +// parent - указатель на родительский контейнер +// tbuf - указатель на буфер содержащий текст шаблона +// hbuf - указатель буфера +// sequence - нужно задавать 0, это очередность нахождения // BOOL rowParse(ROWCELL* &cell, ROWCELL* parent, char *tbuf, int &hbuf, int &sequence, ROWCELL** RowTabAccess) { @@ -350,10 +350,10 @@ void rowResetEmptyRects(ROWCELL* cell) } // rowCalculateMinSize -// -// - ! rowPositioning -// cell - -// NOTE: rowCalculateMinSize w h RowTA, +// Вычисление минимальных размеров каждого контейнера дерева описания контакта +// Эта фу-я ВСЕГДА! должна вызываться непосредственно перед rowPositioning +// cell - указатель на корневой узел дерева описания контакта +// NOTE: Перед вызывом rowCalculateMinSize необходимо заполнить поля w и h структуры RowTA, для каждого элемента // void rowCalculateMinSize(ROWCELL* cell) { @@ -426,8 +426,8 @@ void rowCalculateMinSize(ROWCELL* cell) // void rowEqualise(ROWCELL* cell) // -// , -// cell - +// Уравнивает высоты детей внутри строк, и ширины детей внутри стобцов +// cell - указатель на корневой узел дерева описания контакта // void rowEqualize(ROWCELL* cell) { @@ -463,8 +463,8 @@ void rowEqualize(ROWCELL* cell) // void rowPlacing(pttCell cell, pttCell parent) // -// -// cell - +// Позиционирует элемент строки контакта в его контейнере +// cell - указатель на плавающий контейнер // void rowPlacing(pROWCELL cell) { @@ -509,9 +509,9 @@ void rowPlacing(pROWCELL cell) // void ttTLProc(pROWCELL cell, pROWCELL parent) // -// , -// cell - -// parent - +// Позиционирует плавающий контейнер, внутри родительского +// cell - указатель на плавающий контейнер +// parent - указатель на родительский контейнер // void rowLayerProc(pROWCELL cell, pROWCELL parent) { @@ -551,9 +551,9 @@ void rowLayerProc(pROWCELL cell, pROWCELL parent) // void rowPositioning(pROWCELL cell, int &dist) // -// , -// cell - -// dist - +// Вычисляет прямоугольники элементов контакта, учитывая выравнивание в контейнере +// cell - указатель на корневой узел дерева описания контакта +// dist - новая ширина контакта // void rowPositioning(pROWCELL cell, int &dist) { @@ -572,7 +572,7 @@ void rowPositioning(pROWCELL cell, int &dist) int autosized = 0; int dummy = 0; - // dist + // Коррректировка назначаемой ширины dist if (w < cell->r.right && (cell->type < TC_TEXT1 || cell->type > TC_TEXT3 && cell->type != TC_SPACE) || !cell->sizing) dist = w = cell->r.right; @@ -584,13 +584,13 @@ void rowPositioning(pROWCELL cell, int &dist) return; } - // + // Позиционирование контейнеров в строке if (cell->cont == TC_ROW) { fixedsized = cell->fixed_width; while (curchild) { - // layer tc + // Контейнеры layer не должны влиять на позиционирование контейнеров tc if (curchild->layer) { curchild = curchild->next; @@ -664,12 +664,12 @@ void rowPositioning(pROWCELL cell, int &dist) } } - // + // Позиционирование контейнеров в столбце if (cell->cont == TC_COL) { while (curchild) { - // layer tr + // Контейнеры layer не должны влиять на позиционирование контейнеров tr if (curchild->layer) { curchild = curchild->next; @@ -723,8 +723,8 @@ void rowPositioning(pROWCELL cell, int &dist) // void rowSizeWithReposition(ROWCELL* &root, int width) // -// -// RowTA +// Производит просчет и позиционирование элементов котакта +// Перед вызовом необходимо заполнить структуру RowTA // void rowSizeWithReposition(ROWCELL* &root, int width) { diff --git a/plugins/Clist_modern/src/modern_row.h b/plugins/Clist_modern/src/modern_row.h index ad84c94071..dead645a89 100644 --- a/plugins/Clist_modern/src/modern_row.h +++ b/plugins/Clist_modern/src/modern_row.h @@ -48,35 +48,35 @@ -// ,
+// Структура, описывающая контейнер элемента контакта
//
typedef struct tagRowCell
{
- int cont; // - , ,
- int type; // , , 0 -
- int halign; //
- int valign; //
+ int cont; // Тип контейнера - контакт, сторока, столбец
+ int type; // Тип элемента, содержащегося в контейнере, если 0 - пустой контейнер
+ int halign; // Горизонтальное выравнивание внутри контейнера
+ int valign; // Вертикальное выравнивание внутри контейнера
- int w; // ,
- int h; //
+ int w; // Ширина элемента контакта, для текстовых полей игнорируется
+ int h; // Высота элемента котнакта
- BOOL sizing; // ,
- BOOL layer; // , ,
+ BOOL sizing; // Параметр, показывающий наличие текстовых полей в дочерних контейнерах
+ BOOL layer; // Параметр, показывающий, что контейнер образует новый слой
- BOOL hasfixed; //
- BOOL fitwidth; //
- // ( .)
+ BOOL hasfixed; // Параметр показывающий что есть вложенные фиксированные элементы
+ BOOL fitwidth; // Параметр указывающий что последний элемент заполняет все оставшееся
+ // Пространство (расстягивает родителя.оверлей)
int fixed_width;
int full_width;
- RECT r; //
- struct tagRowCell * next; //
- struct tagRowCell * child; // .
+ RECT r; // Прямоугольник для рисования элемента
+ struct tagRowCell * next; // Поле связи
+ struct tagRowCell * child; // Поле связи см. файл описания
}
ROWCELL, *pROWCELL;
-//
+// Структура для доступа к контейнерам элемента контакта внутри дерева опивания
#ifndef _CPPCODE
int cppCalculateRowHeight(ROWCELL *RowRoot);
void cppCalculateRowItemsPos(ROWCELL *RowRoot, int width);
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp index 3cecdbbdf5..83d3842ebf 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.cpp +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -27,7 +27,7 @@ Created by Pescuma, modified by Artem Shpynov #include "stdafx.h"
#include "modern_clcpaint.h"
-ROWCELL *gl_RowTabAccess[TC_ELEMENTSCOUNT + 1] = {}; // , .
+ROWCELL *gl_RowTabAccess[TC_ELEMENTSCOUNT + 1] = {}; // Массив, через который осуществляется доступ к элементам контакта.
ROWCELL *gl_RowRoot;
void FreeRowCell()
diff --git a/plugins/Clist_modern/src/modern_rowheight_funcs.h b/plugins/Clist_modern/src/modern_rowheight_funcs.h index 077b4ed324..ee62dd081c 100644 --- a/plugins/Clist_modern/src/modern_rowheight_funcs.h +++ b/plugins/Clist_modern/src/modern_rowheight_funcs.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp index c8aaffbded..4fce3ac60e 100644 --- a/plugins/Clist_modern/src/modern_rowtemplateopt.cpp +++ b/plugins/Clist_modern/src/modern_rowtemplateopt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_skinbutton.cpp b/plugins/Clist_modern/src/modern_skinbutton.cpp index b957d3f89b..01b2d6a312 100644 --- a/plugins/Clist_modern/src/modern_skinbutton.cpp +++ b/plugins/Clist_modern/src/modern_skinbutton.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/Clist_modern/src/modern_skinengine.cpp b/plugins/Clist_modern/src/modern_skinengine.cpp index 8f32dfa2ac..8d6e8fc619 100644 --- a/plugins/Clist_modern/src/modern_skinengine.cpp +++ b/plugins/Clist_modern/src/modern_skinengine.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/Clist_modern/src/modern_skinopt.cpp b/plugins/Clist_modern/src/modern_skinopt.cpp index 386b268fa1..50071533a9 100644 --- a/plugins/Clist_modern/src/modern_skinopt.cpp +++ b/plugins/Clist_modern/src/modern_skinopt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/Clist_modern/src/modern_skinselector.cpp b/plugins/Clist_modern/src/modern_skinselector.cpp index 214faf17b9..191d9fd734 100644 --- a/plugins/Clist_modern/src/modern_skinselector.cpp +++ b/plugins/Clist_modern/src/modern_skinselector.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_skinselector.h b/plugins/Clist_modern/src/modern_skinselector.h index 61e34a768e..1a7a149d2d 100644 --- a/plugins/Clist_modern/src/modern_skinselector.h +++ b/plugins/Clist_modern/src/modern_skinselector.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_static_clui.h b/plugins/Clist_modern/src/modern_static_clui.h index a8de445427..d91b60151a 100644 --- a/plugins/Clist_modern/src/modern_static_clui.h +++ b/plugins/Clist_modern/src/modern_static_clui.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-08 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/Clist_modern/src/modern_statusbar_options.cpp b/plugins/Clist_modern/src/modern_statusbar_options.cpp index 43c942c6af..a0b1864992 100644 --- a/plugins/Clist_modern/src/modern_statusbar_options.cpp +++ b/plugins/Clist_modern/src/modern_statusbar_options.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/modern_toolbar.cpp b/plugins/Clist_modern/src/modern_toolbar.cpp index 35457afc55..83576dd848 100644 --- a/plugins/Clist_modern/src/modern_toolbar.cpp +++ b/plugins/Clist_modern/src/modern_toolbar.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
Copyright 2007 Artem Shpynov
diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp index b556d85556..542e2ef8ad 100644 --- a/plugins/Clist_modern/src/modern_viewmodebar.cpp +++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/stdafx.h b/plugins/Clist_modern/src/stdafx.h index a5ebb5df48..437b0cd47e 100644 --- a/plugins/Clist_modern/src/stdafx.h +++ b/plugins/Clist_modern/src/stdafx.h @@ -5,7 +5,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_modern/src/version.h b/plugins/Clist_modern/src/version.h index afd5203779..31af1f54d3 100644 --- a/plugins/Clist_modern/src/version.h +++ b/plugins/Clist_modern/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Artem Shpynov, Ricardo Pescuma Domenecci and Anton Senko based on clist_mw by Bethoven"
#define __AUTHOREMAIL "ashpynov@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/Clist_modern/"
-#define __COPYRIGHT " 2000-2010 Miranda-IM project"
+#define __COPYRIGHT "© 2000-2010 Miranda-IM project"
diff --git a/plugins/Clist_nicer/src/Docking.cpp b/plugins/Clist_nicer/src/Docking.cpp index e6732b348d..2ef8cf33f4 100644 --- a/plugins/Clist_nicer/src/Docking.cpp +++ b/plugins/Clist_nicer/src/Docking.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/alphablend.cpp b/plugins/Clist_nicer/src/alphablend.cpp index 63010edbd8..434c448721 100644 --- a/plugins/Clist_nicer/src/alphablend.cpp +++ b/plugins/Clist_nicer/src/alphablend.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/alphablend.h b/plugins/Clist_nicer/src/alphablend.h index 48a6c9cf5b..2c074a1f43 100644 --- a/plugins/Clist_nicer/src/alphablend.h +++ b/plugins/Clist_nicer/src/alphablend.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp index 756e7ba60d..f24df50401 100644 --- a/plugins/Clist_nicer/src/clc.cpp +++ b/plugins/Clist_nicer/src/clc.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clc.h b/plugins/Clist_nicer/src/clc.h index 9284a62cb1..80316d3981 100644 --- a/plugins/Clist_nicer/src/clc.h +++ b/plugins/Clist_nicer/src/clc.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp index 18859042a4..41210844db 100644 --- a/plugins/Clist_nicer/src/clcitems.cpp +++ b/plugins/Clist_nicer/src/clcitems.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clcmsgs.cpp b/plugins/Clist_nicer/src/clcmsgs.cpp index d7f776e607..e478f0764e 100644 --- a/plugins/Clist_nicer/src/clcmsgs.cpp +++ b/plugins/Clist_nicer/src/clcmsgs.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clcopts.cpp b/plugins/Clist_nicer/src/clcopts.cpp index 199026fc71..a95582c3ac 100644 --- a/plugins/Clist_nicer/src/clcopts.cpp +++ b/plugins/Clist_nicer/src/clcopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clcpaint.cpp b/plugins/Clist_nicer/src/clcpaint.cpp index 28c0c73405..ea3d3a54e8 100644 --- a/plugins/Clist_nicer/src/clcpaint.cpp +++ b/plugins/Clist_nicer/src/clcpaint.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clcutils.cpp b/plugins/Clist_nicer/src/clcutils.cpp index c898aec8c3..b0976d8a1c 100644 --- a/plugins/Clist_nicer/src/clcutils.cpp +++ b/plugins/Clist_nicer/src/clcutils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clist.h b/plugins/Clist_nicer/src/clist.h index cbc6b22844..340752b050 100644 --- a/plugins/Clist_nicer/src/clist.h +++ b/plugins/Clist_nicer/src/clist.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp index c56e691fa1..acc282d8ca 100644 --- a/plugins/Clist_nicer/src/clistevents.cpp +++ b/plugins/Clist_nicer/src/clistevents.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp index 0aef011081..a06f4cf0c8 100644 --- a/plugins/Clist_nicer/src/clistmenus.cpp +++ b/plugins/Clist_nicer/src/clistmenus.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp index 782ada2086..37e1cc6b60 100644 --- a/plugins/Clist_nicer/src/clistmod.cpp +++ b/plugins/Clist_nicer/src/clistmod.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-10 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clistopts.cpp b/plugins/Clist_nicer/src/clistopts.cpp index c2aa4a74d8..7450af9e07 100644 --- a/plugins/Clist_nicer/src/clistopts.cpp +++ b/plugins/Clist_nicer/src/clistopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clistsettings.cpp b/plugins/Clist_nicer/src/clistsettings.cpp index ef83efbc73..9d1244ea9d 100644 --- a/plugins/Clist_nicer/src/clistsettings.cpp +++ b/plugins/Clist_nicer/src/clistsettings.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clisttray.cpp b/plugins/Clist_nicer/src/clisttray.cpp index 7669cfc678..97b60f9ef6 100644 --- a/plugins/Clist_nicer/src/clisttray.cpp +++ b/plugins/Clist_nicer/src/clisttray.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp index 9bdcd016e6..14207e9caf 100644 --- a/plugins/Clist_nicer/src/clui.cpp +++ b/plugins/Clist_nicer/src/clui.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-03 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/Clist_nicer/src/cluiframes.cpp b/plugins/Clist_nicer/src/cluiframes.cpp index 0a2a2d1499..67752f0b5a 100644 --- a/plugins/Clist_nicer/src/cluiframes.cpp +++ b/plugins/Clist_nicer/src/cluiframes.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-03 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/Clist_nicer/src/cluiopts.cpp b/plugins/Clist_nicer/src/cluiopts.cpp index f8636fdb21..ceff68889c 100644 --- a/plugins/Clist_nicer/src/cluiopts.cpp +++ b/plugins/Clist_nicer/src/cluiopts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp index f97d264643..bf03244e7d 100644 --- a/plugins/Clist_nicer/src/cluiservices.cpp +++ b/plugins/Clist_nicer/src/cluiservices.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/config.cpp b/plugins/Clist_nicer/src/config.cpp index 18d2844705..c65671378f 100644 --- a/plugins/Clist_nicer/src/config.cpp +++ b/plugins/Clist_nicer/src/config.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/config.h b/plugins/Clist_nicer/src/config.h index 99365d7023..4f7a730a79 100644 --- a/plugins/Clist_nicer/src/config.h +++ b/plugins/Clist_nicer/src/config.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/contact.cpp b/plugins/Clist_nicer/src/contact.cpp index 49d78b9ab3..f64f6b9ddd 100644 --- a/plugins/Clist_nicer/src/contact.cpp +++ b/plugins/Clist_nicer/src/contact.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/extBackg.cpp b/plugins/Clist_nicer/src/extBackg.cpp index b575696943..edc607b4d6 100644 --- a/plugins/Clist_nicer/src/extBackg.cpp +++ b/plugins/Clist_nicer/src/extBackg.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/extBackg.h b/plugins/Clist_nicer/src/extBackg.h index 5293c4e697..c993934ca8 100644 --- a/plugins/Clist_nicer/src/extBackg.h +++ b/plugins/Clist_nicer/src/extBackg.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/groupmenu.cpp b/plugins/Clist_nicer/src/groupmenu.cpp index 62b955c8c7..eae19f9aa5 100644 --- a/plugins/Clist_nicer/src/groupmenu.cpp +++ b/plugins/Clist_nicer/src/groupmenu.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/init.cpp b/plugins/Clist_nicer/src/init.cpp index 7bd7c4077b..afa894dbb6 100644 --- a/plugins/Clist_nicer/src/init.cpp +++ b/plugins/Clist_nicer/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/rowheight_funcs.cpp b/plugins/Clist_nicer/src/rowheight_funcs.cpp index e916ac3b74..4d01d9f7ef 100644 --- a/plugins/Clist_nicer/src/rowheight_funcs.cpp +++ b/plugins/Clist_nicer/src/rowheight_funcs.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/statusbar.cpp b/plugins/Clist_nicer/src/statusbar.cpp index e69c39732e..eeafc58ca1 100644 --- a/plugins/Clist_nicer/src/statusbar.cpp +++ b/plugins/Clist_nicer/src/statusbar.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/stdafx.h b/plugins/Clist_nicer/src/stdafx.h index 35c41717fb..7530c560a8 100644 --- a/plugins/Clist_nicer/src/stdafx.h +++ b/plugins/Clist_nicer/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Clist_nicer/src/version.h b/plugins/Clist_nicer/src/version.h index cf88ae0447..13f6690c71 100644 --- a/plugins/Clist_nicer/src/version.h +++ b/plugins/Clist_nicer/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Pixel, egoDust, cyreve, Nightwish"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Clist_nicer/"
-#define __COPYRIGHT " 2000-2010 Miranda-IM project"
+#define __COPYRIGHT "© 2000-2010 Miranda-IM project"
diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp index 83888c400c..7b6298f78f 100644 --- a/plugins/Clist_nicer/src/viewmodes.cpp +++ b/plugins/Clist_nicer/src/viewmodes.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
@@ -72,7 +72,7 @@ void CLVM_EnumModes(pfnEnumCallback EnumCallback) int FillModes(char *szsetting)
{
- if (szsetting[0] != '')
+ if (szsetting[0] != 'ц')
SendDlgItemMessageA(sttClvmHwnd, IDC_VIEWMODES, LB_INSERTSTRING, -1, (LPARAM)szsetting);
return 1;
}
diff --git a/plugins/Clist_nicer/src/wallpaper.cpp b/plugins/Clist_nicer/src/wallpaper.cpp index 0921445068..8758de2c04 100644 --- a/plugins/Clist_nicer/src/wallpaper.cpp +++ b/plugins/Clist_nicer/src/wallpaper.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Cln_skinedit/res/skinedit.rc b/plugins/Cln_skinedit/res/skinedit.rc index b7f0719c9d..e0f7f533f8 100644 --- a/plugins/Cln_skinedit/res/skinedit.rc +++ b/plugins/Cln_skinedit/res/skinedit.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -104,7 +104,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Cln_skinedit/src/main.cpp b/plugins/Cln_skinedit/src/main.cpp index b0a2734abb..d464b850ad 100644 --- a/plugins/Cln_skinedit/src/main.cpp +++ b/plugins/Cln_skinedit/src/main.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-04 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -545,7 +545,7 @@ static void RefreshControls(HWND hwnd) InvalidateRect(GetDlgItem(hwnd, _controls_to_refresh[i]), nullptr, FALSE); } -// wenn die listbox gendert wurde +// wenn die listbox geдndert wurde static void OnListItemsChange(HWND hwndDlg) { SendMessage(hwndDlg, WM_SETREDRAW, FALSE, 0); diff --git a/plugins/Cln_skinedit/src/skineditres.h b/plugins/Cln_skinedit/src/skineditres.h index ec4da1453d..9eed862270 100644 --- a/plugins/Cln_skinedit/src/skineditres.h +++ b/plugins/Cln_skinedit/src/skineditres.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// d:\MNG_orig\plugins\Clist_nicer\skineditor\res\skinedit.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ d:\MNG_orig\plugins\Clist_nicer\skineditor\res\skinedit.rc
//
#define IDD_SKINITEMEDIT 101
#define IDD_IMAGEITEMEDIT 102
diff --git a/plugins/Cln_skinedit/src/stdafx.h b/plugins/Cln_skinedit/src/stdafx.h index 1aed845122..b15f136caa 100644 --- a/plugins/Cln_skinedit/src/stdafx.h +++ b/plugins/Cln_skinedit/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-04 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Cln_skinedit/src/version.h b/plugins/Cln_skinedit/src/version.h index e38bfb6035..49d9d2c68f 100644 --- a/plugins/Cln_skinedit/src/version.h +++ b/plugins/Cln_skinedit/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Nightwish, Pixel" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/Cln_skinedit/" -#define __COPYRIGHT " 2000-2006 Miranda-IM project" +#define __COPYRIGHT "© 2000-2006 Miranda-IM project" diff --git a/plugins/CloudFile/src/version.h b/plugins/CloudFile/src/version.h index c7c05b57b7..7a5ce87b09 100644 --- a/plugins/CloudFile/src/version.h +++ b/plugins/CloudFile/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/CloudFile/" -#define __COPYRIGHT " 2017 Miranda NG project" +#define __COPYRIGHT "© 2017 Miranda NG project" diff --git a/plugins/CmdLine/src/CmdLine.cpp b/plugins/CmdLine/src/CmdLine.cpp index b28fe18a7d..6c6bf029c2 100644 --- a/plugins/CmdLine/src/CmdLine.cpp +++ b/plugins/CmdLine/src/CmdLine.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/hooked_events.cpp b/plugins/CmdLine/src/hooked_events.cpp index 663a7fe3b0..5ff8a0a0da 100644 --- a/plugins/CmdLine/src/hooked_events.cpp +++ b/plugins/CmdLine/src/hooked_events.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/hooked_events.h b/plugins/CmdLine/src/hooked_events.h index 11b9fea363..754a88e7e4 100644 --- a/plugins/CmdLine/src/hooked_events.h +++ b/plugins/CmdLine/src/hooked_events.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/mimcmd_data.cpp b/plugins/CmdLine/src/mimcmd_data.cpp index 8338c0e48a..affcdfbd9e 100644 --- a/plugins/CmdLine/src/mimcmd_data.cpp +++ b/plugins/CmdLine/src/mimcmd_data.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/mimcmd_handlers.h b/plugins/CmdLine/src/mimcmd_handlers.h index 1a30ccaeae..64db00bbbf 100644 --- a/plugins/CmdLine/src/mimcmd_handlers.h +++ b/plugins/CmdLine/src/mimcmd_handlers.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/mimcmd_ipc.cpp b/plugins/CmdLine/src/mimcmd_ipc.cpp index d9cf61a21a..4a80de23b6 100644 --- a/plugins/CmdLine/src/mimcmd_ipc.cpp +++ b/plugins/CmdLine/src/mimcmd_ipc.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/mimcmd_ipc.h b/plugins/CmdLine/src/mimcmd_ipc.h index d12a4a993f..2125ce6f5e 100644 --- a/plugins/CmdLine/src/mimcmd_ipc.h +++ b/plugins/CmdLine/src/mimcmd_ipc.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/services.cpp b/plugins/CmdLine/src/services.cpp index 5faff619b9..56c768878a 100644 --- a/plugins/CmdLine/src/services.cpp +++ b/plugins/CmdLine/src/services.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/services.h b/plugins/CmdLine/src/services.h index b4beb1d44b..00a5c6d369 100644 --- a/plugins/CmdLine/src/services.h +++ b/plugins/CmdLine/src/services.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/stdafx.h b/plugins/CmdLine/src/stdafx.h index 0cdff59745..3049769b4c 100644 --- a/plugins/CmdLine/src/stdafx.h +++ b/plugins/CmdLine/src/stdafx.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/utils.cpp b/plugins/CmdLine/src/utils.cpp index 3e10c68950..eb8081ccd0 100644 --- a/plugins/CmdLine/src/utils.cpp +++ b/plugins/CmdLine/src/utils.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/utils.h b/plugins/CmdLine/src/utils.h index 01c58c4c78..3fe9f4ca61 100644 --- a/plugins/CmdLine/src/utils.h +++ b/plugins/CmdLine/src/utils.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/CmdLine/src/version.h b/plugins/CmdLine/src/version.h index 2fcfc361cd..6f9d7a7e52 100644 --- a/plugins/CmdLine/src/version.h +++ b/plugins/CmdLine/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Cristian Libotean"
#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/CmdLine/"
-#define __COPYRIGHT " 2007-2011 Cristian Libotean"
+#define __COPYRIGHT "© 2007-2011 Cristian Libotean"
diff --git a/plugins/ConnectionNotify/src/version.h b/plugins/ConnectionNotify/src/version.h index 0edeb9c3ea..a147192ba9 100644 --- a/plugins/ConnectionNotify/src/version.h +++ b/plugins/ConnectionNotify/src/version.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __DESCRIPTION "Notify with popup if some connection established"
#define __AUTHOR "MaKaR"
#define __AUTHOREMAIL "makar@poczta.of.pl"
-#define __COPYRIGHT " 2011-2013 MaKaRSoFT"
+#define __COPYRIGHT "© 2011-2013 MaKaRSoFT"
#define __AUTHORWEB "https://miranda-ng.org/p/ConnectionNotify/"
#define __PLUGIN_DISPLAY_NAME "ConnectionNotify"
diff --git a/plugins/Console/src/Console.cpp b/plugins/Console/src/Console.cpp index 43c85aea52..bcc42ec164 100644 --- a/plugins/Console/src/Console.cpp +++ b/plugins/Console/src/Console.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Console/src/init.cpp b/plugins/Console/src/init.cpp index 634b6722f9..17943385fa 100644 --- a/plugins/Console/src/init.cpp +++ b/plugins/Console/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Console/src/stdafx.h b/plugins/Console/src/stdafx.h index e47e581228..73dbe6a50a 100644 --- a/plugins/Console/src/stdafx.h +++ b/plugins/Console/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Console/src/version.h b/plugins/Console/src/version.h index 50e20960b5..57d5d11c65 100644 --- a/plugins/Console/src/version.h +++ b/plugins/Console/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Bio"
#define __AUTHOREMAIL "bio@ktaspb.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/Console/"
-#define __COPYRIGHT " 2005-2012 Bio"
+#define __COPYRIGHT "© 2005-2012 Bio"
diff --git a/plugins/ContactsPlus/res/contacts.rc b/plugins/ContactsPlus/res/contacts.rc index f0a7964043..4c2d112f06 100644 --- a/plugins/ContactsPlus/res/contacts.rc +++ b/plugins/ContactsPlus/res/contacts.rc @@ -146,7 +146,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/ContactsPlus/src/main.cpp b/plugins/ContactsPlus/src/main.cpp index 66b604553d..5a878c8c05 100644 --- a/plugins/ContactsPlus/src/main.cpp +++ b/plugins/ContactsPlus/src/main.cpp @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp index 75a07be4fe..67b2290358 100644 --- a/plugins/ContactsPlus/src/receive.cpp +++ b/plugins/ContactsPlus/src/receive.cpp @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/receive.h b/plugins/ContactsPlus/src/receive.h index 2bb0f5f659..286f91ca13 100644 --- a/plugins/ContactsPlus/src/receive.h +++ b/plugins/ContactsPlus/src/receive.h @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp index 6ddd675442..9887b10071 100644 --- a/plugins/ContactsPlus/src/send.cpp +++ b/plugins/ContactsPlus/src/send.cpp @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/send.h b/plugins/ContactsPlus/src/send.h index eada2a7da7..1cd9f2ec04 100644 --- a/plugins/ContactsPlus/src/send.h +++ b/plugins/ContactsPlus/src/send.h @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/stdafx.h b/plugins/ContactsPlus/src/stdafx.h index d7e786f1be..14b3a280b9 100644 --- a/plugins/ContactsPlus/src/stdafx.h +++ b/plugins/ContactsPlus/src/stdafx.h @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/utils.cpp b/plugins/ContactsPlus/src/utils.cpp index 9ea296f915..c6c079cf3a 100644 --- a/plugins/ContactsPlus/src/utils.cpp +++ b/plugins/ContactsPlus/src/utils.cpp @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/utils.h b/plugins/ContactsPlus/src/utils.h index 6783f5bd74..01eee73411 100644 --- a/plugins/ContactsPlus/src/utils.h +++ b/plugins/ContactsPlus/src/utils.h @@ -2,8 +2,8 @@ // Contacts+ for Miranda Instant Messenger
// _______________________________________
//
-// Copyright 2002 Dominus Procellarum
-// Copyright 2004-2008 Joe Kucera
+// Copyright © 2002 Dominus Procellarum
+// Copyright © 2004-2008 Joe Kucera
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/ContactsPlus/src/version.h b/plugins/ContactsPlus/src/version.h index 953874a258..0e8658af31 100644 --- a/plugins/ContactsPlus/src/version.h +++ b/plugins/ContactsPlus/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Joe Kucera, Todor Totev" #define __AUTHOREMAIL "jokusoftware@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/Contacts/" -#define __COPYRIGHT " 2004-2008 Joe Kucera, Original code 2002 Dominus Procellarum" +#define __COPYRIGHT "© 2004-2008 Joe Kucera, Original code © 2002 Dominus Procellarum" diff --git a/plugins/ContextHelp/src/version.h b/plugins/ContextHelp/src/version.h index 5ceee1d99d..482a4d75f3 100644 --- a/plugins/ContextHelp/src/version.h +++ b/plugins/ContextHelp/src/version.h @@ -50,4 +50,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "Richard Hughes, H. Herkenrath, Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/ContextHelp/"
-#define __COPYRIGHT " 2002 Richard Hughes, 2005-2007 H. Herkenrath, 2016-17 Miranda NG Team"
+#define __COPYRIGHT "© 2002 Richard Hughes, 2005-2007 H. Herkenrath, 2016-17 Miranda NG Team"
diff --git a/plugins/CountryFlags/src/ip2country.cpp b/plugins/CountryFlags/src/ip2country.cpp index d51373e7d2..1014bb8753 100644 --- a/plugins/CountryFlags/src/ip2country.cpp +++ b/plugins/CountryFlags/src/ip2country.cpp @@ -216,7 +216,7 @@ static int EnumIpDataLines(const char *pszFileCSV,const char *pszFileOut) mir_wstrcpy(pszCountry,"UNITED KINGDOM");
else if (!mir_wstrcmpi(pszTwo,"JE")) /* map error */
mir_wstrcpy(pszCountry,"UNITED KINGDOM");
- else if (!mir_wstrcmpi(pszTwo,"AX")) /* land Island belongs to Finland */
+ else if (!mir_wstrcmpi(pszTwo,"AX")) /* Еland Island belongs to Finland */
mir_wstrcpy(pszCountry,"FINLAND");
else if (!mir_wstrcmpi(pszTwo,"ME"))
mir_wstrcpy(pszCountry,"MONTENEGRO");
diff --git a/plugins/CountryFlags/src/version.h b/plugins/CountryFlags/src/version.h index ef8b49dd71..7db3bc805b 100644 --- a/plugins/CountryFlags/src/version.h +++ b/plugins/CountryFlags/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "H. Herkenrath"
#define __AUTHOREMAIL "hrathh@users.sourceforge.net"
#define __AUTHORWEB "https://miranda-ng.org/p/Flags/"
-#define __COPYRIGHT " 2006-2007 H. Herkenrath"
+#define __COPYRIGHT "© 2006-2007 H. Herkenrath"
diff --git a/plugins/CrashDumper/src/version.h b/plugins/CrashDumper/src/version.h index 37a76037c9..9b0f464e2a 100644 --- a/plugins/CrashDumper/src/version.h +++ b/plugins/CrashDumper/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "borkra"
#define __AUTHOREMAIL "borkra@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/CrashDumper/"
-#define __COPYRIGHT " 2008-12 Boris Krasnovskiy, 2012-17 Miranda NG team"
+#define __COPYRIGHT "© 2008-12 Boris Krasnovskiy, 2012-17 Miranda NG team"
diff --git a/plugins/CryptoPP/crypto/src/version.h b/plugins/CryptoPP/crypto/src/version.h index 94da03a602..ca634c9df2 100644 --- a/plugins/CryptoPP/crypto/src/version.h +++ b/plugins/CryptoPP/crypto/src/version.h @@ -7,5 +7,5 @@ #define __PLUGIN_NAME "cryptopp" #define __FILENAME "Cryptlib.lib" -#define __DESCRIPTION "Crypto++ Library DLL." -#define __COPYRIGHT " 1995-2007 by Wei Dai" +#define __DESCRIPTION "Crypto++® Library DLL." +#define __COPYRIGHT "© 1995-2007 by Wei Dai" diff --git a/plugins/CryptoPP/src/cpp_cntx.cpp b/plugins/CryptoPP/src/cpp_cntx.cpp index 9628477124..9fcb9e8542 100644 --- a/plugins/CryptoPP/src/cpp_cntx.cpp +++ b/plugins/CryptoPP/src/cpp_cntx.cpp @@ -19,7 +19,7 @@ pCNTX get_context_on_id(HANDLE context) HANDLE __cdecl cpp_create_context(int mode)
{
pCNTX cntx = (pCNTX)malloc(sizeof(CNTX));
- memset(cntx, 0, sizeof(CNTX)); //
+ memset(cntx, 0, sizeof(CNTX)); // очищаем выделенный блок
cntx->header = HEADER;
cntx->footer = FOOTER;
cntx->mode = mode;
@@ -30,7 +30,7 @@ HANDLE __cdecl cpp_create_context(int mode) void __cdecl cpp_delete_context(HANDLE context)
{
pCNTX tmp = get_context_on_id(context);
- if (tmp) { //
+ if (tmp) { // помечаем на удаление
cpp_free_keys(tmp);
free(tmp);
}
diff --git a/plugins/CryptoPP/src/cpp_rsam.cpp b/plugins/CryptoPP/src/cpp_rsam.cpp index c2eddf6cc8..1ff82b508d 100644 --- a/plugins/CryptoPP/src/cpp_rsam.cpp +++ b/plugins/CryptoPP/src/cpp_rsam.cpp @@ -281,7 +281,7 @@ int __cdecl rsa_disconnect(HANDLE context) Sent_NetLog("rsa_disconnect: %08x", context);
#endif
pCNTX ptr = get_context_on_id(context); if (!ptr) return 0;
- rsa_free(ptr); //
+ rsa_free(ptr); // удалим трэд и очередь сообщений
pRSADATA p = (pRSADATA)cpp_alloc_pdata(ptr);
if (!p->state) return 1;
@@ -291,7 +291,7 @@ int __cdecl rsa_disconnect(HANDLE context) inject_msg(context, 0xF0, encode_msg(0, p, ::hash(buffer, RAND_SIZE)));
p->state = 0;
- imp->rsa_notify(context, -3); //
+ imp->rsa_notify(context, -3); // соединение разорвано вручную
return 1;
}
@@ -302,12 +302,12 @@ int __cdecl rsa_disabled(HANDLE context) Sent_NetLog("rsa_disabled: %08x", context);
#endif
pCNTX ptr = get_context_on_id(context); if (!ptr) return 0;
- rsa_free(ptr); //
+ rsa_free(ptr); // удалим трэд и очередь сообщений
pRSADATA p = (pRSADATA)cpp_alloc_pdata(ptr);
p->state = 0;
inject_msg(context, 0xFF, null);
- // imp->rsa_notify(-context,-8); // "disabled"
+ // imp->rsa_notify(-context,-8); // соединение разорвано по причине "disabled"
return 1;
}
@@ -332,38 +332,38 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) #if defined(_DEBUG) || defined(NETLIB_LOG)
Sent_NetLog("rsa_recv: %02x %d", type, p->state);
#endif
- if (type > 0x10 && type < 0xE0) // ( )
- if (p->state == 0 || p->state != (type >> 4)) { //
- //
+ if (type > 0x10 && type < 0xE0) // проверим тип сообщения (когда соединение еще не установлено)
+ if (p->state == 0 || p->state != (type >> 4)) { // неверное состояние
+ // шлем перерывание сессии
p->state = 0; p->time = 0;
- rsa_free(ptr); //
- null_msg(context, 0x00, -1); // ,
+ rsa_free(ptr); // удалим трэд и очередь сообщений
+ null_msg(context, 0x00, -1); // сессия разорвана по ошибке, неверный тип сообщения
return nullptr;
}
switch (type) {
- case 0x00: //
+ case 0x00: // прерывание сессии по ошибке другой стороной
{
- // -
+ // если соединение установлено - ничего не делаем
if (p->state == 0 || p->state == 7) return nullptr;
- //
+ // иначе сбрасываем текущее состояние
p->state = 0; p->time = 0;
- imp->rsa_notify(context, -2); //
+ imp->rsa_notify(context, -2); // сессия разорвана по ошибке другой стороной
} break;
- // ,
- case 0x10: //
- case 0x22: // ,
- case 0x23: //
- case 0x24: // ,
- case 0x33: // ,
+ // это все будем обрабатывать в отдельном потоке, чтобы избежать таймаутов
+ case 0x10: // запрос на установку соединения
+ case 0x22: // получили удаленный паблик, отправляем уже криптоключ
+ case 0x23: // отправляем локальный паблик
+ case 0x24: // получили удаленный паблик, отправим локальный паблик
+ case 0x33: // получили удаленный паблик, отправляем криптоключ
case 0x34:
- case 0x21: // ,
+ case 0x21: // получили криптоключ, отправляем криптотест
case 0x32:
case 0x40:
- case 0x0D: //
- case 0xD0: //
+ case 0x0D: // запрос паблика
+ case 0xD0: // ответ пабликом
if (!p->event) {
p->event = CreateEvent(nullptr, FALSE, FALSE, nullptr);
unsigned int tID;
@@ -376,13 +376,13 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) mir_cslock lck(localQueueMutex);
p->queue->push(tlv(type, data));
}
- SetEvent(p->event); // :)
+ SetEvent(p->event); // сказали обрабатывать :)
break;
- case 0x50: // ,
+ case 0x50: // получили криптотест, отправляем свой криптотест
if (!decode_msg(p, data).length()) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return nullptr;
}
{
@@ -391,60 +391,60 @@ LPSTR __cdecl rsa_recv(HANDLE context, LPCSTR msg) inject_msg(context, 0x60, encode_msg(0, p, ::hash(buffer, RAND_SIZE)));
}
p->state = 7; p->time = 0;
- rsa_free_thread(p); //
- imp->rsa_notify(context, 1); // ,
+ rsa_free_thread(p); // удалим трэд и очередь сообщений
+ imp->rsa_notify(context, 1); // заебися, криптосессия установлена
break;
- case 0x60: // ,
+ case 0x60: // получили криптотест, сессия установлена
if (!decode_msg(p, data).length()) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return nullptr;
}
p->state = 7; p->time = 0;
- rsa_free_thread(p); //
- imp->rsa_notify(context, 1); // ,
+ rsa_free_thread(p); // удалим трэд и очередь сообщений
+ imp->rsa_notify(context, 1); // заебися, криптосессия установлена
break;
- case 0x70: // AES ,
+ case 0x70: // получили AES сообщение, декодируем
{
mir_free(ptr->tmp);
string msg = decode_msg(p, data);
if (msg.length())
return ptr->tmp = mir_strdup(msg.c_str());
else {
- imp->rsa_notify(context, -5); // AES
+ imp->rsa_notify(context, -5); // ошибка декодирования AES сообщения
return ptr->tmp = nullptr;
}
}
- case 0xE0: // RSA ,
+ case 0xE0: // получили RSA сообщение, декодируем
{
mir_free(ptr->tmp);
string msg = decode_rsa(p, r, data);
if (msg.length())
return ptr->tmp = mir_strdup(msg.c_str());
else {
- imp->rsa_notify(context, -6); // RSA
+ imp->rsa_notify(context, -6); // ошибка декодирования RSA сообщения
return ptr->tmp = nullptr;
}
}
- case 0xF0: //
+ case 0xF0: // разрыв соединения вручную
{
if (p->state != 7) return nullptr;
string msg = decode_msg(p, data);
if (!msg.length()) return nullptr;
p->state = 0;
- rsa_free(ptr); //
- imp->rsa_notify(context, -4); //
+ rsa_free(ptr); // удалим трэд и очередь сообщений
+ imp->rsa_notify(context, -4); // соединение разорвано вручную другой стороной
}
break;
- case 0xFF: // "disabled"
+ case 0xFF: // разрыв соединения по причине "disabled"
p->state = 0;
- rsa_free(ptr); //
- imp->rsa_notify(context, -8); // "disabled"
+ rsa_free(ptr); // удалим трэд и очередь сообщений
+ imp->rsa_notify(context, -8); // соединение разорвано по причине "disabled"
break;
}
@@ -459,11 +459,11 @@ int __cdecl rsa_send(HANDLE context, LPCSTR msg) pCNTX ptr = get_context_on_id(context); if (!ptr) return 0;
pRSADATA p = (pRSADATA)cpp_alloc_pdata(ptr); if (p->state != 0 && p->state != 7) return 0;
- if (p->state == 7) // , AES
+ if (p->state == 7) // сессия установлена, шифруем AES и отправляем
inject_msg(context, 0x70, encode_msg(1, p, string(msg)));
- else if (p->state == 0) { // , RSA
+ else if (p->state == 0) { // сессия установлена, отправляем RSA сообщение
if (!p->pub_k.length()) return 0;
- // -
+ // есть паблик ключ - отправим сообщение
pRSAPRIV r = rsa_get_priv(ptr);
inject_msg(context, 0xE0, encode_rsa(1, p, r, string(msg)));
}
@@ -646,7 +646,7 @@ void rsa_timeout(HANDLE context, pRSADATA p) #endif
p->state = 0; p->time = 0;
// null_msg(context,0x00,-7);
- imp->rsa_notify(context, -7); //
+ imp->rsa_notify(context, -7); // сессия разорвана по таймауту
}
int __cdecl rsa_encrypt_file(HANDLE context, LPCSTR file_in, LPCSTR file_out)
@@ -707,19 +707,19 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) un_tlv(un_tlv(un_tlv(data, t[0], features), t[1], sha1), t[2], sha2);
BOOL lr = (p->pub_s == sha1); BOOL ll = (r->pub_s == sha2);
switch ((lr << 4) | ll) {
- case 0x11: //
+ case 0x11: // оба паблика совпали
inject_msg(context, 0x21, gen_aes_key_iv(ptr->mode, p, r));
p->state = 5;
break;
- case 0x10: // ,
+ case 0x10: // совпал удаленный паблик, нужен локальный
inject_msg(context, 0x22, tlv(0, features) + tlv(1, r->pub_k) + tlv(2, r->pub_s));
p->state = 3;
break;
- case 0x01: // ,
+ case 0x01: // совпал локальный паблик, нужен удаленный
inject_msg(context, 0x23, tlv(0, features));
p->state = 3;
break;
- case 0x00: //
+ case 0x00: // не совпали оба паблика
inject_msg(context, 0x24, tlv(0, features) + tlv(1, r->pub_k) + tlv(2, r->pub_s));
p->state = 3;
break;
@@ -727,14 +727,14 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) }
break;
- case 0x22: // ,
+ case 0x22: // получили удаленный паблик, отправляем уже криптоключ
{
string pub;
un_tlv(un_tlv(data, t[0], features), t[1], pub);
string sig = ::hash(pub);
if (!imp->rsa_check_pub(context, (PBYTE)pub.data(), (int)pub.length(), (PBYTE)sig.data(), (int)sig.length())) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return 0;
}
init_pub(p, pub);
@@ -747,20 +747,20 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) }
break;
- case 0x23: //
+ case 0x23: // отправляем локальный паблик
un_tlv(data, t[0], features);
inject_msg(context, 0x33, tlv(1, r->pub_k) + tlv(2, r->pub_s));
p->state = 4;
break;
- case 0x24: // ,
+ case 0x24: // получили удаленный паблик, отправим локальный паблик
{
string pub;
un_tlv(un_tlv(data, t[0], features), t[1], pub);
string sig = ::hash(pub);
if (!imp->rsa_check_pub(context, (PBYTE)pub.data(), (int)pub.length(), (PBYTE)sig.data(), (int)sig.length())) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return 0;
}
init_pub(p, pub);
@@ -773,7 +773,7 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) }
break;
- case 0x33: // ,
+ case 0x33: // получили удаленный паблик, отправляем криптоключ
case 0x34:
{
string pub;
@@ -781,7 +781,7 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) string sig = ::hash(pub);
if (!imp->rsa_check_pub(context, (PBYTE)pub.data(), (int)pub.length(), (PBYTE)sig.data(), (int)sig.length())) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return 0;
}
init_pub(p, pub);
@@ -794,14 +794,14 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) }
break;
- case 0x21: // ,
+ case 0x21: // получили криптоключ, отправляем криптотест
case 0x32:
case 0x40:
{
string key = decode_rsa(p, r, data);
if (!key.length()) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return 0;
}
un_tlv(key, t[0], p->aes_k);
@@ -813,21 +813,21 @@ int __cdecl rsa_recv_thread(HANDLE context, string& msg) }
break;
- case 0x0D: //
- case 0xD0: //
+ case 0x0D: // запрос паблика
+ case 0xD0: // ответ пабликом
{
string pub, sha;
un_tlv(un_tlv(un_tlv(data, t[0], features), t[1], pub), t[2], sha);
- if (p->pub_k != pub) { //
+ if (p->pub_k != pub) { // пришел новый паблик
string sig = ::hash(pub);
if (!imp->rsa_check_pub(context, (PBYTE)pub.data(), (int)pub.length(), (PBYTE)sig.data(), (int)sig.length())) {
p->state = 0; p->time = 0;
- null_msg(context, 0x00, -type); //
+ null_msg(context, 0x00, -type); // сессия разорвана по ошибке
return 0;
}
init_pub(p, pub);
}
- if (type == 0x0D) //
+ if (type == 0x0D) // нужно отправить мой паблик
inject_msg(context, 0xD0, tlv(0, features) + tlv(1, r->pub_k) + tlv(2, p->pub_s));
p->state = 0; p->time = 0;
@@ -859,7 +859,7 @@ int rsa_free(pCNTX ptr) return true;
if (p->event) {
- p->thread_exit = 2; //
+ p->thread_exit = 2; // отпускаем поток в свободное плавание
SetEvent(p->event);
return false;
}
@@ -875,7 +875,7 @@ void rsa_free_thread(pRSADATA p) if (p->event) {
p->thread_exit = 1;
SetEvent(p->event);
- //
+ // ждем завершения потока
WaitForSingleObject(p->thread, INFINITE);
CloseHandle(p->thread);
CloseHandle(p->event);
@@ -911,7 +911,7 @@ unsigned __stdcall sttConnectThread(LPVOID arg) WaitForSingleObject(p->event, INFINITE); // dwMsec rc==WAIT_TIMEOUT
if (p->thread_exit == 1) return 0;
if (p->thread_exit == 2) {
- // -
+ // мы в свободном плавании - освободим память и завершим трэд
CloseHandle(p->thread);
CloseHandle(p->event);
SAFE_DELETE(p->queue);
@@ -919,11 +919,11 @@ unsigned __stdcall sttConnectThread(LPVOID arg) return 0;
}
- //
+ // дождались сообщения в очереди
while (!p->thread_exit && p->queue && !p->queue->empty()) {
- //
+ // обработаем сообщения из очереди
if (rsa_recv_thread(context, p->queue->front()) == -1) {
- //
+ // очистить очередь
clear_queue(p);
break;
}
diff --git a/plugins/CryptoPP/src/cpp_rsau.cpp b/plugins/CryptoPP/src/cpp_rsau.cpp index d476c4fb1c..1adf07afd5 100644 --- a/plugins/CryptoPP/src/cpp_rsau.cpp +++ b/plugins/CryptoPP/src/cpp_rsau.cpp @@ -6,7 +6,7 @@ string pad256(string& str) {
string out = str;
int pad = out.length() % 32;
- if (pad) { // 256
+ if (pad) { // надо выровнять на 256 бит
if (pad > 3) {
out += tlv(0, padding.substr(0, 32 - 3 - pad));
}
diff --git a/plugins/CryptoPP/src/cryptopp.h b/plugins/CryptoPP/src/cryptopp.h index 8657e29c6a..a13337f20e 100644 --- a/plugins/CryptoPP/src/cryptopp.h +++ b/plugins/CryptoPP/src/cryptopp.h @@ -111,8 +111,8 @@ typedef queue<string,STRINGDEQUE> STRINGQUEUE; typedef struct __RSADATA {
- short state; // 0 - , 1..6 - keyexchange, 7 -
- u_int time; // keyexchange,
+ short state; // 0 - нифига нет, 1..6 - keyexchange, 7 - соединение установлено
+ u_int time; // для прерывания keyexchange, если долго нет ответа
string pub_k; // public key string
string pub_s; // hash(pub_k)
RSA::PublicKey pub; // public key
@@ -162,20 +162,20 @@ string cpp_zlibc(string&); string cpp_zlibd(string&);
typedef struct {
- int (__cdecl *rsa_gen_keypair)(short); // RSA- ( 2048, 2048 4096)
- int (__cdecl *rsa_get_keypair)(short,PBYTE,int*,PBYTE,int*); //
- int (__cdecl *rsa_get_keyhash)(short,PBYTE,int*,PBYTE,int*); // hash
- int (__cdecl *rsa_set_keypair)(short,PBYTE,int); // ,
- int (__cdecl *rsa_get_pubkey)(HANDLE,PBYTE,int*); //
- int (__cdecl *rsa_set_pubkey)(HANDLE,PBYTE,int); //
- void (__cdecl *rsa_set_timeout)(int); //
- int (__cdecl *rsa_get_state)(HANDLE); //
- int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // SHA1(key)
- int (__cdecl *rsa_connect)(HANDLE); //
- int (__cdecl *rsa_disconnect)(HANDLE); //
- int (__cdecl *rsa_disabled)(HANDLE); // "disabled"
- LPSTR (__cdecl *rsa_recv)(HANDLE,LPCSTR); //
- int (__cdecl *rsa_send)(HANDLE,LPCSTR); //
+ int (__cdecl *rsa_gen_keypair)(short); // генерит RSA-ключи для указанной длины (либо тока 2048, либо 2048 и 4096)
+ int (__cdecl *rsa_get_keypair)(short,PBYTE,int*,PBYTE,int*); // возвращает пару ключей для указанной длины
+ int (__cdecl *rsa_get_keyhash)(short,PBYTE,int*,PBYTE,int*); // возвращает hash пары ключей для указанной длины
+ int (__cdecl *rsa_set_keypair)(short,PBYTE,int); // устанавливает ключи, указанной длины
+ int (__cdecl *rsa_get_pubkey)(HANDLE,PBYTE,int*); // возвращает паблик ключ из указанного контекста
+ int (__cdecl *rsa_set_pubkey)(HANDLE,PBYTE,int); // загружает паблик ключ для указанного контекста
+ void (__cdecl *rsa_set_timeout)(int); // установить таймаут для установки секюрного соединения
+ int (__cdecl *rsa_get_state)(HANDLE); // получить статус указанного контекста
+ int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // вычисляет SHA1(key)
+ int (__cdecl *rsa_connect)(HANDLE); // запускает процесс установки содинения с указанным контекстом
+ int (__cdecl *rsa_disconnect)(HANDLE); // разрывает соединение с указанным контекстом
+ int (__cdecl *rsa_disabled)(HANDLE); // разрывает соединение по причине "disabled"
+ LPSTR (__cdecl *rsa_recv)(HANDLE,LPCSTR); // необходимо передавать сюда все входящие протокольные сообщения
+ int (__cdecl *rsa_send)(HANDLE,LPCSTR); // вызываем для отправки сообщения клиенту
int (__cdecl *rsa_encrypt_file)(HANDLE,LPCSTR,LPCSTR);
int (__cdecl *rsa_decrypt_file)(HANDLE,LPCSTR,LPCSTR);
LPSTR (__cdecl *utf8encode)(LPCWSTR);
@@ -190,9 +190,9 @@ typedef struct { typedef RSA_EXPORT* pRSA_EXPORT;
typedef struct {
- int (__cdecl *rsa_inject)(HANDLE,LPCSTR); //
- int (__cdecl *rsa_check_pub)(HANDLE,PBYTE,int,PBYTE,int); // SHA ,
- void (__cdecl *rsa_notify)(HANDLE,int); //
+ int (__cdecl *rsa_inject)(HANDLE,LPCSTR); // вставляет сообщение в очередь на отправку
+ int (__cdecl *rsa_check_pub)(HANDLE,PBYTE,int,PBYTE,int); // проверяет интерактивно SHA и сохраняет ключ, если все нормально
+ void (__cdecl *rsa_notify)(HANDLE,int); // нотификация о смене состояния
} RSA_IMPORT;
typedef RSA_IMPORT* pRSA_IMPORT;
diff --git a/plugins/CryptoPP/src/version.h b/plugins/CryptoPP/src/version.h index 845cc34359..60042bfccb 100644 --- a/plugins/CryptoPP/src/version.h +++ b/plugins/CryptoPP/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Baloo"
#define __AUTHOREMAIL "baloo@bk.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/CryptoPP/"
-#define __COPYRIGHT " 2006-09 Baloo"
+#define __COPYRIGHT "© 2006-09 Baloo"
diff --git a/plugins/CyrTranslit/src/TransliterationMap.cpp b/plugins/CyrTranslit/src/TransliterationMap.cpp index f8f2169770..6ec327d84f 100644 --- a/plugins/CyrTranslit/src/TransliterationMap.cpp +++ b/plugins/CyrTranslit/src/TransliterationMap.cpp @@ -47,144 +47,144 @@ const TransliterationMap& TransliterationMap::getInstance() TransliterationMap::TransliterationMap()
{
- theMap[''] = "a";
- theMap[''] = "b";
- theMap[''] = "v";
- theMap[''] = "g";
- theMap[''] = "d";
- theMap[''] = "e";
- theMap[''] = "e";
- theMap[''] = "zh";
- theMap[''] = "z";
- theMap[''] = "i";
- theMap[''] = "i";
- theMap[''] = "k";
- theMap[''] = "l";
- theMap[''] = "m";
- theMap[''] = "n";
- theMap[''] = "o";
- theMap[''] = "p";
- theMap[''] = "r";
- theMap[''] = "s";
- theMap[''] = "t";
- theMap[''] = "u";
- theMap[''] = "f";
- theMap[''] = "kh";
- theMap[''] = "ts";
- theMap[''] = "ch";
- theMap[''] = "sh";
- theMap[''] = "sch";
- theMap[''] = "`";
- theMap[''] = "y";
- theMap[''] = "'";
- theMap[''] = "e";
- theMap[''] = "yu";
- theMap[''] = "ya";
+ theMap['а'] = "a";
+ theMap['б'] = "b";
+ theMap['в'] = "v";
+ theMap['г'] = "g";
+ theMap['д'] = "d";
+ theMap['е'] = "e";
+ theMap['ё'] = "e";
+ theMap['ж'] = "zh";
+ theMap['з'] = "z";
+ theMap['и'] = "i";
+ theMap['й'] = "i";
+ theMap['к'] = "k";
+ theMap['л'] = "l";
+ theMap['м'] = "m";
+ theMap['н'] = "n";
+ theMap['о'] = "o";
+ theMap['п'] = "p";
+ theMap['р'] = "r";
+ theMap['с'] = "s";
+ theMap['т'] = "t";
+ theMap['у'] = "u";
+ theMap['ф'] = "f";
+ theMap['х'] = "kh";
+ theMap['ц'] = "ts";
+ theMap['ч'] = "ch";
+ theMap['ш'] = "sh";
+ theMap['щ'] = "sch";
+ theMap['ъ'] = "`";
+ theMap['ы'] = "y";
+ theMap['ь'] = "'";
+ theMap['э'] = "e";
+ theMap['ю'] = "yu";
+ theMap['я'] = "ya";
- theMap[''] = "A";
- theMap[''] = "B";
- theMap[''] = "V";
- theMap[''] = "G";
- theMap[''] = "D";
- theMap[''] = "E";
- theMap[''] = "E";
- theMap[''] = "ZH";
- theMap[''] = "Z";
- theMap[''] = "I";
- theMap[''] = "I";
- theMap[''] = "K";
- theMap[''] = "L";
- theMap[''] = "M";
- theMap[''] = "N";
- theMap[''] = "O";
- theMap[''] = "P";
- theMap[''] = "R";
- theMap[''] = "S";
- theMap[''] = "T";
- theMap[''] = "U";
- theMap[''] = "F";
- theMap[''] = "KH";
- theMap[''] = "TS";
- theMap[''] = "CH";
- theMap[''] = "SH";
- theMap[''] = "SCH";
- theMap[''] = "`";
- theMap[''] = "Y";
- theMap[''] = "'";
- theMap[''] = "E";
- theMap[''] = "YU";
- theMap[''] = "YA";
-
-
-
-
- theMapW[L''] = L"a";
- theMapW[L''] = L"b";
- theMapW[L''] = L"v";
- theMapW[L''] = L"g";
- theMapW[L''] = L"d";
- theMapW[L''] = L"e";
- theMapW[L''] = L"e";
- theMapW[L''] = L"zh";
- theMapW[L''] = L"z";
- theMapW[L''] = L"i";
- theMapW[L''] = L"i";
- theMapW[L''] = L"k";
- theMapW[L''] = L"l";
- theMapW[L''] = L"m";
- theMapW[L''] = L"n";
- theMapW[L''] = L"o";
- theMapW[L''] = L"p";
- theMapW[L''] = L"r";
- theMapW[L''] = L"s";
- theMapW[L''] = L"t";
- theMapW[L''] = L"u";
- theMapW[L''] = L"f";
- theMapW[L''] = L"kh";
- theMapW[L''] = L"ts";
- theMapW[L''] = L"ch";
- theMapW[L''] = L"sh";
- theMapW[L''] = L"sch";
- theMapW[L''] = L"`";
- theMapW[L''] = L"y";
- theMapW[L''] = L"'";
- theMapW[L''] = L"e";
- theMapW[L''] = L"yu";
- theMapW[L''] = L"ya";
+ theMap['А'] = "A";
+ theMap['Б'] = "B";
+ theMap['В'] = "V";
+ theMap['Г'] = "G";
+ theMap['Д'] = "D";
+ theMap['Е'] = "E";
+ theMap['Ё'] = "E";
+ theMap['Ж'] = "ZH";
+ theMap['З'] = "Z";
+ theMap['И'] = "I";
+ theMap['Й'] = "I";
+ theMap['К'] = "K";
+ theMap['Л'] = "L";
+ theMap['М'] = "M";
+ theMap['Н'] = "N";
+ theMap['О'] = "O";
+ theMap['П'] = "P";
+ theMap['Р'] = "R";
+ theMap['С'] = "S";
+ theMap['Т'] = "T";
+ theMap['У'] = "U";
+ theMap['Ф'] = "F";
+ theMap['Х'] = "KH";
+ theMap['Ц'] = "TS";
+ theMap['Ч'] = "CH";
+ theMap['Ш'] = "SH";
+ theMap['Щ'] = "SCH";
+ theMap['Ъ'] = "`";
+ theMap['Ы'] = "Y";
+ theMap['Ь'] = "'";
+ theMap['Э'] = "E";
+ theMap['Ю'] = "YU";
+ theMap['Я'] = "YA";
+
+
+
+
+ theMapW[L'а'] = L"a";
+ theMapW[L'б'] = L"b";
+ theMapW[L'в'] = L"v";
+ theMapW[L'г'] = L"g";
+ theMapW[L'д'] = L"d";
+ theMapW[L'е'] = L"e";
+ theMapW[L'ё'] = L"e";
+ theMapW[L'ж'] = L"zh";
+ theMapW[L'з'] = L"z";
+ theMapW[L'и'] = L"i";
+ theMapW[L'й'] = L"i";
+ theMapW[L'к'] = L"k";
+ theMapW[L'л'] = L"l";
+ theMapW[L'м'] = L"m";
+ theMapW[L'н'] = L"n";
+ theMapW[L'о'] = L"o";
+ theMapW[L'п'] = L"p";
+ theMapW[L'р'] = L"r";
+ theMapW[L'с'] = L"s";
+ theMapW[L'т'] = L"t";
+ theMapW[L'у'] = L"u";
+ theMapW[L'ф'] = L"f";
+ theMapW[L'х'] = L"kh";
+ theMapW[L'ц'] = L"ts";
+ theMapW[L'ч'] = L"ch";
+ theMapW[L'ш'] = L"sh";
+ theMapW[L'щ'] = L"sch";
+ theMapW[L'ъ'] = L"`";
+ theMapW[L'ы'] = L"y";
+ theMapW[L'ь'] = L"'";
+ theMapW[L'э'] = L"e";
+ theMapW[L'ю'] = L"yu";
+ theMapW[L'я'] = L"ya";
- theMapW[L''] = L"A";
- theMapW[L''] = L"B";
- theMapW[L''] = L"V";
- theMapW[L''] = L"G";
- theMapW[L''] = L"D";
- theMapW[L''] = L"E";
- theMapW[L''] = L"E";
- theMapW[L''] = L"ZH";
- theMapW[L''] = L"Z";
- theMapW[L''] = L"I";
- theMapW[L''] = L"I";
- theMapW[L''] = L"K";
- theMapW[L''] = L"L";
- theMapW[L''] = L"M";
- theMapW[L''] = L"N";
- theMapW[L''] = L"O";
- theMapW[L''] = L"P";
- theMapW[L''] = L"R";
- theMapW[L''] = L"S";
- theMapW[L''] = L"T";
- theMapW[L''] = L"U";
- theMapW[L''] = L"F";
- theMapW[L''] = L"KH";
- theMapW[L''] = L"TS";
- theMapW[L''] = L"CH";
- theMapW[L''] = L"SH";
- theMapW[L''] = L"SCH";
- theMapW[L''] = L"`";
- theMapW[L''] = L"Y";
- theMapW[L''] = L"'";
- theMapW[L''] = L"E";
- theMapW[L''] = L"YU";
- theMapW[L''] = L"YA";
+ theMapW[L'А'] = L"A";
+ theMapW[L'Б'] = L"B";
+ theMapW[L'В'] = L"V";
+ theMapW[L'Г'] = L"G";
+ theMapW[L'Д'] = L"D";
+ theMapW[L'Е'] = L"E";
+ theMapW[L'Ё'] = L"E";
+ theMapW[L'Ж'] = L"ZH";
+ theMapW[L'З'] = L"Z";
+ theMapW[L'И'] = L"I";
+ theMapW[L'Й'] = L"I";
+ theMapW[L'К'] = L"K";
+ theMapW[L'Л'] = L"L";
+ theMapW[L'М'] = L"M";
+ theMapW[L'Н'] = L"N";
+ theMapW[L'О'] = L"O";
+ theMapW[L'П'] = L"P";
+ theMapW[L'Р'] = L"R";
+ theMapW[L'С'] = L"S";
+ theMapW[L'Т'] = L"T";
+ theMapW[L'У'] = L"U";
+ theMapW[L'Ф'] = L"F";
+ theMapW[L'Х'] = L"KH";
+ theMapW[L'Ц'] = L"TS";
+ theMapW[L'Ч'] = L"CH";
+ theMapW[L'Ш'] = L"SH";
+ theMapW[L'Щ'] = L"SCH";
+ theMapW[L'Ъ'] = L"`";
+ theMapW[L'Ы'] = L"Y";
+ theMapW[L'Ь'] = L"'";
+ theMapW[L'Э'] = L"E";
+ theMapW[L'Ю'] = L"YU";
+ theMapW[L'Я'] = L"YA";
}
//------------------------------------------------------------------------------
diff --git a/plugins/CyrTranslit/src/version.h b/plugins/CyrTranslit/src/version.h index daaf63a085..a2e119f5b5 100644 --- a/plugins/CyrTranslit/src/version.h +++ b/plugins/CyrTranslit/src/version.h @@ -30,4 +30,4 @@ #define __AUTHOR "ValeraVi, Ivan Krechetov"
#define __AUTHOREMAIL "valeravi@vi-soft.com.ua"
#define __AUTHORWEB "https://miranda-ng.org/p/CyrTranslit/"
-#define __COPYRIGHT " 2005-2009 ValeraVi, Ivan Krechetov"
+#define __COPYRIGHT "© 2005-2009 ValeraVi, Ivan Krechetov"
diff --git a/plugins/Db3x_mmap/res/db3x_mmap.rc b/plugins/Db3x_mmap/res/db3x_mmap.rc index 963fef1f98..45394bcdce 100644 --- a/plugins/Db3x_mmap/res/db3x_mmap.rc +++ b/plugins/Db3x_mmap/res/db3x_mmap.rc @@ -12,7 +12,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -53,12 +53,12 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Английский (США) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -189,7 +189,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Английский (США) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Db3x_mmap/src/database.cpp b/plugins/Db3x_mmap/src/database.cpp index 27b86c38af..4b05feb9f8 100644 --- a/plugins/Db3x_mmap/src/database.cpp +++ b/plugins/Db3x_mmap/src/database.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/database.h b/plugins/Db3x_mmap/src/database.h index 1b7407c612..624b034398 100644 --- a/plugins/Db3x_mmap/src/database.h +++ b/plugins/Db3x_mmap/src/database.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbcache.cpp b/plugins/Db3x_mmap/src/dbcache.cpp index ede7a56f26..1eceed261a 100644 --- a/plugins/Db3x_mmap/src/dbcache.cpp +++ b/plugins/Db3x_mmap/src/dbcache.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbcontacts.cpp b/plugins/Db3x_mmap/src/dbcontacts.cpp index b9d1eb614d..b4c1788dac 100644 --- a/plugins/Db3x_mmap/src/dbcontacts.cpp +++ b/plugins/Db3x_mmap/src/dbcontacts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbcrypt.cpp b/plugins/Db3x_mmap/src/dbcrypt.cpp index 608cfa689d..7996003f22 100644 --- a/plugins/Db3x_mmap/src/dbcrypt.cpp +++ b/plugins/Db3x_mmap/src/dbcrypt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbevents.cpp b/plugins/Db3x_mmap/src/dbevents.cpp index 767b22aa74..82f0cee05f 100644 --- a/plugins/Db3x_mmap/src/dbevents.cpp +++ b/plugins/Db3x_mmap/src/dbevents.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbheaders.cpp b/plugins/Db3x_mmap/src/dbheaders.cpp index 76dc1fb6bd..683a08eea2 100644 --- a/plugins/Db3x_mmap/src/dbheaders.cpp +++ b/plugins/Db3x_mmap/src/dbheaders.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbintf.cpp b/plugins/Db3x_mmap/src/dbintf.cpp index d43ff7b99c..aaf76ca9f8 100644 --- a/plugins/Db3x_mmap/src/dbintf.cpp +++ b/plugins/Db3x_mmap/src/dbintf.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbintf.h b/plugins/Db3x_mmap/src/dbintf.h index bbb7677825..dfa59fc6ca 100644 --- a/plugins/Db3x_mmap/src/dbintf.h +++ b/plugins/Db3x_mmap/src/dbintf.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbmodulechain.cpp b/plugins/Db3x_mmap/src/dbmodulechain.cpp index 3c2fb36f13..eca7095bd5 100644 --- a/plugins/Db3x_mmap/src/dbmodulechain.cpp +++ b/plugins/Db3x_mmap/src/dbmodulechain.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbsettings.cpp b/plugins/Db3x_mmap/src/dbsettings.cpp index 9423e369e4..2cf62dbb4a 100644 --- a/plugins/Db3x_mmap/src/dbsettings.cpp +++ b/plugins/Db3x_mmap/src/dbsettings.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp index 0225aa685a..507d948663 100644 --- a/plugins/Db3x_mmap/src/dbtool/eventchain.cpp +++ b/plugins/Db3x_mmap/src/dbtool/eventchain.cpp @@ -3,7 +3,7 @@ Miranda Database Tool
Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright 2000-2011 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/init.cpp b/plugins/Db3x_mmap/src/init.cpp index 316ebe4d8a..534528fa64 100644 --- a/plugins/Db3x_mmap/src/init.cpp +++ b/plugins/Db3x_mmap/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/resource.h b/plugins/Db3x_mmap/src/resource.h index 29345c6ddc..f4c4072086 100644 --- a/plugins/Db3x_mmap/src/resource.h +++ b/plugins/Db3x_mmap/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// D:\Others\SVN\MirandaNG\trunk\plugins\Db3x_mmap\res\db3x_mmap.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ D:\Others\SVN\MirandaNG\trunk\plugins\Db3x_mmap\res\db3x_mmap.rc
//
#define IDREMOVE 3
#define IDI_ICONPASS 100
diff --git a/plugins/Db3x_mmap/src/stdafx.h b/plugins/Db3x_mmap/src/stdafx.h index 4cd428a977..e482ad6c6d 100644 --- a/plugins/Db3x_mmap/src/stdafx.h +++ b/plugins/Db3x_mmap/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/ui.cpp b/plugins/Db3x_mmap/src/ui.cpp index 2e088b95d8..05b8c28c3b 100644 --- a/plugins/Db3x_mmap/src/ui.cpp +++ b/plugins/Db3x_mmap/src/ui.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db3x_mmap/src/version.h b/plugins/Db3x_mmap/src/version.h index 46ead88296..f15fb07b2a 100644 --- a/plugins/Db3x_mmap/src/version.h +++ b/plugins/Db3x_mmap/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda-NG project"
#define __AUTHOREMAIL "bio@msx.ru; ghazan@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/Dbx_mmap/"
-#define __COPYRIGHT " 2012-17 Miranda NG project"
+#define __COPYRIGHT "© 2012-17 Miranda NG project"
diff --git a/plugins/DbChecker/src/version.h b/plugins/DbChecker/src/version.h index 0c13d36441..c7e5045807 100644 --- a/plugins/DbChecker/src/version.h +++ b/plugins/DbChecker/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "George Hazan"
#define __AUTHOREMAIL "ghazan@miranda-ng.org"
#define __AUTHORWEB "https://miranda-ng.org/p/DbChecker/"
-#define __COPYRIGHT " 2012-17 George Hazan"
+#define __COPYRIGHT "© 2012-17 George Hazan"
diff --git a/plugins/DbEditorPP/src/version.h b/plugins/DbEditorPP/src/version.h index eef9fdf000..001417d300 100644 --- a/plugins/DbEditorPP/src/version.h +++ b/plugins/DbEditorPP/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Bio, Jonathan Gordon" #define __AUTHOREMAIL "bio@ktaspb.ru, jdgordy@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/DbEditorPP/" -#define __COPYRIGHT " 2003-2017 Bio, Jonathan Gordon" +#define __COPYRIGHT "© 2003-2017 Bio, Jonathan Gordon" diff --git a/plugins/Db_autobackups/src/options.h b/plugins/Db_autobackups/src/options.h index 049f45743b..79f9cfe51f 100644 --- a/plugins/Db_autobackups/src/options.h +++ b/plugins/Db_autobackups/src/options.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Db_autobackups/src/version.h b/plugins/Db_autobackups/src/version.h index e43c676eee..5f72c4b2e6 100644 --- a/plugins/Db_autobackups/src/version.h +++ b/plugins/Db_autobackups/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "chaos.persei, sje, Kildor, Billy_Bons"
#define __AUTHOREMAIL "chaos.persei@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/Db_autobackups/"
-#define __COPYRIGHT " 2005-2017 chaos.persei, sje, Kildor, Billy_Bons, Vasilich, Miranda NG team"
+#define __COPYRIGHT "© 2005-2017 chaos.persei, sje, Kildor, Billy_Bons, Vasilich, Miranda NG team"
diff --git a/plugins/Dbx_mdb/res/dbx_mdb.rc b/plugins/Dbx_mdb/res/dbx_mdb.rc index 5d9649518c..03c0486fe6 100644 --- a/plugins/Dbx_mdb/res/dbx_mdb.rc +++ b/plugins/Dbx_mdb/res/dbx_mdb.rc @@ -12,7 +12,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Английский (США) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -160,7 +160,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Английский (США) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Dbx_mdb/src/dbcontacts.cpp b/plugins/Dbx_mdb/src/dbcontacts.cpp index f6d513b6e4..f20a57e82c 100644 --- a/plugins/Dbx_mdb/src/dbcontacts.cpp +++ b/plugins/Dbx_mdb/src/dbcontacts.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbcrypt.cpp b/plugins/Dbx_mdb/src/dbcrypt.cpp index 8b67755711..f4bc167d31 100644 --- a/plugins/Dbx_mdb/src/dbcrypt.cpp +++ b/plugins/Dbx_mdb/src/dbcrypt.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbevents.cpp b/plugins/Dbx_mdb/src/dbevents.cpp index ec5a291fc1..1c431eb48c 100644 --- a/plugins/Dbx_mdb/src/dbevents.cpp +++ b/plugins/Dbx_mdb/src/dbevents.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbintf.cpp b/plugins/Dbx_mdb/src/dbintf.cpp index a432ac3e29..38793d490c 100644 --- a/plugins/Dbx_mdb/src/dbintf.cpp +++ b/plugins/Dbx_mdb/src/dbintf.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbintf.h b/plugins/Dbx_mdb/src/dbintf.h index d331c027f2..8ce07f1252 100644 --- a/plugins/Dbx_mdb/src/dbintf.h +++ b/plugins/Dbx_mdb/src/dbintf.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbmodulechain.cpp b/plugins/Dbx_mdb/src/dbmodulechain.cpp index 6a27cbc238..033a379276 100644 --- a/plugins/Dbx_mdb/src/dbmodulechain.cpp +++ b/plugins/Dbx_mdb/src/dbmodulechain.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbsettings.cpp b/plugins/Dbx_mdb/src/dbsettings.cpp index b61f9d8ec0..e0415aefd7 100644 --- a/plugins/Dbx_mdb/src/dbsettings.cpp +++ b/plugins/Dbx_mdb/src/dbsettings.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/dbutils.cpp b/plugins/Dbx_mdb/src/dbutils.cpp index ebd7780cbc..c822552511 100644 --- a/plugins/Dbx_mdb/src/dbutils.cpp +++ b/plugins/Dbx_mdb/src/dbutils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/init.cpp b/plugins/Dbx_mdb/src/init.cpp index 8567c890e7..679c95f9ce 100644 --- a/plugins/Dbx_mdb/src/init.cpp +++ b/plugins/Dbx_mdb/src/init.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/mdbx/bits.h b/plugins/Dbx_mdb/src/mdbx/bits.h index 4d3a50cc0b..d1ebb7cd2d 100644 --- a/plugins/Dbx_mdb/src/mdbx/bits.h +++ b/plugins/Dbx_mdb/src/mdbx/bits.h @@ -1,4 +1,4 @@ -/* +/* * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru> * and other libmdbx authors: please see AUTHORS file. * All rights reserved. diff --git a/plugins/Dbx_mdb/src/mdbx/mdbx.h b/plugins/Dbx_mdb/src/mdbx/mdbx.h index 421d833b70..f7de11c0e4 100644 --- a/plugins/Dbx_mdb/src/mdbx/mdbx.h +++ b/plugins/Dbx_mdb/src/mdbx/mdbx.h @@ -1,4 +1,4 @@ -/* LICENSE AND COPYRUSTING ***************************************************** +/* LICENSE AND COPYRUSTING ***************************************************** * * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru> * and other libmdbx authors: please see AUTHORS file. diff --git a/plugins/Dbx_mdb/src/mdbx/osal.h b/plugins/Dbx_mdb/src/mdbx/osal.h index 871e52b0dc..e3a503ba1a 100644 --- a/plugins/Dbx_mdb/src/mdbx/osal.h +++ b/plugins/Dbx_mdb/src/mdbx/osal.h @@ -1,4 +1,4 @@ -/* https://en.wikipedia.org/wiki/Operating_system_abstraction_layer */ +/* https://en.wikipedia.org/wiki/Operating_system_abstraction_layer */ /* * Copyright 2015-2017 Leonid Yuriev <leo@yuriev.ru> diff --git a/plugins/Dbx_mdb/src/resource.h b/plugins/Dbx_mdb/src/resource.h index 2b197f31ef..de4820837c 100644 --- a/plugins/Dbx_mdb/src/resource.h +++ b/plugins/Dbx_mdb/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// d:\Others\SVN\MirandaNG\trunk\plugins\Dbx_mdb\res\dbx_mdb.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ d:\Others\SVN\MirandaNG\trunk\plugins\Dbx_mdb\res\dbx_mdb.rc
//
#define IDREMOVE 3
#define IDI_ICONPASS 100
diff --git a/plugins/Dbx_mdb/src/stdafx.h b/plugins/Dbx_mdb/src/stdafx.h index 53839424e1..6525d5fc01 100644 --- a/plugins/Dbx_mdb/src/stdafx.h +++ b/plugins/Dbx_mdb/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/ui.cpp b/plugins/Dbx_mdb/src/ui.cpp index b6fe84f78b..4413198e53 100644 --- a/plugins/Dbx_mdb/src/ui.cpp +++ b/plugins/Dbx_mdb/src/ui.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/Dbx_mdb/src/version.h b/plugins/Dbx_mdb/src/version.h index 8789f57bf8..49ab4f5196 100644 --- a/plugins/Dbx_mdb/src/version.h +++ b/plugins/Dbx_mdb/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda-NG project"
#define __AUTHOREMAIL "ghazan@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/Dbx_mdb/"
-#define __COPYRIGHT " 2015-17 Miranda NG project"
+#define __COPYRIGHT "© 2015-17 Miranda NG project"
diff --git a/plugins/Dropbox/proto_dropbox/res/Proto_Dropbox.rc b/plugins/Dropbox/proto_dropbox/res/Proto_Dropbox.rc Binary files differindex 3eaac4e99b..22339493ab 100644 --- a/plugins/Dropbox/proto_dropbox/res/Proto_Dropbox.rc +++ b/plugins/Dropbox/proto_dropbox/res/Proto_Dropbox.rc diff --git a/plugins/Dropbox/proto_dropbox/src/resource.h b/plugins/Dropbox/proto_dropbox/src/resource.h Binary files differindex c6b804fd4e..f234a1cbb7 100644 --- a/plugins/Dropbox/proto_dropbox/src/resource.h +++ b/plugins/Dropbox/proto_dropbox/src/resource.h diff --git a/plugins/Dropbox/src/version.h b/plugins/Dropbox/src/version.h index 14b5ef17a0..aaec775b44 100644 --- a/plugins/Dropbox/src/version.h +++ b/plugins/Dropbox/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Dropbox/"
-#define __COPYRIGHT " 2014-17 Miranda NG project"
+#define __COPYRIGHT "© 2014-17 Miranda NG project"
diff --git a/plugins/Exchange/src/MirandaExchange.cpp b/plugins/Exchange/src/MirandaExchange.cpp index acf53d85cf..85b0df5d6a 100644 --- a/plugins/Exchange/src/MirandaExchange.cpp +++ b/plugins/Exchange/src/MirandaExchange.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/MirandaExchange.h b/plugins/Exchange/src/MirandaExchange.h index e4ca0b3ad8..d32be8c402 100644 --- a/plugins/Exchange/src/MirandaExchange.h +++ b/plugins/Exchange/src/MirandaExchange.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/dlg_handlers.cpp b/plugins/Exchange/src/dlg_handlers.cpp index 5bb8fab5e5..2f1f5d62eb 100644 --- a/plugins/Exchange/src/dlg_handlers.cpp +++ b/plugins/Exchange/src/dlg_handlers.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/dlg_handlers.h b/plugins/Exchange/src/dlg_handlers.h index f98c3a8a43..7c755bd94f 100644 --- a/plugins/Exchange/src/dlg_handlers.h +++ b/plugins/Exchange/src/dlg_handlers.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/emails.cpp b/plugins/Exchange/src/emails.cpp index 840885e687..7298a6b902 100644 --- a/plugins/Exchange/src/emails.cpp +++ b/plugins/Exchange/src/emails.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/emails.h b/plugins/Exchange/src/emails.h index 2a624b8262..6d90641cc8 100644 --- a/plugins/Exchange/src/emails.h +++ b/plugins/Exchange/src/emails.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/exchange.cpp b/plugins/Exchange/src/exchange.cpp index 8805bf42e5..57ac5f3fe0 100644 --- a/plugins/Exchange/src/exchange.cpp +++ b/plugins/Exchange/src/exchange.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/hooked_events.cpp b/plugins/Exchange/src/hooked_events.cpp index fdb239a046..1ebe0c463f 100644 --- a/plugins/Exchange/src/hooked_events.cpp +++ b/plugins/Exchange/src/hooked_events.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/hooked_events.h b/plugins/Exchange/src/hooked_events.h index acf209b216..2b37d19508 100644 --- a/plugins/Exchange/src/hooked_events.h +++ b/plugins/Exchange/src/hooked_events.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/services.cpp b/plugins/Exchange/src/services.cpp index a5e73c702e..6c8e4816a5 100644 --- a/plugins/Exchange/src/services.cpp +++ b/plugins/Exchange/src/services.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/services.h b/plugins/Exchange/src/services.h index f445c69b42..e12170c26c 100644 --- a/plugins/Exchange/src/services.h +++ b/plugins/Exchange/src/services.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/stdafx.h b/plugins/Exchange/src/stdafx.h index bccf7e2c22..54a29c3752 100644 --- a/plugins/Exchange/src/stdafx.h +++ b/plugins/Exchange/src/stdafx.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/utils.cpp b/plugins/Exchange/src/utils.cpp index 6f9fd24ae9..3316ce41b3 100644 --- a/plugins/Exchange/src/utils.cpp +++ b/plugins/Exchange/src/utils.cpp @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/utils.h b/plugins/Exchange/src/utils.h index efc7942b95..8e3b63aa0c 100644 --- a/plugins/Exchange/src/utils.h +++ b/plugins/Exchange/src/utils.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Exchange/src/version.h b/plugins/Exchange/src/version.h index fb22bf708f..036b0e6996 100644 --- a/plugins/Exchange/src/version.h +++ b/plugins/Exchange/src/version.h @@ -1,7 +1,7 @@ /*
Exchange notifier plugin for Miranda IM
-Copyright 2006 Cristian Libotean, Attila Vajda
+Copyright © 2006 Cristian Libotean, Attila Vajda
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -31,7 +31,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __DESC "Notifies you if you have unread email on an exchange server."
#define __AUTHOR "Cristian Libotean, Attila Vajda, MaKaR (NG)"
#define __AUTHOREMAIL "makar@poczta.of.pl"
-#define __COPYRIGHT " 2006-2013 Cristian Libotean and Attila Vajda"
+#define __COPYRIGHT "© 2006-2013 Cristian Libotean and Attila Vajda"
#define __AUTHORWEB "https://miranda-ng.org/p/Exchange/"
#define __PLUGIN_DISPLAY_NAME "Exchange notifier plugin"
diff --git a/plugins/ExternalAPI/m_addcontactplus.h b/plugins/ExternalAPI/m_addcontactplus.h index 82d3e6e1f3..a6fae3b46b 100644 --- a/plugins/ExternalAPI/m_addcontactplus.h +++ b/plugins/ExternalAPI/m_addcontactplus.h @@ -2,7 +2,7 @@ AddContact+ plugin for Miranda IM
-Copyright (C) 2007-2011 Bartosz 'Dezeath' Biaek
+Copyright (C) 2007-2011 Bartosz 'Dezeath' Biaіek
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
diff --git a/plugins/ExternalAPI/m_assocmgr.h b/plugins/ExternalAPI/m_assocmgr.h index a1d4d24612..2ea78d8a26 100644 --- a/plugins/ExternalAPI/m_assocmgr.h +++ b/plugins/ExternalAPI/m_assocmgr.h @@ -3,7 +3,7 @@ 'File Association Manager'-Plugin for
Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (C) 2005-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
diff --git a/plugins/ExternalAPI/m_changekeyboardlayout.h b/plugins/ExternalAPI/m_changekeyboardlayout.h index 8923dffa12..283fc6c525 100644 --- a/plugins/ExternalAPI/m_changekeyboardlayout.h +++ b/plugins/ExternalAPI/m_changekeyboardlayout.h @@ -1,17 +1,17 @@ #ifndef _M_CHANGEKEYBOARDLAYOUT_H
#define _M_CHANGEKEYBOARDLAYOUT_H
-//
-// wParam - HWND , NULL
-// lParam 0
-// 0 (1) .
-// : " " .
+// Меняет раскладку текста для окна с указанных хэндлом
+// wParam - HWND окна, или NULL для окна в фокусе
+// lParam должен быть 0
+// Возвращает 0 в случае успеха и ненулевое значение (1) при ошибке.
+// Примечание: Режим "текущего слова" определяется по соответствующей опции для основной горячей клавиши.
#define MS_CKL_CHANGELAYOUT "ChangeKeyboardLayout/ChangeLayout"
-//wParam .
-//lParam - LPCTSTR , ,
-// HKL , NULL .
-//: " - "
+//wParam должен быть ноль.
+//lParam - LPCTSTR текста, раскладку которого требуется определить,
+//Возвращает HKL раскладку текста, или NULL в случае ошибки.
+//Примечание: При определении раскладки учитывается опция "Раскладка текста - текущая раскладка"
#define MS_CKL_GETLAYOUTOFTEXT "ChangeKeyboardLayout/GetLayoutOfText"
typedef struct
@@ -21,10 +21,10 @@ typedef struct BOOL bTwoWay;
}CKLLayouts;
-//wParam - LPCTSTR
-//lParam - CKLLayouts,
-// " "
-// LPTSTR
+//wParam - LPCTSTR исходного текста
+//lParam - указатель на структуру CKLLayouts, содержащую раскладки для
+//изменения текста и опцию "двунаправленного преобразования"
+//Возвращает LPTSTR на результирующую строку
#define MS_CKL_CHANGETEXTLAYOUT "ChangeKeyboardLayout/ChangeTextLayout"
#endif
\ No newline at end of file diff --git a/plugins/ExternalAPI/m_dbeditorpp.h b/plugins/ExternalAPI/m_dbeditorpp.h index 11ef4a7da4..daf67f8f41 100644 --- a/plugins/ExternalAPI/m_dbeditorpp.h +++ b/plugins/ExternalAPI/m_dbeditorpp.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2003-11 Bio, Jonathan Gordon
This program is free software; you can redistribute it and/or
diff --git a/plugins/ExternalAPI/m_fingerprint.h b/plugins/ExternalAPI/m_fingerprint.h index 35fc75c260..3048242925 100644 --- a/plugins/ExternalAPI/m_fingerprint.h +++ b/plugins/ExternalAPI/m_fingerprint.h @@ -1,7 +1,7 @@ /*
Fingerprint Mod+ (client version) icons module for Miranda IM
-Copyright 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
+Copyright © 2006-2007 Artem Shpynov aka FYR, Bio, Faith Healer. 2009-2010 HierOS
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ExternalAPI/m_folders.h b/plugins/ExternalAPI/m_folders.h index fbdc248d1c..85173bf7dd 100644 --- a/plugins/ExternalAPI/m_folders.h +++ b/plugins/ExternalAPI/m_folders.h @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ExternalAPI/m_proto_listeningto.h b/plugins/ExternalAPI/m_proto_listeningto.h index a0a3694735..acd2e615b6 100644 --- a/plugins/ExternalAPI/m_proto_listeningto.h +++ b/plugins/ExternalAPI/m_proto_listeningto.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-06 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/ExternalAPI/m_sendss.h b/plugins/ExternalAPI/m_sendss.h index 90cc84d421..4c190a4cdf 100644 --- a/plugins/ExternalAPI/m_sendss.h +++ b/plugins/ExternalAPI/m_sendss.h @@ -1,5 +1,5 @@ //This file is part of Send Screenshot a Miranda IM plugin
-//Copyright (c) 2004-2006 Srgio Vieira Rolanski
+//Copyright (c) 2004-2006 Sйrgio Vieira Rolanski
//
//This program is free software; you can redistribute it and/or
//modify it under the terms of the GNU General Public License
diff --git a/plugins/ExternalAPI/m_shutdown.h b/plugins/ExternalAPI/m_shutdown.h index 97fee14fb2..315654ca53 100644 --- a/plugins/ExternalAPI/m_shutdown.h +++ b/plugins/ExternalAPI/m_shutdown.h @@ -3,7 +3,7 @@ 'AutoShutdown'-Plugin for
Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (C) 2004-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
diff --git a/plugins/ExternalAPI/m_simplestatusmsg.h b/plugins/ExternalAPI/m_simplestatusmsg.h index bf31dab2d1..6e1b684168 100644 --- a/plugins/ExternalAPI/m_simplestatusmsg.h +++ b/plugins/ExternalAPI/m_simplestatusmsg.h @@ -1,7 +1,7 @@ /*
Simple Status Message plugin for Miranda IM
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/ExternalAPI/m_skin_eng.h b/plugins/ExternalAPI/m_skin_eng.h index 7dcfb48eb6..e936ef1e56 100644 --- a/plugins/ExternalAPI/m_skin_eng.h +++ b/plugins/ExternalAPI/m_skin_eng.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-08 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/ExternalAPI/m_stopspam.h b/plugins/ExternalAPI/m_stopspam.h index 2991beef46..22dc59796d 100644 --- a/plugins/ExternalAPI/m_stopspam.h +++ b/plugins/ExternalAPI/m_stopspam.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2004-009 Roman Miklashevsky, A. Petkevich, Kosh&chka, persei
This program is free software; you can redistribute it and/or
diff --git a/plugins/ExternalAPI/m_userinfoex.h b/plugins/ExternalAPI/m_userinfoex.h index 8c1b73fdab..fbfd245be6 100644 --- a/plugins/ExternalAPI/m_userinfoex.h +++ b/plugins/ExternalAPI/m_userinfoex.h @@ -1,7 +1,7 @@ /*
Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-09 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/FTPFileYM/src/utils.cpp b/plugins/FTPFileYM/src/utils.cpp index 70ed92deaf..34491f7e2a 100644 --- a/plugins/FTPFileYM/src/utils.cpp +++ b/plugins/FTPFileYM/src/utils.cpp @@ -92,7 +92,7 @@ void Utils::copyToClipboard(char *szText) }
}
-const char from_chars[] = "Ũ !@#$%^&=,{}[];'`";
+const char from_chars[] = "абвгдеёжзийклмнопрстуфхцчшщъыьэюяАБВГДЕЁЖЗИЙКЛМНОПРСТУФХЦЧШЩЪЫЬЭЮЯ !@#$%^&=,{}[];'`";
const char to_chars[] = "abvgdeezziiklmnoprstufhccwwqyqeuaABVGDEEZZIIKLMNOPRSTUFHCCWWQYQEUA_________________";
char* Utils::makeSafeString(wchar_t *input, char *output)
diff --git a/plugins/FTPFileYM/src/version.h b/plugins/FTPFileYM/src/version.h index b5137c68d7..ea36fb539f 100644 --- a/plugins/FTPFileYM/src/version.h +++ b/plugins/FTPFileYM/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "yaho"
#define __AUTHOREMAIL "yaho@miranda-easy.net"
#define __AUTHORWEB "https://miranda-ng.org/p/FTPFile/"
-#define __COPYRIGHT " 2007-2010 Jan Holub"
+#define __COPYRIGHT "© 2007-2010 Jan Holub"
diff --git a/plugins/FavContacts/src/version.h b/plugins/FavContacts/src/version.h index 581cfdd9fc..057d4f6502 100644 --- a/plugins/FavContacts/src/version.h +++ b/plugins/FavContacts/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Victor Pavlychko" #define __AUTHOREMAIL "nullbie@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/FavContacts/" -#define __COPYRIGHT " 2007-2009 Victor Pavlychko" +#define __COPYRIGHT "© 2007-2009 Victor Pavlychko" diff --git a/plugins/FileAsMessage/src/version.h b/plugins/FileAsMessage/src/version.h index 3d75fccdd7..ddb306b2f3 100644 --- a/plugins/FileAsMessage/src/version.h +++ b/plugins/FileAsMessage/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Denis Stanishevskiy" #define __AUTHOREMAIL "stdenformiranda@fromru.com" #define __AUTHORWEB "https://miranda-ng.org/p/FileAsMessage/" -#define __COPYRIGHT " 2004 Denis Stanishevskiy" +#define __COPYRIGHT "© 2004 Denis Stanishevskiy" diff --git a/plugins/FingerprintNG/src/fingerprint.cpp b/plugins/FingerprintNG/src/fingerprint.cpp index ea594073de..ba0f1ae2dd 100644 --- a/plugins/FingerprintNG/src/fingerprint.cpp +++ b/plugins/FingerprintNG/src/fingerprint.cpp @@ -1,6 +1,6 @@ /* Fingerprint NG (client version) icons module for Miranda NG -Copyright 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors. +Copyright © 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -796,7 +796,7 @@ static INT_PTR ServiceGetClientDescrW(WPARAM wParam, LPARAM) * MS_FP_SAMECLIENTSW service implementation. * wParam - LPWSTR first MirVer value * lParam - LPWSTR second MirVer value - * returns LPCWSTR: client desription (do not destroy) if clients are same or NULL + * returns LPCWSTR: client desсription (do not destroy) if clients are same or NULL */ static INT_PTR ServiceSameClientsW(WPARAM wParam, LPARAM lParam) diff --git a/plugins/FingerprintNG/src/main.cpp b/plugins/FingerprintNG/src/main.cpp index a60f815de1..f8af6c8a48 100644 --- a/plugins/FingerprintNG/src/main.cpp +++ b/plugins/FingerprintNG/src/main.cpp @@ -1,6 +1,6 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright 2006-17 FYR, Bio, nullbie, ghazan, mataes, HierOS, faith_healer and all respective contributors.
+Copyright © 2006-17 FYR, Bio, nullbie, ghazan, mataes, HierOS, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/masks.cpp b/plugins/FingerprintNG/src/masks.cpp index 7ed05f1eea..dc4960ad41 100644 --- a/plugins/FingerprintNG/src/masks.cpp +++ b/plugins/FingerprintNG/src/masks.cpp @@ -1,4 +1,4 @@ -/*
+/*
Fingerprint NG (client version) icons module for Miranda NG
Copyright © 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
diff --git a/plugins/FingerprintNG/src/options.cpp b/plugins/FingerprintNG/src/options.cpp index d664761c82..dc99d8e59d 100644 --- a/plugins/FingerprintNG/src/options.cpp +++ b/plugins/FingerprintNG/src/options.cpp @@ -1,7 +1,7 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/stdafx.h b/plugins/FingerprintNG/src/stdafx.h index 937d195110..f19c447c67 100644 --- a/plugins/FingerprintNG/src/stdafx.h +++ b/plugins/FingerprintNG/src/stdafx.h @@ -1,7 +1,7 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-17 ghazan, mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FingerprintNG/src/version.h b/plugins/FingerprintNG/src/version.h index fa854b90af..4ee2eaffab 100644 --- a/plugins/FingerprintNG/src/version.h +++ b/plugins/FingerprintNG/src/version.h @@ -1,6 +1,6 @@ /*
Fingerprint NG (client version) icons module for Miranda NG
-Copyright 2006-17 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
+Copyright © 2006-17 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors.
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -30,4 +30,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "faith_healer, ghazan, Mataes"
#define __AUTHOREMAIL "faith_healer@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/Fingerprint/"
-#define __COPYRIGHT " 2006-17 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
+#define __COPYRIGHT "© 2006-17 ghazan, Mataes, HierOS, FYR, Bio, nullbie, faith_healer and all respective contributors."
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.cpp b/plugins/FloatingContacts/src/bitmap_funcs.cpp index f49cc3d69c..5cbf09bc9b 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.cpp +++ b/plugins/FloatingContacts/src/bitmap_funcs.cpp @@ -1,8 +1,8 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
+Copyright © 2002 Luca Santarelli,
+ © 2004-2007 Victor Pavlychko
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FloatingContacts/src/bitmap_funcs.h b/plugins/FloatingContacts/src/bitmap_funcs.h index 55726b14c7..46b749289b 100644 --- a/plugins/FloatingContacts/src/bitmap_funcs.h +++ b/plugins/FloatingContacts/src/bitmap_funcs.h @@ -1,8 +1,8 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
+Copyright © 2002 Luca Santarelli,
+ © 2004-2007 Victor Pavlychko
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/FloatingContacts/src/version.h b/plugins/FloatingContacts/src/version.h index 31349efd2b..5af00f2c44 100644 --- a/plugins/FloatingContacts/src/version.h +++ b/plugins/FloatingContacts/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Iavor Vajarov, Kosh&chka, Victor Pavlychko"
#define __AUTHOREMAIL "ell-6@ya.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/FloatingContacts/"
-#define __COPYRIGHT " 2002-2004 I. Vajarov (ivajarov@code.bg), 2008 Kosh&chka, V. Pavlychko"
+#define __COPYRIGHT "© 2002-2004 I. Vajarov (ivajarov@code.bg), 2008 Kosh&chka, V. Pavlychko"
diff --git a/plugins/Folders/src/events.cpp b/plugins/Folders/src/events.cpp index ae9616333c..cf564a2836 100644 --- a/plugins/Folders/src/events.cpp +++ b/plugins/Folders/src/events.cpp @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/events.h b/plugins/Folders/src/events.h index 69a2cc44a5..5fb6724541 100644 --- a/plugins/Folders/src/events.h +++ b/plugins/Folders/src/events.h @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/folderItem.cpp b/plugins/Folders/src/folderItem.cpp index 0b86c2c357..35d718798b 100644 --- a/plugins/Folders/src/folderItem.cpp +++ b/plugins/Folders/src/folderItem.cpp @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/folderItem.h b/plugins/Folders/src/folderItem.h index 385037b0d2..cd35c36637 100644 --- a/plugins/Folders/src/folderItem.h +++ b/plugins/Folders/src/folderItem.h @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/folders.cpp b/plugins/Folders/src/folders.cpp index ec41cd29fb..b6d8ded550 100644 --- a/plugins/Folders/src/folders.cpp +++ b/plugins/Folders/src/folders.cpp @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/services.cpp b/plugins/Folders/src/services.cpp index cba24efd33..a1d01aea9d 100644 --- a/plugins/Folders/src/services.cpp +++ b/plugins/Folders/src/services.cpp @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/services.h b/plugins/Folders/src/services.h index c262748b13..419de6cad9 100644 --- a/plugins/Folders/src/services.h +++ b/plugins/Folders/src/services.h @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/stdafx.h b/plugins/Folders/src/stdafx.h index a1cab2d14b..3d9f67e760 100644 --- a/plugins/Folders/src/stdafx.h +++ b/plugins/Folders/src/stdafx.h @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/utils.cpp b/plugins/Folders/src/utils.cpp index 61b445b5c6..5973546d38 100644 --- a/plugins/Folders/src/utils.cpp +++ b/plugins/Folders/src/utils.cpp @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/utils.h b/plugins/Folders/src/utils.h index 509546dcd6..c8550d153c 100644 --- a/plugins/Folders/src/utils.h +++ b/plugins/Folders/src/utils.h @@ -1,7 +1,7 @@ /*
Custom profile folders plugin for Miranda IM
-Copyright 2005 Cristian Libotean
+Copyright © 2005 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Folders/src/version.h b/plugins/Folders/src/version.h index a990c6e0b2..886868da09 100644 --- a/plugins/Folders/src/version.h +++ b/plugins/Folders/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Cristian Libotean, Miranda NG Team"
#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/Folders/"
-#define __COPYRIGHT " 2005-2012 Cristian Libotean, 2012-17 Miranda NG Team"
+#define __COPYRIGHT "© 2005-2012 Cristian Libotean, 2012-17 Miranda NG Team"
diff --git a/plugins/GmailNotifier/src/version.h b/plugins/GmailNotifier/src/version.h index 74bd805294..7834d0d829 100644 --- a/plugins/GmailNotifier/src/version.h +++ b/plugins/GmailNotifier/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Mixwind"
#define __AUTHOREMAIL "mixwind@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/GmailNotifier/"
-#define __COPYRIGHT " 2005 Sun Zhuo"
+#define __COPYRIGHT "© 2005 Sun Zhuo"
diff --git a/plugins/HTTPServer/res/resource.rc b/plugins/HTTPServer/res/resource.rc index 869da4f336..fb98cca4a2 100644 --- a/plugins/HTTPServer/res/resource.rc +++ b/plugins/HTTPServer/res/resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -190,7 +190,7 @@ BEGIN END
END
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/HTTPServer/src/GuiElements.cpp b/plugins/HTTPServer/src/GuiElements.cpp index 5e1134b2c9..8baf495fd7 100644 --- a/plugins/HTTPServer/src/GuiElements.cpp +++ b/plugins/HTTPServer/src/GuiElements.cpp @@ -991,7 +991,7 @@ static INT_PTR CALLBACK DlgProcStatsticView(HWND hwndDlg, UINT msg, WPARAM wPara // References : -
// Remarks : -
// Created : 030826, 26 august 2003
-// Developer : Srgio Rolanski
+// Developer : Sйrgio Rolanski
/////////////////////////////////////////////////////////////////////
void SendLinkToUser(WPARAM wParam, char *pszSrvPath)
diff --git a/plugins/HTTPServer/src/HttpUser.cpp b/plugins/HTTPServer/src/HttpUser.cpp index db86533b7f..1f28cdac5d 100644 --- a/plugins/HTTPServer/src/HttpUser.cpp +++ b/plugins/HTTPServer/src/HttpUser.cpp @@ -87,7 +87,7 @@ static int nUnescapedURI(char * pszURI) nNewChar = '/';
if ((nNewChar & 0x80) == 0x00) { // 0xxxxxxx (yields 7 bits)
- more = -1; // this is to avoid sequence like %C3k%A6 will end up beeing "k" insted it will be "k"
+ more = -1; // this is to avoid sequence like %C3k%A6 will end up beeing "kж" insted it will be "k"
*pszCurInsert = (char)nNewChar;
pszCurInsert++;
continue;
diff --git a/plugins/HTTPServer/src/main.cpp b/plugins/HTTPServer/src/main.cpp index fb821023f6..5a69bca0be 100644 --- a/plugins/HTTPServer/src/main.cpp +++ b/plugins/HTTPServer/src/main.cpp @@ -463,7 +463,7 @@ static INT_PTR nAddChangeRemoveShare(WPARAM wParam, LPARAM lParam) pclNewNode->pclNext = *pclPrev;
*pclPrev = pclNewNode;
- /* Add by Srgio Vieira Rolanski */
+ /* Add by Sйrgio Vieira Rolanski */
if (pclNew->dwOptions & OPT_SEND_LINK)
SendLinkToUser(wParam, pclNew->pszSrvPath);
diff --git a/plugins/HTTPServer/src/resource.h b/plugins/HTTPServer/src/resource.h index 940253e98e..346f3e2915 100644 --- a/plugins/HTTPServer/src/resource.h +++ b/plugins/HTTPServer/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// D:\MNG_orig\plugins\HTTPServer\res\resource.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ D:\MNG_orig\plugins\HTTPServer\res\resource.rc
//
#define IDD_NEW_SHARE_PROPERTIES 101
#define IDI_DISABLE_SERVER 101
diff --git a/plugins/HTTPServer/src/version.h b/plugins/HTTPServer/src/version.h index e6d55adc72..c58cfb21e1 100644 --- a/plugins/HTTPServer/src/version.h +++ b/plugins/HTTPServer/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Kennet Nielsen, modified by Vampik, Houdini" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/HTTPServer/" -#define __COPYRIGHT " 2003-2009 Kennet Nielsen, Vampik, Houdini" +#define __COPYRIGHT "© 2003-2009 Kennet Nielsen, Vampik, Houdini" diff --git a/plugins/HistoryLinkListPlus/src/version.h b/plugins/HistoryLinkListPlus/src/version.h index 9f735d5441..c8ab34ae17 100644 --- a/plugins/HistoryLinkListPlus/src/version.h +++ b/plugins/HistoryLinkListPlus/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Thomas Wendel, gureedo" #define __AUTHOREMAIL "gureedo@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/LinkList/" -#define __COPYRIGHT " 2010-2011 gureedo" +#define __COPYRIGHT "© 2010-2011 gureedo" diff --git a/plugins/HistoryPlusPlus/historypp_icons/src/resource.h b/plugins/HistoryPlusPlus/historypp_icons/src/resource.h Binary files differindex 114b3932d7..10821b547f 100644 --- a/plugins/HistoryPlusPlus/historypp_icons/src/resource.h +++ b/plugins/HistoryPlusPlus/historypp_icons/src/resource.h diff --git a/plugins/HistoryPlusPlus/hpp_res_ver.rc b/plugins/HistoryPlusPlus/hpp_res_ver.rc index 1ac02cd615..b8b6e1929d 100644 --- a/plugins/HistoryPlusPlus/hpp_res_ver.rc +++ b/plugins/HistoryPlusPlus/hpp_res_ver.rc @@ -13,7 +13,7 @@ FILETYPE VFT_DLL VALUE "FileDescription", "History++ plugin for Miranda NG\000"
VALUE "FileVersion", "1.5.1.5\000"
VALUE "InternalName", "historypp\000"
- VALUE "LegalCopyright", " 2006-2009 theMIROn, 2003-2006 Art Fedorov.\000"
+ VALUE "LegalCopyright", "© 2006-2009 theMIROn, 2003-2006 Art Fedorov.\000"
VALUE "LegalTrademarks", "Gnu General Public License V2\000"
VALUE "OriginalFilename", "historypp.dll\000"
VALUE "ProductName", "History PlusPlus Module\000"
diff --git a/plugins/HistoryStats/src/version.h b/plugins/HistoryStats/src/version.h index 9b821a0b7a..0255da74da 100644 --- a/plugins/HistoryStats/src/version.h +++ b/plugins/HistoryStats/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Martin Afanasjew"
#define __AUTHOREMAIL "miranda@dark-passage.de"
#define __AUTHORWEB "https://miranda-ng.org/p/HistoryStats/"
-#define __COPYRIGHT " 2005-2007 Martin Afanasjew (see README for further credits)"
+#define __COPYRIGHT "© 2005-2007 Martin Afanasjew (see README for further credits)"
diff --git a/plugins/HistorySweeperLight/res/historysweeperlight.rc b/plugins/HistorySweeperLight/res/historysweeperlight.rc index 2c972d6d26..1ddf9d7d4d 100644 --- a/plugins/HistorySweeperLight/res/historysweeperlight.rc +++ b/plugins/HistorySweeperLight/res/historysweeperlight.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -85,7 +85,7 @@ IDI_ACT1 ICON "act1.ico" IDI_ACT2 ICON "act2.ico"
IDI_ACTDEL ICON "actDel.ico"
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/HistorySweeperLight/src/resource.h b/plugins/HistorySweeperLight/src/resource.h index c6e2c3710d..869a794d58 100644 --- a/plugins/HistorySweeperLight/src/resource.h +++ b/plugins/HistorySweeperLight/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// D:\MNG_orig\plugins\HistorySweeperLight\res\historysweeperlight.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ D:\MNG_orig\plugins\HistorySweeperLight\res\historysweeperlight.rc
//
#define IDD_OPT_HISTORYSWEEPER 101
#define IDI_ACTG 102
diff --git a/plugins/HistorySweeperLight/src/version.h b/plugins/HistorySweeperLight/src/version.h index 44960a283c..dfbb36af6d 100644 --- a/plugins/HistorySweeperLight/src/version.h +++ b/plugins/HistorySweeperLight/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Sergey V. Gershovich a.k.a. Jazzy$, Boris Krasnovskiy, tico-tico"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/HistorySweeperLight/"
-#define __COPYRIGHT " 2002-2003 Sergey V. Gershovich a.k.a. Jazzy$, 2006-2009 Boris Krasnovskiy, 2010-2011 tico-tico"
+#define __COPYRIGHT "© 2002-2003 Sergey V. Gershovich a.k.a. Jazzy$, 2006-2009 Boris Krasnovskiy, 2010-2011 tico-tico"
diff --git a/plugins/HwHotKeys/res/HwHotKeys.rc b/plugins/HwHotKeys/res/HwHotKeys.rc index f80fe85b8b..7b0777d103 100644 --- a/plugins/HwHotKeys/res/HwHotKeys.rc +++ b/plugins/HwHotKeys/res/HwHotKeys.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -93,7 +93,7 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp b/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp index a732504763..012da96a25 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_Dlg.cpp @@ -1,6 +1,6 @@ /* ============================================================================
Hardware HotKeys plugin for Miranda NG.
-Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
+Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
This program is free software; you can redistribute it and / or
modify it under the terms of the GNU General Public License
@@ -47,7 +47,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) code_Close_tmp = key_code_assign;
HwHotKeys_PrintFullKeyname(key_code_assign);
SetDlgItemTextA(hDialogWnd, dlg_close_edit, key_name_buffer);
- SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); //
+ SendMessage(GetParent(hDlg), PSM_CHANGED, 0, 0); // сообщает системе о том что были изменения
break;
case dlg_close_clear:
code_Close_tmp = 0;
@@ -85,7 +85,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) case 0:
switch (((LPNMHDR)lParam)->code)
{
- case PSN_APPLY: //
+ case PSN_APPLY: // система просит сохранить настройки плагина
code_Close = code_Close_tmp;
db_set_dw(0, __DbModName, "Close", code_Close_tmp);
code_HideShow = code_HideShow_tmp;
@@ -99,7 +99,7 @@ INT_PTR CALLBACK OptDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM lParam) break; //case WM_NOTIFY
case WM_DESTROY:
- hDialogWnd = nullptr; // ( ), 0 ( )
+ hDialogWnd = nullptr; // используется для вывода туда в реалтайме сканкодов клавы (пока открыты настройки), 0 (при закрытии диалога) блокирует это
break;
}
diff --git a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp index 01ed11e26f..22814e4c9d 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_DllMain.cpp @@ -1,6 +1,6 @@ /* ============================================================================
Hardware HotKeys plugin for Miranda NG.
-Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
+Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
This program is free software; you can redistribute it and / or
modify it under the terms of the GNU General Public License
@@ -23,47 +23,47 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. HINSTANCE hInstance;
int hLangpack;
-HWND hDialogWnd = nullptr; // ,
+HWND hDialogWnd = nullptr; // хэндл окна настроек, он глобально используется для вывода туда в реалтайме сканкодов клавы из хука
HHOOK hHook;
CLIST_INTERFACE *pcli;
-// - //,
+// там хранятся настройки - сканкоды кнопок для закрытия/показа/чтения, на которые должны реагировать соответствующие действия
DWORD code_Close = 0;
DWORD code_HideShow = 0;
DWORD code_ReadMsg = 0;
-// _tmp
+// в _tmp копируются настройки на время диалога настроек
DWORD code_Close_tmp = 0;
DWORD code_HideShow_tmp = 0;
DWORD code_ReadMsg_tmp = 0;
-// :
-// 0...7 - ( KbdLLHookStruct.scanCode&0xFF)
-// 8 - , LLKHF_EXTENDED ((LOBYTE(KbdLLHookStruct.flags)&1) -
-// ( 101- 255 , .. F13-F20).
-// , 9- ( *key_tab[0x200]).
-// 9-19 - .
-// 20-31 - , Shift/Ctrl/Alt/Win. 4 - 12 . 3 - , , .
-// key_flag_sr
-
-// 10 - "" .
-// 0...7 - ( KbdLLHookStruct.scanCode&0xFF)
-// 8 - , LLKHF_EXTENDED ((LOBYTE(KbdLLHookStruct.flags)&1) -
-// ( 101- 255 , .. F13-F20).
-// 9 - 0...7 , VK- (KbdLLHookStruct.vkCode), 8 0.
-// USB- , 0 - VK-.
-// ( *key_tab[0x300]).
-// 10-19 - .
-// 20-31 - , Shift/Ctrl/Alt/Win. 4 - 12 . 3 - , , .
-// key_flag_sr
-
-
-
-
-DWORD key_code = 0; //
+// формат сканкодов тут такой:
+// младшие 0...7 биты - это аппаратный сканкод (как он приходит в KbdLLHookStruct.scanCode&0xFF)
+// 8 бит - это как бы часть сканкода, флаг LLKHF_EXTENDED ((LOBYTE(KbdLLHookStruct.flags)&1) - часть кнопок с этим флагом
+// (авторам 101-кнопочной клавы не хватило 255 сканкодов, т.к. там много старых кнопок которые уже давно вымерли типа F13-F20).
+// итак, плагин оперирует 9-битными сканкодами (имена кнопок всех этих сканкодов прописаны в таблице *key_tab[0x200]).
+// биты 9-19 - не используются.
+// биты 20-31 - это флаги регистров, Shift/Ctrl/Alt/Win. На 4 кнопки - 12 битов. Потому что каждая кнопка 3 имеет бита - левая, правая, или любая.
+// битовые маски регистров опеределены в key_flag_sr и соседних именах
+
+// плагин оперирует 10 - битными "сканкодами" собственного формата.
+// младшие 0...7 биты - это обычно аппаратный сканкод (как он приходит в KbdLLHookStruct.scanCode&0xFF)
+// 8 бит - это как бы часть сканкода, флаг LLKHF_EXTENDED ((LOBYTE(KbdLLHookStruct.flags)&1) - часть кнопок с этим флагом
+// (авторам 101-кнопочной клавы не хватило 255 сканкодов, т.к. там много старых кнопок которые уже давно вымерли типа F13-F20).
+// 9 бит - это значит что в битах 0...7 не аппаратный сканкод, а VK-код (KbdLLHookStruct.vkCode), и 8 бит при этом всегда 0.
+// сделано это потому что некоторые USB-клавиатуры не выдают в хук аппаратные скандоды, и если там 0 - то будет использован VK-код.
+// (имена кнопок всех этих сканкодов прописаны в таблице *key_tab[0x300]).
+// биты 10-19 - не используются.
+// биты 20-31 - это флаги регистров, Shift/Ctrl/Alt/Win. На 4 кнопки - 12 битов. Потому что каждая кнопка 3 имеет бита - левая, правая, или любая.
+// битовые маски регистров опеределены в key_flag_sr и соседних именах
+
+
+
+
+DWORD key_code = 0; // там постоянно обновляется сканкод текущей нажатой комбинации
DWORD key_code_raw = 0;
-DWORD key_code_assign = 0; // , .
+DWORD key_code_assign = 0; // во время настроек там хранится сканкод последней нажатой комбинации, который можно назначить для действия.
-CHAR key_name_buffer[150]; // . ANSI.
-// - L_Shift + L_Ctrl + L_Alt + L_Win + R_Shift + R_Ctrl + R_Alt + R_Win + MSO_Print, HP_TouchPadOff - 100 .
+CHAR key_name_buffer[150]; // буфер куда печатается имя кнопки в настройках. ANSI.
+// Самая длинная в теории строка - «L_Shift + L_Ctrl + L_Alt + L_Win + R_Shift + R_Ctrl + R_Alt + R_Win + MSO_Print, HP_TouchPadOff» - менее 100 букв.
// ============================================================================
@@ -85,7 +85,7 @@ PLUGININFOEX PluginInfoEx = { __COPYRIGHT,
__AUTHORWEB,
UNICODE_AWARE,
- // {315B3800-8258-44C4-B60E-58C50B9303B6} - GUID HwHotKeys
+ // {315B3800-8258-44C4-B60E-58C50B9303B6} - GUID для плагина HwHotKeys
{ 0x315b3800, 0x8258, 0x44c4, { 0xb6, 0xe, 0x58, 0xc5, 0xb, 0x93, 0x3, 0xb6 } }
};
@@ -98,21 +98,21 @@ extern "C" __declspec(dllexport) PLUGININFOEX * MirandaPluginInfoEx(DWORD) extern "C" __declspec(dllexport) int Load(void)
{
- // ( )
+ // загружаем (из БД) настройки плагина
code_Close = db_get_dw(0, __DbModName, "Close", 0);
code_HideShow = db_get_dw(0, __DbModName, "HideShow", 0);
code_ReadMsg = db_get_dw(0, __DbModName, "ReadMsg", 0);
- // - mir_getLP(PlgInfoEx)
+ // установка кода локализации - макрос mir_getLP(PlgInfoEx)
mir_getLP(&PluginInfoEx);
- // - CLIST_INTERFACE *pcli;
+ // Интерфейс контактлиста - макрос заполняет CLIST_INTERFACE *pcli;
pcli = Clist_GetInterface();
- //
+ // регистрация диалога опций
HookEvent(ME_OPT_INITIALISE, initializeOptions);
- //
+ // установка хука для низкоуровневой обработки хоткеев
hHook = SetWindowsHookExA(WH_KEYBOARD_LL, key_hook, hInstance, 0);
// StringCbPrintfA(key_name_buffer, 100, "hHook = 0x%x, Err = %u", hHook, GetLastError);
diff --git a/plugins/HwHotKeys/src/HwHotKeys_KbdHook.cpp b/plugins/HwHotKeys/src/HwHotKeys_KbdHook.cpp index eadb9f1f4d..17065834a2 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_KbdHook.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_KbdHook.cpp @@ -1,6 +1,6 @@ /* ============================================================================
Hardware HotKeys plugin for Miranda NG.
-Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
+Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
This program is free software; you can redistribute it and / or
modify it under the terms of the GNU General Public License
@@ -24,31 +24,31 @@ LRESULT CALLBACK key_hook(int nCode, WPARAM wParam, LPARAM lParam) // https://m KBDLLHOOKSTRUCT *pKbdLLHookStruct = (KBDLLHOOKSTRUCT *)lParam;
if (nCode >= 0)
{
- if (wParam == WM_KEYUP || wParam == WM_SYSKEYUP) // -
+ if (wParam == WM_KEYUP || wParam == WM_SYSKEYUP) // при отпускании любой кнопки - сбрасываем всю накопленную комбинацию
{
key_code = 0;
}
else if (wParam == WM_KEYDOWN || wParam == WM_SYSKEYDOWN)
{
if (!(pKbdLLHookStruct->scanCode & 0xFFFFFF00) && (pKbdLLHookStruct->scanCode & 0xFF)) // && !(pKbdLLHookStruct->flags & LLKHF_INJECTED))
- // 0xFFFFFF00 L_Alt/AltGr,
- // 0xFF ( ..)
- // LLKHF_INJECTED ,
+ // 0xFFFFFF00 фильтр дл¤ странных двойных сканкодов например перед L_Alt/AltGr,
+ // 0xFF фильтр дл¤ нулевых сканкодов(приход¤т при вс¤кой там эмул¤ции нажатий и т.п.)
+ // LLKHF_INJECTED фильтр дл¤ эмулируемых нажатий, но есть проблема с некоторыми клавами
{
- // ( + . LLKHF_EXTENDED), 0 1FF
+ // строим комплексный код(сканкод + доп.флаг LLKHF_EXTENDED), от 0 до 1FF
key_code_raw = (LOBYTE(pKbdLLHookStruct->scanCode) | ((LOBYTE(pKbdLLHookStruct->flags)&1) << 8));
- if (hDialogWnd) // -
+ if (hDialogWnd) // если диалог настроек открыт - выводим в него нажимаемые кнопоки
{
StringCbPrintfA(key_name_buffer, sizeof(key_name_buffer), "%03X %s", key_code_raw, key_tab[(key_code_raw & 0x1FF)]);
SetDlgItemTextA(hDialogWnd, dlg_scancode_edit, key_name_buffer);
}
- switch (key_code_raw) //
+ switch (key_code_raw) // провер¤ем кнопки модификаторов
{
case 0x01D: // L_Ctrl
key_code |= key_flag_cl;
- break; // - , .
+ break; // после модификаторов - ничего не делаем, выход из хука.
case 0x11D: // R_Ctrl
key_code |= key_flag_cr;
break;
@@ -76,11 +76,11 @@ LRESULT CALLBACK key_hook(int nCode, WPARAM wParam, LPARAM lParam) // https://m case 0x136: // R_Shift_fake
key_code |= key_flag_sr;
break;
- default: // -
- key_code = (LOWORD(key_code_raw)) | (key_code & 0xFFFF0000); // - ( )
- if (hDialogWnd) // - ( Shift+Key), ;
+ default: // если это не кнопка модификатора - то дальнейша¤ обработка
+ key_code = (LOWORD(key_code_raw)) | (key_code & 0xFFFF0000); // в старшей половине там лежат биты модификаторов - их оставл¤ем (они там могут быть от предыдущего раза)
+ if (hDialogWnd) // если диалог настроек открыт - выводим в него комплексную комбинацию (типа Shift+Key), которую потом можно назначить;
{
- if (IsDlgButtonChecked(hDialogWnd, dlg_combine)) // / ?
+ if (IsDlgButtonChecked(hDialogWnd, dlg_combine)) // левые/правые модификаторы объедин¤ть в один?
{
DWORD tmp1, tmp2;
tmp1 = ((key_code >> 4) | (key_code >> 8)) & 0x00F00000;
@@ -95,34 +95,34 @@ LRESULT CALLBACK key_hook(int nCode, WPARAM wParam, LPARAM lParam) // https://m HwHotKeys_PrintFullKeyname(key_code_assign);
SetDlgItemTextA(hDialogWnd, dlg_keyname_edit, key_name_buffer);
}
- else // ( )
+ else // хоткей выполн¤ют действи¤ только если закрыт диалог настроек (чтобы не мешал настраивать)
{
- if (HwHotKeys_CompareCurrentScancode(code_Close)) // Miranda
+ if (HwHotKeys_CompareCurrentScancode(code_Close)) // хоткей полного закрыти¤ Miranda
{
// Beep(300, 200);
CallService("CloseAction", 0, 0);
return 1;
}
- else if (HwHotKeys_CompareCurrentScancode(code_HideShow)) // / Miranda
+ else if (HwHotKeys_CompareCurrentScancode(code_HideShow)) // хоткей сворачивани¤/разворачивани¤ главного окна Miranda
{
// Beep(700, 200);
- pcli->pfnShowHide(); //
+ pcli->pfnShowHide(); // есть варианты
return 1;
}
- else if (HwHotKeys_CompareCurrentScancode(code_ReadMsg)) //
+ else if (HwHotKeys_CompareCurrentScancode(code_ReadMsg)) // хоткей чтени¤ сообщени¤
{
// Beep(1500, 200);
- if (pcli->pfnEventsProcessTrayDoubleClick(0) != 0) //
- { // - ...
+ if (pcli->pfnEventsProcessTrayDoubleClick(0) != 0) // клик по трею дл¤ стандартного открыти¤ сообщени¤
+ { // иначе - окно чата уже открыто и надо его вытащить наверх...
SetForegroundWindow(pcli->hwndContactList);
SetFocus(pcli->hwndContactList);
- //
- // http://www.rsdn.ru/article/qna/ui/wndsetfg.xml
- // (
- // , srmm)
- // hkRead
+ // хот¤ всЄ равно это не очень работает в новой винде
+ // надо http://www.rsdn.ru/article/qna/ui/wndsetfg.xml
+ // но пока незнаю где тут вз¤ть хэндл окна чата(причЄм именно дл¤
+ // выбранного контакта, их же несколько может быть если простой srmm)
+ // у миранды в hkRead такие же проблемы
}
- return 1; // 1 , ..
+ return 1; // возврат 1 запрещает дальнейшую работу кнопки, т.е. кнопка после нашего плагина никому более не достанетс¤
}
}
}
diff --git a/plugins/HwHotKeys/src/HwHotKeys_KeyName.cpp b/plugins/HwHotKeys/src/HwHotKeys_KeyName.cpp index ef116b6b5d..93f4d9c1b0 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_KeyName.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_KeyName.cpp @@ -1,6 +1,6 @@ /* ============================================================================
Hardware HotKeys plugin for Miranda NG.
-Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
+Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
This program is free software; you can redistribute it and / or
modify it under the terms of the GNU General Public License
@@ -19,14 +19,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. #include "stdafx.h"
-// (KbdLLHookStruct.scanCode & 0xFF) ((LOBYTE(KbdLLHookStruct.flags)&1)
-// VK- (KbdLLHookStruct.vkCode)
+// тут описаны известные имена кнопок по аппаратным сканкодам (KbdLLHookStruct.scanCode & 0xFF) и ((LOBYTE(KbdLLHookStruct.flags)&1)
+// и по VK-кодам (KbdLLHookStruct.vkCode)
-// ( ) !
+// при обнаружении новых кнопок (на мультимедийных клавиатурах) просьба сообщать об этом автору!
-// KbdLLHookStruct.scanCode
+// имена для KbdLLHookStruct.scanCode
const CHAR *k000 = "Undefined!";
const CHAR *k001 = "Esc";
const CHAR *k002 = "1";
@@ -188,7 +188,7 @@ const CHAR *k169 = "Browser_Forward"; const CHAR *k16A = "Browser_Back";
-// (Shift,Ctrl,Alt,Win)
+// кнопки регистров (Shift,Ctrl,Alt,Win)
const CHAR *t_CL = k01D;
const CHAR *t_CR = k11D;
const CHAR *t_CC = k01D + 2;
@@ -206,7 +206,7 @@ const CHAR *t_SS = k02A + 2; const CHAR *key_tab[0x200] =
{
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k00D, k00E, k00F, // 000 - KbdLLHookStruct.scanCode
+ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k00A, k00B, k00C, k00D, k00E, k00F, // 000 - простые KbdLLHookStruct.scanCode
k010, k011, k012, k013, k014, k015, k016, k017, k018, k019, k01A, k01B, k01C, k01D, k01E, k01F, // 010
k020, k021, k022, k023, k024, k025, k026, k027, k028, k029, k02A, k02B, k02C, k02D, k02E, k02F, // 020
k030, k031, k032, k033, k034, k035, k036, k037, k038, k039, k03A, k03B, k03C, k03D, k03E, k03F, // 030
diff --git a/plugins/HwHotKeys/src/HwHotKeys_Util.cpp b/plugins/HwHotKeys/src/HwHotKeys_Util.cpp index 39b299d758..ecbce8b736 100644 --- a/plugins/HwHotKeys/src/HwHotKeys_Util.cpp +++ b/plugins/HwHotKeys/src/HwHotKeys_Util.cpp @@ -1,6 +1,6 @@ /* ============================================================================
Hardware HotKeys plugin for Miranda NG.
-Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
+Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
This program is free software; you can redistribute it and / or
modify it under the terms of the GNU General Public License
@@ -21,19 +21,19 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. -//
+// сравнивает текущий нажатый сканкод с указанным
BOOL HwHotKeys_CompareCurrentScancode(DWORD scancode)
{
- if (key_code == scancode) // key_code - .
+ if (key_code == scancode) // key_code - текущий нажатый на клавиатуре сканкод.
{
- return true; // - TRUE.
+ return true; // сканкод напрямую совпал - TRUE.
}
- if (!(scancode & 0x00F00000)) // / .
+ if (!(scancode & 0x00F00000)) // проверяем нет ли в сканкоде запроса на любой из левого/правого регистра.
{
return false;
}
- DWORD tmp1, tmp2; // : 0xF0000000 - Sft/Ctr/Alt/Win, 0x0F000000 - , 0x00F00000 - Sft/Ctr/Alt/Win
- tmp1 = key_code >> 8; // .
+ DWORD tmp1, tmp2; // битовые маски: 0xF0000000 - левые кнопки Sft/Ctr/Alt/Win, 0x0F000000 - правые кнопки, 0x00F00000 - любые кнопки Sft/Ctr/Alt/Win
+ tmp1 = key_code >> 8; // сдвигаем биты левых и правых кнопок.
tmp2 = key_code >> 4;
tmp1 |= tmp2;
tmp1 &= 0x00F00000;
@@ -47,12 +47,12 @@ BOOL HwHotKeys_CompareCurrentScancode(DWORD scancode) -// key_name_buffer
-// ANSI ( , )
+// печатает в буфер key_name_buffer текстовое описание нажатой комбинации кнопок
+// Кодировка ANSI (для экономии места, всё равно названия клавиш английские)
VOID HwHotKeys_PrintFullKeyname(DWORD scancode)
{
key_name_buffer[0] = 0;
- if (!scancode) // - .
+ if (!scancode) // если нулевой сканкод - то пустую строку делаем.
{
return;
}
@@ -121,7 +121,7 @@ VOID HwHotKeys_PrintFullKeyname(DWORD scancode) StringCbCatA(key_name_buffer, sizeof(key_name_buffer), " + ");
}
- if ((scancode & 0x1FF) < sizeof(key_tab)) // - .
+ if ((scancode & 0x1FF) < sizeof(key_tab)) // защита от ошибочных данных - чтобы не выйти из таблицы имён.
{
StringCbCatA(key_name_buffer, sizeof(key_name_buffer), key_tab[(scancode & 0x1FF)]);
}
@@ -130,7 +130,7 @@ VOID HwHotKeys_PrintFullKeyname(DWORD scancode) StringCbCatA(key_name_buffer, sizeof(key_name_buffer), "out of range");
}
- INT_PTR tmp1 = mir_strlen(key_name_buffer); // - ()
+ INT_PTR tmp1 = mir_strlen(key_name_buffer); // допечатываем в конеце строки сканкод - для удобства работы с пока ещё не известными (безимянными) кнопками
StringCbPrintfA(key_name_buffer + tmp1, sizeof(key_name_buffer) - tmp1, " (%03X)", (scancode & 0x1FF));
return;
diff --git a/plugins/HwHotKeys/src/stdafx.h b/plugins/HwHotKeys/src/stdafx.h index dfce5e714e..94d0b78b74 100644 --- a/plugins/HwHotKeys/src/stdafx.h +++ b/plugins/HwHotKeys/src/stdafx.h @@ -1,6 +1,6 @@ /* ============================================================================
Hardware HotKeys plugin for Miranda NG.
-Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
+Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112
This program is free software; you can redistribute it and / or
modify it under the terms of the GNU General Public License
@@ -41,7 +41,7 @@ extern CLIST_INTERFACE *pcli; extern HINSTANCE hInstance;
extern INT hLangpack;
-extern HWND hDialogWnd; // ,
+extern HWND hDialogWnd; // глобально используется для вывода туда в реалтайме сканкодов клавы, из хука
extern HHOOK hHook;
extern DWORD code_Close_tmp;
@@ -72,7 +72,7 @@ extern const CHAR *t_SL; extern const CHAR *t_SR;
extern const CHAR *t_SS;
-// HwHotKeys_CompareCurrentScancode
+// значения связаны с битами в HwHotKeys_CompareCurrentScancode
#define key_flag_sr 0x01000000
#define key_flag_cr 0x02000000
#define key_flag_ar 0x04000000
diff --git a/plugins/HwHotKeys/src/version.h b/plugins/HwHotKeys/src/version.h index 0c5c8d595a..344f756348 100644 --- a/plugins/HwHotKeys/src/version.h +++ b/plugins/HwHotKeys/src/version.h @@ -1,6 +1,6 @@ /* ============================================================================ Hardware HotKeys plugin for Miranda NG. -Copyright Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112 +Copyright © Eugene f2065, http://f2065.narod.ru, f2065 mail.ru, ICQ 35078112 This program is free software; you can redistribute it and / or modify it under the terms of the GNU General Public License @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. ============================================================================ */ -// : -// 1.0.0.6 - Hardware HotKeys Miranda NG ( Miranda IM), . +// история версий: +// 1.0.0.6 - первая версия Hardware HotKeys для Miranda NG (более ранние версии были для Miranda IM), исправление старых ошибок. #define __MAJOR_VERSION 1 @@ -28,14 +28,14 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111 - 1307, USA. #include <stdver.h> -#define __PLUGIN_NAME "Hardware HotKeys" // dll-fileinfo "FileVersion" "ProductName", , . ! +#define __PLUGIN_NAME "Hardware HotKeys" // dll-fileinfo "FileVersion" и "ProductName", меню в настройках миранды, название плагина в миранде. Нелокализуемое! #define __FILENAME "HwHotKeys.dll" // dll-fileinfo "OriginalFilename" -#define __DESCRIPTION_MIR "Allows you to assign expanded multimedia keys (only for PS/2 keyboards)." // () -#define __DESCRIPTION_DLL "Hardware HotKeys plugin for Miranda NG." // dll-fileinfo "FileDescription" ( - ). ! -#define __AUTHOR "Eugene f2065" // -#define __AUTHOREMAIL "f2065@mail.ru" // -#define __AUTHORWEB "http://f2065.narod.ru/" // dll-fileinfo "CompanyName", -#define __COPYRIGHT " 2010-2017 Eugene f2065" // dll-fileinfo "LegalCopyright", - -#define __DbModName "HwHotKeys" // +#define __DESCRIPTION_MIR "Allows you to assign expanded multimedia keys (only for PS/2 keyboards)." // описание плагина в миранде (локализуемое) +#define __DESCRIPTION_DLL "Hardware HotKeys plugin for Miranda NG." // описание плагина в dll-fileinfo "FileDescription" (там многострочные строки - не работают). Нелокализуемое! +#define __AUTHOR "Eugene f2065" // описание плагина в миранде +#define __AUTHOREMAIL "f2065@mail.ru" // описание плагина в миранде +#define __AUTHORWEB "http://f2065.narod.ru/" // описание плагина в dll-fileinfo "CompanyName", описание плагина в миранде +#define __COPYRIGHT "© 2010-2017 Eugene f2065" // описание плагина в dll-fileinfo "LegalCopyright", описание плагина в миранде + +#define __DbModName "HwHotKeys" // имя раздела настроек плагина в БД миранды diff --git a/plugins/IEHistory/src/IEHistory.cpp b/plugins/IEHistory/src/IEHistory.cpp index 2096b2d701..6f8151f72d 100644 --- a/plugins/IEHistory/src/IEHistory.cpp +++ b/plugins/IEHistory/src/IEHistory.cpp @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/dlgHandlers.cpp b/plugins/IEHistory/src/dlgHandlers.cpp index 1bb009e1b5..dad7eb3932 100644 --- a/plugins/IEHistory/src/dlgHandlers.cpp +++ b/plugins/IEHistory/src/dlgHandlers.cpp @@ -1,7 +1,7 @@ /*
IEView history viewer plugin for Miranda IM
-Copyright 2005-2006 Cristian Libotean
+Copyright © 2005-2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/IEHistory/src/dlgHandlers.h b/plugins/IEHistory/src/dlgHandlers.h index bf492a5bbf..01d39a1351 100644 --- a/plugins/IEHistory/src/dlgHandlers.h +++ b/plugins/IEHistory/src/dlgHandlers.h @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/events.cpp b/plugins/IEHistory/src/events.cpp index c56d11b6da..e7abc9cff8 100644 --- a/plugins/IEHistory/src/events.cpp +++ b/plugins/IEHistory/src/events.cpp @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/events.h b/plugins/IEHistory/src/events.h index 70dd68cccf..abfa66ac42 100644 --- a/plugins/IEHistory/src/events.h +++ b/plugins/IEHistory/src/events.h @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/services.cpp b/plugins/IEHistory/src/services.cpp index 1556b08363..84ea58ffee 100644 --- a/plugins/IEHistory/src/services.cpp +++ b/plugins/IEHistory/src/services.cpp @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/services.h b/plugins/IEHistory/src/services.h index aa1f0c39cf..c1048ce9fc 100644 --- a/plugins/IEHistory/src/services.h +++ b/plugins/IEHistory/src/services.h @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/stdafx.cxx b/plugins/IEHistory/src/stdafx.cxx index 56f759b9d0..b5acedc6eb 100644 --- a/plugins/IEHistory/src/stdafx.cxx +++ b/plugins/IEHistory/src/stdafx.cxx @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/stdafx.h b/plugins/IEHistory/src/stdafx.h index 72e210060d..4db5643aee 100644 --- a/plugins/IEHistory/src/stdafx.h +++ b/plugins/IEHistory/src/stdafx.h @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/utils.cpp b/plugins/IEHistory/src/utils.cpp index ed3936781f..fc40eeba25 100644 --- a/plugins/IEHistory/src/utils.cpp +++ b/plugins/IEHistory/src/utils.cpp @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/utils.h b/plugins/IEHistory/src/utils.h index 6cb2b71370..a8c98ef30b 100644 --- a/plugins/IEHistory/src/utils.h +++ b/plugins/IEHistory/src/utils.h @@ -1,7 +1,7 @@ /* IEView history viewer plugin for Miranda IM -Copyright 2005-2006 Cristian Libotean +Copyright © 2005-2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/IEHistory/src/version.h b/plugins/IEHistory/src/version.h index 6a5b2d6517..e84bd1a658 100644 --- a/plugins/IEHistory/src/version.h +++ b/plugins/IEHistory/src/version.h @@ -1,7 +1,7 @@ /* Bonsai plugin for Miranda IM -Copyright 2006 Cristian Libotean +Copyright © 2006 Cristian Libotean This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -32,7 +32,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "Cristian Libotean, Miranda NG team" //#define __AUTHOREMAIL "eblis102@yahoo.com" #define __AUTHOREMAIL "" -#define __COPYRIGHT " 2006 Cristian Libotean, 2014-17 Miranda NG team" +#define __COPYRIGHT "© 2006 Cristian Libotean, 2014-17 Miranda NG team" #define __AUTHORWEB "https://miranda-ng.org/p/IEHistory" #define __PLUGIN_DISPLAY_NAME "IEView history viewer" diff --git a/plugins/IEView/src/version.h b/plugins/IEView/src/version.h index 4f3136710b..ebd233c51c 100644 --- a/plugins/IEView/src/version.h +++ b/plugins/IEView/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Piotr Piastucki, Francois Mean" #define __AUTHOREMAIL "the_leech@users.berlios.de" #define __AUTHORWEB "https://miranda-ng.org/p/IEView/" -#define __COPYRIGHT " 2005-2011 Piotr Piastucki, Francois Mean" +#define __COPYRIGHT "© 2005-2011 Piotr Piastucki, Francois Mean" diff --git a/plugins/IgnoreState/src/version.h b/plugins/IgnoreState/src/version.h index 8739dfb9e7..71b8f06747 100644 --- a/plugins/IgnoreState/src/version.h +++ b/plugins/IgnoreState/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Kildor" #define __AUTHOREMAIL "kostia@ngs.ru" #define __AUTHORWEB "https://miranda-ng.org/p/IgnoreState/" -#define __COPYRIGHT " 2009-2010 Kostia Romanov" +#define __COPYRIGHT "© 2009-2010 Kostia Romanov" diff --git a/plugins/Import/src/import.cpp b/plugins/Import/src/import.cpp index 92b8933439..82645c29bd 100644 --- a/plugins/Import/src/import.cpp +++ b/plugins/Import/src/import.cpp @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/main.cpp b/plugins/Import/src/main.cpp index 33ae9d1494..6d3029f8b1 100644 --- a/plugins/Import/src/main.cpp +++ b/plugins/Import/src/main.cpp @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/miranda.cpp b/plugins/Import/src/miranda.cpp index 38aecfa1f5..5b31e7e3ec 100644 --- a/plugins/Import/src/miranda.cpp +++ b/plugins/Import/src/miranda.cpp @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/progress.cpp b/plugins/Import/src/progress.cpp index dc19315d97..384ea84d97 100644 --- a/plugins/Import/src/progress.cpp +++ b/plugins/Import/src/progress.cpp @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/stdafx.h b/plugins/Import/src/stdafx.h index 57cb51392b..0e561fbe6e 100644 --- a/plugins/Import/src/stdafx.h +++ b/plugins/Import/src/stdafx.h @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/utils.cpp b/plugins/Import/src/utils.cpp index ba9e6a45aa..21bb6c09c7 100644 --- a/plugins/Import/src/utils.cpp +++ b/plugins/Import/src/utils.cpp @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Import/src/version.h b/plugins/Import/src/version.h index 436b2f010a..3408e433eb 100644 --- a/plugins/Import/src/version.h +++ b/plugins/Import/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda team"
#define __AUTHOREMAIL "info@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/Import/"
-#define __COPYRIGHT " 2012-2017 George Hazan"
+#define __COPYRIGHT "© 2012-2017 George Hazan"
diff --git a/plugins/Import/src/wizard.cpp b/plugins/Import/src/wizard.cpp index a5fd8e26ee..d94b922da5 100644 --- a/plugins/Import/src/wizard.cpp +++ b/plugins/Import/src/wizard.cpp @@ -2,7 +2,7 @@ Import plugin for Miranda NG
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/ImportTXT/ImpTxt_Ver.rc b/plugins/ImportTXT/ImpTxt_Ver.rc index ef7b9fd4e5..2ccc54f162 100644 --- a/plugins/ImportTXT/ImpTxt_Ver.rc +++ b/plugins/ImportTXT/ImpTxt_Ver.rc @@ -12,7 +12,7 @@ BLOCK "StringFileInfo" VALUE "FileDescription", "ImportTXT plugin for Miranda NG"
VALUE "FileVersion", "0.0.1.12"
VALUE "InternalName", "importtxt"
- VALUE "LegalCopyright", " 2008 Abyss"
+ VALUE "LegalCopyright", "© 2008 Abyss"
VALUE "LegalTrademarks", "Gnu General Public License V2"
VALUE "OriginalFilename", "importtxt.dll"
VALUE "ProductName", "Import TXT Module"
diff --git a/plugins/KeyboardNotify/src/main.cpp b/plugins/KeyboardNotify/src/main.cpp index 59a3b82e83..1bcb7840b8 100644 --- a/plugins/KeyboardNotify/src/main.cpp +++ b/plugins/KeyboardNotify/src/main.cpp @@ -2,7 +2,7 @@ KeyboardNotify plugin v1.5 for Miranda IM
_________________________________________
- Copyright (C) 2002,2003 Martin berg
+ Copyright (C) 2002,2003 Martin Цberg
Copyright (C) 2004 Std
Copyright (C) 2005,2006 TioDuke (tioduke@yahoo.ca)
diff --git a/plugins/KeyboardNotify/src/version.h b/plugins/KeyboardNotify/src/version.h index 733b4977ed..0a7f622ea3 100644 --- a/plugins/KeyboardNotify/src/version.h +++ b/plugins/KeyboardNotify/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "TioDuke" #define __AUTHOREMAIL "tioduke@yahoo.ca" #define __AUTHORWEB "https://miranda-ng.org/p/KeyboardNotify/" -#define __COPYRIGHT " 2002-2003 Martin \xd6" "berg, 2004 Std, 2005-2008 TioDuke" +#define __COPYRIGHT "© 2002-2003 Martin \xd6" "berg, 2004 Std, 2005-2008 TioDuke" diff --git a/plugins/Kuzne4ikCrypt/src/GOST/28147_14.cpp b/plugins/Kuzne4ikCrypt/src/GOST/28147_14.cpp index 60f664eda1..2032fbf9fb 100644 --- a/plugins/Kuzne4ikCrypt/src/GOST/28147_14.cpp +++ b/plugins/Kuzne4ikCrypt/src/GOST/28147_14.cpp @@ -1,5 +1,5 @@ /** @file
- * @brief ""
+ * @brief Реализация алгоритма "Кузнечик"
*
* @copyright InfoTeCS. All rights reserved.
*/
@@ -9,7 +9,7 @@ #include "28147_14.h"
#include "table.h"
-/** @brief . */
+/** @brief Нелинейное биективное преобразование множества двоичных векторов. */
static const unsigned char kPi[256] =
{
252, 238, 221, 17, 207, 110, 49, 22, 251, 196, 250, 218, 35, 197, 4, 77,
@@ -30,7 +30,7 @@ static const unsigned char kPi[256] = 89, 166, 116, 210, 230, 244, 180, 192, 209, 102, 175, 194, 57, 75, 99, 182
};
-/** @brief . */
+/** @brief Обратное нелинейное биективное преобразование множества двоичных векторов. */
static const unsigned char kReversePi[256] =
{
0xa5,0x2d,0x32,0x8f,0x0e,0x30,0x38,0xc0,0x54,0xe6,0x9e,0x39,0x55,0x7e,0x52,0x91,
@@ -51,7 +51,7 @@ static const unsigned char kReversePi[256] = 0x12,0x1a,0x48,0x68,0xf5,0x81,0x8b,0xc7,0xd6,0x20,0x0a,0x08,0x00,0x4c,0xd7,0x74
};
-/** @brief l */
+/** @brief Коэффициенты умножения в преобразовании l */
static const unsigned char kB[16] = {148, 32, 133, 16, 194, 192, 1, 251, 1, 192, 194, 16, 133, 32, 148, 1};
int funcX(unsigned char* a, unsigned char* b, unsigned char* outdata)
diff --git a/plugins/Kuzne4ikCrypt/src/GOST/28147_14.h b/plugins/Kuzne4ikCrypt/src/GOST/28147_14.h index fa6e08cbb2..e6a2a5c6f3 100644 --- a/plugins/Kuzne4ikCrypt/src/GOST/28147_14.h +++ b/plugins/Kuzne4ikCrypt/src/GOST/28147_14.h @@ -1,5 +1,5 @@ /** @file
- * @brief ""
+ * @brief Объявление функций реализующих преобразования из алгоритма "Кузнечик"
*
* @copyright InfoTeCS. All rights reserved.
*/
@@ -15,153 +15,153 @@ extern "C" {
#endif
-/** @brief X
+/** @brief Преобразование X
*
- * @param[in] a
- * @param[in] b
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] a входной параметр преобразования
+ * @param[in] b входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcX(unsigned char* a, unsigned char* b, unsigned char* outdata);
-/** @brief S
+/** @brief Преобразование S
*
- * @param[in] indata
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] indata входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcS(unsigned char* indata, unsigned char* outdata);
-/** @brief S
+/** @brief Преобразование обратное к преобразованию S
*
- * @param[in] indata
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] indata входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcReverseS(unsigned char* indata, unsigned char* outdata);
-/** @brief R
+/** @brief Преобразование R
*
- * @param[in] indata
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] indata входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcR(unsigned char* indata, unsigned char* outdata);
-/** @brief R
+/** @brief Преобразование обратное к преобразованию R
*
- * @param[in] indata
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] indata входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcReverseR(unsigned char* indata, unsigned char* outdata);
-/** @brief L
+/** @brief Преобразование L
*
- * @param[in] indata
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] indata входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcL(unsigned char* indata, unsigned char* outdata);
-/** @brief L
+/** @brief Преобразование обратное к преобразованию L
*
- * @param[in] indata
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] indata входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcReverseL(unsigned char* indata, unsigned char* outdata);
-/** @brief LSX
+/** @brief Преобразование LSX
*
- * @param[in] a
- * @param[in] b
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] a входной параметр преобразования
+ * @param[in] b входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcLSX(unsigned char* a, unsigned char* b, unsigned char* outdata);
-/** @brief LSX
+/** @brief Преобразование обратное к преобразованию LSX
*
- * @param[in] a
- * @param[in] b
- * @param[out] outdata
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] a входной параметр преобразования
+ * @param[in] b входной параметр преобразования
+ * @param[out] outdata результат параметр преобразования
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcReverseLSX(unsigned char* a, unsigned char* b, unsigned char* outdata);
-/** @brief F
+/** @brief Преобразование F
*
- * @param[in] inputKey
- * @param[in] inputKeySecond
- * @param[in] iterationConst
- * @param[out] outputKey
- * @param[out] outputKeySecond
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] inputKey Первый ключ из пары ключей полученной в предедущей итерации
+ * @param[in] inputKeySecond Второй ключ из пары ключей полученной в предедущей итерации
+ * @param[in] iterationConst Итерационная константа
+ * @param[out] outputKey Первый ключ
+ * @param[out] outputKeySecond Второй ключ
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcF(unsigned char* inputKey, unsigned char* inputKeySecond, unsigned char* iterationConst, unsigned char* outputKey, unsigned char* outputKeySecond);
-/** @brief
+/** @brief Вычисление итерационной константы С
*
- * @param[in] number
- * @param[out] output
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] number номер константы
+ * @param[out] output итерационная константа
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int funcC(unsigned char number, unsigned char* outputW);
-/** @brief
+/** @brief Развертка ключа
*
- * @param[in] masterKey
- * @param[out] keys
- * @param[in] print
- * @return 0
- * @return -1
+ * @param[in] masterKey Мастер ключ
+ * @param[out] keys массив развернутых ключей
+ * @param[in] print функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int ExpandKey(unsigned char* masterKey, unsigned char* keys);
-/** @brief
+/** @brief Выполнение зашифрования блока
*
- * @param[in] plainText
- * @param[out] chipherText
- * @param[in] keys
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] plainText Исходный блок
+ * @param[out] chipherText Зашифрованный блок
+ * @param[in] keys Развернутые ключи
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int Encrypt_14(unsigned char* plainText, unsigned char* chipherText, unsigned char* keys);
-/** @brief
+/** @brief Выполение расшифрования блока
*
- * @param[in] chipherText
- * @param[out] plainText
- * @param[in] keys
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] chipherText Зашифрованный блок
+ * @param[out] plainText Расшифрованный блок
+ * @param[in] keys Развернутые ключи
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int Decrypt_14(unsigned char* chipherText, unsigned char* plainText, unsigned char* keys);
diff --git a/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.cpp b/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.cpp index 3606af3a26..9ac26c8072 100644 --- a/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.cpp +++ b/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.cpp @@ -1,5 +1,5 @@ /** @file
-* @brief
+* @brief Реализация режимов работы блочных алгоритмов
*
* @copyright InfoTeCS. All rights reserved.
*/
@@ -12,150 +12,150 @@ #include "28147_14.h"
#include "block_chipher.h"
-/** @brief */
+/** @brief определение внутреннего ассерта */
#define INFOTECS_ASSERT(e) typedef char __C_ASSERT__[(e)?1:-1]
-/** @brief "" */
+/** @brief размер тестовых данных для алгоритма "кузнечик" */
#define textLen14 sizeof(kSeltTestGost14PlainText)/sizeof(kSeltTestGost14PlainText[0])
-/** @brief 28147-89 */
+/** @brief размер тестовых данных для алгоритма 28147-89 */
#define textLen89 sizeof(kSeltTestGost89PlainText)/sizeof(kSeltTestGost89PlainText[0])
-/** @brief "" */
+/** @brief Признак алгоритма "Кузнечик" */
const unsigned char kAlg14 = 1;
-/** @brief 28147-89 */
+/** @brief Признак алгоритма 28147-89 */
const unsigned char kAlg89 = 2;
-/** @brief */
+/** @brief указатель на функцию шифрования */
typedef int (DLL_IMPORT *pEncrypt)(unsigned char* plainText, unsigned char* chipherText, unsigned char* keys);
-/** @brief */
+/** @brief указатель на функцию расшифрования */
typedef int (DLL_IMPORT *pDecrypt)(unsigned char* chipherText, unsigned char* plainText, unsigned char* keys);
-/** @brief ECB */
+/** @brief Функция самотестирования режима ECB */
static int SelfTestGost14Ecb();
-/** @brief ECB */
+/** @brief Функция самотестирования режима ECB */
static int SelfTestGost89Ecb();
-/** @brief CRT */
+/** @brief Функция самотестирования режима CRT */
static int SelfTestGost14Crt();
-/** @brief CRT */
+/** @brief Функция самотестирования режима CRT */
static int SelfTestGost89Crt();
-/** @brief OFB */
+/** @brief Функция самотестирования режима OFB */
static int SelfTestGost14Ofb();
-/** @brief OFB */
+/** @brief Функция самотестирования режима OFB */
static int SelfTestGost89Ofb();
-/** @brief CBC */
+/** @brief Функция самотестирования режима CBC */
static int SelfTestGost14Cbc();
-/** @brief CBC */
+/** @brief Функция самотестирования режима CBC */
static int SelfTestGost89Cbc();
-/** @brief CFB */
+/** @brief Функция самотестирования режима CFB */
static int SelfTestGost14Cfb();
-/** @brief CFB */
+/** @brief Функция самотестирования режима CFB */
static int SelfTestGost89Cfb();
-/** @brief */
+/** @brief Функция самотестирования режима имитовставки */
static int SelfTestGost14Imit();
-/** @brief */
+/** @brief Функция самотестирования режима имитовставки */
static int SelfTestGost89Imit();
-/** @brief 1 */
+/** @brief Сдвиг влево на 1 бит */
static void ShifttLeftOne(unsigned char *r, size_t length);
-/** @brief ECB */
+/** @brief Контекст ECB */
typedef struct
{
- unsigned char Alg; /**< */
- unsigned char* Keys; /**< */
- unsigned int BlockLen; /**< */
- pEncrypt EncryptFunc; /**< */
- pDecrypt DecryptFunc; /**< */
+ unsigned char Alg; /**< идентификатор алгоритма */
+ unsigned char* Keys; /**< ключ */
+ unsigned int BlockLen; /**< размер блока */
+ pEncrypt EncryptFunc; /**< функция шифрования */
+ pDecrypt DecryptFunc; /**< функция расшифрования */
} Context_ecb;
-/** @brief CRT */
+/** @brief Контекст CRT */
typedef struct
{
- unsigned char Alg; /**< */
- unsigned char* Counter; /**< */
- unsigned char* Keys; /**< */
- size_t S; /**< */
- size_t BlockLen; /**< */
- pEncrypt EncryptFunc; /**< */
- unsigned char *tmpblock; /**< */
+ unsigned char Alg; /**< идентификатор алгоритма */
+ unsigned char* Counter; /**< счетчик */
+ unsigned char* Keys; /**< ключ */
+ size_t S; /**< размер синхропосылки */
+ size_t BlockLen; /**< размер блока */
+ pEncrypt EncryptFunc; /**< функция шифрования */
+ unsigned char *tmpblock; /**< временный блок */
} Context_crt;
-/** @brief OFB */
+/** @brief Контекст OFB */
typedef struct
{
- unsigned char Alg; /**< */
- unsigned char* IV; /**< */
- unsigned char* Keys; /**< */
- size_t M; /**< */
- size_t S; /**< S */
- size_t BlockLen; /**< */
- pEncrypt EncryptFunc; /**< */
- pDecrypt DecryptFunc; /**< */
- unsigned char *tmpblock; /**< */
- unsigned char* nextIV; /**< */
+ unsigned char Alg; /**< идентификатор алгоритма */
+ unsigned char* IV; /**< синхропосылка */
+ unsigned char* Keys; /**< ключ */
+ size_t M; /**< размер синхрпосылки */
+ size_t S; /**< параметр S */
+ size_t BlockLen; /**< размер блока */
+ pEncrypt EncryptFunc; /**< функция шифрования */
+ pDecrypt DecryptFunc; /**< функция расшифрования */
+ unsigned char *tmpblock; /**< временный блок */
+ unsigned char* nextIV; /**< синхропосылка для следующего блока */
} Context_ofb;
-/** @brief CFB */
+/** @brief Контекст CFB */
typedef struct
{
- unsigned char Alg; /**< */
- unsigned char* IV; /**< */
- unsigned char* Keys; /**< */
- size_t M; /**< */
- size_t S; /**< S */
- size_t BlockLen; /**< */
- pEncrypt EncryptFunc; /**< */
- pDecrypt DecryptFunc; /**< */
- unsigned char *tmpblock; /**< */
- unsigned char* nextIV; /**< */
+ unsigned char Alg; /**< идентификатор алгоритма */
+ unsigned char* IV; /**< синхропосылка */
+ unsigned char* Keys; /**< ключ */
+ size_t M; /**< размер синхрпосылки */
+ size_t S; /**< параметр S */
+ size_t BlockLen; /**< размер блока */
+ pEncrypt EncryptFunc; /**< функция шифрования */
+ pDecrypt DecryptFunc; /**< функция расшифрования */
+ unsigned char *tmpblock; /**< временный блок */
+ unsigned char* nextIV; /**< синхропосылка для следующего блока */
} Context_cfb;
-/** @brief CBC */
+/** @brief Контекст CBC */
typedef struct
{
- unsigned char Alg; /**< */
- unsigned char* IV; /**< */
- unsigned char* Keys; /**< */
- size_t BlockLen; /**< */
- size_t M; /**< */
- pEncrypt EncryptFunc; /**< */
- pDecrypt DecryptFunc; /**< */
- unsigned char* nextIV; /**< */
- unsigned char* tempIV; /**< */
- unsigned char *tmpblock; /**< */
+ unsigned char Alg; /**< идентификатор алгоритма */
+ unsigned char* IV; /**< синхропосылка */
+ unsigned char* Keys; /**< ключ */
+ size_t BlockLen; /**< размер блока */
+ size_t M; /**< размер синхрпосылки */
+ pEncrypt EncryptFunc; /**< функция шифрования */
+ pDecrypt DecryptFunc; /**< функция расшифрования */
+ unsigned char* nextIV; /**< синхропосылка для следующего блока */
+ unsigned char* tempIV; /**< для временного хранения значения синхропосылки */
+ unsigned char *tmpblock; /**< временный блок */
} Context_cbc;
-/** @brief */
+/** @brief Контекст имитовставки */
typedef struct
{
- unsigned char Alg; /**< */
- unsigned char* Keys; /**< */
- unsigned char* K1; /**< K1 */
- unsigned char* K2; /**< K2 */
- unsigned char* B; /**< B */
- unsigned char* R; /**< R */
- unsigned char* C; /**< C */
- unsigned char* LastBlock; /**< */
- size_t S; /**< S */
- size_t BlockLen; /**< */
- size_t LastBlockSize; /**< */
- int isFistBlock; /**< */
- pEncrypt EncryptFunc; /**< */
- unsigned char *tmpblock; /**< */
- unsigned char *resimit; /**< */
+ unsigned char Alg; /**< идентификатор алгоритма */
+ unsigned char* Keys; /**< ключ */
+ unsigned char* K1; /**< вспомогательный параметр K1 */
+ unsigned char* K2; /**< вспомогательный параметр K2 */
+ unsigned char* B; /**< вспомогательный параметр B */
+ unsigned char* R; /**< вспомогательный параметр R */
+ unsigned char* C; /**< вспомогательный параметр C */
+ unsigned char* LastBlock; /**< предыдущий блок */
+ size_t S; /**< параметр S */
+ size_t BlockLen; /**< размер блока */
+ size_t LastBlockSize; /**< размер предыдущего блока */
+ int isFistBlock; /**< идентификатор первого блока */
+ pEncrypt EncryptFunc; /**< функция шифрования */
+ unsigned char *tmpblock; /**< временный блок */
+ unsigned char *resimit; /**< имитовставка */
} Context_imit;
static int init_ecb_14_impl(unsigned char *key, void* ctx)
diff --git a/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.h b/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.h index 3a4500d3d0..a98d09c9ce 100644 --- a/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.h +++ b/plugins/Kuzne4ikCrypt/src/GOST/block_chipher.h @@ -1,5 +1,5 @@ /** @file
- * @brief
+ * @brief Объявление функций реализующих режимы работы блочных алгоритмов
*
* @copyright InfoTeCS. All rights reserved.
*/
@@ -9,355 +9,355 @@ #define DLL_IMPORT
-/** @brief ECB "" */
+/** @brief Размер контекста для режима шифрования ECB алгоритма "кузнечик" */
#define kEcb14ContextLen 0x28
-/** @brief ECB 28147-89 */
+/** @brief Размер контекста для режима шифрования ECB алгоритма 28147-89 */
#define kEcb89ContextLen 0x28
-/** @brief CBC "" */
+/** @brief Размер контекста для режима шифрования CBC алгоритма "кузнечик" */
#define kCbc14ContextLen 0x38
-/** @brief CBC 28147-89 */
+/** @brief Размер контекста для режима шифрования CBC алгоритма 28147-89 */
#define kCbc89ContextLen 0x38
-/** @brief CRT "" */
+/** @brief Размер контекста для режима шифрования CRT алгоритма "кузнечик" */
#define kCrt14ContextLen 0x30
-/** @brief CRT 28147-89 */
+/** @brief Размер контекста для режима шифрования CRT алгоритма 28147-89 */
#define kCrt89ContextLen 0x30
-/** @brief OFB "" */
+/** @brief Размер контекста для режима шифрования OFB алгоритма "кузнечик" */
#define kOfb14ContextLen 0x40
-/** @brief OFB 28147-89 */
+/** @brief Размер контекста для режима шифрования OFB алгоритма 28147-89 */
#define kOfb89ContextLen 0x40
-/** @brief CFB "" */
+/** @brief Размер контекста для режима шифрования CFB алгоритма "кузнечик" */
#define kCfb14ContextLen 0x40
-/** @brief CFB 28147-89 */
+/** @brief Размер контекста для режима шифрования CFB алгоритма 28147-89 */
#define kCfb89ContextLen 0x40
-/** @brief "" */
+/** @brief Размер контекста для режима формирования имитовставки алгоритма "кузнечик" */
#define kImit14ContextLen 0x68
-/** @brief 28147-89 */
+/** @brief Размер контекста для режима формирования имитовставки алгоритма 28147-89 */
#define kImit89ContextLen 0x68
-/** @brief "" */
+/** @brief Размер блока алгоритма "кузнечик" */
#define kBlockLen14 16
-/** @brief 28147-89 */
+/** @brief Размер блока алгоритма 28147-89 */
#define kBlockLen89 8
-/** @brief 28147-89 */
+/** @brief Размер ключа алгоритма 28147-89 */
#define kKeyLen89 32
#ifdef __cplusplus
extern "C" {
#endif
-/* *** ***
- *
- *
+/* *** Режимы шифрования ***
+ * Режимы шифрования работают с использованием базового
+ * криптографического преобразования
*/
-/** @brief ECB ""
+/** @brief Инициализация контекста шифрования в режиме ECB для алгоритма "кузнечик"
*
- * @param[in] key
- * @param[out] ctx cbc
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[out] ctx контекст cbc
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ecb_14(unsigned char *key, void* ctx);
-/** @brief ecb
+/** @brief Удаление контекста ecb
*
- * @param[in] ctx ecb
- * @return 0
- * @return -1
+ * @param[in] ctx контекст ecb
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_ecb(void* ctx);
-/** @brief CBC ""
+/** @brief Инициализация контекста шифрования в режиме CBC для алгоритма "кузнечик"
*
- * @param[in] key
- * @param[out] ctx cbc
- * @param[in] iv
- * @param[in] ivLength
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[out] ctx контекст cbc
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длинна синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cbc_14(unsigned char *key, void* ctx, const unsigned char *iv, size_t ivLength);
-/** @brief cbc
+/** @brief Удаление контекста cbc
*
- * @param[in] ctx cbc
- * @return 0
- * @return -1
+ * @param[in] ctx контекст cbc
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_cbc(void* ctx);
-/** @brief CRT ""
+/** @brief Инициализация контекста шифрования в режиме CRT для алгоритма "кузнечик"
*
- * @param[in] key
- * @param[out] ctx crt
- * @param[in] iv
- * @param[in] length
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[out] ctx контекст crt
+ * @param[in] iv синхропосылка
+ * @param[in] length длинна синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_crt_14(unsigned char* key, unsigned char *iv, size_t length, void *ctx);
-/** @brief crt
+/** @brief Удаление контекста crt
*
- * @param[in] ctx crt
- * @return 0
- * @return -1
+ * @param[in] ctx контекст crt
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_crt(void* ctx);
-/** @brief OFB ""
+/** @brief Инициализация контекста шифрования в режиме OFB для алгоритма "кузнечик"
*
- * @param[in] key
- * @param[out] ctx ofb
- * @param[in] s S
- * @param[in] iv
- * @param[in] ivLength
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[out] ctx контекст ofb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длинна синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_ofb_14(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength);
-/** @brief ofb
+/** @brief Удаление контекста ofb
*
- * @param[in] ctx ofb
- * @return 0
- * @return -1
+ * @param[in] ctx контекст ofb
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_ofb(void* ctx);
-/** @brief CFB ""
+/** @brief Инициализация контекста шифрования в режиме CFB для алгоритма "кузнечик"
*
- * @param[in] key
- * @param[out] ctx cfb
- * @param[in] s S
- * @param[in] iv
- * @param[in] ivLength
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[out] ctx контекст cfb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длинна синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cfb_14(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength);
-/** @brief CFB 28147-89
+/** @brief Инициализация контекста шифрования в режиме CFB для алгоритма 28147-89
*
- * @param[in] key
- * @param[out] ctx cfb
- * @param[in] s S
- * @param[in] iv
- * @param[in] ivLength
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[out] ctx контекст cfb
+ * @param[in] s параметр S
+ * @param[in] iv синхропосылка
+ * @param[in] ivLength длинна синхропосылки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_cfb_89(unsigned char *key, void *ctx, size_t s, unsigned char *iv, size_t ivLength);
-/** @brief cfb
+/** @brief Удаление контекста cfb
*
- * @param[in] ctx cfb
- * @return 0
- * @return -1
+ * @param[in] ctx контекст cfb
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_cfb(void* ctx);
-/** @brief ""
+/** @brief Инициализация контекста имтовставки для алгоритма "кузнечик"
*
- * @param[out] ctx
- * @param[in] key
- * @param[in] s S
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[out] ctx контекст имитовставки
+ * @param[in] key ключ
+ * @param[in] s параметр S
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_imit_14(unsigned char *key, size_t s, void *ctx);
-/** @brief 28147-89
+/** @brief Инициализация контекста имтовставки для алгоритма 28147-89
*
- * @param[in] key
- * @param[in] s S
- * @param[out] ctx
- * @param[in] print
- * @param[in] print_uint
- * @return 0
- * @return -1
+ * @param[in] key ключ
+ * @param[in] s параметр S
+ * @param[out] ctx контекст имитовставки
+ * @param[in] print функция логирования
+ * @param[in] print_uint функция логирования
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT init_imit_89(unsigned char *key, size_t s, void *ctx);
-/** @brief
+/** @brief Удаление контекста имитовставки
*
- * @param[in] ctx
- * @return 0
- * @return -1
+ * @param[in] ctx контекст имитовставки
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
void DLL_IMPORT free_imit(void* ctx);
-/** @brief
+/** @brief Выполнение зашифрования информации в режиме простой замены для данных кратных размеру блока
*
- * @param[in] ctx ECB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] length
- * @return 0
- * @return -1
+ * @param[in] ctx контекст ECB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] length длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_ecb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief
+/** @brief Выполнение расшифрования информации в режиме простой замены для данных кратных размеру блока
*
- * @param[in] ctx ECB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] length
- * @return 0
- * @return -1
+ * @param[in] ctx контекст ECB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] length длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_ecb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief
+/** @brief Выполнение зашифрования информации в режиме простой замены с зацеплением для данных кратных размеру блока
*
- * @param[in] ctx CBC
- * @param[in] indata
- * @param[out] outdata
- * @param[in] length
- * @return 0
- * @return -1
+ * @param[in] ctx контекст CBC
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] length длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_cbc(void *ctx, unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief
+/** @brief Выполнение рсшифрования информации в режиме простой замены с зацеплением для данных кратных размеру блока
*
- * @param[in] ctx CBC
- * @param[in] indata
- * @param[out] outdata
- * @param[in] length
- * @return 0
- * @return -1
+ * @param[in] ctx контекст CBC
+ * @param[in] indata зашифрованный текст
+ * @param[out] outdata расшифрованный текст
+ * @param[in] length длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_cbc(void *ctx, unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief ( )
+/** @brief Выполнение шифрования (зашифрования или расшифрования) в режиме гаммирования
*
- * @param[in] ctx CRT
- * @param[in] indata
- * @param[out] outdata
- * @param[in] length
- * @return 0
- * @return -1
+ * @param[in] ctx контекст CRT
+ * @param[in] indata входное сообщение
+ * @param[out] outdata результат
+ * @param[in] length длинна сообщения
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT crypt_crt(void *ctx, unsigned char *indata, unsigned char *outdata, size_t length);
-/** @brief
+/** @brief Выполнение шаговой шифрования информации в режиме гаммирования с обратной связью
*
- * @param[in] ctx OFB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] inlength
- * @return 0
- * @return -1
+ * @param[in] ctx контекст OFB
+ * @param[in] indata входной блок
+ * @param[out] outdata результат преобразования
+ * @param[in] inlength длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT crypt_ofb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief
+/** @brief Выполнение зашифрования информации в режиме гаммирования с обратной связью
*
- * @param[in] ctx OFB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] inlength
- * @return 0
- * @return -1
+ * @param[in] ctx контекст OFB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] inlength длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_ofb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief
+/** @brief Выполнение расшифрования информации в режиме гаммирования с обратной связью
*
- * @param[in] ctx OFB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] inlength
- * @return 0
- * @return -1
+ * @param[in] ctx контекст OFB
+ * @param[in] indata зашифрованный текст
+ * @param[out] outdata расшифрованный текст
+ * @param[in] inlength длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_ofb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief
+/** @brief Выполнение зашифрования информации в режиме гаммирования с обратной связью по шифртексту
*
- * @param[in] ctx CFB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] inlength
- * @return 0
- * @return -1
+ * @param[in] ctx контекст CFB
+ * @param[in] indata открытый текст
+ * @param[out] outdata зашифрованный текст
+ * @param[in] inlength длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT encrypt_cfb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief
+/** @brief Выполнение расшифрования информации в режиме гаммирования с обратной связью по шифртексту
*
- * @param[in] ctx CFB
- * @param[in] indata
- * @param[out] outdata
- * @param[in] inlength
- * @return 0
- * @return -1
+ * @param[in] ctx контекст CFB
+ * @param[in] indata зашифрованный текст
+ * @param[out] outdata расшифрованный текст
+ * @param[in] inlength длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT decrypt_cfb(void *ctx, unsigned char *indata, unsigned char *outdata, size_t inlength);
-/** @brief
+/** @brief Выполнение вычисления имитовставки по данным кратным размеру блока
*
- * @param[in] ctx
- * @param[in] indata
- * @param[in] length
- * @return 0
- * @return -1
+ * @param[in] ctx контекст имитовставки
+ * @param[in] indata открытый текст
+ * @param[in] length длинна текста
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT imit(void *ctx, unsigned char *indata, size_t length);
-/** @brief
+/** @brief Завершение выроботки имитовставки
*
- * @param[in] ctx
+ * @param[in] ctx контекст имитовставки
* @param[out] value
- * @return 0
- * @return -1
+ * @return 0 если все преобразование прошло успешно
+ * @return -1 если произошла ошибка
*/
int DLL_IMPORT done_imit(void *ctx, unsigned char *value);
-/** @brief .
+/** @brief Дополнение данных до размера блока.
*
- * @param[in] data . data , .
- * @param[in] length
- * @param[in] blockLen
- * @return
+ * @param[in] data сообщение. Память под данные data должна быть выделена, достаточная для дополнения.
+ * @param[in] length размер сообщения
+ * @param[in] blockLen длинна блока
+ * @return размер сообщения
*/
int DLL_IMPORT padd(unsigned char *data, size_t length, size_t blockLen);
-/** @brief . -1
+/** @brief Удаление дополненных данных. При ошибках возвращается значение -1
*
- * @param[in] data
- * @param[in] length
- * @return
+ * @param[in] data сообщение
+ * @param[in] length размер сообщения
+ * @return размер сообщения
*/
int DLL_IMPORT unpadd(unsigned char *data, size_t length);
diff --git a/plugins/Kuzne4ikCrypt/src/GOST/table.h b/plugins/Kuzne4ikCrypt/src/GOST/table.h index c839240ad1..082e2afc00 100644 --- a/plugins/Kuzne4ikCrypt/src/GOST/table.h +++ b/plugins/Kuzne4ikCrypt/src/GOST/table.h @@ -1,7 +1,7 @@ #ifndef TABLE_H
#define TABLE_H
-/** @brief */
+/** @brief таблица для умножения */
static const unsigned char multTable[] =
{
0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
diff --git a/plugins/Kuzne4ikCrypt/src/version.h b/plugins/Kuzne4ikCrypt/src/version.h index c9bbc09e57..4603c35674 100644 --- a/plugins/Kuzne4ikCrypt/src/version.h +++ b/plugins/Kuzne4ikCrypt/src/version.h @@ -9,4 +9,4 @@ #define __AUTHOR "Miranda NG Development Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p//"
-#define __COPYRIGHT " 2016-17 Miranda NG Development Team"
+#define __COPYRIGHT "© 2016-17 Miranda NG Development Team"
diff --git a/plugins/ListeningTo/src/version.h b/plugins/ListeningTo/src/version.h index 20920e804c..95b6a13741 100644 --- a/plugins/ListeningTo/src/version.h +++ b/plugins/ListeningTo/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/ListeningTo/" -#define __COPYRIGHT " 2006-2009 Ricardo Pescuma Domenecci" +#define __COPYRIGHT "© 2006-2009 Ricardo Pescuma Domenecci" diff --git a/plugins/LotusNotify/src/version.h b/plugins/LotusNotify/src/version.h index b52a72b602..fc759fffe4 100644 --- a/plugins/LotusNotify/src/version.h +++ b/plugins/LotusNotify/src/version.h @@ -12,5 +12,5 @@ #define __AUTHOR "MaKaRSoFT - http://maciej.wycik.pl/miranda"
#define __AUTHOREMAIL "makar@poczta.of.pl"
#define __AUTHORWEB "https://miranda-ng.org/p/LotusNotify/"
-#define __COPYRIGHT " 2006 MaKaRSoFT, 2013 wsx22, 2015 pepinlebref"
+#define __COPYRIGHT "© 2006 MaKaRSoFT, 2013 wsx22, 2015 pepinlebref"
#define __LEGALTRADEMARKS "Freeware"
diff --git a/plugins/MenuItemEx/src/version.h b/plugins/MenuItemEx/src/version.h index b93180a4dc..390e31788d 100644 --- a/plugins/MenuItemEx/src/version.h +++ b/plugins/MenuItemEx/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Heiko Schillinger, Baloo, Billy_Bons, Robert P\xf6" "sel"
#define __AUTHOREMAIL "micron@nexgo.de; baloo@bk.ru; tatarinov.sergey@gmail.com; robyer@seznam.cz"
#define __AUTHORWEB "https://miranda-ng.org/p/MenuEx/"
-#define __COPYRIGHT " 2001-03 Heiko Schillinger, 2006-08 Baloo, 2009-10 Billy_Bons, 2011-13 Robert P\xf6" "sel"
+#define __COPYRIGHT "© 2001-03 Heiko Schillinger, © 2006-08 Baloo, © 2009-10 Billy_Bons, © 2011-13 Robert P\xf6" "sel"
diff --git a/plugins/MessageState/src/version.h b/plugins/MessageState/src/version.h index 6de8605936..fea0d8d59f 100644 --- a/plugins/MessageState/src/version.h +++ b/plugins/MessageState/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "MikalaiR"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/MessageState/"
-#define __COPYRIGHT " 2015-17 Miranda NG Team"
+#define __COPYRIGHT "© 2015-17 Miranda NG Team"
diff --git a/plugins/MimCmd/src/MimCmd.cpp b/plugins/MimCmd/src/MimCmd.cpp index 88d2dcd2db..14f8667b0c 100644 --- a/plugins/MimCmd/src/MimCmd.cpp +++ b/plugins/MimCmd/src/MimCmd.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MimCmd/src/commands.cpp b/plugins/MimCmd/src/commands.cpp index db79ddbe7c..4d11c66f24 100644 --- a/plugins/MimCmd/src/commands.cpp +++ b/plugins/MimCmd/src/commands.cpp @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MimCmd/src/commands.h b/plugins/MimCmd/src/commands.h index 4c60b49565..2bd0f74a06 100644 --- a/plugins/MimCmd/src/commands.h +++ b/plugins/MimCmd/src/commands.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MimCmd/src/stdafx.h b/plugins/MimCmd/src/stdafx.h index e56c664f1d..51c2476f62 100644 --- a/plugins/MimCmd/src/stdafx.h +++ b/plugins/MimCmd/src/stdafx.h @@ -1,7 +1,7 @@ /*
CmdLine plugin for Miranda IM
-Copyright 2007 Cristian Libotean
+Copyright © 2007 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/MimCmd/src/version.h b/plugins/MimCmd/src/version.h index 330ad3abe3..319023d290 100644 --- a/plugins/MimCmd/src/version.h +++ b/plugins/MimCmd/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Cristian Libotean"
#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/CmdLine/"
-#define __COPYRIGHT " 2007-2011 Cristian Libotean"
+#define __COPYRIGHT "© 2007-2011 Cristian Libotean"
diff --git a/plugins/MirFox/src/version.h b/plugins/MirFox/src/version.h index 7e3c40eca8..7f9f2df000 100644 --- a/plugins/MirFox/src/version.h +++ b/plugins/MirFox/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Szymon Tokarz"
#define __AUTHOREMAIL "wsx22@o2.pl"
#define __AUTHORWEB "https://miranda-ng.org/p/MirFox/"
-#define __COPYRIGHT " 2013 - 2017 Szymon Tokarz"
+#define __COPYRIGHT "© 2013 - 2017 Szymon Tokarz"
diff --git a/plugins/MirLua/src/version.h b/plugins/MirLua/src/version.h index 3ea196a357..1525666f2a 100644 --- a/plugins/MirLua/src/version.h +++ b/plugins/MirLua/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/MirLua/"
-#define __COPYRIGHT " 2015-17 Miranda NG project"
+#define __COPYRIGHT "© 2015-17 Miranda NG project"
diff --git a/plugins/MirOTR/Libgpg-error/versioninfo.rc b/plugins/MirOTR/Libgpg-error/versioninfo.rc index 214accd298..617bb335b3 100644 --- a/plugins/MirOTR/Libgpg-error/versioninfo.rc +++ b/plugins/MirOTR/Libgpg-error/versioninfo.rc @@ -39,7 +39,7 @@ BEGIN VALUE "FileDescription", "libgpg-error - Common error codes\0" VALUE "FileVersion", "14.14.0.f796885\0" VALUE "InternalName", "libgpg-error\0" - VALUE "LegalCopyright", "Copyright 2013 g10 Code GmbH\0" + VALUE "LegalCopyright", "Copyright © 2013 g10 Code GmbH\0" VALUE "LegalTrademarks", "\0" VALUE "OriginalFilename", "libgpg-error.dll\0" VALUE "PrivateBuild", "\0" diff --git a/plugins/MirOTR/src/dllmain.cpp b/plugins/MirOTR/src/dllmain.cpp index 936bca86c9..5555ab7c8a 100644 --- a/plugins/MirOTR/src/dllmain.cpp +++ b/plugins/MirOTR/src/dllmain.cpp @@ -1,4 +1,4 @@ -// dllmain.cpp : Definiert den Einstiegspunkt fr die DLL-Anwendung.
+// dllmain.cpp : Definiert den Einstiegspunkt fьr die DLL-Anwendung.
#include "stdafx.h"
CLIST_INTERFACE *pcli;
diff --git a/plugins/MirOTR/src/stdafx.cpp b/plugins/MirOTR/src/stdafx.cpp index ade275910d..c64355fc05 100644 --- a/plugins/MirOTR/src/stdafx.cpp +++ b/plugins/MirOTR/src/stdafx.cpp @@ -1,5 +1,5 @@ // stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet. // MirOTR.pch ist der vorkompilierte Header. -// stdafx.obj enthlt die vorkompilierten Typinformationen. +// stdafx.obj enthдlt die vorkompilierten Typinformationen. #include "stdafx.h" diff --git a/plugins/MirOTR/src/stdafx.h b/plugins/MirOTR/src/stdafx.h index 4b3e232006..b78ae9d68c 100644 --- a/plugins/MirOTR/src/stdafx.h +++ b/plugins/MirOTR/src/stdafx.h @@ -1,6 +1,6 @@ -// stdafx.h : Includedatei fr Standardsystem-Includedateien
-// oder hufig verwendete projektspezifische Includedateien,
-// die nur in unregelmigen Abstnden gendert werden.
+// stdafx.h : Includedatei fьr Standardsystem-Includedateien
+// oder hдufig verwendete projektspezifische Includedateien,
+// die nur in unregelmдЯigen Abstдnden geдndert werden.
//
#pragma once
diff --git a/plugins/MirOTR/src/version.h b/plugins/MirOTR/src/version.h index cf04b52880..275fa1166b 100644 --- a/plugins/MirOTR/src/version.h +++ b/plugins/MirOTR/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "ProgAndy & CHEF-KOCH"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/MirOTR/"
-#define __COPYRIGHT " ProgAndy & CHEF-KOCH"
+#define __COPYRIGHT "© ProgAndy & CHEF-KOCH"
diff --git a/plugins/MirandaG15/src/CScreen.cpp b/plugins/MirandaG15/src/CScreen.cpp index 3ba1fb845b..08ed7cb155 100644 --- a/plugins/MirandaG15/src/CScreen.cpp +++ b/plugins/MirandaG15/src/CScreen.cpp @@ -47,7 +47,7 @@ bool CScreen::Initialize() m_Clock.SetSize(40,2);
m_Clock.SetText(L"23:00 - ");
- m_Clock.SetFontFaceName(L"Small Fonts");//Digital Limit 33 C"));
+ m_Clock.SetFontFaceName(L"Small Fonts");//Digital Limit 3х3 C"));
m_Clock.SetFontPointSize(10);
//m_Clock.SetFont(CConfig::GetFont(FONT_CLIST));
diff --git a/plugins/MirandaG15/src/LCDFramework/ConStream.cpp b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp Binary files differindex 88b2510e1f..4c09b830ac 100644 --- a/plugins/MirandaG15/src/LCDFramework/ConStream.cpp +++ b/plugins/MirandaG15/src/LCDFramework/ConStream.cpp diff --git a/plugins/MirandaG15/src/LCDFramework/ConStream.h b/plugins/MirandaG15/src/LCDFramework/ConStream.h Binary files differindex 78664316e8..de5da1643d 100644 --- a/plugins/MirandaG15/src/LCDFramework/ConStream.h +++ b/plugins/MirandaG15/src/LCDFramework/ConStream.h diff --git a/plugins/MirandaG15/src/LCDFramework/hid/hidpi.h b/plugins/MirandaG15/src/LCDFramework/hid/hidpi.h index f3c12b71fd..40650cbf7a 100644 --- a/plugins/MirandaG15/src/LCDFramework/hid/hidpi.h +++ b/plugins/MirandaG15/src/LCDFramework/hid/hidpi.h @@ -269,8 +269,8 @@ Arguments: Capabilities a HIDP_CAPS structure
Return Value:
- HIDP_STATUS_SUCCESS
- HIDP_STATUS_INVALID_PREPARSED_DATA
+· HIDP_STATUS_SUCCESS
+· HIDP_STATUS_INVALID_PREPARSED_DATA
--*/
NTSTATUS __stdcall
@@ -340,8 +340,8 @@ Parameters: Return Value
HidP_GetButtonCaps returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_BUFFER_TOO_SMALL
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_BUFFER_TOO_SMALL
--*/
@@ -387,8 +387,8 @@ Parameters: Return Value
HidP_GetValueCaps returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_BUFFER_TOO_SMALL (all given entries however have been filled in)
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_BUFFER_TOO_SMALL (all given entries however have been filled in)
--*/
@@ -414,13 +414,13 @@ Return Value HidP_SetData returns the following error codes. Upon an error the report
packet is in an unknown state.
- HIDP_STATUS_SUCCESS upon successful insertion of usages into the report packet.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if there exists a byte in the usage list for
+· HIDP_STATUS_SUCCESS upon successful insertion of usages into the report packet.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if there exists a byte in the usage list for
which there is no corresponding control.
- HIDP_STATUS_INVALID_REPORT_LENGTH the length of the report packet is not the
+· HIDP_STATUS_INVALID_REPORT_LENGTH the length of the report packet is not the
size expected.
- HIDP_STATUS_BUFFER_TOO_SMALL if there are not enough entries in a given Main
+· HIDP_STATUS_BUFFER_TOO_SMALL if there are not enough entries in a given Main
Array Item to list all of the given usages. The user needs
to split his request to set usages up.
--*/
@@ -497,7 +497,7 @@ Routine Description: This function sets binary values (buttons) in the report. Given an
initialized packet of correct length, it modifies the report packet so that
each element in the given list of usages has been set in the report packet.
- For example, in an output report with 5 LEDs, each with a given usage,
+ For example, in an output report with 5 LED’s, each with a given usage,
an application could turn on any subset of these lights by placing their
usages in any order into the byte array (usageList). HidP_SetUsage would,
in turn, set the appropriate bit or add the corresponding byte into the
@@ -539,13 +539,13 @@ Return Value HidP_SetUsage returns the following error codes. Upon an error the report
packet is in an unknown state.
- HIDP_STATUS_SUCCESS upon successful insertion of usages into the report packet.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if there exists a byte in the usage list for
+· HIDP_STATUS_SUCCESS upon successful insertion of usages into the report packet.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if there exists a byte in the usage list for
which there is no corresponding control.
- HIDP_STATUS_INVALID_REPORT_LENGTH the length of the report packet is not the
+· HIDP_STATUS_INVALID_REPORT_LENGTH the length of the report packet is not the
size expected.
- HIDP_STATUS_BUFFER_TOO_SMALL if there are not enough entries in a given Main
+· HIDP_STATUS_BUFFER_TOO_SMALL if there are not enough entries in a given Main
Array Item to list all of the given usages. The user needs
to split his request to set usages up.
--*/
@@ -570,7 +570,7 @@ Routine Description: This function sets binary values (buttons) in the report. Given an
initialized packet of correct length, it modifies the report packet so that
each element in the given list of usages has been set in the report packet.
- For example, in an output report with 5 LEDs, each with a given usage,
+ For example, in an output report with 5 LED’s, each with a given usage,
an application could turn on any subset of these lights by placing their
usages in any order into the byte array (usageList). HidP_SetUsage would,
in turn, set the appropriate bit or add the corresponding byte into the
@@ -612,13 +612,13 @@ Return Value HidP_SetUsage returns the following error codes. Upon an error the report
packet is in an unknown state.
- HIDP_STATUS_SUCCESS upon successful insertion of usages into the report packet.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if there exists a byte in the usage list for
+· HIDP_STATUS_SUCCESS upon successful insertion of usages into the report packet.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if there exists a byte in the usage list for
which there is no corresponding control.
- HIDP_STATUS_INVALID_REPORT_LENGTH the length of the report packet is not the
+· HIDP_STATUS_INVALID_REPORT_LENGTH the length of the report packet is not the
size expected.
- HIDP_STATUS_BUFFER_TOO_SMALL if there are not enough entries in a given Main
+· HIDP_STATUS_BUFFER_TOO_SMALL if there are not enough entries in a given Main
Array Item to list all of the given usages. The user needs
to split his request to set usages up.
--*/
@@ -673,16 +673,16 @@ Parameters: Return Value
HidpGetUsage returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if no control for this device matches the given
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if no control for this device matches the given
usagePage.
- HIDP_STATUS_BUFFER_TOO_SMALL if the given usageList is not long enough to
+· HIDP_STATUS_BUFFER_TOO_SMALL if the given usageList is not long enough to
hold the usages found in the given report packet.
HidP_MaxUsageListLength should be used to prevent
this error.
- HIDP_STATUS_INVALID_PREPARSED_DATA if the given preparsed data is invalid
- HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
+· HIDP_STATUS_INVALID_PREPARSED_DATA if the given preparsed data is invalid
+· HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
the size expected.
--*/
@@ -729,15 +729,15 @@ Parameters: Return Value
HidpGetUsage returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if no button controls are found for this device.
- HIDP_STATUS_BUFFER_TOO_SMALL if the given usageList is not long enough to
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if no button controls are found for this device.
+· HIDP_STATUS_BUFFER_TOO_SMALL if the given usageList is not long enough to
hold the usages found in the given report packet.
HidP_MaxUsageListLength should be used to prevent
this error.
- HIDP_STATUS_INVALID_PREPARSED_DATA if the given preparsed data is invalid
- HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
+· HIDP_STATUS_INVALID_PREPARSED_DATA if the given preparsed data is invalid
+· HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
the size expected.
--*/
@@ -822,12 +822,12 @@ Parameters: Return Value:
HidpSetUsageValue returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
control on the device, or if it refers to a button
style control.
- HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
+· HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
the size expected given the HIDP_CHANNELS structure.
--*/
@@ -882,18 +882,18 @@ Parameters: Return Value:
HidpSetUsageValue returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
control on the device, or if it refers to a button
style control.
- HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
+· HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is not
the size expected given the HIDP_CHANNELS structure.
- HIDP_STATUS_VALUE_OUT_OF_RANGE The physical value given was out of range,
+· HIDP_STATUS_VALUE_OUT_OF_RANGE The physical value given was out of range,
but this field does not accept null values. In this
case the field remains unchanged.
- HIDP_STATUS_BAD_LOG_PHY_VALUES
- HIDP_STATUS_NULL A null value was written into the field, because the
+· HIDP_STATUS_BAD_LOG_PHY_VALUES
+· HIDP_STATUS_NULL A null value was written into the field, because the
physical value given was out of range and this field
supports null values. The value written was outside the
range of LogicalMin and LogicalMax and is specifically
@@ -1010,12 +1010,12 @@ Parameters: Return Value:
HidpSetUsageValue returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
control on the device, or if it refers to a button
style control.
- HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is
+· HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is
not the size expected given the HIDP_CHANNELS structure.
--*/
@@ -1070,16 +1070,16 @@ Parameters: Return Value:
HidpSetUsageValue returns the following error codes:
- HIDP_STATUS_SUCCESS.
- HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
- HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
+· HIDP_STATUS_SUCCESS.
+· HIDP_STATUS_INVALID_REPORT_TYPE if reportType is not valid.
+· HIDP_STATUS_USAGE_NOT_FOUND if the given usage does not correspond to a
control on the device, or if it refers to a button
style control.
- HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is
+· HIDP_STATUS_INVALID_REPORT_LENGTH if the length of the report packet is
not the size expected given the HIDP_CHANNELS structure.
- HIDP_STATUS_VALUE_OUT_OF_RANGE
- HIDP_STATUS_BAD_LOG_PHY_VALUES
- HIDP_STATUS_NULL
+· HIDP_STATUS_VALUE_OUT_OF_RANGE
+· HIDP_STATUS_BAD_LOG_PHY_VALUES
+· HIDP_STATUS_NULL
--*/
NTSTATUS __stdcall
diff --git a/plugins/MirandaG15/src/version.h b/plugins/MirandaG15/src/version.h index 6ab7be4d6d..3095c901db 100644 --- a/plugins/MirandaG15/src/version.h +++ b/plugins/MirandaG15/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Martin Kleinhans" #define __AUTHOREMAIL "mail@mkleinhans.de" #define __AUTHORWEB "https://miranda-ng.org/p/MirandaG15/" -#define __COPYRIGHT " 2009 Martin Kleinhans" +#define __COPYRIGHT "© 2009 Martin Kleinhans" diff --git a/plugins/MobileState/src/clients.h b/plugins/MobileState/src/clients.h index 829dbf4b45..ae9de5cf65 100644 --- a/plugins/MobileState/src/clients.h +++ b/plugins/MobileState/src/clients.h @@ -1,6 +1,6 @@ /*
Mobile State plugin for Miranda NG (www.miranda-ng.org)
- (c) 2012-17 by Robert Psel
+ (c) 2012-17 by Robert Pцsel
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
diff --git a/plugins/MobileState/src/main.cpp b/plugins/MobileState/src/main.cpp index 371a802cce..aa38c3bcb4 100644 --- a/plugins/MobileState/src/main.cpp +++ b/plugins/MobileState/src/main.cpp @@ -1,6 +1,6 @@ /*
Mobile State plugin for Miranda NG (www.miranda-ng.org)
- (c) 2012-17 by Robert Psel
+ (c) 2012-17 by Robert Pцsel
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
diff --git a/plugins/MobileState/src/stdafx.h b/plugins/MobileState/src/stdafx.h index e2d9a46b90..0b24722e68 100644 --- a/plugins/MobileState/src/stdafx.h +++ b/plugins/MobileState/src/stdafx.h @@ -1,6 +1,6 @@ /*
Mobile State plugin for Miranda NG (www.miranda-ng.org)
- (c) 2012-17 by Robert Psel
+ (c) 2012-17 by Robert Pцsel
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
diff --git a/plugins/MobileState/src/version.h b/plugins/MobileState/src/version.h index 582e75f0b7..be73529a9a 100644 --- a/plugins/MobileState/src/version.h +++ b/plugins/MobileState/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Robert P\xf6" "sel"
#define __AUTHOREMAIL "robyer@seznam.cz"
#define __AUTHORWEB "https://miranda-ng.org/p/MobileState/"
-#define __COPYRIGHT " 2012-17 Robert P\xf6" "sel"
+#define __COPYRIGHT "© 2012-17 Robert P\xf6" "sel"
diff --git a/plugins/MsgPopup/src/version.h b/plugins/MsgPopup/src/version.h index 863eadf49d..54379e6606 100644 --- a/plugins/MsgPopup/src/version.h +++ b/plugins/MsgPopup/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "StDenis" #define __AUTHOREMAIL "stdenformiranda@fromru.com" #define __AUTHORWEB "https://miranda-ng.org/p/MsgPopup/" -#define __COPYRIGHT " 2004 Denis Stanishevskiy" +#define __COPYRIGHT "© 2004 Denis Stanishevskiy" diff --git a/plugins/Msg_Export/src/main.cpp b/plugins/Msg_Export/src/main.cpp index e4b7fcaf51..333029e5f1 100755 --- a/plugins/Msg_Export/src/main.cpp +++ b/plugins/Msg_Export/src/main.cpp @@ -208,12 +208,12 @@ extern "C" __declspec(dllexport) int Load() enRenameAction = (ENDialogAction)db_get_b(NULL, MODULE, "RenameAction", enRenameAction);
enDeleteAction = (ENDialogAction)db_get_b(NULL, MODULE, "DeleteAction", enDeleteAction);
- HANDLE hServiceFun = nullptr;
+ HANDLE hServiceFunс = nullptr;
if (bReplaceHistory)
- hServiceFun = CreateServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY, ShowExportHistory); //this need new code
+ hServiceFunс = CreateServiceFunction(MS_HISTORY_SHOWCONTACTHISTORY, ShowExportHistory); //this need new code
- if (!hServiceFun)
- hServiceFun = CreateServiceFunction(MS_SHOW_EXPORT_HISTORY, ShowExportHistory);
+ if (!hServiceFunс)
+ hServiceFunс = CreateServiceFunction(MS_SHOW_EXPORT_HISTORY, ShowExportHistory);
hInternalWindowList = WindowList_Create();
return 0;
diff --git a/plugins/Msg_Export/src/version.h b/plugins/Msg_Export/src/version.h index 098c30c578..cb04f386aa 100644 --- a/plugins/Msg_Export/src/version.h +++ b/plugins/Msg_Export/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Kennet Nielsen, mod by ring0" #define __AUTHOREMAIL "Kennet_N@ofir.dk" #define __AUTHORWEB "https://miranda-ng.org/p/Msg_Export/" -#define __COPYRIGHT " 2002 Kennet Nielsen, 2012-17 Miranda NG Team" +#define __COPYRIGHT "© 2002 Kennet Nielsen, 2012-17 Miranda NG Team" diff --git a/plugins/MyDetails/src/version.h b/plugins/MyDetails/src/version.h index 6df49adf2f..c621144e1a 100644 --- a/plugins/MyDetails/src/version.h +++ b/plugins/MyDetails/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci, Drugwash" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/MyDetails/" -#define __COPYRIGHT " 2005-2008 Ricardo Pescuma Domenecci, Drugwash" +#define __COPYRIGHT "© 2005-2008 Ricardo Pescuma Domenecci, Drugwash" diff --git a/plugins/NewAwaySysMod/src/version.h b/plugins/NewAwaySysMod/src/version.h index 5726b56610..0058c6b912 100644 --- a/plugins/NewAwaySysMod/src/version.h +++ b/plugins/NewAwaySysMod/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "NightFox, Deathdemon, XF007, Goblineye Entertainment"
#define __AUTHOREMAIL "NightFox@myied.org"
#define __AUTHORWEB "https://miranda-ng.org/p/NewAwaySys/"
-#define __COPYRIGHT " 2010 NightFox; 2005-2007 Chervov Dmitry; 2004-2005 Iksaif; 2002-2003 Goblineye Entertainment"
+#define __COPYRIGHT "© 2010 NightFox; © 2005-2007 Chervov Dmitry; © 2004-2005 Iksaif; © 2002-2003 Goblineye Entertainment"
diff --git a/plugins/NewXstatusNotify/src/version.h b/plugins/NewXstatusNotify/src/version.h index 7633867e1a..afc55f67f3 100644 --- a/plugins/NewXstatusNotify/src/version.h +++ b/plugins/NewXstatusNotify/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Luca Santarelli, Vasilich, yaho"
#define __AUTHOREMAIL "yaho@miranda-easy.net"
#define __AUTHORWEB "https://miranda-ng.org/p/NewXstatusNotify/"
-#define __COPYRIGHT " 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho"
+#define __COPYRIGHT "© 2001-2004 Luca Santarelli, 2005-2007 Vasilich, 2007-2011 yaho"
diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc index 29d01ff20c..86e2da7969 100644 --- a/plugins/New_GPG/res/new_gpg.rc +++ b/plugins/New_GPG/res/new_gpg.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -403,7 +403,7 @@ IDI_SECURED ICON "secured.ico" IDI_UNSECURED ICON "unsecured.ico"
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/New_GPG/src/clist.cpp b/plugins/New_GPG/src/clist.cpp index 0c27067479..4dba48a024 100644 --- a/plugins/New_GPG/src/clist.cpp +++ b/plugins/New_GPG/src/clist.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 SecureIM developers (baloo and others), sss
+// Copyright © 2010-2012 SecureIM developers (baloo and others), sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/globals.h b/plugins/New_GPG/src/globals.h index 4a8c6f2cb5..e289fa8f0b 100644 --- a/plugins/New_GPG/src/globals.h +++ b/plugins/New_GPG/src/globals.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/gpg_wrapper.cpp b/plugins/New_GPG/src/gpg_wrapper.cpp index 5b2b319fa4..b9be29422c 100755 --- a/plugins/New_GPG/src/gpg_wrapper.cpp +++ b/plugins/New_GPG/src/gpg_wrapper.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/plugins/New_GPG/src/gpg_wrapper.h b/plugins/New_GPG/src/gpg_wrapper.h index a867553462..1328e02feb 100644 --- a/plugins/New_GPG/src/gpg_wrapper.h +++ b/plugins/New_GPG/src/gpg_wrapper.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/plugins/New_GPG/src/icons.cpp b/plugins/New_GPG/src/icons.cpp index 8111d29887..bb680e34cb 100644 --- a/plugins/New_GPG/src/icons.cpp +++ b/plugins/New_GPG/src/icons.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 SecureIM developers (baloo and others), sss
+// Copyright © 2010-2012 SecureIM developers (baloo and others), sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp index 27bfb72b0f..f46c266d09 100644 --- a/plugins/New_GPG/src/init.cpp +++ b/plugins/New_GPG/src/init.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/jabber_account.cpp b/plugins/New_GPG/src/jabber_account.cpp index c8fe82d0e9..7aaf562bdf 100644 --- a/plugins/New_GPG/src/jabber_account.cpp +++ b/plugins/New_GPG/src/jabber_account.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/jabber_account.h b/plugins/New_GPG/src/jabber_account.h index 8086c0ea6a..c29003d612 100644 --- a/plugins/New_GPG/src/jabber_account.h +++ b/plugins/New_GPG/src/jabber_account.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/log.cpp b/plugins/New_GPG/src/log.cpp index 675589111d..a1927e4274 100644 --- a/plugins/New_GPG/src/log.cpp +++ b/plugins/New_GPG/src/log.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/log.h b/plugins/New_GPG/src/log.h index 9bb7a0dae9..effd8a5941 100644 --- a/plugins/New_GPG/src/log.h +++ b/plugins/New_GPG/src/log.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/plugins/New_GPG/src/main.cpp b/plugins/New_GPG/src/main.cpp index 48bc61e07d..26f56ed27f 100755 --- a/plugins/New_GPG/src/main.cpp +++ b/plugins/New_GPG/src/main.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -2163,7 +2163,7 @@ void ImportKey() string::size_type s = output.find("gpg: key ") + mir_strlen("gpg: key "); string::size_type s2 = output.find(":", s); db_set_s(hcnt, szGPGModuleName, "KeyID", output.substr(s, s2 - s).c_str()); - s = output.find("“", s2); + s = output.find("“", s2); if (s == string::npos) { s = output.find("\"", s2); s += 1; @@ -2173,7 +2173,7 @@ void ImportKey() bool uncommon = false; if ((s2 = output.find("(", s)) == string::npos) { if ((s2 = output.find("<", s)) == string::npos) { - s2 = output.find("”", s); + s2 = output.find("”", s); uncommon = true; } } @@ -2226,7 +2226,7 @@ void ImportKey() string::size_type s = output.find("gpg: key ") + mir_strlen("gpg: key "); string::size_type s2 = output.find(":", s); db_set_s(metaGetMostOnline(hContact), szGPGModuleName, "KeyID", output.substr(s, s2 - s).c_str()); - s = output.find("“", s2); + s = output.find("“", s2); if (s == string::npos) { s = output.find("\"", s2); s += 1; @@ -2236,7 +2236,7 @@ void ImportKey() bool uncommon = false; if ((s2 = output.find("(", s)) == string::npos) { if ((s2 = output.find("<", s)) == string::npos) { - s2 = output.find("”", s); + s2 = output.find("”", s); uncommon = true; } } @@ -2287,7 +2287,7 @@ void ImportKey() string::size_type s = output.find("gpg: key ") + mir_strlen("gpg: key "); string::size_type s2 = output.find(":", s); db_set_s(hContact, szGPGModuleName, "KeyID", output.substr(s, s2 - s).c_str()); - s = output.find("“", s2); + s = output.find("“", s2); if (s == string::npos) { s = output.find("\"", s2); s += 1; @@ -2297,7 +2297,7 @@ void ImportKey() bool uncommon = false; if ((s2 = output.find("(", s)) == string::npos) { if ((s2 = output.find("<", s)) == string::npos) { - s2 = output.find("”", s); + s2 = output.find("”", s); uncommon = true; } } diff --git a/plugins/New_GPG/src/main.h b/plugins/New_GPG/src/main.h index 309d0a5857..d5c9a6c0a8 100644 --- a/plugins/New_GPG/src/main.h +++ b/plugins/New_GPG/src/main.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/messages.cpp b/plugins/New_GPG/src/messages.cpp index 62d33a8839..fd8dcaecf1 100755 --- a/plugins/New_GPG/src/messages.cpp +++ b/plugins/New_GPG/src/messages.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License @@ -491,7 +491,7 @@ INT_PTR RecvMsgSvc(WPARAM w, LPARAM l) s2 = output.find(":", s1); db_set_s(ccs->hContact, szGPGModuleName, "KeyID", output.substr(s1, s2 - s1).c_str()); s2 += 2; - s1 = output.find("“", s2); + s1 = output.find("“", s2); if (s1 == string::npos) { s1 = output.find("\"", s2); diff --git a/plugins/New_GPG/src/metacontacts.cpp b/plugins/New_GPG/src/metacontacts.cpp index 5de14098b4..8d433e6e6b 100644 --- a/plugins/New_GPG/src/metacontacts.cpp +++ b/plugins/New_GPG/src/metacontacts.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 SecureIM developers (baloo and others), sss
+// Copyright © 2010-2012 SecureIM developers (baloo and others), sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/metacontacts.h b/plugins/New_GPG/src/metacontacts.h index c0d2dd2b3b..30953dda5b 100644 --- a/plugins/New_GPG/src/metacontacts.h +++ b/plugins/New_GPG/src/metacontacts.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/srmm.cpp b/plugins/New_GPG/src/srmm.cpp index 5dd57c2b11..aacba98120 100644 --- a/plugins/New_GPG/src/srmm.cpp +++ b/plugins/New_GPG/src/srmm.cpp @@ -1,4 +1,4 @@ -// Copyright 2010-2012 SecureIM developers (baloo and others), sss
+// Copyright © 2010-2012 SecureIM developers (baloo and others), sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -37,7 +37,7 @@ int __cdecl onIconPressed(WPARAM wParam, LPARAM lParam) if(db_mc_isMeta(hContact))
{
hMeta = hContact;
- hContact = metaGetMostOnline(hContact); // ,
+ hContact = metaGetMostOnline(hContact); // возьмем тот, через который пойдет сообщение
}
else if(db_mc_isSub(hContact))
hMeta = db_mc_getMeta(hContact);
diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h index f3bc474f9d..70f999adeb 100644 --- a/plugins/New_GPG/src/stdafx.h +++ b/plugins/New_GPG/src/stdafx.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss +// Copyright © 2010-2012 sss // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/plugins/New_GPG/src/utilities.h b/plugins/New_GPG/src/utilities.h index c1840d274b..a27f6215c4 100644 --- a/plugins/New_GPG/src/utilities.h +++ b/plugins/New_GPG/src/utilities.h @@ -1,4 +1,4 @@ -// Copyright 2010-2012 sss
+// Copyright © 2010-2012 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/New_GPG/src/version.h b/plugins/New_GPG/src/version.h index d9b4997548..8c156b9a16 100755 --- a/plugins/New_GPG/src/version.h +++ b/plugins/New_GPG/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "sss" #define __AUTHOREMAIL "sss123next@list.ru" #define __AUTHORWEB "https://miranda-ng.org/p/New_GPG/" -#define __COPYRIGHT " 2010-17 sss" +#define __COPYRIGHT "© 2010-17 sss" diff --git a/plugins/NewsAggregator/Src/Utils.cpp b/plugins/NewsAggregator/Src/Utils.cpp index db6f67eab5..11725ae360 100644 --- a/plugins/NewsAggregator/Src/Utils.cpp +++ b/plugins/NewsAggregator/Src/Utils.cpp @@ -1,4 +1,4 @@ -/*
+/*
Copyright (C) 2012 Mataes
This is free software; you can redistribute it and/or
diff --git a/plugins/NewsAggregator/Src/version.h b/plugins/NewsAggregator/Src/version.h index 533a1f8735..b9197c3d5d 100644 --- a/plugins/NewsAggregator/Src/version.h +++ b/plugins/NewsAggregator/Src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Mataes, FREAK_THEMIGHTY" #define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/NewsAggregator/" -#define __COPYRIGHT " 2012-17 Mataes, FREAK_THEMIGHTY" +#define __COPYRIGHT "© 2012-17 Mataes, FREAK_THEMIGHTY" diff --git a/plugins/NewsAggregator/proto_newsaggregator/res/Proto_NewsAggregator.rc b/plugins/NewsAggregator/proto_newsaggregator/res/Proto_NewsAggregator.rc Binary files differindex 3eaac4e99b..22339493ab 100644 --- a/plugins/NewsAggregator/proto_newsaggregator/res/Proto_NewsAggregator.rc +++ b/plugins/NewsAggregator/proto_newsaggregator/res/Proto_NewsAggregator.rc diff --git a/plugins/NewsAggregator/proto_newsaggregator/src/resource.h b/plugins/NewsAggregator/proto_newsaggregator/src/resource.h Binary files differindex c6b804fd4e..f234a1cbb7 100644 --- a/plugins/NewsAggregator/proto_newsaggregator/src/resource.h +++ b/plugins/NewsAggregator/proto_newsaggregator/src/resource.h diff --git a/plugins/NoHistory/src/version.h b/plugins/NoHistory/src/version.h index fef7775c2c..31b68721b2 100644 --- a/plugins/NoHistory/src/version.h +++ b/plugins/NoHistory/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Scott Ellis, NightFox" #define __AUTHOREMAIL "mail@scottellis.com.au; nightfox@myied.org" #define __AUTHORWEB "https://miranda-ng.org/p/NoHistory/" -#define __COPYRIGHT " 2005 Scott Ellis, 2010-17 NightFox" +#define __COPYRIGHT "© 2005 Scott Ellis, 2010-17 NightFox" diff --git a/plugins/Non-IM Contact/src/version.h b/plugins/Non-IM Contact/src/version.h index 49d0d3fc11..a2e19e413a 100644 --- a/plugins/Non-IM Contact/src/version.h +++ b/plugins/Non-IM Contact/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Jonathan Gordon" #define __AUTHOREMAIL "ICQ 98791178, MSN jonnog@hotmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/NimContact/" -#define __COPYRIGHT " 2003-2004 Jonathan Gordon, jdgordy@gmail.com" +#define __COPYRIGHT "© 2003-2004 Jonathan Gordon, jdgordy@gmail.com" diff --git a/plugins/NotesAndReminders/src/version.h b/plugins/NotesAndReminders/src/version.h index 8bb3568757..295d18edec 100644 --- a/plugins/NotesAndReminders/src/version.h +++ b/plugins/NotesAndReminders/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Joe Kucera, Lubomir Kolev Ivanov, Georg Fischer" #define __AUTHOREMAIL "jokusoftware@users.sourceforge.net; d00mEr@dir.bg" #define __AUTHORWEB "https://miranda-ng.org/p/NotesAndReminders/" -#define __COPYRIGHT " 2003-2005 Joe Kucera, Lubomir Ivanov" +#define __COPYRIGHT "© 2003-2005 Joe Kucera, Lubomir Ivanov" diff --git a/plugins/NotifyAnything/src/version.h b/plugins/NotifyAnything/src/version.h index d5b9e4bc83..5e87c48eef 100644 --- a/plugins/NotifyAnything/src/version.h +++ b/plugins/NotifyAnything/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Daniel Wesslen, Korney San" #define __AUTHOREMAIL "wesslen@users.sourceforge.net, kora@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/NotifyAnything/" -#define __COPYRIGHT " 2003 Daniel Wesslen" +#define __COPYRIGHT "© 2003 Daniel Wesslen" diff --git a/plugins/Nudge/src/version.h b/plugins/Nudge/src/version.h index b0980dc1be..553c4efea7 100644 --- a/plugins/Nudge/src/version.h +++ b/plugins/Nudge/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Tweety/GouZ, FREAK_THEMIGHTY" #define __AUTHOREMAIL "francois.mean@skynet.be, Sylvain.gougouzian@gmail.com, wishmaster51@googlemail.com" #define __AUTHORWEB "https://miranda-ng.org/p/Nudge/" -#define __COPYRIGHT " the miranda community" +#define __COPYRIGHT "© the miranda community" diff --git a/plugins/OpenFolder/src/version.h b/plugins/OpenFolder/src/version.h index e9e11c1c12..05f208d2df 100644 --- a/plugins/OpenFolder/src/version.h +++ b/plugins/OpenFolder/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "jarvis, Kreisquadratur" #define __AUTHOREMAIL "jarvis@jabber.cz, djui@kreisquadratur.de" #define __AUTHORWEB "https://miranda-ng.org/p/OpenFolder/" -#define __COPYRIGHT " 2008 jarvis, 2004 Kreisquadratur" +#define __COPYRIGHT "© 2008 jarvis, © 2004 Kreisquadratur" diff --git a/plugins/OpenSSL/src/version.h b/plugins/OpenSSL/src/version.h index 58237f9912..6dff056a72 100644 --- a/plugins/OpenSSL/src/version.h +++ b/plugins/OpenSSL/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team" #define __AUTHOREMAIL "" #define __AUTHORWEB "" -#define __COPYRIGHT " 2014-17 Miranda NG Team" +#define __COPYRIGHT "© 2014-17 Miranda NG Team" diff --git a/plugins/PackUpdater/Res/Resource.rc b/plugins/PackUpdater/Res/Resource.rc index 2956f92717..c653b86b07 100644 --- a/plugins/PackUpdater/Res/Resource.rc +++ b/plugins/PackUpdater/Res/Resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -179,7 +179,7 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/PackUpdater/Src/Utils.cpp b/plugins/PackUpdater/Src/Utils.cpp index 036a782d3c..48ed3e42a0 100644 --- a/plugins/PackUpdater/Src/Utils.cpp +++ b/plugins/PackUpdater/Src/Utils.cpp @@ -285,7 +285,7 @@ static void CheckUpdates(void *) return;
} // user have not admin's rights
- //
+ //добавить проверку на существование файла
wchar_t tszFilePathDest[MAX_PATH] = { 0 };
switch (Files[CurrentFile].FileType) {
case 0:
diff --git a/plugins/PackUpdater/Src/version.h b/plugins/PackUpdater/Src/version.h index 31e5b76699..2823d340ee 100644 --- a/plugins/PackUpdater/Src/version.h +++ b/plugins/PackUpdater/Src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Mataes, ZERO_BiT" #define __AUTHOREMAIL "mataes2007@gmail.com, zero-bit@mail.ru" #define __AUTHORWEB "https://miranda-ng.org/p/PackUpdater/" -#define __COPYRIGHT " 2011-2017 Mataes, 2007 ZERO_BiT" +#define __COPYRIGHT "© 2011-2017 Mataes, 2007 ZERO_BiT" diff --git a/plugins/PasteIt/src/version.h b/plugins/PasteIt/src/version.h index fb174274d8..68de25f823 100644 --- a/plugins/PasteIt/src/version.h +++ b/plugins/PasteIt/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Krzysztof Kral"
#define __AUTHOREMAIL "programista@poczta.of.pl"
#define __AUTHORWEB "https://miranda-ng.org/p/PasteIt/"
-#define __COPYRIGHT " 2011 Krzysztof Kral"
+#define __COPYRIGHT "© 2011 Krzysztof Kral"
diff --git a/plugins/Ping/src/version.h b/plugins/Ping/src/version.h index fafe587d09..16ad496842 100644 --- a/plugins/Ping/src/version.h +++ b/plugins/Ping/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Scott Ellis" #define __AUTHOREMAIL "mail@scottellis.com.au" #define __AUTHORWEB "https://miranda-ng.org/p/Ping/" -#define __COPYRIGHT " 2005 Scott Ellis" +#define __COPYRIGHT "© 2005 Scott Ellis" diff --git a/plugins/PluginUpdater/src/version.h b/plugins/PluginUpdater/src/version.h index 3e8f5d8dc7..d3477ff6fd 100644 --- a/plugins/PluginUpdater/src/version.h +++ b/plugins/PluginUpdater/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Mataes, George Hazan" #define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/PluginUpdater/" -#define __COPYRIGHT " 2012-17 Mataes, George Hazan" +#define __COPYRIGHT "© 2012-17 Mataes, George Hazan" diff --git a/plugins/Popup/src/actions.cpp b/plugins/Popup/src/actions.cpp index d85a6269d4..9235521bec 100644 --- a/plugins/Popup/src/actions.cpp +++ b/plugins/Popup/src/actions.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/actions.h b/plugins/Popup/src/actions.h index 78e1a14a1d..bfdaf8591d 100644 --- a/plugins/Popup/src/actions.h +++ b/plugins/Popup/src/actions.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/avatars.h b/plugins/Popup/src/avatars.h index 52b708ca92..c9c38c3cd4 100644 --- a/plugins/Popup/src/avatars.h +++ b/plugins/Popup/src/avatars.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/avatars_flash.h b/plugins/Popup/src/avatars_flash.h index 7868e2c5cc..9678d84259 100644 --- a/plugins/Popup/src/avatars_flash.h +++ b/plugins/Popup/src/avatars_flash.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/avatars_gif.cpp b/plugins/Popup/src/avatars_gif.cpp index 3e8c257cc4..bfb5d63368 100644 --- a/plugins/Popup/src/avatars_gif.cpp +++ b/plugins/Popup/src/avatars_gif.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/avatars_gif.h b/plugins/Popup/src/avatars_gif.h index 07cf5e1a49..5dcdc85a24 100644 --- a/plugins/Popup/src/avatars_gif.h +++ b/plugins/Popup/src/avatars_gif.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/avatars_simple.cpp b/plugins/Popup/src/avatars_simple.cpp index 21ce9e0463..b32c05dc35 100644 --- a/plugins/Popup/src/avatars_simple.cpp +++ b/plugins/Popup/src/avatars_simple.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/avatars_simple.h b/plugins/Popup/src/avatars_simple.h index 490e1f403b..da92dca5df 100644 --- a/plugins/Popup/src/avatars_simple.h +++ b/plugins/Popup/src/avatars_simple.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/bitmap_funcs.cpp b/plugins/Popup/src/bitmap_funcs.cpp index 4ca3ef3bf2..5a07c757de 100644 --- a/plugins/Popup/src/bitmap_funcs.cpp +++ b/plugins/Popup/src/bitmap_funcs.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/bitmap_funcs.h b/plugins/Popup/src/bitmap_funcs.h index bc1ab377eb..6b8a4e2816 100644 --- a/plugins/Popup/src/bitmap_funcs.h +++ b/plugins/Popup/src/bitmap_funcs.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/common.h b/plugins/Popup/src/common.h index 8ce683b65f..ca632bac41 100644 --- a/plugins/Popup/src/common.h +++ b/plugins/Popup/src/common.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/config.h b/plugins/Popup/src/config.h index 34bc824053..07e9d6d86c 100644 --- a/plugins/Popup/src/config.h +++ b/plugins/Popup/src/config.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/def_settings.h b/plugins/Popup/src/def_settings.h index 6e2dd748d4..73c2425e63 100644 --- a/plugins/Popup/src/def_settings.h +++ b/plugins/Popup/src/def_settings.h @@ -1,8 +1,8 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/defs.h b/plugins/Popup/src/defs.h index 237148a222..43959f9b86 100644 --- a/plugins/Popup/src/defs.h +++ b/plugins/Popup/src/defs.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/effects.cpp b/plugins/Popup/src/effects.cpp index dfc8139d08..e73322d265 100644 --- a/plugins/Popup/src/effects.cpp +++ b/plugins/Popup/src/effects.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/effects.h b/plugins/Popup/src/effects.h index 57532caad9..d3ff4502ef 100644 --- a/plugins/Popup/src/effects.h +++ b/plugins/Popup/src/effects.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/font.cpp b/plugins/Popup/src/font.cpp index aaf022f2ec..7e8550038f 100644 --- a/plugins/Popup/src/font.cpp +++ b/plugins/Popup/src/font.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/font.h b/plugins/Popup/src/font.h index 8c14ee26e7..3975a53c88 100644 --- a/plugins/Popup/src/font.h +++ b/plugins/Popup/src/font.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/formula.cpp b/plugins/Popup/src/formula.cpp index 0151fb2c9b..f2748ae030 100644 --- a/plugins/Popup/src/formula.cpp +++ b/plugins/Popup/src/formula.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/formula.h b/plugins/Popup/src/formula.h index 65a9eae3ee..6de6ac625d 100644 --- a/plugins/Popup/src/formula.h +++ b/plugins/Popup/src/formula.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/history.cpp b/plugins/Popup/src/history.cpp index 860e777962..3bad370778 100644 --- a/plugins/Popup/src/history.cpp +++ b/plugins/Popup/src/history.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/history.h b/plugins/Popup/src/history.h index 58a7e73c6f..b4e28bfac2 100644 --- a/plugins/Popup/src/history.h +++ b/plugins/Popup/src/history.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/icons.cpp b/plugins/Popup/src/icons.cpp index fec8b0663d..297a9d982f 100644 --- a/plugins/Popup/src/icons.cpp +++ b/plugins/Popup/src/icons.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/icons.h b/plugins/Popup/src/icons.h index a418a3cc65..ad7ee64153 100644 --- a/plugins/Popup/src/icons.h +++ b/plugins/Popup/src/icons.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/notifications.cpp b/plugins/Popup/src/notifications.cpp index 09bd94e332..f5e904b3a4 100644 --- a/plugins/Popup/src/notifications.cpp +++ b/plugins/Popup/src/notifications.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/notifications.h b/plugins/Popup/src/notifications.h index 7155fb0239..041a83d78c 100644 --- a/plugins/Popup/src/notifications.h +++ b/plugins/Popup/src/notifications.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_adv.cpp b/plugins/Popup/src/opt_adv.cpp index 41f1d8ced4..f9d4f75f8e 100644 --- a/plugins/Popup/src/opt_adv.cpp +++ b/plugins/Popup/src/opt_adv.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_adv.h b/plugins/Popup/src/opt_adv.h index 6a0c1e66d1..d5ac6d128f 100644 --- a/plugins/Popup/src/opt_adv.h +++ b/plugins/Popup/src/opt_adv.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_class.cpp b/plugins/Popup/src/opt_class.cpp index 18905ee3aa..742bc2dbee 100644 --- a/plugins/Popup/src/opt_class.cpp +++ b/plugins/Popup/src/opt_class.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_class.h b/plugins/Popup/src/opt_class.h index 407dcf743e..905bc791fd 100644 --- a/plugins/Popup/src/opt_class.h +++ b/plugins/Popup/src/opt_class.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_contacts.cpp b/plugins/Popup/src/opt_contacts.cpp index ae183f15b8..0bb94612f6 100644 --- a/plugins/Popup/src/opt_contacts.cpp +++ b/plugins/Popup/src/opt_contacts.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_contacts.h b/plugins/Popup/src/opt_contacts.h index f65e495466..9e1309857f 100644 --- a/plugins/Popup/src/opt_contacts.h +++ b/plugins/Popup/src/opt_contacts.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_gen.h b/plugins/Popup/src/opt_gen.h index c0bd009a6e..f97d056306 100644 --- a/plugins/Popup/src/opt_gen.h +++ b/plugins/Popup/src/opt_gen.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_skins.cpp b/plugins/Popup/src/opt_skins.cpp index 925a7d2b5a..dc78a7bab8 100644 --- a/plugins/Popup/src/opt_skins.cpp +++ b/plugins/Popup/src/opt_skins.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opt_skins.h b/plugins/Popup/src/opt_skins.h index e6200d6e25..5711500501 100644 --- a/plugins/Popup/src/opt_skins.h +++ b/plugins/Popup/src/opt_skins.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opttree.cpp b/plugins/Popup/src/opttree.cpp index 1b5b4a8743..68a7a9ef7a 100644 --- a/plugins/Popup/src/opttree.cpp +++ b/plugins/Popup/src/opttree.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/opttree.h b/plugins/Popup/src/opttree.h index 77cea5d075..3dd63d3e0d 100644 --- a/plugins/Popup/src/opttree.h +++ b/plugins/Popup/src/opttree.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp index 54531432b6..1a5b462632 100644 --- a/plugins/Popup/src/popup_thread.cpp +++ b/plugins/Popup/src/popup_thread.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/popup_thread.h b/plugins/Popup/src/popup_thread.h index f56f5f1d1b..13cdae4466 100644 --- a/plugins/Popup/src/popup_thread.h +++ b/plugins/Popup/src/popup_thread.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/popup_wnd2.h b/plugins/Popup/src/popup_wnd2.h index 96bf23ff97..57061569ee 100644 --- a/plugins/Popup/src/popup_wnd2.h +++ b/plugins/Popup/src/popup_wnd2.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/services.cpp b/plugins/Popup/src/services.cpp index d4dcd4418e..f07534de09 100644 --- a/plugins/Popup/src/services.cpp +++ b/plugins/Popup/src/services.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/services.h b/plugins/Popup/src/services.h index 6851c26350..3e6a682a9e 100644 --- a/plugins/Popup/src/services.h +++ b/plugins/Popup/src/services.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/skin.h b/plugins/Popup/src/skin.h index 28726cbf28..8c903a9ca8 100644 --- a/plugins/Popup/src/skin.h +++ b/plugins/Popup/src/skin.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/srmm_menu.cpp b/plugins/Popup/src/srmm_menu.cpp index ba45fa7c30..fa4c6bf244 100644 --- a/plugins/Popup/src/srmm_menu.cpp +++ b/plugins/Popup/src/srmm_menu.cpp @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/srmm_menu.h b/plugins/Popup/src/srmm_menu.h index 7a2c269d55..54c445ed1e 100644 --- a/plugins/Popup/src/srmm_menu.h +++ b/plugins/Popup/src/srmm_menu.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/stdafx.h b/plugins/Popup/src/stdafx.h index 9a335c1324..e892d518f6 100644 --- a/plugins/Popup/src/stdafx.h +++ b/plugins/Popup/src/stdafx.h @@ -1,10 +1,10 @@ /*
Popup Plus plugin for Miranda IM
-Copyright 2002 Luca Santarelli,
- 2004-2007 Victor Pavlychko
- 2010 MPK
- 2010 Merlin_de
+Copyright © 2002 Luca Santarelli,
+© 2004-2007 Victor Pavlychko
+© 2010 MPK
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/Popup/src/version.h b/plugins/Popup/src/version.h index ab99b49060..45bbca6f8c 100644 --- a/plugins/Popup/src/version.h +++ b/plugins/Popup/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "MPK, Merlin_de (Luca Santarelli, Victor Pavlychko)"
#define __AUTHOREMAIL "mp-king@web.de"
#define __AUTHORWEB "https://miranda-ng.org/p/Popup/"
-#define __COPYRIGHT " 2002 Luca Santarelli, 2004-2007 Victor Pavlychko, 2010 MPK, Merlin_de"
+#define __COPYRIGHT "© 2002 Luca Santarelli, 2004-2007 Victor Pavlychko, 2010 MPK, Merlin_de"
diff --git a/plugins/ProfileManager/src/version.h b/plugins/ProfileManager/src/version.h index 6d20fb0aa8..dbcb79f127 100644 --- a/plugins/ProfileManager/src/version.h +++ b/plugins/ProfileManager/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Roman Gemini" #define __AUTHOREMAIL "woobind@ukr.net" #define __AUTHORWEB "https://miranda-ng.org/p/PManagerEx/" -#define __COPYRIGHT " 2008-10 Roman Gemini" +#define __COPYRIGHT "© 2008-10 Roman Gemini" diff --git a/plugins/QuickContacts/src/version.h b/plugins/QuickContacts/src/version.h index da3a592de0..eee85d9015 100644 --- a/plugins/QuickContacts/src/version.h +++ b/plugins/QuickContacts/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci, Heiko Schillinger" #define __AUTHOREMAIL "pescuma@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/QuickContacts/" -#define __COPYRIGHT " 2007-2009 Ricardo Pescuma Domenecci" +#define __COPYRIGHT "© 2007-2009 Ricardo Pescuma Domenecci" diff --git a/plugins/QuickMessages/src/version.h b/plugins/QuickMessages/src/version.h index 37f528d8be..b3ead27ca7 100644 --- a/plugins/QuickMessages/src/version.h +++ b/plugins/QuickMessages/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "MaD_CLuSTeR" #define __AUTHOREMAIL "daniok@yandex.ru" #define __AUTHORWEB "https://miranda-ng.org/p/QuickMessages/" -#define __COPYRIGHT " 2008 Danil Mozhar" +#define __COPYRIGHT "© 2008 Danil Mozhar" diff --git a/plugins/QuickReplies/src/version.h b/plugins/QuickReplies/src/version.h index 06642e81fd..9d1580a360 100644 --- a/plugins/QuickReplies/src/version.h +++ b/plugins/QuickReplies/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Unsane"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/QuickReplies/"
-#define __COPYRIGHT " 2010 Unsane"
+#define __COPYRIGHT "© 2010 Unsane"
diff --git a/plugins/Rate/src/main.cpp b/plugins/Rate/src/main.cpp index 03d440448b..aa15bbe0d4 100644 --- a/plugins/Rate/src/main.cpp +++ b/plugins/Rate/src/main.cpp @@ -61,7 +61,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) return TRUE;
}
-//
+// плагининфо
extern "C" __declspec(dllexport) PLUGININFOEX* MirandaPluginInfoEx(DWORD)
{
return &pluginInfo;
diff --git a/plugins/Rate/src/version.h b/plugins/Rate/src/version.h index ca83d78334..ccfe060611 100644 --- a/plugins/Rate/src/version.h +++ b/plugins/Rate/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Kildor, Thief" #define __AUTHOREMAIL "kostia@ngs.ru" #define __AUTHORWEB "https://miranda-ng.org/p/Rate/" -#define __COPYRIGHT " 2006-2009 Kostia Romanov, based on AuthState by Alexander Turyak" +#define __COPYRIGHT "© 2006-2009 Kostia Romanov, based on AuthState by Alexander Turyak" diff --git a/plugins/RecentContacts/src/version.h b/plugins/RecentContacts/src/version.h index bc561fe9db..5f5c0b84fc 100644 --- a/plugins/RecentContacts/src/version.h +++ b/plugins/RecentContacts/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "ValeraVi, Kildor" #define __AUTHOREMAIL "kostia@ngs.ru" #define __AUTHORWEB "https://miranda-ng.org/p/RecentContacts/" -#define __COPYRIGHT " 2005 ValeraVi, 2009 Kildor" +#define __COPYRIGHT "© 2005 ValeraVi, 2009 Kildor" diff --git a/plugins/RemovePersonalSettings/src/rps.cpp b/plugins/RemovePersonalSettings/src/rps.cpp index 0f792822c0..cad64ae0d1 100644 --- a/plugins/RemovePersonalSettings/src/rps.cpp +++ b/plugins/RemovePersonalSettings/src/rps.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
Copyright (c) 2000-05 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/RemovePersonalSettings/src/version.h b/plugins/RemovePersonalSettings/src/version.h index f2c5ab315d..57e04b8703 100644 --- a/plugins/RemovePersonalSettings/src/version.h +++ b/plugins/RemovePersonalSettings/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/RemovePersonalSettings/"
-#define __COPYRIGHT " 2007-2009 Ricardo Pescuma Domenecci"
+#define __COPYRIGHT "© 2007-2009 Ricardo Pescuma Domenecci"
diff --git a/plugins/Restart/src/version.h b/plugins/Restart/src/version.h index 9df8974dc7..bd550e6dc5 100644 --- a/plugins/Restart/src/version.h +++ b/plugins/Restart/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "eugene.nv" #define __AUTHOREMAIL "ep@eugn.me" #define __AUTHORWEB "https://miranda-ng.org/p/Restart/" -#define __COPYRIGHT " 2008-13 eugene.nv" +#define __COPYRIGHT "© 2008-13 eugene.nv" diff --git a/plugins/SMS/src/AdditionalFunctions/ListMT.h b/plugins/SMS/src/AdditionalFunctions/ListMT.h index 15c4b1d8b2..964ea5d09f 100644 --- a/plugins/SMS/src/AdditionalFunctions/ListMT.h +++ b/plugins/SMS/src/AdditionalFunctions/ListMT.h @@ -1,34 +1,34 @@ #if !defined(AFX_LIST_MT__H__INCLUDED_)
#define AFX_LIST_MT__H__INCLUDED_
-// ,
+// структура для работы со списком, элемент списка
typedef struct _LIST_MT_ITEM
{
#ifdef __cplusplus
- _LIST_MT_ITEM *plmtiPrev; // *
- _LIST_MT_ITEM *plmtiNext; // *
+ _LIST_MT_ITEM *plmtiPrev; // *предыдущий элемент в списке
+ _LIST_MT_ITEM *plmtiNext; // *следующий элемент в списке
#else
- LPVOID *plmtiPrev; // *
- LPVOID *plmtiNext; // *
+ LPVOID *plmtiPrev; // *предыдущий элемент в списке
+ LPVOID *plmtiNext; // *следующий элемент в списке
#endif
- LPVOID lpData; // ,
- LPVOID lpListMT; // ,
+ LPVOID lpData; // указатель на данные, связанные с элементом списка
+ LPVOID lpListMT; // указатель на заголовок списка, см структуру ниже
}LIST_MT_ITEM, *PLIST_MT_ITEM, *LPLIST_MT_ITEM;
typedef CONST PLIST_MT_ITEM PCLIST_MT_ITEM, LPCLIST_MT_ITEM;
-// ,
+// структура для работы со списком, заголовок списка
typedef struct _LIST_MT
{
- size_t nCount; // *
- PLIST_MT_ITEM plmtiFirst; // *
- PLIST_MT_ITEM plmtiLast; // *
+ size_t nCount; // *колличество элементов в списке
+ PLIST_MT_ITEM plmtiFirst; // *указывает на первый элемент в списке
+ PLIST_MT_ITEM plmtiLast; // *указывает на последний элемент в списке
CRITICAL_SECTION cs; // *section for exclysive access to List
}LIST_MT, *PLIST_MT, *LPLIST_MT;
typedef CONST PLIST_MT PCLIST_MT, LPCLIST_MT;
-//
+// структура для работы с итератором
typedef struct _LIST_MT_ITERATOR
{
PLIST_MT_ITEM plmtListMTItem;
@@ -117,23 +117,23 @@ __inline DWORD ListMTItemDelete(PCLIST_MT pclmtListMT,PCLIST_MT_ITEM pclmtListMT DWORD dwRetErrorCode;
if (pclmtListMTItem->lpListMT==pclmtListMT && pclmtListMT)
- {// , .
+ {// Данный элемент принадлежит к этому списку, можно удалить.
PLIST_MT_ITEM plmtiPrevNode=pclmtListMTItem->plmtiPrev,plmtiNextNode=pclmtListMTItem->plmtiNext;
if (plmtiPrevNode || plmtiNextNode)
{
if (plmtiPrevNode && plmtiNextNode==NULL)
{// This is the start node in the list to delete
- //
+ // отключился последний подключившийся
plmtiPrevNode->plmtiNext=NULL;
pclmtListMT->plmtiLast=plmtiPrevNode;
}else{
if (plmtiPrevNode==NULL && plmtiNextNode)
{// This is the end node in the list to delete
- //
+ // отключился первый подключившийся
plmtiNextNode->plmtiPrev=NULL;
pclmtListMT->plmtiFirst=plmtiNextNode;
- }else{//
+ }else{// оключился клиент не первый и не последний
//if (plmtiPrev && plmtiNext)
{// Neither start node nor end node in the list
plmtiPrevNode->plmtiNext=plmtiNextNode;
@@ -149,7 +149,7 @@ __inline DWORD ListMTItemDelete(PCLIST_MT pclmtListMT,PCLIST_MT_ITEM pclmtListMT pclmtListMTItem->lpListMT=NULL;
InterlockedDecrementPointer(&pclmtListMT->nCount);// pclmtListMT->nCount--;
dwRetErrorCode=NO_ERROR;
- }else{//
+ }else{// попытались удалить элемент не относящийся к данному списку
dwRetErrorCode=ERROR_INVALID_HANDLE;
}
return(dwRetErrorCode);
@@ -169,7 +169,7 @@ __inline void ListMTItemDataSet(PCLIST_MT_ITEM pclmtListMTItem, LPVOID lpData) __inline DWORD ListMTItemGetFirst(PCLIST_MT pclmtListMT,PLIST_MT_ITEM *pplmtListMTItem,LPVOID *plpData)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
DWORD dwRetErrorCode;
if (pclmtListMT->plmtiFirst)
@@ -185,7 +185,7 @@ return(dwRetErrorCode); __inline DWORD ListMTItemGetLast(PCLIST_MT pclmtListMT,PLIST_MT_ITEM *pplmtListMTItem,LPVOID *plpData)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
DWORD dwRetErrorCode;
if (pclmtListMT->plmtiLast)
@@ -202,32 +202,32 @@ return(dwRetErrorCode); __inline void ListMTItemSwap(PCLIST_MT pclmtListMT,PCLIST_MT_ITEM pclmtListMTItem1,PCLIST_MT_ITEM pclmtListMTItem2)
-{// ,
+{// поменять два элемента списка местами, даже если они из разных списков
if (pclmtListMTItem1!=pclmtListMTItem2)
- {//
+ {// это разные элементы списка
PLIST_MT_ITEM lpTemp;
lpTemp=pclmtListMTItem1->plmtiPrev;
if ((pclmtListMTItem1->plmtiPrev=pclmtListMTItem2->plmtiPrev)==NULL)
- {// pclmtListMTItem2 , , pclmtListMTItem1
+ {// pclmtListMTItem2 был первым, обновляем заголвок листа, теперь первый pclmtListMTItem1
pclmtListMT->plmtiFirst=pclmtListMTItem1;
}
if ((pclmtListMTItem2->plmtiPrev=lpTemp)==NULL)
- {// pclmtListMTItem1 , , pclmtListMTItem2
+ {// pclmtListMTItem1 был первым, обновляем заголвок листа, теперь первый pclmtListMTItem2
pclmtListMT->plmtiFirst=pclmtListMTItem2;
}
lpTemp=pclmtListMTItem1->plmtiNext;
if ((pclmtListMTItem1->plmtiNext=pclmtListMTItem2->plmtiNext)==NULL)
- {// pclmtListMTItem2 , , pclmtListMTItem1
+ {// pclmtListMTItem2 был последним, обновляем заголвок листа, теперь последний pclmtListMTItem1
pclmtListMT->plmtiLast=pclmtListMTItem1;
}
if ((pclmtListMTItem2->plmtiNext=lpTemp)==NULL)
- {// pclmtListMTItem1 , , pclmtListMTItem2
+ {// pclmtListMTItem1 был последним, обновляем заголвок листа, теперь последний pclmtListMTItem2
pclmtListMT->plmtiLast=pclmtListMTItem2;
}
}
@@ -235,19 +235,19 @@ __inline void ListMTItemSwap(PCLIST_MT pclmtListMT,PCLIST_MT_ITEM pclmtListMTIte __inline BOOL ListMTIteratorMoveFirst(PCLIST_MT pclmtListMT,PCLIST_MT_ITERATOR pclmtiIterator)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
return((pclmtiIterator->plmtListMTItem=pclmtListMT->plmtiFirst)? TRUE:FALSE);
}
__inline BOOL ListMTIteratorMoveLast(PCLIST_MT pclmtListMT,PCLIST_MT_ITERATOR pclmtiIterator)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
return((pclmtiIterator->plmtListMTItem=pclmtListMT->plmtiLast)? TRUE:FALSE);
}
__inline BOOL ListMTIteratorMovePrev(PCLIST_MT_ITERATOR pclmtiIterator)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
BOOL bRet=FALSE;
if (pclmtiIterator->plmtListMTItem)
@@ -259,7 +259,7 @@ return(bRet); __inline BOOL ListMTIteratorMoveNext(PCLIST_MT_ITERATOR pclmtiIterator)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
BOOL bRet=FALSE;
if (pclmtiIterator->plmtListMTItem)
@@ -271,7 +271,7 @@ return(bRet); __inline DWORD ListMTIteratorGet(PCLIST_MT_ITERATOR pclmtiIterator,PLIST_MT_ITEM *pplmtListMTItem,LPVOID *plpData)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
DWORD dwRetErrorCode;
if (pclmtiIterator->plmtListMTItem)
diff --git a/plugins/SMS/src/SMSConstans.h b/plugins/SMS/src/SMSConstans.h index 9a48672f9f..7abfc0bb61 100644 --- a/plugins/SMS/src/SMSConstans.h +++ b/plugins/SMS/src/SMSConstans.h @@ -8,9 +8,9 @@ #define PROTOCOL_DISPLAY_NAME_ORIG "SMS"
#define TIMEOUT_MSGSEND 60000 // send sms timeout
-#define MIN_SMS_DBEVENT_LEN 4 //
+#define MIN_SMS_DBEVENT_LEN 4 // для фильтрации событий авторизации от джабер плагина
#define MAX_PHONE_LEN MAX_PATH
-#define PHONES_MIN_COUNT 4 //internal // email
+#define PHONES_MIN_COUNT 4 //internal // колличество элементов обязательно проверяемых при извлечении email адреса из инфы юзера
#define SMS_DEFAULT_
#define SMS_DEFAULT_SIGNATUREPOS FALSE
@@ -70,11 +70,11 @@ int SendSMSMenuCommand(WPARAM wParam,LPARAM lParam); #define SMS_SEND_STR LPGENW("Send &SMS...")
#define SMS_SEND_CM_STR LPGENW("&SMS Message")
-// /
+// структура содержащая информацию о сервисах/функциях
struct SERVICE_ITEM
{
- LPSTR lpszName; // ,
- LPVOID lpFunc; //
+ LPSTR lpszName; // имя сервиса, оно же имя в иколибе
+ LPVOID lpFunc; // функция вызываемая
};
static const SERVICE_ITEM siPluginServices[] =
diff --git a/plugins/SMS/src/functions.cpp b/plugins/SMS/src/functions.cpp index 78c7f5851c..4501afcde7 100644 --- a/plugins/SMS/src/functions.cpp +++ b/plugins/SMS/src/functions.cpp @@ -384,7 +384,7 @@ DWORD ReplaceInBuff(LPVOID lpInBuff, size_t dwInBuffSize, size_t dwReplaceItemsC break;
}
}
- else {// , .
+ else {// сюда по идее никогда не попадём, на всякий случай.
DebugBreak();
break;
}
diff --git a/plugins/SMS/src/recvdlg.cpp b/plugins/SMS/src/recvdlg.cpp index 5e2d194e05..a427fb2ba9 100644 --- a/plugins/SMS/src/recvdlg.cpp +++ b/plugins/SMS/src/recvdlg.cpp @@ -53,7 +53,7 @@ void RecvSMSWindowDestroy() RECV_SMS_WINDOW_DATA *prswdWindowData;
ListMTLock(&ssSMSSettings.lmtRecvSMSWindowsListMT);
- while (ListMTItemGetFirst(&ssSMSSettings.lmtRecvSMSWindowsListMT, nullptr, (LPVOID*)&prswdWindowData) == NO_ERROR) {//
+ while (ListMTItemGetFirst(&ssSMSSettings.lmtRecvSMSWindowsListMT, nullptr, (LPVOID*)&prswdWindowData) == NO_ERROR) {// цикл
RecvSMSWindowRemove(prswdWindowData->hWnd);
}
ListMTUnLock(&ssSMSSettings.lmtRecvSMSWindowsListMT);
diff --git a/plugins/SMS/src/senddlg.cpp b/plugins/SMS/src/senddlg.cpp index bb501bf051..c4788d8d1b 100644 --- a/plugins/SMS/src/senddlg.cpp +++ b/plugins/SMS/src/senddlg.cpp @@ -622,7 +622,7 @@ HWND SendSMSWindowHwndByHProcessGet(HANDLE hProcess) ListMTLock(&ssSMSSettings.lmtSendSMSWindowsListMT);
ListMTIteratorMoveFirst(&ssSMSSettings.lmtSendSMSWindowsListMT, &lmtiIterator);
- do {//
+ do {// цикл
if (ListMTIteratorGet(&lmtiIterator, nullptr, (LPVOID*)&psswdWindowData) == NO_ERROR)
if (psswdWindowData->hProcess == hProcess) {
hRet = psswdWindowData->hWnd;
@@ -825,7 +825,7 @@ HWND SendSMSWindowIsOtherInstanceHContact(MCONTACT hContact) ListMTLock(&ssSMSSettings.lmtSendSMSWindowsListMT);
ListMTIteratorMoveFirst(&ssSMSSettings.lmtSendSMSWindowsListMT, &lmtiIterator);
- do {//
+ do {// цикл
if (ListMTIteratorGet(&lmtiIterator, nullptr, (LPVOID*)&psswdWindowData) == NO_ERROR)
if (psswdWindowData->hMyContact == hContact) {
hRet = psswdWindowData->hWnd;
@@ -933,7 +933,7 @@ void SendSMSWindowsUpdateAllAccountLists() ListMTLock(&ssSMSSettings.lmtSendSMSWindowsListMT);
ListMTIteratorMoveFirst(&ssSMSSettings.lmtSendSMSWindowsListMT, &lmtiIterator);
- do {//
+ do {// цикл
if (ListMTIteratorGet(&lmtiIterator, nullptr, (LPVOID*)&psswdWindowData) == NO_ERROR) {
SendSMSWindowUpdateAccountList(psswdWindowData->hWnd);
}
diff --git a/plugins/SMS/src/stdafx.h b/plugins/SMS/src/stdafx.h index d5eb55a324..d75f056b75 100644 --- a/plugins/SMS/src/stdafx.h +++ b/plugins/SMS/src/stdafx.h @@ -33,13 +33,13 @@ extern HINSTANCE hInst;
-//
+// структура содержащая информацию по построению меню или расширеных иконок
struct GUI_DISPLAY_ITEM
{
- LPSTR lpszName; // ,
- LPWSTR lpwszDescr; //
- LONG defIcon; //
- LPVOID lpFunc; //
+ LPSTR lpszName; // имя сервиса, оно же имя в иколибе
+ LPWSTR lpwszDescr; // текстовое описание отображаемое юзеру
+ LONG defIcon; // иконка из ресурсов
+ LPVOID lpFunc; // функция вызываемая меню
};
diff --git a/plugins/SMS/src/version.h b/plugins/SMS/src/version.h index b79d1bcf07..b923ad70ca 100644 --- a/plugins/SMS/src/version.h +++ b/plugins/SMS/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Richard Hughes, Improved by Ariel Shulman, rewritten by Rozhuk Ivan" #define __AUTHOREMAIL "Rozhuk_I@mail.ru" #define __AUTHORWEB "https://miranda-ng.org/p/SMS/" -#define __COPYRIGHT " 2001-02 Richard Hughes, 2003 Ariel Shulman, 2007-09 Rozhuk Ivan (Rozhuk_I@mail.ru)" +#define __COPYRIGHT "© 2001-02 Richard Hughes, 2003 Ariel Shulman, 2007-09 Rozhuk Ivan (Rozhuk_I@mail.ru)" diff --git a/plugins/Scriver/src/version.h b/plugins/Scriver/src/version.h index b695210147..7cd1c93cd9 100644 --- a/plugins/Scriver/src/version.h +++ b/plugins/Scriver/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Development Team" #define __AUTHOREMAIL "the_leech@users.berlios.de" #define __AUTHORWEB "https://miranda-ng.org/p/Scriver/" -#define __COPYRIGHT " 2000-2012 Miranda IM Project, 2012-17 Miranda NG project" +#define __COPYRIGHT "© 2000-2012 Miranda IM Project, 2012-17 Miranda NG project" diff --git a/plugins/SecureIM/SecureIM_icons/src/version.h b/plugins/SecureIM/SecureIM_icons/src/version.h index e3a0151f19..4532a869df 100644 --- a/plugins/SecureIM/SecureIM_icons/src/version.h +++ b/plugins/SecureIM/SecureIM_icons/src/version.h @@ -8,4 +8,4 @@ #define __PLUGIN_NAME "SecureIM icons" #define __FILENAME "SecureIM_icons.dll" #define __DESCRIPTION "Iconpack for SecureIM plugin of Miranda NG." -#define __COPYRIGHT " 2003 Johell, 2005-09 Baloo" +#define __COPYRIGHT "© 2003 Johell, 2005-09 Baloo" diff --git a/plugins/SecureIM/src/crypt.h b/plugins/SecureIM/src/crypt.h index 684f7c96c7..79e2b677e6 100644 --- a/plugins/SecureIM/src/crypt.h +++ b/plugins/SecureIM/src/crypt.h @@ -47,12 +47,12 @@ struct UinKey LPSTR msgSplitted; // message to combine
pPM msgPart; // parts of message
pWM msgQueue; // last messages not sended or to resend;
- BOOL sendQueue; // -
+ BOOL sendQueue; // идет отсылка очереди - не обрабатываются сообщения
BOOL offlineKey;
- char waitForExchange; // 0 -
- // 1 -
- // 2 -
- // 3 -
+ char waitForExchange; // 0 - сбросить очередь
+ // 1 - ожидаем
+ // 2 - дослать с шифрованием
+ // 3 - дослать без шифрования с вопросом
BOOL decoded; // false on decode error
short features;
HANDLE cntx; // crypto context
diff --git a/plugins/SecureIM/src/crypt_check.cpp b/plugins/SecureIM/src/crypt_check.cpp index 183f93f62f..82dbb7ad1c 100644 --- a/plugins/SecureIM/src/crypt_check.cpp +++ b/plugins/SecureIM/src/crypt_check.cpp @@ -20,11 +20,11 @@ bool isSecureProtocol(MCONTACT hContact) BYTE isContactSecured(MCONTACT hContact)
{
- // Offline
+ // нужна проверка на Offline и в этом случае другие статусы
if (!arClist.getCount()) return 0;
if (db_mc_isMeta(hContact))
- hContact = db_mc_getMostOnline(hContact); // ,
+ hContact = db_mc_getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
pUinKey p = findUinKey(hContact);
if (!p || !p->proto || !p->proto->inspecting)
diff --git a/plugins/SecureIM/src/crypt_icons.cpp b/plugins/SecureIM/src/crypt_icons.cpp index d0ad9953a5..59e0059773 100644 --- a/plugins/SecureIM/src/crypt_icons.cpp +++ b/plugins/SecureIM/src/crypt_icons.cpp @@ -13,10 +13,10 @@ struct ICON_CACHE OBJLIST<ICON_CACHE> arIcoList(10);
-// mode HICON
+// преобразует mode в HICON который НЕ НУЖНО разрушать в конце
static ICON_CACHE& getCacheItem(int mode, int type)
{
- int m = mode & 0x0f, s = (mode & SECURED) >> 4, i; // -
+ int m = mode & 0x0f, s = (mode & SECURED) >> 4, i; // разобрали на части - режим и состояние
HICON icon;
for (i = 0; i < arIcoList.getCount(); i++)
@@ -61,12 +61,12 @@ HANDLE mode2clicon(int mode, int type) return p.hCLIcon;
}
-// clist messagew
+// обновляет иконки в clist и в messagew
void ShowStatusIcon(MCONTACT hContact, int mode)
{
MCONTACT hMC = db_mc_getMeta(hContact);
- // clist
+ // обновить иконки в clist
if (mode != -1) {
HANDLE hIcon = mode2clicon(mode, 1);
ExtraIcon_SetIcon(g_hCLIcon, hContact, hIcon);
@@ -85,7 +85,7 @@ void ShowStatusIcon(MCONTACT hContact, int mode) sid.dwId = i;
sid.flags = (mode & SECURED) ? 0 : MBF_DISABLED;
if (mode == -1 || (mode & 0x0f) != i || isChatRoom(hContact))
- sid.flags |= MBF_HIDDEN; //
+ sid.flags |= MBF_HIDDEN; // отключаем все ненужные иконки
Srmm_ModifyIcon(hContact, &sid);
if (hMC)
Srmm_ModifyIcon(hMC, &sid);
diff --git a/plugins/SecureIM/src/crypt_misc.cpp b/plugins/SecureIM/src/crypt_misc.cpp index 8f60119b0b..108e8958b9 100644 --- a/plugins/SecureIM/src/crypt_misc.cpp +++ b/plugins/SecureIM/src/crypt_misc.cpp @@ -16,7 +16,7 @@ static void sttWaitForExchange(LPVOID param) Sent_NetLog("sttWaitForExchange: %d", ptr->waitForExchange);
// if keyexchange failed or timeout
- if (ptr->waitForExchange == 1 || ptr->waitForExchange == 3) { // - ,
+ if (ptr->waitForExchange == 1 || ptr->waitForExchange == 3) { // протухло - отправляем незашифрованно, если надо
if (ptr->msgQueue && msgbox1(nullptr, sim104, MODULENAME, MB_YESNO | MB_ICONQUESTION) == IDYES) {
mir_cslock lck(localQueueMutex);
ptr->sendQueue = true;
@@ -37,7 +37,7 @@ static void sttWaitForExchange(LPVOID param) ptr->waitForExchange = 0;
ShowStatusIconNotify(ptr->hContact);
}
- else if (ptr->waitForExchange == 2) { //
+ else if (ptr->waitForExchange == 2) { // дослать очередь через установленное соединение
mir_cslock lck(localQueueMutex);
// we need to resend last send back message with new crypto Key
pWM ptrMessage = ptr->msgQueue;
@@ -54,7 +54,7 @@ static void sttWaitForExchange(LPVOID param) ptr->msgQueue = nullptr;
ptr->waitForExchange = 0;
}
- else if (ptr->waitForExchange == 0) { //
+ else if (ptr->waitForExchange == 0) { // очистить очередь
mir_cslock lck(localQueueMutex);
// we need to resend last send back message with new crypto Key
pWM ptrMessage = ptr->msgQueue;
diff --git a/plugins/SecureIM/src/cryptopp.h b/plugins/SecureIM/src/cryptopp.h index bfa4e097b3..089d101cd7 100644 --- a/plugins/SecureIM/src/cryptopp.h +++ b/plugins/SecureIM/src/cryptopp.h @@ -35,20 +35,20 @@ #define CPP_ERROR_NO_PGP_KEY 10
typedef struct {
- int (__cdecl *rsa_gen_keypair)(short); // RSA- ( 2048, 2048 4096)
- int (__cdecl *rsa_get_keypair)(short,PBYTE,int*,PBYTE,int*); //
- int (__cdecl *rsa_get_keyhash)(short,PBYTE,int*,PBYTE,int*); // hash
- int (__cdecl *rsa_set_keypair)(short,PBYTE,int); // ,
- int (__cdecl *rsa_get_pubkey)(HANDLE,PBYTE,int*); //
- int (__cdecl *rsa_set_pubkey)(HANDLE,PBYTE,int); //
- void (__cdecl *rsa_set_timeout)(int); //
- int (__cdecl *rsa_get_state)(HANDLE); //
- int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // SHA1(key)
- int (__cdecl *rsa_connect)(HANDLE); //
- int (__cdecl *rsa_disconnect)(HANDLE); //
- int (__cdecl *rsa_disabled)(HANDLE); // "disabled"
- LPSTR (__cdecl *rsa_recv)(HANDLE,LPCSTR); //
- int (__cdecl *rsa_send)(HANDLE,LPCSTR); //
+ int (__cdecl *rsa_gen_keypair)(short); // генерит RSA-ключи для указанной длины (либо тока 2048, либо 2048 и 4096)
+ int (__cdecl *rsa_get_keypair)(short,PBYTE,int*,PBYTE,int*); // возвращает пару ключей для указанной длины
+ int (__cdecl *rsa_get_keyhash)(short,PBYTE,int*,PBYTE,int*); // возвращает hash пары ключей для указанной длины
+ int (__cdecl *rsa_set_keypair)(short,PBYTE,int); // устанавливает ключи, указанной длины
+ int (__cdecl *rsa_get_pubkey)(HANDLE,PBYTE,int*); // возвращает паблик ключ из указанного контекста
+ int (__cdecl *rsa_set_pubkey)(HANDLE,PBYTE,int); // загружает паблик ключ для указанного контекста
+ void (__cdecl *rsa_set_timeout)(int); // установить таймаут для установки секюрного соединения
+ int (__cdecl *rsa_get_state)(HANDLE); // получить статус указанного контекста
+ int (__cdecl *rsa_get_hash)(PBYTE,int,PBYTE,int*); // вычисляет SHA1(key)
+ int (__cdecl *rsa_connect)(HANDLE); // запускает процесс установки содинения с указанным контекстом
+ int (__cdecl *rsa_disconnect)(HANDLE); // разрывает соединение с указанным контекстом
+ int (__cdecl *rsa_disabled)(HANDLE); // разрывает соединение по причине "disabled"
+ LPSTR (__cdecl *rsa_recv)(HANDLE,LPCSTR); // необходимо передавать сюда все входящие протокольные сообщения
+ int (__cdecl *rsa_send)(HANDLE,LPCSTR); // вызываем для отправки сообщения клиенту
int (__cdecl *rsa_encrypt_file)(HANDLE,LPCSTR,LPCSTR);
int (__cdecl *rsa_decrypt_file)(HANDLE,LPCSTR,LPCSTR);
LPSTR (__cdecl *utf8encode)(LPCWSTR);
@@ -63,9 +63,9 @@ typedef struct { typedef RSA_EXPORT* pRSA_EXPORT;
typedef struct {
- int (__cdecl *rsa_inject)(HANDLE,LPCSTR); //
- int (__cdecl *rsa_check_pub)(HANDLE,PBYTE,int,PBYTE,int); // SHA ,
- void (__cdecl *rsa_notify)(HANDLE,int); //
+ int (__cdecl *rsa_inject)(HANDLE,LPCSTR); // вставляет сообщение в очередь на отправку
+ int (__cdecl *rsa_check_pub)(HANDLE,PBYTE,int,PBYTE,int); // проверяет интерактивно SHA и сохраняет ключ, если все нормально
+ void (__cdecl *rsa_notify)(HANDLE,int); // нотификация о смене состояния
} RSA_IMPORT;
typedef RSA_IMPORT* pRSA_IMPORT;
diff --git a/plugins/SecureIM/src/mmi.cpp b/plugins/SecureIM/src/mmi.cpp index 30b1030e32..d1608069b5 100644 --- a/plugins/SecureIM/src/mmi.cpp +++ b/plugins/SecureIM/src/mmi.cpp @@ -102,13 +102,13 @@ void __fastcall safe_delete(void** p) }
}
-// UTF8
+// преобразуем текст из чистого UTF8 в формат миранды
LPSTR utf8_to_miranda(LPCSTR szUtfMsg, DWORD& flags)
{
return mir_strdup(szUtfMsg);
}
-// UTF8
+// преобразуем текст из формата миранды в чистый UTF8
LPSTR miranda_to_utf8(LPCSTR szMirMsg, DWORD flags)
{
return mir_strdup(szMirMsg);
diff --git a/plugins/SecureIM/src/options.cpp b/plugins/SecureIM/src/options.cpp index 79095679a5..3a5065d88f 100644 --- a/plugins/SecureIM/src/options.cpp +++ b/plugins/SecureIM/src/options.cpp @@ -555,7 +555,7 @@ INT_PTR CALLBACK DlgProcOptionsProto(HWND hDlg, UINT wMsg, WPARAM wParam, LPARAM if (res == IDOK) {
if (!mir_exp->rsa_import_keypair(CPP_MODE_RSA, priv, passphrase))
msgbox(hDlg, sim113, MODULENAME, MB_OK | MB_ICONEXCLAMATION);
- else // SHA1
+ else // обновить SHA1 значение
RefreshProtoDlg(hDlg);
}
}
diff --git a/plugins/SecureIM/src/secureim.h b/plugins/SecureIM/src/secureim.h index 5dcb462f8c..8962a4a058 100644 --- a/plugins/SecureIM/src/secureim.h +++ b/plugins/SecureIM/src/secureim.h @@ -1,7 +1,7 @@ #ifndef __SECURE_IM__
#define __SECURE_IM__
-// SecureIM
+// режимы шифрования SecureIM
#define MODE_NATIVE 0
#define MODE_PGP 1
#define MODE_GPG 2
@@ -11,7 +11,7 @@ #define SECURED 0x10
-// Native RSA/AES
+// статусы для Native и RSA/AES режимов
#define STATUS_DISABLED 0
#define STATUS_ENABLED 1
#define STATUS_ALWAYSTRY 2
diff --git a/plugins/SecureIM/src/splitmsg.cpp b/plugins/SecureIM/src/splitmsg.cpp index a4f1d8a946..7388d55bb2 100644 --- a/plugins/SecureIM/src/splitmsg.cpp +++ b/plugins/SecureIM/src/splitmsg.cpp @@ -1,6 +1,6 @@ #include "commonheaders.h"
-// szMsg iLen, PARTzPARTzz
+// разбивает сообщение szMsg на части длиной iLen, возвращает строку вида PARTzPARTzz
LPSTR splitMsg(LPSTR szMsg, int iLen)
{
Sent_NetLog("split: msg: -----\n%s\n-----\n", szMsg);
@@ -30,7 +30,7 @@ LPSTR splitMsg(LPSTR szMsg, int iLen) }
-// ,
+// собираем сообщение из частей, части храним в структуре у контакта
LPSTR combineMessage(pUinKey ptr, LPSTR szMsg)
{
Sent_NetLog("combine: part: %s", szMsg);
@@ -90,7 +90,7 @@ LPSTR combineMessage(pUinKey ptr, LPSTR szMsg) return nullptr;
}
-// ,
+// отправляет сообщение, если надо то разбивает на части
int splitMessageSend(pUinKey ptr, LPSTR szMsg)
{
int len = (int)mir_strlen(szMsg);
diff --git a/plugins/SecureIM/src/svcs_clist.cpp b/plugins/SecureIM/src/svcs_clist.cpp index 548c92bce8..c2c00b19ed 100644 --- a/plugins/SecureIM/src/svcs_clist.cpp +++ b/plugins/SecureIM/src/svcs_clist.cpp @@ -67,7 +67,7 @@ int __cdecl onRebuildContactMenu(WPARAM hContact, LPARAM) {
BOOL bMC = db_mc_isMeta(hContact);
if (bMC)
- hContact = db_mc_getMostOnline(hContact); // ,
+ hContact = db_mc_getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
pUinKey ptr = getUinKey(hContact);
ShowStatusIconNotify(hContact);
diff --git a/plugins/SecureIM/src/svcs_menu.cpp b/plugins/SecureIM/src/svcs_menu.cpp index b7f879dbbf..ac1b0f9c5f 100644 --- a/plugins/SecureIM/src/svcs_menu.cpp +++ b/plugins/SecureIM/src/svcs_menu.cpp @@ -158,7 +158,7 @@ INT_PTR __cdecl Service_Mode(WPARAM wParam, LPARAM lParam) case MODE_PGP:
case MODE_GPG:
- //
+ // нужно много проверок и отключение активного контекста если необходимо
if (ptr) {
if (ptr->cntx) {
cpp_delete_context(ptr->cntx);
diff --git a/plugins/SecureIM/src/svcs_proto.cpp b/plugins/SecureIM/src/svcs_proto.cpp index 9e3a18de80..cc763dbb25 100644 --- a/plugins/SecureIM/src/svcs_proto.cpp +++ b/plugins/SecureIM/src/svcs_proto.cpp @@ -289,7 +289,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) showPopupDC(ptr->hContact);
ShowStatusIconNotify(ptr->hContact);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // дослать нешифрованно
return 1;
case SiG_KEYR: // key3 message
@@ -322,7 +322,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) showPopup(sim013, ptr->hContact, g_hPOP[POP_PU_DIS], 0);
ShowStatusIconNotify(ptr->hContact);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // дослать нешифрованно
return 1;
}
@@ -354,7 +354,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) Proto_ChainSend(wParam, ccs);
showPopupKS(ptr->hContact);
- waitForExchange(ptr); //
+ waitForExchange(ptr); // запустим ожидание
return 1;
}
@@ -386,7 +386,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) showPopup(sim013, ptr->hContact, g_hPOP[POP_PU_DIS], 0);
ShowStatusIconNotify(ptr->hContact);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // дослать нешифрованно
return 1;
}
else {
@@ -415,7 +415,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ShowStatusIconNotify(ptr->hContact);
cpp_reset_context(ptr->cntx);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // дослать нешифрованно
return 1;
}
break;
@@ -429,7 +429,7 @@ INT_PTR __cdecl onRecvMsg(WPARAM wParam, LPARAM lParam) ShowStatusIconNotify(ptr->hContact);
Sent_NetLog("onRecvMsg: Session established");
- waitForExchange(ptr, 2); //
+ waitForExchange(ptr, 2); // дошлем через шифрованное соединение
return 1;
}
@@ -471,7 +471,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) if (ptr->mode == MODE_PGP || ptr->mode == MODE_GPG) {
Sent_NetLog("onSendMsg: PGP|GPG mode");
- // -
+ // если можно зашифровать - шифруем
if (isContactPGP(ptr->hContact) || isContactGPG(ptr->hContact)) {
if (!ptr->cntx) {
ptr->cntx = cpp_create_context((isContactGPG(ptr->hContact) ? CPP_MODE_GPG : CPP_MODE_PGP) | ((db_get_b(ptr->hContact, MODULENAME, "gpgANSI", 0)) ? CPP_MODE_GPG_ANSI : 0));
@@ -491,7 +491,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) if (!szNewMsg)
return returnError(ccs->hContact, Translate(sim109));
- //
+ // отправляем зашифрованное сообщение
splitMessageSend(ptr, szNewMsg);
showPopupSM(ptr->hContact);
@@ -499,7 +499,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) return returnNoError(ccs->hContact);
}
- //
+ // отправляем незашифрованное
return Proto_ChainSend(wParam, ccs);
}
@@ -522,14 +522,14 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) if (!bSOM || (!isClientMiranda(ptr, 1) && !isSecureIM(ptr, 1)) || !loadRSAkey(ptr)) {
if (ssig == SiG_NONE)
- //
+ // просто шлем незашифрованное в оффлайн
return Proto_ChainSend(wParam, ccs);
- // -
+ // ничего не шлем дальше - это служебное сообщение
return returnNoError(ccs->hContact);
}
- //
+ // шлем шифрованное в оффлайн
mir_exp->rsa_send(ptr->cntx, ptrA(miranda_to_utf8((LPCSTR)ccs->lParam, ccs->wParam)));
showPopupSM(ptr->hContact);
return returnNoError(ccs->hContact);
@@ -542,25 +542,25 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) deleteRSAcntx(ptr);
}
- if (ssig == SiG_NONE) //
+ if (ssig == SiG_NONE) // просто шлем незашифрованное
return Proto_ChainSend(wParam, ccs);
- // -
+ // ничего не шлем дальше - это служебное сообщение
return returnNoError(ccs->hContact);
}
- //
+ // разорвать соединение
if (ssig == SiG_DEIN) {
if (ptr->cntx) {
mir_exp->rsa_disconnect(ptr->cntx);
deleteRSAcntx(ptr);
}
ShowStatusIconNotify(ptr->hContact);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // дошлем нешифрованно
return returnNoError(ccs->hContact);
}
- //
+ // соединение установлено
if (ptr->cntx && mir_exp->rsa_get_state(ptr->cntx) == 7) {
mir_exp->rsa_send(ptr->cntx, ptrA(miranda_to_utf8((LPCSTR)ccs->lParam, ccs->wParam)));
ShowStatusIconNotify(ptr->hContact);
@@ -568,17 +568,17 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) return returnNoError(ccs->hContact);
}
- // ( , AIP & NOL)
+ // просто сообщение (без тэгов, нет контекста и работают AIP & NOL)
if (ssig == SiG_NONE && isSecureIM(ptr->hContact)) {
- //
+ // добавим его в очередь
addMsg2Queue(ptr, ccs->wParam, (LPSTR)ccs->lParam);
- //
+ // запускаем процесс установки соединения
ssig = SiG_INIT;
- //
+ // запускаем трэд ожидания и досылки
waitForExchange(ptr);
}
- //
+ // установить соединение
if (ssig == SiG_INIT) {
createRSAcntx(ptr);
loadRSAkey(ptr);
@@ -588,7 +588,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) return returnNoError(ccs->hContact);
}
- // ( )
+ // просто шлем незашифрованное (не знаю даже когда такое случится)
return Proto_ChainSend(wParam, ccs);
}
@@ -741,7 +741,7 @@ INT_PTR __cdecl onSendMsg(WPARAM wParam, LPARAM lParam) showPopupKS(ccs->hContact);
ShowStatusIconNotify(ccs->hContact);
- waitForExchange(ptr); //
+ waitForExchange(ptr); // запускаем ожидание
}
return returnNoError(ccs->hContact);
}
diff --git a/plugins/SecureIM/src/svcs_rsa.cpp b/plugins/SecureIM/src/svcs_rsa.cpp index 66dbfe4686..307cc38921 100644 --- a/plugins/SecureIM/src/svcs_rsa.cpp +++ b/plugins/SecureIM/src/svcs_rsa.cpp @@ -20,7 +20,7 @@ int __cdecl rsa_inject(HANDLE context, LPCSTR msg) LPSTR buf = (LPSTR)mir_alloc(LEN_SECU + len);
memcpy(buf, SIG_SECU, LEN_SECU);
memcpy(buf + LEN_SECU, msg, len);
- //
+ // отправляем сообщение
splitMessageSend(ptr, buf);
mir_free(buf);
return 1;
@@ -90,22 +90,22 @@ void __cdecl rsa_notify(HANDLE context, int state) case 1:
showPopupEC(ptr->hContact);
ShowStatusIconNotify(ptr->hContact);
- waitForExchange(ptr, 2); //
+ waitForExchange(ptr, 2); // досылаем сообщения из очереди
return;
- case -1: // ,
+ case -1: // сессия разорвана по ошибке, неверный тип сообщения
msg = sim501; break;
- case -2: //
+ case -2: // сессия разорвана по ошибке другой стороной
msg = sim502; break;
- case -5: // AES
+ case -5: // ошибка декодирования AES сообщения
msg = sim505; break;
- case -6: // RSA
+ case -6: // ошибка декодирования RSA сообщения
msg = sim506; break;
- case -7: // (10 )
+ case -7: // таймаут установки соединения (10 секунд)
msg = sim507; break;
- case -8: // "disabled"
+ case -8: // сессия разорвана по причине "disabled"
msg = sim508; break;
- case -0x10: //
+ case -0x10: // сессия разорвана по ошибке
case -0x21:
case -0x22:
case -0x23:
@@ -122,16 +122,16 @@ void __cdecl rsa_notify(HANDLE context, int state) showPopupDCmsg(ptr->hContact, buf);
ShowStatusIconNotify(ptr->hContact);
if (ptr->cntx) deleteRSAcntx(ptr);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // досылаем нешифровано
}
return;
- case -3: //
- case -4: //
+ case -3: // соединение разорвано вручную
+ case -4: // соединение разорвано вручную другой стороной
showPopupDC(ptr->hContact);
ShowStatusIconNotify(ptr->hContact);
if (ptr->cntx) deleteRSAcntx(ptr);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // досылаем нешифровано
return;
default:
@@ -140,7 +140,7 @@ void __cdecl rsa_notify(HANDLE context, int state) showPopupDCmsg(ptr->hContact, msg);
ShowStatusIconNotify(ptr->hContact);
if (ptr->cntx) deleteRSAcntx(ptr);
- waitForExchange(ptr, 3); //
+ waitForExchange(ptr, 3); // досылаем нешифровано
}
void sttGenerateRSA(LPVOID)
@@ -156,7 +156,7 @@ void sttGenerateRSA(LPVOID) rsa_4096 = 1;
}
-// - RSA
+// загружает паблик-ключ в RSA контекст
BYTE loadRSAkey(pUinKey ptr)
{
if (!ptr->keyLoaded) {
@@ -171,7 +171,7 @@ BYTE loadRSAkey(pUinKey ptr) return ptr->keyLoaded;
}
-// RSA
+// создает RSA контекст
void createRSAcntx(pUinKey ptr)
{
if (!ptr->cntx) {
@@ -180,7 +180,7 @@ void createRSAcntx(pUinKey ptr) }
}
-// RSA
+// пересоздает RSA контекст
void resetRSAcntx(pUinKey ptr)
{
if (ptr->cntx) {
@@ -190,7 +190,7 @@ void resetRSAcntx(pUinKey ptr) }
}
-// RSA
+// удаляет RSA контекст
void deleteRSAcntx(pUinKey ptr)
{
cpp_delete_context(ptr->cntx);
diff --git a/plugins/SecureIM/src/svcs_srmm.cpp b/plugins/SecureIM/src/svcs_srmm.cpp index 7977d0932e..aa131ad533 100644 --- a/plugins/SecureIM/src/svcs_srmm.cpp +++ b/plugins/SecureIM/src/svcs_srmm.cpp @@ -12,7 +12,7 @@ int __cdecl onWindowEvent(WPARAM, LPARAM lParam) int __cdecl onIconPressed(WPARAM hContact, LPARAM lParam)
{
if (db_mc_isMeta(hContact))
- hContact = db_mc_getMostOnline(hContact); // ,
+ hContact = db_mc_getMostOnline(hContact); // возьмем тот, через который пойдет сообщение
StatusIconClickData *sicd = (StatusIconClickData *)lParam;
if (mir_strcmp(sicd->szModule, MODULENAME) != 0 || !isSecureProtocol(hContact))
diff --git a/plugins/SecureIM/src/version.h b/plugins/SecureIM/src/version.h index 69b92d695b..f23117aab2 100644 --- a/plugins/SecureIM/src/version.h +++ b/plugins/SecureIM/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Johell, Ghost, Nightwish, __alex, Baloo"
#define __AUTHOREMAIL "Johell@ifrance.com, baloo@bk.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/SecureIM/"
-#define __COPYRIGHT " 2003 Johell, 2005-09 Baloo"
+#define __COPYRIGHT "© 2003 Johell, 2005-09 Baloo"
diff --git a/plugins/SeenPlugin/src/version.h b/plugins/SeenPlugin/src/version.h index a036d3556f..a71af62bab 100644 --- a/plugins/SeenPlugin/src/version.h +++ b/plugins/SeenPlugin/src/version.h @@ -32,4 +32,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "Heiko Schillinger, YB"
#define __AUTHOREMAIL "y_b@saaplugin.no-ip.info"
#define __AUTHORWEB "https://miranda-ng.org/p/SeenPlugin/"
-#define __COPYRIGHT " 2001-2002 Heiko Schillinger, 2003 modified by Bruno Rino, 2005-07 modified by YB"
+#define __COPYRIGHT "© 2001-2002 Heiko Schillinger, 2003 modified by Bruno Rino, 2005-07 modified by YB"
diff --git a/plugins/SendScreenshotPlus/src/CSend.h b/plugins/SendScreenshotPlus/src/CSend.h index f94c7563fb..67fbe34518 100644 --- a/plugins/SendScreenshotPlus/src/CSend.h +++ b/plugins/SendScreenshotPlus/src/CSend.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendDropbox.cpp b/plugins/SendScreenshotPlus/src/CSendDropbox.cpp index 2ce5e24096..81924c90d6 100644 --- a/plugins/SendScreenshotPlus/src/CSendDropbox.cpp +++ b/plugins/SendScreenshotPlus/src/CSendDropbox.cpp @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendDropbox.h b/plugins/SendScreenshotPlus/src/CSendDropbox.h index 77ffb65ebc..dba3048cfa 100644 --- a/plugins/SendScreenshotPlus/src/CSendDropbox.h +++ b/plugins/SendScreenshotPlus/src/CSendDropbox.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.cpp b/plugins/SendScreenshotPlus/src/CSendEmail.cpp index 20993010b2..fb34f72e50 100644 --- a/plugins/SendScreenshotPlus/src/CSendEmail.cpp +++ b/plugins/SendScreenshotPlus/src/CSendEmail.cpp @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendEmail.h b/plugins/SendScreenshotPlus/src/CSendEmail.h index 6d9795aaf8..80cf5ca65d 100644 --- a/plugins/SendScreenshotPlus/src/CSendEmail.h +++ b/plugins/SendScreenshotPlus/src/CSendEmail.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp index ec25d447fa..56441652e6 100644 --- a/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp +++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.cpp @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendFTPFile.h b/plugins/SendScreenshotPlus/src/CSendFTPFile.h index 1d1b48a499..9c99096aa2 100644 --- a/plugins/SendScreenshotPlus/src/CSendFTPFile.h +++ b/plugins/SendScreenshotPlus/src/CSendFTPFile.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendFile.cpp b/plugins/SendScreenshotPlus/src/CSendFile.cpp index 2b72cf8666..7f8268c176 100644 --- a/plugins/SendScreenshotPlus/src/CSendFile.cpp +++ b/plugins/SendScreenshotPlus/src/CSendFile.cpp @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendFile.h b/plugins/SendScreenshotPlus/src/CSendFile.h index bfb26542d4..9d46ccfd70 100644 --- a/plugins/SendScreenshotPlus/src/CSendFile.h +++ b/plugins/SendScreenshotPlus/src/CSendFile.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h index 783217e362..43b8dcfdcc 100644 --- a/plugins/SendScreenshotPlus/src/CSendHTTPServer.h +++ b/plugins/SendScreenshotPlus/src/CSendHTTPServer.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.cpp b/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.cpp index a5ca255e53..0c9750d767 100644 --- a/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.cpp +++ b/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.cpp @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h b/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h index 58455f0d3f..e04671f065 100644 --- a/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h +++ b/plugins/SendScreenshotPlus/src/CSendHost_ImageShack.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/Main.h b/plugins/SendScreenshotPlus/src/Main.h index d6757e66cc..bb7d9d514f 100644 --- a/plugins/SendScreenshotPlus/src/Main.h +++ b/plugins/SendScreenshotPlus/src/Main.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/UAboutForm.h b/plugins/SendScreenshotPlus/src/UAboutForm.h index 9081d465a0..13071835fb 100644 --- a/plugins/SendScreenshotPlus/src/UAboutForm.h +++ b/plugins/SendScreenshotPlus/src/UAboutForm.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/UMainForm.h b/plugins/SendScreenshotPlus/src/UMainForm.h index ae265ca5d8..d62c5f2a42 100644 --- a/plugins/SendScreenshotPlus/src/UMainForm.h +++ b/plugins/SendScreenshotPlus/src/UMainForm.h @@ -2,14 +2,14 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. Copyright (c) 2010 Ing.U.Horn Parts of this file based on original sorce code -(c) 2004-2006 Srgio Vieira Rolanski (portet from Borland C++) +(c) 2004-2006 Sйrgio Vieira Rolanski (portet from Borland C++) This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.cpp b/plugins/SendScreenshotPlus/src/ctrl_button.cpp index 71bbf81a27..837b792580 100644 --- a/plugins/SendScreenshotPlus/src/ctrl_button.cpp +++ b/plugins/SendScreenshotPlus/src/ctrl_button.cpp @@ -2,7 +2,7 @@ imported from UserinfoEx plugin for Miranda NG Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/SendScreenshotPlus/src/ctrl_button.h b/plugins/SendScreenshotPlus/src/ctrl_button.h index 7274984977..e17c580ff7 100644 --- a/plugins/SendScreenshotPlus/src/ctrl_button.h +++ b/plugins/SendScreenshotPlus/src/ctrl_button.h @@ -1,11 +1,11 @@ /* imported from UserinfoEx plugin for Miranda NG Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. diff --git a/plugins/SendScreenshotPlus/src/dlg_msgbox.h b/plugins/SendScreenshotPlus/src/dlg_msgbox.h index 60396ae630..f114567a8c 100644 --- a/plugins/SendScreenshotPlus/src/dlg_msgbox.h +++ b/plugins/SendScreenshotPlus/src/dlg_msgbox.h @@ -2,8 +2,8 @@ Miranda NG: the free IM client for Microsoft* Windows*
Copyright:
- 2012-17 Miranda NG project (https://miranda-ng.org)
- 2006-10 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2012-17 Miranda NG project (https://miranda-ng.org)
+© 2006-10 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/SendScreenshotPlus/src/mir_string.cpp b/plugins/SendScreenshotPlus/src/mir_string.cpp index bd84a58a8b..ccf2f7cab1 100644 --- a/plugins/SendScreenshotPlus/src/mir_string.cpp +++ b/plugins/SendScreenshotPlus/src/mir_string.cpp @@ -1,7 +1,7 @@ /*
Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-09 Miranda ICQ/IM project,
This file is part of Send Screenshot Plus, a Miranda IM plugin.
diff --git a/plugins/SendScreenshotPlus/src/mir_string.h b/plugins/SendScreenshotPlus/src/mir_string.h index 452384decc..d5705928d7 100644 --- a/plugins/SendScreenshotPlus/src/mir_string.h +++ b/plugins/SendScreenshotPlus/src/mir_string.h @@ -1,7 +1,7 @@ /* Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-09 Miranda ICQ/IM project, This file is part of Send Screenshot Plus, a Miranda IM plugin. diff --git a/plugins/SendScreenshotPlus/src/version.h b/plugins/SendScreenshotPlus/src/version.h index 315d05ddd3..10f0ebe1be 100644 --- a/plugins/SendScreenshotPlus/src/version.h +++ b/plugins/SendScreenshotPlus/src/version.h @@ -11,5 +11,5 @@ #define __AUTHOR "Merlin" #define __AUTHOREMAIL "ing.u.horn@googlemail.com" #define __AUTHORWEB "https://miranda-ng.org/p/SendSS/" -#define __COPYRIGHT " 2010 Merlin, 2004-2006 Sergio Vieira Rolanski" +#define __COPYRIGHT "© 2010 Merlin, 2004-2006 Sergio Vieira Rolanski" #define __USER_AGENT_STRING "SendSS/" __VERSION_STRING_DOTS diff --git a/plugins/Sessions/Src/version.h b/plugins/Sessions/Src/version.h index 92062acb84..580a5abde1 100644 --- a/plugins/Sessions/Src/version.h +++ b/plugins/Sessions/Src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "MaD_CLuSTeR" #define __AUTHOREMAIL "daniok@yandex.ru" #define __AUTHORWEB "https://miranda-ng.org/p/Sessions/" -#define __COPYRIGHT " 2007-2008 Danil Mozhar" +#define __COPYRIGHT "© 2007-2008 Danil Mozhar" diff --git a/plugins/ShellExt/src/version.h b/plugins/ShellExt/src/version.h index d39c7882f1..35500637c1 100644 --- a/plugins/ShellExt/src/version.h +++ b/plugins/ShellExt/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Sam Kothari, Miranda NG Team" #define __AUTHOREMAIL "egodust@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/ShellExt/" -#define __COPYRIGHT " 2009 Sam Kothari (egoDust)" +#define __COPYRIGHT "© 2009 Sam Kothari (egoDust)" diff --git a/plugins/SimpleAR/src/version.h b/plugins/SimpleAR/src/version.h index 478a9c8543..ca9699cb5b 100644 --- a/plugins/SimpleAR/src/version.h +++ b/plugins/SimpleAR/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Stark Wong, Mataes, Mikel-Ard-Ri" #define __AUTHOREMAIL "mikelardri@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/SimpleAR/" -#define __COPYRIGHT " 2012" +#define __COPYRIGHT "© 2012" diff --git a/plugins/SimpleStatusMsg/src/awaymsg.cpp b/plugins/SimpleStatusMsg/src/awaymsg.cpp index 37ae062f63..ad3db9c638 100644 --- a/plugins/SimpleStatusMsg/src/awaymsg.cpp +++ b/plugins/SimpleStatusMsg/src/awaymsg.cpp @@ -2,13 +2,13 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-10 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
Portions of this code modified for Simple Status Message plugin
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/SimpleStatusMsg/src/main.cpp b/plugins/SimpleStatusMsg/src/main.cpp index f1fc07fed6..da0348f032 100644 --- a/plugins/SimpleStatusMsg/src/main.cpp +++ b/plugins/SimpleStatusMsg/src/main.cpp @@ -1,7 +1,7 @@ /*
Simple Status Message plugin for Miranda IM
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/SimpleStatusMsg/src/msgbox.cpp b/plugins/SimpleStatusMsg/src/msgbox.cpp index d35a8eb527..3f4d5f3a65 100644 --- a/plugins/SimpleStatusMsg/src/msgbox.cpp +++ b/plugins/SimpleStatusMsg/src/msgbox.cpp @@ -1,7 +1,7 @@ /* Simple Status Message plugin for Miranda IM -Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven +Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven 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 diff --git a/plugins/SimpleStatusMsg/src/options.cpp b/plugins/SimpleStatusMsg/src/options.cpp index 5c6f80052b..e18f215927 100644 --- a/plugins/SimpleStatusMsg/src/options.cpp +++ b/plugins/SimpleStatusMsg/src/options.cpp @@ -1,7 +1,7 @@ /*
Simple Status Message plugin for Miranda IM
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/SimpleStatusMsg/src/simplestatusmsg.h b/plugins/SimpleStatusMsg/src/simplestatusmsg.h index c5fd123b6d..8a8e8f0736 100644 --- a/plugins/SimpleStatusMsg/src/simplestatusmsg.h +++ b/plugins/SimpleStatusMsg/src/simplestatusmsg.h @@ -1,7 +1,7 @@ /*
Simple Status Message plugin for Miranda IM
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/SimpleStatusMsg/src/stdafx.h b/plugins/SimpleStatusMsg/src/stdafx.h index 02fcf01bc7..987479b8fc 100644 --- a/plugins/SimpleStatusMsg/src/stdafx.h +++ b/plugins/SimpleStatusMsg/src/stdafx.h @@ -1,7 +1,7 @@ /*
Simple Status Message plugin for Miranda IM
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/SimpleStatusMsg/src/utils.cpp b/plugins/SimpleStatusMsg/src/utils.cpp index 5bca49336f..178bd47609 100644 --- a/plugins/SimpleStatusMsg/src/utils.cpp +++ b/plugins/SimpleStatusMsg/src/utils.cpp @@ -1,7 +1,7 @@ /*
Simple Status Message plugin for Miranda IM
-Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaek, (C) 2005 Harven
+Copyright (C) 2006-2011 Bartosz 'Dezeath' Biaіek, (C) 2005 Harven
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
diff --git a/plugins/SimpleStatusMsg/src/version.h b/plugins/SimpleStatusMsg/src/version.h index 8711ce78c7..a2674b2181 100644 --- a/plugins/SimpleStatusMsg/src/version.h +++ b/plugins/SimpleStatusMsg/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Bartosz 'Dezeath' Bialek, Harven" #define __AUTHOREMAIL "dezred@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/SimpleStatusMsg/" -#define __COPYRIGHT " 2006-2011 Bartosz Bialek, 2005 Harven" +#define __COPYRIGHT "© 2006-2011 Bartosz Bialek, 2005 Harven" diff --git a/plugins/SkypeStatusChange/src/version.h b/plugins/SkypeStatusChange/src/version.h index 7e43834d3f..d0873aacd9 100644 --- a/plugins/SkypeStatusChange/src/version.h +++ b/plugins/SkypeStatusChange/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Dioksin" #define __AUTHOREMAIL "dioksin@ua.fm" #define __AUTHORWEB "https://miranda-ng.org/p/SkypeStatusChange/" -#define __COPYRIGHT " 2009-2010 Dioksin" +#define __COPYRIGHT "© 2009-2010 Dioksin" diff --git a/plugins/SmileyAdd/res/resource.rc b/plugins/SmileyAdd/res/resource.rc index 952c2475a1..27357ba49b 100644 --- a/plugins/SmileyAdd/res/resource.rc +++ b/plugins/SmileyAdd/res/resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// resources
+// Нейтральный resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -132,7 +132,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // resources
+#endif // Нейтральный resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/SmileyAdd/src/resource.h b/plugins/SmileyAdd/src/resource.h index 27bee22de3..09115cfae1 100644 --- a/plugins/SmileyAdd/src/resource.h +++ b/plugins/SmileyAdd/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// D:\Others\SVN\MirandaNG\trunk\plugins\SmileyAdd\res\resource.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ D:\Others\SVN\MirandaNG\trunk\plugins\SmileyAdd\res\resource.rc
//
#define IDI_SMILINGICON 124
#define IDD_OPT_SMILEYS 245
diff --git a/plugins/SmileyAdd/src/version.h b/plugins/SmileyAdd/src/version.h index 2f660feaa1..084efc5042 100644 --- a/plugins/SmileyAdd/src/version.h +++ b/plugins/SmileyAdd/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Peacow, nightwish, bid, borkra"
#define __AUTHOREMAIL "borkra@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/SmileyAdd/"
-#define __COPYRIGHT " 2012-17 Miranda NG Team, 2004-12 Boris Krasnovskiy, portions by Rein-Peter de Boer"
+#define __COPYRIGHT "© 2012-17 Miranda NG Team, 2004-12 Boris Krasnovskiy, portions by Rein-Peter de Boer"
diff --git a/plugins/Spamotron/src/version.h b/plugins/Spamotron/src/version.h index 663a9bbfc8..55823a9f3b 100644 --- a/plugins/Spamotron/src/version.h +++ b/plugins/Spamotron/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "vu1tur" #define __AUTHOREMAIL "to@vu1tur.eu.org" #define __AUTHORWEB "https://miranda-ng.org/p/Spamotron/" -#define __COPYRIGHT " 2010 vu1tur" +#define __COPYRIGHT "© 2010 vu1tur" diff --git a/plugins/SpellChecker/Flags-Angelika/src/version.h b/plugins/SpellChecker/Flags-Angelika/src/version.h index 8c2db714cb..1a6bbcd9e3 100644 --- a/plugins/SpellChecker/Flags-Angelika/src/version.h +++ b/plugins/SpellChecker/Flags-Angelika/src/version.h @@ -8,4 +8,4 @@ #define __PLUGIN_NAME "SpellChecker flags icons" #define __FILENAME "Flags_icons.dll" #define __DESCRIPTION "Flags icons for SpellChecker plugin of Miranda NG." -#define __COPYRIGHT " 2006-2010 Ricardo Pescuma Domenecci" +#define __COPYRIGHT "© 2006-2010 Ricardo Pescuma Domenecci" diff --git a/plugins/SpellChecker/Flags/src/version.h b/plugins/SpellChecker/Flags/src/version.h index 8c2db714cb..1a6bbcd9e3 100644 --- a/plugins/SpellChecker/Flags/src/version.h +++ b/plugins/SpellChecker/Flags/src/version.h @@ -8,4 +8,4 @@ #define __PLUGIN_NAME "SpellChecker flags icons" #define __FILENAME "Flags_icons.dll" #define __DESCRIPTION "Flags icons for SpellChecker plugin of Miranda NG." -#define __COPYRIGHT " 2006-2010 Ricardo Pescuma Domenecci" +#define __COPYRIGHT "© 2006-2010 Ricardo Pescuma Domenecci" diff --git a/plugins/SpellChecker/src/version.h b/plugins/SpellChecker/src/version.h index 868202218e..3562484366 100644 --- a/plugins/SpellChecker/src/version.h +++ b/plugins/SpellChecker/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ricardo Pescuma Domenecci, Wishmaster" #define __AUTHOREMAIL "pescuma@miranda-im.org" #define __AUTHORWEB "https://miranda-ng.org/p/SpellChecker/" -#define __COPYRIGHT " 2006-2010 Ricardo Pescuma Domenecci" +#define __COPYRIGHT "© 2006-2010 Ricardo Pescuma Domenecci" diff --git a/plugins/SplashScreen/src/version.h b/plugins/SplashScreen/src/version.h index e93e7ef98c..91b22115a2 100644 --- a/plugins/SplashScreen/src/version.h +++ b/plugins/SplashScreen/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "nullbie, Thief"
#define __AUTHOREMAIL "thief@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/SplashScreen/"
-#define __COPYRIGHT " 2004-2007 Victor Pavlychko, 2005-2011 Alexander Turyak"
+#define __COPYRIGHT "© 2004-2007 Victor Pavlychko, 2005-2011 Alexander Turyak"
diff --git a/plugins/StartPosition/src/version.h b/plugins/StartPosition/src/version.h index 9adb18869b..807d53434f 100644 --- a/plugins/StartPosition/src/version.h +++ b/plugins/StartPosition/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Felipe Brahm - souFrag" #define __AUTHOREMAIL "felipebrahm@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/StartPosition/" -#define __COPYRIGHT " 2005-2008 Felipe Brahm - souFrag, 2012-17 Miranda NG project" +#define __COPYRIGHT "© 2005-2008 Felipe Brahm - souFrag, © 2012-17 Miranda NG project" diff --git a/plugins/StartupSilence/src/main.cpp b/plugins/StartupSilence/src/main.cpp index 86b7295749..9f40ecdffe 100644 --- a/plugins/StartupSilence/src/main.cpp +++ b/plugins/StartupSilence/src/main.cpp @@ -1,6 +1,6 @@ /*
-Copyright () 2012-13 Vladimir Lyubimov
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-13 Vladimir Lyubimov
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/StartupSilence/src/version.h b/plugins/StartupSilence/src/version.h index c69596f474..88c7193a98 100644 --- a/plugins/StartupSilence/src/version.h +++ b/plugins/StartupSilence/src/version.h @@ -17,7 +17,7 @@ #define __AUTHOR "Vladimir Lyubimov"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/"
-#define __COPYRIGHT " 2012-17 Vladimir Lyubimov"
+#define __COPYRIGHT "© 2012-17 Vladimir Lyubimov"
// other stuff for Version resource
#include <stdver.h>
diff --git a/plugins/StatusChange/src/version.h b/plugins/StatusChange/src/version.h index b28854837d..f03a2bf1e5 100644 --- a/plugins/StatusChange/src/version.h +++ b/plugins/StatusChange/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Angelo Luiz Tartari" #define __AUTHOREMAIL "corsario-br@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/StatusChange/" -#define __COPYRIGHT " 2002 Angelo Luiz Tartari" +#define __COPYRIGHT "© 2002 Angelo Luiz Tartari" diff --git a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp index 6f5349098e..300687d7ea 100644 --- a/plugins/StatusManager/src/KeepStatus/keepstatus.cpp +++ b/plugins/StatusManager/src/KeepStatus/keepstatus.cpp @@ -912,7 +912,7 @@ static int ProcessPopup(int reason, LPARAM lParam) if (!db_get_b(0, KSMODULENAME, SETTING_PUCONNLOST, TRUE)) return -1; - if (lParam) { // . + if (lParam) { // ”казатель на им¤ модул¤. hIcon = Skin_LoadProtoIcon((char*)lParam, SKINICON_STATUS_OFFLINE); mir_snwprintf(text, TranslateT("%s status error (next retry (%d) in %d s)"), GetHumanName(lParam), retryCount + 1, currentDelay / 1000); } diff --git a/plugins/StatusManager/src/version.h b/plugins/StatusManager/src/version.h index 82d57c0469..1a33b23ec3 100644 --- a/plugins/StatusManager/src/version.h +++ b/plugins/StatusManager/src/version.h @@ -14,4 +14,4 @@ #define __AUTHOR "P Boon" #define __AUTHOREMAIL "unregistered@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/StatusManager/" -#define __COPYRIGHT " 2003-08 P. Boon, 2008-17 George Hazan" +#define __COPYRIGHT "© 2003-08 P. Boon, 2008-17 George Hazan" diff --git a/plugins/StopSpamMod/res/stopspam.rc b/plugins/StopSpamMod/res/stopspam.rc index a812942e05..950de7995c 100755 --- a/plugins/StopSpamMod/res/stopspam.rc +++ b/plugins/StopSpamMod/res/stopspam.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -175,7 +175,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/StopSpamMod/src/version.h b/plugins/StopSpamMod/src/version.h index b92a28afc0..bef600991b 100755 --- a/plugins/StopSpamMod/src/version.h +++ b/plugins/StopSpamMod/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Roman Miklashevsky, sss, Elzor"
#define __AUTHOREMAIL "sss123next@list.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/StopSpamMod/"
-#define __COPYRIGHT " 2004-2017 Roman Miklashevsky, A. Petkevich, Kosh&chka, sss, Elzor"
+#define __COPYRIGHT "© 2004-2017 Roman Miklashevsky, A. Petkevich, Kosh&chka, sss, Elzor"
diff --git a/plugins/StopSpamPlus/src/version.h b/plugins/StopSpamPlus/src/version.h index 920c757277..dc84021f01 100644 --- a/plugins/StopSpamPlus/src/version.h +++ b/plugins/StopSpamPlus/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Roman Miklashevsky, A. Petkevich, Kosh&chka, persei"
#define __AUTHOREMAIL "koshechka@miranda.im"
#define __AUTHORWEB "https://miranda-ng.org/p/StopSpam/"
-#define __COPYRIGHT " 2004-2010 Roman Miklashevsky, A. Petkevich, Kosh&chka, persei"
+#define __COPYRIGHT "© 2004-2010 Roman Miklashevsky, A. Petkevich, Kosh&chka, persei"
diff --git a/plugins/TabSRMM/TabSRMM_icons/version.h b/plugins/TabSRMM/TabSRMM_icons/version.h index 8a4b2aaf7a..56b53e920e 100644 --- a/plugins/TabSRMM/TabSRMM_icons/version.h +++ b/plugins/TabSRMM/TabSRMM_icons/version.h @@ -8,4 +8,4 @@ #define __PLUGIN_NAME "TabSRMM icons" #define __FILENAME "TabSRMM_icons.dll" #define __DESCRIPTION "Iconpack for TabSRMM plugin of Miranda NG." -#define __COPYRIGHT " 2012-17 Miranda NG team, 2000-2010 Miranda Project and contributors." +#define __COPYRIGHT "© 2012-17 Miranda NG team, 2000-2010 Miranda Project and contributors." diff --git a/plugins/TabSRMM/src/ImageDataObject.cpp b/plugins/TabSRMM/src/ImageDataObject.cpp index ba771838ca..b8e200ccc6 100644 --- a/plugins/TabSRMM/src/ImageDataObject.cpp +++ b/plugins/TabSRMM/src/ImageDataObject.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/TSButton.cpp b/plugins/TabSRMM/src/TSButton.cpp index 167b604547..b710523f99 100644 --- a/plugins/TabSRMM/src/TSButton.cpp +++ b/plugins/TabSRMM/src/TSButton.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat.h b/plugins/TabSRMM/src/chat.h index 209f935638..a9dcdc8462 100644 --- a/plugins/TabSRMM/src/chat.h +++ b/plugins/TabSRMM/src/chat.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat_log.cpp b/plugins/TabSRMM/src/chat_log.cpp index ad5fb9201b..375ac71830 100644 --- a/plugins/TabSRMM/src/chat_log.cpp +++ b/plugins/TabSRMM/src/chat_log.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat_main.cpp b/plugins/TabSRMM/src/chat_main.cpp index 395b4b0402..8fd8026538 100644 --- a/plugins/TabSRMM/src/chat_main.cpp +++ b/plugins/TabSRMM/src/chat_main.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat_manager.cpp b/plugins/TabSRMM/src/chat_manager.cpp index ab7f447c4b..adbc2735b4 100644 --- a/plugins/TabSRMM/src/chat_manager.cpp +++ b/plugins/TabSRMM/src/chat_manager.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat_options.cpp b/plugins/TabSRMM/src/chat_options.cpp index 2adbadfe10..410b6a04bf 100644 --- a/plugins/TabSRMM/src/chat_options.cpp +++ b/plugins/TabSRMM/src/chat_options.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat_tools.cpp b/plugins/TabSRMM/src/chat_tools.cpp index 29d612b30a..3451c0d083 100644 --- a/plugins/TabSRMM/src/chat_tools.cpp +++ b/plugins/TabSRMM/src/chat_tools.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/chat_window.cpp b/plugins/TabSRMM/src/chat_window.cpp index 9db44118f1..2dc2a2d20b 100644 --- a/plugins/TabSRMM/src/chat_window.cpp +++ b/plugins/TabSRMM/src/chat_window.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/contactcache.cpp b/plugins/TabSRMM/src/contactcache.cpp index 70626350a4..2ba734ccd0 100644 --- a/plugins/TabSRMM/src/contactcache.cpp +++ b/plugins/TabSRMM/src/contactcache.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/contactcache.h b/plugins/TabSRMM/src/contactcache.h index 226c6d0a4e..9d90e7e322 100644 --- a/plugins/TabSRMM/src/contactcache.h +++ b/plugins/TabSRMM/src/contactcache.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp index 90348e7e05..0c6bfca355 100644 --- a/plugins/TabSRMM/src/container.cpp +++ b/plugins/TabSRMM/src/container.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/controls.cpp b/plugins/TabSRMM/src/controls.cpp index d66da586d5..27fde5e205 100644 --- a/plugins/TabSRMM/src/controls.cpp +++ b/plugins/TabSRMM/src/controls.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/controls.h b/plugins/TabSRMM/src/controls.h index 93e72f351e..622bb4de3d 100644 --- a/plugins/TabSRMM/src/controls.h +++ b/plugins/TabSRMM/src/controls.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp index 205e5d5dac..fbe5fba040 100644 --- a/plugins/TabSRMM/src/eventpopups.cpp +++ b/plugins/TabSRMM/src/eventpopups.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/functions.h b/plugins/TabSRMM/src/functions.h index 95cf88d7da..e614194649 100644 --- a/plugins/TabSRMM/src/functions.h +++ b/plugins/TabSRMM/src/functions.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/generic_msghandlers.cpp b/plugins/TabSRMM/src/generic_msghandlers.cpp index 939a92e906..21cb27bc1e 100644 --- a/plugins/TabSRMM/src/generic_msghandlers.cpp +++ b/plugins/TabSRMM/src/generic_msghandlers.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/globals.cpp b/plugins/TabSRMM/src/globals.cpp index a002a44042..4fe51313c8 100644 --- a/plugins/TabSRMM/src/globals.cpp +++ b/plugins/TabSRMM/src/globals.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/globals.h b/plugins/TabSRMM/src/globals.h index 7eb87efa7c..ed35884db8 100644 --- a/plugins/TabSRMM/src/globals.h +++ b/plugins/TabSRMM/src/globals.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp index 844cf2adfd..cb2481a87d 100644 --- a/plugins/TabSRMM/src/hotkeyhandler.cpp +++ b/plugins/TabSRMM/src/hotkeyhandler.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/infopanel.cpp b/plugins/TabSRMM/src/infopanel.cpp index e891fcf5b9..22b05635ec 100644 --- a/plugins/TabSRMM/src/infopanel.cpp +++ b/plugins/TabSRMM/src/infopanel.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/infopanel.h b/plugins/TabSRMM/src/infopanel.h index f554fa0bc5..b8dc533292 100644 --- a/plugins/TabSRMM/src/infopanel.h +++ b/plugins/TabSRMM/src/infopanel.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/mim.cpp b/plugins/TabSRMM/src/mim.cpp index cace397ad3..873ddfc3e1 100644 --- a/plugins/TabSRMM/src/mim.cpp +++ b/plugins/TabSRMM/src/mim.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/mim.h b/plugins/TabSRMM/src/mim.h index a956fdd1ba..47c3a4a283 100644 --- a/plugins/TabSRMM/src/mim.h +++ b/plugins/TabSRMM/src/mim.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/modplus.cpp b/plugins/TabSRMM/src/modplus.cpp index eaa29d336b..ae7ff3c90a 100644 --- a/plugins/TabSRMM/src/modplus.cpp +++ b/plugins/TabSRMM/src/modplus.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp index 5ede9f7a68..570c49447a 100644 --- a/plugins/TabSRMM/src/msgdialog.cpp +++ b/plugins/TabSRMM/src/msgdialog.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp index ec48cdd159..43f3ab9088 100644 --- a/plugins/TabSRMM/src/msgdlgutils.cpp +++ b/plugins/TabSRMM/src/msgdlgutils.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/msgdlgutils.h b/plugins/TabSRMM/src/msgdlgutils.h index cd2362ca59..7baf23ef18 100644 --- a/plugins/TabSRMM/src/msgdlgutils.h +++ b/plugins/TabSRMM/src/msgdlgutils.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/msglog.cpp b/plugins/TabSRMM/src/msglog.cpp index 11b1a1de13..fdb9c580cb 100644 --- a/plugins/TabSRMM/src/msglog.cpp +++ b/plugins/TabSRMM/src/msglog.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/msgoptions.cpp b/plugins/TabSRMM/src/msgoptions.cpp index 3a5d1e806d..90bf9a03c7 100644 --- a/plugins/TabSRMM/src/msgoptions.cpp +++ b/plugins/TabSRMM/src/msgoptions.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
@@ -1096,7 +1096,8 @@ public: {
bool bEnabled = chkLimit.GetState() != 0;
edtLimit.Enable(bEnabled);
- spnLimit.Enable(bEnabled);
}
+ spnLimit.Enable(bEnabled);
+ }
virtual INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override
{
diff --git a/plugins/TabSRMM/src/msgs.cpp b/plugins/TabSRMM/src/msgs.cpp index 67598de9d6..078f47d8d9 100644 --- a/plugins/TabSRMM/src/msgs.cpp +++ b/plugins/TabSRMM/src/msgs.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/msgs.h b/plugins/TabSRMM/src/msgs.h index 3882d33a4a..bf7e63d23c 100644 --- a/plugins/TabSRMM/src/msgs.h +++ b/plugins/TabSRMM/src/msgs.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/muchighlight.cpp b/plugins/TabSRMM/src/muchighlight.cpp index 85b131ff3f..a1b2166873 100644 --- a/plugins/TabSRMM/src/muchighlight.cpp +++ b/plugins/TabSRMM/src/muchighlight.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/muchighlight.h b/plugins/TabSRMM/src/muchighlight.h index d6e124df04..0f855a7bed 100644 --- a/plugins/TabSRMM/src/muchighlight.h +++ b/plugins/TabSRMM/src/muchighlight.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/nen.h b/plugins/TabSRMM/src/nen.h index a5033803e9..9c1b969e1a 100644 --- a/plugins/TabSRMM/src/nen.h +++ b/plugins/TabSRMM/src/nen.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/selectcontainer.cpp b/plugins/TabSRMM/src/selectcontainer.cpp index 2f8e50f92d..fbfb4dbe31 100644 --- a/plugins/TabSRMM/src/selectcontainer.cpp +++ b/plugins/TabSRMM/src/selectcontainer.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/sendlater.cpp b/plugins/TabSRMM/src/sendlater.cpp index e76b4b79e0..d3affd3337 100644 --- a/plugins/TabSRMM/src/sendlater.cpp +++ b/plugins/TabSRMM/src/sendlater.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/sendlater.h b/plugins/TabSRMM/src/sendlater.h index d257488872..2c57695722 100644 --- a/plugins/TabSRMM/src/sendlater.h +++ b/plugins/TabSRMM/src/sendlater.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/sendqueue.cpp b/plugins/TabSRMM/src/sendqueue.cpp index a84eda1481..506e92c1e5 100644 --- a/plugins/TabSRMM/src/sendqueue.cpp +++ b/plugins/TabSRMM/src/sendqueue.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/sendqueue.h b/plugins/TabSRMM/src/sendqueue.h index f6e48e769e..a7831b4fdb 100644 --- a/plugins/TabSRMM/src/sendqueue.h +++ b/plugins/TabSRMM/src/sendqueue.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/sidebar.cpp b/plugins/TabSRMM/src/sidebar.cpp index 9edf862b52..51ed71f35a 100644 --- a/plugins/TabSRMM/src/sidebar.cpp +++ b/plugins/TabSRMM/src/sidebar.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/sidebar.h b/plugins/TabSRMM/src/sidebar.h index 505fc26847..cf7bd9ab4c 100644 --- a/plugins/TabSRMM/src/sidebar.h +++ b/plugins/TabSRMM/src/sidebar.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/srmm.cpp b/plugins/TabSRMM/src/srmm.cpp index 9e4de29270..eaeb161de4 100644 --- a/plugins/TabSRMM/src/srmm.cpp +++ b/plugins/TabSRMM/src/srmm.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/stdafx.h b/plugins/TabSRMM/src/stdafx.h index b53148b5d1..6592cfabdd 100644 --- a/plugins/TabSRMM/src/stdafx.h +++ b/plugins/TabSRMM/src/stdafx.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/tabctrl.cpp b/plugins/TabSRMM/src/tabctrl.cpp index f02a185743..7f1b447ae6 100644 --- a/plugins/TabSRMM/src/tabctrl.cpp +++ b/plugins/TabSRMM/src/tabctrl.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/taskbar.cpp b/plugins/TabSRMM/src/taskbar.cpp index 18d2087273..333976176f 100644 --- a/plugins/TabSRMM/src/taskbar.cpp +++ b/plugins/TabSRMM/src/taskbar.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/taskbar.h b/plugins/TabSRMM/src/taskbar.h index 1545a5b1e8..56f815d7bb 100644 --- a/plugins/TabSRMM/src/taskbar.h +++ b/plugins/TabSRMM/src/taskbar.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/templates.cpp b/plugins/TabSRMM/src/templates.cpp index 0ab41c7c6e..7d4c461766 100644 --- a/plugins/TabSRMM/src/templates.cpp +++ b/plugins/TabSRMM/src/templates.cpp @@ -1,7 +1,7 @@ ///////////////////////////////////////////////////////////////////////////////////////// // Miranda NG: the free IM client for Microsoft* Windows* // -// Copyright () 2012-17 Miranda NG project, +// Copyright (с) 2012-17 Miranda NG project, // Copyright (c) 2000-09 Miranda ICQ/IM project, // all portions of this codebase are copyrighted to the people // listed in contributors.txt. diff --git a/plugins/TabSRMM/src/templates.h b/plugins/TabSRMM/src/templates.h index 8fa0088eda..35a470b30d 100644 --- a/plugins/TabSRMM/src/templates.h +++ b/plugins/TabSRMM/src/templates.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/themeio.cpp b/plugins/TabSRMM/src/themeio.cpp index 5f7d4fb866..fbca212097 100644 --- a/plugins/TabSRMM/src/themeio.cpp +++ b/plugins/TabSRMM/src/themeio.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/themes.cpp b/plugins/TabSRMM/src/themes.cpp index 5ed85aab29..ba35283efa 100644 --- a/plugins/TabSRMM/src/themes.cpp +++ b/plugins/TabSRMM/src/themes.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/themes.h b/plugins/TabSRMM/src/themes.h index 4472524fe9..f74bb55f67 100644 --- a/plugins/TabSRMM/src/themes.h +++ b/plugins/TabSRMM/src/themes.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/translator.cpp b/plugins/TabSRMM/src/translator.cpp index 6c89f3b3c6..ae59c39bd8 100644 --- a/plugins/TabSRMM/src/translator.cpp +++ b/plugins/TabSRMM/src/translator.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/translator.h b/plugins/TabSRMM/src/translator.h index 62217e9fd8..250f6320b8 100644 --- a/plugins/TabSRMM/src/translator.h +++ b/plugins/TabSRMM/src/translator.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp index 1fcaff527c..287a96452b 100644 --- a/plugins/TabSRMM/src/trayicon.cpp +++ b/plugins/TabSRMM/src/trayicon.cpp @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/utils.h b/plugins/TabSRMM/src/utils.h index 0218f7956e..95f43ffe24 100644 --- a/plugins/TabSRMM/src/utils.h +++ b/plugins/TabSRMM/src/utils.h @@ -1,7 +1,7 @@ /////////////////////////////////////////////////////////////////////////////////////////
// Miranda NG: the free IM client for Microsoft* Windows*
//
-// Copyright () 2012-17 Miranda NG project,
+// Copyright (с) 2012-17 Miranda NG project,
// Copyright (c) 2000-09 Miranda ICQ/IM project,
// all portions of this codebase are copyrighted to the people
// listed in contributors.txt.
diff --git a/plugins/TabSRMM/src/version.h b/plugins/TabSRMM/src/version.h index 5537060714..d591342b56 100644 --- a/plugins/TabSRMM/src/version.h +++ b/plugins/TabSRMM/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "The Miranda developers team and contributors"
#define __AUTHOREMAIL "silvercircle@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/TabSRMM/"
-#define __COPYRIGHT " 2012-17 Miranda NG team, 2000-2010 Miranda Project and contributors."
+#define __COPYRIGHT "© 2012-17 Miranda NG team, 2000-2010 Miranda Project and contributors."
diff --git a/plugins/TipperYM/src/version.h b/plugins/TipperYM/src/version.h index 58e0cf0f9d..e8428aee33 100644 --- a/plugins/TipperYM/src/version.h +++ b/plugins/TipperYM/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Scott Ellis, yaho"
#define __AUTHOREMAIL "yaho@miranda-easy.net"
#define __AUTHORWEB "https://miranda-ng.org/p/Tipper/"
-#define __COPYRIGHT " 2005-2007 Scott Ellis, 2007-2011 Jan Holub"
+#define __COPYRIGHT "© 2005-2007 Scott Ellis, 2007-2011 Jan Holub"
diff --git a/plugins/Toaster/res/resource.rc b/plugins/Toaster/res/resource.rc index d80a03ad47..718e921336 100644 --- a/plugins/Toaster/res/resource.rc +++ b/plugins/Toaster/res/resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// resources
+// Нейтральный resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEU)
LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
@@ -63,12 +63,12 @@ BEGIN 0x0000
END
-#endif // resources
+#endif // Нейтральный resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -99,7 +99,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Toaster/src/resource.h b/plugins/Toaster/src/resource.h index 08def87a34..90308dac0f 100644 --- a/plugins/Toaster/src/resource.h +++ b/plugins/Toaster/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// d:\Others\SVN\MirandaNG\trunk\plugins\Toaster\res\resource.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ d:\Others\SVN\MirandaNG\trunk\plugins\Toaster\res\resource.rc
//
#define IDD_OPTIONS_MAIN 107
#define IDC_CHECK1 1013
diff --git a/plugins/Toaster/src/version.h b/plugins/Toaster/src/version.h index 9419134987..ecd1e63774 100644 --- a/plugins/Toaster/src/version.h +++ b/plugins/Toaster/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Toaster/"
-#define __COPYRIGHT " 2015-17 Miranda NG project"
+#define __COPYRIGHT "© 2015-17 Miranda NG project"
diff --git a/plugins/TooltipNotify/src/version.h b/plugins/TooltipNotify/src/version.h index 7afb851fbf..57407ab729 100644 --- a/plugins/TooltipNotify/src/version.h +++ b/plugins/TooltipNotify/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "perf"
#define __AUTHOREMAIL "perf@mail333.com"
#define __AUTHORWEB "https://miranda-ng.org/p/TooltipNotify/"
-#define __COPYRIGHT " 2004-2008 Gneedah software"
+#define __COPYRIGHT "© 2004-2008 Gneedah software"
diff --git a/plugins/TopToolBar/src/version.h b/plugins/TopToolBar/src/version.h index b4ed2e0cd3..37294d4c91 100644 --- a/plugins/TopToolBar/src/version.h +++ b/plugins/TopToolBar/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Bethoven"
#define __AUTHOREMAIL "bethoven@mailgate.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/TopToolBar/"
-#define __COPYRIGHT " 2003-2008 Bethoven"
+#define __COPYRIGHT "© 2003-2008 Bethoven"
diff --git a/plugins/TrafficCounter/src/TrafficCounter.cpp b/plugins/TrafficCounter/src/TrafficCounter.cpp index ef7c33e8ca..3c2c81fa82 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.cpp +++ b/plugins/TrafficCounter/src/TrafficCounter.cpp @@ -23,15 +23,15 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. //GLOBAL
/*-------------------------------------------------------------------------------------------------------------------*/
uTCFLAGS unOptions;
-PROTOLIST *ProtoList; // .
-PROTOLIST OverallInfo; // .
+PROTOLIST *ProtoList; // Данные обо всех аккаунтах.
+PROTOLIST OverallInfo; // Суммарные данные по видимым аккаунтам.
int NumberOfAccounts;
HWND TrafficHwnd;
HINSTANCE hInst;
CLIST_INTERFACE *pcli;
-int hLangpack = 0; // .
+int hLangpack = 0; // Поддержка плагинозависимого перевода.
BOOL bPopupExists = FALSE, bVariablesExists = FALSE, bTooltipExists = FALSE;
static wchar_t tszFormat[] =
@@ -51,7 +51,7 @@ wchar_t *TRAFFIC_COUNTER_WINDOW_CLASS = L"TrafficCounterWnd"; WORD notify_send_size = 0;
WORD notify_recv_size = 0;
//
-//
+// Цвет шрифта и фона
COLORREF Traffic_BkColor, Traffic_FontColor;
//notify
@@ -88,12 +88,12 @@ FontIDW TrafficFontID; ColourIDW TrafficBackgroundColorID;
//---------------------------------------------------------------------------------------------
-// ToolTip
+// Для ToolTip
//---------------------------------------------------------------------------------------------
BOOL TooltipShowing;
POINT TooltipPosition;
-//
+// Вспомогательные переменные чтобы заставить работать ключевой цвет
BOOL UseKeyColor;
COLORREF KeyColor;
@@ -129,7 +129,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) extern "C" int __declspec(dllexport) Load(void)
{
- // .
+ // Получаем дескриптор языкового пакета.
mir_getLP(&pluginInfoEx);
pcli = Clist_GetInterface();
@@ -146,13 +146,13 @@ extern "C" int __declspec(dllexport) Load(void) extern "C" int __declspec(dllexport) Unload(void)
{
- // .
+ // Удаляем шрифт.
if (Traffic_h_font) {
DeleteObject(Traffic_h_font);
Traffic_h_font = nullptr;
}
- // .
+ // Убиваем все рабочие данные.
DestroyProtocolList();
return 0;
}
@@ -164,20 +164,20 @@ int TrafficCounterShutdown(WPARAM, LPARAM) SaveSettings(0);
- // .
+ // Удаляем пункт главного меню.
if (hTrafficMainMenuItem) {
Menu_RemoveItem(hTrafficMainMenuItem);
hTrafficMainMenuItem = nullptr;
}
- // .
+ // Удаляем контекстное меню.
if (TrafficPopupMenu) {
DestroyMenu(TrafficPopupMenu);
TrafficPopupMenu = nullptr;
}
- // .
+ // Разрегистрируем процедуру отрисовки фрейма.
CallService(MS_SKINENG_REGISTERPAINTSUB, (WPARAM)TrafficHwnd, (LPARAM)NULL);
- // .
+ // Удаляем фрейм.
if ((ServiceExists(MS_CLIST_FRAMES_REMOVEFRAME)) && Traffic_FrameID) {
CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)Traffic_FrameID, 0);
Traffic_FrameID = nullptr;
@@ -200,7 +200,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) CreateProtocolList();
ModuleLoad(0, 0);
- //
+ // Читаем флаги
unOptions.Flags = db_get_dw(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_WHAT_DRAW, 0x0882);
Stat_SelAcc = db_get_w(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_STAT_ACC_OPT, 0x01);
@@ -214,7 +214,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) Traffic_PopupTimeoutDefault = db_get_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_POPUP_TIMEOUT_DEFAULT, 1);
Traffic_PopupTimeoutValue = db_get_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_POPUP_TIMEOUT_VALUE, 5);
- //
+ // Формат счётчика для каждого активного протокола
if (db_get_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_COUNTER_FORMAT, &dbv) == 0) {
if (mir_wstrlen(dbv.ptszVal) > 0)
mir_wstrncpy(Traffic_CounterFormat, dbv.ptszVal, _countof(Traffic_CounterFormat));
@@ -226,7 +226,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) mir_wstrcpy(Traffic_CounterFormat, tszFormat);
}
- //
+ // Формат всплывающих подсказок
if (db_get_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOOLTIP_FORMAT, &dbv) == 0) {
if (mir_wstrlen(dbv.ptszVal) > 0)
mir_wstrncpy(Traffic_TooltipFormat, dbv.ptszVal, _countof(Traffic_TooltipFormat));
@@ -240,7 +240,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) Traffic_AdditionSpace = db_get_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_ADDITION_SPACE, 0);
- //
+ // Счётчик времени онлайна
OverallInfo.Total.Timer = db_get_dw(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOTAL_ONLINE_TIME, 0);
//register traffic font
@@ -258,7 +258,7 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) TrafficFontID.order = 0;
Font_RegisterW(&TrafficFontID);
- //
+ // Регистрируем цвет фона
TrafficBackgroundColorID.cbSize = sizeof(ColourIDW);
mir_wstrcpy(TrafficBackgroundColorID.group, LPGENW("Traffic counter"));
mir_wstrcpy(TrafficBackgroundColorID.name, LPGENW("Font"));
@@ -269,11 +269,11 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) HookEvent(ME_FONT_RELOAD, UpdateFonts);
- // Variables
+ // Добавляем поддержку плагина Variables
RegisterVariablesTokens();
CreateServiceFunction("TrafficCounter/ShowHide", MenuCommand_TrafficShowHide);
- // /
+ // Регистрируем горячую клавишу для показа/скрытия фрейма
{
HOTKEYDESC hkd = {};
hkd.DefHotKey = HOTKEYCODE(HOTKEYF_CONTROL | HOTKEYF_SHIFT, 'T');
@@ -284,17 +284,17 @@ int TrafficCounterModulesLoaded(WPARAM, LPARAM) Hotkey_Register(&hkd);
}
- // .
+ // Добавляем пункт в главное меню.
if (unOptions.ShowMainMenuItem)
Traffic_AddMainMenuItem();
- // .
+ // Создаём контекстное меню.
if (TrafficPopupMenu = CreatePopupMenu()) {
AppendMenu(TrafficPopupMenu, MF_STRING, POPUPMENU_HIDE, TranslateT("Hide traffic window"));
AppendMenu(TrafficPopupMenu, MF_STRING, POPUPMENU_CLEAR_NOW, TranslateT("Clear the current (Now:) value"));
}
- // Netlib
+ // Регистрируем обработчики событий Netlib
HookEvent(ME_NETLIB_FASTRECV, TrafficRecv);
HookEvent(ME_NETLIB_FASTSEND, TrafficSend);
@@ -308,12 +308,12 @@ void SaveSettings(BYTE OnlyCnt) {
unsigned short int i;
- //
+ // Сохраняем счётчик времени онлайна
db_set_dw(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOTAL_ONLINE_TIME, OverallInfo.Total.Timer);
if (OnlyCnt) return;
- //
+ // Для каждого протокола сохраняем флаги
for (i = 0; i < NumberOfAccounts; i++) {
if (!ProtoList[i].name) continue;
db_set_b(NULL, ProtoList[i].name, SETTINGS_PROTO_FLAGS, ProtoList[i].Flags);
@@ -331,13 +331,13 @@ void SaveSettings(BYTE OnlyCnt) db_set_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_POPUP_TIMEOUT_DEFAULT, Traffic_PopupTimeoutDefault);
db_set_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_POPUP_TIMEOUT_VALUE, Traffic_PopupTimeoutValue);
//
- //
+ // Формат счётчиков
db_set_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_COUNTER_FORMAT, Traffic_CounterFormat);
db_set_ws(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_TOOLTIP_FORMAT, Traffic_TooltipFormat);
db_set_b(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_ADDITION_SPACE, Traffic_AdditionSpace);
- //
+ // Сохраняем флаги
db_set_dw(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_WHAT_DRAW, unOptions.Flags);
db_set_w(NULL, TRAFFIC_SETTINGS_GROUP, SETTINGS_STAT_ACC_OPT, Stat_SelAcc);
}
@@ -414,7 +414,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) int height = rect.bottom - rect.top;
int width = rect.right - rect.left;
- // .
+ // Свой контекст устройства.
HDC hdc = CreateCompatibleDC(hDC);
BITMAPINFO RGB32BitsBITMAPINFO = { 0 };
@@ -453,43 +453,43 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) HFONT old_font = (HFONT)SelectObject(hdc, Traffic_h_font);
- //
+ // Ограничиваем область рисования
rect.top += 2;
rect.left += 3;
rect.bottom -= 2;
rect.right -= 3;
//-------------------
- // Variables, .
+ // Если нет плагина Variables, рисуем упрощённо.
//-------------------
if (!bVariablesExists) {
SummarySession = SummaryTotal = 0;
- //
+ // Для каждого аккаунта
for (int i = 0; i < NumberOfAccounts; i++) {
- // .
+ // Только если разрешено его отображение.
if (ProtoList[i].Visible && ProtoList[i].Enabled) {
int dx = 0;
- // .
+ // Изображаем иконку аккаунта.
if (unOptions.DrawProtoIcon) {
TC_DrawIconEx(hdc, rect.left, rect.top,
Skin_LoadProtoIcon(ProtoList[i].name, CallProtoService(ProtoList[i].name, PS_GETSTATUS, 0, 0)), b, ClistModernPresent);
dx = 19;
}
- //
+ // Изображаем имя аккаунта
if (unOptions.DrawProtoName) {
rect.left += dx;
TC_AlphaText(hdc, ProtoList[i].tszAccountName, &rect, DT_SINGLELINE | DT_LEFT | DT_TOP, ClistModernPresent);
rect.left -= dx;
}
- // .
- // .
+ // Следующие позиции строятся от правого края.
+ // Общее время.
if (unOptions.DrawTotalTimeCounter) {
wchar_t bu[32];
GetDurationFormatM(ProtoList[i].Total.Timer, L"h:mm:ss", bu, 32);
TC_AlphaText(hdc, bu, &rect, DT_SINGLELINE | DT_RIGHT | DT_TOP, ClistModernPresent);
}
- // .
+ // Текущее время.
if (unOptions.DrawCurrentTimeCounter) {
wchar_t bu[32];
@@ -498,7 +498,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) TC_AlphaText(hdc, bu, &rect, DT_SINGLELINE | DT_RIGHT | DT_TOP, ClistModernPresent);
rect.right += 50;
}
- // .
+ // Изображаем общий трафик.
if (unOptions.DrawTotalTraffic) {
wchar_t bu[32];
@@ -510,7 +510,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) if (ProtoList[i].Visible)
SummaryTotal += ProtoList[i].TotalRecvTraffic + ProtoList[i].TotalSentTraffic;
}
- // .
+ // Изображаем текущий трафик.
if (unOptions.DrawCurrentTraffic) {
wchar_t bu[32];
@@ -526,17 +526,17 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) rect.top += Traffic_LineHeight + Traffic_AdditionSpace;
}
}
- // .
+ // Рисуем суммарный трафик выбранных аккаунтов.
if (unOptions.ShowSummary) {
- // .
+ // Изображаем иконку.
int dx = 0;
if (unOptions.DrawProtoIcon) {
TC_DrawIconEx(hdc, rect.left, rect.top,
Skin_LoadIcon(SKINICON_OTHER_MIRANDA), b, ClistModernPresent);
dx = 19;
}
- //
- //
+ // Выводим текст
+ // Изображаем имя
if (unOptions.DrawProtoName) {
wchar_t *bu = mir_a2u("Summary");
@@ -545,14 +545,14 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) rect.left -= dx;
mir_free(bu);
}
- // .
+ // Общее время.
if (unOptions.DrawTotalTimeCounter) {
wchar_t bu[32];
GetDurationFormatM(OverallInfo.Total.Timer, L"h:mm:ss", bu, 32);
TC_AlphaText(hdc, bu, &rect, DT_SINGLELINE | DT_RIGHT | DT_TOP, ClistModernPresent);
}
- // .
+ // Текущее время.
if (unOptions.DrawCurrentTimeCounter) {
wchar_t bu[32];
@@ -561,7 +561,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) TC_AlphaText(hdc, bu, &rect, DT_SINGLELINE | DT_RIGHT | DT_TOP, ClistModernPresent);
rect.right += 50;
}
- // .
+ // Изображаем общий трафик.
if (unOptions.DrawTotalTraffic) {
wchar_t bu[32];
@@ -570,7 +570,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) TC_AlphaText(hdc, bu, &rect, DT_SINGLELINE | DT_RIGHT | DT_TOP, ClistModernPresent);
rect.right += 100;
}
- // .
+ // Изображаем текущий трафик.
if (unOptions.DrawCurrentTraffic) {
wchar_t bu[32];
@@ -581,17 +581,17 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) }
}
rect.top += Traffic_LineHeight + Traffic_AdditionSpace;
- // .
+ // Рисуем всеобщий трафик.
if (unOptions.ShowOverall) {
- // .
+ // Изображаем иконку.
int dx = 0;
if (unOptions.DrawProtoIcon) {
TC_DrawIconEx(hdc, rect.left, rect.top,
Skin_LoadIcon(SKINICON_OTHER_MIRANDA), b, ClistModernPresent);
dx = 19;
}
- //
- //
+ // Выводим текст
+ // Изображаем имя
if (unOptions.DrawProtoName) {
wchar_t *bu = mir_a2u("Overall");
@@ -600,8 +600,8 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) rect.left -= dx;
mir_free(bu);
}
- // .
- // .
+ // Следующие позиции строятся от правого края.
+ // Изображаем общий трафик.
if (unOptions.DrawTotalTraffic) {
wchar_t bu[32];
@@ -610,7 +610,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) TC_AlphaText(hdc, bu, &rect, DT_SINGLELINE | DT_RIGHT | DT_TOP, ClistModernPresent);
rect.right += 100;
}
- // .
+ // Изображаем текущий трафик.
if (unOptions.DrawCurrentTraffic) {
wchar_t bu[32];
@@ -623,16 +623,16 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) }
else {
//-------------
- // Variables - -
+ // Если есть Variables - рисуем по-новому
//-------------
RowItemInfo *ItemsList;
WORD ItemsNumber, RowsNumber;
- // Variables .
+ // Готовим список строк для Variables и иконок.
wchar_t **ExtraText = (wchar_t**)mir_alloc(sizeof(wchar_t*));
HICON *ahIcon = (HICON*)mir_alloc(sizeof(HICON));
RowsNumber = 0;
- // .
+ // Цикл по аккаунтам.
for (int i = 0; i < NumberOfAccounts; i++) {
if (ProtoList[i].Visible && ProtoList[i].Enabled) {
ExtraText = (wchar_t**)mir_realloc(ExtraText, sizeof(wchar_t*) * (RowsNumber + 1));
@@ -642,7 +642,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) ahIcon[RowsNumber++] = Skin_LoadProtoIcon(ProtoList[i].name, CallProtoService(ProtoList[i].name, PS_GETSTATUS, 0, 0));
}
}
- // 2 .
+ // Ещё 2 особых элемента.
if (unOptions.ShowSummary) {
ExtraText = (wchar_t**)mir_realloc(ExtraText, sizeof(wchar_t*) * (RowsNumber + 1));
ahIcon = (HICON*)mir_realloc(ahIcon, sizeof(HICON) * (RowsNumber + 1));
@@ -658,16 +658,16 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) ahIcon[RowsNumber++] = Skin_LoadIcon(SKINICON_OTHER_MIRANDA);
}
- //
+ // Рисуем свой счётчик для каждого из выбранных протоколов
for (int i = 0; i < RowsNumber; i++) {
wchar_t *buf = variables_parse(Traffic_CounterFormat, ExtraText[i], NULL);
if (ItemsNumber = GetRowItems(buf, &ItemsList)) {
- // .
+ // Рисуем текст.
for (int dx = 0; dx < ItemsNumber; dx++) {
- // .
+ // Делаем копию прямоугольника для рисования.
memcpy(&rect2, &rect, sizeof(RECT));
rect2.bottom = rect2.top + Traffic_LineHeight;
- // ?
+ // Что за тег?
switch (ItemsList[dx].Alignment) {
case 'I':
TC_DrawIconEx(hdc, ItemsList[dx].Interval, rect2.top, ahIcon[i], b, ClistModernPresent);
@@ -688,7 +688,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) }
}
- // .
+ // Нужно освободить память.
for (; ItemsNumber--;)
mir_free(ItemsList[ItemsNumber].String);
@@ -698,7 +698,7 @@ int PaintTrafficCounterWindow(HWND hwnd, HDC hDC) rect.top += Traffic_LineHeight + Traffic_AdditionSpace;
}
- // .
+ // Удаляем список строк.
for (; RowsNumber--;)
mir_free(ExtraText[RowsNumber]);
mir_free(ExtraText);
@@ -735,7 +735,7 @@ void ProtocolIsOnLine(int num) - 1000 * ProtoList[num].AllStatistics[ProtoList[num].NumberOfRecords - 1].Time;
ProtoList[num].Session.Timer = 0;
- if (online_count == 1) // - .
+ if (online_count == 1) // Хотя бы один аккаунт перешёл в онлайн - готовимся считать суммарное время.
{
OverallInfo.Session.TimeAtStart = CurrentTimeMs - 1000 * OverallInfo.Session.Timer;
OverallInfo.Total.TimeAtStart = CurrentTimeMs - 1000 * OverallInfo.Total.Timer;
@@ -838,13 +838,13 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP NotifyOnSend();
break;
- case TIMER_REDRAW: // .
+ case TIMER_REDRAW: // Перерисовка раз в полсекунды.
{
DWORD CurrentTimeMs;
SYSTEMTIME stNow;
SaveSettings(1);
- // .
+ // Перед подсчётом суммарного трафика обнуляем счётчики.
OverallInfo.CurrentRecvTraffic =
OverallInfo.CurrentSentTraffic =
OverallInfo.TotalRecvTraffic =
@@ -862,11 +862,11 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP Stat_CheckStatistics(i);
- { // .
+ { // Здесь на основании статистики вычисляются значения всех трафиков и времени.
DWORD Sum1, Sum2;
unsigned long int j;
- // .
+ // Значения для текущей сессии.
for (Sum1 = Sum2 = 0, j = ProtoList[i].StartIndex; j < ProtoList[i].NumberOfRecords; j++) {
Sum1 += ProtoList[i].AllStatistics[j].Incoming;
Sum2 += ProtoList[i].AllStatistics[j].Outgoing;
@@ -875,7 +875,7 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP ProtoList[i].CurrentSentTraffic = Sum2 - ProtoList[i].StartOutgoing;
OverallInfo.CurrentRecvTraffic += ProtoList[i].CurrentRecvTraffic;
OverallInfo.CurrentSentTraffic += ProtoList[i].CurrentSentTraffic;
- // .
+ // Значения для выбранного периода.
ProtoList[i].TotalRecvTraffic =
Stat_GetItemValue(1 << i,
unOptions.PeriodForShow + 1,
@@ -892,7 +892,7 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP OverallInfo.TotalSentTraffic += ProtoList[i].TotalSentTraffic;
}
}
- // ?
+ // Не пора ли уведомить?
if (unOptions.NotifyBySize && Traffic_Notify_size_value) {
if (!((OverallInfo.CurrentRecvTraffic >> 10) % Traffic_Notify_size_value)
&& notify_recv_size != OverallInfo.CurrentRecvTraffic >> 10)
@@ -903,10 +903,10 @@ LRESULT CALLBACK TrafficCounterWndProc_MW(HWND hwnd, UINT msg, WPARAM wParam, LP NotifyOnSend();
}
- // .
+ // Счётчики суммарного времени.
GetLocalTime(&stNow);
- // ?
+ // Не пора ли сбросить общий счётчик?
if ((unOptions.PeriodForShow == 0
&& stNow.wHour == 0
&& stNow.wMinute == 0
@@ -1002,7 +1002,7 @@ void CreateTrafficWindow(HWND hCluiWnd) 0, 0, 0, 0, hCluiWnd, nullptr, hInst, nullptr);
if (ServiceExists(MS_CLIST_FRAMES_ADDFRAME)) {
- //
+ // Готовимся создавать фрейм
memset(&f, 0, sizeof(CLISTFrame));
f.align = alBottom;
f.cbSize = sizeof(CLISTFrame);
@@ -1011,12 +1011,12 @@ void CreateTrafficWindow(HWND hCluiWnd) f.hWnd = TrafficHwnd;
f.TBname = ("Traffic counter");
f.name = ("Traffic counter");
- //
+ // Создаём фрейм
Traffic_FrameID = (HANDLE)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&f, 0);
CallService(MS_SKINENG_REGISTERPAINTSUB, (WPARAM)f.hWnd, (LPARAM)TrafficCounter_PaintCallbackProc);
}
- // .
+ // Создаём таймеры.
SetTimer(TrafficHwnd, TIMER_REDRAW, 500, nullptr);
UpdateNotifyTimer();
}
@@ -1113,8 +1113,8 @@ void CreateProtocolList(void) ProtoList[i].StartIndex = ProtoList[i].NumberOfRecords - 1;
ProtoList[i].StartIncoming = ProtoList[i].AllStatistics[ProtoList[i].StartIndex].Incoming;
ProtoList[i].StartOutgoing = ProtoList[i].AllStatistics[ProtoList[i].StartIndex].Outgoing;
- } //
- // .
+ } // цикл по аккаунтам
+ // Начальные значения для суммарной информации.
OverallInfo.Session.Timer = OverallInfo.Total.Timer = 0;
}
@@ -1169,7 +1169,7 @@ int UpdateFonts(WPARAM, LPARAM) TrafficFontHeight = abs(logfont.lfHeight) + 1;
Traffic_BkColor = Colour_GetW(TrafficBackgroundColorID);
- //
+ // Ключевой цвет
UseKeyColor = db_get_b(NULL, "ModernSettings", "UseKeyColor", 1);
KeyColor = db_get_dw(NULL, "ModernSettings", "KeyColor", 0);
@@ -1190,15 +1190,15 @@ unsigned short int TrafficWindowHeight(void) for (int i = 0; i < NumberOfAccounts; i++)
ActProto += ProtoList[i].Visible && ProtoList[i].Enabled;
- // 16 ( ).
+ // Высота строки минимум 16 пикселей (для иконки).
Traffic_LineHeight = TrafficFontHeight > 16 ? TrafficFontHeight : 16;
- // .
+ // Высота фрейма равна количеству строк.
int MaxWndHeight = ActProto * Traffic_LineHeight + Traffic_AdditionSpace * (ActProto - 1) + 4;
return (MaxWndHeight < TrafficFontHeight) ? 0 : MaxWndHeight;
}
-// ProtoList
+// Функция вносит изменения в ProtoList при коммутации аккаунтов
int OnAccountsListChange(WPARAM wParam, LPARAM lParam)
{
PROTOACCOUNT *acc = (PROTOACCOUNT*)lParam;
diff --git a/plugins/TrafficCounter/src/TrafficCounter.h b/plugins/TrafficCounter/src/TrafficCounter.h index a033d67289..a11f4178be 100644 --- a/plugins/TrafficCounter/src/TrafficCounter.h +++ b/plugins/TrafficCounter/src/TrafficCounter.h @@ -24,7 +24,7 @@ int TrafficRecv(WPARAM wParam,LPARAM lParam); int TrafficSend(WPARAM wParam,LPARAM lParam);
//---------------------------------------------------------------------------------------------
-//
+// Имена параметров с настройками в базе
//---------------------------------------------------------------------------------------------
#define TRAFFIC_SETTINGS_GROUP "TrafficCounter"
@@ -51,13 +51,13 @@ int TrafficSend(WPARAM wParam,LPARAM lParam); #define TIMER_REDRAW 3300
#define TIMER_TOOLTIP 3301
#define SETTINGS_TOTAL_ONLINE_TIME "TotalOnlineTime"
-//
+// Разные флажки
#define SETTINGS_WHAT_DRAW "WhatDraw"
-// -
+// Настройки для протоколов - сохраняются в ветке протокола
#define SETTINGS_PROTO_FLAGS "tc_Flags"
-/*====== =====*/
+/*====== ФУНКЦИИ МОДУЛЯ =====*/
int TrafficCounterOptInitialise(WPARAM wParam,LPARAM lParam);
int TrafficCounterModulesLoaded(WPARAM wParam,LPARAM lParam);
int TrafficCounterShutdown(WPARAM wParam,LPARAM lParam);
@@ -77,10 +77,10 @@ int OnAccountsListChange(WPARAM wParam, LPARAM lParam); int UpdateFonts(WPARAM wParam, LPARAM lParam);
void UpdateTrafficWindowSize(void);
unsigned short int TrafficWindowHeight(void);
-//
+// Рисование
int TrafficCounter_Draw(HWND, HDC);
int PaintTrafficCounterWindow(HWND, HDC);
-//
+// Вспомогательные функции
INT_PTR MenuCommand_TrafficShowHide(WPARAM, LPARAM);
void Traffic_AddMainMenuItem(void);
diff --git a/plugins/TrafficCounter/src/misc.cpp b/plugins/TrafficCounter/src/misc.cpp index f15a045250..3e8b231e07 100644 --- a/plugins/TrafficCounter/src/misc.cpp +++ b/plugins/TrafficCounter/src/misc.cpp @@ -19,52 +19,52 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "stdafx.h"
-/* .
-:
-InputString - ;
-RowItemsList - .
- - . */
+/* Функция разбирает строку и возвращает список тегов и соответствующих им строк.
+Аргументы:
+InputString - строка для разбора;
+RowItemsList - список найденных элементов.
+Возвращаемое значение - количество элементов в списках. */
WORD GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList)
{
wchar_t *begin, *end;
WORD c = 0;
- // .
+ // Ищем слева открывающую скобку.
begin = wcschr(InputString, '{');
- // ...
+ // Если скобка найдена...
if (begin) {
- //
+ // Выделяем память под указатели
*RowItemsList = (RowItemInfo*)mir_alloc(sizeof(RowItemInfo));
}
else return 0;
do {
- // .
+ // Сразу вслед за ней ищем закрывающую.
end = wcschr(begin, '}');
- //
+ // Выделяем память под указатели
*RowItemsList = (RowItemInfo*)mir_realloc(*RowItemsList, sizeof(RowItemInfo) * (c + 1));
- // .
+ // Разбираем тег.
swscanf(begin + 1, L"%c%hd",
&((*RowItemsList)[c].Alignment),
&((*RowItemsList)[c].Interval));
- // - , .
+ // Ищем далее открывающую скобку - это конец строки, соответствующей тегу.
begin = wcschr(end, '{');
if (begin) {
- // .
+ // Выделяем память под строку.
(*RowItemsList)[c].String = (wchar_t*)mir_alloc(sizeof(wchar_t) * (begin - end));
- // .
+ // Копируем строку.
wcsncpy((*RowItemsList)[c].String, end + 1, begin - end - 1);
(*RowItemsList)[c].String[begin - end - 1] = 0;
}
else {
- // .
+ // Выделяем память под строку.
(*RowItemsList)[c].String = (wchar_t*)mir_alloc(sizeof(wchar_t) * mir_wstrlen(end));
- // .
+ // Копируем строку.
wcsncpy((*RowItemsList)[c].String, end + 1, mir_wstrlen(end));
}
@@ -74,7 +74,7 @@ WORD GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList) return c;
}
-/* . */
+/* Функция возвращает количество дней в указанном месяце указанного года. */
BYTE DaysInMonth(BYTE Month, WORD Year)
{
switch (Month) {
@@ -94,8 +94,8 @@ BYTE DaysInMonth(BYTE Month, WORD Year) return 0;
}
-//
-// 7 - , 1 - . .
+// Функция определяет день недели по дате
+// 7 - ВС, 1 - ПН и т. д.
BYTE DayOfWeek(BYTE Day, BYTE Month, WORD Year)
{
WORD a, y, m;
@@ -111,19 +111,19 @@ BYTE DayOfWeek(BYTE Day, BYTE Month, WORD Year) }
/*
-:
-Value - ;
-Unit - (0 - , 1 - , 2 - , 3 - );
-Buffer - ;
-Size - .
- : .
+Аргументы:
+Value - количество байт;
+Unit - единицы измерения (0 - байты, 1 - килобайты, 2 - мегабайты, 3 - автоматически);
+Buffer - адрес строки для записи результата;
+Size - размер буфера.
+Возвращаемое значение: требуемый размер буфера.
*/
size_t GetFormattedTraffic(DWORD Value, BYTE Unit, wchar_t *Buffer, size_t Size)
{
wchar_t Str1[32], szUnit[4] = { ' ', 0 };
DWORD Divider;
NUMBERFMT nf = { 0, 1, 3, L",", L" ", 0 };
- wchar_t *Res; // .
+ wchar_t *Res; // Промежуточный результат.
switch (Unit) {
case 0: //bytes
@@ -167,36 +167,36 @@ size_t GetFormattedTraffic(DWORD Value, BYTE Unit, wchar_t *Buffer, size_t Size) return l;
}
-/*
-:
-Duration: ;
-Format: ;
-Buffer: , .
-Size - . */
+/* Преобразование интервала времени в его строковое представление
+Аргументы:
+Duration: интервал времени в секундах;
+Format: строка формата;
+Buffer: адрес буфера, куда функция помещает результат.
+Size - размер буфера. */
size_t GetDurationFormatM(DWORD Duration, wchar_t *Format, wchar_t *Buffer, size_t Size)
{
size_t Length;
DWORD q;
WORD TokenIndex, FormatIndex;
- wchar_t Token[256], // .
- *Res; // .
+ wchar_t Token[256], // Аккумулятор.
+ *Res; // Промежуточный результат.
- Res = (wchar_t*)malloc(sizeof(wchar_t)); // - , .
+ Res = (wchar_t*)malloc(sizeof(wchar_t)); // Выделяем чуть-чуть памяти под результат, но это только начало.
//SecureZeroMemory(Res, sizeof(wchar_t));
Res[0] = 0;
for (FormatIndex = 0; Format[FormatIndex];) {
- // . , - .
+ // Ищем токены. Считается, что токен - только буквы.
TokenIndex = 0;
q = iswalpha(Format[FormatIndex]);
- // .
+ // Копируем символы в аккумулятор до смены флага.
do {
Token[TokenIndex++] = Format[FormatIndex++];
} while (q == iswalpha(Format[FormatIndex]));
Token[TokenIndex] = 0;
- // ?
+ // Что получили в аккумуляторе?
if (!mir_wstrcmp(Token, L"d")) {
q = Duration / (60 * 60 * 24);
mir_snwprintf(Token, L"%d", q);
@@ -233,7 +233,7 @@ size_t GetDurationFormatM(DWORD Duration, wchar_t *Format, wchar_t *Buffer, size Duration -= q;
}
- // , .
+ // Добавим памяти, если нужно.
Length = mir_wstrlen(Res) + mir_wstrlen(Token) + 1;
Res = (wchar_t*)realloc(Res, Length * sizeof(wchar_t));
mir_wstrcat(Res, Token);
@@ -249,7 +249,7 @@ size_t GetDurationFormatM(DWORD Duration, wchar_t *Format, wchar_t *Buffer, size return Length;
}
-/* :
+/* Результат:
-1 - st1 < st2
0 - st1 = st2
+1 - st1 > st2
diff --git a/plugins/TrafficCounter/src/misc.h b/plugins/TrafficCounter/src/misc.h index d0d784e6cf..04343d3c33 100644 --- a/plugins/TrafficCounter/src/misc.h +++ b/plugins/TrafficCounter/src/misc.h @@ -1,30 +1,30 @@ typedef struct
{
- wchar_t Alignment; // . L - , R - .
- WORD Interval; // , .
- wchar_t *String; // .
+ wchar_t Alignment; // Выравнивание. L - к левой границе, R - к правой.
+ WORD Interval; // Расстояние, на которое граница строки отстоит от левого края фрейма.
+ wchar_t *String; // Собственно строка.
} RowItemInfo;
-/* .
-:
-InputString - ;
-RowItemsList - .
- - . */
+/* Функция разбирает строку и возвращает список тегов и соответствующих им строк.
+Аргументы:
+InputString - строка для разбора;
+RowItemsList - список найденных элементов.
+Возвращаемое значение - количество элементов в списках. */
WORD GetRowItems(wchar_t *InputString, RowItemInfo **RowItemsList);
-/* . */
+/* Функция возвращает количество дней в указанном месяце указанного года. */
BYTE DaysInMonth(BYTE Month, WORD Year);
-//
-// 7 - , 1 - . .
+// Функция определяет день недели по дате
+// 7 - ВС, 1 - ПН и т. д.
BYTE DayOfWeek(BYTE Day, BYTE Month, WORD Year);
-/* :
- Value - ;
- Unit - (0 - , 1 - , 2 - , 3 - );
- Buffer - ;
- Size - .
- : . */
+/* Аргументы:
+ Value - количество байт;
+ Unit - единицы измерения (0 - байты, 1 - килобайты, 2 - мегабайты, 3 - автоматически);
+ Buffer - адрес строки для записи результата;
+ Size - размер буфера.
+Возвращаемое значение: требуемый размер буфера. */
size_t GetFormattedTraffic(DWORD Value, BYTE Unit, wchar_t *Buffer, size_t Size);
size_t GetDurationFormatM(DWORD Duration, wchar_t *Format, wchar_t *Buffer, size_t Size);
diff --git a/plugins/TrafficCounter/src/options.cpp b/plugins/TrafficCounter/src/options.cpp index 605f04767a..16cfb39ab7 100644 --- a/plugins/TrafficCounter/src/options.cpp +++ b/plugins/TrafficCounter/src/options.cpp @@ -17,13 +17,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* ======================================================================================
-
-: Mironych
+Здесь содержатся переменные и функции для работы со статистикой
+Автор: Mironych
=======================================================================================*/
#include "stdafx.h"
-OPTTREE_OPTION *pOptions; // opttree.c .
+OPTTREE_OPTION *pOptions; // Через этот указатель модуль opttree.c может добраться до списка опций.
/////////////////////////////////////////////////////////////////////////////////////////
@@ -135,8 +135,8 @@ static OPTTREE_OPTION options[] = {0, LPGENW("General") L"/" LPGENW("Draw frame as skin element"), OPTTREE_CHECK, 1, nullptr, "DrawFrmAsSkin"},
{0, LPGENW("General") L"/" LPGENW("Show tooltip in traffic window"), OPTTREE_CHECK, 1, nullptr, "ShowTooltip"},
{0, LPGENW("General") L"/" LPGENW("\"Toggle traffic counter\" in main menu"), OPTTREE_CHECK, 1, nullptr, "ShowMainMenuItem"},
- //
- // 16 16
+ // Резервируем место под активные и видимые протоколы
+ // Максимум 16 позиций видимых и 16 активных
{0, nullptr, OPTTREE_CHECK, OPTTREE_INVISIBLE, nullptr, nullptr},
{0, nullptr, OPTTREE_CHECK, OPTTREE_INVISIBLE, nullptr, nullptr},
{0, nullptr, OPTTREE_CHECK, OPTTREE_INVISIBLE, nullptr, nullptr},
@@ -183,12 +183,12 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, if (!Initialized) {
pOptions = options;
optionCount = _countof(options);
- // Variables,
+ // Если нет Variables, активируем галочки для старого метода рисования
if (!bVariablesExists)
for (i = 0; i < 8; i++)
options[i].dwFlag = 1;
- // .
+ // Флажки для видимости аккаунтов создаются в любом случае.
for (i = j = 0; (j < NumberOfAccounts) && (i < optionCount) ; i++)
if ((options[i].dwFlag & OPTTREE_INVISIBLE) && !options[i].szSettingName)
{
@@ -215,11 +215,11 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, //show/hide button
SetDlgItemText(hwndDlg,IDC_BSHOWHIDE,(IsWindowVisible(TrafficHwnd) != 0)? TranslateT("Hide now") : TranslateT("Show now"));
- //
+ // Строки формата для счётчиков
EnableWindow(GetDlgItem(hwndDlg, IDC_EDIT_COUNTER_FORMAT), bVariablesExists);
SetDlgItemText(hwndDlg, IDC_EDIT_COUNTER_FORMAT, Traffic_CounterFormat);
- //
+ // Формат всплывающей подсказки
EnableWindow(GetDlgItem(hwndDlg,IDC_EDIT_TOOLTIP_FORMAT), bTooltipExists);
SetDlgItemText(hwndDlg, IDC_EDIT_TOOLTIP_FORMAT, Traffic_TooltipFormat);
@@ -230,7 +230,7 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, SendDlgItemMessage(hwndDlg, IDC_COMBO_AUTO_CLEAR, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Year"));
SendDlgItemMessage(hwndDlg, IDC_COMBO_AUTO_CLEAR, CB_SETCURSEL, unOptions.PeriodForShow, 0);
- //
+ // Интервал между строками
SetDlgItemInt(hwndDlg, IDC_EDIT_SPACE, Traffic_AdditionSpace, 0);
SendDlgItemMessage(hwndDlg, IDC_EDIT_SPACE, EM_LIMITTEXT, 2, 0);
@@ -246,7 +246,7 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, OptTree_SetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, unOptions.ShowTooltip, "ShowTooltip");
OptTree_SetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, unOptions.ShowMainMenuItem, "ShowMainMenuItem");
- //
+ // Настройки видимости протоколов
for (i = 0; i < NumberOfAccounts; i++) {
char buffer[32];
mir_strcpy(buffer, ProtoList[i].name);
@@ -285,9 +285,9 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, case PSN_APPLY:
unOptions.PeriodForShow = (char)SendDlgItemMessage(hwndDlg,IDC_COMBO_AUTO_CLEAR,CB_GETCURSEL,0,0);
- //
+ // Интервал между строками
Traffic_AdditionSpace = GetDlgItemInt(hwndDlg, IDC_EDIT_SPACE, nullptr, 0);
- // Appearance
+ // Настройки Appearance
unOptions.DrawProtoIcon = OptTree_GetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, "DrawProtoIcon");
unOptions.DrawProtoName = OptTree_GetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, "DrawProtoName");
unOptions.DrawCurrentTraffic = OptTree_GetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, "DrawCurrentTraffic");
@@ -300,7 +300,7 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, unOptions.ShowTooltip = OptTree_GetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, "ShowTooltip");
unOptions.ShowMainMenuItem = OptTree_GetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, "ShowMainMenuItem");
- //
+ // Настройки видимости протоколов
for (i = 0; i < NumberOfAccounts; i++)
{
char buffer[32];
@@ -309,25 +309,25 @@ static INT_PTR CALLBACK DlgProcTCOptions(HWND hwndDlg, UINT msg, WPARAM wParam, }
unOptions.ShowOverall = OptTree_GetOptions(hwndDlg, IDC_APPEARANCEOPTIONS, options, optionCount, "ShowOverall");
- //
+ // Формат счётчиков
GetDlgItemText(hwndDlg, IDC_EDIT_COUNTER_FORMAT, Traffic_CounterFormat, _countof(Traffic_CounterFormat));
- //
+ // Формат всплывающей подсказки
GetDlgItemText(hwndDlg, IDC_EDIT_TOOLTIP_FORMAT, Traffic_TooltipFormat, _countof(Traffic_TooltipFormat));
- //
+ // Ключевой цвет
UseKeyColor = db_get_b(NULL, "ModernSettings", "UseKeyColor", 1);
KeyColor = db_get_dw(NULL, "ModernSettings", "KeyColor", 0);
- //
+ // Перерисовываем фрейм
UpdateTrafficWindowSize();
- // , .
+ // Если отключается показ пункта главного меню, то удаляем его.
if (!unOptions.ShowMainMenuItem && hTrafficMainMenuItem)
{
Menu_RemoveItem(hTrafficMainMenuItem);
hTrafficMainMenuItem = nullptr;
}
- // , .
+ // Если включается, то создаём.
if (unOptions.ShowMainMenuItem && !hTrafficMainMenuItem)
Traffic_AddMainMenuItem();
diff --git a/plugins/TrafficCounter/src/opttree.cpp b/plugins/TrafficCounter/src/opttree.cpp index c3d6cfdc7d..fb9ffe8f91 100644 --- a/plugins/TrafficCounter/src/opttree.cpp +++ b/plugins/TrafficCounter/src/opttree.cpp @@ -36,7 +36,7 @@ static void OptTree_TranslateItem(HWND hwndTree, HTREEITEM hItem) tvi.pszText = buf;
tvi.cchTextMax = _countof(buf);
SendMessage(hwndTree, TVM_GETITEM, 0, (LPARAM)&tvi);
- // , .
+ // Проверим, надо ли переводить.
if ((tvi.lParam != -1) && (pOptions[tvi.lParam].dwFlag & OPTTREE_NOTRANSLATE)) return;
tvi.pszText = TranslateW(tvi.pszText);
SendMessage(hwndTree, TVM_SETITEM, 0, (LPARAM)&tvi);
diff --git a/plugins/TrafficCounter/src/opttree.h b/plugins/TrafficCounter/src/opttree.h index 8c80b599eb..4fde5a2387 100644 --- a/plugins/TrafficCounter/src/opttree.h +++ b/plugins/TrafficCounter/src/opttree.h @@ -24,7 +24,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __opttree_h__
#define __opttree_h__
-//
+// дыруш
#define OPTTREE_CHECK 0
#define OPTTREE_INVISIBLE 2
#define OPTTREE_NOTRANSLATE 4
diff --git a/plugins/TrafficCounter/src/statistics.cpp b/plugins/TrafficCounter/src/statistics.cpp index 342b1d8fa2..5451e7158e 100644 --- a/plugins/TrafficCounter/src/statistics.cpp +++ b/plugins/TrafficCounter/src/statistics.cpp @@ -17,13 +17,13 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* ======================================================================================
-
-: Mironych
+Здесь содержатся переменные и функции для работы со статистикой
+Автор: Mironych
=======================================================================================*/
#include "stdafx.h"
-WORD Stat_SelAcc; //
+WORD Stat_SelAcc; // Выбранные аккаунты в окне статистики
HWND hListAccs;
@@ -34,7 +34,7 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA switch (msg) {
case WM_INITDIALOG:
TranslateDialogDefault(hwndDlg);
- // ListBox c .
+ // Создаём ListBox c перечнем аккаунтов.
hListAccs = CreateWindowEx(WS_EX_CLIENTEDGE,
L"ListBox",
nullptr, WS_CHILD | WS_VISIBLE | WS_VSCROLL | WS_TABSTOP | LBS_NOINTEGRALHEIGHT | LBS_EXTENDEDSEL | LBS_NOTIFY,
@@ -42,19 +42,19 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA hwndDlg, nullptr, nullptr, nullptr);
SendMessage(hListAccs, WM_SETFONT, (WPARAM)(HFONT)GetStockObject(DEFAULT_GUI_FONT), 0);
for (i = 0; i < NumberOfAccounts; i++) {
- //
+ // Готовим список аккаунтов
if (ProtoList[i].tszAccountName)
SendMessage(hListAccs, LB_ADDSTRING, 0, (LPARAM)ProtoList[i].tszAccountName);
}
for (i = NumberOfAccounts; i--;)
SendMessage(hListAccs, LB_SETSEL, (WPARAM)0x01 & (Stat_SelAcc >> i), (LPARAM)i);
- //
+ // Готовим список единиц измерения
SendDlgItemMessage(hwndDlg, IDC_COMBO_UNITS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Bytes"));
SendDlgItemMessage(hwndDlg, IDC_COMBO_UNITS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("KB"));
SendDlgItemMessage(hwndDlg, IDC_COMBO_UNITS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("MB"));
SendDlgItemMessage(hwndDlg, IDC_COMBO_UNITS, CB_INSERTSTRING, -1, (LPARAM)TranslateT("Adaptive"));
SendDlgItemMessage(hwndDlg, IDC_COMBO_UNITS, CB_SETCURSEL, unOptions.Stat_Units, 0);
- //
+ // Готовим закладки
{
TCITEM tci;
tci.mask = TCIF_TEXT;
@@ -70,7 +70,7 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA SendDlgItemMessage(hwndDlg, IDC_TAB_STATS, TCM_INSERTITEM, 4, (LPARAM)&tci);
SendDlgItemMessage(hwndDlg, IDC_TAB_STATS, TCM_SETCURSEL, unOptions.Stat_Tab, 0);
}
- // ListView -
+ // Готовим ListView - колонки и стили
{
SendDlgItemMessage(hwndDlg, IDC_LIST_DATA, LVM_SETEXTENDEDLISTVIEWSTYLE, 0, LVS_EX_FULLROWSELECT);
SendDlgItemMessage(hwndDlg, IDC_LIST_DATA, LVM_SETUNICODEFORMAT, 1, 0);
@@ -136,7 +136,7 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA for (i = NumberOfAccounts; i--;)
if (0x01 & (Stat_SelAcc >> i)) {
SetFilePointer(ProtoList[i].hFile, sizeof(HOURLYSTATS), nullptr, FILE_BEGIN);
- SetEndOfFile(ProtoList[i].hFile); // .
+ SetEndOfFile(ProtoList[i].hFile); // Усекаем файл до одной записи.
ProtoList[i].NumberOfRecords = 1;
ProtoList[i].AllStatistics = (HOURLYSTATS*)mir_realloc(ProtoList[i].AllStatistics, sizeof(HOURLYSTATS));
ProtoList[i].AllStatistics[0].Hour = stNow.wHour;
@@ -179,10 +179,10 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA if (!(pdi->item.mask & LVIF_TEXT)) return 0;
- // .
+ // Если нужна надпись.
if (!pdi->item.iSubItem) {
EldestAcc = Stat_GetEldestAcc(Stat_SelAcc);
- // !
+ // Индекс применим только для самого старого аккаунта!
Index = Stat_GetStartIndex(EldestAcc, unOptions.Stat_Tab, pdi->item.iItem, &st);
switch (unOptions.Stat_Tab) {
case 0: // Hourly
@@ -196,12 +196,12 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, nullptr, pdi->item.pszText, 32);
break;
case 2: // Weekly
- // .
+ // Уходим к первому понедельнику слева.
SystemTimeToVariantTime(&st, &vartime);
vartime -= DayOfWeek(st.wDay, st.wMonth, st.wYear) - 1;
VariantTimeToSystemTime(vartime, &st);
GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, &st, nullptr, pdi->item.pszText, 32);
- // .
+ // Теперь к воскресенью.
SystemTimeToVariantTime(&st, &vartime);
vartime += 6;
VariantTimeToSystemTime(vartime, &st);
@@ -220,14 +220,14 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA Value = Stat_GetItemValue(Stat_SelAcc, unOptions.Stat_Tab, pdi->item.iItem, pdi->item.iSubItem);
- // ListView .
+ // Теперь можно записать в ListView циферки.
switch (pdi->item.iSubItem) {
- case 1: //
- case 2: //
- case 3: //
+ case 1: // Входящий
+ case 2: // Исходящий
+ case 3: // Сумма
GetFormattedTraffic(Value, unOptions.Stat_Units, pdi->item.pszText, 32);
break;
- case 4: //
+ case 4: // Время
{
wchar_t *Fmt[5] = { L"m:ss", L"h:mm:ss", L"h:mm:ss", L"d hh:mm:ss", L"d hh:mm:ss" };
GetDurationFormatM(Value, Fmt[unOptions.Stat_Tab], pdi->item.pszText, 32);
@@ -257,10 +257,10 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA LPNMLVCUSTOMDRAW lplvcd = (LPNMLVCUSTOMDRAW)lParam;
switch (lplvcd->nmcd.dwDrawStage) {
- case CDDS_PREPAINT: // ListView.
+ case CDDS_PREPAINT: // Перед началом рисования всего ListView.
SetWindowLongPtr(hwndDlg, DWLP_MSGRESULT, CDRF_NOTIFYITEMDRAW);
return TRUE;
- case CDDS_ITEMPREPAINT: // .
+ case CDDS_ITEMPREPAINT: // Перед началом рисования строки.
{
COLORREF Color;
BYTE r, g, b;
@@ -291,7 +291,7 @@ INT_PTR CALLBACK DlgProcOptStatistics(HWND hwndDlg, UINT msg, WPARAM wParam, LPA }
/*
- n.
+Функция читает статистику из файла для аккаунта с номером n.
*/
void Stat_ReadFile(BYTE n)
{
@@ -308,9 +308,9 @@ void Stat_ReadFile(BYTE n) ProtoList[n].hFile = CreateFile(FileName, GENERIC_READ | GENERIC_WRITE,
FILE_SHARE_READ, nullptr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, nullptr);
GetFileSizeEx(ProtoList[n].hFile, &Size);
- if (Size.QuadPart != 0) // ...
+ if (Size.QuadPart != 0) // Если файл со статистикой существует и имеет ненулевой размер...
{
- // ...
+ // ...то читаем статистику из файла
ProtoList[n].NumberOfRecords = DWORD(Size.QuadPart / sizeof(HOURLYSTATS));
ProtoList[n].AllStatistics = (HOURLYSTATS*)mir_alloc(sizeof(HOURLYSTATS)*ProtoList[n].NumberOfRecords);
ReadFile(ProtoList[n].hFile, &ProtoList[n].AllStatistics[0], sizeof(HOURLYSTATS)*ProtoList[n].NumberOfRecords, &BytesRead, nullptr);
@@ -320,7 +320,7 @@ void Stat_ReadFile(BYTE n) }
}
else {
- // .
+ // Необходимо создать новый файл.
ProtoList[n].NumberOfRecords = 1;
ProtoList[n].AllStatistics = (HOURLYSTATS*)mir_alloc(sizeof(HOURLYSTATS));
ProtoList[n].AllStatistics[0].Hour = stNow.wHour;
@@ -334,17 +334,17 @@ void Stat_ReadFile(BYTE n) Stat_CheckStatistics(n);
}
-/* ListView .
-: hwndDialog - . */
+/* Функция готовит вывод в ListView статистики.
+Аргументы: hwndDialog - хэндл окна диалога. */
void Stat_Show(HWND hwndDialog)
{
DWORD MaxRecords;
- // .
+ // Нужно узнать количество записей.
MaxRecords = Stat_GetRecordsNumber(Stat_GetEldestAcc(Stat_SelAcc), unOptions.Stat_Tab);
- // ListView.
+ // Установим такое же количество строк в ListView.
SendDlgItemMessage(hwndDialog, IDC_LIST_DATA, LVM_SETITEMCOUNT, MaxRecords, 0);
- // .
+ // Надо показать самые свежие записи.
SendDlgItemMessage(hwndDialog, IDC_LIST_DATA, LVM_ENSUREVISIBLE, (WPARAM)(MaxRecords - 1), 0);
}
@@ -361,11 +361,11 @@ void Stat_UpdateTotalTraffic(HWND hwndDialog, DWORD Incoming, DWORD Outgoing) }
/*
- n.
- , .
- ( ),
- .
- , .
+Функция сравнивает с текущим время последней записи в статистике для аккаунта с номером n.
+Если они совпадают, ничего не происходит.
+Если текущее время меньше времени последней записи (часы перевели назад),
+количество записей уменьшается на соответствующее количество часов.
+Если текущее время больше, в статистику включается необходимое количество пустых записей.
*/
void Stat_CheckStatistics(BYTE n)
{
@@ -381,15 +381,15 @@ void Stat_CheckStatistics(BYTE n) GetLocalTime(&stNow);
d = TimeCompare(stNow, stLast);
- // ...
+ // Если текущее время совпадает со временем последней записи...
if (!d) {
- // ... .
+ // ...сохраняем запись в файл и уходим.
SetFilePointer(ProtoList[n].hFile, -LONG(sizeof(HOURLYSTATS)), nullptr, FILE_END);
WriteFile(ProtoList[n].hFile, &ProtoList[n].AllStatistics[ProtoList[n].NumberOfRecords - 1], sizeof(HOURLYSTATS), &q, nullptr);
return;
}
- // .
+ // Если часы перевели назад.
if (d < 0) {
do {
stLast.wHour--;
@@ -411,14 +411,14 @@ void Stat_CheckStatistics(BYTE n) }
if (d > 0) {
- // .
+ // Сохраняем.
SetFilePointer(ProtoList[n].hFile, -LONG(sizeof(HOURLYSTATS)), nullptr, FILE_END);
WriteFile(ProtoList[n].hFile, &ProtoList[n].AllStatistics[ProtoList[n].NumberOfRecords - 1], sizeof(HOURLYSTATS), &q, nullptr);
- // , ( ).
+ // Последняя запись из статистики понадобится для вычисления новых записей, поэтому копируем её (кроме трафика и времени).
memcpy(&htTmp, &ProtoList[n].AllStatistics[ProtoList[n].NumberOfRecords - 1],
sizeof(HOURLYSTATS) - 2 * sizeof(DWORD) - sizeof(WORD));
- // .
+ // Счётчик времени каждый час должен начинать считать с нуля.
ProtoList[n].Total.TimeAtStart = GetTickCount() - stNow.wMilliseconds;
do {
@@ -441,7 +441,7 @@ void Stat_CheckStatistics(BYTE n) stLast.wMonth = htTmp.Month;
stLast.wYear = htTmp.Year;
- // .
+ // Добавляем записи одновременно в ОЗУ и в файл.
WriteFile(ProtoList[n].hFile, &htTmp, sizeof(HOURLYSTATS), &q, nullptr);
memcpy(&ProtoList[n].AllStatistics[ProtoList[n].NumberOfRecords - 1], &htTmp, sizeof(HOURLYSTATS));
@@ -449,16 +449,16 @@ void Stat_CheckStatistics(BYTE n) }
}
-/* , .
- .
-:
-ItemNumber - ListView ( ).
-stReq - , .
+/* Функция возращает индекс первой записи в статистике, относящейся к выбранному интервалу.
+При вычислении учитывается выбранный интервал и аккаунты.
+Аргументы:
+ItemNumber - номер строки в ListView (номер периода).
+stReq - дата, соответствующая вычисленному индексу.
*/
DWORD Stat_GetStartIndex(BYTE AccNum, BYTE Interval, DWORD ItemNumber, SYSTEMTIME *stReq)
{
- DWORD Left, Right, Probe; // ( ).
- SYSTEMTIME stProbe = { 0 }; // .
+ DWORD Left, Right, Probe; // Границы интервала для поиска (индексы статистики).
+ SYSTEMTIME stProbe = { 0 }; // Время тыка.
signed short int d = 1;
if (!ItemNumber) {
@@ -469,7 +469,7 @@ DWORD Stat_GetStartIndex(BYTE AccNum, BYTE Interval, DWORD ItemNumber, SYSTEMTIM return 0;
}
- // , .
+ // Вычисляем время, соответствующее началу интервала.
for (Probe = 0, Left = 1; Left < ProtoList[AccNum].NumberOfRecords; Left++) {
switch (Interval) {
case STAT_INTERVAL_HOUR:
@@ -509,7 +509,7 @@ DWORD Stat_GetStartIndex(BYTE AccNum, BYTE Interval, DWORD ItemNumber, SYSTEMTIM Left = 0; Right = ProtoList[AccNum].NumberOfRecords - 1;
- // .
+ // Вычисляем индекс начала интервала.
while (TRUE) {
if (Right - Left == 1) return Right;
Probe = (Left + Right) >> 1;
@@ -525,12 +525,12 @@ DWORD Stat_GetStartIndex(BYTE AccNum, BYTE Interval, DWORD ItemNumber, SYSTEMTIM return Probe;
}
-/* ,
- ,
- . */
+/* Функция устанавливает величину сдвига для заданного аккаунта,
+то есть номер записи в статистике старейшего из выбранных аккаунтов,
+дата которой соответствует началу статистики указанного аккаунта. */
void Stat_SetAccShift(BYTE AccNum, BYTE EldestAccount)
{
- DWORD Left, Right, Probe = 0; // ( ).
+ DWORD Left, Right, Probe = 0; // Границы интервала для поиска (индексы статистики).
SYSTEMTIME stReq = { 0 }, stProbe;
signed short int d = 1;
@@ -544,7 +544,7 @@ void Stat_SetAccShift(BYTE AccNum, BYTE EldestAccount) stReq.wMonth = ProtoList[AccNum].AllStatistics[0].Month;
stReq.wYear = ProtoList[AccNum].AllStatistics[0].Year;
- // .
+ // Вычисляем индекс начала интервала.
Left = 0; Right = ProtoList[EldestAccount].NumberOfRecords - 1;
while (TRUE) {
if (Right - Left == 1) {
@@ -564,13 +564,13 @@ void Stat_SetAccShift(BYTE AccNum, BYTE EldestAccount) ProtoList[AccNum].Shift = Probe;
}
-/* ,
- ListView.
-:
-SelectedAccs - , ;
-Interval - ;
-ItemNum - ListVew;
-SubitemNum - , . */
+/* Функция вычисляет значение, соответствующее указанному подэлементу
+указанной строки ListView.
+Аргументы:
+SelectedAccs - слово, в котором единичные биты соответствуют выбранным аккаунтам;
+Interval - выбранный интервал;
+ItemNum - номер строки в ListVew;
+SubitemNum - номер колонки, определяет вид информации. */
DWORD Stat_GetItemValue(WORD SelectedAccs, BYTE Interval, DWORD ItemNum, BYTE SubItemNum)
{
@@ -592,29 +592,29 @@ DWORD Stat_GetItemValue(WORD SelectedAccs, BYTE Interval, DWORD ItemNum, BYTE Su for (i = 0;;) {
if (IndexM >= 0)
switch (SubItemNum) {
- case 1: //
+ case 1: // Входящий
Result += ProtoList[a].AllStatistics[IndexM].Incoming;
break;
- case 2: //
+ case 2: // Исходящий
Result += ProtoList[a].AllStatistics[IndexM].Outgoing;
break;
- case 3: //
+ case 3: // Сумма
Result += ProtoList[a].AllStatistics[IndexM].Incoming
+ ProtoList[a].AllStatistics[IndexM].Outgoing;
break;
- case 4: //
+ case 4: // Время
Result += ProtoList[a].AllStatistics[IndexM].Time;
break;
}
- IndexM++; IndexP++; // .
+ IndexM++; IndexP++; // Переходим к следующей записи.
if (IndexM == ProtoList[a].NumberOfRecords)
break;
- // ?
+ // Когда остановиться?
switch (Interval) {
case STAT_INTERVAL_HOUR:
- i = 1; // .
+ i = 1; // Новый час начинается каждый час.
break;
case STAT_INTERVAL_DAY:
i = (0 == ProtoList[EldestAcc].AllStatistics[IndexP].Hour);
@@ -643,16 +643,16 @@ DWORD Stat_GetItemValue(WORD SelectedAccs, BYTE Interval, DWORD ItemNum, BYTE Su return Result;
}
-/*
- . */
+/* Функция возвращает количество записей в статистике для
+заданного аккаунта и заданного интервала. */
DWORD Stat_GetRecordsNumber(BYTE AccNum, BYTE Interval)
{
DWORD Result, i;
- // .
+ // Нужно узнать количество записей.
switch (Interval) {
case STAT_INTERVAL_HOUR:
- Result = ProtoList[AccNum].NumberOfRecords; // .
+ Result = ProtoList[AccNum].NumberOfRecords; // Для почасовой статистики совпадает.
break;
case STAT_INTERVAL_DAY:
for (Result = 1, i = ProtoList[AccNum].NumberOfRecords - 1; i--;)
@@ -688,16 +688,16 @@ BYTE Stat_GetEldestAcc(WORD SelectedAccs) {
BYTE Result, i;
- // , .
- // ( .)
+ // Узнаём номер аккаунта из числа выбранных, имеющего самую старую первую запись.
+ // (Это аккаунт с максимальным количеством записей.)
for (Result = i = 0; i < NumberOfAccounts; i++) {
- // - .
+ // Надо с чего-то начать поиск.
if (0x01 & (SelectedAccs >> i)) {
Result = i;
break;
}
}
- // .
+ // Продолжаем поиск.
for (; ++i < NumberOfAccounts;) {
if (0x01 & (SelectedAccs >> i) && (ProtoList[i].NumberOfRecords > ProtoList[Result].NumberOfRecords))
Result = i;
diff --git a/plugins/TrafficCounter/src/stdafx.h b/plugins/TrafficCounter/src/stdafx.h index 2868dc3b87..edd4494e3a 100644 --- a/plugins/TrafficCounter/src/stdafx.h +++ b/plugins/TrafficCounter/src/stdafx.h @@ -65,53 +65,53 @@ typedef struct typedef struct tagTimer
{
- DWORD TimeAtStart; // - .
- DWORD Timer; // .
+ DWORD TimeAtStart; // Время в момент запуска таймера - в миллисекундах.
+ DWORD Timer; // Количество секунд со времени запуска таймера.
} TIMER;
typedef struct
{
- char *name; // .
+ char *name; // Имя аккаунта.
- TIMER Session; // ( ).
- TIMER Total; // .
+ TIMER Session; // Таймер текущей сессии (протокол в онлайне).
+ TIMER Total; // Таймер общий.
- DWORD TotalRecvTraffic, // ( )
+ DWORD TotalRecvTraffic, // Общий трафик протокола (за выбранный период)
TotalSentTraffic,
- CurrentRecvTraffic, // ( )
+ CurrentRecvTraffic, // Текущий трафик протокола (за сессию)
CurrentSentTraffic;
union
{
BYTE Flags;
struct
{
- unsigned int Reserv0:1; // - .
- unsigned int Visible:1; // = 1 -
- unsigned int Enabled:1; // = 1 -
- unsigned int State:1; // = 1 -
+ unsigned int Reserv0:1; // Активность потеряла смысл - статистика ведётся по всем аккаунтам.
+ unsigned int Visible:1; // = 1 - аккаунт будет показываться во фрейме счётчиков
+ unsigned int Enabled:1; // = 1 - аккаунт включен и не прячется
+ unsigned int State:1; // = 1 - аккаунт сейчас онлайн
unsigned int Reserv1:3;
};
};
- // 0.1.1.0.
- DWORD NumberOfRecords; // .
- HOURLYSTATS *AllStatistics; // .
- HANDLE hFile; // .
+ // Добавлено в версии 0.1.1.0.
+ DWORD NumberOfRecords; // Количество часов в общей статистике.
+ HOURLYSTATS *AllStatistics; // Полная статистика вместе со статистикой онлайна.
+ HANDLE hFile; // Файл с сохранённой статистикой данного протокола.
- DWORD StartIndex; // , .
- DWORD StartIncoming; // .
- DWORD StartOutgoing; // .
+ DWORD StartIndex; // Номер записи в статистике, бывший актуальным на момент запуска.
+ DWORD StartIncoming; // Значение входящего трафика на момент запуска.
+ DWORD StartOutgoing; // Значение исходящего трафика на момент запуска.
// 0.1.1.5.
- DWORD Shift; // ,
- // .
+ DWORD Shift; // Номер записи в статистике старейшего выбранного аккаунта,
+ // дата которой соответствует началу статистики данного аккаунта.
// 0.1.1.6
- wchar_t *tszAccountName; // .
+ wchar_t *tszAccountName; // Человеческое имя аккаунта для использования в графическом интерфейсе.
} PROTOLIST;
//---------------------------------------------------------------------------------------------
-//
+// Различные флаги
//---------------------------------------------------------------------------------------------
typedef union
{
@@ -166,7 +166,7 @@ extern COLORREF KeyColor; extern HGENMENU hTrafficMainMenuItem;
extern WORD Stat_SelAcc;
-extern OPTTREE_OPTION *pOptions; // TrafficCounter.c.
+extern OPTTREE_OPTION *pOptions; // Объявлено в модуле TrafficCounter.c.
extern PROTOLIST OverallInfo;
#endif
diff --git a/plugins/TrafficCounter/src/vars.cpp b/plugins/TrafficCounter/src/vars.cpp index b7df5fb1ba..fdbb22892b 100644 --- a/plugins/TrafficCounter/src/vars.cpp +++ b/plugins/TrafficCounter/src/vars.cpp @@ -17,8 +17,8 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* ======================================================================================
- Variables
-: Mironych
+Здесь содержатся функции для поддержки плагина Variables
+Автор: Mironych
=======================================================================================*/
#include "stdafx.h"
@@ -50,7 +50,7 @@ static wchar_t* GetTraffic(ARGUMENTSINFO *ai) }
}
else
- { // ,
+ { // Ищем индекс протокола, переданного первым аргументом
for (tmp = ed = 0; ed < NumberOfAccounts; ed++)
{
if (!ProtoList[ed].name) continue;
@@ -61,7 +61,7 @@ static wchar_t* GetTraffic(ARGUMENTSINFO *ai) tmprn = ProtoList[ed].CurrentRecvTraffic;
tmpst = ProtoList[ed].TotalSentTraffic;
tmprt = ProtoList[ed].TotalRecvTraffic;
- tmp = 0xAA; // ,
+ tmp = 0xAA; // Признак того, что протокол был найден
}
mir_free(buf);
}
@@ -98,8 +98,8 @@ static wchar_t* GetTraffic(ARGUMENTSINFO *ai) if (!mir_wstrcmp(ai->targv[4], L"d")) ed = 3;
else return nullptr;
- // .
- // .
+ // Получаем форматированную строку и возвращаем указатель на неё.
+ // Сначала узнаем размер буфера.
size_t l = GetFormattedTraffic(tmp, ed, nullptr, 0);
wchar_t *res = (wchar_t*)mir_alloc(l * sizeof(wchar_t));
if (!res) return nullptr;
@@ -117,7 +117,7 @@ static wchar_t* GetTime(ARGUMENTSINFO *ai) if (ai->argc != 4) return nullptr;
- // ,
+ // Ищем индекс протокола, переданного первым аргументом
for (flag = ed = 0; ed < NumberOfAccounts; ed++)
{
wchar_t *buf;
@@ -147,8 +147,8 @@ static wchar_t* GetTime(ARGUMENTSINFO *ai) if (flag != 0xAA) return nullptr;
- // .
- // .
+ // Получаем форматированную строку и возвращаем указатель на неё.
+ // Сначала узнаем размер буфера.
size_t l = GetDurationFormatM(Duration, ai->targv[3], nullptr, 0);
wchar_t *res = (wchar_t*)mir_alloc(l * sizeof(wchar_t));
if (!res) return nullptr;
@@ -166,14 +166,14 @@ void RegisterVariablesTokens(void) memset(&trs, 0, sizeof(trs));
trs.cbSize = sizeof(TOKENREGISTER);
- // ,
+ // Функция, возвращающая трафик
trs.tszTokenString = L"tc_GetTraffic";
trs.parseFunctionT = GetTraffic;
trs.szHelpText = "Traffic counter\t(A,B,C,D)\tGet traffic counter value. A: <ProtocolName> OR overall OR summary; B: now OR total; C: sent OR received OR both; D: b - in bytes, k - in kilobytes, m - in megabytes, d - dynamic";
trs.flags = TRF_TCHAR | TRF_PARSEFUNC | TRF_FUNCTION | TRF_FREEMEM;
trs.memType = TR_MEM_MIRANDA;
CallService(MS_VARS_REGISTERTOKEN, 0, (LPARAM)&trs);
- // ,
+ // Функция, возвращающая время
trs.tszTokenString = L"tc_GetTime";
trs.parseFunctionT = GetTime;
trs.szHelpText = "Traffic counter\t(A,B,C)\tGet time counter value. A: <ProtocolName> OR summary; B: now OR total; C: format";
diff --git a/plugins/TrafficCounter/src/version.h b/plugins/TrafficCounter/src/version.h index 1b0394a143..46154c826f 100644 --- a/plugins/TrafficCounter/src/version.h +++ b/plugins/TrafficCounter/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ghost, Mironych"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/TrafficCounter/"
-#define __COPYRIGHT " 2002-2006 Ghost, 2007-2012 Mironych"
+#define __COPYRIGHT "© 2002-2006 Ghost, 2007-2012 Mironych"
diff --git a/plugins/TranslitSwitcher/res/Resource.rc b/plugins/TranslitSwitcher/res/Resource.rc index 3019bbb1f4..c275ea7ab8 100644 --- a/plugins/TranslitSwitcher/res/Resource.rc +++ b/plugins/TranslitSwitcher/res/Resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -31,7 +31,7 @@ IDI_TRANSLITSEND ICON "TranslitSend.ico" IDI_INVERTSEND ICON "InvertSend.ico"
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/TranslitSwitcher/src/Layoutproc.cpp b/plugins/TranslitSwitcher/src/Layoutproc.cpp index 74fdc4f130..03740c5813 100644 --- a/plugins/TranslitSwitcher/src/Layoutproc.cpp +++ b/plugins/TranslitSwitcher/src/Layoutproc.cpp @@ -64,280 +64,280 @@ void Transliterate(wchar_t *&str) newStr[0] = 0;
for (; *str != 0; str++) {
switch (str[0]) {
- case '': mir_wstrcat(newStr, L"a"); break;
- case '': mir_wstrcat(newStr, L"b"); break;
- case '': mir_wstrcat(newStr, L"v"); break;
- case '': mir_wstrcat(newStr, L"g"); break;
- case '': mir_wstrcat(newStr, L"d"); break;
- case '': mir_wstrcat(newStr, L"e"); break;
- case '': mir_wstrcat(newStr, L"ye"); break;
- case '': mir_wstrcat(newStr, L"zh"); break;
- case '': mir_wstrcat(newStr, L"z"); break;
- case '': mir_wstrcat(newStr, L"i"); break;
- case '': mir_wstrcat(newStr, L"y"); break;
- case '': mir_wstrcat(newStr, L"k"); break;
- case '': mir_wstrcat(newStr, L"l"); break;
- case '': mir_wstrcat(newStr, L"m"); break;
- case '': mir_wstrcat(newStr, L"n"); break;
- case '': mir_wstrcat(newStr, L"o"); break;
- case '': mir_wstrcat(newStr, L"p"); break;
- case '': mir_wstrcat(newStr, L"r"); break;
- case '': mir_wstrcat(newStr, L"s"); break;
- case '': mir_wstrcat(newStr, L"t"); break;
- case '': mir_wstrcat(newStr, L"u"); break;
- case '': mir_wstrcat(newStr, L"f"); break;
- case '': mir_wstrcat(newStr, L"kh"); break;
- case '': mir_wstrcat(newStr, L"ts"); break;
- case '': mir_wstrcat(newStr, L"ch"); break;
- case '': mir_wstrcat(newStr, L"sh"); break;
- case '': mir_wstrcat(newStr, L"sch"); break;
- case '': mir_wstrcat(newStr, L"'"); break;
- case '': mir_wstrcat(newStr, L"yi"); break;
- case '': mir_wstrcat(newStr, L""); break;
- case '': mir_wstrcat(newStr, L"e"); break;
- case '': mir_wstrcat(newStr, L"yu"); break;
- case '': mir_wstrcat(newStr, L"ya"); break;
- case '': mir_wstrcat(newStr, L"A"); break;
- case '': mir_wstrcat(newStr, L"B"); break;
- case '': mir_wstrcat(newStr, L"V"); break;
- case '': mir_wstrcat(newStr, L"G"); break;
- case '': mir_wstrcat(newStr, L"D"); break;
- case '': mir_wstrcat(newStr, L"E"); break;
- case '': mir_wstrcat(newStr, L"Ye"); break;
- case '': mir_wstrcat(newStr, L"Zh"); break;
- case '': mir_wstrcat(newStr, L"Z"); break;
- case '': mir_wstrcat(newStr, L"I"); break;
- case '': mir_wstrcat(newStr, L"Y"); break;
- case '': mir_wstrcat(newStr, L"K"); break;
- case '': mir_wstrcat(newStr, L"L"); break;
- case '': mir_wstrcat(newStr, L"M"); break;
- case '': mir_wstrcat(newStr, L"N"); break;
- case '': mir_wstrcat(newStr, L"O"); break;
- case '': mir_wstrcat(newStr, L"P"); break;
- case '': mir_wstrcat(newStr, L"R"); break;
- case '': mir_wstrcat(newStr, L"S"); break;
- case '': mir_wstrcat(newStr, L"T"); break;
- case '': mir_wstrcat(newStr, L"U"); break;
- case '': mir_wstrcat(newStr, L"F"); break;
- case '': mir_wstrcat(newStr, L"Kh"); break;
- case '': mir_wstrcat(newStr, L"Ts"); break;
- case '': mir_wstrcat(newStr, L"Ch"); break;
- case '': mir_wstrcat(newStr, L"Sh"); break;
- case '': mir_wstrcat(newStr, L"Sch"); break;
- case '': mir_wstrcat(newStr, L"'"); break;
- case '': mir_wstrcat(newStr, L"Yi"); break;
- case '': mir_wstrcat(newStr, L""); break;
- case '': mir_wstrcat(newStr, L"E"); break;
- case '': mir_wstrcat(newStr, L"Yu"); break;
- case '': mir_wstrcat(newStr, L"Ya"); break;
-
- case 'a': mir_wstrcat(newStr, L""); break;
- case 'b': mir_wstrcat(newStr, L""); break;
- case 'v': mir_wstrcat(newStr, L""); break;
- case 'g': mir_wstrcat(newStr, L""); break;
- case 'd': mir_wstrcat(newStr, L""); break;
- case 'e': mir_wstrcat(newStr, L""); break;
+ case 'а': mir_wstrcat(newStr, L"a"); break;
+ case 'б': mir_wstrcat(newStr, L"b"); break;
+ case 'в': mir_wstrcat(newStr, L"v"); break;
+ case 'г': mir_wstrcat(newStr, L"g"); break;
+ case 'д': mir_wstrcat(newStr, L"d"); break;
+ case 'е': mir_wstrcat(newStr, L"e"); break;
+ case 'ё': mir_wstrcat(newStr, L"ye"); break;
+ case 'ж': mir_wstrcat(newStr, L"zh"); break;
+ case 'з': mir_wstrcat(newStr, L"z"); break;
+ case 'и': mir_wstrcat(newStr, L"i"); break;
+ case 'й': mir_wstrcat(newStr, L"y"); break;
+ case 'к': mir_wstrcat(newStr, L"k"); break;
+ case 'л': mir_wstrcat(newStr, L"l"); break;
+ case 'м': mir_wstrcat(newStr, L"m"); break;
+ case 'н': mir_wstrcat(newStr, L"n"); break;
+ case 'о': mir_wstrcat(newStr, L"o"); break;
+ case 'п': mir_wstrcat(newStr, L"p"); break;
+ case 'р': mir_wstrcat(newStr, L"r"); break;
+ case 'с': mir_wstrcat(newStr, L"s"); break;
+ case 'т': mir_wstrcat(newStr, L"t"); break;
+ case 'у': mir_wstrcat(newStr, L"u"); break;
+ case 'ф': mir_wstrcat(newStr, L"f"); break;
+ case 'х': mir_wstrcat(newStr, L"kh"); break;
+ case 'ц': mir_wstrcat(newStr, L"ts"); break;
+ case 'ч': mir_wstrcat(newStr, L"ch"); break;
+ case 'ш': mir_wstrcat(newStr, L"sh"); break;
+ case 'щ': mir_wstrcat(newStr, L"sch"); break;
+ case 'ъ': mir_wstrcat(newStr, L"'"); break;
+ case 'ы': mir_wstrcat(newStr, L"yi"); break;
+ case 'ь': mir_wstrcat(newStr, L""); break;
+ case 'э': mir_wstrcat(newStr, L"e"); break;
+ case 'ю': mir_wstrcat(newStr, L"yu"); break;
+ case 'я': mir_wstrcat(newStr, L"ya"); break;
+ case 'А': mir_wstrcat(newStr, L"A"); break;
+ case 'Б': mir_wstrcat(newStr, L"B"); break;
+ case 'В': mir_wstrcat(newStr, L"V"); break;
+ case 'Г': mir_wstrcat(newStr, L"G"); break;
+ case 'Д': mir_wstrcat(newStr, L"D"); break;
+ case 'Е': mir_wstrcat(newStr, L"E"); break;
+ case 'Ё': mir_wstrcat(newStr, L"Ye"); break;
+ case 'Ж': mir_wstrcat(newStr, L"Zh"); break;
+ case 'З': mir_wstrcat(newStr, L"Z"); break;
+ case 'И': mir_wstrcat(newStr, L"I"); break;
+ case 'Й': mir_wstrcat(newStr, L"Y"); break;
+ case 'К': mir_wstrcat(newStr, L"K"); break;
+ case 'Л': mir_wstrcat(newStr, L"L"); break;
+ case 'М': mir_wstrcat(newStr, L"M"); break;
+ case 'Н': mir_wstrcat(newStr, L"N"); break;
+ case 'О': mir_wstrcat(newStr, L"O"); break;
+ case 'П': mir_wstrcat(newStr, L"P"); break;
+ case 'Р': mir_wstrcat(newStr, L"R"); break;
+ case 'С': mir_wstrcat(newStr, L"S"); break;
+ case 'Т': mir_wstrcat(newStr, L"T"); break;
+ case 'У': mir_wstrcat(newStr, L"U"); break;
+ case 'Ф': mir_wstrcat(newStr, L"F"); break;
+ case 'Х': mir_wstrcat(newStr, L"Kh"); break;
+ case 'Ц': mir_wstrcat(newStr, L"Ts"); break;
+ case 'Ч': mir_wstrcat(newStr, L"Ch"); break;
+ case 'Ш': mir_wstrcat(newStr, L"Sh"); break;
+ case 'Щ': mir_wstrcat(newStr, L"Sch"); break;
+ case 'Ъ': mir_wstrcat(newStr, L"'"); break;
+ case 'Ы': mir_wstrcat(newStr, L"Yi"); break;
+ case 'Ь': mir_wstrcat(newStr, L""); break;
+ case 'Э': mir_wstrcat(newStr, L"E"); break;
+ case 'Ю': mir_wstrcat(newStr, L"Yu"); break;
+ case 'Я': mir_wstrcat(newStr, L"Ya"); break;
+
+ case 'a': mir_wstrcat(newStr, L"а"); break;
+ case 'b': mir_wstrcat(newStr, L"б"); break;
+ case 'v': mir_wstrcat(newStr, L"в"); break;
+ case 'g': mir_wstrcat(newStr, L"г"); break;
+ case 'd': mir_wstrcat(newStr, L"д"); break;
+ case 'e': mir_wstrcat(newStr, L"е"); break;
case 'z':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ж");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"з");
break;
}
}
- case 'i': mir_wstrcat(newStr, L""); break;
+ case 'i': mir_wstrcat(newStr, L"и"); break;
case 'y':
{
if (str[1] == 'a') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"я");
str++;
break;
}
else if (str[1] == 'e') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ё");
str++;
break;
}
else if (str[1] == 'u') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ю");
str++;
break;
}
else if (str[1] == 'i') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ы");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"й");
break;
}
}
case 'k':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"х");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"к");
break;
}
}
- case 'l': mir_wstrcat(newStr, L""); break;
- case 'm': mir_wstrcat(newStr, L""); break;
- case 'n': mir_wstrcat(newStr, L""); break;
- case 'o': mir_wstrcat(newStr, L""); break;
- case 'p': mir_wstrcat(newStr, L""); break;
- case 'r': mir_wstrcat(newStr, L""); break;
+ case 'l': mir_wstrcat(newStr, L"л"); break;
+ case 'm': mir_wstrcat(newStr, L"м"); break;
+ case 'n': mir_wstrcat(newStr, L"н"); break;
+ case 'o': mir_wstrcat(newStr, L"о"); break;
+ case 'p': mir_wstrcat(newStr, L"п"); break;
+ case 'r': mir_wstrcat(newStr, L"р"); break;
case 's':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ш");
str++;
break;
}
else if (str[1] == 'c' && str[2] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"щ");
str += 2;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"с");
break;
}
}
case 't':
{
if (str[1] == 's') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ц");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"т");
break;
}
}
- case 'u': mir_wstrcat(newStr, L""); break;
- case 'f': mir_wstrcat(newStr, L""); break;
+ case 'u': mir_wstrcat(newStr, L"у"); break;
+ case 'f': mir_wstrcat(newStr, L"ф"); break;
case 'c':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"ч");
str++;
break;
}
}
- case 'A': mir_wstrcat(newStr, L""); break;
- case 'B': mir_wstrcat(newStr, L""); break;
- case 'V': mir_wstrcat(newStr, L""); break;
- case 'G': mir_wstrcat(newStr, L""); break;
- case 'D': mir_wstrcat(newStr, L""); break;
- case 'E': mir_wstrcat(newStr, L""); break;
+ case 'A': mir_wstrcat(newStr, L"А"); break;
+ case 'B': mir_wstrcat(newStr, L"Б"); break;
+ case 'V': mir_wstrcat(newStr, L"В"); break;
+ case 'G': mir_wstrcat(newStr, L"Г"); break;
+ case 'D': mir_wstrcat(newStr, L"Д"); break;
+ case 'E': mir_wstrcat(newStr, L"Е"); break;
case 'Y':
{
if (str[1] == 'a') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Я");
str++;
break;
}
else if (str[1] == 'e') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ё");
str++;
break;
}
else if (str[1] == 'u') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ю");
str++;
break;
}
else if (str[1] == 'i') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ы");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Й");
break;
}
}
case 'Z':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ж");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"З");
break;
}
}
- case 'I': mir_wstrcat(newStr, L""); break;
+ case 'I': mir_wstrcat(newStr, L"И"); break;
case 'K':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Х");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"К");
break;
}
}
- case 'L': mir_wstrcat(newStr, L""); break;
- case 'M': mir_wstrcat(newStr, L""); break;
- case 'N': mir_wstrcat(newStr, L""); break;
- case 'O': mir_wstrcat(newStr, L""); break;
- case 'P': mir_wstrcat(newStr, L""); break;
- case 'R': mir_wstrcat(newStr, L""); break;
+ case 'L': mir_wstrcat(newStr, L"Л"); break;
+ case 'M': mir_wstrcat(newStr, L"М"); break;
+ case 'N': mir_wstrcat(newStr, L"Н"); break;
+ case 'O': mir_wstrcat(newStr, L"О"); break;
+ case 'P': mir_wstrcat(newStr, L"П"); break;
+ case 'R': mir_wstrcat(newStr, L"Р"); break;
case 'S':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ш");
str++;
break;
}
else if (str[1] == 'c' && str[2] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Щ");
str += 2;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"С");
break;
}
}
case 'T':
{
if (str[1] == 's') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ц");
str++;
break;
}
else {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Т");
break;
}
}
- case 'U': mir_wstrcat(newStr, L""); break;
- case 'F': mir_wstrcat(newStr, L""); break;
+ case 'U': mir_wstrcat(newStr, L"У"); break;
+ case 'F': mir_wstrcat(newStr, L"Ф"); break;
case 'C':
{
if (str[1] == 'h') {
- mir_wstrcat(newStr, L"");
+ mir_wstrcat(newStr, L"Ч");
str++;
break;
}
}
- case '\'': mir_wstrcat(newStr, L""); break;
+ case '\'': mir_wstrcat(newStr, L"ъ"); break;
default: { wchar_t Temp[2] = { str[0], 0 }; mir_wstrcat(newStr, &Temp[0]); }
}
diff --git a/plugins/TranslitSwitcher/src/version.h b/plugins/TranslitSwitcher/src/version.h index 572b946344..d308e511c1 100644 --- a/plugins/TranslitSwitcher/src/version.h +++ b/plugins/TranslitSwitcher/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Mataes, tico-tico, Tim" #define __AUTHOREMAIL "mataes2007@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/TranslitSwitcher/" -#define __COPYRIGHT " 2011-17 Mataes, tico-tico, 2007 Dmitry Titkov" +#define __COPYRIGHT "© 2011-17 Mataes, tico-tico, 2007 Dmitry Titkov" diff --git a/plugins/UserGuide/src/version.h b/plugins/UserGuide/src/version.h index 1f2decbeee..ab676d20ec 100644 --- a/plugins/UserGuide/src/version.h +++ b/plugins/UserGuide/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Yasnovidyashii" #define __AUTHOREMAIL "yasnovidyashii@gmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/UserGuide/" -#define __COPYRIGHT " 2009 Mikhail Yuriev" +#define __COPYRIGHT "© 2009 Mikhail Yuriev" diff --git a/plugins/UserInfoEx/IconPacks/default/src/version.h b/plugins/UserInfoEx/IconPacks/default/src/version.h index 829f78a215..4531c4360f 100644 --- a/plugins/UserInfoEx/IconPacks/default/src/version.h +++ b/plugins/UserInfoEx/IconPacks/default/src/version.h @@ -8,4 +8,4 @@ #define __PLUGIN_NAME "UInfoEx icons" #define __FILENAME "UInfoEx_icons.dll" #define __DESCRIPTION "This is an Iconpack for the UserInfoEx plugin." -#define __COPYRIGHT " 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol" +#define __COPYRIGHT "© 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol" diff --git a/plugins/UserInfoEx/IconPacks/ice/src/version.h b/plugins/UserInfoEx/IconPacks/ice/src/version.h index 829f78a215..4531c4360f 100644 --- a/plugins/UserInfoEx/IconPacks/ice/src/version.h +++ b/plugins/UserInfoEx/IconPacks/ice/src/version.h @@ -8,4 +8,4 @@ #define __PLUGIN_NAME "UInfoEx icons" #define __FILENAME "UInfoEx_icons.dll" #define __DESCRIPTION "This is an Iconpack for the UserInfoEx plugin." -#define __COPYRIGHT " 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol" +#define __COPYRIGHT "© 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol" diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp index 95c95a443b..7dc3e80f3e 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp +++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.cpp @@ -2,10 +2,10 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
part of this code based on:
-Miranda IM Country Flags Plugin Copyright 2006-2007 H. Herkenrath
+Miranda IM Country Flags Plugin Copyright ©2006-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/Flags/svc_flagsicons.h b/plugins/UserInfoEx/src/Flags/svc_flagsicons.h index ee9c6641df..b6943574a5 100644 --- a/plugins/UserInfoEx/src/Flags/svc_flagsicons.h +++ b/plugins/UserInfoEx/src/Flags/svc_flagsicons.h @@ -2,10 +2,10 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
part of this code based on:
-Miranda IM Country Flags Plugin Copyright 2006-2007 H. Herkenrath
+Miranda IM Country Flags Plugin Copyright ©2006-2007 H. Herkenrath
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.cpp b/plugins/UserInfoEx/src/classMAnnivDate.cpp index 796e247cb4..92d892582e 100644 --- a/plugins/UserInfoEx/src/classMAnnivDate.cpp +++ b/plugins/UserInfoEx/src/classMAnnivDate.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -222,11 +222,11 @@ static zodiac[] = { { 111, 140, LPGENW("Taurus"), ICO_ZOD_TAURUS }, // Stier
{ 141, 172, LPGENW("Gemini"), ICO_ZOD_GEMINI }, // Zwillinge
{ 173, 203, LPGENW("Cancer"), ICO_ZOD_CANCER }, // Krebs
- { 204, 235, LPGENW("Leo"), ICO_ZOD_LEO }, // Lwe
+ { 204, 235, LPGENW("Leo"), ICO_ZOD_LEO }, // Lцwe
{ 236, 266, LPGENW("Virgo"), ICO_ZOD_VIRGO }, // Jungfrau
{ 267, 296, LPGENW("Libra"), ICO_ZOD_LIBRA }, // Waage
{ 297, 326, LPGENW("Scorpio"), ICO_ZOD_SCORPIO }, // Scorpion
- { 327, 355, LPGENW("Sagittarius"), ICO_ZOD_SAGITTARIUS }, // Schtze
+ { 327, 355, LPGENW("Sagittarius"), ICO_ZOD_SAGITTARIUS }, // Schьtze
{ 356, 364, LPGENW("Capricorn"), ICO_ZOD_CAPRICORN }, // Steinbock
{ 1, 19, LPGENW("Capricorn"), ICO_ZOD_CAPRICORN }, // Steinbock
{ 20, 49, LPGENW("Aquarius"), ICO_ZOD_AQUARIUS }, // Wassermann
diff --git a/plugins/UserInfoEx/src/classMAnnivDate.h b/plugins/UserInfoEx/src/classMAnnivDate.h index 9d600eb814..e6f328b0c0 100644 --- a/plugins/UserInfoEx/src/classMAnnivDate.h +++ b/plugins/UserInfoEx/src/classMAnnivDate.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/classMTime.cpp b/plugins/UserInfoEx/src/classMTime.cpp index a615733c21..c1591cba80 100644 --- a/plugins/UserInfoEx/src/classMTime.cpp +++ b/plugins/UserInfoEx/src/classMTime.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/classMTime.h b/plugins/UserInfoEx/src/classMTime.h index 623b1a156b..3388611c2f 100644 --- a/plugins/UserInfoEx/src/classMTime.h +++ b/plugins/UserInfoEx/src/classMTime.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp index 30283b2b2b..2237cd4eaa 100644 --- a/plugins/UserInfoEx/src/classPsTree.cpp +++ b/plugins/UserInfoEx/src/classPsTree.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/UserInfoEx/src/classPsTreeItem.cpp b/plugins/UserInfoEx/src/classPsTreeItem.cpp index 56be6b3605..1bd103b6f3 100644 --- a/plugins/UserInfoEx/src/classPsTreeItem.cpp +++ b/plugins/UserInfoEx/src/classPsTreeItem.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/commonheaders.cpp b/plugins/UserInfoEx/src/commonheaders.cpp index 0bd406ea1e..81851c8948 100644 --- a/plugins/UserInfoEx/src/commonheaders.cpp +++ b/plugins/UserInfoEx/src/commonheaders.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp index 0c6e34bd54..283710341a 100644 --- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp +++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.h b/plugins/UserInfoEx/src/ctrl_annivedit.h index 96caf188fd..2c0045d00f 100644 --- a/plugins/UserInfoEx/src/ctrl_annivedit.h +++ b/plugins/UserInfoEx/src/ctrl_annivedit.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_base.cpp b/plugins/UserInfoEx/src/ctrl_base.cpp index c226ec3134..67a3614ab8 100644 --- a/plugins/UserInfoEx/src/ctrl_base.cpp +++ b/plugins/UserInfoEx/src/ctrl_base.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_base.h b/plugins/UserInfoEx/src/ctrl_base.h index 9bfd74b425..1e4965f5bc 100644 --- a/plugins/UserInfoEx/src/ctrl_base.h +++ b/plugins/UserInfoEx/src/ctrl_base.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_button.cpp b/plugins/UserInfoEx/src/ctrl_button.cpp index 534bf8edc2..9531c0d7f6 100644 --- a/plugins/UserInfoEx/src/ctrl_button.cpp +++ b/plugins/UserInfoEx/src/ctrl_button.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_button.h b/plugins/UserInfoEx/src/ctrl_button.h index c6691c161d..c509e95b2a 100644 --- a/plugins/UserInfoEx/src/ctrl_button.h +++ b/plugins/UserInfoEx/src/ctrl_button.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_combo.cpp b/plugins/UserInfoEx/src/ctrl_combo.cpp index fb23e48f0c..ecad70f50b 100644 --- a/plugins/UserInfoEx/src/ctrl_combo.cpp +++ b/plugins/UserInfoEx/src/ctrl_combo.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_combo.h b/plugins/UserInfoEx/src/ctrl_combo.h index b2e2dc1ecf..ad4aa1273b 100644 --- a/plugins/UserInfoEx/src/ctrl_combo.h +++ b/plugins/UserInfoEx/src/ctrl_combo.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp index 35460aa35a..342a760f11 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.cpp +++ b/plugins/UserInfoEx/src/ctrl_contact.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_contact.h b/plugins/UserInfoEx/src/ctrl_contact.h index 42f09717cf..6216035542 100644 --- a/plugins/UserInfoEx/src/ctrl_contact.h +++ b/plugins/UserInfoEx/src/ctrl_contact.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_edit.cpp b/plugins/UserInfoEx/src/ctrl_edit.cpp index 1da43c143c..2e6b94ce5f 100644 --- a/plugins/UserInfoEx/src/ctrl_edit.cpp +++ b/plugins/UserInfoEx/src/ctrl_edit.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/UserInfoEx/src/ctrl_edit.h b/plugins/UserInfoEx/src/ctrl_edit.h index 2166d74831..3a03956cf4 100644 --- a/plugins/UserInfoEx/src/ctrl_edit.h +++ b/plugins/UserInfoEx/src/ctrl_edit.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp index 86c2b251fb..12d41473f7 100644 --- a/plugins/UserInfoEx/src/ctrl_tzcombo.cpp +++ b/plugins/UserInfoEx/src/ctrl_tzcombo.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ctrl_tzcombo.h b/plugins/UserInfoEx/src/ctrl_tzcombo.h index 6d549a96fc..daa48907bd 100644 --- a/plugins/UserInfoEx/src/ctrl_tzcombo.h +++ b/plugins/UserInfoEx/src/ctrl_tzcombo.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp index 6c2d1e3c1f..237f94c7fd 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.h b/plugins/UserInfoEx/src/dlg_anniversarylist.h index dcc25d7303..73c4e7c428 100644 --- a/plugins/UserInfoEx/src/dlg_anniversarylist.h +++ b/plugins/UserInfoEx/src/dlg_anniversarylist.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/dlg_msgbox.cpp b/plugins/UserInfoEx/src/dlg_msgbox.cpp index 3a5e3161b4..4a59aa2741 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.cpp +++ b/plugins/UserInfoEx/src/dlg_msgbox.cpp @@ -2,8 +2,8 @@ UserinfoEx plugin for Miranda NG
Copyright:
- 2012-17 Miranda NG project (https://miranda-ng.org)
- 2006-10 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2012-17 Miranda NG project (https://miranda-ng.org)
+© 2006-10 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
@@ -35,7 +35,7 @@ typedef struct _MSGPOPUPDATA *
* @param hDlg - the dialog box's window handle
* @param idCtrl - the identication number of the control to move
- * @param dx -number of pixels to horizontal move the control
+ * @param dx -ґnumber of pixels to horizontal move the control
* @param dy - number of pixels to vertical move the control
* @param dw - number of pixels to horizontal resize the control
* @param dh - number of pixels to vertical resize the control
diff --git a/plugins/UserInfoEx/src/dlg_msgbox.h b/plugins/UserInfoEx/src/dlg_msgbox.h index 7caf10617d..29992ec0d7 100644 --- a/plugins/UserInfoEx/src/dlg_msgbox.h +++ b/plugins/UserInfoEx/src/dlg_msgbox.h @@ -2,8 +2,8 @@ UserinfoEx plugin for Miranda NG
Copyright:
- 2012-17 Miranda NG project (https://miranda-ng.org)
- 2006-10 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2012-17 Miranda NG project (https://miranda-ng.org)
+© 2006-10 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.cpp b/plugins/UserInfoEx/src/dlg_propsheet.cpp index 6324c74669..948b70dba8 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.cpp +++ b/plugins/UserInfoEx/src/dlg_propsheet.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/dlg_propsheet.h b/plugins/UserInfoEx/src/dlg_propsheet.h index f2e1d88871..4de3112d21 100644 --- a/plugins/UserInfoEx/src/dlg_propsheet.h +++ b/plugins/UserInfoEx/src/dlg_propsheet.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp index af55004dc5..b7311f6874 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h index 90e080b34e..d24ffd5f8d 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactBase.h +++ b/plugins/UserInfoEx/src/ex_import/classExImContactBase.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp index f01d6a66fb..1eb4404029 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/classExImContactXML.h b/plugins/UserInfoEx/src/ex_import/classExImContactXML.h index e989484072..759f8d756a 100644 --- a/plugins/UserInfoEx/src/ex_import/classExImContactXML.h +++ b/plugins/UserInfoEx/src/ex_import/classExImContactXML.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp index 35b5b31444..5e72891db6 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h index 74e64a1e75..1127e4a87a 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImModules.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp index 8cf1ef0cc9..fc1f62f342 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.h index 8ba9117bbb..f2d7d0a34e 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.h +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImOpenSaveFile.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp index 67b1f7a288..6e121bc8b9 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.h b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.h index 379df3c7c1..d542d23754 100644 --- a/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.h +++ b/plugins/UserInfoEx/src/ex_import/dlg_ExImProgress.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h b/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h index 1a8445c9fe..fec2911bec 100644 --- a/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h +++ b/plugins/UserInfoEx/src/ex_import/mir_rfcCodecs.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp index 8dc1e60c31..62b19ea7c7 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h index 250df73991..b6a9c8873c 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImINI.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp index 1231a72c84..38e55fceec 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h index cb1e70b4ec..36fd2b265e 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImVCF.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp index 170b39329f..0349babe2b 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h index b7e6fe50ee..21a5c502e5 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImXML.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp index 4d6d2fc829..cce65ecc2d 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.h b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h index 5a6f684139..1a3be18c01 100644 --- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.h +++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.cpp b/plugins/UserInfoEx/src/ex_import/tinystr.cpp index 3fb330aac6..5414a2d95f 100644 --- a/plugins/UserInfoEx/src/ex_import/tinystr.cpp +++ b/plugins/UserInfoEx/src/ex_import/tinystr.cpp @@ -38,7 +38,7 @@ distribution. UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
===============================================================================
*/
diff --git a/plugins/UserInfoEx/src/ex_import/tinystr.h b/plugins/UserInfoEx/src/ex_import/tinystr.h index 2658a4f639..a5d85d11dc 100644 --- a/plugins/UserInfoEx/src/ex_import/tinystr.h +++ b/plugins/UserInfoEx/src/ex_import/tinystr.h @@ -38,7 +38,7 @@ distribution. UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol =============================================================================== */ diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp index be5292e438..bfd6707659 100644 --- a/plugins/UserInfoEx/src/ex_import/tinyxml.cpp +++ b/plugins/UserInfoEx/src/ex_import/tinyxml.cpp @@ -26,7 +26,7 @@ distribution. UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
===============================================================================
*/
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxml.h b/plugins/UserInfoEx/src/ex_import/tinyxml.h index b40797c079..ac98ee8d74 100644 --- a/plugins/UserInfoEx/src/ex_import/tinyxml.h +++ b/plugins/UserInfoEx/src/ex_import/tinyxml.h @@ -26,7 +26,7 @@ distribution. UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol =============================================================================== */ diff --git a/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp index d142050176..d84be9bfc4 100644 --- a/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp +++ b/plugins/UserInfoEx/src/ex_import/tinyxmlerror.cpp @@ -26,7 +26,7 @@ distribution. UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
===============================================================================
*/
diff --git a/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp index eb5e97134e..f6e1df72b0 100644 --- a/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp +++ b/plugins/UserInfoEx/src/ex_import/tinyxmlparser.cpp @@ -26,7 +26,7 @@ distribution. UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
===============================================================================
*/
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.cpp b/plugins/UserInfoEx/src/mir_contactqueue.cpp index 8353ecb9ce..c9f22502b3 100644 --- a/plugins/UserInfoEx/src/mir_contactqueue.cpp +++ b/plugins/UserInfoEx/src/mir_contactqueue.cpp @@ -1,7 +1,7 @@ /*
-Copyright 2006 Ricardo Pescuma Domenecci
+Copyright ©2006 Ricardo Pescuma Domenecci
-Modified 2008-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+Modified ©2008-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_contactqueue.h b/plugins/UserInfoEx/src/mir_contactqueue.h index 59a47a0f4c..9d224a91f3 100644 --- a/plugins/UserInfoEx/src/mir_contactqueue.h +++ b/plugins/UserInfoEx/src/mir_contactqueue.h @@ -1,7 +1,7 @@ /*
-Copyright 2006 Ricardo Pescuma Domenecci
+Copyright ©2006 Ricardo Pescuma Domenecci
-Modified 2008-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+Modified ©2008-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_db.cpp b/plugins/UserInfoEx/src/mir_db.cpp index 7e42d0f682..e4eb8bf2d2 100644 --- a/plugins/UserInfoEx/src/mir_db.cpp +++ b/plugins/UserInfoEx/src/mir_db.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_db.h b/plugins/UserInfoEx/src/mir_db.h index 9db1b29458..bbf6328c1e 100644 --- a/plugins/UserInfoEx/src/mir_db.h +++ b/plugins/UserInfoEx/src/mir_db.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_icolib.cpp b/plugins/UserInfoEx/src/mir_icolib.cpp index 542d31d12d..cdb2783326 100644 --- a/plugins/UserInfoEx/src/mir_icolib.cpp +++ b/plugins/UserInfoEx/src/mir_icolib.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_icolib.h b/plugins/UserInfoEx/src/mir_icolib.h index 8930f1299c..bbc5763423 100644 --- a/plugins/UserInfoEx/src/mir_icolib.h +++ b/plugins/UserInfoEx/src/mir_icolib.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp index 4aa17f387f..205261f0f0 100644 --- a/plugins/UserInfoEx/src/mir_menuitems.cpp +++ b/plugins/UserInfoEx/src/mir_menuitems.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_menuitems.h b/plugins/UserInfoEx/src/mir_menuitems.h index 612f45fcab..27d8f7afc9 100644 --- a/plugins/UserInfoEx/src/mir_menuitems.h +++ b/plugins/UserInfoEx/src/mir_menuitems.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/mir_string.cpp b/plugins/UserInfoEx/src/mir_string.cpp index da3d819fa7..480ebc93e5 100644 --- a/plugins/UserInfoEx/src/mir_string.cpp +++ b/plugins/UserInfoEx/src/mir_string.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/UserInfoEx/src/mir_string.h b/plugins/UserInfoEx/src/mir_string.h index 573985052f..b574f67aee 100644 --- a/plugins/UserInfoEx/src/mir_string.h +++ b/plugins/UserInfoEx/src/mir_string.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_about.cpp b/plugins/UserInfoEx/src/psp_about.cpp index 760dabe314..bacc975bd2 100644 --- a/plugins/UserInfoEx/src/psp_about.cpp +++ b/plugins/UserInfoEx/src/psp_about.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_anniversary.cpp b/plugins/UserInfoEx/src/psp_anniversary.cpp index 205bf80add..fb51299823 100644 --- a/plugins/UserInfoEx/src/psp_anniversary.cpp +++ b/plugins/UserInfoEx/src/psp_anniversary.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_base.cpp b/plugins/UserInfoEx/src/psp_base.cpp index 98dd6d7b2c..d8d07bd9ea 100644 --- a/plugins/UserInfoEx/src/psp_base.cpp +++ b/plugins/UserInfoEx/src/psp_base.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_base.h b/plugins/UserInfoEx/src/psp_base.h index 726aeccb7d..6f8702b99f 100644 --- a/plugins/UserInfoEx/src/psp_base.h +++ b/plugins/UserInfoEx/src/psp_base.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_company.cpp b/plugins/UserInfoEx/src/psp_company.cpp index 496ff3f60f..06328e885f 100644 --- a/plugins/UserInfoEx/src/psp_company.cpp +++ b/plugins/UserInfoEx/src/psp_company.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_contact.cpp b/plugins/UserInfoEx/src/psp_contact.cpp index 47c9afaade..75eb8909ec 100644 --- a/plugins/UserInfoEx/src/psp_contact.cpp +++ b/plugins/UserInfoEx/src/psp_contact.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_general.cpp b/plugins/UserInfoEx/src/psp_general.cpp index 5d402909fc..5c92af6fe0 100644 --- a/plugins/UserInfoEx/src/psp_general.cpp +++ b/plugins/UserInfoEx/src/psp_general.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_options.h b/plugins/UserInfoEx/src/psp_options.h index ab6c05c733..28bf533ef4 100644 --- a/plugins/UserInfoEx/src/psp_options.h +++ b/plugins/UserInfoEx/src/psp_options.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_origin.cpp b/plugins/UserInfoEx/src/psp_origin.cpp index cf18c2aa90..5c804278d4 100644 --- a/plugins/UserInfoEx/src/psp_origin.cpp +++ b/plugins/UserInfoEx/src/psp_origin.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp index f1ce019d2e..ab335c58bb 100644 --- a/plugins/UserInfoEx/src/psp_profile.cpp +++ b/plugins/UserInfoEx/src/psp_profile.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_avatar.cpp b/plugins/UserInfoEx/src/svc_avatar.cpp index 88e593c5b9..cd553e6e1d 100644 --- a/plugins/UserInfoEx/src/svc_avatar.cpp +++ b/plugins/UserInfoEx/src/svc_avatar.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_avatar.h b/plugins/UserInfoEx/src/svc_avatar.h index 0bbd2a5089..1e92275c67 100644 --- a/plugins/UserInfoEx/src/svc_avatar.h +++ b/plugins/UserInfoEx/src/svc_avatar.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_constants.h b/plugins/UserInfoEx/src/svc_constants.h index 3dd299d904..453693380b 100644 --- a/plugins/UserInfoEx/src/svc_constants.h +++ b/plugins/UserInfoEx/src/svc_constants.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_email.h b/plugins/UserInfoEx/src/svc_email.h index d2f7cb3ec7..8fb6cd7a61 100644 --- a/plugins/UserInfoEx/src/svc_email.h +++ b/plugins/UserInfoEx/src/svc_email.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_gender.h b/plugins/UserInfoEx/src/svc_gender.h index 5d897bbe11..8fbd958130 100644 --- a/plugins/UserInfoEx/src/svc_gender.h +++ b/plugins/UserInfoEx/src/svc_gender.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_homepage.h b/plugins/UserInfoEx/src/svc_homepage.h index ba7c826879..cf85beaaa7 100644 --- a/plugins/UserInfoEx/src/svc_homepage.h +++ b/plugins/UserInfoEx/src/svc_homepage.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_phone.h b/plugins/UserInfoEx/src/svc_phone.h index e394168020..8db73d20c7 100644 --- a/plugins/UserInfoEx/src/svc_phone.h +++ b/plugins/UserInfoEx/src/svc_phone.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_refreshci.cpp b/plugins/UserInfoEx/src/svc_refreshci.cpp index 1edda986a4..5b6b65987f 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.cpp +++ b/plugins/UserInfoEx/src/svc_refreshci.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_refreshci.h b/plugins/UserInfoEx/src/svc_refreshci.h index 7aba236ef7..521fbb2001 100644 --- a/plugins/UserInfoEx/src/svc_refreshci.h +++ b/plugins/UserInfoEx/src/svc_refreshci.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_reminder.h b/plugins/UserInfoEx/src/svc_reminder.h index 5360a33b93..88f3f45075 100644 --- a/plugins/UserInfoEx/src/svc_reminder.h +++ b/plugins/UserInfoEx/src/svc_reminder.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/svc_timezone.cpp b/plugins/UserInfoEx/src/svc_timezone.cpp index ebff28999f..96ca82f4b4 100644 --- a/plugins/UserInfoEx/src/svc_timezone.cpp +++ b/plugins/UserInfoEx/src/svc_timezone.cpp @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM Copyright: - 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol +© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/plugins/UserInfoEx/src/svc_timezone.h b/plugins/UserInfoEx/src/svc_timezone.h index 6c133a4a78..759e410be0 100644 --- a/plugins/UserInfoEx/src/svc_timezone.h +++ b/plugins/UserInfoEx/src/svc_timezone.h @@ -2,7 +2,7 @@ UserinfoEx plugin for Miranda IM
Copyright:
- 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
+© 2006-2010 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/UserInfoEx/src/version.h b/plugins/UserInfoEx/src/version.h index 07ccd4beb3..557c55d5e4 100644 --- a/plugins/UserInfoEx/src/version.h +++ b/plugins/UserInfoEx/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
#define __AUTHOREMAIL "deathaxe@web.de"
#define __AUTHORWEB "https://miranda-ng.org/p/UInfoEx/"
-#define __COPYRIGHT " 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
+#define __COPYRIGHT "© 2006-2009 DeathAxe, Yasnovidyashii, Merlin, K. Romanov, Kreol"
diff --git a/plugins/Variables/src/version.h b/plugins/Variables/src/version.h index 8fc42839a7..010c047d72 100644 --- a/plugins/Variables/src/version.h +++ b/plugins/Variables/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "P Boon" #define __AUTHOREMAIL "unregistered@users.sourceforge.net" #define __AUTHORWEB "https://miranda-ng.org/p/Variables/" -#define __COPYRIGHT " 2003-2008 P. Boon, Ricardo Pescuma, George Hazan" +#define __COPYRIGHT "© 2003-2008 P. Boon, Ricardo Pescuma, George Hazan" diff --git a/plugins/Watrack_MPD/src/init.cpp b/plugins/Watrack_MPD/src/init.cpp index 4ed6cfb8ee..41d24efd60 100755 --- a/plugins/Watrack_MPD/src/init.cpp +++ b/plugins/Watrack_MPD/src/init.cpp @@ -1,4 +1,4 @@ -// Copyright 2009-2010 sss
+// Copyright © 2009-2010 sss
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/Watrack_MPD/src/options.cpp b/plugins/Watrack_MPD/src/options.cpp index 10a6ffa28d..13313079d0 100755 --- a/plugins/Watrack_MPD/src/options.cpp +++ b/plugins/Watrack_MPD/src/options.cpp @@ -1,4 +1,4 @@ -// Copyright 2008 sss, chaos.persei +// Copyright © 2008 sss, chaos.persei // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/plugins/Watrack_MPD/src/stdafx.h b/plugins/Watrack_MPD/src/stdafx.h index 8d40410cd9..914126d34d 100755 --- a/plugins/Watrack_MPD/src/stdafx.h +++ b/plugins/Watrack_MPD/src/stdafx.h @@ -1,4 +1,4 @@ -// Copyright 2008 sss, chaos.persei
+// Copyright © 2008 sss, chaos.persei
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/plugins/Watrack_MPD/src/utilities.cpp b/plugins/Watrack_MPD/src/utilities.cpp index 1a833a8126..b8c209150f 100755 --- a/plugins/Watrack_MPD/src/utilities.cpp +++ b/plugins/Watrack_MPD/src/utilities.cpp @@ -1,4 +1,4 @@ -// Copyright 2008 sss, chaos.persei +// Copyright © 2008 sss, chaos.persei // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/plugins/Watrack_MPD/src/version.h b/plugins/Watrack_MPD/src/version.h index 31c8fd32a5..a973d9afdd 100644 --- a/plugins/Watrack_MPD/src/version.h +++ b/plugins/Watrack_MPD/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "sss" #define __AUTHOREMAIL "sss123next@list.ru" #define __AUTHORWEB "https://miranda-ng.org/p/Watrack_MPD/" -#define __COPYRIGHT " 2009 sss" +#define __COPYRIGHT "© 2009 sss" diff --git a/plugins/Weather/res/resource.rc b/plugins/Weather/res/resource.rc index 45f9705512..366d734775 100644 --- a/plugins/Weather/res/resource.rc +++ b/plugins/Weather/res/resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Немецкий (Германия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_DEU)
LANGUAGE LANG_GERMAN, SUBLANG_GERMAN
@@ -410,7 +410,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Немецкий (Германия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/Weather/src/version.h b/plugins/Weather/src/version.h index bbbef4d2f2..7562216179 100644 --- a/plugins/Weather/src/version.h +++ b/plugins/Weather/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Weather/"
-#define __COPYRIGHT " 2002-2005 NoName, 2005-2010 Boris Krasnovskiy, 2012-17 Miranda NG Team"
+#define __COPYRIGHT "© 2002-2005 NoName, 2005-2010 Boris Krasnovskiy, 2012-17 Miranda NG Team"
diff --git a/plugins/WebView/src/version.h b/plugins/WebView/src/version.h index cd530d0c33..42f5d505c1 100644 --- a/plugins/WebView/src/version.h +++ b/plugins/WebView/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Vincent Joyce" #define __AUTHOREMAIL "ungoliante666@hotmail.com" #define __AUTHORWEB "https://miranda-ng.org/p/WebView/" -#define __COPYRIGHT " 2011 Vincent Joyce" +#define __COPYRIGHT "© 2011 Vincent Joyce" diff --git a/plugins/WebView/src/webview_cleanup.cpp b/plugins/WebView/src/webview_cleanup.cpp index 31d081e15c..8ff30c08dc 100644 --- a/plugins/WebView/src/webview_cleanup.cpp +++ b/plugins/WebView/src/webview_cleanup.cpp @@ -203,165 +203,165 @@ char Characters[AMOUNT3] = '<',
'>',
' ',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '', // greater than 255 extra latin characters
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '', // misc other characters
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
+ 'Ў',
+ 'ў',
+ 'Ј',
+ '¤',
+ 'Ґ',
+ '¦',
+ '§',
+ 'Ё',
+ '©',
+ 'Є',
+ '«',
+ '¬',
+ '',
+ '®',
+ 'Ї',
+ '°',
+ '±',
+ 'І',
+ 'і',
+ 'ґ',
+ 'µ',
+ '¶',
+ '·',
+ 'ё',
+ '№',
+ 'є',
+ '»',
+ 'ј',
+ 'Ѕ',
+ 'ѕ',
+ 'ї',
+ 'А',
+ 'Б',
+ 'В',
+ 'Г',
+ 'Д',
+ 'Е',
+ 'Ж',
+ 'З',
+ 'И',
+ 'Й',
+ 'К',
+ 'Л',
+ 'М',
+ 'Н',
+ 'О',
+ 'П',
+ 'Р',
+ 'С',
+ 'Т',
+ 'У',
+ 'Ф',
+ 'Х',
+ 'Ц',
+ 'Ч',
+ 'Ш',
+ 'Щ',
+ 'Ъ',
+ 'Ы',
+ 'Ь',
+ 'Э',
+ 'Ю',
+ 'Я',
+ 'а',
+ 'б',
+ 'в',
+ 'г',
+ 'д',
+ 'е',
+ 'ж',
+ 'з',
+ 'и',
+ 'й',
+ 'к',
+ 'л',
+ 'м',
+ 'н',
+ 'о',
+ 'п',
+ 'р',
+ 'с',
+ 'т',
+ 'у',
+ 'ф',
+ 'х',
+ 'ц',
+ 'ч',
+ 'ш',
+ 'щ',
+ 'ъ',
+ 'ы',
+ 'ь',
+ 'э',
+ 'ю',
+ 'я',
+ 'Њ', // greater than 255 extra latin characters
+ 'њ',
+ 'Љ',
+ 'љ',
+ 'џ',
+ 'ѓ',
+ '€',
+ '',
+ 'Њ',
+ 'њ',
+ 'Љ',
+ 'љ',
+ 'џ',
+ 'ѓ',
+ '€',
+ '',
+ '–',
+ '—', // misc other characters
+ '‘',
+ '’',
+ '‚',
+ '“',
+ '”',
+ '„',
+ '†',
+ '‡',
+ '•',
+ '…',
+ '‰',
+ '‹',
+ '›',
+ 'Ђ',
'I',
'R',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
- '',
+ '™',
+ '–',
+ '—',
+ '‘',
+ '’',
+ '‚',
+ '“',
+ '”',
+ '„',
+ '†',
+ '‡',
+ '•',
+ '…',
+ '‰',
+ '‹',
+ '›',
+ 'Ђ',
'I',
'R',
- '',
+ '™',
' ',
' ',
' ',
' ',
' ',
' ',
- '',
- '',
- '',
- ''};
+ 'х',
+ 'ї',
+ '¦',
+ 'Ї'};
/*****************************************************************************/
void CodetoSymbol(char *truncated)
diff --git a/plugins/WhenWasIt/src/WhenWasIt.cpp b/plugins/WhenWasIt/src/WhenWasIt.cpp index 0bdd5bb7d6..b2d18a66ef 100644 --- a/plugins/WhenWasIt/src/WhenWasIt.cpp +++ b/plugins/WhenWasIt/src/WhenWasIt.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/birthdays.cpp b/plugins/WhenWasIt/src/birthdays.cpp index 067c61f162..43e60ffdc9 100644 --- a/plugins/WhenWasIt/src/birthdays.cpp +++ b/plugins/WhenWasIt/src/birthdays.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/birthdays.h b/plugins/WhenWasIt/src/birthdays.h index 10fdfa45fa..c090143adc 100644 --- a/plugins/WhenWasIt/src/birthdays.h +++ b/plugins/WhenWasIt/src/birthdays.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/date_utils.cpp b/plugins/WhenWasIt/src/date_utils.cpp index 4645e1f88e..897f2af0eb 100644 --- a/plugins/WhenWasIt/src/date_utils.cpp +++ b/plugins/WhenWasIt/src/date_utils.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/date_utils.h b/plugins/WhenWasIt/src/date_utils.h index d0f5d171dc..3cfcf235d5 100644 --- a/plugins/WhenWasIt/src/date_utils.h +++ b/plugins/WhenWasIt/src/date_utils.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/dlg_handlers.cpp b/plugins/WhenWasIt/src/dlg_handlers.cpp index 4448ccb73c..637d73fd3a 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.cpp +++ b/plugins/WhenWasIt/src/dlg_handlers.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
Copyright (C) 2014 Rozhuk Ivan
This program is free software; you can redistribute it and/or
diff --git a/plugins/WhenWasIt/src/dlg_handlers.h b/plugins/WhenWasIt/src/dlg_handlers.h index e33df200ad..7a77e5e33a 100644 --- a/plugins/WhenWasIt/src/dlg_handlers.h +++ b/plugins/WhenWasIt/src/dlg_handlers.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/events.cpp b/plugins/WhenWasIt/src/events.cpp index 63828b0422..9985e55e65 100644 --- a/plugins/WhenWasIt/src/events.cpp +++ b/plugins/WhenWasIt/src/events.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/events.h b/plugins/WhenWasIt/src/events.h index 8d63e59630..725f74866a 100644 --- a/plugins/WhenWasIt/src/events.h +++ b/plugins/WhenWasIt/src/events.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/hooked_events.cpp b/plugins/WhenWasIt/src/hooked_events.cpp index 072a57f2ba..c25bcc9eeb 100644 --- a/plugins/WhenWasIt/src/hooked_events.cpp +++ b/plugins/WhenWasIt/src/hooked_events.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006-2011 Cristian Libotean
+Copyright © 2006-2011 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/hooked_events.h b/plugins/WhenWasIt/src/hooked_events.h index f33012a9e2..25679b8bcf 100644 --- a/plugins/WhenWasIt/src/hooked_events.h +++ b/plugins/WhenWasIt/src/hooked_events.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/icons.cpp b/plugins/WhenWasIt/src/icons.cpp index e4164f2e8a..9cb6c49b3e 100644 --- a/plugins/WhenWasIt/src/icons.cpp +++ b/plugins/WhenWasIt/src/icons.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/icons.h b/plugins/WhenWasIt/src/icons.h index bf440d01e7..b3886cdbb9 100644 --- a/plugins/WhenWasIt/src/icons.h +++ b/plugins/WhenWasIt/src/icons.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/notifiers.cpp b/plugins/WhenWasIt/src/notifiers.cpp index 1280a06d5d..ac16710c23 100644 --- a/plugins/WhenWasIt/src/notifiers.cpp +++ b/plugins/WhenWasIt/src/notifiers.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/notifiers.h b/plugins/WhenWasIt/src/notifiers.h index 58c9e81dfd..815dc79b6d 100644 --- a/plugins/WhenWasIt/src/notifiers.h +++ b/plugins/WhenWasIt/src/notifiers.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/services.cpp b/plugins/WhenWasIt/src/services.cpp index 399cf5aeb1..4de81db610 100644 --- a/plugins/WhenWasIt/src/services.cpp +++ b/plugins/WhenWasIt/src/services.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/services.h b/plugins/WhenWasIt/src/services.h index 1787f96ef5..105bec9973 100644 --- a/plugins/WhenWasIt/src/services.h +++ b/plugins/WhenWasIt/src/services.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/stdafx.h b/plugins/WhenWasIt/src/stdafx.h index 2a0760b1e1..5f5ce88dda 100644 --- a/plugins/WhenWasIt/src/stdafx.h +++ b/plugins/WhenWasIt/src/stdafx.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006-2011 Cristian Libotean
+Copyright © 2006-2011 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/utils.cpp b/plugins/WhenWasIt/src/utils.cpp index c77578adee..d2856f94a4 100644 --- a/plugins/WhenWasIt/src/utils.cpp +++ b/plugins/WhenWasIt/src/utils.cpp @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/utils.h b/plugins/WhenWasIt/src/utils.h index b432c623c1..912b5ceeb7 100644 --- a/plugins/WhenWasIt/src/utils.h +++ b/plugins/WhenWasIt/src/utils.h @@ -1,7 +1,7 @@ /*
WhenWasIt (birthday reminder) plugin for Miranda IM
-Copyright 2006 Cristian Libotean
+Copyright © 2006 Cristian Libotean
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/WhenWasIt/src/version.h b/plugins/WhenWasIt/src/version.h index 9c7445aeec..08db3ede63 100644 --- a/plugins/WhenWasIt/src/version.h +++ b/plugins/WhenWasIt/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Cristian Libotean"
#define __AUTHOREMAIL "eblis102@yahoo.com"
#define __AUTHORWEB "https://miranda-ng.org/p/WhenWasIt/"
-#define __COPYRIGHT " 2006-2011 Cristian Libotean"
+#define __COPYRIGHT "© 2006-2011 Cristian Libotean"
diff --git a/plugins/WhoUsesMyFiles/src/version.h b/plugins/WhoUsesMyFiles/src/version.h index 5e28e76253..9fc7bab382 100644 --- a/plugins/WhoUsesMyFiles/src/version.h +++ b/plugins/WhoUsesMyFiles/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Nikolay Redko" #define __AUTHOREMAIL "nike000@users.sf.net" #define __AUTHORWEB "https://miranda-ng.org/p/WhoUsesMyFiles/" -#define __COPYRIGHT " 2003 Nike" +#define __COPYRIGHT "© 2003 Nike" diff --git a/plugins/WinterSpeak/src/version.h b/plugins/WinterSpeak/src/version.h index da86804d18..d0043659db 100644 --- a/plugins/WinterSpeak/src/version.h +++ b/plugins/WinterSpeak/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Ryan Winter, BlubbFish" #define __AUTHOREMAIL "miranda@blubbfish.net" #define __AUTHORWEB "https://miranda-ng.org/p/WinterSpeak/" -#define __COPYRIGHT " 2002 Ryan Winter, 2013 BlubbFish" +#define __COPYRIGHT "© 2002 Ryan Winter, 2013 BlubbFish" diff --git a/plugins/XSoundNotify/res/XSoundNotify.rc b/plugins/XSoundNotify/res/XSoundNotify.rc index 630acf9ac2..3e1eb766a5 100644 --- a/plugins/XSoundNotify/res/XSoundNotify.rc +++ b/plugins/XSoundNotify/res/XSoundNotify.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -95,7 +95,7 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/XSoundNotify/src/resource.h b/plugins/XSoundNotify/src/resource.h index 252ae84ac6..1ef78edb80 100644 --- a/plugins/XSoundNotify/src/resource.h +++ b/plugins/XSoundNotify/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// d:\MNG_orig\plugins\XSoundNotify\res\XSoundNotify.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ d:\MNG_orig\plugins\XSoundNotify\res\XSoundNotify.rc
//
#define IDD_OPTIONS 101
#define IDD_CONTACTS 102
diff --git a/plugins/XSoundNotify/src/version.h b/plugins/XSoundNotify/src/version.h index c199cb186d..420ab55dcc 100644 --- a/plugins/XSoundNotify/src/version.h +++ b/plugins/XSoundNotify/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Roman Torsten" #define __AUTHOREMAIL "rs_torsten-public@yahoo.com" #define __AUTHORWEB "https://miranda-ng.org/p/XSoundNotify/" -#define __COPYRIGHT " 2011 Roman Torsten" +#define __COPYRIGHT "© 2011 Roman Torsten" diff --git a/plugins/XSoundNotify/src/xsn_main.cpp b/plugins/XSoundNotify/src/xsn_main.cpp index 79e0d814ab..dc2feaa354 100644 --- a/plugins/XSoundNotify/src/xsn_main.cpp +++ b/plugins/XSoundNotify/src/xsn_main.cpp @@ -105,7 +105,7 @@ static bool isReceiveMessage(MEVENT hDbEvent) {
DBEVENTINFO info = {};
db_event_get(hDbEvent, &info);
- // i don't understand why it works and how it works, but it works correctly - practice way ( )
+ // i don't understand why it works and how it works, but it works correctly - practice way (методом тыка)
// so, i think correct condition would be : eventType == EVENTTYPE_MESSAGE && info.flags & DBEF_READ, but it really isn't
return !(((info.eventType != EVENTTYPE_MESSAGE) && !(info.flags & DBEF_READ)) || (info.flags & DBEF_SENT));
}
diff --git a/plugins/YAMN/src/version.h b/plugins/YAMN/src/version.h index cb3fb51161..d9e8ed5c85 100644 --- a/plugins/YAMN/src/version.h +++ b/plugins/YAMN/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "y_b, tweety, majvan"
#define __AUTHOREMAIL "francois.mean@skynet.be"
#define __AUTHORWEB "https://miranda-ng.org/p/YAMN/"
-#define __COPYRIGHT " 2002-2004 majvan, 2005-2007 tweety, y_b, Miranda community"
+#define __COPYRIGHT "© 2002-2004 majvan, 2005-2007 tweety, y_b, Miranda community"
diff --git a/plugins/YAPP/src/popwin.cpp b/plugins/YAPP/src/popwin.cpp index bdaff9f4d1..dce7e7cf1c 100644 --- a/plugins/YAPP/src/popwin.cpp +++ b/plugins/YAPP/src/popwin.cpp @@ -40,7 +40,7 @@ void RepositionWindows() { x += options.win_width + 1;
}
- // : - .
+ // Особый случай: выдвижение окна из-за верхнего края экрана.
if ((options.animate == ANIMATE_VERT) && (options.location == PL_TOPLEFT || options.location == PL_TOPRIGHT))
y = 0;
else
@@ -51,18 +51,18 @@ void RepositionWindows() { {
SendMessage(current->hwnd, PUM_GETHEIGHT, (WPARAM)&height, 0);
- // , .
+ // Если окна размещать у нижнего края, то координата текущего окна меньше на его высоту.
if (options.location == PL_BOTTOMLEFT || options.location == PL_BOTTOMRIGHT)
y -= height + 1;
- // .
+ // Перемещаем окно.
SendMessage(current->hwnd, PUM_MOVE, (WPARAM)x, (LPARAM)y);
- // .
- // , .
+ // Координата для следующего окна.
+ // Если окна размещать у верхнего края, то координата следующего окна больше на высоту текущего окна.
if (options.location == PL_TOPLEFT || options.location == PL_TOPRIGHT)
y += height + 1;
- // .
+ // Переходим к следующему окну.
current = current->next;
}
}
@@ -153,8 +153,8 @@ void RemoveWindowFromStack(HWND hwnd) current = current->next;
}
- // , :
- // / .
+ // Если после удаления в стеке остались окна, то нужно провести сжатие:
+ // сдвинуть все окна к верхнему/нижнему краю экрана.
if (hwnd_stack_top)
RepositionWindows();
}
diff --git a/plugins/YAPP/src/version.h b/plugins/YAPP/src/version.h index d05106616a..168719a1ab 100644 --- a/plugins/YAPP/src/version.h +++ b/plugins/YAPP/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Scott Ellis"
#define __AUTHOREMAIL "mail@scottellis.com.au"
#define __AUTHORWEB "https://miranda-ng.org/p/YAPP/"
-#define __COPYRIGHT " 2005-2006 Scott Ellis"
+#define __COPYRIGHT "© 2005-2006 Scott Ellis"
diff --git a/plugins/YARelay/src/main.cpp b/plugins/YARelay/src/main.cpp index 2797e6322c..b79528d78c 100644 --- a/plugins/YARelay/src/main.cpp +++ b/plugins/YARelay/src/main.cpp @@ -52,7 +52,7 @@ BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD, LPVOID) }
/**
-* Protocols cknowledgement
+* Protocols аcknowledgement
*/
int ProtoAck(WPARAM,LPARAM lparam)
{
diff --git a/plugins/YARelay/src/version.h b/plugins/YARelay/src/version.h index 836e2f465c..d565b2ec64 100644 --- a/plugins/YARelay/src/version.h +++ b/plugins/YARelay/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Anar Ibragimoff" #define __AUTHOREMAIL "ai91@mail.ru" #define __AUTHORWEB "https://miranda-ng.org/p/YARelay/" -#define __COPYRIGHT " 2005 Anar Ibragimoff" +#define __COPYRIGHT "© 2005 Anar Ibragimoff" diff --git a/plugins/ZeroNotification/src/version.h b/plugins/ZeroNotification/src/version.h index 3bf710e716..a69a5c5435 100644 --- a/plugins/ZeroNotification/src/version.h +++ b/plugins/ZeroNotification/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "bidyut, Maat"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/ZeroNotify/"
-#define __COPYRIGHT " 2005 bidyut, 2009 Maat"
+#define __COPYRIGHT "© 2005 bidyut, 2009 Maat"
diff --git a/plugins/ZeroSwitch/src/version.h b/plugins/ZeroSwitch/src/version.h index 0997452acc..0f3801c22a 100644 --- a/plugins/ZeroSwitch/src/version.h +++ b/plugins/ZeroSwitch/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "ZERO_BiT"
#define __AUTHOREMAIL "zero-bit@mail.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/ZeroSwitch/"
-#define __COPYRIGHT " 2007 ZERO_BiT"
+#define __COPYRIGHT "© 2007 ZERO_BiT"
diff --git a/plugins/helpers/commonheaders.h b/plugins/helpers/commonheaders.h index adf40281b7..e22b0fa5eb 100644 --- a/plugins/helpers/commonheaders.h +++ b/plugins/helpers/commonheaders.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-03 Miranda ICQ/IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/plugins/mRadio/proto_mradio/src/resource.h b/plugins/mRadio/proto_mradio/src/resource.h Binary files differindex d425e7b8b1..a3a1164829 100644 --- a/plugins/mRadio/proto_mradio/src/resource.h +++ b/plugins/mRadio/proto_mradio/src/resource.h diff --git a/plugins/mTextControl/src/main.cpp b/plugins/mTextControl/src/main.cpp index ce4ce10b7e..afc87735db 100644 --- a/plugins/mTextControl/src/main.cpp +++ b/plugins/mTextControl/src/main.cpp @@ -1,8 +1,8 @@ /*
Miranda Text Control - Plugin for Miranda IM
-Copyright 2005 Victor Pavlychko (nullbie@gmail.com),
- 2010 Merlin_de
+Copyright © 2005 Victor Pavlychko (nullbie@gmail.com),
+© 2010 Merlin_de
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/plugins/mTextControl/src/version.h b/plugins/mTextControl/src/version.h index ff737b30e3..480791cbd2 100644 --- a/plugins/mTextControl/src/version.h +++ b/plugins/mTextControl/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Merlin_de, Victor Pavlychko"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/mTextControl/"
-#define __COPYRIGHT " 2005-2006 Victor Pavlychko, 2010 Merlin_de"
+#define __COPYRIGHT "© 2005-2006 Victor Pavlychko, 2010 Merlin_de"
diff --git a/plugins/testplugin/src/testplug.cpp b/plugins/testplugin/src/testplug.cpp index 5a18377eda..2a3531be06 100644 --- a/plugins/testplugin/src/testplug.cpp +++ b/plugins/testplugin/src/testplug.cpp @@ -25,7 +25,7 @@ PLUGININFOEX pluginInfo = { "The long description of your plugin, to go in the plugin options dialog",
"J. Random Hacker",
"noreply@sourceforge.net",
- " 2002 J. Random Hacker",
+ "© 2002 J. Random Hacker",
"https://miranda-ng.org/",
UNICODE_AWARE, //not transient
// Generate your own unique id for your plugin.
diff --git a/plugins/wbOSD/src/version.h b/plugins/wbOSD/src/version.h index d40d80c6da..8f40116d9f 100644 --- a/plugins/wbOSD/src/version.h +++ b/plugins/wbOSD/src/version.h @@ -32,4 +32,4 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #define __AUTHOR "Andrej Krutak"
#define __AUTHOREMAIL "andree182@gmail.com"
#define __AUTHORWEB "https://miranda-ng.org/p/wbOSD/"
-#define __COPYRIGHT " 2005 Andrej Krutak"
+#define __COPYRIGHT "© 2005 Andrej Krutak"
diff --git a/protocols/AimOscar/proto_aim/src/resource.h b/protocols/AimOscar/proto_aim/src/resource.h Binary files differindex 80648724ca..d63bb1cdec 100644 --- a/protocols/AimOscar/proto_aim/src/resource.h +++ b/protocols/AimOscar/proto_aim/src/resource.h diff --git a/protocols/AimOscar/src/version.h b/protocols/AimOscar/src/version.h index 7fd84e0b93..d64d0715bb 100644 --- a/protocols/AimOscar/src/version.h +++ b/protocols/AimOscar/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Boris Krasnovskiy, Aaron Myles Landwehr"
#define __AUTHOREMAIL "borkra@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/AIM/"
-#define __COPYRIGHT " 2008-2011 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr"
+#define __COPYRIGHT "© 2008-2011 Boris Krasnovskiy, 2005-2006 Aaron Myles Landwehr"
diff --git a/protocols/Discord/src/avatars.cpp b/protocols/Discord/src/avatars.cpp index 73f645e34b..d2b629e442 100644 --- a/protocols/Discord/src/avatars.cpp +++ b/protocols/Discord/src/avatars.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/connection.cpp b/protocols/Discord/src/connection.cpp index 06cda379c2..5d8f9677e2 100644 --- a/protocols/Discord/src/connection.cpp +++ b/protocols/Discord/src/connection.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/dispatch.cpp b/protocols/Discord/src/dispatch.cpp index cd5dbf7ec3..025eeff0dd 100644 --- a/protocols/Discord/src/dispatch.cpp +++ b/protocols/Discord/src/dispatch.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/gateway.cpp b/protocols/Discord/src/gateway.cpp index df07cfbe2c..0f59b9382e 100644 --- a/protocols/Discord/src/gateway.cpp +++ b/protocols/Discord/src/gateway.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/groupchat.cpp b/protocols/Discord/src/groupchat.cpp index 825d8267d2..6bf5735879 100644 --- a/protocols/Discord/src/groupchat.cpp +++ b/protocols/Discord/src/groupchat.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/guilds.cpp b/protocols/Discord/src/guilds.cpp index db21b69cc2..9589494962 100644 --- a/protocols/Discord/src/guilds.cpp +++ b/protocols/Discord/src/guilds.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/http.cpp b/protocols/Discord/src/http.cpp index 2b0168aad1..26154f3ff6 100644 --- a/protocols/Discord/src/http.cpp +++ b/protocols/Discord/src/http.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/main.cpp b/protocols/Discord/src/main.cpp index 79677242c7..808354befb 100644 --- a/protocols/Discord/src/main.cpp +++ b/protocols/Discord/src/main.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/menus.cpp b/protocols/Discord/src/menus.cpp index 4c3cf1ab5c..ee43464e16 100644 --- a/protocols/Discord/src/menus.cpp +++ b/protocols/Discord/src/menus.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/options.cpp b/protocols/Discord/src/options.cpp index a929f132f7..f335f2aa91 100644 --- a/protocols/Discord/src/options.cpp +++ b/protocols/Discord/src/options.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/proto.cpp b/protocols/Discord/src/proto.cpp index 59fd938409..e937ade657 100644 --- a/protocols/Discord/src/proto.cpp +++ b/protocols/Discord/src/proto.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/server.cpp b/protocols/Discord/src/server.cpp index 1d48a3dc04..49eceea8a1 100644 --- a/protocols/Discord/src/server.cpp +++ b/protocols/Discord/src/server.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/stdafx.cxx b/protocols/Discord/src/stdafx.cxx index 66349b8227..1643cbea3a 100644 --- a/protocols/Discord/src/stdafx.cxx +++ b/protocols/Discord/src/stdafx.cxx @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/utils.cpp b/protocols/Discord/src/utils.cpp index a3ebd86284..2c0b254930 100644 --- a/protocols/Discord/src/utils.cpp +++ b/protocols/Discord/src/utils.cpp @@ -1,5 +1,5 @@ /* -Copyright 2016-17 Miranda NG team +Copyright © 2016-17 Miranda NG team 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 diff --git a/protocols/Discord/src/version.h b/protocols/Discord/src/version.h index 248ffde201..2389a715d1 100644 --- a/protocols/Discord/src/version.h +++ b/protocols/Discord/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "George Hazan" #define __AUTHOREMAIL "ghazan@miranda.im" #define __AUTHORWEB "https://miranda-ng.org/p/Discord/" -#define __COPYRIGHT " 2016-17 Miranda NG team" +#define __COPYRIGHT "© 2016-17 Miranda NG team" diff --git a/protocols/Dummy/src/dummy.h b/protocols/Dummy/src/dummy.h index 2aef5359a2..9017c5e9aa 100644 --- a/protocols/Dummy/src/dummy.h +++ b/protocols/Dummy/src/dummy.h @@ -1,5 +1,5 @@ /*
-Copyright (c) 2014 Robert Psel
+Copyright (c) 2014 Robert Pцsel
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/Dummy/src/dummy_options.cpp b/protocols/Dummy/src/dummy_options.cpp index 935dc955ff..8b300537b7 100644 --- a/protocols/Dummy/src/dummy_options.cpp +++ b/protocols/Dummy/src/dummy_options.cpp @@ -1,5 +1,5 @@ /*
-Copyright (c) 2014 Robert Psel
+Copyright (c) 2014 Robert Pцsel
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/Dummy/src/dummy_proto.cpp b/protocols/Dummy/src/dummy_proto.cpp index 6ccf2f4ac0..4c2ef65967 100644 --- a/protocols/Dummy/src/dummy_proto.cpp +++ b/protocols/Dummy/src/dummy_proto.cpp @@ -1,5 +1,5 @@ /* -Copyright (c) 2014 Robert Psel +Copyright (c) 2014 Robert Pцsel This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/protocols/Dummy/src/dummy_proto.h b/protocols/Dummy/src/dummy_proto.h index 2543c949da..885c92e59c 100644 --- a/protocols/Dummy/src/dummy_proto.h +++ b/protocols/Dummy/src/dummy_proto.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2014 Robert Psel +Copyright (c) 2014 Robert Pцsel This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/protocols/Dummy/src/main.cpp b/protocols/Dummy/src/main.cpp index 7ce977fa6d..797c7e7470 100644 --- a/protocols/Dummy/src/main.cpp +++ b/protocols/Dummy/src/main.cpp @@ -1,5 +1,5 @@ /*
-Copyright (c) 2014 Robert Psel
+Copyright (c) 2014 Robert Pцsel
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/Dummy/src/stdafx.cxx b/protocols/Dummy/src/stdafx.cxx index 4c7b0c9368..b577430df0 100644 --- a/protocols/Dummy/src/stdafx.cxx +++ b/protocols/Dummy/src/stdafx.cxx @@ -1,5 +1,5 @@ /* -Copyright (c) 2014 Robert Psel +Copyright (c) 2014 Robert Pцsel This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/protocols/Dummy/src/stdafx.h b/protocols/Dummy/src/stdafx.h index 84b1fbc2da..e20bdc612b 100644 --- a/protocols/Dummy/src/stdafx.h +++ b/protocols/Dummy/src/stdafx.h @@ -1,5 +1,5 @@ /* -Copyright (c) 2014 Robert Psel +Copyright (c) 2014 Robert Pцsel This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/protocols/Dummy/src/version.h b/protocols/Dummy/src/version.h index c9ba47ae5d..938681144c 100644 --- a/protocols/Dummy/src/version.h +++ b/protocols/Dummy/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Robert P\xf6" "sel" #define __AUTHOREMAIL "robyer@seznam.cz" #define __AUTHORWEB "https://miranda-ng.org/p/Dummy/" -#define __COPYRIGHT " 2014-17 Robert P\xf6" "sel" +#define __COPYRIGHT "© 2014-17 Robert P\xf6" "sel" diff --git a/protocols/EmLanProto/src/version.h b/protocols/EmLanProto/src/version.h index 99c0c3d5e9..e5c437a35c 100644 --- a/protocols/EmLanProto/src/version.h +++ b/protocols/EmLanProto/src/version.h @@ -12,4 +12,4 @@ #define __AUTHOR "kva" #define __AUTHOREMAIL "kva@fromru.com" #define __AUTHORWEB "https://miranda-ng.org/p/EmLanProto/" -#define __COPYRIGHT " Viktor Kuzmin" +#define __COPYRIGHT "© Viktor Kuzmin" diff --git a/protocols/Gadu-Gadu/src/avatar.cpp b/protocols/Gadu-Gadu/src/avatar.cpp index 975d3720b4..6fecc850e1 100644 --- a/protocols/Gadu-Gadu/src/avatar.cpp +++ b/protocols/Gadu-Gadu/src/avatar.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////////
// Gadu-Gadu Plugin for Miranda IM
//
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/core.cpp b/protocols/Gadu-Gadu/src/core.cpp index a9048fe0c8..881c95792d 100644 --- a/protocols/Gadu-Gadu/src/core.cpp +++ b/protocols/Gadu-Gadu/src/core.cpp @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/dynstuff.cpp b/protocols/Gadu-Gadu/src/dynstuff.cpp index 275a273aff..520a53bb51 100644 --- a/protocols/Gadu-Gadu/src/dynstuff.cpp +++ b/protocols/Gadu-Gadu/src/dynstuff.cpp @@ -28,15 +28,15 @@ /*
* list_add_sorted()
*
- * dodaje do listy dany element. przy okazji moe te skopiowa zawarto.
- * jeli poda si jako ostatni parametr funkcj porwnujc zawarto
- * elementw, moe posortowa od razu.
+ * dodaje do listy dany element. przy okazji moїe teї skopiowaж zawarto¶ж.
+ * je¶li poda siк jako ostatni parametr funkcjк porуwnuj±c± zawarto¶ж
+ * elementуw, moїe posortowaж od razu.
*
- * - list - wskanik do listy,
- * - data - wskanik do elementu,
- * - alloc_size - rozmiar elementu, jeli chcemy go skopiowa.
+ * - list - wskaјnik do listy,
+ * - data - wskaјnik do elementu,
+ * - alloc_size - rozmiar elementu, je¶li chcemy go skopiowaж.
*
- * zwraca wskanik zaalokowanego elementu lub NULL w przpadku bdu.
+ * zwraca wskaјnik zaalokowanego elementu lub NULL w przpadku bікdu.
*/
void *list_add_sorted(list_t *list, void *data, int alloc_size, int (*comparision)(void *, void *))
{
@@ -90,7 +90,7 @@ void *list_add_sorted(list_t *list, void *data, int alloc_size, int (*comparisio /*
* list_add()
*
- * wrapper do list_add_sorted(), ktry zachowuje poprzedni skadni.
+ * wrapper do list_add_sorted(), ktуry zachowuje poprzedni± skіadniк.
*/
void *list_add(list_t *list, void *data, int alloc_size)
{
@@ -102,9 +102,9 @@ void *list_add(list_t *list, void *data, int alloc_size) *
* usuwa z listy wpis z podanym elementem.
*
- * - list - wskanik do listy,
+ * - list - wskaјnik do listy,
* - data - element,
- * - free_data - zwolni pami po elemencie.
+ * - free_data - zwolniж pamiкж po elemencie.
*/
int list_remove(list_t *list, void *data, int free_data)
{
@@ -138,7 +138,7 @@ int list_remove(list_t *list, void *data, int free_data) /*
* list_count()
*
- * zwraca ilo elementw w danej licie.
+ * zwraca ilo¶ж elementуw w danej li¶cie.
*
* - list - lista.
*/
@@ -158,7 +158,7 @@ int list_count(list_t list) * niszczy wszystkie elementy listy.
*
* - list - lista,
- * - free_data - czy zwalnia bufor danych?
+ * - free_data - czy zwalniaж bufor danych?
*/
int list_destroy(list_t list, int free_data)
{
@@ -181,10 +181,10 @@ int list_destroy(list_t list, int free_data) /*
* string_realloc()
*
- * upewnia si, e w stringu bdzie wystarczajco duo miejsca.
+ * upewnia siк, їe w stringu bкdzie wystarczaj±co duїo miejsca.
*
- * - s - cig znakw,
- * - count - wymagana ilo znakw (bez kocowego '\0').
+ * - s - ci±g znakуw,
+ * - count - wymagana ilo¶ж znakуw (bez koсcowego '\0').
*/
static void string_realloc(string_t s, int count)
{
@@ -204,10 +204,10 @@ static void string_realloc(string_t s, int count) /*
* string_append_c()
*
- * dodaje do danego cigu jeden znak, alokujc przy tym odpowiedni ilo
- * pamici.
+ * dodaje do danego ci±gu jeden znak, alokuj±c przy tym odpowiedni± ilo¶ж
+ * pamiкci.
*
- * - s - cig znakw.
+ * - s - ci±g znakуw.
* - c - znaczek do dopisania.
*/
int string_append_c(string_t s, char c)
@@ -228,11 +228,11 @@ int string_append_c(string_t s, char c) /*
* string_append_n()
*
- * dodaje tekst do bufora alokujc odpowiedni ilo pamici.
+ * dodaje tekst do bufora alokuj±c odpowiedni± ilo¶ж pamiкci.
*
- * - s - cig znakw,
+ * - s - ci±g znakуw,
* - str - tekst do dopisania,
- * - count - ile znakw tego tekstu dopisa? (-1 znaczy, e cay).
+ * - count - ile znakуw tego tekstu dopisaж? (-1 znaczy, їe caіy).
*/
int string_append_n(string_t s, const char *str, int count)
{
@@ -264,10 +264,10 @@ int string_append(string_t s, const char *str) *
* wstawia tekst w podane miejsce bufora.
*
- * - s - cig znakw,
- * - index - miejsce, gdzie mamy wpisa (liczone od 0),
+ * - s - ci±g znakуw,
+ * - index - miejsce, gdzie mamy wpisaж (liczone od 0),
* - str - tekst do dopisania,
- * - count - ilo znakw do dopisania (-1 znaczy, e wszystkie).
+ * - count - ilo¶ж znakуw do dopisania (-1 znaczy, їe wszystkie).
*/
void string_insert_n(string_t s, int index, const char *str, int count)
{
@@ -296,11 +296,11 @@ void string_insert(string_t s, int index, const char *str) /*
* string_init()
*
- * inicjuje struktur string. alokuje pami i przypisuje pierwsz warto.
+ * inicjuje strukturк string. alokuje pamiкж i przypisuje pierwsz± warto¶ж.
*
- * - value - jeli NULL, cig jest pusty, inaczej kopiuje tam.
+ * - value - je¶li NULL, ci±g jest pusty, inaczej kopiuje tam.
*
- * zwraca zaalokowan struktur `string'.
+ * zwraca zaalokowan± strukturк `string'.
*/
string_t string_init(const char *value)
{
@@ -319,9 +319,9 @@ string_t string_init(const char *value) /*
* string_clear()
*
- * czyci zawarto struktury `string'.
+ * czy¶ci zawarto¶ж struktury `string'.
*
- * - s - cig znakw.
+ * - s - ci±g znakуw.
*/
void string_clear(string_t s)
{
@@ -340,13 +340,13 @@ void string_clear(string_t s) /*
* string_free()
*
- * zwalnia pami po strukturze string i moe te zwolni pami po samym
- * cigu znakw.
+ * zwalnia pamiкж po strukturze string i moїe teї zwolniж pamiкж po samym
+ * ci±gu znakуw.
*
- * - s - struktura, ktr wycinamy,
- * - free_string - zwolni pami po cigu znakw?
+ * - s - struktura, ktуr± wycinamy,
+ * - free_string - zwolniж pamiкж po ci±gu znakуw?
*
- * jeli free_string=0 zwraca wskanik do cigu, inaczej NULL.
+ * je¶li free_string=0 zwraca wskaјnik do ci±gu, inaczej NULL.
*/
char *string_free(string_t s, int free_string)
{
@@ -368,14 +368,14 @@ char *string_free(string_t s, int free_string) /*
* _itoa()
*
- * prosta funkcja, ktra zwraca tekstow reprezentacj liczby. w obrbie
- * danego wywoania jakiej funkcji lub wyraenia moe by wywoania 10
- * razy, poniewa tyle mamy statycznych buforw. lepsze to ni cige
- * tworzenie tymczasowych buforw na stosie i sprintf()owanie.
+ * prosta funkcja, ktуra zwraca tekstow± reprezentacjк liczby. w obrкbie
+ * danego wywoіania jakiej¶ funkcji lub wyraїenia moїe byж wywoіania 10
+ * razy, poniewaї tyle mamy statycznych buforуw. lepsze to niї ci±gіe
+ * tworzenie tymczasowych buforуw na stosie i sprintf()owanie.
*
* - i - liczba do zamiany.
*
- * zwraca adres do bufora, ktrego _NIE_NALEY_ zwalnia.
+ * zwraca adres do bufora, ktуrego _NIE_NALEЇY_ zwalniaж.
*/
const char *ditoa(long int i)
@@ -394,19 +394,19 @@ const char *ditoa(long int i) /*
* array_make()
*
- * tworzy tablic tekstw z jednego, rozdzielonego podanymi znakami.
+ * tworzy tablicк tekstуw z jednego, rozdzielonego podanymi znakami.
*
- * - string - tekst wejciowy,
- * - sep - lista elementw oddzielajcych,
- * - max - maksymalna ilo elementw tablicy. jeli rwne 0, nie ma
- * ogranicze rozmiaru tablicy.
- * - trim - czy wiksz ilo elementw oddzielajcych traktowa jako
- * jeden (na przykad spacje, tabulacja itp.)
- * - quotes - czy pola mog by zapisywane w cudzysowiach lub
+ * - string - tekst wej¶ciowy,
+ * - sep - lista elementуw oddzielaj±cych,
+ * - max - maksymalna ilo¶ж elementуw tablicy. je¶li rуwne 0, nie ma
+ * ograniczeс rozmiaru tablicy.
+ * - trim - czy wiкksz± ilo¶ж elementуw oddzielaj±cych traktowaж jako
+ * jeden (na przykіad spacje, tabulacja itp.)
+ * - quotes - czy pola mog± byж zapisywane w cudzysіowiach lub
* apostrofach z escapowanymi znakami.
*
- * zaalokowan tablic z zaalokowanymi cigami znakw, ktr naley
- * zwolni funkcj array_free()
+ * zaalokowan± tablicк z zaalokowanymi ci±gami znakуw, ktуr± naleїy
+ * zwolniж funkcj± array_free()
*/
char **array_make(const char *string, const char *sep, int max, int trim, int quotes)
{
@@ -505,7 +505,7 @@ failure: /*
* array_count()
*
- * zwraca ilo elementw tablicy.
+ * zwraca ilo¶ж elementуw tablicy.
*/
int array_count(char **array)
{
@@ -539,13 +539,13 @@ void array_add(char ***array, char *string) /*
* array_join()
*
- * czy elementy tablicy w jeden string oddzielajc elementy odpowiednim
+ * і±czy elementy tablicy w jeden string oddzielaj±c elementy odpowiednim
* separatorem.
*
- * - array - wskanik do tablicy,
+ * - array - wskaјnik do tablicy,
* - sep - seperator.
*
- * zwrcony cig znakw naley zwolni.
+ * zwrуcony ci±g znakуw naleїy zwolniж.
*/
char *array_join(char **array, const char *sep)
{
@@ -569,8 +569,8 @@ char *array_join(char **array, const char *sep) * stwierdza, czy tablica zawiera podany element.
*
* - array - tablica,
- * - string - szukany cig znakw,
- * - casesensitive - czy mamy zwraca uwag na wielko znakw?
+ * - string - szukany ci±g znakуw,
+ * - casesensitive - czy mamy zwracaж uwagк na wielko¶ж znakуw?
*
* 0/1
*/
@@ -594,7 +594,7 @@ int array_contains(char **array, const char *string, int casesensitive) /*
* array_free()
*
- * zwalnia pamie zajmowan przez tablic.
+ * zwalnia pamieж zajmowan± przez tablicк.
*/
void array_free(char **array)
{
diff --git a/protocols/Gadu-Gadu/src/dynstuff.h b/protocols/Gadu-Gadu/src/dynstuff.h index 8e36c67ede..c176207076 100644 --- a/protocols/Gadu-Gadu/src/dynstuff.h +++ b/protocols/Gadu-Gadu/src/dynstuff.h @@ -54,7 +54,7 @@ void string_insert_n(string_t s, int index, const char *str, int count); void string_clear(string_t s);
char *string_free(string_t s, int free_string);
-/* tablice stringw */
+/* tablice stringуw */
char **array_make(const char *string, const char *sep, int max, int trim, int quotes);
char *array_join(char **array, const char *sep);
@@ -63,7 +63,7 @@ int array_count(char **array); int array_contains(char **array, const char *string, int casesensitive);
void array_free(char **array);
-/* rozszerzenia libcw */
+/* rozszerzenia libcуw */
const char *ditoa(long int i);
diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index 9f343b52cd..b15b9bedc1 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/gg.h b/protocols/Gadu-Gadu/src/gg.h index f1848d2e5e..34465ea821 100644 --- a/protocols/Gadu-Gadu/src/gg.h +++ b/protocols/Gadu-Gadu/src/gg.h @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/gg_proto.cpp b/protocols/Gadu-Gadu/src/gg_proto.cpp index d0ff63102f..7e2a537d1d 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.cpp +++ b/protocols/Gadu-Gadu/src/gg_proto.cpp @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/gg_proto.h b/protocols/Gadu-Gadu/src/gg_proto.h index 9107c49cdd..e5d39c6257 100644 --- a/protocols/Gadu-Gadu/src/gg_proto.h +++ b/protocols/Gadu-Gadu/src/gg_proto.h @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index 0cfef60aed..a0f408d38f 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/libgadu/win32.cpp b/protocols/Gadu-Gadu/src/libgadu/win32.cpp index 55da0d8e0d..414325d0b1 100644 --- a/protocols/Gadu-Gadu/src/libgadu/win32.cpp +++ b/protocols/Gadu-Gadu/src/libgadu/win32.cpp @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2010 Bartosz Biaek
+// Copyright (c) 2009-2010 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/libgadu/win32.h b/protocols/Gadu-Gadu/src/libgadu/win32.h index fdc5017279..bf30d6f75e 100644 --- a/protocols/Gadu-Gadu/src/libgadu/win32.h +++ b/protocols/Gadu-Gadu/src/libgadu/win32.h @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2010 Bartosz Biaek
+// Copyright (c) 2009-2010 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index 6463c5ccf6..03b6b90a81 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////////
// Gadu-Gadu Plugin for Miranda IM
//
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/oauth.cpp b/protocols/Gadu-Gadu/src/oauth.cpp index 5c0f21cf74..e2339bf4eb 100644 --- a/protocols/Gadu-Gadu/src/oauth.cpp +++ b/protocols/Gadu-Gadu/src/oauth.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////////
// Gadu-Gadu Plugin for Miranda IM
//
-// Copyright (c) 2010 Bartosz Biaek
+// Copyright (c) 2010 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/popups.cpp b/protocols/Gadu-Gadu/src/popups.cpp index a1527e3b46..167130a027 100644 --- a/protocols/Gadu-Gadu/src/popups.cpp +++ b/protocols/Gadu-Gadu/src/popups.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////////
// Gadu-Gadu Plugin for Miranda IM
//
-// Copyright (c) 2011-2012 Bartosz Biaek
+// Copyright (c) 2011-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/services.cpp b/protocols/Gadu-Gadu/src/services.cpp index cd060f3609..6137887bf1 100644 --- a/protocols/Gadu-Gadu/src/services.cpp +++ b/protocols/Gadu-Gadu/src/services.cpp @@ -2,7 +2,7 @@ // Gadu-Gadu Plugin for Miranda IM
//
// Copyright (c) 2003-2009 Adam Strzelecki <ono+miranda@java.pl>
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index f13ddecb2b..327d091981 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////////
// Gadu-Gadu Plugin for Miranda IM
//
-// Copyright (c) 2009-2012 Bartosz Biaek
+// Copyright (c) 2009-2012 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/Gadu-Gadu/src/version.h b/protocols/Gadu-Gadu/src/version.h index e4add85bd9..8ec02a91d6 100644 --- a/protocols/Gadu-Gadu/src/version.h +++ b/protocols/Gadu-Gadu/src/version.h @@ -1,7 +1,7 @@ ////////////////////////////////////////////////////////////////////////////////
// Gadu-Gadu Plugin for Miranda IM
//
-// Copyright (c) 2010 Bartosz Biaek
+// Copyright (c) 2010 Bartosz Biaіek
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
@@ -29,5 +29,5 @@ #define __DESCRIPTION "Gadu-Gadu protocol support for Miranda NG."
#define __AUTHOR "Bartosz Bialek, Adam Strzelecki"
#define __AUTHOREMAIL "dezred"/*antispam*/"@"/*antispam*/"gmail"/*antispam*/"."/*antispam*/"com"
-#define __COPYRIGHT " 2009-2012 Bartosz Bialek, 2003-2009 Adam Strzelecki"
+#define __COPYRIGHT "© 2009-2012 Bartosz Bialek, 2003-2009 Adam Strzelecki"
#define __AUTHORWEB "https://miranda-ng.org/p/GG/"
diff --git a/protocols/ICQCorp/src/version.h b/protocols/ICQCorp/src/version.h index 3f5565af02..dd28b0b456 100644 --- a/protocols/ICQCorp/src/version.h +++ b/protocols/ICQCorp/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team, Eugene Tarasenko"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/ICQCorp/"
-#define __COPYRIGHT " 2014-17 Miranda NG Team, 2003-2005 Eugene Tarasenko"
+#define __COPYRIGHT "© 2014-17 Miranda NG Team, 2003-2005 Eugene Tarasenko"
diff --git a/protocols/IRCG/src/irclib.h b/protocols/IRCG/src/irclib.h index a6df9a0d8d..dcb6fccf00 100644 --- a/protocols/IRCG/src/irclib.h +++ b/protocols/IRCG/src/irclib.h @@ -152,7 +152,7 @@ protected: public:
CDccSession(CIrcProto*, DCCINFO *pdci); // constructor
- ~CDccSession(); // destructor,
+ ~CDccSession(); // destructor, что характерно
time_t tLastPercentageUpdate; // time of last update of the filetransfer dialog
time_t tLastActivity; // time of last in/out activity of the object
diff --git a/protocols/IRCG/src/version.h b/protocols/IRCG/src/version.h index 129365f6fc..a708c116a6 100644 --- a/protocols/IRCG/src/version.h +++ b/protocols/IRCG/src/version.h @@ -8,7 +8,7 @@ #define __DESC "Internet Relay Chat (IRC) protocol support for Miranda NG."
#define __AUTHOR "Miranda team"
#define __AUTHOREMAIL "ghazan@miranda.im"
-#define __COPYRIGHT " 2003-17 Jurgen Persson, George Hazan"
+#define __COPYRIGHT "© 2003-17 Jurgen Persson, George Hazan"
#define __AUTHORWEB "https://miranda-ng.org/p/IRC/"
#define __PLUGIN_NAME "IRC protocol"
diff --git a/protocols/IRCG/src/windows.cpp b/protocols/IRCG/src/windows.cpp index 4dc846af9b..759436f5fc 100644 --- a/protocols/IRCG/src/windows.cpp +++ b/protocols/IRCG/src/windows.cpp @@ -916,7 +916,7 @@ void CManagerDlg::OnClose() CMStringW S1 = temp;
/* FIXME: What the hell does it mean!? GCC won't compile this on UNICODE */
#if !defined(__GNUC__) || !defined(UNICODE)
- S1.Replace(L" ", L"%");
+ S1.Replace(L" ", L"%¤");
#endif
S += L" " + S1;
}
@@ -1289,7 +1289,7 @@ void CManagerDlg::InitManager(int mode, const wchar_t* window) if (!S.IsEmpty()) {
/* FIXME: What the hell does it mean!? GCC won't compile this on UNICODE */
#if !defined(__GNUC__) || !defined(UNICODE)
- S.Replace(L"%", L" ");
+ S.Replace(L"%¤", L" ");
#endif
m_topic.SendMsg(CB_ADDSTRING, 0, (LPARAM)S.c_str());
}
diff --git a/protocols/IcqOscarJ/src/askauthentication.cpp b/protocols/IcqOscarJ/src/askauthentication.cpp index 8c3b9e498b..8ca90bd5c5 100644 --- a/protocols/IcqOscarJ/src/askauthentication.cpp +++ b/protocols/IcqOscarJ/src/askauthentication.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/capabilities.cpp b/protocols/IcqOscarJ/src/capabilities.cpp index d7a4bf59c0..a2a3ac2d5b 100644 --- a/protocols/IcqOscarJ/src/capabilities.cpp +++ b/protocols/IcqOscarJ/src/capabilities.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/capabilities.h b/protocols/IcqOscarJ/src/capabilities.h index 5dd5a84d81..bce14e3e2d 100644 --- a/protocols/IcqOscarJ/src/capabilities.h +++ b/protocols/IcqOscarJ/src/capabilities.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/chan_01login.cpp b/protocols/IcqOscarJ/src/chan_01login.cpp index 1186984410..0767981f11 100644 --- a/protocols/IcqOscarJ/src/chan_01login.cpp +++ b/protocols/IcqOscarJ/src/chan_01login.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/chan_02data.cpp b/protocols/IcqOscarJ/src/chan_02data.cpp index 4a42f5ed04..eca922ca73 100644 --- a/protocols/IcqOscarJ/src/chan_02data.cpp +++ b/protocols/IcqOscarJ/src/chan_02data.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/chan_03error.cpp b/protocols/IcqOscarJ/src/chan_03error.cpp index fa32814542..481e1e6ce4 100644 --- a/protocols/IcqOscarJ/src/chan_03error.cpp +++ b/protocols/IcqOscarJ/src/chan_03error.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001,2002 Jon Keating, Richard Hughes
-// Copyright 2002,2003,2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004,2005 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001,2002 Jon Keating, Richard Hughes
+// Copyright © 2002,2003,2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004,2005 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/chan_04close.cpp b/protocols/IcqOscarJ/src/chan_04close.cpp index 7e1f6b2ffa..5d9069ddc1 100644 --- a/protocols/IcqOscarJ/src/chan_04close.cpp +++ b/protocols/IcqOscarJ/src/chan_04close.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/chan_05ping.cpp b/protocols/IcqOscarJ/src/chan_05ping.cpp index bf807cc7c5..8e3f05d938 100644 --- a/protocols/IcqOscarJ/src/chan_05ping.cpp +++ b/protocols/IcqOscarJ/src/chan_05ping.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/changeinfo.h b/protocols/IcqOscarJ/src/changeinfo.h index 9ce6ba0c48..68c4a17c0a 100644 --- a/protocols/IcqOscarJ/src/changeinfo.h +++ b/protocols/IcqOscarJ/src/changeinfo.h @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2010 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2010 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/channels.h b/protocols/IcqOscarJ/src/channels.h index 5e2f59aed6..22fd191318 100644 --- a/protocols/IcqOscarJ/src/channels.h +++ b/protocols/IcqOscarJ/src/channels.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/constants.cpp b/protocols/IcqOscarJ/src/constants.cpp index d632303f7a..e12c56f4c2 100644 --- a/protocols/IcqOscarJ/src/constants.cpp +++ b/protocols/IcqOscarJ/src/constants.cpp @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2009 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2009 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/cookies.cpp b/protocols/IcqOscarJ/src/cookies.cpp index df1305de8e..e828ee042e 100644 --- a/protocols/IcqOscarJ/src/cookies.cpp +++ b/protocols/IcqOscarJ/src/cookies.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/cookies.h b/protocols/IcqOscarJ/src/cookies.h index d0705417c8..4e1b22a512 100644 --- a/protocols/IcqOscarJ/src/cookies.h +++ b/protocols/IcqOscarJ/src/cookies.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/db.cpp b/protocols/IcqOscarJ/src/db.cpp index 1c03f1e4ff..6f31d4d194 100644 --- a/protocols/IcqOscarJ/src/db.cpp +++ b/protocols/IcqOscarJ/src/db.cpp @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2009 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2009 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/directpackets.cpp b/protocols/IcqOscarJ/src/directpackets.cpp index 7ee3bed194..f9b2500536 100644 --- a/protocols/IcqOscarJ/src/directpackets.cpp +++ b/protocols/IcqOscarJ/src/directpackets.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/dlgproc.cpp b/protocols/IcqOscarJ/src/dlgproc.cpp index 68bdab1338..d411398080 100644 --- a/protocols/IcqOscarJ/src/dlgproc.cpp +++ b/protocols/IcqOscarJ/src/dlgproc.cpp @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2010 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2010 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/editlist.cpp b/protocols/IcqOscarJ/src/editlist.cpp index af99fa4531..afa89e0e73 100644 --- a/protocols/IcqOscarJ/src/editlist.cpp +++ b/protocols/IcqOscarJ/src/editlist.cpp @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2009 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2009 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/editstring.cpp b/protocols/IcqOscarJ/src/editstring.cpp index ee2029956f..004bb77910 100644 --- a/protocols/IcqOscarJ/src/editstring.cpp +++ b/protocols/IcqOscarJ/src/editstring.cpp @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2009 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2009 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_01service.cpp b/protocols/IcqOscarJ/src/fam_01service.cpp index c654288d64..01f3caf7d9 100644 --- a/protocols/IcqOscarJ/src/fam_01service.cpp +++ b/protocols/IcqOscarJ/src/fam_01service.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_02location.cpp b/protocols/IcqOscarJ/src/fam_02location.cpp index 088614904d..76aab02f91 100644 --- a/protocols/IcqOscarJ/src/fam_02location.cpp +++ b/protocols/IcqOscarJ/src/fam_02location.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_03buddy.cpp b/protocols/IcqOscarJ/src/fam_03buddy.cpp index 4b79391c19..6338374ee6 100644 --- a/protocols/IcqOscarJ/src/fam_03buddy.cpp +++ b/protocols/IcqOscarJ/src/fam_03buddy.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_04message.cpp b/protocols/IcqOscarJ/src/fam_04message.cpp index bad7a528c4..b0170a7267 100644 --- a/protocols/IcqOscarJ/src/fam_04message.cpp +++ b/protocols/IcqOscarJ/src/fam_04message.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_09bos.cpp b/protocols/IcqOscarJ/src/fam_09bos.cpp index b3f69bb2a9..154194f684 100644 --- a/protocols/IcqOscarJ/src/fam_09bos.cpp +++ b/protocols/IcqOscarJ/src/fam_09bos.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_0alookup.cpp b/protocols/IcqOscarJ/src/fam_0alookup.cpp index 50a66c2ec1..6b17291f0b 100644 --- a/protocols/IcqOscarJ/src/fam_0alookup.cpp +++ b/protocols/IcqOscarJ/src/fam_0alookup.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_0bstatus.cpp b/protocols/IcqOscarJ/src/fam_0bstatus.cpp index 91b79e4a0c..eb0d048003 100644 --- a/protocols/IcqOscarJ/src/fam_0bstatus.cpp +++ b/protocols/IcqOscarJ/src/fam_0bstatus.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001,2002 Jon Keating, Richard Hughes
-// Copyright 2002,2003,2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004,2005,2006 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001,2002 Jon Keating, Richard Hughes
+// Copyright © 2002,2003,2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004,2005,2006 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_13servclist.cpp b/protocols/IcqOscarJ/src/fam_13servclist.cpp index 17137e8783..9f0021d45e 100644 --- a/protocols/IcqOscarJ/src/fam_13servclist.cpp +++ b/protocols/IcqOscarJ/src/fam_13servclist.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger // ________________________________________ // -// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede -// Copyright 2001-2002 Jon Keating, Richard Hughes -// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater -// Copyright 2004-2010 Joe Kucera -// Copyright 2012-2017 Miranda NG Team +// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede +// Copyright © 2001-2002 Jon Keating, Richard Hughes +// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater +// Copyright © 2004-2010 Joe Kucera +// Copyright © 2012-2017 Miranda NG Team // // This program is free software; you can redistribute it and/or // modify it under the terms of the GNU General Public License diff --git a/protocols/IcqOscarJ/src/fam_15icqserver.cpp b/protocols/IcqOscarJ/src/fam_15icqserver.cpp index 93629b691f..8b7ea2367e 100644 --- a/protocols/IcqOscarJ/src/fam_15icqserver.cpp +++ b/protocols/IcqOscarJ/src/fam_15icqserver.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/fam_17signon.cpp b/protocols/IcqOscarJ/src/fam_17signon.cpp index 9dd5151d97..3c142cbbe7 100644 --- a/protocols/IcqOscarJ/src/fam_17signon.cpp +++ b/protocols/IcqOscarJ/src/fam_17signon.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/families.h b/protocols/IcqOscarJ/src/families.h index facea0b926..bd4aa827e6 100644 --- a/protocols/IcqOscarJ/src/families.h +++ b/protocols/IcqOscarJ/src/families.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/globals.h b/protocols/IcqOscarJ/src/globals.h index 667005ed0e..21d0810d08 100644 --- a/protocols/IcqOscarJ/src/globals.h +++ b/protocols/IcqOscarJ/src/globals.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/guids.h b/protocols/IcqOscarJ/src/guids.h index 134625e95a..1aa0e86986 100644 --- a/protocols/IcqOscarJ/src/guids.h +++ b/protocols/IcqOscarJ/src/guids.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/i18n.cpp b/protocols/IcqOscarJ/src/i18n.cpp index 9efa10fd39..3e32c106c0 100644 --- a/protocols/IcqOscarJ/src/i18n.cpp +++ b/protocols/IcqOscarJ/src/i18n.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/i18n.h b/protocols/IcqOscarJ/src/i18n.h index f0a7174805..d8ca224640 100644 --- a/protocols/IcqOscarJ/src/i18n.h +++ b/protocols/IcqOscarJ/src/i18n.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_advsearch.cpp b/protocols/IcqOscarJ/src/icq_advsearch.cpp index d9539b960a..accc1f86c9 100644 --- a/protocols/IcqOscarJ/src/icq_advsearch.cpp +++ b/protocols/IcqOscarJ/src/icq_advsearch.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_advsearch.h b/protocols/IcqOscarJ/src/icq_advsearch.h index db8b87b4a4..0191e7020b 100644 --- a/protocols/IcqOscarJ/src/icq_advsearch.h +++ b/protocols/IcqOscarJ/src/icq_advsearch.h @@ -2,10 +2,10 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001,2002 Jon Keating, Richard Hughes
-// Copyright 2002,2003,2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001,2002 Jon Keating, Richard Hughes
+// Copyright © 2002,2003,2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_avatar.cpp b/protocols/IcqOscarJ/src/icq_avatar.cpp index f554e06e60..da9c52604b 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.cpp +++ b/protocols/IcqOscarJ/src/icq_avatar.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_avatar.h b/protocols/IcqOscarJ/src/icq_avatar.h index 9f72b95094..231849737c 100644 --- a/protocols/IcqOscarJ/src/icq_avatar.h +++ b/protocols/IcqOscarJ/src/icq_avatar.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_clients.cpp b/protocols/IcqOscarJ/src/icq_clients.cpp index 83ba2f4d1d..3f5c2aed1f 100644 --- a/protocols/IcqOscarJ/src/icq_clients.cpp +++ b/protocols/IcqOscarJ/src/icq_clients.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_constants.h b/protocols/IcqOscarJ/src/icq_constants.h index c1af3d7916..01e033fc5e 100644 --- a/protocols/IcqOscarJ/src/icq_constants.h +++ b/protocols/IcqOscarJ/src/icq_constants.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_db.cpp b/protocols/IcqOscarJ/src/icq_db.cpp index 2c856d56ee..2a1d53ae0a 100644 --- a/protocols/IcqOscarJ/src/icq_db.cpp +++ b/protocols/IcqOscarJ/src/icq_db.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_direct.cpp b/protocols/IcqOscarJ/src/icq_direct.cpp index 40a6ed5e0e..f3d669d4a5 100644 --- a/protocols/IcqOscarJ/src/icq_direct.cpp +++ b/protocols/IcqOscarJ/src/icq_direct.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_direct.h b/protocols/IcqOscarJ/src/icq_direct.h index c357a39847..12b5ea2a99 100644 --- a/protocols/IcqOscarJ/src/icq_direct.h +++ b/protocols/IcqOscarJ/src/icq_direct.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_directmsg.cpp b/protocols/IcqOscarJ/src/icq_directmsg.cpp index 9d4afa4238..93d723a8f7 100644 --- a/protocols/IcqOscarJ/src/icq_directmsg.cpp +++ b/protocols/IcqOscarJ/src/icq_directmsg.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_fieldnames.cpp b/protocols/IcqOscarJ/src/icq_fieldnames.cpp index eb6d973992..203c61381f 100644 --- a/protocols/IcqOscarJ/src/icq_fieldnames.cpp +++ b/protocols/IcqOscarJ/src/icq_fieldnames.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_fieldnames.h b/protocols/IcqOscarJ/src/icq_fieldnames.h index f3ac883071..94948173ec 100644 --- a/protocols/IcqOscarJ/src/icq_fieldnames.h +++ b/protocols/IcqOscarJ/src/icq_fieldnames.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_filerequests.cpp b/protocols/IcqOscarJ/src/icq_filerequests.cpp index e907124806..67ded72e48 100644 --- a/protocols/IcqOscarJ/src/icq_filerequests.cpp +++ b/protocols/IcqOscarJ/src/icq_filerequests.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_filetransfer.cpp b/protocols/IcqOscarJ/src/icq_filetransfer.cpp index d5f98899eb..9cb73dcd43 100644 --- a/protocols/IcqOscarJ/src/icq_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/icq_filetransfer.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_firstrun.cpp b/protocols/IcqOscarJ/src/icq_firstrun.cpp index 6fe8fb8fd7..640145b6c0 100644 --- a/protocols/IcqOscarJ/src/icq_firstrun.cpp +++ b/protocols/IcqOscarJ/src/icq_firstrun.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_http.cpp b/protocols/IcqOscarJ/src/icq_http.cpp index 389670904a..fbf053aa23 100644 --- a/protocols/IcqOscarJ/src/icq_http.cpp +++ b/protocols/IcqOscarJ/src/icq_http.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001,2002 Jon Keating, Richard Hughes
-// Copyright 2002,2003,2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004,2005,2006 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001,2002 Jon Keating, Richard Hughes
+// Copyright © 2002,2003,2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004,2005,2006 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_http.h b/protocols/IcqOscarJ/src/icq_http.h index d523255e99..292de1e73a 100644 --- a/protocols/IcqOscarJ/src/icq_http.h +++ b/protocols/IcqOscarJ/src/icq_http.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001,2002 Jon Keating, Richard Hughes
-// Copyright 2002,2003,2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004,2005 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000,2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001,2002 Jon Keating, Richard Hughes
+// Copyright © 2002,2003,2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004,2005 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_infoupdate.cpp b/protocols/IcqOscarJ/src/icq_infoupdate.cpp index 28a90bf2e8..1f97aa932c 100644 --- a/protocols/IcqOscarJ/src/icq_infoupdate.cpp +++ b/protocols/IcqOscarJ/src/icq_infoupdate.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp index 93cc50b027..416b77cf9b 100644 --- a/protocols/IcqOscarJ/src/icq_menu.cpp +++ b/protocols/IcqOscarJ/src/icq_menu.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_opts.cpp b/protocols/IcqOscarJ/src/icq_opts.cpp index b433d495db..e28fa066e7 100644 --- a/protocols/IcqOscarJ/src/icq_opts.cpp +++ b/protocols/IcqOscarJ/src/icq_opts.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_packet.cpp b/protocols/IcqOscarJ/src/icq_packet.cpp index cc954bf2fe..2f7c913e8f 100644 --- a/protocols/IcqOscarJ/src/icq_packet.cpp +++ b/protocols/IcqOscarJ/src/icq_packet.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_packet.h b/protocols/IcqOscarJ/src/icq_packet.h index e0e73a9d2d..860f9b8390 100644 --- a/protocols/IcqOscarJ/src/icq_packet.h +++ b/protocols/IcqOscarJ/src/icq_packet.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_popups.cpp b/protocols/IcqOscarJ/src/icq_popups.cpp index 1cc7bd6a30..41ede96b24 100644 --- a/protocols/IcqOscarJ/src/icq_popups.cpp +++ b/protocols/IcqOscarJ/src/icq_popups.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_popups.h b/protocols/IcqOscarJ/src/icq_popups.h index d989352078..f7ac23b71d 100644 --- a/protocols/IcqOscarJ/src/icq_popups.h +++ b/protocols/IcqOscarJ/src/icq_popups.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_proto.cpp b/protocols/IcqOscarJ/src/icq_proto.cpp index 0a26743995..684b4b9405 100644 --- a/protocols/IcqOscarJ/src/icq_proto.cpp +++ b/protocols/IcqOscarJ/src/icq_proto.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera, George Hazan
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera, George Hazan
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_proto.h b/protocols/IcqOscarJ/src/icq_proto.h index 37d46889f1..e91b7e802b 100644 --- a/protocols/IcqOscarJ/src/icq_proto.h +++ b/protocols/IcqOscarJ/src/icq_proto.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera, George Hazan
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera, George Hazan
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_rates.cpp b/protocols/IcqOscarJ/src/icq_rates.cpp index f319afd1b5..cc5e51b3cd 100644 --- a/protocols/IcqOscarJ/src/icq_rates.cpp +++ b/protocols/IcqOscarJ/src/icq_rates.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_rates.h b/protocols/IcqOscarJ/src/icq_rates.h index 1dcc500101..c10504c2b4 100644 --- a/protocols/IcqOscarJ/src/icq_rates.h +++ b/protocols/IcqOscarJ/src/icq_rates.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_server.cpp b/protocols/IcqOscarJ/src/icq_server.cpp index 95303e5619..d9ada21477 100644 --- a/protocols/IcqOscarJ/src/icq_server.cpp +++ b/protocols/IcqOscarJ/src/icq_server.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_server.h b/protocols/IcqOscarJ/src/icq_server.h index 38b05eff24..bbfd033a12 100644 --- a/protocols/IcqOscarJ/src/icq_server.h +++ b/protocols/IcqOscarJ/src/icq_server.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_servlist.cpp b/protocols/IcqOscarJ/src/icq_servlist.cpp index 4a562bf016..6eb6445793 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.cpp +++ b/protocols/IcqOscarJ/src/icq_servlist.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_servlist.h b/protocols/IcqOscarJ/src/icq_servlist.h index a99cb00911..486ca47927 100644 --- a/protocols/IcqOscarJ/src/icq_servlist.h +++ b/protocols/IcqOscarJ/src/icq_servlist.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_uploadui.cpp b/protocols/IcqOscarJ/src/icq_uploadui.cpp index 139f89a658..2614972fe6 100644 --- a/protocols/IcqOscarJ/src/icq_uploadui.cpp +++ b/protocols/IcqOscarJ/src/icq_uploadui.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 65f7d1025f..d5507e2fa6 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Angeli-Ka, Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Angeli-Ka, Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icq_xtraz.cpp b/protocols/IcqOscarJ/src/icq_xtraz.cpp index afaf939692..c6c8f11ac5 100644 --- a/protocols/IcqOscarJ/src/icq_xtraz.cpp +++ b/protocols/IcqOscarJ/src/icq_xtraz.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.cpp b/protocols/IcqOscarJ/src/icqosc_svcs.cpp index 372bff14ef..c7b6987526 100644 --- a/protocols/IcqOscarJ/src/icqosc_svcs.cpp +++ b/protocols/IcqOscarJ/src/icqosc_svcs.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/icqosc_svcs.h b/protocols/IcqOscarJ/src/icqosc_svcs.h index 54f9144d75..1114144a62 100644 --- a/protocols/IcqOscarJ/src/icqosc_svcs.h +++ b/protocols/IcqOscarJ/src/icqosc_svcs.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/init.cpp b/protocols/IcqOscarJ/src/init.cpp index 10ea203387..ca3806e78a 100644 --- a/protocols/IcqOscarJ/src/init.cpp +++ b/protocols/IcqOscarJ/src/init.cpp @@ -1,4 +1,4 @@ -// ---------------------------------------------------------------------------80
+// ---------------------------------------------------------------------------80
// ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
diff --git a/protocols/IcqOscarJ/src/log.cpp b/protocols/IcqOscarJ/src/log.cpp index c3c73afc4b..ba614d1dfb 100644 --- a/protocols/IcqOscarJ/src/log.cpp +++ b/protocols/IcqOscarJ/src/log.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/log.h b/protocols/IcqOscarJ/src/log.h index 57e7737ed3..6104a87d0e 100644 --- a/protocols/IcqOscarJ/src/log.h +++ b/protocols/IcqOscarJ/src/log.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/loginpassword.cpp b/protocols/IcqOscarJ/src/loginpassword.cpp index 8d76ee7bba..214d5d9df6 100644 --- a/protocols/IcqOscarJ/src/loginpassword.cpp +++ b/protocols/IcqOscarJ/src/loginpassword.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp index d413daecd0..86a6830edc 100644 --- a/protocols/IcqOscarJ/src/oscar_filetransfer.cpp +++ b/protocols/IcqOscarJ/src/oscar_filetransfer.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/oscar_filetransfer.h b/protocols/IcqOscarJ/src/oscar_filetransfer.h index b9cff90e38..c916131ab9 100644 --- a/protocols/IcqOscarJ/src/oscar_filetransfer.h +++ b/protocols/IcqOscarJ/src/oscar_filetransfer.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/stdafx.h b/protocols/IcqOscarJ/src/stdafx.h index ed9f95efa7..e783623666 100644 --- a/protocols/IcqOscarJ/src/stdafx.h +++ b/protocols/IcqOscarJ/src/stdafx.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/stdpackets.cpp b/protocols/IcqOscarJ/src/stdpackets.cpp index a29d454ce8..1041f227c9 100644 --- a/protocols/IcqOscarJ/src/stdpackets.cpp +++ b/protocols/IcqOscarJ/src/stdpackets.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/stdpackets.h b/protocols/IcqOscarJ/src/stdpackets.h index d25b2c5725..74b1ed12a0 100644 --- a/protocols/IcqOscarJ/src/stdpackets.h +++ b/protocols/IcqOscarJ/src/stdpackets.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/tlv.cpp b/protocols/IcqOscarJ/src/tlv.cpp index ad14045898..fd7d69cb89 100644 --- a/protocols/IcqOscarJ/src/tlv.cpp +++ b/protocols/IcqOscarJ/src/tlv.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2009 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2009 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/tlv.h b/protocols/IcqOscarJ/src/tlv.h index 7cb99c60c2..86ef7fa4f1 100644 --- a/protocols/IcqOscarJ/src/tlv.h +++ b/protocols/IcqOscarJ/src/tlv.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2008 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2008 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/upload.cpp b/protocols/IcqOscarJ/src/upload.cpp index 431d946028..262bff9ab7 100644 --- a/protocols/IcqOscarJ/src/upload.cpp +++ b/protocols/IcqOscarJ/src/upload.cpp @@ -2,9 +2,9 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2001-2004 Richard Hughes, Martin berg
-// Copyright 2004-2009 Joe Kucera, Bio
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2001-2004 Richard Hughes, Martin Цberg
+// Copyright © 2004-2009 Joe Kucera, Bio
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/userinfotab.cpp b/protocols/IcqOscarJ/src/userinfotab.cpp index 67ef1ec9ef..c9eb563790 100644 --- a/protocols/IcqOscarJ/src/userinfotab.cpp +++ b/protocols/IcqOscarJ/src/userinfotab.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/utilities.cpp b/protocols/IcqOscarJ/src/utilities.cpp index 9242e1e063..511f4b3ada 100644 --- a/protocols/IcqOscarJ/src/utilities.cpp +++ b/protocols/IcqOscarJ/src/utilities.cpp @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/utilities.h b/protocols/IcqOscarJ/src/utilities.h index 99abe2cb0e..77ab886115 100644 --- a/protocols/IcqOscarJ/src/utilities.h +++ b/protocols/IcqOscarJ/src/utilities.h @@ -2,11 +2,11 @@ // ICQ plugin for Miranda Instant Messenger
// ________________________________________
//
-// Copyright 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
-// Copyright 2001-2002 Jon Keating, Richard Hughes
-// Copyright 2002-2004 Martin berg, Sam Kothari, Robert Rainwater
-// Copyright 2004-2010 Joe Kucera
-// Copyright 2012-2017 Miranda NG Team
+// Copyright © 2000-2001 Richard Hughes, Roland Rabien, Tristan Van de Vreede
+// Copyright © 2001-2002 Jon Keating, Richard Hughes
+// Copyright © 2002-2004 Martin Цberg, Sam Kothari, Robert Rainwater
+// Copyright © 2004-2010 Joe Kucera
+// Copyright © 2012-2017 Miranda NG Team
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
diff --git a/protocols/IcqOscarJ/src/version.h b/protocols/IcqOscarJ/src/version.h index f275a79fa3..23b06b473d 100644 --- a/protocols/IcqOscarJ/src/version.h +++ b/protocols/IcqOscarJ/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Joe Kucera, Bio, Martin \xd6" "berg, Richard Hughes, Jon Keating, etc."
#define __AUTHOREMAIL "jokusoftware@miranda-im.org"
#define __AUTHORWEB "https://miranda-ng.org/p/ICQ/"
-#define __COPYRIGHT " 2000-17 M.\xd6" "berg, R.Hughes, J.Keating, Bio, Angeli-Ka, G.Hazan, J.Kucera"
+#define __COPYRIGHT "© 2000-17 M.\xd6" "berg, R.Hughes, J.Keating, Bio, Angeli-Ka, G.Hazan, J.Kucera"
diff --git a/protocols/JabberG/src/jabber.cpp b/protocols/JabberG/src/jabber.cpp index a1573d2e81..4aad3df848 100755 --- a/protocols/JabberG/src/jabber.cpp +++ b/protocols/JabberG/src/jabber.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_adhoc.cpp b/protocols/JabberG/src/jabber_adhoc.cpp index a2f7a0ebbd..0d4f8697df 100644 --- a/protocols/JabberG/src/jabber_adhoc.cpp +++ b/protocols/JabberG/src/jabber_adhoc.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Artem Shpynov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
Module implements an XMPP protocol extension for reporting and executing ad-hoc,
human-oriented commands according to XEP-0050: Ad-Hoc Commands
diff --git a/protocols/JabberG/src/jabber_agent.cpp b/protocols/JabberG/src/jabber_agent.cpp index 1f5d30be63..931d3f7a82 100644 --- a/protocols/JabberG/src/jabber_agent.cpp +++ b/protocols/JabberG/src/jabber_agent.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_api.cpp b/protocols/JabberG/src/jabber_api.cpp index df3d97a563..21e8335541 100644 --- a/protocols/JabberG/src/jabber_api.cpp +++ b/protocols/JabberG/src/jabber_api.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_archive.cpp b/protocols/JabberG/src/jabber_archive.cpp index 8379e9adad..18457566bf 100644 --- a/protocols/JabberG/src/jabber_archive.cpp +++ b/protocols/JabberG/src/jabber_archive.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_bookmarks.cpp b/protocols/JabberG/src/jabber_bookmarks.cpp index 6b553f7af8..7467acf789 100644 --- a/protocols/JabberG/src/jabber_bookmarks.cpp +++ b/protocols/JabberG/src/jabber_bookmarks.cpp @@ -3,7 +3,7 @@ Jabber Protocol Plugin for Miranda NG
Copyright (c) 2007 Michael Stepura, George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_byte.cpp b/protocols/JabberG/src/jabber_byte.cpp index c4d36f2549..50bb0c32b1 100644 --- a/protocols/JabberG/src/jabber_byte.cpp +++ b/protocols/JabberG/src/jabber_byte.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_byte.h b/protocols/JabberG/src/jabber_byte.h index b89c12a711..bb1bcd7455 100644 --- a/protocols/JabberG/src/jabber_byte.h +++ b/protocols/JabberG/src/jabber_byte.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_caps.cpp b/protocols/JabberG/src/jabber_caps.cpp index f238b075b8..955192426f 100755 --- a/protocols/JabberG/src/jabber_caps.cpp +++ b/protocols/JabberG/src/jabber_caps.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_caps.h b/protocols/JabberG/src/jabber_caps.h index 18ffd15956..a1eeb210a9 100755 --- a/protocols/JabberG/src/jabber_caps.h +++ b/protocols/JabberG/src/jabber_caps.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_captcha.cpp b/protocols/JabberG/src/jabber_captcha.cpp index e75d79fcaa..7831c6e0ca 100644 --- a/protocols/JabberG/src/jabber_captcha.cpp +++ b/protocols/JabberG/src/jabber_captcha.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_chat.cpp b/protocols/JabberG/src/jabber_chat.cpp index 252d82ee82..69c7e0c1d4 100644 --- a/protocols/JabberG/src/jabber_chat.cpp +++ b/protocols/JabberG/src/jabber_chat.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_console.cpp b/protocols/JabberG/src/jabber_console.cpp index 3173d6757a..c15b598a56 100644 --- a/protocols/JabberG/src/jabber_console.cpp +++ b/protocols/JabberG/src/jabber_console.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2007 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_db_utils.h b/protocols/JabberG/src/jabber_db_utils.h index 92fb1549cf..088c750331 100755 --- a/protocols/JabberG/src/jabber_db_utils.h +++ b/protocols/JabberG/src/jabber_db_utils.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_disco.cpp b/protocols/JabberG/src/jabber_disco.cpp index 98dde44e89..b767f559e6 100644 --- a/protocols/JabberG/src/jabber_disco.cpp +++ b/protocols/JabberG/src/jabber_disco.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_disco.h b/protocols/JabberG/src/jabber_disco.h index 9e31ab731e..f6597ac04b 100644 --- a/protocols/JabberG/src/jabber_disco.h +++ b/protocols/JabberG/src/jabber_disco.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2005-07 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_events.cpp b/protocols/JabberG/src/jabber_events.cpp index 1c3f03a575..bc446fb95f 100644 --- a/protocols/JabberG/src/jabber_events.cpp +++ b/protocols/JabberG/src/jabber_events.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_file.cpp b/protocols/JabberG/src/jabber_file.cpp index 8795a42459..dd83f96535 100644 --- a/protocols/JabberG/src/jabber_file.cpp +++ b/protocols/JabberG/src/jabber_file.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_filterlist.cpp b/protocols/JabberG/src/jabber_filterlist.cpp index 848c2ec451..4aa92580d8 100644 --- a/protocols/JabberG/src/jabber_filterlist.cpp +++ b/protocols/JabberG/src/jabber_filterlist.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_form.cpp b/protocols/JabberG/src/jabber_form.cpp index 032e4cdf24..0347f4536a 100644 --- a/protocols/JabberG/src/jabber_form.cpp +++ b/protocols/JabberG/src/jabber_form.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_frame.cpp b/protocols/JabberG/src/jabber_frame.cpp index 735c4807fb..553ace973f 100644 --- a/protocols/JabberG/src/jabber_frame.cpp +++ b/protocols/JabberG/src/jabber_frame.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ft.cpp b/protocols/JabberG/src/jabber_ft.cpp index 93d093ecda..4d7296ee18 100644 --- a/protocols/JabberG/src/jabber_ft.cpp +++ b/protocols/JabberG/src/jabber_ft.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_groupchat.cpp b/protocols/JabberG/src/jabber_groupchat.cpp index 294c197487..f007f6d922 100644 --- a/protocols/JabberG/src/jabber_groupchat.cpp +++ b/protocols/JabberG/src/jabber_groupchat.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ibb.cpp b/protocols/JabberG/src/jabber_ibb.cpp index 9482e44f60..75e184fa9c 100644 --- a/protocols/JabberG/src/jabber_ibb.cpp +++ b/protocols/JabberG/src/jabber_ibb.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ibb.h b/protocols/JabberG/src/jabber_ibb.h index a835ecaa94..9ec8f42417 100644 --- a/protocols/JabberG/src/jabber_ibb.h +++ b/protocols/JabberG/src/jabber_ibb.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_icolib.cpp b/protocols/JabberG/src/jabber_icolib.cpp index e008da1f0c..51f078733e 100644 --- a/protocols/JabberG/src/jabber_icolib.cpp +++ b/protocols/JabberG/src/jabber_icolib.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
Idea & portions of code by Artem Shpynov
diff --git a/protocols/JabberG/src/jabber_icolib.h b/protocols/JabberG/src/jabber_icolib.h index 1635ae5904..f2e7a1e7cf 100644 --- a/protocols/JabberG/src/jabber_icolib.h +++ b/protocols/JabberG/src/jabber_icolib.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iq.cpp b/protocols/JabberG/src/jabber_iq.cpp index d9e88f7560..d97664e9f4 100644 --- a/protocols/JabberG/src/jabber_iq.cpp +++ b/protocols/JabberG/src/jabber_iq.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iq.h b/protocols/JabberG/src/jabber_iq.h index 9476b34189..2077454a92 100644 --- a/protocols/JabberG/src/jabber_iq.h +++ b/protocols/JabberG/src/jabber_iq.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iq_handlers.cpp b/protocols/JabberG/src/jabber_iq_handlers.cpp index f6ff5655de..0da5877d68 100644 --- a/protocols/JabberG/src/jabber_iq_handlers.cpp +++ b/protocols/JabberG/src/jabber_iq_handlers.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iqid.cpp b/protocols/JabberG/src/jabber_iqid.cpp index aeecad1744..0915e3e175 100755 --- a/protocols/JabberG/src/jabber_iqid.cpp +++ b/protocols/JabberG/src/jabber_iqid.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_iqid_muc.cpp b/protocols/JabberG/src/jabber_iqid_muc.cpp index 7f3c2980f8..87df69364e 100644 --- a/protocols/JabberG/src/jabber_iqid_muc.cpp +++ b/protocols/JabberG/src/jabber_iqid_muc.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_libstr.cpp b/protocols/JabberG/src/jabber_libstr.cpp index 81c23ad46b..73c3ffe460 100644 --- a/protocols/JabberG/src/jabber_libstr.cpp +++ b/protocols/JabberG/src/jabber_libstr.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_list.cpp b/protocols/JabberG/src/jabber_list.cpp index 5559b39901..8166f92f82 100644 --- a/protocols/JabberG/src/jabber_list.cpp +++ b/protocols/JabberG/src/jabber_list.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_list.h b/protocols/JabberG/src/jabber_list.h index b56daae7cb..0eb4a8648e 100644 --- a/protocols/JabberG/src/jabber_list.h +++ b/protocols/JabberG/src/jabber_list.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 03d4b5d6a7..02ce356e46 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_message_handlers.cpp b/protocols/JabberG/src/jabber_message_handlers.cpp index c0684869d0..755c3160f6 100644 --- a/protocols/JabberG/src/jabber_message_handlers.cpp +++ b/protocols/JabberG/src/jabber_message_handlers.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_message_manager.cpp b/protocols/JabberG/src/jabber_message_manager.cpp index 8327ba5fc9..357fdd87c3 100644 --- a/protocols/JabberG/src/jabber_message_manager.cpp +++ b/protocols/JabberG/src/jabber_message_manager.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_message_manager.h b/protocols/JabberG/src/jabber_message_manager.h index 4527d77269..225e582a86 100644 --- a/protocols/JabberG/src/jabber_message_manager.h +++ b/protocols/JabberG/src/jabber_message_manager.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_misc.cpp b/protocols/JabberG/src/jabber_misc.cpp index 7900f2711d..6e56a500e1 100755 --- a/protocols/JabberG/src/jabber_misc.cpp +++ b/protocols/JabberG/src/jabber_misc.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_notes.cpp b/protocols/JabberG/src/jabber_notes.cpp index dd80f9d395..5686ace175 100644 --- a/protocols/JabberG/src/jabber_notes.cpp +++ b/protocols/JabberG/src/jabber_notes.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_notes.h b/protocols/JabberG/src/jabber_notes.h index 9619d6c165..a4c9f6ed8a 100644 --- a/protocols/JabberG/src/jabber_notes.h +++ b/protocols/JabberG/src/jabber_notes.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_omemo.h b/protocols/JabberG/src/jabber_omemo.h index 89b55f8a38..712edb4095 100755 --- a/protocols/JabberG/src/jabber_omemo.h +++ b/protocols/JabberG/src/jabber_omemo.h @@ -1,4 +1,4 @@ -/*
+/*
Jabber Protocol Plugin for Miranda NG
diff --git a/protocols/JabberG/src/jabber_opt.cpp b/protocols/JabberG/src/jabber_opt.cpp index e75c01de02..cebf2b0bb4 100755 --- a/protocols/JabberG/src/jabber_opt.cpp +++ b/protocols/JabberG/src/jabber_opt.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_opttree.cpp b/protocols/JabberG/src/jabber_opttree.cpp index ef65f14eb6..03d5aa3d7c 100644 --- a/protocols/JabberG/src/jabber_opttree.cpp +++ b/protocols/JabberG/src/jabber_opttree.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2007 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_opttree.h b/protocols/JabberG/src/jabber_opttree.h index 273acd13bc..0880c18290 100644 --- a/protocols/JabberG/src/jabber_opttree.h +++ b/protocols/JabberG/src/jabber_opttree.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2007 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_password.cpp b/protocols/JabberG/src/jabber_password.cpp index b60e09197e..05104f3a0d 100644 --- a/protocols/JabberG/src/jabber_password.cpp +++ b/protocols/JabberG/src/jabber_password.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_presence_manager.cpp b/protocols/JabberG/src/jabber_presence_manager.cpp index d918c4998d..fafa757dc6 100644 --- a/protocols/JabberG/src/jabber_presence_manager.cpp +++ b/protocols/JabberG/src/jabber_presence_manager.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_presence_manager.h b/protocols/JabberG/src/jabber_presence_manager.h index d329618278..5bc0cb050d 100644 --- a/protocols/JabberG/src/jabber_presence_manager.h +++ b/protocols/JabberG/src/jabber_presence_manager.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index bff28c6457..da07b44f37 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_privacy.h b/protocols/JabberG/src/jabber_privacy.h index a9ea553ce9..e8f24b38e3 100644 --- a/protocols/JabberG/src/jabber_privacy.h +++ b/protocols/JabberG/src/jabber_privacy.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_proto.cpp b/protocols/JabberG/src/jabber_proto.cpp index fa20992ff9..2d57ba08d1 100755 --- a/protocols/JabberG/src/jabber_proto.cpp +++ b/protocols/JabberG/src/jabber_proto.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_proto.h b/protocols/JabberG/src/jabber_proto.h index 4149f80080..1fc55efc12 100755 --- a/protocols/JabberG/src/jabber_proto.h +++ b/protocols/JabberG/src/jabber_proto.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_rc.cpp b/protocols/JabberG/src/jabber_rc.cpp index 610c2d5514..c73959d6a5 100644 --- a/protocols/JabberG/src/jabber_rc.cpp +++ b/protocols/JabberG/src/jabber_rc.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
XEP-0146 support for Miranda IM
diff --git a/protocols/JabberG/src/jabber_rc.h b/protocols/JabberG/src/jabber_rc.h index 91ba10f661..099713a3b3 100644 --- a/protocols/JabberG/src/jabber_rc.h +++ b/protocols/JabberG/src/jabber_rc.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
XEP-0146 support for Miranda IM
diff --git a/protocols/JabberG/src/jabber_search.cpp b/protocols/JabberG/src/jabber_search.cpp index d298054cc2..4f7bc1f369 100644 --- a/protocols/JabberG/src/jabber_search.cpp +++ b/protocols/JabberG/src/jabber_search.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan Copyright (c) 2007 Artem Shpynov -Copyright () 2012-17 Miranda NG project +Copyright (с) 2012-17 Miranda NG project Module implements a search according to XEP-0055: Jabber Search http://www.xmpp.org/extensions/xep-0055.html diff --git a/protocols/JabberG/src/jabber_search.h b/protocols/JabberG/src/jabber_search.h index 9fddc8cfc1..d80888833f 100644 --- a/protocols/JabberG/src/jabber_search.h +++ b/protocols/JabberG/src/jabber_search.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Artem Shpynov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
Module implements a search according to XEP-0055: Jabber Search
http://www.xmpp.org/extensions/xep-0055.html
diff --git a/protocols/JabberG/src/jabber_secur.cpp b/protocols/JabberG/src/jabber_secur.cpp index d3eea40481..6f2603f7af 100644 --- a/protocols/JabberG/src/jabber_secur.cpp +++ b/protocols/JabberG/src/jabber_secur.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_secur.h b/protocols/JabberG/src/jabber_secur.h index 2a7165cff1..1b5e20eff7 100644 --- a/protocols/JabberG/src/jabber_secur.h +++ b/protocols/JabberG/src/jabber_secur.h @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_send_manager.cpp b/protocols/JabberG/src/jabber_send_manager.cpp index c4c5fdddee..2a26ac36cf 100644 --- a/protocols/JabberG/src/jabber_send_manager.cpp +++ b/protocols/JabberG/src/jabber_send_manager.cpp @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_send_manager.h b/protocols/JabberG/src/jabber_send_manager.h index 50ddfe7b78..0f61aa4cce 100644 --- a/protocols/JabberG/src/jabber_send_manager.h +++ b/protocols/JabberG/src/jabber_send_manager.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-08 George Hazan
Copyright (c) 2007 Maxim Mluhov
Copyright (c) 2008-09 Dmitriy Chervov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_std.cpp b/protocols/JabberG/src/jabber_std.cpp index a01e2cbb4c..b058eaa8d1 100644 --- a/protocols/JabberG/src/jabber_std.cpp +++ b/protocols/JabberG/src/jabber_std.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_svc.cpp b/protocols/JabberG/src/jabber_svc.cpp index 4a1fec9a73..b8b2b397e9 100644 --- a/protocols/JabberG/src/jabber_svc.cpp +++ b/protocols/JabberG/src/jabber_svc.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_thread.cpp b/protocols/JabberG/src/jabber_thread.cpp index c9276754de..41d05f91c1 100755 --- a/protocols/JabberG/src/jabber_thread.cpp +++ b/protocols/JabberG/src/jabber_thread.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_treelist.cpp b/protocols/JabberG/src/jabber_treelist.cpp index b486809dec..1591921f58 100644 --- a/protocols/JabberG/src/jabber_treelist.cpp +++ b/protocols/JabberG/src/jabber_treelist.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_userinfo.cpp b/protocols/JabberG/src/jabber_userinfo.cpp index 13681ceb0f..9c826e9c19 100755 --- a/protocols/JabberG/src/jabber_userinfo.cpp +++ b/protocols/JabberG/src/jabber_userinfo.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan Copyright (c) 2007 Maxim Mluhov -Copyright () 2012-17 Miranda NG project +Copyright (с) 2012-17 Miranda NG project This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff --git a/protocols/JabberG/src/jabber_util.cpp b/protocols/JabberG/src/jabber_util.cpp index bfa0387296..a5e90312d6 100755 --- a/protocols/JabberG/src/jabber_util.cpp +++ b/protocols/JabberG/src/jabber_util.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_vcard.cpp b/protocols/JabberG/src/jabber_vcard.cpp index 98ee39ddd1..7b68f663d0 100644 --- a/protocols/JabberG/src/jabber_vcard.cpp +++ b/protocols/JabberG/src/jabber_vcard.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_ws.cpp b/protocols/JabberG/src/jabber_ws.cpp index d4a75d50f3..5fb4566556 100644 --- a/protocols/JabberG/src/jabber_ws.cpp +++ b/protocols/JabberG/src/jabber_ws.cpp @@ -4,7 +4,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xml.cpp b/protocols/JabberG/src/jabber_xml.cpp index a667148534..be347d25c4 100644 --- a/protocols/JabberG/src/jabber_xml.cpp +++ b/protocols/JabberG/src/jabber_xml.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xml.h b/protocols/JabberG/src/jabber_xml.h index 09f2e8831b..f9eb0f5799 100644 --- a/protocols/JabberG/src/jabber_xml.h +++ b/protocols/JabberG/src/jabber_xml.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index d45e5627a6..65b3676fff 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_xstatus.h b/protocols/JabberG/src/jabber_xstatus.h index f72839c3e4..94589af625 100644 --- a/protocols/JabberG/src/jabber_xstatus.h +++ b/protocols/JabberG/src/jabber_xstatus.h @@ -6,7 +6,7 @@ Copyright (c) 2002-04 Santithorn Bunchua Copyright (c) 2005-12 George Hazan
Copyright (c) 2007-09 Maxim Mluhov
Copyright (c) 2007-09 Victor Pavlychko
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/jabber_zstream.cpp b/protocols/JabberG/src/jabber_zstream.cpp index cd820ef2d8..85ecd8d290 100644 --- a/protocols/JabberG/src/jabber_zstream.cpp +++ b/protocols/JabberG/src/jabber_zstream.cpp @@ -6,7 +6,7 @@ XEP-0138 (Stream Compression) implementation Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Kostya Chukavin, Taras Zackrepa
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/stdafx.cxx b/protocols/JabberG/src/stdafx.cxx index 4057eb0777..61ff677031 100644 --- a/protocols/JabberG/src/stdafx.cxx +++ b/protocols/JabberG/src/stdafx.cxx @@ -1,5 +1,5 @@ /*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org)
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/stdafx.h b/protocols/JabberG/src/stdafx.h index 79f44f6137..eb44bdc1bb 100644 --- a/protocols/JabberG/src/stdafx.h +++ b/protocols/JabberG/src/stdafx.h @@ -5,7 +5,7 @@ Jabber Protocol Plugin for Miranda NG Copyright (c) 2002-04 Santithorn Bunchua
Copyright (c) 2005-12 George Hazan
Copyright (c) 2007 Maxim Mluhov
-Copyright () 2012-17 Miranda NG project
+Copyright (с) 2012-17 Miranda NG project
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/JabberG/src/version.h b/protocols/JabberG/src/version.h index 61f9467ae9..088b87f37c 100644 --- a/protocols/JabberG/src/version.h +++ b/protocols/JabberG/src/version.h @@ -9,5 +9,5 @@ #define __DESCRIPTION "Jabber (XMPP) protocol support for Miranda NG."
#define __AUTHOR "George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura"
#define __AUTHOREMAIL "ghazan@miranda.im"
-#define __COPYRIGHT " 2005-17 George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura"
+#define __COPYRIGHT "© 2005-17 George Hazan, Maxim Mluhov, Victor Pavlychko, Artem Shpynov, Michael Stepura"
#define __AUTHORWEB "https://miranda-ng.org/p/Jabber/"
diff --git a/protocols/MRA/docs/MraPlaces.h b/protocols/MRA/docs/MraPlaces.h index b51e4151b9..e48f7e3bfa 100644 --- a/protocols/MRA/docs/MraPlaces.h +++ b/protocols/MRA/docs/MraPlaces.h @@ -15,3156 +15,3156 @@ typedef struct MRA_PLACE mrapPlaces[]=
{
- {24, 0, 0, L""},
- {81, 0, 0, L""},
- {82, 0, 0, L""},
- {97, 0, 0, L""},
- {96, 0, 0, L""},
- {99, 0, 0, L""},
- {100, 0, 0, L"-"},
- {101, 0, 0, L""},
- {102, 0, 0, L""},
- {83, 0, 0, L""},
- {86, 0, 0, L""},
- {95, 0, 0, L""},
- {103, 0, 0, L""},
- {79, 0, 0, L""},
- {85, 0, 0, L""},
- {87, 0, 0, L""},
- {104, 0, 0, L""},
- {84, 0, 0, L""},
- {105, 0, 0, L""},
- {106, 0, 0, L""},
- {107, 0, 0, L""},
- {92, 0, 0, L" ()"},
- {76, 0, 0, L""},
- {3215, 0, 0, L" (.)"},
- {29, 0, 0, L" ()"},
- {108, 0, 0, L""},
- {88, 0, 0, L""},
- {109, 0, 0, L""},
- {110, 0, 0, L""},
- {111, 0, 0, L""},
- {112, 0, 0, L""},
- {113, 0, 0, L""},
- {114, 0, 0, L""},
- {115, 0, 0, L""},
- {116, 0, 0, L" "},
- {117, 0, 0, L""},
- {3216, 0, 0, L" (.)"},
- {122, 0, 0, L""},
- {89, 0, 0, L""},
- {94, 0, 0, L" "},
- {118, 0, 0, L""},
- {78, 0, 0, L""},
- {91, 0, 0, L""},
- {119, 0, 0, L""},
- {120, 0, 0, L""},
- {132, 0, 0, L""},
- {90, 0, 0, L""},
- {77, 0, 0, L""},
- {93, 0, 0, L""},
- {121, 0, 0, L""},
- {98, 0, 0, L" "},
- {75, 0, 0, L""},
- {123, 0, 0, L""},
- {454, 0, 0, L" "},
- {124, 0, 0, L""},
- {453, 0, 0, L" ()"},
- {126, 0, 0, L""},
- {127, 0, 0, L" "},
- {128, 0, 0, L" ( )"},
- {129, 0, 0, L""},
- {3220, 0, 0, L" (..)"},
- {130, 0, 0, L" "},
- {3218, 0, 0, L" (.)"},
- {3221, 0, 0, L" (..)"},
- {3230, 0, 0, L" (.)"},
- {131, 0, 0, L""},
- {133, 0, 0, L" - "},
- {3222, 0, 0, L" (.)"},
- {125, 0, 0, L""},
- {3219, 0, 0, L". ()"},
- {134, 0, 0, L" "},
- {3223, 0, 0, L" (..)"},
- {135, 0, 0, L""},
- {136, 0, 0, L""},
- {3224, 0, 0, L" (.)"},
- {137, 0, 0, L""},
- {3226, 0, 0, L" "},
- {3225, 0, 0, L" "},
- {138, 0, 0, L""},
- {139, 0, 0, L""},
- {3200, 0, 0, L" (.)"},
- {140, 0, 0, L" "},
- {141, 0, 0, L""},
- {3202, 0, 0, L" (.)"},
- {142, 0, 0, L""},
- {143, 0, 0, L""},
- {146, 0, 0, L""},
- {3203, 0, 0, L" (.)"},
- {144, 0, 0, L""},
- {145, 0, 0, L""},
- {147, 0, 0, L""},
- {3204, 0, 0, L" (.)"},
- {452, 0, 0, L" ()"},
- {149, 0, 0, L""},
- {148, 0, 0, L""},
- {3205, 0, 0, L" (.)"},
- {173, 0, 0, L""},
- {150, 0, 0, L""},
- {151, 0, 0, L""},
- {152, 0, 0, L" (.)"},
- {153, 0, 0, L""},
- {154, 0, 0, L" "},
- {155, 0, 0, L""},
- {156, 0, 0, L"-"},
- {157, 0, 0, L""},
- {3208, 0, 0, L" (.)"},
- {158, 0, 0, L""},
- {3209, 0, 0, L" ()"},
- {3201, 0, 0, L" "},
- {159, 0, 0, L""},
- {3207, 0, 0, L" (.)"},
- {3211, 0, 0, L" (.)"},
- {160, 0, 0, L""},
- {161, 0, 0, L""},
- {162, 0, 0, L""},
- {163, 0, 0, L""},
- {164, 0, 0, L"- "},
- {165, 0, 0, L"- "},
- {166, 0, 0, L"-"},
- {3210, 0, 0, L"- (.)"},
- {167, 0, 0, L""},
- {168, 0, 0, L" "},
- {169, 0, 0, L""},
- {3212, 0, 0, L" (.)"},
- {3206, 0, 0, L" "},
- {170, 0, 0, L""},
- {171, 0, 0, L""},
- {3213, 0, 0, L". . - (.)"},
- {172, 0, 0, L""},
- {174, 0, 0, L""},
- {175, 0, 0, L""},
- {176, 0, 0, L""},
- {177, 0, 0, L""},
- {3228, 0, 0, L" "},
- {178, 0, 0, L"-"},
- {179, 0, 0, L""},
- {180, 0, 0, L""},
- {181, 0, 0, L""},
- {182, 0, 0, L""},
- {183, 0, 0, L""},
- {184, 0, 0, L"-"},
- {185, 0, 0, L""},
- {186, 0, 0, L""},
- {187, 0, 0, L""},
- {3198, 0, 0, L". "},
- {23, 0, 0, L""},
- {188, 0, 0, L"-"},
- {189, 0, 0, L""},
- {190, 0, 0, L""},
- {191, 0, 0, L""},
- {193, 0, 0, L" ()"},
- {192, 0, 0, L""},
- {194, 0, 0, L"-`"},
- {195, 0, 0, L""},
- {196, 0, 0, L""},
- {197, 0, 0, L""},
- {198, 0, 0, L""},
- {199, 0, 0, L""},
- {200, 0, 0, L""},
- {3229, 0, 0, L" (.)"},
- {201, 0, 0, L""},
- {202, 0, 0, L""},
- {203, 0, 0, L""},
- {204, 0, 0, L""},
- {205, 0, 0, L""},
- {206, 0, 0, L""},
- {207, 0, 0, L""},
- {3227, 0, 0, L" (.)"},
- {3197, 0, 0, L" (.)"},
- {208, 0, 0, L""},
- {209, 0, 0, L"- "},
- {210, 0, 0, L""},
- {3199, 0, 0, L" (.)"},
- {211, 0, 0, L""},
- {212, 0, 0, L""},
- {213, 0, 0, L""},
- {214, 0, 0, L""},
- {215, 0, 0, L"-"},
- {216, 0, 0, L""},
- {217, 0, 0, L""},
- {218, 0, 0, L""},
- {219, 0, 0, L""},
- {220, 0, 0, L" "},
- {222, 0, 0, L""},
- {223, 0, 0, L" "},
- {221, 0, 0, L""},
- {224, 0, 0, L""},
- {225, 0, 0, L"- ()"},
- {39, 0, 0, L""},
- {40, 0, 0, L""},
- {32, 0, 0, L""},
- {33, 0, 0, L""},
- {340, 0, 0, L""},
- {38, 0, 0, L""},
- {41, 0, 0, L""},
- {42, 0, 0, L" "},
- {43, 0, 0, L""},
- {45, 0, 0, L""},
- {44, 0, 0, L""},
- {46, 0, 0, L""},
- {3193, 0, 0, L" (.)"},
- {47, 0, 0, L" (.)"},
- {48, 0, 0, L""},
- {49, 0, 0, L""},
- {3194, 0, 0, L" (.)"},
- {50, 0, 0, L""},
- {51, 0, 0, L""},
- {34, 0, 0, L""},
- {52, 0, 0, L""},
- {53, 0, 0, L""},
- {54, 0, 0, L""},
- {55, 0, 0, L""},
- {56, 0, 0, L""},
- {57, 0, 0, L""},
- {58, 0, 0, L""},
- {59, 0, 0, L""},
- {36, 0, 0, L""},
- {60, 0, 0, L""},
- {61, 0, 0, L""},
- {3195, 0, 0, L" (.)"},
- {62, 0, 0, L""},
- {35, 0, 0, L""},
- {63, 0, 0, L""},
- {64, 0, 0, L"-"},
- {74, 0, 0, L" "},
- {65, 0, 0, L""},
- {66, 0, 0, L""},
- {67, 0, 0, L" - ()"},
- {68, 0, 0, L""},
- {37, 0, 0, L""},
- {69, 0, 0, L""},
- {70, 0, 0, L""},
- {71, 0, 0, L""},
- {72, 0, 0, L""},
- {3196, 0, 0, L" (.)"},
- {73, 0, 0, L""},
- {24, 25, 0, L""},
- {24, 226, 0, L"-"},
- {24, 233, 0, L" ()"},
- {24, 232, 0, L" "},
- {24, 235, 0, L" "},
- {24, 227, 0, L" ."},
- {24, 229, 0, L" ."},
- {24, 231, 0, L" ."},
- {24, 234, 0, L" ."},
- {24, 228, 0, L" "},
- {24, 230, 0, L" "},
- {24, 236, 0, L" "},
- {24, 237, 0, L""},
- {24, 240, 0, L"-"},
- {24, 241, 0, L""},
- {24, 248, 0, L""},
- {24, 249, 0, L""},
- {24, 251, 0, L""},
- {24, 238, 0, L" ."},
- {24, 242, 0, L" ."},
- {24, 243, 0, L" ."},
- {24, 244, 0, L" ."},
- {24, 245, 0, L" ."},
- {24, 246, 0, L" ."},
- {24, 247, 0, L" ."},
- {24, 250, 0, L" ."},
- {24, 239, 0, L"- "},
- {24, 255, 0, L""},
- {24, 256, 0, L""},
- {24, 252, 0, L" ."},
- {24, 253, 0, L" ."},
- {24, 254, 0, L" ."},
- {24, 257, 0, L" ."},
- {24, 258, 0, L" ."},
- {24, 260, 0, L" ."},
- {24, 261, 0, L" ."},
- {24, 259, 0, L" "},
- {24, 265, 0, L""},
- {24, 263, 0, L" "},
- {24, 273, 0, L""},
- {24, 275, 0, L""},
- {24, 264, 0, L" "},
- {24, 268, 0, L" "},
- {24, 266, 0, L" ."},
- {24, 267, 0, L" ."},
- {24, 269, 0, L" ."},
- {24, 270, 0, L" ."},
- {24, 272, 0, L" ."},
- {24, 276, 0, L" ."},
- {24, 262, 0, L" "},
- {24, 271, 0, L" "},
- {24, 274, 0, L"- "},
- {24, 277, 0, L" "},
- {24, 278, 0, L" ."},
- {24, 279, 0, L" ."},
- {24, 280, 0, L" ."},
- {24, 282, 0, L" ."},
- {24, 281, 0, L"- - "},
- {24, 283, 0, L"- "},
- {24, 284, 0, L" ."},
- {24, 285, 0, L" ."},
- {24, 286, 0, L" ."},
- {24, 287, 0, L" ."},
- {24, 288, 0, L" ."},
- {24, 289, 0, L" ."},
- {24, 290, 0, L" ."},
- {24, 291, 0, L" ."},
- {24, 292, 0, L" ."},
- {24, 293, 0, L" ."},
- {24, 294, 0, L" ."},
- {24, 295, 0, L" ."},
- {24, 296, 0, L" ."},
- {24, 297, 0, L" ."},
- {24, 298, 0, L" ."},
- {24, 299, 0, L" ."},
- {24, 300, 0, L" ."},
- {24, 301, 0, L""},
- {24, 304, 0, L""},
- {24, 305, 0, L""},
- {24, 306, 0, L"-"},
- {24, 307, 0, L""},
- {24, 308, 0, L"-"},
- {24, 311, 0, L" - "},
- {24, 313, 0, L""},
- {24, 309, 0, L" "},
- {24, 312, 0, L" "},
- {24, 302, 0, L" ."},
- {24, 303, 0, L" ."},
- {24, 310, 0, L" ."},
- {81, 1055, 0, L""},
- {81, 1058, 0, L""},
- {81, 1056, 0, L""},
- {81, 1057, 0, L""},
- {81, 3153, 0, L""},
- {81, 2291, 0, L""},
- {82, 2932, 0, L""},
- {82, 1060, 0, L""},
- {82, 3084, 0, L""},
- {82, 3011, 0, L""},
- {82, 3306, 0, L""},
- {82, 1059, 0, L""},
- {82, 3145, 0, L""},
- {82, 2292, 0, L""},
- {97, 1061, 0, L""},
- {97, 2293, 0, L""},
- {96, 1062, 0, L""},
- {96, 2294, 0, L""},
- {99, 1063, 0, L""},
- {99, 2295, 0, L""},
- {100, 1064, 0, L"--"},
- {100, 2296, 0, L""},
- {101, 1065, 0, L""},
- {101, 2297, 0, L""},
- {102, 1066, 0, L""},
- {102, 2298, 0, L""},
- {83, 1067, 0, L""},
- {83, 3158, 0, L""},
- {83, 1068, 0, L""},
- {83, 3129, 0, L""},
- {83, 1069, 0, L""},
- {83, 1070, 0, L""},
- {83, 2299, 0, L""},
- {86, 3345, 0, L""},
- {86, 1071, 0, L""},
- {86, 2992, 0, L""},
- {86, 3175, 0, L""},
- {86, 3363, 0, L"-"},
- {86, 2884, 0, L"-"},
- {86, 3243, 0, L"-"},
- {86, 1074, 0, L"-"},
- {86, 3348, 0, L""},
- {86, 3241, 0, L""},
- {86, 1075, 0, L""},
- {86, 3350, 0, L"-"},
- {86, 2982, 0, L""},
- {86, 2971, 0, L"-"},
- {86, 3136, 0, L""},
- {86, 1080, 0, L""},
- {86, 3303, 0, L""},
- {86, 3050, 0, L""},
- {86, 3151, 0, L" "},
- {86, 3141, 0, L""},
- {86, 3012, 0, L" "},
- {86, 1081, 0, L""},
- {86, 1077, 0, L"-"},
- {86, 1079, 0, L""},
- {86, 1078, 0, L""},
- {86, 1076, 0, L""},
- {86, 2929, 0, L""},
- {86, 2928, 0, L""},
- {86, 2300, 0, L""},
- {95, 3315, 0, L""},
- {95, 1082, 0, L""},
- {95, 1083, 0, L""},
- {95, 3144, 0, L""},
- {95, 3025, 0, L""},
- {95, 3277, 0, L""},
- {95, 1084, 0, L""},
- {95, 2301, 0, L""},
- {103, 1085, 0, L""},
- {103, 2302, 0, L""},
- {79, 1086, 0, L""},
- {79, 2303, 0, L""},
- {85, 1087, 0, L""},
- {85, 2304, 0, L""},
- {87, 1088, 0, L""},
- {87, 2305, 0, L""},
- {104, 1089, 0, L""},
- {104, 2306, 0, L""},
- {84, 1090, 0, L""},
- {84, 1091, 0, L""},
- {84, 1092, 0, L"-"},
- {84, 3242, 0, L""},
- {84, 1093, 0, L""},
- {84, 1094, 0, L" ()"},
- {84, 1095, 0, L""},
- {84, 3245, 0, L""},
- {84, 3083, 0, L""},
- {84, 1096, 0, L""},
- {84, 1097, 0, L""},
- {84, 1098, 0, L""},
- {84, 1099, 0, L""},
- {84, 2868, 0, L""},
- {84, 1100, 0, L""},
- {84, 1101, 0, L" (.-. .)"},
- {84, 1102, 0, L""},
- {84, 1103, 0, L""},
- {84, 1104, 0, L""},
- {84, 3166, 0, L""},
- {84, 1105, 0, L"-"},
- {84, 2927, 0, L""},
- {84, 1106, 0, L""},
- {84, 1107, 0, L""},
- {84, 1108, 0, L"-"},
- {84, 1109, 0, L""},
- {84, 1110, 0, L""},
- {84, 2307, 0, L""},
- {105, 1111, 0, L""},
- {105, 2308, 0, L""},
- {106, 1112, 0, L""},
- {106, 2309, 0, L""},
- {107, 1113, 0, L""},
- {107, 1114, 0, L""},
- {107, 1115, 0, L""},
- {107, 2954, 0, L""},
- {107, 2310, 0, L""},
- {92, 1116, 0, L""},
- {92, 1117, 0, L"-"},
- {92, 3027, 0, L"-"},
- {92, 1118, 0, L""},
- {92, 1119, 0, L""},
- {92, 1120, 0, L""},
- {92, 2933, 0, L""},
- {92, 2311, 0, L""},
- {76, 3214, 0, L" ()"},
- {76, 1121, 0, L""},
- {76, 2869, 0, L""},
- {76, 3262, 0, L""},
- {76, 1122, 0, L""},
- {76, 1123, 0, L""},
- {76, 1124, 0, L""},
- {76, 3043, 0, L""},
- {76, 2312, 0, L""},
- {29, 1125, 0, L""},
- {29, 2313, 0, L""},
- {108, 1126, 0, L""},
- {108, 3240, 0, L""},
- {108, 2314, 0, L""},
- {88, 1127, 0, L"-"},
- {88, 2315, 0, L""},
- {109, 1128, 0, L""},
- {109, 2316, 0, L""},
- {110, 1129, 0, L""},
- {110, 2317, 0, L""},
- {111, 1130, 0, L"-"},
- {111, 1131, 0, L"-"},
- {111, 2318, 0, L""},
- {112, 1132, 0, L""},
- {112, 2319, 0, L""},
- {113, 1133, 0, L"-"},
- {113, 1134, 0, L""},
- {113, 2320, 0, L""},
- {114, 1135, 0, L""},
- {114, 2321, 0, L""},
- {115, 1136, 0, L""},
- {115, 2322, 0, L""},
- {116, 1137, 0, L"-"},
- {116, 1138, 0, L""},
- {116, 1139, 0, L""},
- {116, 2323, 0, L""},
- {117, 1140, 0, L""},
- {117, 2324, 0, L""},
- {122, 1141, 0, L""},
- {122, 2325, 0, L""},
- {89, 1072, 0, L""},
- {89, 1073, 0, L""},
- {89, 1142, 0, L""},
- {89, 2326, 0, L""},
- {94, 3250, 0, L""},
- {94, 1143, 0, L"-"},
- {94, 2327, 0, L""},
- {78, 1144, 0, L""},
- {78, 2328, 0, L""},
- {91, 1145, 0, L""},
- {91, 3307, 0, L""},
- {91, 3308, 0, L""},
- {91, 2329, 0, L""},
- {119, 1146, 0, L""},
- {119, 1147, 0, L""},
- {119, 2330, 0, L""},
- {120, 1148, 0, L""},
- {120, 2331, 0, L""},
- {132, 1149, 0, L""},
- {132, 2332, 0, L""},
- {90, 1150, 0, L""},
- {90, 3079, 0, L""},
- {90, 2333, 0, L""},
- {77, 1152, 0, L""},
- {77, 1153, 0, L""},
- {77, 3080, 0, L""},
- {77, 1151, 0, L""},
- {77, 1154, 0, L""},
- {77, 1155, 0, L""},
- {77, 2334, 0, L""},
- {93, 3362, 0, L""},
- {93, 3137, 0, L""},
- {93, 3273, 0, L""},
- {93, 1156, 0, L""},
- {93, 1157, 0, L""},
- {93, 3167, 0, L""},
- {93, 3347, 0, L""},
- {93, 1158, 0, L""},
- {93, 1159, 0, L""},
- {93, 1160, 0, L""},
- {93, 1161, 0, L""},
- {93, 1162, 0, L""},
- {93, 1163, 0, L""},
- {93, 1164, 0, L""},
- {93, 2335, 0, L""},
- {121, 1165, 0, L""},
- {121, 3319, 0, L""},
- {121, 2336, 0, L""},
- {98, 1166, 0, L""},
- {98, 2337, 0, L""},
- {75, 3176, 0, L""},
- {75, 3339, 0, L""},
- {75, 1167, 0, L""},
- {75, 1168, 0, L""},
- {75, 2338, 0, L""},
- {123, 1914, 0, L""},
- {123, 2957, 0, L" "},
- {123, 1915, 0, L""},
- {123, 3331, 0, L""},
- {123, 1916, 0, L""},
- {123, 3001, 0, L""},
- {123, 1917, 0, L""},
- {123, 3217, 0, L""},
- {123, 3064, 0, L""},
- {123, 3020, 0, L" "},
- {123, 1918, 0, L""},
- {123, 3238, 0, L""},
- {123, 2339, 0, L""},
- {454, 1192, 0, L"-"},
- {454, 2366, 0, L""},
- {124, 1919, 0, L"-"},
- {124, 2340, 0, L""},
- {453, 1193, 0, L""},
- {453, 2368, 0, L""},
- {126, 1921, 0, L""},
- {126, 2342, 0, L""},
- {127, 1922, 0, L""},
- {127, 2343, 0, L""},
- {128, 1923, 0, L""},
- {128, 2344, 0, L""},
- {129, 1924, 0, L""},
- {129, 2345, 0, L""},
- {130, 1925, 0, L""},
- {130, 1926, 0, L""},
- {130, 1928, 0, L""},
- {130, 1929, 0, L""},
- {130, 3235, 0, L""},
- {130, 1927, 0, L""},
- {130, 3323, 0, L""},
- {130, 2346, 0, L""},
- {131, 1930, 0, L""},
- {131, 2347, 0, L""},
- {133, 1931, 0, L"-"},
- {133, 2348, 0, L""},
- {125, 1920, 0, L""},
- {125, 2341, 0, L""},
- {134, 1932, 0, L""},
- {134, 2349, 0, L""},
- {135, 1933, 0, L""},
- {135, 2350, 0, L""},
- {136, 1934, 0, L""},
- {136, 2351, 0, L""},
- {137, 1935, 0, L""},
- {137, 2352, 0, L""},
- {138, 3055, 0, L""},
- {138, 3049, 0, L""},
- {138, 3330, 0, L""},
- {138, 1169, 0, L""},
- {138, 3106, 0, L""},
- {138, 1170, 0, L""},
- {138, 1171, 0, L""},
- {138, 1172, 0, L""},
- {138, 3365, 0, L""},
- {138, 1173, 0, L""},
- {138, 3104, 0, L""},
- {138, 3366, 0, L""},
- {138, 1174, 0, L""},
- {138, 2964, 0, L""},
- {138, 3113, 0, L""},
- {138, 1175, 0, L""},
- {138, 2920, 0, L"-"},
- {138, 2889, 0, L"-"},
- {138, 1176, 0, L""},
- {138, 2903, 0, L" "},
- {138, 1177, 0, L""},
- {138, 1178, 0, L""},
- {138, 2946, 0, L""},
- {138, 1179, 0, L""},
- {138, 1180, 0, L""},
- {138, 2353, 0, L""},
- {139, 407, 0, L""},
- {139, 426, 0, L""},
- {139, 378, 0, L""},
- {139, 412, 0, L""},
- {139, 446, 0, L""},
- {139, 434, 0, L""},
- {139, 416, 0, L""},
- {139, 428, 0, L""},
- {139, 440, 0, L""},
- {139, 352, 0, L""},
- {139, 394, 0, L""},
- {139, 374, 0, L""},
- {139, 448, 0, L""},
- {139, 390, 0, L""},
- {139, 402, 0, L""},
- {139, 396, 0, L" "},
- {139, 370, 0, L""},
- {139, 368, 0, L""},
- {139, 444, 0, L""},
- {139, 388, 0, L""},
- {139, 408, 0, L""},
- {139, 430, 0, L""},
- {139, 358, 0, L""},
- {139, 418, 0, L""},
- {139, 354, 0, L""},
- {139, 376, 0, L""},
- {139, 414, 0, L""},
- {139, 380, 0, L""},
- {139, 372, 0, L""},
- {139, 424, 0, L""},
- {139, 348, 0, L""},
- {139, 392, 0, L""},
- {139, 386, 0, L""},
- {139, 438, 0, L""},
- {139, 362, 0, L"-"},
- {139, 360, 0, L"-"},
- {139, 432, 0, L"-"},
- {139, 350, 0, L"-"},
- {139, 366, 0, L""},
- {139, 420, 0, L""},
- {139, 442, 0, L""},
- {139, 364, 0, L""},
- {139, 450, 0, L"-"},
- {139, 356, 0, L"-"},
- {139, 382, 0, L" "},
- {139, 398, 0, L" "},
- {139, 410, 0, L""},
- {139, 422, 0, L""},
- {139, 406, 0, L" "},
- {139, 404, 0, L""},
- {139, 384, 0, L" "},
- {139, 400, 0, L" "},
- {139, 436, 0, L""},
- {140, 1238, 0, L"-"},
- {140, 2442, 0, L""},
- {141, 1239, 0, L"-"},
- {141, 2441, 0, L""},
- {142, 1240, 0, L""},
- {142, 2440, 0, L""},
- {143, 1241, 0, L""},
- {143, 2439, 0, L""},
- {146, 1242, 0, L""},
- {146, 2438, 0, L""},
- {144, 1243, 0, L"-"},
- {144, 2437, 0, L""},
- {145, 1244, 0, L""},
- {145, 3094, 0, L" "},
- {145, 1245, 0, L"--"},
- {145, 1246, 0, L"-"},
- {145, 2436, 0, L""},
- {147, 1247, 0, L""},
- {147, 2435, 0, L""},
- {452, 1190, 0, L"-"},
- {452, 2364, 0, L""},
- {149, 1248, 0, L"--"},
- {149, 2434, 0, L""},
- {148, 1249, 0, L""},
- {148, 2433, 0, L""},
- {173, 1250, 0, L""},
- {173, 2432, 0, L""},
- {150, 1251, 0, L""},
- {150, 2431, 0, L""},
- {151, 1252, 0, L"-"},
- {151, 2430, 0, L""},
- {152, 1253, 0, L""},
- {152, 2429, 0, L""},
- {153, 1254, 0, L""},
- {153, 2428, 0, L""},
- {154, 1255, 0, L"-"},
- {154, 2427, 0, L""},
- {155, 1256, 0, L""},
- {155, 2426, 0, L""},
- {156, 1257, 0, L"-"},
- {156, 2425, 0, L""},
- {157, 1258, 0, L""},
- {157, 2424, 0, L""},
- {158, 1259, 0, L""},
- {158, 1260, 0, L""},
- {158, 2423, 0, L""},
- {159, 1261, 0, L""},
- {159, 2422, 0, L""},
- {160, 1262, 0, L""},
- {160, 2421, 0, L""},
- {161, 1263, 0, L""},
- {161, 2420, 0, L""},
- {162, 1264, 0, L""},
- {162, 2419, 0, L""},
- {163, 1265, 0, L"-"},
- {163, 2418, 0, L""},
- {164, 1266, 0, L""},
- {164, 2417, 0, L""},
- {165, 1267, 0, L""},
- {165, 2416, 0, L""},
- {166, 1268, 0, L""},
- {166, 2415, 0, L""},
- {167, 1269, 0, L""},
- {167, 2414, 0, L""},
- {168, 1270, 0, L"--"},
- {168, 2413, 0, L""},
- {169, 1271, 0, L""},
- {169, 2412, 0, L""},
- {170, 1272, 0, L""},
- {170, 2411, 0, L""},
- {171, 1273, 0, L""},
- {171, 1274, 0, L""},
- {171, 2410, 0, L""},
- {172, 1275, 0, L""},
- {172, 2409, 0, L""},
- {174, 1854, 0, L""},
- {174, 2495, 0, L""},
- {175, 1855, 0, L""},
- {175, 2494, 0, L""},
- {176, 1856, 0, L""},
- {176, 1857, 0, L"-"},
- {176, 2493, 0, L""},
- {177, 1858, 0, L""},
- {177, 2492, 0, L""},
- {178, 1859, 0, L""},
- {178, 2491, 0, L""},
- {179, 1860, 0, L""},
- {179, 2490, 0, L""},
- {180, 1861, 0, L""},
- {180, 2489, 0, L""},
- {181, 1862, 0, L""},
- {181, 2488, 0, L""},
- {182, 1863, 0, L""},
- {182, 2487, 0, L""},
- {183, 1864, 0, L""},
- {183, 2486, 0, L""},
- {184, 1865, 0, L""},
- {184, 2485, 0, L""},
- {185, 1866, 0, L""},
- {185, 2484, 0, L""},
- {186, 3312, 0, L""},
- {186, 1867, 0, L""},
- {186, 1868, 0, L""},
- {186, 2483, 0, L""},
- {187, 1869, 0, L""},
- {187, 2482, 0, L""},
- {23, 1870, 0, L""},
- {23, 2481, 0, L""},
- {188, 1871, 0, L""},
- {188, 2480, 0, L""},
- {189, 1872, 0, L""},
- {189, 2479, 0, L""},
- {190, 1873, 0, L""},
- {190, 2478, 0, L""},
- {191, 1874, 0, L""},
- {191, 2477, 0, L""},
- {193, 1875, 0, L""},
- {193, 2476, 0, L""},
- {192, 1876, 0, L""},
- {192, 2475, 0, L""},
- {194, 1877, 0, L""},
- {194, 2474, 0, L""},
- {195, 1878, 0, L""},
- {195, 2473, 0, L""},
- {196, 1879, 0, L""},
- {196, 2472, 0, L""},
- {197, 1880, 0, L""},
- {197, 2471, 0, L""},
- {198, 1881, 0, L"-"},
- {198, 2470, 0, L""},
- {199, 1882, 0, L""},
- {199, 2469, 0, L""},
- {200, 1883, 0, L""},
- {200, 2468, 0, L""},
- {201, 1884, 0, L""},
- {201, 2467, 0, L""},
- {202, 1885, 0, L""},
- {202, 2466, 0, L""},
- {203, 1886, 0, L""},
- {203, 1887, 0, L""},
- {203, 2465, 0, L""},
- {204, 1888, 0, L""},
- {204, 2464, 0, L""},
- {205, 1889, 0, L""},
- {205, 2463, 0, L""},
- {206, 1890, 0, L""},
- {206, 2462, 0, L""},
- {207, 1891, 0, L""},
- {207, 2461, 0, L""},
- {208, 1892, 0, L""},
- {208, 2460, 0, L""},
- {209, 1893, 0, L"-"},
- {209, 2459, 0, L""},
- {210, 1894, 0, L""},
- {210, 2458, 0, L""},
- {211, 1895, 0, L""},
- {211, 2457, 0, L""},
- {212, 1896, 0, L""},
- {212, 2456, 0, L""},
- {213, 1897, 0, L""},
- {213, 2455, 0, L""},
- {214, 1898, 0, L""},
- {214, 2454, 0, L""},
- {215, 1899, 0, L""},
- {215, 2453, 0, L""},
- {216, 1900, 0, L"--"},
- {216, 1901, 0, L""},
- {216, 2452, 0, L""},
- {217, 1902, 0, L""},
- {217, 2451, 0, L""},
- {218, 1903, 0, L""},
- {218, 2450, 0, L""},
- {219, 1904, 0, L""},
- {219, 2449, 0, L""},
- {220, 1905, 0, L""},
- {220, 2448, 0, L""},
- {222, 1906, 0, L""},
- {222, 2447, 0, L""},
- {223, 1907, 0, L""},
- {223, 2446, 0, L""},
- {221, 1908, 0, L""},
- {221, 2445, 0, L""},
- {224, 1909, 0, L"-"},
- {224, 2444, 0, L""},
- {225, 1910, 0, L""},
- {225, 1913, 0, L""},
- {225, 1912, 0, L""},
- {225, 3033, 0, L""},
- {225, 1911, 0, L""},
- {225, 2443, 0, L""},
- {39, 314, 0, L""},
- {39, 315, 0, L" ."},
- {39, 316, 0, L" ."},
- {39, 317, 0, L" ."},
- {39, 318, 0, L" ."},
- {39, 319, 0, L" ."},
- {39, 320, 0, L" ."},
- {39, 321, 0, L" ."},
- {39, 322, 0, L"- ."},
- {39, 323, 0, L" ."},
- {39, 324, 0, L" ."},
- {39, 325, 0, L""},
- {39, 326, 0, L" ."},
- {39, 327, 0, L" ."},
- {39, 328, 0, L" ."},
- {39, 329, 0, L" ."},
- {39, 330, 0, L" ."},
- {39, 331, 0, L" ."},
- {39, 332, 0, L" ."},
- {39, 333, 0, L" ."},
- {39, 334, 0, L" ."},
- {39, 335, 0, L" ."},
- {39, 336, 0, L" ."},
- {39, 337, 0, L" ."},
- {39, 338, 0, L" ."},
- {39, 339, 0, L" ."},
- {40, 602, 0, L" "},
- {40, 604, 0, L""},
- {40, 603, 0, L""},
- {40, 608, 0, L""},
- {40, 606, 0, L""},
- {40, 3099, 0, L"--"},
- {40, 605, 0, L""},
- {40, 3174, 0, L""},
- {40, 609, 0, L""},
- {40, 607, 0, L""},
- {40, 610, 0, L""},
- {40, 611, 0, L""},
- {40, 2541, 0, L""},
- {32, 612, 0, L""},
- {32, 2540, 0, L""},
- {33, 613, 0, L"--"},
- {33, 2539, 0, L""},
- {340, 341, 0, L""},
- {340, 342, 0, L" ."},
- {340, 343, 0, L" ."},
- {340, 344, 0, L" ."},
- {340, 345, 0, L" ."},
- {340, 346, 0, L" ."},
- {340, 347, 0, L" ."},
- {38, 760, 0, L""},
- {38, 767, 0, L""},
- {38, 762, 0, L""},
- {38, 761, 0, L""},
- {38, 763, 0, L""},
- {38, 769, 0, L""},
- {38, 765, 0, L""},
- {38, 764, 0, L""},
- {38, 3117, 0, L""},
- {38, 766, 0, L""},
- {38, 768, 0, L""},
- {38, 2532, 0, L""},
- {41, 3098, 0, L""},
- {41, 792, 0, L""},
- {41, 770, 0, L""},
- {41, 771, 0, L""},
- {41, 773, 0, L""},
- {41, 776, 0, L"-"},
- {41, 788, 0, L""},
- {41, 789, 0, L""},
- {41, 796, 0, L""},
- {41, 777, 0, L""},
- {41, 781, 0, L""},
- {41, 786, 0, L""},
- {41, 791, 0, L""},
- {41, 793, 0, L""},
- {41, 795, 0, L""},
- {41, 787, 0, L""},
- {41, 790, 0, L""},
- {41, 3133, 0, L""},
- {41, 794, 0, L""},
- {41, 782, 0, L""},
- {41, 780, 0, L""},
- {41, 779, 0, L""},
- {41, 774, 0, L""},
- {41, 784, 0, L""},
- {41, 772, 0, L""},
- {41, 775, 0, L""},
- {41, 3116, 0, L""},
- {41, 785, 0, L""},
- {41, 778, 0, L""},
- {41, 783, 0, L""},
- {41, 2531, 0, L""},
- {42, 797, 0, L"-"},
- {42, 799, 0, L""},
- {42, 798, 0, L""},
- {42, 800, 0, L""},
- {42, 2530, 0, L""},
- {45, 802, 0, L""},
- {45, 3075, 0, L""},
- {45, 801, 0, L""},
- {45, 804, 0, L""},
- {45, 803, 0, L""},
- {45, 805, 0, L""},
- {45, 3168, 0, L""},
- {45, 806, 0, L""},
- {45, 807, 0, L""},
- {45, 808, 0, L""},
- {45, 809, 0, L""},
- {45, 3131, 0, L""},
- {45, 810, 0, L""},
- {45, 3342, 0, L""},
- {45, 811, 0, L""},
- {45, 812, 0, L""},
- {45, 813, 0, L""},
- {45, 814, 0, L""},
- {45, 3089, 0, L""},
- {45, 815, 0, L""},
- {45, 816, 0, L""},
- {45, 817, 0, L""},
- {45, 818, 0, L""},
- {45, 819, 0, L""},
- {45, 820, 0, L""},
- {45, 2976, 0, L""},
- {45, 2988, 0, L""},
- {45, 821, 0, L""},
- {45, 3088, 0, L""},
- {45, 822, 0, L""},
- {45, 823, 0, L""},
- {45, 824, 0, L""},
- {45, 825, 0, L""},
- {45, 3343, 0, L""},
- {45, 2867, 0, L""},
- {45, 2986, 0, L"-"},
- {45, 826, 0, L""},
- {45, 3063, 0, L""},
- {45, 827, 0, L""},
- {45, 3140, 0, L""},
- {45, 828, 0, L""},
- {45, 829, 0, L""},
- {45, 830, 0, L""},
- {45, 2529, 0, L""},
- {44, 831, 0, L""},
- {44, 832, 0, L""},
- {44, 836, 0, L""},
- {44, 835, 0, L""},
- {44, 834, 0, L""},
- {44, 833, 0, L""},
- {44, 2528, 0, L""},
- {46, 3007, 0, L""},
- {46, 837, 0, L""},
- {46, 838, 0, L"-"},
- {46, 3371, 0, L""},
- {46, 839, 0, L"-"},
- {46, 840, 0, L""},
- {46, 841, 0, L""},
- {46, 3163, 0, L""},
- {46, 842, 0, L""},
- {46, 843, 0, L""},
- {46, 3015, 0, L""},
- {46, 844, 0, L""},
- {46, 2921, 0, L""},
- {46, 845, 0, L""},
- {46, 846, 0, L""},
- {46, 847, 0, L""},
- {46, 848, 0, L""},
- {46, 849, 0, L""},
- {46, 3010, 0, L""},
- {46, 850, 0, L""},
- {46, 851, 0, L""},
- {46, 3072, 0, L""},
- {46, 852, 0, L""},
- {46, 853, 0, L""},
- {46, 854, 0, L""},
- {46, 855, 0, L""},
- {46, 3082, 0, L""},
- {46, 3309, 0, L""},
- {46, 856, 0, L""},
- {46, 857, 0, L""},
- {46, 3138, 0, L""},
- {46, 858, 0, L""},
- {46, 859, 0, L""},
- {46, 2872, 0, L""},
- {46, 2965, 0, L""},
- {46, 3135, 0, L""},
- {46, 3156, 0, L""},
- {46, 3192, 0, L""},
- {46, 860, 0, L""},
- {46, 861, 0, L""},
- {46, 2864, 0, L""},
- {46, 862, 0, L""},
- {46, 3009, 0, L""},
- {46, 2993, 0, L""},
- {46, 863, 0, L""},
- {46, 864, 0, L""},
- {46, 865, 0, L""},
- {46, 866, 0, L""},
- {46, 3191, 0, L""},
- {46, 2974, 0, L"-"},
- {46, 3127, 0, L""},
- {46, 867, 0, L""},
- {46, 868, 0, L""},
- {46, 869, 0, L"--"},
- {46, 3373, 0, L""},
- {46, 3313, 0, L""},
- {46, 870, 0, L""},
- {46, 3045, 0, L""},
- {46, 2906, 0, L""},
- {46, 2527, 0, L""},
- {48, 871, 0, L""},
- {48, 873, 0, L""},
- {48, 3147, 0, L""},
- {48, 872, 0, L""},
- {48, 3178, 0, L""},
- {48, 2526, 0, L""},
- {49, 3006, 0, L""},
- {49, 874, 0, L""},
- {49, 875, 0, L""},
- {49, 3285, 0, L""},
- {49, 876, 0, L""},
- {49, 3126, 0, L""},
- {49, 2525, 0, L""},
- {50, 3377, 0, L""},
- {50, 3067, 0, L""},
- {50, 877, 0, L""},
- {50, 3065, 0, L""},
- {50, 3066, 0, L""},
- {50, 878, 0, L""},
- {50, 3069, 0, L""},
- {50, 3068, 0, L""},
- {50, 2524, 0, L""},
- {51, 879, 0, L""},
- {51, 2523, 0, L""},
- {34, 880, 0, L""},
- {34, 3125, 0, L""},
- {34, 881, 0, L""},
- {34, 890, 0, L""},
- {34, 3076, 0, L""},
- {34, 882, 0, L""},
- {34, 3070, 0, L""},
- {34, 888, 0, L""},
- {34, 886, 0, L""},
- {34, 891, 0, L"-"},
- {34, 3310, 0, L" "},
- {34, 883, 0, L""},
- {34, 884, 0, L""},
- {34, 885, 0, L""},
- {34, 892, 0, L""},
- {34, 3179, 0, L" "},
- {34, 3177, 0, L"-"},
- {34, 3289, 0, L"---"},
- {34, 889, 0, L""},
- {34, 887, 0, L""},
- {34, 893, 0, L""},
- {34, 2522, 0, L""},
- {52, 3318, 0, L""},
- {52, 3278, 0, L""},
- {52, 906, 0, L""},
- {52, 894, 0, L""},
- {52, 895, 0, L""},
- {52, 905, 0, L""},
- {52, 896, 0, L""},
- {52, 897, 0, L""},
- {52, 3369, 0, L""},
- {52, 3327, 0, L""},
- {52, 898, 0, L""},
- {52, 899, 0, L""},
- {52, 907, 0, L""},
- {52, 908, 0, L""},
- {52, 900, 0, L""},
- {52, 901, 0, L""},
- {52, 3368, 0, L"-"},
- {52, 3384, 0, L""},
- {52, 3252, 0, L""},
- {52, 902, 0, L""},
- {52, 903, 0, L""},
- {52, 3130, 0, L""},
- {52, 904, 0, L""},
- {52, 2521, 0, L""},
- {53, 2939, 0, L""},
- {53, 3054, 0, L""},
- {53, 909, 0, L""},
- {53, 2934, 0, L""},
- {53, 913, 0, L""},
- {53, 2935, 0, L""},
- {53, 912, 0, L""},
- {53, 2905, 0, L""},
- {53, 911, 0, L""},
- {53, 2936, 0, L""},
- {53, 2937, 0, L""},
- {53, 910, 0, L""},
- {53, 2520, 0, L""},
- {54, 914, 0, L""},
- {54, 915, 0, L""},
- {54, 916, 0, L""},
- {54, 918, 0, L""},
- {54, 919, 0, L""},
- {54, 3173, 0, L""},
- {54, 917, 0, L""},
- {54, 2519, 0, L""},
- {55, 920, 0, L""},
- {55, 2518, 0, L""},
- {56, 3376, 0, L""},
- {56, 921, 0, L""},
- {56, 2517, 0, L""},
- {57, 3142, 0, L""},
- {57, 922, 0, L""},
- {57, 2516, 0, L""},
- {58, 923, 0, L""},
- {58, 3154, 0, L""},
- {58, 924, 0, L""},
- {58, 2515, 0, L""},
- {59, 925, 0, L""},
- {59, 926, 0, L""},
- {59, 3234, 0, L""},
- {59, 3275, 0, L""},
- {59, 927, 0, L""},
- {59, 3321, 0, L""},
- {59, 928, 0, L""},
- {59, 929, 0, L""},
- {59, 3281, 0, L"-"},
- {59, 2514, 0, L""},
- {36, 930, 0, L"-"},
- {36, 2513, 0, L""},
- {60, 931, 0, L""},
- {60, 933, 0, L""},
- {60, 932, 0, L""},
- {60, 934, 0, L""},
- {60, 935, 0, L""},
- {60, 2977, 0, L""},
- {60, 3030, 0, L""},
- {60, 3091, 0, L""},
- {60, 936, 0, L""},
- {60, 937, 0, L""},
- {60, 3044, 0, L""},
- {60, 3380, 0, L""},
- {60, 2512, 0, L""},
- {61, 3190, 0, L""},
- {61, 2857, 0, L""},
- {61, 938, 0, L""},
- {61, 3355, 0, L""},
- {61, 939, 0, L""},
- {61, 2511, 0, L""},
- {62, 940, 0, L""},
- {62, 941, 0, L""},
- {62, 3164, 0, L""},
- {62, 942, 0, L""},
- {62, 943, 0, L""},
- {62, 3237, 0, L""},
- {62, 3165, 0, L" "},
- {62, 944, 0, L""},
- {62, 945, 0, L""},
- {62, 3008, 0, L""},
- {62, 3150, 0, L""},
- {62, 946, 0, L""},
- {62, 947, 0, L""},
- {62, 948, 0, L""},
- {62, 2958, 0, L""},
- {62, 2510, 0, L""},
- {35, 949, 0, L""},
- {35, 950, 0, L""},
- {35, 2509, 0, L""},
- {63, 952, 0, L""},
- {63, 951, 0, L""},
- {63, 954, 0, L""},
- {63, 955, 0, L""},
- {63, 953, 0, L""},
- {63, 2508, 0, L""},
- {64, 956, 0, L"-"},
- {64, 2507, 0, L""},
- {74, 957, 0, L""},
- {74, 960, 0, L""},
- {74, 958, 0, L"-"},
- {74, 959, 0, L""},
- {74, 2506, 0, L""},
- {65, 961, 0, L""},
- {65, 962, 0, L""},
- {65, 3101, 0, L""},
- {65, 963, 0, L""},
- {65, 964, 0, L""},
- {65, 965, 0, L""},
- {65, 966, 0, L""},
- {65, 2505, 0, L""},
- {66, 968, 0, L""},
- {66, 967, 0, L""},
- {66, 969, 0, L""},
- {66, 2504, 0, L""},
- {67, 970, 0, L""},
- {67, 2503, 0, L""},
- {68, 2888, 0, L""},
- {68, 971, 0, L""},
- {68, 979, 0, L""},
- {68, 972, 0, L""},
- {68, 980, 0, L""},
- {68, 973, 0, L""},
- {68, 3375, 0, L""},
- {68, 3159, 0, L""},
- {68, 974, 0, L""},
- {68, 975, 0, L""},
- {68, 976, 0, L""},
- {68, 977, 0, L""},
- {68, 978, 0, L""},
- {68, 2502, 0, L""},
- {37, 996, 0, L""},
- {37, 983, 0, L""},
- {37, 997, 0, L""},
- {37, 984, 0, L""},
- {37, 998, 0, L""},
- {37, 987, 0, L""},
- {37, 988, 0, L""},
- {37, 993, 0, L"-"},
- {37, 3037, 0, L""},
- {37, 989, 0, L""},
- {37, 985, 0, L""},
- {37, 991, 0, L""},
- {37, 3161, 0, L""},
- {37, 990, 0, L""},
- {37, 994, 0, L""},
- {37, 995, 0, L""},
- {37, 999, 0, L""},
- {37, 981, 0, L""},
- {37, 3374, 0, L""},
- {37, 992, 0, L""},
- {37, 982, 0, L""},
- {37, 986, 0, L""},
- {37, 3314, 0, L""},
- {37, 2501, 0, L""},
- {69, 1003, 0, L""},
- {69, 1000, 0, L""},
- {69, 1001, 0, L""},
- {69, 1004, 0, L""},
- {69, 1002, 0, L""},
- {69, 2500, 0, L""},
- {70, 1005, 0, L""},
- {70, 3291, 0, L"-"},
- {70, 1007, 0, L"-"},
- {70, 1008, 0, L"-"},
- {70, 3019, 0, L""},
- {70, 1010, 0, L""},
- {70, 1009, 0, L""},
- {70, 1015, 0, L""},
- {70, 3105, 0, L" "},
- {70, 1006, 0, L""},
- {70, 3246, 0, L""},
- {70, 1011, 0, L""},
- {70, 1012, 0, L"--"},
- {70, 1014, 0, L"-"},
- {70, 1013, 0, L"--"},
- {70, 2499, 0, L""},
- {71, 1016, 0, L""},
- {71, 1019, 0, L""},
- {71, 1017, 0, L""},
- {71, 1018, 0, L""},
- {71, 1020, 0, L""},
- {71, 1021, 0, L""},
- {71, 1022, 0, L""},
- {71, 3189, 0, L""},
- {71, 1023, 0, L""},
- {71, 1024, 0, L""},
- {71, 1025, 0, L""},
- {71, 1026, 0, L""},
- {71, 1027, 0, L""},
- {71, 1028, 0, L""},
- {71, 1029, 0, L""},
- {71, 1030, 0, L""},
- {71, 2498, 0, L""},
- {72, 2883, 0, L""},
- {72, 1031, 0, L""},
- {72, 1032, 0, L""},
- {72, 1037, 0, L""},
- {72, 1036, 0, L""},
- {72, 1042, 0, L""},
- {72, 1033, 0, L""},
- {72, 1034, 0, L""},
- {72, 1041, 0, L""},
- {72, 1039, 0, L""},
- {72, 1043, 0, L""},
- {72, 1040, 0, L""},
- {72, 1038, 0, L""},
- {72, 2497, 0, L""},
- {73, 3013, 0, L""},
- {73, 1044, 0, L""},
- {73, 1045, 0, L"-"},
- {73, 1046, 0, L""},
- {73, 1047, 0, L""},
- {73, 1048, 0, L""},
- {73, 1049, 0, L""},
- {73, 1050, 0, L""},
- {73, 1051, 0, L""},
- {73, 1052, 0, L""},
- {73, 1053, 0, L""},
- {73, 1054, 0, L""},
- {24, 233, 474, L""},
- {24, 233, 2809, L""},
- {24, 233, 2804, L""},
- {24, 233, 475, L""},
- {24, 233, 477, L""},
- {24, 233, 476, L""},
- {24, 233, 2806, L""},
- {24, 233, 3115, L""},
- {24, 233, 2808, L""},
- {24, 233, 2807, L""},
- {24, 233, 2805, L""},
- {24, 233, 478, L"-"},
- {24, 233, 479, L""},
- {24, 233, 2263, L""},
- {24, 232, 2819, L""},
- {24, 232, 464, L""},
- {24, 232, 465, L" "},
- {24, 232, 466, L""},
- {24, 232, 2817, L""},
- {24, 232, 2818, L""},
- {24, 232, 3359, L""},
- {24, 232, 467, L"-"},
- {24, 232, 468, L""},
- {24, 232, 469, L""},
- {24, 232, 470, L""},
- {24, 232, 471, L""},
- {24, 232, 472, L""},
- {24, 232, 2816, L"-"},
- {24, 232, 473, L""},
- {24, 232, 2258, L""},
- {24, 235, 487, L""},
- {24, 235, 2821, L""},
- {24, 235, 488, L""},
- {24, 235, 2820, L""},
- {24, 235, 489, L"--"},
- {24, 235, 490, L"--"},
- {24, 235, 491, L" "},
- {24, 235, 3353, L""},
- {24, 235, 492, L""},
- {24, 235, 2280, L""},
- {24, 227, 455, L""},
- {24, 227, 456, L""},
- {24, 227, 2814, L""},
- {24, 227, 2813, L""},
- {24, 227, 2815, L""},
- {24, 227, 2812, L""},
- {24, 227, 2811, L""},
- {24, 227, 457, L""},
- {24, 227, 2217, L""},
- {24, 227, 2218, L""},
- {24, 229, 460, L""},
- {24, 229, 2822, L""},
- {24, 229, 459, L"-."},
- {24, 229, 2234, L""},
- {24, 231, 462, L""},
- {24, 231, 2823, L""},
- {24, 231, 463, L""},
- {24, 231, 2246, L""},
- {24, 234, 480, L"-"},
- {24, 234, 2829, L""},
- {24, 234, 2833, L""},
- {24, 234, 2825, L""},
- {24, 234, 481, L""},
- {24, 234, 482, L""},
- {24, 234, 2826, L""},
- {24, 234, 2832, L""},
- {24, 234, 2836, L""},
- {24, 234, 2830, L""},
- {24, 234, 483, L""},
- {24, 234, 2828, L""},
- {24, 234, 2824, L"-"},
- {24, 234, 2827, L""},
- {24, 234, 2831, L""},
- {24, 234, 484, L""},
- {24, 234, 2834, L""},
- {24, 234, 2835, L""},
- {24, 234, 485, L"-"},
- {24, 234, 486, L"-"},
- {24, 234, 2264, L""},
- {24, 228, 458, L""},
- {24, 228, 2810, L""},
- {24, 228, 2226, L""},
- {24, 230, 461, L""},
- {24, 230, 2239, L""},
- {24, 236, 493, L""},
- {24, 236, 2287, L""},
- {24, 237, 2850, L""},
- {24, 237, 2851, L""},
- {24, 237, 2657, L""},
- {24, 237, 2662, L""},
- {24, 237, 494, L""},
- {24, 237, 2658, L""},
- {24, 237, 2660, L""},
- {24, 237, 2659, L""},
- {24, 237, 2663, L""},
- {24, 237, 495, L""},
- {24, 237, 496, L""},
- {24, 237, 2655, L""},
- {24, 237, 497, L""},
- {24, 237, 2654, L""},
- {24, 237, 499, L""},
- {24, 237, 2656, L""},
- {24, 237, 498, L""},
- {24, 237, 500, L""},
- {24, 237, 2661, L""},
- {24, 237, 501, L""},
- {24, 237, 502, L""},
- {24, 237, 2664, L""},
- {24, 237, 2220, L""},
- {24, 240, 509, L""},
- {24, 240, 510, L""},
- {24, 240, 511, L"-"},
- {24, 240, 512, L""},
- {24, 240, 2247, L""},
- {24, 241, 513, L" "},
- {24, 241, 2147, L""},
- {24, 241, 2150, L""},
- {24, 241, 2148, L""},
- {24, 241, 2910, L""},
- {24, 241, 515, L""},
- {24, 241, 514, L""},
- {24, 241, 2149, L""},
- {24, 241, 2923, L""},
- {24, 241, 2248, L""},
- {24, 248, 2569, L""},
- {24, 248, 2575, L""},
- {24, 248, 569, L""},
- {24, 248, 570, L""},
- {24, 248, 2571, L""},
- {24, 248, 571, L""},
- {24, 248, 2570, L""},
- {24, 248, 572, L""},
- {24, 248, 573, L""},
- {24, 248, 2576, L""},
- {24, 248, 574, L""},
- {24, 248, 575, L""},
- {24, 248, 2577, L""},
- {24, 248, 2572, L""},
- {24, 248, 576, L""},
- {24, 248, 2573, L""},
- {24, 248, 577, L" "},
- {24, 248, 578, L""},
- {24, 248, 579, L""},
- {24, 248, 2574, L""},
- {24, 248, 580, L""},
- {24, 248, 2271, L""},
- {24, 249, 3311, L""},
- {24, 249, 581, L""},
- {24, 249, 582, L""},
- {24, 249, 583, L""},
- {24, 249, 584, L""},
- {24, 249, 2665, L""},
- {24, 249, 585, L""},
- {24, 249, 586, L""},
- {24, 249, 587, L""},
- {24, 249, 2277, L""},
- {24, 251, 2158, L""},
- {24, 251, 2156, L""},
- {24, 251, 2151, L""},
- {24, 251, 2152, L" "},
- {24, 251, 2155, L""},
- {24, 251, 2153, L""},
- {24, 251, 592, L""},
- {24, 251, 2157, L""},
- {24, 251, 2154, L""},
- {24, 251, 2286, L""},
- {24, 238, 2168, L" "},
- {24, 238, 503, L" "},
- {24, 238, 2164, L""},
- {24, 238, 504, L""},
- {24, 238, 505, L"-"},
- {24, 238, 2160, L""},
- {24, 238, 506, L""},
- {24, 238, 2167, L""},
- {24, 238, 2159, L""},
- {24, 238, 2169, L""},
- {24, 238, 2163, L""},
- {24, 238, 2170, L""},
- {24, 238, 2166, L""},
- {24, 238, 2165, L""},
- {24, 238, 2162, L""},
- {24, 238, 2171, L""},
- {24, 238, 2161, L""},
- {24, 238, 507, L""},
- {24, 238, 2237, L""},
- {24, 242, 516, L""},
- {24, 242, 517, L""},
- {24, 242, 2139, L""},
- {24, 242, 518, L""},
- {24, 242, 519, L""},
- {24, 242, 520, L""},
- {24, 242, 2140, L""},
- {24, 242, 2138, L""},
- {24, 242, 521, L""},
- {24, 242, 2137, L""},
- {24, 242, 522, L""},
- {24, 242, 523, L""},
- {24, 242, 524, L""},
- {24, 242, 2891, L""},
- {24, 242, 525, L""},
- {24, 242, 2145, L""},
- {24, 242, 2143, L""},
- {24, 242, 2144, L""},
- {24, 242, 2146, L""},
- {24, 242, 526, L" "},
- {24, 242, 527, L""},
- {24, 242, 2135, L""},
- {24, 242, 528, L""},
- {24, 242, 529, L""},
- {24, 242, 530, L""},
- {24, 242, 2141, L""},
- {24, 242, 2136, L""},
- {24, 242, 2897, L""},
- {24, 242, 2142, L""},
- {24, 242, 2251, L""},
- {24, 243, 2678, L""},
- {24, 243, 2673, L""},
- {24, 243, 531, L""},
- {24, 243, 532, L""},
- {24, 243, 2674, L""},
- {24, 243, 2675, L""},
- {24, 243, 533, L""},
- {24, 243, 535, L""},
- {24, 243, 536, L""},
- {24, 243, 3360, L""},
- {24, 243, 2677, L"-"},
- {24, 243, 2676, L""},
- {24, 243, 537, L""},
- {24, 243, 538, L""},
- {24, 243, 2254, L""},
- {24, 244, 539, L""},
- {24, 244, 2597, L""},
- {24, 244, 2595, L""},
- {24, 244, 2593, L""},
- {24, 244, 540, L""},
- {24, 244, 2598, L" "},
- {24, 244, 2592, L""},
- {24, 244, 541, L""},
- {24, 244, 3304, L" "},
- {24, 244, 2596, L""},
- {24, 244, 2594, L""},
- {24, 244, 2256, L""},
- {24, 245, 2690, L""},
- {24, 245, 542, L""},
- {24, 245, 2679, L""},
- {24, 245, 2680, L""},
- {24, 245, 2687, L""},
- {24, 245, 2686, L""},
- {24, 245, 543, L""},
- {24, 245, 544, L""},
- {24, 245, 2681, L""},
- {24, 245, 545, L""},
- {24, 245, 546, L""},
- {24, 245, 547, L""},
- {24, 245, 548, L""},
- {24, 245, 2683, L""},
- {24, 245, 2684, L""},
- {24, 245, 2682, L""},
- {24, 245, 549, L""},
- {24, 245, 550, L""},
- {24, 245, 2685, L""},
- {24, 245, 551, L""},
- {24, 245, 2689, L""},
- {24, 245, 2688, L""},
- {24, 245, 552, L""},
- {24, 245, 553, L""},
- {24, 245, 2257, L""},
- {24, 246, 554, L""},
- {24, 246, 555, L""},
- {24, 246, 2599, L""},
- {24, 246, 3293, L" "},
- {24, 246, 2602, L""},
- {24, 246, 556, L""},
- {24, 246, 2600, L""},
- {24, 246, 557, L""},
- {24, 246, 558, L""},
- {24, 246, 559, L""},
- {24, 246, 560, L""},
- {24, 246, 561, L""},
- {24, 246, 2601, L""},
- {24, 246, 562, L""},
- {24, 246, 2261, L""},
- {24, 247, 2613, L""},
- {24, 247, 2606, L""},
- {24, 247, 563, L""},
- {24, 247, 564, L""},
- {24, 247, 565, L""},
- {24, 247, 2608, L""},
- {24, 247, 2607, L""},
- {24, 247, 2609, L""},
- {24, 247, 2610, L" "},
- {24, 247, 2605, L""},
- {24, 247, 566, L""},
- {24, 247, 2603, L""},
- {24, 247, 2604, L""},
- {24, 247, 2612, L""},
- {24, 247, 567, L""},
- {24, 247, 2611, L""},
- {24, 247, 568, L""},
- {24, 247, 3267, L"-12"},
- {24, 247, 2262, L""},
- {24, 250, 2614, L""},
- {24, 250, 588, L""},
- {24, 250, 2615, L""},
- {24, 250, 589, L""},
- {24, 250, 2616, L""},
- {24, 250, 590, L""},
- {24, 250, 591, L""},
- {24, 250, 2278, L""},
- {24, 239, 508, L""},
- {24, 239, 2238, L""},
- {24, 255, 1355, L""},
- {24, 255, 1356, L""},
- {24, 255, 1357, L""},
- {24, 255, 1358, L""},
- {24, 255, 1359, L""},
- {24, 255, 1360, L""},
- {24, 255, 1362, L""},
- {24, 255, 1361, L""},
- {24, 255, 3286, L""},
- {24, 255, 1937, L""},
- {24, 255, 1363, L""},
- {24, 255, 1938, L""},
- {24, 255, 3287, L""},
- {24, 255, 1936, L""},
- {24, 255, 1364, L""},
- {24, 255, 1365, L""},
- {24, 255, 1939, L""},
- {24, 255, 2201, L""},
- {24, 256, 1366, L""},
- {24, 256, 1367, L""},
- {24, 256, 2202, L""},
- {24, 256, 1368, L""},
- {24, 256, 1940, L""},
- {24, 256, 1369, L""},
- {24, 256, 1941, L""},
- {24, 256, 1370, L""},
- {24, 256, 1371, L""},
- {24, 256, 1372, L""},
- {24, 256, 2203, L""},
- {24, 252, 593, L""},
- {24, 252, 594, L""},
- {24, 252, 1945, L""},
- {24, 252, 595, L""},
- {24, 252, 596, L""},
- {24, 252, 1944, L""},
- {24, 252, 597, L""},
- {24, 252, 598, L""},
- {24, 252, 1946, L""},
- {24, 252, 599, L""},
- {24, 252, 600, L""},
- {24, 252, 601, L""},
- {24, 252, 1942, L""},
- {24, 252, 3239, L""},
- {24, 252, 1943, L""},
- {24, 252, 2204, L""},
- {24, 253, 1950, L""},
- {24, 253, 1949, L""},
- {24, 253, 1338, L" "},
- {24, 253, 1339, L""},
- {24, 253, 1951, L""},
- {24, 253, 1340, L""},
- {24, 253, 1952, L""},
- {24, 253, 2871, L""},
- {24, 253, 1341, L""},
- {24, 253, 1955, L""},
- {24, 253, 1342, L""},
- {24, 253, 1947, L""},
- {24, 253, 1343, L""},
- {24, 253, 1953, L""},
- {24, 253, 1954, L""},
- {24, 253, 1948, L""},
- {24, 253, 1344, L""},
- {24, 253, 2205, L""},
- {24, 254, 2838, L""},
- {24, 254, 1345, L""},
- {24, 254, 2846, L""},
- {24, 254, 2843, L""},
- {24, 254, 1346, L""},
- {24, 254, 1347, L""},
- {24, 254, 1348, L""},
- {24, 254, 2842, L""},
- {24, 254, 2845, L""},
- {24, 254, 2848, L""},
- {24, 254, 2837, L""},
- {24, 254, 2844, L""},
- {24, 254, 1349, L""},
- {24, 254, 2841, L""},
- {24, 254, 2839, L""},
- {24, 254, 1350, L""},
- {24, 254, 1351, L""},
- {24, 254, 1352, L""},
- {24, 254, 2840, L""},
- {24, 254, 1353, L""},
- {24, 254, 1354, L""},
- {24, 254, 2231, L""},
- {24, 257, 1985, L""},
- {24, 257, 1374, L""},
- {24, 257, 1373, L""},
- {24, 257, 1375, L""},
- {24, 257, 1995, L""},
- {24, 257, 1376, L""},
- {24, 257, 1378, L""},
- {24, 257, 1993, L""},
- {24, 257, 1379, L""},
- {24, 257, 1380, L""},
- {24, 257, 1381, L""},
- {24, 257, 1384, L""},
- {24, 257, 1984, L" "},
- {24, 257, 1990, L""},
- {24, 257, 1994, L""},
- {24, 257, 1386, L""},
- {24, 257, 1987, L" "},
- {24, 257, 1996, L""},
- {24, 257, 1986, L""},
- {24, 257, 1983, L""},
- {24, 257, 1992, L""},
- {24, 257, 1988, L""},
- {24, 257, 3071, L""},
- {24, 257, 1989, L""},
- {24, 257, 1389, L""},
- {24, 257, 1991, L""},
- {24, 257, 1391, L" "},
- {24, 257, 1392, L""},
- {24, 257, 1393, L""},
- {24, 257, 1394, L""},
- {24, 257, 2207, L""},
- {24, 258, 1395, L""},
- {24, 258, 1959, L""},
- {24, 258, 1396, L""},
- {24, 258, 1397, L""},
- {24, 258, 1398, L""},
- {24, 258, 1399, L""},
- {24, 258, 1958, L""},
- {24, 258, 1400, L""},
- {24, 258, 1401, L""},
- {24, 258, 1402, L""},
- {24, 258, 1403, L""},
- {24, 258, 1404, L" "},
- {24, 258, 1956, L""},
- {24, 258, 1957, L""},
- {24, 258, 3288, L""},
- {24, 258, 2206, L""},
- {24, 260, 1406, L""},
- {24, 260, 2001, L""},
- {24, 260, 2003, L""},
- {24, 260, 1407, L" "},
- {24, 260, 1408, L""},
- {24, 260, 2002, L" "},
- {24, 260, 1409, L""},
- {24, 260, 2000, L""},
- {24, 260, 1997, L""},
- {24, 260, 1410, L" "},
- {24, 260, 1998, L""},
- {24, 260, 1999, L""},
- {24, 260, 2208, L""},
- {24, 261, 1412, L" "},
- {24, 261, 2004, L""},
- {24, 261, 2009, L""},
- {24, 261, 2005, L""},
- {24, 261, 1413, L""},
- {24, 261, 2006, L""},
- {24, 261, 2008, L""},
- {24, 261, 1414, L""},
- {24, 261, 1415, L""},
- {24, 261, 1411, L""},
- {24, 261, 1416, L""},
- {24, 261, 2007, L""},
- {24, 261, 1417, L""},
- {24, 261, 2209, L""},
- {24, 259, 1405, L"-"},
- {24, 259, 2250, L""},
- {24, 265, 2764, L""},
- {24, 265, 2760, L""},
- {24, 265, 2762, L""},
- {24, 265, 2763, L""},
- {24, 265, 2761, L""},
- {24, 265, 1446, L"-"},
- {24, 265, 2222, L""},
- {24, 263, 1439, L"-"},
- {24, 263, 2215, L""},
- {24, 273, 2766, L"-"},
- {24, 273, 1494, L""},
- {24, 273, 2768, L" "},
- {24, 273, 2767, L""},
- {24, 273, 2765, L""},
- {24, 273, 2275, L""},
- {24, 275, 2769, L""},
- {24, 275, 1496, L""},
- {24, 275, 1497, L""},
- {24, 275, 2770, L""},
- {24, 275, 2771, L""},
- {24, 275, 2281, L""},
- {24, 264, 1440, L""},
- {24, 264, 1441, L""},
- {24, 264, 1442, L""},
- {24, 264, 1443, L""},
- {24, 264, 2728, L""},
- {24, 264, 2731, L""},
- {24, 264, 2729, L""},
- {24, 264, 2732, L"--"},
- {24, 264, 3292, L""},
- {24, 264, 2730, L""},
- {24, 264, 1444, L""},
- {24, 264, 1445, L""},
- {24, 264, 3231, L""},
- {24, 264, 2216, L""},
- {24, 268, 2781, L""},
- {24, 268, 1469, L""},
- {24, 268, 2784, L""},
- {24, 268, 2773, L""},
- {24, 268, 2774, L""},
- {24, 268, 3122, L""},
- {24, 268, 2772, L""},
- {24, 268, 3294, L""},
- {24, 268, 2777, L""},
- {24, 268, 1470, L""},
- {24, 268, 2778, L""},
- {24, 268, 2782, L""},
- {24, 268, 2783, L""},
- {24, 268, 1471, L""},
- {24, 268, 1472, L""},
- {24, 268, 1473, L""},
- {24, 268, 2775, L""},
- {24, 268, 2776, L""},
- {24, 268, 2780, L""},
- {24, 268, 2779, L""},
- {24, 268, 2785, L""},
- {24, 268, 1474, L""},
- {24, 268, 2242, L""},
- {24, 266, 2792, L""},
- {24, 266, 1447, L""},
- {24, 266, 1448, L""},
- {24, 266, 2791, L""},
- {24, 266, 1450, L""},
- {24, 266, 1451, L""},
- {24, 266, 2793, L""},
- {24, 266, 2789, L"-"},
- {24, 266, 2786, L""},
- {24, 266, 1452, L""},
- {24, 266, 2794, L""},
- {24, 266, 2787, L""},
- {24, 266, 1449, L""},
- {24, 266, 2790, L""},
- {24, 266, 1453, L""},
- {24, 266, 2788, L""},
- {24, 266, 1454, L""},
- {24, 266, 1455, L"-"},
- {24, 266, 2908, L""},
- {24, 266, 1456, L"-"},
- {24, 266, 1457, L"-"},
- {24, 266, 1458, L""},
- {24, 266, 1459, L""},
- {24, 266, 2795, L""},
- {24, 266, 2229, L""},
- {24, 267, 2737, L"-"},
- {24, 267, 2740, L""},
- {24, 267, 2746, L""},
- {24, 267, 2739, L""},
- {24, 267, 2742, L""},
- {24, 267, 1460, L""},
- {24, 267, 1461, L""},
- {24, 267, 2738, L"-"},
- {24, 267, 2745, L""},
- {24, 267, 1462, L""},
- {24, 267, 1463, L""},
- {24, 267, 1464, L""},
- {24, 267, 2744, L""},
- {24, 267, 3358, L""},
- {24, 267, 1465, L""},
- {24, 267, 1466, L""},
- {24, 267, 2743, L""},
- {24, 267, 2741, L""},
- {24, 267, 1467, L""},
- {24, 267, 1468, L""},
- {24, 267, 2236, L""},
- {24, 269, 1475, L""},
- {24, 269, 1476, L""},
- {24, 269, 1477, L""},
- {24, 269, 2750, L""},
- {24, 269, 1478, L""},
- {24, 269, 2752, L""},
- {24, 269, 2751, L""},
- {24, 269, 3107, L""},
- {24, 269, 2753, L""},
- {24, 269, 2755, L""},
- {24, 269, 1479, L""},
- {24, 269, 2759, L""},
- {24, 269, 2756, L""},
- {24, 269, 2758, L""},
- {24, 269, 2757, L""},
- {24, 269, 2754, L""},
- {24, 269, 2252, L""},
- {24, 270, 2733, L""},
- {24, 270, 1480, L""},
- {24, 270, 1481, L""},
- {24, 270, 2735, L""},
- {24, 270, 1482, L""},
- {24, 270, 2734, L""},
- {24, 270, 2736, L""},
- {24, 270, 2253, L""},
- {24, 272, 1488, L""},
- {24, 272, 1489, L" "},
- {24, 272, 3295, L""},
- {24, 272, 1491, L""},
- {24, 272, 1492, L""},
- {24, 272, 1493, L""},
- {24, 272, 1490, L""},
- {24, 272, 2273, L""},
- {24, 276, 2803, L""},
- {24, 276, 2799, L""},
- {24, 276, 1499, L""},
- {24, 276, 2801, L""},
- {24, 276, 2800, L""},
- {24, 276, 2802, L"-"},
- {24, 276, 2798, L""},
- {24, 276, 2796, L""},
- {24, 276, 1498, L""},
- {24, 276, 2797, L""},
- {24, 276, 2285, L""},
- {24, 262, 1438, L""},
- {24, 262, 2213, L""},
- {24, 271, 3233, L""},
- {24, 271, 1485, L""},
- {24, 271, 1487, L""},
- {24, 271, 1483, L""},
- {24, 271, 1484, L""},
- {24, 271, 1486, L""},
- {24, 271, 2269, L""},
- {24, 274, 1495, L"-"},
- {24, 274, 2279, L""},
- {24, 277, 1500, L""},
- {24, 277, 2288, L""},
- {24, 278, 2668, L""},
- {24, 278, 2667, L""},
- {24, 278, 1524, L""},
- {24, 278, 2669, L""},
- {24, 278, 2666, L""},
- {24, 278, 2671, L""},
- {24, 278, 1525, L""},
- {24, 278, 2670, L""},
- {24, 278, 2672, L""},
- {24, 278, 2243, L""},
- {24, 279, 1526, L""},
- {24, 279, 1527, L""},
- {24, 279, 2691, L""},
- {24, 279, 1528, L""},
- {24, 279, 2924, L""},
- {24, 279, 2707, L""},
- {24, 279, 1529, L""},
- {24, 279, 2698, L" "},
- {24, 279, 1530, L" "},
- {24, 279, 1531, L" "},
- {24, 279, 1532, L" "},
- {24, 279, 2696, L" "},
- {24, 279, 2692, L""},
- {24, 279, 2706, L""},
- {24, 279, 2709, L""},
- {24, 279, 1533, L""},
- {24, 279, 1534, L""},
- {24, 279, 1535, L""},
- {24, 279, 1536, L""},
- {24, 279, 1537, L"-"},
- {24, 279, 1538, L""},
- {24, 279, 2708, L""},
- {24, 279, 1539, L""},
- {24, 279, 2712, L""},
- {24, 279, 1540, L""},
- {24, 279, 2694, L""},
- {24, 279, 2693, L""},
- {24, 279, 1541, L""},
- {24, 279, 2711, L""},
- {24, 279, 2713, L""},
- {24, 279, 1542, L""},
- {24, 279, 2702, L" "},
- {24, 279, 1543, L" "},
- {24, 279, 2695, L" "},
- {24, 279, 2697, L" "},
- {24, 279, 2699, L" "},
- {24, 279, 2909, L""},
- {24, 279, 1544, L""},
- {24, 279, 1545, L""},
- {24, 279, 1546, L""},
- {24, 279, 1547, L""},
- {24, 279, 3296, L""},
- {24, 279, 2700, L""},
- {24, 279, 1548, L""},
- {24, 279, 2710, L""},
- {24, 279, 2701, L" "},
- {24, 279, 2703, L""},
- {24, 279, 1549, L""},
- {24, 279, 2704, L""},
- {24, 279, 2705, L""},
- {24, 279, 2265, L""},
- {24, 280, 1550, L""},
- {24, 280, 1551, L""},
- {24, 280, 3326, L""},
- {24, 280, 1552, L""},
- {24, 280, 1553, L""},
- {24, 280, 2748, L""},
- {24, 280, 2276, L""},
- {24, 282, 1564, L""},
- {24, 282, 2723, L""},
- {24, 282, 2724, L""},
- {24, 282, 2716, L" "},
- {24, 282, 3297, L""},
- {24, 282, 2725, L""},
- {24, 282, 1565, L""},
- {24, 282, 2722, L""},
- {24, 282, 1566, L""},
- {24, 282, 2718, L""},
- {24, 282, 2720, L"-"},
- {24, 282, 1567, L""},
- {24, 282, 2721, L""},
- {24, 282, 2715, L""},
- {24, 282, 1568, L""},
- {24, 282, 1569, L""},
- {24, 282, 1570, L""},
- {24, 282, 2726, L""},
- {24, 282, 2717, L""},
- {24, 282, 3100, L""},
- {24, 282, 1571, L""},
- {24, 282, 2719, L""},
- {24, 282, 2727, L""},
- {24, 282, 1572, L""},
- {24, 282, 3332, L""},
- {24, 282, 1573, L""},
- {24, 282, 1574, L"-"},
- {24, 282, 1575, L""},
- {24, 282, 1576, L""},
- {24, 282, 1577, L""},
- {24, 282, 2714, L""},
- {24, 282, 2283, L""},
- {24, 281, 2749, L""},
- {24, 281, 1554, L""},
- {24, 281, 1555, L""},
- {24, 281, 1556, L""},
- {24, 281, 1561, L""},
- {24, 281, 1562, L""},
- {24, 281, 1559, L""},
- {24, 281, 2852, L""},
- {24, 281, 2853, L""},
- {24, 281, 2854, L"-"},
- {24, 281, 1560, L""},
- {24, 281, 1563, L""},
- {24, 281, 2747, L""},
- {24, 281, 1557, L""},
- {24, 281, 1558, L"-"},
- {24, 281, 3344, L""},
- {24, 281, 2282, L""},
- {24, 283, 3298, L""},
- {24, 283, 1578, L""},
- {24, 283, 2856, L""},
- {24, 283, 1579, L""},
- {24, 283, 1580, L" "},
- {24, 283, 1581, L""},
- {24, 283, 1582, L""},
- {24, 283, 1583, L""},
- {24, 283, 2289, L""},
- {24, 284, 1625, L""},
- {24, 284, 1626, L""},
- {24, 284, 2172, L""},
- {24, 284, 2173, L""},
- {24, 284, 1627, L""},
- {24, 284, 2174, L""},
- {24, 284, 2175, L" "},
- {24, 284, 1628, L" "},
- {24, 284, 1629, L""},
- {24, 284, 2221, L""},
- {24, 285, 1630, L""},
- {24, 285, 3283, L""},
- {24, 285, 1631, L""},
- {24, 285, 2013, L""},
- {24, 285, 2015, L""},
- {24, 285, 1632, L""},
- {24, 285, 1633, L""},
- {24, 285, 1634, L""},
- {24, 285, 2016, L""},
- {24, 285, 2018, L""},
- {24, 285, 2017, L""},
- {24, 285, 2020, L""},
- {24, 285, 2014, L""},
- {24, 285, 2010, L""},
- {24, 285, 2012, L""},
- {24, 285, 2011, L""},
- {24, 285, 2019, L""},
- {24, 285, 2210, L""},
- {24, 286, 1635, L""},
- {24, 286, 1636, L""},
- {24, 286, 2021, L""},
- {24, 286, 1637, L""},
- {24, 286, 2022, L""},
- {24, 286, 1638, L"-"},
- {24, 286, 2023, L""},
- {24, 286, 2031, L""},
- {24, 286, 2024, L""},
- {24, 286, 1639, L""},
- {24, 286, 1640, L""},
- {24, 286, 2026, L""},
- {24, 286, 3299, L" "},
- {24, 286, 2033, L""},
- {24, 286, 2025, L""},
- {24, 286, 1641, L""},
- {24, 286, 1642, L""},
- {24, 286, 2027, L""},
- {24, 286, 2211, L""},
- {24, 286, 2028, L""},
- {24, 286, 2032, L""},
- {24, 286, 2029, L""},
- {24, 286, 1643, L""},
- {24, 286, 2030, L"-"},
- {24, 286, 2212, L""},
- {24, 287, 1644, L""},
- {24, 287, 1645, L""},
- {24, 287, 1646, L""},
- {24, 287, 1647, L""},
- {24, 287, 1648, L""},
- {24, 287, 2178, L""},
- {24, 287, 2176, L""},
- {24, 287, 1649, L""},
- {24, 287, 2177, L""},
- {24, 287, 2180, L""},
- {24, 287, 1650, L""},
- {24, 287, 2181, L""},
- {24, 287, 1651, L""},
- {24, 287, 2179, L""},
- {24, 287, 2182, L""},
- {24, 287, 2224, L""},
- {24, 288, 1652, L""},
- {24, 288, 2036, L" "},
- {24, 288, 1657, L""},
- {24, 288, 1653, L""},
- {24, 288, 1656, L""},
- {24, 288, 2040, L""},
- {24, 288, 2037, L""},
- {24, 288, 2043, L""},
- {24, 288, 3300, L""},
- {24, 288, 2039, L""},
- {24, 288, 2038, L""},
- {24, 288, 2042, L""},
- {24, 288, 2044, L""},
- {24, 288, 1655, L""},
- {24, 288, 2034, L""},
- {24, 288, 1654, L""},
- {24, 288, 2041, L""},
- {24, 288, 2035, L""},
- {24, 288, 2227, L""},
- {24, 289, 2050, L""},
- {24, 289, 2051, L""},
- {24, 289, 3301, L""},
- {24, 289, 2052, L""},
- {24, 289, 1660, L""},
- {24, 289, 1658, L""},
- {24, 289, 2046, L""},
- {24, 289, 1661, L""},
- {24, 289, 2053, L""},
- {24, 289, 2049, L""},
- {24, 289, 1659, L""},
- {24, 289, 2054, L""},
- {24, 289, 2055, L""},
- {24, 289, 2047, L""},
- {24, 289, 1662, L""},
- {24, 289, 2057, L""},
- {24, 289, 2056, L"-"},
- {24, 289, 2045, L""},
- {24, 289, 1663, L""},
- {24, 289, 2131, L""},
- {24, 289, 2048, L""},
- {24, 289, 2233, L""},
- {24, 290, 1664, L""},
- {24, 290, 1665, L""},
- {24, 290, 1666, L""},
- {24, 290, 2059, L""},
- {24, 290, 1667, L""},
- {24, 290, 3302, L"--"},
- {24, 290, 1668, L""},
- {24, 290, 2060, L""},
- {24, 290, 1669, L""},
- {24, 290, 2061, L""},
- {24, 290, 2062, L""},
- {24, 290, 2058, L""},
- {24, 290, 1670, L""},
- {24, 290, 2240, L""},
- {24, 291, 1671, L"-"},
- {24, 291, 1673, L""},
- {24, 291, 3279, L""},
- {24, 291, 1672, L""},
- {24, 291, 2187, L""},
- {24, 291, 2188, L""},
- {24, 291, 2184, L""},
- {24, 291, 2185, L""},
- {24, 291, 2183, L""},
- {24, 291, 2189, L""},
- {24, 291, 2186, L""},
- {24, 291, 2244, L""},
- {24, 292, 2194, L""},
- {24, 292, 2193, L""},
- {24, 292, 1674, L""},
- {24, 292, 2190, L""},
- {24, 292, 2195, L""},
- {24, 292, 1675, L""},
- {24, 292, 2192, L""},
- {24, 292, 2191, L""},
- {24, 292, 2245, L""},
- {24, 293, 1733, L""},
- {24, 293, 1732, L""},
- {24, 293, 1731, L""},
- {24, 293, 1730, L""},
- {24, 293, 2063, L""},
- {24, 293, 2064, L""},
- {24, 293, 1729, L""},
- {24, 293, 1728, L""},
- {24, 293, 1727, L""},
- {24, 293, 2065, L""},
- {24, 293, 1726, L""},
- {24, 293, 1725, L""},
- {24, 293, 1724, L""},
- {24, 293, 1723, L""},
- {24, 293, 2066, L""},
- {24, 293, 1722, L""},
- {24, 293, 1721, L""},
- {24, 293, 1720, L""},
- {24, 293, 1719, L""},
- {24, 293, 2067, L""},
- {24, 293, 1718, L""},
- {24, 293, 1715, L""},
- {24, 293, 1717, L""},
- {24, 293, 2068, L""},
- {24, 293, 2069, L""},
- {24, 293, 1716, L""},
- {24, 293, 1714, L""},
- {24, 293, 1713, L""},
- {24, 293, 1712, L""},
- {24, 293, 1711, L""},
- {24, 293, 1710, L""},
- {24, 293, 2070, L""},
- {24, 293, 2071, L""},
- {24, 293, 1709, L"-"},
- {24, 293, 1708, L""},
- {24, 293, 2072, L"-"},
- {24, 293, 1707, L""},
- {24, 293, 1706, L""},
- {24, 293, 1705, L""},
- {24, 293, 1704, L""},
- {24, 293, 1703, L""},
- {24, 293, 1702, L""},
- {24, 293, 1701, L"-"},
- {24, 293, 1700, L""},
- {24, 293, 1698, L""},
- {24, 293, 2073, L""},
- {24, 293, 2074, L""},
- {24, 293, 1699, L"-"},
- {24, 293, 1697, L" "},
- {24, 293, 1696, L""},
- {24, 293, 1695, L""},
- {24, 293, 1694, L""},
- {24, 293, 1693, L""},
- {24, 293, 1692, L""},
- {24, 293, 1691, L""},
- {24, 293, 1690, L""},
- {24, 293, 2075, L""},
- {24, 293, 2076, L""},
- {24, 293, 1689, L" "},
- {24, 293, 1688, L""},
- {24, 293, 1687, L""},
- {24, 293, 1686, L""},
- {24, 293, 2077, L""},
- {24, 293, 2078, L""},
- {24, 293, 1685, L""},
- {24, 293, 1684, L""},
- {24, 293, 1683, L""},
- {24, 293, 1682, L""},
- {24, 293, 1681, L""},
- {24, 293, 1680, L""},
- {24, 293, 1679, L""},
- {24, 293, 1678, L""},
- {24, 293, 2080, L""},
- {24, 293, 1677, L""},
- {24, 293, 1676, L""},
- {24, 293, 2079, L""},
- {24, 293, 3031, L""},
- {24, 293, 2081, L""},
- {24, 293, 2249, L""},
- {24, 294, 2083, L""},
- {24, 294, 2082, L"-"},
- {24, 294, 3160, L""},
- {24, 294, 1736, L""},
- {24, 294, 2084, L""},
- {24, 294, 1737, L""},
- {24, 294, 2085, L""},
- {24, 294, 1735, L""},
- {24, 294, 2255, L""},
- {24, 295, 1740, L"-"},
- {24, 295, 1741, L""},
- {24, 295, 2086, L""},
- {24, 295, 2087, L""},
- {24, 295, 2089, L""},
- {24, 295, 2091, L""},
- {24, 295, 2093, L""},
- {24, 295, 1738, L""},
- {24, 295, 3305, L""},
- {24, 295, 1739, L""},
- {24, 295, 2090, L""},
- {24, 295, 2088, L"-"},
- {24, 295, 2092, L"-"},
- {24, 295, 2094, L""},
- {24, 295, 3320, L""},
- {24, 295, 2260, L""},
- {24, 296, 2095, L""},
- {24, 296, 1743, L""},
- {24, 296, 1744, L""},
- {24, 296, 2096, L""},
- {24, 296, 1745, L""},
- {24, 296, 1746, L""},
- {24, 296, 2097, L""},
- {24, 296, 2098, L""},
- {24, 296, 2099, L""},
- {24, 296, 2100, L""},
- {24, 296, 2101, L""},
- {24, 296, 1747, L""},
- {24, 296, 1742, L""},
- {24, 296, 2102, L""},
- {24, 296, 1748, L""},
- {24, 296, 2267, L""},
- {24, 297, 2198, L""},
- {24, 297, 2199, L""},
- {24, 297, 1752, L""},
- {24, 297, 1751, L""},
- {24, 297, 2196, L""},
- {24, 297, 1750, L""},
- {24, 297, 3271, L""},
- {24, 297, 1749, L""},
- {24, 297, 3272, L""},
- {24, 297, 2197, L""},
- {24, 297, 2270, L""},
- {24, 298, 2103, L""},
- {24, 298, 2104, L""},
- {24, 298, 2105, L""},
- {24, 298, 2106, L""},
- {24, 298, 2107, L""},
- {24, 298, 1753, L" "},
- {24, 298, 2108, L" "},
- {24, 298, 2109, L""},
- {24, 298, 2110, L""},
- {24, 298, 2111, L""},
- {24, 298, 1758, L""},
- {24, 298, 1756, L""},
- {24, 298, 2112, L" "},
- {24, 298, 1759, L""},
- {24, 298, 1760, L""},
- {24, 298, 1761, L""},
- {24, 298, 2113, L""},
- {24, 298, 1757, L""},
- {24, 298, 2114, L""},
- {24, 298, 1754, L""},
- {24, 298, 2115, L""},
- {24, 298, 2116, L""},
- {24, 298, 1755, L""},
- {24, 298, 2272, L""},
- {24, 299, 2127, L""},
- {24, 299, 2126, L""},
- {24, 299, 2118, L""},
- {24, 299, 2122, L""},
- {24, 299, 2129, L""},
- {24, 299, 1762, L""},
- {24, 299, 2128, L""},
- {24, 299, 3354, L""},
- {24, 299, 2124, L""},
- {24, 299, 1763, L""},
- {24, 299, 2123, L""},
- {24, 299, 1764, L""},
- {24, 299, 2117, L""},
- {24, 299, 2130, L"-"},
- {24, 299, 2120, L""},
- {24, 299, 2119, L""},
- {24, 299, 2125, L""},
- {24, 299, 1765, L""},
- {24, 299, 1766, L""},
- {24, 299, 2121, L""},
- {24, 299, 1767, L""},
- {24, 299, 2274, L""},
- {24, 300, 3053, L" "},
- {24, 300, 3268, L""},
- {24, 300, 1773, L"-"},
- {24, 300, 2132, L""},
- {24, 300, 3269, L" "},
- {24, 300, 2133, L""},
- {24, 300, 3270, L""},
- {24, 300, 1774, L""},
- {24, 300, 2994, L""},
- {24, 300, 1775, L"-"},
- {24, 300, 2134, L""},
- {24, 300, 1769, L""},
- {24, 300, 1771, L""},
- {24, 300, 1772, L""},
- {24, 300, 1770, L""},
- {24, 300, 1768, L""},
- {24, 300, 2290, L""},
- {24, 301, 2849, L""},
- {24, 301, 1776, L""},
- {24, 301, 2214, L""},
- {24, 304, 2617, L""},
- {24, 304, 1791, L""},
- {24, 304, 1788, L""},
- {24, 304, 2619, L""},
- {24, 304, 1789, L""},
- {24, 304, 2618, L""},
- {24, 304, 1790, L""},
- {24, 304, 1792, L""},
- {24, 304, 2620, L""},
- {24, 304, 2225, L""},
- {24, 305, 3052, L""},
- {24, 305, 1787, L""},
- {24, 305, 2228, L""},
- {24, 306, 2621, L""},
- {24, 306, 1794, L""},
- {24, 306, 1793, L""},
- {24, 306, 2622, L""},
- {24, 306, 1795, L""},
- {24, 306, 2623, L""},
- {24, 306, 2624, L""},
- {24, 306, 3274, L""},
- {24, 306, 2230, L""},
- {24, 307, 2567, L""},
- {24, 307, 2568, L""},
- {24, 307, 3324, L""},
- {24, 307, 1796, L""},
- {24, 307, 2232, L""},
- {24, 308, 1799, L""},
- {24, 308, 1798, L""},
- {24, 308, 2626, L""},
- {24, 308, 2625, L"-"},
- {24, 308, 1797, L""},
- {24, 308, 2235, L""},
- {24, 311, 2630, L""},
- {24, 311, 2631, L""},
- {24, 311, 2628, L""},
- {24, 311, 1839, L""},
- {24, 311, 2629, L""},
- {24, 311, 2627, L""},
- {24, 311, 2266, L""},
- {24, 313, 2632, L""},
- {24, 313, 1853, L""},
- {24, 313, 2633, L""},
- {24, 313, 2284, L""},
- {24, 309, 2636, L""},
- {24, 309, 1800, L""},
- {24, 309, 1801, L""},
- {24, 309, 1802, L""},
- {24, 309, 1803, L""},
- {24, 309, 1804, L""},
- {24, 309, 1805, L" "},
- {24, 309, 2637, L""},
- {24, 309, 1806, L""},
- {24, 309, 1807, L""},
- {24, 309, 2638, L""},
- {24, 309, 1808, L""},
- {24, 309, 1809, L""},
- {24, 309, 1810, L""},
- {24, 309, 1811, L""},
- {24, 309, 3232, L""},
- {24, 309, 2639, L""},
- {24, 309, 1812, L""},
- {24, 309, 1813, L""},
- {24, 309, 1814, L"-"},
- {24, 309, 3102, L""},
- {24, 309, 1815, L"--"},
- {24, 309, 1816, L""},
- {24, 309, 3266, L""},
- {24, 309, 3039, L""},
- {24, 309, 1817, L""},
- {24, 309, 2635, L""},
- {24, 309, 1818, L""},
- {24, 309, 1819, L""},
- {24, 309, 1820, L"-"},
- {24, 309, 2634, L""},
- {24, 309, 2241, L""},
- {24, 312, 1840, L""},
- {24, 312, 2644, L""},
- {24, 312, 1841, L""},
- {24, 312, 1842, L""},
- {24, 312, 1843, L""},
- {24, 312, 1844, L""},
- {24, 312, 2647, L""},
- {24, 312, 2641, L""},
- {24, 312, 2642, L""},
- {24, 312, 1845, L""},
- {24, 312, 1846, L""},
- {24, 312, 3367, L""},
- {24, 312, 3265, L""},
- {24, 312, 1847, L""},
- {24, 312, 1848, L" "},
- {24, 312, 1849, L""},
- {24, 312, 2645, L""},
- {24, 312, 2643, L""},
- {24, 312, 1850, L""},
- {24, 312, 1851, L""},
- {24, 312, 1852, L""},
- {24, 312, 2646, L""},
- {24, 312, 2640, L""},
- {24, 312, 2268, L""},
- {24, 302, 1777, L""},
- {24, 302, 1778, L""},
- {24, 302, 3383, L""},
- {24, 302, 2578, L""},
- {24, 302, 2579, L""},
- {24, 302, 1786, L""},
- {24, 302, 2219, L""},
- {24, 303, 1779, L""},
- {24, 303, 1780, L""},
- {24, 303, 2584, L""},
- {24, 303, 1781, L""},
- {24, 303, 1782, L"--"},
- {24, 303, 1783, L""},
- {24, 303, 2588, L""},
- {24, 303, 2591, L""},
- {24, 303, 2587, L""},
- {24, 303, 2582, L""},
- {24, 303, 2590, L""},
- {24, 303, 1784, L""},
- {24, 303, 2581, L""},
- {24, 303, 2583, L""},
- {24, 303, 2580, L" "},
- {24, 303, 2589, L""},
- {24, 303, 2585, L""},
- {24, 303, 1785, L""},
- {24, 303, 2586, L""},
- {24, 303, 2223, L""},
- {24, 310, 1821, L""},
- {24, 310, 1822, L""},
- {24, 310, 1823, L""},
- {24, 310, 1824, L""},
- {24, 310, 1825, L" "},
- {24, 310, 1826, L""},
- {24, 310, 1827, L""},
- {24, 310, 2651, L""},
- {24, 310, 1828, L""},
- {24, 310, 3264, L""},
- {24, 310, 2652, L"-"},
- {24, 310, 2649, L""},
- {24, 310, 2648, L" "},
- {24, 310, 1829, L""},
- {24, 310, 2653, L""},
- {24, 310, 1830, L""},
- {24, 310, 1831, L""},
- {24, 310, 1832, L""},
- {24, 310, 1833, L"--"},
- {24, 310, 1834, L""},
- {24, 310, 1835, L""},
- {24, 310, 1836, L""},
- {24, 310, 1837, L"-"},
- {24, 310, 3263, L""},
- {24, 310, 2650, L""},
- {24, 310, 1838, L""},
- {24, 310, 2259, L""},
- {139, 407, 407, L" "},
- {139, 426, 427, L""},
- {139, 426, 2354, L""},
- {139, 378, 3109, L" "},
- {139, 378, 379, L"-"},
- {139, 378, 2963, L""},
- {139, 378, 2355, L""},
- {139, 412, 3236, L""},
- {139, 412, 413, L""},
- {139, 412, 1181, L""},
- {139, 412, 2356, L""},
- {139, 446, 1182, L""},
- {139, 446, 447, L""},
- {139, 446, 1183, L""},
- {139, 446, 2357, L""},
- {139, 434, 2917, L""},
- {139, 434, 1184, L""},
- {139, 434, 435, L""},
- {139, 434, 3061, L""},
- {139, 434, 2358, L""},
- {139, 416, 417, L"-"},
- {139, 416, 2359, L""},
- {139, 428, 3017, L""},
- {139, 428, 429, L""},
- {139, 428, 2360, L""},
- {139, 440, 2956, L""},
- {139, 440, 2967, L""},
- {139, 440, 3385, L""},
- {139, 440, 2865, L""},
- {139, 440, 441, L""},
- {139, 440, 3352, L" "},
- {139, 440, 2876, L""},
- {139, 440, 3003, L""},
- {139, 440, 1185, L""},
- {139, 440, 2983, L""},
- {139, 440, 1186, L""},
- {139, 440, 3152, L" "},
- {139, 440, 2886, L""},
- {139, 440, 2361, L""},
- {139, 352, 353, L""},
- {139, 352, 2861, L""},
- {139, 352, 2362, L""},
- {139, 394, 1188, L""},
- {139, 394, 1187, L""},
- {139, 394, 2969, L""},
- {139, 394, 1189, L""},
- {139, 394, 3114, L""},
- {139, 394, 2885, L"-"},
- {139, 394, 2979, L" "},
- {139, 394, 3338, L""},
- {139, 394, 395, L""},
- {139, 394, 3005, L""},
- {139, 394, 2991, L""},
- {139, 394, 2996, L""},
- {139, 394, 3097, L""},
- {139, 394, 2981, L""},
- {139, 394, 2363, L""},
- {139, 374, 2995, L"-"},
- {139, 374, 375, L""},
- {139, 374, 2365, L""},
- {139, 448, 449, L""},
- {139, 448, 1191, L""},
- {139, 448, 2367, L""},
- {139, 390, 3021, L""},
- {139, 390, 391, L""},
- {139, 390, 2973, L""},
- {139, 390, 2369, L""},
- {139, 402, 403, L""},
- {139, 402, 2370, L""},
- {139, 396, 397, L""},
- {139, 396, 2371, L""},
- {139, 370, 2911, L""},
- {139, 370, 3074, L""},
- {139, 370, 371, L""},
- {139, 370, 2930, L""},
- {139, 370, 1194, L""},
- {139, 370, 2372, L""},
- {139, 368, 369, L""},
- {139, 368, 1195, L""},
- {139, 368, 2373, L""},
- {139, 444, 2959, L""},
- {139, 444, 2961, L""},
- {139, 444, 2912, L""},
- {139, 444, 2899, L" "},
- {139, 444, 1196, L""},
- {139, 444, 3249, L""},
- {139, 444, 3014, L""},
- {139, 444, 3048, L""},
- {139, 444, 2901, L"-"},
- {139, 444, 2926, L" "},
- {139, 444, 2922, L""},
- {139, 444, 1203, L""},
- {139, 444, 2978, L""},
- {139, 444, 2990, L""},
- {139, 444, 3077, L""},
- {139, 444, 2918, L""},
- {139, 444, 2881, L""},
- {139, 444, 3247, L""},
- {139, 444, 3092, L" "},
- {139, 444, 2948, L""},
- {139, 444, 1197, L"-"},
- {139, 444, 1198, L"-"},
- {139, 444, 3058, L"-"},
- {139, 444, 3328, L"--"},
- {139, 444, 2874, L"-"},
- {139, 444, 2998, L""},
- {139, 444, 3087, L""},
- {139, 444, 2947, L""},
- {139, 444, 2900, L" "},
- {139, 444, 1199, L""},
- {139, 444, 3335, L""},
- {139, 444, 2966, L""},
- {139, 444, 445, L""},
- {139, 444, 1200, L"-"},
- {139, 444, 3317, L"-"},
- {139, 444, 1201, L"-"},
- {139, 444, 1202, L"-"},
- {139, 444, 2878, L""},
- {139, 444, 2925, L"-"},
- {139, 444, 2875, L"-"},
- {139, 444, 1204, L"-"},
- {139, 444, 2859, L"-"},
- {139, 444, 3157, L" "},
- {139, 444, 3146, L""},
- {139, 444, 2970, L" "},
- {139, 444, 2949, L"-"},
- {139, 444, 3057, L" "},
- {139, 444, 3032, L"-"},
- {139, 444, 3381, L""},
- {139, 444, 3028, L""},
- {139, 444, 2858, L""},
- {139, 444, 3040, L""},
- {139, 444, 2374, L""},
- {139, 388, 3041, L""},
- {139, 388, 389, L""},
- {139, 388, 2375, L""},
- {139, 408, 3004, L""},
- {139, 408, 1205, L""},
- {139, 408, 409, L""},
- {139, 408, 2376, L""},
- {139, 430, 1206, L""},
- {139, 430, 3095, L""},
- {139, 430, 431, L""},
- {139, 430, 1207, L"-"},
- {139, 430, 3046, L""},
- {139, 430, 2377, L""},
- {139, 358, 2968, L""},
- {139, 358, 3018, L""},
- {139, 358, 2882, L""},
- {139, 358, 359, L""},
- {139, 358, 3047, L""},
- {139, 358, 2378, L""},
- {139, 418, 419, L"-"},
- {139, 418, 1208, L" "},
- {139, 418, 2408, L""},
- {139, 354, 2931, L""},
- {139, 354, 3334, L""},
- {139, 354, 355, L""},
- {139, 354, 3059, L""},
- {139, 354, 2919, L""},
- {139, 354, 2902, L""},
- {139, 354, 1209, L""},
- {139, 354, 3336, L""},
- {139, 354, 2985, L""},
- {139, 354, 3022, L""},
- {139, 354, 2407, L""},
- {139, 376, 1210, L""},
- {139, 376, 2980, L""},
- {139, 376, 377, L"-"},
- {139, 376, 3035, L" "},
- {139, 376, 2406, L""},
- {139, 414, 415, L""},
- {139, 414, 2405, L""},
- {139, 380, 381, L"-"},
- {139, 380, 3062, L" "},
- {139, 380, 3038, L" "},
- {139, 380, 1211, L"-"},
- {139, 380, 2895, L""},
- {139, 380, 2404, L""},
- {139, 372, 3357, L" "},
- {139, 372, 1212, L"-"},
- {139, 372, 1213, L""},
- {139, 372, 3103, L""},
- {139, 372, 373, L""},
- {139, 372, 2987, L""},
- {139, 372, 2887, L""},
- {139, 372, 2403, L""},
- {139, 424, 1214, L"-"},
- {139, 424, 425, L""},
- {139, 424, 2402, L""},
- {139, 348, 349, L""},
- {139, 348, 3000, L""},
- {139, 348, 2401, L""},
- {139, 392, 393, L""},
- {139, 392, 1215, L""},
- {139, 392, 3143, L""},
- {139, 392, 3337, L" "},
- {139, 392, 2904, L" "},
- {139, 392, 3329, L""},
- {139, 392, 2400, L""},
- {139, 386, 387, L""},
- {139, 386, 1216, L""},
- {139, 386, 2399, L""},
- {139, 438, 439, L"-"},
- {139, 438, 1217, L"-"},
- {139, 438, 2890, L""},
- {139, 438, 2398, L""},
- {139, 362, 1219, L"-"},
- {139, 362, 1218, L""},
- {139, 362, 3276, L""},
- {139, 362, 3073, L""},
- {139, 362, 2955, L""},
- {139, 362, 3349, L""},
- {139, 362, 363, L""},
- {139, 362, 3078, L""},
- {139, 362, 3248, L" "},
- {139, 362, 2397, L""},
- {139, 360, 3134, L""},
- {139, 360, 3081, L""},
- {139, 360, 2997, L""},
- {139, 360, 2999, L""},
- {139, 360, 3139, L""},
- {139, 360, 3060, L""},
- {139, 360, 1220, L"-"},
- {139, 360, 361, L""},
- {139, 360, 2914, L""},
- {139, 360, 3056, L" "},
- {139, 360, 2396, L""},
- {139, 432, 1222, L""},
- {139, 432, 433, L"-"},
- {139, 432, 2395, L""},
- {139, 350, 2989, L""},
- {139, 350, 351, L""},
- {139, 350, 2950, L""},
- {139, 350, 1221, L""},
- {139, 350, 3111, L""},
- {139, 350, 2898, L""},
- {139, 350, 2938, L""},
- {139, 350, 2394, L""},
- {139, 366, 2953, L""},
- {139, 366, 3112, L" "},
- {139, 366, 1223, L""},
- {139, 366, 367, L""},
- {139, 366, 2951, L""},
- {139, 366, 2862, L""},
- {139, 366, 3034, L""},
- {139, 366, 2860, L""},
- {139, 366, 2393, L""},
- {139, 420, 421, L"-"},
- {139, 420, 1224, L""},
- {139, 420, 2392, L""},
- {139, 442, 2877, L"-"},
- {139, 442, 2945, L"-"},
- {139, 442, 1225, L""},
- {139, 442, 443, L""},
- {139, 442, 1226, L""},
- {139, 442, 2391, L""},
- {139, 364, 3316, L""},
- {139, 364, 3282, L""},
- {139, 364, 2972, L" "},
- {139, 364, 1227, L""},
- {139, 364, 2893, L""},
- {139, 364, 3110, L" "},
- {139, 364, 1228, L""},
- {139, 364, 365, L""},
- {139, 364, 2390, L""},
- {139, 450, 451, L""},
- {139, 450, 3093, L"-"},
- {139, 450, 2389, L""},
- {139, 356, 357, L""},
- {139, 356, 2388, L""},
- {139, 382, 383, L""},
- {139, 382, 2387, L""},
- {139, 398, 2960, L""},
- {139, 398, 2915, L""},
- {139, 398, 399, L""},
- {139, 398, 2386, L""},
- {139, 410, 2863, L""},
- {139, 410, 411, L""},
- {139, 410, 1229, L""},
- {139, 410, 2385, L""},
- {139, 422, 3085, L""},
- {139, 422, 2913, L""},
- {139, 422, 1233, L""},
- {139, 422, 2916, L""},
- {139, 422, 3123, L""},
- {139, 422, 2873, L""},
- {139, 422, 3096, L" "},
- {139, 422, 423, L""},
- {139, 422, 1232, L"-"},
- {139, 422, 3023, L""},
- {139, 422, 1231, L""},
- {139, 422, 1230, L"-"},
- {139, 422, 2384, L""},
- {139, 406, 2383, L""},
- {139, 404, 2879, L"-"},
- {139, 404, 2880, L""},
- {139, 404, 3086, L""},
- {139, 404, 3002, L""},
- {139, 404, 3124, L" "},
- {139, 404, 2894, L"-"},
- {139, 404, 3290, L"-"},
- {139, 404, 1234, L""},
- {139, 404, 1236, L""},
- {139, 404, 3372, L" "},
- {139, 404, 2952, L"-"},
- {139, 404, 3340, L""},
- {139, 404, 1235, L"-"},
- {139, 404, 405, L""},
- {139, 404, 2962, L" "},
- {139, 404, 2382, L""},
- {139, 384, 385, L""},
- {139, 384, 2381, L""},
- {139, 400, 401, L""},
- {139, 400, 3090, L""},
- {139, 400, 1237, L""},
- {139, 400, 2380, L""},
- {139, 436, 3036, L""},
- {139, 436, 3024, L""},
- {139, 436, 3108, L""},
- {139, 436, 2866, L"-"},
- {139, 436, 437, L"--"},
- {139, 436, 2379, L""},
- {39, 315, 614, L""},
- {39, 315, 615, L""},
- {39, 315, 2566, L""},
- {39, 316, 2940, L""},
- {39, 316, 616, L""},
- {39, 316, 2565, L""},
- {39, 317, 617, L""},
- {39, 317, 618, L""},
- {39, 317, 619, L" "},
- {39, 317, 620, L""},
- {39, 317, 621, L""},
- {39, 317, 622, L""},
- {39, 317, 623, L""},
- {39, 317, 2564, L""},
- {39, 318, 624, L""},
- {39, 318, 625, L""},
- {39, 318, 626, L""},
- {39, 318, 627, L""},
- {39, 318, 628, L""},
- {39, 318, 629, L""},
- {39, 318, 630, L""},
- {39, 318, 2944, L""},
- {39, 318, 631, L""},
- {39, 318, 632, L""},
- {39, 318, 633, L""},
- {39, 318, 634, L""},
- {39, 318, 635, L""},
- {39, 318, 2563, L""},
- {39, 319, 636, L""},
- {39, 319, 637, L""},
- {39, 319, 2942, L""},
- {39, 319, 638, L""},
- {39, 319, 2907, L""},
- {39, 319, 639, L"-"},
- {39, 319, 2562, L""},
- {39, 320, 640, L""},
- {39, 320, 641, L""},
- {39, 320, 3119, L""},
- {39, 320, 3162, L""},
- {39, 320, 642, L""},
- {39, 320, 643, L""},
- {39, 320, 2561, L""},
- {39, 321, 644, L""},
- {39, 321, 3128, L""},
- {39, 321, 645, L""},
- {39, 321, 646, L""},
- {39, 321, 3121, L""},
- {39, 321, 3378, L""},
- {39, 321, 2560, L""},
- {39, 322, 3379, L""},
- {39, 322, 647, L"-"},
- {39, 322, 3170, L""},
- {39, 322, 2559, L""},
- {39, 323, 648, L" "},
- {39, 323, 649, L""},
- {39, 323, 651, L""},
- {39, 323, 650, L""},
- {39, 323, 652, L""},
- {39, 323, 3341, L"-"},
- {39, 323, 653, L""},
- {39, 323, 654, L""},
- {39, 323, 655, L""},
- {39, 323, 2558, L""},
- {39, 324, 656, L""},
- {39, 324, 657, L""},
- {39, 324, 658, L""},
- {39, 324, 2557, L""},
- {39, 325, 659, L""},
- {39, 325, 2984, L""},
- {39, 325, 3042, L""},
- {39, 325, 660, L""},
- {39, 325, 662, L""},
- {39, 325, 3382, L""},
- {39, 325, 663, L""},
- {39, 325, 667, L""},
- {39, 325, 666, L""},
- {39, 325, 668, L""},
- {39, 325, 669, L""},
- {39, 325, 665, L""},
- {39, 325, 661, L""},
- {39, 325, 3370, L" "},
- {39, 325, 670, L""},
- {39, 325, 664, L""},
- {39, 325, 3148, L""},
- {39, 325, 671, L""},
- {39, 325, 2556, L""},
- {39, 326, 672, L""},
- {39, 326, 673, L""},
- {39, 326, 674, L""},
- {39, 326, 675, L""},
- {39, 326, 3364, L""},
- {39, 326, 676, L""},
- {39, 326, 677, L""},
- {39, 326, 678, L""},
- {39, 326, 679, L""},
- {39, 326, 680, L""},
- {39, 326, 2555, L""},
- {39, 327, 3284, L""},
- {39, 327, 681, L""},
- {39, 327, 682, L""},
- {39, 327, 2554, L""},
- {39, 328, 3322, L""},
- {39, 328, 2870, L""},
- {39, 328, 683, L""},
- {39, 328, 3118, L""},
- {39, 328, 3325, L""},
- {39, 328, 2553, L""},
- {39, 329, 684, L"-"},
- {39, 329, 685, L""},
- {39, 329, 689, L""},
- {39, 329, 686, L""},
- {39, 329, 688, L""},
- {39, 329, 687, L""},
- {39, 329, 2552, L""},
- {39, 330, 690, L""},
- {39, 330, 691, L""},
- {39, 330, 693, L""},
- {39, 330, 694, L""},
- {39, 330, 695, L""},
- {39, 330, 692, L""},
- {39, 330, 2551, L""},
- {39, 331, 696, L""},
- {39, 331, 697, L""},
- {39, 331, 3361, L""},
- {39, 331, 2550, L""},
- {39, 332, 3356, L""},
- {39, 332, 698, L""},
- {39, 332, 700, L""},
- {39, 332, 699, L""},
- {39, 332, 701, L""},
- {39, 332, 2549, L""},
- {39, 333, 702, L""},
- {39, 333, 3171, L""},
- {39, 333, 703, L""},
- {39, 333, 704, L""},
- {39, 333, 2548, L""},
- {39, 334, 705, L""},
- {39, 334, 3346, L""},
- {39, 334, 3351, L""},
- {39, 334, 706, L""},
- {39, 334, 708, L""},
- {39, 334, 707, L""},
- {39, 334, 709, L""},
- {39, 334, 2547, L""},
- {39, 335, 710, L""},
- {39, 335, 711, L""},
- {39, 335, 712, L" "},
- {39, 335, 3280, L""},
- {39, 335, 713, L""},
- {39, 335, 2546, L""},
- {39, 336, 714, L"-"},
- {39, 336, 715, L""},
- {39, 336, 2941, L""},
- {39, 336, 716, L""},
- {39, 336, 3120, L""},
- {39, 336, 2943, L""},
- {39, 336, 717, L""},
- {39, 336, 3155, L""},
- {39, 336, 2542, L""},
- {39, 337, 3169, L""},
- {39, 337, 3016, L""},
- {39, 337, 3333, L""},
- {39, 337, 718, L""},
- {39, 337, 719, L""},
- {39, 337, 720, L""},
- {39, 337, 2545, L""},
- {39, 338, 721, L""},
- {39, 338, 722, L""},
- {39, 338, 723, L""},
- {39, 338, 2544, L""},
- {39, 339, 724, L""},
- {39, 339, 2543, L""},
- {340, 342, 725, L""},
- {340, 342, 726, L""},
- {340, 342, 727, L""},
- {340, 342, 728, L""},
- {340, 342, 3172, L""},
- {340, 342, 729, L""},
- {340, 342, 730, L""},
- {340, 342, 731, L""},
- {340, 342, 732, L""},
- {340, 342, 2538, L""},
- {340, 343, 733, L""},
- {340, 343, 735, L""},
- {340, 343, 734, L""},
- {340, 343, 736, L""},
- {340, 343, 737, L""},
- {340, 343, 738, L""},
- {340, 343, 2537, L""},
- {340, 344, 739, L""},
- {340, 344, 740, L""},
- {340, 344, 741, L""},
- {340, 344, 742, L""},
- {340, 344, 743, L""},
- {340, 344, 744, L""},
- {340, 344, 2536, L""},
- {340, 345, 745, L""},
- {340, 345, 746, L""},
- {340, 345, 747, L""},
- {340, 345, 3244, L""},
- {340, 345, 748, L""},
- {340, 345, 2535, L""},
- {340, 346, 3149, L""},
- {340, 346, 749, L""},
- {340, 346, 750, L""},
- {340, 346, 751, L""},
- {340, 346, 752, L" "},
- {340, 346, 753, L""},
- {340, 346, 2896, L""},
- {340, 346, 754, L""},
- {340, 346, 755, L""},
- {340, 346, 756, L""},
- {340, 346, 2534, L""},
- {340, 347, 757, L""},
- {340, 347, 758, L""},
- {340, 347, 759, L""},
- {340, 347, 2533, L""},
+ {24, 0, 0, L"Россия"},
+ {81, 0, 0, L"Азербайджан"},
+ {82, 0, 0, L"Армения"},
+ {97, 0, 0, L"Афганистан"},
+ {96, 0, 0, L"Бангладеш"},
+ {99, 0, 0, L"Бахрейн"},
+ {100, 0, 0, L"Бруней-Даруссалам"},
+ {101, 0, 0, L"Бутан"},
+ {102, 0, 0, L"Вьетнам"},
+ {83, 0, 0, L"Грузия"},
+ {86, 0, 0, L"Израиль"},
+ {95, 0, 0, L"Индия"},
+ {103, 0, 0, L"Индонезия"},
+ {79, 0, 0, L"Иордания"},
+ {85, 0, 0, L"Ирак"},
+ {87, 0, 0, L"Иран"},
+ {104, 0, 0, L"Йемен"},
+ {84, 0, 0, L"Казахстан"},
+ {105, 0, 0, L"Камбоджа"},
+ {106, 0, 0, L"Катар"},
+ {107, 0, 0, L"Кипр"},
+ {92, 0, 0, L"Киргизия (Кыргызстан)"},
+ {76, 0, 0, L"Китай"},
+ {3215, 0, 0, L"Кокосовые острова (Австр.)"},
+ {29, 0, 0, L"Корея (КНДР)"},
+ {108, 0, 0, L"Корея"},
+ {88, 0, 0, L"Кувейт"},
+ {109, 0, 0, L"Лаос"},
+ {110, 0, 0, L"Ливан"},
+ {111, 0, 0, L"Малайзия"},
+ {112, 0, 0, L"Мальдивы"},
+ {113, 0, 0, L"Монголия"},
+ {114, 0, 0, L"Мьянма"},
+ {115, 0, 0, L"Непал"},
+ {116, 0, 0, L"Объединенные Арабские Эмираты"},
+ {117, 0, 0, L"Оман"},
+ {3216, 0, 0, L"Остров Рождества (Австр.)"},
+ {122, 0, 0, L"Пакистан"},
+ {89, 0, 0, L"Палестина"},
+ {94, 0, 0, L"Саудовская Аравия"},
+ {118, 0, 0, L"Сингапур"},
+ {78, 0, 0, L"Сирия"},
+ {91, 0, 0, L"Таджикистан"},
+ {119, 0, 0, L"Таиланд"},
+ {120, 0, 0, L"Тайвань"},
+ {132, 0, 0, L"Тимор"},
+ {90, 0, 0, L"Туркмения"},
+ {77, 0, 0, L"Турция"},
+ {93, 0, 0, L"Узбекистан"},
+ {121, 0, 0, L"Филиппины"},
+ {98, 0, 0, L"Шри Ланка"},
+ {75, 0, 0, L"Япония"},
+ {123, 0, 0, L"Австралия"},
+ {454, 0, 0, L"Американское Самоа"},
+ {124, 0, 0, L"Вануату"},
+ {453, 0, 0, L"Гуам (США)"},
+ {126, 0, 0, L"Кирибати"},
+ {127, 0, 0, L"Маршалловы Острова"},
+ {128, 0, 0, L"Микронезия (Федеративные Штаты Микронезии)"},
+ {129, 0, 0, L"Науру"},
+ {3220, 0, 0, L"Ниуэ (Н.Зел.)"},
+ {130, 0, 0, L"Новая Зеландия"},
+ {3218, 0, 0, L"Новая Каледония (Фр.)"},
+ {3221, 0, 0, L"Острова Кука (Н.Зел.)"},
+ {3230, 0, 0, L"Острова Херд и Макдональд (Австр.)"},
+ {131, 0, 0, L"Палау"},
+ {133, 0, 0, L"Папуа - Новая Гвинея"},
+ {3222, 0, 0, L"Питкерн (Брит.)"},
+ {125, 0, 0, L"Самоа"},
+ {3219, 0, 0, L"Сев. Марианские острова (США)"},
+ {134, 0, 0, L"Соломоновы Острова"},
+ {3223, 0, 0, L"Токелау (Н.Зел.)"},
+ {135, 0, 0, L"Тонга"},
+ {136, 0, 0, L"Тувалу"},
+ {3224, 0, 0, L"Уоллис и Футуна острова (Фр.)"},
+ {137, 0, 0, L"Фиджи"},
+ {3226, 0, 0, L"Французская Полинезия"},
+ {3225, 0, 0, L"Французские Южные территории"},
+ {138, 0, 0, L"Канада"},
+ {139, 0, 0, L"США"},
+ {3200, 0, 0, L"Ангилья (Брит.)"},
+ {140, 0, 0, L"Антигуа и Барбуда"},
+ {141, 0, 0, L"Аргентина"},
+ {3202, 0, 0, L"Аруба (Нид.)"},
+ {142, 0, 0, L"Багамы"},
+ {143, 0, 0, L"Барбадос"},
+ {146, 0, 0, L"Белиз"},
+ {3203, 0, 0, L"Бермуды (Брит.)"},
+ {144, 0, 0, L"Боливия"},
+ {145, 0, 0, L"Бразилия"},
+ {147, 0, 0, L"Венесуэла"},
+ {3204, 0, 0, L"Виргинские острова (Брит.)"},
+ {452, 0, 0, L"Виргинские острова (США)"},
+ {149, 0, 0, L"Гаити"},
+ {148, 0, 0, L"Гайана"},
+ {3205, 0, 0, L"Гваделупа (Фр.)"},
+ {173, 0, 0, L"Гватемала"},
+ {150, 0, 0, L"Гондурас"},
+ {151, 0, 0, L"Гренада"},
+ {152, 0, 0, L"Гренландия (Дат.)"},
+ {153, 0, 0, L"Доминика"},
+ {154, 0, 0, L"Доминиканская Республика"},
+ {155, 0, 0, L"Колумбия"},
+ {156, 0, 0, L"Коста-Рика"},
+ {157, 0, 0, L"Куба"},
+ {3208, 0, 0, L"Мартиника (Фр.)"},
+ {158, 0, 0, L"Мексика"},
+ {3209, 0, 0, L"Монтсеррат (Брит)"},
+ {3201, 0, 0, L"Нидерландские Антилы"},
+ {159, 0, 0, L"Никарагуа"},
+ {3207, 0, 0, L"Остров Кайман (Брит.)"},
+ {3211, 0, 0, L"Острова Теркс и Кайкос (Брит.)"},
+ {160, 0, 0, L"Панама"},
+ {161, 0, 0, L"Парагвай"},
+ {162, 0, 0, L"Перу"},
+ {163, 0, 0, L"Сальвадор"},
+ {164, 0, 0, L"Сент-Винсент и Гренадины"},
+ {165, 0, 0, L"Сент-Китс и Невис"},
+ {166, 0, 0, L"Сент-Люсия"},
+ {3210, 0, 0, L"Сент-Пьер и Микелон (Фр.)"},
+ {167, 0, 0, L"Суринам"},
+ {168, 0, 0, L"Тринидат и Тобаго"},
+ {169, 0, 0, L"Уругвай"},
+ {3212, 0, 0, L"Фолклендские острова (Брит.)"},
+ {3206, 0, 0, L"Французская Гвиана"},
+ {170, 0, 0, L"Чили"},
+ {171, 0, 0, L"Эквадор"},
+ {3213, 0, 0, L"Юж. Джорджия и Юж. Сандвичевы о-ва (Брит.)"},
+ {172, 0, 0, L"Ямайка"},
+ {174, 0, 0, L"Алжир"},
+ {175, 0, 0, L"Ангола"},
+ {176, 0, 0, L"Бенин"},
+ {177, 0, 0, L"Ботсвана"},
+ {3228, 0, 0, L"Британская территория в Индийском океане"},
+ {178, 0, 0, L"Буркина-Фасо"},
+ {179, 0, 0, L"Бурунди"},
+ {180, 0, 0, L"Габон"},
+ {181, 0, 0, L"Гамбия"},
+ {182, 0, 0, L"Гана"},
+ {183, 0, 0, L"Гвинея"},
+ {184, 0, 0, L"Гвинея-Бисау"},
+ {185, 0, 0, L"Джибути"},
+ {186, 0, 0, L"Египет"},
+ {187, 0, 0, L"Замбия"},
+ {3198, 0, 0, L"Зап. Сахара"},
+ {23, 0, 0, L"Зимбабве"},
+ {188, 0, 0, L"Кабо-Верде"},
+ {189, 0, 0, L"Камерун"},
+ {190, 0, 0, L"Кения"},
+ {191, 0, 0, L"Коморы"},
+ {193, 0, 0, L"Конго (Заир)"},
+ {192, 0, 0, L"Конго"},
+ {194, 0, 0, L"Кот-д`Ивуар"},
+ {195, 0, 0, L"Лесото"},
+ {196, 0, 0, L"Либерия"},
+ {197, 0, 0, L"Ливия"},
+ {198, 0, 0, L"Маврикий"},
+ {199, 0, 0, L"Мавритания"},
+ {200, 0, 0, L"Мадагаскар"},
+ {3229, 0, 0, L"Майотт (Фр.)"},
+ {201, 0, 0, L"Малави"},
+ {202, 0, 0, L"Мали"},
+ {203, 0, 0, L"Марокко"},
+ {204, 0, 0, L"Мозамбик"},
+ {205, 0, 0, L"Намибия"},
+ {206, 0, 0, L"Нигер"},
+ {207, 0, 0, L"Нигерия"},
+ {3227, 0, 0, L"Остров Буве (Норв.)"},
+ {3197, 0, 0, L"Реюньон (Фр.)"},
+ {208, 0, 0, L"Руанда"},
+ {209, 0, 0, L"Сан-Томе и Принсипи"},
+ {210, 0, 0, L"Свазиленд"},
+ {3199, 0, 0, L"Святая Елена (Брит.)"},
+ {211, 0, 0, L"Сейшелы"},
+ {212, 0, 0, L"Сенегал"},
+ {213, 0, 0, L"Сомали"},
+ {214, 0, 0, L"Судан"},
+ {215, 0, 0, L"Сьерра-Леоне"},
+ {216, 0, 0, L"Танзания"},
+ {217, 0, 0, L"Того"},
+ {218, 0, 0, L"Тунис"},
+ {219, 0, 0, L"Уганда"},
+ {220, 0, 0, L"Центральноафриканская Республика"},
+ {222, 0, 0, L"Чад"},
+ {223, 0, 0, L"Экваториальная Гвинея"},
+ {221, 0, 0, L"Эритрея"},
+ {224, 0, 0, L"Эфиопия"},
+ {225, 0, 0, L"Южно-Африканская Республика (ЮАР)"},
+ {39, 0, 0, L"Украина"},
+ {40, 0, 0, L"Австрия"},
+ {32, 0, 0, L"Албания"},
+ {33, 0, 0, L"Андорра"},
+ {340, 0, 0, L"Белоруссия"},
+ {38, 0, 0, L"Бельгия"},
+ {41, 0, 0, L"Болгария"},
+ {42, 0, 0, L"Босния и Герцеговина"},
+ {43, 0, 0, L"Ватикан"},
+ {45, 0, 0, L"Великобритания"},
+ {44, 0, 0, L"Венгрия"},
+ {46, 0, 0, L"Германия"},
+ {3193, 0, 0, L"Гернси (Брит.)"},
+ {47, 0, 0, L"Гибралтар (Брит.)"},
+ {48, 0, 0, L"Греция"},
+ {49, 0, 0, L"Дания"},
+ {3194, 0, 0, L"Джерси (Брит.)"},
+ {50, 0, 0, L"Ирландия"},
+ {51, 0, 0, L"Исландия"},
+ {34, 0, 0, L"Испания"},
+ {52, 0, 0, L"Италия"},
+ {53, 0, 0, L"Латвия"},
+ {54, 0, 0, L"Литва"},
+ {55, 0, 0, L"Лихтенштейн"},
+ {56, 0, 0, L"Люксембург"},
+ {57, 0, 0, L"Македония"},
+ {58, 0, 0, L"Мальта"},
+ {59, 0, 0, L"Молдавия"},
+ {36, 0, 0, L"Монако"},
+ {60, 0, 0, L"Нидерланды"},
+ {61, 0, 0, L"Норвегия"},
+ {3195, 0, 0, L"Остров Мэн (Брит.)"},
+ {62, 0, 0, L"Польша"},
+ {35, 0, 0, L"Португалия"},
+ {63, 0, 0, L"Румыния"},
+ {64, 0, 0, L"Сан-Марино"},
+ {74, 0, 0, L"Сербия и Черногория"},
+ {65, 0, 0, L"Словакия"},
+ {66, 0, 0, L"Словения"},
+ {67, 0, 0, L"Фарерские о-ва (Дания)"},
+ {68, 0, 0, L"Финляндия"},
+ {37, 0, 0, L"Франция"},
+ {69, 0, 0, L"Хорватия"},
+ {70, 0, 0, L"Чехия"},
+ {71, 0, 0, L"Швейцария"},
+ {72, 0, 0, L"Швеция"},
+ {3196, 0, 0, L"Шпицберген (Норв.)"},
+ {73, 0, 0, L"Эстония"},
+ {24, 25, 0, L"Москва"},
+ {24, 226, 0, L"Санкт-Петербург"},
+ {24, 233, 0, L"Саха (Якутия)"},
+ {24, 232, 0, L"Приморский край"},
+ {24, 235, 0, L"Хабаровский край"},
+ {24, 227, 0, L"Амурская обл."},
+ {24, 229, 0, L"Камчатская обл."},
+ {24, 231, 0, L"Магаданская обл."},
+ {24, 234, 0, L"Сахалинская обл."},
+ {24, 228, 0, L"Еврейская АО"},
+ {24, 230, 0, L"Корякский АО"},
+ {24, 236, 0, L"Чукотский АО"},
+ {24, 237, 0, L"Башкортостан"},
+ {24, 240, 0, L"Марий-Эл"},
+ {24, 241, 0, L"Мордовия"},
+ {24, 248, 0, L"Татарстан"},
+ {24, 249, 0, L"Удмуртия"},
+ {24, 251, 0, L"Чувашия"},
+ {24, 238, 0, L"Кировская обл."},
+ {24, 242, 0, L"Нижегородская обл."},
+ {24, 243, 0, L"Оренбургская обл."},
+ {24, 244, 0, L"Пензенская обл."},
+ {24, 245, 0, L"Пермская обл."},
+ {24, 246, 0, L"Самарская обл."},
+ {24, 247, 0, L"Саратовская обл."},
+ {24, 250, 0, L"Ульяновская обл."},
+ {24, 239, 0, L"Коми-Пермяцкий АО"},
+ {24, 255, 0, L"Карелия"},
+ {24, 256, 0, L"Коми"},
+ {24, 252, 0, L"Архангельская обл."},
+ {24, 253, 0, L"Вологодская обл."},
+ {24, 254, 0, L"Калининградская обл."},
+ {24, 257, 0, L"Ленинградская обл."},
+ {24, 258, 0, L"Мурманская обл."},
+ {24, 260, 0, L"Новгородская обл."},
+ {24, 261, 0, L"Псковская обл."},
+ {24, 259, 0, L"Ненецкий АО"},
+ {24, 265, 0, L"Бурятия"},
+ {24, 263, 0, L"Республика Алтай"},
+ {24, 273, 0, L"Тыва"},
+ {24, 275, 0, L"Хакасия"},
+ {24, 264, 0, L"Алтайский край"},
+ {24, 268, 0, L"Красноярский край"},
+ {24, 266, 0, L"Иркутская обл."},
+ {24, 267, 0, L"Кемеровская обл."},
+ {24, 269, 0, L"Новосибирская обл."},
+ {24, 270, 0, L"Омская обл."},
+ {24, 272, 0, L"Томская обл."},
+ {24, 276, 0, L"Читинская обл."},
+ {24, 262, 0, L"Агинский Бурятский АО"},
+ {24, 271, 0, L"Таймырский АО"},
+ {24, 274, 0, L"Усть-Ордынский Бурятский АО"},
+ {24, 277, 0, L"Эвенкийский АО"},
+ {24, 278, 0, L"Курганская обл."},
+ {24, 279, 0, L"Свердловская обл."},
+ {24, 280, 0, L"Тюменская обл."},
+ {24, 282, 0, L"Челябинская обл."},
+ {24, 281, 0, L"Ханты-Мансийский АО - Югра"},
+ {24, 283, 0, L"Ямало-Ненецкий АО"},
+ {24, 284, 0, L"Белгородская обл."},
+ {24, 285, 0, L"Брянская обл."},
+ {24, 286, 0, L"Владимирская обл."},
+ {24, 287, 0, L"Воронежская обл."},
+ {24, 288, 0, L"Ивановская обл."},
+ {24, 289, 0, L"Калужская обл."},
+ {24, 290, 0, L"Костромская обл."},
+ {24, 291, 0, L"Курская обл."},
+ {24, 292, 0, L"Липецкая обл."},
+ {24, 293, 0, L"Московская обл."},
+ {24, 294, 0, L"Орловская обл."},
+ {24, 295, 0, L"Рязанская обл."},
+ {24, 296, 0, L"Смоленская обл."},
+ {24, 297, 0, L"Тамбовская обл."},
+ {24, 298, 0, L"Тверская обл."},
+ {24, 299, 0, L"Тульская обл."},
+ {24, 300, 0, L"Ярославская обл."},
+ {24, 301, 0, L"Адыгея"},
+ {24, 304, 0, L"Дагестан"},
+ {24, 305, 0, L"Ингушетия"},
+ {24, 306, 0, L"Кабардино-Балкария"},
+ {24, 307, 0, L"Калмыкия"},
+ {24, 308, 0, L"Карачаево-Черкессия"},
+ {24, 311, 0, L"Северная Осетия - Алания"},
+ {24, 313, 0, L"Чечня"},
+ {24, 309, 0, L"Краснодарский край"},
+ {24, 312, 0, L"Ставропольский край"},
+ {24, 302, 0, L"Астраханская обл."},
+ {24, 303, 0, L"Волгоградская обл."},
+ {24, 310, 0, L"Ростовская обл."},
+ {81, 1055, 0, L"Баку"},
+ {81, 1058, 0, L"Гянджа"},
+ {81, 1056, 0, L"Нахичевань"},
+ {81, 1057, 0, L"Ханкенди"},
+ {81, 3153, 0, L"Шеки"},
+ {81, 2291, 0, L"Другое"},
+ {82, 2932, 0, L"Абовян"},
+ {82, 1060, 0, L"Аштарак"},
+ {82, 3084, 0, L"Ванадзор"},
+ {82, 3011, 0, L"Гюмри"},
+ {82, 3306, 0, L"Дилижан"},
+ {82, 1059, 0, L"Ереван"},
+ {82, 3145, 0, L"Ханкенди"},
+ {82, 2292, 0, L"Другое"},
+ {97, 1061, 0, L"Кабул"},
+ {97, 2293, 0, L"Другое"},
+ {96, 1062, 0, L"Дакка"},
+ {96, 2294, 0, L"Другое"},
+ {99, 1063, 0, L"Манама"},
+ {99, 2295, 0, L"Другое"},
+ {100, 1064, 0, L"Бандар-Сери-Бегаван"},
+ {100, 2296, 0, L"Другое"},
+ {101, 1065, 0, L"Тхимпху"},
+ {101, 2297, 0, L"Другое"},
+ {102, 1066, 0, L"Ханой"},
+ {102, 2298, 0, L"Другое"},
+ {83, 1067, 0, L"Батуми"},
+ {83, 3158, 0, L"Боржоми"},
+ {83, 1068, 0, L"Поти"},
+ {83, 3129, 0, L"Рустави"},
+ {83, 1069, 0, L"Сухуми"},
+ {83, 1070, 0, L"Тбилиси"},
+ {83, 2299, 0, L"Другое"},
+ {86, 3345, 0, L"Ариэль"},
+ {86, 1071, 0, L"Афула"},
+ {86, 2992, 0, L"Ашдод"},
+ {86, 3175, 0, L"Ашкелон"},
+ {86, 3363, 0, L"Бат-Ям"},
+ {86, 2884, 0, L"Беер-Яков"},
+ {86, 3243, 0, L"Бейт-Шемеш"},
+ {86, 1074, 0, L"Беэр-Шева"},
+ {86, 3348, 0, L"Герцелия"},
+ {86, 3241, 0, L"Димона"},
+ {86, 1075, 0, L"Иерусалим"},
+ {86, 3350, 0, L"Йокнеам-Иллит"},
+ {86, 2982, 0, L"Кармиэль"},
+ {86, 2971, 0, L"Кфар-Саба"},
+ {86, 3136, 0, L"Назарет"},
+ {86, 1080, 0, L"Натания"},
+ {86, 3303, 0, L"Офаким"},
+ {86, 3050, 0, L"Раанана"},
+ {86, 3151, 0, L"Рамат Ган"},
+ {86, 3141, 0, L"Реховот"},
+ {86, 3012, 0, L"Ришон ле Цион"},
+ {86, 1081, 0, L"Тверия"},
+ {86, 1077, 0, L"Тель-Авив"},
+ {86, 1079, 0, L"Хадера"},
+ {86, 1078, 0, L"Хайфа"},
+ {86, 1076, 0, L"Хеврон"},
+ {86, 2929, 0, L"Цфат"},
+ {86, 2928, 0, L"Эйлат"},
+ {86, 2300, 0, L"Другое"},
+ {95, 3315, 0, L"Бангалор"},
+ {95, 1082, 0, L"Дели"},
+ {95, 1083, 0, L"Джайпур"},
+ {95, 3144, 0, L"Калькутта"},
+ {95, 3025, 0, L"Мумбаи"},
+ {95, 3277, 0, L"Панаджи"},
+ {95, 1084, 0, L"Ченнаи"},
+ {95, 2301, 0, L"Другое"},
+ {103, 1085, 0, L"Джакарта"},
+ {103, 2302, 0, L"Другое"},
+ {79, 1086, 0, L"Амман"},
+ {79, 2303, 0, L"Другое"},
+ {85, 1087, 0, L"Багдад"},
+ {85, 2304, 0, L"Другое"},
+ {87, 1088, 0, L"Тегеран"},
+ {87, 2305, 0, L"Другое"},
+ {104, 1089, 0, L"Сана"},
+ {104, 2306, 0, L"Другое"},
+ {84, 1090, 0, L"Актау"},
+ {84, 1091, 0, L"Актюбинск"},
+ {84, 1092, 0, L"Алма-Ата"},
+ {84, 3242, 0, L"Аршалы"},
+ {84, 1093, 0, L"Астана"},
+ {84, 1094, 0, L"Атырау (Гурьев)"},
+ {84, 1095, 0, L"Байконур"},
+ {84, 3245, 0, L"Балхаш"},
+ {84, 3083, 0, L"Жезказган"},
+ {84, 1096, 0, L"Капчагай"},
+ {84, 1097, 0, L"Караганда"},
+ {84, 1098, 0, L"Кокшетау"},
+ {84, 1099, 0, L"Кустанай"},
+ {84, 2868, 0, L"Лисаковск"},
+ {84, 1100, 0, L"Павлодар"},
+ {84, 1101, 0, L"Петропавловск (Сев.-Каз. обл.)"},
+ {84, 1102, 0, L"Рудный"},
+ {84, 1103, 0, L"Семипалатинск"},
+ {84, 1104, 0, L"Степногорск"},
+ {84, 3166, 0, L"Талгар"},
+ {84, 1105, 0, L"Талды-Курган"},
+ {84, 2927, 0, L"Тараз"},
+ {84, 1106, 0, L"Темиртау"},
+ {84, 1107, 0, L"Уральск"},
+ {84, 1108, 0, L"Усть-Каменогорск"},
+ {84, 1109, 0, L"Чимкент"},
+ {84, 1110, 0, L"Экибастуз"},
+ {84, 2307, 0, L"Другое"},
+ {105, 1111, 0, L"Пномпень"},
+ {105, 2308, 0, L"Другое"},
+ {106, 1112, 0, L"Доха"},
+ {106, 2309, 0, L"Другое"},
+ {107, 1113, 0, L"Ларнака"},
+ {107, 1114, 0, L"Лимассол"},
+ {107, 1115, 0, L"Никосия"},
+ {107, 2954, 0, L"Пафос"},
+ {107, 2310, 0, L"Другое"},
+ {92, 1116, 0, L"Бишкек"},
+ {92, 1117, 0, L"Джалал-Абад"},
+ {92, 3027, 0, L"Кара-Балта"},
+ {92, 1118, 0, L"Каракол"},
+ {92, 1119, 0, L"Ош"},
+ {92, 1120, 0, L"Талас"},
+ {92, 2933, 0, L"Хайдаркен"},
+ {92, 2311, 0, L"Другое"},
+ {76, 3214, 0, L"Аомынь (Макао)"},
+ {76, 1121, 0, L"Гонконг"},
+ {76, 2869, 0, L"Гуанчжоу"},
+ {76, 3262, 0, L"Далянь"},
+ {76, 1122, 0, L"Пекин"},
+ {76, 1123, 0, L"Харбин"},
+ {76, 1124, 0, L"Шанхай"},
+ {76, 3043, 0, L"Шеньян"},
+ {76, 2312, 0, L"Другое"},
+ {29, 1125, 0, L"Пхеньян"},
+ {29, 2313, 0, L"Другое"},
+ {108, 1126, 0, L"Сеул"},
+ {108, 3240, 0, L"Тейджон"},
+ {108, 2314, 0, L"Другое"},
+ {88, 1127, 0, L"Эль-Кувейт"},
+ {88, 2315, 0, L"Другое"},
+ {109, 1128, 0, L"Вьентьян"},
+ {109, 2316, 0, L"Другое"},
+ {110, 1129, 0, L"Бейрут"},
+ {110, 2317, 0, L"Другое"},
+ {111, 1130, 0, L"Джохор-Бару"},
+ {111, 1131, 0, L"Куала-Лумпур"},
+ {111, 2318, 0, L"Другое"},
+ {112, 1132, 0, L"Мале"},
+ {112, 2319, 0, L"Другое"},
+ {113, 1133, 0, L"Улан-Батор"},
+ {113, 1134, 0, L"Эрдэнэт"},
+ {113, 2320, 0, L"Другое"},
+ {114, 1135, 0, L"Янгон"},
+ {114, 2321, 0, L"Другое"},
+ {115, 1136, 0, L"Катманду"},
+ {115, 2322, 0, L"Другое"},
+ {116, 1137, 0, L"Абу-Даби"},
+ {116, 1138, 0, L"Дубай"},
+ {116, 1139, 0, L"Шарджа"},
+ {116, 2323, 0, L"Другое"},
+ {117, 1140, 0, L"Маскат"},
+ {117, 2324, 0, L"Другое"},
+ {122, 1141, 0, L"Исламабад"},
+ {122, 2325, 0, L"Другое"},
+ {89, 1072, 0, L"Ашдод"},
+ {89, 1073, 0, L"Ашкелон"},
+ {89, 1142, 0, L"Газа"},
+ {89, 2326, 0, L"Другое"},
+ {94, 3250, 0, L"Медина"},
+ {94, 1143, 0, L"Эр-Рияд"},
+ {94, 2327, 0, L"Другое"},
+ {78, 1144, 0, L"Дамаск"},
+ {78, 2328, 0, L"Другое"},
+ {91, 1145, 0, L"Душанбе"},
+ {91, 3307, 0, L"Кайраккум"},
+ {91, 3308, 0, L"Худжанд"},
+ {91, 2329, 0, L"Другое"},
+ {119, 1146, 0, L"Бангкок"},
+ {119, 1147, 0, L"Пхукет"},
+ {119, 2330, 0, L"Другое"},
+ {120, 1148, 0, L"Тайбэй"},
+ {120, 2331, 0, L"Другое"},
+ {132, 1149, 0, L"Дили"},
+ {132, 2332, 0, L"Другое"},
+ {90, 1150, 0, L"Ашхабад"},
+ {90, 3079, 0, L"Безмеин"},
+ {90, 2333, 0, L"Другое"},
+ {77, 1152, 0, L"Анкара"},
+ {77, 1153, 0, L"Анталия"},
+ {77, 3080, 0, L"Бурса"},
+ {77, 1151, 0, L"Мармарис"},
+ {77, 1154, 0, L"Стамбул"},
+ {77, 1155, 0, L"Трабзон"},
+ {77, 2334, 0, L"Другое"},
+ {93, 3362, 0, L"Алмалык"},
+ {93, 3137, 0, L"Андижан"},
+ {93, 3273, 0, L"Асака"},
+ {93, 1156, 0, L"Ахангаран"},
+ {93, 1157, 0, L"Бухара"},
+ {93, 3167, 0, L"Джизак"},
+ {93, 3347, 0, L"Кунград"},
+ {93, 1158, 0, L"Навои"},
+ {93, 1159, 0, L"Наманган"},
+ {93, 1160, 0, L"Самарканд"},
+ {93, 1161, 0, L"Ташкент"},
+ {93, 1162, 0, L"Ургенч"},
+ {93, 1163, 0, L"Фергана"},
+ {93, 1164, 0, L"Чирчик"},
+ {93, 2335, 0, L"Другое"},
+ {121, 1165, 0, L"Манила"},
+ {121, 3319, 0, L"Себу"},
+ {121, 2336, 0, L"Другое"},
+ {98, 1166, 0, L"Коломбо"},
+ {98, 2337, 0, L"Другое"},
+ {75, 3176, 0, L"Исесаки"},
+ {75, 3339, 0, L"Корияма"},
+ {75, 1167, 0, L"Саппоро"},
+ {75, 1168, 0, L"Токио"},
+ {75, 2338, 0, L"Другое"},
+ {123, 1914, 0, L"Аделаида"},
+ {123, 2957, 0, L"Блэк Рок"},
+ {123, 1915, 0, L"Брисбен"},
+ {123, 3331, 0, L"Горокан"},
+ {123, 1916, 0, L"Канберра"},
+ {123, 3001, 0, L"Лидкомб"},
+ {123, 1917, 0, L"Мельбурн"},
+ {123, 3217, 0, L"Норфолк"},
+ {123, 3064, 0, L"Перт"},
+ {123, 3020, 0, L"Санта Люсиа"},
+ {123, 1918, 0, L"Сидней"},
+ {123, 3238, 0, L"Энеабба"},
+ {123, 2339, 0, L"Другое"},
+ {454, 1192, 0, L"Паго-Паго"},
+ {454, 2366, 0, L"Другое"},
+ {124, 1919, 0, L"Порт-Вила"},
+ {124, 2340, 0, L"Другое"},
+ {453, 1193, 0, L"Аганья"},
+ {453, 2368, 0, L"Другое"},
+ {126, 1921, 0, L"Баирики"},
+ {126, 2342, 0, L"Другое"},
+ {127, 1922, 0, L"Маджуро"},
+ {127, 2343, 0, L"Другое"},
+ {128, 1923, 0, L"Паликир"},
+ {128, 2344, 0, L"Другое"},
+ {129, 1924, 0, L"Ярен"},
+ {129, 2345, 0, L"Другое"},
+ {130, 1925, 0, L"Веллингтон"},
+ {130, 1926, 0, L"Гамильтон"},
+ {130, 1928, 0, L"Данидин"},
+ {130, 1929, 0, L"Крайстчерч"},
+ {130, 3235, 0, L"Кромвель"},
+ {130, 1927, 0, L"Окленд"},
+ {130, 3323, 0, L"Тауранга"},
+ {130, 2346, 0, L"Другое"},
+ {131, 1930, 0, L"Корор"},
+ {131, 2347, 0, L"Другое"},
+ {133, 1931, 0, L"Порт-Морсби"},
+ {133, 2348, 0, L"Другое"},
+ {125, 1920, 0, L"Апиа"},
+ {125, 2341, 0, L"Другое"},
+ {134, 1932, 0, L"Хониара"},
+ {134, 2349, 0, L"Другое"},
+ {135, 1933, 0, L"Нукуалофа"},
+ {135, 2350, 0, L"Другое"},
+ {136, 1934, 0, L"Фунафути"},
+ {136, 2351, 0, L"Другое"},
+ {137, 1935, 0, L"Сува"},
+ {137, 2352, 0, L"Другое"},
+ {138, 3055, 0, L"Барлингтон"},
+ {138, 3049, 0, L"Броссард"},
+ {138, 3330, 0, L"Бурнаби"},
+ {138, 1169, 0, L"Ванкувер"},
+ {138, 3106, 0, L"Ватерлоо"},
+ {138, 1170, 0, L"Виннипег"},
+ {138, 1171, 0, L"Галифакс"},
+ {138, 1172, 0, L"Гамильтон"},
+ {138, 3365, 0, L"Денвер"},
+ {138, 1173, 0, L"Калгари"},
+ {138, 3104, 0, L"Камлупс"},
+ {138, 3366, 0, L"Каннингтон"},
+ {138, 1174, 0, L"Квебек"},
+ {138, 2964, 0, L"Кингстон"},
+ {138, 3113, 0, L"Коквитлам"},
+ {138, 1175, 0, L"Монреаль"},
+ {138, 2920, 0, L"Ниагара-Фолс"},
+ {138, 2889, 0, L"Норд-Йорк"},
+ {138, 1176, 0, L"Оттава"},
+ {138, 2903, 0, L"Порт Алберни"},
+ {138, 1177, 0, L"Ричмонд"},
+ {138, 1178, 0, L"Тимминс"},
+ {138, 2946, 0, L"Торнхилл"},
+ {138, 1179, 0, L"Торонто"},
+ {138, 1180, 0, L"Эдмонтон"},
+ {138, 2353, 0, L"Другое"},
+ {139, 407, 0, L"Вашингтон"},
+ {139, 426, 0, L"Айдахо"},
+ {139, 378, 0, L"Айова"},
+ {139, 412, 0, L"Алабама"},
+ {139, 446, 0, L"Аляска"},
+ {139, 434, 0, L"Аризона"},
+ {139, 416, 0, L"Арканзас"},
+ {139, 428, 0, L"Вайоминг"},
+ {139, 440, 0, L"Вашингтон"},
+ {139, 352, 0, L"Вермонт"},
+ {139, 394, 0, L"Виргиния"},
+ {139, 374, 0, L"Висконсин"},
+ {139, 448, 0, L"Гавайи"},
+ {139, 390, 0, L"Делавер"},
+ {139, 402, 0, L"Джорджия"},
+ {139, 396, 0, L"Западная Виргиния"},
+ {139, 370, 0, L"Иллинойс"},
+ {139, 368, 0, L"Индиана"},
+ {139, 444, 0, L"Калифорния"},
+ {139, 388, 0, L"Канзас"},
+ {139, 408, 0, L"Кентукки"},
+ {139, 430, 0, L"Колорадо"},
+ {139, 358, 0, L"Коннектикут"},
+ {139, 418, 0, L"Луизиана"},
+ {139, 354, 0, L"Массачусетс"},
+ {139, 376, 0, L"Миннесота"},
+ {139, 414, 0, L"Миссисипи"},
+ {139, 380, 0, L"Миссури"},
+ {139, 372, 0, L"Мичиган"},
+ {139, 424, 0, L"Монтана"},
+ {139, 348, 0, L"Мэн"},
+ {139, 392, 0, L"Мэриленд"},
+ {139, 386, 0, L"Небраска"},
+ {139, 438, 0, L"Невада"},
+ {139, 362, 0, L"Нью-Джерси"},
+ {139, 360, 0, L"Нью-Йорк"},
+ {139, 432, 0, L"Нью-Мексико"},
+ {139, 350, 0, L"Нью-Хэмпшир"},
+ {139, 366, 0, L"Огайо"},
+ {139, 420, 0, L"Оклахома"},
+ {139, 442, 0, L"Орегон"},
+ {139, 364, 0, L"Пенсильвания"},
+ {139, 450, 0, L"Пуэрто-Рико"},
+ {139, 356, 0, L"Род-Айленд"},
+ {139, 382, 0, L"Северная Дакота"},
+ {139, 398, 0, L"Северная Каролина"},
+ {139, 410, 0, L"Теннесси"},
+ {139, 422, 0, L"Техас"},
+ {139, 406, 0, L"Федеральный округ Колумбия"},
+ {139, 404, 0, L"Флорида"},
+ {139, 384, 0, L"Южная Дакота"},
+ {139, 400, 0, L"Южная Каролина"},
+ {139, 436, 0, L"Юта"},
+ {140, 1238, 0, L"Сент-Джонс"},
+ {140, 2442, 0, L"Другое"},
+ {141, 1239, 0, L"Буэнос-Айрес"},
+ {141, 2441, 0, L"Другое"},
+ {142, 1240, 0, L"Нассау"},
+ {142, 2440, 0, L"Другое"},
+ {143, 1241, 0, L"Бриджтаун"},
+ {143, 2439, 0, L"Другое"},
+ {146, 1242, 0, L"Бельмопан"},
+ {146, 2438, 0, L"Другое"},
+ {144, 1243, 0, L"Ла-Пас"},
+ {144, 2437, 0, L"Другое"},
+ {145, 1244, 0, L"Бразилиа"},
+ {145, 3094, 0, L"Пассо Фундо"},
+ {145, 1245, 0, L"Рио-де-Жанейро"},
+ {145, 1246, 0, L"Сан-Паулу"},
+ {145, 2436, 0, L"Другое"},
+ {147, 1247, 0, L"Каракас"},
+ {147, 2435, 0, L"Другое"},
+ {452, 1190, 0, L"Шарлотта-Амалия"},
+ {452, 2364, 0, L"Другое"},
+ {149, 1248, 0, L"Порт-о-Пренс"},
+ {149, 2434, 0, L"Другое"},
+ {148, 1249, 0, L"Джоржтаун"},
+ {148, 2433, 0, L"Другое"},
+ {173, 1250, 0, L"Гватемала"},
+ {173, 2432, 0, L"Другое"},
+ {150, 1251, 0, L"Тегусигальпа"},
+ {150, 2431, 0, L"Другое"},
+ {151, 1252, 0, L"Сент-Джорджес"},
+ {151, 2430, 0, L"Другое"},
+ {152, 1253, 0, L"Уманак"},
+ {152, 2429, 0, L"Другое"},
+ {153, 1254, 0, L"Розо"},
+ {153, 2428, 0, L"Другое"},
+ {154, 1255, 0, L"Санто-Доминго"},
+ {154, 2427, 0, L"Другое"},
+ {155, 1256, 0, L"Богота"},
+ {155, 2426, 0, L"Другое"},
+ {156, 1257, 0, L"Сан-Хосе"},
+ {156, 2425, 0, L"Другое"},
+ {157, 1258, 0, L"Гавана"},
+ {157, 2424, 0, L"Другое"},
+ {158, 1259, 0, L"Акапулько"},
+ {158, 1260, 0, L"Мехико"},
+ {158, 2423, 0, L"Другое"},
+ {159, 1261, 0, L"Манагуа"},
+ {159, 2422, 0, L"Другое"},
+ {160, 1262, 0, L"Панама"},
+ {160, 2421, 0, L"Другое"},
+ {161, 1263, 0, L"Асунсьон"},
+ {161, 2420, 0, L"Другое"},
+ {162, 1264, 0, L"Лима"},
+ {162, 2419, 0, L"Другое"},
+ {163, 1265, 0, L"Сан-Сальвадор"},
+ {163, 2418, 0, L"Другое"},
+ {164, 1266, 0, L"Кингстаун"},
+ {164, 2417, 0, L"Другое"},
+ {165, 1267, 0, L"Бастер"},
+ {165, 2416, 0, L"Другое"},
+ {166, 1268, 0, L"Кастри"},
+ {166, 2415, 0, L"Другое"},
+ {167, 1269, 0, L"Парамарибо"},
+ {167, 2414, 0, L"Другое"},
+ {168, 1270, 0, L"Порт-оф-Спейн"},
+ {168, 2413, 0, L"Другое"},
+ {169, 1271, 0, L"Монтевидео"},
+ {169, 2412, 0, L"Другое"},
+ {170, 1272, 0, L"Сантьяго"},
+ {170, 2411, 0, L"Другое"},
+ {171, 1273, 0, L"Гуаякиль"},
+ {171, 1274, 0, L"Кито"},
+ {171, 2410, 0, L"Другое"},
+ {172, 1275, 0, L"Кингстон"},
+ {172, 2409, 0, L"Другое"},
+ {174, 1854, 0, L"Алжир"},
+ {174, 2495, 0, L"Другое"},
+ {175, 1855, 0, L"Луанда"},
+ {175, 2494, 0, L"Другое"},
+ {176, 1856, 0, L"Котону"},
+ {176, 1857, 0, L"Порто-Ново"},
+ {176, 2493, 0, L"Другое"},
+ {177, 1858, 0, L"Габороне"},
+ {177, 2492, 0, L"Другое"},
+ {178, 1859, 0, L"Уагадугу"},
+ {178, 2491, 0, L"Другое"},
+ {179, 1860, 0, L"Бужумбуру"},
+ {179, 2490, 0, L"Другое"},
+ {180, 1861, 0, L"Либревиль"},
+ {180, 2489, 0, L"Другое"},
+ {181, 1862, 0, L"Банжул"},
+ {181, 2488, 0, L"Другое"},
+ {182, 1863, 0, L"Аккра"},
+ {182, 2487, 0, L"Другое"},
+ {183, 1864, 0, L"Конакри"},
+ {183, 2486, 0, L"Другое"},
+ {184, 1865, 0, L"Бисау"},
+ {184, 2485, 0, L"Другое"},
+ {185, 1866, 0, L"Джибути"},
+ {185, 2484, 0, L"Другое"},
+ {186, 3312, 0, L"Дахаб"},
+ {186, 1867, 0, L"Каир"},
+ {186, 1868, 0, L"Хургада"},
+ {186, 2483, 0, L"Другое"},
+ {187, 1869, 0, L"Лусака"},
+ {187, 2482, 0, L"Другое"},
+ {23, 1870, 0, L"Хараре"},
+ {23, 2481, 0, L"Другое"},
+ {188, 1871, 0, L"Прая"},
+ {188, 2480, 0, L"Другое"},
+ {189, 1872, 0, L"Яунде"},
+ {189, 2479, 0, L"Другое"},
+ {190, 1873, 0, L"Найроби"},
+ {190, 2478, 0, L"Другое"},
+ {191, 1874, 0, L"Морони"},
+ {191, 2477, 0, L"Другое"},
+ {193, 1875, 0, L"Киншаса"},
+ {193, 2476, 0, L"Другое"},
+ {192, 1876, 0, L"Браззавиль"},
+ {192, 2475, 0, L"Другое"},
+ {194, 1877, 0, L"Ямусукро"},
+ {194, 2474, 0, L"Другое"},
+ {195, 1878, 0, L"Масеру"},
+ {195, 2473, 0, L"Другое"},
+ {196, 1879, 0, L"Монровия"},
+ {196, 2472, 0, L"Другое"},
+ {197, 1880, 0, L"Триполи"},
+ {197, 2471, 0, L"Другое"},
+ {198, 1881, 0, L"Порт-Луи"},
+ {198, 2470, 0, L"Другое"},
+ {199, 1882, 0, L"Нуакшот"},
+ {199, 2469, 0, L"Другое"},
+ {200, 1883, 0, L"Антананариву"},
+ {200, 2468, 0, L"Другое"},
+ {201, 1884, 0, L"Лилонгве"},
+ {201, 2467, 0, L"Другое"},
+ {202, 1885, 0, L"Бамако"},
+ {202, 2466, 0, L"Другое"},
+ {203, 1886, 0, L"Агадир"},
+ {203, 1887, 0, L"Рабат"},
+ {203, 2465, 0, L"Другое"},
+ {204, 1888, 0, L"Мапуту"},
+ {204, 2464, 0, L"Другое"},
+ {205, 1889, 0, L"Виндхук"},
+ {205, 2463, 0, L"Другое"},
+ {206, 1890, 0, L"Ниамей"},
+ {206, 2462, 0, L"Другое"},
+ {207, 1891, 0, L"Абуджа"},
+ {207, 2461, 0, L"Другое"},
+ {208, 1892, 0, L"Кигали"},
+ {208, 2460, 0, L"Другое"},
+ {209, 1893, 0, L"Сан-Томе"},
+ {209, 2459, 0, L"Другое"},
+ {210, 1894, 0, L"Мбабане"},
+ {210, 2458, 0, L"Другое"},
+ {211, 1895, 0, L"Виктория"},
+ {211, 2457, 0, L"Другое"},
+ {212, 1896, 0, L"Дакар"},
+ {212, 2456, 0, L"Другое"},
+ {213, 1897, 0, L"Могадишо"},
+ {213, 2455, 0, L"Другое"},
+ {214, 1898, 0, L"Хартум"},
+ {214, 2454, 0, L"Другое"},
+ {215, 1899, 0, L"Фритаун"},
+ {215, 2453, 0, L"Другое"},
+ {216, 1900, 0, L"Дар-эс-Салам"},
+ {216, 1901, 0, L"Додома"},
+ {216, 2452, 0, L"Другое"},
+ {217, 1902, 0, L"Ломе"},
+ {217, 2451, 0, L"Другое"},
+ {218, 1903, 0, L"Тунис"},
+ {218, 2450, 0, L"Другое"},
+ {219, 1904, 0, L"Кампала"},
+ {219, 2449, 0, L"Другое"},
+ {220, 1905, 0, L"Банги"},
+ {220, 2448, 0, L"Другое"},
+ {222, 1906, 0, L"Нджамена"},
+ {222, 2447, 0, L"Другое"},
+ {223, 1907, 0, L"Малабо"},
+ {223, 2446, 0, L"Другое"},
+ {221, 1908, 0, L"Асмэра"},
+ {221, 2445, 0, L"Другое"},
+ {224, 1909, 0, L"Аддис-Абеба"},
+ {224, 2444, 0, L"Другое"},
+ {225, 1910, 0, L"Дурбан"},
+ {225, 1913, 0, L"Йоханнесбург"},
+ {225, 1912, 0, L"Кейптаун"},
+ {225, 3033, 0, L"Пайнтаун"},
+ {225, 1911, 0, L"Претория"},
+ {225, 2443, 0, L"Другое"},
+ {39, 314, 0, L"Киев"},
+ {39, 315, 0, L"Винницкая обл."},
+ {39, 316, 0, L"Волынская обл."},
+ {39, 317, 0, L"Днепропетровская обл."},
+ {39, 318, 0, L"Донецкая обл."},
+ {39, 319, 0, L"Житомирская обл."},
+ {39, 320, 0, L"Закарпатская обл."},
+ {39, 321, 0, L"Запорожская обл."},
+ {39, 322, 0, L"Ивано-Франковская обл."},
+ {39, 323, 0, L"Киевская обл."},
+ {39, 324, 0, L"Кировоградская обл."},
+ {39, 325, 0, L"Крым"},
+ {39, 326, 0, L"Луганская обл."},
+ {39, 327, 0, L"Львовская обл."},
+ {39, 328, 0, L"Николаевская обл."},
+ {39, 329, 0, L"Одесская обл."},
+ {39, 330, 0, L"Полтавская обл."},
+ {39, 331, 0, L"Ровенская обл."},
+ {39, 332, 0, L"Сумская обл."},
+ {39, 333, 0, L"Тернопольская обл."},
+ {39, 334, 0, L"Харьковская обл."},
+ {39, 335, 0, L"Херсонская обл."},
+ {39, 336, 0, L"Хмельницкая обл."},
+ {39, 337, 0, L"Черкасская обл."},
+ {39, 338, 0, L"Черниговская обл."},
+ {39, 339, 0, L"Черновицкая обл."},
+ {40, 602, 0, L"Бад Халл"},
+ {40, 604, 0, L"Брегенц"},
+ {40, 603, 0, L"Вена"},
+ {40, 608, 0, L"Грац"},
+ {40, 606, 0, L"Зальцбург"},
+ {40, 3099, 0, L"Зель-ам-Зее"},
+ {40, 605, 0, L"Инсбрук"},
+ {40, 3174, 0, L"Кирхберг"},
+ {40, 609, 0, L"Клагенфурт"},
+ {40, 607, 0, L"Линц"},
+ {40, 610, 0, L"Обдах"},
+ {40, 611, 0, L"Щтубайтал"},
+ {40, 2541, 0, L"Другое"},
+ {32, 612, 0, L"Тирана"},
+ {32, 2540, 0, L"Другое"},
+ {33, 613, 0, L"Андорра-ла-Велья"},
+ {33, 2539, 0, L"Другое"},
+ {340, 341, 0, L"Минск"},
+ {340, 342, 0, L"Брестская обл."},
+ {340, 343, 0, L"Витебская обл."},
+ {340, 344, 0, L"Гомельская обл."},
+ {340, 345, 0, L"Гродненская обл."},
+ {340, 346, 0, L"Минская обл."},
+ {340, 347, 0, L"Могилевская обл."},
+ {38, 760, 0, L"Антверпен"},
+ {38, 767, 0, L"Арлон"},
+ {38, 762, 0, L"Брюгге"},
+ {38, 761, 0, L"Брюссель"},
+ {38, 763, 0, L"Гент"},
+ {38, 769, 0, L"Лувен"},
+ {38, 765, 0, L"Льеж"},
+ {38, 764, 0, L"Монс"},
+ {38, 3117, 0, L"Мортсель"},
+ {38, 766, 0, L"Намюр"},
+ {38, 768, 0, L"Хасселт"},
+ {38, 2532, 0, L"Другое"},
+ {41, 3098, 0, L"Банско"},
+ {41, 792, 0, L"Благоевград"},
+ {41, 770, 0, L"Бургас"},
+ {41, 771, 0, L"Бяла"},
+ {41, 773, 0, L"Варна"},
+ {41, 776, 0, L"Велико-Тырново"},
+ {41, 788, 0, L"Видин"},
+ {41, 789, 0, L"Враца"},
+ {41, 796, 0, L"Габрово"},
+ {41, 777, 0, L"Димитровград"},
+ {41, 781, 0, L"Каварна"},
+ {41, 786, 0, L"Кырджали"},
+ {41, 791, 0, L"Кюстендил"},
+ {41, 793, 0, L"Лазарджик"},
+ {41, 795, 0, L"Ловеч"},
+ {41, 787, 0, L"Михайловград"},
+ {41, 790, 0, L"Перник"},
+ {41, 3133, 0, L"Пирдоп"},
+ {41, 794, 0, L"Плевен"},
+ {41, 782, 0, L"Пловдив"},
+ {41, 780, 0, L"Разград"},
+ {41, 779, 0, L"Русе"},
+ {41, 774, 0, L"Силистра"},
+ {41, 784, 0, L"Сливен"},
+ {41, 772, 0, L"София"},
+ {41, 775, 0, L"Толбухин"},
+ {41, 3116, 0, L"Тырново"},
+ {41, 785, 0, L"Хасково"},
+ {41, 778, 0, L"Шумен"},
+ {41, 783, 0, L"Ямбол"},
+ {41, 2531, 0, L"Другое"},
+ {42, 797, 0, L"Баня-Лука"},
+ {42, 799, 0, L"Зеница"},
+ {42, 798, 0, L"Сараево"},
+ {42, 800, 0, L"Тузла"},
+ {42, 2530, 0, L"Другое"},
+ {45, 802, 0, L"Абердин"},
+ {45, 3075, 0, L"Айслворт"},
+ {45, 801, 0, L"Алнвик"},
+ {45, 804, 0, L"Бидефорд"},
+ {45, 803, 0, L"Бирмингем"},
+ {45, 805, 0, L"Блоксвич"},
+ {45, 3168, 0, L"Бостон"},
+ {45, 806, 0, L"Брайтон"},
+ {45, 807, 0, L"Бредфорд"},
+ {45, 808, 0, L"Бристоль"},
+ {45, 809, 0, L"Вилленхолл"},
+ {45, 3131, 0, L"Воррингтон"},
+ {45, 810, 0, L"Вудбридж"},
+ {45, 3342, 0, L"Гилфорд"},
+ {45, 811, 0, L"Глазго"},
+ {45, 812, 0, L"Дадли"},
+ {45, 813, 0, L"Дарем"},
+ {45, 814, 0, L"Дуглас"},
+ {45, 3089, 0, L"Кардиф"},
+ {45, 815, 0, L"Кембридж"},
+ {45, 816, 0, L"Кентербери"},
+ {45, 817, 0, L"Ливерпуль"},
+ {45, 818, 0, L"Лидс"},
+ {45, 819, 0, L"Лондон"},
+ {45, 820, 0, L"Манчестер"},
+ {45, 2976, 0, L"Митчем"},
+ {45, 2988, 0, L"Мэйденхед"},
+ {45, 821, 0, L"Ноттингем"},
+ {45, 3088, 0, L"Ньюпорт"},
+ {45, 822, 0, L"Оксфорд"},
+ {45, 823, 0, L"Плимут"},
+ {45, 824, 0, L"Портсмут"},
+ {45, 825, 0, L"Престон"},
+ {45, 3343, 0, L"Райд"},
+ {45, 2867, 0, L"Ридинг"},
+ {45, 2986, 0, L"Сент-Албанс"},
+ {45, 826, 0, L"Стаффорд"},
+ {45, 3063, 0, L"Стокпорт"},
+ {45, 827, 0, L"Уэймут"},
+ {45, 3140, 0, L"Челтенхэм"},
+ {45, 828, 0, L"Честер"},
+ {45, 829, 0, L"Шеффилд"},
+ {45, 830, 0, L"Эдинбург"},
+ {45, 2529, 0, L"Другое"},
+ {44, 831, 0, L"Будапешт"},
+ {44, 832, 0, L"Геделле"},
+ {44, 836, 0, L"Дебрецен"},
+ {44, 835, 0, L"Мишкольц"},
+ {44, 834, 0, L"Сегед"},
+ {44, 833, 0, L"Шиофок"},
+ {44, 2528, 0, L"Другое"},
+ {46, 3007, 0, L"Аахен"},
+ {46, 837, 0, L"Аугсбург"},
+ {46, 838, 0, L"Баден-Баден"},
+ {46, 3371, 0, L"Бамберг"},
+ {46, 839, 0, L"Бергиш-Гладбах"},
+ {46, 840, 0, L"Берлин"},
+ {46, 841, 0, L"Билефельд"},
+ {46, 3163, 0, L"Бовенден"},
+ {46, 842, 0, L"Бонн"},
+ {46, 843, 0, L"Браденбург"},
+ {46, 3015, 0, L"Брауншвейг"},
+ {46, 844, 0, L"Бремен"},
+ {46, 2921, 0, L"Варштайн"},
+ {46, 845, 0, L"Веймар"},
+ {46, 846, 0, L"Вупперталь"},
+ {46, 847, 0, L"Гамбург"},
+ {46, 848, 0, L"Ганновер"},
+ {46, 849, 0, L"Гарделеген"},
+ {46, 3010, 0, L"Гейдельберг"},
+ {46, 850, 0, L"Гота"},
+ {46, 851, 0, L"Дармштадт"},
+ {46, 3072, 0, L"Дессау"},
+ {46, 852, 0, L"Детмольд"},
+ {46, 853, 0, L"Дортмунд"},
+ {46, 854, 0, L"Дрезден"},
+ {46, 855, 0, L"Дюссельдорф"},
+ {46, 3082, 0, L"Иффецхайм"},
+ {46, 3309, 0, L"Кассел"},
+ {46, 856, 0, L"Кельн"},
+ {46, 857, 0, L"Киль"},
+ {46, 3138, 0, L"Кобленц"},
+ {46, 858, 0, L"Крефельд"},
+ {46, 859, 0, L"Лейпциг"},
+ {46, 2872, 0, L"Лимбург"},
+ {46, 2965, 0, L"Линген"},
+ {46, 3135, 0, L"Любек"},
+ {46, 3156, 0, L"Мангейм"},
+ {46, 3192, 0, L"Меерсбург"},
+ {46, 860, 0, L"Мюнстер"},
+ {46, 861, 0, L"Мюнхен"},
+ {46, 2864, 0, L"Нойштадт"},
+ {46, 862, 0, L"Нюрнберг"},
+ {46, 3009, 0, L"Оффенбург"},
+ {46, 2993, 0, L"Падерборн"},
+ {46, 863, 0, L"Равенсбург"},
+ {46, 864, 0, L"Регенсбург"},
+ {46, 865, 0, L"Рейнен"},
+ {46, 866, 0, L"Росток"},
+ {46, 3191, 0, L"Саарбрюкен"},
+ {46, 2974, 0, L"Санкт-Августин"},
+ {46, 3127, 0, L"Тюринген"},
+ {46, 867, 0, L"Фрайберг"},
+ {46, 868, 0, L"Фрайбург"},
+ {46, 869, 0, L"Франкфурт-на-Майне"},
+ {46, 3373, 0, L"Хемнитц"},
+ {46, 3313, 0, L"Хильден"},
+ {46, 870, 0, L"Штутгарт"},
+ {46, 3045, 0, L"Эрланген"},
+ {46, 2906, 0, L"Эшборн"},
+ {46, 2527, 0, L"Другое"},
+ {48, 871, 0, L"Афины"},
+ {48, 873, 0, L"Ираклион"},
+ {48, 3147, 0, L"Корфу"},
+ {48, 872, 0, L"Салоники"},
+ {48, 3178, 0, L"Халкидики"},
+ {48, 2526, 0, L"Другое"},
+ {49, 3006, 0, L"Архус"},
+ {49, 874, 0, L"Копенгаген"},
+ {49, 875, 0, L"Оденсе"},
+ {49, 3285, 0, L"Ольборг"},
+ {49, 876, 0, L"Сванеке"},
+ {49, 3126, 0, L"Скиве"},
+ {49, 2525, 0, L"Другое"},
+ {50, 3377, 0, L"Виклоу"},
+ {50, 3067, 0, L"Голвей"},
+ {50, 877, 0, L"Дублин"},
+ {50, 3065, 0, L"Килларней"},
+ {50, 3066, 0, L"Корк"},
+ {50, 878, 0, L"Лимерик"},
+ {50, 3069, 0, L"Нейс"},
+ {50, 3068, 0, L"Типперэри"},
+ {50, 2524, 0, L"Другое"},
+ {51, 879, 0, L"Рейкьявик"},
+ {51, 2523, 0, L"Другое"},
+ {34, 880, 0, L"Аликанте"},
+ {34, 3125, 0, L"Альмерия"},
+ {34, 881, 0, L"Барселона"},
+ {34, 890, 0, L"Бильбао"},
+ {34, 3076, 0, L"Бланес"},
+ {34, 882, 0, L"Валенсия"},
+ {34, 3070, 0, L"Ибица"},
+ {34, 888, 0, L"Кадис"},
+ {34, 886, 0, L"Картахена"},
+ {34, 891, 0, L"Ла-Корунья"},
+ {34, 3310, 0, L"Лорет де Мар"},
+ {34, 883, 0, L"Мадрид"},
+ {34, 884, 0, L"Малага"},
+ {34, 885, 0, L"Марбелья"},
+ {34, 892, 0, L"Овьедо"},
+ {34, 3179, 0, L"Пальма де Майорка"},
+ {34, 3177, 0, L"Сан-Агустин"},
+ {34, 3289, 0, L"Санта-Крус-де-Тенерифе"},
+ {34, 889, 0, L"Сарагоса"},
+ {34, 887, 0, L"Севилья"},
+ {34, 893, 0, L"Хихон"},
+ {34, 2522, 0, L"Другое"},
+ {52, 3318, 0, L"Аоста"},
+ {52, 3278, 0, L"Беллариа"},
+ {52, 906, 0, L"Болонья"},
+ {52, 894, 0, L"Брешиа"},
+ {52, 895, 0, L"Венеция"},
+ {52, 905, 0, L"Верона"},
+ {52, 896, 0, L"Генуя"},
+ {52, 897, 0, L"Лекко"},
+ {52, 3369, 0, L"Ливорно"},
+ {52, 3327, 0, L"Марсала"},
+ {52, 898, 0, L"Милан"},
+ {52, 899, 0, L"Модена"},
+ {52, 907, 0, L"Неаполь"},
+ {52, 908, 0, L"Перуджа"},
+ {52, 900, 0, L"Пиза"},
+ {52, 901, 0, L"Рим"},
+ {52, 3368, 0, L"Сан-Ремо"},
+ {52, 3384, 0, L"Сиракуза"},
+ {52, 3252, 0, L"Терамо"},
+ {52, 902, 0, L"Триест"},
+ {52, 903, 0, L"Турин"},
+ {52, 3130, 0, L"Фано"},
+ {52, 904, 0, L"Флоренция"},
+ {52, 2521, 0, L"Другое"},
+ {53, 2939, 0, L"Айзкраукле"},
+ {53, 3054, 0, L"Валка"},
+ {53, 909, 0, L"Даугавпилс"},
+ {53, 2934, 0, L"Екабпилс"},
+ {53, 913, 0, L"Елгава"},
+ {53, 2935, 0, L"Кокнесе"},
+ {53, 912, 0, L"Лиепая"},
+ {53, 2905, 0, L"Резекне"},
+ {53, 911, 0, L"Рига"},
+ {53, 2936, 0, L"Саласпилс"},
+ {53, 2937, 0, L"Смилтене"},
+ {53, 910, 0, L"Юрмала"},
+ {53, 2520, 0, L"Другое"},
+ {54, 914, 0, L"Вильнюс"},
+ {54, 915, 0, L"Висагинас"},
+ {54, 916, 0, L"Каунас"},
+ {54, 918, 0, L"Клайпеда"},
+ {54, 919, 0, L"Паланга"},
+ {54, 3173, 0, L"Пеневежис"},
+ {54, 917, 0, L"Шауляй"},
+ {54, 2519, 0, L"Другое"},
+ {55, 920, 0, L"Вадуц"},
+ {55, 2518, 0, L"Другое"},
+ {56, 3376, 0, L"Бетцдорф"},
+ {56, 921, 0, L"Люксембург"},
+ {56, 2517, 0, L"Другое"},
+ {57, 3142, 0, L"Битола"},
+ {57, 922, 0, L"Скопье"},
+ {57, 2516, 0, L"Другое"},
+ {58, 923, 0, L"Валлетта"},
+ {58, 3154, 0, L"Мзида"},
+ {58, 924, 0, L"Слима"},
+ {58, 2515, 0, L"Другое"},
+ {59, 925, 0, L"Бельцы"},
+ {59, 926, 0, L"Бендеры"},
+ {59, 3234, 0, L"Дубоссары"},
+ {59, 3275, 0, L"Кахул"},
+ {59, 927, 0, L"Кишинев"},
+ {59, 3321, 0, L"Резина"},
+ {59, 928, 0, L"Рыбница"},
+ {59, 929, 0, L"Тирасполь"},
+ {59, 3281, 0, L"Чадыр-Лунга"},
+ {59, 2514, 0, L"Другое"},
+ {36, 930, 0, L"Монте-Карло"},
+ {36, 2513, 0, L"Другое"},
+ {60, 931, 0, L"Амстердам"},
+ {60, 933, 0, L"Бреда"},
+ {60, 932, 0, L"Гаага"},
+ {60, 934, 0, L"Гауда"},
+ {60, 935, 0, L"Делфт"},
+ {60, 2977, 0, L"Донген"},
+ {60, 3030, 0, L"Зволле"},
+ {60, 3091, 0, L"Ниймеген"},
+ {60, 936, 0, L"Роттердам"},
+ {60, 937, 0, L"Утрехт"},
+ {60, 3044, 0, L"Эйндховен"},
+ {60, 3380, 0, L"Эншеде"},
+ {60, 2512, 0, L"Другое"},
+ {61, 3190, 0, L"Кристиансанд"},
+ {61, 2857, 0, L"Лиллехаммер"},
+ {61, 938, 0, L"Осло"},
+ {61, 3355, 0, L"Ставангер"},
+ {61, 939, 0, L"Тронхейм"},
+ {61, 2511, 0, L"Другое"},
+ {62, 940, 0, L"Белосток"},
+ {62, 941, 0, L"Варшава"},
+ {62, 3164, 0, L"Вроцлав"},
+ {62, 942, 0, L"Гданьск"},
+ {62, 943, 0, L"Гливице"},
+ {62, 3237, 0, L"Закопане"},
+ {62, 3165, 0, L"Зелена Гура"},
+ {62, 944, 0, L"Катовице"},
+ {62, 945, 0, L"Краков"},
+ {62, 3008, 0, L"Лодзь"},
+ {62, 3150, 0, L"Ольштын"},
+ {62, 946, 0, L"Познань"},
+ {62, 947, 0, L"Радом"},
+ {62, 948, 0, L"Сопот"},
+ {62, 2958, 0, L"Тыхы"},
+ {62, 2510, 0, L"Другое"},
+ {35, 949, 0, L"Лиссабон"},
+ {35, 950, 0, L"Порто"},
+ {35, 2509, 0, L"Другое"},
+ {63, 952, 0, L"Брашов"},
+ {63, 951, 0, L"Бухарест"},
+ {63, 954, 0, L"Констанца"},
+ {63, 955, 0, L"Плоешти"},
+ {63, 953, 0, L"Яссы"},
+ {63, 2508, 0, L"Другое"},
+ {64, 956, 0, L"Сан-Марино"},
+ {64, 2507, 0, L"Другое"},
+ {74, 957, 0, L"Белград"},
+ {74, 960, 0, L"Ниш"},
+ {74, 958, 0, L"Нови-Сад"},
+ {74, 959, 0, L"Сараево"},
+ {74, 2506, 0, L"Другое"},
+ {65, 961, 0, L"Братислава"},
+ {65, 962, 0, L"Кошице"},
+ {65, 3101, 0, L"Липтов"},
+ {65, 963, 0, L"Попрад"},
+ {65, 964, 0, L"Прешов"},
+ {65, 965, 0, L"Ружемберок"},
+ {65, 966, 0, L"Тврдошин"},
+ {65, 2505, 0, L"Другое"},
+ {66, 968, 0, L"Копар"},
+ {66, 967, 0, L"Любляна"},
+ {66, 969, 0, L"Марибор"},
+ {66, 2504, 0, L"Другое"},
+ {67, 970, 0, L"Торсхавн"},
+ {67, 2503, 0, L"Другое"},
+ {68, 2888, 0, L"Вантаа"},
+ {68, 971, 0, L"Васа"},
+ {68, 979, 0, L"Котка"},
+ {68, 972, 0, L"Коувола"},
+ {68, 980, 0, L"Лахти"},
+ {68, 973, 0, L"Оулу"},
+ {68, 3375, 0, L"Риихимяки"},
+ {68, 3159, 0, L"Руовеси"},
+ {68, 974, 0, L"Тампере"},
+ {68, 975, 0, L"Турку"},
+ {68, 976, 0, L"Хельсинки"},
+ {68, 977, 0, L"Эспо"},
+ {68, 978, 0, L"Ювяскюля"},
+ {68, 2502, 0, L"Другое"},
+ {37, 996, 0, L"Авиньон"},
+ {37, 983, 0, L"Бержерак"},
+ {37, 997, 0, L"Блуа"},
+ {37, 984, 0, L"Бордо"},
+ {37, 998, 0, L"Дижон"},
+ {37, 987, 0, L"Канн"},
+ {37, 988, 0, L"Кастр"},
+ {37, 993, 0, L"Клермон-Ферран"},
+ {37, 3037, 0, L"Лилль"},
+ {37, 989, 0, L"Лион"},
+ {37, 985, 0, L"Марсель"},
+ {37, 991, 0, L"Мец"},
+ {37, 3161, 0, L"Мобеж"},
+ {37, 990, 0, L"Нанси"},
+ {37, 994, 0, L"Нант"},
+ {37, 995, 0, L"Ницца"},
+ {37, 999, 0, L"Орлеан"},
+ {37, 981, 0, L"Париж"},
+ {37, 3374, 0, L"Перпиньян"},
+ {37, 992, 0, L"Руан"},
+ {37, 982, 0, L"Страсбург"},
+ {37, 986, 0, L"Тулуза"},
+ {37, 3314, 0, L"Шамбери"},
+ {37, 2501, 0, L"Другое"},
+ {69, 1003, 0, L"Дубровник"},
+ {69, 1000, 0, L"Загреб"},
+ {69, 1001, 0, L"Задар"},
+ {69, 1004, 0, L"Риека"},
+ {69, 1002, 0, L"Сплит"},
+ {69, 2500, 0, L"Другое"},
+ {70, 1005, 0, L"Брно"},
+ {70, 3291, 0, L"Гавличкув-Брод"},
+ {70, 1007, 0, L"Градец-Кралове"},
+ {70, 1008, 0, L"Карлови-Вари"},
+ {70, 3019, 0, L"Кладрубы"},
+ {70, 1010, 0, L"Лоуни"},
+ {70, 1009, 0, L"Острава"},
+ {70, 1015, 0, L"Пльзень"},
+ {70, 3105, 0, L"Правчицка Брана"},
+ {70, 1006, 0, L"Прага"},
+ {70, 3246, 0, L"Тачов"},
+ {70, 1011, 0, L"Тршебич"},
+ {70, 1012, 0, L"Усти-над-Лабем"},
+ {70, 1014, 0, L"Ческе-Будеевице"},
+ {70, 1013, 0, L"Яблонец-над-Нисоу"},
+ {70, 2499, 0, L"Другое"},
+ {71, 1016, 0, L"Арау"},
+ {71, 1019, 0, L"Баден"},
+ {71, 1017, 0, L"Базель"},
+ {71, 1018, 0, L"Берн"},
+ {71, 1020, 0, L"Биль"},
+ {71, 1021, 0, L"Винтертур"},
+ {71, 1022, 0, L"Давос"},
+ {71, 3189, 0, L"Делемонт"},
+ {71, 1023, 0, L"Женева"},
+ {71, 1024, 0, L"Золотурн"},
+ {71, 1025, 0, L"Лозанна"},
+ {71, 1026, 0, L"Локарно"},
+ {71, 1027, 0, L"Лугано"},
+ {71, 1028, 0, L"Люцерн"},
+ {71, 1029, 0, L"Монтре"},
+ {71, 1030, 0, L"Цюрих"},
+ {71, 2498, 0, L"Другое"},
+ {72, 2883, 0, L"Арбога"},
+ {72, 1031, 0, L"Гетеборг"},
+ {72, 1032, 0, L"Кальмар"},
+ {72, 1037, 0, L"Лахольм"},
+ {72, 1036, 0, L"Лулео"},
+ {72, 1042, 0, L"Лунд"},
+ {72, 1033, 0, L"Мальме"},
+ {72, 1034, 0, L"Стокгольм"},
+ {72, 1041, 0, L"Умео"},
+ {72, 1039, 0, L"Фалун"},
+ {72, 1043, 0, L"Хельсинборг"},
+ {72, 1040, 0, L"Хернесанд"},
+ {72, 1038, 0, L"Эстерсунд"},
+ {72, 2497, 0, L"Другое"},
+ {73, 3013, 0, L"Валга"},
+ {73, 1044, 0, L"Кейла"},
+ {73, 1045, 0, L"Кохтла-Ярве"},
+ {73, 1046, 0, L"Маарду"},
+ {73, 1047, 0, L"Мыйзакюла"},
+ {73, 1048, 0, L"Нарва"},
+ {73, 1049, 0, L"Пярну"},
+ {73, 1050, 0, L"Раквере"},
+ {73, 1051, 0, L"Силламяэ"},
+ {73, 1052, 0, L"Таллин"},
+ {73, 1053, 0, L"Тарту"},
+ {73, 1054, 0, L"Хаапсалу"},
+ {24, 233, 474, L"Алдан"},
+ {24, 233, 2809, L"Верхоянск"},
+ {24, 233, 2804, L"Вилюйск"},
+ {24, 233, 475, L"Ленск"},
+ {24, 233, 477, L"Мирный"},
+ {24, 233, 476, L"Нерюнгри"},
+ {24, 233, 2806, L"Олекминск"},
+ {24, 233, 3115, L"Покровск"},
+ {24, 233, 2808, L"Среднеколымск"},
+ {24, 233, 2807, L"Томмот"},
+ {24, 233, 2805, L"Удачный"},
+ {24, 233, 478, L"Усть-Нера"},
+ {24, 233, 479, L"Якутск"},
+ {24, 233, 2263, L"Другое"},
+ {24, 232, 2819, L"Арсеньев"},
+ {24, 232, 464, L"Артем"},
+ {24, 232, 465, L"Большой Камень"},
+ {24, 232, 466, L"Владивосток"},
+ {24, 232, 2817, L"Дальнегорск"},
+ {24, 232, 2818, L"Дальнереченск"},
+ {24, 232, 3359, L"Кавалерово"},
+ {24, 232, 467, L"Камень-Рыболов"},
+ {24, 232, 468, L"Лесозаводск"},
+ {24, 232, 469, L"Лучегорск"},
+ {24, 232, 470, L"Находка"},
+ {24, 232, 471, L"Партизанск"},
+ {24, 232, 472, L"Пластун"},
+ {24, 232, 2816, L"Спасск-Дальний"},
+ {24, 232, 473, L"Уссурийск"},
+ {24, 232, 2258, L"Другое"},
+ {24, 235, 487, L"Амурск"},
+ {24, 235, 2821, L"Бикин"},
+ {24, 235, 488, L"Ванино"},
+ {24, 235, 2820, L"Вяземский"},
+ {24, 235, 489, L"Комсомольск-на-Амуре"},
+ {24, 235, 490, L"Николаевск-на-Амуре"},
+ {24, 235, 491, L"Советская Гавань"},
+ {24, 235, 3353, L"Солнечный"},
+ {24, 235, 492, L"Хабаровск"},
+ {24, 235, 2280, L"Другое"},
+ {24, 227, 455, L"Белогорск"},
+ {24, 227, 456, L"Благовещенск"},
+ {24, 227, 2814, L"Завитинск"},
+ {24, 227, 2813, L"Зея"},
+ {24, 227, 2815, L"Райчихинск"},
+ {24, 227, 2812, L"Свободный"},
+ {24, 227, 2811, L"Сковородино"},
+ {24, 227, 457, L"Тында"},
+ {24, 227, 2217, L"Шимановск"},
+ {24, 227, 2218, L"Другое"},
+ {24, 229, 460, L"Елизово"},
+ {24, 229, 2822, L"Ключи"},
+ {24, 229, 459, L"Петропавловск-Камч."},
+ {24, 229, 2234, L"Другое"},
+ {24, 231, 462, L"Магадан"},
+ {24, 231, 2823, L"Сусуман"},
+ {24, 231, 463, L"Ягодное"},
+ {24, 231, 2246, L"Другое"},
+ {24, 234, 480, L"Александровск-Сахалинский"},
+ {24, 234, 2829, L"Анива"},
+ {24, 234, 2833, L"Горнозаводск"},
+ {24, 234, 2825, L"Долинск"},
+ {24, 234, 481, L"Корсаков"},
+ {24, 234, 482, L"Красногорск"},
+ {24, 234, 2826, L"Курильск"},
+ {24, 234, 2832, L"Лесогорск"},
+ {24, 234, 2836, L"Макаров"},
+ {24, 234, 2830, L"Невельск"},
+ {24, 234, 483, L"Оха"},
+ {24, 234, 2828, L"Поронайск"},
+ {24, 234, 2824, L"Северо-Курильск"},
+ {24, 234, 2827, L"Томари"},
+ {24, 234, 2831, L"Углегорск"},
+ {24, 234, 484, L"Холмск"},
+ {24, 234, 2834, L"Чехов"},
+ {24, 234, 2835, L"Шахтерск"},
+ {24, 234, 485, L"Южно-Курильск"},
+ {24, 234, 486, L"Южно-Сахалинск"},
+ {24, 234, 2264, L"Другое"},
+ {24, 228, 458, L"Биробиджан"},
+ {24, 228, 2810, L"Облучье"},
+ {24, 228, 2226, L"Другое"},
+ {24, 230, 461, L"Полана"},
+ {24, 230, 2239, L"Другое"},
+ {24, 236, 493, L"Анадырь"},
+ {24, 236, 2287, L"Другое"},
+ {24, 237, 2850, L"Агидель"},
+ {24, 237, 2851, L"Агидель"},
+ {24, 237, 2657, L"Баймак"},
+ {24, 237, 2662, L"Белебей"},
+ {24, 237, 494, L"Белорецк"},
+ {24, 237, 2658, L"Бирск"},
+ {24, 237, 2660, L"Благовещенск"},
+ {24, 237, 2659, L"Давлеканово"},
+ {24, 237, 2663, L"Дюртюли"},
+ {24, 237, 495, L"Ишимбай"},
+ {24, 237, 496, L"Кумертау"},
+ {24, 237, 2655, L"Мелеуз"},
+ {24, 237, 497, L"Нефтекамск"},
+ {24, 237, 2654, L"Октябрьский"},
+ {24, 237, 499, L"Салават"},
+ {24, 237, 2656, L"Сибай"},
+ {24, 237, 498, L"Стерлитамак"},
+ {24, 237, 500, L"Туймазы"},
+ {24, 237, 2661, L"Туймазы"},
+ {24, 237, 501, L"Уфа"},
+ {24, 237, 502, L"Учалы"},
+ {24, 237, 2664, L"Янаул"},
+ {24, 237, 2220, L"Другое"},
+ {24, 240, 509, L"Волжск"},
+ {24, 240, 510, L"Звенигово"},
+ {24, 240, 511, L"Йошкар-Ола"},
+ {24, 240, 512, L"Козьмодемьянск"},
+ {24, 240, 2247, L"Другое"},
+ {24, 241, 513, L"Зубова Поляна"},
+ {24, 241, 2147, L"Инсар"},
+ {24, 241, 2150, L"Ковылкино"},
+ {24, 241, 2148, L"Краснослободск"},
+ {24, 241, 2910, L"Лямбирь"},
+ {24, 241, 515, L"Рузаевка"},
+ {24, 241, 514, L"Саранск"},
+ {24, 241, 2149, L"Темников"},
+ {24, 241, 2923, L"Чамзинка"},
+ {24, 241, 2248, L"Другое"},
+ {24, 248, 2569, L"Агрыз"},
+ {24, 248, 2575, L"Азнакаево"},
+ {24, 248, 569, L"Альметьевск"},
+ {24, 248, 570, L"Апастово"},
+ {24, 248, 2571, L"Болгар"},
+ {24, 248, 571, L"Бугульма"},
+ {24, 248, 2570, L"Буинск"},
+ {24, 248, 572, L"Джалиль"},
+ {24, 248, 573, L"Елабуга"},
+ {24, 248, 2576, L"Заинск"},
+ {24, 248, 574, L"Зеленодольск"},
+ {24, 248, 575, L"Казань"},
+ {24, 248, 2577, L"Лениногорск"},
+ {24, 248, 2572, L"Мамадыш"},
+ {24, 248, 576, L"Менделеевск"},
+ {24, 248, 2573, L"Мензелинск"},
+ {24, 248, 577, L"Набережные Челны"},
+ {24, 248, 578, L"Нижнекамск"},
+ {24, 248, 579, L"Нурлат"},
+ {24, 248, 2574, L"Тетюши"},
+ {24, 248, 580, L"Чистополь"},
+ {24, 248, 2271, L"Другое"},
+ {24, 249, 3311, L"Вавож"},
+ {24, 249, 581, L"Воткинск"},
+ {24, 249, 582, L"Глазов"},
+ {24, 249, 583, L"Игра"},
+ {24, 249, 584, L"Ижевск"},
+ {24, 249, 2665, L"Камбарка"},
+ {24, 249, 585, L"Можга"},
+ {24, 249, 586, L"Сарапул"},
+ {24, 249, 587, L"Ува"},
+ {24, 249, 2277, L"Другое"},
+ {24, 251, 2158, L"Алатырь"},
+ {24, 251, 2156, L"Канаш"},
+ {24, 251, 2151, L"Козловка"},
+ {24, 251, 2152, L"Марьинский Посад"},
+ {24, 251, 2155, L"Новочебоксарск"},
+ {24, 251, 2153, L"Цивильск"},
+ {24, 251, 592, L"Чебоксары"},
+ {24, 251, 2157, L"Шумерля"},
+ {24, 251, 2154, L"Ядрин"},
+ {24, 251, 2286, L"Другое"},
+ {24, 238, 2168, L"Белая Холуница"},
+ {24, 238, 503, L"Вятские Поляны"},
+ {24, 238, 2164, L"Зуевка"},
+ {24, 238, 504, L"Киров"},
+ {24, 238, 505, L"Кирово-Чепецк"},
+ {24, 238, 2160, L"Кирс"},
+ {24, 238, 506, L"Котельнич"},
+ {24, 238, 2167, L"Луза"},
+ {24, 238, 2159, L"Малмыж"},
+ {24, 238, 2169, L"Мураши"},
+ {24, 238, 2163, L"Нолинск"},
+ {24, 238, 2170, L"Омутнинск"},
+ {24, 238, 2166, L"Слободской"},
+ {24, 238, 2165, L"Советск"},
+ {24, 238, 2162, L"Сосновка"},
+ {24, 238, 2171, L"Уржум"},
+ {24, 238, 2161, L"Халтурин"},
+ {24, 238, 507, L"Яранск"},
+ {24, 238, 2237, L"Другое"},
+ {24, 242, 516, L"Арзамас"},
+ {24, 242, 517, L"Балахна"},
+ {24, 242, 2139, L"Богородск"},
+ {24, 242, 518, L"Бор"},
+ {24, 242, 519, L"Вахтан"},
+ {24, 242, 520, L"Ветлуга"},
+ {24, 242, 2140, L"Володарск"},
+ {24, 242, 2138, L"Ворсма"},
+ {24, 242, 521, L"Выкса"},
+ {24, 242, 2137, L"Горбатов"},
+ {24, 242, 522, L"Городец"},
+ {24, 242, 523, L"Дзержинск"},
+ {24, 242, 524, L"Заволжье"},
+ {24, 242, 2891, L"Ильиногорск"},
+ {24, 242, 525, L"Кстово"},
+ {24, 242, 2145, L"Кулебаки"},
+ {24, 242, 2143, L"Лукоянов"},
+ {24, 242, 2144, L"Лысково"},
+ {24, 242, 2146, L"Навашино"},
+ {24, 242, 526, L"Нижний Новгород"},
+ {24, 242, 527, L"Павлово"},
+ {24, 242, 2135, L"Первомайск"},
+ {24, 242, 528, L"Саров"},
+ {24, 242, 529, L"Семенов"},
+ {24, 242, 530, L"Сергач"},
+ {24, 242, 2141, L"Урень"},
+ {24, 242, 2136, L"Чкаловск"},
+ {24, 242, 2897, L"Шатки"},
+ {24, 242, 2142, L"Шахунья"},
+ {24, 242, 2251, L"Другое"},
+ {24, 243, 2678, L"Абдулино"},
+ {24, 243, 2673, L"Бугуруслан"},
+ {24, 243, 531, L"Бузулук"},
+ {24, 243, 532, L"Гай"},
+ {24, 243, 2674, L"Кувандык"},
+ {24, 243, 2675, L"Медногорск"},
+ {24, 243, 533, L"Новотроицк"},
+ {24, 243, 535, L"Оренбург"},
+ {24, 243, 536, L"Орск"},
+ {24, 243, 3360, L"Саракташ"},
+ {24, 243, 2677, L"Соль-Илецк"},
+ {24, 243, 2676, L"Сорочинск"},
+ {24, 243, 537, L"Тоцкое"},
+ {24, 243, 538, L"Ясный"},
+ {24, 243, 2254, L"Другое"},
+ {24, 244, 539, L"Беднодемьяновск"},
+ {24, 244, 2597, L"Белинский"},
+ {24, 244, 2595, L"Городище"},
+ {24, 244, 2593, L"Каменка"},
+ {24, 244, 540, L"Кузнецк"},
+ {24, 244, 2598, L"Нижний Ломов"},
+ {24, 244, 2592, L"Никольск"},
+ {24, 244, 541, L"Пенза"},
+ {24, 244, 3304, L"Русский Камешкир"},
+ {24, 244, 2596, L"Сердобск"},
+ {24, 244, 2594, L"Сурск"},
+ {24, 244, 2256, L"Другое"},
+ {24, 245, 2690, L"Александровск"},
+ {24, 245, 542, L"Березники"},
+ {24, 245, 2679, L"Верещагино"},
+ {24, 245, 2680, L"Горнозаводск"},
+ {24, 245, 2687, L"Гремячинск"},
+ {24, 245, 2686, L"Губаха"},
+ {24, 245, 543, L"Добрянка"},
+ {24, 245, 544, L"Кизел"},
+ {24, 245, 2681, L"Красновишерск"},
+ {24, 245, 545, L"Краснокамск"},
+ {24, 245, 546, L"Кунгур"},
+ {24, 245, 547, L"Лысьва"},
+ {24, 245, 548, L"Нытва"},
+ {24, 245, 2683, L"Оса"},
+ {24, 245, 2684, L"Оханск"},
+ {24, 245, 2682, L"Очер"},
+ {24, 245, 549, L"Пермь"},
+ {24, 245, 550, L"Соликамск"},
+ {24, 245, 2685, L"Усолье"},
+ {24, 245, 551, L"Чайковский"},
+ {24, 245, 2689, L"Чердынь"},
+ {24, 245, 2688, L"Чермоз"},
+ {24, 245, 552, L"Чернушка"},
+ {24, 245, 553, L"Чусовой"},
+ {24, 245, 2257, L"Другое"},
+ {24, 246, 554, L"Волжский"},
+ {24, 246, 555, L"Жигулевск"},
+ {24, 246, 2599, L"Кинель"},
+ {24, 246, 3293, L"Красный Яр"},
+ {24, 246, 2602, L"Нефтегорск"},
+ {24, 246, 556, L"Новокуйбышевск"},
+ {24, 246, 2600, L"Октябрьск"},
+ {24, 246, 557, L"Отрадный"},
+ {24, 246, 558, L"Похвистнево"},
+ {24, 246, 559, L"Самара"},
+ {24, 246, 560, L"Сызрань"},
+ {24, 246, 561, L"Тольятти"},
+ {24, 246, 2601, L"Чапаевск"},
+ {24, 246, 562, L"Шигоны"},
+ {24, 246, 2261, L"Другое"},
+ {24, 247, 2613, L"Аркадак"},
+ {24, 247, 2606, L"Аткарск"},
+ {24, 247, 563, L"Балаково"},
+ {24, 247, 564, L"Балашов"},
+ {24, 247, 565, L"Вольск"},
+ {24, 247, 2608, L"Ершов"},
+ {24, 247, 2607, L"Калининск"},
+ {24, 247, 2609, L"Красноармейск"},
+ {24, 247, 2610, L"Красный Кут"},
+ {24, 247, 2605, L"Маркс"},
+ {24, 247, 566, L"Новоузенск"},
+ {24, 247, 2603, L"Петровск"},
+ {24, 247, 2604, L"Пугачев"},
+ {24, 247, 2612, L"Ртищево"},
+ {24, 247, 567, L"Саратов"},
+ {24, 247, 2611, L"Хвалынск"},
+ {24, 247, 568, L"Энгельс"},
+ {24, 247, 3267, L"Энгельс-12"},
+ {24, 247, 2262, L"Другое"},
+ {24, 250, 2614, L"Барыш"},
+ {24, 250, 588, L"Димитровград"},
+ {24, 250, 2615, L"Инза"},
+ {24, 250, 589, L"Новоспасское"},
+ {24, 250, 2616, L"Новоульяновск"},
+ {24, 250, 590, L"Сенгилей"},
+ {24, 250, 591, L"Ульяновск"},
+ {24, 250, 2278, L"Другое"},
+ {24, 239, 508, L"Кудымкар"},
+ {24, 239, 2238, L"Другое"},
+ {24, 255, 1355, L"Беломорск"},
+ {24, 255, 1356, L"Кемь"},
+ {24, 255, 1357, L"Кондопога"},
+ {24, 255, 1358, L"Костомукша"},
+ {24, 255, 1359, L"Коткозеро"},
+ {24, 255, 1360, L"Лахденпохья"},
+ {24, 255, 1362, L"Лоухи"},
+ {24, 255, 1361, L"Медвежьегорск"},
+ {24, 255, 3286, L"Муезерский"},
+ {24, 255, 1937, L"Олонец"},
+ {24, 255, 1363, L"Петрозаводск"},
+ {24, 255, 1938, L"Питкяранта"},
+ {24, 255, 3287, L"Пряжа"},
+ {24, 255, 1936, L"Пудож"},
+ {24, 255, 1364, L"Сегежа"},
+ {24, 255, 1365, L"Сортавала"},
+ {24, 255, 1939, L"Суоярви"},
+ {24, 255, 2201, L"Другое"},
+ {24, 256, 1366, L"Воркута"},
+ {24, 256, 1367, L"Вуктыл"},
+ {24, 256, 2202, L"Емва"},
+ {24, 256, 1368, L"Инта"},
+ {24, 256, 1940, L"Микунь"},
+ {24, 256, 1369, L"Печора"},
+ {24, 256, 1941, L"Сосногорск"},
+ {24, 256, 1370, L"Сыктывкар"},
+ {24, 256, 1371, L"Усинск"},
+ {24, 256, 1372, L"Ухта"},
+ {24, 256, 2203, L"Другое"},
+ {24, 252, 593, L"Архангельск"},
+ {24, 252, 594, L"Вельск"},
+ {24, 252, 1945, L"Каргополь"},
+ {24, 252, 595, L"Коряжма"},
+ {24, 252, 596, L"Котлас"},
+ {24, 252, 1944, L"Мезень"},
+ {24, 252, 597, L"Мирный"},
+ {24, 252, 598, L"Новодвинск"},
+ {24, 252, 1946, L"Няндома"},
+ {24, 252, 599, L"Онега"},
+ {24, 252, 600, L"Пинега"},
+ {24, 252, 601, L"Северодвинск"},
+ {24, 252, 1942, L"Сольвычегодск"},
+ {24, 252, 3239, L"Холмогоры"},
+ {24, 252, 1943, L"Шенкурск"},
+ {24, 252, 2204, L"Другое"},
+ {24, 253, 1950, L"Бабаево"},
+ {24, 253, 1949, L"Белозерск"},
+ {24, 253, 1338, L"Великий Устюг"},
+ {24, 253, 1339, L"Вологда"},
+ {24, 253, 1951, L"Вытегра"},
+ {24, 253, 1340, L"Грязовец"},
+ {24, 253, 1952, L"Кадников"},
+ {24, 253, 2871, L"Кадуй"},
+ {24, 253, 1341, L"Кириллов"},
+ {24, 253, 1955, L"Красавино"},
+ {24, 253, 1342, L"Михайловка"},
+ {24, 253, 1947, L"Никольск"},
+ {24, 253, 1343, L"Сокол"},
+ {24, 253, 1953, L"Тотьма"},
+ {24, 253, 1954, L"Устюжна"},
+ {24, 253, 1948, L"Харовск"},
+ {24, 253, 1344, L"Череповец"},
+ {24, 253, 2205, L"Другое"},
+ {24, 254, 2838, L"Багратионовск"},
+ {24, 254, 1345, L"Балтийск"},
+ {24, 254, 2846, L"Гвардейск"},
+ {24, 254, 2843, L"Гурьевск"},
+ {24, 254, 1346, L"Гусев"},
+ {24, 254, 1347, L"Зеленоградск"},
+ {24, 254, 1348, L"Калининград"},
+ {24, 254, 2842, L"Краснознаменск"},
+ {24, 254, 2845, L"Ладушкин"},
+ {24, 254, 2848, L"Мамоново"},
+ {24, 254, 2837, L"Неман"},
+ {24, 254, 2844, L"Нестеров"},
+ {24, 254, 1349, L"Озерск"},
+ {24, 254, 2841, L"Полесск"},
+ {24, 254, 2839, L"Правдинск"},
+ {24, 254, 1350, L"Приморск"},
+ {24, 254, 1351, L"Светлогорск"},
+ {24, 254, 1352, L"Светлый"},
+ {24, 254, 2840, L"Славск"},
+ {24, 254, 1353, L"Советск"},
+ {24, 254, 1354, L"Черняховск"},
+ {24, 254, 2231, L"Другое"},
+ {24, 257, 1985, L"Бокситогорск"},
+ {24, 257, 1374, L"Волхов"},
+ {24, 257, 1373, L"Всеволожск"},
+ {24, 257, 1375, L"Выборг"},
+ {24, 257, 1995, L"Высоцк"},
+ {24, 257, 1376, L"Гатчина"},
+ {24, 257, 1378, L"Ивангород"},
+ {24, 257, 1993, L"Каменногорск"},
+ {24, 257, 1379, L"Кингисепп"},
+ {24, 257, 1380, L"Кириши"},
+ {24, 257, 1381, L"Кировск"},
+ {24, 257, 1384, L"Кузьмоловский"},
+ {24, 257, 1984, L"Лодейное Поле"},
+ {24, 257, 1990, L"Луга"},
+ {24, 257, 1994, L"Любань"},
+ {24, 257, 1386, L"Никольское"},
+ {24, 257, 1987, L"Новая Ладога"},
+ {24, 257, 1996, L"Отрадное"},
+ {24, 257, 1986, L"Пикалево"},
+ {24, 257, 1983, L"Подпорожье"},
+ {24, 257, 1992, L"Приморск"},
+ {24, 257, 1988, L"Приозерск"},
+ {24, 257, 3071, L"Пушкин"},
+ {24, 257, 1989, L"Светогорск"},
+ {24, 257, 1389, L"Сертолово"},
+ {24, 257, 1991, L"Сланцы"},
+ {24, 257, 1391, L"Сосновый Бор"},
+ {24, 257, 1392, L"Тихвин"},
+ {24, 257, 1393, L"Тосно"},
+ {24, 257, 1394, L"Шлиссельбург"},
+ {24, 257, 2207, L"Другое"},
+ {24, 258, 1395, L"Апатиты"},
+ {24, 258, 1959, L"Заполярный"},
+ {24, 258, 1396, L"Зареченск"},
+ {24, 258, 1397, L"Кандалакша"},
+ {24, 258, 1398, L"Кировск"},
+ {24, 258, 1399, L"Ковдор"},
+ {24, 258, 1958, L"Кола"},
+ {24, 258, 1400, L"Мончегорск"},
+ {24, 258, 1401, L"Мурманск"},
+ {24, 258, 1402, L"Мурмаши"},
+ {24, 258, 1403, L"Оленегорск"},
+ {24, 258, 1404, L"Полярные Зори"},
+ {24, 258, 1956, L"Полярный"},
+ {24, 258, 1957, L"Североморск"},
+ {24, 258, 3288, L"Снежногорск"},
+ {24, 258, 2206, L"Другое"},
+ {24, 260, 1406, L"Батецкий"},
+ {24, 260, 2001, L"Боровичи"},
+ {24, 260, 2003, L"Валдай"},
+ {24, 260, 1407, L"Великий Новгород"},
+ {24, 260, 1408, L"Крестцы"},
+ {24, 260, 2002, L"Малая Вишера"},
+ {24, 260, 1409, L"Окуловка"},
+ {24, 260, 2000, L"Пестово"},
+ {24, 260, 1997, L"Сольцы"},
+ {24, 260, 1410, L"Старая Русса"},
+ {24, 260, 1998, L"Холм"},
+ {24, 260, 1999, L"Чудово"},
+ {24, 260, 2208, L"Другое"},
+ {24, 261, 1412, L"Великие Луки"},
+ {24, 261, 2004, L"Гдов"},
+ {24, 261, 2009, L"Дно"},
+ {24, 261, 2005, L"Невель"},
+ {24, 261, 1413, L"Новоржев"},
+ {24, 261, 2006, L"Опочка"},
+ {24, 261, 2008, L"Остров"},
+ {24, 261, 1414, L"Печоры"},
+ {24, 261, 1415, L"Порхов"},
+ {24, 261, 1411, L"Псков"},
+ {24, 261, 1416, L"Пустошка"},
+ {24, 261, 2007, L"Пыталово"},
+ {24, 261, 1417, L"Себеж"},
+ {24, 261, 2209, L"Другое"},
+ {24, 259, 1405, L"Нарьян-Мар"},
+ {24, 259, 2250, L"Другое"},
+ {24, 265, 2764, L"Бабушкин"},
+ {24, 265, 2760, L"Гусиноозерск"},
+ {24, 265, 2762, L"Закаменск"},
+ {24, 265, 2763, L"Кяхта"},
+ {24, 265, 2761, L"Северобайкальск"},
+ {24, 265, 1446, L"Улан-Удэ"},
+ {24, 265, 2222, L"Другое"},
+ {24, 263, 1439, L"Горно-Алтайск"},
+ {24, 263, 2215, L"Другое"},
+ {24, 273, 2766, L"Ак-Довурак"},
+ {24, 273, 1494, L"Кызыл"},
+ {24, 273, 2768, L"Новый Шагонар"},
+ {24, 273, 2767, L"Туран"},
+ {24, 273, 2765, L"Чадан"},
+ {24, 273, 2275, L"Другое"},
+ {24, 275, 2769, L"Абаза"},
+ {24, 275, 1496, L"Абакан"},
+ {24, 275, 1497, L"Саяногорск"},
+ {24, 275, 2770, L"Сорск"},
+ {24, 275, 2771, L"Черногорск"},
+ {24, 275, 2281, L"Другое"},
+ {24, 264, 1440, L"Алейск"},
+ {24, 264, 1441, L"Барнаул"},
+ {24, 264, 1442, L"Белокуриха"},
+ {24, 264, 1443, L"Бийск"},
+ {24, 264, 2728, L"Горняк"},
+ {24, 264, 2731, L"Заринск"},
+ {24, 264, 2729, L"Змеиногорск"},
+ {24, 264, 2732, L"Камень-на-Оби"},
+ {24, 264, 3292, L"Кулунда"},
+ {24, 264, 2730, L"Новоалтайск"},
+ {24, 264, 1444, L"Рубцовск"},
+ {24, 264, 1445, L"Славгород"},
+ {24, 264, 3231, L"Яровое"},
+ {24, 264, 2216, L"Другое"},
+ {24, 268, 2781, L"Артемовск"},
+ {24, 268, 1469, L"Ачинск"},
+ {24, 268, 2784, L"Боготол"},
+ {24, 268, 2773, L"Бородино"},
+ {24, 268, 2774, L"Дивногорск"},
+ {24, 268, 3122, L"Емельяновск"},
+ {24, 268, 2772, L"Енисейск"},
+ {24, 268, 3294, L"Железногорск"},
+ {24, 268, 2777, L"Заозерный"},
+ {24, 268, 1470, L"Игарка"},
+ {24, 268, 2778, L"Иланский"},
+ {24, 268, 2782, L"Канск"},
+ {24, 268, 2783, L"Кодинский"},
+ {24, 268, 1471, L"Красноярск"},
+ {24, 268, 1472, L"Лесосибирск"},
+ {24, 268, 1473, L"Минусинск"},
+ {24, 268, 2775, L"Назарово"},
+ {24, 268, 2776, L"Сосновоборск"},
+ {24, 268, 2780, L"Ужур"},
+ {24, 268, 2779, L"Уяр"},
+ {24, 268, 2785, L"Шарыпово"},
+ {24, 268, 1474, L"Шушенское"},
+ {24, 268, 2242, L"Другое"},
+ {24, 266, 2792, L"Алзамай"},
+ {24, 266, 1447, L"Ангарск"},
+ {24, 266, 1448, L"Байкальск"},
+ {24, 266, 2791, L"Бирюсинск"},
+ {24, 266, 1450, L"Бодайбо"},
+ {24, 266, 1451, L"Братск"},
+ {24, 266, 2793, L"Вихоревка"},
+ {24, 266, 2789, L"Железногорск-Илимский"},
+ {24, 266, 2786, L"Зима"},
+ {24, 266, 1452, L"Иркутск"},
+ {24, 266, 2794, L"Киренск"},
+ {24, 266, 2787, L"Нижнеудинск"},
+ {24, 266, 1449, L"Саянск"},
+ {24, 266, 2790, L"Свирск"},
+ {24, 266, 1453, L"Слюдянка"},
+ {24, 266, 2788, L"Тайшет"},
+ {24, 266, 1454, L"Тулун"},
+ {24, 266, 1455, L"Усолье-Сибирское"},
+ {24, 266, 2908, L"Усольск"},
+ {24, 266, 1456, L"Усть-Илимск"},
+ {24, 266, 1457, L"Усть-Кут"},
+ {24, 266, 1458, L"Хужир"},
+ {24, 266, 1459, L"Черемхово"},
+ {24, 266, 2795, L"Шелехов"},
+ {24, 266, 2229, L"Другое"},
+ {24, 267, 2737, L"Анжеро-Суджинск"},
+ {24, 267, 2740, L"Белово"},
+ {24, 267, 2746, L"Березовский"},
+ {24, 267, 2739, L"Гурьевск"},
+ {24, 267, 2742, L"Калтан"},
+ {24, 267, 1460, L"Кемерово"},
+ {24, 267, 1461, L"Киселевск"},
+ {24, 267, 2738, L"Ленинск-Кузнецкий"},
+ {24, 267, 2745, L"Мариинск"},
+ {24, 267, 1462, L"Междуреченск"},
+ {24, 267, 1463, L"Мыски"},
+ {24, 267, 1464, L"Новокузнецк"},
+ {24, 267, 2744, L"Осинники"},
+ {24, 267, 3358, L"Полысаево"},
+ {24, 267, 1465, L"Прокопьевск"},
+ {24, 267, 1466, L"Салаир"},
+ {24, 267, 2743, L"Тайга"},
+ {24, 267, 2741, L"Таштагол"},
+ {24, 267, 1467, L"Топки"},
+ {24, 267, 1468, L"Юрга"},
+ {24, 267, 2236, L"Другое"},
+ {24, 269, 1475, L"Баган"},
+ {24, 269, 1476, L"Барабинск"},
+ {24, 269, 1477, L"Бердск"},
+ {24, 269, 2750, L"Болотное"},
+ {24, 269, 1478, L"Искитим"},
+ {24, 269, 2752, L"Карасук"},
+ {24, 269, 2751, L"Каргат"},
+ {24, 269, 3107, L"Краснообск"},
+ {24, 269, 2753, L"Куйбышев"},
+ {24, 269, 2755, L"Купино"},
+ {24, 269, 1479, L"Новосибирск"},
+ {24, 269, 2759, L"Обь"},
+ {24, 269, 2756, L"Татарск"},
+ {24, 269, 2758, L"Тогучин"},
+ {24, 269, 2757, L"Черепаново"},
+ {24, 269, 2754, L"Чулым"},
+ {24, 269, 2252, L"Другое"},
+ {24, 270, 2733, L"Исилькуль"},
+ {24, 270, 1480, L"Калачинск"},
+ {24, 270, 1481, L"Марьяновка"},
+ {24, 270, 2735, L"Называевск"},
+ {24, 270, 1482, L"Омск"},
+ {24, 270, 2734, L"Тара"},
+ {24, 270, 2736, L"Тюкалинск"},
+ {24, 270, 2253, L"Другое"},
+ {24, 272, 1488, L"Асино"},
+ {24, 272, 1489, L"Белый Яр"},
+ {24, 272, 3295, L"Каргасок"},
+ {24, 272, 1491, L"Колпашево"},
+ {24, 272, 1492, L"Северск"},
+ {24, 272, 1493, L"Стрежевой"},
+ {24, 272, 1490, L"Томск"},
+ {24, 272, 2273, L"Другое"},
+ {24, 276, 2803, L"Балей"},
+ {24, 276, 2799, L"Борзя"},
+ {24, 276, 1499, L"Краснокаменск"},
+ {24, 276, 2801, L"Могоча"},
+ {24, 276, 2800, L"Нерчинск"},
+ {24, 276, 2802, L"Петровск-Забайкальский"},
+ {24, 276, 2798, L"Сретенск"},
+ {24, 276, 2796, L"Хилок"},
+ {24, 276, 1498, L"Чита"},
+ {24, 276, 2797, L"Шилка"},
+ {24, 276, 2285, L"Другое"},
+ {24, 262, 1438, L"Агинское"},
+ {24, 262, 2213, L"Другое"},
+ {24, 271, 3233, L"Диксон"},
+ {24, 271, 1485, L"Дудинка"},
+ {24, 271, 1487, L"Кайеркан"},
+ {24, 271, 1483, L"Норильск"},
+ {24, 271, 1484, L"Талнах"},
+ {24, 271, 1486, L"Хатанга"},
+ {24, 271, 2269, L"Другое"},
+ {24, 274, 1495, L"Усть-Ордынский"},
+ {24, 274, 2279, L"Другое"},
+ {24, 277, 1500, L"Тура"},
+ {24, 277, 2288, L"Другое"},
+ {24, 278, 2668, L"Далматово"},
+ {24, 278, 2667, L"Катайск"},
+ {24, 278, 1524, L"Курган"},
+ {24, 278, 2669, L"Куртамыш"},
+ {24, 278, 2666, L"Макушино"},
+ {24, 278, 2671, L"Петухово"},
+ {24, 278, 1525, L"Шадринск"},
+ {24, 278, 2670, L"Шумиха"},
+ {24, 278, 2672, L"Щучье"},
+ {24, 278, 2243, L"Другое"},
+ {24, 279, 1526, L"Алапаевск"},
+ {24, 279, 1527, L"Арамиль"},
+ {24, 279, 2691, L"Артемовский"},
+ {24, 279, 1528, L"Асбест"},
+ {24, 279, 2924, L"Белоярский"},
+ {24, 279, 2707, L"Березовский"},
+ {24, 279, 1529, L"Богданович"},
+ {24, 279, 2698, L"Верхний Тагил"},
+ {24, 279, 1530, L"Верхняя Пышма"},
+ {24, 279, 1531, L"Верхняя Салда"},
+ {24, 279, 1532, L"Верхняя Синячиха"},
+ {24, 279, 2696, L"Верхняя Тура"},
+ {24, 279, 2692, L"Верхотурье"},
+ {24, 279, 2706, L"Волчанск"},
+ {24, 279, 2709, L"Дегтярск"},
+ {24, 279, 1533, L"Екатеринбург"},
+ {24, 279, 1534, L"Заречный"},
+ {24, 279, 1535, L"Ивдель"},
+ {24, 279, 1536, L"Ирбит"},
+ {24, 279, 1537, L"Каменск-Уральский"},
+ {24, 279, 1538, L"Камышлов"},
+ {24, 279, 2708, L"Карпинск"},
+ {24, 279, 1539, L"Качканар"},
+ {24, 279, 2712, L"Кировград"},
+ {24, 279, 1540, L"Краснотурьинск"},
+ {24, 279, 2694, L"Красноуральск"},
+ {24, 279, 2693, L"Красноуфимск"},
+ {24, 279, 1541, L"Кушва"},
+ {24, 279, 2711, L"Михайловск"},
+ {24, 279, 2713, L"Михайловск"},
+ {24, 279, 1542, L"Невьянск"},
+ {24, 279, 2702, L"Нижние Серги"},
+ {24, 279, 1543, L"Нижний Тагил"},
+ {24, 279, 2695, L"Нижняя Салда"},
+ {24, 279, 2697, L"Нижняя Тура"},
+ {24, 279, 2699, L"Новая Ляля"},
+ {24, 279, 2909, L"Новоуральск"},
+ {24, 279, 1544, L"Первоуральск"},
+ {24, 279, 1545, L"Полевской"},
+ {24, 279, 1546, L"Ревда"},
+ {24, 279, 1547, L"Реж"},
+ {24, 279, 3296, L"Рефтинский"},
+ {24, 279, 2700, L"Североуральск"},
+ {24, 279, 1548, L"Серов"},
+ {24, 279, 2710, L"Среднеуральск"},
+ {24, 279, 2701, L"Сухой Лог"},
+ {24, 279, 2703, L"Сысерть"},
+ {24, 279, 1549, L"Тавда"},
+ {24, 279, 2704, L"Талица"},
+ {24, 279, 2705, L"Туринск"},
+ {24, 279, 2265, L"Другое"},
+ {24, 280, 1550, L"Заводоуковск"},
+ {24, 280, 1551, L"Ишим"},
+ {24, 280, 3326, L"Сургут"},
+ {24, 280, 1552, L"Тобольск"},
+ {24, 280, 1553, L"Тюмень"},
+ {24, 280, 2748, L"Ялуторовск"},
+ {24, 280, 2276, L"Другое"},
+ {24, 282, 1564, L"Аша"},
+ {24, 282, 2723, L"Бакал"},
+ {24, 282, 2724, L"Верхнеуральск"},
+ {24, 282, 2716, L"Верхний Уфалей"},
+ {24, 282, 3297, L"Всеволожск"},
+ {24, 282, 2725, L"Еманжелинск"},
+ {24, 282, 1565, L"Златоуст"},
+ {24, 282, 2722, L"Карабаш"},
+ {24, 282, 1566, L"Карталы"},
+ {24, 282, 2718, L"Касли"},
+ {24, 282, 2720, L"Катав-Ивановск"},
+ {24, 282, 1567, L"Копейск"},
+ {24, 282, 2721, L"Коркино"},
+ {24, 282, 2715, L"Куса"},
+ {24, 282, 1568, L"Кыштым"},
+ {24, 282, 1569, L"Магнитогорск"},
+ {24, 282, 1570, L"Миасс"},
+ {24, 282, 2726, L"Миньяр"},
+ {24, 282, 2717, L"Нязепетровск"},
+ {24, 282, 3100, L"Озерск"},
+ {24, 282, 1571, L"Пласт"},
+ {24, 282, 2719, L"Сатка"},
+ {24, 282, 2727, L"Сим"},
+ {24, 282, 1572, L"Снежинск"},
+ {24, 282, 3332, L"Трехгорный"},
+ {24, 282, 1573, L"Троицк"},
+ {24, 282, 1574, L"Усть-Катав"},
+ {24, 282, 1575, L"Чебаркуль"},
+ {24, 282, 1576, L"Челябинск"},
+ {24, 282, 1577, L"Южноуральск"},
+ {24, 282, 2714, L"Юрюзань"},
+ {24, 282, 2283, L"Другое"},
+ {24, 281, 2749, L"Белоярский"},
+ {24, 281, 1554, L"Игрим"},
+ {24, 281, 1555, L"Когалым"},
+ {24, 281, 1556, L"Лангепас"},
+ {24, 281, 1561, L"Мегион"},
+ {24, 281, 1562, L"Нефтеюганск"},
+ {24, 281, 1559, L"Нижневартовск"},
+ {24, 281, 2852, L"Нягань"},
+ {24, 281, 2853, L"Нягань"},
+ {24, 281, 2854, L"Пыть-Ях"},
+ {24, 281, 1560, L"Радужный"},
+ {24, 281, 1563, L"Советский"},
+ {24, 281, 2747, L"Сургут"},
+ {24, 281, 1557, L"Урай"},
+ {24, 281, 1558, L"Ханты-Мансийск"},
+ {24, 281, 3344, L"Югорск"},
+ {24, 281, 2282, L"Другое"},
+ {24, 283, 3298, L"Губкинский"},
+ {24, 283, 1578, L"Лабытнанги"},
+ {24, 283, 2856, L"Муравленко"},
+ {24, 283, 1579, L"Надым"},
+ {24, 283, 1580, L"Новый Уренгой"},
+ {24, 283, 1581, L"Ноябрьск"},
+ {24, 283, 1582, L"Салехард"},
+ {24, 283, 1583, L"Уренгой"},
+ {24, 283, 2289, L"Другое"},
+ {24, 284, 1625, L"Алексеевка"},
+ {24, 284, 1626, L"Белгород"},
+ {24, 284, 2172, L"Валуйки"},
+ {24, 284, 2173, L"Грайворон"},
+ {24, 284, 1627, L"Губкин"},
+ {24, 284, 2174, L"Короча"},
+ {24, 284, 2175, L"Новый Оскол"},
+ {24, 284, 1628, L"Старый Оскол"},
+ {24, 284, 1629, L"Шебекино"},
+ {24, 284, 2221, L"Другое"},
+ {24, 285, 1630, L"Брянск"},
+ {24, 285, 3283, L"Дебрянск"},
+ {24, 285, 1631, L"Дятьково"},
+ {24, 285, 2013, L"Жуковка"},
+ {24, 285, 2015, L"Злынка"},
+ {24, 285, 1632, L"Карачев"},
+ {24, 285, 1633, L"Клинцы"},
+ {24, 285, 1634, L"Мглин"},
+ {24, 285, 2016, L"Новозыбков"},
+ {24, 285, 2018, L"Почеп"},
+ {24, 285, 2017, L"Севск"},
+ {24, 285, 2020, L"Сельцо"},
+ {24, 285, 2014, L"Стародуб"},
+ {24, 285, 2010, L"Сураж"},
+ {24, 285, 2012, L"Трубчевск"},
+ {24, 285, 2011, L"Унеча"},
+ {24, 285, 2019, L"Фокино"},
+ {24, 285, 2210, L"Другое"},
+ {24, 286, 1635, L"Александров"},
+ {24, 286, 1636, L"Владимир"},
+ {24, 286, 2021, L"Вязники"},
+ {24, 286, 1637, L"Головино"},
+ {24, 286, 2022, L"Гороховец"},
+ {24, 286, 1638, L"Гусь-Хрустальный"},
+ {24, 286, 2023, L"Камешково"},
+ {24, 286, 2031, L"Карабаново"},
+ {24, 286, 2024, L"Киржач"},
+ {24, 286, 1639, L"Ковров"},
+ {24, 286, 1640, L"Кольчугино"},
+ {24, 286, 2026, L"Костерево"},
+ {24, 286, 3299, L"Красная Горбатка"},
+ {24, 286, 2033, L"Лакинск"},
+ {24, 286, 2025, L"Меленки"},
+ {24, 286, 1641, L"Муром"},
+ {24, 286, 1642, L"Петушки"},
+ {24, 286, 2027, L"Покров"},
+ {24, 286, 2211, L"Радужный"},
+ {24, 286, 2028, L"Собинка"},
+ {24, 286, 2032, L"Струнино"},
+ {24, 286, 2029, L"Судогда"},
+ {24, 286, 1643, L"Суздаль"},
+ {24, 286, 2030, L"Юрьев-Польский"},
+ {24, 286, 2212, L"Другое"},
+ {24, 287, 1644, L"Бобров"},
+ {24, 287, 1645, L"Богучар"},
+ {24, 287, 1646, L"Борисоглебск"},
+ {24, 287, 1647, L"Бутурлиновка"},
+ {24, 287, 1648, L"Воронеж"},
+ {24, 287, 2178, L"Калач"},
+ {24, 287, 2176, L"Лиски"},
+ {24, 287, 1649, L"Нововоронеж"},
+ {24, 287, 2177, L"Новохоперск"},
+ {24, 287, 2180, L"Острогожск"},
+ {24, 287, 1650, L"Павловск"},
+ {24, 287, 2181, L"Поворино"},
+ {24, 287, 1651, L"Россошь"},
+ {24, 287, 2179, L"Семилуки"},
+ {24, 287, 2182, L"Эртиль"},
+ {24, 287, 2224, L"Другое"},
+ {24, 288, 1652, L"Вичуга"},
+ {24, 288, 2036, L"Гаврилов Посад"},
+ {24, 288, 1657, L"Заволжск"},
+ {24, 288, 1653, L"Иваново"},
+ {24, 288, 1656, L"Кинешма"},
+ {24, 288, 2040, L"Комсомольск"},
+ {24, 288, 2037, L"Кохма"},
+ {24, 288, 2043, L"Наволоки"},
+ {24, 288, 3300, L"Палех"},
+ {24, 288, 2039, L"Плес"},
+ {24, 288, 2038, L"Приволжск"},
+ {24, 288, 2042, L"Пучеж"},
+ {24, 288, 2044, L"Родники"},
+ {24, 288, 1655, L"Тейково"},
+ {24, 288, 2034, L"Фурманов"},
+ {24, 288, 1654, L"Шуя"},
+ {24, 288, 2041, L"Южа"},
+ {24, 288, 2035, L"Юрьевец"},
+ {24, 288, 2227, L"Другое"},
+ {24, 289, 2050, L"Балабаново"},
+ {24, 289, 2051, L"Боровск"},
+ {24, 289, 3301, L"Воротынск"},
+ {24, 289, 2052, L"Жиздра"},
+ {24, 289, 1660, L"Жуковка"},
+ {24, 289, 1658, L"Калуга"},
+ {24, 289, 2046, L"Киров"},
+ {24, 289, 1661, L"Козельск"},
+ {24, 289, 2053, L"Кондрово"},
+ {24, 289, 2049, L"Людиново"},
+ {24, 289, 1659, L"Малоярославец"},
+ {24, 289, 2054, L"Медынь"},
+ {24, 289, 2055, L"Мещовск"},
+ {24, 289, 2047, L"Мосальск"},
+ {24, 289, 1662, L"Обнинск"},
+ {24, 289, 2057, L"Сосенский"},
+ {24, 289, 2056, L"Спас-Демянск"},
+ {24, 289, 2045, L"Сухиничи"},
+ {24, 289, 1663, L"Таруса"},
+ {24, 289, 2131, L"Чекалин"},
+ {24, 289, 2048, L"Юхнов"},
+ {24, 289, 2233, L"Другое"},
+ {24, 290, 1664, L"Буй"},
+ {24, 290, 1665, L"Волгореченск"},
+ {24, 290, 1666, L"Галич"},
+ {24, 290, 2059, L"Кологрив"},
+ {24, 290, 1667, L"Кострома"},
+ {24, 290, 3302, L"Красное-на-Волге"},
+ {24, 290, 1668, L"Макарьев"},
+ {24, 290, 2060, L"Мантурово"},
+ {24, 290, 1669, L"Нерехта"},
+ {24, 290, 2061, L"Нея"},
+ {24, 290, 2062, L"Солигалич"},
+ {24, 290, 2058, L"Чухлома"},
+ {24, 290, 1670, L"Шарья"},
+ {24, 290, 2240, L"Другое"},
+ {24, 291, 1671, L"Дмитриев-Льговский"},
+ {24, 291, 1673, L"Железногорск"},
+ {24, 291, 3279, L"Железногорск"},
+ {24, 291, 1672, L"Курск"},
+ {24, 291, 2187, L"Курчатов"},
+ {24, 291, 2188, L"Льгов"},
+ {24, 291, 2184, L"Обоянь"},
+ {24, 291, 2185, L"Рыльск"},
+ {24, 291, 2183, L"Суджа"},
+ {24, 291, 2189, L"Фатеж"},
+ {24, 291, 2186, L"Щигры"},
+ {24, 291, 2244, L"Другое"},
+ {24, 292, 2194, L"Грязи"},
+ {24, 292, 2193, L"Данков"},
+ {24, 292, 1674, L"Елец"},
+ {24, 292, 2190, L"Задонск"},
+ {24, 292, 2195, L"Лебедянь"},
+ {24, 292, 1675, L"Липецк"},
+ {24, 292, 2192, L"Усмань"},
+ {24, 292, 2191, L"Чаплыгин"},
+ {24, 292, 2245, L"Другое"},
+ {24, 293, 1733, L"Апрелевка"},
+ {24, 293, 1732, L"Балашиха"},
+ {24, 293, 1731, L"Бронницы"},
+ {24, 293, 1730, L"Верея"},
+ {24, 293, 2063, L"Видное"},
+ {24, 293, 2064, L"Волоколамск"},
+ {24, 293, 1729, L"Воскресенск"},
+ {24, 293, 1728, L"Высоковск"},
+ {24, 293, 1727, L"Голицыно"},
+ {24, 293, 2065, L"Дедовск"},
+ {24, 293, 1726, L"Дзержинский"},
+ {24, 293, 1725, L"Дмитров"},
+ {24, 293, 1724, L"Долгопрудный"},
+ {24, 293, 1723, L"Домодедово"},
+ {24, 293, 2066, L"Дрезна"},
+ {24, 293, 1722, L"Дубна"},
+ {24, 293, 1721, L"Егорьевск"},
+ {24, 293, 1720, L"Железнодорожный"},
+ {24, 293, 1719, L"Жуковский"},
+ {24, 293, 2067, L"Зарайск"},
+ {24, 293, 1718, L"Звенигород"},
+ {24, 293, 1715, L"Ивантеевка"},
+ {24, 293, 1717, L"Истра"},
+ {24, 293, 2068, L"Калининград"},
+ {24, 293, 2069, L"Кашира"},
+ {24, 293, 1716, L"Климовск"},
+ {24, 293, 1714, L"Клин"},
+ {24, 293, 1713, L"Коломна"},
+ {24, 293, 1712, L"Королев"},
+ {24, 293, 1711, L"Красноармейск"},
+ {24, 293, 1710, L"Красногорск"},
+ {24, 293, 2070, L"Краснозаводск"},
+ {24, 293, 2071, L"Куровское"},
+ {24, 293, 1709, L"Ликино-Дулево"},
+ {24, 293, 1708, L"Лобня"},
+ {24, 293, 2072, L"Лосино-Петровский"},
+ {24, 293, 1707, L"Луховицы"},
+ {24, 293, 1706, L"Лыткарино"},
+ {24, 293, 1705, L"Люберцы"},
+ {24, 293, 1704, L"Менделеево"},
+ {24, 293, 1703, L"Можайск"},
+ {24, 293, 1702, L"Мытищи"},
+ {24, 293, 1701, L"Наро-Фоминск"},
+ {24, 293, 1700, L"Ногинск"},
+ {24, 293, 1698, L"Одинцово"},
+ {24, 293, 2073, L"Ожерелье"},
+ {24, 293, 2074, L"Озеры"},
+ {24, 293, 1699, L"Орехово-Зуево"},
+ {24, 293, 1697, L"Павловский Посад"},
+ {24, 293, 1696, L"Подольск"},
+ {24, 293, 1695, L"Протвино"},
+ {24, 293, 1694, L"Пушкино"},
+ {24, 293, 1693, L"Пущино"},
+ {24, 293, 1692, L"Раменское"},
+ {24, 293, 1691, L"Реутов"},
+ {24, 293, 1690, L"Решетников"},
+ {24, 293, 2075, L"Рошаль"},
+ {24, 293, 2076, L"Руза"},
+ {24, 293, 1689, L"Сергиев Посад"},
+ {24, 293, 1688, L"Серпухов"},
+ {24, 293, 1687, L"Солнечногорск"},
+ {24, 293, 1686, L"Ступино"},
+ {24, 293, 2077, L"Сходня"},
+ {24, 293, 2078, L"Талдом"},
+ {24, 293, 1685, L"Троицк"},
+ {24, 293, 1684, L"Фрязино"},
+ {24, 293, 1683, L"Химки"},
+ {24, 293, 1682, L"Хотьково"},
+ {24, 293, 1681, L"Черноголовка"},
+ {24, 293, 1680, L"Чехов"},
+ {24, 293, 1679, L"Шатура"},
+ {24, 293, 1678, L"Щелково"},
+ {24, 293, 2080, L"Щербинка"},
+ {24, 293, 1677, L"Электрогорск"},
+ {24, 293, 1676, L"Электросталь"},
+ {24, 293, 2079, L"Электроугли"},
+ {24, 293, 3031, L"Юбилейный"},
+ {24, 293, 2081, L"Яхрома"},
+ {24, 293, 2249, L"Другое"},
+ {24, 294, 2083, L"Болхов"},
+ {24, 294, 2082, L"Дмитровск-Орловский"},
+ {24, 294, 3160, L"Залегощь"},
+ {24, 294, 1736, L"Ливны"},
+ {24, 294, 2084, L"Малоархангельск"},
+ {24, 294, 1737, L"Мценск"},
+ {24, 294, 2085, L"Новосиль"},
+ {24, 294, 1735, L"Орел"},
+ {24, 294, 2255, L"Другое"},
+ {24, 295, 1740, L"Гусь-Железный"},
+ {24, 295, 1741, L"Касимов"},
+ {24, 295, 2086, L"Кораблино"},
+ {24, 295, 2087, L"Михайлов"},
+ {24, 295, 2089, L"Новомичуринск"},
+ {24, 295, 2091, L"Рыбное"},
+ {24, 295, 2093, L"Ряжск"},
+ {24, 295, 1738, L"Рязань"},
+ {24, 295, 3305, L"Сапожок"},
+ {24, 295, 1739, L"Сасово"},
+ {24, 295, 2090, L"Скопин"},
+ {24, 295, 2088, L"Спас-Клепики"},
+ {24, 295, 2092, L"Спасск-Рязанский"},
+ {24, 295, 2094, L"Шацк"},
+ {24, 295, 3320, L"Шилово"},
+ {24, 295, 2260, L"Другое"},
+ {24, 296, 2095, L"Велиж"},
+ {24, 296, 1743, L"Вязьма"},
+ {24, 296, 1744, L"Гагарин"},
+ {24, 296, 2096, L"Демидов"},
+ {24, 296, 1745, L"Десногорск"},
+ {24, 296, 1746, L"Дорогубуж"},
+ {24, 296, 2097, L"Духовщина"},
+ {24, 296, 2098, L"Ельня"},
+ {24, 296, 2099, L"Починок"},
+ {24, 296, 2100, L"Рославль"},
+ {24, 296, 2101, L"Рудня"},
+ {24, 296, 1747, L"Сафоново"},
+ {24, 296, 1742, L"Смоленск"},
+ {24, 296, 2102, L"Сычевка"},
+ {24, 296, 1748, L"Ярцево"},
+ {24, 296, 2267, L"Другое"},
+ {24, 297, 2198, L"Жердевка"},
+ {24, 297, 2199, L"Кирсанов"},
+ {24, 297, 1752, L"Котовск"},
+ {24, 297, 1751, L"Мичуринск"},
+ {24, 297, 2196, L"Моршанск"},
+ {24, 297, 1750, L"Рассказово"},
+ {24, 297, 3271, L"Сатинка"},
+ {24, 297, 1749, L"Тамбов"},
+ {24, 297, 3272, L"Тулиновка"},
+ {24, 297, 2197, L"Уварово"},
+ {24, 297, 2270, L"Другое"},
+ {24, 298, 2103, L"Андреаполь"},
+ {24, 298, 2104, L"Бежецк"},
+ {24, 298, 2105, L"Белый"},
+ {24, 298, 2106, L"Бологое"},
+ {24, 298, 2107, L"Весьегонск"},
+ {24, 298, 1753, L"Вышний Волочек"},
+ {24, 298, 2108, L"Западная Двина"},
+ {24, 298, 2109, L"Зубцов"},
+ {24, 298, 2110, L"Калязин"},
+ {24, 298, 2111, L"Кашин"},
+ {24, 298, 1758, L"Кимры"},
+ {24, 298, 1756, L"Конаково"},
+ {24, 298, 2112, L"Красный Холм"},
+ {24, 298, 1759, L"Кувшиново"},
+ {24, 298, 1760, L"Лихославль"},
+ {24, 298, 1761, L"Нелидово"},
+ {24, 298, 2113, L"Осташков"},
+ {24, 298, 1757, L"Ржев"},
+ {24, 298, 2114, L"Старица"},
+ {24, 298, 1754, L"Тверь"},
+ {24, 298, 2115, L"Торжок"},
+ {24, 298, 2116, L"Торопец"},
+ {24, 298, 1755, L"Удомля"},
+ {24, 298, 2272, L"Другое"},
+ {24, 299, 2127, L"Алексин"},
+ {24, 299, 2126, L"Белев"},
+ {24, 299, 2118, L"Богородицк"},
+ {24, 299, 2122, L"Болохово"},
+ {24, 299, 2129, L"Венев"},
+ {24, 299, 1762, L"Донской"},
+ {24, 299, 2128, L"Ефремов"},
+ {24, 299, 3354, L"Заокский"},
+ {24, 299, 2124, L"Киреевск"},
+ {24, 299, 1763, L"Климовск"},
+ {24, 299, 2123, L"Липки"},
+ {24, 299, 1764, L"Новомосковск"},
+ {24, 299, 2117, L"Плавск"},
+ {24, 299, 2130, L"Северо-Задонск"},
+ {24, 299, 2120, L"Советск"},
+ {24, 299, 2119, L"Сокольники"},
+ {24, 299, 2125, L"Суворов"},
+ {24, 299, 1765, L"Тула"},
+ {24, 299, 1766, L"Узловая"},
+ {24, 299, 2121, L"Щекино"},
+ {24, 299, 1767, L"Ясногорск"},
+ {24, 299, 2274, L"Другое"},
+ {24, 300, 3053, L"Большое Село"},
+ {24, 300, 3268, L"Брейтово"},
+ {24, 300, 1773, L"Гаврилов-Ям"},
+ {24, 300, 2132, L"Данилов"},
+ {24, 300, 3269, L"Красные Ткачи"},
+ {24, 300, 2133, L"Любим"},
+ {24, 300, 3270, L"Мокеевское"},
+ {24, 300, 1774, L"Мышкин"},
+ {24, 300, 2994, L"Некоуз"},
+ {24, 300, 1775, L"Переславль-Залесский"},
+ {24, 300, 2134, L"Пошехонье"},
+ {24, 300, 1769, L"Ростов"},
+ {24, 300, 1771, L"Рыбинск"},
+ {24, 300, 1772, L"Тутаев"},
+ {24, 300, 1770, L"Углич"},
+ {24, 300, 1768, L"Ярославль"},
+ {24, 300, 2290, L"Другое"},
+ {24, 301, 2849, L"Адыгейск"},
+ {24, 301, 1776, L"Майкоп"},
+ {24, 301, 2214, L"Другое"},
+ {24, 304, 2617, L"Буйнакск"},
+ {24, 304, 1791, L"Гуниб"},
+ {24, 304, 1788, L"Дербент"},
+ {24, 304, 2619, L"Избербаш"},
+ {24, 304, 1789, L"Каспийск"},
+ {24, 304, 2618, L"Кизилюрт"},
+ {24, 304, 1790, L"Кизляр"},
+ {24, 304, 1792, L"Махачкала"},
+ {24, 304, 2620, L"Хасавюрт"},
+ {24, 304, 2225, L"Другое"},
+ {24, 305, 3052, L"Магас"},
+ {24, 305, 1787, L"Назрань"},
+ {24, 305, 2228, L"Другое"},
+ {24, 306, 2621, L"Баксан"},
+ {24, 306, 1794, L"Майский"},
+ {24, 306, 1793, L"Нальчик"},
+ {24, 306, 2622, L"Нарткала"},
+ {24, 306, 1795, L"Прохладный"},
+ {24, 306, 2623, L"Терек"},
+ {24, 306, 2624, L"Тырныауз"},
+ {24, 306, 3274, L"Чегем"},
+ {24, 306, 2230, L"Другое"},
+ {24, 307, 2567, L"Городовиково"},
+ {24, 307, 2568, L"Лагань"},
+ {24, 307, 3324, L"Троицкое"},
+ {24, 307, 1796, L"Элиста"},
+ {24, 307, 2232, L"Другое"},
+ {24, 308, 1799, L"Домбай"},
+ {24, 308, 1798, L"Карачаевск"},
+ {24, 308, 2626, L"Теберда"},
+ {24, 308, 2625, L"Усть-Джегута"},
+ {24, 308, 1797, L"Черкесск"},
+ {24, 308, 2235, L"Другое"},
+ {24, 311, 2630, L"Алагир"},
+ {24, 311, 2631, L"Ардон"},
+ {24, 311, 2628, L"Беслан"},
+ {24, 311, 1839, L"Владикавказ"},
+ {24, 311, 2629, L"Дигора"},
+ {24, 311, 2627, L"Моздок"},
+ {24, 311, 2266, L"Другое"},
+ {24, 313, 2632, L"Аргун"},
+ {24, 313, 1853, L"Грозный"},
+ {24, 313, 2633, L"Гудермес"},
+ {24, 313, 2284, L"Другое"},
+ {24, 309, 2636, L"Абинск"},
+ {24, 309, 1800, L"Анапа"},
+ {24, 309, 1801, L"Апшеронск"},
+ {24, 309, 1802, L"Армавир"},
+ {24, 309, 1803, L"Белореченск"},
+ {24, 309, 1804, L"Геленджик"},
+ {24, 309, 1805, L"Горячий Ключ"},
+ {24, 309, 2637, L"Гулькевичи"},
+ {24, 309, 1806, L"Динская"},
+ {24, 309, 1807, L"Ейск"},
+ {24, 309, 2638, L"Кореновск"},
+ {24, 309, 1808, L"Краснодар"},
+ {24, 309, 1809, L"Кропоткин"},
+ {24, 309, 1810, L"Крымск"},
+ {24, 309, 1811, L"Курганинск"},
+ {24, 309, 3232, L"Лабинск"},
+ {24, 309, 2639, L"Новокубанск"},
+ {24, 309, 1812, L"Новороссийск"},
+ {24, 309, 1813, L"Пластуновская"},
+ {24, 309, 1814, L"Приморско-Ахтарск"},
+ {24, 309, 3102, L"Северская"},
+ {24, 309, 1815, L"Славянск-на-Кубани"},
+ {24, 309, 1816, L"Сочи"},
+ {24, 309, 3266, L"Староминская"},
+ {24, 309, 3039, L"Тамань"},
+ {24, 309, 1817, L"Темрюк"},
+ {24, 309, 2635, L"Тимашевск"},
+ {24, 309, 1818, L"Тихорецк"},
+ {24, 309, 1819, L"Туапсе"},
+ {24, 309, 1820, L"Усть-Лабинск"},
+ {24, 309, 2634, L"Хадыженск"},
+ {24, 309, 2241, L"Другое"},
+ {24, 312, 1840, L"Александровское"},
+ {24, 312, 2644, L"Благодарный"},
+ {24, 312, 1841, L"Буденновск"},
+ {24, 312, 1842, L"Георгиевск"},
+ {24, 312, 1843, L"Ессентуки"},
+ {24, 312, 1844, L"Железноводск"},
+ {24, 312, 2647, L"Зеленокумск"},
+ {24, 312, 2641, L"Изобильный"},
+ {24, 312, 2642, L"Ипатово"},
+ {24, 312, 1845, L"Кисловодск"},
+ {24, 312, 1846, L"Кочубеевское"},
+ {24, 312, 3367, L"Курсавка"},
+ {24, 312, 3265, L"Левокумское"},
+ {24, 312, 1847, L"Лермонтов"},
+ {24, 312, 1848, L"Минеральные Воды"},
+ {24, 312, 1849, L"Невинномысск"},
+ {24, 312, 2645, L"Нефтекумск"},
+ {24, 312, 2643, L"Новоалександровск"},
+ {24, 312, 1850, L"Новопавловск"},
+ {24, 312, 1851, L"Новоселицкое"},
+ {24, 312, 1852, L"Пятигорск"},
+ {24, 312, 2646, L"Светлоград"},
+ {24, 312, 2640, L"Ставрополь"},
+ {24, 312, 2268, L"Другое"},
+ {24, 302, 1777, L"Астрахань"},
+ {24, 302, 1778, L"Ахтубинск"},
+ {24, 302, 3383, L"Знаменск"},
+ {24, 302, 2578, L"Камызяк"},
+ {24, 302, 2579, L"Нариманов"},
+ {24, 302, 1786, L"Харабали"},
+ {24, 302, 2219, L"Другое"},
+ {24, 303, 1779, L"Волгоград"},
+ {24, 303, 1780, L"Волжский"},
+ {24, 303, 2584, L"Дубовка"},
+ {24, 303, 1781, L"Жирновск"},
+ {24, 303, 1782, L"Калач-на-Дону"},
+ {24, 303, 1783, L"Камышин"},
+ {24, 303, 2588, L"Котельниково"},
+ {24, 303, 2591, L"Котово"},
+ {24, 303, 2587, L"Краснослободск"},
+ {24, 303, 2582, L"Ленинск"},
+ {24, 303, 2590, L"Михайловка"},
+ {24, 303, 1784, L"Николаевск"},
+ {24, 303, 2581, L"Новоаннинский"},
+ {24, 303, 2583, L"Палласовка"},
+ {24, 303, 2580, L"Петров Вал"},
+ {24, 303, 2589, L"Серафимович"},
+ {24, 303, 2585, L"Суровикино"},
+ {24, 303, 1785, L"Урюпинск"},
+ {24, 303, 2586, L"Фролово"},
+ {24, 303, 2223, L"Другое"},
+ {24, 310, 1821, L"Азов"},
+ {24, 310, 1822, L"Аксай"},
+ {24, 310, 1823, L"Багаевская"},
+ {24, 310, 1824, L"Батайск"},
+ {24, 310, 1825, L"Белая Калитва"},
+ {24, 310, 1826, L"Волгодонск"},
+ {24, 310, 1827, L"Гуково"},
+ {24, 310, 2651, L"Донецк"},
+ {24, 310, 1828, L"Зерноград"},
+ {24, 310, 3264, L"Каменоломни"},
+ {24, 310, 2652, L"Каменск-Шахтинский"},
+ {24, 310, 2649, L"Константиновск"},
+ {24, 310, 2648, L"Красный Сулин"},
+ {24, 310, 1829, L"Миллерово"},
+ {24, 310, 2653, L"Морозовск"},
+ {24, 310, 1830, L"Новочеркасск"},
+ {24, 310, 1831, L"Новошахтинск"},
+ {24, 310, 1832, L"Пролетарск"},
+ {24, 310, 1833, L"Ростов-на-Дону"},
+ {24, 310, 1834, L"Сальск"},
+ {24, 310, 1835, L"Семикаракорск"},
+ {24, 310, 1836, L"Таганрог"},
+ {24, 310, 1837, L"Усть-Донецкий"},
+ {24, 310, 3263, L"Целина"},
+ {24, 310, 2650, L"Цимлянск"},
+ {24, 310, 1838, L"Шахты"},
+ {24, 310, 2259, L"Другое"},
+ {139, 407, 407, L" столица"},
+ {139, 426, 427, L"Бойсе"},
+ {139, 426, 2354, L"Другое"},
+ {139, 378, 3109, L"Айова Сити"},
+ {139, 378, 379, L"Де-Мойн"},
+ {139, 378, 2963, L"Декора"},
+ {139, 378, 2355, L"Другое"},
+ {139, 412, 3236, L"Бирмингем"},
+ {139, 412, 413, L"Монтгомери"},
+ {139, 412, 1181, L"Хантсвилл"},
+ {139, 412, 2356, L"Другое"},
+ {139, 446, 1182, L"Анкоридж"},
+ {139, 446, 447, L"Джуно"},
+ {139, 446, 1183, L"Фэрбенкс"},
+ {139, 446, 2357, L"Другое"},
+ {139, 434, 2917, L"Темпе"},
+ {139, 434, 1184, L"Тусон"},
+ {139, 434, 435, L"Финикс"},
+ {139, 434, 3061, L"Чандлер"},
+ {139, 434, 2358, L"Другое"},
+ {139, 416, 417, L"Литл-Рок"},
+ {139, 416, 2359, L"Другое"},
+ {139, 428, 3017, L"Ларами"},
+ {139, 428, 429, L"Шайенн"},
+ {139, 428, 2360, L"Другое"},
+ {139, 440, 2956, L"Беллевью"},
+ {139, 440, 2967, L"Бремертон"},
+ {139, 440, 3385, L"Ванкувер"},
+ {139, 440, 2865, L"Линден"},
+ {139, 440, 441, L"Олимпия"},
+ {139, 440, 3352, L"Порт Орчард"},
+ {139, 440, 2876, L"Редмонт"},
+ {139, 440, 3003, L"Рентон"},
+ {139, 440, 1185, L"Сиэтл"},
+ {139, 440, 2983, L"Снохомиш"},
+ {139, 440, 1186, L"Такома"},
+ {139, 440, 3152, L"Фрайди Харбор"},
+ {139, 440, 2886, L"Эверет"},
+ {139, 440, 2361, L"Другое"},
+ {139, 352, 353, L"Монтпильер"},
+ {139, 352, 2861, L"Норвич"},
+ {139, 352, 2362, L"Другое"},
+ {139, 394, 1188, L"Александрия"},
+ {139, 394, 1187, L"Арлингтон"},
+ {139, 394, 2969, L"Даллес"},
+ {139, 394, 1189, L"Манассас"},
+ {139, 394, 3114, L"Норфолк"},
+ {139, 394, 2885, L"Ньюпорт-Ньюс"},
+ {139, 394, 2979, L"Раунд Хил"},
+ {139, 394, 3338, L"Рестон"},
+ {139, 394, 395, L"Ричмонд"},
+ {139, 394, 3005, L"Уоррентон"},
+ {139, 394, 2991, L"Херндон"},
+ {139, 394, 2996, L"Центрвиль"},
+ {139, 394, 3097, L"Чантилли"},
+ {139, 394, 2981, L"Шарлотесвиль"},
+ {139, 394, 2363, L"Другое"},
+ {139, 374, 2995, L"Грин-Бей"},
+ {139, 374, 375, L"Мадисон"},
+ {139, 374, 2365, L"Другое"},
+ {139, 448, 449, L"Гонолулу"},
+ {139, 448, 1191, L"Хило"},
+ {139, 448, 2367, L"Другое"},
+ {139, 390, 3021, L"Вильмингтон"},
+ {139, 390, 391, L"Довер"},
+ {139, 390, 2973, L"Льюис"},
+ {139, 390, 2369, L"Другое"},
+ {139, 402, 403, L"Атланта"},
+ {139, 402, 2370, L"Другое"},
+ {139, 396, 397, L"Чарлстон"},
+ {139, 396, 2371, L"Другое"},
+ {139, 370, 2911, L"Вестмонт"},
+ {139, 370, 3074, L"Гарвард"},
+ {139, 370, 371, L"Спрингфилд"},
+ {139, 370, 2930, L"Урбана"},
+ {139, 370, 1194, L"Чикаго"},
+ {139, 370, 2372, L"Другое"},
+ {139, 368, 369, L"Индианаполис"},
+ {139, 368, 1195, L"Эвансвил"},
+ {139, 368, 2373, L"Другое"},
+ {139, 444, 2959, L"Анахайм"},
+ {139, 444, 2961, L"Аптос"},
+ {139, 444, 2912, L"Артезия"},
+ {139, 444, 2899, L"Беверли Хилз"},
+ {139, 444, 1196, L"Беркли"},
+ {139, 444, 3249, L"Бреа"},
+ {139, 444, 3014, L"Брисбейн"},
+ {139, 444, 3048, L"Венис"},
+ {139, 444, 2901, L"Вест-Голливуд"},
+ {139, 444, 2926, L"Вестлейк Вилладж"},
+ {139, 444, 2922, L"Гардена"},
+ {139, 444, 1203, L"Глендейл"},
+ {139, 444, 2978, L"Денвиль"},
+ {139, 444, 2990, L"Дублин"},
+ {139, 444, 3077, L"Дэвис"},
+ {139, 444, 2918, L"Ирвайн"},
+ {139, 444, 2881, L"Карсон"},
+ {139, 444, 3247, L"Кипресс"},
+ {139, 444, 3092, L"Коста Меса"},
+ {139, 444, 2948, L"Купертино"},
+ {139, 444, 1197, L"Лонг-Бич"},
+ {139, 444, 1198, L"Лос-Анджелес"},
+ {139, 444, 3058, L"Лос-Гатос"},
+ {139, 444, 3328, L"Марина-дель-Рей"},
+ {139, 444, 2874, L"Маунтин-Вью"},
+ {139, 444, 2998, L"Милпитас"},
+ {139, 444, 3087, L"Монтерей"},
+ {139, 444, 2947, L"Окленд"},
+ {139, 444, 2900, L"Пало Альто"},
+ {139, 444, 1199, L"Пасадена"},
+ {139, 444, 3335, L"Редвуд"},
+ {139, 444, 2966, L"Розамонд"},
+ {139, 444, 445, L"Сакраменто"},
+ {139, 444, 1200, L"Сан-Диего"},
+ {139, 444, 3317, L"Сан-Мартин"},
+ {139, 444, 1201, L"Сан-Франциско"},
+ {139, 444, 1202, L"Сан-Хосе"},
+ {139, 444, 2878, L"Саннивейл"},
+ {139, 444, 2925, L"Санта-Барбара"},
+ {139, 444, 2875, L"Санта-Клара"},
+ {139, 444, 1204, L"Санта-Круз"},
+ {139, 444, 2859, L"Санта-Моника"},
+ {139, 444, 3157, L"Студио Сити"},
+ {139, 444, 3146, L"Торранс"},
+ {139, 444, 2970, L"Тысяча Дубов"},
+ {139, 444, 2949, L"Универсал-Сити"},
+ {139, 444, 3057, L"Форт Брэгг"},
+ {139, 444, 3032, L"Фостер-Сити"},
+ {139, 444, 3381, L"Фремонт"},
+ {139, 444, 3028, L"Фуллертон"},
+ {139, 444, 2858, L"Эмервиль"},
+ {139, 444, 3040, L"Эскондидо"},
+ {139, 444, 2374, L"Другое"},
+ {139, 388, 3041, L"Лоуренс"},
+ {139, 388, 389, L"Топика"},
+ {139, 388, 2375, L"Другое"},
+ {139, 408, 3004, L"Лексингтон"},
+ {139, 408, 1205, L"Луисвилл"},
+ {139, 408, 409, L"Франкфорт"},
+ {139, 408, 2376, L"Другое"},
+ {139, 430, 1206, L"Боулдер"},
+ {139, 430, 3095, L"Грили"},
+ {139, 430, 431, L"Денвер"},
+ {139, 430, 1207, L"Колорадо-Спрингс"},
+ {139, 430, 3046, L"Литлтон"},
+ {139, 430, 2377, L"Другое"},
+ {139, 358, 2968, L"Дариен"},
+ {139, 358, 3018, L"Денбери"},
+ {139, 358, 2882, L"Стэмфорд"},
+ {139, 358, 359, L"Хартфорд"},
+ {139, 358, 3047, L"Шелтон"},
+ {139, 358, 2378, L"Другое"},
+ {139, 418, 419, L"Батон-Руж"},
+ {139, 418, 1208, L"Новый Орлеан"},
+ {139, 418, 2408, L"Другое"},
+ {139, 354, 2931, L"Аттлеборо"},
+ {139, 354, 3334, L"Билерика"},
+ {139, 354, 355, L"Бостон"},
+ {139, 354, 3059, L"Вестгемптон"},
+ {139, 354, 2919, L"Вобурн"},
+ {139, 354, 2902, L"Дедхэм"},
+ {139, 354, 1209, L"Кеймбридж"},
+ {139, 354, 3336, L"Нидхем"},
+ {139, 354, 2985, L"Ньютонвиль"},
+ {139, 354, 3022, L"Уолтхэм"},
+ {139, 354, 2407, L"Другое"},
+ {139, 376, 1210, L"Миннеаполис"},
+ {139, 376, 2980, L"Плимут"},
+ {139, 376, 377, L"Сент-Пол"},
+ {139, 376, 3035, L"Эден Прейри"},
+ {139, 376, 2406, L"Другое"},
+ {139, 414, 415, L"Джэксон"},
+ {139, 414, 2405, L"Другое"},
+ {139, 380, 381, L"Джефферсон-Сити"},
+ {139, 380, 3062, L"Канзас Сити"},
+ {139, 380, 3038, L"Ли Саммит"},
+ {139, 380, 1211, L"Сент-Луис"},
+ {139, 380, 2895, L"Эллисвил"},
+ {139, 380, 2404, L"Другое"},
+ {139, 372, 3357, L"Вест Блюмфельд"},
+ {139, 372, 1212, L"Гранд-Рапидс"},
+ {139, 372, 1213, L"Детройт"},
+ {139, 372, 3103, L"Каламазу"},
+ {139, 372, 373, L"Лансинг"},
+ {139, 372, 2987, L"Новай"},
+ {139, 372, 2887, L"Сагино"},
+ {139, 372, 2403, L"Другое"},
+ {139, 424, 1214, L"Грейт-Фолс"},
+ {139, 424, 425, L"Хелина"},
+ {139, 424, 2402, L"Другое"},
+ {139, 348, 349, L"Огаста"},
+ {139, 348, 3000, L"Ярмут"},
+ {139, 348, 2401, L"Другое"},
+ {139, 392, 393, L"Аннаполис"},
+ {139, 392, 1215, L"Балтимор"},
+ {139, 392, 3143, L"Гринбелт"},
+ {139, 392, 3337, L"Колледж Парк"},
+ {139, 392, 2904, L"Маунт Эйри"},
+ {139, 392, 3329, L"Роквилль"},
+ {139, 392, 2400, L"Другое"},
+ {139, 386, 387, L"Линкольн"},
+ {139, 386, 1216, L"Омаха"},
+ {139, 386, 2399, L"Другое"},
+ {139, 438, 439, L"Карсон-Сити"},
+ {139, 438, 1217, L"Лас-Вегас"},
+ {139, 438, 2890, L"Рено"},
+ {139, 438, 2398, L"Другое"},
+ {139, 362, 1219, L"Атлантик-Сити"},
+ {139, 362, 1218, L"Ньюарк"},
+ {139, 362, 3276, L"Оклин"},
+ {139, 362, 3073, L"Принстон"},
+ {139, 362, 2955, L"Рузерфорд"},
+ {139, 362, 3349, L"Сомервиль"},
+ {139, 362, 363, L"Трентон"},
+ {139, 362, 3078, L"Хакеттстоун"},
+ {139, 362, 3248, L"Черри Хилл"},
+ {139, 362, 2397, L"Другое"},
+ {139, 360, 3134, L"Баффало"},
+ {139, 360, 3081, L"Бингхэмптон"},
+ {139, 360, 2997, L"Бруклин"},
+ {139, 360, 2999, L"Варвик"},
+ {139, 360, 3139, L"Ирвингтон"},
+ {139, 360, 3060, L"Итака"},
+ {139, 360, 1220, L"Нью-Йорк"},
+ {139, 360, 361, L"Олбани"},
+ {139, 360, 2914, L"Погкипси"},
+ {139, 360, 3056, L"Саратога Спрингс"},
+ {139, 360, 2396, L"Другое"},
+ {139, 432, 1222, L"Альбукерке"},
+ {139, 432, 433, L"Санта-Фе"},
+ {139, 432, 2395, L"Другое"},
+ {139, 350, 2989, L"Амхерст"},
+ {139, 350, 351, L"Конкорд"},
+ {139, 350, 2950, L"Лондондерри"},
+ {139, 350, 1221, L"Манчестер"},
+ {139, 350, 3111, L"Рочестер"},
+ {139, 350, 2898, L"Салем"},
+ {139, 350, 2938, L"Хадсон"},
+ {139, 350, 2394, L"Другое"},
+ {139, 366, 2953, L"Варрен"},
+ {139, 366, 3112, L"Гроув Сити"},
+ {139, 366, 1223, L"Кливленд"},
+ {139, 366, 367, L"Колумбус"},
+ {139, 366, 2951, L"Лавленд"},
+ {139, 366, 2862, L"Оберлин"},
+ {139, 366, 3034, L"Рейнольдсбург"},
+ {139, 366, 2860, L"Цинциннати"},
+ {139, 366, 2393, L"Другое"},
+ {139, 420, 421, L"Оклахома-Сити"},
+ {139, 420, 1224, L"Талса"},
+ {139, 420, 2392, L"Другое"},
+ {139, 442, 2877, L"Кламат-Фолс"},
+ {139, 442, 2945, L"Коттедж-Гроув"},
+ {139, 442, 1225, L"Портленд"},
+ {139, 442, 443, L"Сейлем"},
+ {139, 442, 1226, L"Юджин"},
+ {139, 442, 2391, L"Другое"},
+ {139, 364, 3316, L"Вифлием"},
+ {139, 364, 3282, L"Колледжвиль"},
+ {139, 364, 2972, L"Нью Фридом"},
+ {139, 364, 1227, L"Питтсбург"},
+ {139, 364, 2893, L"Рандор"},
+ {139, 364, 3110, L"Слиппери Рок"},
+ {139, 364, 1228, L"Филадельфия"},
+ {139, 364, 365, L"Харрисберг"},
+ {139, 364, 2390, L"Другое"},
+ {139, 450, 451, L"Понсе"},
+ {139, 450, 3093, L"Сан-Хуан"},
+ {139, 450, 2389, L"Другое"},
+ {139, 356, 357, L"Провиденс"},
+ {139, 356, 2388, L"Другое"},
+ {139, 382, 383, L"Бисмарк"},
+ {139, 382, 2387, L"Другое"},
+ {139, 398, 2960, L"Вильмингтон"},
+ {139, 398, 2915, L"Дурхам"},
+ {139, 398, 399, L"Роли"},
+ {139, 398, 2386, L"Другое"},
+ {139, 410, 2863, L"Мемфис"},
+ {139, 410, 411, L"Нашвилл"},
+ {139, 410, 1229, L"Ноксвилл"},
+ {139, 410, 2385, L"Другое"},
+ {139, 422, 3085, L"Бедфорд"},
+ {139, 422, 2913, L"Брейди"},
+ {139, 422, 1233, L"Даллас"},
+ {139, 422, 2916, L"Ирвинг"},
+ {139, 422, 3123, L"Кингсвилл"},
+ {139, 422, 2873, L"Конрой"},
+ {139, 422, 3096, L"Корпус Кристи"},
+ {139, 422, 423, L"Остин"},
+ {139, 422, 1232, L"Сан-Антонио"},
+ {139, 422, 3023, L"Уайли"},
+ {139, 422, 1231, L"Хьюстон"},
+ {139, 422, 1230, L"Эль-Пасо"},
+ {139, 422, 2384, L"Другое"},
+ {139, 406, 2383, L"Другое"},
+ {139, 404, 2879, L"Бока-Рейтон"},
+ {139, 404, 2880, L"Гейнсвил"},
+ {139, 404, 3086, L"Джексонвиль"},
+ {139, 404, 3002, L"Киссимми"},
+ {139, 404, 3124, L"Корал Гейблс"},
+ {139, 404, 2894, L"Корал-Спрингс"},
+ {139, 404, 3290, L"Лейк-Ворт"},
+ {139, 404, 1234, L"Майами"},
+ {139, 404, 1236, L"Орландо"},
+ {139, 404, 3372, L"Пинеллас Парк"},
+ {139, 404, 2952, L"Пунта-Горда"},
+ {139, 404, 3340, L"Сарасота"},
+ {139, 404, 1235, L"Сент-Питерсберг"},
+ {139, 404, 405, L"Таллахасси"},
+ {139, 404, 2962, L"Форт Лаудердейл"},
+ {139, 404, 2382, L"Другое"},
+ {139, 384, 385, L"Пирр"},
+ {139, 384, 2381, L"Другое"},
+ {139, 400, 401, L"Колумбия"},
+ {139, 400, 3090, L"Спартанбург"},
+ {139, 400, 1237, L"Чарлстон"},
+ {139, 400, 2380, L"Другое"},
+ {139, 436, 3036, L"Кейсвилл"},
+ {139, 436, 3024, L"Линдон"},
+ {139, 436, 3108, L"Орем"},
+ {139, 436, 2866, L"Сент-Джордж"},
+ {139, 436, 437, L"Солт-Лейк-Сити"},
+ {139, 436, 2379, L"Другое"},
+ {39, 315, 614, L"Винница"},
+ {39, 315, 615, L"Хмельник"},
+ {39, 315, 2566, L"Другое"},
+ {39, 316, 2940, L"Ковель"},
+ {39, 316, 616, L"Луцк"},
+ {39, 316, 2565, L"Другое"},
+ {39, 317, 617, L"Днепродзержинск"},
+ {39, 317, 618, L"Днепропетровск"},
+ {39, 317, 619, L"Кривой Рог"},
+ {39, 317, 620, L"Никополь"},
+ {39, 317, 621, L"Новомосковск"},
+ {39, 317, 622, L"Орджоникидзе"},
+ {39, 317, 623, L"Павлоград"},
+ {39, 317, 2564, L"Другое"},
+ {39, 318, 624, L"Артемовск"},
+ {39, 318, 625, L"Горловка"},
+ {39, 318, 626, L"Донецк"},
+ {39, 318, 627, L"Дружковка"},
+ {39, 318, 628, L"Енакиево"},
+ {39, 318, 629, L"Константиновка"},
+ {39, 318, 630, L"Краматорск"},
+ {39, 318, 2944, L"Красноармейск"},
+ {39, 318, 631, L"Макеевка"},
+ {39, 318, 632, L"Мариуполь"},
+ {39, 318, 633, L"Николаевка"},
+ {39, 318, 634, L"Славянск"},
+ {39, 318, 635, L"Харцызск"},
+ {39, 318, 2563, L"Другое"},
+ {39, 319, 636, L"Бердичев"},
+ {39, 319, 637, L"Житомир"},
+ {39, 319, 2942, L"Коростень"},
+ {39, 319, 638, L"Коростышев"},
+ {39, 319, 2907, L"Малин"},
+ {39, 319, 639, L"Новоград-Волынский"},
+ {39, 319, 2562, L"Другое"},
+ {39, 320, 640, L"Берегово"},
+ {39, 320, 641, L"Воловец"},
+ {39, 320, 3119, L"Мукачево"},
+ {39, 320, 3162, L"Свалява"},
+ {39, 320, 642, L"Ужгород"},
+ {39, 320, 643, L"Хуст"},
+ {39, 320, 2561, L"Другое"},
+ {39, 321, 644, L"Бердянск"},
+ {39, 321, 3128, L"Гуляйполе"},
+ {39, 321, 645, L"Запорожье"},
+ {39, 321, 646, L"Мелитополь"},
+ {39, 321, 3121, L"Приморск"},
+ {39, 321, 3378, L"Энергодар"},
+ {39, 321, 2560, L"Другое"},
+ {39, 322, 3379, L"Галич"},
+ {39, 322, 647, L"Ивано-Франковск"},
+ {39, 322, 3170, L"Яремче"},
+ {39, 322, 2559, L"Другое"},
+ {39, 323, 648, L"Белая Церковь"},
+ {39, 323, 649, L"Борисполь"},
+ {39, 323, 651, L"Бровары"},
+ {39, 323, 650, L"Васильков"},
+ {39, 323, 652, L"Ирпень"},
+ {39, 323, 3341, L"Переяслав-Хмельницкий"},
+ {39, 323, 653, L"Славутич"},
+ {39, 323, 654, L"Фастов"},
+ {39, 323, 655, L"Чернобыль"},
+ {39, 323, 2558, L"Другое"},
+ {39, 324, 656, L"Александрия"},
+ {39, 324, 657, L"Кировоград"},
+ {39, 324, 658, L"Светловодск"},
+ {39, 324, 2557, L"Другое"},
+ {39, 325, 659, L"Алушта"},
+ {39, 325, 2984, L"Армянск"},
+ {39, 325, 3042, L"Балаклава"},
+ {39, 325, 660, L"Бахчисарай"},
+ {39, 325, 662, L"Гурзуф"},
+ {39, 325, 3382, L"Джанкой"},
+ {39, 325, 663, L"Евпатория"},
+ {39, 325, 667, L"Керчь"},
+ {39, 325, 666, L"Коктебель"},
+ {39, 325, 668, L"Мысовое"},
+ {39, 325, 669, L"Саки"},
+ {39, 325, 665, L"Севастополь"},
+ {39, 325, 661, L"Симферополь"},
+ {39, 325, 3370, L"Старый Крым"},
+ {39, 325, 670, L"Судак"},
+ {39, 325, 664, L"Феодосия"},
+ {39, 325, 3148, L"Черноморское"},
+ {39, 325, 671, L"Ялта"},
+ {39, 325, 2556, L"Другое"},
+ {39, 326, 672, L"Алчевск"},
+ {39, 326, 673, L"Антрацит"},
+ {39, 326, 674, L"Лисичанск"},
+ {39, 326, 675, L"Луганск"},
+ {39, 326, 3364, L"Молодогвардейск"},
+ {39, 326, 676, L"Петровское"},
+ {39, 326, 677, L"Ровеньки"},
+ {39, 326, 678, L"Рубежное"},
+ {39, 326, 679, L"Северодонецк"},
+ {39, 326, 680, L"Стаханов"},
+ {39, 326, 2555, L"Другое"},
+ {39, 327, 3284, L"Дрогобыч"},
+ {39, 327, 681, L"Львов"},
+ {39, 327, 682, L"Трускавец"},
+ {39, 327, 2554, L"Другое"},
+ {39, 328, 3322, L"Вознесенск"},
+ {39, 328, 2870, L"Жовтневое"},
+ {39, 328, 683, L"Николаев"},
+ {39, 328, 3118, L"Очаков"},
+ {39, 328, 3325, L"Южноукраинск"},
+ {39, 328, 2553, L"Другое"},
+ {39, 329, 684, L"Белгород-Днестровский"},
+ {39, 329, 685, L"Измаил"},
+ {39, 329, 689, L"Ильичевск"},
+ {39, 329, 686, L"Одесса"},
+ {39, 329, 688, L"Рени"},
+ {39, 329, 687, L"Слободка"},
+ {39, 329, 2552, L"Другое"},
+ {39, 330, 690, L"Гадяч"},
+ {39, 330, 691, L"Комсомольск"},
+ {39, 330, 693, L"Кременчуг"},
+ {39, 330, 694, L"Лубны"},
+ {39, 330, 695, L"Миргород"},
+ {39, 330, 692, L"Полтава"},
+ {39, 330, 2551, L"Другое"},
+ {39, 331, 696, L"Здолбунов"},
+ {39, 331, 697, L"Ровно"},
+ {39, 331, 3361, L"Сарны"},
+ {39, 331, 2550, L"Другое"},
+ {39, 332, 3356, L"Бурынь"},
+ {39, 332, 698, L"Конотоп"},
+ {39, 332, 700, L"Ромны"},
+ {39, 332, 699, L"Сумы"},
+ {39, 332, 701, L"Шостка"},
+ {39, 332, 2549, L"Другое"},
+ {39, 333, 702, L"Бережаны"},
+ {39, 333, 3171, L"Борщев"},
+ {39, 333, 703, L"Тернополь"},
+ {39, 333, 704, L"Чортков"},
+ {39, 333, 2548, L"Другое"},
+ {39, 334, 705, L"Изюм"},
+ {39, 334, 3346, L"Купянск"},
+ {39, 334, 3351, L"Купянск"},
+ {39, 334, 706, L"Лозовая"},
+ {39, 334, 708, L"Мерефа"},
+ {39, 334, 707, L"Харьков"},
+ {39, 334, 709, L"Чугуев"},
+ {39, 334, 2547, L"Другое"},
+ {39, 335, 710, L"Геническ"},
+ {39, 335, 711, L"Каховка"},
+ {39, 335, 712, L"Новая Каховка"},
+ {39, 335, 3280, L"Скадовск"},
+ {39, 335, 713, L"Херсон"},
+ {39, 335, 2546, L"Другое"},
+ {39, 336, 714, L"Каменец-Подольский"},
+ {39, 336, 715, L"Красилов"},
+ {39, 336, 2941, L"Нетишин"},
+ {39, 336, 716, L"Полонное"},
+ {39, 336, 3120, L"Сатанов"},
+ {39, 336, 2943, L"Славута"},
+ {39, 336, 717, L"Хмельницкий"},
+ {39, 336, 3155, L"Чемировцы"},
+ {39, 336, 2542, L"Другое"},
+ {39, 337, 3169, L"Золотоноша"},
+ {39, 337, 3016, L"Канев"},
+ {39, 337, 3333, L"Полонное"},
+ {39, 337, 718, L"Умань"},
+ {39, 337, 719, L"Христиновка"},
+ {39, 337, 720, L"Черкассы"},
+ {39, 337, 2545, L"Другое"},
+ {39, 338, 721, L"Нежин"},
+ {39, 338, 722, L"Прилуки"},
+ {39, 338, 723, L"Чернигов"},
+ {39, 338, 2544, L"Другое"},
+ {39, 339, 724, L"Черновцы"},
+ {39, 339, 2543, L"Другое"},
+ {340, 342, 725, L"Барановичи"},
+ {340, 342, 726, L"Белоозерск"},
+ {340, 342, 727, L"Береза"},
+ {340, 342, 728, L"Брест"},
+ {340, 342, 3172, L"Дрогичин"},
+ {340, 342, 729, L"Кобрин"},
+ {340, 342, 730, L"Ляховичи"},
+ {340, 342, 731, L"Малорита"},
+ {340, 342, 732, L"Пинск"},
+ {340, 342, 2538, L"Другое"},
+ {340, 343, 733, L"Браслав"},
+ {340, 343, 735, L"Витебск"},
+ {340, 343, 734, L"Новолукомоль"},
+ {340, 343, 736, L"Новополоцк"},
+ {340, 343, 737, L"Орша"},
+ {340, 343, 738, L"Толочин"},
+ {340, 343, 2537, L"Другое"},
+ {340, 344, 739, L"Гомель"},
+ {340, 344, 740, L"Жлобин"},
+ {340, 344, 741, L"Мозырь"},
+ {340, 344, 742, L"Речица"},
+ {340, 344, 743, L"Рогачев"},
+ {340, 344, 744, L"Светлогорск"},
+ {340, 344, 2536, L"Другое"},
+ {340, 345, 745, L"Волковыск"},
+ {340, 345, 746, L"Гродно"},
+ {340, 345, 747, L"Лида"},
+ {340, 345, 3244, L"Слоним"},
+ {340, 345, 748, L"Сморгонь"},
+ {340, 345, 2535, L"Другое"},
+ {340, 346, 3149, L"Березино"},
+ {340, 346, 749, L"Борисов"},
+ {340, 346, 750, L"Вилейка"},
+ {340, 346, 751, L"Жодино"},
+ {340, 346, 752, L"Марьина Горка"},
+ {340, 346, 753, L"Молодечно"},
+ {340, 346, 2896, L"Слуцк"},
+ {340, 346, 754, L"Смолевичи"},
+ {340, 346, 755, L"Солигорск"},
+ {340, 346, 756, L"Червень"},
+ {340, 346, 2534, L"Другое"},
+ {340, 347, 757, L"Бобруйск"},
+ {340, 347, 758, L"Могилев"},
+ {340, 347, 759, L"Осиповичи"},
+ {340, 347, 2533, L"Другое"},
{0, 0, 0, NULL}
};
diff --git a/protocols/MRA/src/MraAvatars.cpp b/protocols/MRA/src/MraAvatars.cpp index 961c5c3329..ba2f4fe98c 100644 --- a/protocols/MRA/src/MraAvatars.cpp +++ b/protocols/MRA/src/MraAvatars.cpp @@ -494,7 +494,7 @@ DWORD CMraProto::MraAvatarsQueueGetAvatar(HANDLE hQueue, DWORD dwFlags, MCONTACT BOOL bQueueAdd = TRUE;// check for updates
SYSTEMTIME stAvatarLastCheckTime;
- if ((dwFlags & GAIF_FORCE) == 0)// . ,
+ if ((dwFlags & GAIF_FORCE) == 0)// если флаг принудит. обновления, то даже не проверяем времени последнего обновления
if (MraAvatarsGetContactTime(hContact, "AvatarLastCheckTime", &stAvatarLastCheckTime)) {
CMStringW wszFileName;
FILETIME ftCurrentTime, ftExpireTime;
@@ -506,7 +506,7 @@ DWORD CMraProto::MraAvatarsQueueGetAvatar(HANDLE hQueue, DWORD dwFlags, MCONTACT if ((*((DWORDLONG*)&ftExpireTime)) > (*((DWORDLONG*)&ftCurrentTime)))
if (MraAvatarsGetFileName(hQueue, hContact, GetContactAvatarFormat(hContact, PA_FORMAT_DEFAULT), wszFileName) == NO_ERROR)
if (IsFileExist(wszFileName)) {
- // / ( )
+ // файл с аватаром существует и не устарел/не было комманды обновлять(просто запрос имени)
if (lpszPath) {
if (db_get_b(NULL, MRA_AVT_SECT_NAME, "ReturnAbsolutePath", MRA_AVT_DEFAULT_RET_ABC_PATH))
mir_wstrncpy(lpszPath, wszFileName, MAX_PATH);
diff --git a/protocols/MRA/src/MraConstans.h b/protocols/MRA/src/MraConstans.h index 406f471c27..f46f67fe0d 100644 --- a/protocols/MRA/src/MraConstans.h +++ b/protocols/MRA/src/MraConstans.h @@ -9,7 +9,7 @@ #define MIRVER_UNKNOWN ("Mail.ru Agent unknown client")
-#define MRA_PLUGIN_UPDATER_ID 2544 //
+#define MRA_PLUGIN_UPDATER_ID 2544 //появляется после первого выкладывания на сайт
#define MRA_SERVER_PORT_STANDART_NLB 2042
#define MRA_SERVER_PORT_STANDART 2041
#define MRA_SERVER_PORT_HTTPS 443
@@ -31,14 +31,14 @@ static const LPSTR lpcszMailRuDomains[] = #define BUFF_SIZE_RCV_MIN_FREE (16 * 1024) //internal
#define BUFF_SIZE_BLOB 16384 //internal
#define BUFF_SIZE_URL 4096 //internal
-#define WAIT_FOR_THREAD_TIMEOUT 15 //internal //
+#define WAIT_FOR_THREAD_TIMEOUT 15 //internal // время ожидания завершения потока
#define THREAD_SLEEP_TIME 100 //internal
#define THREAD_MAX_PING_TIME 20 // sec, internal
#define THREAD_MAX_PING_FAIL_COUNT 3 // internal
-#define SEND_QUEUE_TIMEOUT 600 //internal //
-#define ALLOCATED_COUNT 32 //internal //
-#define EMAILS_MIN_COUNT 16 //internal // email
-#define PHONES_MIN_COUNT 4 //internal // email
+#define SEND_QUEUE_TIMEOUT 600 //internal // время удаления недоставленных сообщений из очереди отправки
+#define ALLOCATED_COUNT 32 //internal // колличество элементов
+#define EMAILS_MIN_COUNT 16 //internal // колличество элементов обязательно проверяемых при извлечении email адреса из инфы юзера
+#define PHONES_MIN_COUNT 4 //internal // колличество элементов обязательно проверяемых при извлечении email адреса из инфы юзера
#define MRA_ALARM_MESSAGE LPGENW("Your contact wakes you")
@@ -133,9 +133,9 @@ static const LPSTR lpcszMailRuDomains[] = #define MRA_DEFAULT_TIMEOUT_RECV_NLB 20
#define MRA_DEFAULT_CONN_RETRY_COUNT_FILES 2
#define MRA_DEFAULT_CONN_RETRY_COUNT_MRIMPROXY 3
-#define MRA_TIMEOUT_DIRECT_CONN 30 //internal;
-#define MRA_TIMEOUT_CONN_MIN 2 //internal;
-#define MRA_TIMEOUT_CONN_MAX 16 //internal;
+#define MRA_TIMEOUT_DIRECT_CONN 30 //internal; время после которого клиент считает что к нему подключится не удалось
+#define MRA_TIMEOUT_CONN_MIN 2 //internal; минимальное время ожидания пока устанавливается исходящее подключение
+#define MRA_TIMEOUT_CONN_MAX 16 //internal; максимальное время ожидания пока устанавливается исходящее подключение
#define MRA_MAXLENOFMESSAGE 32768 //internal
#define MRA_MAXCONTACTSPERPACKET 256 //internal
#define MRA_CODE_PAGE 1251 //internal
@@ -172,7 +172,7 @@ static const LPSTR lpcszMailRuDomains[] = #define MRA_DEFAULT_LAST_SEARCH_COUTRY 0
-#define MRA_DEFAULT_FILE_SEND_BLOCK_SIZE 8192 //hidden,
+#define MRA_DEFAULT_FILE_SEND_BLOCK_SIZE 8192 //hidden, размер блока при отправке файла
#define MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA FALSE
diff --git a/protocols/MRA/src/MraFilesQueue.cpp b/protocols/MRA/src/MraFilesQueue.cpp index ae7938fe4b..cdf220ffc1 100644 --- a/protocols/MRA/src/MraFilesQueue.cpp +++ b/protocols/MRA/src/MraFilesQueue.cpp @@ -222,12 +222,12 @@ size_t CMraProto::MraFilesQueueGetLocalAddressesList(LPSTR lpszBuff, size_t dwBu {
LPSTR lpszCurPos = lpszBuff;
- if (getByte("FileSendHideMyAddresses", MRA_DEF_FS_HIDE_MY_ADDRESSES)) {// IP !!! :)
- if (getByte("FileSendAddExtraAddresses", MRA_DEF_FS_ADD_EXTRA_ADDRESSES) == FALSE) {//
+ if (getByte("FileSendHideMyAddresses", MRA_DEF_FS_HIDE_MY_ADDRESSES)) {// не выдаём врагу наш IP адрес!!! :)
+ if (getByte("FileSendAddExtraAddresses", MRA_DEF_FS_ADD_EXTRA_ADDRESSES) == FALSE) {// только если не добавляем адрес роутера
lpszCurPos += mir_snprintf(lpszCurPos, (dwBuffSize - ((size_t)lpszCurPos - (size_t)lpszBuff)), MRA_FILES_NULL_ADDRR);
}
}
- else {// IP
+ else {// создаём список наших IP адресов
BYTE btAddress[32];
DWORD dwSelfExternalIP;
size_t dwAdapter = 0;
@@ -250,7 +250,7 @@ size_t CMraProto::MraFilesQueueGetLocalAddressesList(LPSTR lpszBuff, size_t dwBu }
CMStringA szHostName;
- if (getByte("FileSendAddExtraAddresses", MRA_DEF_FS_ADD_EXTRA_ADDRESSES))//
+ if (getByte("FileSendAddExtraAddresses", MRA_DEF_FS_ADD_EXTRA_ADDRESSES))// добавляем произвольный адрес
if (mraGetStringA(NULL, "FileSendExtraAddresses", szHostName))
lpszCurPos += mir_snprintf(lpszCurPos, (dwBuffSize - ((size_t)lpszCurPos - (size_t)lpszBuff)), "%s:%lu;", szHostName.c_str(), dwPort);
@@ -435,7 +435,7 @@ HANDLE CMraProto::MraFilesQueueConnectOut(MRA_FILES_QUEUE_ITEM *dat) size_t dwAddrCount = 0;
NETLIBOPENCONNECTION nloc = { 0 };
- if (getByte("FileSendIgnoryAdditionalPorts", MRA_DEF_FS_IGNORY_ADDITIONAL_PORTS) || bIsHTTPSProxyUsed) {// IP, 3
+ if (getByte("FileSendIgnoryAdditionalPorts", MRA_DEF_FS_IGNORY_ADDITIONAL_PORTS) || bIsHTTPSProxyUsed) {// фильтруем порты для одного IP, вместо 3 будем коннектится только к одному
if (bIsHTTPSProxyUsed)
dwLocalPort = MRA_SERVER_PORT_HTTPS;
else if ((dwLocalPort = getWord("ServerPort", MRA_DEFAULT_SERVER_PORT)) == MRA_SERVER_PORT_STANDART_NLB)
@@ -457,7 +457,7 @@ HANDLE CMraProto::MraFilesQueueConnectOut(MRA_FILES_QUEUE_ITEM *dat) dwConnectReTryCount = getDword("ConnectReTryCountFileSend", MRA_DEFAULT_CONN_RETRY_COUNT_FILES);
nloc.cbSize = sizeof(nloc);
nloc.flags = NLOCF_V2;
- nloc.timeout = getDword("TimeOutConnectFileSend", (int)((MRA_TIMEOUT_DIRECT_CONN - 1) / (dwAddrCount*dwConnectReTryCount)));// -1
+ nloc.timeout = getDword("TimeOutConnectFileSend", (int)((MRA_TIMEOUT_DIRECT_CONN - 1) / (dwAddrCount*dwConnectReTryCount)));// -1 сек чтобы был запас
if (nloc.timeout < MRA_TIMEOUT_CONN_MIN) nloc.timeout = MRA_TIMEOUT_CONN_MIN;
if (nloc.timeout > MRA_TIMEOUT_CONN_MAX) nloc.timeout = MRA_TIMEOUT_CONN_MAX;
@@ -478,12 +478,12 @@ HANDLE CMraProto::MraFilesQueueConnectOut(MRA_FILES_QUEUE_ITEM *dat) if (dat->hConnection) {
ProtoBroadcastAck(dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
if (MraFilesQueueHandCheck(dat->hConnection, dat)) {
- //
+ // связь установленная с тем кем нужно
setDword(dat->hContact, "OldIP", getDword(dat->hContact, "IP", 0));
setDword(dat->hContact, "IP", ntohl(dat->malAddrList.pMailAddress[i].dwAddr));
break;
}
- else // :)
+ else // кажется не туда подключились :)
NETLIB_CLOSEHANDLE(dat->hConnection);
}
}
@@ -519,7 +519,7 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat) CHAR szAddrList[2048] = { 0 };
size_t dwAddrListSize;
- //
+ // копируем адреса в соответствии с правилами и начинаем слушать порт
if (getByte("FileSendEnableDirectConn", MRA_DEF_FS_ENABLE_DIRECT_CONN)) {
NETLIBBIND nlbBind = {};
nlbBind.pfnNewConnectionV2 = MraFilesQueueConnectionReceived;
@@ -531,7 +531,7 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat) ProtoBroadcastAck(dat->hContact, ACKTYPE_FILE, ACKRESULT_LISTENING, (HANDLE)dat->dwIDRequest, 0);
dwAddrListSize = MraFilesQueueGetLocalAddressesList(szAddrList, sizeof(szAddrList), nlbBind.wPort);
}
- // , .
+ // не смогли слушать порт, хз почему.
else {
ShowFormattedErrorMessage(L"Files exchange: cant create listen soscket, will try connect to remonte host. Error", GetLastError());
@@ -540,7 +540,7 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat) dwAddrListSize = (sizeof(MRA_FILES_NULL_ADDRR)-1);
}
}
- // ,
+ // подставляем ложный адрес, чтобы точно не подключились и не слушаем порт
else {
memcpy(szAddrList, MRA_FILES_NULL_ADDRR, sizeof(MRA_FILES_NULL_ADDRR));
dwAddrListSize = (sizeof(MRA_FILES_NULL_ADDRR)-1);
@@ -548,10 +548,10 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat) if (dwAddrListSize) {
dat->hWaitHandle = CreateEvent(nullptr, TRUE, FALSE, nullptr);
- if (dat->bSending == FALSE) // ,
+ if (dat->bSending == FALSE) // запрашиваем зеркальное соединение, тк сами подключится не смогли
MraFileTransferAck(FILE_TRANSFER_MIRROR, szEmail, dat->dwIDRequest, szAddrList);
- else { // ( )
- //
+ else { // здесь отправляем запрос на передачу(установление соединения)
+ // создаём текстовый список файлов для отправки другой стороне
LPWSTR lpwszFiles, lpwszCurPos;
size_t dwFilesSize;
@@ -567,7 +567,7 @@ HANDLE CMraProto::MraFilesQueueConnectIn(MRA_FILES_QUEUE_ITEM *dat) dwFilesSize = (lpwszCurPos - lpwszFiles);// size in WCHARs
if (dat->hMraMrimProxyData) {
- // ,
+ // устанавливаем данные для майловской прокси, если она разрешена
CMStringA lpszFiles = lpwszFiles;
MraMrimProxySetData(dat->hMraMrimProxyData, szEmail, dat->dwIDRequest, MRIM_PROXY_TYPE_FILES, lpszFiles, "", nullptr);
}
@@ -592,14 +592,14 @@ void MraFilesQueueConnectionReceived(HNETLIBCONN hNewConnection, DWORD dwRemoteI MRA_FILES_QUEUE_ITEM *dat = (MRA_FILES_QUEUE_ITEM*)pExtra;
ProtoBroadcastAck(dat->ppro->m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
- if (dat->ppro->MraFilesQueueHandCheck(hNewConnection, dat)) { //
+ if (dat->ppro->MraFilesQueueHandCheck(hNewConnection, dat)) { // связь установленная с тем кем нужно
dat->hConnection = hNewConnection;
ProtoBroadcastAck(dat->ppro->m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
dat->ppro->setDword(dat->hContact, "OldIP", dat->ppro->getDword(dat->hContact, "IP", 0));
dat->ppro->setDword(dat->hContact, "IP", dwRemoteIP);
SetEvent(dat->hWaitHandle);
}
- else {// :)
+ else {// кажется кто то не туда подключилися :)
ProtoBroadcastAck(dat->ppro->m_szModuleName, dat->hContact, ACKTYPE_FILE, ACKRESULT_LISTENING, (HANDLE)dat->dwIDRequest, 0);
Netlib_CloseHandle(hNewConnection);
}
@@ -752,8 +752,8 @@ void CMraProto::MraFilesQueueRecvThreadProc(LPVOID lpParameter) else {
if (InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0)) {
ProtoBroadcastAck(dat->hContact, ACKRESULT_CONNECTPROXY, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
- if (MraMrimProxyConnect(dat->hMraMrimProxyData, &dat->hConnection) == NO_ERROR) {// , ( , )
- if (MraFilesQueueHandCheck(dat->hConnection, dat)) {// // dat->bSending
+ if (MraMrimProxyConnect(dat->hMraMrimProxyData, &dat->hConnection) == NO_ERROR) {// подключились к прокси, проверяем та ли сессия (ещё раз, на этот раз сами)
+ if (MraFilesQueueHandCheck(dat->hConnection, dat)) {// связь установленная с тем кем нужно// dat->bSending
ProtoBroadcastAck(dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
bConnected = TRUE;
}
@@ -923,7 +923,7 @@ DWORD CMraProto::MraFilesQueueAddSend(HANDLE hQueue, DWORD dwFlags, MCONTACT hCo dat->ppro = this;
dat->bIsWorking = TRUE;
dat->dwSendTime = GetTickCount();
- dat->dwIDRequest = InterlockedIncrement((LONG volatile*)&dwCMDNum);// ,
+ dat->dwIDRequest = InterlockedIncrement((LONG volatile*)&dwCMDNum);// уникальный, рандомный идентификатор
dat->dwFlags = dwFlags;
dat->hContact = hContact;
if (getByte("FileSendEnableMRIMProxyCons", MRA_DEF_FS_ENABLE_MRIM_PROXY_CONS)) dat->hMraMrimProxyData = MraMrimProxyCreate();
@@ -1001,9 +1001,9 @@ void CMraProto::MraFilesQueueSendThreadProc(LPVOID lpParameter) if (InterlockedExchangeAdd((volatile LONG*)&dat->bIsWorking, 0)) {
ProtoBroadcastAck(dat->hContact, ACKRESULT_CONNECTPROXY, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
if (MraMrimProxyConnect(dat->hMraMrimProxyData, &dat->hConnection) == NO_ERROR) {
- // , ( , )
+ // подключились к прокси, проверяем та ли сессия (ещё раз, на этот раз сами)
if (MraFilesQueueHandCheck(dat->hConnection, dat)) {
- // // dat->bSending
+ // связь установленная с тем кем нужно// dat->bSending
ProtoBroadcastAck(dat->hContact, ACKTYPE_FILE, ACKRESULT_CONNECTED, (HANDLE)dat->dwIDRequest, 0);
bConnected = TRUE;
}
diff --git a/protocols/MRA/src/MraMRIMProxy.cpp b/protocols/MRA/src/MraMRIMProxy.cpp index d5d5af1b9e..c8811720d0 100644 --- a/protocols/MRA/src/MraMRIMProxy.cpp +++ b/protocols/MRA/src/MraMRIMProxy.cpp @@ -82,12 +82,12 @@ DWORD CMraProto::MraMrimProxyConnect(HANDLE hMraMrimProxyData, HNETLIBCONN *phCo MRA_MRIMPROXY_DATA *pmmpd = (MRA_MRIMPROXY_DATA*)hMraMrimProxyData;
NETLIBOPENCONNECTION nloc = {0};
- // ,
+ // адреса есть, значит инициаторы не мы
if (pmmpd->malAddrList.dwAddrCount) {
CMStringA szAddresses = MraAddrListGetToBuff(&pmmpd->malAddrList);
MraProxyAck(PROXY_STATUS_OK, pmmpd->szEmail, pmmpd->dwIDRequest, pmmpd->dwDataType, pmmpd->lpszUserData, szAddresses, pmmpd->mguidSessionID);
}
- //
+ // мы инициаторы
else {
pmmpd->hWaitHandle = CreateEvent(nullptr, TRUE, FALSE, nullptr);
if (pmmpd->szEmail)
@@ -105,13 +105,13 @@ DWORD CMraProto::MraMrimProxyConnect(HANDLE hMraMrimProxyData, HNETLIBCONN *phCo dwConnectReTryCount = getDword("ConnectReTryCountMRIMProxy", MRA_DEFAULT_CONN_RETRY_COUNT_MRIMPROXY);
nloc.cbSize = sizeof(nloc);
nloc.flags = NLOCF_V2;
- nloc.timeout = ((MRA_TIMEOUT_DIRECT_CONN-1)/(pmmpd->malAddrList.dwAddrCount*dwConnectReTryCount));// -1
+ nloc.timeout = ((MRA_TIMEOUT_DIRECT_CONN-1)/(pmmpd->malAddrList.dwAddrCount*dwConnectReTryCount));// -1 сек чтобы был запас
if (nloc.timeout < MRA_TIMEOUT_CONN_MIN) nloc.timeout = MRA_TIMEOUT_CONN_MIN;
if (nloc.timeout > MRA_TIMEOUT_CONN_MAX) nloc.timeout = MRA_TIMEOUT_CONN_MAX;
// Set up the sockaddr structure
for (size_t i = 0; i < pmmpd->malAddrList.dwAddrCount && dwRetErrorCode != NO_ERROR; i++) {
- // https 443
+ // через https прокси только 443 порт
if ((pmmpd->malAddrList.pMailAddress[i].dwPort == MRA_SERVER_PORT_HTTPS && bIsHTTPSProxyUsed) || bIsHTTPSProxyUsed == FALSE) {
if (pmmpd->dwDataType == MRIM_PROXY_TYPE_FILES)
ProtoBroadcastAck(MraHContactFromEmail(pmmpd->szEmail, FALSE, TRUE, nullptr), ACKTYPE_FILE, ACKRESULT_CONNECTING, (HANDLE)pmmpd->dwIDRequest, 0);
@@ -189,7 +189,7 @@ DWORD CMraProto::MraMrimProxyConnect(HANDLE hMraMrimProxyData, HNETLIBCONN *phCo }// filtered
}// end for
- if (dwRetErrorCode != NO_ERROR) // :)
+ if (dwRetErrorCode != NO_ERROR) // кажется не туда подключились :)
NETLIB_CLOSEHANDLE(pmmpd->hConnection);
}
*phConnection = pmmpd->hConnection;
diff --git a/protocols/MRA/src/MraOfflineMsg.cpp b/protocols/MRA/src/MraOfflineMsg.cpp index 1e75e886e3..a5e786a6ba 100644 --- a/protocols/MRA/src/MraOfflineMsg.cpp +++ b/protocols/MRA/src/MraOfflineMsg.cpp @@ -43,7 +43,7 @@ static DWORD MraOfflineMessageGetMIMEHeadAndBody(LPCSTR lpszMessage, size_t dwMe if (!lpszMessage || !dwMessageSize)
return ERROR_NOT_FOUND;
- // : RFC CRLFCRLF LFLF MIME ,
+ // затычка: майл не придерживается RFC и вместо CRLFCRLF ставит LFLF в MIME частях, иногда ставит
LPSTR lpszBody = (LPSTR)MemoryFind(0, lpszMessage, dwMessageSize, CRLFCRLF, (sizeof(CRLFCRLF)-1));
if (lpszBody)
lpszBody += (sizeof(CRLFCRLF)-1);
@@ -55,7 +55,7 @@ static DWORD MraOfflineMessageGetMIMEHeadAndBody(LPCSTR lpszMessage, size_t dwMe if (!lpszBody)
return ERROR_NOT_FOUND;
- //
+ // нашли начало контента миме части
size_t dwBodySize = (dwMessageSize-(lpszBody-lpszMessage));
if (plpszHeader) (*plpszHeader) = (LPSTR)lpszMessage;
if (pdwHeaderSize) (*pdwHeaderSize) = ((lpszBody-(sizeof(LFLF)-1))-lpszMessage);
@@ -96,10 +96,10 @@ static DWORD MraOfflineMessageGetNextMIMEPart(LPSTR lpszBody, size_t dwBodySize, LPSTR lpszCurMIMEPos = plpszCurMIMEPos;
LPSTR lpszMIMEPart = (LPSTR)MemoryFind((lpszCurMIMEPos-lpszBody), lpszBody, dwBodySize, lpszBoundary, dwBoundarySize);
- if (lpszMIMEPart) {//
+ if (lpszMIMEPart) {// первая миме часть
lpszMIMEPart += dwBoundarySize;
- // : RFC CRLF LF MIME ,
+ // затычка: майл не придерживается RFC и вместо CRLF ставит LF в MIME частях, иногда ставит
if ((*((WORD*)lpszMIMEPart)) == (*((WORD*)CRLF)))
lpszMIMEPart += (sizeof(CRLF)-1);
else if ((*((BYTE*)lpszMIMEPart)) == (*((BYTE*)LF)))
@@ -112,9 +112,9 @@ static DWORD MraOfflineMessageGetNextMIMEPart(LPSTR lpszBody, size_t dwBodySize, if (lpszMIMEPart == nullptr)
return ERROR_NO_MORE_ITEMS;
LPSTR lpszTemp = (LPSTR)MemoryFind((lpszMIMEPart-lpszBody), lpszBody, dwBodySize, lpszBoundary, dwBoundarySize);
- if (lpszTemp) {//
+ if (lpszTemp) {// нашли конец миме части с текстом
size_t dwMIMEPartSize = (lpszTemp-lpszMIMEPart);// 4 = CRLF"--"Boundary / 3 = LF"--"Boundary
- // : RFC CRLF LF MIME ,
+ // затычка: майл не придерживается RFC и вместо CRLF ставит LF в MIME частях, иногда ставит
if ((*((WORD*)(lpszTemp-4))) == (*((WORD*)CRLF)))
dwMIMEPartSize -= 4;
else if ((*((BYTE*)(lpszTemp-3))) == (*((BYTE*)LF)))
@@ -132,12 +132,12 @@ static DWORD MraOfflineMessageGetNextMIMEPart(LPSTR lpszBody, size_t dwBodySize, return ERROR_NOT_FOUND;
}
-//
+// Сообщение
static DWORD PlainText2message(const CMStringA &szContentType, const CMStringA &szBody, CMStringA &plpsText, DWORD *pdwFlags)
{
// Content-Type: text/plain; charset = CP-1251
if ( strstr(szContentType, "utf-16le")) {
- // charset = UTF-16LE// base64
+ // charset = UTF-16LE// предполагаем что оно в base64
unsigned dwTextSize;
ptrA lpszText((LPSTR)mir_base64_decode(szBody, &dwTextSize));
if (lpszText) {
diff --git a/protocols/MRA/src/MraPlaces.h b/protocols/MRA/src/MraPlaces.h index 100887c18a..98a5e535b2 100644 --- a/protocols/MRA/src/MraPlaces.h +++ b/protocols/MRA/src/MraPlaces.h @@ -4,8 +4,8 @@ #pragma once
-#define lpwszOther L""
-//static LPWSTR lpwszOther = L"";
+#define lpwszOther L"Другое"
+//static LPWSTR lpwszOther = L"Другое";
typedef struct
@@ -63,1603 +63,1603 @@ typedef struct static const MRA_PLACE mrapPlaces[] =
{
- {24, 0, 0, L""},
- {81, 0, 0, L""},
- {82, 0, 0, L""},
- {97, 0, 0, L""},
- {96, 0, 0, L""},
- {99, 0, 0, L""},
- {100, 0, 0, L"-"},
- {101, 0, 0, L""},
- {102, 0, 0, L""},
- {83, 0, 0, L""},
- {86, 0, 0, L""},
- {95, 0, 0, L""},
- {103, 0, 0, L""},
- {79, 0, 0, L""},
- {85, 0, 0, L""},
- {87, 0, 0, L""},
- {104, 0, 0, L""},
- {84, 0, 0, L""},
- {105, 0, 0, L""},
- {106, 0, 0, L""},
- {107, 0, 0, L""},
- {92, 0, 0, L" ()"},
- {76, 0, 0, L""},
- {3215, 0, 0, L" (.)"},
- {29, 0, 0, L" ()"},
- {108, 0, 0, L""},
- {88, 0, 0, L""},
- {109, 0, 0, L""},
- {110, 0, 0, L""},
- {111, 0, 0, L""},
- {112, 0, 0, L""},
- {113, 0, 0, L""},
- {114, 0, 0, L""},
- {115, 0, 0, L""},
- {116, 0, 0, L" "},
- {117, 0, 0, L""},
- {3216, 0, 0, L" (.)"},
- {122, 0, 0, L""},
- {89, 0, 0, L""},
- {94, 0, 0, L" "},
- {118, 0, 0, L""},
- {78, 0, 0, L""},
- {91, 0, 0, L""},
- {119, 0, 0, L""},
- {120, 0, 0, L""},
- {132, 0, 0, L""},
- {90, 0, 0, L""},
- {77, 0, 0, L""},
- {93, 0, 0, L""},
- {121, 0, 0, L""},
- {98, 0, 0, L" "},
- {75, 0, 0, L""},
- {123, 0, 0, L""},
- {454, 0, 0, L" "},
- {124, 0, 0, L""},
- {453, 0, 0, L" ()"},
- {126, 0, 0, L""},
- {127, 0, 0, L" "},
- {128, 0, 0, L" ( )"},
- {129, 0, 0, L""},
- {3220, 0, 0, L" (..)"},
- {130, 0, 0, L" "},
- {3218, 0, 0, L" (.)"},
- {3221, 0, 0, L" (..)"},
- {3230, 0, 0, L" (.)"},
- {131, 0, 0, L""},
- {133, 0, 0, L" - "},
- {3222, 0, 0, L" (.)"},
- {125, 0, 0, L""},
- {3219, 0, 0, L". ()"},
- {134, 0, 0, L" "},
- {3223, 0, 0, L" (..)"},
- {135, 0, 0, L""},
- {136, 0, 0, L""},
- {3224, 0, 0, L" (.)"},
- {137, 0, 0, L""},
- {3226, 0, 0, L" "},
- {3225, 0, 0, L" "},
- {138, 0, 0, L""},
- {139, 0, 0, L""},
- {3200, 0, 0, L" (.)"},
- {140, 0, 0, L" "},
- {141, 0, 0, L""},
- {3202, 0, 0, L" (.)"},
- {142, 0, 0, L""},
- {143, 0, 0, L""},
- {146, 0, 0, L""},
- {3203, 0, 0, L" (.)"},
- {144, 0, 0, L""},
- {145, 0, 0, L""},
- {147, 0, 0, L""},
- {3204, 0, 0, L" (.)"},
- {452, 0, 0, L" ()"},
- {149, 0, 0, L""},
- {148, 0, 0, L""},
- {3205, 0, 0, L" (.)"},
- {173, 0, 0, L""},
- {150, 0, 0, L""},
- {151, 0, 0, L""},
- {152, 0, 0, L" (.)"},
- {153, 0, 0, L""},
- {154, 0, 0, L" "},
- {155, 0, 0, L""},
- {156, 0, 0, L"-"},
- {157, 0, 0, L""},
- {3208, 0, 0, L" (.)"},
- {158, 0, 0, L""},
- {3209, 0, 0, L" ()"},
- {3201, 0, 0, L" "},
- {159, 0, 0, L""},
- {3207, 0, 0, L" (.)"},
- {3211, 0, 0, L" (.)"},
- {160, 0, 0, L""},
- {161, 0, 0, L""},
- {162, 0, 0, L""},
- {163, 0, 0, L""},
- {164, 0, 0, L"- "},
- {165, 0, 0, L"- "},
- {166, 0, 0, L"-"},
- {3210, 0, 0, L"- (.)"},
- {167, 0, 0, L""},
- {168, 0, 0, L" "},
- {169, 0, 0, L""},
- {3212, 0, 0, L" (.)"},
- {3206, 0, 0, L" "},
- {170, 0, 0, L""},
- {171, 0, 0, L""},
- {3213, 0, 0, L". . - (.)"},
- {172, 0, 0, L""},
- {174, 0, 0, L""},
- {175, 0, 0, L""},
- {176, 0, 0, L""},
- {177, 0, 0, L""},
- {3228, 0, 0, L" "},
- {178, 0, 0, L"-"},
- {179, 0, 0, L""},
- {180, 0, 0, L""},
- {181, 0, 0, L""},
- {182, 0, 0, L""},
- {183, 0, 0, L""},
- {184, 0, 0, L"-"},
- {185, 0, 0, L""},
- {186, 0, 0, L""},
- {187, 0, 0, L""},
- {3198, 0, 0, L". "},
- {23, 0, 0, L""},
- {188, 0, 0, L"-"},
- {189, 0, 0, L""},
- {190, 0, 0, L""},
- {191, 0, 0, L""},
- {193, 0, 0, L" ()"},
- {192, 0, 0, L""},
- {194, 0, 0, L"-`"},
- {195, 0, 0, L""},
- {196, 0, 0, L""},
- {197, 0, 0, L""},
- {198, 0, 0, L""},
- {199, 0, 0, L""},
- {200, 0, 0, L""},
- {3229, 0, 0, L" (.)"},
- {201, 0, 0, L""},
- {202, 0, 0, L""},
- {203, 0, 0, L""},
- {204, 0, 0, L""},
- {205, 0, 0, L""},
- {206, 0, 0, L""},
- {207, 0, 0, L""},
- {3227, 0, 0, L" (.)"},
- {3197, 0, 0, L" (.)"},
- {208, 0, 0, L""},
- {209, 0, 0, L"- "},
- {210, 0, 0, L""},
- {3199, 0, 0, L" (.)"},
- {211, 0, 0, L""},
- {212, 0, 0, L""},
- {213, 0, 0, L""},
- {214, 0, 0, L""},
- {215, 0, 0, L"-"},
- {216, 0, 0, L""},
- {217, 0, 0, L""},
- {218, 0, 0, L""},
- {219, 0, 0, L""},
- {220, 0, 0, L" "},
- {222, 0, 0, L""},
- {223, 0, 0, L" "},
- {221, 0, 0, L""},
- {224, 0, 0, L""},
- {225, 0, 0, L"- ()"},
- {39, 0, 0, L""},
- {40, 0, 0, L""},
- {32, 0, 0, L""},
- {33, 0, 0, L""},
- {340, 0, 0, L""},
- {38, 0, 0, L""},
- {41, 0, 0, L""},
- {42, 0, 0, L" "},
- {43, 0, 0, L""},
- {45, 0, 0, L""},
- {44, 0, 0, L""},
- {46, 0, 0, L""},
- {3193, 0, 0, L" (.)"},
- {47, 0, 0, L" (.)"},
- {48, 0, 0, L""},
- {49, 0, 0, L""},
- {3194, 0, 0, L" (.)"},
- {50, 0, 0, L""},
- {51, 0, 0, L""},
- {34, 0, 0, L""},
- {52, 0, 0, L""},
- {53, 0, 0, L""},
- {54, 0, 0, L""},
- {55, 0, 0, L""},
- {56, 0, 0, L""},
- {57, 0, 0, L""},
- {58, 0, 0, L""},
- {59, 0, 0, L""},
- {36, 0, 0, L""},
- {60, 0, 0, L""},
- {61, 0, 0, L""},
- {3195, 0, 0, L" (.)"},
- {62, 0, 0, L""},
- {35, 0, 0, L""},
- {63, 0, 0, L""},
- {64, 0, 0, L"-"},
- {74, 0, 0, L" "},
- {65, 0, 0, L""},
- {66, 0, 0, L""},
- {67, 0, 0, L" - ()"},
- {68, 0, 0, L""},
- {37, 0, 0, L""},
- {69, 0, 0, L""},
- {70, 0, 0, L""},
- {71, 0, 0, L""},
- {72, 0, 0, L""},
- {3196, 0, 0, L" (.)"},
- {73, 0, 0, L""},
- {24, 25, 0, L""},
- {24, 226, 0, L"-"},
- {24, 233, 0, L" ()"},
- {24, 232, 0, L" "},
- {24, 235, 0, L" "},
- {24, 227, 0, L" ."},
- {24, 229, 0, L" ."},
- {24, 231, 0, L" ."},
- {24, 234, 0, L" ."},
- {24, 228, 0, L" "},
- {24, 230, 0, L" "},
- {24, 236, 0, L" "},
- {24, 237, 0, L""},
- {24, 240, 0, L"-"},
- {24, 241, 0, L""},
- {24, 248, 0, L""},
- {24, 249, 0, L""},
- {24, 251, 0, L""},
- {24, 238, 0, L" ."},
- {24, 242, 0, L" ."},
- {24, 243, 0, L" ."},
- {24, 244, 0, L" ."},
- {24, 245, 0, L" ."},
- {24, 246, 0, L" ."},
- {24, 247, 0, L" ."},
- {24, 250, 0, L" ."},
- {24, 239, 0, L"- "},
- {24, 255, 0, L""},
- {24, 256, 0, L""},
- {24, 252, 0, L" ."},
- {24, 253, 0, L" ."},
- {24, 254, 0, L" ."},
- {24, 257, 0, L" ."},
- {24, 258, 0, L" ."},
- {24, 260, 0, L" ."},
- {24, 261, 0, L" ."},
- {24, 259, 0, L" "},
- {24, 265, 0, L""},
- {24, 263, 0, L" "},
- {24, 273, 0, L""},
- {24, 275, 0, L""},
- {24, 264, 0, L" "},
- {24, 268, 0, L" "},
- {24, 266, 0, L" ."},
- {24, 267, 0, L" ."},
- {24, 269, 0, L" ."},
- {24, 270, 0, L" ."},
- {24, 272, 0, L" ."},
- {24, 276, 0, L" ."},
- {24, 262, 0, L" "},
- {24, 271, 0, L" "},
- {24, 274, 0, L"- "},
- {24, 277, 0, L" "},
- {24, 278, 0, L" ."},
- {24, 279, 0, L" ."},
- {24, 280, 0, L" ."},
- {24, 282, 0, L" ."},
- {24, 281, 0, L"- - "},
- {24, 283, 0, L"- "},
- {24, 284, 0, L" ."},
- {24, 285, 0, L" ."},
- {24, 286, 0, L" ."},
- {24, 287, 0, L" ."},
- {24, 288, 0, L" ."},
- {24, 289, 0, L" ."},
- {24, 290, 0, L" ."},
- {24, 291, 0, L" ."},
- {24, 292, 0, L" ."},
- {24, 293, 0, L" ."},
- {24, 294, 0, L" ."},
- {24, 295, 0, L" ."},
- {24, 296, 0, L" ."},
- {24, 297, 0, L" ."},
- {24, 298, 0, L" ."},
- {24, 299, 0, L" ."},
- {24, 300, 0, L" ."},
- {24, 301, 0, L""},
- {24, 304, 0, L""},
- {24, 305, 0, L""},
- {24, 306, 0, L"-"},
- {24, 307, 0, L""},
- {24, 308, 0, L"-"},
- {24, 311, 0, L" - "},
- {24, 313, 0, L""},
- {24, 309, 0, L" "},
- {24, 312, 0, L" "},
- {24, 302, 0, L" ."},
- {24, 303, 0, L" ."},
- {24, 310, 0, L" ."},
- {81, 1055, 0, L""},
- {81, 1058, 0, L""},
- {81, 1056, 0, L""},
- {81, 1057, 0, L""},
- {81, 3153, 0, L""},
+ {24, 0, 0, L"Россия"},
+ {81, 0, 0, L"Азербайджан"},
+ {82, 0, 0, L"Армения"},
+ {97, 0, 0, L"Афганистан"},
+ {96, 0, 0, L"Бангладеш"},
+ {99, 0, 0, L"Бахрейн"},
+ {100, 0, 0, L"Бруней-Даруссалам"},
+ {101, 0, 0, L"Бутан"},
+ {102, 0, 0, L"Вьетнам"},
+ {83, 0, 0, L"Грузия"},
+ {86, 0, 0, L"Израиль"},
+ {95, 0, 0, L"Индия"},
+ {103, 0, 0, L"Индонезия"},
+ {79, 0, 0, L"Иордания"},
+ {85, 0, 0, L"Ирак"},
+ {87, 0, 0, L"Иран"},
+ {104, 0, 0, L"Йемен"},
+ {84, 0, 0, L"Казахстан"},
+ {105, 0, 0, L"Камбоджа"},
+ {106, 0, 0, L"Катар"},
+ {107, 0, 0, L"Кипр"},
+ {92, 0, 0, L"Киргизия (Кыргызстан)"},
+ {76, 0, 0, L"Китай"},
+ {3215, 0, 0, L"Кокосовые острова (Австр.)"},
+ {29, 0, 0, L"Корея (КНДР)"},
+ {108, 0, 0, L"Корея"},
+ {88, 0, 0, L"Кувейт"},
+ {109, 0, 0, L"Лаос"},
+ {110, 0, 0, L"Ливан"},
+ {111, 0, 0, L"Малайзия"},
+ {112, 0, 0, L"Мальдивы"},
+ {113, 0, 0, L"Монголия"},
+ {114, 0, 0, L"Мьянма"},
+ {115, 0, 0, L"Непал"},
+ {116, 0, 0, L"Объединенные Арабские Эмираты"},
+ {117, 0, 0, L"Оман"},
+ {3216, 0, 0, L"Остров Рождества (Австр.)"},
+ {122, 0, 0, L"Пакистан"},
+ {89, 0, 0, L"Палестина"},
+ {94, 0, 0, L"Саудовская Аравия"},
+ {118, 0, 0, L"Сингапур"},
+ {78, 0, 0, L"Сирия"},
+ {91, 0, 0, L"Таджикистан"},
+ {119, 0, 0, L"Таиланд"},
+ {120, 0, 0, L"Тайвань"},
+ {132, 0, 0, L"Тимор"},
+ {90, 0, 0, L"Туркмения"},
+ {77, 0, 0, L"Турция"},
+ {93, 0, 0, L"Узбекистан"},
+ {121, 0, 0, L"Филиппины"},
+ {98, 0, 0, L"Шри Ланка"},
+ {75, 0, 0, L"Япония"},
+ {123, 0, 0, L"Австралия"},
+ {454, 0, 0, L"Американское Самоа"},
+ {124, 0, 0, L"Вануату"},
+ {453, 0, 0, L"Гуам (США)"},
+ {126, 0, 0, L"Кирибати"},
+ {127, 0, 0, L"Маршалловы Острова"},
+ {128, 0, 0, L"Микронезия (Федеративные Штаты Микронезии)"},
+ {129, 0, 0, L"Науру"},
+ {3220, 0, 0, L"Ниуэ (Н.Зел.)"},
+ {130, 0, 0, L"Новая Зеландия"},
+ {3218, 0, 0, L"Новая Каледония (Фр.)"},
+ {3221, 0, 0, L"Острова Кука (Н.Зел.)"},
+ {3230, 0, 0, L"Острова Херд и Макдональд (Австр.)"},
+ {131, 0, 0, L"Палау"},
+ {133, 0, 0, L"Папуа - Новая Гвинея"},
+ {3222, 0, 0, L"Питкерн (Брит.)"},
+ {125, 0, 0, L"Самоа"},
+ {3219, 0, 0, L"Сев. Марианские острова (США)"},
+ {134, 0, 0, L"Соломоновы Острова"},
+ {3223, 0, 0, L"Токелау (Н.Зел.)"},
+ {135, 0, 0, L"Тонга"},
+ {136, 0, 0, L"Тувалу"},
+ {3224, 0, 0, L"Уоллис и Футуна острова (Фр.)"},
+ {137, 0, 0, L"Фиджи"},
+ {3226, 0, 0, L"Французская Полинезия"},
+ {3225, 0, 0, L"Французские Южные территории"},
+ {138, 0, 0, L"Канада"},
+ {139, 0, 0, L"США"},
+ {3200, 0, 0, L"Ангилья (Брит.)"},
+ {140, 0, 0, L"Антигуа и Барбуда"},
+ {141, 0, 0, L"Аргентина"},
+ {3202, 0, 0, L"Аруба (Нид.)"},
+ {142, 0, 0, L"Багамы"},
+ {143, 0, 0, L"Барбадос"},
+ {146, 0, 0, L"Белиз"},
+ {3203, 0, 0, L"Бермуды (Брит.)"},
+ {144, 0, 0, L"Боливия"},
+ {145, 0, 0, L"Бразилия"},
+ {147, 0, 0, L"Венесуэла"},
+ {3204, 0, 0, L"Виргинские острова (Брит.)"},
+ {452, 0, 0, L"Виргинские острова (США)"},
+ {149, 0, 0, L"Гаити"},
+ {148, 0, 0, L"Гайана"},
+ {3205, 0, 0, L"Гваделупа (Фр.)"},
+ {173, 0, 0, L"Гватемала"},
+ {150, 0, 0, L"Гондурас"},
+ {151, 0, 0, L"Гренада"},
+ {152, 0, 0, L"Гренландия (Дат.)"},
+ {153, 0, 0, L"Доминика"},
+ {154, 0, 0, L"Доминиканская Республика"},
+ {155, 0, 0, L"Колумбия"},
+ {156, 0, 0, L"Коста-Рика"},
+ {157, 0, 0, L"Куба"},
+ {3208, 0, 0, L"Мартиника (Фр.)"},
+ {158, 0, 0, L"Мексика"},
+ {3209, 0, 0, L"Монтсеррат (Брит)"},
+ {3201, 0, 0, L"Нидерландские Антилы"},
+ {159, 0, 0, L"Никарагуа"},
+ {3207, 0, 0, L"Остров Кайман (Брит.)"},
+ {3211, 0, 0, L"Острова Теркс и Кайкос (Брит.)"},
+ {160, 0, 0, L"Панама"},
+ {161, 0, 0, L"Парагвай"},
+ {162, 0, 0, L"Перу"},
+ {163, 0, 0, L"Сальвадор"},
+ {164, 0, 0, L"Сент-Винсент и Гренадины"},
+ {165, 0, 0, L"Сент-Китс и Невис"},
+ {166, 0, 0, L"Сент-Люсия"},
+ {3210, 0, 0, L"Сент-Пьер и Микелон (Фр.)"},
+ {167, 0, 0, L"Суринам"},
+ {168, 0, 0, L"Тринидат и Тобаго"},
+ {169, 0, 0, L"Уругвай"},
+ {3212, 0, 0, L"Фолклендские острова (Брит.)"},
+ {3206, 0, 0, L"Французская Гвиана"},
+ {170, 0, 0, L"Чили"},
+ {171, 0, 0, L"Эквадор"},
+ {3213, 0, 0, L"Юж. Джорджия и Юж. Сандвичевы о-ва (Брит.)"},
+ {172, 0, 0, L"Ямайка"},
+ {174, 0, 0, L"Алжир"},
+ {175, 0, 0, L"Ангола"},
+ {176, 0, 0, L"Бенин"},
+ {177, 0, 0, L"Ботсвана"},
+ {3228, 0, 0, L"Британская территория в Индийском океане"},
+ {178, 0, 0, L"Буркина-Фасо"},
+ {179, 0, 0, L"Бурунди"},
+ {180, 0, 0, L"Габон"},
+ {181, 0, 0, L"Гамбия"},
+ {182, 0, 0, L"Гана"},
+ {183, 0, 0, L"Гвинея"},
+ {184, 0, 0, L"Гвинея-Бисау"},
+ {185, 0, 0, L"Джибути"},
+ {186, 0, 0, L"Египет"},
+ {187, 0, 0, L"Замбия"},
+ {3198, 0, 0, L"Зап. Сахара"},
+ {23, 0, 0, L"Зимбабве"},
+ {188, 0, 0, L"Кабо-Верде"},
+ {189, 0, 0, L"Камерун"},
+ {190, 0, 0, L"Кения"},
+ {191, 0, 0, L"Коморы"},
+ {193, 0, 0, L"Конго (Заир)"},
+ {192, 0, 0, L"Конго"},
+ {194, 0, 0, L"Кот-д`Ивуар"},
+ {195, 0, 0, L"Лесото"},
+ {196, 0, 0, L"Либерия"},
+ {197, 0, 0, L"Ливия"},
+ {198, 0, 0, L"Маврикий"},
+ {199, 0, 0, L"Мавритания"},
+ {200, 0, 0, L"Мадагаскар"},
+ {3229, 0, 0, L"Майотт (Фр.)"},
+ {201, 0, 0, L"Малави"},
+ {202, 0, 0, L"Мали"},
+ {203, 0, 0, L"Марокко"},
+ {204, 0, 0, L"Мозамбик"},
+ {205, 0, 0, L"Намибия"},
+ {206, 0, 0, L"Нигер"},
+ {207, 0, 0, L"Нигерия"},
+ {3227, 0, 0, L"Остров Буве (Норв.)"},
+ {3197, 0, 0, L"Реюньон (Фр.)"},
+ {208, 0, 0, L"Руанда"},
+ {209, 0, 0, L"Сан-Томе и Принсипи"},
+ {210, 0, 0, L"Свазиленд"},
+ {3199, 0, 0, L"Святая Елена (Брит.)"},
+ {211, 0, 0, L"Сейшелы"},
+ {212, 0, 0, L"Сенегал"},
+ {213, 0, 0, L"Сомали"},
+ {214, 0, 0, L"Судан"},
+ {215, 0, 0, L"Сьерра-Леоне"},
+ {216, 0, 0, L"Танзания"},
+ {217, 0, 0, L"Того"},
+ {218, 0, 0, L"Тунис"},
+ {219, 0, 0, L"Уганда"},
+ {220, 0, 0, L"Центральноафриканская Республика"},
+ {222, 0, 0, L"Чад"},
+ {223, 0, 0, L"Экваториальная Гвинея"},
+ {221, 0, 0, L"Эритрея"},
+ {224, 0, 0, L"Эфиопия"},
+ {225, 0, 0, L"Южно-Африканская Республика (ЮАР)"},
+ {39, 0, 0, L"Украина"},
+ {40, 0, 0, L"Австрия"},
+ {32, 0, 0, L"Албания"},
+ {33, 0, 0, L"Андорра"},
+ {340, 0, 0, L"Белоруссия"},
+ {38, 0, 0, L"Бельгия"},
+ {41, 0, 0, L"Болгария"},
+ {42, 0, 0, L"Босния и Герцеговина"},
+ {43, 0, 0, L"Ватикан"},
+ {45, 0, 0, L"Великобритания"},
+ {44, 0, 0, L"Венгрия"},
+ {46, 0, 0, L"Германия"},
+ {3193, 0, 0, L"Гернси (Брит.)"},
+ {47, 0, 0, L"Гибралтар (Брит.)"},
+ {48, 0, 0, L"Греция"},
+ {49, 0, 0, L"Дания"},
+ {3194, 0, 0, L"Джерси (Брит.)"},
+ {50, 0, 0, L"Ирландия"},
+ {51, 0, 0, L"Исландия"},
+ {34, 0, 0, L"Испания"},
+ {52, 0, 0, L"Италия"},
+ {53, 0, 0, L"Латвия"},
+ {54, 0, 0, L"Литва"},
+ {55, 0, 0, L"Лихтенштейн"},
+ {56, 0, 0, L"Люксембург"},
+ {57, 0, 0, L"Македония"},
+ {58, 0, 0, L"Мальта"},
+ {59, 0, 0, L"Молдавия"},
+ {36, 0, 0, L"Монако"},
+ {60, 0, 0, L"Нидерланды"},
+ {61, 0, 0, L"Норвегия"},
+ {3195, 0, 0, L"Остров Мэн (Брит.)"},
+ {62, 0, 0, L"Польша"},
+ {35, 0, 0, L"Португалия"},
+ {63, 0, 0, L"Румыния"},
+ {64, 0, 0, L"Сан-Марино"},
+ {74, 0, 0, L"Сербия и Черногория"},
+ {65, 0, 0, L"Словакия"},
+ {66, 0, 0, L"Словения"},
+ {67, 0, 0, L"Фарерские о-ва (Дания)"},
+ {68, 0, 0, L"Финляндия"},
+ {37, 0, 0, L"Франция"},
+ {69, 0, 0, L"Хорватия"},
+ {70, 0, 0, L"Чехия"},
+ {71, 0, 0, L"Швейцария"},
+ {72, 0, 0, L"Швеция"},
+ {3196, 0, 0, L"Шпицберген (Норв.)"},
+ {73, 0, 0, L"Эстония"},
+ {24, 25, 0, L"Москва"},
+ {24, 226, 0, L"Санкт-Петербург"},
+ {24, 233, 0, L"Саха (Якутия)"},
+ {24, 232, 0, L"Приморский край"},
+ {24, 235, 0, L"Хабаровский край"},
+ {24, 227, 0, L"Амурская обл."},
+ {24, 229, 0, L"Камчатская обл."},
+ {24, 231, 0, L"Магаданская обл."},
+ {24, 234, 0, L"Сахалинская обл."},
+ {24, 228, 0, L"Еврейская АО"},
+ {24, 230, 0, L"Корякский АО"},
+ {24, 236, 0, L"Чукотский АО"},
+ {24, 237, 0, L"Башкортостан"},
+ {24, 240, 0, L"Марий-Эл"},
+ {24, 241, 0, L"Мордовия"},
+ {24, 248, 0, L"Татарстан"},
+ {24, 249, 0, L"Удмуртия"},
+ {24, 251, 0, L"Чувашия"},
+ {24, 238, 0, L"Кировская обл."},
+ {24, 242, 0, L"Нижегородская обл."},
+ {24, 243, 0, L"Оренбургская обл."},
+ {24, 244, 0, L"Пензенская обл."},
+ {24, 245, 0, L"Пермская обл."},
+ {24, 246, 0, L"Самарская обл."},
+ {24, 247, 0, L"Саратовская обл."},
+ {24, 250, 0, L"Ульяновская обл."},
+ {24, 239, 0, L"Коми-Пермяцкий АО"},
+ {24, 255, 0, L"Карелия"},
+ {24, 256, 0, L"Коми"},
+ {24, 252, 0, L"Архангельская обл."},
+ {24, 253, 0, L"Вологодская обл."},
+ {24, 254, 0, L"Калининградская обл."},
+ {24, 257, 0, L"Ленинградская обл."},
+ {24, 258, 0, L"Мурманская обл."},
+ {24, 260, 0, L"Новгородская обл."},
+ {24, 261, 0, L"Псковская обл."},
+ {24, 259, 0, L"Ненецкий АО"},
+ {24, 265, 0, L"Бурятия"},
+ {24, 263, 0, L"Республика Алтай"},
+ {24, 273, 0, L"Тыва"},
+ {24, 275, 0, L"Хакасия"},
+ {24, 264, 0, L"Алтайский край"},
+ {24, 268, 0, L"Красноярский край"},
+ {24, 266, 0, L"Иркутская обл."},
+ {24, 267, 0, L"Кемеровская обл."},
+ {24, 269, 0, L"Новосибирская обл."},
+ {24, 270, 0, L"Омская обл."},
+ {24, 272, 0, L"Томская обл."},
+ {24, 276, 0, L"Читинская обл."},
+ {24, 262, 0, L"Агинский Бурятский АО"},
+ {24, 271, 0, L"Таймырский АО"},
+ {24, 274, 0, L"Усть-Ордынский Бурятский АО"},
+ {24, 277, 0, L"Эвенкийский АО"},
+ {24, 278, 0, L"Курганская обл."},
+ {24, 279, 0, L"Свердловская обл."},
+ {24, 280, 0, L"Тюменская обл."},
+ {24, 282, 0, L"Челябинская обл."},
+ {24, 281, 0, L"Ханты-Мансийский АО - Югра"},
+ {24, 283, 0, L"Ямало-Ненецкий АО"},
+ {24, 284, 0, L"Белгородская обл."},
+ {24, 285, 0, L"Брянская обл."},
+ {24, 286, 0, L"Владимирская обл."},
+ {24, 287, 0, L"Воронежская обл."},
+ {24, 288, 0, L"Ивановская обл."},
+ {24, 289, 0, L"Калужская обл."},
+ {24, 290, 0, L"Костромская обл."},
+ {24, 291, 0, L"Курская обл."},
+ {24, 292, 0, L"Липецкая обл."},
+ {24, 293, 0, L"Московская обл."},
+ {24, 294, 0, L"Орловская обл."},
+ {24, 295, 0, L"Рязанская обл."},
+ {24, 296, 0, L"Смоленская обл."},
+ {24, 297, 0, L"Тамбовская обл."},
+ {24, 298, 0, L"Тверская обл."},
+ {24, 299, 0, L"Тульская обл."},
+ {24, 300, 0, L"Ярославская обл."},
+ {24, 301, 0, L"Адыгея"},
+ {24, 304, 0, L"Дагестан"},
+ {24, 305, 0, L"Ингушетия"},
+ {24, 306, 0, L"Кабардино-Балкария"},
+ {24, 307, 0, L"Калмыкия"},
+ {24, 308, 0, L"Карачаево-Черкессия"},
+ {24, 311, 0, L"Северная Осетия - Алания"},
+ {24, 313, 0, L"Чечня"},
+ {24, 309, 0, L"Краснодарский край"},
+ {24, 312, 0, L"Ставропольский край"},
+ {24, 302, 0, L"Астраханская обл."},
+ {24, 303, 0, L"Волгоградская обл."},
+ {24, 310, 0, L"Ростовская обл."},
+ {81, 1055, 0, L"Баку"},
+ {81, 1058, 0, L"Гянджа"},
+ {81, 1056, 0, L"Нахичевань"},
+ {81, 1057, 0, L"Ханкенди"},
+ {81, 3153, 0, L"Шеки"},
{81, 2291, 0, lpwszOther},
- {82, 2932, 0, L""},
- {82, 1060, 0, L""},
- {82, 3084, 0, L""},
- {82, 3011, 0, L""},
- {82, 3306, 0, L""},
- {82, 1059, 0, L""},
- {82, 3145, 0, L""},
+ {82, 2932, 0, L"Абовян"},
+ {82, 1060, 0, L"Аштарак"},
+ {82, 3084, 0, L"Ванадзор"},
+ {82, 3011, 0, L"Гюмри"},
+ {82, 3306, 0, L"Дилижан"},
+ {82, 1059, 0, L"Ереван"},
+ {82, 3145, 0, L"Ханкенди"},
{82, 2292, 0, lpwszOther},
- {97, 1061, 0, L""},
+ {97, 1061, 0, L"Кабул"},
{97, 2293, 0, lpwszOther},
- {96, 1062, 0, L""},
+ {96, 1062, 0, L"Дакка"},
{96, 2294, 0, lpwszOther},
- {99, 1063, 0, L""},
+ {99, 1063, 0, L"Манама"},
{99, 2295, 0, lpwszOther},
- {100, 1064, 0, L"--"},
+ {100, 1064, 0, L"Бандар-Сери-Бегаван"},
{100, 2296, 0, lpwszOther},
- {101, 1065, 0, L""},
+ {101, 1065, 0, L"Тхимпху"},
{101, 2297, 0, lpwszOther},
- {102, 1066, 0, L""},
+ {102, 1066, 0, L"Ханой"},
{102, 2298, 0, lpwszOther},
- {83, 1067, 0, L""},
- {83, 3158, 0, L""},
- {83, 1068, 0, L""},
- {83, 3129, 0, L""},
- {83, 1069, 0, L""},
- {83, 1070, 0, L""},
+ {83, 1067, 0, L"Батуми"},
+ {83, 3158, 0, L"Боржоми"},
+ {83, 1068, 0, L"Поти"},
+ {83, 3129, 0, L"Рустави"},
+ {83, 1069, 0, L"Сухуми"},
+ {83, 1070, 0, L"Тбилиси"},
{83, 2299, 0, lpwszOther},
- {86, 3345, 0, L""},
- {86, 1071, 0, L""},
- {86, 2992, 0, L""},
- {86, 3175, 0, L""},
- {86, 3363, 0, L"-"},
- {86, 2884, 0, L"-"},
- {86, 3243, 0, L"-"},
- {86, 1074, 0, L"-"},
- {86, 3348, 0, L""},
- {86, 3241, 0, L""},
- {86, 1075, 0, L""},
- {86, 3350, 0, L"-"},
- {86, 2982, 0, L""},
- {86, 2971, 0, L"-"},
- {86, 3136, 0, L""},
- {86, 1080, 0, L""},
- {86, 3303, 0, L""},
- {86, 3050, 0, L""},
- {86, 3151, 0, L" "},
- {86, 3141, 0, L""},
- {86, 3012, 0, L" "},
- {86, 1081, 0, L""},
- {86, 1077, 0, L"-"},
- {86, 1079, 0, L""},
- {86, 1078, 0, L""},
- {86, 1076, 0, L""},
- {86, 2929, 0, L""},
- {86, 2928, 0, L""},
+ {86, 3345, 0, L"Ариэль"},
+ {86, 1071, 0, L"Афула"},
+ {86, 2992, 0, L"Ашдод"},
+ {86, 3175, 0, L"Ашкелон"},
+ {86, 3363, 0, L"Бат-Ям"},
+ {86, 2884, 0, L"Беер-Яков"},
+ {86, 3243, 0, L"Бейт-Шемеш"},
+ {86, 1074, 0, L"Беэр-Шева"},
+ {86, 3348, 0, L"Герцелия"},
+ {86, 3241, 0, L"Димона"},
+ {86, 1075, 0, L"Иерусалим"},
+ {86, 3350, 0, L"Йокнеам-Иллит"},
+ {86, 2982, 0, L"Кармиэль"},
+ {86, 2971, 0, L"Кфар-Саба"},
+ {86, 3136, 0, L"Назарет"},
+ {86, 1080, 0, L"Натания"},
+ {86, 3303, 0, L"Офаким"},
+ {86, 3050, 0, L"Раанана"},
+ {86, 3151, 0, L"Рамат Ган"},
+ {86, 3141, 0, L"Реховот"},
+ {86, 3012, 0, L"Ришон ле Цион"},
+ {86, 1081, 0, L"Тверия"},
+ {86, 1077, 0, L"Тель-Авив"},
+ {86, 1079, 0, L"Хадера"},
+ {86, 1078, 0, L"Хайфа"},
+ {86, 1076, 0, L"Хеврон"},
+ {86, 2929, 0, L"Цфат"},
+ {86, 2928, 0, L"Эйлат"},
{86, 2300, 0, lpwszOther},
- {95, 3315, 0, L""},
- {95, 1082, 0, L""},
- {95, 1083, 0, L""},
- {95, 3144, 0, L""},
- {95, 3025, 0, L""},
- {95, 3277, 0, L""},
- {95, 1084, 0, L""},
+ {95, 3315, 0, L"Бангалор"},
+ {95, 1082, 0, L"Дели"},
+ {95, 1083, 0, L"Джайпур"},
+ {95, 3144, 0, L"Калькутта"},
+ {95, 3025, 0, L"Мумбаи"},
+ {95, 3277, 0, L"Панаджи"},
+ {95, 1084, 0, L"Ченнаи"},
{95, 2301, 0, lpwszOther},
- {103, 1085, 0, L""},
+ {103, 1085, 0, L"Джакарта"},
{103, 2302, 0, lpwszOther},
- {79, 1086, 0, L""},
+ {79, 1086, 0, L"Амман"},
{79, 2303, 0, lpwszOther},
- {85, 1087, 0, L""},
+ {85, 1087, 0, L"Багдад"},
{85, 2304, 0, lpwszOther},
- {87, 1088, 0, L""},
+ {87, 1088, 0, L"Тегеран"},
{87, 2305, 0, lpwszOther},
- {104, 1089, 0, L""},
+ {104, 1089, 0, L"Сана"},
{104, 2306, 0, lpwszOther},
- {84, 1090, 0, L""},
- {84, 1091, 0, L""},
- {84, 1092, 0, L"-"},
- {84, 3242, 0, L""},
- {84, 1093, 0, L""},
- {84, 1094, 0, L" ()"},
- {84, 1095, 0, L""},
- {84, 3245, 0, L""},
- {84, 3083, 0, L""},
- {84, 1096, 0, L""},
- {84, 1097, 0, L""},
- {84, 1098, 0, L""},
- {84, 1099, 0, L""},
- {84, 2868, 0, L""},
- {84, 1100, 0, L""},
- {84, 1101, 0, L" (.-. .)"},
- {84, 1102, 0, L""},
- {84, 1103, 0, L""},
- {84, 1104, 0, L""},
- {84, 3166, 0, L""},
- {84, 1105, 0, L"-"},
- {84, 2927, 0, L""},
- {84, 1106, 0, L""},
- {84, 1107, 0, L""},
- {84, 1108, 0, L"-"},
- {84, 1109, 0, L""},
- {84, 1110, 0, L""},
+ {84, 1090, 0, L"Актау"},
+ {84, 1091, 0, L"Актюбинск"},
+ {84, 1092, 0, L"Алма-Ата"},
+ {84, 3242, 0, L"Аршалы"},
+ {84, 1093, 0, L"Астана"},
+ {84, 1094, 0, L"Атырау (Гурьев)"},
+ {84, 1095, 0, L"Байконур"},
+ {84, 3245, 0, L"Балхаш"},
+ {84, 3083, 0, L"Жезказган"},
+ {84, 1096, 0, L"Капчагай"},
+ {84, 1097, 0, L"Караганда"},
+ {84, 1098, 0, L"Кокшетау"},
+ {84, 1099, 0, L"Кустанай"},
+ {84, 2868, 0, L"Лисаковск"},
+ {84, 1100, 0, L"Павлодар"},
+ {84, 1101, 0, L"Петропавловск (Сев.-Каз. обл.)"},
+ {84, 1102, 0, L"Рудный"},
+ {84, 1103, 0, L"Семипалатинск"},
+ {84, 1104, 0, L"Степногорск"},
+ {84, 3166, 0, L"Талгар"},
+ {84, 1105, 0, L"Талды-Курган"},
+ {84, 2927, 0, L"Тараз"},
+ {84, 1106, 0, L"Темиртау"},
+ {84, 1107, 0, L"Уральск"},
+ {84, 1108, 0, L"Усть-Каменогорск"},
+ {84, 1109, 0, L"Чимкент"},
+ {84, 1110, 0, L"Экибастуз"},
{84, 2307, 0, lpwszOther},
- {105, 1111, 0, L""},
+ {105, 1111, 0, L"Пномпень"},
{105, 2308, 0, lpwszOther},
- {106, 1112, 0, L""},
+ {106, 1112, 0, L"Доха"},
{106, 2309, 0, lpwszOther},
- {107, 1113, 0, L""},
- {107, 1114, 0, L""},
- {107, 1115, 0, L""},
- {107, 2954, 0, L""},
+ {107, 1113, 0, L"Ларнака"},
+ {107, 1114, 0, L"Лимассол"},
+ {107, 1115, 0, L"Никосия"},
+ {107, 2954, 0, L"Пафос"},
{107, 2310, 0, lpwszOther},
- {92, 1116, 0, L""},
- {92, 1117, 0, L"-"},
- {92, 3027, 0, L"-"},
- {92, 1118, 0, L""},
- {92, 1119, 0, L""},
- {92, 1120, 0, L""},
- {92, 2933, 0, L""},
+ {92, 1116, 0, L"Бишкек"},
+ {92, 1117, 0, L"Джалал-Абад"},
+ {92, 3027, 0, L"Кара-Балта"},
+ {92, 1118, 0, L"Каракол"},
+ {92, 1119, 0, L"Ош"},
+ {92, 1120, 0, L"Талас"},
+ {92, 2933, 0, L"Хайдаркен"},
{92, 2311, 0, lpwszOther},
- {76, 3214, 0, L" ()"},
- {76, 1121, 0, L""},
- {76, 2869, 0, L""},
- {76, 3262, 0, L""},
- {76, 1122, 0, L""},
- {76, 1123, 0, L""},
- {76, 1124, 0, L""},
- {76, 3043, 0, L""},
+ {76, 3214, 0, L"Аомынь (Макао)"},
+ {76, 1121, 0, L"Гонконг"},
+ {76, 2869, 0, L"Гуанчжоу"},
+ {76, 3262, 0, L"Далянь"},
+ {76, 1122, 0, L"Пекин"},
+ {76, 1123, 0, L"Харбин"},
+ {76, 1124, 0, L"Шанхай"},
+ {76, 3043, 0, L"Шеньян"},
{76, 2312, 0, lpwszOther},
- {29, 1125, 0, L""},
+ {29, 1125, 0, L"Пхеньян"},
{29, 2313, 0, lpwszOther},
- {108, 1126, 0, L""},
- {108, 3240, 0, L""},
+ {108, 1126, 0, L"Сеул"},
+ {108, 3240, 0, L"Тейджон"},
{108, 2314, 0, lpwszOther},
- {88, 1127, 0, L"-"},
+ {88, 1127, 0, L"Эль-Кувейт"},
{88, 2315, 0, lpwszOther},
- {109, 1128, 0, L""},
+ {109, 1128, 0, L"Вьентьян"},
{109, 2316, 0, lpwszOther},
- {110, 1129, 0, L""},
+ {110, 1129, 0, L"Бейрут"},
{110, 2317, 0, lpwszOther},
- {111, 1130, 0, L"-"},
- {111, 1131, 0, L"-"},
+ {111, 1130, 0, L"Джохор-Бару"},
+ {111, 1131, 0, L"Куала-Лумпур"},
{111, 2318, 0, lpwszOther},
- {112, 1132, 0, L""},
+ {112, 1132, 0, L"Мале"},
{112, 2319, 0, lpwszOther},
- {113, 1133, 0, L"-"},
- {113, 1134, 0, L""},
+ {113, 1133, 0, L"Улан-Батор"},
+ {113, 1134, 0, L"Эрдэнэт"},
{113, 2320, 0, lpwszOther},
- {114, 1135, 0, L""},
+ {114, 1135, 0, L"Янгон"},
{114, 2321, 0, lpwszOther},
- {115, 1136, 0, L""},
+ {115, 1136, 0, L"Катманду"},
{115, 2322, 0, lpwszOther},
- {116, 1137, 0, L"-"},
- {116, 1138, 0, L""},
- {116, 1139, 0, L""},
+ {116, 1137, 0, L"Абу-Даби"},
+ {116, 1138, 0, L"Дубай"},
+ {116, 1139, 0, L"Шарджа"},
{116, 2323, 0, lpwszOther},
- {117, 1140, 0, L""},
+ {117, 1140, 0, L"Маскат"},
{117, 2324, 0, lpwszOther},
- {122, 1141, 0, L""},
+ {122, 1141, 0, L"Исламабад"},
{122, 2325, 0, lpwszOther},
- {89, 1072, 0, L""},
- {89, 1073, 0, L""},
- {89, 1142, 0, L""},
+ {89, 1072, 0, L"Ашдод"},
+ {89, 1073, 0, L"Ашкелон"},
+ {89, 1142, 0, L"Газа"},
{89, 2326, 0, lpwszOther},
- {94, 3250, 0, L""},
- {94, 1143, 0, L"-"},
+ {94, 3250, 0, L"Медина"},
+ {94, 1143, 0, L"Эр-Рияд"},
{94, 2327, 0, lpwszOther},
- {78, 1144, 0, L""},
+ {78, 1144, 0, L"Дамаск"},
{78, 2328, 0, lpwszOther},
- {91, 1145, 0, L""},
- {91, 3307, 0, L""},
- {91, 3308, 0, L""},
+ {91, 1145, 0, L"Душанбе"},
+ {91, 3307, 0, L"Кайраккум"},
+ {91, 3308, 0, L"Худжанд"},
{91, 2329, 0, lpwszOther},
- {119, 1146, 0, L""},
- {119, 1147, 0, L""},
+ {119, 1146, 0, L"Бангкок"},
+ {119, 1147, 0, L"Пхукет"},
{119, 2330, 0, lpwszOther},
- {120, 1148, 0, L""},
+ {120, 1148, 0, L"Тайбэй"},
{120, 2331, 0, lpwszOther},
- {132, 1149, 0, L""},
+ {132, 1149, 0, L"Дили"},
{132, 2332, 0, lpwszOther},
- {90, 1150, 0, L""},
- {90, 3079, 0, L""},
+ {90, 1150, 0, L"Ашхабад"},
+ {90, 3079, 0, L"Безмеин"},
{90, 2333, 0, lpwszOther},
- {77, 1152, 0, L""},
- {77, 1153, 0, L""},
- {77, 3080, 0, L""},
- {77, 1151, 0, L""},
- {77, 1154, 0, L""},
- {77, 1155, 0, L""},
+ {77, 1152, 0, L"Анкара"},
+ {77, 1153, 0, L"Анталия"},
+ {77, 3080, 0, L"Бурса"},
+ {77, 1151, 0, L"Мармарис"},
+ {77, 1154, 0, L"Стамбул"},
+ {77, 1155, 0, L"Трабзон"},
{77, 2334, 0, lpwszOther},
- {93, 3362, 0, L""},
- {93, 3137, 0, L""},
- {93, 3273, 0, L""},
- {93, 1156, 0, L""},
- {93, 1157, 0, L""},
- {93, 3167, 0, L""},
- {93, 3347, 0, L""},
- {93, 1158, 0, L""},
- {93, 1159, 0, L""},
- {93, 1160, 0, L""},
- {93, 1161, 0, L""},
- {93, 1162, 0, L""},
- {93, 1163, 0, L""},
- {93, 1164, 0, L""},
+ {93, 3362, 0, L"Алмалык"},
+ {93, 3137, 0, L"Андижан"},
+ {93, 3273, 0, L"Асака"},
+ {93, 1156, 0, L"Ахангаран"},
+ {93, 1157, 0, L"Бухара"},
+ {93, 3167, 0, L"Джизак"},
+ {93, 3347, 0, L"Кунград"},
+ {93, 1158, 0, L"Навои"},
+ {93, 1159, 0, L"Наманган"},
+ {93, 1160, 0, L"Самарканд"},
+ {93, 1161, 0, L"Ташкент"},
+ {93, 1162, 0, L"Ургенч"},
+ {93, 1163, 0, L"Фергана"},
+ {93, 1164, 0, L"Чирчик"},
{93, 2335, 0, lpwszOther},
- {121, 1165, 0, L""},
- {121, 3319, 0, L""},
+ {121, 1165, 0, L"Манила"},
+ {121, 3319, 0, L"Себу"},
{121, 2336, 0, lpwszOther},
- {98, 1166, 0, L""},
+ {98, 1166, 0, L"Коломбо"},
{98, 2337, 0, lpwszOther},
- {75, 3176, 0, L""},
- {75, 3339, 0, L""},
- {75, 1167, 0, L""},
- {75, 1168, 0, L""},
+ {75, 3176, 0, L"Исесаки"},
+ {75, 3339, 0, L"Корияма"},
+ {75, 1167, 0, L"Саппоро"},
+ {75, 1168, 0, L"Токио"},
{75, 2338, 0, lpwszOther},
- {123, 1914, 0, L""},
- {123, 2957, 0, L" "},
- {123, 1915, 0, L""},
- {123, 3331, 0, L""},
- {123, 1916, 0, L""},
- {123, 3001, 0, L""},
- {123, 1917, 0, L""},
- {123, 3217, 0, L""},
- {123, 3064, 0, L""},
- {123, 3020, 0, L" "},
- {123, 1918, 0, L""},
- {123, 3238, 0, L""},
+ {123, 1914, 0, L"Аделаида"},
+ {123, 2957, 0, L"Блэк Рок"},
+ {123, 1915, 0, L"Брисбен"},
+ {123, 3331, 0, L"Горокан"},
+ {123, 1916, 0, L"Канберра"},
+ {123, 3001, 0, L"Лидкомб"},
+ {123, 1917, 0, L"Мельбурн"},
+ {123, 3217, 0, L"Норфолк"},
+ {123, 3064, 0, L"Перт"},
+ {123, 3020, 0, L"Санта Люсиа"},
+ {123, 1918, 0, L"Сидней"},
+ {123, 3238, 0, L"Энеабба"},
{123, 2339, 0, lpwszOther},
- {454, 1192, 0, L"-"},
+ {454, 1192, 0, L"Паго-Паго"},
{454, 2366, 0, lpwszOther},
- {124, 1919, 0, L"-"},
+ {124, 1919, 0, L"Порт-Вила"},
{124, 2340, 0, lpwszOther},
- {453, 1193, 0, L""},
+ {453, 1193, 0, L"Аганья"},
{453, 2368, 0, lpwszOther},
- {126, 1921, 0, L""},
+ {126, 1921, 0, L"Баирики"},
{126, 2342, 0, lpwszOther},
- {127, 1922, 0, L""},
+ {127, 1922, 0, L"Маджуро"},
{127, 2343, 0, lpwszOther},
- {128, 1923, 0, L""},
+ {128, 1923, 0, L"Паликир"},
{128, 2344, 0, lpwszOther},
- {129, 1924, 0, L""},
+ {129, 1924, 0, L"Ярен"},
{129, 2345, 0, lpwszOther},
- {130, 1925, 0, L""},
- {130, 1926, 0, L""},
- {130, 1928, 0, L""},
- {130, 1929, 0, L""},
- {130, 3235, 0, L""},
- {130, 1927, 0, L""},
- {130, 3323, 0, L""},
+ {130, 1925, 0, L"Веллингтон"},
+ {130, 1926, 0, L"Гамильтон"},
+ {130, 1928, 0, L"Данидин"},
+ {130, 1929, 0, L"Крайстчерч"},
+ {130, 3235, 0, L"Кромвель"},
+ {130, 1927, 0, L"Окленд"},
+ {130, 3323, 0, L"Тауранга"},
{130, 2346, 0, lpwszOther},
- {131, 1930, 0, L""},
+ {131, 1930, 0, L"Корор"},
{131, 2347, 0, lpwszOther},
- {133, 1931, 0, L"-"},
+ {133, 1931, 0, L"Порт-Морсби"},
{133, 2348, 0, lpwszOther},
- {125, 1920, 0, L""},
+ {125, 1920, 0, L"Апиа"},
{125, 2341, 0, lpwszOther},
- {134, 1932, 0, L""},
+ {134, 1932, 0, L"Хониара"},
{134, 2349, 0, lpwszOther},
- {135, 1933, 0, L""},
+ {135, 1933, 0, L"Нукуалофа"},
{135, 2350, 0, lpwszOther},
- {136, 1934, 0, L""},
+ {136, 1934, 0, L"Фунафути"},
{136, 2351, 0, lpwszOther},
- {137, 1935, 0, L""},
+ {137, 1935, 0, L"Сува"},
{137, 2352, 0, lpwszOther},
- {138, 3055, 0, L""},
- {138, 3049, 0, L""},
- {138, 3330, 0, L""},
- {138, 1169, 0, L""},
- {138, 3106, 0, L""},
- {138, 1170, 0, L""},
- {138, 1171, 0, L""},
- {138, 1172, 0, L""},
- {138, 3365, 0, L""},
- {138, 1173, 0, L""},
- {138, 3104, 0, L""},
- {138, 3366, 0, L""},
- {138, 1174, 0, L""},
- {138, 2964, 0, L""},
- {138, 3113, 0, L""},
- {138, 1175, 0, L""},
- {138, 2920, 0, L"-"},
- {138, 2889, 0, L"-"},
- {138, 1176, 0, L""},
- {138, 2903, 0, L" "},
- {138, 1177, 0, L""},
- {138, 1178, 0, L""},
- {138, 2946, 0, L""},
- {138, 1179, 0, L""},
- {138, 1180, 0, L""},
+ {138, 3055, 0, L"Барлингтон"},
+ {138, 3049, 0, L"Броссард"},
+ {138, 3330, 0, L"Бурнаби"},
+ {138, 1169, 0, L"Ванкувер"},
+ {138, 3106, 0, L"Ватерлоо"},
+ {138, 1170, 0, L"Виннипег"},
+ {138, 1171, 0, L"Галифакс"},
+ {138, 1172, 0, L"Гамильтон"},
+ {138, 3365, 0, L"Денвер"},
+ {138, 1173, 0, L"Калгари"},
+ {138, 3104, 0, L"Камлупс"},
+ {138, 3366, 0, L"Каннингтон"},
+ {138, 1174, 0, L"Квебек"},
+ {138, 2964, 0, L"Кингстон"},
+ {138, 3113, 0, L"Коквитлам"},
+ {138, 1175, 0, L"Монреаль"},
+ {138, 2920, 0, L"Ниагара-Фолс"},
+ {138, 2889, 0, L"Норд-Йорк"},
+ {138, 1176, 0, L"Оттава"},
+ {138, 2903, 0, L"Порт Алберни"},
+ {138, 1177, 0, L"Ричмонд"},
+ {138, 1178, 0, L"Тимминс"},
+ {138, 2946, 0, L"Торнхилл"},
+ {138, 1179, 0, L"Торонто"},
+ {138, 1180, 0, L"Эдмонтон"},
{138, 2353, 0, lpwszOther},
- {139, 407, 0, L""},
- {139, 426, 0, L""},
- {139, 378, 0, L""},
- {139, 412, 0, L""},
- {139, 446, 0, L""},
- {139, 434, 0, L""},
- {139, 416, 0, L""},
- {139, 428, 0, L""},
- {139, 440, 0, L""},
- {139, 352, 0, L""},
- {139, 394, 0, L""},
- {139, 374, 0, L""},
- {139, 448, 0, L""},
- {139, 390, 0, L""},
- {139, 402, 0, L""},
- {139, 396, 0, L" "},
- {139, 370, 0, L""},
- {139, 368, 0, L""},
- {139, 444, 0, L""},
- {139, 388, 0, L""},
- {139, 408, 0, L""},
- {139, 430, 0, L""},
- {139, 358, 0, L""},
- {139, 418, 0, L""},
- {139, 354, 0, L""},
- {139, 376, 0, L""},
- {139, 414, 0, L""},
- {139, 380, 0, L""},
- {139, 372, 0, L""},
- {139, 424, 0, L""},
- {139, 348, 0, L""},
- {139, 392, 0, L""},
- {139, 386, 0, L""},
- {139, 438, 0, L""},
- {139, 362, 0, L"-"},
- {139, 360, 0, L"-"},
- {139, 432, 0, L"-"},
- {139, 350, 0, L"-"},
- {139, 366, 0, L""},
- {139, 420, 0, L""},
- {139, 442, 0, L""},
- {139, 364, 0, L""},
- {139, 450, 0, L"-"},
- {139, 356, 0, L"-"},
- {139, 382, 0, L" "},
- {139, 398, 0, L" "},
- {139, 410, 0, L""},
- {139, 422, 0, L""},
- {139, 406, 0, L" "},
- {139, 404, 0, L""},
- {139, 384, 0, L" "},
- {139, 400, 0, L" "},
- {139, 436, 0, L""},
- {140, 1238, 0, L"-"},
+ {139, 407, 0, L"Вашингтон"},
+ {139, 426, 0, L"Айдахо"},
+ {139, 378, 0, L"Айова"},
+ {139, 412, 0, L"Алабама"},
+ {139, 446, 0, L"Аляска"},
+ {139, 434, 0, L"Аризона"},
+ {139, 416, 0, L"Арканзас"},
+ {139, 428, 0, L"Вайоминг"},
+ {139, 440, 0, L"Вашингтон"},
+ {139, 352, 0, L"Вермонт"},
+ {139, 394, 0, L"Виргиния"},
+ {139, 374, 0, L"Висконсин"},
+ {139, 448, 0, L"Гавайи"},
+ {139, 390, 0, L"Делавер"},
+ {139, 402, 0, L"Джорджия"},
+ {139, 396, 0, L"Западная Виргиния"},
+ {139, 370, 0, L"Иллинойс"},
+ {139, 368, 0, L"Индиана"},
+ {139, 444, 0, L"Калифорния"},
+ {139, 388, 0, L"Канзас"},
+ {139, 408, 0, L"Кентукки"},
+ {139, 430, 0, L"Колорадо"},
+ {139, 358, 0, L"Коннектикут"},
+ {139, 418, 0, L"Луизиана"},
+ {139, 354, 0, L"Массачусетс"},
+ {139, 376, 0, L"Миннесота"},
+ {139, 414, 0, L"Миссисипи"},
+ {139, 380, 0, L"Миссури"},
+ {139, 372, 0, L"Мичиган"},
+ {139, 424, 0, L"Монтана"},
+ {139, 348, 0, L"Мэн"},
+ {139, 392, 0, L"Мэриленд"},
+ {139, 386, 0, L"Небраска"},
+ {139, 438, 0, L"Невада"},
+ {139, 362, 0, L"Нью-Джерси"},
+ {139, 360, 0, L"Нью-Йорк"},
+ {139, 432, 0, L"Нью-Мексико"},
+ {139, 350, 0, L"Нью-Хэмпшир"},
+ {139, 366, 0, L"Огайо"},
+ {139, 420, 0, L"Оклахома"},
+ {139, 442, 0, L"Орегон"},
+ {139, 364, 0, L"Пенсильвания"},
+ {139, 450, 0, L"Пуэрто-Рико"},
+ {139, 356, 0, L"Род-Айленд"},
+ {139, 382, 0, L"Северная Дакота"},
+ {139, 398, 0, L"Северная Каролина"},
+ {139, 410, 0, L"Теннесси"},
+ {139, 422, 0, L"Техас"},
+ {139, 406, 0, L"Федеральный округ Колумбия"},
+ {139, 404, 0, L"Флорида"},
+ {139, 384, 0, L"Южная Дакота"},
+ {139, 400, 0, L"Южная Каролина"},
+ {139, 436, 0, L"Юта"},
+ {140, 1238, 0, L"Сент-Джонс"},
{140, 2442, 0, lpwszOther},
- {141, 1239, 0, L"-"},
+ {141, 1239, 0, L"Буэнос-Айрес"},
{141, 2441, 0, lpwszOther},
- {142, 1240, 0, L""},
+ {142, 1240, 0, L"Нассау"},
{142, 2440, 0, lpwszOther},
- {143, 1241, 0, L""},
+ {143, 1241, 0, L"Бриджтаун"},
{143, 2439, 0, lpwszOther},
- {146, 1242, 0, L""},
+ {146, 1242, 0, L"Бельмопан"},
{146, 2438, 0, lpwszOther},
- {144, 1243, 0, L"-"},
+ {144, 1243, 0, L"Ла-Пас"},
{144, 2437, 0, lpwszOther},
- {145, 1244, 0, L""},
- {145, 3094, 0, L" "},
- {145, 1245, 0, L"--"},
- {145, 1246, 0, L"-"},
+ {145, 1244, 0, L"Бразилиа"},
+ {145, 3094, 0, L"Пассо Фундо"},
+ {145, 1245, 0, L"Рио-де-Жанейро"},
+ {145, 1246, 0, L"Сан-Паулу"},
{145, 2436, 0, lpwszOther},
- {147, 1247, 0, L""},
+ {147, 1247, 0, L"Каракас"},
{147, 2435, 0, lpwszOther},
- {452, 1190, 0, L"-"},
+ {452, 1190, 0, L"Шарлотта-Амалия"},
{452, 2364, 0, lpwszOther},
- {149, 1248, 0, L"--"},
+ {149, 1248, 0, L"Порт-о-Пренс"},
{149, 2434, 0, lpwszOther},
- {148, 1249, 0, L""},
+ {148, 1249, 0, L"Джоржтаун"},
{148, 2433, 0, lpwszOther},
- {173, 1250, 0, L""},
+ {173, 1250, 0, L"Гватемала"},
{173, 2432, 0, lpwszOther},
- {150, 1251, 0, L""},
+ {150, 1251, 0, L"Тегусигальпа"},
{150, 2431, 0, lpwszOther},
- {151, 1252, 0, L"-"},
+ {151, 1252, 0, L"Сент-Джорджес"},
{151, 2430, 0, lpwszOther},
- {152, 1253, 0, L""},
+ {152, 1253, 0, L"Уманак"},
{152, 2429, 0, lpwszOther},
- {153, 1254, 0, L""},
+ {153, 1254, 0, L"Розо"},
{153, 2428, 0, lpwszOther},
- {154, 1255, 0, L"-"},
+ {154, 1255, 0, L"Санто-Доминго"},
{154, 2427, 0, lpwszOther},
- {155, 1256, 0, L""},
+ {155, 1256, 0, L"Богота"},
{155, 2426, 0, lpwszOther},
- {156, 1257, 0, L"-"},
+ {156, 1257, 0, L"Сан-Хосе"},
{156, 2425, 0, lpwszOther},
- {157, 1258, 0, L""},
+ {157, 1258, 0, L"Гавана"},
{157, 2424, 0, lpwszOther},
- {158, 1259, 0, L""},
- {158, 1260, 0, L""},
+ {158, 1259, 0, L"Акапулько"},
+ {158, 1260, 0, L"Мехико"},
{158, 2423, 0, lpwszOther},
- {159, 1261, 0, L""},
+ {159, 1261, 0, L"Манагуа"},
{159, 2422, 0, lpwszOther},
- {160, 1262, 0, L""},
+ {160, 1262, 0, L"Панама"},
{160, 2421, 0, lpwszOther},
- {161, 1263, 0, L""},
+ {161, 1263, 0, L"Асунсьон"},
{161, 2420, 0, lpwszOther},
- {162, 1264, 0, L""},
+ {162, 1264, 0, L"Лима"},
{162, 2419, 0, lpwszOther},
- {163, 1265, 0, L"-"},
+ {163, 1265, 0, L"Сан-Сальвадор"},
{163, 2418, 0, lpwszOther},
- {164, 1266, 0, L""},
+ {164, 1266, 0, L"Кингстаун"},
{164, 2417, 0, lpwszOther},
- {165, 1267, 0, L""},
+ {165, 1267, 0, L"Бастер"},
{165, 2416, 0, lpwszOther},
- {166, 1268, 0, L""},
+ {166, 1268, 0, L"Кастри"},
{166, 2415, 0, lpwszOther},
- {167, 1269, 0, L""},
+ {167, 1269, 0, L"Парамарибо"},
{167, 2414, 0, lpwszOther},
- {168, 1270, 0, L"--"},
+ {168, 1270, 0, L"Порт-оф-Спейн"},
{168, 2413, 0, lpwszOther},
- {169, 1271, 0, L""},
+ {169, 1271, 0, L"Монтевидео"},
{169, 2412, 0, lpwszOther},
- {170, 1272, 0, L""},
+ {170, 1272, 0, L"Сантьяго"},
{170, 2411, 0, lpwszOther},
- {171, 1273, 0, L""},
- {171, 1274, 0, L""},
+ {171, 1273, 0, L"Гуаякиль"},
+ {171, 1274, 0, L"Кито"},
{171, 2410, 0, lpwszOther},
- {172, 1275, 0, L""},
+ {172, 1275, 0, L"Кингстон"},
{172, 2409, 0, lpwszOther},
- {174, 1854, 0, L""},
+ {174, 1854, 0, L"Алжир"},
{174, 2495, 0, lpwszOther},
- {175, 1855, 0, L""},
+ {175, 1855, 0, L"Луанда"},
{175, 2494, 0, lpwszOther},
- {176, 1856, 0, L""},
- {176, 1857, 0, L"-"},
+ {176, 1856, 0, L"Котону"},
+ {176, 1857, 0, L"Порто-Ново"},
{176, 2493, 0, lpwszOther},
- {177, 1858, 0, L""},
+ {177, 1858, 0, L"Габороне"},
{177, 2492, 0, lpwszOther},
- {178, 1859, 0, L""},
+ {178, 1859, 0, L"Уагадугу"},
{178, 2491, 0, lpwszOther},
- {179, 1860, 0, L""},
+ {179, 1860, 0, L"Бужумбуру"},
{179, 2490, 0, lpwszOther},
- {180, 1861, 0, L""},
+ {180, 1861, 0, L"Либревиль"},
{180, 2489, 0, lpwszOther},
- {181, 1862, 0, L""},
+ {181, 1862, 0, L"Банжул"},
{181, 2488, 0, lpwszOther},
- {182, 1863, 0, L""},
+ {182, 1863, 0, L"Аккра"},
{182, 2487, 0, lpwszOther},
- {183, 1864, 0, L""},
+ {183, 1864, 0, L"Конакри"},
{183, 2486, 0, lpwszOther},
- {184, 1865, 0, L""},
+ {184, 1865, 0, L"Бисау"},
{184, 2485, 0, lpwszOther},
- {185, 1866, 0, L""},
+ {185, 1866, 0, L"Джибути"},
{185, 2484, 0, lpwszOther},
- {186, 3312, 0, L""},
- {186, 1867, 0, L""},
- {186, 1868, 0, L""},
+ {186, 3312, 0, L"Дахаб"},
+ {186, 1867, 0, L"Каир"},
+ {186, 1868, 0, L"Хургада"},
{186, 2483, 0, lpwszOther},
- {187, 1869, 0, L""},
+ {187, 1869, 0, L"Лусака"},
{187, 2482, 0, lpwszOther},
- {23, 1870, 0, L""},
+ {23, 1870, 0, L"Хараре"},
{23, 2481, 0, lpwszOther},
- {188, 1871, 0, L""},
+ {188, 1871, 0, L"Прая"},
{188, 2480, 0, lpwszOther},
- {189, 1872, 0, L""},
+ {189, 1872, 0, L"Яунде"},
{189, 2479, 0, lpwszOther},
- {190, 1873, 0, L""},
+ {190, 1873, 0, L"Найроби"},
{190, 2478, 0, lpwszOther},
- {191, 1874, 0, L""},
+ {191, 1874, 0, L"Морони"},
{191, 2477, 0, lpwszOther},
- {193, 1875, 0, L""},
+ {193, 1875, 0, L"Киншаса"},
{193, 2476, 0, lpwszOther},
- {192, 1876, 0, L""},
+ {192, 1876, 0, L"Браззавиль"},
{192, 2475, 0, lpwszOther},
- {194, 1877, 0, L""},
+ {194, 1877, 0, L"Ямусукро"},
{194, 2474, 0, lpwszOther},
- {195, 1878, 0, L""},
+ {195, 1878, 0, L"Масеру"},
{195, 2473, 0, lpwszOther},
- {196, 1879, 0, L""},
+ {196, 1879, 0, L"Монровия"},
{196, 2472, 0, lpwszOther},
- {197, 1880, 0, L""},
+ {197, 1880, 0, L"Триполи"},
{197, 2471, 0, lpwszOther},
- {198, 1881, 0, L"-"},
+ {198, 1881, 0, L"Порт-Луи"},
{198, 2470, 0, lpwszOther},
- {199, 1882, 0, L""},
+ {199, 1882, 0, L"Нуакшот"},
{199, 2469, 0, lpwszOther},
- {200, 1883, 0, L""},
+ {200, 1883, 0, L"Антананариву"},
{200, 2468, 0, lpwszOther},
- {201, 1884, 0, L""},
+ {201, 1884, 0, L"Лилонгве"},
{201, 2467, 0, lpwszOther},
- {202, 1885, 0, L""},
+ {202, 1885, 0, L"Бамако"},
{202, 2466, 0, lpwszOther},
- {203, 1886, 0, L""},
- {203, 1887, 0, L""},
+ {203, 1886, 0, L"Агадир"},
+ {203, 1887, 0, L"Рабат"},
{203, 2465, 0, lpwszOther},
- {204, 1888, 0, L""},
+ {204, 1888, 0, L"Мапуту"},
{204, 2464, 0, lpwszOther},
- {205, 1889, 0, L""},
+ {205, 1889, 0, L"Виндхук"},
{205, 2463, 0, lpwszOther},
- {206, 1890, 0, L""},
+ {206, 1890, 0, L"Ниамей"},
{206, 2462, 0, lpwszOther},
- {207, 1891, 0, L""},
+ {207, 1891, 0, L"Абуджа"},
{207, 2461, 0, lpwszOther},
- {208, 1892, 0, L""},
+ {208, 1892, 0, L"Кигали"},
{208, 2460, 0, lpwszOther},
- {209, 1893, 0, L"-"},
+ {209, 1893, 0, L"Сан-Томе"},
{209, 2459, 0, lpwszOther},
- {210, 1894, 0, L""},
+ {210, 1894, 0, L"Мбабане"},
{210, 2458, 0, lpwszOther},
- {211, 1895, 0, L""},
+ {211, 1895, 0, L"Виктория"},
{211, 2457, 0, lpwszOther},
- {212, 1896, 0, L""},
+ {212, 1896, 0, L"Дакар"},
{212, 2456, 0, lpwszOther},
- {213, 1897, 0, L""},
+ {213, 1897, 0, L"Могадишо"},
{213, 2455, 0, lpwszOther},
- {214, 1898, 0, L""},
+ {214, 1898, 0, L"Хартум"},
{214, 2454, 0, lpwszOther},
- {215, 1899, 0, L""},
+ {215, 1899, 0, L"Фритаун"},
{215, 2453, 0, lpwszOther},
- {216, 1900, 0, L"--"},
- {216, 1901, 0, L""},
+ {216, 1900, 0, L"Дар-эс-Салам"},
+ {216, 1901, 0, L"Додома"},
{216, 2452, 0, lpwszOther},
- {217, 1902, 0, L""},
+ {217, 1902, 0, L"Ломе"},
{217, 2451, 0, lpwszOther},
- {218, 1903, 0, L""},
+ {218, 1903, 0, L"Тунис"},
{218, 2450, 0, lpwszOther},
- {219, 1904, 0, L""},
+ {219, 1904, 0, L"Кампала"},
{219, 2449, 0, lpwszOther},
- {220, 1905, 0, L""},
+ {220, 1905, 0, L"Банги"},
{220, 2448, 0, lpwszOther},
- {222, 1906, 0, L""},
+ {222, 1906, 0, L"Нджамена"},
{222, 2447, 0, lpwszOther},
- {223, 1907, 0, L""},
+ {223, 1907, 0, L"Малабо"},
{223, 2446, 0, lpwszOther},
- {221, 1908, 0, L""},
+ {221, 1908, 0, L"Асмэра"},
{221, 2445, 0, lpwszOther},
- {224, 1909, 0, L"-"},
+ {224, 1909, 0, L"Аддис-Абеба"},
{224, 2444, 0, lpwszOther},
- {225, 1910, 0, L""},
- {225, 1913, 0, L""},
- {225, 1912, 0, L""},
- {225, 3033, 0, L""},
- {225, 1911, 0, L""},
+ {225, 1910, 0, L"Дурбан"},
+ {225, 1913, 0, L"Йоханнесбург"},
+ {225, 1912, 0, L"Кейптаун"},
+ {225, 3033, 0, L"Пайнтаун"},
+ {225, 1911, 0, L"Претория"},
{225, 2443, 0, lpwszOther},
- {39, 314, 0, L""},
- {39, 315, 0, L" ."},
- {39, 316, 0, L" ."},
- {39, 317, 0, L" ."},
- {39, 318, 0, L" ."},
- {39, 319, 0, L" ."},
- {39, 320, 0, L" ."},
- {39, 321, 0, L" ."},
- {39, 322, 0, L"- ."},
- {39, 323, 0, L" ."},
- {39, 324, 0, L" ."},
- {39, 325, 0, L""},
- {39, 326, 0, L" ."},
- {39, 327, 0, L" ."},
- {39, 328, 0, L" ."},
- {39, 329, 0, L" ."},
- {39, 330, 0, L" ."},
- {39, 331, 0, L" ."},
- {39, 332, 0, L" ."},
- {39, 333, 0, L" ."},
- {39, 334, 0, L" ."},
- {39, 335, 0, L" ."},
- {39, 336, 0, L" ."},
- {39, 337, 0, L" ."},
- {39, 338, 0, L" ."},
- {39, 339, 0, L" ."},
- {40, 602, 0, L" "},
- {40, 604, 0, L""},
- {40, 603, 0, L""},
- {40, 608, 0, L""},
- {40, 606, 0, L""},
- {40, 3099, 0, L"--"},
- {40, 605, 0, L""},
- {40, 3174, 0, L""},
- {40, 609, 0, L""},
- {40, 607, 0, L""},
- {40, 610, 0, L""},
- {40, 611, 0, L""},
+ {39, 314, 0, L"Киев"},
+ {39, 315, 0, L"Винницкая обл."},
+ {39, 316, 0, L"Волынская обл."},
+ {39, 317, 0, L"Днепропетровская обл."},
+ {39, 318, 0, L"Донецкая обл."},
+ {39, 319, 0, L"Житомирская обл."},
+ {39, 320, 0, L"Закарпатская обл."},
+ {39, 321, 0, L"Запорожская обл."},
+ {39, 322, 0, L"Ивано-Франковская обл."},
+ {39, 323, 0, L"Киевская обл."},
+ {39, 324, 0, L"Кировоградская обл."},
+ {39, 325, 0, L"Крым"},
+ {39, 326, 0, L"Луганская обл."},
+ {39, 327, 0, L"Львовская обл."},
+ {39, 328, 0, L"Николаевская обл."},
+ {39, 329, 0, L"Одесская обл."},
+ {39, 330, 0, L"Полтавская обл."},
+ {39, 331, 0, L"Ровенская обл."},
+ {39, 332, 0, L"Сумская обл."},
+ {39, 333, 0, L"Тернопольская обл."},
+ {39, 334, 0, L"Харьковская обл."},
+ {39, 335, 0, L"Херсонская обл."},
+ {39, 336, 0, L"Хмельницкая обл."},
+ {39, 337, 0, L"Черкасская обл."},
+ {39, 338, 0, L"Черниговская обл."},
+ {39, 339, 0, L"Черновицкая обл."},
+ {40, 602, 0, L"Бад Халл"},
+ {40, 604, 0, L"Брегенц"},
+ {40, 603, 0, L"Вена"},
+ {40, 608, 0, L"Грац"},
+ {40, 606, 0, L"Зальцбург"},
+ {40, 3099, 0, L"Зель-ам-Зее"},
+ {40, 605, 0, L"Инсбрук"},
+ {40, 3174, 0, L"Кирхберг"},
+ {40, 609, 0, L"Клагенфурт"},
+ {40, 607, 0, L"Линц"},
+ {40, 610, 0, L"Обдах"},
+ {40, 611, 0, L"Щтубайтал"},
{40, 2541, 0, lpwszOther},
- {32, 612, 0, L""},
+ {32, 612, 0, L"Тирана"},
{32, 2540, 0, lpwszOther},
- {33, 613, 0, L"--"},
+ {33, 613, 0, L"Андорра-ла-Велья"},
{33, 2539, 0, lpwszOther},
- {340, 341, 0, L""},
- {340, 342, 0, L" ."},
- {340, 343, 0, L" ."},
- {340, 344, 0, L" ."},
- {340, 345, 0, L" ."},
- {340, 346, 0, L" ."},
- {340, 347, 0, L" ."},
- {38, 760, 0, L""},
- {38, 767, 0, L""},
- {38, 762, 0, L""},
- {38, 761, 0, L""},
- {38, 763, 0, L""},
- {38, 769, 0, L""},
- {38, 765, 0, L""},
- {38, 764, 0, L""},
- {38, 3117, 0, L""},
- {38, 766, 0, L""},
- {38, 768, 0, L""},
+ {340, 341, 0, L"Минск"},
+ {340, 342, 0, L"Брестская обл."},
+ {340, 343, 0, L"Витебская обл."},
+ {340, 344, 0, L"Гомельская обл."},
+ {340, 345, 0, L"Гродненская обл."},
+ {340, 346, 0, L"Минская обл."},
+ {340, 347, 0, L"Могилевская обл."},
+ {38, 760, 0, L"Антверпен"},
+ {38, 767, 0, L"Арлон"},
+ {38, 762, 0, L"Брюгге"},
+ {38, 761, 0, L"Брюссель"},
+ {38, 763, 0, L"Гент"},
+ {38, 769, 0, L"Лувен"},
+ {38, 765, 0, L"Льеж"},
+ {38, 764, 0, L"Монс"},
+ {38, 3117, 0, L"Мортсель"},
+ {38, 766, 0, L"Намюр"},
+ {38, 768, 0, L"Хасселт"},
{38, 2532, 0, lpwszOther},
- {41, 3098, 0, L""},
- {41, 792, 0, L""},
- {41, 770, 0, L""},
- {41, 771, 0, L""},
- {41, 773, 0, L""},
- {41, 776, 0, L"-"},
- {41, 788, 0, L""},
- {41, 789, 0, L""},
- {41, 796, 0, L""},
- {41, 777, 0, L""},
- {41, 781, 0, L""},
- {41, 786, 0, L""},
- {41, 791, 0, L""},
- {41, 793, 0, L""},
- {41, 795, 0, L""},
- {41, 787, 0, L""},
- {41, 790, 0, L""},
- {41, 3133, 0, L""},
- {41, 794, 0, L""},
- {41, 782, 0, L""},
- {41, 780, 0, L""},
- {41, 779, 0, L""},
- {41, 774, 0, L""},
- {41, 784, 0, L""},
- {41, 772, 0, L""},
- {41, 775, 0, L""},
- {41, 3116, 0, L""},
- {41, 785, 0, L""},
- {41, 778, 0, L""},
- {41, 783, 0, L""},
+ {41, 3098, 0, L"Банско"},
+ {41, 792, 0, L"Благоевград"},
+ {41, 770, 0, L"Бургас"},
+ {41, 771, 0, L"Бяла"},
+ {41, 773, 0, L"Варна"},
+ {41, 776, 0, L"Велико-Тырново"},
+ {41, 788, 0, L"Видин"},
+ {41, 789, 0, L"Враца"},
+ {41, 796, 0, L"Габрово"},
+ {41, 777, 0, L"Димитровград"},
+ {41, 781, 0, L"Каварна"},
+ {41, 786, 0, L"Кырджали"},
+ {41, 791, 0, L"Кюстендил"},
+ {41, 793, 0, L"Лазарджик"},
+ {41, 795, 0, L"Ловеч"},
+ {41, 787, 0, L"Михайловград"},
+ {41, 790, 0, L"Перник"},
+ {41, 3133, 0, L"Пирдоп"},
+ {41, 794, 0, L"Плевен"},
+ {41, 782, 0, L"Пловдив"},
+ {41, 780, 0, L"Разград"},
+ {41, 779, 0, L"Русе"},
+ {41, 774, 0, L"Силистра"},
+ {41, 784, 0, L"Сливен"},
+ {41, 772, 0, L"София"},
+ {41, 775, 0, L"Толбухин"},
+ {41, 3116, 0, L"Тырново"},
+ {41, 785, 0, L"Хасково"},
+ {41, 778, 0, L"Шумен"},
+ {41, 783, 0, L"Ямбол"},
{41, 2531, 0, lpwszOther},
- {42, 797, 0, L"-"},
- {42, 799, 0, L""},
- {42, 798, 0, L""},
- {42, 800, 0, L""},
+ {42, 797, 0, L"Баня-Лука"},
+ {42, 799, 0, L"Зеница"},
+ {42, 798, 0, L"Сараево"},
+ {42, 800, 0, L"Тузла"},
{42, 2530, 0, lpwszOther},
- {45, 802, 0, L""},
- {45, 3075, 0, L""},
- {45, 801, 0, L""},
- {45, 804, 0, L""},
- {45, 803, 0, L""},
- {45, 805, 0, L""},
- {45, 3168, 0, L""},
- {45, 806, 0, L""},
- {45, 807, 0, L""},
- {45, 808, 0, L""},
- {45, 809, 0, L""},
- {45, 3131, 0, L""},
- {45, 810, 0, L""},
- {45, 3342, 0, L""},
- {45, 811, 0, L""},
- {45, 812, 0, L""},
- {45, 813, 0, L""},
- {45, 814, 0, L""},
- {45, 3089, 0, L""},
- {45, 815, 0, L""},
- {45, 816, 0, L""},
- {45, 817, 0, L""},
- {45, 818, 0, L""},
- {45, 819, 0, L""},
- {45, 820, 0, L""},
- {45, 2976, 0, L""},
- {45, 2988, 0, L""},
- {45, 821, 0, L""},
- {45, 3088, 0, L""},
- {45, 822, 0, L""},
- {45, 823, 0, L""},
- {45, 824, 0, L""},
- {45, 825, 0, L""},
- {45, 3343, 0, L""},
- {45, 2867, 0, L""},
- {45, 2986, 0, L"-"},
- {45, 826, 0, L""},
- {45, 3063, 0, L""},
- {45, 827, 0, L""},
- {45, 3140, 0, L""},
- {45, 828, 0, L""},
- {45, 829, 0, L""},
- {45, 830, 0, L""},
+ {45, 802, 0, L"Абердин"},
+ {45, 3075, 0, L"Айслворт"},
+ {45, 801, 0, L"Алнвик"},
+ {45, 804, 0, L"Бидефорд"},
+ {45, 803, 0, L"Бирмингем"},
+ {45, 805, 0, L"Блоксвич"},
+ {45, 3168, 0, L"Бостон"},
+ {45, 806, 0, L"Брайтон"},
+ {45, 807, 0, L"Бредфорд"},
+ {45, 808, 0, L"Бристоль"},
+ {45, 809, 0, L"Вилленхолл"},
+ {45, 3131, 0, L"Воррингтон"},
+ {45, 810, 0, L"Вудбридж"},
+ {45, 3342, 0, L"Гилфорд"},
+ {45, 811, 0, L"Глазго"},
+ {45, 812, 0, L"Дадли"},
+ {45, 813, 0, L"Дарем"},
+ {45, 814, 0, L"Дуглас"},
+ {45, 3089, 0, L"Кардиф"},
+ {45, 815, 0, L"Кембридж"},
+ {45, 816, 0, L"Кентербери"},
+ {45, 817, 0, L"Ливерпуль"},
+ {45, 818, 0, L"Лидс"},
+ {45, 819, 0, L"Лондон"},
+ {45, 820, 0, L"Манчестер"},
+ {45, 2976, 0, L"Митчем"},
+ {45, 2988, 0, L"Мэйденхед"},
+ {45, 821, 0, L"Ноттингем"},
+ {45, 3088, 0, L"Ньюпорт"},
+ {45, 822, 0, L"Оксфорд"},
+ {45, 823, 0, L"Плимут"},
+ {45, 824, 0, L"Портсмут"},
+ {45, 825, 0, L"Престон"},
+ {45, 3343, 0, L"Райд"},
+ {45, 2867, 0, L"Ридинг"},
+ {45, 2986, 0, L"Сент-Албанс"},
+ {45, 826, 0, L"Стаффорд"},
+ {45, 3063, 0, L"Стокпорт"},
+ {45, 827, 0, L"Уэймут"},
+ {45, 3140, 0, L"Челтенхэм"},
+ {45, 828, 0, L"Честер"},
+ {45, 829, 0, L"Шеффилд"},
+ {45, 830, 0, L"Эдинбург"},
{45, 2529, 0, lpwszOther},
- {44, 831, 0, L""},
- {44, 832, 0, L""},
- {44, 836, 0, L""},
- {44, 835, 0, L""},
- {44, 834, 0, L""},
- {44, 833, 0, L""},
+ {44, 831, 0, L"Будапешт"},
+ {44, 832, 0, L"Геделле"},
+ {44, 836, 0, L"Дебрецен"},
+ {44, 835, 0, L"Мишкольц"},
+ {44, 834, 0, L"Сегед"},
+ {44, 833, 0, L"Шиофок"},
{44, 2528, 0, lpwszOther},
- {46, 3007, 0, L""},
- {46, 837, 0, L""},
- {46, 838, 0, L"-"},
- {46, 3371, 0, L""},
- {46, 839, 0, L"-"},
- {46, 840, 0, L""},
- {46, 841, 0, L""},
- {46, 3163, 0, L""},
- {46, 842, 0, L""},
- {46, 843, 0, L""},
- {46, 3015, 0, L""},
- {46, 844, 0, L""},
- {46, 2921, 0, L""},
- {46, 845, 0, L""},
- {46, 846, 0, L""},
- {46, 847, 0, L""},
- {46, 848, 0, L""},
- {46, 849, 0, L""},
- {46, 3010, 0, L""},
- {46, 850, 0, L""},
- {46, 851, 0, L""},
- {46, 3072, 0, L""},
- {46, 852, 0, L""},
- {46, 853, 0, L""},
- {46, 854, 0, L""},
- {46, 855, 0, L""},
- {46, 3082, 0, L""},
- {46, 3309, 0, L""},
- {46, 856, 0, L""},
- {46, 857, 0, L""},
- {46, 3138, 0, L""},
- {46, 858, 0, L""},
- {46, 859, 0, L""},
- {46, 2872, 0, L""},
- {46, 2965, 0, L""},
- {46, 3135, 0, L""},
- {46, 3156, 0, L""},
- {46, 3192, 0, L""},
- {46, 860, 0, L""},
- {46, 861, 0, L""},
- {46, 2864, 0, L""},
- {46, 862, 0, L""},
- {46, 3009, 0, L""},
- {46, 2993, 0, L""},
- {46, 863, 0, L""},
- {46, 864, 0, L""},
- {46, 865, 0, L""},
- {46, 866, 0, L""},
- {46, 3191, 0, L""},
- {46, 2974, 0, L"-"},
- {46, 3127, 0, L""},
- {46, 867, 0, L""},
- {46, 868, 0, L""},
- {46, 869, 0, L"--"},
- {46, 3373, 0, L""},
- {46, 3313, 0, L""},
- {46, 870, 0, L""},
- {46, 3045, 0, L""},
- {46, 2906, 0, L""},
+ {46, 3007, 0, L"Аахен"},
+ {46, 837, 0, L"Аугсбург"},
+ {46, 838, 0, L"Баден-Баден"},
+ {46, 3371, 0, L"Бамберг"},
+ {46, 839, 0, L"Бергиш-Гладбах"},
+ {46, 840, 0, L"Берлин"},
+ {46, 841, 0, L"Билефельд"},
+ {46, 3163, 0, L"Бовенден"},
+ {46, 842, 0, L"Бонн"},
+ {46, 843, 0, L"Браденбург"},
+ {46, 3015, 0, L"Брауншвейг"},
+ {46, 844, 0, L"Бремен"},
+ {46, 2921, 0, L"Варштайн"},
+ {46, 845, 0, L"Веймар"},
+ {46, 846, 0, L"Вупперталь"},
+ {46, 847, 0, L"Гамбург"},
+ {46, 848, 0, L"Ганновер"},
+ {46, 849, 0, L"Гарделеген"},
+ {46, 3010, 0, L"Гейдельберг"},
+ {46, 850, 0, L"Гота"},
+ {46, 851, 0, L"Дармштадт"},
+ {46, 3072, 0, L"Дессау"},
+ {46, 852, 0, L"Детмольд"},
+ {46, 853, 0, L"Дортмунд"},
+ {46, 854, 0, L"Дрезден"},
+ {46, 855, 0, L"Дюссельдорф"},
+ {46, 3082, 0, L"Иффецхайм"},
+ {46, 3309, 0, L"Кассел"},
+ {46, 856, 0, L"Кельн"},
+ {46, 857, 0, L"Киль"},
+ {46, 3138, 0, L"Кобленц"},
+ {46, 858, 0, L"Крефельд"},
+ {46, 859, 0, L"Лейпциг"},
+ {46, 2872, 0, L"Лимбург"},
+ {46, 2965, 0, L"Линген"},
+ {46, 3135, 0, L"Любек"},
+ {46, 3156, 0, L"Мангейм"},
+ {46, 3192, 0, L"Меерсбург"},
+ {46, 860, 0, L"Мюнстер"},
+ {46, 861, 0, L"Мюнхен"},
+ {46, 2864, 0, L"Нойштадт"},
+ {46, 862, 0, L"Нюрнберг"},
+ {46, 3009, 0, L"Оффенбург"},
+ {46, 2993, 0, L"Падерборн"},
+ {46, 863, 0, L"Равенсбург"},
+ {46, 864, 0, L"Регенсбург"},
+ {46, 865, 0, L"Рейнен"},
+ {46, 866, 0, L"Росток"},
+ {46, 3191, 0, L"Саарбрюкен"},
+ {46, 2974, 0, L"Санкт-Августин"},
+ {46, 3127, 0, L"Тюринген"},
+ {46, 867, 0, L"Фрайберг"},
+ {46, 868, 0, L"Фрайбург"},
+ {46, 869, 0, L"Франкфурт-на-Майне"},
+ {46, 3373, 0, L"Хемнитц"},
+ {46, 3313, 0, L"Хильден"},
+ {46, 870, 0, L"Штутгарт"},
+ {46, 3045, 0, L"Эрланген"},
+ {46, 2906, 0, L"Эшборн"},
{46, 2527, 0, lpwszOther},
- {48, 871, 0, L""},
- {48, 873, 0, L""},
- {48, 3147, 0, L""},
- {48, 872, 0, L""},
- {48, 3178, 0, L""},
+ {48, 871, 0, L"Афины"},
+ {48, 873, 0, L"Ираклион"},
+ {48, 3147, 0, L"Корфу"},
+ {48, 872, 0, L"Салоники"},
+ {48, 3178, 0, L"Халкидики"},
{48, 2526, 0, lpwszOther},
- {49, 3006, 0, L""},
- {49, 874, 0, L""},
- {49, 875, 0, L""},
- {49, 3285, 0, L""},
- {49, 876, 0, L""},
- {49, 3126, 0, L""},
+ {49, 3006, 0, L"Архус"},
+ {49, 874, 0, L"Копенгаген"},
+ {49, 875, 0, L"Оденсе"},
+ {49, 3285, 0, L"Ольборг"},
+ {49, 876, 0, L"Сванеке"},
+ {49, 3126, 0, L"Скиве"},
{49, 2525, 0, lpwszOther},
- {50, 3377, 0, L""},
- {50, 3067, 0, L""},
- {50, 877, 0, L""},
- {50, 3065, 0, L""},
- {50, 3066, 0, L""},
- {50, 878, 0, L""},
- {50, 3069, 0, L""},
- {50, 3068, 0, L""},
+ {50, 3377, 0, L"Виклоу"},
+ {50, 3067, 0, L"Голвей"},
+ {50, 877, 0, L"Дублин"},
+ {50, 3065, 0, L"Килларней"},
+ {50, 3066, 0, L"Корк"},
+ {50, 878, 0, L"Лимерик"},
+ {50, 3069, 0, L"Нейс"},
+ {50, 3068, 0, L"Типперэри"},
{50, 2524, 0, lpwszOther},
- {51, 879, 0, L""},
+ {51, 879, 0, L"Рейкьявик"},
{51, 2523, 0, lpwszOther},
- {34, 880, 0, L""},
- {34, 3125, 0, L""},
- {34, 881, 0, L""},
- {34, 890, 0, L""},
- {34, 3076, 0, L""},
- {34, 882, 0, L""},
- {34, 3070, 0, L""},
- {34, 888, 0, L""},
- {34, 886, 0, L""},
- {34, 891, 0, L"-"},
- {34, 3310, 0, L" "},
- {34, 883, 0, L""},
- {34, 884, 0, L""},
- {34, 885, 0, L""},
- {34, 892, 0, L""},
- {34, 3179, 0, L" "},
- {34, 3177, 0, L"-"},
- {34, 3289, 0, L"---"},
- {34, 889, 0, L""},
- {34, 887, 0, L""},
- {34, 893, 0, L""},
+ {34, 880, 0, L"Аликанте"},
+ {34, 3125, 0, L"Альмерия"},
+ {34, 881, 0, L"Барселона"},
+ {34, 890, 0, L"Бильбао"},
+ {34, 3076, 0, L"Бланес"},
+ {34, 882, 0, L"Валенсия"},
+ {34, 3070, 0, L"Ибица"},
+ {34, 888, 0, L"Кадис"},
+ {34, 886, 0, L"Картахена"},
+ {34, 891, 0, L"Ла-Корунья"},
+ {34, 3310, 0, L"Лорет де Мар"},
+ {34, 883, 0, L"Мадрид"},
+ {34, 884, 0, L"Малага"},
+ {34, 885, 0, L"Марбелья"},
+ {34, 892, 0, L"Овьедо"},
+ {34, 3179, 0, L"Пальма де Майорка"},
+ {34, 3177, 0, L"Сан-Агустин"},
+ {34, 3289, 0, L"Санта-Крус-де-Тенерифе"},
+ {34, 889, 0, L"Сарагоса"},
+ {34, 887, 0, L"Севилья"},
+ {34, 893, 0, L"Хихон"},
{34, 2522, 0, lpwszOther},
- {52, 3318, 0, L""},
- {52, 3278, 0, L""},
- {52, 906, 0, L""},
- {52, 894, 0, L""},
- {52, 895, 0, L""},
- {52, 905, 0, L""},
- {52, 896, 0, L""},
- {52, 897, 0, L""},
- {52, 3369, 0, L""},
- {52, 3327, 0, L""},
- {52, 898, 0, L""},
- {52, 899, 0, L""},
- {52, 907, 0, L""},
- {52, 908, 0, L""},
- {52, 900, 0, L""},
- {52, 901, 0, L""},
- {52, 3368, 0, L"-"},
- {52, 3384, 0, L""},
- {52, 3252, 0, L""},
- {52, 902, 0, L""},
- {52, 903, 0, L""},
- {52, 3130, 0, L""},
- {52, 904, 0, L""},
+ {52, 3318, 0, L"Аоста"},
+ {52, 3278, 0, L"Беллариа"},
+ {52, 906, 0, L"Болонья"},
+ {52, 894, 0, L"Брешиа"},
+ {52, 895, 0, L"Венеция"},
+ {52, 905, 0, L"Верона"},
+ {52, 896, 0, L"Генуя"},
+ {52, 897, 0, L"Лекко"},
+ {52, 3369, 0, L"Ливорно"},
+ {52, 3327, 0, L"Марсала"},
+ {52, 898, 0, L"Милан"},
+ {52, 899, 0, L"Модена"},
+ {52, 907, 0, L"Неаполь"},
+ {52, 908, 0, L"Перуджа"},
+ {52, 900, 0, L"Пиза"},
+ {52, 901, 0, L"Рим"},
+ {52, 3368, 0, L"Сан-Ремо"},
+ {52, 3384, 0, L"Сиракуза"},
+ {52, 3252, 0, L"Терамо"},
+ {52, 902, 0, L"Триест"},
+ {52, 903, 0, L"Турин"},
+ {52, 3130, 0, L"Фано"},
+ {52, 904, 0, L"Флоренция"},
{52, 2521, 0, lpwszOther},
- {53, 2939, 0, L""},
- {53, 3054, 0, L""},
- {53, 909, 0, L""},
- {53, 2934, 0, L""},
- {53, 913, 0, L""},
- {53, 2935, 0, L""},
- {53, 912, 0, L""},
- {53, 2905, 0, L""},
- {53, 911, 0, L""},
- {53, 2936, 0, L""},
- {53, 2937, 0, L""},
- {53, 910, 0, L""},
+ {53, 2939, 0, L"Айзкраукле"},
+ {53, 3054, 0, L"Валка"},
+ {53, 909, 0, L"Даугавпилс"},
+ {53, 2934, 0, L"Екабпилс"},
+ {53, 913, 0, L"Елгава"},
+ {53, 2935, 0, L"Кокнесе"},
+ {53, 912, 0, L"Лиепая"},
+ {53, 2905, 0, L"Резекне"},
+ {53, 911, 0, L"Рига"},
+ {53, 2936, 0, L"Саласпилс"},
+ {53, 2937, 0, L"Смилтене"},
+ {53, 910, 0, L"Юрмала"},
{53, 2520, 0, lpwszOther},
- {54, 914, 0, L""},
- {54, 915, 0, L""},
- {54, 916, 0, L""},
- {54, 918, 0, L""},
- {54, 919, 0, L""},
- {54, 3173, 0, L""},
- {54, 917, 0, L""},
+ {54, 914, 0, L"Вильнюс"},
+ {54, 915, 0, L"Висагинас"},
+ {54, 916, 0, L"Каунас"},
+ {54, 918, 0, L"Клайпеда"},
+ {54, 919, 0, L"Паланга"},
+ {54, 3173, 0, L"Пеневежис"},
+ {54, 917, 0, L"Шауляй"},
{54, 2519, 0, lpwszOther},
- {55, 920, 0, L""},
+ {55, 920, 0, L"Вадуц"},
{55, 2518, 0, lpwszOther},
- {56, 3376, 0, L""},
- {56, 921, 0, L""},
+ {56, 3376, 0, L"Бетцдорф"},
+ {56, 921, 0, L"Люксембург"},
{56, 2517, 0, lpwszOther},
- {57, 3142, 0, L""},
- {57, 922, 0, L""},
+ {57, 3142, 0, L"Битола"},
+ {57, 922, 0, L"Скопье"},
{57, 2516, 0, lpwszOther},
- {58, 923, 0, L""},
- {58, 3154, 0, L""},
- {58, 924, 0, L""},
+ {58, 923, 0, L"Валлетта"},
+ {58, 3154, 0, L"Мзида"},
+ {58, 924, 0, L"Слима"},
{58, 2515, 0, lpwszOther},
- {59, 925, 0, L""},
- {59, 926, 0, L""},
- {59, 3234, 0, L""},
- {59, 3275, 0, L""},
- {59, 927, 0, L""},
- {59, 3321, 0, L""},
- {59, 928, 0, L""},
- {59, 929, 0, L""},
- {59, 3281, 0, L"-"},
+ {59, 925, 0, L"Бельцы"},
+ {59, 926, 0, L"Бендеры"},
+ {59, 3234, 0, L"Дубоссары"},
+ {59, 3275, 0, L"Кахул"},
+ {59, 927, 0, L"Кишинев"},
+ {59, 3321, 0, L"Резина"},
+ {59, 928, 0, L"Рыбница"},
+ {59, 929, 0, L"Тирасполь"},
+ {59, 3281, 0, L"Чадыр-Лунга"},
{59, 2514, 0, lpwszOther},
- {36, 930, 0, L"-"},
+ {36, 930, 0, L"Монте-Карло"},
{36, 2513, 0, lpwszOther},
- {60, 931, 0, L""},
- {60, 933, 0, L""},
- {60, 932, 0, L""},
- {60, 934, 0, L""},
- {60, 935, 0, L""},
- {60, 2977, 0, L""},
- {60, 3030, 0, L""},
- {60, 3091, 0, L""},
- {60, 936, 0, L""},
- {60, 937, 0, L""},
- {60, 3044, 0, L""},
- {60, 3380, 0, L""},
+ {60, 931, 0, L"Амстердам"},
+ {60, 933, 0, L"Бреда"},
+ {60, 932, 0, L"Гаага"},
+ {60, 934, 0, L"Гауда"},
+ {60, 935, 0, L"Делфт"},
+ {60, 2977, 0, L"Донген"},
+ {60, 3030, 0, L"Зволле"},
+ {60, 3091, 0, L"Ниймеген"},
+ {60, 936, 0, L"Роттердам"},
+ {60, 937, 0, L"Утрехт"},
+ {60, 3044, 0, L"Эйндховен"},
+ {60, 3380, 0, L"Эншеде"},
{60, 2512, 0, lpwszOther},
- {61, 3190, 0, L""},
- {61, 2857, 0, L""},
- {61, 938, 0, L""},
- {61, 3355, 0, L""},
- {61, 939, 0, L""},
+ {61, 3190, 0, L"Кристиансанд"},
+ {61, 2857, 0, L"Лиллехаммер"},
+ {61, 938, 0, L"Осло"},
+ {61, 3355, 0, L"Ставангер"},
+ {61, 939, 0, L"Тронхейм"},
{61, 2511, 0, lpwszOther},
- {62, 940, 0, L""},
- {62, 941, 0, L""},
- {62, 3164, 0, L""},
- {62, 942, 0, L""},
- {62, 943, 0, L""},
- {62, 3237, 0, L""},
- {62, 3165, 0, L" "},
- {62, 944, 0, L""},
- {62, 945, 0, L""},
- {62, 3008, 0, L""},
- {62, 3150, 0, L""},
- {62, 946, 0, L""},
- {62, 947, 0, L""},
- {62, 948, 0, L""},
- {62, 2958, 0, L""},
+ {62, 940, 0, L"Белосток"},
+ {62, 941, 0, L"Варшава"},
+ {62, 3164, 0, L"Вроцлав"},
+ {62, 942, 0, L"Гданьск"},
+ {62, 943, 0, L"Гливице"},
+ {62, 3237, 0, L"Закопане"},
+ {62, 3165, 0, L"Зелена Гура"},
+ {62, 944, 0, L"Катовице"},
+ {62, 945, 0, L"Краков"},
+ {62, 3008, 0, L"Лодзь"},
+ {62, 3150, 0, L"Ольштын"},
+ {62, 946, 0, L"Познань"},
+ {62, 947, 0, L"Радом"},
+ {62, 948, 0, L"Сопот"},
+ {62, 2958, 0, L"Тыхы"},
{62, 2510, 0, lpwszOther},
- {35, 949, 0, L""},
- {35, 950, 0, L""},
+ {35, 949, 0, L"Лиссабон"},
+ {35, 950, 0, L"Порто"},
{35, 2509, 0, lpwszOther},
- {63, 952, 0, L""},
- {63, 951, 0, L""},
- {63, 954, 0, L""},
- {63, 955, 0, L""},
- {63, 953, 0, L""},
+ {63, 952, 0, L"Брашов"},
+ {63, 951, 0, L"Бухарест"},
+ {63, 954, 0, L"Констанца"},
+ {63, 955, 0, L"Плоешти"},
+ {63, 953, 0, L"Яссы"},
{63, 2508, 0, lpwszOther},
- {64, 956, 0, L"-"},
+ {64, 956, 0, L"Сан-Марино"},
{64, 2507, 0, lpwszOther},
- {74, 957, 0, L""},
- {74, 960, 0, L""},
- {74, 958, 0, L"-"},
- {74, 959, 0, L""},
+ {74, 957, 0, L"Белград"},
+ {74, 960, 0, L"Ниш"},
+ {74, 958, 0, L"Нови-Сад"},
+ {74, 959, 0, L"Сараево"},
{74, 2506, 0, lpwszOther},
- {65, 961, 0, L""},
- {65, 962, 0, L""},
- {65, 3101, 0, L""},
- {65, 963, 0, L""},
- {65, 964, 0, L""},
- {65, 965, 0, L""},
- {65, 966, 0, L""},
+ {65, 961, 0, L"Братислава"},
+ {65, 962, 0, L"Кошице"},
+ {65, 3101, 0, L"Липтов"},
+ {65, 963, 0, L"Попрад"},
+ {65, 964, 0, L"Прешов"},
+ {65, 965, 0, L"Ружемберок"},
+ {65, 966, 0, L"Тврдошин"},
{65, 2505, 0, lpwszOther},
- {66, 968, 0, L""},
- {66, 967, 0, L""},
- {66, 969, 0, L""},
+ {66, 968, 0, L"Копар"},
+ {66, 967, 0, L"Любляна"},
+ {66, 969, 0, L"Марибор"},
{66, 2504, 0, lpwszOther},
- {67, 970, 0, L""},
+ {67, 970, 0, L"Торсхавн"},
{67, 2503, 0, lpwszOther},
- {68, 2888, 0, L""},
- {68, 971, 0, L""},
- {68, 979, 0, L""},
- {68, 972, 0, L""},
- {68, 980, 0, L""},
- {68, 973, 0, L""},
- {68, 3375, 0, L""},
- {68, 3159, 0, L""},
- {68, 974, 0, L""},
- {68, 975, 0, L""},
- {68, 976, 0, L""},
- {68, 977, 0, L""},
- {68, 978, 0, L""},
+ {68, 2888, 0, L"Вантаа"},
+ {68, 971, 0, L"Васа"},
+ {68, 979, 0, L"Котка"},
+ {68, 972, 0, L"Коувола"},
+ {68, 980, 0, L"Лахти"},
+ {68, 973, 0, L"Оулу"},
+ {68, 3375, 0, L"Риихимяки"},
+ {68, 3159, 0, L"Руовеси"},
+ {68, 974, 0, L"Тампере"},
+ {68, 975, 0, L"Турку"},
+ {68, 976, 0, L"Хельсинки"},
+ {68, 977, 0, L"Эспо"},
+ {68, 978, 0, L"Ювяскюля"},
{68, 2502, 0, lpwszOther},
- {37, 996, 0, L""},
- {37, 983, 0, L""},
- {37, 997, 0, L""},
- {37, 984, 0, L""},
- {37, 998, 0, L""},
- {37, 987, 0, L""},
- {37, 988, 0, L""},
- {37, 993, 0, L"-"},
- {37, 3037, 0, L""},
- {37, 989, 0, L""},
- {37, 985, 0, L""},
- {37, 991, 0, L""},
- {37, 3161, 0, L""},
- {37, 990, 0, L""},
- {37, 994, 0, L""},
- {37, 995, 0, L""},
- {37, 999, 0, L""},
- {37, 981, 0, L""},
- {37, 3374, 0, L""},
- {37, 992, 0, L""},
- {37, 982, 0, L""},
- {37, 986, 0, L""},
- {37, 3314, 0, L""},
+ {37, 996, 0, L"Авиньон"},
+ {37, 983, 0, L"Бержерак"},
+ {37, 997, 0, L"Блуа"},
+ {37, 984, 0, L"Бордо"},
+ {37, 998, 0, L"Дижон"},
+ {37, 987, 0, L"Канн"},
+ {37, 988, 0, L"Кастр"},
+ {37, 993, 0, L"Клермон-Ферран"},
+ {37, 3037, 0, L"Лилль"},
+ {37, 989, 0, L"Лион"},
+ {37, 985, 0, L"Марсель"},
+ {37, 991, 0, L"Мец"},
+ {37, 3161, 0, L"Мобеж"},
+ {37, 990, 0, L"Нанси"},
+ {37, 994, 0, L"Нант"},
+ {37, 995, 0, L"Ницца"},
+ {37, 999, 0, L"Орлеан"},
+ {37, 981, 0, L"Париж"},
+ {37, 3374, 0, L"Перпиньян"},
+ {37, 992, 0, L"Руан"},
+ {37, 982, 0, L"Страсбург"},
+ {37, 986, 0, L"Тулуза"},
+ {37, 3314, 0, L"Шамбери"},
{37, 2501, 0, lpwszOther},
- {69, 1003, 0, L""},
- {69, 1000, 0, L""},
- {69, 1001, 0, L""},
- {69, 1004, 0, L""},
- {69, 1002, 0, L""},
+ {69, 1003, 0, L"Дубровник"},
+ {69, 1000, 0, L"Загреб"},
+ {69, 1001, 0, L"Задар"},
+ {69, 1004, 0, L"Риека"},
+ {69, 1002, 0, L"Сплит"},
{69, 2500, 0, lpwszOther},
- {70, 1005, 0, L""},
- {70, 3291, 0, L"-"},
- {70, 1007, 0, L"-"},
- {70, 1008, 0, L"-"},
- {70, 3019, 0, L""},
- {70, 1010, 0, L""},
- {70, 1009, 0, L""},
- {70, 1015, 0, L""},
- {70, 3105, 0, L" "},
- {70, 1006, 0, L""},
- {70, 3246, 0, L""},
- {70, 1011, 0, L""},
- {70, 1012, 0, L"--"},
- {70, 1014, 0, L"-"},
- {70, 1013, 0, L"--"},
+ {70, 1005, 0, L"Брно"},
+ {70, 3291, 0, L"Гавличкув-Брод"},
+ {70, 1007, 0, L"Градец-Кралове"},
+ {70, 1008, 0, L"Карлови-Вари"},
+ {70, 3019, 0, L"Кладрубы"},
+ {70, 1010, 0, L"Лоуни"},
+ {70, 1009, 0, L"Острава"},
+ {70, 1015, 0, L"Пльзень"},
+ {70, 3105, 0, L"Правчицка Брана"},
+ {70, 1006, 0, L"Прага"},
+ {70, 3246, 0, L"Тачов"},
+ {70, 1011, 0, L"Тршебич"},
+ {70, 1012, 0, L"Усти-над-Лабем"},
+ {70, 1014, 0, L"Ческе-Будеевице"},
+ {70, 1013, 0, L"Яблонец-над-Нисоу"},
{70, 2499, 0, lpwszOther},
- {71, 1016, 0, L""},
- {71, 1019, 0, L""},
- {71, 1017, 0, L""},
- {71, 1018, 0, L""},
- {71, 1020, 0, L""},
- {71, 1021, 0, L""},
- {71, 1022, 0, L""},
- {71, 3189, 0, L""},
- {71, 1023, 0, L""},
- {71, 1024, 0, L""},
- {71, 1025, 0, L""},
- {71, 1026, 0, L""},
- {71, 1027, 0, L""},
- {71, 1028, 0, L""},
- {71, 1029, 0, L""},
- {71, 1030, 0, L""},
+ {71, 1016, 0, L"Арау"},
+ {71, 1019, 0, L"Баден"},
+ {71, 1017, 0, L"Базель"},
+ {71, 1018, 0, L"Берн"},
+ {71, 1020, 0, L"Биль"},
+ {71, 1021, 0, L"Винтертур"},
+ {71, 1022, 0, L"Давос"},
+ {71, 3189, 0, L"Делемонт"},
+ {71, 1023, 0, L"Женева"},
+ {71, 1024, 0, L"Золотурн"},
+ {71, 1025, 0, L"Лозанна"},
+ {71, 1026, 0, L"Локарно"},
+ {71, 1027, 0, L"Лугано"},
+ {71, 1028, 0, L"Люцерн"},
+ {71, 1029, 0, L"Монтре"},
+ {71, 1030, 0, L"Цюрих"},
{71, 2498, 0, lpwszOther},
- {72, 2883, 0, L""},
- {72, 1031, 0, L""},
- {72, 1032, 0, L""},
- {72, 1037, 0, L""},
- {72, 1036, 0, L""},
- {72, 1042, 0, L""},
- {72, 1033, 0, L""},
- {72, 1034, 0, L""},
- {72, 1041, 0, L""},
- {72, 1039, 0, L""},
- {72, 1043, 0, L""},
- {72, 1040, 0, L""},
- {72, 1038, 0, L""},
+ {72, 2883, 0, L"Арбога"},
+ {72, 1031, 0, L"Гетеборг"},
+ {72, 1032, 0, L"Кальмар"},
+ {72, 1037, 0, L"Лахольм"},
+ {72, 1036, 0, L"Лулео"},
+ {72, 1042, 0, L"Лунд"},
+ {72, 1033, 0, L"Мальме"},
+ {72, 1034, 0, L"Стокгольм"},
+ {72, 1041, 0, L"Умео"},
+ {72, 1039, 0, L"Фалун"},
+ {72, 1043, 0, L"Хельсинборг"},
+ {72, 1040, 0, L"Хернесанд"},
+ {72, 1038, 0, L"Эстерсунд"},
{72, 2497, 0, lpwszOther},
- {73, 3013, 0, L""},
- {73, 1044, 0, L""},
- {73, 1045, 0, L"-"},
- {73, 1046, 0, L""},
- {73, 1047, 0, L""},
- {73, 1048, 0, L""},
- {73, 1049, 0, L""},
- {73, 1050, 0, L""},
- {73, 1051, 0, L""},
- {73, 1052, 0, L""},
- {73, 1053, 0, L""},
- {73, 1054, 0, L""},
+ {73, 3013, 0, L"Валга"},
+ {73, 1044, 0, L"Кейла"},
+ {73, 1045, 0, L"Кохтла-Ярве"},
+ {73, 1046, 0, L"Маарду"},
+ {73, 1047, 0, L"Мыйзакюла"},
+ {73, 1048, 0, L"Нарва"},
+ {73, 1049, 0, L"Пярну"},
+ {73, 1050, 0, L"Раквере"},
+ {73, 1051, 0, L"Силламяэ"},
+ {73, 1052, 0, L"Таллин"},
+ {73, 1053, 0, L"Тарту"},
+ {73, 1054, 0, L"Хаапсалу"},
{0, 0, 0, NULL}
};//*/
/*
static const MRA_COUNTRY mracCountrys[] =
{
- {24, L""},
- {81, L""},
- {82, L""},
- {97, L""},
- {96, L""},
- {99, L""},
- {100, L"-"},
- {101, L""},
- {102, L""},
- {83, L""},
- {86, L""},
- {95, L""},
- {103, L""},
- {79, L""},
- {85, L""},
- {87, L""},
- {104, L""},
- {84, L""},
- {105, L""},
- {106, L""},
- {107, L""},
- {92, L" ()"},
- {76, L""},
- {3215, L" (.)"},
- {29, L" ()"},
- {108, L""},
- {88, L""},
- {109, L""},
- {110, L""},
- {111, L""},
- {112, L""},
- {113, L""},
- {114, L""},
- {115, L""},
- {116, L" "},
- {117, L""},
- {3216, L" (.)"},
- {122, L""},
- {89, L""},
- {94, L" "},
- {118, L""},
- {78, L""},
- {91, L""},
- {119, L""},
- {120, L""},
- {132, L""},
- {90, L""},
- {77, L""},
- {93, L""},
- {121, L""},
- {98, L" "},
- {75, L""},
- {123, L""},
- {454, L" "},
- {124, L""},
- {453, L" ()"},
- {126, L""},
- {127, L" "},
- {128, L" ( )"},
- {129, L""},
- {3220, L" (..)"},
- {130, L" "},
- {3218, L" (.)"},
- {3221, L" (..)"},
- {3230, L" (.)"},
- {131, L""},
- {133, L" - "},
- {3222, L" (.)"},
- {125, L""},
- {3219, L". ()"},
- {134, L" "},
- {3223, L" (..)"},
- {135, L""},
- {136, L""},
- {3224, L" (.)"},
- {137, L""},
- {3226, L" "},
- {3225, L" "},
- {138, L""},
- {139, L""},
- {3200, L" (.)"},
- {140, L" "},
- {141, L""},
- {3202, L" (.)"},
- {142, L""},
- {143, L""},
- {146, L""},
- {3203, L" (.)"},
- {144, L""},
- {145, L""},
- {147, L""},
- {3204, L" (.)"},
- {452, L" ()"},
- {149, L""},
- {148, L""},
- {3205, L" (.)"},
- {173, L""},
- {150, L""},
- {151, L""},
- {152, L" (.)"},
- {153, L""},
- {154, L" "},
- {155, L""},
- {156, L"-"},
- {157, L""},
- {3208, L" (.)"},
- {158, L""},
- {3209, L" ()"},
- {3201, L" "},
- {159, L""},
- {3207, L" (.)"},
- {3211, L" (.)"},
- {160, L""},
- {161, L""},
- {162, L""},
- {163, L""},
- {164, L"- "},
- {165, L"- "},
- {166, L"-"},
- {3210, L"- (.)"},
- {167, L""},
- {168, L" "},
- {169, L""},
- {3212, L" (.)"},
- {3206, L" "},
- {170, L""},
- {171, L""},
- {3213, L". . - (.)"},
- {172, L""},
- {174, L""},
- {175, L""},
- {176, L""},
- {177, L""},
- {3228, L" "},
- {178, L"-"},
- {179, L""},
- {180, L""},
- {181, L""},
- {182, L""},
- {183, L""},
- {184, L"-"},
- {185, L""},
- {186, L""},
- {187, L""},
- {3198, L". "},
- {23, L""},
- {188, L"-"},
- {189, L""},
- {190, L""},
- {191, L""},
- {193, L" ()"},
- {192, L""},
- {194, L"-`"},
- {195, L""},
- {196, L""},
- {197, L""},
- {198, L""},
- {199, L""},
- {200, L""},
- {3229, L" (.)"},
- {201, L""},
- {202, L""},
- {203, L""},
- {204, L""},
- {205, L""},
- {206, L""},
- {207, L""},
- {3227, L" (.)"},
- {3197, L" (.)"},
- {208, L""},
- {209, L"- "},
- {210, L""},
- {3199, L" (.)"},
- {211, L""},
- {212, L""},
- {213, L""},
- {214, L""},
- {215, L"-"},
- {216, L""},
- {217, L""},
- {218, L""},
- {219, L""},
- {220, L" "},
- {222, L""},
- {223, L" "},
- {221, L""},
- {224, L""},
- {225, L"- ()"},
- {39, L""},
- {40, L""},
- {32, L""},
- {33, L""},
- {340, L""},
- {38, L""},
- {41, L""},
- {42, L" "},
- {43, L""},
- {45, L""},
- {44, L""},
- {46, L""},
- {3193, L" (.)"},
- {47, L" (.)"},
- {48, L""},
- {49, L""},
- {3194, L" (.)"},
- {50, L""},
- {51, L""},
- {34, L""},
- {52, L""},
- {53, L""},
- {54, L""},
- {55, L""},
- {56, L""},
- {57, L""},
- {58, L""},
- {59, L""},
- {36, L""},
- {60, L""},
- {61, L""},
- {3195, L" (.)"},
- {62, L""},
- {35, L""},
- {63, L""},
- {64, L"-"},
- {74, L" "},
- {65, L""},
- {66, L""},
- {67, L" - ()"},
- {68, L""},
- {37, L""},
- {69, L""},
- {70, L""},
- {71, L""},
- {72, L""},
- {3196, L" (.)"},
- {73, L""},
+ {24, L"Россия"},
+ {81, L"Азербайджан"},
+ {82, L"Армения"},
+ {97, L"Афганистан"},
+ {96, L"Бангладеш"},
+ {99, L"Бахрейн"},
+ {100, L"Бруней-Даруссалам"},
+ {101, L"Бутан"},
+ {102, L"Вьетнам"},
+ {83, L"Грузия"},
+ {86, L"Израиль"},
+ {95, L"Индия"},
+ {103, L"Индонезия"},
+ {79, L"Иордания"},
+ {85, L"Ирак"},
+ {87, L"Иран"},
+ {104, L"Йемен"},
+ {84, L"Казахстан"},
+ {105, L"Камбоджа"},
+ {106, L"Катар"},
+ {107, L"Кипр"},
+ {92, L"Киргизия (Кыргызстан)"},
+ {76, L"Китай"},
+ {3215, L"Кокосовые острова (Австр.)"},
+ {29, L"Корея (КНДР)"},
+ {108, L"Корея"},
+ {88, L"Кувейт"},
+ {109, L"Лаос"},
+ {110, L"Ливан"},
+ {111, L"Малайзия"},
+ {112, L"Мальдивы"},
+ {113, L"Монголия"},
+ {114, L"Мьянма"},
+ {115, L"Непал"},
+ {116, L"Объединенные Арабские Эмираты"},
+ {117, L"Оман"},
+ {3216, L"Остров Рождества (Австр.)"},
+ {122, L"Пакистан"},
+ {89, L"Палестина"},
+ {94, L"Саудовская Аравия"},
+ {118, L"Сингапур"},
+ {78, L"Сирия"},
+ {91, L"Таджикистан"},
+ {119, L"Таиланд"},
+ {120, L"Тайвань"},
+ {132, L"Тимор"},
+ {90, L"Туркмения"},
+ {77, L"Турция"},
+ {93, L"Узбекистан"},
+ {121, L"Филиппины"},
+ {98, L"Шри Ланка"},
+ {75, L"Япония"},
+ {123, L"Австралия"},
+ {454, L"Американское Самоа"},
+ {124, L"Вануату"},
+ {453, L"Гуам (США)"},
+ {126, L"Кирибати"},
+ {127, L"Маршалловы Острова"},
+ {128, L"Микронезия (Федеративные Штаты Микронезии)"},
+ {129, L"Науру"},
+ {3220, L"Ниуэ (Н.Зел.)"},
+ {130, L"Новая Зеландия"},
+ {3218, L"Новая Каледония (Фр.)"},
+ {3221, L"Острова Кука (Н.Зел.)"},
+ {3230, L"Острова Херд и Макдональд (Австр.)"},
+ {131, L"Палау"},
+ {133, L"Папуа - Новая Гвинея"},
+ {3222, L"Питкерн (Брит.)"},
+ {125, L"Самоа"},
+ {3219, L"Сев. Марианские острова (США)"},
+ {134, L"Соломоновы Острова"},
+ {3223, L"Токелау (Н.Зел.)"},
+ {135, L"Тонга"},
+ {136, L"Тувалу"},
+ {3224, L"Уоллис и Футуна острова (Фр.)"},
+ {137, L"Фиджи"},
+ {3226, L"Французская Полинезия"},
+ {3225, L"Французские Южные территории"},
+ {138, L"Канада"},
+ {139, L"США"},
+ {3200, L"Ангилья (Брит.)"},
+ {140, L"Антигуа и Барбуда"},
+ {141, L"Аргентина"},
+ {3202, L"Аруба (Нид.)"},
+ {142, L"Багамы"},
+ {143, L"Барбадос"},
+ {146, L"Белиз"},
+ {3203, L"Бермуды (Брит.)"},
+ {144, L"Боливия"},
+ {145, L"Бразилия"},
+ {147, L"Венесуэла"},
+ {3204, L"Виргинские острова (Брит.)"},
+ {452, L"Виргинские острова (США)"},
+ {149, L"Гаити"},
+ {148, L"Гайана"},
+ {3205, L"Гваделупа (Фр.)"},
+ {173, L"Гватемала"},
+ {150, L"Гондурас"},
+ {151, L"Гренада"},
+ {152, L"Гренландия (Дат.)"},
+ {153, L"Доминика"},
+ {154, L"Доминиканская Республика"},
+ {155, L"Колумбия"},
+ {156, L"Коста-Рика"},
+ {157, L"Куба"},
+ {3208, L"Мартиника (Фр.)"},
+ {158, L"Мексика"},
+ {3209, L"Монтсеррат (Брит)"},
+ {3201, L"Нидерландские Антилы"},
+ {159, L"Никарагуа"},
+ {3207, L"Остров Кайман (Брит.)"},
+ {3211, L"Острова Теркс и Кайкос (Брит.)"},
+ {160, L"Панама"},
+ {161, L"Парагвай"},
+ {162, L"Перу"},
+ {163, L"Сальвадор"},
+ {164, L"Сент-Винсент и Гренадины"},
+ {165, L"Сент-Китс и Невис"},
+ {166, L"Сент-Люсия"},
+ {3210, L"Сент-Пьер и Микелон (Фр.)"},
+ {167, L"Суринам"},
+ {168, L"Тринидат и Тобаго"},
+ {169, L"Уругвай"},
+ {3212, L"Фолклендские острова (Брит.)"},
+ {3206, L"Французская Гвиана"},
+ {170, L"Чили"},
+ {171, L"Эквадор"},
+ {3213, L"Юж. Джорджия и Юж. Сандвичевы о-ва (Брит.)"},
+ {172, L"Ямайка"},
+ {174, L"Алжир"},
+ {175, L"Ангола"},
+ {176, L"Бенин"},
+ {177, L"Ботсвана"},
+ {3228, L"Британская территория в Индийском океане"},
+ {178, L"Буркина-Фасо"},
+ {179, L"Бурунди"},
+ {180, L"Габон"},
+ {181, L"Гамбия"},
+ {182, L"Гана"},
+ {183, L"Гвинея"},
+ {184, L"Гвинея-Бисау"},
+ {185, L"Джибути"},
+ {186, L"Египет"},
+ {187, L"Замбия"},
+ {3198, L"Зап. Сахара"},
+ {23, L"Зимбабве"},
+ {188, L"Кабо-Верде"},
+ {189, L"Камерун"},
+ {190, L"Кения"},
+ {191, L"Коморы"},
+ {193, L"Конго (Заир)"},
+ {192, L"Конго"},
+ {194, L"Кот-д`Ивуар"},
+ {195, L"Лесото"},
+ {196, L"Либерия"},
+ {197, L"Ливия"},
+ {198, L"Маврикий"},
+ {199, L"Мавритания"},
+ {200, L"Мадагаскар"},
+ {3229, L"Майотт (Фр.)"},
+ {201, L"Малави"},
+ {202, L"Мали"},
+ {203, L"Марокко"},
+ {204, L"Мозамбик"},
+ {205, L"Намибия"},
+ {206, L"Нигер"},
+ {207, L"Нигерия"},
+ {3227, L"Остров Буве (Норв.)"},
+ {3197, L"Реюньон (Фр.)"},
+ {208, L"Руанда"},
+ {209, L"Сан-Томе и Принсипи"},
+ {210, L"Свазиленд"},
+ {3199, L"Святая Елена (Брит.)"},
+ {211, L"Сейшелы"},
+ {212, L"Сенегал"},
+ {213, L"Сомали"},
+ {214, L"Судан"},
+ {215, L"Сьерра-Леоне"},
+ {216, L"Танзания"},
+ {217, L"Того"},
+ {218, L"Тунис"},
+ {219, L"Уганда"},
+ {220, L"Центральноафриканская Республика"},
+ {222, L"Чад"},
+ {223, L"Экваториальная Гвинея"},
+ {221, L"Эритрея"},
+ {224, L"Эфиопия"},
+ {225, L"Южно-Африканская Республика (ЮАР)"},
+ {39, L"Украина"},
+ {40, L"Австрия"},
+ {32, L"Албания"},
+ {33, L"Андорра"},
+ {340, L"Белоруссия"},
+ {38, L"Бельгия"},
+ {41, L"Болгария"},
+ {42, L"Босния и Герцеговина"},
+ {43, L"Ватикан"},
+ {45, L"Великобритания"},
+ {44, L"Венгрия"},
+ {46, L"Германия"},
+ {3193, L"Гернси (Брит.)"},
+ {47, L"Гибралтар (Брит.)"},
+ {48, L"Греция"},
+ {49, L"Дания"},
+ {3194, L"Джерси (Брит.)"},
+ {50, L"Ирландия"},
+ {51, L"Исландия"},
+ {34, L"Испания"},
+ {52, L"Италия"},
+ {53, L"Латвия"},
+ {54, L"Литва"},
+ {55, L"Лихтенштейн"},
+ {56, L"Люксембург"},
+ {57, L"Македония"},
+ {58, L"Мальта"},
+ {59, L"Молдавия"},
+ {36, L"Монако"},
+ {60, L"Нидерланды"},
+ {61, L"Норвегия"},
+ {3195, L"Остров Мэн (Брит.)"},
+ {62, L"Польша"},
+ {35, L"Португалия"},
+ {63, L"Румыния"},
+ {64, L"Сан-Марино"},
+ {74, L"Сербия и Черногория"},
+ {65, L"Словакия"},
+ {66, L"Словения"},
+ {67, L"Фарерские о-ва (Дания)"},
+ {68, L"Финляндия"},
+ {37, L"Франция"},
+ {69, L"Хорватия"},
+ {70, L"Чехия"},
+ {71, L"Швейцария"},
+ {72, L"Швеция"},
+ {3196, L"Шпицберген (Норв.)"},
+ {73, L"Эстония"},
{0, NULL}
};
@@ -1667,1125 +1667,1125 @@ static const MRA_COUNTRY mracCountrys[] = static const MRA_CITY mracCitys[] =
{
- {24, 25, L""},
- {24, 226, L"-"},
- {24, 233, L" ()"},
- {24, 232, L" "},
- {24, 235, L" "},
- {24, 227, L" ."},
- {24, 229, L" ."},
- {24, 231, L" ."},
- {24, 234, L" ."},
- {24, 228, L" "},
- {24, 230, L" "},
- {24, 236, L" "},
- {24, 237, L""},
- {24, 240, L"-"},
- {24, 241, L""},
- {24, 248, L""},
- {24, 249, L""},
- {24, 251, L""},
- {24, 238, L" ."},
- {24, 242, L" ."},
- {24, 243, L" ."},
- {24, 244, L" ."},
- {24, 245, L" ."},
- {24, 246, L" ."},
- {24, 247, L" ."},
- {24, 250, L" ."},
- {24, 239, L"- "},
- {24, 255, L""},
- {24, 256, L""},
- {24, 252, L" ."},
- {24, 253, L" ."},
- {24, 254, L" ."},
- {24, 257, L" ."},
- {24, 258, L" ."},
- {24, 260, L" ."},
- {24, 261, L" ."},
- {24, 259, L" "},
- {24, 265, L""},
- {24, 263, L" "},
- {24, 273, L""},
- {24, 275, L""},
- {24, 264, L" "},
- {24, 268, L" "},
- {24, 266, L" ."},
- {24, 267, L" ."},
- {24, 269, L" ."},
- {24, 270, L" ."},
- {24, 272, L" ."},
- {24, 276, L" ."},
- {24, 262, L" "},
- {24, 271, L" "},
- {24, 274, L"- "},
- {24, 277, L" "},
- {24, 278, L" ."},
- {24, 279, L" ."},
- {24, 280, L" ."},
- {24, 282, L" ."},
- {24, 281, L"- - "},
- {24, 283, L"- "},
- {24, 284, L" ."},
- {24, 285, L" ."},
- {24, 286, L" ."},
- {24, 287, L" ."},
- {24, 288, L" ."},
- {24, 289, L" ."},
- {24, 290, L" ."},
- {24, 291, L" ."},
- {24, 292, L" ."},
- {24, 293, L" ."},
- {24, 294, L" ."},
- {24, 295, L" ."},
- {24, 296, L" ."},
- {24, 297, L" ."},
- {24, 298, L" ."},
- {24, 299, L" ."},
- {24, 300, L" ."},
- {24, 301, L""},
- {24, 304, L""},
- {24, 305, L""},
- {24, 306, L"-"},
- {24, 307, L""},
- {24, 308, L"-"},
- {24, 311, L" - "},
- {24, 313, L""},
- {24, 309, L" "},
- {24, 312, L" "},
- {24, 302, L" ."},
- {24, 303, L" ."},
- {24, 310, L" ."},
- {81, 1055, L""},
- {81, 1058, L""},
- {81, 1056, L""},
- {81, 1057, L""},
- {81, 3153, L""},
+ {24, 25, L"Москва"},
+ {24, 226, L"Санкт-Петербург"},
+ {24, 233, L"Саха (Якутия)"},
+ {24, 232, L"Приморский край"},
+ {24, 235, L"Хабаровский край"},
+ {24, 227, L"Амурская обл."},
+ {24, 229, L"Камчатская обл."},
+ {24, 231, L"Магаданская обл."},
+ {24, 234, L"Сахалинская обл."},
+ {24, 228, L"Еврейская АО"},
+ {24, 230, L"Корякский АО"},
+ {24, 236, L"Чукотский АО"},
+ {24, 237, L"Башкортостан"},
+ {24, 240, L"Марий-Эл"},
+ {24, 241, L"Мордовия"},
+ {24, 248, L"Татарстан"},
+ {24, 249, L"Удмуртия"},
+ {24, 251, L"Чувашия"},
+ {24, 238, L"Кировская обл."},
+ {24, 242, L"Нижегородская обл."},
+ {24, 243, L"Оренбургская обл."},
+ {24, 244, L"Пензенская обл."},
+ {24, 245, L"Пермская обл."},
+ {24, 246, L"Самарская обл."},
+ {24, 247, L"Саратовская обл."},
+ {24, 250, L"Ульяновская обл."},
+ {24, 239, L"Коми-Пермяцкий АО"},
+ {24, 255, L"Карелия"},
+ {24, 256, L"Коми"},
+ {24, 252, L"Архангельская обл."},
+ {24, 253, L"Вологодская обл."},
+ {24, 254, L"Калининградская обл."},
+ {24, 257, L"Ленинградская обл."},
+ {24, 258, L"Мурманская обл."},
+ {24, 260, L"Новгородская обл."},
+ {24, 261, L"Псковская обл."},
+ {24, 259, L"Ненецкий АО"},
+ {24, 265, L"Бурятия"},
+ {24, 263, L"Республика Алтай"},
+ {24, 273, L"Тыва"},
+ {24, 275, L"Хакасия"},
+ {24, 264, L"Алтайский край"},
+ {24, 268, L"Красноярский край"},
+ {24, 266, L"Иркутская обл."},
+ {24, 267, L"Кемеровская обл."},
+ {24, 269, L"Новосибирская обл."},
+ {24, 270, L"Омская обл."},
+ {24, 272, L"Томская обл."},
+ {24, 276, L"Читинская обл."},
+ {24, 262, L"Агинский Бурятский АО"},
+ {24, 271, L"Таймырский АО"},
+ {24, 274, L"Усть-Ордынский Бурятский АО"},
+ {24, 277, L"Эвенкийский АО"},
+ {24, 278, L"Курганская обл."},
+ {24, 279, L"Свердловская обл."},
+ {24, 280, L"Тюменская обл."},
+ {24, 282, L"Челябинская обл."},
+ {24, 281, L"Ханты-Мансийский АО - Югра"},
+ {24, 283, L"Ямало-Ненецкий АО"},
+ {24, 284, L"Белгородская обл."},
+ {24, 285, L"Брянская обл."},
+ {24, 286, L"Владимирская обл."},
+ {24, 287, L"Воронежская обл."},
+ {24, 288, L"Ивановская обл."},
+ {24, 289, L"Калужская обл."},
+ {24, 290, L"Костромская обл."},
+ {24, 291, L"Курская обл."},
+ {24, 292, L"Липецкая обл."},
+ {24, 293, L"Московская обл."},
+ {24, 294, L"Орловская обл."},
+ {24, 295, L"Рязанская обл."},
+ {24, 296, L"Смоленская обл."},
+ {24, 297, L"Тамбовская обл."},
+ {24, 298, L"Тверская обл."},
+ {24, 299, L"Тульская обл."},
+ {24, 300, L"Ярославская обл."},
+ {24, 301, L"Адыгея"},
+ {24, 304, L"Дагестан"},
+ {24, 305, L"Ингушетия"},
+ {24, 306, L"Кабардино-Балкария"},
+ {24, 307, L"Калмыкия"},
+ {24, 308, L"Карачаево-Черкессия"},
+ {24, 311, L"Северная Осетия - Алания"},
+ {24, 313, L"Чечня"},
+ {24, 309, L"Краснодарский край"},
+ {24, 312, L"Ставропольский край"},
+ {24, 302, L"Астраханская обл."},
+ {24, 303, L"Волгоградская обл."},
+ {24, 310, L"Ростовская обл."},
+ {81, 1055, L"Баку"},
+ {81, 1058, L"Гянджа"},
+ {81, 1056, L"Нахичевань"},
+ {81, 1057, L"Ханкенди"},
+ {81, 3153, L"Шеки"},
{81, 2291, lpwszOther},
- {82, 2932, L""},
- {82, 1060, L""},
- {82, 3084, L""},
- {82, 3011, L""},
- {82, 3306, L""},
- {82, 1059, L""},
- {82, 3145, L""},
+ {82, 2932, L"Абовян"},
+ {82, 1060, L"Аштарак"},
+ {82, 3084, L"Ванадзор"},
+ {82, 3011, L"Гюмри"},
+ {82, 3306, L"Дилижан"},
+ {82, 1059, L"Ереван"},
+ {82, 3145, L"Ханкенди"},
{82, 2292, lpwszOther},
- {97, 1061, L""},
+ {97, 1061, L"Кабул"},
{97, 2293, lpwszOther},
- {96, 1062, L""},
+ {96, 1062, L"Дакка"},
{96, 2294, lpwszOther},
- {99, 1063, L""},
+ {99, 1063, L"Манама"},
{99, 2295, lpwszOther},
- {100, 1064, L"--"},
+ {100, 1064, L"Бандар-Сери-Бегаван"},
{100, 2296, lpwszOther},
- {101, 1065, L""},
+ {101, 1065, L"Тхимпху"},
{101, 2297, lpwszOther},
- {102, 1066, L""},
+ {102, 1066, L"Ханой"},
{102, 2298, lpwszOther},
- {83, 1067, L""},
- {83, 3158, L""},
- {83, 1068, L""},
- {83, 3129, L""},
- {83, 1069, L""},
- {83, 1070, L""},
+ {83, 1067, L"Батуми"},
+ {83, 3158, L"Боржоми"},
+ {83, 1068, L"Поти"},
+ {83, 3129, L"Рустави"},
+ {83, 1069, L"Сухуми"},
+ {83, 1070, L"Тбилиси"},
{83, 2299, lpwszOther},
- {86, 3345, L""},
- {86, 1071, L""},
- {86, 2992, L""},
- {86, 3175, L""},
- {86, 3363, L"-"},
- {86, 2884, L"-"},
- {86, 3243, L"-"},
- {86, 1074, L"-"},
- {86, 3348, L""},
- {86, 3241, L""},
- {86, 1075, L""},
- {86, 3350, L"-"},
- {86, 2982, L""},
- {86, 2971, L"-"},
- {86, 3136, L""},
- {86, 1080, L""},
- {86, 3303, L""},
- {86, 3050, L""},
- {86, 3151, L" "},
- {86, 3141, L""},
- {86, 3012, L" "},
- {86, 1081, L""},
- {86, 1077, L"-"},
- {86, 1079, L""},
- {86, 1078, L""},
- {86, 1076, L""},
- {86, 2929, L""},
- {86, 2928, L""},
+ {86, 3345, L"Ариэль"},
+ {86, 1071, L"Афула"},
+ {86, 2992, L"Ашдод"},
+ {86, 3175, L"Ашкелон"},
+ {86, 3363, L"Бат-Ям"},
+ {86, 2884, L"Беер-Яков"},
+ {86, 3243, L"Бейт-Шемеш"},
+ {86, 1074, L"Беэр-Шева"},
+ {86, 3348, L"Герцелия"},
+ {86, 3241, L"Димона"},
+ {86, 1075, L"Иерусалим"},
+ {86, 3350, L"Йокнеам-Иллит"},
+ {86, 2982, L"Кармиэль"},
+ {86, 2971, L"Кфар-Саба"},
+ {86, 3136, L"Назарет"},
+ {86, 1080, L"Натания"},
+ {86, 3303, L"Офаким"},
+ {86, 3050, L"Раанана"},
+ {86, 3151, L"Рамат Ган"},
+ {86, 3141, L"Реховот"},
+ {86, 3012, L"Ришон ле Цион"},
+ {86, 1081, L"Тверия"},
+ {86, 1077, L"Тель-Авив"},
+ {86, 1079, L"Хадера"},
+ {86, 1078, L"Хайфа"},
+ {86, 1076, L"Хеврон"},
+ {86, 2929, L"Цфат"},
+ {86, 2928, L"Эйлат"},
{86, 2300, lpwszOther},
- {95, 3315, L""},
- {95, 1082, L""},
- {95, 1083, L""},
- {95, 3144, L""},
- {95, 3025, L""},
- {95, 3277, L""},
- {95, 1084, L""},
+ {95, 3315, L"Бангалор"},
+ {95, 1082, L"Дели"},
+ {95, 1083, L"Джайпур"},
+ {95, 3144, L"Калькутта"},
+ {95, 3025, L"Мумбаи"},
+ {95, 3277, L"Панаджи"},
+ {95, 1084, L"Ченнаи"},
{95, 2301, lpwszOther},
- {103, 1085, L""},
+ {103, 1085, L"Джакарта"},
{103, 2302, lpwszOther},
- {79, 1086, L""},
+ {79, 1086, L"Амман"},
{79, 2303, lpwszOther},
- {85, 1087, L""},
+ {85, 1087, L"Багдад"},
{85, 2304, lpwszOther},
- {87, 1088, L""},
+ {87, 1088, L"Тегеран"},
{87, 2305, lpwszOther},
- {104, 1089, L""},
+ {104, 1089, L"Сана"},
{104, 2306, lpwszOther},
- {84, 1090, L""},
- {84, 1091, L""},
- {84, 1092, L"-"},
- {84, 3242, L""},
- {84, 1093, L""},
- {84, 1094, L" ()"},
- {84, 1095, L""},
- {84, 3245, L""},
- {84, 3083, L""},
- {84, 1096, L""},
- {84, 1097, L""},
- {84, 1098, L""},
- {84, 1099, L""},
- {84, 2868, L""},
- {84, 1100, L""},
- {84, 1101, L" (.-. .)"},
- {84, 1102, L""},
- {84, 1103, L""},
- {84, 1104, L""},
- {84, 3166, L""},
- {84, 1105, L"-"},
- {84, 2927, L""},
- {84, 1106, L""},
- {84, 1107, L""},
- {84, 1108, L"-"},
- {84, 1109, L""},
- {84, 1110, L""},
+ {84, 1090, L"Актау"},
+ {84, 1091, L"Актюбинск"},
+ {84, 1092, L"Алма-Ата"},
+ {84, 3242, L"Аршалы"},
+ {84, 1093, L"Астана"},
+ {84, 1094, L"Атырау (Гурьев)"},
+ {84, 1095, L"Байконур"},
+ {84, 3245, L"Балхаш"},
+ {84, 3083, L"Жезказган"},
+ {84, 1096, L"Капчагай"},
+ {84, 1097, L"Караганда"},
+ {84, 1098, L"Кокшетау"},
+ {84, 1099, L"Кустанай"},
+ {84, 2868, L"Лисаковск"},
+ {84, 1100, L"Павлодар"},
+ {84, 1101, L"Петропавловск (Сев.-Каз. обл.)"},
+ {84, 1102, L"Рудный"},
+ {84, 1103, L"Семипалатинск"},
+ {84, 1104, L"Степногорск"},
+ {84, 3166, L"Талгар"},
+ {84, 1105, L"Талды-Курган"},
+ {84, 2927, L"Тараз"},
+ {84, 1106, L"Темиртау"},
+ {84, 1107, L"Уральск"},
+ {84, 1108, L"Усть-Каменогорск"},
+ {84, 1109, L"Чимкент"},
+ {84, 1110, L"Экибастуз"},
{84, 2307, lpwszOther},
- {105, 1111, L""},
+ {105, 1111, L"Пномпень"},
{105, 2308, lpwszOther},
- {106, 1112, L""},
+ {106, 1112, L"Доха"},
{106, 2309, lpwszOther},
- {107, 1113, L""},
- {107, 1114, L""},
- {107, 1115, L""},
- {107, 2954, L""},
+ {107, 1113, L"Ларнака"},
+ {107, 1114, L"Лимассол"},
+ {107, 1115, L"Никосия"},
+ {107, 2954, L"Пафос"},
{107, 2310, lpwszOther},
- {92, 1116, L""},
- {92, 1117, L"-"},
- {92, 3027, L"-"},
- {92, 1118, L""},
- {92, 1119, L""},
- {92, 1120, L""},
- {92, 2933, L""},
+ {92, 1116, L"Бишкек"},
+ {92, 1117, L"Джалал-Абад"},
+ {92, 3027, L"Кара-Балта"},
+ {92, 1118, L"Каракол"},
+ {92, 1119, L"Ош"},
+ {92, 1120, L"Талас"},
+ {92, 2933, L"Хайдаркен"},
{92, 2311, lpwszOther},
- {76, 3214, L" ()"},
- {76, 1121, L""},
- {76, 2869, L""},
- {76, 3262, L""},
- {76, 1122, L""},
- {76, 1123, L""},
- {76, 1124, L""},
- {76, 3043, L""},
+ {76, 3214, L"Аомынь (Макао)"},
+ {76, 1121, L"Гонконг"},
+ {76, 2869, L"Гуанчжоу"},
+ {76, 3262, L"Далянь"},
+ {76, 1122, L"Пекин"},
+ {76, 1123, L"Харбин"},
+ {76, 1124, L"Шанхай"},
+ {76, 3043, L"Шеньян"},
{76, 2312, lpwszOther},
- {29, 1125, L""},
+ {29, 1125, L"Пхеньян"},
{29, 2313, lpwszOther},
- {108, 1126, L""},
- {108, 3240, L""},
+ {108, 1126, L"Сеул"},
+ {108, 3240, L"Тейджон"},
{108, 2314, lpwszOther},
- {88, 1127, L"-"},
+ {88, 1127, L"Эль-Кувейт"},
{88, 2315, lpwszOther},
- {109, 1128, L""},
+ {109, 1128, L"Вьентьян"},
{109, 2316, lpwszOther},
- {110, 1129, L""},
+ {110, 1129, L"Бейрут"},
{110, 2317, lpwszOther},
- {111, 1130, L"-"},
- {111, 1131, L"-"},
+ {111, 1130, L"Джохор-Бару"},
+ {111, 1131, L"Куала-Лумпур"},
{111, 2318, lpwszOther},
- {112, 1132, L""},
+ {112, 1132, L"Мале"},
{112, 2319, lpwszOther},
- {113, 1133, L"-"},
- {113, 1134, L""},
+ {113, 1133, L"Улан-Батор"},
+ {113, 1134, L"Эрдэнэт"},
{113, 2320, lpwszOther},
- {114, 1135, L""},
+ {114, 1135, L"Янгон"},
{114, 2321, lpwszOther},
- {115, 1136, L""},
+ {115, 1136, L"Катманду"},
{115, 2322, lpwszOther},
- {116, 1137, L"-"},
- {116, 1138, L""},
- {116, 1139, L""},
+ {116, 1137, L"Абу-Даби"},
+ {116, 1138, L"Дубай"},
+ {116, 1139, L"Шарджа"},
{116, 2323, lpwszOther},
- {117, 1140, L""},
+ {117, 1140, L"Маскат"},
{117, 2324, lpwszOther},
- {122, 1141, L""},
+ {122, 1141, L"Исламабад"},
{122, 2325, lpwszOther},
- {89, 1072, L""},
- {89, 1073, L""},
- {89, 1142, L""},
+ {89, 1072, L"Ашдод"},
+ {89, 1073, L"Ашкелон"},
+ {89, 1142, L"Газа"},
{89, 2326, lpwszOther},
- {94, 3250, L""},
- {94, 1143, L"-"},
+ {94, 3250, L"Медина"},
+ {94, 1143, L"Эр-Рияд"},
{94, 2327, lpwszOther},
- {78, 1144, L""},
+ {78, 1144, L"Дамаск"},
{78, 2328, lpwszOther},
- {91, 1145, L""},
- {91, 3307, L""},
- {91, 3308, L""},
+ {91, 1145, L"Душанбе"},
+ {91, 3307, L"Кайраккум"},
+ {91, 3308, L"Худжанд"},
{91, 2329, lpwszOther},
- {119, 1146, L""},
- {119, 1147, L""},
+ {119, 1146, L"Бангкок"},
+ {119, 1147, L"Пхукет"},
{119, 2330, lpwszOther},
- {120, 1148, L""},
+ {120, 1148, L"Тайбэй"},
{120, 2331, lpwszOther},
- {132, 1149, L""},
+ {132, 1149, L"Дили"},
{132, 2332, lpwszOther},
- {90, 1150, L""},
- {90, 3079, L""},
+ {90, 1150, L"Ашхабад"},
+ {90, 3079, L"Безмеин"},
{90, 2333, lpwszOther},
- {77, 1152, L""},
- {77, 1153, L""},
- {77, 3080, L""},
- {77, 1151, L""},
- {77, 1154, L""},
- {77, 1155, L""},
+ {77, 1152, L"Анкара"},
+ {77, 1153, L"Анталия"},
+ {77, 3080, L"Бурса"},
+ {77, 1151, L"Мармарис"},
+ {77, 1154, L"Стамбул"},
+ {77, 1155, L"Трабзон"},
{77, 2334, lpwszOther},
- {93, 3362, L""},
- {93, 3137, L""},
- {93, 3273, L""},
- {93, 1156, L""},
- {93, 1157, L""},
- {93, 3167, L""},
- {93, 3347, L""},
- {93, 1158, L""},
- {93, 1159, L""},
- {93, 1160, L""},
- {93, 1161, L""},
- {93, 1162, L""},
- {93, 1163, L""},
- {93, 1164, L""},
+ {93, 3362, L"Алмалык"},
+ {93, 3137, L"Андижан"},
+ {93, 3273, L"Асака"},
+ {93, 1156, L"Ахангаран"},
+ {93, 1157, L"Бухара"},
+ {93, 3167, L"Джизак"},
+ {93, 3347, L"Кунград"},
+ {93, 1158, L"Навои"},
+ {93, 1159, L"Наманган"},
+ {93, 1160, L"Самарканд"},
+ {93, 1161, L"Ташкент"},
+ {93, 1162, L"Ургенч"},
+ {93, 1163, L"Фергана"},
+ {93, 1164, L"Чирчик"},
{93, 2335, lpwszOther},
- {121, 1165, L""},
- {121, 3319, L""},
+ {121, 1165, L"Манила"},
+ {121, 3319, L"Себу"},
{121, 2336, lpwszOther},
- {98, 1166, L""},
+ {98, 1166, L"Коломбо"},
{98, 2337, lpwszOther},
- {75, 3176, L""},
- {75, 3339, L""},
- {75, 1167, L""},
- {75, 1168, L""},
+ {75, 3176, L"Исесаки"},
+ {75, 3339, L"Корияма"},
+ {75, 1167, L"Саппоро"},
+ {75, 1168, L"Токио"},
{75, 2338, lpwszOther},
- {123, 1914, L""},
- {123, 2957, L" "},
- {123, 1915, L""},
- {123, 3331, L""},
- {123, 1916, L""},
- {123, 3001, L""},
- {123, 1917, L""},
- {123, 3217, L""},
- {123, 3064, L""},
- {123, 3020, L" "},
- {123, 1918, L""},
- {123, 3238, L""},
+ {123, 1914, L"Аделаида"},
+ {123, 2957, L"Блэк Рок"},
+ {123, 1915, L"Брисбен"},
+ {123, 3331, L"Горокан"},
+ {123, 1916, L"Канберра"},
+ {123, 3001, L"Лидкомб"},
+ {123, 1917, L"Мельбурн"},
+ {123, 3217, L"Норфолк"},
+ {123, 3064, L"Перт"},
+ {123, 3020, L"Санта Люсиа"},
+ {123, 1918, L"Сидней"},
+ {123, 3238, L"Энеабба"},
{123, 2339, lpwszOther},
- {454, 1192, L"-"},
+ {454, 1192, L"Паго-Паго"},
{454, 2366, lpwszOther},
- {124, 1919, L"-"},
+ {124, 1919, L"Порт-Вила"},
{124, 2340, lpwszOther},
- {453, 1193, L""},
+ {453, 1193, L"Аганья"},
{453, 2368, lpwszOther},
- {126, 1921, L""},
+ {126, 1921, L"Баирики"},
{126, 2342, lpwszOther},
- {127, 1922, L""},
+ {127, 1922, L"Маджуро"},
{127, 2343, lpwszOther},
- {128, 1923, L""},
+ {128, 1923, L"Паликир"},
{128, 2344, lpwszOther},
- {129, 1924, L""},
+ {129, 1924, L"Ярен"},
{129, 2345, lpwszOther},
- {130, 1925, L""},
- {130, 1926, L""},
- {130, 1928, L""},
- {130, 1929, L""},
- {130, 3235, L""},
- {130, 1927, L""},
- {130, 3323, L""},
+ {130, 1925, L"Веллингтон"},
+ {130, 1926, L"Гамильтон"},
+ {130, 1928, L"Данидин"},
+ {130, 1929, L"Крайстчерч"},
+ {130, 3235, L"Кромвель"},
+ {130, 1927, L"Окленд"},
+ {130, 3323, L"Тауранга"},
{130, 2346, lpwszOther},
- {131, 1930, L""},
+ {131, 1930, L"Корор"},
{131, 2347, lpwszOther},
- {133, 1931, L"-"},
+ {133, 1931, L"Порт-Морсби"},
{133, 2348, lpwszOther},
- {125, 1920, L""},
+ {125, 1920, L"Апиа"},
{125, 2341, lpwszOther},
- {134, 1932, L""},
+ {134, 1932, L"Хониара"},
{134, 2349, lpwszOther},
- {135, 1933, L""},
+ {135, 1933, L"Нукуалофа"},
{135, 2350, lpwszOther},
- {136, 1934, L""},
+ {136, 1934, L"Фунафути"},
{136, 2351, lpwszOther},
- {137, 1935, L""},
+ {137, 1935, L"Сува"},
{137, 2352, lpwszOther},
- {138, 3055, L""},
- {138, 3049, L""},
- {138, 3330, L""},
- {138, 1169, L""},
- {138, 3106, L""},
- {138, 1170, L""},
- {138, 1171, L""},
- {138, 1172, L""},
- {138, 3365, L""},
- {138, 1173, L""},
- {138, 3104, L""},
- {138, 3366, L""},
- {138, 1174, L""},
- {138, 2964, L""},
- {138, 3113, L""},
- {138, 1175, L""},
- {138, 2920, L"-"},
- {138, 2889, L"-"},
- {138, 1176, L""},
- {138, 2903, L" "},
- {138, 1177, L""},
- {138, 1178, L""},
- {138, 2946, L""},
- {138, 1179, L""},
- {138, 1180, L""},
+ {138, 3055, L"Барлингтон"},
+ {138, 3049, L"Броссард"},
+ {138, 3330, L"Бурнаби"},
+ {138, 1169, L"Ванкувер"},
+ {138, 3106, L"Ватерлоо"},
+ {138, 1170, L"Виннипег"},
+ {138, 1171, L"Галифакс"},
+ {138, 1172, L"Гамильтон"},
+ {138, 3365, L"Денвер"},
+ {138, 1173, L"Калгари"},
+ {138, 3104, L"Камлупс"},
+ {138, 3366, L"Каннингтон"},
+ {138, 1174, L"Квебек"},
+ {138, 2964, L"Кингстон"},
+ {138, 3113, L"Коквитлам"},
+ {138, 1175, L"Монреаль"},
+ {138, 2920, L"Ниагара-Фолс"},
+ {138, 2889, L"Норд-Йорк"},
+ {138, 1176, L"Оттава"},
+ {138, 2903, L"Порт Алберни"},
+ {138, 1177, L"Ричмонд"},
+ {138, 1178, L"Тимминс"},
+ {138, 2946, L"Торнхилл"},
+ {138, 1179, L"Торонто"},
+ {138, 1180, L"Эдмонтон"},
{138, 2353, lpwszOther},
- {139, 407, L""},
- {139, 426, L""},
- {139, 378, L""},
- {139, 412, L""},
- {139, 446, L""},
- {139, 434, L""},
- {139, 416, L""},
- {139, 428, L""},
- {139, 440, L""},
- {139, 352, L""},
- {139, 394, L""},
- {139, 374, L""},
- {139, 448, L""},
- {139, 390, L""},
- {139, 402, L""},
- {139, 396, L" "},
- {139, 370, L""},
- {139, 368, L""},
- {139, 444, L""},
- {139, 388, L""},
- {139, 408, L""},
- {139, 430, L""},
- {139, 358, L""},
- {139, 418, L""},
- {139, 354, L""},
- {139, 376, L""},
- {139, 414, L""},
- {139, 380, L""},
- {139, 372, L""},
- {139, 424, L""},
- {139, 348, L""},
- {139, 392, L""},
- {139, 386, L""},
- {139, 438, L""},
- {139, 362, L"-"},
- {139, 360, L"-"},
- {139, 432, L"-"},
- {139, 350, L"-"},
- {139, 366, L""},
- {139, 420, L""},
- {139, 442, L""},
- {139, 364, L""},
- {139, 450, L"-"},
- {139, 356, L"-"},
- {139, 382, L" "},
- {139, 398, L" "},
- {139, 410, L""},
- {139, 422, L""},
- {139, 406, L" "},
- {139, 404, L""},
- {139, 384, L" "},
- {139, 400, L" "},
- {139, 436, L""},
- {140, 1238, L"-"},
+ {139, 407, L"Вашингтон"},
+ {139, 426, L"Айдахо"},
+ {139, 378, L"Айова"},
+ {139, 412, L"Алабама"},
+ {139, 446, L"Аляска"},
+ {139, 434, L"Аризона"},
+ {139, 416, L"Арканзас"},
+ {139, 428, L"Вайоминг"},
+ {139, 440, L"Вашингтон"},
+ {139, 352, L"Вермонт"},
+ {139, 394, L"Виргиния"},
+ {139, 374, L"Висконсин"},
+ {139, 448, L"Гавайи"},
+ {139, 390, L"Делавер"},
+ {139, 402, L"Джорджия"},
+ {139, 396, L"Западная Виргиния"},
+ {139, 370, L"Иллинойс"},
+ {139, 368, L"Индиана"},
+ {139, 444, L"Калифорния"},
+ {139, 388, L"Канзас"},
+ {139, 408, L"Кентукки"},
+ {139, 430, L"Колорадо"},
+ {139, 358, L"Коннектикут"},
+ {139, 418, L"Луизиана"},
+ {139, 354, L"Массачусетс"},
+ {139, 376, L"Миннесота"},
+ {139, 414, L"Миссисипи"},
+ {139, 380, L"Миссури"},
+ {139, 372, L"Мичиган"},
+ {139, 424, L"Монтана"},
+ {139, 348, L"Мэн"},
+ {139, 392, L"Мэриленд"},
+ {139, 386, L"Небраска"},
+ {139, 438, L"Невада"},
+ {139, 362, L"Нью-Джерси"},
+ {139, 360, L"Нью-Йорк"},
+ {139, 432, L"Нью-Мексико"},
+ {139, 350, L"Нью-Хэмпшир"},
+ {139, 366, L"Огайо"},
+ {139, 420, L"Оклахома"},
+ {139, 442, L"Орегон"},
+ {139, 364, L"Пенсильвания"},
+ {139, 450, L"Пуэрто-Рико"},
+ {139, 356, L"Род-Айленд"},
+ {139, 382, L"Северная Дакота"},
+ {139, 398, L"Северная Каролина"},
+ {139, 410, L"Теннесси"},
+ {139, 422, L"Техас"},
+ {139, 406, L"Федеральный округ Колумбия"},
+ {139, 404, L"Флорида"},
+ {139, 384, L"Южная Дакота"},
+ {139, 400, L"Южная Каролина"},
+ {139, 436, L"Юта"},
+ {140, 1238, L"Сент-Джонс"},
{140, 2442, lpwszOther},
- {141, 1239, L"-"},
+ {141, 1239, L"Буэнос-Айрес"},
{141, 2441, lpwszOther},
- {142, 1240, L""},
+ {142, 1240, L"Нассау"},
{142, 2440, lpwszOther},
- {143, 1241, L""},
+ {143, 1241, L"Бриджтаун"},
{143, 2439, lpwszOther},
- {146, 1242, L""},
+ {146, 1242, L"Бельмопан"},
{146, 2438, lpwszOther},
- {144, 1243, L"-"},
+ {144, 1243, L"Ла-Пас"},
{144, 2437, lpwszOther},
- {145, 1244, L""},
- {145, 3094, L" "},
- {145, 1245, L"--"},
- {145, 1246, L"-"},
+ {145, 1244, L"Бразилиа"},
+ {145, 3094, L"Пассо Фундо"},
+ {145, 1245, L"Рио-де-Жанейро"},
+ {145, 1246, L"Сан-Паулу"},
{145, 2436, lpwszOther},
- {147, 1247, L""},
+ {147, 1247, L"Каракас"},
{147, 2435, lpwszOther},
- {452, 1190, L"-"},
+ {452, 1190, L"Шарлотта-Амалия"},
{452, 2364, lpwszOther},
- {149, 1248, L"--"},
+ {149, 1248, L"Порт-о-Пренс"},
{149, 2434, lpwszOther},
- {148, 1249, L""},
+ {148, 1249, L"Джоржтаун"},
{148, 2433, lpwszOther},
- {173, 1250, L""},
+ {173, 1250, L"Гватемала"},
{173, 2432, lpwszOther},
- {150, 1251, L""},
+ {150, 1251, L"Тегусигальпа"},
{150, 2431, lpwszOther},
- {151, 1252, L"-"},
+ {151, 1252, L"Сент-Джорджес"},
{151, 2430, lpwszOther},
- {152, 1253, L""},
+ {152, 1253, L"Уманак"},
{152, 2429, lpwszOther},
- {153, 1254, L""},
+ {153, 1254, L"Розо"},
{153, 2428, lpwszOther},
- {154, 1255, L"-"},
+ {154, 1255, L"Санто-Доминго"},
{154, 2427, lpwszOther},
- {155, 1256, L""},
+ {155, 1256, L"Богота"},
{155, 2426, lpwszOther},
- {156, 1257, L"-"},
+ {156, 1257, L"Сан-Хосе"},
{156, 2425, lpwszOther},
- {157, 1258, L""},
+ {157, 1258, L"Гавана"},
{157, 2424, lpwszOther},
- {158, 1259, L""},
- {158, 1260, L""},
+ {158, 1259, L"Акапулько"},
+ {158, 1260, L"Мехико"},
{158, 2423, lpwszOther},
- {159, 1261, L""},
+ {159, 1261, L"Манагуа"},
{159, 2422, lpwszOther},
- {160, 1262, L""},
+ {160, 1262, L"Панама"},
{160, 2421, lpwszOther},
- {161, 1263, L""},
+ {161, 1263, L"Асунсьон"},
{161, 2420, lpwszOther},
- {162, 1264, L""},
+ {162, 1264, L"Лима"},
{162, 2419, lpwszOther},
- {163, 1265, L"-"},
+ {163, 1265, L"Сан-Сальвадор"},
{163, 2418, lpwszOther},
- {164, 1266, L""},
+ {164, 1266, L"Кингстаун"},
{164, 2417, lpwszOther},
- {165, 1267, L""},
+ {165, 1267, L"Бастер"},
{165, 2416, lpwszOther},
- {166, 1268, L""},
+ {166, 1268, L"Кастри"},
{166, 2415, lpwszOther},
- {167, 1269, L""},
+ {167, 1269, L"Парамарибо"},
{167, 2414, lpwszOther},
- {168, 1270, L"--"},
+ {168, 1270, L"Порт-оф-Спейн"},
{168, 2413, lpwszOther},
- {169, 1271, L""},
+ {169, 1271, L"Монтевидео"},
{169, 2412, lpwszOther},
- {170, 1272, L""},
+ {170, 1272, L"Сантьяго"},
{170, 2411, lpwszOther},
- {171, 1273, L""},
- {171, 1274, L""},
+ {171, 1273, L"Гуаякиль"},
+ {171, 1274, L"Кито"},
{171, 2410, lpwszOther},
- {172, 1275, L""},
+ {172, 1275, L"Кингстон"},
{172, 2409, lpwszOther},
- {174, 1854, L""},
+ {174, 1854, L"Алжир"},
{174, 2495, lpwszOther},
- {175, 1855, L""},
+ {175, 1855, L"Луанда"},
{175, 2494, lpwszOther},
- {176, 1856, L""},
- {176, 1857, L"-"},
+ {176, 1856, L"Котону"},
+ {176, 1857, L"Порто-Ново"},
{176, 2493, lpwszOther},
- {177, 1858, L""},
+ {177, 1858, L"Габороне"},
{177, 2492, lpwszOther},
- {178, 1859, L""},
+ {178, 1859, L"Уагадугу"},
{178, 2491, lpwszOther},
- {179, 1860, L""},
+ {179, 1860, L"Бужумбуру"},
{179, 2490, lpwszOther},
- {180, 1861, L""},
+ {180, 1861, L"Либревиль"},
{180, 2489, lpwszOther},
- {181, 1862, L""},
+ {181, 1862, L"Банжул"},
{181, 2488, lpwszOther},
- {182, 1863, L""},
+ {182, 1863, L"Аккра"},
{182, 2487, lpwszOther},
- {183, 1864, L""},
+ {183, 1864, L"Конакри"},
{183, 2486, lpwszOther},
- {184, 1865, L""},
+ {184, 1865, L"Бисау"},
{184, 2485, lpwszOther},
- {185, 1866, L""},
+ {185, 1866, L"Джибути"},
{185, 2484, lpwszOther},
- {186, 3312, L""},
- {186, 1867, L""},
- {186, 1868, L""},
+ {186, 3312, L"Дахаб"},
+ {186, 1867, L"Каир"},
+ {186, 1868, L"Хургада"},
{186, 2483, lpwszOther},
- {187, 1869, L""},
+ {187, 1869, L"Лусака"},
{187, 2482, lpwszOther},
- {23, 1870, L""},
+ {23, 1870, L"Хараре"},
{23, 2481, lpwszOther},
- {188, 1871, L""},
+ {188, 1871, L"Прая"},
{188, 2480, lpwszOther},
- {189, 1872, L""},
+ {189, 1872, L"Яунде"},
{189, 2479, lpwszOther},
- {190, 1873, L""},
+ {190, 1873, L"Найроби"},
{190, 2478, lpwszOther},
- {191, 1874, L""},
+ {191, 1874, L"Морони"},
{191, 2477, lpwszOther},
- {193, 1875, L""},
+ {193, 1875, L"Киншаса"},
{193, 2476, lpwszOther},
- {192, 1876, L""},
+ {192, 1876, L"Браззавиль"},
{192, 2475, lpwszOther},
- {194, 1877, L""},
+ {194, 1877, L"Ямусукро"},
{194, 2474, lpwszOther},
- {195, 1878, L""},
+ {195, 1878, L"Масеру"},
{195, 2473, lpwszOther},
- {196, 1879, L""},
+ {196, 1879, L"Монровия"},
{196, 2472, lpwszOther},
- {197, 1880, L""},
+ {197, 1880, L"Триполи"},
{197, 2471, lpwszOther},
- {198, 1881, L"-"},
+ {198, 1881, L"Порт-Луи"},
{198, 2470, lpwszOther},
- {199, 1882, L""},
+ {199, 1882, L"Нуакшот"},
{199, 2469, lpwszOther},
- {200, 1883, L""},
+ {200, 1883, L"Антананариву"},
{200, 2468, lpwszOther},
- {201, 1884, L""},
+ {201, 1884, L"Лилонгве"},
{201, 2467, lpwszOther},
- {202, 1885, L""},
+ {202, 1885, L"Бамако"},
{202, 2466, lpwszOther},
- {203, 1886, L""},
- {203, 1887, L""},
+ {203, 1886, L"Агадир"},
+ {203, 1887, L"Рабат"},
{203, 2465, lpwszOther},
- {204, 1888, L""},
+ {204, 1888, L"Мапуту"},
{204, 2464, lpwszOther},
- {205, 1889, L""},
+ {205, 1889, L"Виндхук"},
{205, 2463, lpwszOther},
- {206, 1890, L""},
+ {206, 1890, L"Ниамей"},
{206, 2462, lpwszOther},
- {207, 1891, L""},
+ {207, 1891, L"Абуджа"},
{207, 2461, lpwszOther},
- {208, 1892, L""},
+ {208, 1892, L"Кигали"},
{208, 2460, lpwszOther},
- {209, 1893, L"-"},
+ {209, 1893, L"Сан-Томе"},
{209, 2459, lpwszOther},
- {210, 1894, L""},
+ {210, 1894, L"Мбабане"},
{210, 2458, lpwszOther},
- {211, 1895, L""},
+ {211, 1895, L"Виктория"},
{211, 2457, lpwszOther},
- {212, 1896, L""},
+ {212, 1896, L"Дакар"},
{212, 2456, lpwszOther},
- {213, 1897, L""},
+ {213, 1897, L"Могадишо"},
{213, 2455, lpwszOther},
- {214, 1898, L""},
+ {214, 1898, L"Хартум"},
{214, 2454, lpwszOther},
- {215, 1899, L""},
+ {215, 1899, L"Фритаун"},
{215, 2453, lpwszOther},
- {216, 1900, L"--"},
- {216, 1901, L""},
+ {216, 1900, L"Дар-эс-Салам"},
+ {216, 1901, L"Додома"},
{216, 2452, lpwszOther},
- {217, 1902, L""},
+ {217, 1902, L"Ломе"},
{217, 2451, lpwszOther},
- {218, 1903, L""},
+ {218, 1903, L"Тунис"},
{218, 2450, lpwszOther},
- {219, 1904, L""},
+ {219, 1904, L"Кампала"},
{219, 2449, lpwszOther},
- {220, 1905, L""},
+ {220, 1905, L"Банги"},
{220, 2448, lpwszOther},
- {222, 1906, L""},
+ {222, 1906, L"Нджамена"},
{222, 2447, lpwszOther},
- {223, 1907, L""},
+ {223, 1907, L"Малабо"},
{223, 2446, lpwszOther},
- {221, 1908, L""},
+ {221, 1908, L"Асмэра"},
{221, 2445, lpwszOther},
- {224, 1909, L"-"},
+ {224, 1909, L"Аддис-Абеба"},
{224, 2444, lpwszOther},
- {225, 1910, L""},
- {225, 1913, L""},
- {225, 1912, L""},
- {225, 3033, L""},
- {225, 1911, L""},
+ {225, 1910, L"Дурбан"},
+ {225, 1913, L"Йоханнесбург"},
+ {225, 1912, L"Кейптаун"},
+ {225, 3033, L"Пайнтаун"},
+ {225, 1911, L"Претория"},
{225, 2443, lpwszOther},
- {39, 314, L""},
- {39, 315, L" ."},
- {39, 316, L" ."},
- {39, 317, L" ."},
- {39, 318, L" ."},
- {39, 319, L" ."},
- {39, 320, L" ."},
- {39, 321, L" ."},
- {39, 322, L"- ."},
- {39, 323, L" ."},
- {39, 324, L" ."},
- {39, 325, L""},
- {39, 326, L" ."},
- {39, 327, L" ."},
- {39, 328, L" ."},
- {39, 329, L" ."},
- {39, 330, L" ."},
- {39, 331, L" ."},
- {39, 332, L" ."},
- {39, 333, L" ."},
- {39, 334, L" ."},
- {39, 335, L" ."},
- {39, 336, L" ."},
- {39, 337, L" ."},
- {39, 338, L" ."},
- {39, 339, L" ."},
- {40, 602, L" "},
- {40, 604, L""},
- {40, 603, L""},
- {40, 608, L""},
- {40, 606, L""},
- {40, 3099, L"--"},
- {40, 605, L""},
- {40, 3174, L""},
- {40, 609, L""},
- {40, 607, L""},
- {40, 610, L""},
- {40, 611, L""},
+ {39, 314, L"Киев"},
+ {39, 315, L"Винницкая обл."},
+ {39, 316, L"Волынская обл."},
+ {39, 317, L"Днепропетровская обл."},
+ {39, 318, L"Донецкая обл."},
+ {39, 319, L"Житомирская обл."},
+ {39, 320, L"Закарпатская обл."},
+ {39, 321, L"Запорожская обл."},
+ {39, 322, L"Ивано-Франковская обл."},
+ {39, 323, L"Киевская обл."},
+ {39, 324, L"Кировоградская обл."},
+ {39, 325, L"Крым"},
+ {39, 326, L"Луганская обл."},
+ {39, 327, L"Львовская обл."},
+ {39, 328, L"Николаевская обл."},
+ {39, 329, L"Одесская обл."},
+ {39, 330, L"Полтавская обл."},
+ {39, 331, L"Ровенская обл."},
+ {39, 332, L"Сумская обл."},
+ {39, 333, L"Тернопольская обл."},
+ {39, 334, L"Харьковская обл."},
+ {39, 335, L"Херсонская обл."},
+ {39, 336, L"Хмельницкая обл."},
+ {39, 337, L"Черкасская обл."},
+ {39, 338, L"Черниговская обл."},
+ {39, 339, L"Черновицкая обл."},
+ {40, 602, L"Бад Халл"},
+ {40, 604, L"Брегенц"},
+ {40, 603, L"Вена"},
+ {40, 608, L"Грац"},
+ {40, 606, L"Зальцбург"},
+ {40, 3099, L"Зель-ам-Зее"},
+ {40, 605, L"Инсбрук"},
+ {40, 3174, L"Кирхберг"},
+ {40, 609, L"Клагенфурт"},
+ {40, 607, L"Линц"},
+ {40, 610, L"Обдах"},
+ {40, 611, L"Щтубайтал"},
{40, 2541, lpwszOther},
- {32, 612, L""},
+ {32, 612, L"Тирана"},
{32, 2540, lpwszOther},
- {33, 613, L"--"},
+ {33, 613, L"Андорра-ла-Велья"},
{33, 2539, lpwszOther},
- {340, 341, L""},
- {340, 342, L" ."},
- {340, 343, L" ."},
- {340, 344, L" ."},
- {340, 345, L" ."},
- {340, 346, L" ."},
- {340, 347, L" ."},
- {38, 760, L""},
- {38, 767, L""},
- {38, 762, L""},
- {38, 761, L""},
- {38, 763, L""},
- {38, 769, L""},
- {38, 765, L""},
- {38, 764, L""},
- {38, 3117, L""},
- {38, 766, L""},
- {38, 768, L""},
+ {340, 341, L"Минск"},
+ {340, 342, L"Брестская обл."},
+ {340, 343, L"Витебская обл."},
+ {340, 344, L"Гомельская обл."},
+ {340, 345, L"Гродненская обл."},
+ {340, 346, L"Минская обл."},
+ {340, 347, L"Могилевская обл."},
+ {38, 760, L"Антверпен"},
+ {38, 767, L"Арлон"},
+ {38, 762, L"Брюгге"},
+ {38, 761, L"Брюссель"},
+ {38, 763, L"Гент"},
+ {38, 769, L"Лувен"},
+ {38, 765, L"Льеж"},
+ {38, 764, L"Монс"},
+ {38, 3117, L"Мортсель"},
+ {38, 766, L"Намюр"},
+ {38, 768, L"Хасселт"},
{38, 2532, lpwszOther},
- {41, 3098, L""},
- {41, 792, L""},
- {41, 770, L""},
- {41, 771, L""},
- {41, 773, L""},
- {41, 776, L"-"},
- {41, 788, L""},
- {41, 789, L""},
- {41, 796, L""},
- {41, 777, L""},
- {41, 781, L""},
- {41, 786, L""},
- {41, 791, L""},
- {41, 793, L""},
- {41, 795, L""},
- {41, 787, L""},
- {41, 790, L""},
- {41, 3133, L""},
- {41, 794, L""},
- {41, 782, L""},
- {41, 780, L""},
- {41, 779, L""},
- {41, 774, L""},
- {41, 784, L""},
- {41, 772, L""},
- {41, 775, L""},
- {41, 3116, L""},
- {41, 785, L""},
- {41, 778, L""},
- {41, 783, L""},
+ {41, 3098, L"Банско"},
+ {41, 792, L"Благоевград"},
+ {41, 770, L"Бургас"},
+ {41, 771, L"Бяла"},
+ {41, 773, L"Варна"},
+ {41, 776, L"Велико-Тырново"},
+ {41, 788, L"Видин"},
+ {41, 789, L"Враца"},
+ {41, 796, L"Габрово"},
+ {41, 777, L"Димитровград"},
+ {41, 781, L"Каварна"},
+ {41, 786, L"Кырджали"},
+ {41, 791, L"Кюстендил"},
+ {41, 793, L"Лазарджик"},
+ {41, 795, L"Ловеч"},
+ {41, 787, L"Михайловград"},
+ {41, 790, L"Перник"},
+ {41, 3133, L"Пирдоп"},
+ {41, 794, L"Плевен"},
+ {41, 782, L"Пловдив"},
+ {41, 780, L"Разград"},
+ {41, 779, L"Русе"},
+ {41, 774, L"Силистра"},
+ {41, 784, L"Сливен"},
+ {41, 772, L"София"},
+ {41, 775, L"Толбухин"},
+ {41, 3116, L"Тырново"},
+ {41, 785, L"Хасково"},
+ {41, 778, L"Шумен"},
+ {41, 783, L"Ямбол"},
{41, 2531, lpwszOther},
- {42, 797, L"-"},
- {42, 799, L""},
- {42, 798, L""},
- {42, 800, L""},
+ {42, 797, L"Баня-Лука"},
+ {42, 799, L"Зеница"},
+ {42, 798, L"Сараево"},
+ {42, 800, L"Тузла"},
{42, 2530, lpwszOther},
- {45, 802, L""},
- {45, 3075, L""},
- {45, 801, L""},
- {45, 804, L""},
- {45, 803, L""},
- {45, 805, L""},
- {45, 3168, L""},
- {45, 806, L""},
- {45, 807, L""},
- {45, 808, L""},
- {45, 809, L""},
- {45, 3131, L""},
- {45, 810, L""},
- {45, 3342, L""},
- {45, 811, L""},
- {45, 812, L""},
- {45, 813, L""},
- {45, 814, L""},
- {45, 3089, L""},
- {45, 815, L""},
- {45, 816, L""},
- {45, 817, L""},
- {45, 818, L""},
- {45, 819, L""},
- {45, 820, L""},
- {45, 2976, L""},
- {45, 2988, L""},
- {45, 821, L""},
- {45, 3088, L""},
- {45, 822, L""},
- {45, 823, L""},
- {45, 824, L""},
- {45, 825, L""},
- {45, 3343, L""},
- {45, 2867, L""},
- {45, 2986, L"-"},
- {45, 826, L""},
- {45, 3063, L""},
- {45, 827, L""},
- {45, 3140, L""},
- {45, 828, L""},
- {45, 829, L""},
- {45, 830, L""},
+ {45, 802, L"Абердин"},
+ {45, 3075, L"Айслворт"},
+ {45, 801, L"Алнвик"},
+ {45, 804, L"Бидефорд"},
+ {45, 803, L"Бирмингем"},
+ {45, 805, L"Блоксвич"},
+ {45, 3168, L"Бостон"},
+ {45, 806, L"Брайтон"},
+ {45, 807, L"Бредфорд"},
+ {45, 808, L"Бристоль"},
+ {45, 809, L"Вилленхолл"},
+ {45, 3131, L"Воррингтон"},
+ {45, 810, L"Вудбридж"},
+ {45, 3342, L"Гилфорд"},
+ {45, 811, L"Глазго"},
+ {45, 812, L"Дадли"},
+ {45, 813, L"Дарем"},
+ {45, 814, L"Дуглас"},
+ {45, 3089, L"Кардиф"},
+ {45, 815, L"Кембридж"},
+ {45, 816, L"Кентербери"},
+ {45, 817, L"Ливерпуль"},
+ {45, 818, L"Лидс"},
+ {45, 819, L"Лондон"},
+ {45, 820, L"Манчестер"},
+ {45, 2976, L"Митчем"},
+ {45, 2988, L"Мэйденхед"},
+ {45, 821, L"Ноттингем"},
+ {45, 3088, L"Ньюпорт"},
+ {45, 822, L"Оксфорд"},
+ {45, 823, L"Плимут"},
+ {45, 824, L"Портсмут"},
+ {45, 825, L"Престон"},
+ {45, 3343, L"Райд"},
+ {45, 2867, L"Ридинг"},
+ {45, 2986, L"Сент-Албанс"},
+ {45, 826, L"Стаффорд"},
+ {45, 3063, L"Стокпорт"},
+ {45, 827, L"Уэймут"},
+ {45, 3140, L"Челтенхэм"},
+ {45, 828, L"Честер"},
+ {45, 829, L"Шеффилд"},
+ {45, 830, L"Эдинбург"},
{45, 2529, lpwszOther},
- {44, 831, L""},
- {44, 832, L""},
- {44, 836, L""},
- {44, 835, L""},
- {44, 834, L""},
- {44, 833, L""},
+ {44, 831, L"Будапешт"},
+ {44, 832, L"Геделле"},
+ {44, 836, L"Дебрецен"},
+ {44, 835, L"Мишкольц"},
+ {44, 834, L"Сегед"},
+ {44, 833, L"Шиофок"},
{44, 2528, lpwszOther},
- {46, 3007, L""},
- {46, 837, L""},
- {46, 838, L"-"},
- {46, 3371, L""},
- {46, 839, L"-"},
- {46, 840, L""},
- {46, 841, L""},
- {46, 3163, L""},
- {46, 842, L""},
- {46, 843, L""},
- {46, 3015, L""},
- {46, 844, L""},
- {46, 2921, L""},
- {46, 845, L""},
- {46, 846, L""},
- {46, 847, L""},
- {46, 848, L""},
- {46, 849, L""},
- {46, 3010, L""},
- {46, 850, L""},
- {46, 851, L""},
- {46, 3072, L""},
- {46, 852, L""},
- {46, 853, L""},
- {46, 854, L""},
- {46, 855, L""},
- {46, 3082, L""},
- {46, 3309, L""},
- {46, 856, L""},
- {46, 857, L""},
- {46, 3138, L""},
- {46, 858, L""},
- {46, 859, L""},
- {46, 2872, L""},
- {46, 2965, L""},
- {46, 3135, L""},
- {46, 3156, L""},
- {46, 3192, L""},
- {46, 860, L""},
- {46, 861, L""},
- {46, 2864, L""},
- {46, 862, L""},
- {46, 3009, L""},
- {46, 2993, L""},
- {46, 863, L""},
- {46, 864, L""},
- {46, 865, L""},
- {46, 866, L""},
- {46, 3191, L""},
- {46, 2974, L"-"},
- {46, 3127, L""},
- {46, 867, L""},
- {46, 868, L""},
- {46, 869, L"--"},
- {46, 3373, L""},
- {46, 3313, L""},
- {46, 870, L""},
- {46, 3045, L""},
- {46, 2906, L""},
+ {46, 3007, L"Аахен"},
+ {46, 837, L"Аугсбург"},
+ {46, 838, L"Баден-Баден"},
+ {46, 3371, L"Бамберг"},
+ {46, 839, L"Бергиш-Гладбах"},
+ {46, 840, L"Берлин"},
+ {46, 841, L"Билефельд"},
+ {46, 3163, L"Бовенден"},
+ {46, 842, L"Бонн"},
+ {46, 843, L"Браденбург"},
+ {46, 3015, L"Брауншвейг"},
+ {46, 844, L"Бремен"},
+ {46, 2921, L"Варштайн"},
+ {46, 845, L"Веймар"},
+ {46, 846, L"Вупперталь"},
+ {46, 847, L"Гамбург"},
+ {46, 848, L"Ганновер"},
+ {46, 849, L"Гарделеген"},
+ {46, 3010, L"Гейдельберг"},
+ {46, 850, L"Гота"},
+ {46, 851, L"Дармштадт"},
+ {46, 3072, L"Дессау"},
+ {46, 852, L"Детмольд"},
+ {46, 853, L"Дортмунд"},
+ {46, 854, L"Дрезден"},
+ {46, 855, L"Дюссельдорф"},
+ {46, 3082, L"Иффецхайм"},
+ {46, 3309, L"Кассел"},
+ {46, 856, L"Кельн"},
+ {46, 857, L"Киль"},
+ {46, 3138, L"Кобленц"},
+ {46, 858, L"Крефельд"},
+ {46, 859, L"Лейпциг"},
+ {46, 2872, L"Лимбург"},
+ {46, 2965, L"Линген"},
+ {46, 3135, L"Любек"},
+ {46, 3156, L"Мангейм"},
+ {46, 3192, L"Меерсбург"},
+ {46, 860, L"Мюнстер"},
+ {46, 861, L"Мюнхен"},
+ {46, 2864, L"Нойштадт"},
+ {46, 862, L"Нюрнберг"},
+ {46, 3009, L"Оффенбург"},
+ {46, 2993, L"Падерборн"},
+ {46, 863, L"Равенсбург"},
+ {46, 864, L"Регенсбург"},
+ {46, 865, L"Рейнен"},
+ {46, 866, L"Росток"},
+ {46, 3191, L"Саарбрюкен"},
+ {46, 2974, L"Санкт-Августин"},
+ {46, 3127, L"Тюринген"},
+ {46, 867, L"Фрайберг"},
+ {46, 868, L"Фрайбург"},
+ {46, 869, L"Франкфурт-на-Майне"},
+ {46, 3373, L"Хемнитц"},
+ {46, 3313, L"Хильден"},
+ {46, 870, L"Штутгарт"},
+ {46, 3045, L"Эрланген"},
+ {46, 2906, L"Эшборн"},
{46, 2527, lpwszOther},
- {48, 871, L""},
- {48, 873, L""},
- {48, 3147, L""},
- {48, 872, L""},
- {48, 3178, L""},
+ {48, 871, L"Афины"},
+ {48, 873, L"Ираклион"},
+ {48, 3147, L"Корфу"},
+ {48, 872, L"Салоники"},
+ {48, 3178, L"Халкидики"},
{48, 2526, lpwszOther},
- {49, 3006, L""},
- {49, 874, L""},
- {49, 875, L""},
- {49, 3285, L""},
- {49, 876, L""},
- {49, 3126, L""},
+ {49, 3006, L"Архус"},
+ {49, 874, L"Копенгаген"},
+ {49, 875, L"Оденсе"},
+ {49, 3285, L"Ольборг"},
+ {49, 876, L"Сванеке"},
+ {49, 3126, L"Скиве"},
{49, 2525, lpwszOther},
- {50, 3377, L""},
- {50, 3067, L""},
- {50, 877, L""},
- {50, 3065, L""},
- {50, 3066, L""},
- {50, 878, L""},
- {50, 3069, L""},
- {50, 3068, L""},
+ {50, 3377, L"Виклоу"},
+ {50, 3067, L"Голвей"},
+ {50, 877, L"Дублин"},
+ {50, 3065, L"Килларней"},
+ {50, 3066, L"Корк"},
+ {50, 878, L"Лимерик"},
+ {50, 3069, L"Нейс"},
+ {50, 3068, L"Типперэри"},
{50, 2524, lpwszOther},
- {51, 879, L""},
+ {51, 879, L"Рейкьявик"},
{51, 2523, lpwszOther},
- {34, 880, L""},
- {34, 3125, L""},
- {34, 881, L""},
- {34, 890, L""},
- {34, 3076, L""},
- {34, 882, L""},
- {34, 3070, L""},
- {34, 888, L""},
- {34, 886, L""},
- {34, 891, L"-"},
- {34, 3310, L" "},
- {34, 883, L""},
- {34, 884, L""},
- {34, 885, L""},
- {34, 892, L""},
- {34, 3179, L" "},
- {34, 3177, L"-"},
- {34, 3289, L"---"},
- {34, 889, L""},
- {34, 887, L""},
- {34, 893, L""},
+ {34, 880, L"Аликанте"},
+ {34, 3125, L"Альмерия"},
+ {34, 881, L"Барселона"},
+ {34, 890, L"Бильбао"},
+ {34, 3076, L"Бланес"},
+ {34, 882, L"Валенсия"},
+ {34, 3070, L"Ибица"},
+ {34, 888, L"Кадис"},
+ {34, 886, L"Картахена"},
+ {34, 891, L"Ла-Корунья"},
+ {34, 3310, L"Лорет де Мар"},
+ {34, 883, L"Мадрид"},
+ {34, 884, L"Малага"},
+ {34, 885, L"Марбелья"},
+ {34, 892, L"Овьедо"},
+ {34, 3179, L"Пальма де Майорка"},
+ {34, 3177, L"Сан-Агустин"},
+ {34, 3289, L"Санта-Крус-де-Тенерифе"},
+ {34, 889, L"Сарагоса"},
+ {34, 887, L"Севилья"},
+ {34, 893, L"Хихон"},
{34, 2522, lpwszOther},
- {52, 3318, L""},
- {52, 3278, L""},
- {52, 906, L""},
- {52, 894, L""},
- {52, 895, L""},
- {52, 905, L""},
- {52, 896, L""},
- {52, 897, L""},
- {52, 3369, L""},
- {52, 3327, L""},
- {52, 898, L""},
- {52, 899, L""},
- {52, 907, L""},
- {52, 908, L""},
- {52, 900, L""},
- {52, 901, L""},
- {52, 3368, L"-"},
- {52, 3384, L""},
- {52, 3252, L""},
- {52, 902, L""},
- {52, 903, L""},
- {52, 3130, L""},
- {52, 904, L""},
+ {52, 3318, L"Аоста"},
+ {52, 3278, L"Беллариа"},
+ {52, 906, L"Болонья"},
+ {52, 894, L"Брешиа"},
+ {52, 895, L"Венеция"},
+ {52, 905, L"Верона"},
+ {52, 896, L"Генуя"},
+ {52, 897, L"Лекко"},
+ {52, 3369, L"Ливорно"},
+ {52, 3327, L"Марсала"},
+ {52, 898, L"Милан"},
+ {52, 899, L"Модена"},
+ {52, 907, L"Неаполь"},
+ {52, 908, L"Перуджа"},
+ {52, 900, L"Пиза"},
+ {52, 901, L"Рим"},
+ {52, 3368, L"Сан-Ремо"},
+ {52, 3384, L"Сиракуза"},
+ {52, 3252, L"Терамо"},
+ {52, 902, L"Триест"},
+ {52, 903, L"Турин"},
+ {52, 3130, L"Фано"},
+ {52, 904, L"Флоренция"},
{52, 2521, lpwszOther},
- {53, 2939, L""},
- {53, 3054, L""},
- {53, 909, L""},
- {53, 2934, L""},
- {53, 913, L""},
- {53, 2935, L""},
- {53, 912, L""},
- {53, 2905, L""},
- {53, 911, L""},
- {53, 2936, L""},
- {53, 2937, L""},
- {53, 910, L""},
+ {53, 2939, L"Айзкраукле"},
+ {53, 3054, L"Валка"},
+ {53, 909, L"Даугавпилс"},
+ {53, 2934, L"Екабпилс"},
+ {53, 913, L"Елгава"},
+ {53, 2935, L"Кокнесе"},
+ {53, 912, L"Лиепая"},
+ {53, 2905, L"Резекне"},
+ {53, 911, L"Рига"},
+ {53, 2936, L"Саласпилс"},
+ {53, 2937, L"Смилтене"},
+ {53, 910, L"Юрмала"},
{53, 2520, lpwszOther},
- {54, 914, L""},
- {54, 915, L""},
- {54, 916, L""},
- {54, 918, L""},
- {54, 919, L""},
- {54, 3173, L""},
- {54, 917, L""},
+ {54, 914, L"Вильнюс"},
+ {54, 915, L"Висагинас"},
+ {54, 916, L"Каунас"},
+ {54, 918, L"Клайпеда"},
+ {54, 919, L"Паланга"},
+ {54, 3173, L"Пеневежис"},
+ {54, 917, L"Шауляй"},
{54, 2519, lpwszOther},
- {55, 920, L""},
+ {55, 920, L"Вадуц"},
{55, 2518, lpwszOther},
- {56, 3376, L""},
- {56, 921, L""},
+ {56, 3376, L"Бетцдорф"},
+ {56, 921, L"Люксембург"},
{56, 2517, lpwszOther},
- {57, 3142, L""},
- {57, 922, L""},
+ {57, 3142, L"Битола"},
+ {57, 922, L"Скопье"},
{57, 2516, lpwszOther},
- {58, 923, L""},
- {58, 3154, L""},
- {58, 924, L""},
+ {58, 923, L"Валлетта"},
+ {58, 3154, L"Мзида"},
+ {58, 924, L"Слима"},
{58, 2515, lpwszOther},
- {59, 925, L""},
- {59, 926, L""},
- {59, 3234, L""},
- {59, 3275, L""},
- {59, 927, L""},
- {59, 3321, L""},
- {59, 928, L""},
- {59, 929, L""},
- {59, 3281, L"-"},
+ {59, 925, L"Бельцы"},
+ {59, 926, L"Бендеры"},
+ {59, 3234, L"Дубоссары"},
+ {59, 3275, L"Кахул"},
+ {59, 927, L"Кишинев"},
+ {59, 3321, L"Резина"},
+ {59, 928, L"Рыбница"},
+ {59, 929, L"Тирасполь"},
+ {59, 3281, L"Чадыр-Лунга"},
{59, 2514, lpwszOther},
- {36, 930, L"-"},
+ {36, 930, L"Монте-Карло"},
{36, 2513, lpwszOther},
- {60, 931, L""},
- {60, 933, L""},
- {60, 932, L""},
- {60, 934, L""},
- {60, 935, L""},
- {60, 2977, L""},
- {60, 3030, L""},
- {60, 3091, L""},
- {60, 936, L""},
- {60, 937, L""},
- {60, 3044, L""},
- {60, 3380, L""},
+ {60, 931, L"Амстердам"},
+ {60, 933, L"Бреда"},
+ {60, 932, L"Гаага"},
+ {60, 934, L"Гауда"},
+ {60, 935, L"Делфт"},
+ {60, 2977, L"Донген"},
+ {60, 3030, L"Зволле"},
+ {60, 3091, L"Ниймеген"},
+ {60, 936, L"Роттердам"},
+ {60, 937, L"Утрехт"},
+ {60, 3044, L"Эйндховен"},
+ {60, 3380, L"Эншеде"},
{60, 2512, lpwszOther},
- {61, 3190, L""},
- {61, 2857, L""},
- {61, 938, L""},
- {61, 3355, L""},
- {61, 939, L""},
+ {61, 3190, L"Кристиансанд"},
+ {61, 2857, L"Лиллехаммер"},
+ {61, 938, L"Осло"},
+ {61, 3355, L"Ставангер"},
+ {61, 939, L"Тронхейм"},
{61, 2511, lpwszOther},
- {62, 940, L""},
- {62, 941, L""},
- {62, 3164, L""},
- {62, 942, L""},
- {62, 943, L""},
- {62, 3237, L""},
- {62, 3165, L" "},
- {62, 944, L""},
- {62, 945, L""},
- {62, 3008, L""},
- {62, 3150, L""},
- {62, 946, L""},
- {62, 947, L""},
- {62, 948, L""},
- {62, 2958, L""},
+ {62, 940, L"Белосток"},
+ {62, 941, L"Варшава"},
+ {62, 3164, L"Вроцлав"},
+ {62, 942, L"Гданьск"},
+ {62, 943, L"Гливице"},
+ {62, 3237, L"Закопане"},
+ {62, 3165, L"Зелена Гура"},
+ {62, 944, L"Катовице"},
+ {62, 945, L"Краков"},
+ {62, 3008, L"Лодзь"},
+ {62, 3150, L"Ольштын"},
+ {62, 946, L"Познань"},
+ {62, 947, L"Радом"},
+ {62, 948, L"Сопот"},
+ {62, 2958, L"Тыхы"},
{62, 2510, lpwszOther},
- {35, 949, L""},
- {35, 950, L""},
+ {35, 949, L"Лиссабон"},
+ {35, 950, L"Порто"},
{35, 2509, lpwszOther},
- {63, 952, L""},
- {63, 951, L""},
- {63, 954, L""},
- {63, 955, L""},
- {63, 953, L""},
+ {63, 952, L"Брашов"},
+ {63, 951, L"Бухарест"},
+ {63, 954, L"Констанца"},
+ {63, 955, L"Плоешти"},
+ {63, 953, L"Яссы"},
{63, 2508, lpwszOther},
- {64, 956, L"-"},
+ {64, 956, L"Сан-Марино"},
{64, 2507, lpwszOther},
- {74, 957, L""},
- {74, 960, L""},
- {74, 958, L"-"},
- {74, 959, L""},
+ {74, 957, L"Белград"},
+ {74, 960, L"Ниш"},
+ {74, 958, L"Нови-Сад"},
+ {74, 959, L"Сараево"},
{74, 2506, lpwszOther},
- {65, 961, L""},
- {65, 962, L""},
- {65, 3101, L""},
- {65, 963, L""},
- {65, 964, L""},
- {65, 965, L""},
- {65, 966, L""},
+ {65, 961, L"Братислава"},
+ {65, 962, L"Кошице"},
+ {65, 3101, L"Липтов"},
+ {65, 963, L"Попрад"},
+ {65, 964, L"Прешов"},
+ {65, 965, L"Ружемберок"},
+ {65, 966, L"Тврдошин"},
{65, 2505, lpwszOther},
- {66, 968, L""},
- {66, 967, L""},
- {66, 969, L""},
+ {66, 968, L"Копар"},
+ {66, 967, L"Любляна"},
+ {66, 969, L"Марибор"},
{66, 2504, lpwszOther},
- {67, 970, L""},
+ {67, 970, L"Торсхавн"},
{67, 2503, lpwszOther},
- {68, 2888, L""},
- {68, 971, L""},
- {68, 979, L""},
- {68, 972, L""},
- {68, 980, L""},
- {68, 973, L""},
- {68, 3375, L""},
- {68, 3159, L""},
- {68, 974, L""},
- {68, 975, L""},
- {68, 976, L""},
- {68, 977, L""},
- {68, 978, L""},
+ {68, 2888, L"Вантаа"},
+ {68, 971, L"Васа"},
+ {68, 979, L"Котка"},
+ {68, 972, L"Коувола"},
+ {68, 980, L"Лахти"},
+ {68, 973, L"Оулу"},
+ {68, 3375, L"Риихимяки"},
+ {68, 3159, L"Руовеси"},
+ {68, 974, L"Тампере"},
+ {68, 975, L"Турку"},
+ {68, 976, L"Хельсинки"},
+ {68, 977, L"Эспо"},
+ {68, 978, L"Ювяскюля"},
{68, 2502, lpwszOther},
- {37, 996, L""},
- {37, 983, L""},
- {37, 997, L""},
- {37, 984, L""},
- {37, 998, L""},
- {37, 987, L""},
- {37, 988, L""},
- {37, 993, L"-"},
- {37, 3037, L""},
- {37, 989, L""},
- {37, 985, L""},
- {37, 991, L""},
- {37, 3161, L""},
- {37, 990, L""},
- {37, 994, L""},
- {37, 995, L""},
- {37, 999, L""},
- {37, 981, L""},
- {37, 3374, L""},
- {37, 992, L""},
- {37, 982, L""},
- {37, 986, L""},
- {37, 3314, L""},
+ {37, 996, L"Авиньон"},
+ {37, 983, L"Бержерак"},
+ {37, 997, L"Блуа"},
+ {37, 984, L"Бордо"},
+ {37, 998, L"Дижон"},
+ {37, 987, L"Канн"},
+ {37, 988, L"Кастр"},
+ {37, 993, L"Клермон-Ферран"},
+ {37, 3037, L"Лилль"},
+ {37, 989, L"Лион"},
+ {37, 985, L"Марсель"},
+ {37, 991, L"Мец"},
+ {37, 3161, L"Мобеж"},
+ {37, 990, L"Нанси"},
+ {37, 994, L"Нант"},
+ {37, 995, L"Ницца"},
+ {37, 999, L"Орлеан"},
+ {37, 981, L"Париж"},
+ {37, 3374, L"Перпиньян"},
+ {37, 992, L"Руан"},
+ {37, 982, L"Страсбург"},
+ {37, 986, L"Тулуза"},
+ {37, 3314, L"Шамбери"},
{37, 2501, lpwszOther},
- {69, 1003, L""},
- {69, 1000, L""},
- {69, 1001, L""},
- {69, 1004, L""},
- {69, 1002, L""},
+ {69, 1003, L"Дубровник"},
+ {69, 1000, L"Загреб"},
+ {69, 1001, L"Задар"},
+ {69, 1004, L"Риека"},
+ {69, 1002, L"Сплит"},
{69, 2500, lpwszOther},
- {70, 1005, L""},
- {70, 3291, L"-"},
- {70, 1007, L"-"},
- {70, 1008, L"-"},
- {70, 3019, L""},
- {70, 1010, L""},
- {70, 1009, L""},
- {70, 1015, L""},
- {70, 3105, L" "},
- {70, 1006, L""},
- {70, 3246, L""},
- {70, 1011, L""},
- {70, 1012, L"--"},
- {70, 1014, L"-"},
- {70, 1013, L"--"},
+ {70, 1005, L"Брно"},
+ {70, 3291, L"Гавличкув-Брод"},
+ {70, 1007, L"Градец-Кралове"},
+ {70, 1008, L"Карлови-Вари"},
+ {70, 3019, L"Кладрубы"},
+ {70, 1010, L"Лоуни"},
+ {70, 1009, L"Острава"},
+ {70, 1015, L"Пльзень"},
+ {70, 3105, L"Правчицка Брана"},
+ {70, 1006, L"Прага"},
+ {70, 3246, L"Тачов"},
+ {70, 1011, L"Тршебич"},
+ {70, 1012, L"Усти-над-Лабем"},
+ {70, 1014, L"Ческе-Будеевице"},
+ {70, 1013, L"Яблонец-над-Нисоу"},
{70, 2499, lpwszOther},
- {71, 1016, L""},
- {71, 1019, L""},
- {71, 1017, L""},
- {71, 1018, L""},
- {71, 1020, L""},
- {71, 1021, L""},
- {71, 1022, L""},
- {71, 3189, L""},
- {71, 1023, L""},
- {71, 1024, L""},
- {71, 1025, L""},
- {71, 1026, L""},
- {71, 1027, L""},
- {71, 1028, L""},
- {71, 1029, L""},
- {71, 1030, L""},
+ {71, 1016, L"Арау"},
+ {71, 1019, L"Баден"},
+ {71, 1017, L"Базель"},
+ {71, 1018, L"Берн"},
+ {71, 1020, L"Биль"},
+ {71, 1021, L"Винтертур"},
+ {71, 1022, L"Давос"},
+ {71, 3189, L"Делемонт"},
+ {71, 1023, L"Женева"},
+ {71, 1024, L"Золотурн"},
+ {71, 1025, L"Лозанна"},
+ {71, 1026, L"Локарно"},
+ {71, 1027, L"Лугано"},
+ {71, 1028, L"Люцерн"},
+ {71, 1029, L"Монтре"},
+ {71, 1030, L"Цюрих"},
{71, 2498, lpwszOther},
- {72, 2883, L""},
- {72, 1031, L""},
- {72, 1032, L""},
- {72, 1037, L""},
- {72, 1036, L""},
- {72, 1042, L""},
- {72, 1033, L""},
- {72, 1034, L""},
- {72, 1041, L""},
- {72, 1039, L""},
- {72, 1043, L""},
- {72, 1040, L""},
- {72, 1038, L""},
+ {72, 2883, L"Арбога"},
+ {72, 1031, L"Гетеборг"},
+ {72, 1032, L"Кальмар"},
+ {72, 1037, L"Лахольм"},
+ {72, 1036, L"Лулео"},
+ {72, 1042, L"Лунд"},
+ {72, 1033, L"Мальме"},
+ {72, 1034, L"Стокгольм"},
+ {72, 1041, L"Умео"},
+ {72, 1039, L"Фалун"},
+ {72, 1043, L"Хельсинборг"},
+ {72, 1040, L"Хернесанд"},
+ {72, 1038, L"Эстерсунд"},
{72, 2497, lpwszOther},
- {73, 3013, L""},
- {73, 1044, L""},
- {73, 1045, L"-"},
- {73, 1046, L""},
- {73, 1047, L""},
- {73, 1048, L""},
- {73, 1049, L""},
- {73, 1050, L""},
- {73, 1051, L""},
- {73, 1052, L""},
- {73, 1053, L""},
- {73, 1054, L""},
+ {73, 3013, L"Валга"},
+ {73, 1044, L"Кейла"},
+ {73, 1045, L"Кохтла-Ярве"},
+ {73, 1046, L"Маарду"},
+ {73, 1047, L"Мыйзакюла"},
+ {73, 1048, L"Нарва"},
+ {73, 1049, L"Пярну"},
+ {73, 1050, L"Раквере"},
+ {73, 1051, L"Силламяэ"},
+ {73, 1052, L"Таллин"},
+ {73, 1053, L"Тарту"},
+ {73, 1054, L"Хаапсалу"},
{0, NULL}
};//*/
@@ -2796,3156 +2796,3156 @@ static const MRA_CITY mracCitys[] = static const MRA_PLACE mrapPlaces[] =
{
- {24, 0, 0, L""},
- {81, 0, 0, L""},
- {82, 0, 0, L""},
- {97, 0, 0, L""},
- {96, 0, 0, L""},
- {99, 0, 0, L""},
- {100, 0, 0, L"-"},
- {101, 0, 0, L""},
- {102, 0, 0, L""},
- {83, 0, 0, L""},
- {86, 0, 0, L""},
- {95, 0, 0, L""},
- {103, 0, 0, L""},
- {79, 0, 0, L""},
- {85, 0, 0, L""},
- {87, 0, 0, L""},
- {104, 0, 0, L""},
- {84, 0, 0, L""},
- {105, 0, 0, L""},
- {106, 0, 0, L""},
- {107, 0, 0, L""},
- {92, 0, 0, L" ()"},
- {76, 0, 0, L""},
- {3215, 0, 0, L" (.)"},
- {29, 0, 0, L" ()"},
- {108, 0, 0, L""},
- {88, 0, 0, L""},
- {109, 0, 0, L""},
- {110, 0, 0, L""},
- {111, 0, 0, L""},
- {112, 0, 0, L""},
- {113, 0, 0, L""},
- {114, 0, 0, L""},
- {115, 0, 0, L""},
- {116, 0, 0, L" "},
- {117, 0, 0, L""},
- {3216, 0, 0, L" (.)"},
- {122, 0, 0, L""},
- {89, 0, 0, L""},
- {94, 0, 0, L" "},
- {118, 0, 0, L""},
- {78, 0, 0, L""},
- {91, 0, 0, L""},
- {119, 0, 0, L""},
- {120, 0, 0, L""},
- {132, 0, 0, L""},
- {90, 0, 0, L""},
- {77, 0, 0, L""},
- {93, 0, 0, L""},
- {121, 0, 0, L""},
- {98, 0, 0, L" "},
- {75, 0, 0, L""},
- {123, 0, 0, L""},
- {454, 0, 0, L" "},
- {124, 0, 0, L""},
- {453, 0, 0, L" ()"},
- {126, 0, 0, L""},
- {127, 0, 0, L" "},
- {128, 0, 0, L" ( )"},
- {129, 0, 0, L""},
- {3220, 0, 0, L" (..)"},
- {130, 0, 0, L" "},
- {3218, 0, 0, L" (.)"},
- {3221, 0, 0, L" (..)"},
- {3230, 0, 0, L" (.)"},
- {131, 0, 0, L""},
- {133, 0, 0, L" - "},
- {3222, 0, 0, L" (.)"},
- {125, 0, 0, L""},
- {3219, 0, 0, L". ()"},
- {134, 0, 0, L" "},
- {3223, 0, 0, L" (..)"},
- {135, 0, 0, L""},
- {136, 0, 0, L""},
- {3224, 0, 0, L" (.)"},
- {137, 0, 0, L""},
- {3226, 0, 0, L" "},
- {3225, 0, 0, L" "},
- {138, 0, 0, L""},
- {139, 0, 0, L""},
- {3200, 0, 0, L" (.)"},
- {140, 0, 0, L" "},
- {141, 0, 0, L""},
- {3202, 0, 0, L" (.)"},
- {142, 0, 0, L""},
- {143, 0, 0, L""},
- {146, 0, 0, L""},
- {3203, 0, 0, L" (.)"},
- {144, 0, 0, L""},
- {145, 0, 0, L""},
- {147, 0, 0, L""},
- {3204, 0, 0, L" (.)"},
- {452, 0, 0, L" ()"},
- {149, 0, 0, L""},
- {148, 0, 0, L""},
- {3205, 0, 0, L" (.)"},
- {173, 0, 0, L""},
- {150, 0, 0, L""},
- {151, 0, 0, L""},
- {152, 0, 0, L" (.)"},
- {153, 0, 0, L""},
- {154, 0, 0, L" "},
- {155, 0, 0, L""},
- {156, 0, 0, L"-"},
- {157, 0, 0, L""},
- {3208, 0, 0, L" (.)"},
- {158, 0, 0, L""},
- {3209, 0, 0, L" ()"},
- {3201, 0, 0, L" "},
- {159, 0, 0, L""},
- {3207, 0, 0, L" (.)"},
- {3211, 0, 0, L" (.)"},
- {160, 0, 0, L""},
- {161, 0, 0, L""},
- {162, 0, 0, L""},
- {163, 0, 0, L""},
- {164, 0, 0, L"- "},
- {165, 0, 0, L"- "},
- {166, 0, 0, L"-"},
- {3210, 0, 0, L"- (.)"},
- {167, 0, 0, L""},
- {168, 0, 0, L" "},
- {169, 0, 0, L""},
- {3212, 0, 0, L" (.)"},
- {3206, 0, 0, L" "},
- {170, 0, 0, L""},
- {171, 0, 0, L""},
- {3213, 0, 0, L". . - (.)"},
- {172, 0, 0, L""},
- {174, 0, 0, L""},
- {175, 0, 0, L""},
- {176, 0, 0, L""},
- {177, 0, 0, L""},
- {3228, 0, 0, L" "},
- {178, 0, 0, L"-"},
- {179, 0, 0, L""},
- {180, 0, 0, L""},
- {181, 0, 0, L""},
- {182, 0, 0, L""},
- {183, 0, 0, L""},
- {184, 0, 0, L"-"},
- {185, 0, 0, L""},
- {186, 0, 0, L""},
- {187, 0, 0, L""},
- {3198, 0, 0, L". "},
- {23, 0, 0, L""},
- {188, 0, 0, L"-"},
- {189, 0, 0, L""},
- {190, 0, 0, L""},
- {191, 0, 0, L""},
- {193, 0, 0, L" ()"},
- {192, 0, 0, L""},
- {194, 0, 0, L"-`"},
- {195, 0, 0, L""},
- {196, 0, 0, L""},
- {197, 0, 0, L""},
- {198, 0, 0, L""},
- {199, 0, 0, L""},
- {200, 0, 0, L""},
- {3229, 0, 0, L" (.)"},
- {201, 0, 0, L""},
- {202, 0, 0, L""},
- {203, 0, 0, L""},
- {204, 0, 0, L""},
- {205, 0, 0, L""},
- {206, 0, 0, L""},
- {207, 0, 0, L""},
- {3227, 0, 0, L" (.)"},
- {3197, 0, 0, L" (.)"},
- {208, 0, 0, L""},
- {209, 0, 0, L"- "},
- {210, 0, 0, L""},
- {3199, 0, 0, L" (.)"},
- {211, 0, 0, L""},
- {212, 0, 0, L""},
- {213, 0, 0, L""},
- {214, 0, 0, L""},
- {215, 0, 0, L"-"},
- {216, 0, 0, L""},
- {217, 0, 0, L""},
- {218, 0, 0, L""},
- {219, 0, 0, L""},
- {220, 0, 0, L" "},
- {222, 0, 0, L""},
- {223, 0, 0, L" "},
- {221, 0, 0, L""},
- {224, 0, 0, L""},
- {225, 0, 0, L"- ()"},
- {39, 0, 0, L""},
- {40, 0, 0, L""},
- {32, 0, 0, L""},
- {33, 0, 0, L""},
- {340, 0, 0, L""},
- {38, 0, 0, L""},
- {41, 0, 0, L""},
- {42, 0, 0, L" "},
- {43, 0, 0, L""},
- {45, 0, 0, L""},
- {44, 0, 0, L""},
- {46, 0, 0, L""},
- {3193, 0, 0, L" (.)"},
- {47, 0, 0, L" (.)"},
- {48, 0, 0, L""},
- {49, 0, 0, L""},
- {3194, 0, 0, L" (.)"},
- {50, 0, 0, L""},
- {51, 0, 0, L""},
- {34, 0, 0, L""},
- {52, 0, 0, L""},
- {53, 0, 0, L""},
- {54, 0, 0, L""},
- {55, 0, 0, L""},
- {56, 0, 0, L""},
- {57, 0, 0, L""},
- {58, 0, 0, L""},
- {59, 0, 0, L""},
- {36, 0, 0, L""},
- {60, 0, 0, L""},
- {61, 0, 0, L""},
- {3195, 0, 0, L" (.)"},
- {62, 0, 0, L""},
- {35, 0, 0, L""},
- {63, 0, 0, L""},
- {64, 0, 0, L"-"},
- {74, 0, 0, L" "},
- {65, 0, 0, L""},
- {66, 0, 0, L""},
- {67, 0, 0, L" - ()"},
- {68, 0, 0, L""},
- {37, 0, 0, L""},
- {69, 0, 0, L""},
- {70, 0, 0, L""},
- {71, 0, 0, L""},
- {72, 0, 0, L""},
- {3196, 0, 0, L" (.)"},
- {73, 0, 0, L""},
- {24, 25, 0, L""},
- {24, 226, 0, L"-"},
- {24, 233, 0, L" ()"},
- {24, 232, 0, L" "},
- {24, 235, 0, L" "},
- {24, 227, 0, L" ."},
- {24, 229, 0, L" ."},
- {24, 231, 0, L" ."},
- {24, 234, 0, L" ."},
- {24, 228, 0, L" "},
- {24, 230, 0, L" "},
- {24, 236, 0, L" "},
- {24, 237, 0, L""},
- {24, 240, 0, L"-"},
- {24, 241, 0, L""},
- {24, 248, 0, L""},
- {24, 249, 0, L""},
- {24, 251, 0, L""},
- {24, 238, 0, L" ."},
- {24, 242, 0, L" ."},
- {24, 243, 0, L" ."},
- {24, 244, 0, L" ."},
- {24, 245, 0, L" ."},
- {24, 246, 0, L" ."},
- {24, 247, 0, L" ."},
- {24, 250, 0, L" ."},
- {24, 239, 0, L"- "},
- {24, 255, 0, L""},
- {24, 256, 0, L""},
- {24, 252, 0, L" ."},
- {24, 253, 0, L" ."},
- {24, 254, 0, L" ."},
- {24, 257, 0, L" ."},
- {24, 258, 0, L" ."},
- {24, 260, 0, L" ."},
- {24, 261, 0, L" ."},
- {24, 259, 0, L" "},
- {24, 265, 0, L""},
- {24, 263, 0, L" "},
- {24, 273, 0, L""},
- {24, 275, 0, L""},
- {24, 264, 0, L" "},
- {24, 268, 0, L" "},
- {24, 266, 0, L" ."},
- {24, 267, 0, L" ."},
- {24, 269, 0, L" ."},
- {24, 270, 0, L" ."},
- {24, 272, 0, L" ."},
- {24, 276, 0, L" ."},
- {24, 262, 0, L" "},
- {24, 271, 0, L" "},
- {24, 274, 0, L"- "},
- {24, 277, 0, L" "},
- {24, 278, 0, L" ."},
- {24, 279, 0, L" ."},
- {24, 280, 0, L" ."},
- {24, 282, 0, L" ."},
- {24, 281, 0, L"- - "},
- {24, 283, 0, L"- "},
- {24, 284, 0, L" ."},
- {24, 285, 0, L" ."},
- {24, 286, 0, L" ."},
- {24, 287, 0, L" ."},
- {24, 288, 0, L" ."},
- {24, 289, 0, L" ."},
- {24, 290, 0, L" ."},
- {24, 291, 0, L" ."},
- {24, 292, 0, L" ."},
- {24, 293, 0, L" ."},
- {24, 294, 0, L" ."},
- {24, 295, 0, L" ."},
- {24, 296, 0, L" ."},
- {24, 297, 0, L" ."},
- {24, 298, 0, L" ."},
- {24, 299, 0, L" ."},
- {24, 300, 0, L" ."},
- {24, 301, 0, L""},
- {24, 304, 0, L""},
- {24, 305, 0, L""},
- {24, 306, 0, L"-"},
- {24, 307, 0, L""},
- {24, 308, 0, L"-"},
- {24, 311, 0, L" - "},
- {24, 313, 0, L""},
- {24, 309, 0, L" "},
- {24, 312, 0, L" "},
- {24, 302, 0, L" ."},
- {24, 303, 0, L" ."},
- {24, 310, 0, L" ."},
- {81, 1055, 0, L""},
- {81, 1058, 0, L""},
- {81, 1056, 0, L""},
- {81, 1057, 0, L""},
- {81, 3153, 0, L""},
- {81, 2291, 0, L""},
- {82, 2932, 0, L""},
- {82, 1060, 0, L""},
- {82, 3084, 0, L""},
- {82, 3011, 0, L""},
- {82, 3306, 0, L""},
- {82, 1059, 0, L""},
- {82, 3145, 0, L""},
- {82, 2292, 0, L""},
- {97, 1061, 0, L""},
- {97, 2293, 0, L""},
- {96, 1062, 0, L""},
- {96, 2294, 0, L""},
- {99, 1063, 0, L""},
- {99, 2295, 0, L""},
- {100, 1064, 0, L"--"},
- {100, 2296, 0, L""},
- {101, 1065, 0, L""},
- {101, 2297, 0, L""},
- {102, 1066, 0, L""},
- {102, 2298, 0, L""},
- {83, 1067, 0, L""},
- {83, 3158, 0, L""},
- {83, 1068, 0, L""},
- {83, 3129, 0, L""},
- {83, 1069, 0, L""},
- {83, 1070, 0, L""},
- {83, 2299, 0, L""},
- {86, 3345, 0, L""},
- {86, 1071, 0, L""},
- {86, 2992, 0, L""},
- {86, 3175, 0, L""},
- {86, 3363, 0, L"-"},
- {86, 2884, 0, L"-"},
- {86, 3243, 0, L"-"},
- {86, 1074, 0, L"-"},
- {86, 3348, 0, L""},
- {86, 3241, 0, L""},
- {86, 1075, 0, L""},
- {86, 3350, 0, L"-"},
- {86, 2982, 0, L""},
- {86, 2971, 0, L"-"},
- {86, 3136, 0, L""},
- {86, 1080, 0, L""},
- {86, 3303, 0, L""},
- {86, 3050, 0, L""},
- {86, 3151, 0, L" "},
- {86, 3141, 0, L""},
- {86, 3012, 0, L" "},
- {86, 1081, 0, L""},
- {86, 1077, 0, L"-"},
- {86, 1079, 0, L""},
- {86, 1078, 0, L""},
- {86, 1076, 0, L""},
- {86, 2929, 0, L""},
- {86, 2928, 0, L""},
- {86, 2300, 0, L""},
- {95, 3315, 0, L""},
- {95, 1082, 0, L""},
- {95, 1083, 0, L""},
- {95, 3144, 0, L""},
- {95, 3025, 0, L""},
- {95, 3277, 0, L""},
- {95, 1084, 0, L""},
- {95, 2301, 0, L""},
- {103, 1085, 0, L""},
- {103, 2302, 0, L""},
- {79, 1086, 0, L""},
- {79, 2303, 0, L""},
- {85, 1087, 0, L""},
- {85, 2304, 0, L""},
- {87, 1088, 0, L""},
- {87, 2305, 0, L""},
- {104, 1089, 0, L""},
- {104, 2306, 0, L""},
- {84, 1090, 0, L""},
- {84, 1091, 0, L""},
- {84, 1092, 0, L"-"},
- {84, 3242, 0, L""},
- {84, 1093, 0, L""},
- {84, 1094, 0, L" ()"},
- {84, 1095, 0, L""},
- {84, 3245, 0, L""},
- {84, 3083, 0, L""},
- {84, 1096, 0, L""},
- {84, 1097, 0, L""},
- {84, 1098, 0, L""},
- {84, 1099, 0, L""},
- {84, 2868, 0, L""},
- {84, 1100, 0, L""},
- {84, 1101, 0, L" (.-. .)"},
- {84, 1102, 0, L""},
- {84, 1103, 0, L""},
- {84, 1104, 0, L""},
- {84, 3166, 0, L""},
- {84, 1105, 0, L"-"},
- {84, 2927, 0, L""},
- {84, 1106, 0, L""},
- {84, 1107, 0, L""},
- {84, 1108, 0, L"-"},
- {84, 1109, 0, L""},
- {84, 1110, 0, L""},
- {84, 2307, 0, L""},
- {105, 1111, 0, L""},
- {105, 2308, 0, L""},
- {106, 1112, 0, L""},
- {106, 2309, 0, L""},
- {107, 1113, 0, L""},
- {107, 1114, 0, L""},
- {107, 1115, 0, L""},
- {107, 2954, 0, L""},
- {107, 2310, 0, L""},
- {92, 1116, 0, L""},
- {92, 1117, 0, L"-"},
- {92, 3027, 0, L"-"},
- {92, 1118, 0, L""},
- {92, 1119, 0, L""},
- {92, 1120, 0, L""},
- {92, 2933, 0, L""},
- {92, 2311, 0, L""},
- {76, 3214, 0, L" ()"},
- {76, 1121, 0, L""},
- {76, 2869, 0, L""},
- {76, 3262, 0, L""},
- {76, 1122, 0, L""},
- {76, 1123, 0, L""},
- {76, 1124, 0, L""},
- {76, 3043, 0, L""},
- {76, 2312, 0, L""},
- {29, 1125, 0, L""},
- {29, 2313, 0, L""},
- {108, 1126, 0, L""},
- {108, 3240, 0, L""},
- {108, 2314, 0, L""},
- {88, 1127, 0, L"-"},
- {88, 2315, 0, L""},
- {109, 1128, 0, L""},
- {109, 2316, 0, L""},
- {110, 1129, 0, L""},
- {110, 2317, 0, L""},
- {111, 1130, 0, L"-"},
- {111, 1131, 0, L"-"},
- {111, 2318, 0, L""},
- {112, 1132, 0, L""},
- {112, 2319, 0, L""},
- {113, 1133, 0, L"-"},
- {113, 1134, 0, L""},
- {113, 2320, 0, L""},
- {114, 1135, 0, L""},
- {114, 2321, 0, L""},
- {115, 1136, 0, L""},
- {115, 2322, 0, L""},
- {116, 1137, 0, L"-"},
- {116, 1138, 0, L""},
- {116, 1139, 0, L""},
- {116, 2323, 0, L""},
- {117, 1140, 0, L""},
- {117, 2324, 0, L""},
- {122, 1141, 0, L""},
- {122, 2325, 0, L""},
- {89, 1072, 0, L""},
- {89, 1073, 0, L""},
- {89, 1142, 0, L""},
- {89, 2326, 0, L""},
- {94, 3250, 0, L""},
- {94, 1143, 0, L"-"},
- {94, 2327, 0, L""},
- {78, 1144, 0, L""},
- {78, 2328, 0, L""},
- {91, 1145, 0, L""},
- {91, 3307, 0, L""},
- {91, 3308, 0, L""},
- {91, 2329, 0, L""},
- {119, 1146, 0, L""},
- {119, 1147, 0, L""},
- {119, 2330, 0, L""},
- {120, 1148, 0, L""},
- {120, 2331, 0, L""},
- {132, 1149, 0, L""},
- {132, 2332, 0, L""},
- {90, 1150, 0, L""},
- {90, 3079, 0, L""},
- {90, 2333, 0, L""},
- {77, 1152, 0, L""},
- {77, 1153, 0, L""},
- {77, 3080, 0, L""},
- {77, 1151, 0, L""},
- {77, 1154, 0, L""},
- {77, 1155, 0, L""},
- {77, 2334, 0, L""},
- {93, 3362, 0, L""},
- {93, 3137, 0, L""},
- {93, 3273, 0, L""},
- {93, 1156, 0, L""},
- {93, 1157, 0, L""},
- {93, 3167, 0, L""},
- {93, 3347, 0, L""},
- {93, 1158, 0, L""},
- {93, 1159, 0, L""},
- {93, 1160, 0, L""},
- {93, 1161, 0, L""},
- {93, 1162, 0, L""},
- {93, 1163, 0, L""},
- {93, 1164, 0, L""},
- {93, 2335, 0, L""},
- {121, 1165, 0, L""},
- {121, 3319, 0, L""},
- {121, 2336, 0, L""},
- {98, 1166, 0, L""},
- {98, 2337, 0, L""},
- {75, 3176, 0, L""},
- {75, 3339, 0, L""},
- {75, 1167, 0, L""},
- {75, 1168, 0, L""},
- {75, 2338, 0, L""},
- {123, 1914, 0, L""},
- {123, 2957, 0, L" "},
- {123, 1915, 0, L""},
- {123, 3331, 0, L""},
- {123, 1916, 0, L""},
- {123, 3001, 0, L""},
- {123, 1917, 0, L""},
- {123, 3217, 0, L""},
- {123, 3064, 0, L""},
- {123, 3020, 0, L" "},
- {123, 1918, 0, L""},
- {123, 3238, 0, L""},
- {123, 2339, 0, L""},
- {454, 1192, 0, L"-"},
- {454, 2366, 0, L""},
- {124, 1919, 0, L"-"},
- {124, 2340, 0, L""},
- {453, 1193, 0, L""},
- {453, 2368, 0, L""},
- {126, 1921, 0, L""},
- {126, 2342, 0, L""},
- {127, 1922, 0, L""},
- {127, 2343, 0, L""},
- {128, 1923, 0, L""},
- {128, 2344, 0, L""},
- {129, 1924, 0, L""},
- {129, 2345, 0, L""},
- {130, 1925, 0, L""},
- {130, 1926, 0, L""},
- {130, 1928, 0, L""},
- {130, 1929, 0, L""},
- {130, 3235, 0, L""},
- {130, 1927, 0, L""},
- {130, 3323, 0, L""},
- {130, 2346, 0, L""},
- {131, 1930, 0, L""},
- {131, 2347, 0, L""},
- {133, 1931, 0, L"-"},
- {133, 2348, 0, L""},
- {125, 1920, 0, L""},
- {125, 2341, 0, L""},
- {134, 1932, 0, L""},
- {134, 2349, 0, L""},
- {135, 1933, 0, L""},
- {135, 2350, 0, L""},
- {136, 1934, 0, L""},
- {136, 2351, 0, L""},
- {137, 1935, 0, L""},
- {137, 2352, 0, L""},
- {138, 3055, 0, L""},
- {138, 3049, 0, L""},
- {138, 3330, 0, L""},
- {138, 1169, 0, L""},
- {138, 3106, 0, L""},
- {138, 1170, 0, L""},
- {138, 1171, 0, L""},
- {138, 1172, 0, L""},
- {138, 3365, 0, L""},
- {138, 1173, 0, L""},
- {138, 3104, 0, L""},
- {138, 3366, 0, L""},
- {138, 1174, 0, L""},
- {138, 2964, 0, L""},
- {138, 3113, 0, L""},
- {138, 1175, 0, L""},
- {138, 2920, 0, L"-"},
- {138, 2889, 0, L"-"},
- {138, 1176, 0, L""},
- {138, 2903, 0, L" "},
- {138, 1177, 0, L""},
- {138, 1178, 0, L""},
- {138, 2946, 0, L""},
- {138, 1179, 0, L""},
- {138, 1180, 0, L""},
- {138, 2353, 0, L""},
- {139, 407, 0, L""},
- {139, 426, 0, L""},
- {139, 378, 0, L""},
- {139, 412, 0, L""},
- {139, 446, 0, L""},
- {139, 434, 0, L""},
- {139, 416, 0, L""},
- {139, 428, 0, L""},
- {139, 440, 0, L""},
- {139, 352, 0, L""},
- {139, 394, 0, L""},
- {139, 374, 0, L""},
- {139, 448, 0, L""},
- {139, 390, 0, L""},
- {139, 402, 0, L""},
- {139, 396, 0, L" "},
- {139, 370, 0, L""},
- {139, 368, 0, L""},
- {139, 444, 0, L""},
- {139, 388, 0, L""},
- {139, 408, 0, L""},
- {139, 430, 0, L""},
- {139, 358, 0, L""},
- {139, 418, 0, L""},
- {139, 354, 0, L""},
- {139, 376, 0, L""},
- {139, 414, 0, L""},
- {139, 380, 0, L""},
- {139, 372, 0, L""},
- {139, 424, 0, L""},
- {139, 348, 0, L""},
- {139, 392, 0, L""},
- {139, 386, 0, L""},
- {139, 438, 0, L""},
- {139, 362, 0, L"-"},
- {139, 360, 0, L"-"},
- {139, 432, 0, L"-"},
- {139, 350, 0, L"-"},
- {139, 366, 0, L""},
- {139, 420, 0, L""},
- {139, 442, 0, L""},
- {139, 364, 0, L""},
- {139, 450, 0, L"-"},
- {139, 356, 0, L"-"},
- {139, 382, 0, L" "},
- {139, 398, 0, L" "},
- {139, 410, 0, L""},
- {139, 422, 0, L""},
- {139, 406, 0, L" "},
- {139, 404, 0, L""},
- {139, 384, 0, L" "},
- {139, 400, 0, L" "},
- {139, 436, 0, L""},
- {140, 1238, 0, L"-"},
- {140, 2442, 0, L""},
- {141, 1239, 0, L"-"},
- {141, 2441, 0, L""},
- {142, 1240, 0, L""},
- {142, 2440, 0, L""},
- {143, 1241, 0, L""},
- {143, 2439, 0, L""},
- {146, 1242, 0, L""},
- {146, 2438, 0, L""},
- {144, 1243, 0, L"-"},
- {144, 2437, 0, L""},
- {145, 1244, 0, L""},
- {145, 3094, 0, L" "},
- {145, 1245, 0, L"--"},
- {145, 1246, 0, L"-"},
- {145, 2436, 0, L""},
- {147, 1247, 0, L""},
- {147, 2435, 0, L""},
- {452, 1190, 0, L"-"},
- {452, 2364, 0, L""},
- {149, 1248, 0, L"--"},
- {149, 2434, 0, L""},
- {148, 1249, 0, L""},
- {148, 2433, 0, L""},
- {173, 1250, 0, L""},
- {173, 2432, 0, L""},
- {150, 1251, 0, L""},
- {150, 2431, 0, L""},
- {151, 1252, 0, L"-"},
- {151, 2430, 0, L""},
- {152, 1253, 0, L""},
- {152, 2429, 0, L""},
- {153, 1254, 0, L""},
- {153, 2428, 0, L""},
- {154, 1255, 0, L"-"},
- {154, 2427, 0, L""},
- {155, 1256, 0, L""},
- {155, 2426, 0, L""},
- {156, 1257, 0, L"-"},
- {156, 2425, 0, L""},
- {157, 1258, 0, L""},
- {157, 2424, 0, L""},
- {158, 1259, 0, L""},
- {158, 1260, 0, L""},
- {158, 2423, 0, L""},
- {159, 1261, 0, L""},
- {159, 2422, 0, L""},
- {160, 1262, 0, L""},
- {160, 2421, 0, L""},
- {161, 1263, 0, L""},
- {161, 2420, 0, L""},
- {162, 1264, 0, L""},
- {162, 2419, 0, L""},
- {163, 1265, 0, L"-"},
- {163, 2418, 0, L""},
- {164, 1266, 0, L""},
- {164, 2417, 0, L""},
- {165, 1267, 0, L""},
- {165, 2416, 0, L""},
- {166, 1268, 0, L""},
- {166, 2415, 0, L""},
- {167, 1269, 0, L""},
- {167, 2414, 0, L""},
- {168, 1270, 0, L"--"},
- {168, 2413, 0, L""},
- {169, 1271, 0, L""},
- {169, 2412, 0, L""},
- {170, 1272, 0, L""},
- {170, 2411, 0, L""},
- {171, 1273, 0, L""},
- {171, 1274, 0, L""},
- {171, 2410, 0, L""},
- {172, 1275, 0, L""},
- {172, 2409, 0, L""},
- {174, 1854, 0, L""},
- {174, 2495, 0, L""},
- {175, 1855, 0, L""},
- {175, 2494, 0, L""},
- {176, 1856, 0, L""},
- {176, 1857, 0, L"-"},
- {176, 2493, 0, L""},
- {177, 1858, 0, L""},
- {177, 2492, 0, L""},
- {178, 1859, 0, L""},
- {178, 2491, 0, L""},
- {179, 1860, 0, L""},
- {179, 2490, 0, L""},
- {180, 1861, 0, L""},
- {180, 2489, 0, L""},
- {181, 1862, 0, L""},
- {181, 2488, 0, L""},
- {182, 1863, 0, L""},
- {182, 2487, 0, L""},
- {183, 1864, 0, L""},
- {183, 2486, 0, L""},
- {184, 1865, 0, L""},
- {184, 2485, 0, L""},
- {185, 1866, 0, L""},
- {185, 2484, 0, L""},
- {186, 3312, 0, L""},
- {186, 1867, 0, L""},
- {186, 1868, 0, L""},
- {186, 2483, 0, L""},
- {187, 1869, 0, L""},
- {187, 2482, 0, L""},
- {23, 1870, 0, L""},
- {23, 2481, 0, L""},
- {188, 1871, 0, L""},
- {188, 2480, 0, L""},
- {189, 1872, 0, L""},
- {189, 2479, 0, L""},
- {190, 1873, 0, L""},
- {190, 2478, 0, L""},
- {191, 1874, 0, L""},
- {191, 2477, 0, L""},
- {193, 1875, 0, L""},
- {193, 2476, 0, L""},
- {192, 1876, 0, L""},
- {192, 2475, 0, L""},
- {194, 1877, 0, L""},
- {194, 2474, 0, L""},
- {195, 1878, 0, L""},
- {195, 2473, 0, L""},
- {196, 1879, 0, L""},
- {196, 2472, 0, L""},
- {197, 1880, 0, L""},
- {197, 2471, 0, L""},
- {198, 1881, 0, L"-"},
- {198, 2470, 0, L""},
- {199, 1882, 0, L""},
- {199, 2469, 0, L""},
- {200, 1883, 0, L""},
- {200, 2468, 0, L""},
- {201, 1884, 0, L""},
- {201, 2467, 0, L""},
- {202, 1885, 0, L""},
- {202, 2466, 0, L""},
- {203, 1886, 0, L""},
- {203, 1887, 0, L""},
- {203, 2465, 0, L""},
- {204, 1888, 0, L""},
- {204, 2464, 0, L""},
- {205, 1889, 0, L""},
- {205, 2463, 0, L""},
- {206, 1890, 0, L""},
- {206, 2462, 0, L""},
- {207, 1891, 0, L""},
- {207, 2461, 0, L""},
- {208, 1892, 0, L""},
- {208, 2460, 0, L""},
- {209, 1893, 0, L"-"},
- {209, 2459, 0, L""},
- {210, 1894, 0, L""},
- {210, 2458, 0, L""},
- {211, 1895, 0, L""},
- {211, 2457, 0, L""},
- {212, 1896, 0, L""},
- {212, 2456, 0, L""},
- {213, 1897, 0, L""},
- {213, 2455, 0, L""},
- {214, 1898, 0, L""},
- {214, 2454, 0, L""},
- {215, 1899, 0, L""},
- {215, 2453, 0, L""},
- {216, 1900, 0, L"--"},
- {216, 1901, 0, L""},
- {216, 2452, 0, L""},
- {217, 1902, 0, L""},
- {217, 2451, 0, L""},
- {218, 1903, 0, L""},
- {218, 2450, 0, L""},
- {219, 1904, 0, L""},
- {219, 2449, 0, L""},
- {220, 1905, 0, L""},
- {220, 2448, 0, L""},
- {222, 1906, 0, L""},
- {222, 2447, 0, L""},
- {223, 1907, 0, L""},
- {223, 2446, 0, L""},
- {221, 1908, 0, L""},
- {221, 2445, 0, L""},
- {224, 1909, 0, L"-"},
- {224, 2444, 0, L""},
- {225, 1910, 0, L""},
- {225, 1913, 0, L""},
- {225, 1912, 0, L""},
- {225, 3033, 0, L""},
- {225, 1911, 0, L""},
- {225, 2443, 0, L""},
- {39, 314, 0, L""},
- {39, 315, 0, L" ."},
- {39, 316, 0, L" ."},
- {39, 317, 0, L" ."},
- {39, 318, 0, L" ."},
- {39, 319, 0, L" ."},
- {39, 320, 0, L" ."},
- {39, 321, 0, L" ."},
- {39, 322, 0, L"- ."},
- {39, 323, 0, L" ."},
- {39, 324, 0, L" ."},
- {39, 325, 0, L""},
- {39, 326, 0, L" ."},
- {39, 327, 0, L" ."},
- {39, 328, 0, L" ."},
- {39, 329, 0, L" ."},
- {39, 330, 0, L" ."},
- {39, 331, 0, L" ."},
- {39, 332, 0, L" ."},
- {39, 333, 0, L" ."},
- {39, 334, 0, L" ."},
- {39, 335, 0, L" ."},
- {39, 336, 0, L" ."},
- {39, 337, 0, L" ."},
- {39, 338, 0, L" ."},
- {39, 339, 0, L" ."},
- {40, 602, 0, L" "},
- {40, 604, 0, L""},
- {40, 603, 0, L""},
- {40, 608, 0, L""},
- {40, 606, 0, L""},
- {40, 3099, 0, L"--"},
- {40, 605, 0, L""},
- {40, 3174, 0, L""},
- {40, 609, 0, L""},
- {40, 607, 0, L""},
- {40, 610, 0, L""},
- {40, 611, 0, L""},
- {40, 2541, 0, L""},
- {32, 612, 0, L""},
- {32, 2540, 0, L""},
- {33, 613, 0, L"--"},
- {33, 2539, 0, L""},
- {340, 341, 0, L""},
- {340, 342, 0, L" ."},
- {340, 343, 0, L" ."},
- {340, 344, 0, L" ."},
- {340, 345, 0, L" ."},
- {340, 346, 0, L" ."},
- {340, 347, 0, L" ."},
- {38, 760, 0, L""},
- {38, 767, 0, L""},
- {38, 762, 0, L""},
- {38, 761, 0, L""},
- {38, 763, 0, L""},
- {38, 769, 0, L""},
- {38, 765, 0, L""},
- {38, 764, 0, L""},
- {38, 3117, 0, L""},
- {38, 766, 0, L""},
- {38, 768, 0, L""},
- {38, 2532, 0, L""},
- {41, 3098, 0, L""},
- {41, 792, 0, L""},
- {41, 770, 0, L""},
- {41, 771, 0, L""},
- {41, 773, 0, L""},
- {41, 776, 0, L"-"},
- {41, 788, 0, L""},
- {41, 789, 0, L""},
- {41, 796, 0, L""},
- {41, 777, 0, L""},
- {41, 781, 0, L""},
- {41, 786, 0, L""},
- {41, 791, 0, L""},
- {41, 793, 0, L""},
- {41, 795, 0, L""},
- {41, 787, 0, L""},
- {41, 790, 0, L""},
- {41, 3133, 0, L""},
- {41, 794, 0, L""},
- {41, 782, 0, L""},
- {41, 780, 0, L""},
- {41, 779, 0, L""},
- {41, 774, 0, L""},
- {41, 784, 0, L""},
- {41, 772, 0, L""},
- {41, 775, 0, L""},
- {41, 3116, 0, L""},
- {41, 785, 0, L""},
- {41, 778, 0, L""},
- {41, 783, 0, L""},
- {41, 2531, 0, L""},
- {42, 797, 0, L"-"},
- {42, 799, 0, L""},
- {42, 798, 0, L""},
- {42, 800, 0, L""},
- {42, 2530, 0, L""},
- {45, 802, 0, L""},
- {45, 3075, 0, L""},
- {45, 801, 0, L""},
- {45, 804, 0, L""},
- {45, 803, 0, L""},
- {45, 805, 0, L""},
- {45, 3168, 0, L""},
- {45, 806, 0, L""},
- {45, 807, 0, L""},
- {45, 808, 0, L""},
- {45, 809, 0, L""},
- {45, 3131, 0, L""},
- {45, 810, 0, L""},
- {45, 3342, 0, L""},
- {45, 811, 0, L""},
- {45, 812, 0, L""},
- {45, 813, 0, L""},
- {45, 814, 0, L""},
- {45, 3089, 0, L""},
- {45, 815, 0, L""},
- {45, 816, 0, L""},
- {45, 817, 0, L""},
- {45, 818, 0, L""},
- {45, 819, 0, L""},
- {45, 820, 0, L""},
- {45, 2976, 0, L""},
- {45, 2988, 0, L""},
- {45, 821, 0, L""},
- {45, 3088, 0, L""},
- {45, 822, 0, L""},
- {45, 823, 0, L""},
- {45, 824, 0, L""},
- {45, 825, 0, L""},
- {45, 3343, 0, L""},
- {45, 2867, 0, L""},
- {45, 2986, 0, L"-"},
- {45, 826, 0, L""},
- {45, 3063, 0, L""},
- {45, 827, 0, L""},
- {45, 3140, 0, L""},
- {45, 828, 0, L""},
- {45, 829, 0, L""},
- {45, 830, 0, L""},
- {45, 2529, 0, L""},
- {44, 831, 0, L""},
- {44, 832, 0, L""},
- {44, 836, 0, L""},
- {44, 835, 0, L""},
- {44, 834, 0, L""},
- {44, 833, 0, L""},
- {44, 2528, 0, L""},
- {46, 3007, 0, L""},
- {46, 837, 0, L""},
- {46, 838, 0, L"-"},
- {46, 3371, 0, L""},
- {46, 839, 0, L"-"},
- {46, 840, 0, L""},
- {46, 841, 0, L""},
- {46, 3163, 0, L""},
- {46, 842, 0, L""},
- {46, 843, 0, L""},
- {46, 3015, 0, L""},
- {46, 844, 0, L""},
- {46, 2921, 0, L""},
- {46, 845, 0, L""},
- {46, 846, 0, L""},
- {46, 847, 0, L""},
- {46, 848, 0, L""},
- {46, 849, 0, L""},
- {46, 3010, 0, L""},
- {46, 850, 0, L""},
- {46, 851, 0, L""},
- {46, 3072, 0, L""},
- {46, 852, 0, L""},
- {46, 853, 0, L""},
- {46, 854, 0, L""},
- {46, 855, 0, L""},
- {46, 3082, 0, L""},
- {46, 3309, 0, L""},
- {46, 856, 0, L""},
- {46, 857, 0, L""},
- {46, 3138, 0, L""},
- {46, 858, 0, L""},
- {46, 859, 0, L""},
- {46, 2872, 0, L""},
- {46, 2965, 0, L""},
- {46, 3135, 0, L""},
- {46, 3156, 0, L""},
- {46, 3192, 0, L""},
- {46, 860, 0, L""},
- {46, 861, 0, L""},
- {46, 2864, 0, L""},
- {46, 862, 0, L""},
- {46, 3009, 0, L""},
- {46, 2993, 0, L""},
- {46, 863, 0, L""},
- {46, 864, 0, L""},
- {46, 865, 0, L""},
- {46, 866, 0, L""},
- {46, 3191, 0, L""},
- {46, 2974, 0, L"-"},
- {46, 3127, 0, L""},
- {46, 867, 0, L""},
- {46, 868, 0, L""},
- {46, 869, 0, L"--"},
- {46, 3373, 0, L""},
- {46, 3313, 0, L""},
- {46, 870, 0, L""},
- {46, 3045, 0, L""},
- {46, 2906, 0, L""},
- {46, 2527, 0, L""},
- {48, 871, 0, L""},
- {48, 873, 0, L""},
- {48, 3147, 0, L""},
- {48, 872, 0, L""},
- {48, 3178, 0, L""},
- {48, 2526, 0, L""},
- {49, 3006, 0, L""},
- {49, 874, 0, L""},
- {49, 875, 0, L""},
- {49, 3285, 0, L""},
- {49, 876, 0, L""},
- {49, 3126, 0, L""},
- {49, 2525, 0, L""},
- {50, 3377, 0, L""},
- {50, 3067, 0, L""},
- {50, 877, 0, L""},
- {50, 3065, 0, L""},
- {50, 3066, 0, L""},
- {50, 878, 0, L""},
- {50, 3069, 0, L""},
- {50, 3068, 0, L""},
- {50, 2524, 0, L""},
- {51, 879, 0, L""},
- {51, 2523, 0, L""},
- {34, 880, 0, L""},
- {34, 3125, 0, L""},
- {34, 881, 0, L""},
- {34, 890, 0, L""},
- {34, 3076, 0, L""},
- {34, 882, 0, L""},
- {34, 3070, 0, L""},
- {34, 888, 0, L""},
- {34, 886, 0, L""},
- {34, 891, 0, L"-"},
- {34, 3310, 0, L" "},
- {34, 883, 0, L""},
- {34, 884, 0, L""},
- {34, 885, 0, L""},
- {34, 892, 0, L""},
- {34, 3179, 0, L" "},
- {34, 3177, 0, L"-"},
- {34, 3289, 0, L"---"},
- {34, 889, 0, L""},
- {34, 887, 0, L""},
- {34, 893, 0, L""},
- {34, 2522, 0, L""},
- {52, 3318, 0, L""},
- {52, 3278, 0, L""},
- {52, 906, 0, L""},
- {52, 894, 0, L""},
- {52, 895, 0, L""},
- {52, 905, 0, L""},
- {52, 896, 0, L""},
- {52, 897, 0, L""},
- {52, 3369, 0, L""},
- {52, 3327, 0, L""},
- {52, 898, 0, L""},
- {52, 899, 0, L""},
- {52, 907, 0, L""},
- {52, 908, 0, L""},
- {52, 900, 0, L""},
- {52, 901, 0, L""},
- {52, 3368, 0, L"-"},
- {52, 3384, 0, L""},
- {52, 3252, 0, L""},
- {52, 902, 0, L""},
- {52, 903, 0, L""},
- {52, 3130, 0, L""},
- {52, 904, 0, L""},
- {52, 2521, 0, L""},
- {53, 2939, 0, L""},
- {53, 3054, 0, L""},
- {53, 909, 0, L""},
- {53, 2934, 0, L""},
- {53, 913, 0, L""},
- {53, 2935, 0, L""},
- {53, 912, 0, L""},
- {53, 2905, 0, L""},
- {53, 911, 0, L""},
- {53, 2936, 0, L""},
- {53, 2937, 0, L""},
- {53, 910, 0, L""},
- {53, 2520, 0, L""},
- {54, 914, 0, L""},
- {54, 915, 0, L""},
- {54, 916, 0, L""},
- {54, 918, 0, L""},
- {54, 919, 0, L""},
- {54, 3173, 0, L""},
- {54, 917, 0, L""},
- {54, 2519, 0, L""},
- {55, 920, 0, L""},
- {55, 2518, 0, L""},
- {56, 3376, 0, L""},
- {56, 921, 0, L""},
- {56, 2517, 0, L""},
- {57, 3142, 0, L""},
- {57, 922, 0, L""},
- {57, 2516, 0, L""},
- {58, 923, 0, L""},
- {58, 3154, 0, L""},
- {58, 924, 0, L""},
- {58, 2515, 0, L""},
- {59, 925, 0, L""},
- {59, 926, 0, L""},
- {59, 3234, 0, L""},
- {59, 3275, 0, L""},
- {59, 927, 0, L""},
- {59, 3321, 0, L""},
- {59, 928, 0, L""},
- {59, 929, 0, L""},
- {59, 3281, 0, L"-"},
- {59, 2514, 0, L""},
- {36, 930, 0, L"-"},
- {36, 2513, 0, L""},
- {60, 931, 0, L""},
- {60, 933, 0, L""},
- {60, 932, 0, L""},
- {60, 934, 0, L""},
- {60, 935, 0, L""},
- {60, 2977, 0, L""},
- {60, 3030, 0, L""},
- {60, 3091, 0, L""},
- {60, 936, 0, L""},
- {60, 937, 0, L""},
- {60, 3044, 0, L""},
- {60, 3380, 0, L""},
- {60, 2512, 0, L""},
- {61, 3190, 0, L""},
- {61, 2857, 0, L""},
- {61, 938, 0, L""},
- {61, 3355, 0, L""},
- {61, 939, 0, L""},
- {61, 2511, 0, L""},
- {62, 940, 0, L""},
- {62, 941, 0, L""},
- {62, 3164, 0, L""},
- {62, 942, 0, L""},
- {62, 943, 0, L""},
- {62, 3237, 0, L""},
- {62, 3165, 0, L" "},
- {62, 944, 0, L""},
- {62, 945, 0, L""},
- {62, 3008, 0, L""},
- {62, 3150, 0, L""},
- {62, 946, 0, L""},
- {62, 947, 0, L""},
- {62, 948, 0, L""},
- {62, 2958, 0, L""},
- {62, 2510, 0, L""},
- {35, 949, 0, L""},
- {35, 950, 0, L""},
- {35, 2509, 0, L""},
- {63, 952, 0, L""},
- {63, 951, 0, L""},
- {63, 954, 0, L""},
- {63, 955, 0, L""},
- {63, 953, 0, L""},
- {63, 2508, 0, L""},
- {64, 956, 0, L"-"},
- {64, 2507, 0, L""},
- {74, 957, 0, L""},
- {74, 960, 0, L""},
- {74, 958, 0, L"-"},
- {74, 959, 0, L""},
- {74, 2506, 0, L""},
- {65, 961, 0, L""},
- {65, 962, 0, L""},
- {65, 3101, 0, L""},
- {65, 963, 0, L""},
- {65, 964, 0, L""},
- {65, 965, 0, L""},
- {65, 966, 0, L""},
- {65, 2505, 0, L""},
- {66, 968, 0, L""},
- {66, 967, 0, L""},
- {66, 969, 0, L""},
- {66, 2504, 0, L""},
- {67, 970, 0, L""},
- {67, 2503, 0, L""},
- {68, 2888, 0, L""},
- {68, 971, 0, L""},
- {68, 979, 0, L""},
- {68, 972, 0, L""},
- {68, 980, 0, L""},
- {68, 973, 0, L""},
- {68, 3375, 0, L""},
- {68, 3159, 0, L""},
- {68, 974, 0, L""},
- {68, 975, 0, L""},
- {68, 976, 0, L""},
- {68, 977, 0, L""},
- {68, 978, 0, L""},
- {68, 2502, 0, L""},
- {37, 996, 0, L""},
- {37, 983, 0, L""},
- {37, 997, 0, L""},
- {37, 984, 0, L""},
- {37, 998, 0, L""},
- {37, 987, 0, L""},
- {37, 988, 0, L""},
- {37, 993, 0, L"-"},
- {37, 3037, 0, L""},
- {37, 989, 0, L""},
- {37, 985, 0, L""},
- {37, 991, 0, L""},
- {37, 3161, 0, L""},
- {37, 990, 0, L""},
- {37, 994, 0, L""},
- {37, 995, 0, L""},
- {37, 999, 0, L""},
- {37, 981, 0, L""},
- {37, 3374, 0, L""},
- {37, 992, 0, L""},
- {37, 982, 0, L""},
- {37, 986, 0, L""},
- {37, 3314, 0, L""},
- {37, 2501, 0, L""},
- {69, 1003, 0, L""},
- {69, 1000, 0, L""},
- {69, 1001, 0, L""},
- {69, 1004, 0, L""},
- {69, 1002, 0, L""},
- {69, 2500, 0, L""},
- {70, 1005, 0, L""},
- {70, 3291, 0, L"-"},
- {70, 1007, 0, L"-"},
- {70, 1008, 0, L"-"},
- {70, 3019, 0, L""},
- {70, 1010, 0, L""},
- {70, 1009, 0, L""},
- {70, 1015, 0, L""},
- {70, 3105, 0, L" "},
- {70, 1006, 0, L""},
- {70, 3246, 0, L""},
- {70, 1011, 0, L""},
- {70, 1012, 0, L"--"},
- {70, 1014, 0, L"-"},
- {70, 1013, 0, L"--"},
- {70, 2499, 0, L""},
- {71, 1016, 0, L""},
- {71, 1019, 0, L""},
- {71, 1017, 0, L""},
- {71, 1018, 0, L""},
- {71, 1020, 0, L""},
- {71, 1021, 0, L""},
- {71, 1022, 0, L""},
- {71, 3189, 0, L""},
- {71, 1023, 0, L""},
- {71, 1024, 0, L""},
- {71, 1025, 0, L""},
- {71, 1026, 0, L""},
- {71, 1027, 0, L""},
- {71, 1028, 0, L""},
- {71, 1029, 0, L""},
- {71, 1030, 0, L""},
- {71, 2498, 0, L""},
- {72, 2883, 0, L""},
- {72, 1031, 0, L""},
- {72, 1032, 0, L""},
- {72, 1037, 0, L""},
- {72, 1036, 0, L""},
- {72, 1042, 0, L""},
- {72, 1033, 0, L""},
- {72, 1034, 0, L""},
- {72, 1041, 0, L""},
- {72, 1039, 0, L""},
- {72, 1043, 0, L""},
- {72, 1040, 0, L""},
- {72, 1038, 0, L""},
- {72, 2497, 0, L""},
- {73, 3013, 0, L""},
- {73, 1044, 0, L""},
- {73, 1045, 0, L"-"},
- {73, 1046, 0, L""},
- {73, 1047, 0, L""},
- {73, 1048, 0, L""},
- {73, 1049, 0, L""},
- {73, 1050, 0, L""},
- {73, 1051, 0, L""},
- {73, 1052, 0, L""},
- {73, 1053, 0, L""},
- {73, 1054, 0, L""},
- {24, 233, 474, L""},
- {24, 233, 2809, L""},
- {24, 233, 2804, L""},
- {24, 233, 475, L""},
- {24, 233, 477, L""},
- {24, 233, 476, L""},
- {24, 233, 2806, L""},
- {24, 233, 3115, L""},
- {24, 233, 2808, L""},
- {24, 233, 2807, L""},
- {24, 233, 2805, L""},
- {24, 233, 478, L"-"},
- {24, 233, 479, L""},
- {24, 233, 2263, L""},
- {24, 232, 2819, L""},
- {24, 232, 464, L""},
- {24, 232, 465, L" "},
- {24, 232, 466, L""},
- {24, 232, 2817, L""},
- {24, 232, 2818, L""},
- {24, 232, 3359, L""},
- {24, 232, 467, L"-"},
- {24, 232, 468, L""},
- {24, 232, 469, L""},
- {24, 232, 470, L""},
- {24, 232, 471, L""},
- {24, 232, 472, L""},
- {24, 232, 2816, L"-"},
- {24, 232, 473, L""},
- {24, 232, 2258, L""},
- {24, 235, 487, L""},
- {24, 235, 2821, L""},
- {24, 235, 488, L""},
- {24, 235, 2820, L""},
- {24, 235, 489, L"--"},
- {24, 235, 490, L"--"},
- {24, 235, 491, L" "},
- {24, 235, 3353, L""},
- {24, 235, 492, L""},
- {24, 235, 2280, L""},
- {24, 227, 455, L""},
- {24, 227, 456, L""},
- {24, 227, 2814, L""},
- {24, 227, 2813, L""},
- {24, 227, 2815, L""},
- {24, 227, 2812, L""},
- {24, 227, 2811, L""},
- {24, 227, 457, L""},
- {24, 227, 2217, L""},
- {24, 227, 2218, L""},
- {24, 229, 460, L""},
- {24, 229, 2822, L""},
- {24, 229, 459, L"-."},
- {24, 229, 2234, L""},
- {24, 231, 462, L""},
- {24, 231, 2823, L""},
- {24, 231, 463, L""},
- {24, 231, 2246, L""},
- {24, 234, 480, L"-"},
- {24, 234, 2829, L""},
- {24, 234, 2833, L""},
- {24, 234, 2825, L""},
- {24, 234, 481, L""},
- {24, 234, 482, L""},
- {24, 234, 2826, L""},
- {24, 234, 2832, L""},
- {24, 234, 2836, L""},
- {24, 234, 2830, L""},
- {24, 234, 483, L""},
- {24, 234, 2828, L""},
- {24, 234, 2824, L"-"},
- {24, 234, 2827, L""},
- {24, 234, 2831, L""},
- {24, 234, 484, L""},
- {24, 234, 2834, L""},
- {24, 234, 2835, L""},
- {24, 234, 485, L"-"},
- {24, 234, 486, L"-"},
- {24, 234, 2264, L""},
- {24, 228, 458, L""},
- {24, 228, 2810, L""},
- {24, 228, 2226, L""},
- {24, 230, 461, L""},
- {24, 230, 2239, L""},
- {24, 236, 493, L""},
- {24, 236, 2287, L""},
- {24, 237, 2850, L""},
- {24, 237, 2851, L""},
- {24, 237, 2657, L""},
- {24, 237, 2662, L""},
- {24, 237, 494, L""},
- {24, 237, 2658, L""},
- {24, 237, 2660, L""},
- {24, 237, 2659, L""},
- {24, 237, 2663, L""},
- {24, 237, 495, L""},
- {24, 237, 496, L""},
- {24, 237, 2655, L""},
- {24, 237, 497, L""},
- {24, 237, 2654, L""},
- {24, 237, 499, L""},
- {24, 237, 2656, L""},
- {24, 237, 498, L""},
- {24, 237, 500, L""},
- {24, 237, 2661, L""},
- {24, 237, 501, L""},
- {24, 237, 502, L""},
- {24, 237, 2664, L""},
- {24, 237, 2220, L""},
- {24, 240, 509, L""},
- {24, 240, 510, L""},
- {24, 240, 511, L"-"},
- {24, 240, 512, L""},
- {24, 240, 2247, L""},
- {24, 241, 513, L" "},
- {24, 241, 2147, L""},
- {24, 241, 2150, L""},
- {24, 241, 2148, L""},
- {24, 241, 2910, L""},
- {24, 241, 515, L""},
- {24, 241, 514, L""},
- {24, 241, 2149, L""},
- {24, 241, 2923, L""},
- {24, 241, 2248, L""},
- {24, 248, 2569, L""},
- {24, 248, 2575, L""},
- {24, 248, 569, L""},
- {24, 248, 570, L""},
- {24, 248, 2571, L""},
- {24, 248, 571, L""},
- {24, 248, 2570, L""},
- {24, 248, 572, L""},
- {24, 248, 573, L""},
- {24, 248, 2576, L""},
- {24, 248, 574, L""},
- {24, 248, 575, L""},
- {24, 248, 2577, L""},
- {24, 248, 2572, L""},
- {24, 248, 576, L""},
- {24, 248, 2573, L""},
- {24, 248, 577, L" "},
- {24, 248, 578, L""},
- {24, 248, 579, L""},
- {24, 248, 2574, L""},
- {24, 248, 580, L""},
- {24, 248, 2271, L""},
- {24, 249, 3311, L""},
- {24, 249, 581, L""},
- {24, 249, 582, L""},
- {24, 249, 583, L""},
- {24, 249, 584, L""},
- {24, 249, 2665, L""},
- {24, 249, 585, L""},
- {24, 249, 586, L""},
- {24, 249, 587, L""},
- {24, 249, 2277, L""},
- {24, 251, 2158, L""},
- {24, 251, 2156, L""},
- {24, 251, 2151, L""},
- {24, 251, 2152, L" "},
- {24, 251, 2155, L""},
- {24, 251, 2153, L""},
- {24, 251, 592, L""},
- {24, 251, 2157, L""},
- {24, 251, 2154, L""},
- {24, 251, 2286, L""},
- {24, 238, 2168, L" "},
- {24, 238, 503, L" "},
- {24, 238, 2164, L""},
- {24, 238, 504, L""},
- {24, 238, 505, L"-"},
- {24, 238, 2160, L""},
- {24, 238, 506, L""},
- {24, 238, 2167, L""},
- {24, 238, 2159, L""},
- {24, 238, 2169, L""},
- {24, 238, 2163, L""},
- {24, 238, 2170, L""},
- {24, 238, 2166, L""},
- {24, 238, 2165, L""},
- {24, 238, 2162, L""},
- {24, 238, 2171, L""},
- {24, 238, 2161, L""},
- {24, 238, 507, L""},
- {24, 238, 2237, L""},
- {24, 242, 516, L""},
- {24, 242, 517, L""},
- {24, 242, 2139, L""},
- {24, 242, 518, L""},
- {24, 242, 519, L""},
- {24, 242, 520, L""},
- {24, 242, 2140, L""},
- {24, 242, 2138, L""},
- {24, 242, 521, L""},
- {24, 242, 2137, L""},
- {24, 242, 522, L""},
- {24, 242, 523, L""},
- {24, 242, 524, L""},
- {24, 242, 2891, L""},
- {24, 242, 525, L""},
- {24, 242, 2145, L""},
- {24, 242, 2143, L""},
- {24, 242, 2144, L""},
- {24, 242, 2146, L""},
- {24, 242, 526, L" "},
- {24, 242, 527, L""},
- {24, 242, 2135, L""},
- {24, 242, 528, L""},
- {24, 242, 529, L""},
- {24, 242, 530, L""},
- {24, 242, 2141, L""},
- {24, 242, 2136, L""},
- {24, 242, 2897, L""},
- {24, 242, 2142, L""},
- {24, 242, 2251, L""},
- {24, 243, 2678, L""},
- {24, 243, 2673, L""},
- {24, 243, 531, L""},
- {24, 243, 532, L""},
- {24, 243, 2674, L""},
- {24, 243, 2675, L""},
- {24, 243, 533, L""},
- {24, 243, 535, L""},
- {24, 243, 536, L""},
- {24, 243, 3360, L""},
- {24, 243, 2677, L"-"},
- {24, 243, 2676, L""},
- {24, 243, 537, L""},
- {24, 243, 538, L""},
- {24, 243, 2254, L""},
- {24, 244, 539, L""},
- {24, 244, 2597, L""},
- {24, 244, 2595, L""},
- {24, 244, 2593, L""},
- {24, 244, 540, L""},
- {24, 244, 2598, L" "},
- {24, 244, 2592, L""},
- {24, 244, 541, L""},
- {24, 244, 3304, L" "},
- {24, 244, 2596, L""},
- {24, 244, 2594, L""},
- {24, 244, 2256, L""},
- {24, 245, 2690, L""},
- {24, 245, 542, L""},
- {24, 245, 2679, L""},
- {24, 245, 2680, L""},
- {24, 245, 2687, L""},
- {24, 245, 2686, L""},
- {24, 245, 543, L""},
- {24, 245, 544, L""},
- {24, 245, 2681, L""},
- {24, 245, 545, L""},
- {24, 245, 546, L""},
- {24, 245, 547, L""},
- {24, 245, 548, L""},
- {24, 245, 2683, L""},
- {24, 245, 2684, L""},
- {24, 245, 2682, L""},
- {24, 245, 549, L""},
- {24, 245, 550, L""},
- {24, 245, 2685, L""},
- {24, 245, 551, L""},
- {24, 245, 2689, L""},
- {24, 245, 2688, L""},
- {24, 245, 552, L""},
- {24, 245, 553, L""},
- {24, 245, 2257, L""},
- {24, 246, 554, L""},
- {24, 246, 555, L""},
- {24, 246, 2599, L""},
- {24, 246, 3293, L" "},
- {24, 246, 2602, L""},
- {24, 246, 556, L""},
- {24, 246, 2600, L""},
- {24, 246, 557, L""},
- {24, 246, 558, L""},
- {24, 246, 559, L""},
- {24, 246, 560, L""},
- {24, 246, 561, L""},
- {24, 246, 2601, L""},
- {24, 246, 562, L""},
- {24, 246, 2261, L""},
- {24, 247, 2613, L""},
- {24, 247, 2606, L""},
- {24, 247, 563, L""},
- {24, 247, 564, L""},
- {24, 247, 565, L""},
- {24, 247, 2608, L""},
- {24, 247, 2607, L""},
- {24, 247, 2609, L""},
- {24, 247, 2610, L" "},
- {24, 247, 2605, L""},
- {24, 247, 566, L""},
- {24, 247, 2603, L""},
- {24, 247, 2604, L""},
- {24, 247, 2612, L""},
- {24, 247, 567, L""},
- {24, 247, 2611, L""},
- {24, 247, 568, L""},
- {24, 247, 3267, L"-12"},
- {24, 247, 2262, L""},
- {24, 250, 2614, L""},
- {24, 250, 588, L""},
- {24, 250, 2615, L""},
- {24, 250, 589, L""},
- {24, 250, 2616, L""},
- {24, 250, 590, L""},
- {24, 250, 591, L""},
- {24, 250, 2278, L""},
- {24, 239, 508, L""},
- {24, 239, 2238, L""},
- {24, 255, 1355, L""},
- {24, 255, 1356, L""},
- {24, 255, 1357, L""},
- {24, 255, 1358, L""},
- {24, 255, 1359, L""},
- {24, 255, 1360, L""},
- {24, 255, 1362, L""},
- {24, 255, 1361, L""},
- {24, 255, 3286, L""},
- {24, 255, 1937, L""},
- {24, 255, 1363, L""},
- {24, 255, 1938, L""},
- {24, 255, 3287, L""},
- {24, 255, 1936, L""},
- {24, 255, 1364, L""},
- {24, 255, 1365, L""},
- {24, 255, 1939, L""},
- {24, 255, 2201, L""},
- {24, 256, 1366, L""},
- {24, 256, 1367, L""},
- {24, 256, 2202, L""},
- {24, 256, 1368, L""},
- {24, 256, 1940, L""},
- {24, 256, 1369, L""},
- {24, 256, 1941, L""},
- {24, 256, 1370, L""},
- {24, 256, 1371, L""},
- {24, 256, 1372, L""},
- {24, 256, 2203, L""},
- {24, 252, 593, L""},
- {24, 252, 594, L""},
- {24, 252, 1945, L""},
- {24, 252, 595, L""},
- {24, 252, 596, L""},
- {24, 252, 1944, L""},
- {24, 252, 597, L""},
- {24, 252, 598, L""},
- {24, 252, 1946, L""},
- {24, 252, 599, L""},
- {24, 252, 600, L""},
- {24, 252, 601, L""},
- {24, 252, 1942, L""},
- {24, 252, 3239, L""},
- {24, 252, 1943, L""},
- {24, 252, 2204, L""},
- {24, 253, 1950, L""},
- {24, 253, 1949, L""},
- {24, 253, 1338, L" "},
- {24, 253, 1339, L""},
- {24, 253, 1951, L""},
- {24, 253, 1340, L""},
- {24, 253, 1952, L""},
- {24, 253, 2871, L""},
- {24, 253, 1341, L""},
- {24, 253, 1955, L""},
- {24, 253, 1342, L""},
- {24, 253, 1947, L""},
- {24, 253, 1343, L""},
- {24, 253, 1953, L""},
- {24, 253, 1954, L""},
- {24, 253, 1948, L""},
- {24, 253, 1344, L""},
- {24, 253, 2205, L""},
- {24, 254, 2838, L""},
- {24, 254, 1345, L""},
- {24, 254, 2846, L""},
- {24, 254, 2843, L""},
- {24, 254, 1346, L""},
- {24, 254, 1347, L""},
- {24, 254, 1348, L""},
- {24, 254, 2842, L""},
- {24, 254, 2845, L""},
- {24, 254, 2848, L""},
- {24, 254, 2837, L""},
- {24, 254, 2844, L""},
- {24, 254, 1349, L""},
- {24, 254, 2841, L""},
- {24, 254, 2839, L""},
- {24, 254, 1350, L""},
- {24, 254, 1351, L""},
- {24, 254, 1352, L""},
- {24, 254, 2840, L""},
- {24, 254, 1353, L""},
- {24, 254, 1354, L""},
- {24, 254, 2231, L""},
- {24, 257, 1985, L""},
- {24, 257, 1374, L""},
- {24, 257, 1373, L""},
- {24, 257, 1375, L""},
- {24, 257, 1995, L""},
- {24, 257, 1376, L""},
- {24, 257, 1378, L""},
- {24, 257, 1993, L""},
- {24, 257, 1379, L""},
- {24, 257, 1380, L""},
- {24, 257, 1381, L""},
- {24, 257, 1384, L""},
- {24, 257, 1984, L" "},
- {24, 257, 1990, L""},
- {24, 257, 1994, L""},
- {24, 257, 1386, L""},
- {24, 257, 1987, L" "},
- {24, 257, 1996, L""},
- {24, 257, 1986, L""},
- {24, 257, 1983, L""},
- {24, 257, 1992, L""},
- {24, 257, 1988, L""},
- {24, 257, 3071, L""},
- {24, 257, 1989, L""},
- {24, 257, 1389, L""},
- {24, 257, 1991, L""},
- {24, 257, 1391, L" "},
- {24, 257, 1392, L""},
- {24, 257, 1393, L""},
- {24, 257, 1394, L""},
- {24, 257, 2207, L""},
- {24, 258, 1395, L""},
- {24, 258, 1959, L""},
- {24, 258, 1396, L""},
- {24, 258, 1397, L""},
- {24, 258, 1398, L""},
- {24, 258, 1399, L""},
- {24, 258, 1958, L""},
- {24, 258, 1400, L""},
- {24, 258, 1401, L""},
- {24, 258, 1402, L""},
- {24, 258, 1403, L""},
- {24, 258, 1404, L" "},
- {24, 258, 1956, L""},
- {24, 258, 1957, L""},
- {24, 258, 3288, L""},
- {24, 258, 2206, L""},
- {24, 260, 1406, L""},
- {24, 260, 2001, L""},
- {24, 260, 2003, L""},
- {24, 260, 1407, L" "},
- {24, 260, 1408, L""},
- {24, 260, 2002, L" "},
- {24, 260, 1409, L""},
- {24, 260, 2000, L""},
- {24, 260, 1997, L""},
- {24, 260, 1410, L" "},
- {24, 260, 1998, L""},
- {24, 260, 1999, L""},
- {24, 260, 2208, L""},
- {24, 261, 1412, L" "},
- {24, 261, 2004, L""},
- {24, 261, 2009, L""},
- {24, 261, 2005, L""},
- {24, 261, 1413, L""},
- {24, 261, 2006, L""},
- {24, 261, 2008, L""},
- {24, 261, 1414, L""},
- {24, 261, 1415, L""},
- {24, 261, 1411, L""},
- {24, 261, 1416, L""},
- {24, 261, 2007, L""},
- {24, 261, 1417, L""},
- {24, 261, 2209, L""},
- {24, 259, 1405, L"-"},
- {24, 259, 2250, L""},
- {24, 265, 2764, L""},
- {24, 265, 2760, L""},
- {24, 265, 2762, L""},
- {24, 265, 2763, L""},
- {24, 265, 2761, L""},
- {24, 265, 1446, L"-"},
- {24, 265, 2222, L""},
- {24, 263, 1439, L"-"},
- {24, 263, 2215, L""},
- {24, 273, 2766, L"-"},
- {24, 273, 1494, L""},
- {24, 273, 2768, L" "},
- {24, 273, 2767, L""},
- {24, 273, 2765, L""},
- {24, 273, 2275, L""},
- {24, 275, 2769, L""},
- {24, 275, 1496, L""},
- {24, 275, 1497, L""},
- {24, 275, 2770, L""},
- {24, 275, 2771, L""},
- {24, 275, 2281, L""},
- {24, 264, 1440, L""},
- {24, 264, 1441, L""},
- {24, 264, 1442, L""},
- {24, 264, 1443, L""},
- {24, 264, 2728, L""},
- {24, 264, 2731, L""},
- {24, 264, 2729, L""},
- {24, 264, 2732, L"--"},
- {24, 264, 3292, L""},
- {24, 264, 2730, L""},
- {24, 264, 1444, L""},
- {24, 264, 1445, L""},
- {24, 264, 3231, L""},
- {24, 264, 2216, L""},
- {24, 268, 2781, L""},
- {24, 268, 1469, L""},
- {24, 268, 2784, L""},
- {24, 268, 2773, L""},
- {24, 268, 2774, L""},
- {24, 268, 3122, L""},
- {24, 268, 2772, L""},
- {24, 268, 3294, L""},
- {24, 268, 2777, L""},
- {24, 268, 1470, L""},
- {24, 268, 2778, L""},
- {24, 268, 2782, L""},
- {24, 268, 2783, L""},
- {24, 268, 1471, L""},
- {24, 268, 1472, L""},
- {24, 268, 1473, L""},
- {24, 268, 2775, L""},
- {24, 268, 2776, L""},
- {24, 268, 2780, L""},
- {24, 268, 2779, L""},
- {24, 268, 2785, L""},
- {24, 268, 1474, L""},
- {24, 268, 2242, L""},
- {24, 266, 2792, L""},
- {24, 266, 1447, L""},
- {24, 266, 1448, L""},
- {24, 266, 2791, L""},
- {24, 266, 1450, L""},
- {24, 266, 1451, L""},
- {24, 266, 2793, L""},
- {24, 266, 2789, L"-"},
- {24, 266, 2786, L""},
- {24, 266, 1452, L""},
- {24, 266, 2794, L""},
- {24, 266, 2787, L""},
- {24, 266, 1449, L""},
- {24, 266, 2790, L""},
- {24, 266, 1453, L""},
- {24, 266, 2788, L""},
- {24, 266, 1454, L""},
- {24, 266, 1455, L"-"},
- {24, 266, 2908, L""},
- {24, 266, 1456, L"-"},
- {24, 266, 1457, L"-"},
- {24, 266, 1458, L""},
- {24, 266, 1459, L""},
- {24, 266, 2795, L""},
- {24, 266, 2229, L""},
- {24, 267, 2737, L"-"},
- {24, 267, 2740, L""},
- {24, 267, 2746, L""},
- {24, 267, 2739, L""},
- {24, 267, 2742, L""},
- {24, 267, 1460, L""},
- {24, 267, 1461, L""},
- {24, 267, 2738, L"-"},
- {24, 267, 2745, L""},
- {24, 267, 1462, L""},
- {24, 267, 1463, L""},
- {24, 267, 1464, L""},
- {24, 267, 2744, L""},
- {24, 267, 3358, L""},
- {24, 267, 1465, L""},
- {24, 267, 1466, L""},
- {24, 267, 2743, L""},
- {24, 267, 2741, L""},
- {24, 267, 1467, L""},
- {24, 267, 1468, L""},
- {24, 267, 2236, L""},
- {24, 269, 1475, L""},
- {24, 269, 1476, L""},
- {24, 269, 1477, L""},
- {24, 269, 2750, L""},
- {24, 269, 1478, L""},
- {24, 269, 2752, L""},
- {24, 269, 2751, L""},
- {24, 269, 3107, L""},
- {24, 269, 2753, L""},
- {24, 269, 2755, L""},
- {24, 269, 1479, L""},
- {24, 269, 2759, L""},
- {24, 269, 2756, L""},
- {24, 269, 2758, L""},
- {24, 269, 2757, L""},
- {24, 269, 2754, L""},
- {24, 269, 2252, L""},
- {24, 270, 2733, L""},
- {24, 270, 1480, L""},
- {24, 270, 1481, L""},
- {24, 270, 2735, L""},
- {24, 270, 1482, L""},
- {24, 270, 2734, L""},
- {24, 270, 2736, L""},
- {24, 270, 2253, L""},
- {24, 272, 1488, L""},
- {24, 272, 1489, L" "},
- {24, 272, 3295, L""},
- {24, 272, 1491, L""},
- {24, 272, 1492, L""},
- {24, 272, 1493, L""},
- {24, 272, 1490, L""},
- {24, 272, 2273, L""},
- {24, 276, 2803, L""},
- {24, 276, 2799, L""},
- {24, 276, 1499, L""},
- {24, 276, 2801, L""},
- {24, 276, 2800, L""},
- {24, 276, 2802, L"-"},
- {24, 276, 2798, L""},
- {24, 276, 2796, L""},
- {24, 276, 1498, L""},
- {24, 276, 2797, L""},
- {24, 276, 2285, L""},
- {24, 262, 1438, L""},
- {24, 262, 2213, L""},
- {24, 271, 3233, L""},
- {24, 271, 1485, L""},
- {24, 271, 1487, L""},
- {24, 271, 1483, L""},
- {24, 271, 1484, L""},
- {24, 271, 1486, L""},
- {24, 271, 2269, L""},
- {24, 274, 1495, L"-"},
- {24, 274, 2279, L""},
- {24, 277, 1500, L""},
- {24, 277, 2288, L""},
- {24, 278, 2668, L""},
- {24, 278, 2667, L""},
- {24, 278, 1524, L""},
- {24, 278, 2669, L""},
- {24, 278, 2666, L""},
- {24, 278, 2671, L""},
- {24, 278, 1525, L""},
- {24, 278, 2670, L""},
- {24, 278, 2672, L""},
- {24, 278, 2243, L""},
- {24, 279, 1526, L""},
- {24, 279, 1527, L""},
- {24, 279, 2691, L""},
- {24, 279, 1528, L""},
- {24, 279, 2924, L""},
- {24, 279, 2707, L""},
- {24, 279, 1529, L""},
- {24, 279, 2698, L" "},
- {24, 279, 1530, L" "},
- {24, 279, 1531, L" "},
- {24, 279, 1532, L" "},
- {24, 279, 2696, L" "},
- {24, 279, 2692, L""},
- {24, 279, 2706, L""},
- {24, 279, 2709, L""},
- {24, 279, 1533, L""},
- {24, 279, 1534, L""},
- {24, 279, 1535, L""},
- {24, 279, 1536, L""},
- {24, 279, 1537, L"-"},
- {24, 279, 1538, L""},
- {24, 279, 2708, L""},
- {24, 279, 1539, L""},
- {24, 279, 2712, L""},
- {24, 279, 1540, L""},
- {24, 279, 2694, L""},
- {24, 279, 2693, L""},
- {24, 279, 1541, L""},
- {24, 279, 2711, L""},
- {24, 279, 2713, L""},
- {24, 279, 1542, L""},
- {24, 279, 2702, L" "},
- {24, 279, 1543, L" "},
- {24, 279, 2695, L" "},
- {24, 279, 2697, L" "},
- {24, 279, 2699, L" "},
- {24, 279, 2909, L""},
- {24, 279, 1544, L""},
- {24, 279, 1545, L""},
- {24, 279, 1546, L""},
- {24, 279, 1547, L""},
- {24, 279, 3296, L""},
- {24, 279, 2700, L""},
- {24, 279, 1548, L""},
- {24, 279, 2710, L""},
- {24, 279, 2701, L" "},
- {24, 279, 2703, L""},
- {24, 279, 1549, L""},
- {24, 279, 2704, L""},
- {24, 279, 2705, L""},
- {24, 279, 2265, L""},
- {24, 280, 1550, L""},
- {24, 280, 1551, L""},
- {24, 280, 3326, L""},
- {24, 280, 1552, L""},
- {24, 280, 1553, L""},
- {24, 280, 2748, L""},
- {24, 280, 2276, L""},
- {24, 282, 1564, L""},
- {24, 282, 2723, L""},
- {24, 282, 2724, L""},
- {24, 282, 2716, L" "},
- {24, 282, 3297, L""},
- {24, 282, 2725, L""},
- {24, 282, 1565, L""},
- {24, 282, 2722, L""},
- {24, 282, 1566, L""},
- {24, 282, 2718, L""},
- {24, 282, 2720, L"-"},
- {24, 282, 1567, L""},
- {24, 282, 2721, L""},
- {24, 282, 2715, L""},
- {24, 282, 1568, L""},
- {24, 282, 1569, L""},
- {24, 282, 1570, L""},
- {24, 282, 2726, L""},
- {24, 282, 2717, L""},
- {24, 282, 3100, L""},
- {24, 282, 1571, L""},
- {24, 282, 2719, L""},
- {24, 282, 2727, L""},
- {24, 282, 1572, L""},
- {24, 282, 3332, L""},
- {24, 282, 1573, L""},
- {24, 282, 1574, L"-"},
- {24, 282, 1575, L""},
- {24, 282, 1576, L""},
- {24, 282, 1577, L""},
- {24, 282, 2714, L""},
- {24, 282, 2283, L""},
- {24, 281, 2749, L""},
- {24, 281, 1554, L""},
- {24, 281, 1555, L""},
- {24, 281, 1556, L""},
- {24, 281, 1561, L""},
- {24, 281, 1562, L""},
- {24, 281, 1559, L""},
- {24, 281, 2852, L""},
- {24, 281, 2853, L""},
- {24, 281, 2854, L"-"},
- {24, 281, 1560, L""},
- {24, 281, 1563, L""},
- {24, 281, 2747, L""},
- {24, 281, 1557, L""},
- {24, 281, 1558, L"-"},
- {24, 281, 3344, L""},
- {24, 281, 2282, L""},
- {24, 283, 3298, L""},
- {24, 283, 1578, L""},
- {24, 283, 2856, L""},
- {24, 283, 1579, L""},
- {24, 283, 1580, L" "},
- {24, 283, 1581, L""},
- {24, 283, 1582, L""},
- {24, 283, 1583, L""},
- {24, 283, 2289, L""},
- {24, 284, 1625, L""},
- {24, 284, 1626, L""},
- {24, 284, 2172, L""},
- {24, 284, 2173, L""},
- {24, 284, 1627, L""},
- {24, 284, 2174, L""},
- {24, 284, 2175, L" "},
- {24, 284, 1628, L" "},
- {24, 284, 1629, L""},
- {24, 284, 2221, L""},
- {24, 285, 1630, L""},
- {24, 285, 3283, L""},
- {24, 285, 1631, L""},
- {24, 285, 2013, L""},
- {24, 285, 2015, L""},
- {24, 285, 1632, L""},
- {24, 285, 1633, L""},
- {24, 285, 1634, L""},
- {24, 285, 2016, L""},
- {24, 285, 2018, L""},
- {24, 285, 2017, L""},
- {24, 285, 2020, L""},
- {24, 285, 2014, L""},
- {24, 285, 2010, L""},
- {24, 285, 2012, L""},
- {24, 285, 2011, L""},
- {24, 285, 2019, L""},
- {24, 285, 2210, L""},
- {24, 286, 1635, L""},
- {24, 286, 1636, L""},
- {24, 286, 2021, L""},
- {24, 286, 1637, L""},
- {24, 286, 2022, L""},
- {24, 286, 1638, L"-"},
- {24, 286, 2023, L""},
- {24, 286, 2031, L""},
- {24, 286, 2024, L""},
- {24, 286, 1639, L""},
- {24, 286, 1640, L""},
- {24, 286, 2026, L""},
- {24, 286, 3299, L" "},
- {24, 286, 2033, L""},
- {24, 286, 2025, L""},
- {24, 286, 1641, L""},
- {24, 286, 1642, L""},
- {24, 286, 2027, L""},
- {24, 286, 2211, L""},
- {24, 286, 2028, L""},
- {24, 286, 2032, L""},
- {24, 286, 2029, L""},
- {24, 286, 1643, L""},
- {24, 286, 2030, L"-"},
- {24, 286, 2212, L""},
- {24, 287, 1644, L""},
- {24, 287, 1645, L""},
- {24, 287, 1646, L""},
- {24, 287, 1647, L""},
- {24, 287, 1648, L""},
- {24, 287, 2178, L""},
- {24, 287, 2176, L""},
- {24, 287, 1649, L""},
- {24, 287, 2177, L""},
- {24, 287, 2180, L""},
- {24, 287, 1650, L""},
- {24, 287, 2181, L""},
- {24, 287, 1651, L""},
- {24, 287, 2179, L""},
- {24, 287, 2182, L""},
- {24, 287, 2224, L""},
- {24, 288, 1652, L""},
- {24, 288, 2036, L" "},
- {24, 288, 1657, L""},
- {24, 288, 1653, L""},
- {24, 288, 1656, L""},
- {24, 288, 2040, L""},
- {24, 288, 2037, L""},
- {24, 288, 2043, L""},
- {24, 288, 3300, L""},
- {24, 288, 2039, L""},
- {24, 288, 2038, L""},
- {24, 288, 2042, L""},
- {24, 288, 2044, L""},
- {24, 288, 1655, L""},
- {24, 288, 2034, L""},
- {24, 288, 1654, L""},
- {24, 288, 2041, L""},
- {24, 288, 2035, L""},
- {24, 288, 2227, L""},
- {24, 289, 2050, L""},
- {24, 289, 2051, L""},
- {24, 289, 3301, L""},
- {24, 289, 2052, L""},
- {24, 289, 1660, L""},
- {24, 289, 1658, L""},
- {24, 289, 2046, L""},
- {24, 289, 1661, L""},
- {24, 289, 2053, L""},
- {24, 289, 2049, L""},
- {24, 289, 1659, L""},
- {24, 289, 2054, L""},
- {24, 289, 2055, L""},
- {24, 289, 2047, L""},
- {24, 289, 1662, L""},
- {24, 289, 2057, L""},
- {24, 289, 2056, L"-"},
- {24, 289, 2045, L""},
- {24, 289, 1663, L""},
- {24, 289, 2131, L""},
- {24, 289, 2048, L""},
- {24, 289, 2233, L""},
- {24, 290, 1664, L""},
- {24, 290, 1665, L""},
- {24, 290, 1666, L""},
- {24, 290, 2059, L""},
- {24, 290, 1667, L""},
- {24, 290, 3302, L"--"},
- {24, 290, 1668, L""},
- {24, 290, 2060, L""},
- {24, 290, 1669, L""},
- {24, 290, 2061, L""},
- {24, 290, 2062, L""},
- {24, 290, 2058, L""},
- {24, 290, 1670, L""},
- {24, 290, 2240, L""},
- {24, 291, 1671, L"-"},
- {24, 291, 1673, L""},
- {24, 291, 3279, L""},
- {24, 291, 1672, L""},
- {24, 291, 2187, L""},
- {24, 291, 2188, L""},
- {24, 291, 2184, L""},
- {24, 291, 2185, L""},
- {24, 291, 2183, L""},
- {24, 291, 2189, L""},
- {24, 291, 2186, L""},
- {24, 291, 2244, L""},
- {24, 292, 2194, L""},
- {24, 292, 2193, L""},
- {24, 292, 1674, L""},
- {24, 292, 2190, L""},
- {24, 292, 2195, L""},
- {24, 292, 1675, L""},
- {24, 292, 2192, L""},
- {24, 292, 2191, L""},
- {24, 292, 2245, L""},
- {24, 293, 1733, L""},
- {24, 293, 1732, L""},
- {24, 293, 1731, L""},
- {24, 293, 1730, L""},
- {24, 293, 2063, L""},
- {24, 293, 2064, L""},
- {24, 293, 1729, L""},
- {24, 293, 1728, L""},
- {24, 293, 1727, L""},
- {24, 293, 2065, L""},
- {24, 293, 1726, L""},
- {24, 293, 1725, L""},
- {24, 293, 1724, L""},
- {24, 293, 1723, L""},
- {24, 293, 2066, L""},
- {24, 293, 1722, L""},
- {24, 293, 1721, L""},
- {24, 293, 1720, L""},
- {24, 293, 1719, L""},
- {24, 293, 2067, L""},
- {24, 293, 1718, L""},
- {24, 293, 1715, L""},
- {24, 293, 1717, L""},
- {24, 293, 2068, L""},
- {24, 293, 2069, L""},
- {24, 293, 1716, L""},
- {24, 293, 1714, L""},
- {24, 293, 1713, L""},
- {24, 293, 1712, L""},
- {24, 293, 1711, L""},
- {24, 293, 1710, L""},
- {24, 293, 2070, L""},
- {24, 293, 2071, L""},
- {24, 293, 1709, L"-"},
- {24, 293, 1708, L""},
- {24, 293, 2072, L"-"},
- {24, 293, 1707, L""},
- {24, 293, 1706, L""},
- {24, 293, 1705, L""},
- {24, 293, 1704, L""},
- {24, 293, 1703, L""},
- {24, 293, 1702, L""},
- {24, 293, 1701, L"-"},
- {24, 293, 1700, L""},
- {24, 293, 1698, L""},
- {24, 293, 2073, L""},
- {24, 293, 2074, L""},
- {24, 293, 1699, L"-"},
- {24, 293, 1697, L" "},
- {24, 293, 1696, L""},
- {24, 293, 1695, L""},
- {24, 293, 1694, L""},
- {24, 293, 1693, L""},
- {24, 293, 1692, L""},
- {24, 293, 1691, L""},
- {24, 293, 1690, L""},
- {24, 293, 2075, L""},
- {24, 293, 2076, L""},
- {24, 293, 1689, L" "},
- {24, 293, 1688, L""},
- {24, 293, 1687, L""},
- {24, 293, 1686, L""},
- {24, 293, 2077, L""},
- {24, 293, 2078, L""},
- {24, 293, 1685, L""},
- {24, 293, 1684, L""},
- {24, 293, 1683, L""},
- {24, 293, 1682, L""},
- {24, 293, 1681, L""},
- {24, 293, 1680, L""},
- {24, 293, 1679, L""},
- {24, 293, 1678, L""},
- {24, 293, 2080, L""},
- {24, 293, 1677, L""},
- {24, 293, 1676, L""},
- {24, 293, 2079, L""},
- {24, 293, 3031, L""},
- {24, 293, 2081, L""},
- {24, 293, 2249, L""},
- {24, 294, 2083, L""},
- {24, 294, 2082, L"-"},
- {24, 294, 3160, L""},
- {24, 294, 1736, L""},
- {24, 294, 2084, L""},
- {24, 294, 1737, L""},
- {24, 294, 2085, L""},
- {24, 294, 1735, L""},
- {24, 294, 2255, L""},
- {24, 295, 1740, L"-"},
- {24, 295, 1741, L""},
- {24, 295, 2086, L""},
- {24, 295, 2087, L""},
- {24, 295, 2089, L""},
- {24, 295, 2091, L""},
- {24, 295, 2093, L""},
- {24, 295, 1738, L""},
- {24, 295, 3305, L""},
- {24, 295, 1739, L""},
- {24, 295, 2090, L""},
- {24, 295, 2088, L"-"},
- {24, 295, 2092, L"-"},
- {24, 295, 2094, L""},
- {24, 295, 3320, L""},
- {24, 295, 2260, L""},
- {24, 296, 2095, L""},
- {24, 296, 1743, L""},
- {24, 296, 1744, L""},
- {24, 296, 2096, L""},
- {24, 296, 1745, L""},
- {24, 296, 1746, L""},
- {24, 296, 2097, L""},
- {24, 296, 2098, L""},
- {24, 296, 2099, L""},
- {24, 296, 2100, L""},
- {24, 296, 2101, L""},
- {24, 296, 1747, L""},
- {24, 296, 1742, L""},
- {24, 296, 2102, L""},
- {24, 296, 1748, L""},
- {24, 296, 2267, L""},
- {24, 297, 2198, L""},
- {24, 297, 2199, L""},
- {24, 297, 1752, L""},
- {24, 297, 1751, L""},
- {24, 297, 2196, L""},
- {24, 297, 1750, L""},
- {24, 297, 3271, L""},
- {24, 297, 1749, L""},
- {24, 297, 3272, L""},
- {24, 297, 2197, L""},
- {24, 297, 2270, L""},
- {24, 298, 2103, L""},
- {24, 298, 2104, L""},
- {24, 298, 2105, L""},
- {24, 298, 2106, L""},
- {24, 298, 2107, L""},
- {24, 298, 1753, L" "},
- {24, 298, 2108, L" "},
- {24, 298, 2109, L""},
- {24, 298, 2110, L""},
- {24, 298, 2111, L""},
- {24, 298, 1758, L""},
- {24, 298, 1756, L""},
- {24, 298, 2112, L" "},
- {24, 298, 1759, L""},
- {24, 298, 1760, L""},
- {24, 298, 1761, L""},
- {24, 298, 2113, L""},
- {24, 298, 1757, L""},
- {24, 298, 2114, L""},
- {24, 298, 1754, L""},
- {24, 298, 2115, L""},
- {24, 298, 2116, L""},
- {24, 298, 1755, L""},
- {24, 298, 2272, L""},
- {24, 299, 2127, L""},
- {24, 299, 2126, L""},
- {24, 299, 2118, L""},
- {24, 299, 2122, L""},
- {24, 299, 2129, L""},
- {24, 299, 1762, L""},
- {24, 299, 2128, L""},
- {24, 299, 3354, L""},
- {24, 299, 2124, L""},
- {24, 299, 1763, L""},
- {24, 299, 2123, L""},
- {24, 299, 1764, L""},
- {24, 299, 2117, L""},
- {24, 299, 2130, L"-"},
- {24, 299, 2120, L""},
- {24, 299, 2119, L""},
- {24, 299, 2125, L""},
- {24, 299, 1765, L""},
- {24, 299, 1766, L""},
- {24, 299, 2121, L""},
- {24, 299, 1767, L""},
- {24, 299, 2274, L""},
- {24, 300, 3053, L" "},
- {24, 300, 3268, L""},
- {24, 300, 1773, L"-"},
- {24, 300, 2132, L""},
- {24, 300, 3269, L" "},
- {24, 300, 2133, L""},
- {24, 300, 3270, L""},
- {24, 300, 1774, L""},
- {24, 300, 2994, L""},
- {24, 300, 1775, L"-"},
- {24, 300, 2134, L""},
- {24, 300, 1769, L""},
- {24, 300, 1771, L""},
- {24, 300, 1772, L""},
- {24, 300, 1770, L""},
- {24, 300, 1768, L""},
- {24, 300, 2290, L""},
- {24, 301, 2849, L""},
- {24, 301, 1776, L""},
- {24, 301, 2214, L""},
- {24, 304, 2617, L""},
- {24, 304, 1791, L""},
- {24, 304, 1788, L""},
- {24, 304, 2619, L""},
- {24, 304, 1789, L""},
- {24, 304, 2618, L""},
- {24, 304, 1790, L""},
- {24, 304, 1792, L""},
- {24, 304, 2620, L""},
- {24, 304, 2225, L""},
- {24, 305, 3052, L""},
- {24, 305, 1787, L""},
- {24, 305, 2228, L""},
- {24, 306, 2621, L""},
- {24, 306, 1794, L""},
- {24, 306, 1793, L""},
- {24, 306, 2622, L""},
- {24, 306, 1795, L""},
- {24, 306, 2623, L""},
- {24, 306, 2624, L""},
- {24, 306, 3274, L""},
- {24, 306, 2230, L""},
- {24, 307, 2567, L""},
- {24, 307, 2568, L""},
- {24, 307, 3324, L""},
- {24, 307, 1796, L""},
- {24, 307, 2232, L""},
- {24, 308, 1799, L""},
- {24, 308, 1798, L""},
- {24, 308, 2626, L""},
- {24, 308, 2625, L"-"},
- {24, 308, 1797, L""},
- {24, 308, 2235, L""},
- {24, 311, 2630, L""},
- {24, 311, 2631, L""},
- {24, 311, 2628, L""},
- {24, 311, 1839, L""},
- {24, 311, 2629, L""},
- {24, 311, 2627, L""},
- {24, 311, 2266, L""},
- {24, 313, 2632, L""},
- {24, 313, 1853, L""},
- {24, 313, 2633, L""},
- {24, 313, 2284, L""},
- {24, 309, 2636, L""},
- {24, 309, 1800, L""},
- {24, 309, 1801, L""},
- {24, 309, 1802, L""},
- {24, 309, 1803, L""},
- {24, 309, 1804, L""},
- {24, 309, 1805, L" "},
- {24, 309, 2637, L""},
- {24, 309, 1806, L""},
- {24, 309, 1807, L""},
- {24, 309, 2638, L""},
- {24, 309, 1808, L""},
- {24, 309, 1809, L""},
- {24, 309, 1810, L""},
- {24, 309, 1811, L""},
- {24, 309, 3232, L""},
- {24, 309, 2639, L""},
- {24, 309, 1812, L""},
- {24, 309, 1813, L""},
- {24, 309, 1814, L"-"},
- {24, 309, 3102, L""},
- {24, 309, 1815, L"--"},
- {24, 309, 1816, L""},
- {24, 309, 3266, L""},
- {24, 309, 3039, L""},
- {24, 309, 1817, L""},
- {24, 309, 2635, L""},
- {24, 309, 1818, L""},
- {24, 309, 1819, L""},
- {24, 309, 1820, L"-"},
- {24, 309, 2634, L""},
- {24, 309, 2241, L""},
- {24, 312, 1840, L""},
- {24, 312, 2644, L""},
- {24, 312, 1841, L""},
- {24, 312, 1842, L""},
- {24, 312, 1843, L""},
- {24, 312, 1844, L""},
- {24, 312, 2647, L""},
- {24, 312, 2641, L""},
- {24, 312, 2642, L""},
- {24, 312, 1845, L""},
- {24, 312, 1846, L""},
- {24, 312, 3367, L""},
- {24, 312, 3265, L""},
- {24, 312, 1847, L""},
- {24, 312, 1848, L" "},
- {24, 312, 1849, L""},
- {24, 312, 2645, L""},
- {24, 312, 2643, L""},
- {24, 312, 1850, L""},
- {24, 312, 1851, L""},
- {24, 312, 1852, L""},
- {24, 312, 2646, L""},
- {24, 312, 2640, L""},
- {24, 312, 2268, L""},
- {24, 302, 1777, L""},
- {24, 302, 1778, L""},
- {24, 302, 3383, L""},
- {24, 302, 2578, L""},
- {24, 302, 2579, L""},
- {24, 302, 1786, L""},
- {24, 302, 2219, L""},
- {24, 303, 1779, L""},
- {24, 303, 1780, L""},
- {24, 303, 2584, L""},
- {24, 303, 1781, L""},
- {24, 303, 1782, L"--"},
- {24, 303, 1783, L""},
- {24, 303, 2588, L""},
- {24, 303, 2591, L""},
- {24, 303, 2587, L""},
- {24, 303, 2582, L""},
- {24, 303, 2590, L""},
- {24, 303, 1784, L""},
- {24, 303, 2581, L""},
- {24, 303, 2583, L""},
- {24, 303, 2580, L" "},
- {24, 303, 2589, L""},
- {24, 303, 2585, L""},
- {24, 303, 1785, L""},
- {24, 303, 2586, L""},
- {24, 303, 2223, L""},
- {24, 310, 1821, L""},
- {24, 310, 1822, L""},
- {24, 310, 1823, L""},
- {24, 310, 1824, L""},
- {24, 310, 1825, L" "},
- {24, 310, 1826, L""},
- {24, 310, 1827, L""},
- {24, 310, 2651, L""},
- {24, 310, 1828, L""},
- {24, 310, 3264, L""},
- {24, 310, 2652, L"-"},
- {24, 310, 2649, L""},
- {24, 310, 2648, L" "},
- {24, 310, 1829, L""},
- {24, 310, 2653, L""},
- {24, 310, 1830, L""},
- {24, 310, 1831, L""},
- {24, 310, 1832, L""},
- {24, 310, 1833, L"--"},
- {24, 310, 1834, L""},
- {24, 310, 1835, L""},
- {24, 310, 1836, L""},
- {24, 310, 1837, L"-"},
- {24, 310, 3263, L""},
- {24, 310, 2650, L""},
- {24, 310, 1838, L""},
- {24, 310, 2259, L""},
- {139, 407, 407, L" "},
- {139, 426, 427, L""},
- {139, 426, 2354, L""},
- {139, 378, 3109, L" "},
- {139, 378, 379, L"-"},
- {139, 378, 2963, L""},
- {139, 378, 2355, L""},
- {139, 412, 3236, L""},
- {139, 412, 413, L""},
- {139, 412, 1181, L""},
- {139, 412, 2356, L""},
- {139, 446, 1182, L""},
- {139, 446, 447, L""},
- {139, 446, 1183, L""},
- {139, 446, 2357, L""},
- {139, 434, 2917, L""},
- {139, 434, 1184, L""},
- {139, 434, 435, L""},
- {139, 434, 3061, L""},
- {139, 434, 2358, L""},
- {139, 416, 417, L"-"},
- {139, 416, 2359, L""},
- {139, 428, 3017, L""},
- {139, 428, 429, L""},
- {139, 428, 2360, L""},
- {139, 440, 2956, L""},
- {139, 440, 2967, L""},
- {139, 440, 3385, L""},
- {139, 440, 2865, L""},
- {139, 440, 441, L""},
- {139, 440, 3352, L" "},
- {139, 440, 2876, L""},
- {139, 440, 3003, L""},
- {139, 440, 1185, L""},
- {139, 440, 2983, L""},
- {139, 440, 1186, L""},
- {139, 440, 3152, L" "},
- {139, 440, 2886, L""},
- {139, 440, 2361, L""},
- {139, 352, 353, L""},
- {139, 352, 2861, L""},
- {139, 352, 2362, L""},
- {139, 394, 1188, L""},
- {139, 394, 1187, L""},
- {139, 394, 2969, L""},
- {139, 394, 1189, L""},
- {139, 394, 3114, L""},
- {139, 394, 2885, L"-"},
- {139, 394, 2979, L" "},
- {139, 394, 3338, L""},
- {139, 394, 395, L""},
- {139, 394, 3005, L""},
- {139, 394, 2991, L""},
- {139, 394, 2996, L""},
- {139, 394, 3097, L""},
- {139, 394, 2981, L""},
- {139, 394, 2363, L""},
- {139, 374, 2995, L"-"},
- {139, 374, 375, L""},
- {139, 374, 2365, L""},
- {139, 448, 449, L""},
- {139, 448, 1191, L""},
- {139, 448, 2367, L""},
- {139, 390, 3021, L""},
- {139, 390, 391, L""},
- {139, 390, 2973, L""},
- {139, 390, 2369, L""},
- {139, 402, 403, L""},
- {139, 402, 2370, L""},
- {139, 396, 397, L""},
- {139, 396, 2371, L""},
- {139, 370, 2911, L""},
- {139, 370, 3074, L""},
- {139, 370, 371, L""},
- {139, 370, 2930, L""},
- {139, 370, 1194, L""},
- {139, 370, 2372, L""},
- {139, 368, 369, L""},
- {139, 368, 1195, L""},
- {139, 368, 2373, L""},
- {139, 444, 2959, L""},
- {139, 444, 2961, L""},
- {139, 444, 2912, L""},
- {139, 444, 2899, L" "},
- {139, 444, 1196, L""},
- {139, 444, 3249, L""},
- {139, 444, 3014, L""},
- {139, 444, 3048, L""},
- {139, 444, 2901, L"-"},
- {139, 444, 2926, L" "},
- {139, 444, 2922, L""},
- {139, 444, 1203, L""},
- {139, 444, 2978, L""},
- {139, 444, 2990, L""},
- {139, 444, 3077, L""},
- {139, 444, 2918, L""},
- {139, 444, 2881, L""},
- {139, 444, 3247, L""},
- {139, 444, 3092, L" "},
- {139, 444, 2948, L""},
- {139, 444, 1197, L"-"},
- {139, 444, 1198, L"-"},
- {139, 444, 3058, L"-"},
- {139, 444, 3328, L"--"},
- {139, 444, 2874, L"-"},
- {139, 444, 2998, L""},
- {139, 444, 3087, L""},
- {139, 444, 2947, L""},
- {139, 444, 2900, L" "},
- {139, 444, 1199, L""},
- {139, 444, 3335, L""},
- {139, 444, 2966, L""},
- {139, 444, 445, L""},
- {139, 444, 1200, L"-"},
- {139, 444, 3317, L"-"},
- {139, 444, 1201, L"-"},
- {139, 444, 1202, L"-"},
- {139, 444, 2878, L""},
- {139, 444, 2925, L"-"},
- {139, 444, 2875, L"-"},
- {139, 444, 1204, L"-"},
- {139, 444, 2859, L"-"},
- {139, 444, 3157, L" "},
- {139, 444, 3146, L""},
- {139, 444, 2970, L" "},
- {139, 444, 2949, L"-"},
- {139, 444, 3057, L" "},
- {139, 444, 3032, L"-"},
- {139, 444, 3381, L""},
- {139, 444, 3028, L""},
- {139, 444, 2858, L""},
- {139, 444, 3040, L""},
- {139, 444, 2374, L""},
- {139, 388, 3041, L""},
- {139, 388, 389, L""},
- {139, 388, 2375, L""},
- {139, 408, 3004, L""},
- {139, 408, 1205, L""},
- {139, 408, 409, L""},
- {139, 408, 2376, L""},
- {139, 430, 1206, L""},
- {139, 430, 3095, L""},
- {139, 430, 431, L""},
- {139, 430, 1207, L"-"},
- {139, 430, 3046, L""},
- {139, 430, 2377, L""},
- {139, 358, 2968, L""},
- {139, 358, 3018, L""},
- {139, 358, 2882, L""},
- {139, 358, 359, L""},
- {139, 358, 3047, L""},
- {139, 358, 2378, L""},
- {139, 418, 419, L"-"},
- {139, 418, 1208, L" "},
- {139, 418, 2408, L""},
- {139, 354, 2931, L""},
- {139, 354, 3334, L""},
- {139, 354, 355, L""},
- {139, 354, 3059, L""},
- {139, 354, 2919, L""},
- {139, 354, 2902, L""},
- {139, 354, 1209, L""},
- {139, 354, 3336, L""},
- {139, 354, 2985, L""},
- {139, 354, 3022, L""},
- {139, 354, 2407, L""},
- {139, 376, 1210, L""},
- {139, 376, 2980, L""},
- {139, 376, 377, L"-"},
- {139, 376, 3035, L" "},
- {139, 376, 2406, L""},
- {139, 414, 415, L""},
- {139, 414, 2405, L""},
- {139, 380, 381, L"-"},
- {139, 380, 3062, L" "},
- {139, 380, 3038, L" "},
- {139, 380, 1211, L"-"},
- {139, 380, 2895, L""},
- {139, 380, 2404, L""},
- {139, 372, 3357, L" "},
- {139, 372, 1212, L"-"},
- {139, 372, 1213, L""},
- {139, 372, 3103, L""},
- {139, 372, 373, L""},
- {139, 372, 2987, L""},
- {139, 372, 2887, L""},
- {139, 372, 2403, L""},
- {139, 424, 1214, L"-"},
- {139, 424, 425, L""},
- {139, 424, 2402, L""},
- {139, 348, 349, L""},
- {139, 348, 3000, L""},
- {139, 348, 2401, L""},
- {139, 392, 393, L""},
- {139, 392, 1215, L""},
- {139, 392, 3143, L""},
- {139, 392, 3337, L" "},
- {139, 392, 2904, L" "},
- {139, 392, 3329, L""},
- {139, 392, 2400, L""},
- {139, 386, 387, L""},
- {139, 386, 1216, L""},
- {139, 386, 2399, L""},
- {139, 438, 439, L"-"},
- {139, 438, 1217, L"-"},
- {139, 438, 2890, L""},
- {139, 438, 2398, L""},
- {139, 362, 1219, L"-"},
- {139, 362, 1218, L""},
- {139, 362, 3276, L""},
- {139, 362, 3073, L""},
- {139, 362, 2955, L""},
- {139, 362, 3349, L""},
- {139, 362, 363, L""},
- {139, 362, 3078, L""},
- {139, 362, 3248, L" "},
- {139, 362, 2397, L""},
- {139, 360, 3134, L""},
- {139, 360, 3081, L""},
- {139, 360, 2997, L""},
- {139, 360, 2999, L""},
- {139, 360, 3139, L""},
- {139, 360, 3060, L""},
- {139, 360, 1220, L"-"},
- {139, 360, 361, L""},
- {139, 360, 2914, L""},
- {139, 360, 3056, L" "},
- {139, 360, 2396, L""},
- {139, 432, 1222, L""},
- {139, 432, 433, L"-"},
- {139, 432, 2395, L""},
- {139, 350, 2989, L""},
- {139, 350, 351, L""},
- {139, 350, 2950, L""},
- {139, 350, 1221, L""},
- {139, 350, 3111, L""},
- {139, 350, 2898, L""},
- {139, 350, 2938, L""},
- {139, 350, 2394, L""},
- {139, 366, 2953, L""},
- {139, 366, 3112, L" "},
- {139, 366, 1223, L""},
- {139, 366, 367, L""},
- {139, 366, 2951, L""},
- {139, 366, 2862, L""},
- {139, 366, 3034, L""},
- {139, 366, 2860, L""},
- {139, 366, 2393, L""},
- {139, 420, 421, L"-"},
- {139, 420, 1224, L""},
- {139, 420, 2392, L""},
- {139, 442, 2877, L"-"},
- {139, 442, 2945, L"-"},
- {139, 442, 1225, L""},
- {139, 442, 443, L""},
- {139, 442, 1226, L""},
- {139, 442, 2391, L""},
- {139, 364, 3316, L""},
- {139, 364, 3282, L""},
- {139, 364, 2972, L" "},
- {139, 364, 1227, L""},
- {139, 364, 2893, L""},
- {139, 364, 3110, L" "},
- {139, 364, 1228, L""},
- {139, 364, 365, L""},
- {139, 364, 2390, L""},
- {139, 450, 451, L""},
- {139, 450, 3093, L"-"},
- {139, 450, 2389, L""},
- {139, 356, 357, L""},
- {139, 356, 2388, L""},
- {139, 382, 383, L""},
- {139, 382, 2387, L""},
- {139, 398, 2960, L""},
- {139, 398, 2915, L""},
- {139, 398, 399, L""},
- {139, 398, 2386, L""},
- {139, 410, 2863, L""},
- {139, 410, 411, L""},
- {139, 410, 1229, L""},
- {139, 410, 2385, L""},
- {139, 422, 3085, L""},
- {139, 422, 2913, L""},
- {139, 422, 1233, L""},
- {139, 422, 2916, L""},
- {139, 422, 3123, L""},
- {139, 422, 2873, L""},
- {139, 422, 3096, L" "},
- {139, 422, 423, L""},
- {139, 422, 1232, L"-"},
- {139, 422, 3023, L""},
- {139, 422, 1231, L""},
- {139, 422, 1230, L"-"},
- {139, 422, 2384, L""},
- {139, 406, 2383, L""},
- {139, 404, 2879, L"-"},
- {139, 404, 2880, L""},
- {139, 404, 3086, L""},
- {139, 404, 3002, L""},
- {139, 404, 3124, L" "},
- {139, 404, 2894, L"-"},
- {139, 404, 3290, L"-"},
- {139, 404, 1234, L""},
- {139, 404, 1236, L""},
- {139, 404, 3372, L" "},
- {139, 404, 2952, L"-"},
- {139, 404, 3340, L""},
- {139, 404, 1235, L"-"},
- {139, 404, 405, L""},
- {139, 404, 2962, L" "},
- {139, 404, 2382, L""},
- {139, 384, 385, L""},
- {139, 384, 2381, L""},
- {139, 400, 401, L""},
- {139, 400, 3090, L""},
- {139, 400, 1237, L""},
- {139, 400, 2380, L""},
- {139, 436, 3036, L""},
- {139, 436, 3024, L""},
- {139, 436, 3108, L""},
- {139, 436, 2866, L"-"},
- {139, 436, 437, L"--"},
- {139, 436, 2379, L""},
- {39, 315, 614, L""},
- {39, 315, 615, L""},
- {39, 315, 2566, L""},
- {39, 316, 2940, L""},
- {39, 316, 616, L""},
- {39, 316, 2565, L""},
- {39, 317, 617, L""},
- {39, 317, 618, L""},
- {39, 317, 619, L" "},
- {39, 317, 620, L""},
- {39, 317, 621, L""},
- {39, 317, 622, L""},
- {39, 317, 623, L""},
- {39, 317, 2564, L""},
- {39, 318, 624, L""},
- {39, 318, 625, L""},
- {39, 318, 626, L""},
- {39, 318, 627, L""},
- {39, 318, 628, L""},
- {39, 318, 629, L""},
- {39, 318, 630, L""},
- {39, 318, 2944, L""},
- {39, 318, 631, L""},
- {39, 318, 632, L""},
- {39, 318, 633, L""},
- {39, 318, 634, L""},
- {39, 318, 635, L""},
- {39, 318, 2563, L""},
- {39, 319, 636, L""},
- {39, 319, 637, L""},
- {39, 319, 2942, L""},
- {39, 319, 638, L""},
- {39, 319, 2907, L""},
- {39, 319, 639, L"-"},
- {39, 319, 2562, L""},
- {39, 320, 640, L""},
- {39, 320, 641, L""},
- {39, 320, 3119, L""},
- {39, 320, 3162, L""},
- {39, 320, 642, L""},
- {39, 320, 643, L""},
- {39, 320, 2561, L""},
- {39, 321, 644, L""},
- {39, 321, 3128, L""},
- {39, 321, 645, L""},
- {39, 321, 646, L""},
- {39, 321, 3121, L""},
- {39, 321, 3378, L""},
- {39, 321, 2560, L""},
- {39, 322, 3379, L""},
- {39, 322, 647, L"-"},
- {39, 322, 3170, L""},
- {39, 322, 2559, L""},
- {39, 323, 648, L" "},
- {39, 323, 649, L""},
- {39, 323, 651, L""},
- {39, 323, 650, L""},
- {39, 323, 652, L""},
- {39, 323, 3341, L"-"},
- {39, 323, 653, L""},
- {39, 323, 654, L""},
- {39, 323, 655, L""},
- {39, 323, 2558, L""},
- {39, 324, 656, L""},
- {39, 324, 657, L""},
- {39, 324, 658, L""},
- {39, 324, 2557, L""},
- {39, 325, 659, L""},
- {39, 325, 2984, L""},
- {39, 325, 3042, L""},
- {39, 325, 660, L""},
- {39, 325, 662, L""},
- {39, 325, 3382, L""},
- {39, 325, 663, L""},
- {39, 325, 667, L""},
- {39, 325, 666, L""},
- {39, 325, 668, L""},
- {39, 325, 669, L""},
- {39, 325, 665, L""},
- {39, 325, 661, L""},
- {39, 325, 3370, L" "},
- {39, 325, 670, L""},
- {39, 325, 664, L""},
- {39, 325, 3148, L""},
- {39, 325, 671, L""},
- {39, 325, 2556, L""},
- {39, 326, 672, L""},
- {39, 326, 673, L""},
- {39, 326, 674, L""},
- {39, 326, 675, L""},
- {39, 326, 3364, L""},
- {39, 326, 676, L""},
- {39, 326, 677, L""},
- {39, 326, 678, L""},
- {39, 326, 679, L""},
- {39, 326, 680, L""},
- {39, 326, 2555, L""},
- {39, 327, 3284, L""},
- {39, 327, 681, L""},
- {39, 327, 682, L""},
- {39, 327, 2554, L""},
- {39, 328, 3322, L""},
- {39, 328, 2870, L""},
- {39, 328, 683, L""},
- {39, 328, 3118, L""},
- {39, 328, 3325, L""},
- {39, 328, 2553, L""},
- {39, 329, 684, L"-"},
- {39, 329, 685, L""},
- {39, 329, 689, L""},
- {39, 329, 686, L""},
- {39, 329, 688, L""},
- {39, 329, 687, L""},
- {39, 329, 2552, L""},
- {39, 330, 690, L""},
- {39, 330, 691, L""},
- {39, 330, 693, L""},
- {39, 330, 694, L""},
- {39, 330, 695, L""},
- {39, 330, 692, L""},
- {39, 330, 2551, L""},
- {39, 331, 696, L""},
- {39, 331, 697, L""},
- {39, 331, 3361, L""},
- {39, 331, 2550, L""},
- {39, 332, 3356, L""},
- {39, 332, 698, L""},
- {39, 332, 700, L""},
- {39, 332, 699, L""},
- {39, 332, 701, L""},
- {39, 332, 2549, L""},
- {39, 333, 702, L""},
- {39, 333, 3171, L""},
- {39, 333, 703, L""},
- {39, 333, 704, L""},
- {39, 333, 2548, L""},
- {39, 334, 705, L""},
- {39, 334, 3346, L""},
- {39, 334, 3351, L""},
- {39, 334, 706, L""},
- {39, 334, 708, L""},
- {39, 334, 707, L""},
- {39, 334, 709, L""},
- {39, 334, 2547, L""},
- {39, 335, 710, L""},
- {39, 335, 711, L""},
- {39, 335, 712, L" "},
- {39, 335, 3280, L""},
- {39, 335, 713, L""},
- {39, 335, 2546, L""},
- {39, 336, 714, L"-"},
- {39, 336, 715, L""},
- {39, 336, 2941, L""},
- {39, 336, 716, L""},
- {39, 336, 3120, L""},
- {39, 336, 2943, L""},
- {39, 336, 717, L""},
- {39, 336, 3155, L""},
- {39, 336, 2542, L""},
- {39, 337, 3169, L""},
- {39, 337, 3016, L""},
- {39, 337, 3333, L""},
- {39, 337, 718, L""},
- {39, 337, 719, L""},
- {39, 337, 720, L""},
- {39, 337, 2545, L""},
- {39, 338, 721, L""},
- {39, 338, 722, L""},
- {39, 338, 723, L""},
- {39, 338, 2544, L""},
- {39, 339, 724, L""},
- {39, 339, 2543, L""},
- {340, 342, 725, L""},
- {340, 342, 726, L""},
- {340, 342, 727, L""},
- {340, 342, 728, L""},
- {340, 342, 3172, L""},
- {340, 342, 729, L""},
- {340, 342, 730, L""},
- {340, 342, 731, L""},
- {340, 342, 732, L""},
- {340, 342, 2538, L""},
- {340, 343, 733, L""},
- {340, 343, 735, L""},
- {340, 343, 734, L""},
- {340, 343, 736, L""},
- {340, 343, 737, L""},
- {340, 343, 738, L""},
- {340, 343, 2537, L""},
- {340, 344, 739, L""},
- {340, 344, 740, L""},
- {340, 344, 741, L""},
- {340, 344, 742, L""},
- {340, 344, 743, L""},
- {340, 344, 744, L""},
- {340, 344, 2536, L""},
- {340, 345, 745, L""},
- {340, 345, 746, L""},
- {340, 345, 747, L""},
- {340, 345, 3244, L""},
- {340, 345, 748, L""},
- {340, 345, 2535, L""},
- {340, 346, 3149, L""},
- {340, 346, 749, L""},
- {340, 346, 750, L""},
- {340, 346, 751, L""},
- {340, 346, 752, L" "},
- {340, 346, 753, L""},
- {340, 346, 2896, L""},
- {340, 346, 754, L""},
- {340, 346, 755, L""},
- {340, 346, 756, L""},
- {340, 346, 2534, L""},
- {340, 347, 757, L""},
- {340, 347, 758, L""},
- {340, 347, 759, L""},
- {340, 347, 2533, L""},
+ {24, 0, 0, L"Россия"},
+ {81, 0, 0, L"Азербайджан"},
+ {82, 0, 0, L"Армения"},
+ {97, 0, 0, L"Афганистан"},
+ {96, 0, 0, L"Бангладеш"},
+ {99, 0, 0, L"Бахрейн"},
+ {100, 0, 0, L"Бруней-Даруссалам"},
+ {101, 0, 0, L"Бутан"},
+ {102, 0, 0, L"Вьетнам"},
+ {83, 0, 0, L"Грузия"},
+ {86, 0, 0, L"Израиль"},
+ {95, 0, 0, L"Индия"},
+ {103, 0, 0, L"Индонезия"},
+ {79, 0, 0, L"Иордания"},
+ {85, 0, 0, L"Ирак"},
+ {87, 0, 0, L"Иран"},
+ {104, 0, 0, L"Йемен"},
+ {84, 0, 0, L"Казахстан"},
+ {105, 0, 0, L"Камбоджа"},
+ {106, 0, 0, L"Катар"},
+ {107, 0, 0, L"Кипр"},
+ {92, 0, 0, L"Киргизия (Кыргызстан)"},
+ {76, 0, 0, L"Китай"},
+ {3215, 0, 0, L"Кокосовые острова (Австр.)"},
+ {29, 0, 0, L"Корея (КНДР)"},
+ {108, 0, 0, L"Корея"},
+ {88, 0, 0, L"Кувейт"},
+ {109, 0, 0, L"Лаос"},
+ {110, 0, 0, L"Ливан"},
+ {111, 0, 0, L"Малайзия"},
+ {112, 0, 0, L"Мальдивы"},
+ {113, 0, 0, L"Монголия"},
+ {114, 0, 0, L"Мьянма"},
+ {115, 0, 0, L"Непал"},
+ {116, 0, 0, L"Объединенные Арабские Эмираты"},
+ {117, 0, 0, L"Оман"},
+ {3216, 0, 0, L"Остров Рождества (Австр.)"},
+ {122, 0, 0, L"Пакистан"},
+ {89, 0, 0, L"Палестина"},
+ {94, 0, 0, L"Саудовская Аравия"},
+ {118, 0, 0, L"Сингапур"},
+ {78, 0, 0, L"Сирия"},
+ {91, 0, 0, L"Таджикистан"},
+ {119, 0, 0, L"Таиланд"},
+ {120, 0, 0, L"Тайвань"},
+ {132, 0, 0, L"Тимор"},
+ {90, 0, 0, L"Туркмения"},
+ {77, 0, 0, L"Турция"},
+ {93, 0, 0, L"Узбекистан"},
+ {121, 0, 0, L"Филиппины"},
+ {98, 0, 0, L"Шри Ланка"},
+ {75, 0, 0, L"Япония"},
+ {123, 0, 0, L"Австралия"},
+ {454, 0, 0, L"Американское Самоа"},
+ {124, 0, 0, L"Вануату"},
+ {453, 0, 0, L"Гуам (США)"},
+ {126, 0, 0, L"Кирибати"},
+ {127, 0, 0, L"Маршалловы Острова"},
+ {128, 0, 0, L"Микронезия (Федеративные Штаты Микронезии)"},
+ {129, 0, 0, L"Науру"},
+ {3220, 0, 0, L"Ниуэ (Н.Зел.)"},
+ {130, 0, 0, L"Новая Зеландия"},
+ {3218, 0, 0, L"Новая Каледония (Фр.)"},
+ {3221, 0, 0, L"Острова Кука (Н.Зел.)"},
+ {3230, 0, 0, L"Острова Херд и Макдональд (Австр.)"},
+ {131, 0, 0, L"Палау"},
+ {133, 0, 0, L"Папуа - Новая Гвинея"},
+ {3222, 0, 0, L"Питкерн (Брит.)"},
+ {125, 0, 0, L"Самоа"},
+ {3219, 0, 0, L"Сев. Марианские острова (США)"},
+ {134, 0, 0, L"Соломоновы Острова"},
+ {3223, 0, 0, L"Токелау (Н.Зел.)"},
+ {135, 0, 0, L"Тонга"},
+ {136, 0, 0, L"Тувалу"},
+ {3224, 0, 0, L"Уоллис и Футуна острова (Фр.)"},
+ {137, 0, 0, L"Фиджи"},
+ {3226, 0, 0, L"Французская Полинезия"},
+ {3225, 0, 0, L"Французские Южные территории"},
+ {138, 0, 0, L"Канада"},
+ {139, 0, 0, L"США"},
+ {3200, 0, 0, L"Ангилья (Брит.)"},
+ {140, 0, 0, L"Антигуа и Барбуда"},
+ {141, 0, 0, L"Аргентина"},
+ {3202, 0, 0, L"Аруба (Нид.)"},
+ {142, 0, 0, L"Багамы"},
+ {143, 0, 0, L"Барбадос"},
+ {146, 0, 0, L"Белиз"},
+ {3203, 0, 0, L"Бермуды (Брит.)"},
+ {144, 0, 0, L"Боливия"},
+ {145, 0, 0, L"Бразилия"},
+ {147, 0, 0, L"Венесуэла"},
+ {3204, 0, 0, L"Виргинские острова (Брит.)"},
+ {452, 0, 0, L"Виргинские острова (США)"},
+ {149, 0, 0, L"Гаити"},
+ {148, 0, 0, L"Гайана"},
+ {3205, 0, 0, L"Гваделупа (Фр.)"},
+ {173, 0, 0, L"Гватемала"},
+ {150, 0, 0, L"Гондурас"},
+ {151, 0, 0, L"Гренада"},
+ {152, 0, 0, L"Гренландия (Дат.)"},
+ {153, 0, 0, L"Доминика"},
+ {154, 0, 0, L"Доминиканская Республика"},
+ {155, 0, 0, L"Колумбия"},
+ {156, 0, 0, L"Коста-Рика"},
+ {157, 0, 0, L"Куба"},
+ {3208, 0, 0, L"Мартиника (Фр.)"},
+ {158, 0, 0, L"Мексика"},
+ {3209, 0, 0, L"Монтсеррат (Брит)"},
+ {3201, 0, 0, L"Нидерландские Антилы"},
+ {159, 0, 0, L"Никарагуа"},
+ {3207, 0, 0, L"Остров Кайман (Брит.)"},
+ {3211, 0, 0, L"Острова Теркс и Кайкос (Брит.)"},
+ {160, 0, 0, L"Панама"},
+ {161, 0, 0, L"Парагвай"},
+ {162, 0, 0, L"Перу"},
+ {163, 0, 0, L"Сальвадор"},
+ {164, 0, 0, L"Сент-Винсент и Гренадины"},
+ {165, 0, 0, L"Сент-Китс и Невис"},
+ {166, 0, 0, L"Сент-Люсия"},
+ {3210, 0, 0, L"Сент-Пьер и Микелон (Фр.)"},
+ {167, 0, 0, L"Суринам"},
+ {168, 0, 0, L"Тринидат и Тобаго"},
+ {169, 0, 0, L"Уругвай"},
+ {3212, 0, 0, L"Фолклендские острова (Брит.)"},
+ {3206, 0, 0, L"Французская Гвиана"},
+ {170, 0, 0, L"Чили"},
+ {171, 0, 0, L"Эквадор"},
+ {3213, 0, 0, L"Юж. Джорджия и Юж. Сандвичевы о-ва (Брит.)"},
+ {172, 0, 0, L"Ямайка"},
+ {174, 0, 0, L"Алжир"},
+ {175, 0, 0, L"Ангола"},
+ {176, 0, 0, L"Бенин"},
+ {177, 0, 0, L"Ботсвана"},
+ {3228, 0, 0, L"Британская территория в Индийском океане"},
+ {178, 0, 0, L"Буркина-Фасо"},
+ {179, 0, 0, L"Бурунди"},
+ {180, 0, 0, L"Габон"},
+ {181, 0, 0, L"Гамбия"},
+ {182, 0, 0, L"Гана"},
+ {183, 0, 0, L"Гвинея"},
+ {184, 0, 0, L"Гвинея-Бисау"},
+ {185, 0, 0, L"Джибути"},
+ {186, 0, 0, L"Египет"},
+ {187, 0, 0, L"Замбия"},
+ {3198, 0, 0, L"Зап. Сахара"},
+ {23, 0, 0, L"Зимбабве"},
+ {188, 0, 0, L"Кабо-Верде"},
+ {189, 0, 0, L"Камерун"},
+ {190, 0, 0, L"Кения"},
+ {191, 0, 0, L"Коморы"},
+ {193, 0, 0, L"Конго (Заир)"},
+ {192, 0, 0, L"Конго"},
+ {194, 0, 0, L"Кот-д`Ивуар"},
+ {195, 0, 0, L"Лесото"},
+ {196, 0, 0, L"Либерия"},
+ {197, 0, 0, L"Ливия"},
+ {198, 0, 0, L"Маврикий"},
+ {199, 0, 0, L"Мавритания"},
+ {200, 0, 0, L"Мадагаскар"},
+ {3229, 0, 0, L"Майотт (Фр.)"},
+ {201, 0, 0, L"Малави"},
+ {202, 0, 0, L"Мали"},
+ {203, 0, 0, L"Марокко"},
+ {204, 0, 0, L"Мозамбик"},
+ {205, 0, 0, L"Намибия"},
+ {206, 0, 0, L"Нигер"},
+ {207, 0, 0, L"Нигерия"},
+ {3227, 0, 0, L"Остров Буве (Норв.)"},
+ {3197, 0, 0, L"Реюньон (Фр.)"},
+ {208, 0, 0, L"Руанда"},
+ {209, 0, 0, L"Сан-Томе и Принсипи"},
+ {210, 0, 0, L"Свазиленд"},
+ {3199, 0, 0, L"Святая Елена (Брит.)"},
+ {211, 0, 0, L"Сейшелы"},
+ {212, 0, 0, L"Сенегал"},
+ {213, 0, 0, L"Сомали"},
+ {214, 0, 0, L"Судан"},
+ {215, 0, 0, L"Сьерра-Леоне"},
+ {216, 0, 0, L"Танзания"},
+ {217, 0, 0, L"Того"},
+ {218, 0, 0, L"Тунис"},
+ {219, 0, 0, L"Уганда"},
+ {220, 0, 0, L"Центральноафриканская Республика"},
+ {222, 0, 0, L"Чад"},
+ {223, 0, 0, L"Экваториальная Гвинея"},
+ {221, 0, 0, L"Эритрея"},
+ {224, 0, 0, L"Эфиопия"},
+ {225, 0, 0, L"Южно-Африканская Республика (ЮАР)"},
+ {39, 0, 0, L"Украина"},
+ {40, 0, 0, L"Австрия"},
+ {32, 0, 0, L"Албания"},
+ {33, 0, 0, L"Андорра"},
+ {340, 0, 0, L"Белоруссия"},
+ {38, 0, 0, L"Бельгия"},
+ {41, 0, 0, L"Болгария"},
+ {42, 0, 0, L"Босния и Герцеговина"},
+ {43, 0, 0, L"Ватикан"},
+ {45, 0, 0, L"Великобритания"},
+ {44, 0, 0, L"Венгрия"},
+ {46, 0, 0, L"Германия"},
+ {3193, 0, 0, L"Гернси (Брит.)"},
+ {47, 0, 0, L"Гибралтар (Брит.)"},
+ {48, 0, 0, L"Греция"},
+ {49, 0, 0, L"Дания"},
+ {3194, 0, 0, L"Джерси (Брит.)"},
+ {50, 0, 0, L"Ирландия"},
+ {51, 0, 0, L"Исландия"},
+ {34, 0, 0, L"Испания"},
+ {52, 0, 0, L"Италия"},
+ {53, 0, 0, L"Латвия"},
+ {54, 0, 0, L"Литва"},
+ {55, 0, 0, L"Лихтенштейн"},
+ {56, 0, 0, L"Люксембург"},
+ {57, 0, 0, L"Македония"},
+ {58, 0, 0, L"Мальта"},
+ {59, 0, 0, L"Молдавия"},
+ {36, 0, 0, L"Монако"},
+ {60, 0, 0, L"Нидерланды"},
+ {61, 0, 0, L"Норвегия"},
+ {3195, 0, 0, L"Остров Мэн (Брит.)"},
+ {62, 0, 0, L"Польша"},
+ {35, 0, 0, L"Португалия"},
+ {63, 0, 0, L"Румыния"},
+ {64, 0, 0, L"Сан-Марино"},
+ {74, 0, 0, L"Сербия и Черногория"},
+ {65, 0, 0, L"Словакия"},
+ {66, 0, 0, L"Словения"},
+ {67, 0, 0, L"Фарерские о-ва (Дания)"},
+ {68, 0, 0, L"Финляндия"},
+ {37, 0, 0, L"Франция"},
+ {69, 0, 0, L"Хорватия"},
+ {70, 0, 0, L"Чехия"},
+ {71, 0, 0, L"Швейцария"},
+ {72, 0, 0, L"Швеция"},
+ {3196, 0, 0, L"Шпицберген (Норв.)"},
+ {73, 0, 0, L"Эстония"},
+ {24, 25, 0, L"Москва"},
+ {24, 226, 0, L"Санкт-Петербург"},
+ {24, 233, 0, L"Саха (Якутия)"},
+ {24, 232, 0, L"Приморский край"},
+ {24, 235, 0, L"Хабаровский край"},
+ {24, 227, 0, L"Амурская обл."},
+ {24, 229, 0, L"Камчатская обл."},
+ {24, 231, 0, L"Магаданская обл."},
+ {24, 234, 0, L"Сахалинская обл."},
+ {24, 228, 0, L"Еврейская АО"},
+ {24, 230, 0, L"Корякский АО"},
+ {24, 236, 0, L"Чукотский АО"},
+ {24, 237, 0, L"Башкортостан"},
+ {24, 240, 0, L"Марий-Эл"},
+ {24, 241, 0, L"Мордовия"},
+ {24, 248, 0, L"Татарстан"},
+ {24, 249, 0, L"Удмуртия"},
+ {24, 251, 0, L"Чувашия"},
+ {24, 238, 0, L"Кировская обл."},
+ {24, 242, 0, L"Нижегородская обл."},
+ {24, 243, 0, L"Оренбургская обл."},
+ {24, 244, 0, L"Пензенская обл."},
+ {24, 245, 0, L"Пермская обл."},
+ {24, 246, 0, L"Самарская обл."},
+ {24, 247, 0, L"Саратовская обл."},
+ {24, 250, 0, L"Ульяновская обл."},
+ {24, 239, 0, L"Коми-Пермяцкий АО"},
+ {24, 255, 0, L"Карелия"},
+ {24, 256, 0, L"Коми"},
+ {24, 252, 0, L"Архангельская обл."},
+ {24, 253, 0, L"Вологодская обл."},
+ {24, 254, 0, L"Калининградская обл."},
+ {24, 257, 0, L"Ленинградская обл."},
+ {24, 258, 0, L"Мурманская обл."},
+ {24, 260, 0, L"Новгородская обл."},
+ {24, 261, 0, L"Псковская обл."},
+ {24, 259, 0, L"Ненецкий АО"},
+ {24, 265, 0, L"Бурятия"},
+ {24, 263, 0, L"Республика Алтай"},
+ {24, 273, 0, L"Тыва"},
+ {24, 275, 0, L"Хакасия"},
+ {24, 264, 0, L"Алтайский край"},
+ {24, 268, 0, L"Красноярский край"},
+ {24, 266, 0, L"Иркутская обл."},
+ {24, 267, 0, L"Кемеровская обл."},
+ {24, 269, 0, L"Новосибирская обл."},
+ {24, 270, 0, L"Омская обл."},
+ {24, 272, 0, L"Томская обл."},
+ {24, 276, 0, L"Читинская обл."},
+ {24, 262, 0, L"Агинский Бурятский АО"},
+ {24, 271, 0, L"Таймырский АО"},
+ {24, 274, 0, L"Усть-Ордынский Бурятский АО"},
+ {24, 277, 0, L"Эвенкийский АО"},
+ {24, 278, 0, L"Курганская обл."},
+ {24, 279, 0, L"Свердловская обл."},
+ {24, 280, 0, L"Тюменская обл."},
+ {24, 282, 0, L"Челябинская обл."},
+ {24, 281, 0, L"Ханты-Мансийский АО - Югра"},
+ {24, 283, 0, L"Ямало-Ненецкий АО"},
+ {24, 284, 0, L"Белгородская обл."},
+ {24, 285, 0, L"Брянская обл."},
+ {24, 286, 0, L"Владимирская обл."},
+ {24, 287, 0, L"Воронежская обл."},
+ {24, 288, 0, L"Ивановская обл."},
+ {24, 289, 0, L"Калужская обл."},
+ {24, 290, 0, L"Костромская обл."},
+ {24, 291, 0, L"Курская обл."},
+ {24, 292, 0, L"Липецкая обл."},
+ {24, 293, 0, L"Московская обл."},
+ {24, 294, 0, L"Орловская обл."},
+ {24, 295, 0, L"Рязанская обл."},
+ {24, 296, 0, L"Смоленская обл."},
+ {24, 297, 0, L"Тамбовская обл."},
+ {24, 298, 0, L"Тверская обл."},
+ {24, 299, 0, L"Тульская обл."},
+ {24, 300, 0, L"Ярославская обл."},
+ {24, 301, 0, L"Адыгея"},
+ {24, 304, 0, L"Дагестан"},
+ {24, 305, 0, L"Ингушетия"},
+ {24, 306, 0, L"Кабардино-Балкария"},
+ {24, 307, 0, L"Калмыкия"},
+ {24, 308, 0, L"Карачаево-Черкессия"},
+ {24, 311, 0, L"Северная Осетия - Алания"},
+ {24, 313, 0, L"Чечня"},
+ {24, 309, 0, L"Краснодарский край"},
+ {24, 312, 0, L"Ставропольский край"},
+ {24, 302, 0, L"Астраханская обл."},
+ {24, 303, 0, L"Волгоградская обл."},
+ {24, 310, 0, L"Ростовская обл."},
+ {81, 1055, 0, L"Баку"},
+ {81, 1058, 0, L"Гянджа"},
+ {81, 1056, 0, L"Нахичевань"},
+ {81, 1057, 0, L"Ханкенди"},
+ {81, 3153, 0, L"Шеки"},
+ {81, 2291, 0, L"Другое"},
+ {82, 2932, 0, L"Абовян"},
+ {82, 1060, 0, L"Аштарак"},
+ {82, 3084, 0, L"Ванадзор"},
+ {82, 3011, 0, L"Гюмри"},
+ {82, 3306, 0, L"Дилижан"},
+ {82, 1059, 0, L"Ереван"},
+ {82, 3145, 0, L"Ханкенди"},
+ {82, 2292, 0, L"Другое"},
+ {97, 1061, 0, L"Кабул"},
+ {97, 2293, 0, L"Другое"},
+ {96, 1062, 0, L"Дакка"},
+ {96, 2294, 0, L"Другое"},
+ {99, 1063, 0, L"Манама"},
+ {99, 2295, 0, L"Другое"},
+ {100, 1064, 0, L"Бандар-Сери-Бегаван"},
+ {100, 2296, 0, L"Другое"},
+ {101, 1065, 0, L"Тхимпху"},
+ {101, 2297, 0, L"Другое"},
+ {102, 1066, 0, L"Ханой"},
+ {102, 2298, 0, L"Другое"},
+ {83, 1067, 0, L"Батуми"},
+ {83, 3158, 0, L"Боржоми"},
+ {83, 1068, 0, L"Поти"},
+ {83, 3129, 0, L"Рустави"},
+ {83, 1069, 0, L"Сухуми"},
+ {83, 1070, 0, L"Тбилиси"},
+ {83, 2299, 0, L"Другое"},
+ {86, 3345, 0, L"Ариэль"},
+ {86, 1071, 0, L"Афула"},
+ {86, 2992, 0, L"Ашдод"},
+ {86, 3175, 0, L"Ашкелон"},
+ {86, 3363, 0, L"Бат-Ям"},
+ {86, 2884, 0, L"Беер-Яков"},
+ {86, 3243, 0, L"Бейт-Шемеш"},
+ {86, 1074, 0, L"Беэр-Шева"},
+ {86, 3348, 0, L"Герцелия"},
+ {86, 3241, 0, L"Димона"},
+ {86, 1075, 0, L"Иерусалим"},
+ {86, 3350, 0, L"Йокнеам-Иллит"},
+ {86, 2982, 0, L"Кармиэль"},
+ {86, 2971, 0, L"Кфар-Саба"},
+ {86, 3136, 0, L"Назарет"},
+ {86, 1080, 0, L"Натания"},
+ {86, 3303, 0, L"Офаким"},
+ {86, 3050, 0, L"Раанана"},
+ {86, 3151, 0, L"Рамат Ган"},
+ {86, 3141, 0, L"Реховот"},
+ {86, 3012, 0, L"Ришон ле Цион"},
+ {86, 1081, 0, L"Тверия"},
+ {86, 1077, 0, L"Тель-Авив"},
+ {86, 1079, 0, L"Хадера"},
+ {86, 1078, 0, L"Хайфа"},
+ {86, 1076, 0, L"Хеврон"},
+ {86, 2929, 0, L"Цфат"},
+ {86, 2928, 0, L"Эйлат"},
+ {86, 2300, 0, L"Другое"},
+ {95, 3315, 0, L"Бангалор"},
+ {95, 1082, 0, L"Дели"},
+ {95, 1083, 0, L"Джайпур"},
+ {95, 3144, 0, L"Калькутта"},
+ {95, 3025, 0, L"Мумбаи"},
+ {95, 3277, 0, L"Панаджи"},
+ {95, 1084, 0, L"Ченнаи"},
+ {95, 2301, 0, L"Другое"},
+ {103, 1085, 0, L"Джакарта"},
+ {103, 2302, 0, L"Другое"},
+ {79, 1086, 0, L"Амман"},
+ {79, 2303, 0, L"Другое"},
+ {85, 1087, 0, L"Багдад"},
+ {85, 2304, 0, L"Другое"},
+ {87, 1088, 0, L"Тегеран"},
+ {87, 2305, 0, L"Другое"},
+ {104, 1089, 0, L"Сана"},
+ {104, 2306, 0, L"Другое"},
+ {84, 1090, 0, L"Актау"},
+ {84, 1091, 0, L"Актюбинск"},
+ {84, 1092, 0, L"Алма-Ата"},
+ {84, 3242, 0, L"Аршалы"},
+ {84, 1093, 0, L"Астана"},
+ {84, 1094, 0, L"Атырау (Гурьев)"},
+ {84, 1095, 0, L"Байконур"},
+ {84, 3245, 0, L"Балхаш"},
+ {84, 3083, 0, L"Жезказган"},
+ {84, 1096, 0, L"Капчагай"},
+ {84, 1097, 0, L"Караганда"},
+ {84, 1098, 0, L"Кокшетау"},
+ {84, 1099, 0, L"Кустанай"},
+ {84, 2868, 0, L"Лисаковск"},
+ {84, 1100, 0, L"Павлодар"},
+ {84, 1101, 0, L"Петропавловск (Сев.-Каз. обл.)"},
+ {84, 1102, 0, L"Рудный"},
+ {84, 1103, 0, L"Семипалатинск"},
+ {84, 1104, 0, L"Степногорск"},
+ {84, 3166, 0, L"Талгар"},
+ {84, 1105, 0, L"Талды-Курган"},
+ {84, 2927, 0, L"Тараз"},
+ {84, 1106, 0, L"Темиртау"},
+ {84, 1107, 0, L"Уральск"},
+ {84, 1108, 0, L"Усть-Каменогорск"},
+ {84, 1109, 0, L"Чимкент"},
+ {84, 1110, 0, L"Экибастуз"},
+ {84, 2307, 0, L"Другое"},
+ {105, 1111, 0, L"Пномпень"},
+ {105, 2308, 0, L"Другое"},
+ {106, 1112, 0, L"Доха"},
+ {106, 2309, 0, L"Другое"},
+ {107, 1113, 0, L"Ларнака"},
+ {107, 1114, 0, L"Лимассол"},
+ {107, 1115, 0, L"Никосия"},
+ {107, 2954, 0, L"Пафос"},
+ {107, 2310, 0, L"Другое"},
+ {92, 1116, 0, L"Бишкек"},
+ {92, 1117, 0, L"Джалал-Абад"},
+ {92, 3027, 0, L"Кара-Балта"},
+ {92, 1118, 0, L"Каракол"},
+ {92, 1119, 0, L"Ош"},
+ {92, 1120, 0, L"Талас"},
+ {92, 2933, 0, L"Хайдаркен"},
+ {92, 2311, 0, L"Другое"},
+ {76, 3214, 0, L"Аомынь (Макао)"},
+ {76, 1121, 0, L"Гонконг"},
+ {76, 2869, 0, L"Гуанчжоу"},
+ {76, 3262, 0, L"Далянь"},
+ {76, 1122, 0, L"Пекин"},
+ {76, 1123, 0, L"Харбин"},
+ {76, 1124, 0, L"Шанхай"},
+ {76, 3043, 0, L"Шеньян"},
+ {76, 2312, 0, L"Другое"},
+ {29, 1125, 0, L"Пхеньян"},
+ {29, 2313, 0, L"Другое"},
+ {108, 1126, 0, L"Сеул"},
+ {108, 3240, 0, L"Тейджон"},
+ {108, 2314, 0, L"Другое"},
+ {88, 1127, 0, L"Эль-Кувейт"},
+ {88, 2315, 0, L"Другое"},
+ {109, 1128, 0, L"Вьентьян"},
+ {109, 2316, 0, L"Другое"},
+ {110, 1129, 0, L"Бейрут"},
+ {110, 2317, 0, L"Другое"},
+ {111, 1130, 0, L"Джохор-Бару"},
+ {111, 1131, 0, L"Куала-Лумпур"},
+ {111, 2318, 0, L"Другое"},
+ {112, 1132, 0, L"Мале"},
+ {112, 2319, 0, L"Другое"},
+ {113, 1133, 0, L"Улан-Батор"},
+ {113, 1134, 0, L"Эрдэнэт"},
+ {113, 2320, 0, L"Другое"},
+ {114, 1135, 0, L"Янгон"},
+ {114, 2321, 0, L"Другое"},
+ {115, 1136, 0, L"Катманду"},
+ {115, 2322, 0, L"Другое"},
+ {116, 1137, 0, L"Абу-Даби"},
+ {116, 1138, 0, L"Дубай"},
+ {116, 1139, 0, L"Шарджа"},
+ {116, 2323, 0, L"Другое"},
+ {117, 1140, 0, L"Маскат"},
+ {117, 2324, 0, L"Другое"},
+ {122, 1141, 0, L"Исламабад"},
+ {122, 2325, 0, L"Другое"},
+ {89, 1072, 0, L"Ашдод"},
+ {89, 1073, 0, L"Ашкелон"},
+ {89, 1142, 0, L"Газа"},
+ {89, 2326, 0, L"Другое"},
+ {94, 3250, 0, L"Медина"},
+ {94, 1143, 0, L"Эр-Рияд"},
+ {94, 2327, 0, L"Другое"},
+ {78, 1144, 0, L"Дамаск"},
+ {78, 2328, 0, L"Другое"},
+ {91, 1145, 0, L"Душанбе"},
+ {91, 3307, 0, L"Кайраккум"},
+ {91, 3308, 0, L"Худжанд"},
+ {91, 2329, 0, L"Другое"},
+ {119, 1146, 0, L"Бангкок"},
+ {119, 1147, 0, L"Пхукет"},
+ {119, 2330, 0, L"Другое"},
+ {120, 1148, 0, L"Тайбэй"},
+ {120, 2331, 0, L"Другое"},
+ {132, 1149, 0, L"Дили"},
+ {132, 2332, 0, L"Другое"},
+ {90, 1150, 0, L"Ашхабад"},
+ {90, 3079, 0, L"Безмеин"},
+ {90, 2333, 0, L"Другое"},
+ {77, 1152, 0, L"Анкара"},
+ {77, 1153, 0, L"Анталия"},
+ {77, 3080, 0, L"Бурса"},
+ {77, 1151, 0, L"Мармарис"},
+ {77, 1154, 0, L"Стамбул"},
+ {77, 1155, 0, L"Трабзон"},
+ {77, 2334, 0, L"Другое"},
+ {93, 3362, 0, L"Алмалык"},
+ {93, 3137, 0, L"Андижан"},
+ {93, 3273, 0, L"Асака"},
+ {93, 1156, 0, L"Ахангаран"},
+ {93, 1157, 0, L"Бухара"},
+ {93, 3167, 0, L"Джизак"},
+ {93, 3347, 0, L"Кунград"},
+ {93, 1158, 0, L"Навои"},
+ {93, 1159, 0, L"Наманган"},
+ {93, 1160, 0, L"Самарканд"},
+ {93, 1161, 0, L"Ташкент"},
+ {93, 1162, 0, L"Ургенч"},
+ {93, 1163, 0, L"Фергана"},
+ {93, 1164, 0, L"Чирчик"},
+ {93, 2335, 0, L"Другое"},
+ {121, 1165, 0, L"Манила"},
+ {121, 3319, 0, L"Себу"},
+ {121, 2336, 0, L"Другое"},
+ {98, 1166, 0, L"Коломбо"},
+ {98, 2337, 0, L"Другое"},
+ {75, 3176, 0, L"Исесаки"},
+ {75, 3339, 0, L"Корияма"},
+ {75, 1167, 0, L"Саппоро"},
+ {75, 1168, 0, L"Токио"},
+ {75, 2338, 0, L"Другое"},
+ {123, 1914, 0, L"Аделаида"},
+ {123, 2957, 0, L"Блэк Рок"},
+ {123, 1915, 0, L"Брисбен"},
+ {123, 3331, 0, L"Горокан"},
+ {123, 1916, 0, L"Канберра"},
+ {123, 3001, 0, L"Лидкомб"},
+ {123, 1917, 0, L"Мельбурн"},
+ {123, 3217, 0, L"Норфолк"},
+ {123, 3064, 0, L"Перт"},
+ {123, 3020, 0, L"Санта Люсиа"},
+ {123, 1918, 0, L"Сидней"},
+ {123, 3238, 0, L"Энеабба"},
+ {123, 2339, 0, L"Другое"},
+ {454, 1192, 0, L"Паго-Паго"},
+ {454, 2366, 0, L"Другое"},
+ {124, 1919, 0, L"Порт-Вила"},
+ {124, 2340, 0, L"Другое"},
+ {453, 1193, 0, L"Аганья"},
+ {453, 2368, 0, L"Другое"},
+ {126, 1921, 0, L"Баирики"},
+ {126, 2342, 0, L"Другое"},
+ {127, 1922, 0, L"Маджуро"},
+ {127, 2343, 0, L"Другое"},
+ {128, 1923, 0, L"Паликир"},
+ {128, 2344, 0, L"Другое"},
+ {129, 1924, 0, L"Ярен"},
+ {129, 2345, 0, L"Другое"},
+ {130, 1925, 0, L"Веллингтон"},
+ {130, 1926, 0, L"Гамильтон"},
+ {130, 1928, 0, L"Данидин"},
+ {130, 1929, 0, L"Крайстчерч"},
+ {130, 3235, 0, L"Кромвель"},
+ {130, 1927, 0, L"Окленд"},
+ {130, 3323, 0, L"Тауранга"},
+ {130, 2346, 0, L"Другое"},
+ {131, 1930, 0, L"Корор"},
+ {131, 2347, 0, L"Другое"},
+ {133, 1931, 0, L"Порт-Морсби"},
+ {133, 2348, 0, L"Другое"},
+ {125, 1920, 0, L"Апиа"},
+ {125, 2341, 0, L"Другое"},
+ {134, 1932, 0, L"Хониара"},
+ {134, 2349, 0, L"Другое"},
+ {135, 1933, 0, L"Нукуалофа"},
+ {135, 2350, 0, L"Другое"},
+ {136, 1934, 0, L"Фунафути"},
+ {136, 2351, 0, L"Другое"},
+ {137, 1935, 0, L"Сува"},
+ {137, 2352, 0, L"Другое"},
+ {138, 3055, 0, L"Барлингтон"},
+ {138, 3049, 0, L"Броссард"},
+ {138, 3330, 0, L"Бурнаби"},
+ {138, 1169, 0, L"Ванкувер"},
+ {138, 3106, 0, L"Ватерлоо"},
+ {138, 1170, 0, L"Виннипег"},
+ {138, 1171, 0, L"Галифакс"},
+ {138, 1172, 0, L"Гамильтон"},
+ {138, 3365, 0, L"Денвер"},
+ {138, 1173, 0, L"Калгари"},
+ {138, 3104, 0, L"Камлупс"},
+ {138, 3366, 0, L"Каннингтон"},
+ {138, 1174, 0, L"Квебек"},
+ {138, 2964, 0, L"Кингстон"},
+ {138, 3113, 0, L"Коквитлам"},
+ {138, 1175, 0, L"Монреаль"},
+ {138, 2920, 0, L"Ниагара-Фолс"},
+ {138, 2889, 0, L"Норд-Йорк"},
+ {138, 1176, 0, L"Оттава"},
+ {138, 2903, 0, L"Порт Алберни"},
+ {138, 1177, 0, L"Ричмонд"},
+ {138, 1178, 0, L"Тимминс"},
+ {138, 2946, 0, L"Торнхилл"},
+ {138, 1179, 0, L"Торонто"},
+ {138, 1180, 0, L"Эдмонтон"},
+ {138, 2353, 0, L"Другое"},
+ {139, 407, 0, L"Вашингтон"},
+ {139, 426, 0, L"Айдахо"},
+ {139, 378, 0, L"Айова"},
+ {139, 412, 0, L"Алабама"},
+ {139, 446, 0, L"Аляска"},
+ {139, 434, 0, L"Аризона"},
+ {139, 416, 0, L"Арканзас"},
+ {139, 428, 0, L"Вайоминг"},
+ {139, 440, 0, L"Вашингтон"},
+ {139, 352, 0, L"Вермонт"},
+ {139, 394, 0, L"Виргиния"},
+ {139, 374, 0, L"Висконсин"},
+ {139, 448, 0, L"Гавайи"},
+ {139, 390, 0, L"Делавер"},
+ {139, 402, 0, L"Джорджия"},
+ {139, 396, 0, L"Западная Виргиния"},
+ {139, 370, 0, L"Иллинойс"},
+ {139, 368, 0, L"Индиана"},
+ {139, 444, 0, L"Калифорния"},
+ {139, 388, 0, L"Канзас"},
+ {139, 408, 0, L"Кентукки"},
+ {139, 430, 0, L"Колорадо"},
+ {139, 358, 0, L"Коннектикут"},
+ {139, 418, 0, L"Луизиана"},
+ {139, 354, 0, L"Массачусетс"},
+ {139, 376, 0, L"Миннесота"},
+ {139, 414, 0, L"Миссисипи"},
+ {139, 380, 0, L"Миссури"},
+ {139, 372, 0, L"Мичиган"},
+ {139, 424, 0, L"Монтана"},
+ {139, 348, 0, L"Мэн"},
+ {139, 392, 0, L"Мэриленд"},
+ {139, 386, 0, L"Небраска"},
+ {139, 438, 0, L"Невада"},
+ {139, 362, 0, L"Нью-Джерси"},
+ {139, 360, 0, L"Нью-Йорк"},
+ {139, 432, 0, L"Нью-Мексико"},
+ {139, 350, 0, L"Нью-Хэмпшир"},
+ {139, 366, 0, L"Огайо"},
+ {139, 420, 0, L"Оклахома"},
+ {139, 442, 0, L"Орегон"},
+ {139, 364, 0, L"Пенсильвания"},
+ {139, 450, 0, L"Пуэрто-Рико"},
+ {139, 356, 0, L"Род-Айленд"},
+ {139, 382, 0, L"Северная Дакота"},
+ {139, 398, 0, L"Северная Каролина"},
+ {139, 410, 0, L"Теннесси"},
+ {139, 422, 0, L"Техас"},
+ {139, 406, 0, L"Федеральный округ Колумбия"},
+ {139, 404, 0, L"Флорида"},
+ {139, 384, 0, L"Южная Дакота"},
+ {139, 400, 0, L"Южная Каролина"},
+ {139, 436, 0, L"Юта"},
+ {140, 1238, 0, L"Сент-Джонс"},
+ {140, 2442, 0, L"Другое"},
+ {141, 1239, 0, L"Буэнос-Айрес"},
+ {141, 2441, 0, L"Другое"},
+ {142, 1240, 0, L"Нассау"},
+ {142, 2440, 0, L"Другое"},
+ {143, 1241, 0, L"Бриджтаун"},
+ {143, 2439, 0, L"Другое"},
+ {146, 1242, 0, L"Бельмопан"},
+ {146, 2438, 0, L"Другое"},
+ {144, 1243, 0, L"Ла-Пас"},
+ {144, 2437, 0, L"Другое"},
+ {145, 1244, 0, L"Бразилиа"},
+ {145, 3094, 0, L"Пассо Фундо"},
+ {145, 1245, 0, L"Рио-де-Жанейро"},
+ {145, 1246, 0, L"Сан-Паулу"},
+ {145, 2436, 0, L"Другое"},
+ {147, 1247, 0, L"Каракас"},
+ {147, 2435, 0, L"Другое"},
+ {452, 1190, 0, L"Шарлотта-Амалия"},
+ {452, 2364, 0, L"Другое"},
+ {149, 1248, 0, L"Порт-о-Пренс"},
+ {149, 2434, 0, L"Другое"},
+ {148, 1249, 0, L"Джоржтаун"},
+ {148, 2433, 0, L"Другое"},
+ {173, 1250, 0, L"Гватемала"},
+ {173, 2432, 0, L"Другое"},
+ {150, 1251, 0, L"Тегусигальпа"},
+ {150, 2431, 0, L"Другое"},
+ {151, 1252, 0, L"Сент-Джорджес"},
+ {151, 2430, 0, L"Другое"},
+ {152, 1253, 0, L"Уманак"},
+ {152, 2429, 0, L"Другое"},
+ {153, 1254, 0, L"Розо"},
+ {153, 2428, 0, L"Другое"},
+ {154, 1255, 0, L"Санто-Доминго"},
+ {154, 2427, 0, L"Другое"},
+ {155, 1256, 0, L"Богота"},
+ {155, 2426, 0, L"Другое"},
+ {156, 1257, 0, L"Сан-Хосе"},
+ {156, 2425, 0, L"Другое"},
+ {157, 1258, 0, L"Гавана"},
+ {157, 2424, 0, L"Другое"},
+ {158, 1259, 0, L"Акапулько"},
+ {158, 1260, 0, L"Мехико"},
+ {158, 2423, 0, L"Другое"},
+ {159, 1261, 0, L"Манагуа"},
+ {159, 2422, 0, L"Другое"},
+ {160, 1262, 0, L"Панама"},
+ {160, 2421, 0, L"Другое"},
+ {161, 1263, 0, L"Асунсьон"},
+ {161, 2420, 0, L"Другое"},
+ {162, 1264, 0, L"Лима"},
+ {162, 2419, 0, L"Другое"},
+ {163, 1265, 0, L"Сан-Сальвадор"},
+ {163, 2418, 0, L"Другое"},
+ {164, 1266, 0, L"Кингстаун"},
+ {164, 2417, 0, L"Другое"},
+ {165, 1267, 0, L"Бастер"},
+ {165, 2416, 0, L"Другое"},
+ {166, 1268, 0, L"Кастри"},
+ {166, 2415, 0, L"Другое"},
+ {167, 1269, 0, L"Парамарибо"},
+ {167, 2414, 0, L"Другое"},
+ {168, 1270, 0, L"Порт-оф-Спейн"},
+ {168, 2413, 0, L"Другое"},
+ {169, 1271, 0, L"Монтевидео"},
+ {169, 2412, 0, L"Другое"},
+ {170, 1272, 0, L"Сантьяго"},
+ {170, 2411, 0, L"Другое"},
+ {171, 1273, 0, L"Гуаякиль"},
+ {171, 1274, 0, L"Кито"},
+ {171, 2410, 0, L"Другое"},
+ {172, 1275, 0, L"Кингстон"},
+ {172, 2409, 0, L"Другое"},
+ {174, 1854, 0, L"Алжир"},
+ {174, 2495, 0, L"Другое"},
+ {175, 1855, 0, L"Луанда"},
+ {175, 2494, 0, L"Другое"},
+ {176, 1856, 0, L"Котону"},
+ {176, 1857, 0, L"Порто-Ново"},
+ {176, 2493, 0, L"Другое"},
+ {177, 1858, 0, L"Габороне"},
+ {177, 2492, 0, L"Другое"},
+ {178, 1859, 0, L"Уагадугу"},
+ {178, 2491, 0, L"Другое"},
+ {179, 1860, 0, L"Бужумбуру"},
+ {179, 2490, 0, L"Другое"},
+ {180, 1861, 0, L"Либревиль"},
+ {180, 2489, 0, L"Другое"},
+ {181, 1862, 0, L"Банжул"},
+ {181, 2488, 0, L"Другое"},
+ {182, 1863, 0, L"Аккра"},
+ {182, 2487, 0, L"Другое"},
+ {183, 1864, 0, L"Конакри"},
+ {183, 2486, 0, L"Другое"},
+ {184, 1865, 0, L"Бисау"},
+ {184, 2485, 0, L"Другое"},
+ {185, 1866, 0, L"Джибути"},
+ {185, 2484, 0, L"Другое"},
+ {186, 3312, 0, L"Дахаб"},
+ {186, 1867, 0, L"Каир"},
+ {186, 1868, 0, L"Хургада"},
+ {186, 2483, 0, L"Другое"},
+ {187, 1869, 0, L"Лусака"},
+ {187, 2482, 0, L"Другое"},
+ {23, 1870, 0, L"Хараре"},
+ {23, 2481, 0, L"Другое"},
+ {188, 1871, 0, L"Прая"},
+ {188, 2480, 0, L"Другое"},
+ {189, 1872, 0, L"Яунде"},
+ {189, 2479, 0, L"Другое"},
+ {190, 1873, 0, L"Найроби"},
+ {190, 2478, 0, L"Другое"},
+ {191, 1874, 0, L"Морони"},
+ {191, 2477, 0, L"Другое"},
+ {193, 1875, 0, L"Киншаса"},
+ {193, 2476, 0, L"Другое"},
+ {192, 1876, 0, L"Браззавиль"},
+ {192, 2475, 0, L"Другое"},
+ {194, 1877, 0, L"Ямусукро"},
+ {194, 2474, 0, L"Другое"},
+ {195, 1878, 0, L"Масеру"},
+ {195, 2473, 0, L"Другое"},
+ {196, 1879, 0, L"Монровия"},
+ {196, 2472, 0, L"Другое"},
+ {197, 1880, 0, L"Триполи"},
+ {197, 2471, 0, L"Другое"},
+ {198, 1881, 0, L"Порт-Луи"},
+ {198, 2470, 0, L"Другое"},
+ {199, 1882, 0, L"Нуакшот"},
+ {199, 2469, 0, L"Другое"},
+ {200, 1883, 0, L"Антананариву"},
+ {200, 2468, 0, L"Другое"},
+ {201, 1884, 0, L"Лилонгве"},
+ {201, 2467, 0, L"Другое"},
+ {202, 1885, 0, L"Бамако"},
+ {202, 2466, 0, L"Другое"},
+ {203, 1886, 0, L"Агадир"},
+ {203, 1887, 0, L"Рабат"},
+ {203, 2465, 0, L"Другое"},
+ {204, 1888, 0, L"Мапуту"},
+ {204, 2464, 0, L"Другое"},
+ {205, 1889, 0, L"Виндхук"},
+ {205, 2463, 0, L"Другое"},
+ {206, 1890, 0, L"Ниамей"},
+ {206, 2462, 0, L"Другое"},
+ {207, 1891, 0, L"Абуджа"},
+ {207, 2461, 0, L"Другое"},
+ {208, 1892, 0, L"Кигали"},
+ {208, 2460, 0, L"Другое"},
+ {209, 1893, 0, L"Сан-Томе"},
+ {209, 2459, 0, L"Другое"},
+ {210, 1894, 0, L"Мбабане"},
+ {210, 2458, 0, L"Другое"},
+ {211, 1895, 0, L"Виктория"},
+ {211, 2457, 0, L"Другое"},
+ {212, 1896, 0, L"Дакар"},
+ {212, 2456, 0, L"Другое"},
+ {213, 1897, 0, L"Могадишо"},
+ {213, 2455, 0, L"Другое"},
+ {214, 1898, 0, L"Хартум"},
+ {214, 2454, 0, L"Другое"},
+ {215, 1899, 0, L"Фритаун"},
+ {215, 2453, 0, L"Другое"},
+ {216, 1900, 0, L"Дар-эс-Салам"},
+ {216, 1901, 0, L"Додома"},
+ {216, 2452, 0, L"Другое"},
+ {217, 1902, 0, L"Ломе"},
+ {217, 2451, 0, L"Другое"},
+ {218, 1903, 0, L"Тунис"},
+ {218, 2450, 0, L"Другое"},
+ {219, 1904, 0, L"Кампала"},
+ {219, 2449, 0, L"Другое"},
+ {220, 1905, 0, L"Банги"},
+ {220, 2448, 0, L"Другое"},
+ {222, 1906, 0, L"Нджамена"},
+ {222, 2447, 0, L"Другое"},
+ {223, 1907, 0, L"Малабо"},
+ {223, 2446, 0, L"Другое"},
+ {221, 1908, 0, L"Асмэра"},
+ {221, 2445, 0, L"Другое"},
+ {224, 1909, 0, L"Аддис-Абеба"},
+ {224, 2444, 0, L"Другое"},
+ {225, 1910, 0, L"Дурбан"},
+ {225, 1913, 0, L"Йоханнесбург"},
+ {225, 1912, 0, L"Кейптаун"},
+ {225, 3033, 0, L"Пайнтаун"},
+ {225, 1911, 0, L"Претория"},
+ {225, 2443, 0, L"Другое"},
+ {39, 314, 0, L"Киев"},
+ {39, 315, 0, L"Винницкая обл."},
+ {39, 316, 0, L"Волынская обл."},
+ {39, 317, 0, L"Днепропетровская обл."},
+ {39, 318, 0, L"Донецкая обл."},
+ {39, 319, 0, L"Житомирская обл."},
+ {39, 320, 0, L"Закарпатская обл."},
+ {39, 321, 0, L"Запорожская обл."},
+ {39, 322, 0, L"Ивано-Франковская обл."},
+ {39, 323, 0, L"Киевская обл."},
+ {39, 324, 0, L"Кировоградская обл."},
+ {39, 325, 0, L"Крым"},
+ {39, 326, 0, L"Луганская обл."},
+ {39, 327, 0, L"Львовская обл."},
+ {39, 328, 0, L"Николаевская обл."},
+ {39, 329, 0, L"Одесская обл."},
+ {39, 330, 0, L"Полтавская обл."},
+ {39, 331, 0, L"Ровенская обл."},
+ {39, 332, 0, L"Сумская обл."},
+ {39, 333, 0, L"Тернопольская обл."},
+ {39, 334, 0, L"Харьковская обл."},
+ {39, 335, 0, L"Херсонская обл."},
+ {39, 336, 0, L"Хмельницкая обл."},
+ {39, 337, 0, L"Черкасская обл."},
+ {39, 338, 0, L"Черниговская обл."},
+ {39, 339, 0, L"Черновицкая обл."},
+ {40, 602, 0, L"Бад Халл"},
+ {40, 604, 0, L"Брегенц"},
+ {40, 603, 0, L"Вена"},
+ {40, 608, 0, L"Грац"},
+ {40, 606, 0, L"Зальцбург"},
+ {40, 3099, 0, L"Зель-ам-Зее"},
+ {40, 605, 0, L"Инсбрук"},
+ {40, 3174, 0, L"Кирхберг"},
+ {40, 609, 0, L"Клагенфурт"},
+ {40, 607, 0, L"Линц"},
+ {40, 610, 0, L"Обдах"},
+ {40, 611, 0, L"Щтубайтал"},
+ {40, 2541, 0, L"Другое"},
+ {32, 612, 0, L"Тирана"},
+ {32, 2540, 0, L"Другое"},
+ {33, 613, 0, L"Андорра-ла-Велья"},
+ {33, 2539, 0, L"Другое"},
+ {340, 341, 0, L"Минск"},
+ {340, 342, 0, L"Брестская обл."},
+ {340, 343, 0, L"Витебская обл."},
+ {340, 344, 0, L"Гомельская обл."},
+ {340, 345, 0, L"Гродненская обл."},
+ {340, 346, 0, L"Минская обл."},
+ {340, 347, 0, L"Могилевская обл."},
+ {38, 760, 0, L"Антверпен"},
+ {38, 767, 0, L"Арлон"},
+ {38, 762, 0, L"Брюгге"},
+ {38, 761, 0, L"Брюссель"},
+ {38, 763, 0, L"Гент"},
+ {38, 769, 0, L"Лувен"},
+ {38, 765, 0, L"Льеж"},
+ {38, 764, 0, L"Монс"},
+ {38, 3117, 0, L"Мортсель"},
+ {38, 766, 0, L"Намюр"},
+ {38, 768, 0, L"Хасселт"},
+ {38, 2532, 0, L"Другое"},
+ {41, 3098, 0, L"Банско"},
+ {41, 792, 0, L"Благоевград"},
+ {41, 770, 0, L"Бургас"},
+ {41, 771, 0, L"Бяла"},
+ {41, 773, 0, L"Варна"},
+ {41, 776, 0, L"Велико-Тырново"},
+ {41, 788, 0, L"Видин"},
+ {41, 789, 0, L"Враца"},
+ {41, 796, 0, L"Габрово"},
+ {41, 777, 0, L"Димитровград"},
+ {41, 781, 0, L"Каварна"},
+ {41, 786, 0, L"Кырджали"},
+ {41, 791, 0, L"Кюстендил"},
+ {41, 793, 0, L"Лазарджик"},
+ {41, 795, 0, L"Ловеч"},
+ {41, 787, 0, L"Михайловград"},
+ {41, 790, 0, L"Перник"},
+ {41, 3133, 0, L"Пирдоп"},
+ {41, 794, 0, L"Плевен"},
+ {41, 782, 0, L"Пловдив"},
+ {41, 780, 0, L"Разград"},
+ {41, 779, 0, L"Русе"},
+ {41, 774, 0, L"Силистра"},
+ {41, 784, 0, L"Сливен"},
+ {41, 772, 0, L"София"},
+ {41, 775, 0, L"Толбухин"},
+ {41, 3116, 0, L"Тырново"},
+ {41, 785, 0, L"Хасково"},
+ {41, 778, 0, L"Шумен"},
+ {41, 783, 0, L"Ямбол"},
+ {41, 2531, 0, L"Другое"},
+ {42, 797, 0, L"Баня-Лука"},
+ {42, 799, 0, L"Зеница"},
+ {42, 798, 0, L"Сараево"},
+ {42, 800, 0, L"Тузла"},
+ {42, 2530, 0, L"Другое"},
+ {45, 802, 0, L"Абердин"},
+ {45, 3075, 0, L"Айслворт"},
+ {45, 801, 0, L"Алнвик"},
+ {45, 804, 0, L"Бидефорд"},
+ {45, 803, 0, L"Бирмингем"},
+ {45, 805, 0, L"Блоксвич"},
+ {45, 3168, 0, L"Бостон"},
+ {45, 806, 0, L"Брайтон"},
+ {45, 807, 0, L"Бредфорд"},
+ {45, 808, 0, L"Бристоль"},
+ {45, 809, 0, L"Вилленхолл"},
+ {45, 3131, 0, L"Воррингтон"},
+ {45, 810, 0, L"Вудбридж"},
+ {45, 3342, 0, L"Гилфорд"},
+ {45, 811, 0, L"Глазго"},
+ {45, 812, 0, L"Дадли"},
+ {45, 813, 0, L"Дарем"},
+ {45, 814, 0, L"Дуглас"},
+ {45, 3089, 0, L"Кардиф"},
+ {45, 815, 0, L"Кембридж"},
+ {45, 816, 0, L"Кентербери"},
+ {45, 817, 0, L"Ливерпуль"},
+ {45, 818, 0, L"Лидс"},
+ {45, 819, 0, L"Лондон"},
+ {45, 820, 0, L"Манчестер"},
+ {45, 2976, 0, L"Митчем"},
+ {45, 2988, 0, L"Мэйденхед"},
+ {45, 821, 0, L"Ноттингем"},
+ {45, 3088, 0, L"Ньюпорт"},
+ {45, 822, 0, L"Оксфорд"},
+ {45, 823, 0, L"Плимут"},
+ {45, 824, 0, L"Портсмут"},
+ {45, 825, 0, L"Престон"},
+ {45, 3343, 0, L"Райд"},
+ {45, 2867, 0, L"Ридинг"},
+ {45, 2986, 0, L"Сент-Албанс"},
+ {45, 826, 0, L"Стаффорд"},
+ {45, 3063, 0, L"Стокпорт"},
+ {45, 827, 0, L"Уэймут"},
+ {45, 3140, 0, L"Челтенхэм"},
+ {45, 828, 0, L"Честер"},
+ {45, 829, 0, L"Шеффилд"},
+ {45, 830, 0, L"Эдинбург"},
+ {45, 2529, 0, L"Другое"},
+ {44, 831, 0, L"Будапешт"},
+ {44, 832, 0, L"Геделле"},
+ {44, 836, 0, L"Дебрецен"},
+ {44, 835, 0, L"Мишкольц"},
+ {44, 834, 0, L"Сегед"},
+ {44, 833, 0, L"Шиофок"},
+ {44, 2528, 0, L"Другое"},
+ {46, 3007, 0, L"Аахен"},
+ {46, 837, 0, L"Аугсбург"},
+ {46, 838, 0, L"Баден-Баден"},
+ {46, 3371, 0, L"Бамберг"},
+ {46, 839, 0, L"Бергиш-Гладбах"},
+ {46, 840, 0, L"Берлин"},
+ {46, 841, 0, L"Билефельд"},
+ {46, 3163, 0, L"Бовенден"},
+ {46, 842, 0, L"Бонн"},
+ {46, 843, 0, L"Браденбург"},
+ {46, 3015, 0, L"Брауншвейг"},
+ {46, 844, 0, L"Бремен"},
+ {46, 2921, 0, L"Варштайн"},
+ {46, 845, 0, L"Веймар"},
+ {46, 846, 0, L"Вупперталь"},
+ {46, 847, 0, L"Гамбург"},
+ {46, 848, 0, L"Ганновер"},
+ {46, 849, 0, L"Гарделеген"},
+ {46, 3010, 0, L"Гейдельберг"},
+ {46, 850, 0, L"Гота"},
+ {46, 851, 0, L"Дармштадт"},
+ {46, 3072, 0, L"Дессау"},
+ {46, 852, 0, L"Детмольд"},
+ {46, 853, 0, L"Дортмунд"},
+ {46, 854, 0, L"Дрезден"},
+ {46, 855, 0, L"Дюссельдорф"},
+ {46, 3082, 0, L"Иффецхайм"},
+ {46, 3309, 0, L"Кассел"},
+ {46, 856, 0, L"Кельн"},
+ {46, 857, 0, L"Киль"},
+ {46, 3138, 0, L"Кобленц"},
+ {46, 858, 0, L"Крефельд"},
+ {46, 859, 0, L"Лейпциг"},
+ {46, 2872, 0, L"Лимбург"},
+ {46, 2965, 0, L"Линген"},
+ {46, 3135, 0, L"Любек"},
+ {46, 3156, 0, L"Мангейм"},
+ {46, 3192, 0, L"Меерсбург"},
+ {46, 860, 0, L"Мюнстер"},
+ {46, 861, 0, L"Мюнхен"},
+ {46, 2864, 0, L"Нойштадт"},
+ {46, 862, 0, L"Нюрнберг"},
+ {46, 3009, 0, L"Оффенбург"},
+ {46, 2993, 0, L"Падерборн"},
+ {46, 863, 0, L"Равенсбург"},
+ {46, 864, 0, L"Регенсбург"},
+ {46, 865, 0, L"Рейнен"},
+ {46, 866, 0, L"Росток"},
+ {46, 3191, 0, L"Саарбрюкен"},
+ {46, 2974, 0, L"Санкт-Августин"},
+ {46, 3127, 0, L"Тюринген"},
+ {46, 867, 0, L"Фрайберг"},
+ {46, 868, 0, L"Фрайбург"},
+ {46, 869, 0, L"Франкфурт-на-Майне"},
+ {46, 3373, 0, L"Хемнитц"},
+ {46, 3313, 0, L"Хильден"},
+ {46, 870, 0, L"Штутгарт"},
+ {46, 3045, 0, L"Эрланген"},
+ {46, 2906, 0, L"Эшборн"},
+ {46, 2527, 0, L"Другое"},
+ {48, 871, 0, L"Афины"},
+ {48, 873, 0, L"Ираклион"},
+ {48, 3147, 0, L"Корфу"},
+ {48, 872, 0, L"Салоники"},
+ {48, 3178, 0, L"Халкидики"},
+ {48, 2526, 0, L"Другое"},
+ {49, 3006, 0, L"Архус"},
+ {49, 874, 0, L"Копенгаген"},
+ {49, 875, 0, L"Оденсе"},
+ {49, 3285, 0, L"Ольборг"},
+ {49, 876, 0, L"Сванеке"},
+ {49, 3126, 0, L"Скиве"},
+ {49, 2525, 0, L"Другое"},
+ {50, 3377, 0, L"Виклоу"},
+ {50, 3067, 0, L"Голвей"},
+ {50, 877, 0, L"Дублин"},
+ {50, 3065, 0, L"Килларней"},
+ {50, 3066, 0, L"Корк"},
+ {50, 878, 0, L"Лимерик"},
+ {50, 3069, 0, L"Нейс"},
+ {50, 3068, 0, L"Типперэри"},
+ {50, 2524, 0, L"Другое"},
+ {51, 879, 0, L"Рейкьявик"},
+ {51, 2523, 0, L"Другое"},
+ {34, 880, 0, L"Аликанте"},
+ {34, 3125, 0, L"Альмерия"},
+ {34, 881, 0, L"Барселона"},
+ {34, 890, 0, L"Бильбао"},
+ {34, 3076, 0, L"Бланес"},
+ {34, 882, 0, L"Валенсия"},
+ {34, 3070, 0, L"Ибица"},
+ {34, 888, 0, L"Кадис"},
+ {34, 886, 0, L"Картахена"},
+ {34, 891, 0, L"Ла-Корунья"},
+ {34, 3310, 0, L"Лорет де Мар"},
+ {34, 883, 0, L"Мадрид"},
+ {34, 884, 0, L"Малага"},
+ {34, 885, 0, L"Марбелья"},
+ {34, 892, 0, L"Овьедо"},
+ {34, 3179, 0, L"Пальма де Майорка"},
+ {34, 3177, 0, L"Сан-Агустин"},
+ {34, 3289, 0, L"Санта-Крус-де-Тенерифе"},
+ {34, 889, 0, L"Сарагоса"},
+ {34, 887, 0, L"Севилья"},
+ {34, 893, 0, L"Хихон"},
+ {34, 2522, 0, L"Другое"},
+ {52, 3318, 0, L"Аоста"},
+ {52, 3278, 0, L"Беллариа"},
+ {52, 906, 0, L"Болонья"},
+ {52, 894, 0, L"Брешиа"},
+ {52, 895, 0, L"Венеция"},
+ {52, 905, 0, L"Верона"},
+ {52, 896, 0, L"Генуя"},
+ {52, 897, 0, L"Лекко"},
+ {52, 3369, 0, L"Ливорно"},
+ {52, 3327, 0, L"Марсала"},
+ {52, 898, 0, L"Милан"},
+ {52, 899, 0, L"Модена"},
+ {52, 907, 0, L"Неаполь"},
+ {52, 908, 0, L"Перуджа"},
+ {52, 900, 0, L"Пиза"},
+ {52, 901, 0, L"Рим"},
+ {52, 3368, 0, L"Сан-Ремо"},
+ {52, 3384, 0, L"Сиракуза"},
+ {52, 3252, 0, L"Терамо"},
+ {52, 902, 0, L"Триест"},
+ {52, 903, 0, L"Турин"},
+ {52, 3130, 0, L"Фано"},
+ {52, 904, 0, L"Флоренция"},
+ {52, 2521, 0, L"Другое"},
+ {53, 2939, 0, L"Айзкраукле"},
+ {53, 3054, 0, L"Валка"},
+ {53, 909, 0, L"Даугавпилс"},
+ {53, 2934, 0, L"Екабпилс"},
+ {53, 913, 0, L"Елгава"},
+ {53, 2935, 0, L"Кокнесе"},
+ {53, 912, 0, L"Лиепая"},
+ {53, 2905, 0, L"Резекне"},
+ {53, 911, 0, L"Рига"},
+ {53, 2936, 0, L"Саласпилс"},
+ {53, 2937, 0, L"Смилтене"},
+ {53, 910, 0, L"Юрмала"},
+ {53, 2520, 0, L"Другое"},
+ {54, 914, 0, L"Вильнюс"},
+ {54, 915, 0, L"Висагинас"},
+ {54, 916, 0, L"Каунас"},
+ {54, 918, 0, L"Клайпеда"},
+ {54, 919, 0, L"Паланга"},
+ {54, 3173, 0, L"Пеневежис"},
+ {54, 917, 0, L"Шауляй"},
+ {54, 2519, 0, L"Другое"},
+ {55, 920, 0, L"Вадуц"},
+ {55, 2518, 0, L"Другое"},
+ {56, 3376, 0, L"Бетцдорф"},
+ {56, 921, 0, L"Люксембург"},
+ {56, 2517, 0, L"Другое"},
+ {57, 3142, 0, L"Битола"},
+ {57, 922, 0, L"Скопье"},
+ {57, 2516, 0, L"Другое"},
+ {58, 923, 0, L"Валлетта"},
+ {58, 3154, 0, L"Мзида"},
+ {58, 924, 0, L"Слима"},
+ {58, 2515, 0, L"Другое"},
+ {59, 925, 0, L"Бельцы"},
+ {59, 926, 0, L"Бендеры"},
+ {59, 3234, 0, L"Дубоссары"},
+ {59, 3275, 0, L"Кахул"},
+ {59, 927, 0, L"Кишинев"},
+ {59, 3321, 0, L"Резина"},
+ {59, 928, 0, L"Рыбница"},
+ {59, 929, 0, L"Тирасполь"},
+ {59, 3281, 0, L"Чадыр-Лунга"},
+ {59, 2514, 0, L"Другое"},
+ {36, 930, 0, L"Монте-Карло"},
+ {36, 2513, 0, L"Другое"},
+ {60, 931, 0, L"Амстердам"},
+ {60, 933, 0, L"Бреда"},
+ {60, 932, 0, L"Гаага"},
+ {60, 934, 0, L"Гауда"},
+ {60, 935, 0, L"Делфт"},
+ {60, 2977, 0, L"Донген"},
+ {60, 3030, 0, L"Зволле"},
+ {60, 3091, 0, L"Ниймеген"},
+ {60, 936, 0, L"Роттердам"},
+ {60, 937, 0, L"Утрехт"},
+ {60, 3044, 0, L"Эйндховен"},
+ {60, 3380, 0, L"Эншеде"},
+ {60, 2512, 0, L"Другое"},
+ {61, 3190, 0, L"Кристиансанд"},
+ {61, 2857, 0, L"Лиллехаммер"},
+ {61, 938, 0, L"Осло"},
+ {61, 3355, 0, L"Ставангер"},
+ {61, 939, 0, L"Тронхейм"},
+ {61, 2511, 0, L"Другое"},
+ {62, 940, 0, L"Белосток"},
+ {62, 941, 0, L"Варшава"},
+ {62, 3164, 0, L"Вроцлав"},
+ {62, 942, 0, L"Гданьск"},
+ {62, 943, 0, L"Гливице"},
+ {62, 3237, 0, L"Закопане"},
+ {62, 3165, 0, L"Зелена Гура"},
+ {62, 944, 0, L"Катовице"},
+ {62, 945, 0, L"Краков"},
+ {62, 3008, 0, L"Лодзь"},
+ {62, 3150, 0, L"Ольштын"},
+ {62, 946, 0, L"Познань"},
+ {62, 947, 0, L"Радом"},
+ {62, 948, 0, L"Сопот"},
+ {62, 2958, 0, L"Тыхы"},
+ {62, 2510, 0, L"Другое"},
+ {35, 949, 0, L"Лиссабон"},
+ {35, 950, 0, L"Порто"},
+ {35, 2509, 0, L"Другое"},
+ {63, 952, 0, L"Брашов"},
+ {63, 951, 0, L"Бухарест"},
+ {63, 954, 0, L"Констанца"},
+ {63, 955, 0, L"Плоешти"},
+ {63, 953, 0, L"Яссы"},
+ {63, 2508, 0, L"Другое"},
+ {64, 956, 0, L"Сан-Марино"},
+ {64, 2507, 0, L"Другое"},
+ {74, 957, 0, L"Белград"},
+ {74, 960, 0, L"Ниш"},
+ {74, 958, 0, L"Нови-Сад"},
+ {74, 959, 0, L"Сараево"},
+ {74, 2506, 0, L"Другое"},
+ {65, 961, 0, L"Братислава"},
+ {65, 962, 0, L"Кошице"},
+ {65, 3101, 0, L"Липтов"},
+ {65, 963, 0, L"Попрад"},
+ {65, 964, 0, L"Прешов"},
+ {65, 965, 0, L"Ружемберок"},
+ {65, 966, 0, L"Тврдошин"},
+ {65, 2505, 0, L"Другое"},
+ {66, 968, 0, L"Копар"},
+ {66, 967, 0, L"Любляна"},
+ {66, 969, 0, L"Марибор"},
+ {66, 2504, 0, L"Другое"},
+ {67, 970, 0, L"Торсхавн"},
+ {67, 2503, 0, L"Другое"},
+ {68, 2888, 0, L"Вантаа"},
+ {68, 971, 0, L"Васа"},
+ {68, 979, 0, L"Котка"},
+ {68, 972, 0, L"Коувола"},
+ {68, 980, 0, L"Лахти"},
+ {68, 973, 0, L"Оулу"},
+ {68, 3375, 0, L"Риихимяки"},
+ {68, 3159, 0, L"Руовеси"},
+ {68, 974, 0, L"Тампере"},
+ {68, 975, 0, L"Турку"},
+ {68, 976, 0, L"Хельсинки"},
+ {68, 977, 0, L"Эспо"},
+ {68, 978, 0, L"Ювяскюля"},
+ {68, 2502, 0, L"Другое"},
+ {37, 996, 0, L"Авиньон"},
+ {37, 983, 0, L"Бержерак"},
+ {37, 997, 0, L"Блуа"},
+ {37, 984, 0, L"Бордо"},
+ {37, 998, 0, L"Дижон"},
+ {37, 987, 0, L"Канн"},
+ {37, 988, 0, L"Кастр"},
+ {37, 993, 0, L"Клермон-Ферран"},
+ {37, 3037, 0, L"Лилль"},
+ {37, 989, 0, L"Лион"},
+ {37, 985, 0, L"Марсель"},
+ {37, 991, 0, L"Мец"},
+ {37, 3161, 0, L"Мобеж"},
+ {37, 990, 0, L"Нанси"},
+ {37, 994, 0, L"Нант"},
+ {37, 995, 0, L"Ницца"},
+ {37, 999, 0, L"Орлеан"},
+ {37, 981, 0, L"Париж"},
+ {37, 3374, 0, L"Перпиньян"},
+ {37, 992, 0, L"Руан"},
+ {37, 982, 0, L"Страсбург"},
+ {37, 986, 0, L"Тулуза"},
+ {37, 3314, 0, L"Шамбери"},
+ {37, 2501, 0, L"Другое"},
+ {69, 1003, 0, L"Дубровник"},
+ {69, 1000, 0, L"Загреб"},
+ {69, 1001, 0, L"Задар"},
+ {69, 1004, 0, L"Риека"},
+ {69, 1002, 0, L"Сплит"},
+ {69, 2500, 0, L"Другое"},
+ {70, 1005, 0, L"Брно"},
+ {70, 3291, 0, L"Гавличкув-Брод"},
+ {70, 1007, 0, L"Градец-Кралове"},
+ {70, 1008, 0, L"Карлови-Вари"},
+ {70, 3019, 0, L"Кладрубы"},
+ {70, 1010, 0, L"Лоуни"},
+ {70, 1009, 0, L"Острава"},
+ {70, 1015, 0, L"Пльзень"},
+ {70, 3105, 0, L"Правчицка Брана"},
+ {70, 1006, 0, L"Прага"},
+ {70, 3246, 0, L"Тачов"},
+ {70, 1011, 0, L"Тршебич"},
+ {70, 1012, 0, L"Усти-над-Лабем"},
+ {70, 1014, 0, L"Ческе-Будеевице"},
+ {70, 1013, 0, L"Яблонец-над-Нисоу"},
+ {70, 2499, 0, L"Другое"},
+ {71, 1016, 0, L"Арау"},
+ {71, 1019, 0, L"Баден"},
+ {71, 1017, 0, L"Базель"},
+ {71, 1018, 0, L"Берн"},
+ {71, 1020, 0, L"Биль"},
+ {71, 1021, 0, L"Винтертур"},
+ {71, 1022, 0, L"Давос"},
+ {71, 3189, 0, L"Делемонт"},
+ {71, 1023, 0, L"Женева"},
+ {71, 1024, 0, L"Золотурн"},
+ {71, 1025, 0, L"Лозанна"},
+ {71, 1026, 0, L"Локарно"},
+ {71, 1027, 0, L"Лугано"},
+ {71, 1028, 0, L"Люцерн"},
+ {71, 1029, 0, L"Монтре"},
+ {71, 1030, 0, L"Цюрих"},
+ {71, 2498, 0, L"Другое"},
+ {72, 2883, 0, L"Арбога"},
+ {72, 1031, 0, L"Гетеборг"},
+ {72, 1032, 0, L"Кальмар"},
+ {72, 1037, 0, L"Лахольм"},
+ {72, 1036, 0, L"Лулео"},
+ {72, 1042, 0, L"Лунд"},
+ {72, 1033, 0, L"Мальме"},
+ {72, 1034, 0, L"Стокгольм"},
+ {72, 1041, 0, L"Умео"},
+ {72, 1039, 0, L"Фалун"},
+ {72, 1043, 0, L"Хельсинборг"},
+ {72, 1040, 0, L"Хернесанд"},
+ {72, 1038, 0, L"Эстерсунд"},
+ {72, 2497, 0, L"Другое"},
+ {73, 3013, 0, L"Валга"},
+ {73, 1044, 0, L"Кейла"},
+ {73, 1045, 0, L"Кохтла-Ярве"},
+ {73, 1046, 0, L"Маарду"},
+ {73, 1047, 0, L"Мыйзакюла"},
+ {73, 1048, 0, L"Нарва"},
+ {73, 1049, 0, L"Пярну"},
+ {73, 1050, 0, L"Раквере"},
+ {73, 1051, 0, L"Силламяэ"},
+ {73, 1052, 0, L"Таллин"},
+ {73, 1053, 0, L"Тарту"},
+ {73, 1054, 0, L"Хаапсалу"},
+ {24, 233, 474, L"Алдан"},
+ {24, 233, 2809, L"Верхоянск"},
+ {24, 233, 2804, L"Вилюйск"},
+ {24, 233, 475, L"Ленск"},
+ {24, 233, 477, L"Мирный"},
+ {24, 233, 476, L"Нерюнгри"},
+ {24, 233, 2806, L"Олекминск"},
+ {24, 233, 3115, L"Покровск"},
+ {24, 233, 2808, L"Среднеколымск"},
+ {24, 233, 2807, L"Томмот"},
+ {24, 233, 2805, L"Удачный"},
+ {24, 233, 478, L"Усть-Нера"},
+ {24, 233, 479, L"Якутск"},
+ {24, 233, 2263, L"Другое"},
+ {24, 232, 2819, L"Арсеньев"},
+ {24, 232, 464, L"Артем"},
+ {24, 232, 465, L"Большой Камень"},
+ {24, 232, 466, L"Владивосток"},
+ {24, 232, 2817, L"Дальнегорск"},
+ {24, 232, 2818, L"Дальнереченск"},
+ {24, 232, 3359, L"Кавалерово"},
+ {24, 232, 467, L"Камень-Рыболов"},
+ {24, 232, 468, L"Лесозаводск"},
+ {24, 232, 469, L"Лучегорск"},
+ {24, 232, 470, L"Находка"},
+ {24, 232, 471, L"Партизанск"},
+ {24, 232, 472, L"Пластун"},
+ {24, 232, 2816, L"Спасск-Дальний"},
+ {24, 232, 473, L"Уссурийск"},
+ {24, 232, 2258, L"Другое"},
+ {24, 235, 487, L"Амурск"},
+ {24, 235, 2821, L"Бикин"},
+ {24, 235, 488, L"Ванино"},
+ {24, 235, 2820, L"Вяземский"},
+ {24, 235, 489, L"Комсомольск-на-Амуре"},
+ {24, 235, 490, L"Николаевск-на-Амуре"},
+ {24, 235, 491, L"Советская Гавань"},
+ {24, 235, 3353, L"Солнечный"},
+ {24, 235, 492, L"Хабаровск"},
+ {24, 235, 2280, L"Другое"},
+ {24, 227, 455, L"Белогорск"},
+ {24, 227, 456, L"Благовещенск"},
+ {24, 227, 2814, L"Завитинск"},
+ {24, 227, 2813, L"Зея"},
+ {24, 227, 2815, L"Райчихинск"},
+ {24, 227, 2812, L"Свободный"},
+ {24, 227, 2811, L"Сковородино"},
+ {24, 227, 457, L"Тында"},
+ {24, 227, 2217, L"Шимановск"},
+ {24, 227, 2218, L"Другое"},
+ {24, 229, 460, L"Елизово"},
+ {24, 229, 2822, L"Ключи"},
+ {24, 229, 459, L"Петропавловск-Камч."},
+ {24, 229, 2234, L"Другое"},
+ {24, 231, 462, L"Магадан"},
+ {24, 231, 2823, L"Сусуман"},
+ {24, 231, 463, L"Ягодное"},
+ {24, 231, 2246, L"Другое"},
+ {24, 234, 480, L"Александровск-Сахалинский"},
+ {24, 234, 2829, L"Анива"},
+ {24, 234, 2833, L"Горнозаводск"},
+ {24, 234, 2825, L"Долинск"},
+ {24, 234, 481, L"Корсаков"},
+ {24, 234, 482, L"Красногорск"},
+ {24, 234, 2826, L"Курильск"},
+ {24, 234, 2832, L"Лесогорск"},
+ {24, 234, 2836, L"Макаров"},
+ {24, 234, 2830, L"Невельск"},
+ {24, 234, 483, L"Оха"},
+ {24, 234, 2828, L"Поронайск"},
+ {24, 234, 2824, L"Северо-Курильск"},
+ {24, 234, 2827, L"Томари"},
+ {24, 234, 2831, L"Углегорск"},
+ {24, 234, 484, L"Холмск"},
+ {24, 234, 2834, L"Чехов"},
+ {24, 234, 2835, L"Шахтерск"},
+ {24, 234, 485, L"Южно-Курильск"},
+ {24, 234, 486, L"Южно-Сахалинск"},
+ {24, 234, 2264, L"Другое"},
+ {24, 228, 458, L"Биробиджан"},
+ {24, 228, 2810, L"Облучье"},
+ {24, 228, 2226, L"Другое"},
+ {24, 230, 461, L"Полана"},
+ {24, 230, 2239, L"Другое"},
+ {24, 236, 493, L"Анадырь"},
+ {24, 236, 2287, L"Другое"},
+ {24, 237, 2850, L"Агидель"},
+ {24, 237, 2851, L"Агидель"},
+ {24, 237, 2657, L"Баймак"},
+ {24, 237, 2662, L"Белебей"},
+ {24, 237, 494, L"Белорецк"},
+ {24, 237, 2658, L"Бирск"},
+ {24, 237, 2660, L"Благовещенск"},
+ {24, 237, 2659, L"Давлеканово"},
+ {24, 237, 2663, L"Дюртюли"},
+ {24, 237, 495, L"Ишимбай"},
+ {24, 237, 496, L"Кумертау"},
+ {24, 237, 2655, L"Мелеуз"},
+ {24, 237, 497, L"Нефтекамск"},
+ {24, 237, 2654, L"Октябрьский"},
+ {24, 237, 499, L"Салават"},
+ {24, 237, 2656, L"Сибай"},
+ {24, 237, 498, L"Стерлитамак"},
+ {24, 237, 500, L"Туймазы"},
+ {24, 237, 2661, L"Туймазы"},
+ {24, 237, 501, L"Уфа"},
+ {24, 237, 502, L"Учалы"},
+ {24, 237, 2664, L"Янаул"},
+ {24, 237, 2220, L"Другое"},
+ {24, 240, 509, L"Волжск"},
+ {24, 240, 510, L"Звенигово"},
+ {24, 240, 511, L"Йошкар-Ола"},
+ {24, 240, 512, L"Козьмодемьянск"},
+ {24, 240, 2247, L"Другое"},
+ {24, 241, 513, L"Зубова Поляна"},
+ {24, 241, 2147, L"Инсар"},
+ {24, 241, 2150, L"Ковылкино"},
+ {24, 241, 2148, L"Краснослободск"},
+ {24, 241, 2910, L"Лямбирь"},
+ {24, 241, 515, L"Рузаевка"},
+ {24, 241, 514, L"Саранск"},
+ {24, 241, 2149, L"Темников"},
+ {24, 241, 2923, L"Чамзинка"},
+ {24, 241, 2248, L"Другое"},
+ {24, 248, 2569, L"Агрыз"},
+ {24, 248, 2575, L"Азнакаево"},
+ {24, 248, 569, L"Альметьевск"},
+ {24, 248, 570, L"Апастово"},
+ {24, 248, 2571, L"Болгар"},
+ {24, 248, 571, L"Бугульма"},
+ {24, 248, 2570, L"Буинск"},
+ {24, 248, 572, L"Джалиль"},
+ {24, 248, 573, L"Елабуга"},
+ {24, 248, 2576, L"Заинск"},
+ {24, 248, 574, L"Зеленодольск"},
+ {24, 248, 575, L"Казань"},
+ {24, 248, 2577, L"Лениногорск"},
+ {24, 248, 2572, L"Мамадыш"},
+ {24, 248, 576, L"Менделеевск"},
+ {24, 248, 2573, L"Мензелинск"},
+ {24, 248, 577, L"Набережные Челны"},
+ {24, 248, 578, L"Нижнекамск"},
+ {24, 248, 579, L"Нурлат"},
+ {24, 248, 2574, L"Тетюши"},
+ {24, 248, 580, L"Чистополь"},
+ {24, 248, 2271, L"Другое"},
+ {24, 249, 3311, L"Вавож"},
+ {24, 249, 581, L"Воткинск"},
+ {24, 249, 582, L"Глазов"},
+ {24, 249, 583, L"Игра"},
+ {24, 249, 584, L"Ижевск"},
+ {24, 249, 2665, L"Камбарка"},
+ {24, 249, 585, L"Можга"},
+ {24, 249, 586, L"Сарапул"},
+ {24, 249, 587, L"Ува"},
+ {24, 249, 2277, L"Другое"},
+ {24, 251, 2158, L"Алатырь"},
+ {24, 251, 2156, L"Канаш"},
+ {24, 251, 2151, L"Козловка"},
+ {24, 251, 2152, L"Марьинский Посад"},
+ {24, 251, 2155, L"Новочебоксарск"},
+ {24, 251, 2153, L"Цивильск"},
+ {24, 251, 592, L"Чебоксары"},
+ {24, 251, 2157, L"Шумерля"},
+ {24, 251, 2154, L"Ядрин"},
+ {24, 251, 2286, L"Другое"},
+ {24, 238, 2168, L"Белая Холуница"},
+ {24, 238, 503, L"Вятские Поляны"},
+ {24, 238, 2164, L"Зуевка"},
+ {24, 238, 504, L"Киров"},
+ {24, 238, 505, L"Кирово-Чепецк"},
+ {24, 238, 2160, L"Кирс"},
+ {24, 238, 506, L"Котельнич"},
+ {24, 238, 2167, L"Луза"},
+ {24, 238, 2159, L"Малмыж"},
+ {24, 238, 2169, L"Мураши"},
+ {24, 238, 2163, L"Нолинск"},
+ {24, 238, 2170, L"Омутнинск"},
+ {24, 238, 2166, L"Слободской"},
+ {24, 238, 2165, L"Советск"},
+ {24, 238, 2162, L"Сосновка"},
+ {24, 238, 2171, L"Уржум"},
+ {24, 238, 2161, L"Халтурин"},
+ {24, 238, 507, L"Яранск"},
+ {24, 238, 2237, L"Другое"},
+ {24, 242, 516, L"Арзамас"},
+ {24, 242, 517, L"Балахна"},
+ {24, 242, 2139, L"Богородск"},
+ {24, 242, 518, L"Бор"},
+ {24, 242, 519, L"Вахтан"},
+ {24, 242, 520, L"Ветлуга"},
+ {24, 242, 2140, L"Володарск"},
+ {24, 242, 2138, L"Ворсма"},
+ {24, 242, 521, L"Выкса"},
+ {24, 242, 2137, L"Горбатов"},
+ {24, 242, 522, L"Городец"},
+ {24, 242, 523, L"Дзержинск"},
+ {24, 242, 524, L"Заволжье"},
+ {24, 242, 2891, L"Ильиногорск"},
+ {24, 242, 525, L"Кстово"},
+ {24, 242, 2145, L"Кулебаки"},
+ {24, 242, 2143, L"Лукоянов"},
+ {24, 242, 2144, L"Лысково"},
+ {24, 242, 2146, L"Навашино"},
+ {24, 242, 526, L"Нижний Новгород"},
+ {24, 242, 527, L"Павлово"},
+ {24, 242, 2135, L"Первомайск"},
+ {24, 242, 528, L"Саров"},
+ {24, 242, 529, L"Семенов"},
+ {24, 242, 530, L"Сергач"},
+ {24, 242, 2141, L"Урень"},
+ {24, 242, 2136, L"Чкаловск"},
+ {24, 242, 2897, L"Шатки"},
+ {24, 242, 2142, L"Шахунья"},
+ {24, 242, 2251, L"Другое"},
+ {24, 243, 2678, L"Абдулино"},
+ {24, 243, 2673, L"Бугуруслан"},
+ {24, 243, 531, L"Бузулук"},
+ {24, 243, 532, L"Гай"},
+ {24, 243, 2674, L"Кувандык"},
+ {24, 243, 2675, L"Медногорск"},
+ {24, 243, 533, L"Новотроицк"},
+ {24, 243, 535, L"Оренбург"},
+ {24, 243, 536, L"Орск"},
+ {24, 243, 3360, L"Саракташ"},
+ {24, 243, 2677, L"Соль-Илецк"},
+ {24, 243, 2676, L"Сорочинск"},
+ {24, 243, 537, L"Тоцкое"},
+ {24, 243, 538, L"Ясный"},
+ {24, 243, 2254, L"Другое"},
+ {24, 244, 539, L"Беднодемьяновск"},
+ {24, 244, 2597, L"Белинский"},
+ {24, 244, 2595, L"Городище"},
+ {24, 244, 2593, L"Каменка"},
+ {24, 244, 540, L"Кузнецк"},
+ {24, 244, 2598, L"Нижний Ломов"},
+ {24, 244, 2592, L"Никольск"},
+ {24, 244, 541, L"Пенза"},
+ {24, 244, 3304, L"Русский Камешкир"},
+ {24, 244, 2596, L"Сердобск"},
+ {24, 244, 2594, L"Сурск"},
+ {24, 244, 2256, L"Другое"},
+ {24, 245, 2690, L"Александровск"},
+ {24, 245, 542, L"Березники"},
+ {24, 245, 2679, L"Верещагино"},
+ {24, 245, 2680, L"Горнозаводск"},
+ {24, 245, 2687, L"Гремячинск"},
+ {24, 245, 2686, L"Губаха"},
+ {24, 245, 543, L"Добрянка"},
+ {24, 245, 544, L"Кизел"},
+ {24, 245, 2681, L"Красновишерск"},
+ {24, 245, 545, L"Краснокамск"},
+ {24, 245, 546, L"Кунгур"},
+ {24, 245, 547, L"Лысьва"},
+ {24, 245, 548, L"Нытва"},
+ {24, 245, 2683, L"Оса"},
+ {24, 245, 2684, L"Оханск"},
+ {24, 245, 2682, L"Очер"},
+ {24, 245, 549, L"Пермь"},
+ {24, 245, 550, L"Соликамск"},
+ {24, 245, 2685, L"Усолье"},
+ {24, 245, 551, L"Чайковский"},
+ {24, 245, 2689, L"Чердынь"},
+ {24, 245, 2688, L"Чермоз"},
+ {24, 245, 552, L"Чернушка"},
+ {24, 245, 553, L"Чусовой"},
+ {24, 245, 2257, L"Другое"},
+ {24, 246, 554, L"Волжский"},
+ {24, 246, 555, L"Жигулевск"},
+ {24, 246, 2599, L"Кинель"},
+ {24, 246, 3293, L"Красный Яр"},
+ {24, 246, 2602, L"Нефтегорск"},
+ {24, 246, 556, L"Новокуйбышевск"},
+ {24, 246, 2600, L"Октябрьск"},
+ {24, 246, 557, L"Отрадный"},
+ {24, 246, 558, L"Похвистнево"},
+ {24, 246, 559, L"Самара"},
+ {24, 246, 560, L"Сызрань"},
+ {24, 246, 561, L"Тольятти"},
+ {24, 246, 2601, L"Чапаевск"},
+ {24, 246, 562, L"Шигоны"},
+ {24, 246, 2261, L"Другое"},
+ {24, 247, 2613, L"Аркадак"},
+ {24, 247, 2606, L"Аткарск"},
+ {24, 247, 563, L"Балаково"},
+ {24, 247, 564, L"Балашов"},
+ {24, 247, 565, L"Вольск"},
+ {24, 247, 2608, L"Ершов"},
+ {24, 247, 2607, L"Калининск"},
+ {24, 247, 2609, L"Красноармейск"},
+ {24, 247, 2610, L"Красный Кут"},
+ {24, 247, 2605, L"Маркс"},
+ {24, 247, 566, L"Новоузенск"},
+ {24, 247, 2603, L"Петровск"},
+ {24, 247, 2604, L"Пугачев"},
+ {24, 247, 2612, L"Ртищево"},
+ {24, 247, 567, L"Саратов"},
+ {24, 247, 2611, L"Хвалынск"},
+ {24, 247, 568, L"Энгельс"},
+ {24, 247, 3267, L"Энгельс-12"},
+ {24, 247, 2262, L"Другое"},
+ {24, 250, 2614, L"Барыш"},
+ {24, 250, 588, L"Димитровград"},
+ {24, 250, 2615, L"Инза"},
+ {24, 250, 589, L"Новоспасское"},
+ {24, 250, 2616, L"Новоульяновск"},
+ {24, 250, 590, L"Сенгилей"},
+ {24, 250, 591, L"Ульяновск"},
+ {24, 250, 2278, L"Другое"},
+ {24, 239, 508, L"Кудымкар"},
+ {24, 239, 2238, L"Другое"},
+ {24, 255, 1355, L"Беломорск"},
+ {24, 255, 1356, L"Кемь"},
+ {24, 255, 1357, L"Кондопога"},
+ {24, 255, 1358, L"Костомукша"},
+ {24, 255, 1359, L"Коткозеро"},
+ {24, 255, 1360, L"Лахденпохья"},
+ {24, 255, 1362, L"Лоухи"},
+ {24, 255, 1361, L"Медвежьегорск"},
+ {24, 255, 3286, L"Муезерский"},
+ {24, 255, 1937, L"Олонец"},
+ {24, 255, 1363, L"Петрозаводск"},
+ {24, 255, 1938, L"Питкяранта"},
+ {24, 255, 3287, L"Пряжа"},
+ {24, 255, 1936, L"Пудож"},
+ {24, 255, 1364, L"Сегежа"},
+ {24, 255, 1365, L"Сортавала"},
+ {24, 255, 1939, L"Суоярви"},
+ {24, 255, 2201, L"Другое"},
+ {24, 256, 1366, L"Воркута"},
+ {24, 256, 1367, L"Вуктыл"},
+ {24, 256, 2202, L"Емва"},
+ {24, 256, 1368, L"Инта"},
+ {24, 256, 1940, L"Микунь"},
+ {24, 256, 1369, L"Печора"},
+ {24, 256, 1941, L"Сосногорск"},
+ {24, 256, 1370, L"Сыктывкар"},
+ {24, 256, 1371, L"Усинск"},
+ {24, 256, 1372, L"Ухта"},
+ {24, 256, 2203, L"Другое"},
+ {24, 252, 593, L"Архангельск"},
+ {24, 252, 594, L"Вельск"},
+ {24, 252, 1945, L"Каргополь"},
+ {24, 252, 595, L"Коряжма"},
+ {24, 252, 596, L"Котлас"},
+ {24, 252, 1944, L"Мезень"},
+ {24, 252, 597, L"Мирный"},
+ {24, 252, 598, L"Новодвинск"},
+ {24, 252, 1946, L"Няндома"},
+ {24, 252, 599, L"Онега"},
+ {24, 252, 600, L"Пинега"},
+ {24, 252, 601, L"Северодвинск"},
+ {24, 252, 1942, L"Сольвычегодск"},
+ {24, 252, 3239, L"Холмогоры"},
+ {24, 252, 1943, L"Шенкурск"},
+ {24, 252, 2204, L"Другое"},
+ {24, 253, 1950, L"Бабаево"},
+ {24, 253, 1949, L"Белозерск"},
+ {24, 253, 1338, L"Великий Устюг"},
+ {24, 253, 1339, L"Вологда"},
+ {24, 253, 1951, L"Вытегра"},
+ {24, 253, 1340, L"Грязовец"},
+ {24, 253, 1952, L"Кадников"},
+ {24, 253, 2871, L"Кадуй"},
+ {24, 253, 1341, L"Кириллов"},
+ {24, 253, 1955, L"Красавино"},
+ {24, 253, 1342, L"Михайловка"},
+ {24, 253, 1947, L"Никольск"},
+ {24, 253, 1343, L"Сокол"},
+ {24, 253, 1953, L"Тотьма"},
+ {24, 253, 1954, L"Устюжна"},
+ {24, 253, 1948, L"Харовск"},
+ {24, 253, 1344, L"Череповец"},
+ {24, 253, 2205, L"Другое"},
+ {24, 254, 2838, L"Багратионовск"},
+ {24, 254, 1345, L"Балтийск"},
+ {24, 254, 2846, L"Гвардейск"},
+ {24, 254, 2843, L"Гурьевск"},
+ {24, 254, 1346, L"Гусев"},
+ {24, 254, 1347, L"Зеленоградск"},
+ {24, 254, 1348, L"Калининград"},
+ {24, 254, 2842, L"Краснознаменск"},
+ {24, 254, 2845, L"Ладушкин"},
+ {24, 254, 2848, L"Мамоново"},
+ {24, 254, 2837, L"Неман"},
+ {24, 254, 2844, L"Нестеров"},
+ {24, 254, 1349, L"Озерск"},
+ {24, 254, 2841, L"Полесск"},
+ {24, 254, 2839, L"Правдинск"},
+ {24, 254, 1350, L"Приморск"},
+ {24, 254, 1351, L"Светлогорск"},
+ {24, 254, 1352, L"Светлый"},
+ {24, 254, 2840, L"Славск"},
+ {24, 254, 1353, L"Советск"},
+ {24, 254, 1354, L"Черняховск"},
+ {24, 254, 2231, L"Другое"},
+ {24, 257, 1985, L"Бокситогорск"},
+ {24, 257, 1374, L"Волхов"},
+ {24, 257, 1373, L"Всеволожск"},
+ {24, 257, 1375, L"Выборг"},
+ {24, 257, 1995, L"Высоцк"},
+ {24, 257, 1376, L"Гатчина"},
+ {24, 257, 1378, L"Ивангород"},
+ {24, 257, 1993, L"Каменногорск"},
+ {24, 257, 1379, L"Кингисепп"},
+ {24, 257, 1380, L"Кириши"},
+ {24, 257, 1381, L"Кировск"},
+ {24, 257, 1384, L"Кузьмоловский"},
+ {24, 257, 1984, L"Лодейное Поле"},
+ {24, 257, 1990, L"Луга"},
+ {24, 257, 1994, L"Любань"},
+ {24, 257, 1386, L"Никольское"},
+ {24, 257, 1987, L"Новая Ладога"},
+ {24, 257, 1996, L"Отрадное"},
+ {24, 257, 1986, L"Пикалево"},
+ {24, 257, 1983, L"Подпорожье"},
+ {24, 257, 1992, L"Приморск"},
+ {24, 257, 1988, L"Приозерск"},
+ {24, 257, 3071, L"Пушкин"},
+ {24, 257, 1989, L"Светогорск"},
+ {24, 257, 1389, L"Сертолово"},
+ {24, 257, 1991, L"Сланцы"},
+ {24, 257, 1391, L"Сосновый Бор"},
+ {24, 257, 1392, L"Тихвин"},
+ {24, 257, 1393, L"Тосно"},
+ {24, 257, 1394, L"Шлиссельбург"},
+ {24, 257, 2207, L"Другое"},
+ {24, 258, 1395, L"Апатиты"},
+ {24, 258, 1959, L"Заполярный"},
+ {24, 258, 1396, L"Зареченск"},
+ {24, 258, 1397, L"Кандалакша"},
+ {24, 258, 1398, L"Кировск"},
+ {24, 258, 1399, L"Ковдор"},
+ {24, 258, 1958, L"Кола"},
+ {24, 258, 1400, L"Мончегорск"},
+ {24, 258, 1401, L"Мурманск"},
+ {24, 258, 1402, L"Мурмаши"},
+ {24, 258, 1403, L"Оленегорск"},
+ {24, 258, 1404, L"Полярные Зори"},
+ {24, 258, 1956, L"Полярный"},
+ {24, 258, 1957, L"Североморск"},
+ {24, 258, 3288, L"Снежногорск"},
+ {24, 258, 2206, L"Другое"},
+ {24, 260, 1406, L"Батецкий"},
+ {24, 260, 2001, L"Боровичи"},
+ {24, 260, 2003, L"Валдай"},
+ {24, 260, 1407, L"Великий Новгород"},
+ {24, 260, 1408, L"Крестцы"},
+ {24, 260, 2002, L"Малая Вишера"},
+ {24, 260, 1409, L"Окуловка"},
+ {24, 260, 2000, L"Пестово"},
+ {24, 260, 1997, L"Сольцы"},
+ {24, 260, 1410, L"Старая Русса"},
+ {24, 260, 1998, L"Холм"},
+ {24, 260, 1999, L"Чудово"},
+ {24, 260, 2208, L"Другое"},
+ {24, 261, 1412, L"Великие Луки"},
+ {24, 261, 2004, L"Гдов"},
+ {24, 261, 2009, L"Дно"},
+ {24, 261, 2005, L"Невель"},
+ {24, 261, 1413, L"Новоржев"},
+ {24, 261, 2006, L"Опочка"},
+ {24, 261, 2008, L"Остров"},
+ {24, 261, 1414, L"Печоры"},
+ {24, 261, 1415, L"Порхов"},
+ {24, 261, 1411, L"Псков"},
+ {24, 261, 1416, L"Пустошка"},
+ {24, 261, 2007, L"Пыталово"},
+ {24, 261, 1417, L"Себеж"},
+ {24, 261, 2209, L"Другое"},
+ {24, 259, 1405, L"Нарьян-Мар"},
+ {24, 259, 2250, L"Другое"},
+ {24, 265, 2764, L"Бабушкин"},
+ {24, 265, 2760, L"Гусиноозерск"},
+ {24, 265, 2762, L"Закаменск"},
+ {24, 265, 2763, L"Кяхта"},
+ {24, 265, 2761, L"Северобайкальск"},
+ {24, 265, 1446, L"Улан-Удэ"},
+ {24, 265, 2222, L"Другое"},
+ {24, 263, 1439, L"Горно-Алтайск"},
+ {24, 263, 2215, L"Другое"},
+ {24, 273, 2766, L"Ак-Довурак"},
+ {24, 273, 1494, L"Кызыл"},
+ {24, 273, 2768, L"Новый Шагонар"},
+ {24, 273, 2767, L"Туран"},
+ {24, 273, 2765, L"Чадан"},
+ {24, 273, 2275, L"Другое"},
+ {24, 275, 2769, L"Абаза"},
+ {24, 275, 1496, L"Абакан"},
+ {24, 275, 1497, L"Саяногорск"},
+ {24, 275, 2770, L"Сорск"},
+ {24, 275, 2771, L"Черногорск"},
+ {24, 275, 2281, L"Другое"},
+ {24, 264, 1440, L"Алейск"},
+ {24, 264, 1441, L"Барнаул"},
+ {24, 264, 1442, L"Белокуриха"},
+ {24, 264, 1443, L"Бийск"},
+ {24, 264, 2728, L"Горняк"},
+ {24, 264, 2731, L"Заринск"},
+ {24, 264, 2729, L"Змеиногорск"},
+ {24, 264, 2732, L"Камень-на-Оби"},
+ {24, 264, 3292, L"Кулунда"},
+ {24, 264, 2730, L"Новоалтайск"},
+ {24, 264, 1444, L"Рубцовск"},
+ {24, 264, 1445, L"Славгород"},
+ {24, 264, 3231, L"Яровое"},
+ {24, 264, 2216, L"Другое"},
+ {24, 268, 2781, L"Артемовск"},
+ {24, 268, 1469, L"Ачинск"},
+ {24, 268, 2784, L"Боготол"},
+ {24, 268, 2773, L"Бородино"},
+ {24, 268, 2774, L"Дивногорск"},
+ {24, 268, 3122, L"Емельяновск"},
+ {24, 268, 2772, L"Енисейск"},
+ {24, 268, 3294, L"Железногорск"},
+ {24, 268, 2777, L"Заозерный"},
+ {24, 268, 1470, L"Игарка"},
+ {24, 268, 2778, L"Иланский"},
+ {24, 268, 2782, L"Канск"},
+ {24, 268, 2783, L"Кодинский"},
+ {24, 268, 1471, L"Красноярск"},
+ {24, 268, 1472, L"Лесосибирск"},
+ {24, 268, 1473, L"Минусинск"},
+ {24, 268, 2775, L"Назарово"},
+ {24, 268, 2776, L"Сосновоборск"},
+ {24, 268, 2780, L"Ужур"},
+ {24, 268, 2779, L"Уяр"},
+ {24, 268, 2785, L"Шарыпово"},
+ {24, 268, 1474, L"Шушенское"},
+ {24, 268, 2242, L"Другое"},
+ {24, 266, 2792, L"Алзамай"},
+ {24, 266, 1447, L"Ангарск"},
+ {24, 266, 1448, L"Байкальск"},
+ {24, 266, 2791, L"Бирюсинск"},
+ {24, 266, 1450, L"Бодайбо"},
+ {24, 266, 1451, L"Братск"},
+ {24, 266, 2793, L"Вихоревка"},
+ {24, 266, 2789, L"Железногорск-Илимский"},
+ {24, 266, 2786, L"Зима"},
+ {24, 266, 1452, L"Иркутск"},
+ {24, 266, 2794, L"Киренск"},
+ {24, 266, 2787, L"Нижнеудинск"},
+ {24, 266, 1449, L"Саянск"},
+ {24, 266, 2790, L"Свирск"},
+ {24, 266, 1453, L"Слюдянка"},
+ {24, 266, 2788, L"Тайшет"},
+ {24, 266, 1454, L"Тулун"},
+ {24, 266, 1455, L"Усолье-Сибирское"},
+ {24, 266, 2908, L"Усольск"},
+ {24, 266, 1456, L"Усть-Илимск"},
+ {24, 266, 1457, L"Усть-Кут"},
+ {24, 266, 1458, L"Хужир"},
+ {24, 266, 1459, L"Черемхово"},
+ {24, 266, 2795, L"Шелехов"},
+ {24, 266, 2229, L"Другое"},
+ {24, 267, 2737, L"Анжеро-Суджинск"},
+ {24, 267, 2740, L"Белово"},
+ {24, 267, 2746, L"Березовский"},
+ {24, 267, 2739, L"Гурьевск"},
+ {24, 267, 2742, L"Калтан"},
+ {24, 267, 1460, L"Кемерово"},
+ {24, 267, 1461, L"Киселевск"},
+ {24, 267, 2738, L"Ленинск-Кузнецкий"},
+ {24, 267, 2745, L"Мариинск"},
+ {24, 267, 1462, L"Междуреченск"},
+ {24, 267, 1463, L"Мыски"},
+ {24, 267, 1464, L"Новокузнецк"},
+ {24, 267, 2744, L"Осинники"},
+ {24, 267, 3358, L"Полысаево"},
+ {24, 267, 1465, L"Прокопьевск"},
+ {24, 267, 1466, L"Салаир"},
+ {24, 267, 2743, L"Тайга"},
+ {24, 267, 2741, L"Таштагол"},
+ {24, 267, 1467, L"Топки"},
+ {24, 267, 1468, L"Юрга"},
+ {24, 267, 2236, L"Другое"},
+ {24, 269, 1475, L"Баган"},
+ {24, 269, 1476, L"Барабинск"},
+ {24, 269, 1477, L"Бердск"},
+ {24, 269, 2750, L"Болотное"},
+ {24, 269, 1478, L"Искитим"},
+ {24, 269, 2752, L"Карасук"},
+ {24, 269, 2751, L"Каргат"},
+ {24, 269, 3107, L"Краснообск"},
+ {24, 269, 2753, L"Куйбышев"},
+ {24, 269, 2755, L"Купино"},
+ {24, 269, 1479, L"Новосибирск"},
+ {24, 269, 2759, L"Обь"},
+ {24, 269, 2756, L"Татарск"},
+ {24, 269, 2758, L"Тогучин"},
+ {24, 269, 2757, L"Черепаново"},
+ {24, 269, 2754, L"Чулым"},
+ {24, 269, 2252, L"Другое"},
+ {24, 270, 2733, L"Исилькуль"},
+ {24, 270, 1480, L"Калачинск"},
+ {24, 270, 1481, L"Марьяновка"},
+ {24, 270, 2735, L"Называевск"},
+ {24, 270, 1482, L"Омск"},
+ {24, 270, 2734, L"Тара"},
+ {24, 270, 2736, L"Тюкалинск"},
+ {24, 270, 2253, L"Другое"},
+ {24, 272, 1488, L"Асино"},
+ {24, 272, 1489, L"Белый Яр"},
+ {24, 272, 3295, L"Каргасок"},
+ {24, 272, 1491, L"Колпашево"},
+ {24, 272, 1492, L"Северск"},
+ {24, 272, 1493, L"Стрежевой"},
+ {24, 272, 1490, L"Томск"},
+ {24, 272, 2273, L"Другое"},
+ {24, 276, 2803, L"Балей"},
+ {24, 276, 2799, L"Борзя"},
+ {24, 276, 1499, L"Краснокаменск"},
+ {24, 276, 2801, L"Могоча"},
+ {24, 276, 2800, L"Нерчинск"},
+ {24, 276, 2802, L"Петровск-Забайкальский"},
+ {24, 276, 2798, L"Сретенск"},
+ {24, 276, 2796, L"Хилок"},
+ {24, 276, 1498, L"Чита"},
+ {24, 276, 2797, L"Шилка"},
+ {24, 276, 2285, L"Другое"},
+ {24, 262, 1438, L"Агинское"},
+ {24, 262, 2213, L"Другое"},
+ {24, 271, 3233, L"Диксон"},
+ {24, 271, 1485, L"Дудинка"},
+ {24, 271, 1487, L"Кайеркан"},
+ {24, 271, 1483, L"Норильск"},
+ {24, 271, 1484, L"Талнах"},
+ {24, 271, 1486, L"Хатанга"},
+ {24, 271, 2269, L"Другое"},
+ {24, 274, 1495, L"Усть-Ордынский"},
+ {24, 274, 2279, L"Другое"},
+ {24, 277, 1500, L"Тура"},
+ {24, 277, 2288, L"Другое"},
+ {24, 278, 2668, L"Далматово"},
+ {24, 278, 2667, L"Катайск"},
+ {24, 278, 1524, L"Курган"},
+ {24, 278, 2669, L"Куртамыш"},
+ {24, 278, 2666, L"Макушино"},
+ {24, 278, 2671, L"Петухово"},
+ {24, 278, 1525, L"Шадринск"},
+ {24, 278, 2670, L"Шумиха"},
+ {24, 278, 2672, L"Щучье"},
+ {24, 278, 2243, L"Другое"},
+ {24, 279, 1526, L"Алапаевск"},
+ {24, 279, 1527, L"Арамиль"},
+ {24, 279, 2691, L"Артемовский"},
+ {24, 279, 1528, L"Асбест"},
+ {24, 279, 2924, L"Белоярский"},
+ {24, 279, 2707, L"Березовский"},
+ {24, 279, 1529, L"Богданович"},
+ {24, 279, 2698, L"Верхний Тагил"},
+ {24, 279, 1530, L"Верхняя Пышма"},
+ {24, 279, 1531, L"Верхняя Салда"},
+ {24, 279, 1532, L"Верхняя Синячиха"},
+ {24, 279, 2696, L"Верхняя Тура"},
+ {24, 279, 2692, L"Верхотурье"},
+ {24, 279, 2706, L"Волчанск"},
+ {24, 279, 2709, L"Дегтярск"},
+ {24, 279, 1533, L"Екатеринбург"},
+ {24, 279, 1534, L"Заречный"},
+ {24, 279, 1535, L"Ивдель"},
+ {24, 279, 1536, L"Ирбит"},
+ {24, 279, 1537, L"Каменск-Уральский"},
+ {24, 279, 1538, L"Камышлов"},
+ {24, 279, 2708, L"Карпинск"},
+ {24, 279, 1539, L"Качканар"},
+ {24, 279, 2712, L"Кировград"},
+ {24, 279, 1540, L"Краснотурьинск"},
+ {24, 279, 2694, L"Красноуральск"},
+ {24, 279, 2693, L"Красноуфимск"},
+ {24, 279, 1541, L"Кушва"},
+ {24, 279, 2711, L"Михайловск"},
+ {24, 279, 2713, L"Михайловск"},
+ {24, 279, 1542, L"Невьянск"},
+ {24, 279, 2702, L"Нижние Серги"},
+ {24, 279, 1543, L"Нижний Тагил"},
+ {24, 279, 2695, L"Нижняя Салда"},
+ {24, 279, 2697, L"Нижняя Тура"},
+ {24, 279, 2699, L"Новая Ляля"},
+ {24, 279, 2909, L"Новоуральск"},
+ {24, 279, 1544, L"Первоуральск"},
+ {24, 279, 1545, L"Полевской"},
+ {24, 279, 1546, L"Ревда"},
+ {24, 279, 1547, L"Реж"},
+ {24, 279, 3296, L"Рефтинский"},
+ {24, 279, 2700, L"Североуральск"},
+ {24, 279, 1548, L"Серов"},
+ {24, 279, 2710, L"Среднеуральск"},
+ {24, 279, 2701, L"Сухой Лог"},
+ {24, 279, 2703, L"Сысерть"},
+ {24, 279, 1549, L"Тавда"},
+ {24, 279, 2704, L"Талица"},
+ {24, 279, 2705, L"Туринск"},
+ {24, 279, 2265, L"Другое"},
+ {24, 280, 1550, L"Заводоуковск"},
+ {24, 280, 1551, L"Ишим"},
+ {24, 280, 3326, L"Сургут"},
+ {24, 280, 1552, L"Тобольск"},
+ {24, 280, 1553, L"Тюмень"},
+ {24, 280, 2748, L"Ялуторовск"},
+ {24, 280, 2276, L"Другое"},
+ {24, 282, 1564, L"Аша"},
+ {24, 282, 2723, L"Бакал"},
+ {24, 282, 2724, L"Верхнеуральск"},
+ {24, 282, 2716, L"Верхний Уфалей"},
+ {24, 282, 3297, L"Всеволожск"},
+ {24, 282, 2725, L"Еманжелинск"},
+ {24, 282, 1565, L"Златоуст"},
+ {24, 282, 2722, L"Карабаш"},
+ {24, 282, 1566, L"Карталы"},
+ {24, 282, 2718, L"Касли"},
+ {24, 282, 2720, L"Катав-Ивановск"},
+ {24, 282, 1567, L"Копейск"},
+ {24, 282, 2721, L"Коркино"},
+ {24, 282, 2715, L"Куса"},
+ {24, 282, 1568, L"Кыштым"},
+ {24, 282, 1569, L"Магнитогорск"},
+ {24, 282, 1570, L"Миасс"},
+ {24, 282, 2726, L"Миньяр"},
+ {24, 282, 2717, L"Нязепетровск"},
+ {24, 282, 3100, L"Озерск"},
+ {24, 282, 1571, L"Пласт"},
+ {24, 282, 2719, L"Сатка"},
+ {24, 282, 2727, L"Сим"},
+ {24, 282, 1572, L"Снежинск"},
+ {24, 282, 3332, L"Трехгорный"},
+ {24, 282, 1573, L"Троицк"},
+ {24, 282, 1574, L"Усть-Катав"},
+ {24, 282, 1575, L"Чебаркуль"},
+ {24, 282, 1576, L"Челябинск"},
+ {24, 282, 1577, L"Южноуральск"},
+ {24, 282, 2714, L"Юрюзань"},
+ {24, 282, 2283, L"Другое"},
+ {24, 281, 2749, L"Белоярский"},
+ {24, 281, 1554, L"Игрим"},
+ {24, 281, 1555, L"Когалым"},
+ {24, 281, 1556, L"Лангепас"},
+ {24, 281, 1561, L"Мегион"},
+ {24, 281, 1562, L"Нефтеюганск"},
+ {24, 281, 1559, L"Нижневартовск"},
+ {24, 281, 2852, L"Нягань"},
+ {24, 281, 2853, L"Нягань"},
+ {24, 281, 2854, L"Пыть-Ях"},
+ {24, 281, 1560, L"Радужный"},
+ {24, 281, 1563, L"Советский"},
+ {24, 281, 2747, L"Сургут"},
+ {24, 281, 1557, L"Урай"},
+ {24, 281, 1558, L"Ханты-Мансийск"},
+ {24, 281, 3344, L"Югорск"},
+ {24, 281, 2282, L"Другое"},
+ {24, 283, 3298, L"Губкинский"},
+ {24, 283, 1578, L"Лабытнанги"},
+ {24, 283, 2856, L"Муравленко"},
+ {24, 283, 1579, L"Надым"},
+ {24, 283, 1580, L"Новый Уренгой"},
+ {24, 283, 1581, L"Ноябрьск"},
+ {24, 283, 1582, L"Салехард"},
+ {24, 283, 1583, L"Уренгой"},
+ {24, 283, 2289, L"Другое"},
+ {24, 284, 1625, L"Алексеевка"},
+ {24, 284, 1626, L"Белгород"},
+ {24, 284, 2172, L"Валуйки"},
+ {24, 284, 2173, L"Грайворон"},
+ {24, 284, 1627, L"Губкин"},
+ {24, 284, 2174, L"Короча"},
+ {24, 284, 2175, L"Новый Оскол"},
+ {24, 284, 1628, L"Старый Оскол"},
+ {24, 284, 1629, L"Шебекино"},
+ {24, 284, 2221, L"Другое"},
+ {24, 285, 1630, L"Брянск"},
+ {24, 285, 3283, L"Дебрянск"},
+ {24, 285, 1631, L"Дятьково"},
+ {24, 285, 2013, L"Жуковка"},
+ {24, 285, 2015, L"Злынка"},
+ {24, 285, 1632, L"Карачев"},
+ {24, 285, 1633, L"Клинцы"},
+ {24, 285, 1634, L"Мглин"},
+ {24, 285, 2016, L"Новозыбков"},
+ {24, 285, 2018, L"Почеп"},
+ {24, 285, 2017, L"Севск"},
+ {24, 285, 2020, L"Сельцо"},
+ {24, 285, 2014, L"Стародуб"},
+ {24, 285, 2010, L"Сураж"},
+ {24, 285, 2012, L"Трубчевск"},
+ {24, 285, 2011, L"Унеча"},
+ {24, 285, 2019, L"Фокино"},
+ {24, 285, 2210, L"Другое"},
+ {24, 286, 1635, L"Александров"},
+ {24, 286, 1636, L"Владимир"},
+ {24, 286, 2021, L"Вязники"},
+ {24, 286, 1637, L"Головино"},
+ {24, 286, 2022, L"Гороховец"},
+ {24, 286, 1638, L"Гусь-Хрустальный"},
+ {24, 286, 2023, L"Камешково"},
+ {24, 286, 2031, L"Карабаново"},
+ {24, 286, 2024, L"Киржач"},
+ {24, 286, 1639, L"Ковров"},
+ {24, 286, 1640, L"Кольчугино"},
+ {24, 286, 2026, L"Костерево"},
+ {24, 286, 3299, L"Красная Горбатка"},
+ {24, 286, 2033, L"Лакинск"},
+ {24, 286, 2025, L"Меленки"},
+ {24, 286, 1641, L"Муром"},
+ {24, 286, 1642, L"Петушки"},
+ {24, 286, 2027, L"Покров"},
+ {24, 286, 2211, L"Радужный"},
+ {24, 286, 2028, L"Собинка"},
+ {24, 286, 2032, L"Струнино"},
+ {24, 286, 2029, L"Судогда"},
+ {24, 286, 1643, L"Суздаль"},
+ {24, 286, 2030, L"Юрьев-Польский"},
+ {24, 286, 2212, L"Другое"},
+ {24, 287, 1644, L"Бобров"},
+ {24, 287, 1645, L"Богучар"},
+ {24, 287, 1646, L"Борисоглебск"},
+ {24, 287, 1647, L"Бутурлиновка"},
+ {24, 287, 1648, L"Воронеж"},
+ {24, 287, 2178, L"Калач"},
+ {24, 287, 2176, L"Лиски"},
+ {24, 287, 1649, L"Нововоронеж"},
+ {24, 287, 2177, L"Новохоперск"},
+ {24, 287, 2180, L"Острогожск"},
+ {24, 287, 1650, L"Павловск"},
+ {24, 287, 2181, L"Поворино"},
+ {24, 287, 1651, L"Россошь"},
+ {24, 287, 2179, L"Семилуки"},
+ {24, 287, 2182, L"Эртиль"},
+ {24, 287, 2224, L"Другое"},
+ {24, 288, 1652, L"Вичуга"},
+ {24, 288, 2036, L"Гаврилов Посад"},
+ {24, 288, 1657, L"Заволжск"},
+ {24, 288, 1653, L"Иваново"},
+ {24, 288, 1656, L"Кинешма"},
+ {24, 288, 2040, L"Комсомольск"},
+ {24, 288, 2037, L"Кохма"},
+ {24, 288, 2043, L"Наволоки"},
+ {24, 288, 3300, L"Палех"},
+ {24, 288, 2039, L"Плес"},
+ {24, 288, 2038, L"Приволжск"},
+ {24, 288, 2042, L"Пучеж"},
+ {24, 288, 2044, L"Родники"},
+ {24, 288, 1655, L"Тейково"},
+ {24, 288, 2034, L"Фурманов"},
+ {24, 288, 1654, L"Шуя"},
+ {24, 288, 2041, L"Южа"},
+ {24, 288, 2035, L"Юрьевец"},
+ {24, 288, 2227, L"Другое"},
+ {24, 289, 2050, L"Балабаново"},
+ {24, 289, 2051, L"Боровск"},
+ {24, 289, 3301, L"Воротынск"},
+ {24, 289, 2052, L"Жиздра"},
+ {24, 289, 1660, L"Жуковка"},
+ {24, 289, 1658, L"Калуга"},
+ {24, 289, 2046, L"Киров"},
+ {24, 289, 1661, L"Козельск"},
+ {24, 289, 2053, L"Кондрово"},
+ {24, 289, 2049, L"Людиново"},
+ {24, 289, 1659, L"Малоярославец"},
+ {24, 289, 2054, L"Медынь"},
+ {24, 289, 2055, L"Мещовск"},
+ {24, 289, 2047, L"Мосальск"},
+ {24, 289, 1662, L"Обнинск"},
+ {24, 289, 2057, L"Сосенский"},
+ {24, 289, 2056, L"Спас-Демянск"},
+ {24, 289, 2045, L"Сухиничи"},
+ {24, 289, 1663, L"Таруса"},
+ {24, 289, 2131, L"Чекалин"},
+ {24, 289, 2048, L"Юхнов"},
+ {24, 289, 2233, L"Другое"},
+ {24, 290, 1664, L"Буй"},
+ {24, 290, 1665, L"Волгореченск"},
+ {24, 290, 1666, L"Галич"},
+ {24, 290, 2059, L"Кологрив"},
+ {24, 290, 1667, L"Кострома"},
+ {24, 290, 3302, L"Красное-на-Волге"},
+ {24, 290, 1668, L"Макарьев"},
+ {24, 290, 2060, L"Мантурово"},
+ {24, 290, 1669, L"Нерехта"},
+ {24, 290, 2061, L"Нея"},
+ {24, 290, 2062, L"Солигалич"},
+ {24, 290, 2058, L"Чухлома"},
+ {24, 290, 1670, L"Шарья"},
+ {24, 290, 2240, L"Другое"},
+ {24, 291, 1671, L"Дмитриев-Льговский"},
+ {24, 291, 1673, L"Железногорск"},
+ {24, 291, 3279, L"Железногорск"},
+ {24, 291, 1672, L"Курск"},
+ {24, 291, 2187, L"Курчатов"},
+ {24, 291, 2188, L"Льгов"},
+ {24, 291, 2184, L"Обоянь"},
+ {24, 291, 2185, L"Рыльск"},
+ {24, 291, 2183, L"Суджа"},
+ {24, 291, 2189, L"Фатеж"},
+ {24, 291, 2186, L"Щигры"},
+ {24, 291, 2244, L"Другое"},
+ {24, 292, 2194, L"Грязи"},
+ {24, 292, 2193, L"Данков"},
+ {24, 292, 1674, L"Елец"},
+ {24, 292, 2190, L"Задонск"},
+ {24, 292, 2195, L"Лебедянь"},
+ {24, 292, 1675, L"Липецк"},
+ {24, 292, 2192, L"Усмань"},
+ {24, 292, 2191, L"Чаплыгин"},
+ {24, 292, 2245, L"Другое"},
+ {24, 293, 1733, L"Апрелевка"},
+ {24, 293, 1732, L"Балашиха"},
+ {24, 293, 1731, L"Бронницы"},
+ {24, 293, 1730, L"Верея"},
+ {24, 293, 2063, L"Видное"},
+ {24, 293, 2064, L"Волоколамск"},
+ {24, 293, 1729, L"Воскресенск"},
+ {24, 293, 1728, L"Высоковск"},
+ {24, 293, 1727, L"Голицыно"},
+ {24, 293, 2065, L"Дедовск"},
+ {24, 293, 1726, L"Дзержинский"},
+ {24, 293, 1725, L"Дмитров"},
+ {24, 293, 1724, L"Долгопрудный"},
+ {24, 293, 1723, L"Домодедово"},
+ {24, 293, 2066, L"Дрезна"},
+ {24, 293, 1722, L"Дубна"},
+ {24, 293, 1721, L"Егорьевск"},
+ {24, 293, 1720, L"Железнодорожный"},
+ {24, 293, 1719, L"Жуковский"},
+ {24, 293, 2067, L"Зарайск"},
+ {24, 293, 1718, L"Звенигород"},
+ {24, 293, 1715, L"Ивантеевка"},
+ {24, 293, 1717, L"Истра"},
+ {24, 293, 2068, L"Калининград"},
+ {24, 293, 2069, L"Кашира"},
+ {24, 293, 1716, L"Климовск"},
+ {24, 293, 1714, L"Клин"},
+ {24, 293, 1713, L"Коломна"},
+ {24, 293, 1712, L"Королев"},
+ {24, 293, 1711, L"Красноармейск"},
+ {24, 293, 1710, L"Красногорск"},
+ {24, 293, 2070, L"Краснозаводск"},
+ {24, 293, 2071, L"Куровское"},
+ {24, 293, 1709, L"Ликино-Дулево"},
+ {24, 293, 1708, L"Лобня"},
+ {24, 293, 2072, L"Лосино-Петровский"},
+ {24, 293, 1707, L"Луховицы"},
+ {24, 293, 1706, L"Лыткарино"},
+ {24, 293, 1705, L"Люберцы"},
+ {24, 293, 1704, L"Менделеево"},
+ {24, 293, 1703, L"Можайск"},
+ {24, 293, 1702, L"Мытищи"},
+ {24, 293, 1701, L"Наро-Фоминск"},
+ {24, 293, 1700, L"Ногинск"},
+ {24, 293, 1698, L"Одинцово"},
+ {24, 293, 2073, L"Ожерелье"},
+ {24, 293, 2074, L"Озеры"},
+ {24, 293, 1699, L"Орехово-Зуево"},
+ {24, 293, 1697, L"Павловский Посад"},
+ {24, 293, 1696, L"Подольск"},
+ {24, 293, 1695, L"Протвино"},
+ {24, 293, 1694, L"Пушкино"},
+ {24, 293, 1693, L"Пущино"},
+ {24, 293, 1692, L"Раменское"},
+ {24, 293, 1691, L"Реутов"},
+ {24, 293, 1690, L"Решетников"},
+ {24, 293, 2075, L"Рошаль"},
+ {24, 293, 2076, L"Руза"},
+ {24, 293, 1689, L"Сергиев Посад"},
+ {24, 293, 1688, L"Серпухов"},
+ {24, 293, 1687, L"Солнечногорск"},
+ {24, 293, 1686, L"Ступино"},
+ {24, 293, 2077, L"Сходня"},
+ {24, 293, 2078, L"Талдом"},
+ {24, 293, 1685, L"Троицк"},
+ {24, 293, 1684, L"Фрязино"},
+ {24, 293, 1683, L"Химки"},
+ {24, 293, 1682, L"Хотьково"},
+ {24, 293, 1681, L"Черноголовка"},
+ {24, 293, 1680, L"Чехов"},
+ {24, 293, 1679, L"Шатура"},
+ {24, 293, 1678, L"Щелково"},
+ {24, 293, 2080, L"Щербинка"},
+ {24, 293, 1677, L"Электрогорск"},
+ {24, 293, 1676, L"Электросталь"},
+ {24, 293, 2079, L"Электроугли"},
+ {24, 293, 3031, L"Юбилейный"},
+ {24, 293, 2081, L"Яхрома"},
+ {24, 293, 2249, L"Другое"},
+ {24, 294, 2083, L"Болхов"},
+ {24, 294, 2082, L"Дмитровск-Орловский"},
+ {24, 294, 3160, L"Залегощь"},
+ {24, 294, 1736, L"Ливны"},
+ {24, 294, 2084, L"Малоархангельск"},
+ {24, 294, 1737, L"Мценск"},
+ {24, 294, 2085, L"Новосиль"},
+ {24, 294, 1735, L"Орел"},
+ {24, 294, 2255, L"Другое"},
+ {24, 295, 1740, L"Гусь-Железный"},
+ {24, 295, 1741, L"Касимов"},
+ {24, 295, 2086, L"Кораблино"},
+ {24, 295, 2087, L"Михайлов"},
+ {24, 295, 2089, L"Новомичуринск"},
+ {24, 295, 2091, L"Рыбное"},
+ {24, 295, 2093, L"Ряжск"},
+ {24, 295, 1738, L"Рязань"},
+ {24, 295, 3305, L"Сапожок"},
+ {24, 295, 1739, L"Сасово"},
+ {24, 295, 2090, L"Скопин"},
+ {24, 295, 2088, L"Спас-Клепики"},
+ {24, 295, 2092, L"Спасск-Рязанский"},
+ {24, 295, 2094, L"Шацк"},
+ {24, 295, 3320, L"Шилово"},
+ {24, 295, 2260, L"Другое"},
+ {24, 296, 2095, L"Велиж"},
+ {24, 296, 1743, L"Вязьма"},
+ {24, 296, 1744, L"Гагарин"},
+ {24, 296, 2096, L"Демидов"},
+ {24, 296, 1745, L"Десногорск"},
+ {24, 296, 1746, L"Дорогубуж"},
+ {24, 296, 2097, L"Духовщина"},
+ {24, 296, 2098, L"Ельня"},
+ {24, 296, 2099, L"Починок"},
+ {24, 296, 2100, L"Рославль"},
+ {24, 296, 2101, L"Рудня"},
+ {24, 296, 1747, L"Сафоново"},
+ {24, 296, 1742, L"Смоленск"},
+ {24, 296, 2102, L"Сычевка"},
+ {24, 296, 1748, L"Ярцево"},
+ {24, 296, 2267, L"Другое"},
+ {24, 297, 2198, L"Жердевка"},
+ {24, 297, 2199, L"Кирсанов"},
+ {24, 297, 1752, L"Котовск"},
+ {24, 297, 1751, L"Мичуринск"},
+ {24, 297, 2196, L"Моршанск"},
+ {24, 297, 1750, L"Рассказово"},
+ {24, 297, 3271, L"Сатинка"},
+ {24, 297, 1749, L"Тамбов"},
+ {24, 297, 3272, L"Тулиновка"},
+ {24, 297, 2197, L"Уварово"},
+ {24, 297, 2270, L"Другое"},
+ {24, 298, 2103, L"Андреаполь"},
+ {24, 298, 2104, L"Бежецк"},
+ {24, 298, 2105, L"Белый"},
+ {24, 298, 2106, L"Бологое"},
+ {24, 298, 2107, L"Весьегонск"},
+ {24, 298, 1753, L"Вышний Волочек"},
+ {24, 298, 2108, L"Западная Двина"},
+ {24, 298, 2109, L"Зубцов"},
+ {24, 298, 2110, L"Калязин"},
+ {24, 298, 2111, L"Кашин"},
+ {24, 298, 1758, L"Кимры"},
+ {24, 298, 1756, L"Конаково"},
+ {24, 298, 2112, L"Красный Холм"},
+ {24, 298, 1759, L"Кувшиново"},
+ {24, 298, 1760, L"Лихославль"},
+ {24, 298, 1761, L"Нелидово"},
+ {24, 298, 2113, L"Осташков"},
+ {24, 298, 1757, L"Ржев"},
+ {24, 298, 2114, L"Старица"},
+ {24, 298, 1754, L"Тверь"},
+ {24, 298, 2115, L"Торжок"},
+ {24, 298, 2116, L"Торопец"},
+ {24, 298, 1755, L"Удомля"},
+ {24, 298, 2272, L"Другое"},
+ {24, 299, 2127, L"Алексин"},
+ {24, 299, 2126, L"Белев"},
+ {24, 299, 2118, L"Богородицк"},
+ {24, 299, 2122, L"Болохово"},
+ {24, 299, 2129, L"Венев"},
+ {24, 299, 1762, L"Донской"},
+ {24, 299, 2128, L"Ефремов"},
+ {24, 299, 3354, L"Заокский"},
+ {24, 299, 2124, L"Киреевск"},
+ {24, 299, 1763, L"Климовск"},
+ {24, 299, 2123, L"Липки"},
+ {24, 299, 1764, L"Новомосковск"},
+ {24, 299, 2117, L"Плавск"},
+ {24, 299, 2130, L"Северо-Задонск"},
+ {24, 299, 2120, L"Советск"},
+ {24, 299, 2119, L"Сокольники"},
+ {24, 299, 2125, L"Суворов"},
+ {24, 299, 1765, L"Тула"},
+ {24, 299, 1766, L"Узловая"},
+ {24, 299, 2121, L"Щекино"},
+ {24, 299, 1767, L"Ясногорск"},
+ {24, 299, 2274, L"Другое"},
+ {24, 300, 3053, L"Большое Село"},
+ {24, 300, 3268, L"Брейтово"},
+ {24, 300, 1773, L"Гаврилов-Ям"},
+ {24, 300, 2132, L"Данилов"},
+ {24, 300, 3269, L"Красные Ткачи"},
+ {24, 300, 2133, L"Любим"},
+ {24, 300, 3270, L"Мокеевское"},
+ {24, 300, 1774, L"Мышкин"},
+ {24, 300, 2994, L"Некоуз"},
+ {24, 300, 1775, L"Переславль-Залесский"},
+ {24, 300, 2134, L"Пошехонье"},
+ {24, 300, 1769, L"Ростов"},
+ {24, 300, 1771, L"Рыбинск"},
+ {24, 300, 1772, L"Тутаев"},
+ {24, 300, 1770, L"Углич"},
+ {24, 300, 1768, L"Ярославль"},
+ {24, 300, 2290, L"Другое"},
+ {24, 301, 2849, L"Адыгейск"},
+ {24, 301, 1776, L"Майкоп"},
+ {24, 301, 2214, L"Другое"},
+ {24, 304, 2617, L"Буйнакск"},
+ {24, 304, 1791, L"Гуниб"},
+ {24, 304, 1788, L"Дербент"},
+ {24, 304, 2619, L"Избербаш"},
+ {24, 304, 1789, L"Каспийск"},
+ {24, 304, 2618, L"Кизилюрт"},
+ {24, 304, 1790, L"Кизляр"},
+ {24, 304, 1792, L"Махачкала"},
+ {24, 304, 2620, L"Хасавюрт"},
+ {24, 304, 2225, L"Другое"},
+ {24, 305, 3052, L"Магас"},
+ {24, 305, 1787, L"Назрань"},
+ {24, 305, 2228, L"Другое"},
+ {24, 306, 2621, L"Баксан"},
+ {24, 306, 1794, L"Майский"},
+ {24, 306, 1793, L"Нальчик"},
+ {24, 306, 2622, L"Нарткала"},
+ {24, 306, 1795, L"Прохладный"},
+ {24, 306, 2623, L"Терек"},
+ {24, 306, 2624, L"Тырныауз"},
+ {24, 306, 3274, L"Чегем"},
+ {24, 306, 2230, L"Другое"},
+ {24, 307, 2567, L"Городовиково"},
+ {24, 307, 2568, L"Лагань"},
+ {24, 307, 3324, L"Троицкое"},
+ {24, 307, 1796, L"Элиста"},
+ {24, 307, 2232, L"Другое"},
+ {24, 308, 1799, L"Домбай"},
+ {24, 308, 1798, L"Карачаевск"},
+ {24, 308, 2626, L"Теберда"},
+ {24, 308, 2625, L"Усть-Джегута"},
+ {24, 308, 1797, L"Черкесск"},
+ {24, 308, 2235, L"Другое"},
+ {24, 311, 2630, L"Алагир"},
+ {24, 311, 2631, L"Ардон"},
+ {24, 311, 2628, L"Беслан"},
+ {24, 311, 1839, L"Владикавказ"},
+ {24, 311, 2629, L"Дигора"},
+ {24, 311, 2627, L"Моздок"},
+ {24, 311, 2266, L"Другое"},
+ {24, 313, 2632, L"Аргун"},
+ {24, 313, 1853, L"Грозный"},
+ {24, 313, 2633, L"Гудермес"},
+ {24, 313, 2284, L"Другое"},
+ {24, 309, 2636, L"Абинск"},
+ {24, 309, 1800, L"Анапа"},
+ {24, 309, 1801, L"Апшеронск"},
+ {24, 309, 1802, L"Армавир"},
+ {24, 309, 1803, L"Белореченск"},
+ {24, 309, 1804, L"Геленджик"},
+ {24, 309, 1805, L"Горячий Ключ"},
+ {24, 309, 2637, L"Гулькевичи"},
+ {24, 309, 1806, L"Динская"},
+ {24, 309, 1807, L"Ейск"},
+ {24, 309, 2638, L"Кореновск"},
+ {24, 309, 1808, L"Краснодар"},
+ {24, 309, 1809, L"Кропоткин"},
+ {24, 309, 1810, L"Крымск"},
+ {24, 309, 1811, L"Курганинск"},
+ {24, 309, 3232, L"Лабинск"},
+ {24, 309, 2639, L"Новокубанск"},
+ {24, 309, 1812, L"Новороссийск"},
+ {24, 309, 1813, L"Пластуновская"},
+ {24, 309, 1814, L"Приморско-Ахтарск"},
+ {24, 309, 3102, L"Северская"},
+ {24, 309, 1815, L"Славянск-на-Кубани"},
+ {24, 309, 1816, L"Сочи"},
+ {24, 309, 3266, L"Староминская"},
+ {24, 309, 3039, L"Тамань"},
+ {24, 309, 1817, L"Темрюк"},
+ {24, 309, 2635, L"Тимашевск"},
+ {24, 309, 1818, L"Тихорецк"},
+ {24, 309, 1819, L"Туапсе"},
+ {24, 309, 1820, L"Усть-Лабинск"},
+ {24, 309, 2634, L"Хадыженск"},
+ {24, 309, 2241, L"Другое"},
+ {24, 312, 1840, L"Александровское"},
+ {24, 312, 2644, L"Благодарный"},
+ {24, 312, 1841, L"Буденновск"},
+ {24, 312, 1842, L"Георгиевск"},
+ {24, 312, 1843, L"Ессентуки"},
+ {24, 312, 1844, L"Железноводск"},
+ {24, 312, 2647, L"Зеленокумск"},
+ {24, 312, 2641, L"Изобильный"},
+ {24, 312, 2642, L"Ипатово"},
+ {24, 312, 1845, L"Кисловодск"},
+ {24, 312, 1846, L"Кочубеевское"},
+ {24, 312, 3367, L"Курсавка"},
+ {24, 312, 3265, L"Левокумское"},
+ {24, 312, 1847, L"Лермонтов"},
+ {24, 312, 1848, L"Минеральные Воды"},
+ {24, 312, 1849, L"Невинномысск"},
+ {24, 312, 2645, L"Нефтекумск"},
+ {24, 312, 2643, L"Новоалександровск"},
+ {24, 312, 1850, L"Новопавловск"},
+ {24, 312, 1851, L"Новоселицкое"},
+ {24, 312, 1852, L"Пятигорск"},
+ {24, 312, 2646, L"Светлоград"},
+ {24, 312, 2640, L"Ставрополь"},
+ {24, 312, 2268, L"Другое"},
+ {24, 302, 1777, L"Астрахань"},
+ {24, 302, 1778, L"Ахтубинск"},
+ {24, 302, 3383, L"Знаменск"},
+ {24, 302, 2578, L"Камызяк"},
+ {24, 302, 2579, L"Нариманов"},
+ {24, 302, 1786, L"Харабали"},
+ {24, 302, 2219, L"Другое"},
+ {24, 303, 1779, L"Волгоград"},
+ {24, 303, 1780, L"Волжский"},
+ {24, 303, 2584, L"Дубовка"},
+ {24, 303, 1781, L"Жирновск"},
+ {24, 303, 1782, L"Калач-на-Дону"},
+ {24, 303, 1783, L"Камышин"},
+ {24, 303, 2588, L"Котельниково"},
+ {24, 303, 2591, L"Котово"},
+ {24, 303, 2587, L"Краснослободск"},
+ {24, 303, 2582, L"Ленинск"},
+ {24, 303, 2590, L"Михайловка"},
+ {24, 303, 1784, L"Николаевск"},
+ {24, 303, 2581, L"Новоаннинский"},
+ {24, 303, 2583, L"Палласовка"},
+ {24, 303, 2580, L"Петров Вал"},
+ {24, 303, 2589, L"Серафимович"},
+ {24, 303, 2585, L"Суровикино"},
+ {24, 303, 1785, L"Урюпинск"},
+ {24, 303, 2586, L"Фролово"},
+ {24, 303, 2223, L"Другое"},
+ {24, 310, 1821, L"Азов"},
+ {24, 310, 1822, L"Аксай"},
+ {24, 310, 1823, L"Багаевская"},
+ {24, 310, 1824, L"Батайск"},
+ {24, 310, 1825, L"Белая Калитва"},
+ {24, 310, 1826, L"Волгодонск"},
+ {24, 310, 1827, L"Гуково"},
+ {24, 310, 2651, L"Донецк"},
+ {24, 310, 1828, L"Зерноград"},
+ {24, 310, 3264, L"Каменоломни"},
+ {24, 310, 2652, L"Каменск-Шахтинский"},
+ {24, 310, 2649, L"Константиновск"},
+ {24, 310, 2648, L"Красный Сулин"},
+ {24, 310, 1829, L"Миллерово"},
+ {24, 310, 2653, L"Морозовск"},
+ {24, 310, 1830, L"Новочеркасск"},
+ {24, 310, 1831, L"Новошахтинск"},
+ {24, 310, 1832, L"Пролетарск"},
+ {24, 310, 1833, L"Ростов-на-Дону"},
+ {24, 310, 1834, L"Сальск"},
+ {24, 310, 1835, L"Семикаракорск"},
+ {24, 310, 1836, L"Таганрог"},
+ {24, 310, 1837, L"Усть-Донецкий"},
+ {24, 310, 3263, L"Целина"},
+ {24, 310, 2650, L"Цимлянск"},
+ {24, 310, 1838, L"Шахты"},
+ {24, 310, 2259, L"Другое"},
+ {139, 407, 407, L" столица"},
+ {139, 426, 427, L"Бойсе"},
+ {139, 426, 2354, L"Другое"},
+ {139, 378, 3109, L"Айова Сити"},
+ {139, 378, 379, L"Де-Мойн"},
+ {139, 378, 2963, L"Декора"},
+ {139, 378, 2355, L"Другое"},
+ {139, 412, 3236, L"Бирмингем"},
+ {139, 412, 413, L"Монтгомери"},
+ {139, 412, 1181, L"Хантсвилл"},
+ {139, 412, 2356, L"Другое"},
+ {139, 446, 1182, L"Анкоридж"},
+ {139, 446, 447, L"Джуно"},
+ {139, 446, 1183, L"Фэрбенкс"},
+ {139, 446, 2357, L"Другое"},
+ {139, 434, 2917, L"Темпе"},
+ {139, 434, 1184, L"Тусон"},
+ {139, 434, 435, L"Финикс"},
+ {139, 434, 3061, L"Чандлер"},
+ {139, 434, 2358, L"Другое"},
+ {139, 416, 417, L"Литл-Рок"},
+ {139, 416, 2359, L"Другое"},
+ {139, 428, 3017, L"Ларами"},
+ {139, 428, 429, L"Шайенн"},
+ {139, 428, 2360, L"Другое"},
+ {139, 440, 2956, L"Беллевью"},
+ {139, 440, 2967, L"Бремертон"},
+ {139, 440, 3385, L"Ванкувер"},
+ {139, 440, 2865, L"Линден"},
+ {139, 440, 441, L"Олимпия"},
+ {139, 440, 3352, L"Порт Орчард"},
+ {139, 440, 2876, L"Редмонт"},
+ {139, 440, 3003, L"Рентон"},
+ {139, 440, 1185, L"Сиэтл"},
+ {139, 440, 2983, L"Снохомиш"},
+ {139, 440, 1186, L"Такома"},
+ {139, 440, 3152, L"Фрайди Харбор"},
+ {139, 440, 2886, L"Эверет"},
+ {139, 440, 2361, L"Другое"},
+ {139, 352, 353, L"Монтпильер"},
+ {139, 352, 2861, L"Норвич"},
+ {139, 352, 2362, L"Другое"},
+ {139, 394, 1188, L"Александрия"},
+ {139, 394, 1187, L"Арлингтон"},
+ {139, 394, 2969, L"Даллес"},
+ {139, 394, 1189, L"Манассас"},
+ {139, 394, 3114, L"Норфолк"},
+ {139, 394, 2885, L"Ньюпорт-Ньюс"},
+ {139, 394, 2979, L"Раунд Хил"},
+ {139, 394, 3338, L"Рестон"},
+ {139, 394, 395, L"Ричмонд"},
+ {139, 394, 3005, L"Уоррентон"},
+ {139, 394, 2991, L"Херндон"},
+ {139, 394, 2996, L"Центрвиль"},
+ {139, 394, 3097, L"Чантилли"},
+ {139, 394, 2981, L"Шарлотесвиль"},
+ {139, 394, 2363, L"Другое"},
+ {139, 374, 2995, L"Грин-Бей"},
+ {139, 374, 375, L"Мадисон"},
+ {139, 374, 2365, L"Другое"},
+ {139, 448, 449, L"Гонолулу"},
+ {139, 448, 1191, L"Хило"},
+ {139, 448, 2367, L"Другое"},
+ {139, 390, 3021, L"Вильмингтон"},
+ {139, 390, 391, L"Довер"},
+ {139, 390, 2973, L"Льюис"},
+ {139, 390, 2369, L"Другое"},
+ {139, 402, 403, L"Атланта"},
+ {139, 402, 2370, L"Другое"},
+ {139, 396, 397, L"Чарлстон"},
+ {139, 396, 2371, L"Другое"},
+ {139, 370, 2911, L"Вестмонт"},
+ {139, 370, 3074, L"Гарвард"},
+ {139, 370, 371, L"Спрингфилд"},
+ {139, 370, 2930, L"Урбана"},
+ {139, 370, 1194, L"Чикаго"},
+ {139, 370, 2372, L"Другое"},
+ {139, 368, 369, L"Индианаполис"},
+ {139, 368, 1195, L"Эвансвил"},
+ {139, 368, 2373, L"Другое"},
+ {139, 444, 2959, L"Анахайм"},
+ {139, 444, 2961, L"Аптос"},
+ {139, 444, 2912, L"Артезия"},
+ {139, 444, 2899, L"Беверли Хилз"},
+ {139, 444, 1196, L"Беркли"},
+ {139, 444, 3249, L"Бреа"},
+ {139, 444, 3014, L"Брисбейн"},
+ {139, 444, 3048, L"Венис"},
+ {139, 444, 2901, L"Вест-Голливуд"},
+ {139, 444, 2926, L"Вестлейк Вилладж"},
+ {139, 444, 2922, L"Гардена"},
+ {139, 444, 1203, L"Глендейл"},
+ {139, 444, 2978, L"Денвиль"},
+ {139, 444, 2990, L"Дублин"},
+ {139, 444, 3077, L"Дэвис"},
+ {139, 444, 2918, L"Ирвайн"},
+ {139, 444, 2881, L"Карсон"},
+ {139, 444, 3247, L"Кипресс"},
+ {139, 444, 3092, L"Коста Меса"},
+ {139, 444, 2948, L"Купертино"},
+ {139, 444, 1197, L"Лонг-Бич"},
+ {139, 444, 1198, L"Лос-Анджелес"},
+ {139, 444, 3058, L"Лос-Гатос"},
+ {139, 444, 3328, L"Марина-дель-Рей"},
+ {139, 444, 2874, L"Маунтин-Вью"},
+ {139, 444, 2998, L"Милпитас"},
+ {139, 444, 3087, L"Монтерей"},
+ {139, 444, 2947, L"Окленд"},
+ {139, 444, 2900, L"Пало Альто"},
+ {139, 444, 1199, L"Пасадена"},
+ {139, 444, 3335, L"Редвуд"},
+ {139, 444, 2966, L"Розамонд"},
+ {139, 444, 445, L"Сакраменто"},
+ {139, 444, 1200, L"Сан-Диего"},
+ {139, 444, 3317, L"Сан-Мартин"},
+ {139, 444, 1201, L"Сан-Франциско"},
+ {139, 444, 1202, L"Сан-Хосе"},
+ {139, 444, 2878, L"Саннивейл"},
+ {139, 444, 2925, L"Санта-Барбара"},
+ {139, 444, 2875, L"Санта-Клара"},
+ {139, 444, 1204, L"Санта-Круз"},
+ {139, 444, 2859, L"Санта-Моника"},
+ {139, 444, 3157, L"Студио Сити"},
+ {139, 444, 3146, L"Торранс"},
+ {139, 444, 2970, L"Тысяча Дубов"},
+ {139, 444, 2949, L"Универсал-Сити"},
+ {139, 444, 3057, L"Форт Брэгг"},
+ {139, 444, 3032, L"Фостер-Сити"},
+ {139, 444, 3381, L"Фремонт"},
+ {139, 444, 3028, L"Фуллертон"},
+ {139, 444, 2858, L"Эмервиль"},
+ {139, 444, 3040, L"Эскондидо"},
+ {139, 444, 2374, L"Другое"},
+ {139, 388, 3041, L"Лоуренс"},
+ {139, 388, 389, L"Топика"},
+ {139, 388, 2375, L"Другое"},
+ {139, 408, 3004, L"Лексингтон"},
+ {139, 408, 1205, L"Луисвилл"},
+ {139, 408, 409, L"Франкфорт"},
+ {139, 408, 2376, L"Другое"},
+ {139, 430, 1206, L"Боулдер"},
+ {139, 430, 3095, L"Грили"},
+ {139, 430, 431, L"Денвер"},
+ {139, 430, 1207, L"Колорадо-Спрингс"},
+ {139, 430, 3046, L"Литлтон"},
+ {139, 430, 2377, L"Другое"},
+ {139, 358, 2968, L"Дариен"},
+ {139, 358, 3018, L"Денбери"},
+ {139, 358, 2882, L"Стэмфорд"},
+ {139, 358, 359, L"Хартфорд"},
+ {139, 358, 3047, L"Шелтон"},
+ {139, 358, 2378, L"Другое"},
+ {139, 418, 419, L"Батон-Руж"},
+ {139, 418, 1208, L"Новый Орлеан"},
+ {139, 418, 2408, L"Другое"},
+ {139, 354, 2931, L"Аттлеборо"},
+ {139, 354, 3334, L"Билерика"},
+ {139, 354, 355, L"Бостон"},
+ {139, 354, 3059, L"Вестгемптон"},
+ {139, 354, 2919, L"Вобурн"},
+ {139, 354, 2902, L"Дедхэм"},
+ {139, 354, 1209, L"Кеймбридж"},
+ {139, 354, 3336, L"Нидхем"},
+ {139, 354, 2985, L"Ньютонвиль"},
+ {139, 354, 3022, L"Уолтхэм"},
+ {139, 354, 2407, L"Другое"},
+ {139, 376, 1210, L"Миннеаполис"},
+ {139, 376, 2980, L"Плимут"},
+ {139, 376, 377, L"Сент-Пол"},
+ {139, 376, 3035, L"Эден Прейри"},
+ {139, 376, 2406, L"Другое"},
+ {139, 414, 415, L"Джэксон"},
+ {139, 414, 2405, L"Другое"},
+ {139, 380, 381, L"Джефферсон-Сити"},
+ {139, 380, 3062, L"Канзас Сити"},
+ {139, 380, 3038, L"Ли Саммит"},
+ {139, 380, 1211, L"Сент-Луис"},
+ {139, 380, 2895, L"Эллисвил"},
+ {139, 380, 2404, L"Другое"},
+ {139, 372, 3357, L"Вест Блюмфельд"},
+ {139, 372, 1212, L"Гранд-Рапидс"},
+ {139, 372, 1213, L"Детройт"},
+ {139, 372, 3103, L"Каламазу"},
+ {139, 372, 373, L"Лансинг"},
+ {139, 372, 2987, L"Новай"},
+ {139, 372, 2887, L"Сагино"},
+ {139, 372, 2403, L"Другое"},
+ {139, 424, 1214, L"Грейт-Фолс"},
+ {139, 424, 425, L"Хелина"},
+ {139, 424, 2402, L"Другое"},
+ {139, 348, 349, L"Огаста"},
+ {139, 348, 3000, L"Ярмут"},
+ {139, 348, 2401, L"Другое"},
+ {139, 392, 393, L"Аннаполис"},
+ {139, 392, 1215, L"Балтимор"},
+ {139, 392, 3143, L"Гринбелт"},
+ {139, 392, 3337, L"Колледж Парк"},
+ {139, 392, 2904, L"Маунт Эйри"},
+ {139, 392, 3329, L"Роквилль"},
+ {139, 392, 2400, L"Другое"},
+ {139, 386, 387, L"Линкольн"},
+ {139, 386, 1216, L"Омаха"},
+ {139, 386, 2399, L"Другое"},
+ {139, 438, 439, L"Карсон-Сити"},
+ {139, 438, 1217, L"Лас-Вегас"},
+ {139, 438, 2890, L"Рено"},
+ {139, 438, 2398, L"Другое"},
+ {139, 362, 1219, L"Атлантик-Сити"},
+ {139, 362, 1218, L"Ньюарк"},
+ {139, 362, 3276, L"Оклин"},
+ {139, 362, 3073, L"Принстон"},
+ {139, 362, 2955, L"Рузерфорд"},
+ {139, 362, 3349, L"Сомервиль"},
+ {139, 362, 363, L"Трентон"},
+ {139, 362, 3078, L"Хакеттстоун"},
+ {139, 362, 3248, L"Черри Хилл"},
+ {139, 362, 2397, L"Другое"},
+ {139, 360, 3134, L"Баффало"},
+ {139, 360, 3081, L"Бингхэмптон"},
+ {139, 360, 2997, L"Бруклин"},
+ {139, 360, 2999, L"Варвик"},
+ {139, 360, 3139, L"Ирвингтон"},
+ {139, 360, 3060, L"Итака"},
+ {139, 360, 1220, L"Нью-Йорк"},
+ {139, 360, 361, L"Олбани"},
+ {139, 360, 2914, L"Погкипси"},
+ {139, 360, 3056, L"Саратога Спрингс"},
+ {139, 360, 2396, L"Другое"},
+ {139, 432, 1222, L"Альбукерке"},
+ {139, 432, 433, L"Санта-Фе"},
+ {139, 432, 2395, L"Другое"},
+ {139, 350, 2989, L"Амхерст"},
+ {139, 350, 351, L"Конкорд"},
+ {139, 350, 2950, L"Лондондерри"},
+ {139, 350, 1221, L"Манчестер"},
+ {139, 350, 3111, L"Рочестер"},
+ {139, 350, 2898, L"Салем"},
+ {139, 350, 2938, L"Хадсон"},
+ {139, 350, 2394, L"Другое"},
+ {139, 366, 2953, L"Варрен"},
+ {139, 366, 3112, L"Гроув Сити"},
+ {139, 366, 1223, L"Кливленд"},
+ {139, 366, 367, L"Колумбус"},
+ {139, 366, 2951, L"Лавленд"},
+ {139, 366, 2862, L"Оберлин"},
+ {139, 366, 3034, L"Рейнольдсбург"},
+ {139, 366, 2860, L"Цинциннати"},
+ {139, 366, 2393, L"Другое"},
+ {139, 420, 421, L"Оклахома-Сити"},
+ {139, 420, 1224, L"Талса"},
+ {139, 420, 2392, L"Другое"},
+ {139, 442, 2877, L"Кламат-Фолс"},
+ {139, 442, 2945, L"Коттедж-Гроув"},
+ {139, 442, 1225, L"Портленд"},
+ {139, 442, 443, L"Сейлем"},
+ {139, 442, 1226, L"Юджин"},
+ {139, 442, 2391, L"Другое"},
+ {139, 364, 3316, L"Вифлием"},
+ {139, 364, 3282, L"Колледжвиль"},
+ {139, 364, 2972, L"Нью Фридом"},
+ {139, 364, 1227, L"Питтсбург"},
+ {139, 364, 2893, L"Рандор"},
+ {139, 364, 3110, L"Слиппери Рок"},
+ {139, 364, 1228, L"Филадельфия"},
+ {139, 364, 365, L"Харрисберг"},
+ {139, 364, 2390, L"Другое"},
+ {139, 450, 451, L"Понсе"},
+ {139, 450, 3093, L"Сан-Хуан"},
+ {139, 450, 2389, L"Другое"},
+ {139, 356, 357, L"Провиденс"},
+ {139, 356, 2388, L"Другое"},
+ {139, 382, 383, L"Бисмарк"},
+ {139, 382, 2387, L"Другое"},
+ {139, 398, 2960, L"Вильмингтон"},
+ {139, 398, 2915, L"Дурхам"},
+ {139, 398, 399, L"Роли"},
+ {139, 398, 2386, L"Другое"},
+ {139, 410, 2863, L"Мемфис"},
+ {139, 410, 411, L"Нашвилл"},
+ {139, 410, 1229, L"Ноксвилл"},
+ {139, 410, 2385, L"Другое"},
+ {139, 422, 3085, L"Бедфорд"},
+ {139, 422, 2913, L"Брейди"},
+ {139, 422, 1233, L"Даллас"},
+ {139, 422, 2916, L"Ирвинг"},
+ {139, 422, 3123, L"Кингсвилл"},
+ {139, 422, 2873, L"Конрой"},
+ {139, 422, 3096, L"Корпус Кристи"},
+ {139, 422, 423, L"Остин"},
+ {139, 422, 1232, L"Сан-Антонио"},
+ {139, 422, 3023, L"Уайли"},
+ {139, 422, 1231, L"Хьюстон"},
+ {139, 422, 1230, L"Эль-Пасо"},
+ {139, 422, 2384, L"Другое"},
+ {139, 406, 2383, L"Другое"},
+ {139, 404, 2879, L"Бока-Рейтон"},
+ {139, 404, 2880, L"Гейнсвил"},
+ {139, 404, 3086, L"Джексонвиль"},
+ {139, 404, 3002, L"Киссимми"},
+ {139, 404, 3124, L"Корал Гейблс"},
+ {139, 404, 2894, L"Корал-Спрингс"},
+ {139, 404, 3290, L"Лейк-Ворт"},
+ {139, 404, 1234, L"Майами"},
+ {139, 404, 1236, L"Орландо"},
+ {139, 404, 3372, L"Пинеллас Парк"},
+ {139, 404, 2952, L"Пунта-Горда"},
+ {139, 404, 3340, L"Сарасота"},
+ {139, 404, 1235, L"Сент-Питерсберг"},
+ {139, 404, 405, L"Таллахасси"},
+ {139, 404, 2962, L"Форт Лаудердейл"},
+ {139, 404, 2382, L"Другое"},
+ {139, 384, 385, L"Пирр"},
+ {139, 384, 2381, L"Другое"},
+ {139, 400, 401, L"Колумбия"},
+ {139, 400, 3090, L"Спартанбург"},
+ {139, 400, 1237, L"Чарлстон"},
+ {139, 400, 2380, L"Другое"},
+ {139, 436, 3036, L"Кейсвилл"},
+ {139, 436, 3024, L"Линдон"},
+ {139, 436, 3108, L"Орем"},
+ {139, 436, 2866, L"Сент-Джордж"},
+ {139, 436, 437, L"Солт-Лейк-Сити"},
+ {139, 436, 2379, L"Другое"},
+ {39, 315, 614, L"Винница"},
+ {39, 315, 615, L"Хмельник"},
+ {39, 315, 2566, L"Другое"},
+ {39, 316, 2940, L"Ковель"},
+ {39, 316, 616, L"Луцк"},
+ {39, 316, 2565, L"Другое"},
+ {39, 317, 617, L"Днепродзержинск"},
+ {39, 317, 618, L"Днепропетровск"},
+ {39, 317, 619, L"Кривой Рог"},
+ {39, 317, 620, L"Никополь"},
+ {39, 317, 621, L"Новомосковск"},
+ {39, 317, 622, L"Орджоникидзе"},
+ {39, 317, 623, L"Павлоград"},
+ {39, 317, 2564, L"Другое"},
+ {39, 318, 624, L"Артемовск"},
+ {39, 318, 625, L"Горловка"},
+ {39, 318, 626, L"Донецк"},
+ {39, 318, 627, L"Дружковка"},
+ {39, 318, 628, L"Енакиево"},
+ {39, 318, 629, L"Константиновка"},
+ {39, 318, 630, L"Краматорск"},
+ {39, 318, 2944, L"Красноармейск"},
+ {39, 318, 631, L"Макеевка"},
+ {39, 318, 632, L"Мариуполь"},
+ {39, 318, 633, L"Николаевка"},
+ {39, 318, 634, L"Славянск"},
+ {39, 318, 635, L"Харцызск"},
+ {39, 318, 2563, L"Другое"},
+ {39, 319, 636, L"Бердичев"},
+ {39, 319, 637, L"Житомир"},
+ {39, 319, 2942, L"Коростень"},
+ {39, 319, 638, L"Коростышев"},
+ {39, 319, 2907, L"Малин"},
+ {39, 319, 639, L"Новоград-Волынский"},
+ {39, 319, 2562, L"Другое"},
+ {39, 320, 640, L"Берегово"},
+ {39, 320, 641, L"Воловец"},
+ {39, 320, 3119, L"Мукачево"},
+ {39, 320, 3162, L"Свалява"},
+ {39, 320, 642, L"Ужгород"},
+ {39, 320, 643, L"Хуст"},
+ {39, 320, 2561, L"Другое"},
+ {39, 321, 644, L"Бердянск"},
+ {39, 321, 3128, L"Гуляйполе"},
+ {39, 321, 645, L"Запорожье"},
+ {39, 321, 646, L"Мелитополь"},
+ {39, 321, 3121, L"Приморск"},
+ {39, 321, 3378, L"Энергодар"},
+ {39, 321, 2560, L"Другое"},
+ {39, 322, 3379, L"Галич"},
+ {39, 322, 647, L"Ивано-Франковск"},
+ {39, 322, 3170, L"Яремче"},
+ {39, 322, 2559, L"Другое"},
+ {39, 323, 648, L"Белая Церковь"},
+ {39, 323, 649, L"Борисполь"},
+ {39, 323, 651, L"Бровары"},
+ {39, 323, 650, L"Васильков"},
+ {39, 323, 652, L"Ирпень"},
+ {39, 323, 3341, L"Переяслав-Хмельницкий"},
+ {39, 323, 653, L"Славутич"},
+ {39, 323, 654, L"Фастов"},
+ {39, 323, 655, L"Чернобыль"},
+ {39, 323, 2558, L"Другое"},
+ {39, 324, 656, L"Александрия"},
+ {39, 324, 657, L"Кировоград"},
+ {39, 324, 658, L"Светловодск"},
+ {39, 324, 2557, L"Другое"},
+ {39, 325, 659, L"Алушта"},
+ {39, 325, 2984, L"Армянск"},
+ {39, 325, 3042, L"Балаклава"},
+ {39, 325, 660, L"Бахчисарай"},
+ {39, 325, 662, L"Гурзуф"},
+ {39, 325, 3382, L"Джанкой"},
+ {39, 325, 663, L"Евпатория"},
+ {39, 325, 667, L"Керчь"},
+ {39, 325, 666, L"Коктебель"},
+ {39, 325, 668, L"Мысовое"},
+ {39, 325, 669, L"Саки"},
+ {39, 325, 665, L"Севастополь"},
+ {39, 325, 661, L"Симферополь"},
+ {39, 325, 3370, L"Старый Крым"},
+ {39, 325, 670, L"Судак"},
+ {39, 325, 664, L"Феодосия"},
+ {39, 325, 3148, L"Черноморское"},
+ {39, 325, 671, L"Ялта"},
+ {39, 325, 2556, L"Другое"},
+ {39, 326, 672, L"Алчевск"},
+ {39, 326, 673, L"Антрацит"},
+ {39, 326, 674, L"Лисичанск"},
+ {39, 326, 675, L"Луганск"},
+ {39, 326, 3364, L"Молодогвардейск"},
+ {39, 326, 676, L"Петровское"},
+ {39, 326, 677, L"Ровеньки"},
+ {39, 326, 678, L"Рубежное"},
+ {39, 326, 679, L"Северодонецк"},
+ {39, 326, 680, L"Стаханов"},
+ {39, 326, 2555, L"Другое"},
+ {39, 327, 3284, L"Дрогобыч"},
+ {39, 327, 681, L"Львов"},
+ {39, 327, 682, L"Трускавец"},
+ {39, 327, 2554, L"Другое"},
+ {39, 328, 3322, L"Вознесенск"},
+ {39, 328, 2870, L"Жовтневое"},
+ {39, 328, 683, L"Николаев"},
+ {39, 328, 3118, L"Очаков"},
+ {39, 328, 3325, L"Южноукраинск"},
+ {39, 328, 2553, L"Другое"},
+ {39, 329, 684, L"Белгород-Днестровский"},
+ {39, 329, 685, L"Измаил"},
+ {39, 329, 689, L"Ильичевск"},
+ {39, 329, 686, L"Одесса"},
+ {39, 329, 688, L"Рени"},
+ {39, 329, 687, L"Слободка"},
+ {39, 329, 2552, L"Другое"},
+ {39, 330, 690, L"Гадяч"},
+ {39, 330, 691, L"Комсомольск"},
+ {39, 330, 693, L"Кременчуг"},
+ {39, 330, 694, L"Лубны"},
+ {39, 330, 695, L"Миргород"},
+ {39, 330, 692, L"Полтава"},
+ {39, 330, 2551, L"Другое"},
+ {39, 331, 696, L"Здолбунов"},
+ {39, 331, 697, L"Ровно"},
+ {39, 331, 3361, L"Сарны"},
+ {39, 331, 2550, L"Другое"},
+ {39, 332, 3356, L"Бурынь"},
+ {39, 332, 698, L"Конотоп"},
+ {39, 332, 700, L"Ромны"},
+ {39, 332, 699, L"Сумы"},
+ {39, 332, 701, L"Шостка"},
+ {39, 332, 2549, L"Другое"},
+ {39, 333, 702, L"Бережаны"},
+ {39, 333, 3171, L"Борщев"},
+ {39, 333, 703, L"Тернополь"},
+ {39, 333, 704, L"Чортков"},
+ {39, 333, 2548, L"Другое"},
+ {39, 334, 705, L"Изюм"},
+ {39, 334, 3346, L"Купянск"},
+ {39, 334, 3351, L"Купянск"},
+ {39, 334, 706, L"Лозовая"},
+ {39, 334, 708, L"Мерефа"},
+ {39, 334, 707, L"Харьков"},
+ {39, 334, 709, L"Чугуев"},
+ {39, 334, 2547, L"Другое"},
+ {39, 335, 710, L"Геническ"},
+ {39, 335, 711, L"Каховка"},
+ {39, 335, 712, L"Новая Каховка"},
+ {39, 335, 3280, L"Скадовск"},
+ {39, 335, 713, L"Херсон"},
+ {39, 335, 2546, L"Другое"},
+ {39, 336, 714, L"Каменец-Подольский"},
+ {39, 336, 715, L"Красилов"},
+ {39, 336, 2941, L"Нетишин"},
+ {39, 336, 716, L"Полонное"},
+ {39, 336, 3120, L"Сатанов"},
+ {39, 336, 2943, L"Славута"},
+ {39, 336, 717, L"Хмельницкий"},
+ {39, 336, 3155, L"Чемировцы"},
+ {39, 336, 2542, L"Другое"},
+ {39, 337, 3169, L"Золотоноша"},
+ {39, 337, 3016, L"Канев"},
+ {39, 337, 3333, L"Полонное"},
+ {39, 337, 718, L"Умань"},
+ {39, 337, 719, L"Христиновка"},
+ {39, 337, 720, L"Черкассы"},
+ {39, 337, 2545, L"Другое"},
+ {39, 338, 721, L"Нежин"},
+ {39, 338, 722, L"Прилуки"},
+ {39, 338, 723, L"Чернигов"},
+ {39, 338, 2544, L"Другое"},
+ {39, 339, 724, L"Черновцы"},
+ {39, 339, 2543, L"Другое"},
+ {340, 342, 725, L"Барановичи"},
+ {340, 342, 726, L"Белоозерск"},
+ {340, 342, 727, L"Береза"},
+ {340, 342, 728, L"Брест"},
+ {340, 342, 3172, L"Дрогичин"},
+ {340, 342, 729, L"Кобрин"},
+ {340, 342, 730, L"Ляховичи"},
+ {340, 342, 731, L"Малорита"},
+ {340, 342, 732, L"Пинск"},
+ {340, 342, 2538, L"Другое"},
+ {340, 343, 733, L"Браслав"},
+ {340, 343, 735, L"Витебск"},
+ {340, 343, 734, L"Новолукомоль"},
+ {340, 343, 736, L"Новополоцк"},
+ {340, 343, 737, L"Орша"},
+ {340, 343, 738, L"Толочин"},
+ {340, 343, 2537, L"Другое"},
+ {340, 344, 739, L"Гомель"},
+ {340, 344, 740, L"Жлобин"},
+ {340, 344, 741, L"Мозырь"},
+ {340, 344, 742, L"Речица"},
+ {340, 344, 743, L"Рогачев"},
+ {340, 344, 744, L"Светлогорск"},
+ {340, 344, 2536, L"Другое"},
+ {340, 345, 745, L"Волковыск"},
+ {340, 345, 746, L"Гродно"},
+ {340, 345, 747, L"Лида"},
+ {340, 345, 3244, L"Слоним"},
+ {340, 345, 748, L"Сморгонь"},
+ {340, 345, 2535, L"Другое"},
+ {340, 346, 3149, L"Березино"},
+ {340, 346, 749, L"Борисов"},
+ {340, 346, 750, L"Вилейка"},
+ {340, 346, 751, L"Жодино"},
+ {340, 346, 752, L"Марьина Горка"},
+ {340, 346, 753, L"Молодечно"},
+ {340, 346, 2896, L"Слуцк"},
+ {340, 346, 754, L"Смолевичи"},
+ {340, 346, 755, L"Солигорск"},
+ {340, 346, 756, L"Червень"},
+ {340, 346, 2534, L"Другое"},
+ {340, 347, 757, L"Бобруйск"},
+ {340, 347, 758, L"Могилев"},
+ {340, 347, 759, L"Осиповичи"},
+ {340, 347, 2533, L"Другое"},
{0, 0, 0, NULL}
};
diff --git a/protocols/MRA/src/MraProto.cpp b/protocols/MRA/src/MraProto.cpp index 91f84dca59..980313d4fd 100644 --- a/protocols/MRA/src/MraProto.cpp +++ b/protocols/MRA/src/MraProto.cpp @@ -89,7 +89,7 @@ int CMraProto::OnModulesLoaded(WPARAM, LPARAM) HookProtoEvent(ME_WAT_NEWSTATUS, &CMraProto::MraMusicChanged);
HookProtoEvent(ME_CLIST_GROUPCHANGE, &CMraProto::OnGroupChanged);
- // offline // unsaved values
+ // всех в offline // тк unsaved values сохран¤ютс¤ их нужно инициализировать
for (MCONTACT hContact = db_find_first(m_szModuleName); hContact != NULL; hContact = db_find_next(hContact, m_szModuleName))
SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID | SCBIF_GROUP_ID | SCBIF_SERVER_FLAG | SCBIF_STATUS), -1, -1, 0, 0, ID_STATUS_OFFLINE, nullptr, nullptr, nullptr);
@@ -460,7 +460,7 @@ int CMraProto::SetStatus(int iNewStatus) m_bLoggedIn = FALSE;
dwOldStatusMode = InterlockedExchange((volatile LONG*)&m_iStatus, m_iDesiredStatus);
- // offline,
+ // всех в offline, только если мы бывали подключены
if (dwOldStatusMode > ID_STATUS_OFFLINE)
for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName))
SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID | SCBIF_GROUP_ID | SCBIF_SERVER_FLAG | SCBIF_STATUS), -1, -1, 0, 0, ID_STATUS_OFFLINE, nullptr, nullptr, nullptr);
@@ -469,7 +469,7 @@ int CMraProto::SetStatus(int iNewStatus) Netlib_Shutdown(m_hConnection);
}
else {
- // offline connecting, offline
+ // если offline то сразу ставим connecting, но обработка как offline
dwOldStatusMode = InterlockedCompareExchange((volatile LONG*)&m_iStatus, ID_STATUS_CONNECTING, ID_STATUS_OFFLINE);
switch (dwOldStatusMode) {
@@ -487,7 +487,7 @@ int CMraProto::SetStatus(int iNewStatus) case ID_STATUS_INVISIBLE:
MraSendNewStatus(m_iDesiredStatus, m_iXStatus, L"", L"");
case ID_STATUS_CONNECTING:
- // ( offline) connecting,
+ // предотвращаем переход в любой статус (кроме offline) из статуса connecting, если он не вызван самим плагином
if (dwOldStatusMode == ID_STATUS_CONNECTING && iNewStatus != m_iDesiredStatus)
break;
@@ -535,7 +535,7 @@ int CMraProto::SetAwayMsg(int iStatus, const wchar_t *msg) DWORD dwStatus = iStatus;
DWORD dwXStatus = m_iXStatus;
- // ,
+ // не отправл¤ем новый статусный текст дл¤ хстатусов, дл¤ хстатусов только эвей сообщени¤
if (dwStatus != ID_STATUS_ONLINE || IsXStatusValid(dwXStatus) == FALSE) {
dwStatusDescSize = min(dwStatusDescSize, STATUS_DESC_MAX);
MraSendNewStatus(dwStatus, dwXStatus, L"", msg);
diff --git a/protocols/MRA/src/MraRTFMsg.cpp b/protocols/MRA/src/MraRTFMsg.cpp index 373d77b19d..5cec2d80a6 100644 --- a/protocols/MRA/src/MraRTFMsg.cpp +++ b/protocols/MRA/src/MraRTFMsg.cpp @@ -166,7 +166,7 @@ DWORD MraSymbolsToRTFTags(LPSTR lpszMessage, size_t dwMessageSize, LPSTR lpszMes for (i = 0;i<SYMBOLS_COUNT;i++) { // looking for the next time
if (lpszFounded[i] && lpszFounded[i] < lpszMessageCurPrev) {
- dwFoundCount--;// , : "):-(" ":-("
+ dwFoundCount--;// вычитаем тут, чтобы учесть схожие смайлы: "):-(" и ":-("
lpszFounded[i] = (LPSTR)MemoryFind((lpszMessageCurPrev-lpszMessage), lpszMessage, dwMessageSize, lpszSimbols[i], dwcSimbolsCount[i]);
if (lpszFounded[i]) dwFoundCount++;
}
diff --git a/protocols/MRA/src/MraSendCommand.cpp b/protocols/MRA/src/MraSendCommand.cpp index 1ecf581750..32dd012880 100644 --- a/protocols/MRA/src/MraSendCommand.cpp +++ b/protocols/MRA/src/MraSendCommand.cpp @@ -100,11 +100,11 @@ DWORD CMraProto::MraMessage(BOOL bAddToQueue, MCONTACT hContact, DWORD dwAckType OutBuffer buf;
buf.SetUL(4);
- buf.SetLPS(lpszBuf);// :)
+ buf.SetLPS(lpszBuf);// сообщение что у собеседника плохая версия :)
buf.SetUL(4);
buf.SetUL(getDword("RTFBackgroundColour", MRA_DEFAULT_RTF_BACKGROUND_COLOUR));
- buf.SetLPS(lpszBuf);// ANSI
- buf.SetLPSW(lpwszMessage);// UNICODE
+ buf.SetLPS(lpszBuf);// сам мульт ANSI
+ buf.SetLPSW(lpwszMessage);// сам мульт UNICODE
DWORD dwBufSize = DWORD(buf.Len() + 128);
lpszBuf.Truncate(dwBufSize);
@@ -273,7 +273,7 @@ DWORD CMraProto::MraChangeStatus(DWORD dwStatus, const CMStringA &szStatusUri, c return MraSendCMD(MRIM_CS_CHANGE_STATUS, buf.Data(), buf.Len());
}
-//
+// Отправка файлов
DWORD CMraProto::MraFileTransfer(const CMStringA &szEmail, DWORD dwIDRequest, DWORD dwFilesTotalSize, const CMStringW &wszFiles, const CMStringA &szAddresses)
{
if (szEmail.GetLength() <= 4)
@@ -297,7 +297,7 @@ DWORD CMraProto::MraFileTransfer(const CMStringA &szEmail, DWORD dwIDRequest, DW return MraSendCMD(MRIM_CS_FILE_TRANSFER, buf.Data(), buf.Len());
}
-//
+// Ответ на отправку файлов
DWORD CMraProto::MraFileTransferAck(DWORD dwStatus, const CMStringA &szEmail, DWORD dwIDRequest, const CMStringA &szDescription)
{
if (szEmail.GetLength() <= 4)
@@ -311,7 +311,7 @@ DWORD CMraProto::MraFileTransferAck(DWORD dwStatus, const CMStringA &szEmail, DW return MraSendCMD(MRIM_CS_FILE_TRANSFER_ACK, buf.Data(), buf.Len());
}
-//
+// Поиск контакта
HANDLE CMraProto::MraWPRequestW(MCONTACT hContact, DWORD dwAckType, DWORD dwRequestFlags, const CMStringA &szUser, const CMStringA &szDomain, const CMStringW &wszNickName, const CMStringW &wszFirstName, const CMStringW &wszLastName, DWORD dwSex, DWORD dwDate1, DWORD dwDate2, DWORD dwCityID, DWORD dwZodiak, DWORD dwBirthdayMonth, DWORD dwBirthdayDay, DWORD dwCountryID, DWORD dwOnline)
{
OutBuffer buf;
@@ -380,7 +380,7 @@ HANDLE CMraProto::MraWPRequestW(MCONTACT hContact, DWORD dwAckType, DWORD dwRequ return (HANDLE)MraSendQueueCMD(hSendQueueHandle, dwRequestFlags, hContact, dwAckType, NULL, 0, MRIM_CS_WP_REQUEST, buf.Data(), buf.Len());
}
-// EMail
+// Поиск контакта по EMail
HANDLE CMraProto::MraWPRequestByEMail(MCONTACT hContact, DWORD dwAckType, CMStringA &szEmail)
{
if (szEmail.GetLength() <= 4)
@@ -396,7 +396,7 @@ HANDLE CMraProto::MraWPRequestByEMail(MCONTACT hContact, DWORD dwAckType, CMStri return MraWPRequestW(hContact, dwAckType, dwRequestFlags, szUser, szDomain, L"", L"", L"", 0, 0, 0, 0, 0, 0, 0, 0, 0);
}
-//
+// Отправка файлов
DWORD CMraProto::MraGame(const CMStringA &szEmail, DWORD dwGameSessionID, DWORD dwGameMsg, DWORD dwGameMsgID, const CMStringA &szData)
{
if (szEmail.GetLength() <= 4)
@@ -412,7 +412,7 @@ DWORD CMraProto::MraGame(const CMStringA &szEmail, DWORD dwGameSessionID, DWORD return MraSendCMD(MRIM_CS_GAME, buf.Data(), buf.Len());
}
-//
+// Авторизация
DWORD CMraProto::MraLogin2W(const CMStringA &szLogin, const CMStringA &szPassword, DWORD dwStatus, const CMStringA &szStatusUri, CMStringW &wszStatusTitle, CMStringW &wszStatusDesc, DWORD dwFutureFlags, CMStringA &szUserAgentFormatted, CMStringA &szUserAgent)
{
if (wszStatusTitle.GetLength() > STATUS_TITLE_MAX) wszStatusTitle.Truncate(STATUS_TITLE_MAX);
@@ -437,7 +437,7 @@ DWORD CMraProto::MraLogin2W(const CMStringA &szLogin, const CMStringA &szPasswor return MraSendCMD(MRIM_CS_LOGIN2, buf.Data(), buf.Len());
}
-// SMS
+// Отправка SMS
DWORD CMraProto::MraSMSW(MCONTACT hContact, const CMStringA &lpszPhone, const CMStringW &lpwszMessage)
{
CMStringA szPhoneLocal = "+" + CopyNumber(lpszPhone);
@@ -455,7 +455,7 @@ DWORD CMraProto::MraSMSW(MCONTACT hContact, const CMStringA &lpszPhone, const CM return MraSendQueueCMD(hSendQueueHandle, 0, hContact, ICQACKTYPE_SMS, lpbData, lpszPhone.GetLength(), MRIM_CS_SMS, buf.Data(), buf.Len());
}
-//
+// Соединение с прокси
DWORD CMraProto::MraProxy(const CMStringA &szEmail, DWORD dwIDRequest, DWORD dwDataType, const CMStringA &lpszData, const CMStringA &szAddresses, MRA_GUID mguidSessionID)
{
if (szEmail.GetLength() <= 4)
@@ -471,7 +471,7 @@ DWORD CMraProto::MraProxy(const CMStringA &szEmail, DWORD dwIDRequest, DWORD dwD return MraSendCMD(MRIM_CS_PROXY, buf.Data(), buf.Len());
}
-//
+// Ответ на соединение с прокси
DWORD CMraProto::MraProxyAck(DWORD dwStatus, const CMStringA &szEmail, DWORD dwIDRequest, DWORD dwDataType, const CMStringA &lpszData, const CMStringA &szAddresses, MRA_GUID mguidSessionID)
{
if (szEmail.GetLength() <= 4)
@@ -488,7 +488,7 @@ DWORD CMraProto::MraProxyAck(DWORD dwStatus, const CMStringA &szEmail, DWORD dwI return MraSendCMD(MRIM_CS_PROXY_ACK, buf.Data(), buf.Len());
}
-//
+// Отправка сообщения в микроблог
DWORD CMraProto::MraChangeUserBlogStatus(DWORD dwFlags, const CMStringW &wszText, DWORDLONG dwBlogStatusID)
{
OutBuffer buf;
@@ -505,10 +505,10 @@ DWORD CMraProto::MraSendPacket(HNETLIBCONN hConnection, DWORD dwCmdNum, DWORD dw mrim_packet_header_t *pmaHeader = (mrim_packet_header_t*)lpbData;
memset(pmaHeader, 0, sizeof(mrim_packet_header_t));
pmaHeader->magic = CS_MAGIC;
- pmaHeader->proto = (PROTO_VERSION_MAJOR << 16) + PROTO_VERSION_MINOR; //
+ pmaHeader->proto = (PROTO_VERSION_MAJOR << 16) + PROTO_VERSION_MINOR; // Версия протокола
pmaHeader->seq = dwCmdNum;// Sequence
- pmaHeader->msg = dwType;//
- pmaHeader->dlen = (unsigned)dwDataSize;//
+ pmaHeader->msg = dwType;// Тип пакета
+ pmaHeader->dlen = (unsigned)dwDataSize;// Длина данных
debugLogA("Sending packet %08x\n", dwType);
diff --git a/protocols/MRA/src/Mra_functions.cpp b/protocols/MRA/src/Mra_functions.cpp index bf8dea15bb..9339d5f94c 100644 --- a/protocols/MRA/src/Mra_functions.cpp +++ b/protocols/MRA/src/Mra_functions.cpp @@ -444,14 +444,14 @@ DWORD CMraProto::SetContactBasicInfoW(MCONTACT hContact, DWORD dwSetInfoFlags, D if (dwSetInfoFlags & SCBIFSI_LOCK_CHANGES_EVENTS)
setDword(hContact, "HooksLocked", TRUE);
- // ,
+ // поля которые нужны, и изменения которых не отслеживаются
if (dwFlags & SCBIF_ID)
setDword(hContact, "ContactID", dwID);
if ((dwFlags & SCBIF_EMAIL) && szEmail != NULL && !szEmail->IsEmpty())
mraSetStringExA(hContact, "e-mail", *szEmail);
- //
+ // поля изменения которых отслеживаются
if (dwFlags & SCBIF_GROUP_ID) {
setDword(hContact, "GroupID", dwGroupID);
@@ -694,13 +694,13 @@ bool IsHTTPSProxyUsed(HNETLIBUSER hNetlibUser) return false;
}
-//
+// определяет принадлежность контакта данной копии плагина
bool CMraProto::IsContactMra(MCONTACT hContact)
{
return Proto_IsProtoOnContact(hContact, m_szModuleName) != 0;
}
-// MRA ,
+// определяется является ли контакт контактом MRA протокола, не зависимо от того какому плагину он принадлежит
bool IsContactMraProto(MCONTACT hContact)
{
LPSTR lpszProto = GetContactProto(hContact);
@@ -1194,14 +1194,14 @@ DWORD GetYears(CONST PSYSTEMTIME pcstSystemTime) SYSTEMTIME stTime;
GetLocalTime(&stTime);
dwRet = stTime.wYear - pcstSystemTime->wYear;
- //
+ // день рожденья будет в след месяце
if (stTime.wMonth < pcstSystemTime->wMonth)
dwRet--;
- // ...
+ // др ещё будет в этом месяце или уже был...
else {
- //
+ // др в этом месяце
if (stTime.wMonth == pcstSystemTime->wMonth)
- // ,
+ // ещё только будет, не сегодня
if (stTime.wDay < pcstSystemTime->wDay)
dwRet--;
}
@@ -1399,7 +1399,7 @@ static DWORD ReplaceInBuff(LPVOID lpInBuff, size_t dwInBuffSize, size_t dwReplac break;
}
}
- else {// , .
+ else {// сюда по идее никогда не попадём, на всякий случай.
_CrtDbgBreak();
break;
}
diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 1c483c262c..6d26c956bb 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -231,7 +231,7 @@ int CMraProto::MraRebuildContactMenu(WPARAM hContact, LPARAM) bHasEMailMR = false;
bChatAgent = false;
if (!getByte(NULL, "HideMenuItemsForNonMRAContacts", MRA_DEFAULT_HIDE_MENU_ITEMS_FOR_NON_MRA))
- if (!IsContactMraProto(hContact))// MRA
+ if (!IsContactMraProto(hContact))// избегаем добавления менюшек в контакты других копий MRA
if (GetContactEMailCount(hContact, FALSE)) {
bHasEMail = true;
if (GetContactEMailCount(hContact, TRUE)) bHasEMailMR = true;
diff --git a/protocols/MRA/src/Mra_proto.cpp b/protocols/MRA/src/Mra_proto.cpp index effd097f75..5f48fdac43 100644 --- a/protocols/MRA/src/Mra_proto.cpp +++ b/protocols/MRA/src/Mra_proto.cpp @@ -8,7 +8,7 @@ DWORD CMraProto::StartConnect() if (m_bShutdown)
return ERROR_OPERATION_ABORTED;
- // / ,
+ // поток ещё/уже не работал, поставили статус что работает и запускаем
if (InterlockedCompareExchange((volatile LONG*)&m_dwThreadWorkerRunning, TRUE, FALSE))
return 0;
@@ -322,7 +322,7 @@ DWORD CMraProto::MraNetworkDispatcher() dwDataCurrentBuffOffset += sizeof(mrim_packet_header_t)+pmaHeader->dlen;
// move pointer to begin of buffer
else {
- //
+ // динамическое уменьшение буффера приёма
if (dwRcvBuffSize > BUFF_SIZE_RCV) {
dwRcvBuffSize = BUFF_SIZE_RCV;
lpbBufferRcv = (LPBYTE)mir_realloc(lpbBufferRcv, dwRcvBuffSize);
@@ -338,7 +338,7 @@ DWORD CMraProto::MraNetworkDispatcher() return dwRetErrorCode;
}
-// // UL ## ping_period ## ( )
+//Подтверждение установки соединения// UL ## ping_period ## Ожидаемая частота подтверждения соединения (в секундах)
bool CMraProto::CmdHelloAck(BinBuffer &buf)
{
buf >> m_dwPingPeriod;
@@ -389,7 +389,7 @@ bool CMraProto::CmdLoginAck() return true;
}
-// Unsuccessful authorization //LPS ## reason ##
+// Unsuccessful authorization //LPS ## reason ## причина отказа
bool CMraProto::CmdLoginRejected(BinBuffer &buf)
{
ProtoBroadcastAck(NULL, ACKTYPE_LOGIN, ACKRESULT_FAILED, nullptr, LOGINERR_WRONGPASSWORD);
@@ -400,9 +400,9 @@ bool CMraProto::CmdLoginRejected(BinBuffer &buf) }
// Message delivery
-//LPS ## from ##
-//LPS ## message ##
-//LPS ## rtf-message ##
+//LPS ## from ## Адрес отправителя
+//LPS ## message ## текстовая версия сообщения
+//LPS ## rtf-message ## форматированная версия сообщения
bool CMraProto::CmdMessageAck(BinBuffer &buf)
{
DWORD dwMsgID, dwFlags;
@@ -411,7 +411,7 @@ bool CMraProto::CmdMessageAck(BinBuffer &buf) if (dwFlags & MESSAGE_FLAG_MULTICHAT)
buf >> szMultiChatData; // LPS multichat_data
- // ,
+ // подтверждаем получение, только если удалось его обработать
if (MraRecvCommand_Message((DWORD)_time32(nullptr), dwFlags, szEmail, szText, szRTFText, szMultiChatData) == NO_ERROR)
if ((dwFlags & MESSAGE_FLAG_NORECV) == 0)
MraMessageRecv(szEmail, dwMsgID);
@@ -426,7 +426,7 @@ bool CMraProto::CmdMessageStatus(ULONG seq, BinBuffer &buf) switch (dwTemp) {
case MESSAGE_DELIVERED:// Message delivered directly to user
ProtoBroadcastAckAsync(hContact, dwAckType, ACKRESULT_SUCCESS, (HANDLE)seq, 0);
- break;//***deb -
+ break;//***deb возможны сбои из-за асинхронности тк там передаётся указатель
case MESSAGE_REJECTED_NOUSER:// Message rejected - no such user
ProtoBroadcastAck(hContact, dwAckType, ACKRESULT_FAILED, (HANDLE)seq, (LPARAM)"Message rejected - no such user");
break;
@@ -525,7 +525,7 @@ bool CMraProto::CmdUserInfo(BinBuffer &buf) return true;
}
-// ,
+//Сообщение доставленное, пока пользователь не был подключен к сети
bool CMraProto::CmdOfflineMessageAck(BinBuffer &buf)
{
CMStringA szEmail, szText, lpsRTFText, lpsMultiChatData, szString;
@@ -633,7 +633,7 @@ bool CMraProto::CmdFileTransferAck(BinBuffer &buf) buf >> dwAckType >> szEmail >> dwTemp >> szString;
switch (dwAckType) {
- case FILE_TRANSFER_STATUS_OK:// , (),
+ case FILE_TRANSFER_STATUS_OK:// игнорируем, мы и так уже слушаем порт(ждём), то что кто то согласился ничего не меняет
//hContact = MraHContactFromEmail(szEmail.lpszData, szEmail.dwSize, TRUE, TRUE, NULL);
break;
case FILE_TRANSFER_STATUS_DECLINE:
@@ -659,7 +659,7 @@ bool CMraProto::CmdFileTransferAck(BinBuffer &buf) return true;
}
-//
+// Смена статуса другого пользователя
bool CMraProto::CmdUserStatus(BinBuffer &buf)
{
DWORD dwStatus, dwXStatus, dwFutureFlags;
@@ -685,7 +685,7 @@ bool CMraProto::CmdUserStatus(BinBuffer &buf) delSetting(hContact, DBSETTING_XSTATUSMSG);
}
- if (dwTemp != ID_STATUS_OFFLINE) { // ,
+ if (dwTemp != ID_STATUS_OFFLINE) { // пишем клиента только если юзер не отключён, иначе не затираем старое
if (!szUserAgentFormatted.IsEmpty()) {
if (getByte("MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE)
szUserAgentFormatted = MraGetVersionStringFromFormatted(szUserAgentFormatted);
@@ -695,7 +695,7 @@ bool CMraProto::CmdUserStatus(BinBuffer &buf) mraSetStringA(hContact, "MirVer", szUserAgentFormatted);
}
- if (dwTemp == MraGetContactStatus(hContact)) {// , ? ;)
+ if (dwTemp == MraGetContactStatus(hContact)) {// меняем шило на шило, подозрительно? ;)
if (dwTemp == ID_STATUS_OFFLINE) { // was/now invisible
CMStringW wszEmail, wszBuff;
mraGetStringW(hContact, "e-mail", wszEmail);
@@ -717,7 +717,7 @@ bool CMraProto::CmdContactAck(int cmd, int seq, BinBuffer &buf) if (!MraSendQueueFind(hSendQueueHandle, seq, nullptr, &hContact, &dwAckType, nullptr, nullptr)) {
DWORD dwTemp = buf.getDword();
switch (dwTemp) {
- case CONTACT_OPER_SUCCESS:// ##
+ case CONTACT_OPER_SUCCESS:// ## добавление произведено успешно
if (cmd == MRIM_CS_ADD_CONTACT_ACK) {
DWORD dwFlags = SCBIF_ID | SCBIF_SERVER_FLAG, dwGroupID = 0;
ptrW grpName(db_get_wsa(hContact, "CList", "Group"));
@@ -728,23 +728,23 @@ bool CMraProto::CmdContactAck(int cmd, int seq, BinBuffer &buf) SetContactBasicInfoW(hContact, 0, dwFlags, buf.getDword(), dwGroupID, 0, CONTACT_INTFLAG_NOT_AUTHORIZED, 0, nullptr, nullptr, nullptr);
}
break;
- case CONTACT_OPER_ERROR:// ##
+ case CONTACT_OPER_ERROR:// ## переданные данные были некорректны
ShowFormattedErrorMessage(L"Data been sent are invalid", NO_ERROR);
break;
- case CONTACT_OPER_INTERR:// ##
+ case CONTACT_OPER_INTERR:// ## при обработке запроса произошла внутренняя ошибка
ShowFormattedErrorMessage(L"Internal server error", NO_ERROR);
break;
- case CONTACT_OPER_NO_SUCH_USER:// ##
+ case CONTACT_OPER_NO_SUCH_USER:// ## добавляемого пользователя не существует в системе
SetContactBasicInfoW(hContact, 0, SCBIF_SERVER_FLAG, 0, 0, 0, -1, 0, nullptr, nullptr, nullptr);
ShowFormattedErrorMessage(L"No such user to add", NO_ERROR);
break;
- case CONTACT_OPER_INVALID_INFO:// ##
+ case CONTACT_OPER_INVALID_INFO:// ## некорректное имя пользователя
ShowFormattedErrorMessage(L"Invalid user name", NO_ERROR);
break;
- case CONTACT_OPER_USER_EXISTS:// ## -
+ case CONTACT_OPER_USER_EXISTS:// ## пользователь уже есть в контакт-листе
ShowFormattedErrorMessage(L"User already added", NO_ERROR);
break;
- case CONTACT_OPER_GROUP_LIMIT:// ## (20)
+ case CONTACT_OPER_GROUP_LIMIT:// ## превышено максимально допустимое количество групп (20)
ShowFormattedErrorMessage(L"Group limit is 20", NO_ERROR);
break;
default:// ## unknown error
@@ -768,10 +768,10 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf) }
switch (buf.getDword()) {
- case MRIM_ANKETA_INFO_STATUS_NOUSER://
+ case MRIM_ANKETA_INFO_STATUS_NOUSER:// не найдено ни одной подходящей записи
SetContactBasicInfoW(hContact, 0, SCBIF_SERVER_FLAG, 0, 0, 0, -1, 0, nullptr, nullptr, nullptr);
- case MRIM_ANKETA_INFO_STATUS_DBERR://
- case MRIM_ANKETA_INFO_STATUS_RATELIMERR:// ,
+ case MRIM_ANKETA_INFO_STATUS_DBERR:// ошибка базы данных
+ case MRIM_ANKETA_INFO_STATUS_RATELIMERR:// слишком много запросов, поиск временно запрещен
switch (dwAckType) {
case ACKTYPE_GETINFO:
ProtoBroadcastAck(hContact, dwAckType, ACKRESULT_FAILED, (HANDLE)1, 0);
@@ -783,7 +783,7 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf) break;
case MRIM_ANKETA_INFO_STATUS_OK:
- //
+ // поиск успешно завершен
DWORD dwFieldsNum, dwMaxRows, dwServerTime;
DWORD dwID, dwContactSeverFlags, dwStatus, dwXStatus;
buf >> dwFieldsNum >> dwMaxRows >> dwServerTime;
@@ -824,13 +824,13 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf) else if (fld == "Sex") {
buf >> val;
switch (atoi(val)) {
- case 1://
+ case 1:// мужской
setByte(hContact, "Gender", 'M');
break;
- case 2://
+ case 2:// женский
setByte(hContact, "Gender", 'F');
break;
- default://
+ default:// а фиг его знает
delSetting(hContact, "Gender");
break;
}
@@ -926,7 +926,7 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf) debugLogA("%s = %s\n", fld.c_str(), val.c_str());
}
} /* for */
- //
+ // для авторизованного нам и так присылают правильный статус
GetContactBasicInfoW(hContact, &dwID, nullptr, nullptr, &dwContactSeverFlags, nullptr, nullptr, nullptr, nullptr);
if (dwID == -1 || (dwContactSeverFlags & CONTACT_INTFLAG_NOT_AUTHORIZED)) {
/* Convert mail.ru statuses to miranda. */
@@ -961,7 +961,7 @@ bool CMraProto::CmdAnketaInfo(int seq, BinBuffer &buf) buf >> val;
mralpsUsernameValue = val;
}
- else if (fld == "Domain") { //
+ else if (fld == "Domain") { // имя было уже задано ранее
buf >> val;
wcsncpy_s(szEmail, _A2T(mralpsUsernameValue + "@" + val), _TRUNCATE);
}
@@ -1090,7 +1090,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) }
// add/modify group
- if (dwControlParam > 1) { // !
+ if (dwControlParam > 1) { // все параметры правильно инициализированны!
if (!(dwGroupFlags & CONTACT_FLAG_REMOVED)) {
m_groups.insert(new MraGroupItem(dwID, dwGroupFlags, wszGroupName));
Clist_GroupCreate(0, wszGroupName);
@@ -1238,7 +1238,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) // add/modify contact
if (dwGroupID != 103)//***deb filtering phone/sms contats
if (_strnicmp(szEmail, "phone", 5))
- if (dwControlParam > 5)// !
+ if (dwControlParam > 5)// все параметры правильно инициализированны!
if ((dwContactFlag & (CONTACT_FLAG_GROUP | CONTACT_FLAG_REMOVED)) == 0) {
BOOL bAdded;
MCONTACT hContact = MraHContactFromEmail(szEmail, TRUE, FALSE, &bAdded);
@@ -1282,7 +1282,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) if (IsXStatusValid(dwXStatus) || wszBlogStatus.GetLength())
SetExtraIcons(hContact);
- if (dwTemp != ID_STATUS_OFFLINE) { // ,
+ if (dwTemp != ID_STATUS_OFFLINE) { // пишем клиента только если юзер не отключён, иначе не затираем старое
if (!szUserAgentFormatted.IsEmpty()) {
if (getByte("MirVerRaw", MRA_DEFAULT_MIRVER_RAW) == FALSE)
szUserAgentFormatted = MraGetVersionStringFromFormatted(szUserAgentFormatted);
@@ -1311,7 +1311,7 @@ bool CMraProto::CmdClist2(BinBuffer &buf) for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
if (GetContactBasicInfoW(hContact, &dwID, nullptr, nullptr, nullptr, nullptr, &email, nullptr, nullptr) == NO_ERROR)
if (dwID == -1) {
- if (IsEMailChatAgent(email)) {// : , ,
+ if (IsEMailChatAgent(email)) {// чат: ещё раз запросим авторизацию, пометим как видимый в списке, постоянный
db_unset(hContact, "CList", "Hidden");
db_unset(hContact, "CList", "NotOnList");
SetExtraIcons(hContact);
@@ -1335,8 +1335,8 @@ bool CMraProto::CmdClist2(BinBuffer &buf) }
setByte("GroupMode", 1);
}
- else { //
- // offline id
+ else { // контакт лист почемуто не получили
+ // всех в offline и id в нестандарт
for (MCONTACT hContact = db_find_first(m_szModuleName); hContact; hContact = db_find_next(hContact, m_szModuleName)) {
SetContactBasicInfoW(hContact, SCBIFSI_LOCK_CHANGES_EVENTS, (SCBIF_ID | SCBIF_GROUP_ID | SCBIF_SERVER_FLAG | SCBIF_STATUS),
-1, -2, 0, 0, ID_STATUS_OFFLINE, nullptr, nullptr, nullptr);
@@ -1344,9 +1344,9 @@ bool CMraProto::CmdClist2(BinBuffer &buf) MraUpdateContactInfo(hContact);
}
- if (dwTemp == GET_CONTACTS_ERROR) // -
+ if (dwTemp == GET_CONTACTS_ERROR) // найденный контакт-лист некорректен
ShowFormattedErrorMessage(L"MRIM_CS_CONTACT_LIST2: bad contact list", NO_ERROR);
- else if (dwTemp == GET_CONTACTS_INTERR) //
+ else if (dwTemp == GET_CONTACTS_INTERR) // произошла внутренняя ошибка
ShowFormattedErrorMessage(L"MRIM_CS_CONTACT_LIST2: internal server error", NO_ERROR);
else {
wchar_t szBuff[1024];
@@ -1364,7 +1364,7 @@ bool CMraProto::CmdProxy(BinBuffer &buf) MRA_GUID mguidSessionID;
buf >> szEmail >> dwIDRequest >> dwAckType >> szString >> szAddresses >> mguidSessionID;
- if (dwAckType == MRIM_PROXY_TYPE_FILES) { // , on file recv
+ if (dwAckType == MRIM_PROXY_TYPE_FILES) { // файлы, on file recv
// set proxy info to file transfer context
if (!MraMrimProxySetData(MraFilesQueueItemProxyByID(hFilesQueueHandle, dwIDRequest), szEmail, dwIDRequest, dwAckType, szString, szAddresses, &mguidSessionID))
MraFilesQueueStartMrimProxy(hFilesQueueHandle, dwIDRequest);
@@ -1489,13 +1489,13 @@ bool CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader) case MRIM_CS_NEW_MAIL: return CmdNewMail(buf);
case MRIM_CS_USER_BLOG_STATUS: return CmdBlogStatus(buf);
- case MRIM_CS_CONNECTION_PARAMS://
+ case MRIM_CS_CONNECTION_PARAMS:// Изменение параметров соединения
buf >> m_dwPingPeriod;
m_dwNextPingSendTickTime = 0; // force send ping
MraSendCMD(MRIM_CS_PING, nullptr, 0);
break;
- case MRIM_CS_LOGOUT:// - .
+ case MRIM_CS_LOGOUT:// Пользователь отключен из-за параллельного входа с его логином.
buf >> dwTemp;
if (dwTemp == LOGOUT_NO_RELOGIN_FLAG)
ShowFormattedErrorMessage(L"Another user connected with your login", NO_ERROR);
@@ -1551,7 +1551,7 @@ bool CMraProto::MraCommandDispatcher(mrim_packet_header_t *pmaHeader) return true;
}
-//
+// Сообщение
DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA &plpsFrom, CMStringA &plpsText, CMStringA &plpsRFTText, CMStringA &plpsMultiChatData)
{
DWORD dwBackColour;
@@ -1569,7 +1569,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & dwFlags &= ~MESSAGE_FLAG_MULTICHAT;
// pre processing - extracting/decoding
- if (dwFlags & MESSAGE_FLAG_AUTHORIZE) { // extract auth message
+ if (dwFlags & MESSAGE_FLAG_AUTHORIZE) { // extract auth message из обычного текста
unsigned dwAuthDataSize;
LPBYTE lpbAuthData = (LPBYTE)mir_base64_decode(plpsText, &dwAuthDataSize);
if (lpbAuthData) {
@@ -1583,7 +1583,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & buf >> lpsAuthMessageW;
wszMessage = lpsAuthMessageW;
}
- else { //
+ else { // преобразуем в юникод текст только если он в АНСИ и если это не Флэш мультик и будильник тоже не нуждается в этом
CMStringA lpsAuthMessage;
buf >> lpsAuthMessage;
wszMessage = ptrW(mir_a2u_cp(lpsAuthMessage, MRA_CODE_PAGE));
@@ -1616,7 +1616,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & CMStringA lpsRTFString, lpsBackColour, szString;
DWORD dwRTFPartsCount;
- // 2, ,
+ // количество частей в некоторых случаях больше 2, тогда нужно игнорировать первый текст, тк там сообщения об ущербности
buf >> dwRTFPartsCount >> lpsRTFString >> dwBackColour;
if (dwFlags & MESSAGE_FLAG_FLASH) {
if (dwRTFPartsCount == 4) {
@@ -1772,7 +1772,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & pre.lParam = mir_strlen(lpbBuffer);
LPSTR lpbBufferCurPos = lpbBuffer;
- while (TRUE) { // ; 0
+ while (TRUE) { // цикл замены ; на 0
lpbBufferCurPos = (LPSTR)MemoryFindByte((lpbBufferCurPos - (LPSTR)lpbBuffer), lpbBuffer, pre.lParam, ';');
if (!lpbBufferCurPos)
break;
@@ -1793,7 +1793,7 @@ DWORD CMraProto::MraRecvCommand_Message(DWORD dwTime, DWORD dwFlags, CMStringA & }
}
else { // standart message// flash animation
- // ANSI, RTF
+ // пишем в ANSI, всё равно RTF
if ((dwFlags & MESSAGE_FLAG_RTF) && (dwFlags & MESSAGE_FLAG_FLASH) == 0 && !lpszMessageExt.IsEmpty() && getByte("RTFReceiveEnable", MRA_DEFAULT_RTF_RECEIVE_ENABLE)) {
pre.flags = 0;
pre.szMessage = (LPSTR)lpszMessageExt.GetString();
diff --git a/protocols/MRA/src/Mra_svcs.cpp b/protocols/MRA/src/Mra_svcs.cpp index 0090d056ca..430bc38a1b 100644 --- a/protocols/MRA/src/Mra_svcs.cpp +++ b/protocols/MRA/src/Mra_svcs.cpp @@ -194,7 +194,7 @@ int CMraProto::MraDbSettingChanged(WPARAM hContact, LPARAM lParam) DBCONTACTWRITESETTING *cws = (DBCONTACTWRITESETTING*)lParam;
- // , ( )
+ // это наш контакт, он не временный (есть в списке на сервере) и его обновление разрешено
if (IsContactMra(hContact) && !db_get_b(hContact, "CList", "NotOnList", 0) && getDword(hContact, "HooksLocked", FALSE) == FALSE) {
if (!strcmp(cws->szModule, "CList")) {
// MyHandle setting
@@ -425,7 +425,7 @@ INT_PTR CMraProto::MraSetXStatusEx(WPARAM, LPARAM lParam) }
}
}
- // ""
+ // неудача только если мы не ставили Хстатус и попытались записать сообщения для "нет" статуса
else if (!(pData->flags & CSSF_MASK_STATUS))
iRet = 1;
}
@@ -500,7 +500,7 @@ INT_PTR CMraProto::MraGetXStatusEx(WPARAM hContact, LPARAM lParam) if ((pData->flags & CSSF_STATUSES_COUNT) && pData->wParam)
*pData->wParam = MRA_XSTATUS_COUNT - 1;
- //**deb ,
+ //**deb можно оптимизировать, данный параметр возможно уже был вычислен при получении самих текстов
if (pData->flags & CSSF_STR_SIZES) {
if (pData->wParam) mraGetStaticStringW(hContact, DBSETTING_XSTATUSNAME, nullptr, 0, (size_t*)pData->wParam);
if (pData->lParam) mraGetStaticStringW(hContact, DBSETTING_XSTATUSMSG, nullptr, 0, (size_t*)pData->lParam);
diff --git a/protocols/MRA/src/Sdk/BuffToLowerCase.h b/protocols/MRA/src/Sdk/BuffToLowerCase.h index c32352e82c..5c1c231222 100644 --- a/protocols/MRA/src/Sdk/BuffToLowerCase.h +++ b/protocols/MRA/src/Sdk/BuffToLowerCase.h @@ -56,9 +56,9 @@ __inline BOOL BuffToLowerCase(LPCVOID lpcOutBuff,LPCVOID lpcBuff,size_t dwLen) test ecx,ecx
jz short end_func
- push ebx //
- push edi //
- push esi //
+ push ebx // сохраняем регистр
+ push edi // сохраняем регистр
+ push esi // сохраняем регистр
mov esi,lpcBuff
mov edi,lpcOutBuff
mov bl,'A'
@@ -80,9 +80,9 @@ __inline BOOL BuffToLowerCase(LPCVOID lpcOutBuff,LPCVOID lpcBuff,size_t dwLen) dec ecx
jnz short lowcaseloop
- pop esi //
- pop edi //
- pop ebx //
+ pop esi // восстанавливаем содержимое регистра
+ pop edi // восстанавливаем содержимое регистра
+ pop ebx // восстанавливаем содержимое регистра
end_func:
}
#endif
diff --git a/protocols/MRA/src/Sdk/InternetTime.h b/protocols/MRA/src/Sdk/InternetTime.h index 7ec927e738..865d02a3e5 100644 --- a/protocols/MRA/src/Sdk/InternetTime.h +++ b/protocols/MRA/src/Sdk/InternetTime.h @@ -124,7 +124,7 @@ __inline void InternetTimeGetCurrentTime(INTERNET_TIME *pitTime) GetSystemTime(&pitTime->stTime);
}
-// MAILTIME
+// Переводит время из MAILTIME в строковое
__inline CMStringA InternetTimeGetString(INTERNET_TIME *pitTime)
{
char lpszBuff[100];
@@ -145,7 +145,7 @@ __inline CMStringA InternetTimeGetString(INTERNET_TIME *pitTime) // time zone
if (pitTime->lTimeZone) {
- if (pitTime->lTimeZone < 0) { // ,
+ if (pitTime->lTimeZone < 0) { // нужно добавить плюсик, минус добавляется автоматом
(*((BYTE*)lpszCurPos)) = '+';
lpszCurPos ++;
dwTimeLen ++;
@@ -163,7 +163,7 @@ __inline CMStringA InternetTimeGetString(INTERNET_TIME *pitTime) return lpszBuff;
}
-// INTERNET_TIME
+// Переводит время из строкового в INTERNET_TIME
__inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pitTime)
{
if (lpszTime.IsEmpty())
@@ -177,7 +177,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit memset(&pitTime, 0, sizeof(INTERNET_TIME));
WSP2SP(lpszTime, lpszTime.GetLength(), lpszCurPos, &dwCurSize);
- if (dwCurSize > 3) { //
+ if (dwCurSize > 3) { // день недели
if (lpszCurPos[3] == ',') {
for (unsigned short i=0; i < 7; i++) {
if ( !_memicmp(lpcszenmDayOfWeakEnum[i], lpszCurPos, 3)) {
@@ -190,7 +190,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit dwCurSize-=4;
}
- if (dwCurSize>2) { //
+ if (dwCurSize>2) { // день месяца
SkeepSPWSP(lpszCurPos,dwCurSize,&lpszCurPos,&dwCurSize);
if ((lpszTemp = (LPSTR)MemoryFindByte(0, lpszCurPos, dwCurSize,' '))) {
dwTemp=(lpszTemp-lpszCurPos);
@@ -199,7 +199,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit lpszCurPos=(lpszTemp+1);
dwCurSize-=(dwTemp+1);
- if (dwCurSize > 3) { //
+ if (dwCurSize > 3) { // месяц
SkeepSPWSP(lpszCurPos,dwCurSize,&lpszCurPos,&dwCurSize);
for (unsigned short i=1; i < 13; i++)
@@ -211,7 +211,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit lpszCurPos += 3;
dwCurSize -= 3;
- if (dwCurSize > 3) { //
+ if (dwCurSize > 3) { // год
SkeepSPWSP(lpszCurPos,dwCurSize,&lpszCurPos,&dwCurSize);
if ((lpszTemp = (LPSTR)MemoryFindByte(0,lpszCurPos,dwCurSize,' '))) {
dwTemp=(lpszTemp-lpszCurPos);
@@ -220,7 +220,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit lpszCurPos=(lpszTemp+1);
dwCurSize-=(dwTemp+1);
- if (dwCurSize > 2) { //
+ if (dwCurSize > 2) { // часы
SkeepSPWSP(lpszCurPos,dwCurSize,&lpszCurPos,&dwCurSize);
if ((lpszTemp = (LPSTR)MemoryFindByte(0,lpszCurPos,dwCurSize,':'))) {
dwTemp=(lpszTemp-lpszCurPos);
@@ -229,7 +229,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit lpszCurPos=(lpszTemp+1);
dwCurSize-=(dwTemp+1);
- if (dwCurSize > 2) { //
+ if (dwCurSize > 2) { // минуты
SkeepSPWSP(lpszCurPos,dwCurSize,&lpszCurPos,&dwCurSize);
if ((lpszTemp=(LPSTR)MemoryFindByte(0,lpszCurPos,dwCurSize,':')))
{
@@ -239,7 +239,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit lpszCurPos = (lpszTemp+1);
dwCurSize -= (dwTemp+1);
- if (dwCurSize > 2) { // ,
+ if (dwCurSize > 2) { // секунды, они есть
if ((lpszTemp = (LPSTR)MemoryFindByte(0,lpszCurPos,dwCurSize,' '))) {
dwTemp=(lpszTemp-lpszCurPos);
pitTime.stTime.wSecond=(unsigned short)StrToUNum32(lpszCurPos,dwTemp);
@@ -248,7 +248,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit dwCurSize-=(dwTemp+1);
}
}
- else {//
+ else {// зоны нет
if (dwCurSize) {
pitTime.stTime.wSecond=(unsigned short)StrToUNum32(lpszCurPos,dwCurSize);
lpszCurPos+=dwCurSize;
@@ -266,7 +266,7 @@ __inline DWORD InternetTimeGetTime(const CMStringA &lpszTime, INTERNET_TIME &pit }
}
- if (dwCurSize) { //
+ if (dwCurSize) { // часовой пояс
SkeepSPWSP(lpszCurPos, dwCurSize, &lpszCurPos, &dwCurSize);
pitTime.lTimeZone = (LONG)StrToNum(lpszCurPos, dwCurSize);
if (pitTime.lTimeZone > 1300 || pitTime.lTimeZone < -1200)
diff --git a/protocols/MRA/src/Sdk/ListMT.h b/protocols/MRA/src/Sdk/ListMT.h index d87173b227..4c3f6dd5b2 100644 --- a/protocols/MRA/src/Sdk/ListMT.h +++ b/protocols/MRA/src/Sdk/ListMT.h @@ -38,34 +38,34 @@ #pragma warning(disable:4312) // warning C4312: 'type cast' : conversion from 'LONG' to 'PVOID' of greater size
-// ,
+// структура для работы со списком, элемент списка
typedef struct _LIST_MT_ITEM
{
#ifdef __cplusplus
- _LIST_MT_ITEM *plmtiPrev; // *
- _LIST_MT_ITEM *plmtiNext; // *
+ _LIST_MT_ITEM *plmtiPrev; // *предыдущий элемент в списке
+ _LIST_MT_ITEM *plmtiNext; // *следующий элемент в списке
#else
- LPVOID *plmtiPrev; // *
- LPVOID *plmtiNext; // *
+ LPVOID *plmtiPrev; // *предыдущий элемент в списке
+ LPVOID *plmtiNext; // *следующий элемент в списке
#endif
- LPVOID lpListMT; // ,
- LPVOID lpData; // ,
+ LPVOID lpListMT; // указатель на заголовок списка, см структуру ниже
+ LPVOID lpData; // указатель на данные, связанные с элементом списка
}LIST_MT_ITEM, *PLIST_MT_ITEM, *LPLIST_MT_ITEM;
typedef CONST PLIST_MT_ITEM PCLIST_MT_ITEM, LPCLIST_MT_ITEM;
-// ,
+// структура для работы со списком, заголовок списка
typedef struct _LIST_MT : public MZeroedObject
{
- size_t nCount; // *
- PLIST_MT_ITEM plmtiFirst; // *
- PLIST_MT_ITEM plmtiLast; // *
+ size_t nCount; // *количество элементов в списке
+ PLIST_MT_ITEM plmtiFirst; // *указывает на первый элемент в списке
+ PLIST_MT_ITEM plmtiLast; // *указывает на последний элемент в списке
mir_cs cs; // *section for exclysive access to List
}LIST_MT, *PLIST_MT, *LPLIST_MT;
typedef CONST PLIST_MT PCLIST_MT, LPCLIST_MT;
-//
+// структура для работы с итератором
typedef struct _LIST_MT_ITERATOR
{
PLIST_MT_ITEM plmtListMTItem;
@@ -108,23 +108,23 @@ __inline DWORD ListMTItemDelete(PCLIST_MT pclmtListMT,PCLIST_MT_ITEM pclmtListMT DWORD dwRetErrorCode;
if (pclmtListMTItem->lpListMT==pclmtListMT && pclmtListMT)
- {// , .
+ {// Данный элемент принадлежит к этому списку, можно удалить.
PLIST_MT_ITEM plmtiPrevNode=pclmtListMTItem->plmtiPrev,plmtiNextNode=pclmtListMTItem->plmtiNext;
if (plmtiPrevNode || plmtiNextNode)
{
if (plmtiPrevNode && plmtiNextNode==NULL)
{// This is the start node in the list to delete
- //
+ // отключился последний подключившийся
plmtiPrevNode->plmtiNext=NULL;
pclmtListMT->plmtiLast=plmtiPrevNode;
}else{
if (plmtiPrevNode==NULL && plmtiNextNode)
{// This is the end node in the list to delete
- //
+ // отключился первый подключившийся
plmtiNextNode->plmtiPrev=NULL;
pclmtListMT->plmtiFirst=plmtiNextNode;
- }else{//
+ }else{// оключился клиент не первый и не последний
//if (plmtiPrev && plmtiNext)
{// Neither start node nor end node in the list
plmtiPrevNode->plmtiNext=plmtiNextNode;
@@ -140,14 +140,14 @@ __inline DWORD ListMTItemDelete(PCLIST_MT pclmtListMT,PCLIST_MT_ITEM pclmtListMT pclmtListMTItem->lpListMT=NULL;
InterlockedDecrementPointer(&pclmtListMT->nCount);// pclmtListMT->nCount--;
dwRetErrorCode=NO_ERROR;
- }else{//
+ }else{// попытались удалить элемент не относящийся к данному списку
dwRetErrorCode=ERROR_INVALID_HANDLE;
}
return(dwRetErrorCode);
}
__inline DWORD ListMTItemGetFirst(PCLIST_MT pclmtListMT,PLIST_MT_ITEM *pplmtListMTItem,LPVOID *plpData)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
DWORD dwRetErrorCode;
if (pclmtListMT->plmtiFirst)
@@ -162,13 +162,13 @@ return(dwRetErrorCode); }
__inline BOOL ListMTIteratorMoveFirst(PCLIST_MT pclmtListMT,PCLIST_MT_ITERATOR pclmtiIterator)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
return((pclmtiIterator->plmtListMTItem=pclmtListMT->plmtiFirst)? TRUE:FALSE);
}
__inline BOOL ListMTIteratorMoveNext(PCLIST_MT_ITERATOR pclmtiIterator)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
BOOL bRet=FALSE;
if (pclmtiIterator->plmtListMTItem)
@@ -180,7 +180,7 @@ return(bRet); __inline DWORD ListMTIteratorGet(PCLIST_MT_ITERATOR pclmtiIterator,PLIST_MT_ITEM *pplmtListMTItem,LPVOID *plpData)
-{// , ListMTLock ListMTUnLock
+{// если нужно гарантировать эксклюзивный доступ, то есть ListMTLock и ListMTUnLock
DWORD dwRetErrorCode;
if (pclmtiIterator->plmtListMTItem)
diff --git a/protocols/MRA/src/Sdk/SHA1.h b/protocols/MRA/src/Sdk/SHA1.h index 74e83edd8b..ca78245454 100644 --- a/protocols/MRA/src/Sdk/SHA1.h +++ b/protocols/MRA/src/Sdk/SHA1.h @@ -51,23 +51,23 @@ __inline void CopyMemoryReverseDWORD(LPCVOID lpcDestination,LPCVOID lpcSource,si #else
__asm{
- push edi //
- push esi //
+ push edi // сохраняем регистр
+ push esi // сохраняем регистр
- mov ecx,dwSize // ecx =
- mov edi,lpcDestination // edi =
- mov esi,lpcSource // esi =
+ mov ecx,dwSize // ecx = длинна входного буффера
+ mov edi,lpcDestination // edi = адрес выходного буффера
+ mov esi,lpcSource // esi = указатель на входной буффер
cld
read_loop:
- lodsd // 4
+ lodsd // читаем 4 байта
bswap eax
stosd
sub ecx,4
- jg short read_loop // 3 ,
+ jg short read_loop // если длинна 3 и более байт, то продолжаем дальше
- pop esi //
- pop edi //
+ pop esi // восстанавливаем содержимое регистра
+ pop edi // восстанавливаем содержимое регистра
}
#endif
}
diff --git a/protocols/MRA/src/Sdk/StrHexToNum.h b/protocols/MRA/src/Sdk/StrHexToNum.h index 78c78cf562..3f36d0d4c3 100644 --- a/protocols/MRA/src/Sdk/StrHexToNum.h +++ b/protocols/MRA/src/Sdk/StrHexToNum.h @@ -58,11 +58,11 @@ __inline DWORD StrHexToUNum32(LPCSTR lpcszString,size_t dwStringLen) if (bCurentFigure!=255)
{
- dwNum*=16;//
- dwNum+=bCurentFigure;//
+ dwNum*=16;// сдвигаем предыдущее число на один разряд чтоб добавить в младший разряд новую цифру
+ dwNum+=bCurentFigure;// добавляем цифру в младший разряд
}
- lpcszString++;//
- dwStringLen--;//
+ lpcszString++;// перемещаем указатель на следующую позицию
+ dwStringLen--;// уменьшаем длинну
}
return(dwNum);
diff --git a/protocols/MRA/src/Sdk/StrToNum.h b/protocols/MRA/src/Sdk/StrToNum.h index 3d7d3bb86f..ef3a95050e 100644 --- a/protocols/MRA/src/Sdk/StrToNum.h +++ b/protocols/MRA/src/Sdk/StrToNum.h @@ -42,11 +42,11 @@ __inline DWORD StrToUNum32(LPCSTR lpcszString,size_t dwStringLen) {
if ((bCurentFigure=((*lpcszString)-48))<10)
{
- dwNum*=10;//
- dwNum+=bCurentFigure;//
+ dwNum*=10;// сдвигаем предыдущее число на один разряд чтоб добавить в младший разряд новую цифру
+ dwNum+=bCurentFigure;// добавляем цифру в младший разряд
}
- lpcszString++;//
- dwStringLen--;//
+ lpcszString++;// перемещаем указатель на следующую позицию
+ dwStringLen--;// уменьшаем длинну
}
return(dwNum);
@@ -62,19 +62,19 @@ __inline SSIZE_T StrToNum(LPCSTR lpcszString,size_t dwStringLen) if (bCurentFigure=='-') lSingn=-1;
if (bCurentFigure=='+') lSingn=1;
- lpcszString++;//
- dwStringLen--;//
+ lpcszString++;// перемещаем указатель на следующую позицию
+ dwStringLen--;// уменьшаем длинну
}
while(dwStringLen)
{
if ((bCurentFigure=((*lpcszString)-48))<10)
{
- lNum*=10;//
- lNum+=bCurentFigure;//
+ lNum*=10;// сдвигаем предыдущее число на один разряд чтоб добавить в младший разряд новую цифру
+ lNum+=bCurentFigure;// добавляем цифру в младший разряд
}
- lpcszString++;//
- dwStringLen--;//
+ lpcszString++;// перемещаем указатель на следующую позицию
+ dwStringLen--;// уменьшаем длинну
}
lNum*=lSingn;
diff --git a/protocols/MRA/src/proto.h b/protocols/MRA/src/proto.h index a9fd37cdcd..b46d21a47f 100644 --- a/protocols/MRA/src/proto.h +++ b/protocols/MRA/src/proto.h @@ -12,22 +12,22 @@ typedef struct mrim_packet_header_t
{
u_long magic; // Magic
- u_long proto; //
+ u_long proto; // Версия протокола
u_long seq; // Sequence
- u_long msg; //
- u_long dlen; //
- u_char reserved[24]; //
+ u_long msg; // Тип пакета
+ u_long dlen; // Длина данных
+ u_char reserved[24]; // Зарезервировано
}
mrim_packet_header_t;
-#define CS_MAGIC 0xDEADBEEF // Magic ( C <-> S )
+#define CS_MAGIC 0xDEADBEEF // Клиентский Magic ( C <-> S )
// UNICODE = (UTF-16LE) ( >= 1.17)
/***************************************************************************
- -
+ ПРОТОКОЛ СВЯЗИ КЛИЕНТ-СЕРВЕР
***************************************************************************/
@@ -71,7 +71,7 @@ mrim_packet_header_t; #define MULTICHAT_DETACHED 5 // user leave chat (s->c)
#define MULTICHAT_DESTROYED 6 //
#define MULTICHAT_INVITE 7 //
- #define MESSAGE_FLAG_v1p16 0x00100000 //
+ #define MESSAGE_FLAG_v1p16 0x00100000 // для перекодировки юникода
#define MESSAGE_FLAG_CP1251 0x00200000
// LPS to e-mail ANSI
// LPS message ANSI/UNICODE (see flags)
@@ -418,8 +418,8 @@ mrim_packet_header_t; // LPS user_agent ANSI ( >= 1.14) (see MRIM_CS_USER_STATUS)
// + statistic packet data:
// LPS lang ( >= 1.16)
-// LPS ua session ( >= 1.20) -
-// LPS replaced ua session ( >= 1.20) -
+// LPS ua session ( >= 1.20) - шли пустой
+// LPS replaced ua session ( >= 1.20) - шли пустой
// LPS client description ANSI
#define MAX_CLIENT_DESCRIPTION 256
// unknown data
diff --git a/protocols/MRA/src/version.h b/protocols/MRA/src/version.h index 704e457f1a..6efeb18fb4 100644 --- a/protocols/MRA/src/version.h +++ b/protocols/MRA/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Rozhuk Ivan"
#define __AUTHOREMAIL "Rozhuk_I@mail.ru"
#define __AUTHORWEB "https://miranda-ng.org/p/MRA/"
-#define __COPYRIGHT " 2005-17 Rozhuk Ivan"
+#define __COPYRIGHT "© 2005-17 Rozhuk Ivan"
diff --git a/protocols/MSN/src/msn_avatar.cpp b/protocols/MSN/src/msn_avatar.cpp index 130f52d1c1..c0c7779fc4 100644 --- a/protocols/MSN/src/msn_avatar.cpp +++ b/protocols/MSN/src/msn_avatar.cpp @@ -1,7 +1,7 @@ /*
Plugin for Miranda NG for communicating with users of the MSN Messenger protocol.
-Copyright () 2012-17 Miranda NG Team
+Copyright (с) 2012-17 Miranda NG Team
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/protocols/MSN/src/version.h b/protocols/MSN/src/version.h index d07b8fcba2..0836b0d939 100644 --- a/protocols/MSN/src/version.h +++ b/protocols/MSN/src/version.h @@ -29,5 +29,5 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define __DESCRIPTION "Microsoft Network (MSN) protocol support for Miranda NG."
#define __AUTHOR "Boris Krasnovskiy, George Hazan, Richard Hughes, leecher"
#define __AUTHOREMAIL "borkra@miranda-im.org"
-#define __COPYRIGHT " 2001-17 Richard Hughes, George Hazan, Boris Krasnovskiy, leecher"
+#define __COPYRIGHT "© 2001-17 Richard Hughes, George Hazan, Boris Krasnovskiy, leecher"
#define __AUTHORWEB "https://miranda-ng.org/p/MSN/"
diff --git a/protocols/MinecraftDynmap/src/chat.cpp b/protocols/MinecraftDynmap/src/chat.cpp index 044261e740..c15a49bfed 100644 --- a/protocols/MinecraftDynmap/src/chat.cpp +++ b/protocols/MinecraftDynmap/src/chat.cpp @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/communication.cpp b/protocols/MinecraftDynmap/src/communication.cpp index 620b3f17a1..ae89e6d377 100644 --- a/protocols/MinecraftDynmap/src/communication.cpp +++ b/protocols/MinecraftDynmap/src/communication.cpp @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/constants.h b/protocols/MinecraftDynmap/src/constants.h index 5bd2e5d25b..68a421c0b2 100644 --- a/protocols/MinecraftDynmap/src/constants.h +++ b/protocols/MinecraftDynmap/src/constants.h @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/dialogs.cpp b/protocols/MinecraftDynmap/src/dialogs.cpp index 69bad0db70..a26d824109 100644 --- a/protocols/MinecraftDynmap/src/dialogs.cpp +++ b/protocols/MinecraftDynmap/src/dialogs.cpp @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/dialogs.h b/protocols/MinecraftDynmap/src/dialogs.h index d6f86e9eb0..40c45095f2 100644 --- a/protocols/MinecraftDynmap/src/dialogs.h +++ b/protocols/MinecraftDynmap/src/dialogs.h @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/main.cpp b/protocols/MinecraftDynmap/src/main.cpp index 910a7562ff..42b4a82c96 100644 --- a/protocols/MinecraftDynmap/src/main.cpp +++ b/protocols/MinecraftDynmap/src/main.cpp @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/proto.cpp b/protocols/MinecraftDynmap/src/proto.cpp index 3aaa6ab022..008ed66936 100644 --- a/protocols/MinecraftDynmap/src/proto.cpp +++ b/protocols/MinecraftDynmap/src/proto.cpp @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/proto.h b/protocols/MinecraftDynmap/src/proto.h index ff643f4be8..c302a10c6d 100644 --- a/protocols/MinecraftDynmap/src/proto.h +++ b/protocols/MinecraftDynmap/src/proto.h @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/stdafx.h b/protocols/MinecraftDynmap/src/stdafx.h index 07c6d363f7..9c238ad0da 100644 --- a/protocols/MinecraftDynmap/src/stdafx.h +++ b/protocols/MinecraftDynmap/src/stdafx.h @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/utils.h b/protocols/MinecraftDynmap/src/utils.h index 247ac1f13b..cbc6586d48 100644 --- a/protocols/MinecraftDynmap/src/utils.h +++ b/protocols/MinecraftDynmap/src/utils.h @@ -3,7 +3,7 @@ Minecraft Dynmap plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2015-17 Robert Psel +Copyright © 2015-17 Robert Pцsel 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 diff --git a/protocols/MinecraftDynmap/src/version.h b/protocols/MinecraftDynmap/src/version.h index a0e1d306b8..dab63323fa 100644 --- a/protocols/MinecraftDynmap/src/version.h +++ b/protocols/MinecraftDynmap/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Robert P\xf6" "sel" #define __AUTHOREMAIL "robyer@seznam.cz" #define __AUTHORWEB "https://miranda-ng.org/p/MinecraftDynmap/" -#define __COPYRIGHT " 2015-17 Robert P\xf6" "sel" +#define __COPYRIGHT "© 2015-17 Robert P\xf6" "sel" diff --git a/protocols/Omegle/src/chat.cpp b/protocols/Omegle/src/chat.cpp index 6281d90e11..17b3240f7f 100644 --- a/protocols/Omegle/src/chat.cpp +++ b/protocols/Omegle/src/chat.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/client.h b/protocols/Omegle/src/client.h index f9d8f23634..0be681ac5b 100644 --- a/protocols/Omegle/src/client.h +++ b/protocols/Omegle/src/client.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/communication.cpp b/protocols/Omegle/src/communication.cpp index 42664f2a97..b85d4eb0c0 100644 --- a/protocols/Omegle/src/communication.cpp +++ b/protocols/Omegle/src/communication.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2011-17 Robert Psel +Copyright © 2011-17 Robert Pцsel 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 diff --git a/protocols/Omegle/src/connection.cpp b/protocols/Omegle/src/connection.cpp index db7d5f4403..53d0632460 100644 --- a/protocols/Omegle/src/connection.cpp +++ b/protocols/Omegle/src/connection.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/constants.h b/protocols/Omegle/src/constants.h index 8dac71d3a9..5c5838afaa 100644 --- a/protocols/Omegle/src/constants.h +++ b/protocols/Omegle/src/constants.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
@@ -109,7 +109,7 @@ static const struct { { "fa", "Persian" },
{ "pl", "Polish" },
{ "pt", "Portugese" },
- { "ro", "Romaian" },
+ { "ro", "Romaсian" },
{ "ru", "Russian" },
{ "el", "Greek" },
{ "sk", "Slovak" },
diff --git a/protocols/Omegle/src/db.h b/protocols/Omegle/src/db.h index cb2c9e7066..5897ebc3ee 100644 --- a/protocols/Omegle/src/db.h +++ b/protocols/Omegle/src/db.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/dialogs.cpp b/protocols/Omegle/src/dialogs.cpp index 94d0a4e722..f2bfaef80e 100644 --- a/protocols/Omegle/src/dialogs.cpp +++ b/protocols/Omegle/src/dialogs.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/dialogs.h b/protocols/Omegle/src/dialogs.h index 2ab3568234..48072572f2 100644 --- a/protocols/Omegle/src/dialogs.h +++ b/protocols/Omegle/src/dialogs.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/http.cpp b/protocols/Omegle/src/http.cpp index e72142716f..313e3f3140 100644 --- a/protocols/Omegle/src/http.cpp +++ b/protocols/Omegle/src/http.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/http.h b/protocols/Omegle/src/http.h index a94cc7b3c2..37969b7045 100644 --- a/protocols/Omegle/src/http.h +++ b/protocols/Omegle/src/http.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/main.cpp b/protocols/Omegle/src/main.cpp index f87d6e7e1c..c4368a4b40 100644 --- a/protocols/Omegle/src/main.cpp +++ b/protocols/Omegle/src/main.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/messages.cpp b/protocols/Omegle/src/messages.cpp index d1021c3597..713422ef61 100644 --- a/protocols/Omegle/src/messages.cpp +++ b/protocols/Omegle/src/messages.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger _____________________________________________ -Copyright 2011-17 Robert Psel +Copyright © 2011-17 Robert Pцsel 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 diff --git a/protocols/Omegle/src/proto.cpp b/protocols/Omegle/src/proto.cpp index 826d8c2eda..139aa6b3c3 100644 --- a/protocols/Omegle/src/proto.cpp +++ b/protocols/Omegle/src/proto.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/proto.h b/protocols/Omegle/src/proto.h index b304a9ad54..69bfd4d476 100644 --- a/protocols/Omegle/src/proto.h +++ b/protocols/Omegle/src/proto.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/stdafx.h b/protocols/Omegle/src/stdafx.h index 3485235b2d..9ef6d60264 100644 --- a/protocols/Omegle/src/stdafx.h +++ b/protocols/Omegle/src/stdafx.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/theme.cpp b/protocols/Omegle/src/theme.cpp index 7fd634c9a7..e2ac9d0b8e 100644 --- a/protocols/Omegle/src/theme.cpp +++ b/protocols/Omegle/src/theme.cpp @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/theme.h b/protocols/Omegle/src/theme.h index bcdf876ade..ff3b0414d2 100644 --- a/protocols/Omegle/src/theme.h +++ b/protocols/Omegle/src/theme.h @@ -3,7 +3,7 @@ Omegle plugin for Miranda Instant Messenger
_____________________________________________
-Copyright 2011-17 Robert Psel
+Copyright © 2011-17 Robert Pцsel
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
diff --git a/protocols/Omegle/src/version.h b/protocols/Omegle/src/version.h index d4478d9bd1..2becf25472 100644 --- a/protocols/Omegle/src/version.h +++ b/protocols/Omegle/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Robert P\xf6" "sel"
#define __AUTHOREMAIL "robyer@seznam.cz"
#define __AUTHORWEB "https://miranda-ng.org/p/Omegle/"
-#define __COPYRIGHT " 2011-17 Robert P\xf6" "sel"
+#define __COPYRIGHT "© 2011-17 Robert P\xf6" "sel"
diff --git a/protocols/Sametime/src/version.h b/protocols/Sametime/src/version.h index b75cb69c03..fc60a0cfff 100644 --- a/protocols/Sametime/src/version.h +++ b/protocols/Sametime/src/version.h @@ -10,5 +10,5 @@ #define __DESCRIPTION "Implementation of instant messaging for the Lotus Sametime protocol."
#define __AUTHOR "Scott Ellis, Szymon Tokarz"
#define __AUTHOREMAIL "mail"/*antispam*/"@"/*antispam*/"scottellis.com.au, wsx22"/*antispam*/"@"/*antispam*/"o2.pl"
-#define __COPYRIGHT " 2005 Scott Ellis, 2014-2017 wsx22"
+#define __COPYRIGHT "© 2005 Scott Ellis, 2014-2017 wsx22"
#define __AUTHORWEB "https://miranda-ng.org/p/Sametime/"
diff --git a/protocols/SkypeWeb/res/resource.rc b/protocols/SkypeWeb/res/resource.rc index 6ef5e18c9b..bfd65f1872 100644 --- a/protocols/SkypeWeb/res/resource.rc +++ b/protocols/SkypeWeb/res/resource.rc @@ -13,7 +13,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// ( ) resources
+// Нейтральный (по умолчанию) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_NEUD)
LANGUAGE LANG_NEUTRAL, SUBLANG_DEFAULT
@@ -35,12 +35,12 @@ IDI_CALL ICON "Icons\\call.ico" IDI_NOTIFY ICON "Icons\\notify.ico"
IDI_ACTION_ME ICON "Icons\\me.ico"
IDI_ERRORICON ICON "Icons\\error.ico"
-#endif // ( ) resources
+#endif // Нейтральный (по умолчанию) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Русский (Россия) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
@@ -71,12 +71,12 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Русский (Россия) resources
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
-// resources
+// Английский resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
@@ -216,7 +216,7 @@ BEGIN END
#endif // APSTUDIO_INVOKED
-#endif // resources
+#endif // Английский resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/SkypeWeb/src/requests/poll.h b/protocols/SkypeWeb/src/requests/poll.h index a7469522dc..560f34593b 100644 --- a/protocols/SkypeWeb/src/requests/poll.h +++ b/protocols/SkypeWeb/src/requests/poll.h @@ -1,4 +1,4 @@ -/*
+/*
Copyright (c) 2015-17 Miranda NG project (https://miranda-ng.org)
This program is free software; you can redistribute it and/or
diff --git a/protocols/SkypeWeb/src/resource.h b/protocols/SkypeWeb/src/resource.h index 32ae5dfccd..05684fe3a0 100644 --- a/protocols/SkypeWeb/src/resource.h +++ b/protocols/SkypeWeb/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// d:\Others\SVN\MirandaNG\trunk\protocols\SkypeWeb\res\resource.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ d:\Others\SVN\MirandaNG\trunk\protocols\SkypeWeb\res\resource.rc
//
#define IDI_SKYPE 100
#define IDC_SKYPENAME 101
diff --git a/protocols/SkypeWeb/src/skype_utils.cpp b/protocols/SkypeWeb/src/skype_utils.cpp index 221e657342..6c9e1fe6cc 100644 --- a/protocols/SkypeWeb/src/skype_utils.cpp +++ b/protocols/SkypeWeb/src/skype_utils.cpp @@ -1,4 +1,4 @@ -/* +/* Copyright (c) 2015-17 Miranda NG project (https://miranda-ng.org) This program is free software; you can redistribute it and/or diff --git a/protocols/SkypeWeb/src/version.h b/protocols/SkypeWeb/src/version.h index 9a4796f6cc..aad66dc7d6 100644 --- a/protocols/SkypeWeb/src/version.h +++ b/protocols/SkypeWeb/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/SkypeWeb/"
-#define __COPYRIGHT " 2015-17 Miranda NG Team"
+#define __COPYRIGHT "© 2015-17 Miranda NG Team"
diff --git a/protocols/Slack/src/http_request.h b/protocols/Slack/src/http_request.h index 9c0d52816f..dcd2e59476 100644 --- a/protocols/Slack/src/http_request.h +++ b/protocols/Slack/src/http_request.h @@ -1,4 +1,4 @@ -#ifndef _HTTP_REQUEST_H_ +#ifndef _HTTP_REQUEST_H_ #define _HTTP_REQUEST_H_ typedef void (CSlackProto::*HttpCallback)(NETLIBHTTPREQUEST*, struct AsyncHttpRequest*); diff --git a/protocols/Slack/src/version.h b/protocols/Slack/src/version.h index 722e8b69ed..26dc8224db 100644 --- a/protocols/Slack/src/version.h +++ b/protocols/Slack/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team" #define __AUTHOREMAIL "" #define __AUTHORWEB "https://miranda-ng.org/p/Slack/" -#define __COPYRIGHT " 2017 Miranda NG Team" +#define __COPYRIGHT "© 2017 Miranda NG Team" diff --git a/protocols/Steam/src/api/authorization.h b/protocols/Steam/src/api/authorization.h index 87bff30afd..cba8d4d274 100644 --- a/protocols/Steam/src/api/authorization.h +++ b/protocols/Steam/src/api/authorization.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_AUTHORIZATION_H_
+#ifndef _STEAM_REQUEST_AUTHORIZATION_H_
#define _STEAM_REQUEST_AUTHORIZATION_H_
class AuthorizationRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/avatar.h b/protocols/Steam/src/api/avatar.h index ef4fcdfcf5..28e573d9d1 100644 --- a/protocols/Steam/src/api/avatar.h +++ b/protocols/Steam/src/api/avatar.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_AVATAR_H_
+#ifndef _STEAM_REQUEST_AVATAR_H_
#define _STEAM_REQUEST_AVATAR_H_
class GetAvatarRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/captcha.h b/protocols/Steam/src/api/captcha.h index b61dca89d6..9619a09b54 100644 --- a/protocols/Steam/src/api/captcha.h +++ b/protocols/Steam/src/api/captcha.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_CAPTCHA_H_
+#ifndef _STEAM_REQUEST_CAPTCHA_H_
#define _STEAM_REQUEST_CAPTCHA_H_
class GetCaptchaRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/friend.h b/protocols/Steam/src/api/friend.h index d0fd70fa22..ade553f2c0 100644 --- a/protocols/Steam/src/api/friend.h +++ b/protocols/Steam/src/api/friend.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_FRIEND_H_
+#ifndef _STEAM_REQUEST_FRIEND_H_
#define _STEAM_REQUEST_FRIEND_H_
class GetUserSummariesRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/friend_list.h b/protocols/Steam/src/api/friend_list.h index d6826ebb60..b6ab98402b 100644 --- a/protocols/Steam/src/api/friend_list.h +++ b/protocols/Steam/src/api/friend_list.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_FRIEND_LIST_H_
+#ifndef _STEAM_REQUEST_FRIEND_LIST_H_
#define _STEAM_REQUEST_FRIEND_LIST_H_
class GetFriendListRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/history.h b/protocols/Steam/src/api/history.h index 86e29a6da2..09eed8a49c 100644 --- a/protocols/Steam/src/api/history.h +++ b/protocols/Steam/src/api/history.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_HISTORY_H_ +#ifndef _STEAM_REQUEST_HISTORY_H_ #define _STEAM_REQUEST_HISTORY_H_ class GetConversationsRequest : public HttpRequest diff --git a/protocols/Steam/src/api/login.h b/protocols/Steam/src/api/login.h index ced52b065c..35ea1d8c74 100644 --- a/protocols/Steam/src/api/login.h +++ b/protocols/Steam/src/api/login.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_LOGIN_H_
+#ifndef _STEAM_REQUEST_LOGIN_H_
#define _STEAM_REQUEST_LOGIN_H_
class LogonRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/message.h b/protocols/Steam/src/api/message.h index 7c38bfb430..77adb4a240 100644 --- a/protocols/Steam/src/api/message.h +++ b/protocols/Steam/src/api/message.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_MESSAGE_H_
+#ifndef _STEAM_REQUEST_MESSAGE_H_
#define _STEAM_REQUEST_MESSAGE_H_
class SendMessageRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/pending.h b/protocols/Steam/src/api/pending.h index 411bcc2948..7c1964b6c5 100644 --- a/protocols/Steam/src/api/pending.h +++ b/protocols/Steam/src/api/pending.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_PENDING_H_
+#ifndef _STEAM_REQUEST_PENDING_H_
#define _STEAM_REQUEST_PENDING_H_
class ApprovePendingRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/poll.h b/protocols/Steam/src/api/poll.h index 8dd795a4fa..5c5da5674c 100644 --- a/protocols/Steam/src/api/poll.h +++ b/protocols/Steam/src/api/poll.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_POLL_H_ +#ifndef _STEAM_REQUEST_POLL_H_ #define _STEAM_REQUEST_POLL_H_ class PollRequest : public HttpRequest diff --git a/protocols/Steam/src/api/rsa_key.h b/protocols/Steam/src/api/rsa_key.h index c9c826b18b..9f89a70403 100644 --- a/protocols/Steam/src/api/rsa_key.h +++ b/protocols/Steam/src/api/rsa_key.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_RSA_KEY_H_
+#ifndef _STEAM_REQUEST_RSA_KEY_H_
#define _STEAM_REQUEST_RSA_KEY_H_
class GetRsaKeyRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/search.h b/protocols/Steam/src/api/search.h index e9e9691cc1..a22ed64431 100644 --- a/protocols/Steam/src/api/search.h +++ b/protocols/Steam/src/api/search.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_SEARCH_H_
+#ifndef _STEAM_REQUEST_SEARCH_H_
#define _STEAM_REQUEST_SEARCH_H_
class SearchRequest : public HttpRequest
diff --git a/protocols/Steam/src/api/session.h b/protocols/Steam/src/api/session.h index 96fc560816..b00e470da6 100644 --- a/protocols/Steam/src/api/session.h +++ b/protocols/Steam/src/api/session.h @@ -1,4 +1,4 @@ -#ifndef _STEAM_REQUEST_SESSION_H_
+#ifndef _STEAM_REQUEST_SESSION_H_
#define _STEAM_REQUEST_SESSION_H_
class GetSessionRequest : public HttpRequest
diff --git a/protocols/Steam/src/http_request.h b/protocols/Steam/src/http_request.h index 8016f2cf1d..841910dc32 100644 --- a/protocols/Steam/src/http_request.h +++ b/protocols/Steam/src/http_request.h @@ -1,4 +1,4 @@ -#ifndef _HTTP_REQUEST_H_ +#ifndef _HTTP_REQUEST_H_ #define _HTTP_REQUEST_H_ class HttpResponse : public NETLIBHTTPREQUEST, public MZeroedObject diff --git a/protocols/Steam/src/steam_dialogs.cpp b/protocols/Steam/src/steam_dialogs.cpp index c3e3b71931..0565040d8d 100644 --- a/protocols/Steam/src/steam_dialogs.cpp +++ b/protocols/Steam/src/steam_dialogs.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h"
+#include "stdafx.h"
CSteamPasswordEditor::CSteamPasswordEditor(CSteamProto *proto)
: CSteamDlgBase(proto, IDD_PASSWORD_EDITOR, false), m_ok(this, IDOK),
diff --git a/protocols/Steam/src/steam_instances.cpp b/protocols/Steam/src/steam_instances.cpp index 82da33d4bc..b88ada2bb4 100644 --- a/protocols/Steam/src/steam_instances.cpp +++ b/protocols/Steam/src/steam_instances.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h"
+#include "stdafx.h"
int CSteamProto::CompareProtos(const CSteamProto *p1, const CSteamProto *p2)
{
diff --git a/protocols/Steam/src/steam_options.cpp b/protocols/Steam/src/steam_options.cpp index cc62799a62..ea55af1147 100644 --- a/protocols/Steam/src/steam_options.cpp +++ b/protocols/Steam/src/steam_options.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h"
+#include "stdafx.h"
CSteamOptionsMain::CSteamOptionsMain(CSteamProto *proto, int idDialog, HWND hwndParent)
: CSteamDlgBase(proto, idDialog, false),
diff --git a/protocols/Steam/src/steam_proto.cpp b/protocols/Steam/src/steam_proto.cpp index e5fd1b3b89..dac637dbff 100644 --- a/protocols/Steam/src/steam_proto.cpp +++ b/protocols/Steam/src/steam_proto.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" CSteamProto::CSteamProto(const char* protoName, const wchar_t* userName) : PROTO<CSteamProto>(protoName, userName), diff --git a/protocols/Steam/src/steam_xstatus.cpp b/protocols/Steam/src/steam_xstatus.cpp index dc7bf6024d..9acf06187f 100644 --- a/protocols/Steam/src/steam_xstatus.cpp +++ b/protocols/Steam/src/steam_xstatus.cpp @@ -1,4 +1,4 @@ -#include "stdafx.h" +#include "stdafx.h" #define STATUS_TITLE_MAX 64 #define STATUS_DESC_MAX 250 diff --git a/protocols/Telegram/src/version.h b/protocols/Telegram/src/version.h index e468157ee4..74e455cd3c 100644 --- a/protocols/Telegram/src/version.h +++ b/protocols/Telegram/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Telegram/"
-#define __COPYRIGHT " 2015 Miranda NG Team"
+#define __COPYRIGHT "© 2015 Miranda NG Team"
diff --git a/protocols/Tlen/src/version.h b/protocols/Tlen/src/version.h index 0662aea454..ca7a54d409 100644 --- a/protocols/Tlen/src/version.h +++ b/protocols/Tlen/src/version.h @@ -14,4 +14,4 @@ #define __AUTHOR "Santithorn Bunchua, Adam Strzelecki, Piotr Piastucki"
#define __AUTHOREMAIL "the_leech@users.berlios.de"
#define __AUTHORWEB "https://miranda-ng.org/p/Tlen/"
-#define __COPYRIGHT " 2002-2012 Santithorn Bunchua, Piotr Piastucki"
+#define __COPYRIGHT "© 2002-2012 Santithorn Bunchua, Piotr Piastucki"
diff --git a/protocols/Tox/src/version.h b/protocols/Tox/src/version.h index 79dbe4eff5..ba58f1f238 100644 --- a/protocols/Tox/src/version.h +++ b/protocols/Tox/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Tox/"
-#define __COPYRIGHT " 2014-17 Miranda NG Team"
+#define __COPYRIGHT "© 2014-17 Miranda NG Team"
diff --git a/protocols/Twitter/src/chat.cpp b/protocols/Twitter/src/chat.cpp index 870ef95d00..814e771cab 100644 --- a/protocols/Twitter/src/chat.cpp +++ b/protocols/Twitter/src/chat.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/connection.cpp b/protocols/Twitter/src/connection.cpp index 3cc359cc59..95e83c0a47 100644 --- a/protocols/Twitter/src/connection.cpp +++ b/protocols/Twitter/src/connection.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/contacts.cpp b/protocols/Twitter/src/contacts.cpp index 762ccfb86c..ea8d299c22 100644 --- a/protocols/Twitter/src/contacts.cpp +++ b/protocols/Twitter/src/contacts.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/http.cpp b/protocols/Twitter/src/http.cpp index 56ec865276..d50f9fc818 100644 --- a/protocols/Twitter/src/http.cpp +++ b/protocols/Twitter/src/http.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/http.h b/protocols/Twitter/src/http.h index 011817ad26..3bdb0361e8 100644 --- a/protocols/Twitter/src/http.h +++ b/protocols/Twitter/src/http.h @@ -1,7 +1,7 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/main.cpp b/protocols/Twitter/src/main.cpp index e5f91827e5..c31101f22b 100644 --- a/protocols/Twitter/src/main.cpp +++ b/protocols/Twitter/src/main.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/oauth.cpp b/protocols/Twitter/src/oauth.cpp index efca13a9c8..c6c118eeff 100644 --- a/protocols/Twitter/src/oauth.cpp +++ b/protocols/Twitter/src/oauth.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 4a4fac9ca2..ccb1132806 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/proto.h b/protocols/Twitter/src/proto.h index c1be3f728c..8484917775 100644 --- a/protocols/Twitter/src/proto.h +++ b/protocols/Twitter/src/proto.h @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/stdafx.cxx b/protocols/Twitter/src/stdafx.cxx index b3677bfc08..5fd3593c8f 100644 --- a/protocols/Twitter/src/stdafx.cxx +++ b/protocols/Twitter/src/stdafx.cxx @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index 68638dcfed..7d65cd4f36 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/theme.h b/protocols/Twitter/src/theme.h index 3e05cb29e1..df69f619eb 100644 --- a/protocols/Twitter/src/theme.h +++ b/protocols/Twitter/src/theme.h @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/twitter.cpp b/protocols/Twitter/src/twitter.cpp index c2fd06c86f..ab9b9f1388 100644 --- a/protocols/Twitter/src/twitter.cpp +++ b/protocols/Twitter/src/twitter.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/twitter.h b/protocols/Twitter/src/twitter.h index 1565fea1aa..0ed9665fea 100644 --- a/protocols/Twitter/src/twitter.h +++ b/protocols/Twitter/src/twitter.h @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/ui.cpp b/protocols/Twitter/src/ui.cpp index 0954438dec..6bc57000fa 100644 --- a/protocols/Twitter/src/ui.cpp +++ b/protocols/Twitter/src/ui.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/ui.h b/protocols/Twitter/src/ui.h index 70e9b6f23e..0902ee24a4 100644 --- a/protocols/Twitter/src/ui.h +++ b/protocols/Twitter/src/ui.h @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/utility.cpp b/protocols/Twitter/src/utility.cpp index 9f5d329e30..29c93ecf72 100644 --- a/protocols/Twitter/src/utility.cpp +++ b/protocols/Twitter/src/utility.cpp @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/utility.h b/protocols/Twitter/src/utility.h index b8052df5be..d441ad826e 100644 --- a/protocols/Twitter/src/utility.h +++ b/protocols/Twitter/src/utility.h @@ -1,6 +1,6 @@ /*
-Copyright 2012-17 Miranda NG team
-Copyright 2009 Jim Porter
+Copyright © 2012-17 Miranda NG team
+Copyright © 2009 Jim Porter
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
diff --git a/protocols/Twitter/src/version.h b/protocols/Twitter/src/version.h index 32cbe35e34..7f9840db58 100644 --- a/protocols/Twitter/src/version.h +++ b/protocols/Twitter/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "dentist, omniwolf, Thief"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/Twitter/"
-#define __COPYRIGHT " 2009-2010 dentist, 2010-2012 omniwolf and Thief"
+#define __COPYRIGHT "© 2009-2010 dentist, 2010-2012 omniwolf and Thief"
diff --git a/protocols/VKontakte/res/resource.rc b/protocols/VKontakte/res/resource.rc index 2a559d8326..be528c2179 100644 --- a/protocols/VKontakte/res/resource.rc +++ b/protocols/VKontakte/res/resource.rc @@ -12,7 +12,7 @@ #undef APSTUDIO_READONLY_SYMBOLS
/////////////////////////////////////////////////////////////////////////////
-// () resources
+// Английский (США) resources
#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
@@ -423,7 +423,7 @@ END #endif // APSTUDIO_INVOKED
-#endif // () resources
+#endif // Английский (США) resources
/////////////////////////////////////////////////////////////////////////////
diff --git a/protocols/VKontakte/src/resource.h b/protocols/VKontakte/src/resource.h index 6fccad6815..397843b01f 100644 --- a/protocols/VKontakte/src/resource.h +++ b/protocols/VKontakte/src/resource.h @@ -1,6 +1,6 @@ //{{NO_DEPENDENCIES}}
-// , Microsoft Visual C++.
-// d:\github\miranda-ng\protocols\VKontakte\res\resource.rc
+// ¬ключаемый файл, созданный в Microsoft Visual C++.
+// »спользуетс¤ d:\github\miranda-ng\protocols\VKontakte\res\resource.rc
//
#define IDOPENBROWSER 3
#define IDD_ACCMGRUI 101
diff --git a/protocols/VKontakte/src/version.h b/protocols/VKontakte/src/version.h index 06d869510f..ec86aa73d0 100644 --- a/protocols/VKontakte/src/version.h +++ b/protocols/VKontakte/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Miranda NG Team"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/VKontakte/"
-#define __COPYRIGHT " 2013-17 Miranda NG Team"
+#define __COPYRIGHT "© 2013-17 Miranda NG Team"
diff --git a/protocols/VKontakte/src/vk.h b/protocols/VKontakte/src/vk.h index 2f93e42f32..148ffc5799 100644 --- a/protocols/VKontakte/src/vk.h +++ b/protocols/VKontakte/src/vk.h @@ -35,16 +35,16 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. #define VKPOLL_RING 70
// Flags for VKPOLL_MSG_ADDED
-#define VKFLAG_MSGUNREAD 1 //
-#define VKFLAG_MSGOUTBOX 2 //
-#define VKFLAG_MSGREPLIED 4 //
-#define VKFLAG_MSGIMPORTANT 8 //
-#define VKFLAG_MSGCHAT 16 //
-#define VKFLAG_MSGFRIENDS 32 //
-#define VKFLAG_MSGSPAM 64 // ""
-#define VKFLAG_MSGDELETED 128 // ( )
-#define VKFLAG_MSGFIXED 256 //
-#define VKFLAG_MSGMEDIA 512 //
+#define VKFLAG_MSGUNREAD 1 // сообщение не прочитано
+#define VKFLAG_MSGOUTBOX 2 // исходящее сообщение
+#define VKFLAG_MSGREPLIED 4 // на сообщение был создан ответ
+#define VKFLAG_MSGIMPORTANT 8 // помеченное сообщение
+#define VKFLAG_MSGCHAT 16 // сообщение отправлено через чат
+#define VKFLAG_MSGFRIENDS 32 // сообщение отправлено другом
+#define VKFLAG_MSGSPAM 64 // сообщение помечено как "Спам"
+#define VKFLAG_MSGDELETED 128 // сообщение удалено (в корзине)
+#define VKFLAG_MSGFIXED 256 // сообщение проверено пользователем на спам
+#define VKFLAG_MSGMEDIA 512 // сообщение содержит медиаконтент
// Errors
#define VKERR_NO_JSONNODE -2 // No JSON Node in server reply
diff --git a/protocols/WhatsApp/src/WhatsAPI++/targetver.h b/protocols/WhatsApp/src/WhatsAPI++/targetver.h index 497706ee83..343ce14c2f 100644 --- a/protocols/WhatsApp/src/WhatsAPI++/targetver.h +++ b/protocols/WhatsApp/src/WhatsAPI++/targetver.h @@ -1,8 +1,8 @@ #pragma once
-// Durch Einbeziehen von"SDKDDKVer.h" wird die hchste verfgbare Windows-Plattform definiert.
+// Durch Einbeziehen von"SDKDDKVer.h" wird die hцchste verfьgbare Windows-Plattform definiert.
-// Wenn Sie die Anwendung fr eine frhere Windows-Plattform erstellen mchten, schlieen Sie "WinSDKVer.h" ein, und
-// legen Sie das _WIN32_WINNT-Makro auf die zu untersttzende Plattform fest, bevor Sie "SDKDDKVer.h" einschlieen.
+// Wenn Sie die Anwendung fьr eine frьhere Windows-Plattform erstellen mцchten, schlieЯen Sie "WinSDKVer.h" ein, und
+// legen Sie das _WIN32_WINNT-Makro auf die zu unterstьtzende Plattform fest, bevor Sie "SDKDDKVer.h" einschlieЯen.
#include <SDKDDKVer.h>
diff --git a/protocols/WhatsApp/src/stdafx.cxx b/protocols/WhatsApp/src/stdafx.cxx index 8d5b5b5857..43acd6332d 100644 --- a/protocols/WhatsApp/src/stdafx.cxx +++ b/protocols/WhatsApp/src/stdafx.cxx @@ -1,8 +1,8 @@ // stdafx.cpp : Quelldatei, die nur die Standard-Includes einbindet.
// WhatsAPI++.pch ist der vorkompilierte Header.
-// stdafx.obj enthlt die vorkompilierten Typinformationen.
+// stdafx.obj enthдlt die vorkompilierten Typinformationen.
#include "stdafx.h"
-// TODO: Auf zustzliche Header verweisen, die in STDAFX.H
+// TODO: Auf zusдtzliche Header verweisen, die in STDAFX.H
// und nicht in dieser Datei erforderlich sind.
diff --git a/protocols/WhatsApp/src/stdafx.h b/protocols/WhatsApp/src/stdafx.h index 35993bc8db..4714359264 100755 --- a/protocols/WhatsApp/src/stdafx.h +++ b/protocols/WhatsApp/src/stdafx.h @@ -1,7 +1,7 @@ /*
WhatsApp plugin for Miranda NG
-Copyright 2013-14 Uli Hecht
+Copyright © 2013-14 Uli Hecht
*/
diff --git a/protocols/WhatsApp/src/version.h b/protocols/WhatsApp/src/version.h index bf021e99a3..3d788dc995 100644 --- a/protocols/WhatsApp/src/version.h +++ b/protocols/WhatsApp/src/version.h @@ -11,4 +11,4 @@ #define __AUTHOR "Uli Hecht"
#define __AUTHOREMAIL ""
#define __AUTHORWEB "https://miranda-ng.org/p/WhatsApp/"
-#define __COPYRIGHT " 2013-14 Uli Hecht, 2015-17 Miranda NG Team"
+#define __COPYRIGHT "© 2013-14 Uli Hecht, 2015-17 Miranda NG Team"
diff --git a/src/mir_core/src/colourpicker.cpp b/src/mir_core/src/colourpicker.cpp index d0041aa116..8fd5c4f825 100644 --- a/src/mir_core/src/colourpicker.cpp +++ b/src/mir_core/src/colourpicker.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/db.cpp b/src/mir_core/src/db.cpp index 7aa591db19..444fe7d890 100644 --- a/src/mir_core/src/db.cpp +++ b/src/mir_core/src/db.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/hyperlink.cpp b/src/mir_core/src/hyperlink.cpp index 52766da083..fa0ecfc6bf 100644 --- a/src/mir_core/src/hyperlink.cpp +++ b/src/mir_core/src/hyperlink.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/langpack.cpp b/src/mir_core/src/langpack.cpp index 81a4f2ea7b..357a05d195 100644 --- a/src/mir_core/src/langpack.cpp +++ b/src/mir_core/src/langpack.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/lists.cpp b/src/mir_core/src/lists.cpp index 310b53f4ae..a9c8a1cfab 100644 --- a/src/mir_core/src/lists.cpp +++ b/src/mir_core/src/lists.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/logger.cpp b/src/mir_core/src/logger.cpp index 0b5d858fc3..537d6cbe1d 100644 --- a/src/mir_core/src/logger.cpp +++ b/src/mir_core/src/logger.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/mc.cpp b/src/mir_core/src/mc.cpp index 01c710137e..df22427dab 100644 --- a/src/mir_core/src/mc.cpp +++ b/src/mir_core/src/mc.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/miranda.cpp b/src/mir_core/src/miranda.cpp index 79abdf9d4c..67662170cb 100644 --- a/src/mir_core/src/miranda.cpp +++ b/src/mir_core/src/miranda.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/miranda.h b/src/mir_core/src/miranda.h index 2714e8fcd3..17f3e0c4ab 100644 --- a/src/mir_core/src/miranda.h +++ b/src/mir_core/src/miranda.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/modules.cpp b/src/mir_core/src/modules.cpp index d287f01319..2779796e8f 100644 --- a/src/mir_core/src/modules.cpp +++ b/src/mir_core/src/modules.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows* -Copyright () 2012-17 Miranda NG project (https://miranda-ng.org), +Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org), Copyright (c) 2000-12 Miranda IM project, all portions of this codebase are copyrighted to the people listed in contributors.txt. @@ -515,13 +515,13 @@ MIR_CORE_DLL(HANDLE) CreateServiceFunctionObjParam(const char *name, MIRANDASERV return CreateServiceInt(3, name, (MIRANDASERVICE)serviceProc, object, lParam); } -MIR_CORE_DLL(HANDLE) CreateProtoServiceFunction(const char *szModule, const char *szService, MIRANDASERVICE serviceProc)
-{
- char str[MAXMODULELABELLENGTH * 2];
- strncpy_s(str, szModule, _TRUNCATE);
- strncat_s(str, szService, _TRUNCATE);
- return CreateServiceFunction(str, serviceProc);
-}
+MIR_CORE_DLL(HANDLE) CreateProtoServiceFunction(const char *szModule, const char *szService, MIRANDASERVICE serviceProc) +{ + char str[MAXMODULELABELLENGTH * 2]; + strncpy_s(str, szModule, _TRUNCATE); + strncat_s(str, szService, _TRUNCATE); + return CreateServiceFunction(str, serviceProc); +} MIR_CORE_DLL(int) DestroyServiceFunction(HANDLE hService) { diff --git a/src/mir_core/src/mstring.cpp b/src/mir_core/src/mstring.cpp index 78d82b1648..fdf43eeab6 100644 --- a/src/mir_core/src/mstring.cpp +++ b/src/mir_core/src/mstring.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/openurl.cpp b/src/mir_core/src/openurl.cpp index 6875b77bdf..66fa9e0c89 100644 --- a/src/mir_core/src/openurl.cpp +++ b/src/mir_core/src/openurl.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/path.cpp b/src/mir_core/src/path.cpp index 6eca1f1329..7744981edb 100644 --- a/src/mir_core/src/path.cpp +++ b/src/mir_core/src/path.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/resizer.cpp b/src/mir_core/src/resizer.cpp index faa3911749..49a88e60c8 100644 --- a/src/mir_core/src/resizer.cpp +++ b/src/mir_core/src/resizer.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/stdafx.h b/src/mir_core/src/stdafx.h index 07ff13323e..06398c6898 100644 --- a/src/mir_core/src/stdafx.h +++ b/src/mir_core/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/threads.cpp b/src/mir_core/src/threads.cpp index 97d3dcd06d..03f4c04760 100644 --- a/src/mir_core/src/threads.cpp +++ b/src/mir_core/src/threads.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/timezones.cpp b/src/mir_core/src/timezones.cpp index 66f912db8a..5152deaa49 100644 --- a/src/mir_core/src/timezones.cpp +++ b/src/mir_core/src/timezones.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/utf.cpp b/src/mir_core/src/utf.cpp index f0aad890e1..4ed23407cd 100644 --- a/src/mir_core/src/utf.cpp +++ b/src/mir_core/src/utf.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/utils.cpp b/src/mir_core/src/utils.cpp index 94ff07c7d1..4001a05d78 100644 --- a/src/mir_core/src/utils.cpp +++ b/src/mir_core/src/utils.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/windowlist.cpp b/src/mir_core/src/windowlist.cpp index a945710dd5..4d6b68d18d 100644 --- a/src/mir_core/src/windowlist.cpp +++ b/src/mir_core/src/windowlist.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/mir_core/src/winutil.cpp b/src/mir_core/src/winutil.cpp index 0397aa04ff..6c59195b19 100644 --- a/src/mir_core/src/winutil.cpp +++ b/src/mir_core/src/winutil.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/miranda32/res/version.rc b/src/miranda32/res/version.rc index 7c16206ba9..d9040a9525 100644 --- a/src/miranda32/res/version.rc +++ b/src/miranda32/res/version.rc @@ -38,7 +38,7 @@ BEGIN VALUE "FileDescription", "Miranda NG\0"
VALUE "FileVersion", MIRANDA_VERSION_DISPLAY
VALUE "InternalName", "miranda32\0"
- VALUE "LegalCopyright", "Copyright 2000-11 Miranda IM, 2012-17 Miranda NG project. This software is released under the terms of the GNU General Public License.\0"
+ VALUE "LegalCopyright", "Copyright © 2000-11 Miranda IM, 2012-17 Miranda NG project. This software is released under the terms of the GNU General Public License.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "miranda32.exe\0"
VALUE "PrivateBuild", "\0"
diff --git a/src/miranda32/src/miranda.cpp b/src/miranda32/src/miranda.cpp index 230d22c7be..d60ff92758 100644 --- a/src/miranda32/src/miranda.cpp +++ b/src/miranda32/src/miranda.cpp @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/src/miranda32/src/stdafx.h b/src/miranda32/src/stdafx.h index 61deb93f0d..7ea0a79589 100644 --- a/src/miranda32/src/stdafx.h +++ b/src/miranda32/src/stdafx.h @@ -2,7 +2,7 @@ Miranda NG: the free IM client for Microsoft* Windows*
-Copyright () 2012-17 Miranda NG project (https://miranda-ng.org),
+Copyright (с) 2012-17 Miranda NG project (https://miranda-ng.org),
Copyright (c) 2000-12 Miranda IM project,
all portions of this codebase are copyrighted to the people
listed in contributors.txt.
diff --git a/tools/MakeDef/h_object.h b/tools/MakeDef/h_object.h index d786c62031..1074db7b00 100644 --- a/tools/MakeDef/h_object.h +++ b/tools/MakeDef/h_object.h @@ -22,7 +22,7 @@ struct HObject : public HRegisteredObject virtual ~HObject() {}
};
-//====[ ]================
+//====[ Пул для ускорения выделений маленьких кусочков памяти ]================
struct HDataPage
{
@@ -83,7 +83,7 @@ inline HSmallAllocator& ALLOCATOR( void* Obj ) return *( HSmallAllocator* )p[ -1 ];
}
-//====[ HRegisteredObject ]======================
+//====[ Реализация инлайновых методов HRegisteredObject ]======================
#if !defined( __NO_MEM_MANAGER__ )
inline void* HRegisteredObject::operator new( size_t sz, HSmallAllocator& A )
diff --git a/tools/MakeDef/h_util.h b/tools/MakeDef/h_util.h index 8f3862000c..cbbbd9b3ed 100644 --- a/tools/MakeDef/h_util.h +++ b/tools/MakeDef/h_util.h @@ -36,7 +36,7 @@ bool fileExists(char* fileName); char* replaceExt(const char* fileName, char* ext, char* buffer);
int shareFile(const char* fileName, bool ifRead, bool ifWrite);
-//----------------- ----------------
+//----------------- ‘ункции дл¤ работы с расширенными строками ----------------
int cstrlen(const char *);
size_t getStrNumber(char* sText);
diff --git a/tools/MakeDef/tcollect.cpp b/tools/MakeDef/tcollect.cpp index b3c531ea2b..6773a5c382 100644 --- a/tools/MakeDef/tcollect.cpp +++ b/tools/MakeDef/tcollect.cpp @@ -200,12 +200,12 @@ bool HCollection::shiftItem(ccIndex pItemNo, int direction) return false;
switch (direction) {
- case 1: //
+ case 1: // Раздвинуть массив на один элемент
memmove(items + pItemNo + 1, items + pItemNo, sizeof(void*)*(count - pItemNo));
items[pItemNo] = NULL;
return true;
- case -1: //
+ case -1: // Сдвинуть массив на один элемент
memmove(items + pItemNo, items + pItemNo + 1, sizeof(void*)*(count - pItemNo));
items[count] = NULL;
return true;
diff --git a/utils/std_string_utils.cpp b/utils/std_string_utils.cpp index 1cfae0ce69..04337634e1 100644 --- a/utils/std_string_utils.cpp +++ b/utils/std_string_utils.cpp @@ -1,6 +1,6 @@ /* -Copyright 2009-11 Michal Zelinka, 2011-17 Robert Psel +Copyright © 2009-11 Michal Zelinka, 2011-17 Robert Pцsel 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 diff --git a/utils/std_string_utils.h b/utils/std_string_utils.h index 2c72e3a918..ab6ec5a07b 100644 --- a/utils/std_string_utils.h +++ b/utils/std_string_utils.h @@ -1,6 +1,6 @@ /*
-Copyright 2009-11 Michal Zelinka, 2011-17 Robert Psel
+Copyright © 2009-11 Michal Zelinka, 2011-17 Robert Pцsel
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
|