From 5e1f923b38ec7313651c232b973e48e870bbbec2 Mon Sep 17 00:00:00 2001
From: Brendan Hagan <bhaganksu@gmail.com>
Date: Sat, 9 Jul 2022 19:21:41 -0400
Subject: [PATCH] misc: reduce impact of locale changes

This is more backwards compatible and would permit applying this locale to an older version without as much mess. I don't think MSE has any concept of versioning on locales unfortunately to permit declaring which field applies to which version.
---
 data/en.mse-locale/locale      | 60 ++++++++++++++++++----------------
 src/gui/image_slice_window.cpp |  4 +--
 2 files changed, 33 insertions(+), 31 deletions(-)

diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index 880c4722..dae38dc1 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -80,9 +80,9 @@ menu:
 	stack:				&Stacked Bars	3
 	scatter:			S&catter Plot	4
 	scatter pie:		Sc&atter-Pie	5
-	
-	console:			Console
-	clear console:		&Clear Console	Ctrl+L
+	
+	console:			Console
+	clear console:		&Clear Console	Ctrl+L
 
 	window:			&Window
 	new window:			&New Window
@@ -199,9 +199,9 @@ help:
 	stack:				A bar graph with stacked bars
 	scatter:			A scatter plot, the size indicates the number of cards
 	scatter pie:		A scatter plot where each item is a small pie graph
-	
-	#console:
-	clear console:		Clear the console
+	
+	#console:
+	clear console:		Clear the console
 
 	#window:
 	new window:			Creates another window to edit the same set
@@ -356,8 +356,8 @@ tool:
 	curve segment:		Curve
 	free point:			Free
 	smooth point:		Smooth
-	symmetric point:	Symmetric
-
+	symmetric point:	Symmetric
+
 	clear console:		Clear Console
 	
 ############################################################## Toolbar help text
@@ -433,8 +433,8 @@ tooltip:
 	curve segment:		To curve
 	free point:			Unlock point
 	smooth point:		Make point smooth
-	symmetric point:	Make point symmetric
-
+	symmetric point:	Make point symmetric
+
 	clear console:		Clear Console
 
 ############################################################## Labels in the GUI
@@ -474,29 +474,29 @@ label:
 	# New set window
 	game type:			&Game type:
 	style type:			&Card style:
-	search game list : Filter Games
+	search game list:   Filter Games
 	search stylesheet list: Filter Stylesheets
 	
-	stylesheet not found :
+	stylesheet not found:
 		The set you are trying to open uses the stylesheet "%s".
 		This stylesheet is not found on your system, please select an alternative.
 
 	# Preferences
-	language : Language
-	windows : Open sets
-	app language : Language of the user interface :
-	card display : Card Display
-	storage : Storage
-	zoom : &Zoom:
-	export : &Export:
-	scale : &Internal Scale:
+	language:			Language
+	windows:			Open sets
+	app language:		Language of the user interface:
+	card display:		Card Display
+	storage: 			Storage
+	zoom:				&Zoom:
+	export: 			&Export:
+	scale: 				&Internal Scale:
 	percent of normal:	% of normal size
 	external programs:	External programs
 	apprentice:			&Apprentice:
-	apprentice exe:		Apprentice Executable
-	internal scale desc:
-		Scale to internally store card images at.
-		Changing this may impact how Sharpening looks.
+	apprentice exe:		Apprentice Executable
+	internal scale desc:
+		Scale to internally store card images at.
+		Changing this may impact how Sharpening looks.
 		Does not retroactively apply to existing images.
 	check at startup:	Check for new versions at startup
 	checking requires internet:
@@ -526,8 +526,10 @@ label:
 	html export options:Export options
 	
 	# Image slicer
-	original:			Original (%s x %s):
-	result:				Result (%s x %s):
+	original:			Original:
+	result:				Result:
+	original with dimensions: Original (%s x %s):
+	result with dimensions:	Result (%s x %s):
 	size:				Size
 	original size:			&Original Size
 	size to fit:			Size to &Fit
@@ -597,7 +599,7 @@ button:
 	add custom pack:	Add &Custom Pack...
 	
 	# Console panel
-	evaluate:			&Evaluate
+	evaluate:			&Evaluate
 	clear:				&Clear
 	
 	# Welcome
@@ -618,7 +620,7 @@ button:
 	check now:			Check &Now
 	always:							Always
 	if internet connection exists:	If internet connection exists
-	never:							Never
+	never:							Never
 	internal image extension: Store images internally with file extension
 	
 	# Column select
@@ -681,7 +683,7 @@ title:
 	preferences:		Preferences
 	global:					Global
 	display:				Display
-	directories:			Directories
+	directories:			Directories
 	internal:               Internal
 	updates:				Updates
 	update check:			Update Check
diff --git a/src/gui/image_slice_window.cpp b/src/gui/image_slice_window.cpp
index a6659fce..ad0df406 100644
--- a/src/gui/image_slice_window.cpp
+++ b/src/gui/image_slice_window.cpp
@@ -134,11 +134,11 @@ ImageSliceWindow::ImageSliceWindow(Window* parent, const Image& source, const wx
     // top row: image editors
     wxSizer* s2 = new wxBoxSizer(wxHORIZONTAL);
       wxSizer* s3 = new wxBoxSizer(wxVERTICAL);
-        s3->Add(new wxStaticText(this, wxID_ANY, _LABEL_2_("original", to_string(slice.source.GetWidth()), to_string(slice.source.GetHeight()))));
+        s3->Add(new wxStaticText(this, wxID_ANY, _LABEL_2_("original with dimensions", to_string(slice.source.GetWidth()), to_string(slice.source.GetHeight()))));
         s3->Add(selector, 1, wxEXPAND | wxTOP, 4);
       s2->Add(s3, 1, wxEXPAND | wxALL, 4);
       wxSizer* s4 = new wxBoxSizer(wxVERTICAL);
-        s4->Add(new wxStaticText(this, wxID_ANY, _LABEL_2_("result", to_string(slice.target_size.GetWidth()), to_string(slice.target_size.GetHeight()))));
+        s4->Add(new wxStaticText(this, wxID_ANY, _LABEL_2_("result with dimensions", to_string(slice.target_size.GetWidth()), to_string(slice.target_size.GetHeight()))));
         s4->Add(preview, 0, wxTOP, 4);
       s2->Add(s4, 0, wxALL, 4);
     s->Add(s2, 1, wxEXPAND);