summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--bin10/mir_full.sln10
-rw-r--r--bin10/mir_full_pro.sln11
-rw-r--r--bin12/mir_full.sln12
-rw-r--r--langpacks/english/Plugins/Facebook.txt2
-rw-r--r--langpacks/english/Plugins/MyDetails.txt26
-rw-r--r--langpacks/russian/Plugins/Facebook.txt2
-rw-r--r--langpacks/russian/Plugins/MyDetails.txt52
7 files changed, 73 insertions, 42 deletions
diff --git a/bin10/mir_full.sln b/bin10/mir_full.sln
index 17b088c1b4..6e44d8ce8f 100644
--- a/bin10/mir_full.sln
+++ b/bin10/mir_full.sln
@@ -414,6 +414,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sa
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\protocols\Sametime\src\glib\glib_10.vcxproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_10.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1844,6 +1846,14 @@ Global
{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32
{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64
{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|Win32.Build.0 = Debug|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|x64.ActiveCfg = Debug|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|x64.Build.0 = Debug|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|Win32.ActiveCfg = Release|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|Win32.Build.0 = Release|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|x64.ActiveCfg = Release|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/bin10/mir_full_pro.sln b/bin10/mir_full_pro.sln
index 2b42be11eb..7747606589 100644
--- a/bin10/mir_full_pro.sln
+++ b/bin10/mir_full_pro.sln
@@ -446,6 +446,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Dropbox", "..\plugins\Dropb
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sametime\sametime_10.vcxproj", "{BE22A21F-73B7-453F-86A0-B867F0056490}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_10.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1868,6 +1870,14 @@ Global
{BE22A21F-73B7-453F-86A0-B867F0056490}.Release|Win32.Build.0 = Release|Win32
{BE22A21F-73B7-453F-86A0-B867F0056490}.Release|x64.ActiveCfg = Release|x64
{BE22A21F-73B7-453F-86A0-B867F0056490}.Release|x64.Build.0 = Release|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|Win32.Build.0 = Debug|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|x64.ActiveCfg = Debug|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|x64.Build.0 = Debug|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|Win32.ActiveCfg = Release|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|Win32.Build.0 = Release|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|x64.ActiveCfg = Release|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2026,6 +2036,7 @@ Global
{A44F96D0-A850-4A67-9570-0E9298A16E40} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{7B072B7F-E2AA-4935-AAF5-5BEF99665AD3} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{8ACA3C8B-BDFA-47B2-8578-069555BA05B3} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA} = {99B819F8-65D9-45BC-B0C4-8C2B0F63AD46}
{66503A70-B1E8-4545-B4FF-2108DFB40C72} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{D548A54E-310B-4A86-A545-64BDD5748745} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
{1BD5E5B9-A750-4CF8-A370-0FBD40A92CB2} = {74981ED5-7A15-4C46-AECF-DA229AF9CC9D}
diff --git a/bin12/mir_full.sln b/bin12/mir_full.sln
index 94334757cc..ee61a2c6d0 100644
--- a/bin12/mir_full.sln
+++ b/bin12/mir_full.sln
@@ -1,6 +1,6 @@
Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Express 2013 for Windows Desktop
-VisualStudioVersion = 12.0.21005.1
+VisualStudioVersion = 12.0.30501.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Miranda", "..\src\miranda32_12.vcxproj", "{F9916510-9055-4C9F-997A-3755DEC1511B}"
ProjectSection(ProjectDependencies) = postProject
@@ -416,6 +416,8 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Sametime", "..\protocols\Sa
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "glib", "..\protocols\Sametime\src\glib\glib_12.vcxproj", "{12BCA020-EABF-429E-876A-A476BC9C10C0}"
EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "GmailNotifier", "..\plugins\GmailNotifier\GmailNotifier_12.vcxproj", "{EDAAD28B-505B-4969-A8BB-97EAE818DEEA}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Win32 = Debug|Win32
@@ -1846,6 +1848,14 @@ Global
{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|Win32.Build.0 = Release|Win32
{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.ActiveCfg = Release|x64
{12BCA020-EABF-429E-876A-A476BC9C10C0}.Release|x64.Build.0 = Release|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|Win32.ActiveCfg = Debug|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|Win32.Build.0 = Debug|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|x64.ActiveCfg = Debug|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Debug|x64.Build.0 = Debug|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|Win32.ActiveCfg = Release|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|Win32.Build.0 = Release|Win32
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|x64.ActiveCfg = Release|x64
+ {EDAAD28B-505B-4969-A8BB-97EAE818DEEA}.Release|x64.Build.0 = Release|x64
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/langpacks/english/Plugins/Facebook.txt b/langpacks/english/Plugins/Facebook.txt
index 5222b65dd8..0eb150ce63 100644
--- a/langpacks/english/Plugins/Facebook.txt
+++ b/langpacks/english/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.4.1
+; Version: 0.2.5.0
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
diff --git a/langpacks/english/Plugins/MyDetails.txt b/langpacks/english/Plugins/MyDetails.txt
index 144a7fa5e6..e94fa99514 100644
--- a/langpacks/english/Plugins/MyDetails.txt
+++ b/langpacks/english/Plugins/MyDetails.txt
@@ -11,20 +11,22 @@
[Nickname:]
[Cancel]
[General]
-[...avatar]
[RTL]
[Align text to right]
-[...nickname]
[Auto-resize frame]
[Use contact list smileys]
-[...status]
[Replace Smileys]
[Resize Smileys]
+[Global On...]
+[...avatar]
+[...nickname]
+[...status]
[...status message]
-[Top:]
-[Bottom:]
-[Left:]
-[Right:]
+[Account]
+[Show account name]
+[Show account cycle button]
+[Cycle through accounts every:]
+[seconds]
[Avatar]
[Custom size:]
[pixels]
@@ -33,13 +35,11 @@
[Round corners]
[Custom corner size:]
[Use free space (under avatar) to other texts]
-[Global On...]
[Frame Options]
-[Cycle through accounts every:]
-[seconds]
-[Account]
-[Show account name]
-[Show account cycle button]
+[Top:]
+[Bottom:]
+[Left:]
+[Right:]
[Set My Status Message for All Status]
[Status Message:]
[&Offline]
diff --git a/langpacks/russian/Plugins/Facebook.txt b/langpacks/russian/Plugins/Facebook.txt
index 9626f72992..b746a4a6ea 100644
--- a/langpacks/russian/Plugins/Facebook.txt
+++ b/langpacks/russian/Plugins/Facebook.txt
@@ -2,7 +2,7 @@
;============================================================
; File: Facebook.dll
; Plugin: Facebook RM
-; Version: 0.2.4.1
+; Version: 0.2.5.0
; Authors: Michal Zelinka, Robert Pösel
;============================================================
[Facebook protocol support for Miranda NG.]
diff --git a/langpacks/russian/Plugins/MyDetails.txt b/langpacks/russian/Plugins/MyDetails.txt
index bda3c08132..be4983d652 100644
--- a/langpacks/russian/Plugins/MyDetails.txt
+++ b/langpacks/russian/Plugins/MyDetails.txt
@@ -15,34 +15,38 @@
Отмена
[General]
Общие
-[...avatar]
-...аватар
[RTL]
RTL
[Align text to right]
Выровнять справа
-[...nickname]
-...ник
[Auto-resize frame]
Выравнивать фрейм
[Use contact list smileys]
Смайлы спиcка контактов
-[...status]
-...статус
[Replace Smileys]
Заменять смайлы
[Resize Smileys]
Изменять размер смайлов
+[Global On...]
+Глобальный...
+[...avatar]
+...аватар
+[...nickname]
+...ник
+[...status]
+...статус
[...status message]
...статусное сообщение
-[Top:]
-Верх:
-[Bottom:]
-Низ:
-[Left:]
-Лево:
-[Right:]
-Право:
+[Account]
+Учётная запись
+[Show account name]
+Показывать имя учётной записи
+[Show account cycle button]
+Кнопки смены учётных записей
+[Cycle through accounts every:]
+Менять учётные записи каждые:
+[seconds]
+секунд
[Avatar]
Аватар
[Custom size:]
@@ -59,20 +63,16 @@ RTL
Размер угла:
[Use free space (under avatar) to other texts]
Использовать свободное место (под аватарами) для текста
-[Global On...]
-Глобальный...
[Frame Options]
Настройки фрейма
-[Cycle through accounts every:]
-Менять учётные записи каждые:
-[seconds]
-секунд
-[Account]
-Учётная запись
-[Show account name]
-Показывать имя учётной записи
-[Show account cycle button]
-Кнопки смены учётных записей
+[Top:]
+Верх:
+[Bottom:]
+Низ:
+[Left:]
+Лево:
+[Right:]
+Право:
[Set My Status Message for All Status]
Статусное сообщение для всех статусов
[Status Message:]