diff --git a/Greenshot/Greenshot.csproj b/Greenshot/Greenshot.csproj
index fdb388f53..56b0edd33 100644
--- a/Greenshot/Greenshot.csproj
+++ b/Greenshot/Greenshot.csproj
@@ -381,4 +381,31 @@
"$(MSBuildProjectDirectory)\tools\TortoiseSVN\SubWCRev.exe" "$(MSBuildProjectDirectory)\." "$(MSBuildProjectDirectory)\AssemblyInfo.cs.template" "$(MSBuildProjectDirectory)\AssemblyInfo.cs"
copy "$(ProjectDir)log4net-debug.xml" "$(SolutionDir)bin\$(Configuration)\log4net.xml"
+
+ False
+ Off
+ 4194304
+ x86
+ 4096
+
+
+ False
+ Off
+ 4194304
+ AnyCPU
+ 4096
+
+
+ False
+ True
+ Full
+ true
+ DEBUG;TRACE
+
+
+ True
+ False
+ None
+ false
+
\ No newline at end of file
diff --git a/Greenshot/Greenshot.sln b/Greenshot/Greenshot.sln
index 31dc8774e..b810dcb7f 100644
--- a/Greenshot/Greenshot.sln
+++ b/Greenshot/Greenshot.sln
@@ -28,6 +28,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotPicasaPlugin", "..
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotOfficePlugin", "..\GreenshotOfficePlugin\GreenshotOfficePlugin.csproj", "{2167DE58-7C83-4BDA-97CE-FA57BE8FA22B}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GreenshotImmioPlugin", "..\GreenshotImmioPlugin\GreenshotImmioPlugin.csproj", "{B7B30064-1034-4C53-AB7C-17A007360C19}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -138,6 +140,32 @@ Global
{2167DE58-7C83-4BDA-97CE-FA57BE8FA22B}.Debug|x86.ActiveCfg = Debug|x86
{2167DE58-7C83-4BDA-97CE-FA57BE8FA22B}.Release|Any CPU.Build.0 = Release|x86
{2167DE58-7C83-4BDA-97CE-FA57BE8FA22B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2167DE58-7C83-4BDA-97CE-FA57BE8FA22B}.Release|x86.Build.0 = Release|x86
+ {2167DE58-7C83-4BDA-97CE-FA57BE8FA22B}.Release|x86.ActiveCfg = Release|x86
+ {1893A2E4-A78A-4713-A8E7-E70058DABEE0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {7EC72A5A-D73A-4B4B-9CA1-2216C7D92D5E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {AD7CFFE2-40E7-46CF-A172-D48CF7AE9A12}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {697CF066-9077-4F22-99D9-D989CCE7282B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {D61E6ECE-E0B6-4467-B492-F08A06BA8F02}.Release|x86.Build.0 = Release|x86
+ {C6988EE8-2FEE-4349-9F09-F9628A0D8965}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {19FEEF09-313F-43C7-819D-F1BCA782B08B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {80D8DEB9-94E3-4876-8CCA-2DF1ED5F2C50}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {C3052651-598A-44E2-AAB3-2E41311D50F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {47F23C86-604E-4CC3-8767-B3D4088F30BB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {5B924697-4DCD-4F98-85F1-105CB84B7341}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {CD642BF4-D815-4D67-A0B5-C69F0B8231AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Debug|x86.Build.0 = Debug|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Debug|x86.ActiveCfg = Debug|x86
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Release|Any CPU.Build.0 = Release|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Release|Mixed Platforms.Build.0 = Release|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Release|x86.Build.0 = Release|Any CPU
+ {B7B30064-1034-4C53-AB7C-17A007360C19}.Release|x86.ActiveCfg = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
diff --git a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
index 55932be97..3f1fced27 100644
--- a/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
+++ b/GreenshotConfluencePlugin/GreenshotConfluencePlugin.csproj
@@ -219,4 +219,32 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$
mkdir "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
+
+ False
+ Off
+ 4194304
+ x86
+ 4096
+
+
+ False
+ Off
+ 4194304
+ AnyCPU
+ 4096
+
+
+ TRACE
+ True
+ False
+ Full
+ true
+
+
+ DEBUG;TRACE
+ False
+ True
+ Full
+ true
+
\ No newline at end of file
diff --git a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj
index 6bff7298f..d5450bf0b 100644
--- a/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj
+++ b/GreenshotExternalCommandPlugin/GreenshotExternalCommandPlugin.csproj
@@ -72,4 +72,32 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$
mkdir "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
copy "$(ProjectDir)Languages\*.xml" "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
+
+ False
+ Off
+ 4194304
+ x86
+ 4096
+
+
+ False
+ Off
+ 4194304
+ AnyCPU
+ 4096
+
+
+ DEBUG;TRACE
+ False
+ True
+ Full
+ true
+
+
+ TRACE
+ True
+ False
+ None
+ false
+
\ No newline at end of file
diff --git a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj
index 7044417df..5c72f9225 100644
--- a/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj
+++ b/GreenshotImgurPlugin/GreenshotImgurPlugin.csproj
@@ -59,7 +59,7 @@
Never
-
+
Never
@@ -95,4 +95,32 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$
mkdir "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
+
+ False
+ True
+ Full
+ true
+ DEBUG;TRACE
+
+
+ False
+ Off
+ 4194304
+ AnyCPU
+ 4096
+
+
+ True
+ False
+ None
+ false
+ TRACE
+
+
+ False
+ Off
+ 4194304
+ x86
+ 4096
+
\ No newline at end of file
diff --git a/GreenshotImgurPlugin/ImgurUtils.cs b/GreenshotImgurPlugin/ImgurUtils.cs
index 2e95b1896..31cb84f92 100644
--- a/GreenshotImgurPlugin/ImgurUtils.cs
+++ b/GreenshotImgurPlugin/ImgurUtils.cs
@@ -128,6 +128,7 @@ namespace GreenshotImgurPlugin {
ImageOutput.SaveToStream(image, requestStream, outputSettings);
}
+ responseString = NetworkHelper.GetResponse(webRequest);
using (WebResponse response = webRequest.GetResponse()) {
LogCredits(response);
using (StreamReader reader = new StreamReader(response.GetResponseStream(), true)) {
diff --git a/GreenshotImgurPlugin/Languages/language_confluenceplugin-zh-CN.xml b/GreenshotImgurPlugin/Languages/language_confluenceplugin-zh-CN.xml
deleted file mode 100644
index 34c8dc05e..000000000
--- a/GreenshotImgurPlugin/Languages/language_confluenceplugin-zh-CN.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-
-
-
- 浏览器页面
- 取消
- 把Wikimarkup复制到剪贴板
- 文件名
- 在搜索和浏览时包含个人空间
- 密码
- 超时
- 网址
- 用户名
- 正在载入Confluence数据,请稍后...
- 登录时发生错误:{0}
- 请输入您的Confluence登录信息
- 确认
- 上传之后打开页面
- 打开页面
- Confluence设置
- 搜索
- 搜索页面
- 搜索文字
- 上传
- 上传到Confluence时发生错误
- 上传格式
- 上传到Confluence
- 图片已成功上传到Confluence!
-
-
\ No newline at end of file
diff --git a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
index 0e8695fc4..f2ad2f97a 100644
--- a/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
+++ b/GreenshotJiraPlugin/GreenshotJiraPlugin.csproj
@@ -99,4 +99,32 @@ copy "$(ProjectDir)bin\$(Configuration)\$(ProjectName).pdb" "$(SolutionDir)bin\$
mkdir "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)"
copy "$(ProjectDir)\Languages\*.xml" "$(SolutionDir)bin\$(Configuration)\Languages\Plugins\$(ProjectName)\"
+
+ False
+ Off
+ 4194304
+ x86
+ 4096
+
+
+ False
+ Off
+ 4194304
+ AnyCPU
+ 4096
+
+
+ DEBUG;TRACE
+ False
+ True
+ Full
+ true
+
+
+ TRACE
+ True
+ False
+ None
+ false
+
\ No newline at end of file
diff --git a/GreenshotOCRCommand/GreenshotOCRCommand.csproj b/GreenshotOCRCommand/GreenshotOCRCommand.csproj
index ccbaa80d7..c99815708 100644
--- a/GreenshotOCRCommand/GreenshotOCRCommand.csproj
+++ b/GreenshotOCRCommand/GreenshotOCRCommand.csproj
@@ -13,26 +13,31 @@
v2.0
512
OnBuildSuccess
+ False
+ False
+ false
+ False
+ Off
+ 4194304
+ x86
- x86
- true
full
false
bin\Debug\
DEBUG;TRACE
prompt
4
- Off
+ true
- x86
- pdbonly
+ None
true
bin\Release\
TRACE
prompt
4
+ false
GreenshotOCRCommand.Program
@@ -54,6 +59,9 @@
mkdir "$(SolutionDir)bin\$(Configuration)\Plugins\GreenshotOCRPlugin"
copy "$(ProjectDir)bin\$(Configuration)\$(TargetFileName)" "$(SolutionDir)bin\$(Configuration)\Plugins\GreenshotOCRPlugin"
+
+ False
+