diff --git a/src/po/ach.po b/src/po/ach.po
index 8da621dc9..f03b7449d 100644
--- a/src/po/ach.po
+++ b/src/po/ach.po
@@ -6,15 +6,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-26 17:43+0900\n"
-"PO-Revision-Date: 2010-10-25 15:44+0200\n"
+"POT-Creation-Date: 2010-08-17 15:55-0700\n"
+"PO-Revision-Date: 2010-12-09 09:00+0200\n"
 "Last-Translator: George Patrick <chanchumgpa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: ach\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: ach\n"
-"X-Generator: Pootle 2.1.1\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Pootle 2.1.5\n"
 
 #. Response to Black (0, 0, 0) color selected
 #: ../colors.h:86
@@ -74,7 +75,7 @@ msgstr "Bululu!"
 #. Response to Lavender (186, 157, 255) color selected
 #: ../colors.h:119
 msgid "Lavender!"
-msgstr "Macalu papul!"
+msgstr "Macalo papul!"
 
 #. Response to Purple (128, 0, 128) color selected
 #: ../colors.h:122
@@ -315,7 +316,7 @@ msgstr "Jami tic"
 #. Title of color palette (buttons across the bottom)
 #: ../titles.h:59
 msgid "Colors"
-msgstr "Kwone rangi mapatpat"
+msgstr "Rangi"
 
 #. Title of brush selector (buttons down the right for paint and line tools)
 #: ../titles.h:62
@@ -336,12 +337,12 @@ msgstr "Ladong alama"
 #. Shape creation tool (square, circle, etc.)
 #: ../titles.h:71 ../tools.h:71
 msgid "Shapes"
-msgstr "Kwone jami mapatpat"
+msgstr "Kite"
 
 #. Title of font selector (buttons down the right for text and label tools)
 #: ../titles.h:74
 msgid "Letters"
-msgstr "Nyukta"
+msgstr "Nukuta"
 
 #. Title of magic tool selector (buttons down the right for magic (effect plugin) tool)
 #. "Magic" effects tools (blur, flip image, etc.)
@@ -362,7 +363,7 @@ msgstr "Dong alama"
 #. Line drawing tool
 #: ../tools.h:68
 msgid "Lines"
-msgstr "Layin"
+msgstr "Rek"
 
 #. Text tool
 #: ../tools.h:74
@@ -397,7 +398,7 @@ msgstr "Nyen"
 #. Open a saved picture
 #. buttons for the file open dialog
 #. Open dialog: 'Open' button, to load the selected picture
-#: ../tools.h:98 ../tuxpaint.c:7605
+#: ../tools.h:98 ../tuxpaint.c:7762
 msgid "Open"
 msgstr "Yabi"
 
@@ -419,17 +420,17 @@ msgstr "Wek woko"
 #. Paint tool instructions
 #: ../tools.h:115
 msgid "Pick a color and a brush shape to draw with."
-msgstr "Yer rangi ma imito ki cal lalingcal wek igo cal kwede"
+msgstr "Kwany rangi ki kit pa lajwac cite igo kwede."
 
 #. Stamp tool instructions
 #: ../tools.h:118
 msgid "Pick a picture to stamp around your drawing."
-msgstr "Yer cal ma omyero idi iteng cal ma igoyo"
+msgstr "Kwany cal ma omyero idi iteng cal megi ma igoyo."
 
 #. Line tool instructions
 #: ../tools.h:121
 msgid "Click to start drawing a line. Let go to complete it."
-msgstr "Dii me cako goyo layin.Wek diyo ka ityeko goyo"
+msgstr "Dii me cako goyo rek. Wek wot ka tyeko goyo ne."
 
 #. Shape tool instructions
 #: ../tools.h:124
@@ -437,8 +438,8 @@ msgid ""
 "Pick a shape. Click to pick the center, drag, then let go when it is the "
 "size you want. Move around to rotate it, and click to draw it."
 msgstr ""
-"Yer cal.Di me yero dyere,ywaa, ci wek ywayo ka oo i kit caji ma imito.Ywa "
-"calo lawala ka imito wiiro ne, ci i dii me goyo cal man."
+"Kwany kite. Di me yero dyere,ywaa, ci wek ywayo ka oo i kit ma imito. Ywa "
+"calo lawala ka imito wiro ne, ci i di me goyo cal man."
 
 #. Text tool instructions
 #: ../tools.h:127
@@ -446,8 +447,8 @@ msgid ""
 "Choose a style of text. Click on your drawing and you can start typing. "
 "Press [Enter] or [Tab] to complete the text."
 msgstr ""
-"Yer kit coc mo keken.Di kum cal mamegi ci dong iromo cako goyo coc.Di Enter "
-"onyo Tab me tyeko coc mamegi."
+"Yer kit coc mo keken.Di kum cal megi ci dong iromo cako goyo coc. Di Enter "
+"onyo Tab me tyeko coc megi."
 
 #. Label tool instructions
 #: ../tools.h:130
@@ -457,15 +458,15 @@ msgid ""
 "and clicking an exist label, you can move it, edit it and change its text "
 "style."
 msgstr ""
-"Yer kit coc mo keken.Di kum cal mamegi ci dong iromo dong cako goyo coc.Di "
-"(Donyi) onyo Tab me tyeko coc mamegi.Ka itio ki layer jami kun idiyo coc ma "
+"Yer kit coc mo keken.Di kum cal megi ci dong iromo dong cako goyo coc.Di "
+"(Donyi) onyo Tab me tyeko coc megi.Ka itiyo ki layer jami kun idiyo coc ma "
 "dong tye,iromo diro kakare, loko ne kit ma imito kun bene iloko wa kit coc "
 "ne. "
 
 #. Magic tool instruction
 #: ../tools.h:136
 msgid "Pick a magical effect to use on your drawing!"
-msgstr "Yer wek otime calo tangu tangu ikum cal mamegi "
+msgstr "Yer wek otime calo tangu tangu ikum cal megi!"
 
 #. Response to 'undo' action
 #: ../tools.h:139
@@ -485,17 +486,17 @@ msgstr "Lajwa!"
 #. Response to 'start a new image' action
 #: ../tools.h:148
 msgid "Pick a color or picture with which to start a new drawing."
-msgstr "Yer rangi onyo cal ma omyero icak gi goco ma nyen."
+msgstr "Kwany rangi onyo cal ma omyero icak ki goc manyen."
 
 #. Response to 'open' action (while file dialog is being constructed)
 #: ../tools.h:151
 msgid "Open…"
-msgstr "Yabi"
+msgstr "Yab..."
 
 #. Response to 'save' action
 #: ../tools.h:154
 msgid "Your image has been saved!"
-msgstr "Cal mamegi ki  tyeko gwoko!"
+msgstr "Cal megi ki tyeko gwoko woko!"
 
 #. Response to 'print' action (while printing, or print dialog is being used)
 #: ../tools.h:157
@@ -510,12 +511,12 @@ msgstr "Dong maber ba!"
 #. Instruction while using Line tool (after click, before release)
 #: ../tools.h:164
 msgid "Let go of the button to complete the line."
-msgstr "Wek citi ikum ladii me tyeko  layin."
+msgstr "Wek citi ikum ladic me tyeko  rek."
 
 #. Instruction while using Shape tool (after first click, before release)
 #: ../tools.h:167
 msgid "Hold the button to stretch the shape."
-msgstr "Mak ladic me telo onyo nyayo cal mamegi."
+msgstr "Mak ladic me telo onyo nyayo kit cal megi."
 
 #. Instruction while finishing Shape tool (after release, during rotation step before second click)
 #: ../tools.h:170
@@ -528,179 +529,179 @@ msgid "OK then… Let’s keep drawing this one!"
 msgstr "Kakare...Wamede ki goyo cal eni ni!"
 
 #. Prompt to confirm user wishes to quit
-#: ../tuxpaint.c:2040
+#: ../tuxpaint.c:1918
 msgid "Do you really want to quit?"
 msgstr "Adaa imito aao?"
 
 #. Quit prompt positive response (quit)
-#: ../tuxpaint.c:2043
+#: ../tuxpaint.c:1921
 msgid "Yes, I’m done!"
 msgstr "Eyo,dong atyeko oo!"
 
 #. Quit prompt negative response (don't quit)
-#: ../tuxpaint.c:2046 ../tuxpaint.c:2073
+#: ../tuxpaint.c:1924 ../tuxpaint.c:1951
 msgid "No, take me back!"
 msgstr "Ku, dwoka dok cen!"
 
 #. Current picture is not saved; user is quitting
-#: ../tuxpaint.c:2050
+#: ../tuxpaint.c:1928
 msgid "If you quit, you’ll lose your picture! Save it?"
 msgstr "Ka i aao, ibino rwenyo cal mamegi woko! Imito gwoko ne?"
 
-#: ../tuxpaint.c:2051 ../tuxpaint.c:2056
+#: ../tuxpaint.c:1929 ../tuxpaint.c:1934
 msgid "Yes, save it!"
 msgstr "Eyo, gwoki!"
 
-#: ../tuxpaint.c:2052 ../tuxpaint.c:2057
+#: ../tuxpaint.c:1930 ../tuxpaint.c:1935
 msgid "No, don’t bother saving!"
 msgstr "Ku, pe iyele me gwoko ne!"
 
 #. Current picture is not saved; user is opening another picture
-#: ../tuxpaint.c:2055
+#: ../tuxpaint.c:1933
 msgid "Save your picture first?"
 msgstr "Kong ki gwok cali maenini?"
 
 #. Error opening picture
-#: ../tuxpaint.c:2060
+#: ../tuxpaint.c:1938
 msgid "Can’t open that picture!"
 msgstr "Yabo cal eno ni oloya woko!"
 
 #. Generic dialog dismissal
-#: ../tuxpaint.c:2063 ../tuxpaint.c:2068 ../tuxpaint.c:2077 ../tuxpaint.c:2084
-#: ../tuxpaint.c:2093
+#: ../tuxpaint.c:1941 ../tuxpaint.c:1946 ../tuxpaint.c:1955 ../tuxpaint.c:1962
+#: ../tuxpaint.c:1971
 msgid "OK"
 msgstr "Aya do."
 
 #. Notification that 'Open' dialog has nothing to show
-#: ../tuxpaint.c:2067
+#: ../tuxpaint.c:1945
 msgid "There are no saved files!"
 msgstr "Pe tye fayil mo keken ma onongo kigwoko."
 
 #. Verification of print action
-#: ../tuxpaint.c:2071
+#: ../tuxpaint.c:1949
 msgid "Print your picture now?"
 msgstr "Ki go cal mamegi ni dong ikaratac?"
 
-#: ../tuxpaint.c:2072
+#: ../tuxpaint.c:1950
 msgid "Yes, print it!"
 msgstr "Eyo, go ne!"
 
 #. Confirmation of successful (we hope) printing
-#: ../tuxpaint.c:2076
+#: ../tuxpaint.c:1954
 msgid "Your picture has been printed!"
 msgstr "Kityeko dong goyo cal mamegi woko! "
 
 #. We got an error printing
-#: ../tuxpaint.c:2080
+#: ../tuxpaint.c:1958
 msgid "Sorry! Your picture could not be printed!"
 msgstr "Tim wa kica! Pe wa goyo cal mamegi!"
 
 #. Notification that it's too soon to print again (--printdelay option is in effect)
-#: ../tuxpaint.c:2083
+#: ../tuxpaint.c:1961
 msgid "You can’t print yet!"
 msgstr "Pwod pe iromo goyo cal mamegi"
 
 #. Prompt to confirm erasing a picture in the Open dialog
-#: ../tuxpaint.c:2087
+#: ../tuxpaint.c:1965
 msgid "Erase this picture?"
 msgstr "Duny cal eni woko?"
 
-#: ../tuxpaint.c:2088
+#: ../tuxpaint.c:1966
 msgid "Yes, erase it!"
 msgstr "Eyo,duny oo!"
 
-#: ../tuxpaint.c:2089
+#: ../tuxpaint.c:1967
 msgid "No, don’t erase it!"
 msgstr "Ku, pe iduny!"
 
 #. Reminder that Mouse Button 1 is the button to use in Tux Paint
-#: ../tuxpaint.c:2092
+#: ../tuxpaint.c:1970
 msgid "Remember to use the left mouse button!"
 msgstr "Po me tic ki mapeca tung acam me oyo/ladic!"
 
 #. Sound has been muted (silenced) via keyboard shortcut
-#: ../tuxpaint.c:2300
+#: ../tuxpaint.c:2567
 msgid "Sound muted."
 msgstr "Dwon kineko oo weng."
 
 #. Sound has been unmuted (unsilenced) via keyboard shortcut
-#: ../tuxpaint.c:2305
+#: ../tuxpaint.c:2572
 msgid "Sound unmuted."
 msgstr "Dwon kiyabu."
 
 #. Wait while Text tool finishes loading fonts
-#: ../tuxpaint.c:3052
+#: ../tuxpaint.c:3355
 msgid "Please wait…"
 msgstr "Tim ber ikur..."
 
 #. Open dialog: 'Erase' button, to erase/deleted the selected picture
-#: ../tuxpaint.c:7608
+#: ../tuxpaint.c:7765
 msgid "Erase"
 msgstr "Duny"
 
 #. Open dialog: 'Slides' button, to switch to slide show mode
-#: ../tuxpaint.c:7611
+#: ../tuxpaint.c:7768
 msgid "Slides"
 msgstr "cale macer malube aluba "
 
 #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
-#: ../tuxpaint.c:7614
+#: ../tuxpaint.c:7771
 msgid "Back"
 msgstr "Cen"
 
 #. Slideshow: 'Next' button, to load next slide (image)
-#: ../tuxpaint.c:7617
+#: ../tuxpaint.c:7774
 msgid "Next"
 msgstr "Mede anyim"
 
 #. Slideshow: 'Play' button, to begin a slideshow sequence
-#: ../tuxpaint.c:7620
+#: ../tuxpaint.c:7777
 msgid "Play"
 msgstr "Tuki"
 
 #. Label for 'Letters' buttons (font selector, down the right when the Text tool is being used); used to show the difference between font faces
-#: ../tuxpaint.c:8328
+#: ../tuxpaint.c:8485
 msgid "Aa"
 msgstr "Aa"
 
 #. Admittedly stupid way of determining which keys can be used for
 #. positive and negative responses in dialogs (e.g., [Y] (for 'yes') in English)
-#: ../tuxpaint.c:11586
+#: ../tuxpaint.c:11730
 msgid "Yes"
 msgstr "Eyo"
 
-#: ../tuxpaint.c:11590
+#: ../tuxpaint.c:11734
 msgid "No"
 msgstr "Ku"
 
 #. Prompt to ask whether user wishes to save over old version of their file
-#: ../tuxpaint.c:12608
+#: ../tuxpaint.c:12730
 msgid "Replace the picture with your changes?"
 msgstr "Kilok cal malube ki alokaloka itici manyeni?"
 
 #. Positive response to saving over old version
 #. (like a 'File:Save' action in other applications)
-#: ../tuxpaint.c:12612
+#: ../tuxpaint.c:12734
 msgid "Yes, replace the old one!"
 msgstr "Eyo,lok kun ileyo maconi oo!"
 
 #. Negative response to saving over old version (saves a new image)
 #. (like a 'File:Save As...' action in other applications)
-#: ../tuxpaint.c:12616
+#: ../tuxpaint.c:12738
 msgid "No, save a new file!"
 msgstr "Ku, gwok fayil manyen!"
 
-#: ../tuxpaint.c:13861
+#: ../tuxpaint.c:13963
 msgid "Choose the picture you want, then click “Open”."
 msgstr "Yer cal ma imito, ci idi \"Yabi\""
 
 #. Let user choose images:
 #. Instructions for Slideshow file dialog (FIXME: Make a #define)
-#: ../tuxpaint.c:14892 ../tuxpaint.c:15220
+#: ../tuxpaint.c:14976 ../tuxpaint.c:15290
 msgid "Choose the pictures you want, then click “Play”."
 msgstr "Yer cal ma imito, ci idi \"Tuki\"."
 
-#: ../tuxpaint.c:22159
+#: ../tuxpaint.c:21524
 msgid "Pick a color."
 msgstr "Kwany rangi."
 
@@ -728,243 +729,209 @@ msgstr "Dii ci iywa ladic ne wek olok rangi idul kom cal mamegi."
 msgid "Click to change the colors in your entire picture."
 msgstr "Dii wek olok rangi ikom cal mamegi weng."
 
-#: ../../magic/src/blind.c:117
+#: ../../magic/src/blind.c:92
 msgid "Blind"
 msgstr "Too wang"
 
-#: ../../magic/src/blind.c:122
+#: ../../magic/src/blind.c:97
 msgid ""
 "Click towards the edge of your picture to pull window blinds over it. Move "
 "perpendicularly to open or close the blinds."
 msgstr ""
-"Dii macok ki lak cal ma megi wek iywa ci iwum ki dirica ma latowang ikume."
-"Ywa atira ci oyab onyo lor towang."
+"Dii macok ki lak cal ma megi wek iywa ci iwum ki dirica ma latowang "
+"ikume.Ywa atira ci oyab onyo lor towang."
 
-#: ../../magic/src/blocks_chalk_drip.c:136
+#: ../../magic/src/blocks_chalk_drip.c:132
 msgid "Blocks"
 msgstr "Bulok"
 
-#: ../../magic/src/blocks_chalk_drip.c:138
+#: ../../magic/src/blocks_chalk_drip.c:134
 msgid "Chalk"
 msgstr "Coka"
 
-#: ../../magic/src/blocks_chalk_drip.c:140
+#: ../../magic/src/blocks_chalk_drip.c:136
 msgid "Drip"
 msgstr "Ton"
 
-#: ../../magic/src/blocks_chalk_drip.c:150
+#: ../../magic/src/blocks_chalk_drip.c:146
 msgid "Click and move the mouse around to make the picture blocky."
 msgstr "Dii ci iywa ladic iyi akina ne wek omi cal gubed calo bulok."
 
-#: ../../magic/src/blocks_chalk_drip.c:153
+#: ../../magic/src/blocks_chalk_drip.c:149
 msgid ""
 "Click and move the mouse around to turn the picture into a chalk drawing."
 msgstr "Dii ci iywa ladic iyi akina ne wek ilok cal kun dwoko ne igoc ma coka."
 
-#: ../../magic/src/blocks_chalk_drip.c:156
+#: ../../magic/src/blocks_chalk_drip.c:152
 msgid "Click and move the mouse around to make the picture drip."
 msgstr "Dii ci iywa ladic iyi akina ne wek omi ton pa cal."
 
-#: ../../magic/src/blur.c:80
+#: ../../magic/src/blur.c:57
 msgid "Blur"
 msgstr "Ma laribiribi."
 
-#: ../../magic/src/blur.c:83
+#: ../../magic/src/blur.c:60
 msgid "Click and move the mouse around to blur the image."
 msgstr "Dii ci iywa ladic iyi akina ne wek omi cal bed laribiribi."
 
-#: ../../magic/src/blur.c:84
+#: ../../magic/src/blur.c:61
 msgid "Click to blur the entire image."
 msgstr "Dii wek omi cal weng obed ma laribiribi."
 
 #. Both are named "Bricks", at the moment:
-#: ../../magic/src/bricks.c:124
+#: ../../magic/src/bricks.c:104
 msgid "Bricks"
 msgstr "Matapwali"
 
-#: ../../magic/src/bricks.c:131
+#: ../../magic/src/bricks.c:111
 msgid "Click and move to draw large bricks."
 msgstr "Dii ci idir wek ogo cal matapwali ma dit odoco."
 
-#: ../../magic/src/bricks.c:133
+#: ../../magic/src/bricks.c:113
 msgid "Click and move to draw small bricks."
 msgstr "Dii ci idir wek igo cal matapwali ma tino."
 
-#: ../../magic/src/calligraphy.c:127
+#: ../../magic/src/calligraphy.c:108
 msgid "Calligraphy"
 msgstr "Coc  ma mwonya"
 
-#: ../../magic/src/calligraphy.c:134
+#: ../../magic/src/calligraphy.c:115
 msgid "Click and move the mouse around to draw in calligraphy."
 msgstr "Dii ci idir ladic iyi akina ne wek igo iyi coc ma mwonya."
 
-#: ../../magic/src/cartoon.c:106
+#: ../../magic/src/cartoon.c:80
 msgid "Cartoon"
 msgstr "Katuun"
 
-#: ../../magic/src/cartoon.c:113
+#: ../../magic/src/cartoon.c:87
 msgid "Click and move the mouse around to turn the picture into a cartoon."
 msgstr "Dii ci idir iyi akina ne wek owir cal dwok tung kum katuun."
 
-#: ../../magic/src/confetti.c:85
+#: ../../magic/src/confetti.c:63
 msgid "Confetti"
 msgstr "Kwone cale ma giyiko ma mile"
 
-#: ../../magic/src/confetti.c:87
+#: ../../magic/src/confetti.c:65
 msgid "Click to throw confetti!"
 msgstr "Dii ci iba cal ma gigoyo ma mile!"
 
-#: ../../magic/src/distortion.c:142
+#: ../../magic/src/distortion.c:121
 msgid "Distortion"
 msgstr "Rucurucu"
 
-#: ../../magic/src/distortion.c:150
+#: ../../magic/src/distortion.c:129
 msgid "Click and drag the mouse to cause distortion in your picture."
 msgstr "Dii ci iywa ladic wek omi cal mamegi rucere odoco."
 
-#: ../../magic/src/emboss.c:103
+#: ../../magic/src/emboss.c:76
 msgid "Emboss"
 msgstr "Ling"
 
-#: ../../magic/src/emboss.c:109
+#: ../../magic/src/emboss.c:82
 msgid "Click and drag the mouse to emboss the picture."
 msgstr "Dii ci iywa ladic wek iling  cal."
 
-#: ../../magic/src/fade_darken.c:121
+#: ../../magic/src/fade_darken.c:119
 msgid "Lighten"
 msgstr "Cwinyi"
 
-#: ../../magic/src/fade_darken.c:123
+#: ../../magic/src/fade_darken.c:121
 msgid "Darken"
 msgstr "Cidi"
 
-#: ../../magic/src/fade_darken.c:134
+#: ../../magic/src/fade_darken.c:132
 msgid "Click and move the mouse to lighten parts of your picture."
 msgstr "Dii ci idir ladic wek icwiny dul kom pa cal mamegi."
 
-#: ../../magic/src/fade_darken.c:136
+#: ../../magic/src/fade_darken.c:134
 msgid "Click to lighten your entire picture."
 msgstr "Dii wek icwiny cal mamegi weng."
 
-#: ../../magic/src/fade_darken.c:141
+#: ../../magic/src/fade_darken.c:139
 msgid "Click and move the mouse to darken parts of your picture."
 msgstr "Dii ci idir ladic wek icid dul kom cal mamegi."
 
-#: ../../magic/src/fade_darken.c:143
+#: ../../magic/src/fade_darken.c:141
 msgid "Click to darken your entire picture."
 msgstr "Dii wek icid woko cal mamegi weng."
 
-#: ../../magic/src/fill.c:108
+#: ../../magic/src/fill.c:87
 msgid "Fill"
 msgstr "Pik"
 
-#: ../../magic/src/fill.c:115
+#: ../../magic/src/fill.c:94
 msgid "Click in the picture to fill that area with color."
 msgstr "Dii yi cal meno wek gupik ka ma orumu en ki rangi."
 
-#: ../../magic/src/fisheye.c:104
+#: ../../magic/src/fisheye.c:78
 msgid "Fisheye"
 msgstr "Lawangrec"
 
 #. Needs better name
-#: ../../magic/src/fisheye.c:106
+#: ../../magic/src/fisheye.c:80
 msgid "Click on part of your picture to create a fisheye effect."
 msgstr "Dii ki dul kom cal ma megi wek'oket ma calo lawangrec."
 
-#: ../../magic/src/flower.c:150
+#: ../../magic/src/flower.c:124
 msgid "Flower"
 msgstr "Ature"
 
-#: ../../magic/src/flower.c:156
+#: ../../magic/src/flower.c:130
 msgid "Click and drag to draw a flower stalk. Let go to finish the flower."
 msgstr "Dii ci iywa ka gono yat pa lature. Wek otyek ka gono lature."
 
-#: ../../magic/src/foam.c:121
+#: ../../magic/src/foam.c:104
 msgid "Foam"
 msgstr "Bwoyo"
 
-#: ../../magic/src/foam.c:127
+#: ../../magic/src/foam.c:110
 msgid "Click and drag the mouse to cover an area with foamy bubbles."
 msgstr "Dii ci iywa ladic wek owum kakare ki bwoyo ma otwak."
 
-#: ../../magic/src/fold.c:105
+#: ../../magic/src/fold.c:84
 msgid "Fold"
 msgstr "Dol"
 
-#: ../../magic/src/fold.c:107
+#: ../../magic/src/fold.c:86
 msgid ""
 "Choose a background color and click to turn the corner of the page over."
 msgstr ""
 "Yer rangi pa ka maneno calu bor ki dii wek owir  gwic pa pot katatac iwiye. "
 
-#: ../../magic/src/fretwork.c:176
-msgid "Fretwork"
-msgstr ""
-
-#: ../../magic/src/fretwork.c:180
-#, fuzzy
-#| msgid "Click and drag to draw arrows made of string art."
-msgid "Click and drag to draw repetitive patterns. "
-msgstr "Dii ki iywa wek igoo latero ma gitiyo ki cale me toltol."
-
-#: ../../magic/src/fretwork.c:182
-#, fuzzy
-#| msgid "Click to cover your picture with rain drops."
-msgid "Click to surround your picture with repetitive patterns."
-msgstr "Dii wek iwum cal mamegi ki ton pa kot."
-
-#: ../../magic/src/glasstile.c:107
+#: ../../magic/src/glasstile.c:83
 msgid "Glass Tile"
 msgstr "Matangula lum"
 
-#: ../../magic/src/glasstile.c:114
+#: ../../magic/src/glasstile.c:90
 msgid "Click and drag the mouse to put glass tile over your picture."
 msgstr "Dii ci iywa ladic wek oket matangula lum iwi cal mamegi."
 
-#: ../../magic/src/glasstile.c:116
+#: ../../magic/src/glasstile.c:92
 msgid "Click to cover your entire picture in glass tiles."
 msgstr "Dii wek iwum cal mamegi weng icanduk pa matangula lum."
 
-#: ../../magic/src/grass.c:112
+#: ../../magic/src/grass.c:92
 msgid "Grass"
 msgstr "Lum"
 
-#: ../../magic/src/grass.c:118
+#: ../../magic/src/grass.c:98
 msgid "Click and move to draw grass. Don’t forget the dirt!"
 msgstr "Dii ci idir wek ogo lum. Kur wii wil ki cilo!"
 
-#: ../../magic/src/halftone.c:34
-msgid "Halftone"
-msgstr ""
-
-#: ../../magic/src/halftone.c:38
-#, fuzzy
-#| msgid "Click to turn your painting into its negative."
-msgid "Click and drag to turn your drawing into a newspaper."
-msgstr "Dii wek olok wir mamegi dwoko ne nioo imarac."
-
-#: ../../magic/src/kalidescope.c:120
+#: ../../magic/src/kalidescope.c:90
 msgid "Symmetric Left/Right"
 msgstr "Nucu mo ma romrom ki mukene ki caji ma Lacam/Lacuc"
 
-#: ../../magic/src/kalidescope.c:122
+#: ../../magic/src/kalidescope.c:92
 msgid "Symmetric Up/Down"
 msgstr "Nucu mo ma romrom ki mukene ki caji ma Lamal/Piny"
 
-#: ../../magic/src/kalidescope.c:124
-msgid "Pattern"
-msgstr ""
-
-#: ../../magic/src/kalidescope.c:126
-msgid "Tiles"
-msgstr ""
-
 #. KAL_BOTH
-#: ../../magic/src/kalidescope.c:128
+#: ../../magic/src/kalidescope.c:94
 msgid "Kaleidoscope"
 msgstr "Dol matye ki ebukutu ma i kio"
 
-#: ../../magic/src/kalidescope.c:136
+#: ../../magic/src/kalidescope.c:102
 msgid ""
 "Click and drag the mouse to draw with two brushes that are symmetric across "
 "the left and right of your picture."
@@ -972,7 +939,7 @@ msgstr ""
 "Dii ci iywa ladic wek ogo ki lajwac aryo ma tye ki nucu mo maromrom arii ma "
 "lacam ki tung lacuc pa cal mamegi."
 
-#: ../../magic/src/kalidescope.c:138
+#: ../../magic/src/kalidescope.c:104
 msgid ""
 "Click and drag the mouse to draw with two brushes that are symmetric across "
 "the top and bottom of your picture."
@@ -980,138 +947,120 @@ msgstr ""
 "Dii ci iywa ladic wek ogo ki lajwac aryo ma tye ki nucu mo ma romrom arii "
 "itung ku wie ci piny pa cal mamegi."
 
-#: ../../magic/src/kalidescope.c:140
-#, fuzzy
-#| msgid "Click and drag the mouse to emboss the picture."
-msgid "Click and drag the mouse to draw a pattern across the picture."
-msgstr "Dii ci iywa ladic wek iling  cal."
-
-#: ../../magic/src/kalidescope.c:142
-#, fuzzy
-#| msgid ""
-#| "Click and drag the mouse to draw with two brushes that are symmetric "
-#| "across the left and right of your picture."
-msgid ""
-"Click and drag the mouse to draw a pattern plus its symmetric across the "
-"picture."
-msgstr ""
-"Dii ci iywa ladic wek ogo ki lajwac aryo ma tye ki nucu mo maromrom arii ma "
-"lacam ki tung lacuc pa cal mamegi."
-
 #. KAL_BOTH
-#: ../../magic/src/kalidescope.c:144
+#: ../../magic/src/kalidescope.c:106
 msgid ""
 "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
 msgstr ""
 "Dii ci iywa ladic wek ogo ki lajwac ma nucu ne romrom ki mukene "
 "(akaleidoscope)."
 
-#: ../../magic/src/light.c:107
+#: ../../magic/src/light.c:84
 msgid "Light"
 msgstr "Cwiny"
 
-#: ../../magic/src/light.c:113
+#: ../../magic/src/light.c:90
 msgid "Click and drag to draw a beam of light on your picture."
 msgstr "Dii ci iywa wek ogo layin acara pa lero okom cal mamegi."
 
-#: ../../magic/src/metalpaint.c:101
+#: ../../magic/src/metalpaint.c:77
 msgid "Metal Paint"
 msgstr "Dawa me nyonyo"
 
-#: ../../magic/src/metalpaint.c:107
+#: ../../magic/src/metalpaint.c:83
 msgid "Click and drag the mouse to paint with a metallic color."
 msgstr "Dii ci iywa ladic wek oling ki rangi me nyonyo."
 
-#: ../../magic/src/mirror_flip.c:117
+#: ../../magic/src/mirror_flip.c:94
 msgid "Mirror"
 msgstr "Kio"
 
-#: ../../magic/src/mirror_flip.c:119
+#: ../../magic/src/mirror_flip.c:96
 msgid "Flip"
 msgstr "Lok me oyoto"
 
-#: ../../magic/src/mirror_flip.c:130
+#: ../../magic/src/mirror_flip.c:106
 msgid "Click to make a mirror image."
 msgstr "Dii wek iyik cal kio."
 
-#: ../../magic/src/mirror_flip.c:133
+#: ../../magic/src/mirror_flip.c:109
 msgid "Click to flip the picture upside-down."
 msgstr "Dii wek ilok cal laculawic."
 
-#: ../../magic/src/mosaic.c:100
+#: ../../magic/src/mosaic.c:75
 msgid "Mosaic"
 msgstr "Cal ma kiketo kacel ki gwenge ma olinge(Mosaic)"
 
-#: ../../magic/src/mosaic.c:103
+#: ../../magic/src/mosaic.c:78
 msgid ""
 "Click and move the mouse to add a mosaic effect to parts of your picture."
 msgstr "Dii wek idir ladic ka ibimedo teko pa mojaik ikom dul kom cal mamegi."
 
-#: ../../magic/src/mosaic.c:104
+#: ../../magic/src/mosaic.c:79
 msgid "Click to add a mosaic effect to your entire picture."
 msgstr ""
 "Dii wek imed teko pa cal ma kiketo kacel ki gwenge ikom cal mamegi weng."
 
-#: ../../magic/src/mosaic_shaped.c:142
+#: ../../magic/src/mosaic_shaped.c:134
 msgid "Square Mosaic"
 msgstr "Cal ma kiketo kacel ki gwenge ma twoke angwen rorom"
 
-#: ../../magic/src/mosaic_shaped.c:143
+#: ../../magic/src/mosaic_shaped.c:135
 msgid "Hexagon Mosaic"
 msgstr "Cal ma kiketo kacel ki gwenge ma olinge ma twoke tye abicel"
 
-#: ../../magic/src/mosaic_shaped.c:144
+#: ../../magic/src/mosaic_shaped.c:136
 msgid "Irregular Mosaic"
 msgstr "Cal ma kiketo kacel ki gwenge ma olinge ma pe ki twoke "
 
-#: ../../magic/src/mosaic_shaped.c:149
+#: ../../magic/src/mosaic_shaped.c:141
 msgid ""
 "Click and move the mouse to add a square mosaic to parts of your picture."
 msgstr ""
 "Dii ci idir ladic wek omed cal ma kiketo ki gwenge ma olinge  ma twoke "
 "angwen rorom ikom dul cal mamegi weng."
 
-#: ../../magic/src/mosaic_shaped.c:150
+#: ../../magic/src/mosaic_shaped.c:142
 msgid "Click to add a square mosaic to your entire picture."
 msgstr ""
 "Dii wek omed cal ma kiketo kacel ki gwenge ma olinge ma twoke angwen ikom "
 "cal mamegi weng."
 
-#: ../../magic/src/mosaic_shaped.c:152
+#: ../../magic/src/mosaic_shaped.c:144
 msgid ""
 "Click and move the mouse to add a hexagonal mosaic to parts of your picture."
 msgstr ""
 "Dii ki idir ladic wek omed cal ma kiketo kacel ki gwenge ma olinge ma twoke "
 "abicel marom ikom cal mamegi."
 
-#: ../../magic/src/mosaic_shaped.c:153
+#: ../../magic/src/mosaic_shaped.c:145
 msgid "Click to add a hexagonal mosaic to your entire picture."
 msgstr ""
 "Dii wek imed cal ma kiketo kacel ki gwenge ma olinge ma twoke abicel marom "
 "ikom cal mamegi weng."
 
-#: ../../magic/src/mosaic_shaped.c:155
+#: ../../magic/src/mosaic_shaped.c:147
 msgid ""
 "Click and move the mouse to add an irregular mosaic to parts of your picture."
 msgstr ""
 "Dii ki idir ladic wek imed cal ma kiketo kacel ki gwenge ma olinge ma twoke "
 "tye ataata  idul kom cal mamegi."
 
-#: ../../magic/src/mosaic_shaped.c:156
+#: ../../magic/src/mosaic_shaped.c:148
 msgid "Click to add an irregular mosaic to your entire picture."
 msgstr ""
 "Dii wek imed cal ma kiketo kacel ki gwenge ma olinge ma twoke tye ataata "
 "idul kum cal mamegi weng."
 
-#: ../../magic/src/negative.c:98
+#: ../../magic/src/negative.c:72
 msgid "Negative"
 msgstr "Olutuke"
 
-#: ../../magic/src/negative.c:106
+#: ../../magic/src/negative.c:80
 msgid "Click and move the mouse around to make your painting negative."
 msgstr "Dii ki idir ladic akina ne wek omi wir mamegi obed marac."
 
-#: ../../magic/src/negative.c:109
+#: ../../magic/src/negative.c:83
 msgid "Click to turn your painting into its negative."
 msgstr "Dii wek olok wir mamegi dwoko ne nioo imarac."
 
@@ -1143,26 +1092,34 @@ msgstr "Dii ikom itwoketwoke ite ywayo kama imito ryeyone cal mamegi."
 msgid "Click and drag up to zoom in or drag down to zoom out the picture."
 msgstr "Dii ki iywa lamal wek onya onyo ywa lapiny wek irid cal woko."
 
-#: ../../magic/src/puzzle.c:105
+#: ../../magic/src/puzzle.c:79
 msgid "Puzzle"
 msgstr "Laruc wic"
 
-#: ../../magic/src/puzzle.c:112
+#: ../../magic/src/puzzle.c:86
 msgid "Click the part of your picture where would you like a puzzle."
 msgstr "Dii dul ikom cal mamegi ka ma imaro laruc wic iye."
 
-#: ../../magic/src/puzzle.c:113
+#: ../../magic/src/puzzle.c:87
 msgid "Click to make a puzzle in fullscreen mode."
 msgstr "Dii wek iyik laruc wic malac iwang kompiuta."
 
-#: ../../magic/src/rails.c:131
+#: ../../magic/src/rails.c:101
 msgid "Rails"
 msgstr "Tyen-gar"
 
-#: ../../magic/src/rails.c:133
+#: ../../magic/src/rails.c:103
 msgid "Click and drag to draw train track rails on your picture."
 msgstr "Dii ki iywa wek igo yoo tyen gar ikom cal mamegi."
 
+#: ../../magic/src/rainbow.c:107
+msgid "Rainbow"
+msgstr "Itoloka"
+
+#: ../../magic/src/rainbow.c:114
+msgid "You can draw in rainbow colors!"
+msgstr "Itwero goyo ki rangi pa itoloka!"
+
 #: ../../magic/src/rain.c:65
 msgid "Rain"
 msgstr "Kot"
@@ -1175,23 +1132,15 @@ msgstr "Dii wek olee ton pa kot ikom cal mamegi."
 msgid "Click to cover your picture with rain drops."
 msgstr "Dii wek iwum cal mamegi ki ton pa kot."
 
-#: ../../magic/src/rainbow.c:139
-msgid "Rainbow"
-msgstr "Itoloka"
-
-#: ../../magic/src/rainbow.c:146
-msgid "You can draw in rainbow colors!"
-msgstr "Itwero goyo ki rangi pa itoloka!"
-
-#: ../../magic/src/realrainbow.c:110
+#: ../../magic/src/realrainbow.c:86
 msgid "Real Rainbow"
 msgstr "Itolaka kikome"
 
-#: ../../magic/src/realrainbow.c:112
+#: ../../magic/src/realrainbow.c:88
 msgid "ROYGBIV Rainbow"
 msgstr "ROYGBIV Itolaka"
 
-#: ../../magic/src/realrainbow.c:117
+#: ../../magic/src/realrainbow.c:93
 msgid ""
 "Click where you want your rainbow to start, drag to where you want it to "
 "end, and then let go to draw a rainbow."
@@ -1199,27 +1148,27 @@ msgstr ""
 "Dii kan ma imito ni itoloka mamegi ocake iye, ywa nioo kan ma imito ni en "
 "ogik iye, ki mii ociti ka gono itolaka."
 
-#: ../../magic/src/ripples.c:106
+#: ../../magic/src/ripples.c:81
 msgid "Ripples"
 msgstr "Twagere pa pii"
 
-#: ../../magic/src/ripples.c:112
+#: ../../magic/src/ripples.c:87
 msgid "Click to make ripples appear over your picture."
 msgstr "Dii wek imii twage pa pii onyute iwi cal mamegi."
 
-#: ../../magic/src/rosette.c:116
+#: ../../magic/src/rosette.c:93
 msgid "Rosette"
 msgstr "Rosette"
 
-#: ../../magic/src/rosette.c:116
+#: ../../magic/src/rosette.c:93
 msgid "Picasso"
 msgstr "Picasso"
 
-#: ../../magic/src/rosette.c:121
+#: ../../magic/src/rosette.c:98
 msgid "Click and start drawing your rosette."
 msgstr "Dii ki icak goyo rosette mamegi."
 
-#: ../../magic/src/rosette.c:123
+#: ../../magic/src/rosette.c:100
 msgid "You can draw just like Picasso!"
 msgstr "Itwero goyo macalo Picasso kikome!"
 
@@ -1259,29 +1208,29 @@ msgstr "Dii ki idir ladic wek oyik silhoutte matye macol ki  matar."
 msgid "Click to create a black and white silhouette of your entire picture."
 msgstr "Dii wek iyik silhoutte manen macol kwede matar ikom cal mamegi weng."
 
-#: ../../magic/src/shift.c:109
+#: ../../magic/src/shift.c:104
 msgid "Shift"
 msgstr "Kobi"
 
-#: ../../magic/src/shift.c:115
+#: ../../magic/src/shift.c:110
 msgid "Click and drag to shift your picture around on the canvas."
 msgstr "Dii ki  iywa me kobo cal mamegi  iyi akina kum canvas."
 
-#: ../../magic/src/smudge.c:106
+#: ../../magic/src/smudge.c:83
 msgid "Smudge"
 msgstr "Lililo"
 
 #. if (which == 1)
-#: ../../magic/src/smudge.c:108
+#: ../../magic/src/smudge.c:85
 msgid "Wet Paint"
 msgstr "Rangi madyaka"
 
-#: ../../magic/src/smudge.c:115
+#: ../../magic/src/smudge.c:92
 msgid "Click and move the mouse around to smudge the picture."
 msgstr "Dii ki idir ladic akina ne wek ilil cal."
 
 #. if (which == 1)
-#: ../../magic/src/smudge.c:117
+#: ../../magic/src/smudge.c:94
 msgid "Click and move the mouse around to draw with wet, smudgy paint."
 msgstr "Dii ki idir ladic iyi akina ne wek igo kwede madyak. dawa ma dyakdyak."
 
@@ -1301,19 +1250,19 @@ msgstr "Dii wek  imed odilo akuna ikum cal mamegi. "
 msgid "Click to add snow flakes to your picture."
 msgstr "Dii wek imed pii mumake mapoto ki malo ikom cal mamegi."
 
-#: ../../magic/src/string.c:123
+#: ../../magic/src/string.c:120
 msgid "String edges"
 msgstr "Teng tol weng ma gikubu"
 
-#: ../../magic/src/string.c:126
+#: ../../magic/src/string.c:123
 msgid "String corner"
 msgstr "Gwic tol  ma gikubu"
 
-#: ../../magic/src/string.c:129
+#: ../../magic/src/string.c:126
 msgid "String 'V'"
 msgstr "Tol \"V\""
 
-#: ../../magic/src/string.c:137
+#: ../../magic/src/string.c:134
 msgid ""
 "Click and drag to draw string art. Drag top-bottom to draw less or more "
 "lines, left or right to make a bigger hole."
@@ -1321,11 +1270,11 @@ msgstr ""
 "Dii ki iywa wek igoo cale ki toltol. Ywa imalu-ki piny wek i goo rye manok "
 "onyo layin mapol, tung lacam onyo tung acuc wek oket i bur ma dit."
 
-#: ../../magic/src/string.c:140
+#: ../../magic/src/string.c:137
 msgid "Click and drag to draw arrows made of string art."
 msgstr "Dii ki iywa wek igoo latero ma gitiyo ki cale me toltol."
 
-#: ../../magic/src/string.c:143
+#: ../../magic/src/string.c:140
 msgid "Draw string art arrows with free angles."
 msgstr "Goo lacim cal toltol kwede akina gi tye mere ataa."
 
@@ -1366,38 +1315,37 @@ msgstr "Yat lajwa lak"
 msgid "Click and drag to squirt toothpaste onto your picture."
 msgstr "Dii ki iywa wek ibibio yat lajwa lak ikom cal ma megi."
 
-#: ../../magic/src/tornado.c:157
+#: ../../magic/src/tornado.c:127
 msgid "Tornado"
 msgstr "Yamo ajuru"
 
-#: ../../magic/src/tornado.c:163
+#: ../../magic/src/tornado.c:133
 msgid "Click and drag to draw a tornado funnel on your picture."
 msgstr "Dii ki iywa wek ogo cal lapik yamo ajuru ikum cal ma megi."
 
-#: ../../magic/src/tv.c:100
+#: ../../magic/src/tv.c:74
 msgid "TV"
 msgstr "TV"
 
-#: ../../magic/src/tv.c:105
+#: ../../magic/src/tv.c:79
 msgid ""
 "Click and drag to make parts of your picture look like they are on "
 "television."
-msgstr ""
-"Dii ci iywa wek omi dul kom cal ma megi onen calo ma gutye itelevision."
+msgstr "Dii ci iywa wek omi dul kom cal ma megi onen calo ma gutye itelevision."
 
-#: ../../magic/src/tv.c:108
+#: ../../magic/src/tv.c:82
 msgid "Click to make your picture look like it's on television."
 msgstr "Dii wek omi cal ma megi nen ma calo tye itelevision."
 
-#: ../../magic/src/waves.c:103
+#: ../../magic/src/waves.c:80
 msgid "Waves"
 msgstr "Yamu ma tago pii"
 
-#: ../../magic/src/waves.c:104
+#: ../../magic/src/waves.c:81
 msgid "Wavelets"
 msgstr "Yamu ma tago manok"
 
-#: ../../magic/src/waves.c:111
+#: ../../magic/src/waves.c:88
 msgid ""
 "Click to make the picture horizontally wavy. Click toward the top for "
 "shorter waves, the bottom for taller waves, the left for small waves, and "
@@ -1406,7 +1354,7 @@ msgstr ""
 "Dii wek omi cal tage abutu. Dii macok ki wie pi tage macek, dol tere me tage "
 "maboco, lacam pi tage manok, ki tung lacuc pi tage mabor."
 
-#: ../../magic/src/waves.c:112
+#: ../../magic/src/waves.c:89
 msgid ""
 "Click to make the picture vertically wavy. Click toward the top for shorter "
 "waves, the bottom for taller waves, the left for small waves, and the right "
@@ -1414,22 +1362,3 @@ msgid ""
 msgstr ""
 "Dii wek omi cal tage atir. Dii macok ki wiye pi tage macek, dol tere pi tage "
 "maboco, lacam pi tage manok, ki tung lacuc pi tage mabor."
-
-#: ../../magic/src/xor.c:95
-#, fuzzy
-#| msgid "Colors"
-msgid "Xor Colors"
-msgstr "Kwone rangi mapatpat"
-
-#: ../../magic/src/xor.c:101
-#, fuzzy
-#| msgid "Click and drag to draw arrows made of string art."
-msgid "Click and drag to draw a XOR effect"
-msgstr "Dii ki iywa wek igoo latero ma gitiyo ki cale me toltol."
-
-#: ../../magic/src/xor.c:103
-#, fuzzy
-#| msgid "Click to add a mosaic effect to your entire picture."
-msgid "Click to draw a XOR effect on the whole picture"
-msgstr ""
-"Dii wek imed teko pa cal ma kiketo kacel ki gwenge ikom cal mamegi weng."