Merge remote-tracking branch 'remotes/origin/release/1.3' into release/1.3

This commit is contained in:
Robin Krom 2021-03-28 11:21:57 +02:00
commit 2467be8c94
No known key found for this signature in database
GPG key ID: BCC01364F1371490
2 changed files with 3 additions and 3 deletions

View file

@ -91,7 +91,7 @@ namespace Greenshot.Forms {
this.linkLblBugs.Size = new System.Drawing.Size(465, 23);
this.linkLblBugs.TabIndex = 9;
this.linkLblBugs.TabStop = true;
this.linkLblBugs.Text = "http://getgreenshot.org/tickets/";
this.linkLblBugs.Text = "https://getgreenshot.org/tickets/";
this.linkLblBugs.LinkClicked += new System.Windows.Forms.LinkLabelLinkClickedEventHandler(this.LinkLblBugsLinkClicked);
//
// BugReportForm

View file

@ -266,8 +266,8 @@ en.startgreenshot=Start {#ExeName}
en.startup=Start {#ExeName} with Windows start
en.win10=Windows 10 plug-in
en.UninstallIconDescription=Uninstall
en.ShowLicense=Show licenze
en.ShowReadme=how Readme
en.ShowLicense=Show license
en.ShowReadme=Show Readme
de.confluence=Confluence Plug-in
de.default=Standard installation