diff --git a/src/po/son.po b/src/po/son.po
index efd9adb05..355c01a8d 100644
--- a/src/po/son.po
+++ b/src/po/son.po
@@ -1,35 +1,36 @@
-# Translation of Tux Paint to Songhay
-# Copyright (C) 2009
-# This file is distributed under the same license as the Tux Paint package.
-# Abdoul Cisse <abdoulseydou@hotmail.com>, 2009.
-#
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
-"Project-Id-Version: tuxpaint 0.9.21\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-10-26 17:43+0900\n"
-"PO-Revision-Date: 2009-12-02 22:19-0000\n"
-"Last-Translator: ggkjk\n"
+"POT-Creation-Date: 2010-08-17 15:55-0700\n"
+"PO-Revision-Date: 2010-09-03 18:14+0200\n"
+"Last-Translator: Mohomodou  <mh@bollag-areal.ch>\n"
 "Language-Team: Songhoy <songhoy@bagoundie.net>\n"
+"Language: son\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.1.5\n"
 
 #. Response to Black (0, 0, 0) color selected
 #: ../colors.h:86
 msgid "Black!"
-msgstr "Bibi!"
+msgstr "Bibi !"
 
 #. Response to Dark grey (128, 128, 128) color selected
 #: ../colors.h:89
 msgid "Dark grey! Some people spell it “dark gray”."
-msgstr "Boosu-boosu-bibi ! Some people spell it “dark gray”."
+msgstr "Boosu-boosu bibi !"
 
 #. Response to Light grey (192, 192, 192) color selected
 #: ../colors.h:92
 msgid "Light grey! Some people spell it “light gray”."
-msgstr "Boosu-boosu-kaaray ! Some people spell it “light gray”."
+msgstr "Boosu-boosu kaaray !"
 
 #. Response to White (255, 255, 255) color selected
 #: ../colors.h:95
@@ -54,7 +55,7 @@ msgstr "Woole !"
 #. Response to Light green (160, 228, 128) color selected
 #: ../colors.h:107
 msgid "Light green!"
-msgstr "Firzi kaaray !"
+msgstr "Firži kaaray !"
 
 #. Response to Dark green (33, 148, 70) color selected
 #: ../colors.h:110
@@ -187,7 +188,7 @@ msgstr "Hoyhoy !"
 #. Congratulations #2
 #: ../great.h:40
 msgid "Cool!"
-msgstr "A hansa ka boori ! "
+msgstr "A hansa ka boori !"
 
 #. Congratulations #3
 #: ../great.h:43
@@ -306,7 +307,7 @@ msgstr "Kanjeguu, bii no kaŋ goo nda ceraw guu."
 #: ../shapes.h:235 ../shapes.h:237
 msgid "A rhombus has four equal sides, and opposite sides are parallel."
 msgstr ""
-"Sunbii, kaare yobante no kaŋ goo nda ceraw  sawanta taaci, wey kaŋ ga tenji "
+"Sunbii, kaare yobante no kaŋ goo nda ceraw sawanta taaci, wey kaŋ ga tenji "
 "ga ceesi cere se."
 
 #: ../shapes.h:241 ../shapes.h:243
@@ -378,7 +379,7 @@ msgstr "Cawhaya"
 #. Label tool
 #: ../tools.h:77
 msgid "Label"
-msgstr "Lanba "
+msgstr "Šilbayhaya"
 
 #. Undo last action
 #: ../tools.h:86
@@ -403,7 +404,7 @@ msgstr "Itaaga"
 #. 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 "Feeri"
 
@@ -430,12 +431,12 @@ msgstr "Noone nda caaraykalam suuba k'i ka goy."
 #. Stamp tool instructions
 #: ../tools.h:118
 msgid "Pick a picture to stamp around your drawing."
-msgstr "Bii foo suuba k'a daŋ ni biyoo kaŋ n'  n'a tee ra."
+msgstr "Bii foo suuba k'a daŋ ni biyoo kaŋ n' n'a tee ra."
 
 #. Line tool instructions
 #: ../tools.h:121
 msgid "Click to start drawing a line. Let go to complete it."
-msgstr "Naagu nee ka žeeri foo sintin. Naŋ zaa n ben."
+msgstr "Naagu nee ka žeeri foo sintin. Naŋ zaa n' ben."
 
 #. Shape tool instructions
 #: ../tools.h:124
@@ -444,29 +445,29 @@ msgid ""
 "size you want. Move around to rotate it, and click to draw it."
 msgstr ""
 "Alhaali foo suuba. Naagu ka gamoo zaa, dogoo nda dimmaa suuba. Gaabu k'a "
-"naagu nda n g'a kuubi. Ka ben a žeeri."
+"naagu nda n' g'a kuubi. Ka ben a žeeri."
 
 #. Text tool instructions
 #: ../tools.h:127
-#, fuzzy
-#| msgid ""
-#| "Choose a style of text. Click on your drawing and you can start typing."
 msgid ""
 "Choose a style of text. Click on your drawing and you can start typing. "
 "Press [Enter] or [Tab] to complete the text."
-msgstr "Hantum-ɲaa dumi suuba. Ni žeeroo naagu ka ni hantum-ɲaaŋoo sintin."
+msgstr ""
+"Kalimaɲaa kuru fasal foo suuba. Ni biyoo naagu nda ma šintin ka hantum. "
+"[Dam] nda [Nor loku] naagu ka kalimaɲaa kuroo timmandi."
 
 #. Label tool instructions
 #: ../tools.h:130
-#, fuzzy
-#| msgid ""
-#| "Choose a style of text. Click on your drawing and you can start typing."
 msgid ""
 "Choose a style of text. Click on your drawing and you can start typing. "
 "Press [Enter] or [Tab] to complete the text. By using the selector button "
 "and clicking an exist label, you can move it, edit it and change its text "
 "style."
-msgstr "Hantum-ɲaa dumi suuba. Ni žeeroo naagu ka ni hantum-ɲaaŋoo sintin."
+msgstr ""
+"Fasal foo suuba kalimaɲaa kuru se. Ni biyoo naagu ka šintin ka hantum. [Dam] "
+"wala [Nor loku] naagu ka kalimaɲaa kuroo timmandi. Nda n' na suubakaw butoŋ "
+"sanba nda n' na šilbay barante naagu, n' ga hin k'a ganandi, k'a fasal nda "
+"ka nga kalimaɲaa kuroo barmay."
 
 #. Magic tool instruction
 #: ../tools.h:136
@@ -491,7 +492,7 @@ msgstr "Tuusuji !"
 #. Response to 'start a new image' action
 #: ../tools.h:148
 msgid "Pick a color or picture with which to start a new drawing."
-msgstr "Bii wala noone foo suuba k'a dam bii taagaa ra."
+msgstr "Bii wala noone foo suuba k'a daŋ bii taagaa ra."
 
 #. Response to 'open' action (while file dialog is being constructed)
 #: ../tools.h:151
@@ -506,7 +507,7 @@ msgstr "Ni biyoo kaŋ n' n'a tee cindi !"
 #. Response to 'print' action (while printing, or print dialog is being used)
 #: ../tools.h:157
 msgid "Printing…"
-msgstr "Karyan..."
+msgstr "Karyaŋ..."
 
 #. Response to 'quit' (exit) action
 #: ../tools.h:160
@@ -534,179 +535,179 @@ msgid "OK then… Let’s keep drawing this one!"
 msgstr "A boori! Ir ma gaabandi ka biyoo woo tee !"
 
 #. Prompt to confirm user wishes to quit
-#: ../tuxpaint.c:2040
+#: ../tuxpaint.c:1918
 msgid "Do you really want to quit?"
-msgstr "Nga baa ma fatta wala ?"
+msgstr "N' ga baa ma fatta wala ?"
 
 #. Quit prompt positive response (quit)
-#: ../tuxpaint.c:2043
+#: ../tuxpaint.c:1921
 msgid "Yes, I’m done!"
 msgstr "Ayyo, ay ben !"
 
 #. 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 "Kala, ir ma will'a ga !"
+msgstr "Kalaa, ir ma willi a ga !"
 
 #. 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 "Nda n fatta, ni biyoo ga dere ! Ayyo, a gaabu !"
+msgstr "Nda n' fatta, ni biyoo ga dere ! K'a gaabu ?"
 
-#: ../tuxpaint.c:2051 ../tuxpaint.c:2056
+#: ../tuxpaint.c:1929 ../tuxpaint.c:1934
 msgid "Yes, save it!"
 msgstr "Ayyo, a gaabu !"
 
-#: ../tuxpaint.c:2052 ../tuxpaint.c:2057
+#: ../tuxpaint.c:1930 ../tuxpaint.c:1935
 msgid "No, don’t bother saving!"
-msgstr "Kala, ma si a gaabu !"
+msgstr "Kalaa, ma ši a gaabu !"
 
 #. Current picture is not saved; user is opening another picture
-#: ../tuxpaint.c:2055
+#: ../tuxpaint.c:1933
 msgid "Save your picture first?"
 msgstr "Ka biyoo gaabu jina ?"
 
 #. Error opening picture
-#: ../tuxpaint.c:2060
+#: ../tuxpaint.c:1938
 msgid "Can’t open that picture!"
 msgstr "Ay si hin ka biyoo woo feeri !"
 
 #. 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 "Ay yadda"
 
 #. Notification that 'Open' dialog has nothing to show
-#: ../tuxpaint.c:2067
+#: ../tuxpaint.c:1945
 msgid "There are no saved files!"
 msgstr "Tiira kul mana jisandi !"
 
 #. Verification of print action
-#: ../tuxpaint.c:2071
+#: ../tuxpaint.c:1949
 msgid "Print your picture now?"
 msgstr "Biyoo kar sohõ ?"
 
-#: ../tuxpaint.c:2072
+#: ../tuxpaint.c:1950
 msgid "Yes, print it!"
 msgstr "Ayyo, a kar !"
 
 #. Confirmation of successful (we hope) printing
-#: ../tuxpaint.c:2076
+#: ../tuxpaint.c:1954
 msgid "Your picture has been printed!"
 msgstr "Ni biyoo karandi !"
 
 #. We got an error printing
-#: ../tuxpaint.c:2080
+#: ../tuxpaint.c:1958
 msgid "Sorry! Your picture could not be printed!"
 msgstr "Alhaa naŋ ! Ni biyoo mana hin ka karandi !"
 
 #. 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 "N si hin ka karandi sohõ da !"
+msgstr "N' ši hin ka karandi sohõ da !"
 
 #. Prompt to confirm erasing a picture in the Open dialog
-#: ../tuxpaint.c:2087
+#: ../tuxpaint.c:1965
 msgid "Erase this picture?"
 msgstr "Biyoo woo tuusu ?"
 
-#: ../tuxpaint.c:2088
+#: ../tuxpaint.c:1966
 msgid "Yes, erase it!"
 msgstr "Ayyo, a tuusu !"
 
-#: ../tuxpaint.c:2089
+#: ../tuxpaint.c:1967
 msgid "No, don’t erase it!"
-msgstr "Kala, ma si a tuusu !"
+msgstr "Kalaa, ma ši a tuusu !"
 
 #. 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 "Ma si dirŋa ka ncaŋoo butoŋ wowaa naagu !"
 
 #. Sound has been muted (silenced) via keyboard shortcut
-#: ../tuxpaint.c:2300
+#: ../tuxpaint.c:2567
 msgid "Sound muted."
 msgstr "Jindoo daaba."
 
 #. Sound has been unmuted (unsilenced) via keyboard shortcut
-#: ../tuxpaint.c:2305
+#: ../tuxpaint.c:2572
 msgid "Sound unmuted."
 msgstr "Jindoo feera."
 
 #. Wait while Text tool finishes loading fonts
-#: ../tuxpaint.c:3052
+#: ../tuxpaint.c:3355
 msgid "Please wait…"
 msgstr "Batu taare..."
 
 #. Open dialog: 'Erase' button, to erase/deleted the selected picture
-#: ../tuxpaint.c:7608
+#: ../tuxpaint.c:7765
 msgid "Erase"
 msgstr "Tuusu"
 
 #. Open dialog: 'Slides' button, to switch to slide show mode
-#: ../tuxpaint.c:7611
+#: ../tuxpaint.c:7768
 msgid "Slides"
 msgstr "Cebebiyey"
 
 #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
-#: ../tuxpaint.c:7614
+#: ../tuxpaint.c:7771
 msgid "Back"
 msgstr "Foobanda"
 
 #. Slideshow: 'Next' button, to load next slide (image)
-#: ../tuxpaint.c:7617
+#: ../tuxpaint.c:7774
 msgid "Next"
 msgstr "Jine"
 
 #. Slideshow: 'Play' button, to begin a slideshow sequence
-#: ../tuxpaint.c:7620
+#: ../tuxpaint.c:7777
 msgid "Play"
-msgstr "Sintin"
+msgstr "Šintin"
 
 #. 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 "Ayyo"
 
-#: ../tuxpaint.c:11590
+#: ../tuxpaint.c:11734
 msgid "No"
-msgstr "Kala"
+msgstr "Kalaa"
 
 #. 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 "Ka biyoo nda ni barmawey kaŋ n' n'i tee zaa ?"
 
 #. 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 "Ayyo, ižeenaa barmay !"
 
 #. 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 "Kala, bii taaga no !"
+msgstr "Kalaa, bii taaga no !"
 
-#: ../tuxpaint.c:13861
+#: ../tuxpaint.c:13963
 msgid "Choose the picture you want, then click “Open”."
 msgstr "Bii foo suuba, ma \"Feeri \" naagu."
 
 #. 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 "Biyey kaŋ n ga bag'ey suuba, de ma ''Sintin'' naagu."
+msgstr "Biyey kaŋ n' ga bag'ey suuba, de ma ''Šintin'' naagu"
 
-#: ../tuxpaint.c:22159
+#: ../tuxpaint.c:21524
 msgid "Pick a color."
 msgstr "Noone suuba."
 
@@ -724,7 +725,7 @@ msgstr "Tux Paint"
 
 #: ../../magic/src/alien.c:64
 msgid "Color Shift"
-msgstr "Noone barmay"
+msgstr "Noonaa barmay"
 
 #: ../../magic/src/alien.c:67
 msgid "Click and move the mouse to change the colors in parts of your picture."
@@ -734,396 +735,324 @@ msgstr "Naagu ka ncaŋoo nor ka ni biyoo jeroo noonaa barmay."
 msgid "Click to change the colors in your entire picture."
 msgstr "Naagu ka biyoo kul noonaa barmay."
 
-#: ../../magic/src/blind.c:117
+#: ../../magic/src/blind.c:92
 msgid "Blind"
-msgstr "Danaw"
+msgstr "Feddi"
 
-#: ../../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 ""
-"Naagu biyoo hirrey bande ka bii kubanteyaŋ daŋ a ra. Nor funetaraa kuuroo "
-"bande ka nugu kubantey daabu wala k'i feeri. "
+"Naagu ni biyoo ceraa here ka zanfun feddiyey zumandi a boŋ. Caraw-caraw ka "
+"feddiyey feeri wala k'i daabu."
 
-#: ../../magic/src/blocks_chalk_drip.c:136
+#: ../../magic/src/blocks_chalk_drip.c:132
 msgid "Blocks"
 msgstr "Gurunbey"
 
-#: ../../magic/src/blocks_chalk_drip.c:138
+#: ../../magic/src/blocks_chalk_drip.c:134
 msgid "Chalk"
 msgstr "Dooru"
 
-#: ../../magic/src/blocks_chalk_drip.c:140
+#: ../../magic/src/blocks_chalk_drip.c:136
 msgid "Drip"
 msgstr "Loti"
 
-#: ../../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 "Naagu, ma ncaŋoo nor ka biyoo bere k'a tee feraw-izeyaŋ."
 
-#: ../../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 "Naagu, ma ncaŋoo nor ka biyoo bere k'a tee dooru-hantum-bii."
 
-#: ../../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 "Naagu, ma ncaŋoo nor ka biyoo morro."
 
-#: ../../magic/src/blur.c:80
+#: ../../magic/src/blur.c:57
 msgid "Blur"
 msgstr "Kokoorandi"
 
-#: ../../magic/src/blur.c:83
+#: ../../magic/src/blur.c:60
 msgid "Click and move the mouse around to blur the image."
 msgstr "Naagu ka ncaŋoo nor ka biyoo kokoorandi."
 
-#: ../../magic/src/blur.c:84
+#: ../../magic/src/blur.c:61
 msgid "Click to blur the entire image."
 msgstr "Naagu ka biyoo kul kokoorandi."
 
 #. Both are named "Bricks", at the moment:
-#: ../../magic/src/bricks.c:124
+#: ../../magic/src/bricks.c:104
 msgid "Bricks"
 msgstr "Feraw-izey"
 
-#: ../../magic/src/bricks.c:131
+#: ../../magic/src/bricks.c:111
 msgid "Click and move to draw large bricks."
 msgstr "Naagu, ma ncaŋoo nor ka feraw beeri biiyaŋ tee."
 
-#: ../../magic/src/bricks.c:133
+#: ../../magic/src/bricks.c:113
 msgid "Click and move to draw small bricks."
-msgstr "Naagu, ma ncaŋoo nor ka feraw kaccu biiyaŋ  tee."
+msgstr "Naagu, ma ncaŋoo nor ka feraw kaccu biiyaŋ tee."
 
-#: ../../magic/src/calligraphy.c:127
+#: ../../magic/src/calligraphy.c:108
 msgid "Calligraphy"
 msgstr "Kalamhantum"
 
-#: ../../magic/src/calligraphy.c:134
+#: ../../magic/src/calligraphy.c:115
 msgid "Click and move the mouse around to draw in calligraphy."
-msgstr "Naagu, ma ncaŋoo nor ka kalamhantum biiyaŋ tee."
+msgstr "Naagu, ma ncaŋoo nor ka kalamhantum biiyan tee."
 
-#: ../../magic/src/cartoon.c:106
+#: ../../magic/src/cartoon.c:80
 msgid "Cartoon"
 msgstr "Biifeelaga"
 
-#: ../../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 "Naagu, ma ncaŋoo nor ka biyoo bere k'a tee biifeelaga."
 
-#: ../../magic/src/confetti.c:85
+#: ../../magic/src/confetti.c:63
 msgid "Confetti"
 msgstr "Kaddasu buuna"
 
-#: ../../magic/src/confetti.c:87
+#: ../../magic/src/confetti.c:65
 msgid "Click to throw confetti!"
 msgstr "Naagu ka kaddasu buuna warra !"
 
-#: ../../magic/src/distortion.c:142
+#: ../../magic/src/distortion.c:121
 msgid "Distortion"
 msgstr "Golbandiyan"
 
-#: ../../magic/src/distortion.c:150
+#: ../../magic/src/distortion.c:129
 msgid "Click and drag the mouse to cause distortion in your picture."
 msgstr "Naagu ka ncaŋoo nor ka ni biyoo golbandi."
 
-#: ../../magic/src/emboss.c:103
+#: ../../magic/src/emboss.c:76
 msgid "Emboss"
 msgstr "Wargandi"
 
-#: ../../magic/src/emboss.c:109
+#: ../../magic/src/emboss.c:82
 msgid "Click and drag the mouse to emboss the picture."
 msgstr "Naagu, ma ncaŋoo nor ka biyoo wargandi."
 
-#: ../../magic/src/fade_darken.c:121
+#: ../../magic/src/fade_darken.c:119
 msgid "Lighten"
 msgstr "Henanandi"
 
-#: ../../magic/src/fade_darken.c:123
+#: ../../magic/src/fade_darken.c:121
 msgid "Darken"
 msgstr "Kubandi"
 
-#: ../../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 "Naagu ka ncaŋoo nor ka ni biyoo jeroo henanandi."
 
-#: ../../magic/src/fade_darken.c:136
+#: ../../magic/src/fade_darken.c:134
 msgid "Click to lighten your entire picture."
 msgstr "Naagu ka biyoo kul henanandi."
 
-#: ../../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 "Naagu ka ncaŋoo nor ka ni biyoo jeroo kubandi."
 
-#: ../../magic/src/fade_darken.c:143
+#: ../../magic/src/fade_darken.c:141
 msgid "Click to darken your entire picture."
 msgstr "Naagu ka biyoo kul kubandi."
 
-#: ../../magic/src/fill.c:108
+#: ../../magic/src/fill.c:87
 msgid "Fill"
 msgstr "Toonandi"
 
-#: ../../magic/src/fill.c:115
+#: ../../magic/src/fill.c:94
 msgid "Click in the picture to fill that area with color."
 msgstr "Biyoo zaa m'a nga noonaa barmay."
 
-#: ../../magic/src/fisheye.c:104
+#: ../../magic/src/fisheye.c:78
 msgid "Fisheye"
 msgstr "Hamiisamoɲe"
 
 #. 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 "Nungu suuba biyoo ra k'a tee hamiisamoɲe."
 
-#: ../../magic/src/flower.c:150
+#: ../../magic/src/flower.c:124
 msgid "Flower"
 msgstr "Boosu"
 
-#: ../../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 "Naagu ka ncaŋoo nor ka zayra boosu žeeri. Naŋ zaa n ben."
+msgstr "Naagu ka ncaŋoo nor ka zayra boosu žeeri. A taŋ ka boosoo benandi."
 
-#: ../../magic/src/foam.c:121
+#: ../../magic/src/foam.c:104
 msgid "Foam"
 msgstr "Kufu"
 
-#: ../../magic/src/foam.c:127
+#: ../../magic/src/foam.c:110
 msgid "Click and drag the mouse to cover an area with foamy bubbles."
 msgstr "Naagu, ma ncaŋoo tansandi ka nungoo too nda saafun kufu."
 
-#: ../../magic/src/fold.c:105
+#: ../../magic/src/fold.c:84
 msgid "Fold"
 msgstr "Taabu"
 
-#: ../../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 "Bandafaari noona suuba dee m'a naagu ka tiiraa kanjey bere."
 
-#: ../../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 "Naagu ka ncaŋoo nor ka haŋawyaŋ tee nda  karfu bii žeeri."
-
-#: ../../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 "Naagu ka ncirɲi loti-loti biyoo kul ra."
-
-#: ../../magic/src/glasstile.c:107
+#: ../../magic/src/glasstile.c:83
 msgid "Glass Tile"
 msgstr "Luulucenbu"
 
-#: ../../magic/src/glasstile.c:114
+#: ../../magic/src/glasstile.c:90
 msgid "Click and drag the mouse to put glass tile over your picture."
 msgstr "Naagu, ma ncaŋoo nor ka ni biyoo taalam nda luulucenbuyaŋ."
 
-#: ../../magic/src/glasstile.c:116
+#: ../../magic/src/glasstile.c:92
 msgid "Click to cover your entire picture in glass tiles."
 msgstr "Naagu ka luulucenbu daŋ biyoo kul ra."
 
-#: ../../magic/src/grass.c:112
+#: ../../magic/src/grass.c:92
 msgid "Grass"
 msgstr "Subu"
 
-#: ../../magic/src/grass.c:118
+#: ../../magic/src/grass.c:98
 msgid "Click and move to draw grass. Don’t forget the dirt!"
 msgstr "Naagu ka ncaŋoo nor ka subu žeeri. Ma si dirŋa kusaa !"
 
-#: ../../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 "Naagu ka biyoo bere k'a tee bii-biyya."
-
-#: ../../magic/src/kalidescope.c:120
+#: ../../magic/src/kalidescope.c:90
 msgid "Symmetric Left/Right"
-msgstr ""
+msgstr "Tenjante Wow/Guma"
 
-#: ../../magic/src/kalidescope.c:122
+#: ../../magic/src/kalidescope.c:92
 msgid "Symmetric Up/Down"
-msgstr ""
-
-#: ../../magic/src/kalidescope.c:124
-msgid "Pattern"
-msgstr ""
-
-#: ../../magic/src/kalidescope.c:126
-msgid "Tiles"
-msgstr ""
+msgstr "Tenjante Beene/Ganda"
 
 #. KAL_BOTH
-#: ../../magic/src/kalidescope.c:128
+#: ../../magic/src/kalidescope.c:94
 msgid "Kaleidoscope"
 msgstr "Noonay-bere-diji"
 
-#: ../../magic/src/kalidescope.c:136
-#, fuzzy
-#| msgid ""
-#| "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
+#: ../../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."
 msgstr ""
-"Naagu, ma ncaŋoo nor ka bii tee nda kalam tenjante hinka (sanda nda noonay-"
-"bere-diji)."
+"Ncaŋoo naagu k'a nor ka žeeri nda caaray kalam hinka kaŋ ga tenji nda cere "
+"ni biyoo gamoo ra kanbe wowa nda guma here."
 
-#: ../../magic/src/kalidescope.c:138
-#, fuzzy
-#| msgid ""
-#| "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
+#: ../../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."
 msgstr ""
-"Naagu, ma ncaŋoo nor ka bii tee nda kalam tenjante hinka (sanda nda noonay-"
-"bere-diji)."
-
-#: ../../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 "Naagu, ma ncaŋoo nor ka biyoo wargandi."
-
-#: ../../magic/src/kalidescope.c:142
-#, fuzzy
-#| msgid ""
-#| "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
-msgid ""
-"Click and drag the mouse to draw a pattern plus its symmetric across the "
-"picture."
-msgstr ""
-"Naagu, ma ncaŋoo nor ka bii tee nda kalam tenjante hinka (sanda nda noonay-"
-"bere-diji)."
+"Ncaŋoo naagu k'a nor ka žeeri nda caaray kalam hinka kaŋ ga tenji nda cere "
+"ni biyoo gamoo ra beene nda ganda."
 
 #. 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 ""
 "Naagu, ma ncaŋoo nor ka bii tee nda kalam tenjante hinka (sanda nda noonay-"
 "bere-diji)."
 
-#: ../../magic/src/light.c:107
+#: ../../magic/src/light.c:84
 msgid "Light"
 msgstr "Gaayay"
 
-#: ../../magic/src/light.c:113
+#: ../../magic/src/light.c:90
 msgid "Click and drag to draw a beam of light on your picture."
 msgstr "Naagu, ma ncaŋoo nor ka waynawcindi tee."
 
-#: ../../magic/src/metalpaint.c:101
+#: ../../magic/src/metalpaint.c:77
 msgid "Metal Paint"
 msgstr "Guuru caarayyan"
 
-#: ../../magic/src/metalpaint.c:107
+#: ../../magic/src/metalpaint.c:83
 msgid "Click and drag the mouse to paint with a metallic color."
 msgstr "Naagu ka ncaŋoo nor ka guuru noone foo ka caaray."
 
-#: ../../magic/src/mirror_flip.c:117
+#: ../../magic/src/mirror_flip.c:94
 msgid "Mirror"
 msgstr "Diji"
 
-#: ../../magic/src/mirror_flip.c:119
+#: ../../magic/src/mirror_flip.c:96
 msgid "Flip"
 msgstr "Bere"
 
-#: ../../magic/src/mirror_flip.c:130
+#: ../../magic/src/mirror_flip.c:106
 msgid "Click to make a mirror image."
 msgstr "Naagu ka dii biyoo dijoo ra."
 
-#: ../../magic/src/mirror_flip.c:133
+#: ../../magic/src/mirror_flip.c:109
 msgid "Click to flip the picture upside-down."
 msgstr "Naagu ka biyoo zumandi."
 
-#: ../../magic/src/mosaic.c:100
+#: ../../magic/src/mosaic.c:75
 msgid "Mosaic"
 msgstr "Tarma"
 
-#: ../../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 "Naagu ka ncaŋoo nor ka tarma takari tonton biyoo ga."
 
-#: ../../magic/src/mosaic.c:104
+#: ../../magic/src/mosaic.c:79
 msgid "Click to add a mosaic effect to your entire picture."
 msgstr "Naagu ka biyoo kul tee tarma takari."
 
-#: ../../magic/src/mosaic_shaped.c:142
+#: ../../magic/src/mosaic_shaped.c:134
 msgid "Square Mosaic"
 msgstr "Kaare tarma"
 
-#: ../../magic/src/mosaic_shaped.c:143
+#: ../../magic/src/mosaic_shaped.c:135
 msgid "Hexagon Mosaic"
-msgstr "Kanje iddu tarma"
+msgstr "Kanje yaaha tarma"
 
-#: ../../magic/src/mosaic_shaped.c:144
+#: ../../magic/src/mosaic_shaped.c:136
 msgid "Irregular Mosaic"
-msgstr "Tarma kan soogey si hanga cere bande"
+msgstr "Tarma cerehõoyante"
 
-#: ../../magic/src/mosaic_shaped.c:149
-#, fuzzy
-#| msgid ""
-#| "Click and move the mouse to add a mosaic effect to parts of your picture."
+#: ../../magic/src/mosaic_shaped.c:141
 msgid ""
 "Click and move the mouse to add a square mosaic to parts of your picture."
-msgstr "Naagu ka ncaŋoo nor ka tarma takari tonton biyoo ga."
+msgstr "Naagu ka ncaŋoo nor ka kaare tarma tonton ni biyoo jerey ga."
 
-#: ../../magic/src/mosaic_shaped.c:150
-#, fuzzy
-#| msgid "Click to add a mosaic effect to your entire picture."
+#: ../../magic/src/mosaic_shaped.c:142
 msgid "Click to add a square mosaic to your entire picture."
-msgstr "Naagu ka biyoo kul tee tarma takari."
+msgstr "Naagu ka kaare tarma tonton ni biyoo kul ga."
 
-#: ../../magic/src/mosaic_shaped.c:152
-#, fuzzy
-#| msgid ""
-#| "Click and move the mouse to add a mosaic effect to parts of your picture."
+#: ../../magic/src/mosaic_shaped.c:144
 msgid ""
 "Click and move the mouse to add a hexagonal mosaic to parts of your picture."
-msgstr "Naagu ka ncaŋoo nor ka tarma takari tonton biyoo ga."
+msgstr "Naagu ka ncaŋoo nor ka kanje yaaha tarma tonton ni biyoo jerey kul ga."
 
-#: ../../magic/src/mosaic_shaped.c:153
-#, fuzzy
-#| msgid "Click to add a mosaic effect to your entire picture."
+#: ../../magic/src/mosaic_shaped.c:145
 msgid "Click to add a hexagonal mosaic to your entire picture."
-msgstr "Naagu ka biyoo kul tee tarma takari."
+msgstr "Naagu ka kanje yaaha tarma tonton ni biyoo kul ga."
 
-#: ../../magic/src/mosaic_shaped.c:155
-#, fuzzy
-#| msgid ""
-#| "Click and move the mouse to add a mosaic effect to parts of your picture."
+#: ../../magic/src/mosaic_shaped.c:147
 msgid ""
 "Click and move the mouse to add an irregular mosaic to parts of your picture."
-msgstr "Naagu ka ncaŋoo nor ka tarma takari tonton biyoo ga."
+msgstr "Naagu ka ncaŋoo nor ka tarma cerehõoyante tonton ni biyoo jerey ga."
 
-#: ../../magic/src/mosaic_shaped.c:156
-#, fuzzy
-#| msgid "Click to add a mosaic effect to your entire picture."
+#: ../../magic/src/mosaic_shaped.c:148
 msgid "Click to add an irregular mosaic to your entire picture."
-msgstr "Naagu ka biyoo kul tee tarma takari."
+msgstr "Naagu ka tarma cerehõoyante tonton ni biyoo kul ga."
 
-#: ../../magic/src/negative.c:98
+#: ../../magic/src/negative.c:72
 msgid "Negative"
 msgstr "Bii-biyya"
 
-#: ../../magic/src/negative.c:106
+#: ../../magic/src/negative.c:80
 msgid "Click and move the mouse around to make your painting negative."
 msgstr "Naagu, ma ncaŋoo nor ka biyoo bere k'a tee feraw-izeyaŋ."
 
-#: ../../magic/src/negative.c:109
+#: ../../magic/src/negative.c:83
 msgid "Click to turn your painting into its negative."
 msgstr "Naagu ka biyoo bere k'a tee bii-biyya."
 
@@ -1141,49 +1070,47 @@ msgstr "Naagu ka jinde tonton biyoo kul ga."
 
 #: ../../magic/src/perspective.c:145
 msgid "Perspective"
-msgstr "Gunari alhaali"
+msgstr "Honnayan"
 
 #: ../../magic/src/perspective.c:146
 msgid "Zoom"
-msgstr "Bebberandi"
+msgstr "Bebbeerandiyan"
 
 #: ../../magic/src/perspective.c:151
-#, fuzzy
-#| msgid "Click and drag the mouse to emboss the picture."
 msgid "Click on the corners and drag where you want to stretch the picture."
-msgstr "Naagu, ma ncaŋoo nor ka biyoo wargandi."
+msgstr "Lokey naagu nda nor nungu kaŋ ra n' ga baa ka biyoo yobu."
 
 #: ../../magic/src/perspective.c:154
-#, fuzzy
-#| msgid "Click and drag to squirt toothpaste onto your picture."
 msgid "Click and drag up to zoom in or drag down to zoom out the picture."
-msgstr "Naagu ka ncaŋoo nor ka kossi doonu firzi biyoo ra."
+msgstr "Naagu ka cenda beene ka biyoo manandi wala ganda k'a moorandi."
 
-#: ../../magic/src/puzzle.c:105
-#, fuzzy
-#| msgid "Purple!"
+#: ../../magic/src/puzzle.c:79
 msgid "Puzzle"
-msgstr "Boy !"
+msgstr "Damcerega"
 
-#: ../../magic/src/puzzle.c:112
-#, fuzzy
-#| msgid "Click on part of your picture to create a fisheye effect."
+#: ../../magic/src/puzzle.c:86
 msgid "Click the part of your picture where would you like a puzzle."
-msgstr "Nungu suuba biyoo ra k'a tee hamiisamoɲe."
+msgstr "Ni biyoo jeroo naagu kaŋ ga n' ga baa a ma hima damcerega. "
 
-#: ../../magic/src/puzzle.c:113
-#, fuzzy
-#| msgid "Click to make a mirror image."
+#: ../../magic/src/puzzle.c:87
 msgid "Click to make a puzzle in fullscreen mode."
-msgstr "Naagu ka dii biyoo dijoo ra."
+msgstr "Naagu ka damceregaa himandi dijikul alhaali."
 
-#: ../../magic/src/rails.c:131
+#: ../../magic/src/rails.c:101
 msgid "Rails"
 msgstr "Zirji fondo"
 
-#: ../../magic/src/rails.c:133
+#: ../../magic/src/rails.c:103
 msgid "Click and drag to draw train track rails on your picture."
-msgstr "Naagu ka ncaŋoo nor ka  zirji fondo tee."
+msgstr "Naagu ka ncaŋoo nor ka zirji fondo tee."
+
+#: ../../magic/src/rainbow.c:107
+msgid "Rainbow"
+msgstr "Woyhenney-dobaa"
+
+#: ../../magic/src/rainbow.c:114
+msgid "You can draw in rainbow colors!"
+msgstr "N' ga hin ka woyhenney-dobaa noonawey ka bii tee !"
 
 #: ../../magic/src/rain.c:65
 msgid "Rain"
@@ -1197,53 +1124,43 @@ msgstr "Naagu ka ncirɲi loti-loti biyoo ra."
 msgid "Click to cover your picture with rain drops."
 msgstr "Naagu ka ncirɲi loti-loti biyoo kul ra."
 
-#: ../../magic/src/rainbow.c:139
-msgid "Rainbow"
-msgstr "Woyhenney-dobaa"
-
-#: ../../magic/src/rainbow.c:146
-msgid "You can draw in rainbow colors!"
-msgstr "N ga hin ka woyhenney-dobaa noonawey ka bii tee"
-
-#: ../../magic/src/realrainbow.c:110
+#: ../../magic/src/realrainbow.c:86
 msgid "Real Rainbow"
-msgstr "Cimi-cimi woyhenney-dobaa"
+msgstr "Woyhenna-dobo cimi"
 
-#: ../../magic/src/realrainbow.c:112
-#, fuzzy
-#| msgid "Real Rainbow"
+#: ../../magic/src/realrainbow.c:88
 msgid "ROYGBIV Rainbow"
-msgstr "Cimi-cimi woyhenney-dobaa"
+msgstr "Woyhenna-dobo cimi"
 
-#: ../../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."
 msgstr ""
-"Naagu nungoo kaŋ ra woyhenney-dobaa ga sintin, ncaŋoo nor ka koy nungoo kaŋ "
-"ra a ga kay, dee ma ncaŋoo taŋ ka woyhenney-dobaa žeeri."
+"Naagu nungu kaŋ n' ga baa ni woyhenna-dobaa ma šintin, cendi nungoo kaŋ n' "
+"ga baa a ma ben, nda m'a naŋ ka woyhenna-dobaa žeeri."
 
-#: ../../magic/src/ripples.c:106
+#: ../../magic/src/ripples.c:81
 msgid "Ripples"
-msgstr "Bonday-izey"
+msgstr "Bonday-izey."
 
-#: ../../magic/src/ripples.c:112
+#: ../../magic/src/ripples.c:87
 msgid "Click to make ripples appear over your picture."
-msgstr "Naagu, ma bondayyaŋ tunandi haroo boŋ."
+msgstr "Naagu, ma bondayyaŋ tunandi haroo boŋ"
 
-#: ../../magic/src/rosette.c:116
+#: ../../magic/src/rosette.c:93
 msgid "Rosette"
 msgstr "Fita hiiri"
 
-#: ../../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 "Naagu nee ka fita hiiri tee."
 
-#: ../../magic/src/rosette.c:123
+#: ../../magic/src/rosette.c:100
 msgid "You can draw just like Picasso!"
 msgstr "N ga hin ka bii tee sanda Picasso !"
 
@@ -1265,53 +1182,49 @@ msgstr "Naagu ka ncaŋoo nor ka hirri tonton biyoo ga."
 
 #: ../../magic/src/sharpen.c:79
 msgid "Click to trace edges in your entire picture."
-msgstr "Naagu ka hirri tee biyoo kul se."
+msgstr "Naagu ka biyoo kul noonaa barmay."
 
 #: ../../magic/src/sharpen.c:80
 msgid "Click and move the mouse to sharpen parts of your picture."
-msgstr "Naagu ka ncaŋoo nor ka ni biyoo yantan."
+msgstr "Naagu ka ncaŋoo nor ka ni biyoo yanta"
 
 #: ../../magic/src/sharpen.c:81
 msgid "Click to sharpen the entire picture."
-msgstr "Naagu ka biyoo kul yantan."
+msgstr "Naagu ka biyoo kul yanta."
 
 #: ../../magic/src/sharpen.c:82
 msgid "Click and move the mouse to create a black and white silhouette."
-msgstr "Naagu ka ncaŋoo nor ka azzaati bibi nda i kaaray tee biyoo se."
+msgstr "Naagu ka ncaŋoo nor ka azzaati bibi nda i kaarey tee biyoo se."
 
 #: ../../magic/src/sharpen.c:83
 msgid "Click to create a black and white silhouette of your entire picture."
 msgstr "Naagu ka ncaŋoo nor ka azzaati bibi nda i kaaray tee biyoo kul se."
 
-#: ../../magic/src/shift.c:109
+#: ../../magic/src/shift.c:104
 msgid "Shift"
 msgstr "Nor"
 
-#: ../../magic/src/shift.c:115
+#: ../../magic/src/shift.c:110
 msgid "Click and drag to shift your picture around on the canvas."
-msgstr "Ncaŋoo naagu m'a nor  ka ni biyoo daŋ kaloo ra."
+msgstr "Ncaŋoo naagu m'a nor ka ni biyoo daŋ kaloo ra."
 
-#: ../../magic/src/smudge.c:106
+#: ../../magic/src/smudge.c:83
 msgid "Smudge"
 msgstr "Kusawandi"
 
 #. if (which == 1)
-#: ../../magic/src/smudge.c:108
-#, fuzzy
-#| msgid "Metal Paint"
+#: ../../magic/src/smudge.c:85
 msgid "Wet Paint"
-msgstr "Guuru caarayyan"
+msgstr "Caaray taya"
 
-#: ../../magic/src/smudge.c:115
+#: ../../magic/src/smudge.c:92
 msgid "Click and move the mouse around to smudge the picture."
 msgstr "Naagu ma ncaŋoo nor ka biyoo kusawandi."
 
 #. if (which == 1)
-#: ../../magic/src/smudge.c:117
-#, fuzzy
-#| msgid "Click and move the mouse around to blur the image."
+#: ../../magic/src/smudge.c:94
 msgid "Click and move the mouse around to draw with wet, smudgy paint."
-msgstr "Naagu ka ncaŋoo nor ka biyoo kokoorandi."
+msgstr "Naagu ka ncaŋoo nor-nor ka žeeri nda caaray batakarante."
 
 #: ../../magic/src/snow.c:68
 msgid "Snow Ball"
@@ -1323,40 +1236,40 @@ msgstr "Než hamni"
 
 #: ../../magic/src/snow.c:72
 msgid "Click to add snow balls to your picture."
-msgstr "Naagu ka než gungulante tonton biyoo ga."
+msgstr "Naagu ka než hamni tonton biyoo ga."
 
 #: ../../magic/src/snow.c:73
 msgid "Click to add snow flakes to your picture."
 msgstr "Naagu ka než hamni tonton biyoo ga."
 
-#: ../../magic/src/string.c:123
+#: ../../magic/src/string.c:120
 msgid "String edges"
-msgstr "Karfu hirri"
+msgstr "Tenjiri jesey"
+
+#: ../../magic/src/string.c:123
+msgid "String corner"
+msgstr "Tenjiri kunga"
 
 #: ../../magic/src/string.c:126
-msgid "String corner"
-msgstr "Karfu hawari"
-
-#: ../../magic/src/string.c:129
 msgid "String 'V'"
-msgstr "Karfu 'V'"
+msgstr "'V' tenjiri"
 
-#: ../../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."
 msgstr ""
-"Naagu ka ncaŋoo nor ka karfu bii žeeri. Naagu ka ncaŋoo nor ka koy ganda "
-"here ka žeerey hina kaccandi wala k'i boobandi , a nor ka koy kanba gumaa "
-"here wala kanba wowaa here ka guusoo beerandi."
+"Naagu nda nor ka tenjiri kanbateeri žeeri. Cendi beene ka zunbu ganda ka "
+"žabu wala ka tonton žeerey ga, kanbe wowa wala kanbe guma ga ka guusoo "
+"beerandi."
+
+#: ../../magic/src/string.c:137
+msgid "Click and drag to draw arrows made of string art."
+msgstr "Naagu nda cendi ka birawyaŋ tee nda tenjiri kanbateeri."
 
 #: ../../magic/src/string.c:140
-msgid "Click and drag to draw arrows made of string art."
-msgstr "Naagu ka ncaŋoo nor ka haŋawyaŋ tee nda  karfu bii žeeri."
-
-#: ../../magic/src/string.c:143
 msgid "Draw string art arrows with free angles."
-msgstr "Haŋaw karfu bii žeeri nda kanje dumi kul."
+msgstr "Tenjiri kanbateeri birawyaŋ žeeri nda ganje feeranteyaŋ."
 
 #: ../../magic/src/tint.c:71
 msgid "Tint"
@@ -1364,105 +1277,98 @@ msgstr "Caaray"
 
 #: ../../magic/src/tint.c:72
 msgid "Color & White"
-msgstr "Bibi nda I kaaray"
+msgstr "Noone bibi nda ikaaray"
 
 #: ../../magic/src/tint.c:75
 msgid ""
 "Click and move the mouse around to change the color of parts of your picture."
-msgstr "Naagu ka ncaŋoo nor ka ni biyoo jerey noonaa barmay."
+msgstr "Naagu ka ncaŋoo nor ka ni biyoo jerey noona barmay."
 
 #: ../../magic/src/tint.c:76
 msgid "Click to change the color of your entire picture."
-msgstr "Naagu ka biyoo kul noonaa barmay."
+msgstr "Naagu ka ni biyoo kul noonaa barmay."
 
 #: ../../magic/src/tint.c:77
 msgid ""
 "Click and move the mouse around to turn parts of your picture into white and "
 "a color you choose."
 msgstr ""
-"Naagu, ma ncaŋoo nor ka biyoo jerey bere k'i tee i kaaray nda noone kaŋ n' "
+"Naagu, ma ncaŋoo nor ka biyoo jerey bere k'i tee i kaaray nda noona kaŋ n' "
 "na suuba."
 
 #: ../../magic/src/tint.c:78
 msgid "Click to turn your entire picture into white and a color you choose."
 msgstr ""
-"Naagu, ma ncaŋoo nor ka biyoo kul bere k'a tee i kaaray nda noone kaŋ n' na "
+"Naagu, ma ncaŋoo nor ka biyoo kul bere k'a tee i kaaray nda noona kaŋ n' na "
 "suuba."
 
 #: ../../magic/src/toothpaste.c:65
 msgid "Toothpaste"
-msgstr "Kossi doonu"
+msgstr "Košši doonu"
 
 #: ../../magic/src/toothpaste.c:68
 msgid "Click and drag to squirt toothpaste onto your picture."
-msgstr "Naagu ka ncaŋoo nor ka kossi doonu firzi biyoo ra."
+msgstr "Naagu ka ncaŋoo nor ka košši doonu firši biyoo ga."
 
-#: ../../magic/src/tornado.c:157
+#: ../../magic/src/tornado.c:127
 msgid "Tornado"
-msgstr "Beena hirri"
+msgstr "Hewkur"
 
-#: ../../magic/src/tornado.c:163
+#: ../../magic/src/tornado.c:133
 msgid "Click and drag to draw a tornado funnel on your picture."
-msgstr "Naagu ma ncaŋoo nor ka beena hirri taka žeeri biyoo ra."
+msgstr "Naagu, ma ncaŋoo nor ka hewkur šigifa tee ni biyoo boŋ."
 
-#: ../../magic/src/tv.c:100
+#: ../../magic/src/tv.c:74
 msgid "TV"
 msgstr "Telewižoŋ"
 
-#: ../../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 ""
-"Click and drag to make parts of your picture look like they are on "
-"television."
+msgstr "Naagu nda nor ka ni biyoo jerey himandi sanda telewižon ra. "
 
-#: ../../magic/src/tv.c:108
+#: ../../magic/src/tv.c:82
 msgid "Click to make your picture look like it's on television."
 msgstr "Naagu ka biyoo himandi sanda telewižoŋ ra."
 
-#: ../../magic/src/waves.c:103
+#: ../../magic/src/waves.c:80
 msgid "Waves"
-msgstr "Bondawey"
+msgstr "Bondaway"
 
-#: ../../magic/src/waves.c:104
+#: ../../magic/src/waves.c:81
 msgid "Wavelets"
 msgstr "Bonday-izey"
 
-#: ../../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 "
 "the right for long waves."
 msgstr ""
-"Naagu ka bonday taka bii zumante tee. Naagu beene here ka bonday kaccuyaŋ "
-"tee. Ganda here ibeeriyaŋ se. Kanbe wowaa ga ka kaa gandoo ra, kanbe gumaa "
-"ga ka tonton gandoo ra."
+"Naagu ka bonday-taka bii zumantee tee. Naagu beene here ka bonday kaccuyan "
+"tee. Ganda here ibeeriyan se. Kanbe wowaa ga ka kaa gandoo ra, kanbe guma ga "
+"ka tonton gandoo ra. Naagu beene here ka bonday kaccuyan tee. Ganda here "
+"ibeeriyan se. Kanbe wowaa ga ka kaa gandoo ra, kanbe guma ga ka tonton "
+"gandoo ra."
 
-#: ../../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 "
 "for long waves."
 msgstr ""
-"Naagu ka bonday taka bii kayante tee. Naagu beene here ka bonday kaccuyaŋ "
-"tee. Ganda here ibeeriyaŋ se. Kanbe wowaa ga ka kaa gandoo ra, kanbe gumaa "
-"ga ka tonton gandoo ra."
+"Naagu ka bonday-taka bii kayante tee. Naagu beene here ka bonday kaccuyan "
+"tee. Ganda here ibeeriyan se. Kanbe wowaa ga ka kaa gandoo ra, kanbe guma ga "
+"ka tonton gandoo ra. Naagu beene here ka bonday kaccuyan tee. Ganda here "
+"ibeeriyan se. Kanbe wowaa ga ka kaa gandoo ra, kanbe guma ga ka tonton "
+"gandoo ra."
 
-#: ../../magic/src/xor.c:95
-#, fuzzy
-#| msgid "Colors"
-msgid "Xor Colors"
-msgstr "Noonawey"
+#~ msgid "qy"
+#~ msgstr "qy"
 
-#: ../../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 "Naagu ka ncaŋoo nor ka haŋawyaŋ tee nda  karfu bii žeeri."
+#~ msgid "QY"
+#~ msgstr "QY"
 
-#: ../../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 "Naagu ka biyoo kul tee tarma takari."
+#~ msgid "Choose a style of text. Click on your drawing and you can start typing."
+#~ msgstr "Hantum-ɲaa dumi suuba. Ni žeeroo naagu ka ni hantum-ɲaaŋoo sintin."