diff options
Diffstat (limited to 'plugins/New_GPG')
-rw-r--r-- | plugins/New_GPG/res/new_gpg.rc | 4 | ||||
-rw-r--r-- | plugins/New_GPG/src/clist.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/globals.h | 2 | ||||
-rwxr-xr-x | plugins/New_GPG/src/gpg_wrapper.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/gpg_wrapper.h | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/icons.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/init.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/jabber_account.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/jabber_account.h | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/log.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/log.h | 2 | ||||
-rwxr-xr-x | plugins/New_GPG/src/main.cpp | 14 | ||||
-rw-r--r-- | plugins/New_GPG/src/main.h | 2 | ||||
-rwxr-xr-x | plugins/New_GPG/src/messages.cpp | 4 | ||||
-rw-r--r-- | plugins/New_GPG/src/metacontacts.cpp | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/metacontacts.h | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/srmm.cpp | 4 | ||||
-rw-r--r-- | plugins/New_GPG/src/stdafx.h | 2 | ||||
-rw-r--r-- | plugins/New_GPG/src/utilities.h | 2 | ||||
-rwxr-xr-x | plugins/New_GPG/src/version.h | 2 |
20 files changed, 29 insertions, 29 deletions
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" |