Names of add/remove card/keyword actions

src/data/action/generic.hpp

@@ -91,7 +91,7 @@ GenericAddAction<T>::GenericAddAction(AddingOrRemoving ar, const vector<T>& item
 template <typename T>
 String GenericAddAction<T>::getName() const {
 	String type = type_name(steps.front().item) + (steps.size() == 1 ? _("") : _("s"));
-	return adding ? _ACTION_1_("add object", type) : _ACTION_1_("remove object", type);
+	return adding ? _ACTION_1_("add item", type) : _ACTION_1_("remove item", type);
 }
 
 template <typename T>

src/data/action/symbol.cpp

@@ -357,7 +357,7 @@ AddSymbolPartAction::AddSymbolPartAction(Symbol& symbol, const SymbolPartP& part
 {}
 
 String AddSymbolPartAction::getName(bool to_undo) const {
-	return _ACTION_1_("add part", part->name);
+	return _ACTION_1_("add item", part->name);
 }
 
 void AddSymbolPartAction::perform(bool to_undo) {
@@ -396,7 +396,7 @@ void RemoveSymbolPartsAction::check(SymbolGroup& group, const set<SymbolPartP>&
 }
 
 String RemoveSymbolPartsAction::getName(bool to_undo) const {
-	return _ACTION_1_("remove parts", removals.size() == 1 ? _TYPE_("shape") : _TYPE_("shapes"));
+	return _ACTION_1_("remove item", removals.size() == 1 ? _TYPE_("shape") : _TYPE_("shapes"));
 }
 
 void RemoveSymbolPartsAction::perform(bool to_undo) {

src/data/card.hpp

@@ -86,6 +86,9 @@ class Card : public IntrusivePtrVirtualBase {
 inline String type_name(const Card&) {
 	return _TYPE_("card");
 }
+inline String type_name(const vector<CardP>&) {
+	return _TYPE_("cards"); // not actually used, only for locale.pl script
+}
 
 void mark_dependency_member(const Card& value, const String& name, const Dependency& dep);
 

src/data/keyword.hpp

@@ -114,6 +114,12 @@ class Keyword : public IntrusivePtrVirtualBase {
 	DECLARE_REFLECTION();
 };
 
+inline String type_name(const Keyword&) {
+	return _TYPE_("keyword");
+}
+inline String type_name(const vector<KeywordP>&) {
+	return _TYPE_("keywords"); // not actually used, only for locale.pl script
+}
 
 // ----------------------------------------------------------------------------- : Using keywords
 

src/resource/common/expected_locale_keys

 # This file contains the keys expected to be in MSE locales
 # It was automatically generated by tools/locale/locale.pl
-# Generated on Sat Dec 29 23:09:36 2007
+# Generated on Sun May 18 23:01:37 2008
 
 action:
 	add control point:	0
-	add part:	1
+	add item:	1
 	add symmetry:	0
 	auto replace:	0
 	backspace:	0
@@ -30,7 +30,7 @@ action:
 	move symmetry center:	0
 	move symmetry handle:	0
 	paste:	0
-	remove parts:	1
+	remove item:	1
 	reorder parts:	0
 	rotate:	1
 	scale:	1
@@ -51,7 +51,6 @@ button:
 	high quality:	0
 	if internet connection exists:	0
 	insert parameter:	0
-	install group:		0
 	install package:	0
 	keep old:	0
 	last opened set:	0
@@ -65,7 +64,6 @@ button:
 	overwrite:	0
 	refer parameter:	0
 	remove item:	0
-	remove group: 0
 	remove package:	0
 	select:	optional, 0
 	select all:	0
@@ -74,7 +72,6 @@ button:
 	show editing hints:	0
 	show lines:	0
 	symbol gallery:	optional, 0
-	upgrade group:	0
 	upgrade package:	0
 	use auto replace:	0
 	use custom styling options:	0
@@ -110,8 +107,6 @@ error:
 	package not found:	1
 	package out of date:	3
 	package too new:	4
-	remove packages:	1
-	remove packages modified:	2
 	stylesheet and set refer to different game:	0
 	successful install:	optional, 2
 	unable to open output file:	0
@@ -498,6 +493,7 @@ tooltip:
 type:
 	boolean:	0
 	card:	0
+	cards:	0
 	circle:	0
 	collection:	0
 	collection of:	1
@@ -512,6 +508,8 @@ type:
 	hexagon:	0
 	image:	0
 	integer:	0
+	keyword:	0
+	keywords:	0
 	nil:	0
 	object:	0
 	pentagon:	0

src/script/to_value.hpp

@@ -35,6 +35,9 @@ void mark_dependency_member(const T& value, const String& name, const Dependency
 template <typename T> inline String type_name(const T&) {
 	return _TYPE_("object");
 }
+template <typename T> inline String type_name(const intrusive_ptr<T>& p) {
+	return type_name(*p.get());
+}
 template <typename K, typename V> inline String type_name(const pair<K,V>& p) {
 	return type_name(p.second); // for maps
 }