From c7b6c071b496c78102bca9d0e565040232119a0a Mon Sep 17 00:00:00 2001
From: JKlingen <jens@getgreenshot.org>
Date: Mon, 16 Dec 2013 20:33:14 +0100
Subject: [PATCH] Bug #1580: removed device names for capture fullscreen
 submenu in multi-monitor setups, which sometimes delivered inconsistent
 results or even garbage characters. Sticking to descriptive text like "bottom
 left", which is more useful anyway.

---
 Greenshot/Forms/MainForm.cs                      | 16 +++-------------
 .../additional_files/readme.txt.template         |  7 +++++++
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/Greenshot/Forms/MainForm.cs b/Greenshot/Forms/MainForm.cs
index 0011ee191..4e47cebdb 100644
--- a/Greenshot/Forms/MainForm.cs
+++ b/Greenshot/Forms/MainForm.cs
@@ -727,15 +727,8 @@ namespace Greenshot {
 			if (Screen.AllScreens.Length > 1) {
 				ToolStripMenuItem captureScreenItem;
 				Rectangle allScreensBounds = WindowCapture.GetScreenBounds();
-				string allDeviceName = "";
-				foreach (Screen screen in Screen.AllScreens) {
-					string deviceName = screen.DeviceName;
-					if (allDeviceName.Length > 0) {
-						allDeviceName += " + ";
-					}
-					allDeviceName += deviceName.Substring(deviceName.Length - 1);
-				}
-				captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all) + " (" + allDeviceName + ")");
+
+				captureScreenItem = new ToolStripMenuItem(Language.GetString(LangKey.contextmenu_capturefullscreen_all));
 				captureScreenItem.Click += delegate {
 					BeginInvoke((MethodInvoker)delegate {
 						CaptureHelper.CaptureFullscreen(false, ScreenCaptureMode.FullScreen);
@@ -744,9 +737,7 @@ namespace Greenshot {
 				captureScreenMenuItem.DropDownItems.Add(captureScreenItem);
 				foreach (Screen screen in Screen.AllScreens) {
 					Screen screenToCapture = screen;
-					string deviceName = screenToCapture.DeviceName;
 					string deviceAlignment = "";
-					deviceName = deviceName.Substring(deviceName.Length - 1);
 					if(screen.Bounds.Top == allScreensBounds.Top && screen.Bounds.Bottom != allScreensBounds.Bottom) {
 						deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_top);
 					} else if(screen.Bounds.Top != allScreensBounds.Top && screen.Bounds.Bottom == allScreensBounds.Bottom) {
@@ -757,8 +748,7 @@ namespace Greenshot {
 					} else if(screen.Bounds.Left != allScreensBounds.Left && screen.Bounds.Right == allScreensBounds.Right) {
 						deviceAlignment += " " + Language.GetString(LangKey.contextmenu_capturefullscreen_right);
 					}
-					deviceName = deviceAlignment + " ("+ deviceName +")";
-					captureScreenItem = new ToolStripMenuItem(deviceName);
+                    captureScreenItem = new ToolStripMenuItem(deviceAlignment);
 					captureScreenItem.Click += delegate {
 						BeginInvoke((MethodInvoker)delegate {
 							CaptureHelper.CaptureRegion(false, screenToCapture.Bounds);
diff --git a/Greenshot/releases/additional_files/readme.txt.template b/Greenshot/releases/additional_files/readme.txt.template
index 17912e682..afd091fbd 100644
--- a/Greenshot/releases/additional_files/readme.txt.template
+++ b/Greenshot/releases/additional_files/readme.txt.template
@@ -4,9 +4,16 @@ CHANGE LOG:
 
 @GITDETAILVERSION@ Bugfix Release
 
+Bugs resolved:
+* Bug #1580: removed device names for capture fullscreen submenu in multi-monitor setups, which sometimes delivered inconsistent results or even garbage characters. Sticking to descriptive text like "bottom left", which is more useful anyway.
+
 Features:
 * Feature #663: dark background for textbox input when editing bright-colored text
 
+Languages:
+* Updates for Swedish translation and help, new Swedish translations for plugins
+* Improvements for German translation and help
+
 1.1.7 build 17 Bugfix Release
 
 Changes: