From 177be1bbf4d62e876795406d5da031bc772e224b Mon Sep 17 00:00:00 2001 From: Karl Ove Hufthammer Date: Wed, 12 Jan 2005 20:27:48 +0000 Subject: [PATCH] Made shape definitions more correct. --- src/magic.h | 6 +++--- src/po/nn.po | 15 ++++++--------- src/shapes.h | 48 ++++++++++++++++++++++++------------------------ 3 files changed, 33 insertions(+), 36 deletions(-) diff --git a/src/magic.h b/src/magic.h index a5ed47224..c827ccfdb 100644 --- a/src/magic.h +++ b/src/magic.h @@ -92,7 +92,7 @@ const char * const magic_names[NUM_MAGICS] = { gettext_noop("Blur"), gettext_noop("Smudge"), - gettext_noop("Fade"), + gettext_noop("Lighten"), gettext_noop("Darken"), gettext_noop("Chalk"), @@ -113,7 +113,7 @@ const char * const magic_names[NUM_MAGICS] = { const char * const magic_tips[NUM_MAGICS] = { gettext_noop("Click in the picture to fill that area with color."), - gettext_noop("Click and move to draw grass. Don't forget the dirt!"), + gettext_noop("Click and move to draw grass. Don’t forget the dirt!"), gettext_noop("Click and move to draw large bricks."), gettext_noop("Click and move to draw small bricks."), @@ -131,7 +131,7 @@ const char * const magic_tips[NUM_MAGICS] = { gettext_noop("Click and move the mouse around to make the picture blocky."), gettext_noop("Click and move the mouse around to draw a negative."), - gettext_noop("Click and move the mouse around to change the picture's color."), + gettext_noop("Click and move the mouse around to change the picture’s color."), gettext_noop("Click and move the mouse around to make the picture drip."), gettext_noop("Click and move the mouse around to turn the picture into a cartoon."), diff --git a/src/po/nn.po b/src/po/nn.po index ff6c3f93b..19a24ae6b 100644 --- a/src/po/nn.po +++ b/src/po/nn.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: nn\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2005-01-06 12:31+0100\n" -"PO-Revision-Date: 2005-01-12 19:53+0100\n" +"PO-Revision-Date: 2005-01-12 21:03+0100\n" "Last-Translator: Karl Ove Hufthammer \n" "Language-Team: Norwegian Nynorsk \n" "MIME-Version: 1.0\n" @@ -142,13 +142,13 @@ msgid "Mirror" msgstr "Spegel" msgid "Flip" -msgstr "Snu" +msgstr "Opp-ned" msgid "Click in the picture to fill that area with color." msgstr "Trykk på teikninga for å fylla området med fargen frå målingbøtta." msgid "Click and move to draw grass. Don't forget the dirt!" -msgstr "Hald inne knappen og flytt rundt for å teikna gras." +msgstr "Hald inne knappen og flytt rundt for å teikna gras. Ikkje gløym jorda!" msgid "Click and move to draw large bricks." msgstr "Hald inne knappen og flytt rundt for å teikna store mursteinar." @@ -169,7 +169,7 @@ msgid "Click and move the mouse around to smudge the picture." msgstr "Hald inne knappen og flytt rundt for å gni teikninga utover." msgid "Click and move to fade the colors." -msgstr "Hald inne knappen og flytt rundt for å bleikna fargane." +msgstr "Hald inne knappen og flytt rundt for å gjera fargane lysare." msgid "Click and move to darken the colors." msgstr "Hald inne knappen og flytt rundt for å gjera fargane mørkare." @@ -183,7 +183,7 @@ msgid "Click and move the mouse around to make the picture blocky." msgstr "Hald inne knappen og flytt rundt for å gjera teikninga «blokkete»." msgid "Click and move the mouse around to draw a negative." -msgstr "Hald inne knappen og flytt rundt for å invertera teikninga." +msgstr "Hald inne knappen og flytt rundt for å byta om på fargane." msgid "Click and move the mouse around to change the picture's color." msgstr "Hald inne knappen og flytt rundt for å endra fargane på teikninga." @@ -191,11 +191,8 @@ msgstr "Hald inne knappen og flytt rundt for å endra fargane på teikninga." msgid "Click and move the mouse around to make the picture drip." msgstr "Hald inne knappen og flytt rundt for å gjera teikninga dryppande." -#, fuzzy msgid "Click and move the mouse around to turn the picture into a cartoon." -msgstr "" -"Hald inne knappen og flytt rundt for å gjera teikninga om til ei " -"kritteikning." +msgstr "Hald inne knappen og flytt rundt for å gjera fargane klarare og strekane tydelegare." msgid "Click to make a mirror image." msgstr "Trykk for å spegelvenda teikninga." diff --git a/src/shapes.h b/src/shapes.h index 2eaa3de56..bb65ba5f2 100644 --- a/src/shapes.h +++ b/src/shapes.h @@ -22,8 +22,8 @@ enum { SHAPE_RECTANGLE_FILL, SHAPE_CIRCLE, SHAPE_CIRCLE_FILL, - SHAPE_OVAL, - SHAPE_OVAL_FILL, + SHAPE_ELLIPSE, + SHAPE_ELLIPSE_FILL, SHAPE_TRIANGLE, SHAPE_TRIANGLE_FILL, SHAPE_PENTAGON, @@ -43,8 +43,8 @@ const int shape_sides[NUM_SHAPES] = { 4, /* Rectangle */ 72, /* Circle */ 72, /* Circle */ - 72, /* Oval */ - 72, /* Oval */ + 72, /* Ellipse */ + 72, /* Ellipse */ 3, /* Triangle */ 3, /* Triangle */ 5, /* Pentagon */ @@ -63,8 +63,8 @@ const int shape_locked[NUM_SHAPES] = { 0, /* Rectangle */ 1, /* Circle */ 1, /* Circle */ - 0, /* Oval */ - 0, /* Oval */ + 0, /* Ellipse */ + 0, /* Ellipse */ 0, /* Triangle */ 0, /* Triangle */ 0, /* Pentagon */ @@ -83,8 +83,8 @@ const int shape_filled[NUM_SHAPES] = { 1, /* Rectangle */ 0, /* Circle */ 1, /* Circle */ - 0, /* Oval */ - 1, /* Oval */ + 0, /* Ellipse */ + 1, /* Ellipse */ 0, /* Triangle */ 1, /* Triangle */ 0, /* Pentagon */ @@ -104,8 +104,8 @@ const int shape_init_ang[NUM_SHAPES] = { 45, /* Rectangle */ 0, /* Circle */ 0, /* Circle */ - 0, /* Oval */ - 0, /* Oval */ + 0, /* Ellipse */ + 0, /* Ellipse */ 210, /* Triangle */ 210, /* Triangle */ 162, /* Pentagon */ @@ -124,8 +124,8 @@ const int shape_no_rotate[NUM_SHAPES] = { 0, /* Rectangle */ 1, /* Circle */ 1, /* Circle */ - 0, /* Oval */ - 0, /* Oval */ + 0, /* Ellipse */ + 0, /* Ellipse */ 0, /* Triangle */ 0, /* Triangle */ 0, /* Pentagon */ @@ -144,8 +144,8 @@ const char * const shape_names[NUM_SHAPES] = { gettext_noop("Rectangle"), gettext_noop("Circle"), gettext_noop("Circle"), - gettext_noop("Oval"), - gettext_noop("Oval"), + gettext_noop("Ellipse"), + gettext_noop("Ellipse"), gettext_noop("Triangle"), gettext_noop("Triangle"), gettext_noop("Pentagon"), @@ -158,20 +158,20 @@ const char * const shape_names[NUM_SHAPES] = { /* Some text to write when each shape is selected: */ const char * const shape_tips[NUM_SHAPES] = { - gettext_noop("A square has four equal sides and L-shaped corners."), - gettext_noop("A square has four equal sides and L-shaped corners."), - gettext_noop("A rectangle has four sides and L-shaped corners."), - gettext_noop("A rectangle has four sides and L-shaped corners."), - gettext_noop("A circle is exactly round."), - gettext_noop("A circle is exactly round."), - gettext_noop("Oval"), - gettext_noop("Oval"), + gettext_noop("A square is a rectangle with four equal sides."), + gettext_noop("A square is a rectangle with four equal sides."), + gettext_noop("A rectangle has four sides and four right angles."), + gettext_noop("A rectangle has four sides and four right angles."), + gettext_noop("A circle is a curve where all points have the same distance from the centre."), + gettext_noop("A circle is a curve where all points have the same distance from the centre."), + gettext_noop("An ellipse is a stretched circle."), + gettext_noop("An ellipse is a stretched circle."), gettext_noop("A triangle has three sides."), gettext_noop("A triangle has three sides."), gettext_noop("A pentagon has five sides."), gettext_noop("A pentagon has five sides."), - gettext_noop("A rhombus has four equal sides."), - gettext_noop("A rhombus has four equal sides.") + gettext_noop("A rhombus has four equal sides, and opposite sides are parallel."), + gettext_noop("A rhombus has four equal sides, and opposite sides are parallel.") };