Commit 27080254 authored by twanvl's avatar twanvl

Names of add/remove card/keyword actions

parent 02325c19
...@@ -91,7 +91,7 @@ GenericAddAction<T>::GenericAddAction(AddingOrRemoving ar, const vector<T>& item ...@@ -91,7 +91,7 @@ GenericAddAction<T>::GenericAddAction(AddingOrRemoving ar, const vector<T>& item
template <typename T> template <typename T>
String GenericAddAction<T>::getName() const { String GenericAddAction<T>::getName() const {
String type = type_name(steps.front().item) + (steps.size() == 1 ? _("") : _("s")); 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> template <typename T>
......
...@@ -357,7 +357,7 @@ AddSymbolPartAction::AddSymbolPartAction(Symbol& symbol, const SymbolPartP& part ...@@ -357,7 +357,7 @@ AddSymbolPartAction::AddSymbolPartAction(Symbol& symbol, const SymbolPartP& part
{} {}
String AddSymbolPartAction::getName(bool to_undo) const { 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) { void AddSymbolPartAction::perform(bool to_undo) {
...@@ -396,7 +396,7 @@ void RemoveSymbolPartsAction::check(SymbolGroup& group, const set<SymbolPartP>& ...@@ -396,7 +396,7 @@ void RemoveSymbolPartsAction::check(SymbolGroup& group, const set<SymbolPartP>&
} }
String RemoveSymbolPartsAction::getName(bool to_undo) const { 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) { void RemoveSymbolPartsAction::perform(bool to_undo) {
......
...@@ -86,6 +86,9 @@ class Card : public IntrusivePtrVirtualBase { ...@@ -86,6 +86,9 @@ class Card : public IntrusivePtrVirtualBase {
inline String type_name(const Card&) { inline String type_name(const Card&) {
return _TYPE_("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); void mark_dependency_member(const Card& value, const String& name, const Dependency& dep);
......
...@@ -114,6 +114,12 @@ class Keyword : public IntrusivePtrVirtualBase { ...@@ -114,6 +114,12 @@ class Keyword : public IntrusivePtrVirtualBase {
DECLARE_REFLECTION(); 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 // ----------------------------------------------------------------------------- : Using keywords
......
# This file contains the keys expected to be in MSE locales # This file contains the keys expected to be in MSE locales
# It was automatically generated by tools/locale/locale.pl # 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: action:
add control point: 0 add control point: 0
add part: 1 add item: 1
add symmetry: 0 add symmetry: 0
auto replace: 0 auto replace: 0
backspace: 0 backspace: 0
change: 1 change: 1
change combine mode: 0 change combine mode: 0
change shape name: 0 change shape name: 0
change symmetry copies: 0 change symmetry copies: 0
change symmetry type: 0 change symmetry type: 0
convert to curve: 0 convert to curve: 0
convert to line: 0 convert to line: 0
cut: 0 cut: 0
delete: 0 delete: 0
delete point: 0 delete point: 0
delete points: 0 delete points: 0
duplicate: 1 duplicate: 1
enter: 0 enter: 0
group parts: 0 group parts: 0
insert symbol: 0 insert symbol: 0
lock point: 0 lock point: 0
move: 1 move: 1
move curve: 0 move curve: 0
move handle: 0 move handle: 0
move symmetry center: 0 move symmetry center: 0
move symmetry handle: 0 move symmetry handle: 0
paste: 0 paste: 0
remove parts: 1 remove item: 1
reorder parts: 0 reorder parts: 0
rotate: 1 rotate: 1
scale: 1 scale: 1
shear: 1 shear: 1
soft line break: 0 soft line break: 0
typing: 0 typing: 0
ungroup parts: 0 ungroup parts: 0
button: button:
add item: 0 add item: 0
always: 0 always: 0
browse: 0 browse: 0
check now: 0 check now: 0
check updates: 0 check updates: 0
defaults: 0 defaults: 0
edit symbol: 0 edit symbol: 0
enabled: 0 enabled: 0
hide: 0 hide: 0
high quality: 0 high quality: 0
if internet connection exists: 0 if internet connection exists: 0
insert parameter: 0 insert parameter: 0
install group: 0 install package: 0
install package: 0 keep old: 0
keep old: 0 last opened set: 0
last opened set: 0 move down: 0
move down: 0 move up: 0
move up: 0 never: 0
never: 0 new set: 0
new set: 0 number: 0
number: 0 number overwrite: 0
number overwrite: 0 open set: 0
open set: 0 overwrite: 0
overwrite: 0 refer parameter: 0
refer parameter: 0 remove item: 0
remove item: 0 remove package: 0
remove group: 0 select: optional, 0
remove package: 0 select all: 0
select: optional, 0 select none: 0
select all: 0 show: 0
select none: 0 show editing hints: 0
show: 0 show lines: 0
show editing hints: 0 symbol gallery: optional, 0
show lines: 0 upgrade package: 0
symbol gallery: optional, 0 use auto replace: 0
upgrade group: 0 use custom styling options: 0
upgrade package: 0 use for all cards: 0
use auto replace: 0 whole word: 0
use custom styling options: 0 zoom export: 0
use for all cards: 0 error:
whole word: 0 aborting parsing: 0
zoom export: 0 can't convert: 2
error: can't convert value: 3
aborting parsing: 0 can't download installer: 2
can't convert: 2 cannot create file: 1
can't convert value: 3 checking updates failed: 0
can't download installer: 2 coordinates for blending overlap: 0
cannot create file: 1 dependency not given: 4
checking updates failed: 0 dimension not found: 1
coordinates for blending overlap: 0 downloading updates: 0
dependency not given: 4 expected key: 1
dimension not found: 1 file not found: 2
downloading updates: 0 file not found package like: 2
expected key: 1 file parse error: 2
file not found: 2 has no member: 2
file not found package like: 2 has no member value: 2
file parse error: 2 images used for blending must have the same size: 0
has no member: 2 in function: 2
has no member value: 2 in parameter: 2
images used for blending must have the same size: 0 installing updates: 0
in function: 2 internal error: 1
in parameter: 2 newer version: 2
installing updates: 0 no game specified: 1
internal error: 1 no stylesheet specified for the set: 0
newer version: 2 no updates: 0
no game specified: 1 package not found: 1
no stylesheet specified for the set: 0 package out of date: 3
no updates: 0 package too new: 4
package not found: 1 stylesheet and set refer to different game: 0
package out of date: 3 successful install: optional, 2
package too new: 4 unable to open output file: 0
remove packages: 1 unable to store file: 0
remove packages modified: 2 unrecognized value: 1
stylesheet and set refer to different game: 0 unsupported field type: 1
successful install: optional, 2 unsupported fill type: 1
unable to open output file: 0 unsupported format: 1
unable to store file: 0 word list type not found: 1
unrecognized value: 1 help:
unsupported field type: 1 about: 0
unsupported fill type: 1 add card: 0
unsupported format: 1 add cards: 0
word list type not found: 1 add keyword: 0
help: add symmetry: 0
about: 0 app language: 0
add card: 0 auto replace: 0
add cards: 0 basic shapes: 0
add keyword: 0 bold: 0
add symmetry: 0 border: 0
app language: 0 card list columns: 0
auto replace: 0 cards tab: 0
basic shapes: 0 check updates: 0
bold: 0 click to select shape: 0
border: 0 close symbol editor: 0
card list columns: 0 copies: 0
cards tab: 0 copy: 0
check updates: 0 copy card: 0
click to select shape: 0 copy keyword: 0
close symbol editor: 0 curve segment: 0
copies: 0 cut: 0
copy: 0 cut card: 0
copy card: 0 cut keyword: 0
copy keyword: 0 difference: 0
curve segment: 0 draft tab: optional, 0
cut: 0 drag to draw shape: 0
cut card: 0 drag to move curve: 0
cut keyword: 0 drag to move line: 0
difference: 0 drag to move point: 0
draft tab: optional, 0 drag to resize: 1
drag to draw shape: 0 drag to rotate: 1
drag to move curve: 0 drag to shear: 1
drag to move line: 0 draw ellipse: 0
drag to move point: 0 draw polygon: 0
drag to resize: 1 draw rectangle: 0
drag to rotate: 1 draw star: 0
drag to shear: 1 duplicate: 0
draw ellipse: 0 ellipse: 0
draw polygon: 0 exit: 0
draw rectangle: 0 export: 0
draw star: 0 export apprentice: 0
duplicate: 0 export html: 0
ellipse: 0 export image: 0
exit: 0 export images: 0
export: 0 export mws: 0
export apprentice: 0 filename format: 0
export html: 0 find: 0
export image: 0 find next: 0
export images: 0 free point: 0
export mws: 0 grid: 0
filename format: 0 group: 0
find: 0 index: 0
find next: 0 intersect: 0
free point: 0 italic: 0
grid: 0 keywords tab: 0
group: 0 last opened set: 1
index: 0 line segment: 0
intersect: 0 merge: 0
italic: 0 new set: 0
keywords tab: 0 new symbol: 0
last opened set: 1 new window: 0
line segment: 0 next card: 0
merge: 0 next keyword: 0
new set: 0 open set: 0
new symbol: 0 open symbol: 0
new window: 0 orientation: 0
next card: 0 overlap: 0
next keyword: 0 paint: 0
open set: 0 paste: 0
open symbol: 0 paste card: 0
orientation: 0 paste keyword: 0
overlap: 0 points: 0
paint: 0 polygon: 0
paste: 0 preferences: 0
paste card: 0 previous card: 0
paste keyword: 0 previous keyword: 0
points: 0 print: 0
polygon: 0 print preview: 0
preferences: 0 rectangle: 0
previous card: 0 redo: 0
previous keyword: 0 reflection: 0
print: 0 reload data: 0
print preview: 0 reminder text: 0
rectangle: 0 remove card: 0
redo: 0 remove keyword: 0
reflection: 0 remove symmetry: 0
reload data: 0 replace: 0
reminder text: 0 rotate: 0
remove card: 0 rotate 0: 0
remove keyword: 0 rotate 180: 0
remove symmetry: 0 rotate 270: 0
replace: 0 rotate 90: 0
rotate: 0 rotate card: 0
rotate 0: 0 rotation: 0
rotate 180: 0 save set: 0
rotate 270: 0 save set as: 0
rotate 90: 0 save symbol: 0
rotate card: 0 save symbol as: 0
rotation: 0 select: 0
save set: 0 set code: 0
save set as: 0 set info tab: 0
save symbol: 0 sides: 0
save symbol as: 0 smooth point: 0
select: 0 snap: 0
set code: 0 star: 0
set info tab: 0 stats tab: 0
sides: 0 store symbol: 0
smooth point: 0 style tab: 0
snap: 0 subtract: 0
star: 0 symbols: 0
stats tab: 0 symmetric point: 0
store symbol: 0 symmetry: 0
style tab: 0 undo: 0
subtract: 0 ungroup: 0
symbols: 0 website: 0
symmetric point: 0 welcome: 0
symmetry: 0 zoom export: 0
undo: 0 label:
ungroup: 0 app language: 0
website: 0 apprentice: 0
welcome: 0 apprentice exe: 0
zoom export: 0 apprentice export cancelled: 0
label: auto match: 0
app language: 0 auto replace: 0
apprentice: 0 card display: 0
apprentice exe: 0 card notes: 0
apprentice export cancelled: 0 cards to export: 0
auto match: 0 check at startup: 0
auto replace: 0 checking requires internet: 0
card display: 0 columns: 0
card notes: 0 export filenames: 0
cards to export: 0 external programs: 0
check at startup: 0 filename conflicts: 0
checking requires internet: 0 filename format: 0
columns: 0 filename is ignored: 0
export filenames: 0 filter: 0
external programs: 0 game type: 0
filename conflicts: 0 html export options: 0
filename format: 0 html template: 0
filename is ignored: 0 install package: 0
filter: 0 keyword: 0
game type: 0 language: 0
html export options: 0 magic set editor package: optional, 0
html template: 0 match: 0
install package: 0 mode: 0
keyword: 0 original: 0
language: 0 package action: 0
magic set editor package: optional, 0 package conflicts: 0
match: 0 package installable: 0
mode: 0 package installed: 0
original: 0 package modified: 0
package action: 0 package name: 0
package conflicts: 0 package status: 0
package installable: 0 package updates: 0
package installed: 0 percent of normal: 0
package modified: 0 reminder: 0
package name: 0 remove package: 0
package status: 0 result: 0
package updates: 0 save changes: 1
percent of normal: 0 select cards print: 0
reminder: 0 select columns: 0
remove package: 0 selection: 0
result: 0 set code: 0
save changes: 1 sides: optional, 0
select cards print: 0 size: 0
select columns: 0 standard keyword: 1
selection: 0 style type: 0
set code: 0 stylesheet not found: 1
sides: optional, 0 styling options: 0
size: 0 upgrade package: 0
standard keyword: 1 uses: 0
style type: 0 zoom: 0
stylesheet not found: 1 menu:
styling options: 0 about: 0
upgrade package: 0 add card: 0
uses: 0 add cards: 0
zoom: 0 add keyword: 0
menu: auto replace: 0
about: 0 basic shapes: 0
add card: 0 bold: 0
add cards: 0 card list columns: 0
add keyword: 0 cards: 0
auto replace: 0 cards tab: 0
basic shapes: 0 check updates: 0
bold: 0 close symbol editor: 0
card list columns: 0 copy: 0
cards: 0 cut: 0
cards tab: 0 draft tab: optional, 0
check updates: 0 duplicate: 0
close symbol editor: 0 edit: 0
copy: 0 exit: 0
cut: 0 export: 0
draft tab: optional, 0 export apprentice: 0
duplicate: 0 export html: 0
edit: 0 export image: 0
exit: 0 export images: 0
export: 0 export mws: 0
export apprentice: 0 file: 0
export html: 0 find: 0
export image: 0 find next: 0
export images: 0 format: 0
export mws: 0 group: 0
file: 0 help: 0
find: 0 index: 0
find next: 0 insert symbol: 0
format: 0 italic: 0
group: 0 keywords: 0
help: 0 keywords tab: 0
index: 0 new set: 0
insert symbol: 0 new symbol: 0
italic: 0 new window: 0
keywords: 0 next card: 0
keywords tab: 0 next keyword: 0
new set: 0 open set: 0
new symbol: 0 open symbol: 0
new window: 0 orientation: 0
next card: 0 paint: 0
next keyword: 0 paste: 0
open set: 0 points: 0
open symbol: 0 preferences: 0
orientation: 0 previous card: 0
paint: 0 previous keyword: 0
paste: 0 print: 0
points: 0 print preview: 0
preferences: 0 redo: 1
previous card: 0 reload data: 0
previous keyword: 0 reminder text: 0
print: 0 remove card: 0
print preview: 0 remove keyword: 0
redo: 1 replace: 0
reload data: 0 rotate: 0
reminder text: 0 rotate 0: 0
remove card: 0 rotate 180: 0
remove keyword: 0 rotate 270: 0
replace: 0 rotate 90: 0
rotate: 0 save set: 0
rotate 0: 0 save set as: 0
rotate 180: 0 save symbol: 0
rotate 270: 0 save symbol as: 0
rotate 90: 0 select: 0
save set: 0 set info tab: 0
save set as: 0 stats tab: 0
save symbol: 0 store symbol: 0
save symbol as: 0 style tab: 0
select: 0 symbols: 0
set info tab: 0 symmetry: 0
stats tab: 0 tool: 0
store symbol: 0 undo: 1
style tab: 0 ungroup: 0
symbols: 0 website: 0
symmetry: 0 window: 0
tool: 0 title:
undo: 1 %s - magic set editor: 1
ungroup: 0 about: 0
website: 0 auto replaces: 0
window: 0 cannot create file: 0
title: directories: 0
%s - magic set editor: 1 display: 0
about: 0 export cancelled: 0
auto replaces: 0 export html: 0
cannot create file: 0 export images: 0
directories: 0 global: 0
display: 0 installing updates: 0
export cancelled: 0 locate apprentice: 0
export html: 0 magic set editor: 0
export images: 0 new set: 0
global: 0 open set: 0
installing updates: 0 packages window: 0
locate apprentice: 0 preferences: 0
magic set editor: 0 print preview: 0
new set: 0 save changes: 0
open set: 0 save html: 0
packages window: 0 save image: 0
preferences: 0 save set: 0
print preview: 0 select cards: 0
save changes: 0 select cards export: 0
save html: 0 select columns: 0
save image: 0 select stylesheet: 0
save set: 0 slice image: 0
select cards: 0 symbol editor: 0
select cards export: 0 untitled: 0
select columns: 0 update check: 0
select stylesheet: 0 updates: 0
slice image: 0 tool:
symbol editor: 0 add symmetry: 0
untitled: 0 basic shapes: 0
update check: 0 border: 0
updates: 0 cards tab: 0
tool: curve segment: 0
add symmetry: 0 difference: 0
basic shapes: 0 draft tab: optional, 0
border: 0 ellipse: 0
cards tab: 0 free point: 0
curve segment: 0 grid: 0
difference: 0 intersect: 0
draft tab: optional, 0 keywords tab: 0
ellipse: 0 line segment: 0
free point: 0 merge: 0
grid: 0 overlap: 0
intersect: 0 paint: optional, 0
keywords tab: 0 points: 0
line segment: 0 polygon: 0
merge: 0 rectangle: 0
overlap: 0 redo: 0
paint: optional, 0 reflection: 0
points: 0 remove symmetry: 0
polygon: 0 rotate: 0
rectangle: 0 rotation: 0
redo: 0 select: 0
reflection: 0 set info tab: 0
remove symmetry: 0 smooth point: 0
rotate: 0 snap: 0
rotation: 0 star: 0
select: 0 stats tab: 0
set info tab: 0 store symbol: 0
smooth point: 0 style tab: 0
snap: 0 subtract: 0
star: 0 symmetric point: 0
stats tab: 0 symmetry: 0
store symbol: 0 undo: 0
style tab: 0 tooltip:
subtract: 0 add card: 0
symmetric point: 0 add keyword: 0
symmetry: 0 add symmetry: 0
undo: 0 basic shapes: 0
tooltip: bold: 0
add card: 0 border: 0
add keyword: 0 cards tab: 0
add symmetry: 0 copy: 0
basic shapes: 0 curve segment: 0
bold: 0 cut: 0
border: 0 difference: 0
cards tab: 0 draft tab: optional, 0
copy: 0 ellipse: 0
curve segment: 0 export: 0
cut: 0 free point: 0
difference: 0 grid: 0
draft tab: optional, 0 intersect: 0
ellipse: 0 italic: 0
export: 0 keywords tab: 0
free point: 0 line segment: 0
grid: 0 merge: 0
intersect: 0 new set: 0
italic: 0 open set: 0
keywords tab: 0 overlap: 0
line segment: 0 paint: optional, 0
merge: 0 paste: 0
new set: 0 points: 0
open set: 0 polygon: 0
overlap: 0 rectangle: 0
paint: optional, 0 redo: 1
paste: 0 reflection: 0
points: 0 reminder text: 0
polygon: 0 remove card: 0
rectangle: 0 remove keyword: 0
redo: 1 remove symmetry: 0
reflection: 0 rotate: 0
reminder text: 0 rotate card: 0
remove card: 0 rotation: 0
remove keyword: 0 save set: 0
remove symmetry: 0 select: 0
rotate: 0 set info tab: 0
rotate card: 0 smooth point: 0
rotation: 0 snap: 0
save set: 0 star: 0
select: 0 stats tab: 0
set info tab: 0 store symbol: 0
smooth point: 0 style tab: 0
snap: 0 subtract: 0
star: 0 symbols: 0
stats tab: 0 symmetric point: 0
store symbol: 0 symmetry: 0
style tab: 0 undo: 1
subtract: 0 type:
symbols: 0 boolean: 0
symmetric point: 0 card: 0
symmetry: 0 cards: 0
undo: 1 circle: 0
type: collection: 0
boolean: 0 collection of: 1
card: 0 color: 0
circle: 0 double: 0
collection: 0 ellipse: 0
collection of: 1 export template: 0
color: 0 field: 0
double: 0 function: 0
ellipse: 0 game: 0
export template: 0 group: 0
field: 0 hexagon: 0
function: 0 image: 0
game: 0 integer: 0
group: 0 keyword: 0
hexagon: 0 keywords: 0
image: 0 nil: 0
integer: 0 object: 0
nil: 0 pentagon: 0
object: 0 point: 0
pentagon: 0 points: 0
point: 0 polygon: 0
points: 0 rectangle: 0
polygon: 0 reflection: 0
rectangle: 0 rhombus: 0
reflection: 0 rotation: 0
rhombus: 0 set: 0
rotation: 0 shape: 0
set: 0 shapes: 0
shape: 0 square: 0
shapes: 0 star: 0
square: 0 string: 0
star: 0 style: 0
string: 0 stylesheet: 0
style: 0 triangle: 0
stylesheet: 0 value: 0
triangle: 0
value: 0
...@@ -35,6 +35,9 @@ void mark_dependency_member(const T& value, const String& name, const Dependency ...@@ -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&) { template <typename T> inline String type_name(const T&) {
return _TYPE_("object"); 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) { template <typename K, typename V> inline String type_name(const pair<K,V>& p) {
return type_name(p.second); // for maps return type_name(p.second); // for maps
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment