all rc files reverted to utf-8

76 files changed, 680 insertions, 680 deletions

diff --git a/plugins/New_GPG/docs/new_gpg_lang_ru.txt b/plugins/New_GPG/docs/new_gpg_lang_ru.txt
index f3f7eac9fd..150ee911a2 100644
--- a/plugins/New_GPG/docs/new_gpg_lang_ru.txt
+++ b/plugins/New_GPG/docs/new_gpg_lang_ru.txt
@@ -1,115 +1,115 @@
-;============================================================

-;  File: new_gpg.dll

-;  Module: new GPG encryption plugin

-;  Versions: 0.0.0.11

-;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=958

-;  Source: git://sss.chaoslab.ru/mim_plugs.git (checkout new_gpg)

-;  Authors: sss

-;============================================================

-

-[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]

-Ваша версия GPG поддерживается. Языковые файлы найдены.\nGPG Должен работать нормально.\nНажмите ОК.

-[Copy own key]

-Копир. свой ключ

-[Select own key]

-Выбрать свой ключ

-[Export PubKey]

-Сохранить ключ

-[GnuPG Variables]

-Пути к GPG

-[Turn on debug log]

-Вкл. запись отладки

-[Accept]

-Принять

-[Accept and enable encryption]

-Принять и включить шифрование

-[Replace]

-Заменить

-[Import key]

-Импорт ключа

-[Load from file]

-Импорт из файла

-[Load other]

-Загрузить

-[Delete key]

-Удалить ключ

-[Select existing]

-Выбрать существующий

-[Turn on encryption]

-Включить шифрование

-[Import key from keyserver]

-Импорт ключа с сервера ключей

-[New public key was received, do you want to import it?]

-Получен новый отрытый ключ. Вы хотите его принять?

-[There is existing key for contact, would you like to replace with new key ?]

-Получен ключ, но у контакта уже есть ключ. Вы хотите его заменить новым?

-[The new public key was recieved]

-Получен новый отрытый ключ.

-[Received key from]

-Получен ключ от

-[Do you want to remove key from entire metacontact (all subcontacts) ?]

-Вы хотите убрать ключ для метаконтакта (всех субконтактов)?

-[Select existing public key from list]

-Выбрать открытый ключ из списка

-[Encrypt file transfers]

-Шифрованная передача файлов

-[Use jabber api on Miranda IM >= 0.9 (recomended)]

-Использовать jabber api если Miranda IM >= 0.9 (Рекомендуется)

-[Current private key id]

-Закрытый ключ

-[This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn.]

-Выбранный вами exe не GnuPG!\nРекомендуется использовать GnuPG v1.x.x с этим плагином.

-[Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn.]

-Ваша версия GnuPG не поддерживается и может работать не правильно!\nРекомендуется использовать GnuPG v1.x.x с этим плагином.

-[Generate key]

-Сгенерировать

-[Select key for use]

-Выбрать ключ

-[Generate and use random key]

-Сгенерировать и использовать ключ

-[GnuPG binary:]

-Путь к exe:

-[Home directory:]

-Домашний каталог:

-[Turn on key autoexchange]

-Включить автообмен ключами

-[Key type:]

-Тип ключа:

-[Key length:]

-Длинна ключа

-[Key password:]

-Пароль ключа:

-[Real name:]

-Имя/Ник:

-[Comment:]

-Комментарий:

-[Expire date:]

-Окончание действия ключа:

-[ex.: 2010-08-15]

-пример: 2010-08-15

-[From 1024 to 4096]

-от 1024 до 4096

-[It can take a long time, be patient]

-* Это может занять несколько минут.

-[0 - does not expire]

-0 - никогда не заканчивается

-[Save password to database]

-Сохранить пароль в базу

-[Default password]

-Пароль по умолчанию

-[Import]

-Импортировать

-[Select keyserver for key search:]

-Выбрать сервер ключей для поиска:

-[Userlist:]

-Лист пользователей:

-[Add tags to encoded and decoded messages]

-Добавлять метки к сообщениям

-[Incomming message tags:]

-Добавлять метки к входящим сообщениям:

-[Outgoing message tags:]

-Добавлять метки исходящим сообщенияс:

-[Open:]

-Начало

-[Close:]

-Конец

+;============================================================
+;  File: new_gpg.dll
+;  Module: new GPG encryption plugin
+;  Versions: 0.0.0.11
+;  URL: http://addons.miranda-im.org/details.php?action=viewfile&id=958
+;  Source: git://sss.chaoslab.ru/mim_plugs.git (checkout new_gpg)
+;  Authors: sss
+;============================================================
+
+[Your GPG version is supported. The language file was found.\nGPG plugin should work fine.\nPress OK to continue.]
+Ваша версия GPG поддерживается. Языковые файлы найдены.\nGPG Должен работать нормально.\nНажмите ОК.
+[Copy own key]
+Копир. свой ключ
+[Select own key]
+Выбрать свой ключ
+[Export PubKey]
+Сохранить ключ
+[GnuPG Variables]
+Пути к GPG
+[Turn on debug log]
+Вкл. запись отладки
+[Accept]
+Принять
+[Accept and enable encryption]
+Принять и включить шифрование
+[Replace]
+Заменить
+[Import key]
+Импорт ключа
+[Load from file]
+Импорт из файла
+[Load other]
+Загрузить
+[Delete key]
+Удалить ключ
+[Select existing]
+Выбрать существующий
+[Turn on encryption]
+Включить шифрование
+[Import key from keyserver]
+Импорт ключа с сервера ключей
+[New public key was received, do you want to import it?]
+Получен новый отрытый ключ. Вы хотите его принять?
+[There is existing key for contact, would you like to replace with new key ?]
+Получен ключ, но у контакта уже есть ключ. Вы хотите его заменить новым?
+[The new public key was recieved]
+Получен новый отрытый ключ.
+[Received key from]
+Получен ключ от
+[Do you want to remove key from entire metacontact (all subcontacts) ?]
+Вы хотите убрать ключ для метаконтакта (всех субконтактов)?
+[Select existing public key from list]
+Выбрать открытый ключ из списка
+[Encrypt file transfers]
+Шифрованная передача файлов
+[Use jabber api on Miranda IM >= 0.9 (recomended)]
+Использовать jabber api если Miranda IM >= 0.9 (Рекомендуется)
+[Current private key id]
+Закрытый ключ
+[This is not gnupg binary !\nrecommended to use GnuPG v1.x.x with this plugn.]
+Выбранный вами exe не GnuPG!\nРекомендуется использовать GnuPG v1.x.x с этим плагином.
+[Unsupported gnupg version found, use at you own risk!\nrecommended to use GnuPG v1.x.x with this plugn.]
+Ваша версия GnuPG не поддерживается и может работать не правильно!\nРекомендуется использовать GnuPG v1.x.x с этим плагином.
+[Generate key]
+Сгенерировать
+[Select key for use]
+Выбрать ключ
+[Generate and use random key]
+Сгенерировать и использовать ключ
+[GnuPG binary:]
+Путь к exe:
+[Home directory:]
+Домашний каталог:
+[Turn on key autoexchange]
+Включить автообмен ключами
+[Key type:]
+Тип ключа:
+[Key length:]
+Длинна ключа
+[Key password:]
+Пароль ключа:
+[Real name:]
+Имя/Ник:
+[Comment:]
+Комментарий:
+[Expire date:]
+Окончание действия ключа:
+[ex.: 2010-08-15]
+пример: 2010-08-15
+[From 1024 to 4096]
+от 1024 до 4096
+[It can take a long time, be patient]
+* Это может занять несколько минут.
+[0 - does not expire]
+0 - никогда не заканчивается
+[Save password to database]
+Сохранить пароль в базу
+[Default password]
+Пароль по умолчанию
+[Import]
+Импортировать
+[Select keyserver for key search:]
+Выбрать сервер ключей для поиска:
+[Userlist:]
+Лист пользователей:
+[Add tags to encoded and decoded messages]
+Добавлять метки к сообщениям
+[Incomming message tags:]
+Добавлять метки к входящим сообщениям:
+[Outgoing message tags:]
+Добавлять метки исходящим сообщенияс:
+[Open:]
+Начало
+[Close:]
+Конец
diff --git a/plugins/New_GPG/docs/readme.txt b/plugins/New_GPG/docs/readme.txt
index be5551c7ac..50f23385fb 100644
--- a/plugins/New_GPG/docs/readme.txt
+++ b/plugins/New_GPG/docs/readme.txt
@@ -1,4 +1,4 @@
-* Build Dependencies
+* Build Dependencies
     1. boost (http://www.boost.org/)
     2. utf8cpp (http://utfcpp.sourceforge.net/)
     3. c++ compiller (because of miranda have compiled with MSVC, only msvc compiled builds working fine (i have no success with mingw, please report your result :) ))
diff --git a/plugins/New_GPG/res/Version.rc b/plugins/New_GPG/res/Version.rc
index fdeb14668c..37934706a0 100644
--- a/plugins/New_GPG/res/Version.rc
+++ b/plugins/New_GPG/res/Version.rc
@@ -1,55 +1,55 @@
-// Microsoft Visual C++ generated resource script.

-//

-#ifdef APSTUDIO_INVOKED

-#error this file is not editable by Microsoft Visual C++

-#endif //APSTUDIO_INVOKED

-

-#include "..\src\version.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-#include "afxres.h"

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// English (U.S.) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)

-#ifdef _WIN32

-LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US

-#pragma code_page(1252)

-#endif //_WIN32

-

-VS_VERSION_INFO VERSIONINFO

- FILEVERSION __FILEVERSION_STRING

- PRODUCTVERSION __FILEVERSION_STRING

- FILEFLAGSMASK 0x17L

-#ifdef _DEBUG

- FILEFLAGS 0x1L

-#else

- FILEFLAGS 0x0L

-#endif

- FILEOS 0x4L

- FILETYPE 0x2L

- FILESUBTYPE 0x0L

-BEGIN

-    BLOCK "StringFileInfo"

-    BEGIN

-        BLOCK "000004b0"

-        BEGIN

-            VALUE "Author", __AUTHOR

-            VALUE "FileDescription", __DESCRIPTION

-            VALUE "FileVersion", __VERSION_STRING

-            VALUE "InternalName", __PLUGIN_NAME

-            VALUE "LegalCopyright", __COPYRIGHT

-            VALUE "OriginalFilename", __FILENAME

-            VALUE "ProductName", __PLUGIN_NAME

-        END

-    END

-    BLOCK "VarFileInfo"

-    BEGIN

-        VALUE "Translation", 0x0, 1200

-    END

-END

-

-#endif    // English (U.S.) resources

-/////////////////////////////////////////////////////////////////////////////

+// Microsoft Visual C++ generated resource script.
+//
+#ifdef APSTUDIO_INVOKED
+#error this file is not editable by Microsoft Visual C++
+#endif //APSTUDIO_INVOKED
+
+#include "..\src\version.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+#include "afxres.h"
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.S.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
+#pragma code_page(1252)
+#endif //_WIN32
+
+VS_VERSION_INFO VERSIONINFO
+ FILEVERSION __FILEVERSION_STRING
+ PRODUCTVERSION __FILEVERSION_STRING
+ FILEFLAGSMASK 0x17L
+#ifdef _DEBUG
+ FILEFLAGS 0x1L
+#else
+ FILEFLAGS 0x0L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x2L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "000004b0"
+        BEGIN
+            VALUE "Author", __AUTHOR
+            VALUE "FileDescription", __DESCRIPTION
+            VALUE "FileVersion", __VERSION_STRING
+            VALUE "InternalName", __PLUGIN_NAME
+            VALUE "LegalCopyright", __COPYRIGHT
+            VALUE "OriginalFilename", __FILENAME
+            VALUE "ProductName", __PLUGIN_NAME
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x0, 1200
+    END
+END
+
+#endif    // English (U.S.) resources
+/////////////////////////////////////////////////////////////////////////////
diff --git a/plugins/New_GPG/res/new_gpg.rc b/plugins/New_GPG/res/new_gpg.rc
index 86e2da7969..41f1b30c0f 100644
--- a/plugins/New_GPG/res/new_gpg.rc
+++ b/plugins/New_GPG/res/new_gpg.rc
@@ -1,420 +1,420 @@
-// Microsoft Visual C++ generated resource script.

-//

-#include "..\src\resource.h"

-

-#define APSTUDIO_READONLY_SYMBOLS

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 2 resource.

-//

-#include "afxres.h"

-

-/////////////////////////////////////////////////////////////////////////////

-#undef APSTUDIO_READONLY_SYMBOLS

-

-/////////////////////////////////////////////////////////////////////////////

-// Русский (Россия) resources

-

-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)

-LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT

-#pragma code_page(1251)

-

-#ifdef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// TEXTINCLUDE

-//

-

-1 TEXTINCLUDE 

-BEGIN

-    "..\src\resource.h\0"

-END

-

-2 TEXTINCLUDE 

-BEGIN

-    "#include ""afxres.h""\r\n"

-    "\0"

-END

-

-3 TEXTINCLUDE 

-BEGIN

-    "\r\n"

-    "\0"

-END

-

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Dialog

-//

-

-IDD_LOAD_PUBLIC_KEY DIALOGEX 0, 0, 338, 190

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Load public GPG key"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "OK",ID_OK,7,169,50,14

-    PUSHBUTTON      "Load from file",ID_LOAD_FROM_FILE,256,169,75,14

-    EDITTEXT        IDC_PUBLIC_KEY_EDIT,7,7,324,134,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_VSCROLL,WS_EX_STATICEDGE

-    PUSHBUTTON      "Select existing",IDC_SELECT_EXISTING,113,169,97,14

-    CONTROL         "Turn on encryption",IDC_ENABLE_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,143,196,10

-    PUSHBUTTON      "Import key from keyserver",IDC_IMPORT,140,152,188,14,WS_DISABLED

-END

-

-IDD_FIRST_RUN DIALOGEX 0, 0, 291, 241

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Set own key"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "OK",ID_OK,12,220,50,14,WS_DISABLED

-    CONTROL         "",IDC_KEY_LIST,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,44,277,105

-    PUSHBUTTON      "Generate key",IDC_GENERATE_KEY,7,152,74,14

-    LTEXT           "Select key to use",IDC_STATIC,16,33,186,8

-    EDITTEXT        IDC_KEY_PASSWORD,94,187,77,14,ES_PASSWORD | ES_AUTOHSCROLL

-    RTEXT           "Key password:",IDC_STATIC,12,191,76,8

-    PUSHBUTTON      "Load other",IDC_OTHER,117,152,64,14

-    PUSHBUTTON      "Delete key",IDC_DELETE_KEY,214,152,70,14

-    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,143,220,141,14

-    LTEXT           "",IDC_GENERATING_KEY,82,207,174,8

-    LTEXT           "Account:",IDC_STATIC,15,12,42,8

-    LTEXT           "Key ID:",IDC_KEY_ID,178,12,99,8

-    COMBOBOX        IDC_ACCOUNT,66,9,104,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP

-    PUSHBUTTON      "Copy public key",IDC_COPY_PUBKEY,7,169,101,14

-    PUSHBUTTON      "Export private key",IDC_EXPORT_PRIVATE,182,169,102,14

-    PUSHBUTTON      "Change password",IDC_CHANGE_PASSWD,182,187,102,14

-END

-

-IDD_BIN_PATH DIALOGEX 0, 0, 354, 108

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Set GPG bin path and keyring home dir."

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "Continue",ID_OK,7,87,50,14

-    LTEXT           "Home directory:",IDC_STATIC,9,34,325,8

-    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8

-    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,293,18,54,14

-    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,293,44,54,14

-    EDITTEXT        IDC_HOME_DIR,7,44,277,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_BIN_PATH,7,17,277,14,ES_AUTOHSCROLL

-    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,132,87,152,14

-    CONTROL         "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,277,10

-END

-

-IDD_NEW_KEY DIALOGEX 0, 0, 427, 68

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "The new public key was received"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "Import key",ID_IMPORT,9,47,46,14

-    PUSHBUTTON      "Accept and enable encryption",IDC_IMPORT_AND_USE,156,47,119,14

-    PUSHBUTTON      "Ignore",IDC_IGNORE_KEY,368,47,52,14

-    CTEXT           "Static",IDC_MESSAGE,18,25,392,8

-    CTEXT           "Static",IDC_KEY_FROM,16,12,395,8

-END

-

-IDD_KEY_GEN DIALOGEX 0, 0, 284, 169

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Key Generation dialog"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,148,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,227,148,50,14

-    COMBOBOX        IDC_KEY_TYPE,120,14,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP

-    EDITTEXT        IDC_KEY_LENGTH,120,30,40,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP

-    EDITTEXT        IDC_KEY_PASSWD,120,46,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_REAL_NAME,120,61,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_EMAIL,120,76,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_COMMENT,120,91,55,14,ES_AUTOHSCROLL | WS_GROUP

-    EDITTEXT        IDC_KEY_EXPIRE_DATE,120,106,55,14,ES_AUTOHSCROLL | WS_GROUP

-    LTEXT           "Key type:",IDC_STATIC,8,16,96,8

-    LTEXT           "Key length:",IDC_STATIC,7,32,106,8

-    LTEXT           "Key password:",IDC_STATIC,7,49,105,8

-    LTEXT           "Real name:",IDC_STATIC,7,63,105,8

-    LTEXT           "Email:",IDC_STATIC,7,79,108,8

-    LTEXT           "Comment:",IDC_STATIC,7,92,107,8

-    LTEXT           "Expire date:",IDC_STATIC,7,109,111,8

-    LTEXT           "ex.: 2010-08-15",IDC_STATIC,182,108,75,8

-    LTEXT           "From 1024 to 4096",IDC_STATIC,168,33,89,8

-    LTEXT           "It can take a long time, be patient",IDC_GENERATING_TEXT,15,132,246,8

-    LTEXT           "0 - does not expire",IDC_STATIC,122,122,141,8

-END

-

-IDD_LOAD_EXISTING_KEY DIALOGEX 0, 0, 370, 257

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Select existing public key from list"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,236,50,14,WS_DISABLED

-    PUSHBUTTON      "Cancel",IDCANCEL,313,236,50,14

-    CONTROL         "",IDC_EXISTING_KEY_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,14,356,217

-END

-

-IDD_KEY_PASSWD DIALOGEX 0, 0, 207, 108

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Enter password for your secret key"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    DEFPUSHBUTTON   "OK",IDOK,7,87,50,14

-    PUSHBUTTON      "Cancel",IDCANCEL,150,87,50,14

-    EDITTEXT        IDC_PASSWORD,13,38,179,14,ES_PASSWORD | ES_AUTOHSCROLL

-    LTEXT           "Password:",IDC_STATIC,14,28,34,8

-    CONTROL         "Save password to database",IDC_SAVE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,56,124,10

-    LTEXT           "",IDC_KEYID,14,14,179,8

-    CONTROL         "Default password",IDC_DEFAULT_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,67,151,10

-END

-

-IDD_IMPORT_KEY DIALOGEX 0, 0, 161, 81

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Set GPG bin path and keyring home dir."

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    PUSHBUTTON      "Import",IDC_IMPORT,15,56,50,14

-    LTEXT           "Select keyserver for key search:",IDC_STATIC,16,20,122,8

-    COMBOBOX        IDC_KEYSERVER,15,34,125,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP

-END

-

-IDD_ENCRYPTED_FILE_MSG_BOX DIALOGEX 0, 0, 229, 63

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU

-CAPTION "Received encrypted file"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    PUSHBUTTON      "Ignore",IDC_IGNORE,7,42,50,14

-    PUSHBUTTON      "Decrypt",IDC_DECRYPT,97,42,50,14

-    LTEXT           "Received encrypted file from contact with disabled encryption.",IDC_STATIC,7,7,215,14

-    CONTROL         "Remember choice",IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,157,10

-END

-

-IDD_EXPORT_TYPE DIALOGEX 0, 0, 281, 90

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Choose which keys to export"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    GROUPBOX        "Static",IDC_STATIC,7,7,267,63

-    PUSHBUTTON      "OK",IDC_OK,7,71,50,14

-    PUSHBUTTON      "Cancel",IDC_CANCEL,224,71,50,14

-    CONTROL         "Export public keys (only set for contacts)",IDC_PUBLIC,

-                    "Button",BS_AUTORADIOBUTTON,15,23,248,10

-    CONTROL         "Export all private keys",IDC_PRIVATE,"Button",BS_AUTORADIOBUTTON,15,36,246,10

-    CONTROL         "Export public and private keys",IDC_ALL,"Button",BS_AUTORADIOBUTTON,15,50,248,10

-END

-

-IDD_CHANGE_PASSWD DIALOGEX 0, 0, 256, 74

-STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU

-CAPTION "Change private key password"

-FONT 8, "MS Shell Dlg", 400, 0, 0x1

-BEGIN

-    EDITTEXT        IDC_OLD_PASSWD,81,16,158,14,ES_PASSWORD | ES_AUTOHSCROLL

-    EDITTEXT        IDC_NEW_PASSWD1,82,33,156,14,ES_PASSWORD | ES_AUTOHSCROLL

-    EDITTEXT        IDC_NEW_PASSWD2,81,50,157,14,ES_PASSWORD | ES_AUTOHSCROLL

-    LTEXT           "Current password:",IDC_STATIC,7,17,61,8

-    LTEXT           "New password twice:",IDC_STATIC,7,32,69,8

-    PUSHBUTTON      "OK",IDC_OK,7,55,50,14

-END

-

-IDD_OPT_GPG DIALOGEX 0, 0, 286, 220

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112

-    CTEXT           "User list:",IDC_STATIC,25,7,201,8

-    PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14

-    PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14

-    CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10

-    EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL

-    PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14

-    CONTROL         "Use Jabber API on Miranda NG (recommended)",IDC_JABBER_API,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10

-    LTEXT           "Default key",IDC_CURRENT_KEY,12,196,170,8

-    CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10

-    CONTROL         "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10

-    PUSHBUTTON      "Copy own key",IDC_COPY_KEY,127,205,74,14

-    PUSHBUTTON      "Select own key",IDC_SELECT_KEY,205,205,74,14

-END

-

-IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,216,17,60,14

-    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,217,44,57,14

-    EDITTEXT        IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL

-    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8

-    LTEXT           "Home directory:",IDC_STATIC,9,34,144,8

-END

-

-IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "Add tags to encoded and decoded messages",IDC_APPEND_TAGS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10

-    EDITTEXT        IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL

-    LTEXT           "Incoming message tags:",IDC_STATIC,15,10,200,8

-    LTEXT           "Outgoing message tags:",IDC_STATIC,13,36,200,8

-    RTEXT           "Open:",IDC_STATIC,13,23,26,8

-    RTEXT           "Close:",IDC_STATIC,127,23,23,8

-    EDITTEXT        IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL

-    EDITTEXT        IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL

-    RTEXT           "Open:",IDC_STATIC,13,49,26,8

-    RTEXT           "Close:",IDC_STATIC,127,49,23,8

-    CONTROL         "Strip all tags in outgoing messages",IDC_STRIP_TAGS,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10

-END

-

-IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50

-STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD

-EXSTYLE WS_EX_CONTROLPARENT

-FONT 8, "MS Shell Dlg", 0, 0, 0x1

-BEGIN

-    CONTROL         "Turn on presence signing (Jabber) (required by XEP-0027)",IDC_PRESCENSE_SUBSCRIPTION,

-                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10

-    PUSHBUTTON      "Export keys",IDC_EXPORT,12,26,100,14

-    PUSHBUTTON      "Import keys",IDC_IMPORT,122,26,100,14

-END

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// DESIGNINFO

-//

-

-#ifdef APSTUDIO_INVOKED

-GUIDELINES DESIGNINFO

-BEGIN

-    IDD_LOAD_PUBLIC_KEY, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 331

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 183

-    END

-

-    IDD_FIRST_RUN, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 284

-        VERTGUIDE, 15

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 234

-        HORZGUIDE, 20

-        HORZGUIDE, 166

-        HORZGUIDE, 183

-        HORZGUIDE, 201

-    END

-

-    IDD_BIN_PATH, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 347

-        VERTGUIDE, 284

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 101

-    END

-

-    IDD_NEW_KEY, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 420

-        TOPMARGIN, 6

-        BOTTOMMARGIN, 61

-    END

-

-    IDD_KEY_GEN, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 277

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 162

-    END

-

-    IDD_LOAD_EXISTING_KEY, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 363

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 250

-    END

-

-    IDD_KEY_PASSWD, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 200

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 101

-    END

-

-    IDD_IMPORT_KEY, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 154

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 74

-    END

-

-    IDD_ENCRYPTED_FILE_MSG_BOX, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 222

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 56

-    END

-

-    IDD_EXPORT_TYPE, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 274

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 85

-        HORZGUIDE, 70

-    END

-

-    IDD_CHANGE_PASSWD, DIALOG

-    BEGIN

-        LEFTMARGIN, 7

-        RIGHTMARGIN, 249

-        TOPMARGIN, 7

-        BOTTOMMARGIN, 69

-    END

-

-    IDD_OPT_GPG_ADVANCED, DIALOG

-    BEGIN

-        VERTGUIDE, 12

-        BOTTOMMARGIN, 40

-    END

-END

-#endif    // APSTUDIO_INVOKED

-

-

-/////////////////////////////////////////////////////////////////////////////

-//

-// Icon

-//

-

-// Icon with lowest ID value placed first to ensure application icon

-// remains consistent on all systems.

-IDI_SECURED             ICON                    "secured.ico"

-IDI_UNSECURED           ICON                    "unsecured.ico"

-

-

-#endif    // Русский (Россия) resources

-/////////////////////////////////////////////////////////////////////////////

-

-

-

-#ifndef APSTUDIO_INVOKED

-/////////////////////////////////////////////////////////////////////////////

-//

-// Generated from the TEXTINCLUDE 3 resource.

-//

-

-

-/////////////////////////////////////////////////////////////////////////////

-#endif    // not APSTUDIO_INVOKED

-

+// Microsoft Visual C++ generated resource script.
+//
+#include "..\src\resource.h"
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// Русский (Россия) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_RUS)
+LANGUAGE LANG_RUSSIAN, SUBLANG_DEFAULT
+#pragma code_page(1251)
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "..\src\resource.h\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\n"
+    "\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\n"
+    "\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Dialog
+//
+
+IDD_LOAD_PUBLIC_KEY DIALOGEX 0, 0, 338, 190
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Load public GPG key"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",ID_OK,7,169,50,14
+    PUSHBUTTON      "Load from file",ID_LOAD_FROM_FILE,256,169,75,14
+    EDITTEXT        IDC_PUBLIC_KEY_EDIT,7,7,324,134,ES_MULTILINE | ES_AUTOVSCROLL | ES_AUTOHSCROLL | WS_VSCROLL,WS_EX_STATICEDGE
+    PUSHBUTTON      "Select existing",IDC_SELECT_EXISTING,113,169,97,14
+    CONTROL         "Turn on encryption",IDC_ENABLE_ENCRYPTION,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,8,143,196,10
+    PUSHBUTTON      "Import key from keyserver",IDC_IMPORT,140,152,188,14,WS_DISABLED
+END
+
+IDD_FIRST_RUN DIALOGEX 0, 0, 291, 241
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Set own key"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",ID_OK,12,220,50,14,WS_DISABLED
+    CONTROL         "",IDC_KEY_LIST,"SysListView32",LVS_REPORT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,44,277,105
+    PUSHBUTTON      "Generate key",IDC_GENERATE_KEY,7,152,74,14
+    LTEXT           "Select key to use",IDC_STATIC,16,33,186,8
+    EDITTEXT        IDC_KEY_PASSWORD,94,187,77,14,ES_PASSWORD | ES_AUTOHSCROLL
+    RTEXT           "Key password:",IDC_STATIC,12,191,76,8
+    PUSHBUTTON      "Load other",IDC_OTHER,117,152,64,14
+    PUSHBUTTON      "Delete key",IDC_DELETE_KEY,214,152,70,14
+    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,143,220,141,14
+    LTEXT           "",IDC_GENERATING_KEY,82,207,174,8
+    LTEXT           "Account:",IDC_STATIC,15,12,42,8
+    LTEXT           "Key ID:",IDC_KEY_ID,178,12,99,8
+    COMBOBOX        IDC_ACCOUNT,66,9,104,30,CBS_DROPDOWNLIST | WS_VSCROLL | WS_TABSTOP
+    PUSHBUTTON      "Copy public key",IDC_COPY_PUBKEY,7,169,101,14
+    PUSHBUTTON      "Export private key",IDC_EXPORT_PRIVATE,182,169,102,14
+    PUSHBUTTON      "Change password",IDC_CHANGE_PASSWD,182,187,102,14
+END
+
+IDD_BIN_PATH DIALOGEX 0, 0, 354, 108
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Set GPG bin path and keyring home dir."
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "Continue",ID_OK,7,87,50,14
+    LTEXT           "Home directory:",IDC_STATIC,9,34,325,8
+    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8
+    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,293,18,54,14
+    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,293,44,54,14
+    EDITTEXT        IDC_HOME_DIR,7,44,277,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_BIN_PATH,7,17,277,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Generate and use random key",IDC_GENERATE_RANDOM,132,87,152,14
+    CONTROL         "Turn on key autoexchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,7,64,277,10
+END
+
+IDD_NEW_KEY DIALOGEX 0, 0, 427, 68
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "The new public key was received"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "Import key",ID_IMPORT,9,47,46,14
+    PUSHBUTTON      "Accept and enable encryption",IDC_IMPORT_AND_USE,156,47,119,14
+    PUSHBUTTON      "Ignore",IDC_IGNORE_KEY,368,47,52,14
+    CTEXT           "Static",IDC_MESSAGE,18,25,392,8
+    CTEXT           "Static",IDC_KEY_FROM,16,12,395,8
+END
+
+IDD_KEY_GEN DIALOGEX 0, 0, 284, 169
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Key Generation dialog"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,7,148,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,227,148,50,14
+    COMBOBOX        IDC_KEY_TYPE,120,14,48,30,CBS_DROPDOWNLIST | CBS_SORT | WS_VSCROLL | WS_GROUP | WS_TABSTOP
+    EDITTEXT        IDC_KEY_LENGTH,120,30,40,14,ES_AUTOHSCROLL | ES_NUMBER | WS_GROUP
+    EDITTEXT        IDC_KEY_PASSWD,120,46,55,14,ES_AUTOHSCROLL | WS_GROUP
+    EDITTEXT        IDC_KEY_REAL_NAME,120,61,55,14,ES_AUTOHSCROLL | WS_GROUP
+    EDITTEXT        IDC_KEY_EMAIL,120,76,55,14,ES_AUTOHSCROLL | WS_GROUP
+    EDITTEXT        IDC_KEY_COMMENT,120,91,55,14,ES_AUTOHSCROLL | WS_GROUP
+    EDITTEXT        IDC_KEY_EXPIRE_DATE,120,106,55,14,ES_AUTOHSCROLL | WS_GROUP
+    LTEXT           "Key type:",IDC_STATIC,8,16,96,8
+    LTEXT           "Key length:",IDC_STATIC,7,32,106,8
+    LTEXT           "Key password:",IDC_STATIC,7,49,105,8
+    LTEXT           "Real name:",IDC_STATIC,7,63,105,8
+    LTEXT           "Email:",IDC_STATIC,7,79,108,8
+    LTEXT           "Comment:",IDC_STATIC,7,92,107,8
+    LTEXT           "Expire date:",IDC_STATIC,7,109,111,8
+    LTEXT           "ex.: 2010-08-15",IDC_STATIC,182,108,75,8
+    LTEXT           "From 1024 to 4096",IDC_STATIC,168,33,89,8
+    LTEXT           "It can take a long time, be patient",IDC_GENERATING_TEXT,15,132,246,8
+    LTEXT           "0 - does not expire",IDC_STATIC,122,122,141,8
+END
+
+IDD_LOAD_EXISTING_KEY DIALOGEX 0, 0, 370, 257
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Select existing public key from list"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,7,236,50,14,WS_DISABLED
+    PUSHBUTTON      "Cancel",IDCANCEL,313,236,50,14
+    CONTROL         "",IDC_EXISTING_KEY_LIST,"SysListView32",LVS_REPORT | LVS_ALIGNLEFT | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,14,356,217
+END
+
+IDD_KEY_PASSWD DIALOGEX 0, 0, 207, 108
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Enter password for your secret key"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    DEFPUSHBUTTON   "OK",IDOK,7,87,50,14
+    PUSHBUTTON      "Cancel",IDCANCEL,150,87,50,14
+    EDITTEXT        IDC_PASSWORD,13,38,179,14,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Password:",IDC_STATIC,14,28,34,8
+    CONTROL         "Save password to database",IDC_SAVE_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,56,124,10
+    LTEXT           "",IDC_KEYID,14,14,179,8
+    CONTROL         "Default password",IDC_DEFAULT_PASSWORD,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,14,67,151,10
+END
+
+IDD_IMPORT_KEY DIALOGEX 0, 0, 161, 81
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Set GPG bin path and keyring home dir."
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    PUSHBUTTON      "Import",IDC_IMPORT,15,56,50,14
+    LTEXT           "Select keyserver for key search:",IDC_STATIC,16,20,122,8
+    COMBOBOX        IDC_KEYSERVER,15,34,125,30,CBS_DROPDOWN | CBS_SORT | WS_VSCROLL | WS_TABSTOP
+END
+
+IDD_ENCRYPTED_FILE_MSG_BOX DIALOGEX 0, 0, 229, 63
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
+CAPTION "Received encrypted file"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    PUSHBUTTON      "Ignore",IDC_IGNORE,7,42,50,14
+    PUSHBUTTON      "Decrypt",IDC_DECRYPT,97,42,50,14
+    LTEXT           "Received encrypted file from contact with disabled encryption.",IDC_STATIC,7,7,215,14
+    CONTROL         "Remember choice",IDC_REMEMBER,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,17,22,157,10
+END
+
+IDD_EXPORT_TYPE DIALOGEX 0, 0, 281, 90
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Choose which keys to export"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    GROUPBOX        "Static",IDC_STATIC,7,7,267,63
+    PUSHBUTTON      "OK",IDC_OK,7,71,50,14
+    PUSHBUTTON      "Cancel",IDC_CANCEL,224,71,50,14
+    CONTROL         "Export public keys (only set for contacts)",IDC_PUBLIC,
+                    "Button",BS_AUTORADIOBUTTON,15,23,248,10
+    CONTROL         "Export all private keys",IDC_PRIVATE,"Button",BS_AUTORADIOBUTTON,15,36,246,10
+    CONTROL         "Export public and private keys",IDC_ALL,"Button",BS_AUTORADIOBUTTON,15,50,248,10
+END
+
+IDD_CHANGE_PASSWD DIALOGEX 0, 0, 256, 74
+STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_VISIBLE | WS_CAPTION | WS_SYSMENU
+CAPTION "Change private key password"
+FONT 8, "MS Shell Dlg", 400, 0, 0x1
+BEGIN
+    EDITTEXT        IDC_OLD_PASSWD,81,16,158,14,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_NEW_PASSWD1,82,33,156,14,ES_PASSWORD | ES_AUTOHSCROLL
+    EDITTEXT        IDC_NEW_PASSWD2,81,50,157,14,ES_PASSWORD | ES_AUTOHSCROLL
+    LTEXT           "Current password:",IDC_STATIC,7,17,61,8
+    LTEXT           "New password twice:",IDC_STATIC,7,32,69,8
+    PUSHBUTTON      "OK",IDC_OK,7,55,50,14
+END
+
+IDD_OPT_GPG DIALOGEX 0, 0, 286, 220
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    CONTROL         "",IDC_USERLIST,"SysListView32",LVS_REPORT | LVS_SINGLESEL | LVS_SHOWSELALWAYS | LVS_NOSORTHEADER | WS_BORDER | WS_TABSTOP,7,17,272,112
+    CTEXT           "User list:",IDC_STATIC,25,7,201,8
+    PUSHBUTTON      "Export PubKey",IDC_SAVE_KEY_BUTTON,8,135,75,14
+    PUSHBUTTON      "Delete key",IDC_DELETE_KEY_BUTTON,90,135,70,14
+    CONTROL         "Turn on debug log",IDC_DEBUG_LOG,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,181,159,89,10
+    EDITTEXT        IDC_LOG_FILE_EDIT,11,157,98,14,ES_AUTOHSCROLL
+    PUSHBUTTON      "Browse",IDC_LOG_FILE_SET,119,156,50,14
+    CONTROL         "Use Jabber API on Miranda NG (recommended)",IDC_JABBER_API,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,175,251,10
+    LTEXT           "Default key",IDC_CURRENT_KEY,12,196,170,8
+    CONTROL         "Encrypt file transfers",IDC_FILE_TRANSFERS,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,11,185,137,10
+    CONTROL         "Automatic key exchange",IDC_AUTO_EXCHANGE,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,163,137,111,10
+    PUSHBUTTON      "Copy own key",IDC_COPY_KEY,127,205,74,14
+    PUSHBUTTON      "Select own key",IDC_SELECT_KEY,205,205,74,14
+END
+
+IDD_OPT_GPG_BIN DIALOGEX 0, 0, 282, 71
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    PUSHBUTTON      "Browse",IDC_SET_BIN_PATH,216,17,60,14
+    PUSHBUTTON      "Browse",IDC_SET_HOME_DIR,217,44,57,14
+    EDITTEXT        IDC_BIN_PATH,7,17,195,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_HOME_DIR,7,44,195,14,ES_AUTOHSCROLL
+    LTEXT           "GnuPG binary:",IDC_STATIC,10,7,147,8
+    LTEXT           "Home directory:",IDC_STATIC,9,34,144,8
+END
+
+IDD_OPT_GPG_MESSAGES DIALOGEX 0, 0, 302, 100
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    CONTROL         "Add tags to encoded and decoded messages",IDC_APPEND_TAGS,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,65,243,10
+    EDITTEXT        IDC_IN_OPEN_TAG,39,20,88,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_IN_CLOSE_TAG,151,20,90,14,ES_AUTOHSCROLL
+    LTEXT           "Incoming message tags:",IDC_STATIC,15,10,200,8
+    LTEXT           "Outgoing message tags:",IDC_STATIC,13,36,200,8
+    RTEXT           "Open:",IDC_STATIC,13,23,26,8
+    RTEXT           "Close:",IDC_STATIC,127,23,23,8
+    EDITTEXT        IDC_OUT_OPEN_TAG,39,46,88,14,ES_AUTOHSCROLL
+    EDITTEXT        IDC_OUT_CLOSE_TAG,151,46,90,14,ES_AUTOHSCROLL
+    RTEXT           "Open:",IDC_STATIC,13,49,26,8
+    RTEXT           "Close:",IDC_STATIC,127,49,23,8
+    CONTROL         "Strip all tags in outgoing messages",IDC_STRIP_TAGS,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,3,76,233,10
+END
+
+IDD_OPT_GPG_ADVANCED DIALOGEX 0, 0, 286, 50
+STYLE DS_SETFONT | DS_FIXEDSYS | WS_CHILD
+EXSTYLE WS_EX_CONTROLPARENT
+FONT 8, "MS Shell Dlg", 0, 0, 0x1
+BEGIN
+    CONTROL         "Turn on presence signing (Jabber) (required by XEP-0027)",IDC_PRESCENSE_SUBSCRIPTION,
+                    "Button",BS_AUTOCHECKBOX | WS_TABSTOP,12,9,268,10
+    PUSHBUTTON      "Export keys",IDC_EXPORT,12,26,100,14
+    PUSHBUTTON      "Import keys",IDC_IMPORT,122,26,100,14
+END
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// DESIGNINFO
+//
+
+#ifdef APSTUDIO_INVOKED
+GUIDELINES DESIGNINFO
+BEGIN
+    IDD_LOAD_PUBLIC_KEY, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 331
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 183
+    END
+
+    IDD_FIRST_RUN, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 284
+        VERTGUIDE, 15
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 234
+        HORZGUIDE, 20
+        HORZGUIDE, 166
+        HORZGUIDE, 183
+        HORZGUIDE, 201
+    END
+
+    IDD_BIN_PATH, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 347
+        VERTGUIDE, 284
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 101
+    END
+
+    IDD_NEW_KEY, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 420
+        TOPMARGIN, 6
+        BOTTOMMARGIN, 61
+    END
+
+    IDD_KEY_GEN, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 277
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 162
+    END
+
+    IDD_LOAD_EXISTING_KEY, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 363
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 250
+    END
+
+    IDD_KEY_PASSWD, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 200
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 101
+    END
+
+    IDD_IMPORT_KEY, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 154
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 74
+    END
+
+    IDD_ENCRYPTED_FILE_MSG_BOX, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 222
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 56
+    END
+
+    IDD_EXPORT_TYPE, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 274
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 85
+        HORZGUIDE, 70
+    END
+
+    IDD_CHANGE_PASSWD, DIALOG
+    BEGIN
+        LEFTMARGIN, 7
+        RIGHTMARGIN, 249
+        TOPMARGIN, 7
+        BOTTOMMARGIN, 69
+    END
+
+    IDD_OPT_GPG_ADVANCED, DIALOG
+    BEGIN
+        VERTGUIDE, 12
+        BOTTOMMARGIN, 40
+    END
+END
+#endif    // APSTUDIO_INVOKED
+
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Icon
+//
+
+// Icon with lowest ID value placed first to ensure application icon
+// remains consistent on all systems.
+IDI_SECURED             ICON                    "secured.ico"
+IDI_UNSECURED           ICON                    "unsecured.ico"
+
+
+#endif    // Русский (Россия) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+
diff --git a/plugins/New_GPG/src/clist.cpp b/plugins/New_GPG/src/clist.cpp
index 317171f87c..645d72c2a6 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/constants.h b/plugins/New_GPG/src/constants.h
index be769466c9..598e37b54e 100644
--- a/plugins/New_GPG/src/constants.h
+++ b/plugins/New_GPG/src/constants.h
@@ -1,4 +1,4 @@
-#ifndef CONSTANTS_H
+#ifndef CONSTANTS_H
 #define CONSTANTS_H
 #define szGPGModuleName "GPG"
 #define PREF_METANODB	0x2000
diff --git a/plugins/New_GPG/src/globals.h b/plugins/New_GPG/src/globals.h
index ef3ea72445..cc631be568 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 b9be29422c..38e06f2254 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 1328e02feb..7227d3cdf0 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 dc6668e2a6..c78075418e 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/include/boost/process.hpp b/plugins/New_GPG/src/include/boost/process.hpp
index 2271e9b49e..6b79644d2d 100644
--- a/plugins/New_GPG/src/include/boost/process.hpp
+++ b/plugins/New_GPG/src/include/boost/process.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/all.hpp b/plugins/New_GPG/src/include/boost/process/all.hpp
index 234dd05d4c..b941151538 100644
--- a/plugins/New_GPG/src/include/boost/process/all.hpp
+++ b/plugins/New_GPG/src/include/boost/process/all.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/child.hpp b/plugins/New_GPG/src/include/boost/process/child.hpp
index ec129fc936..14c8c9992d 100644
--- a/plugins/New_GPG/src/include/boost/process/child.hpp
+++ b/plugins/New_GPG/src/include/boost/process/child.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/config.hpp b/plugins/New_GPG/src/include/boost/process/config.hpp
index 7aae4d3ca4..972420dcc8 100644
--- a/plugins/New_GPG/src/include/boost/process/config.hpp
+++ b/plugins/New_GPG/src/include/boost/process/config.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/create_pipe.hpp b/plugins/New_GPG/src/include/boost/process/create_pipe.hpp
index 6c34ecf44b..79ff2d29e4 100644
--- a/plugins/New_GPG/src/include/boost/process/create_pipe.hpp
+++ b/plugins/New_GPG/src/include/boost/process/create_pipe.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/execute.hpp b/plugins/New_GPG/src/include/boost/process/execute.hpp
index 608831171e..c3f6c13961 100644
--- a/plugins/New_GPG/src/include/boost/process/execute.hpp
+++ b/plugins/New_GPG/src/include/boost/process/execute.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/executor.hpp b/plugins/New_GPG/src/include/boost/process/executor.hpp
index 905d7f84cc..7ba77395f3 100644
--- a/plugins/New_GPG/src/include/boost/process/executor.hpp
+++ b/plugins/New_GPG/src/include/boost/process/executor.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/initializers.hpp b/plugins/New_GPG/src/include/boost/process/initializers.hpp
index c7175d1425..8904e4aa31 100644
--- a/plugins/New_GPG/src/include/boost/process/initializers.hpp
+++ b/plugins/New_GPG/src/include/boost/process/initializers.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/mitigate.hpp b/plugins/New_GPG/src/include/boost/process/mitigate.hpp
index 6838984aa1..f0652b0c6a 100644
--- a/plugins/New_GPG/src/include/boost/process/mitigate.hpp
+++ b/plugins/New_GPG/src/include/boost/process/mitigate.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/pipe.hpp b/plugins/New_GPG/src/include/boost/process/pipe.hpp
index 35f2a4470d..5238a56aed 100644
--- a/plugins/New_GPG/src/include/boost/process/pipe.hpp
+++ b/plugins/New_GPG/src/include/boost/process/pipe.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/search_path.hpp b/plugins/New_GPG/src/include/boost/process/search_path.hpp
index 20bff060b6..2f7926ed2f 100644
--- a/plugins/New_GPG/src/include/boost/process/search_path.hpp
+++ b/plugins/New_GPG/src/include/boost/process/search_path.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/shell_path.hpp b/plugins/New_GPG/src/include/boost/process/shell_path.hpp
index 92e9f0814b..3a08f9c432 100644
--- a/plugins/New_GPG/src/include/boost/process/shell_path.hpp
+++ b/plugins/New_GPG/src/include/boost/process/shell_path.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/terminate.hpp b/plugins/New_GPG/src/include/boost/process/terminate.hpp
index 140eba7e8d..154f133f99 100644
--- a/plugins/New_GPG/src/include/boost/process/terminate.hpp
+++ b/plugins/New_GPG/src/include/boost/process/terminate.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/wait_for_exit.hpp b/plugins/New_GPG/src/include/boost/process/wait_for_exit.hpp
index d9b118695d..c621f9155a 100644
--- a/plugins/New_GPG/src/include/boost/process/wait_for_exit.hpp
+++ b/plugins/New_GPG/src/include/boost/process/wait_for_exit.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/child.hpp b/plugins/New_GPG/src/include/boost/process/windows/child.hpp
index 083cd29da0..e952260bee 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/child.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/child.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/create_pipe.hpp b/plugins/New_GPG/src/include/boost/process/windows/create_pipe.hpp
index fe1e49751d..863945e140 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/create_pipe.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/create_pipe.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/execute.hpp b/plugins/New_GPG/src/include/boost/process/windows/execute.hpp
index 43067521ea..0bbeb12e25 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/execute.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/execute.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/executor.hpp b/plugins/New_GPG/src/include/boost/process/windows/executor.hpp
index 1560f30793..1dd06b1235 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/executor.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/executor.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers.hpp
index 2d7098c034..44be391fec 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stderr.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stderr.hpp
index de3ee30dc5..f17640a327 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stderr.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stderr.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdin.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdin.hpp
index 54c942ab63..e0461c9446 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdin.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdin.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdout.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdout.hpp
index c72c05f1bf..066908a927 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdout.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/bind_stdout.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stderr.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stderr.hpp
index 373c097f3a..a01def6304 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stderr.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stderr.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdin.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdin.hpp
index 036b0bb4ce..0f1c71abf9 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdin.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdin.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdout.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdout.hpp
index b58a6000f9..3d766199e1 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdout.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/close_stdout.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/hide_console.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/hide_console.hpp
index b01aa026f0..44b3ce14c2 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/hide_console.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/hide_console.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/inherit_env.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/inherit_env.hpp
index a2b2eda00a..5f32931ee4 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/inherit_env.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/inherit_env.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/initializer_base.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/initializer_base.hpp
index b98da7b21b..654be2c2d6 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/initializer_base.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/initializer_base.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_error.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_error.hpp
index 71eeada072..a155cf1ba8 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_error.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_error.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_setup.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_setup.hpp
index 671fc9ac5c..85f2369a74 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_setup.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_setup.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_success.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_success.hpp
index 67b3b2bdcf..c72c7f0224 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_success.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/on_CreateProcess_success.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/run_exe.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/run_exe.hpp
index bfa2b790b1..409053a3ae 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/run_exe.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/run_exe.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_args.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_args.hpp
index 4b3c5b6249..7cdc4a24fd 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_args.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_args.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_cmd_line.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_cmd_line.hpp
index a3d9f6f761..0631328edc 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_cmd_line.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_cmd_line.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_env.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_env.hpp
index 6dfdfc58a4..7b188702d3 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_env.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_env.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_on_error.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_on_error.hpp
index 695ea5904d..30b8ccfd61 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/set_on_error.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/set_on_error.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/show_window.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/show_window.hpp
index 3046179205..27046316c0 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/show_window.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/show_window.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/start_in_dir.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/start_in_dir.hpp
index 8dc952abcc..1e43f90de7 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/start_in_dir.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/start_in_dir.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/initializers/throw_on_error.hpp b/plugins/New_GPG/src/include/boost/process/windows/initializers/throw_on_error.hpp
index 044fa00417..7103056141 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/initializers/throw_on_error.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/initializers/throw_on_error.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/pipe.hpp b/plugins/New_GPG/src/include/boost/process/windows/pipe.hpp
index fd912afcc9..08b3a26726 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/pipe.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/pipe.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/search_path.hpp b/plugins/New_GPG/src/include/boost/process/windows/search_path.hpp
index ceb9c6f7c2..4dba1d5382 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/search_path.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/search_path.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/shell_path.hpp b/plugins/New_GPG/src/include/boost/process/windows/shell_path.hpp
index ace15b96e1..141e550694 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/shell_path.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/shell_path.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/terminate.hpp b/plugins/New_GPG/src/include/boost/process/windows/terminate.hpp
index 43afe250a6..6661dc1fe9 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/terminate.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/terminate.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/boost/process/windows/wait_for_exit.hpp b/plugins/New_GPG/src/include/boost/process/windows/wait_for_exit.hpp
index 23a8b9a9f1..667887fa76 100644
--- a/plugins/New_GPG/src/include/boost/process/windows/wait_for_exit.hpp
+++ b/plugins/New_GPG/src/include/boost/process/windows/wait_for_exit.hpp
@@ -1,4 +1,4 @@
-// Copyright (c) 2006, 2007 Julio M. Merino Vidal
+// Copyright (c) 2006, 2007 Julio M. Merino Vidal
 // Copyright (c) 2008 Ilya Sokolov, Boris Schaeling
 // Copyright (c) 2009 Boris Schaeling
 // Copyright (c) 2010 Felipe Tanus, Boris Schaeling
diff --git a/plugins/New_GPG/src/include/utf8.h b/plugins/New_GPG/src/include/utf8.h
index 82b13f59f9..3346f7a410 100644
--- a/plugins/New_GPG/src/include/utf8.h
+++ b/plugins/New_GPG/src/include/utf8.h
@@ -1,4 +1,4 @@
-// Copyright 2006 Nemanja Trifunovic
+// Copyright 2006 Nemanja Trifunovic
 
 /*
 Permission is hereby granted, free of charge, to any person or organization
diff --git a/plugins/New_GPG/src/include/utf8/checked.h b/plugins/New_GPG/src/include/utf8/checked.h
index 3b00644444..f3137095b4 100644
--- a/plugins/New_GPG/src/include/utf8/checked.h
+++ b/plugins/New_GPG/src/include/utf8/checked.h
@@ -1,4 +1,4 @@
-// Copyright 2006 Nemanja Trifunovic
+// Copyright 2006 Nemanja Trifunovic
 
 /*
 Permission is hereby granted, free of charge, to any person or organization
diff --git a/plugins/New_GPG/src/include/utf8/core.h b/plugins/New_GPG/src/include/utf8/core.h
index 693d388c07..015e7db31c 100644
--- a/plugins/New_GPG/src/include/utf8/core.h
+++ b/plugins/New_GPG/src/include/utf8/core.h
@@ -1,4 +1,4 @@
-// Copyright 2006 Nemanja Trifunovic
+// Copyright 2006 Nemanja Trifunovic
 
 /*
 Permission is hereby granted, free of charge, to any person or organization
diff --git a/plugins/New_GPG/src/include/utf8/unchecked.h b/plugins/New_GPG/src/include/utf8/unchecked.h
index b4547fad94..29c90d0ff8 100644
--- a/plugins/New_GPG/src/include/utf8/unchecked.h
+++ b/plugins/New_GPG/src/include/utf8/unchecked.h
@@ -1,4 +1,4 @@
-// Copyright 2006 Nemanja Trifunovic
+// Copyright 2006 Nemanja Trifunovic
 
 /*
 Permission is hereby granted, free of charge, to any person or organization
diff --git a/plugins/New_GPG/src/init.cpp b/plugins/New_GPG/src/init.cpp
index 9ad51625f4..2d2bbe76e2 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 3a939c6c8e..fb294aa67d 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 fe336bd4a1..3a122db2dd 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 1737f3853e..bc3dc5047f 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 effd8a5941..41666369d2 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 ce668b8b5e..16680cb572 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
diff --git a/plugins/New_GPG/src/main.h b/plugins/New_GPG/src/main.h
index 745f5e2a77..c04a47302e 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 af6e414087..2b17efb7db 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
diff --git a/plugins/New_GPG/src/metacontacts.cpp b/plugins/New_GPG/src/metacontacts.cpp
index 73225bdbb4..d625e1a3bb 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 23a56d4ef7..ad609352ac 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/options.cpp b/plugins/New_GPG/src/options.cpp
index e6e16366d1..b6bcac6774 100755
--- a/plugins/New_GPG/src/options.cpp
+++ b/plugins/New_GPG/src/options.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/resource.h b/plugins/New_GPG/src/resource.h
index b57e346c05..4761d3fec9 100644
--- a/plugins/New_GPG/src/resource.h
+++ b/plugins/New_GPG/src/resource.h
@@ -1,4 +1,4 @@
-//{{NO_DEPENDENCIES}}
+//{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
 // Used by new_gpg.rc
 //
diff --git a/plugins/New_GPG/src/srmm.cpp b/plugins/New_GPG/src/srmm.cpp
index edcd6ae51e..80aea96aa5 100755
--- 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
diff --git a/plugins/New_GPG/src/stdafx.cxx b/plugins/New_GPG/src/stdafx.cxx
index e0372ed6dc..1e3ab13b21 100644
--- a/plugins/New_GPG/src/stdafx.cxx
+++ b/plugins/New_GPG/src/stdafx.cxx
@@ -1,18 +1,18 @@
-/*

-Copyright (C) 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

-as published by the Free Software Foundation version 2

-of the License.

-

-This program is distributed in the hope that it will be useful,

-but WITHOUT ANY WARRANTY; without even the implied warranty of

-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

-GNU General Public License for more details.

-

-You should have received a copy of the GNU General Public License

-along with this program. If not, see <http://www.gnu.org/licenses/>.

-*/

-

-#include "stdafx.h"

+/*
+Copyright (C) 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
+as published by the Free Software Foundation version 2
+of the License.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "stdafx.h"
diff --git a/plugins/New_GPG/src/stdafx.h b/plugins/New_GPG/src/stdafx.h
index b6dca06048..0900c87e0f 100755
--- 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.cpp b/plugins/New_GPG/src/utilities.cpp
index 3dd0fca129..d7262b9bd6 100755
--- a/plugins/New_GPG/src/utilities.cpp
+++ b/plugins/New_GPG/src/utilities.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/utilities.h b/plugins/New_GPG/src/utilities.h
index 753342d86d..7c78cbfa0b 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 8c156b9a16..0a60085071 100755
--- a/plugins/New_GPG/src/version.h
+++ b/plugins/New_GPG/src/version.h
@@ -1,4 +1,4 @@
-#define __MAJOR_VERSION          0
+#define __MAJOR_VERSION          0
 #define __MINOR_VERSION          0
 #define __RELEASE_NUM            0
 #define __BUILD_NUM             14