From 03cc925b671fe9b9020cd20c2a5e4a9d778097ea Mon Sep 17 00:00:00 2001
From: twanvl <twanvl@0fc631ac-6414-0410-93d0-97cfa31319b6>
Date: Fri, 30 May 2008 20:06:20 +0000
Subject: [PATCH] Fixed warnings about locale

git-svn-id: svn://svn.code.sf.net/p/magicseteditor/code/trunk@895 0fc631ac-6414-0410-93d0-97cfa31319b6
---
 data/en.mse-locale/locale                | 23 ++++++++++++++++-------
 src/gui/packages_window.cpp              |  5 +++++
 src/resource/common/expected_locale_keys | 11 ++++++++++-
 3 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/data/en.mse-locale/locale b/data/en.mse-locale/locale
index 5456a53f..e44a7e40 100644
--- a/data/en.mse-locale/locale
+++ b/data/en.mse-locale/locale
@@ -1,5 +1,5 @@
 mse version: 0.3.6
-installer group: locales
+installer group: translations/English
 full name: English
 version: 2007-09-23
 icon: usgb.png
@@ -38,7 +38,7 @@ menu:
 	cards:			&Cards
 	previous card:		Select &Previous Card	PgUp
 	next card:			Select &Next Card	PgDn
-	add card:			&Add Card	Ctrl++
+	add card:			&Add Card	Ctrl+Enter
 	add cards:			Add &Multiple Cards...
 	remove card:		&Delete Selected Card
 	orientation:		&Orientation
@@ -51,7 +51,7 @@ menu:
 	keywords:		&Keywords
 	previous keyword:	Select &Previous Keyword	PgUp
 	next keyword:		Select &Next Keyword	PgDn
-	add keyword:		&Add Keyword	Ctrl++
+	add keyword:		&Add Keyword	Ctrl+Enter
 	remove keyword:		&Remove Select Keyword	Del
 	
 	format:			F&ormat
@@ -467,7 +467,6 @@ label:
 	install package:		install
 	upgrade package:		upgrade
 	remove package:			remove
-	
 
 ############################################################## Buttons/checkboxes/choices in the GUI
 button:
@@ -523,6 +522,9 @@ button:
 	enabled:			Enabled
 	whole word:			Match whole word only
 	
+	# Old style update checker  (NOTE: this will be removed in a feature version)
+	close:				&Close
+	
 	# Packages window
 	install package:	&Install
 	upgrade package:	&Upgrade
@@ -544,7 +546,7 @@ title:
 	open set:			Open Set
 	save set:			Save Set As
 	save image:			Save Image
-	#updates available:	Updates Available
+	updates available:	Updates Available
 	save changes:		Save Changes?
 	select stylesheet:	Select Stylesheet
 	#preferences
@@ -579,6 +581,10 @@ title:
 
 ############################################################## Action (undo/redo) names
 action:
+	# List boxes
+	add item:			Add %s
+	remove item:		Remove %s
+	
 	# Text editor
 	typing:				Typing
 	enter:				Enter
@@ -597,8 +603,6 @@ action:
 	rotate:				Rotate %s
 	shear:				Shear %s
 	scale:				Resize %s
-	add part:			Add %s
-	remove parts:		Remove %s
 	duplicate:			Duplicate %s
 	reorder parts:		Reorder
 	change combine mode:Change combine mode
@@ -732,14 +736,19 @@ type:
 	nil:			nothing
 	
 	# Object types
+	package:		package
+	locale:			translation
 	game:			game
 	set:			set
 	stylesheet:		stylesheet
 	export template:export template
 	card:			card
+	cards:			cards
 	field:			field
 	style:			style
 	value:			value
+	keyword:		keyword
+	keywords:		keywords
 	
 	# Symbol editor shapes
 	shape:			shape
diff --git a/src/gui/packages_window.cpp b/src/gui/packages_window.cpp
index 8c63d1f4..dd24f942 100644
--- a/src/gui/packages_window.cpp
+++ b/src/gui/packages_window.cpp
@@ -608,6 +608,10 @@ void PackagesWindow::onOk(wxCommandEvent& ev) {
 	// Done
 	// Continue event propagation into the dialog window so that it closes.
 	ev.Skip();
+	//%% TODO: will we delete packages?
+	//%%       If so, we need to warn with _ERROR_1_("remove packages") and _ERROR_2_("remove packages modified")
+	//%%       We probably also refer to the type of package, _TYPE_("package"), for example _TYPE_("locale")
+	//%%       NOTE: The above text is for the locale.pl program
 }
 
 void PackagesWindow::onUpdateUI(wxUpdateUIEvent& ev) {
@@ -625,6 +629,7 @@ void PackagesWindow::onUpdateUI(wxUpdateUIEvent& ev) {
 			ev.Enable(package && package->can(PACKAGE_REMOVE  | where));
 			break;
 	}
+	// TODO: change labels to _BUTTON_("install group"), _BUTTON_("remove group"), _BUTTON_("upgrade group")
 }
 
 void PackagesWindow::onIdle(wxIdleEvent& ev) {
diff --git a/src/resource/common/expected_locale_keys b/src/resource/common/expected_locale_keys
index 8c5e372f..6266c7f0 100644
--- a/src/resource/common/expected_locale_keys
+++ b/src/resource/common/expected_locale_keys
@@ -1,6 +1,6 @@
 # This file contains the keys expected to be in MSE locales
 # It was automatically generated by tools/locale/locale.pl
-# Generated on Sun May 18 23:01:37 2008
+# Generated on Fri May 30 22:05:19 2008
 
 action:
 	add control point:	0
@@ -44,6 +44,7 @@ button:
 	browse:	0
 	check now:	0
 	check updates:	0
+	close:	0
 	defaults:	0
 	edit symbol:	0
 	enabled:	0
@@ -51,6 +52,7 @@ button:
 	high quality:	0
 	if internet connection exists:	0
 	insert parameter:	0
+	install group:	optional, 0
 	install package:	0
 	keep old:	0
 	last opened set:	0
@@ -63,6 +65,7 @@ button:
 	open set:	0
 	overwrite:	0
 	refer parameter:	0
+	remove group:	optional, 0
 	remove item:	0
 	remove package:	0
 	select:	optional, 0
@@ -72,6 +75,7 @@ button:
 	show editing hints:	0
 	show lines:	0
 	symbol gallery:	optional, 0
+	upgrade group:	optional, 0
 	upgrade package:	0
 	use auto replace:	0
 	use custom styling options:	0
@@ -107,6 +111,8 @@ error:
 	package not found:	1
 	package out of date:	3
 	package too new:	4
+	remove packages:	optional, 1
+	remove packages modified:	optional, 2
 	stylesheet and set refer to different game:	0
 	successful install:	optional, 2
 	unable to open output file:	0
@@ -400,6 +406,7 @@ title:
 	untitled:	0
 	update check:	0
 	updates:	0
+	updates available:	0
 tool:
 	add symmetry:	0
 	basic shapes:	0
@@ -510,8 +517,10 @@ type:
 	integer:	0
 	keyword:	0
 	keywords:	0
+	locale:	optional, 0
 	nil:	0
 	object:	0
+	package:	optional, 0
 	pentagon:	0
 	point:	0
 	points:	0