diff --git a/InnoSetup/ShareX setup.iss b/InnoSetup/ShareX setup.iss
index a92337ccb..64bab7404 100644
--- a/InnoSetup/ShareX setup.iss
+++ b/InnoSetup/ShareX setup.iss
@@ -10,7 +10,7 @@
[Setup]
AllowNoIcons=true
-AppCopyright=Copyright © 2007-2015 {#MyAppPublisher}
+AppCopyright=Copyright © 2007-2015 {#MyAppPublisher}
AppId={#MyAppId}
AppMutex={#MyAppId}
AppName={#MyAppName}
diff --git a/ShareX.HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs b/ShareX.HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs
index ec70f8a9d..161a18dff 100644
--- a/ShareX.HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs
+++ b/ShareX.HelpersLib/SingleInstanceApplication/ApplicationInstanceManager.cs
@@ -1,8 +1,8 @@
-#region License Information (GPL v3)
+#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
- Copyright © 2007-2015 ShareX Developers
+ Copyright © 2007-2015 ShareX Developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/ShareX.HelpersLib/SingleInstanceApplication/InstanceProxy.cs b/ShareX.HelpersLib/SingleInstanceApplication/InstanceProxy.cs
index 7430b3069..c509119bb 100644
--- a/ShareX.HelpersLib/SingleInstanceApplication/InstanceProxy.cs
+++ b/ShareX.HelpersLib/SingleInstanceApplication/InstanceProxy.cs
@@ -1,8 +1,8 @@
-#region License Information (GPL v3)
+#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
- Copyright © 2007-2015 ShareX Developers
+ Copyright © 2007-2015 ShareX Developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs b/ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs
index afc18db6a..aa11f1608 100644
--- a/ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs
+++ b/ShareX.UploadersLib/FileUploaders/MediaCrushUploader.cs
@@ -1,8 +1,8 @@
-#region License Information (GPL v3)
+#region License Information (GPL v3)
/*
ShareX - A program that allows you to take screenshots and share any file type
- Copyright © 2007-2015 ShareX Developers
+ Copyright © 2007-2015 ShareX Developers
This program is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License
diff --git a/ShareX/Forms/AboutForm.Designer.cs b/ShareX/Forms/AboutForm.Designer.cs
index af77a05da..9e0272ab5 100644
--- a/ShareX/Forms/AboutForm.Designer.cs
+++ b/ShareX/Forms/AboutForm.Designer.cs
@@ -38,8 +38,8 @@ private void InitializeComponent()
this.rtbCredits = new System.Windows.Forms.RichTextBox();
this.rtbShareXInfo = new System.Windows.Forms.RichTextBox();
this.lblOwners = new System.Windows.Forms.Label();
- this.cLogo = new HelpersLib.Canvas();
- this.uclUpdate = new HelpersLib.UpdateCheckerLabel();
+ this.cLogo = new ShareX.HelpersLib.Canvas();
+ this.uclUpdate = new ShareX.HelpersLib.UpdateCheckerLabel();
this.pbMikeGooglePlus = new System.Windows.Forms.PictureBox();
this.pbBerkSteamURL = new System.Windows.Forms.PictureBox();
this.pbMikeURL = new System.Windows.Forms.PictureBox();
@@ -79,18 +79,18 @@ private void InitializeComponent()
//
// rtbCredits
//
- resources.ApplyResources(this.rtbCredits, "rtbCredits");
this.rtbCredits.BackColor = System.Drawing.Color.WhiteSmoke;
this.rtbCredits.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ resources.ApplyResources(this.rtbCredits, "rtbCredits");
this.rtbCredits.Name = "rtbCredits";
this.rtbCredits.ReadOnly = true;
this.rtbCredits.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtb_LinkClicked);
//
// rtbShareXInfo
//
- resources.ApplyResources(this.rtbShareXInfo, "rtbShareXInfo");
this.rtbShareXInfo.BackColor = System.Drawing.Color.WhiteSmoke;
this.rtbShareXInfo.BorderStyle = System.Windows.Forms.BorderStyle.None;
+ resources.ApplyResources(this.rtbShareXInfo, "rtbShareXInfo");
this.rtbShareXInfo.Name = "rtbShareXInfo";
this.rtbShareXInfo.ReadOnly = true;
this.rtbShareXInfo.LinkClicked += new System.Windows.Forms.LinkClickedEventHandler(this.rtb_LinkClicked);
@@ -102,10 +102,10 @@ private void InitializeComponent()
//
// cLogo
//
- resources.ApplyResources(this.cLogo, "cLogo");
this.cLogo.Interval = 100;
+ resources.ApplyResources(this.cLogo, "cLogo");
this.cLogo.Name = "cLogo";
- this.cLogo.Draw += new HelpersLib.Canvas.DrawEventHandler(this.cLogo_Draw);
+ this.cLogo.Draw += new ShareX.HelpersLib.Canvas.DrawEventHandler(this.cLogo_Draw);
this.cLogo.MouseDown += new System.Windows.Forms.MouseEventHandler(this.cLogo_MouseDown);
//
// uclUpdate
@@ -115,57 +115,57 @@ private void InitializeComponent()
//
// pbMikeGooglePlus
//
- resources.ApplyResources(this.pbMikeGooglePlus, "pbMikeGooglePlus");
this.pbMikeGooglePlus.BackColor = System.Drawing.Color.Transparent;
this.pbMikeGooglePlus.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbMikeGooglePlus.Image = global::ShareX.Properties.Resources.google_plus;
+ resources.ApplyResources(this.pbMikeGooglePlus, "pbMikeGooglePlus");
this.pbMikeGooglePlus.Name = "pbMikeGooglePlus";
this.pbMikeGooglePlus.TabStop = false;
this.pbMikeGooglePlus.Click += new System.EventHandler(this.pbMikeGooglePlus_Click);
//
// pbBerkSteamURL
//
- resources.ApplyResources(this.pbBerkSteamURL, "pbBerkSteamURL");
this.pbBerkSteamURL.BackColor = System.Drawing.Color.Transparent;
this.pbBerkSteamURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbBerkSteamURL.Image = global::ShareX.Properties.Resources.steam;
+ resources.ApplyResources(this.pbBerkSteamURL, "pbBerkSteamURL");
this.pbBerkSteamURL.Name = "pbBerkSteamURL";
this.pbBerkSteamURL.TabStop = false;
this.pbBerkSteamURL.Click += new System.EventHandler(this.pbBerkSteamURL_Click);
//
// pbMikeURL
//
- resources.ApplyResources(this.pbMikeURL, "pbMikeURL");
this.pbMikeURL.BackColor = System.Drawing.Color.Transparent;
this.pbMikeURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbMikeURL.Image = global::ShareX.Properties.Resources.GitHub;
+ resources.ApplyResources(this.pbMikeURL, "pbMikeURL");
this.pbMikeURL.Name = "pbMikeURL";
this.pbMikeURL.TabStop = false;
this.pbMikeURL.Click += new System.EventHandler(this.pbMikeURL_Click);
//
// pbAU
//
- resources.ApplyResources(this.pbAU, "pbAU");
this.pbAU.BackColor = System.Drawing.Color.Transparent;
this.pbAU.Image = global::ShareX.Properties.Resources.au;
+ resources.ApplyResources(this.pbAU, "pbAU");
this.pbAU.Name = "pbAU";
this.pbAU.TabStop = false;
//
// pbBerkURL
//
- resources.ApplyResources(this.pbBerkURL, "pbBerkURL");
this.pbBerkURL.BackColor = System.Drawing.Color.Transparent;
this.pbBerkURL.Cursor = System.Windows.Forms.Cursors.Hand;
this.pbBerkURL.Image = global::ShareX.Properties.Resources.GitHub;
+ resources.ApplyResources(this.pbBerkURL, "pbBerkURL");
this.pbBerkURL.Name = "pbBerkURL";
this.pbBerkURL.TabStop = false;
this.pbBerkURL.Click += new System.EventHandler(this.pbBerkURL_Click);
//
// pbTR
//
- resources.ApplyResources(this.pbTR, "pbTR");
this.pbTR.BackColor = System.Drawing.Color.Transparent;
this.pbTR.Image = global::ShareX.Properties.Resources.tr;
+ resources.ApplyResources(this.pbTR, "pbTR");
this.pbTR.Name = "pbTR";
this.pbTR.TabStop = false;
//
diff --git a/ShareX/Forms/AboutForm.cs b/ShareX/Forms/AboutForm.cs
index 1f86dfce1..c6269c88e 100644
--- a/ShareX/Forms/AboutForm.cs
+++ b/ShareX/Forms/AboutForm.cs
@@ -24,6 +24,7 @@ You should have received a copy of the GNU General Public License
#endregion License Information (GPL v3)
using ShareX.HelpersLib;
+using ShareX.Properties;
using System;
using System.Drawing;
using System.Drawing.Drawing2D;
@@ -44,6 +45,44 @@ public AboutForm()
rtbCredits.AddContextMenu();
uclUpdate.CheckUpdate(TaskHelpers.CheckUpdate);
+
+ rtbShareXInfo.Text = string.Format(@"{0}: http://getsharex.com
+{1}: https://github.com/ShareX/ShareX
+{2}: https://github.com/ShareX/ShareX/issues", Resources.AboutForm_AboutForm_Website, Resources.AboutForm_AboutForm_Project_page, Resources.AboutForm_AboutForm_Issues);
+
+ rtbCredits.Text = string.Format(@"{0}:
+
+Mega, Gist and Jira support: https://github.com/gpailler
+Web site: https://github.com/dmxt
+MediaCrush support: https://github.com/SirCmpwn
+Amazon S3 and DreamObjects support: https://github.com/alanedwardes
+Gfycat support: https://github.com/Dinnerbone
+Copy support: https://github.com/KamilKZ
+AdFly support: https://github.com/LRNAB
+MediaFire support: https://github.com/michalx2
+Pushbullet support: https://github.com/BallisticLingonberries
+
+{1}:
+
+Turkish: https://github.com/muratmoon
+
+{2}:
+
+Greenshot Image Editor: https://bitbucket.org/greenshot/greenshot
+Json.NET: https://json.codeplex.com
+SSH.NET: https://sshnet.codeplex.com
+Icons: http://p.yusukekamiyamane.com
+ImageListView: https://code.google.com/p/imagelistview
+AviWriter: https://code.google.com/p/aforge
+FFmpeg: http://www.ffmpeg.org
+FFmpeg Windows builds: http://ffmpeg.zeranoe.com/builds
+7-Zip: http://www.7-zip.org
+SevenZipSharp: https://sevenzipsharp.codeplex.com
+DirectShow video and audio device: https://github.com/rdp/screen-capture-recorder-to-video-windows-free
+QrCode.Net: https://qrcodenet.codeplex.com
+System.Net.FtpClient: https://netftp.codeplex.com
+
+Copyright © 2007-2015 ShareX Developers", Resources.AboutForm_AboutForm_Contributors, Resources.AboutForm_AboutForm_Translators, Resources.AboutForm_AboutForm_External_libraries);
}
private void AboutForm_Shown(object sender, EventArgs e)
diff --git a/ShareX/Forms/AboutForm.de.resx b/ShareX/Forms/AboutForm.de.resx
index ab7e5e4ef..c8781a8e5 100644
--- a/ShareX/Forms/AboutForm.de.resx
+++ b/ShareX/Forms/AboutForm.de.resx
@@ -116,50 +116,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
-
- ShareX - Ãœber
-
Besitzer:
-
- Mitwirkende:
-
-Mega, Gist and Jira support: https://github.com/gpailler
-Web site: https://github.com/dmxt
-MediaCrush support: https://github.com/SirCmpwn
-Amazon S3 and DreamObjects support: https://github.com/alanedwardes
-Gfycat support: https://github.com/Dinnerbone
-Copy support: https://github.com/KamilKZ
-AdFly support: https://github.com/LRNAB
-MediaFire support: https://github.com/michalx2
-Pushbullet support: https://github.com/BallisticLingonberries
-
-Ãœbersetzer:
-
-Türkisch: https://github.com/muratmoon
-
-Externe Bibliotheken:
-
-Greenshot Image Editor: https://bitbucket.org/greenshot/greenshot
-Json.NET: https://json.codeplex.com
-SSH.NET: https://sshnet.codeplex.com
-Icons: http://p.yusukekamiyamane.com
-ImageListView: https://code.google.com/p/imagelistview
-AviWriter: https://code.google.com/p/aforge
-FFmpeg: http://www.ffmpeg.org
-FFmpeg Windows builds: http://ffmpeg.zeranoe.com/builds
-7-Zip: http://www.7-zip.org
-SevenZipSharp: https://sevenzipsharp.codeplex.com
-DirectShow video and audio device: https://github.com/rdp/screen-capture-recorder-to-video-windows-free
-QrCode.Net: https://qrcodenet.codeplex.com
-System.Net.FtpClient: https://netftp.codeplex.com
-
-Copyright © 2007-2015 ShareX Developers
-
-
- Homepage: http://getsharex.com
-Projektseite: https://github.com/ShareX/ShareX
-Probleme: https://github.com/ShareX/ShareX/issues
-
\ No newline at end of file
diff --git a/ShareX/Forms/AboutForm.resx b/ShareX/Forms/AboutForm.resx
index 83f07bc3b..fd2d274c3 100644
--- a/ShareX/Forms/AboutForm.resx
+++ b/ShareX/Forms/AboutForm.resx
@@ -1,4 +1,3 @@
-