Skip to content

Commit

Permalink
fix NOOP translations
Browse files Browse the repository at this point in the history
  • Loading branch information
kaa-ching committed Aug 20, 2015
1 parent 3cb7645 commit 825db79
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 26 deletions.
36 changes: 18 additions & 18 deletions src/model/PolyObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -44,8 +44,8 @@ static PolyObjectFactory thePolyObjectFactory;

static AbstractPolyObjectFactory theBowlingPinFactory(
"BowlingPin",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Bowling Pin"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Bowling pins are meant to be run "
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Bowling Pin"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Bowling pins are meant to be run "
"over - and most people prefer to do that using "
"a Bowling Ball."),
"BowlingPin",
Expand All @@ -57,8 +57,8 @@ static AbstractPolyObjectFactory theBowlingPinFactory(

static AbstractPolyObjectFactory theSkyhookFactory(
"Skyhook",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Skyhook"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "A skyhook just hangs in the air. And you can hang a "
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Skyhook"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "A skyhook just hangs in the air. And you can hang a "
"lot of weight on it!"),
"Skyhook",
"(-0.03,-0.07)=(0.01,-0.11)=(0.05,-0.11)=(0.1,-0.05)=(0.1,-0.02)"
Expand All @@ -67,40 +67,40 @@ static AbstractPolyObjectFactory theSkyhookFactory(

static AbstractPolyObjectFactory theWeightFactory(
"Weight",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Weight"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "A serious mass. As heavy as it looks!"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Weight"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "A serious mass. As heavy as it looks!"),
"Weight",
"(-0.20,-0.20)=(0.20,-0.20)=(0.06,0.20)=(-0.06,0.20)",
0.40, 0.40, 10.0, 0.3 );

static AbstractPolyObjectFactory theLeftRampFactory(
"LeftRamp",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Left Ramp"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "This is a ramp. The left is lower than the right, so things slide to the left."),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Left Ramp"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "This is a ramp. The left is lower than the right, so things slide to the left."),
"LeftRamp",
"(-0.5,-0.46)=(-0.5,-0.5)=(0.13,-0.5)=(0.5,0.5)",
1.0, 1.0, 0.0, 0.2 );

static AbstractPolyObjectFactory theRightRampFactory(
"RightRamp",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Right Ramp"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "This is a ramp. The left is higher than the right, so things slide to the right."),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Right Ramp"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "This is a ramp. The left is higher than the right, so things slide to the right."),
"RightRamp",
"(-0.5,0.5)=(-0.13,-0.5)=(0.5,-0.5)=(0.5,-0.46)",
1.0, 1.0, 0.0, 0.2 );

static AbstractPolyObjectFactory theLeftWedgeFactory(
"LeftWedge",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Left Wedge"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "This is a wedge. The left is lower than the right, so things slide to the left."),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Left Wedge"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "This is a wedge. The left is lower than the right, so things slide to the left."),
"birch-wedge-left",
"(-0.5,-0.46)=(-0.5,-0.5)=(0.5,-0.5)=(0.5,0.5)",
1.0, 1.0, 0.0, 0.2 );

static AbstractPolyObjectFactory theRightWedgeFactory(
"RightWedge",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Right Wedge"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "This is a wedge. The left is higher than the right, so things slide to the right."),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Right Wedge"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "This is a wedge. The left is higher than the right, so things slide to the right."),
"birch-wedge-right",
"(-0.5,0.5)=(-0.5,-0.5)=(0.5,-0.5)=(0.5,-0.46)",
1.0, 1.0, 0.0, 0.2 );
Expand All @@ -109,8 +109,8 @@ static AbstractPolyObjectFactory theRightWedgeFactory(
// on both the inside and the outside - you can use both if you want :-)
static AbstractPolyObjectFactory the40QuarterArcFactory(
"QuarterArc40",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Quarter Arc Small"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "This is a quarter arc. Or ninety degrees, or 1.57 radians if you want."),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Quarter Arc Small"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "This is a quarter arc. Or ninety degrees, or 1.57 radians if you want."),
"QuarterArc",
"(0.100,-.200)=(0.200,-.200)=(0.180,-.076)=(0.085,-.107);"
"(0.085,-.107)=(0.180,-.076)=(0.124,0.035)=(0.043,-.024);"
Expand All @@ -123,8 +123,8 @@ static AbstractPolyObjectFactory the40QuarterArcFactory(
// on both the inside and the outside - you can use both if you want :-)
static AbstractPolyObjectFactory the80QuarterArcFactory(
"QuarterArc80",
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "Quarter Arc Large"),
QT_TRANSLATE_NOOP(AbstractPolyObjectFactory, "This is a quarter arc. Or ninety degrees, or 1.57 radians if you want."),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "Quarter Arc Large"),
QT_TRANSLATE_NOOP("AbstractPolyObjectFactory", "This is a quarter arc. Or ninety degrees, or 1.57 radians if you want."),
"QuarterArc80",
"( 0.300,-0.400)=( 0.400,-0.400)=( 0.388,-0.261)=( 0.289,-0.278);"
"( 0.289,-0.278)=( 0.388,-0.261)=( 0.352,-0.126)=( 0.258,-0.161);"
Expand Down
16 changes: 8 additions & 8 deletions src/model/RectObject.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -49,27 +49,27 @@ static RectObjectFactory theRectObjectFactory;
// anImageName, aWidth,aHeight, aMass, aBounciness

static AbstractRectObjectFactory theDomRedFactory("DominoRed",
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "Domino (Red)"),
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "The famous plastic red domino stone"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "Domino (Red)"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "The famous plastic red domino stone"),
"DominoRed", 0.1, 0.5, 2.5, 0.1 );

static AbstractRectObjectFactory theDomBlueFactory("DominoBlue",
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "Domino (Blue)"),
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "The famous plastic blue domino stone"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "Domino (Blue)"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "The famous plastic blue domino stone"),
"DominoBlue", 0.1, 0.5, 2.5, 0.1 );

static AbstractRectObjectFactory theDomGreenFactory("DominoGreen",
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "Domino (Green)"),
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "The famous plastic green domino stone"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "Domino (Green)"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "The famous plastic green domino stone"),
"DominoGreen", 0.1, 0.5, 2.5, 0.1 );

static AbstractRectObjectFactory theFloorFactory("Floor",
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "Floor"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "Floor"),
"",
"used_wood_bar", 1.0, 0.1, 0.0, 0.1 );

static AbstractRectObjectFactory theWallFactory("Wall",
QT_TRANSLATE_NOOP(AbstractRectObjectFactory, "Wall"),
QT_TRANSLATE_NOOP("AbstractRectObjectFactory", "Wall"),
"",
"oldbrick", 0.2, 1.0, 0.0, 0.05 );

Expand Down

0 comments on commit 825db79

Please sign in to comment.