diff --git a/src/po/fr.po b/src/po/fr.po
index 9bbdbb7cf..9e9345166 100644
--- a/src/po/fr.po
+++ b/src/po/fr.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-09-07 07:37+0200\n"
+"POT-Creation-Date: 2009-09-10 15:53-0700\n"
 "PO-Revision-Date: 2009-09-07 07:36+0100\n"
 "Last-Translator: Chion Jacques <jacques.chion@orange.fr>\n"
 "Language-Team:  <fr@li.org>\n"
@@ -714,38 +714,6 @@ msgstr "Clique et déplace la souris pour changer la couleur localement."
 msgid "Click to change the colors in your entire picture."
 msgstr "Clique pour changer la couleur de tout le dessin."
 
-#: ../../magic/src/blackAndWhite.c:67
-msgid "Black & White"
-msgstr "Gris"
-
-#: ../../magic/src/blackAndWhite.c:68
-msgid "Threshold"
-msgstr "Noir et blanc"
-
-#
-#: ../../magic/src/blackAndWhite.c:71
-msgid "Click and move the mouse around convert the image to greyscale."
-msgstr "Clique et déplace la souris pour obtenir une partie de l'image en gris"
-
-#
-#: ../../magic/src/blackAndWhite.c:72
-msgid "Click to convert the image to greyscale."
-msgstr "Clique pour que toute l'image devienne grise."
-
-#: ../../magic/src/blackAndWhite.c:73
-msgid ""
-"Click and move the mouse around to threshold the image into black and white "
-"regions."
-msgstr ""
-"Clique et déplace la souris pour avoir le dessin en noir et blanc par "
-"endroits."
-
-#
-#: ../../magic/src/blackAndWhite.c:74
-msgid "Click to threshold the image into black and white regions."
-msgstr ""
-"Clique et déplace la souris pour avoir tout le dessin en noir et blanc."
-
 #: ../../magic/src/blind.c:92
 msgid "Blind"
 msgstr "Store"
@@ -953,19 +921,6 @@ msgstr ""
 "Clique et déplace la souris pour dessiner de l'herbe. N'oublie pas la "
 "poussière !"
 
-#: ../../magic/src/jigsaw.c:62
-msgid "Jigsaw"
-msgstr "Scie sauteuse"
-
-#: ../../magic/src/jigsaw.c:65
-msgid ""
-"Click to make your picture into a jigsaw which you can print and cut out, "
-"make sure to ask an adult for help."
-msgstr ""
-"Clique pour découper ton image avec une scie sauteuse, que tu pourras "
-"ensuite imprimer puis découper avec des ciseaux. Demande à une grande "
-"personne de t'aider."
-
 #: ../../magic/src/kalidescope.c:77
 msgid "Kaleidoscope"
 msgstr "Kaléidoscope"
@@ -1425,6 +1380,44 @@ msgstr ""
 "courtes vagues, vers le bas pour de longues vagues, à gauche pour diminuer "
 "l'amplitude et à droite pour augmenter l'amplitude."
 
+#~ msgid "Black & White"
+#~ msgstr "Gris"
+
+#~ msgid "Threshold"
+#~ msgstr "Noir et blanc"
+
+#
+#~ msgid "Click and move the mouse around convert the image to greyscale."
+#~ msgstr ""
+#~ "Clique et déplace la souris pour obtenir une partie de l'image en gris"
+
+#
+#~ msgid "Click to convert the image to greyscale."
+#~ msgstr "Clique pour que toute l'image devienne grise."
+
+#~ msgid ""
+#~ "Click and move the mouse around to threshold the image into black and "
+#~ "white regions."
+#~ msgstr ""
+#~ "Clique et déplace la souris pour avoir le dessin en noir et blanc par "
+#~ "endroits."
+
+#
+#~ msgid "Click to threshold the image into black and white regions."
+#~ msgstr ""
+#~ "Clique et déplace la souris pour avoir tout le dessin en noir et blanc."
+
+#~ msgid "Jigsaw"
+#~ msgstr "Scie sauteuse"
+
+#~ msgid ""
+#~ "Click to make your picture into a jigsaw which you can print and cut out, "
+#~ "make sure to ask an adult for help."
+#~ msgstr ""
+#~ "Clique pour découper ton image avec une scie sauteuse, que tu pourras "
+#~ "ensuite imprimer puis découper avec des ciseaux. Demande à une grande "
+#~ "personne de t'aider."
+
 #~ msgid ""
 #~ "Click and drag to draw the blind, move left or right to open or close."
 #~ msgstr ""
diff --git a/src/po/pt.po b/src/po/pt.po
index 60022b0e0..b6f7c75b4 100644
--- a/src/po/pt.po
+++ b/src/po/pt.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: tuxpaint 0.9.21\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 18:32-0700\n"
+"POT-Creation-Date: 2009-09-10 15:53-0700\n"
 "PO-Revision-Date: 2009-09-01 12:53-0000\n"
 "Last-Translator: Sérgio Marques <smarquespt@gmail.com>\n"
 "Language-Team: Portuguese <translation-team-pt@lists.sourceforge.net>\n"
@@ -232,95 +232,82 @@ msgid "ZH_TW"
 msgstr "ZH_TW"
 
 #. Square shape tool (4 equally-lengthed sides at right angles)
-#: ../shapes.h:171
-#: ../shapes.h:172
+#: ../shapes.h:171 ../shapes.h:172
 msgid "Square"
 msgstr "Quadrado"
 
 #. Rectangle shape tool (4 sides at right angles)
-#: ../shapes.h:175
-#: ../shapes.h:176
+#: ../shapes.h:175 ../shapes.h:176
 msgid "Rectangle"
 msgstr "Rectângulo"
 
 #. Circle shape tool (X radius and Y radius are the same)
-#: ../shapes.h:179
-#: ../shapes.h:180
+#: ../shapes.h:179 ../shapes.h:180
 msgid "Circle"
 msgstr "Círculo"
 
 #. Ellipse shape tool (X radius and Y radius may differ)
-#: ../shapes.h:183
-#: ../shapes.h:184
+#: ../shapes.h:183 ../shapes.h:184
 msgid "Ellipse"
 msgstr "Elipse"
 
 #. Triangle shape tool (3 sides)
-#: ../shapes.h:187
-#: ../shapes.h:188
+#: ../shapes.h:187 ../shapes.h:188
 msgid "Triangle"
 msgstr "Triângulo"
 
 #. Pentagone shape tool (5 sides)
-#: ../shapes.h:191
-#: ../shapes.h:192
+#: ../shapes.h:191 ../shapes.h:192
 msgid "Pentagon"
 msgstr "Pentágono"
 
 #. Rhombus shape tool (4 sides, not at right angles)
-#: ../shapes.h:195
-#: ../shapes.h:196
+#: ../shapes.h:195 ../shapes.h:196
 msgid "Rhombus"
 msgstr "Losango"
 
 #. Octagon shape tool (8 sides)
-#: ../shapes.h:199
-#: ../shapes.h:200
+#: ../shapes.h:199 ../shapes.h:200
 msgid "Octagon"
 msgstr "Octógono"
 
 #. Description of a square
-#: ../shapes.h:208
-#: ../shapes.h:209
+#: ../shapes.h:208 ../shapes.h:209
 msgid "A square is a rectangle with four equal sides."
 msgstr "Um quadrado é um rectângulo com quatro lados iguais."
 
 #. Description of a rectangle
-#: ../shapes.h:212
-#: ../shapes.h:213
+#: ../shapes.h:212 ../shapes.h:213
 msgid "A rectangle has four sides and four right angles."
 msgstr "Um rectângulo tem quatro lados e quatro ângulos rectos."
 
-#: ../shapes.h:217
-#: ../shapes.h:219
-msgid "A circle is a curve where all points have the same distance from the center."
-msgstr "Um círculo é uma curva em que todos os pontos estão à mesma distância do centro."
+#: ../shapes.h:217 ../shapes.h:219
+msgid ""
+"A circle is a curve where all points have the same distance from the center."
+msgstr ""
+"Um círculo é uma curva em que todos os pontos estão à mesma distância do "
+"centro."
 
 #. Description of an ellipse
-#: ../shapes.h:222
-#: ../shapes.h:223
+#: ../shapes.h:222 ../shapes.h:223
 msgid "An ellipse is a stretched circle."
 msgstr "Uma elipse é um círculo esticado."
 
 #. Description of a triangle
-#: ../shapes.h:226
-#: ../shapes.h:227
+#: ../shapes.h:226 ../shapes.h:227
 msgid "A triangle has three sides."
 msgstr "Um triângulo tem três lados."
 
 #. Description of a pentagon
-#: ../shapes.h:230
-#: ../shapes.h:231
+#: ../shapes.h:230 ../shapes.h:231
 msgid "A pentagon has five sides."
 msgstr "Um pentágono tem cinco lados."
 
-#: ../shapes.h:235
-#: ../shapes.h:237
+#: ../shapes.h:235 ../shapes.h:237
 msgid "A rhombus has four equal sides, and opposite sides are parallel."
 msgstr "Um losango tem quatro lados iguais e os lados opostos são paralelos."
 
-#: ../shapes.h:241
-#: ../shapes.h:243
+#: ../shapes.h:241 ../shapes.h:243
 msgid "An octagon has eight equal sides."
 msgstr "Um octágono tem oito lados iguais."
 
@@ -351,8 +338,7 @@ msgstr "Carimbos"
 
 #. Title of shape selector (buttons down the right for shapes tool)
 #. Shape creation tool (square, circle, etc.)
-#: ../titles.h:71
-#: ../tools.h:69
+#: ../titles.h:71 ../tools.h:69
 msgid "Shapes"
 msgstr "Formas"
 
@@ -363,8 +349,7 @@ msgstr "Letras"
 
 #. Title of magic tool selector (buttons down the right for magic (effect plugin) tool)
 #. "Magic" effects tools (blur, flip image, etc.)
-#: ../titles.h:77
-#: ../tools.h:75
+#: ../titles.h:77 ../tools.h:75
 msgid "Magic"
 msgstr "Mágico"
 
@@ -411,8 +396,7 @@ msgstr "Novo"
 #. Open a saved picture
 #. buttons for the file open dialog
 #. Open dialog: 'Open' button, to load the selected picture
-#: ../tools.h:90
-#: ../tuxpaint.c:8005
+#: ../tools.h:90 ../tuxpaint.c:8005
 msgid "Open"
 msgstr "Abrir"
 
@@ -444,20 +428,27 @@ msgstr "Escolhe uma imagem para colocar em volta do desenho."
 #. Line tool instructions
 #: ../tools.h:113
 msgid "Click to start drawing a line. Let go to complete it."
-msgstr "Clica para começares a desenhar uma linha. Solta o botão quando terminares."
+msgstr ""
+"Clica para começares a desenhar uma linha. Solta o botão quando terminares."
 
 # #: tools.h:65
 # msgid "Pick a shape to draw.  Click once to pick the center of the shape, #click again to draw it."
 # msgstr "Escolha uma forma para desenhar. Clique uma vez para definir o centro da imagem. Clique de novo para desenhá-la."
 #. Shape tool instructions
 #: ../tools.h:116
-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 "Escolhe uma forma. Clica para pores o centro, arrasta, e larga quando estiver do tamanho que queres. Move o rato para a rodares e clica para desenhar."
+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 ""
+"Escolhe uma forma. Clica para pores o centro, arrasta, e larga quando "
+"estiver do tamanho que queres. Move o rato para a rodares e clica para "
+"desenhar."
 
 #. Text tool instructions
 #: ../tools.h:119
 msgid "Choose a style of text. Click on your drawing and you can start typing."
-msgstr "Escolhe um estilo de texto. Clica no desenho e podes começar a escrever."
+msgstr ""
+"Escolhe um estilo de texto. Clica no desenho e podes começar a escrever."
 
 #. Magic tool instruction
 #: ../tools.h:122
@@ -535,8 +526,7 @@ msgid "Yes, I’m done!"
 msgstr "Sim, terminei !"
 
 #. Quit prompt negative response (don't quit)
-#: ../tuxpaint.c:1864
-#: ../tuxpaint.c:1891
+#: ../tuxpaint.c:1864 ../tuxpaint.c:1891
 msgid "No, take me back!"
 msgstr "Não, quero continuar!"
 
@@ -545,13 +535,11 @@ msgstr "Não, quero continuar!"
 msgid "If you quit, you’ll lose your picture! Save it?"
 msgstr "Se saires, vais perder a imagem! Queres guardá-la?"
 
-#: ../tuxpaint.c:1869
-#: ../tuxpaint.c:1874
+#: ../tuxpaint.c:1869 ../tuxpaint.c:1874
 msgid "Yes, save it!"
 msgstr "Sim, guardar!"
 
-#: ../tuxpaint.c:1870
-#: ../tuxpaint.c:1875
+#: ../tuxpaint.c:1870 ../tuxpaint.c:1875
 msgid "No, don’t bother saving!"
 msgstr "Não, não é preciso !"
 
@@ -566,10 +554,7 @@ msgid "Can’t open that picture!"
 msgstr "Não consigo abrir essa imagem!"
 
 #. Generic dialog dismissal
-#: ../tuxpaint.c:1881
-#: ../tuxpaint.c:1886
-#: ../tuxpaint.c:1895
-#: ../tuxpaint.c:1902
+#: ../tuxpaint.c:1881 ../tuxpaint.c:1886 ../tuxpaint.c:1895 ../tuxpaint.c:1902
 #: ../tuxpaint.c:1911
 msgid "OK"
 msgstr "Está bem"
@@ -703,8 +688,7 @@ msgstr "Escolhe a imagem que queres e clica em “Abrir”."
 
 #. Let user choose images:
 #. Instructions for Slideshow file dialog (FIXME: Make a #define)
-#: ../tuxpaint.c:14427
-#: ../tuxpaint.c:14741
+#: ../tuxpaint.c:14427 ../tuxpaint.c:14741
 msgid "Choose the pictures you want, then click “Play”."
 msgstr "Escolhe as imagens que queres e clica em “Mostrar”."
 
@@ -737,11 +721,12 @@ msgid "Blind"
 msgstr "Persiana"
 
 #: ../../magic/src/blind.c:97
-#| msgid ""
-#| "Click on a side and drag the blind to were you want, slide on the first "
-#| "lame to open or close the blind."
-msgid "Click towards the edge of your picture to pull window blinds over it. Move perpendicularly to open or close the blinds."
-msgstr "Clica na direcção da margem da imagem para puxar as persianas. Move perpendicularmente para abri-las ou fecha-las."
+msgid ""
+"Click towards the edge of your picture to pull window blinds over it. Move "
+"perpendicularly to open or close the blinds."
+msgstr ""
+"Clica na direcção da margem da imagem para puxar as persianas. Move "
+"perpendicularmente para abri-las ou fecha-las."
 
 #: ../../magic/src/blocks_chalk_drip.c:132
 msgid "Blocks"
@@ -760,7 +745,8 @@ msgid "Click and move the mouse around to make the picture blocky."
 msgstr "Clica e move o rato para transformares a imagem em blocos."
 
 #: ../../magic/src/blocks_chalk_drip.c:149
-msgid "Click and move the mouse around to turn the picture into a chalk drawing."
+msgid ""
+"Click and move the mouse around to turn the picture into a chalk drawing."
 msgstr "Clica e move o rato para transformares a imagem num desenho de giz."
 
 #: ../../magic/src/blocks_chalk_drip.c:152
@@ -894,8 +880,10 @@ msgid "Fold"
 msgstr "Dobra"
 
 #: ../../magic/src/fold.c:86
-msgid "Choose a background color and click to turn the corner of the page over."
-msgstr "Escolhe uma cor de fundo e clica para virar o canto da página por cima."
+msgid ""
+"Choose a background color and click to turn the corner of the page over."
+msgstr ""
+"Escolhe uma cor de fundo e clica para virar o canto da página por cima."
 
 #: ../../magic/src/glasstile.c:83
 msgid "Glass Tile"
@@ -903,7 +891,8 @@ msgstr "Fundo de Garrafa"
 
 #: ../../magic/src/glasstile.c:90
 msgid "Click and drag the mouse to put glass tile over your picture."
-msgstr "Clica e arrasta o rato para pôr um fundo de garrafa por cima da imagem."
+msgstr ""
+"Clica e arrasta o rato para pôr um fundo de garrafa por cima da imagem."
 
 #: ../../magic/src/glasstile.c:92
 msgid "Click to cover your entire picture in glass tiles."
@@ -922,8 +911,10 @@ msgid "Kaleidoscope"
 msgstr "Caleidoscópio"
 
 #: ../../magic/src/kalidescope.c:83
-msgid "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
-msgstr "Clica e arrasta o rato para desenhar com pincéis simétricos (caleidoscópio)."
+msgid ""
+"Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
+msgstr ""
+"Clica e arrasta o rato para desenhar com pincéis simétricos (caleidoscópio)."
 
 #: ../../magic/src/light.c:84
 msgid "Light"
@@ -962,20 +953,21 @@ msgid "Mosaic"
 msgstr "Mosaico"
 
 #: ../../magic/src/mosaic.c:78
-msgid "Click and move the mouse to add a mosaic effect to parts of your picture."
-msgstr "Clica e move o rato para adicionar um efeito de mosaico em algumas partes da imagem."
+msgid ""
+"Click and move the mouse to add a mosaic effect to parts of your picture."
+msgstr ""
+"Clica e move o rato para adicionar um efeito de mosaico em algumas partes da "
+"imagem."
 
 #: ../../magic/src/mosaic.c:79
 msgid "Click to add a mosaic effect to your entire picture."
 msgstr "Clica para adicionar um efeito de mosaico à imagem."
 
 #: ../../magic/src/mosaic_shaped.c:134
-#| msgid "Square"
 msgid "Square Mosaic"
 msgstr "Mosaico Quadrado"
 
 #: ../../magic/src/mosaic_shaped.c:135
-#| msgid "Mosaic"
 msgid "Hexagon Mosaic"
 msgstr "Mosaico Hexagonal"
 
@@ -984,38 +976,35 @@ msgid "Irregular Mosaic"
 msgstr "MOsaico Irregular"
 
 #: ../../magic/src/mosaic_shaped.c:141
-#| msgid ""
-#| "Click and move the mouse to add a irregular mosaic to parts of your "
-#| "picture."
-msgid "Click and move the mouse to add a square mosaic to parts of your picture."
-msgstr "Clica e move o rato para adicionar um mosaico irregular em algumas partes da imagem."
+msgid ""
+"Click and move the mouse to add a square mosaic to parts of your picture."
+msgstr ""
+"Clica e move o rato para adicionar um mosaico irregular em algumas partes da "
+"imagem."
 
 #: ../../magic/src/mosaic_shaped.c:142
-#| msgid "Click to add a irregular mosaic to your entire picture."
 msgid "Click to add a square mosaic to your entire picture."
 msgstr "Clica para adicionar um mosaico irregular à imagem."
 
 #: ../../magic/src/mosaic_shaped.c:144
-#| msgid ""
-#| "Click and move the mouse to add a irregular mosaic to parts of your "
-#| "picture."
-msgid "Click and move the mouse to add a hexagonal mosaic to parts of your picture."
-msgstr "Clica e move o rato para adicionar um mosaico irregular em algumas partes da imagem."
+msgid ""
+"Click and move the mouse to add a hexagonal mosaic to parts of your picture."
+msgstr ""
+"Clica e move o rato para adicionar um mosaico irregular em algumas partes da "
+"imagem."
 
 #: ../../magic/src/mosaic_shaped.c:145
-#| msgid "Click to add a irregular mosaic to your entire picture."
 msgid "Click to add a hexagonal mosaic to your entire picture."
 msgstr "Clica para adicionar um mosaico irregular à imagem."
 
 #: ../../magic/src/mosaic_shaped.c:147
-#| msgid ""
-#| "Click and move the mouse to add a irregular mosaic to parts of your "
-#| "picture."
-msgid "Click and move the mouse to add an irregular mosaic to parts of your picture."
-msgstr "Clica e move o rato para adicionar um mosaico irregular em algumas partes da imagem."
+msgid ""
+"Click and move the mouse to add an irregular mosaic to parts of your picture."
+msgstr ""
+"Clica e move o rato para adicionar um mosaico irregular em algumas partes da "
+"imagem."
 
 #: ../../magic/src/mosaic_shaped.c:148
-#| msgid "Click to add a irregular mosaic to your entire picture."
 msgid "Click to add an irregular mosaic to your entire picture."
 msgstr "Clica para adicionar um mosaico irregular à imagem."
 
@@ -1053,13 +1042,14 @@ msgstr "Zoom"
 
 #: ../../magic/src/perspective.c:151
 msgid "Click on the corners and drag where you want to stretch the picture."
-msgstr "Clica nos cantos e arrasta até ao ponto que pretendes para esticar a imagem."
+msgstr ""
+"Clica nos cantos e arrasta até ao ponto que pretendes para esticar a imagem."
 
 #: ../../magic/src/perspective.c:154
-#| msgid ""
-#| "Click and drag to up to zoom in or drag to down to zoom out the picture."
 msgid "Click and drag up to zoom in or drag down to zoom out the picture."
-msgstr "Clica e arrasta para cima para aumentar o zoom da imagem e para baixo para o diminuir."
+msgstr ""
+"Clica e arrasta para cima para aumentar o zoom da imagem e para baixo para o "
+"diminuir."
 
 #: ../../magic/src/puzzle.c:79
 msgid "Puzzle"
@@ -1106,13 +1096,16 @@ msgid "Real Rainbow"
 msgstr "Arco-íris Real"
 
 #: ../../magic/src/realrainbow.c:88
-#| msgid "Real Rainbow"
 msgid "ROYGBIV Rainbow"
 msgstr "Arco-íris ROYGBIV"
 
 #: ../../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 "Clica onde queres começar o arco-íris, arrasta-o para onde queres que acabe e larga para desenha-lo."
+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 ""
+"Clica onde queres começar o arco-íris, arrasta-o para onde queres que acabe "
+"e larga para desenha-lo."
 
 #: ../../magic/src/ripples.c:81
 msgid "Ripples"
@@ -1219,8 +1212,13 @@ msgid "String 'V'"
 msgstr "Linhas em V"
 
 #: ../../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 "Clica e arrasta para desenhar linhas artísticas. Arrasta para cima/baixo para desenhar menos ou mais linhas e esquerda ou direita para aumentar o buraco."
+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 ""
+"Clica e arrasta para desenhar linhas artísticas. Arrasta para cima/baixo "
+"para desenhar menos ou mais linhas e esquerda ou direita para aumentar o "
+"buraco."
 
 #: ../../magic/src/string.c:137
 msgid "Click and drag to draw arrows made of string art."
@@ -1239,7 +1237,8 @@ msgid "Color & White"
 msgstr "Cor & Branco"
 
 #: ../../magic/src/tint.c:75
-msgid "Click and move the mouse around to change the color of parts of your picture."
+msgid ""
+"Click and move the mouse around to change the color of parts of your picture."
 msgstr "Clica e move o rato para alterar as cores de algumas partes da imagem."
 
 #: ../../magic/src/tint.c:76
@@ -1247,8 +1246,12 @@ msgid "Click to change the color of your entire picture."
 msgstr "Clica para alterar as cores da imagem."
 
 #: ../../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 "Clica e move o rato para transformar partes da tua imagem em branco e outra cor à tua escolha."
+msgid ""
+"Click and move the mouse around to turn parts of your picture into white and "
+"a color you choose."
+msgstr ""
+"Clica e move o rato para transformar partes da tua imagem em branco e outra "
+"cor à tua escolha."
 
 #: ../../magic/src/tint.c:78
 msgid "Click to turn your entire picture into white and a color you choose."
@@ -1275,8 +1278,12 @@ msgid "TV"
 msgstr "TV"
 
 #: ../../magic/src/tv.c:79
-msgid "Click and drag to make parts of your picture look like they are on television."
-msgstr "Clica e arrasta para fazer com que algumas partes da imagem apareçam como se estivessem na televisão."
+msgid ""
+"Click and drag to make parts of your picture look like they are on "
+"television."
+msgstr ""
+"Clica e arrasta para fazer com que algumas partes da imagem apareçam como se "
+"estivessem na televisão."
 
 #: ../../magic/src/tv.c:82
 msgid "Click to make your picture look like it's on television."
@@ -1291,42 +1298,64 @@ msgid "Wavelets"
 msgstr "Ondulação leve"
 
 #: ../../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 "Clica para fazer ondulações horizontais na imagem. Clica para cima para ondas curtas, para baixo para ondas altas, para a esquerda para ondas pequenas e para a direita para ondas compridas."
+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 ""
+"Clica para fazer ondulações horizontais na imagem. Clica para cima para "
+"ondas curtas, para baixo para ondas altas, para a esquerda para ondas "
+"pequenas e para a direita para ondas compridas."
 
 #: ../../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 "Clica para fazer ondulações horizontais na imagem. Clica para cima para ondas curtas, para baixo para ondas altas, para a esquerda para ondas pequenas e para a direita para ondas compridas."
+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 ""
+"Clica para fazer ondulações horizontais na imagem. Clica para cima para "
+"ondas curtas, para baixo para ondas altas, para a esquerda para ondas "
+"pequenas e para a direita para ondas compridas."
 
 #~ msgid "Mosaic square"
 #~ msgstr "Mosaico quadrado"
+
 #~ msgid "Mosaic hexagon"
 #~ msgstr "Mosaico hexagonal"
+
 #~ msgid "Mosaic irregular"
 #~ msgstr "Mosaico irregular"
+
 #~ msgid ""
 #~ "Click and move the mouse to add a mosaic squared effect to parts of your "
 #~ "picture."
 #~ msgstr ""
 #~ "Clica e move o rato para adicionar um efeito de mosaico quadrado em "
 #~ "algumas partes da imagem."
+
 #~ msgid "Click to add a mosaic squared effect to your entire picture."
 #~ msgstr "Clica para adicionar um efeito de mosaico quadrado à imagem."
+
 #~ msgid ""
 #~ "Click and move the mouse to add a mosaic hexagonal effect to parts of "
 #~ "your picture."
 #~ msgstr ""
 #~ "Clica e move o rato para adicionar um efeito de mosaico hexagonal em "
 #~ "algumas partes da imagem."
+
 #~ msgid "Click to add a mosaic hexagonal effect to your entire picture."
 #~ msgstr "Clica para adicionar um efeito de mosaico hexagonal à imagem."
+
 #~ msgid "qy"
 #~ msgstr "qy"
+
 #~ msgid "QY"
 #~ msgstr "QY"
+
 #~ msgid "Click and drag to draw string art aligned to the edges."
 #~ msgstr ""
 #~ "Clica e arrasta para desenhar linhas em cadeia alinhadas ás margens."
+
 #~ msgid ""
 #~ "Draw string art with free angles. Click and drag a V: drag to the vertex, "
 #~ "drag backwards a little to the start, then drag to the end."
@@ -1339,6 +1368,7 @@ msgstr "Clica para fazer ondulações horizontais na imagem. Clica para cima par
 #~ msgid ""
 #~ "Click and drag to draw a tornado stalk. Let go to finish the tornado."
 #~ msgstr "Clica e arrasta para desenhar uma flor. Larga para acabar a flor."
+
 #, fuzzy
 #~ msgid ""
 #~ "Click and move the mouse to give parts of your picture an \"alien\" "
@@ -1387,18 +1417,24 @@ msgstr "Clica para fazer ondulações horizontais na imagem. Clica para cima par
 #, fuzzy
 #~ msgid "Blur All"
 #~ msgstr "Embaciar"
+
 #~ msgid "Click and move to fade the colors."
 #~ msgstr "Clica e move o rato para desbotares as cores."
+
 #~ msgid "Click and move to darken the colors."
 #~ msgstr "Clica e move o rato para escurecer as cores."
+
 #~ msgid "Sparkles"
 #~ msgstr "Fagulhas"
+
 #~ msgid "You now have a blank sheet to draw on!"
 #~ msgstr "Agora tens uma folha nova para desenhares!"
+
 #~ msgid "Start a new picture?"
 #~ msgstr "Começar um novo desenho?"
+
 #~ msgid "Yes, let's start fresh!"
 #~ msgstr "Sim, vamos começar de novo"
+
 #~ msgid "Click and move to draw sparkles."
 #~ msgstr "Clica e move o rato para desenhares fagulhas."
-
diff --git a/src/po/tuxpaint.pot b/src/po/tuxpaint.pot
index d7cb064d5..720e0c241 100644
--- a/src/po/tuxpaint.pot
+++ b/src/po/tuxpaint.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-31 18:32-0700\n"
+"POT-Creation-Date: 2009-09-10 15:53-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
diff --git a/src/po/zam.po b/src/po/zam.po
index 2f6468b16..ec4b05cc8 100644
--- a/src/po/zam.po
+++ b/src/po/zam.po
@@ -1,686 +1,1420 @@
-# Tux Paint spanish messages
-# Copyright (C) 2002
-# Gabriel Gazzan <ggabriel@internet.com.uy>, 2002.
+# Tux Paint Zapoteco messages
+# Copyright (C) 2009
+# Rodrigo Perez <rodpera@yahoo.com>, 2009
 msgid ""
 msgstr ""
 "Project-Id-Version: TuxPaint 0.9.17\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-08-09 23:58-0700\n"
+"POT-Creation-Date: 2009-09-10 15:53-0700\n"
 "PO-Revision-Date: 2009-09-10 17:34-0600\n"
 "Last-Translator: Rodrigo Perez <rodpera@yahoo.com>\n"
-"Language-Team: Español <gablistas@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Spanish\n"
 
 #. Response to Black (0, 0, 0) color selected
+#: ../colors.h:86
 msgid "Black!"
 msgstr "¡Nagaat!"
 
 #. Response to Dark grey (128, 128, 128) color selected
+#: ../colors.h:89
 msgid "Dark grey! Some people spell it “dark gray”."
 msgstr "¡kaá doos nagaat !"
 
 #. Response to Light grey (192, 192, 192) color selected
+#: ../colors.h:92
 msgid "Light grey! Some people spell it “light gray”."
 msgstr "¡luút naagánt!"
 
 #. Response to White (255, 255, 255) color selected
+#: ../colors.h:95
 msgid "White!"
 msgstr "¡Na kiss!"
 
 #. Response to Red (255, 0, 0) color selected
+#: ../colors.h:98
 msgid "Red!"
 msgstr "¡Na neé!"
 
 #. Response to Orange (255, 128, 0) color selected
+#: ../colors.h:101
 msgid "Orange!"
 msgstr "¡Naranj!"
 
 #. Response to Yellow (255, 255, 0) color selected
+#: ../colors.h:104
 msgid "Yellow!"
 msgstr "¡Guúts!"
 
 #. Response to Light green (160, 228, 128) color selected
+#: ../colors.h:107
 msgid "Light green!"
 msgstr "¡Naá yeé clar!"
 
 #. Response to Dark green (33, 148, 70) color selected
+#: ../colors.h:110
 msgid "Dark green!"
 msgstr "¡Naá yeé nagaatt!"
 
 #. Response to "Sky" blue (138, 168, 205) color selected
+#: ../colors.h:113
 msgid "Sky blue!"
 msgstr "¡Te sha nie loó beé!"
 
 #. Response to Blue (50, 100, 255) color selected
+#: ../colors.h:116
 msgid "Blue!"
 msgstr "¡Te sha nie niit!"
 
 #. Response to Lavender (186, 157, 255) color selected
+#: ../colors.h:119
 msgid "Lavender!"
 msgstr "¡Lavanda!"
 
 #. Response to Purple (128, 0, 128) color selected
+#: ../colors.h:122
 msgid "Purple!"
 msgstr "¡Púrpura!"
 
 #. Response to Pink (255, 165, 211) color selected
+#: ../colors.h:125
 msgid "Pink!"
 msgstr "¡Rosado!"
 
 #. Response to Brown (128, 80, 0) color selected
+#: ../colors.h:128
 msgid "Brown!"
 msgstr "¡Te sha nie yuú!"
 
 #. Response to Tan (226, 189, 166) color selected
+#: ../colors.h:131
 msgid "Tan!"
 msgstr "¡Tostado!"
 
 #. Response to Beige (247, 228, 219) color selected
+#: ../colors.h:134
 msgid "Beige!"
 msgstr "¡Crema!"
 
 #. First, the blacklist. We list font families that can crash Tux Paint
+#. via bugs in the SDL_ttf library. We also test fonts to be sure that
 #. they have both uppercase and lowercase letters. Note that we do not
+#. test for "Aa", because it is OK if uppercase and lowercase are the
 #. same (but not nice -- such fonts get a low score later).
-#. We test the alphabet twice, to help with translation. If the users
-#. should be translated. Otherwise, only Line X should be translated
-#. code below (the best scores going to fonts that support both).
+#.
+#. Most locales leave the blacklist strings alone: "QX" and "qx"
+#. (it is less destructive to use the scoring strings instead)
+#.
+#. Locales that absolutely require all fonts to have some
+#. extra characters should use "QX..." and "qx...", where "..."
+#. are some characters you absolutely require in all fonts.
+#.
+#. Locales with absolutely NO use for ASCII may use "..." and "...",
+#. where "..." are some characters you absolutely require in
+#. all fonts. This would be the case for a locale in which it is
+#. impossible for a user to type ASCII letters.
+#.
+#. Most translators should use scoring instead.
+#: ../dirwalk.c:164
 msgid "qx"
 msgstr ""
 
+#: ../dirwalk.c:164
 msgid "QX"
 msgstr ""
 
-#. Line Y
-msgid "qy"
-msgstr ""
-
-msgid "QY"
-msgstr ""
-
+#. TODO: weight specification
 #. Now we score fonts to ensure that the best ones will be placed at
+#. the top of the list. The user will see them first. This sorting is
 #. especially important for users who have scroll buttons disabled.
+#. Translators should do whatever is needed to put crummy fonts last.
 #. distinct uppercase and lowercase (e.g., 'o' vs. 'O')
+#: ../dirwalk.c:191
 msgid "oO"
 msgstr ""
 
-#. uncommon punctuation (e.g., '@', '#', '*', etc.)
-msgid "`\\%_@$~#{}<>^&*"
-msgstr ""
-
 #. common punctuation (e.g., '?', '!', '.', ',', etc.)
+#: ../dirwalk.c:194
 msgid ",.?!"
 msgstr ""
 
+#. uncommon punctuation (e.g., '@', '#', '*', etc.)
+#: ../dirwalk.c:197
+msgid "`\\%_@$~#{<(^&*"
+msgstr ""
+
 #. digits (e.g., '0', '1' and '7')
+#: ../dirwalk.c:200
 msgid "017"
 msgstr ""
 
 #. distinct circle-like characters (e.g., 'O' (capital oh) vs. '0' (zero))
+#: ../dirwalk.c:203
 msgid "O0"
 msgstr ""
 
 #. distinct line-like characters (e.g., 'l' (lowercase elle) vs. '1' (one) vs. 'I' (capital aye))
+#: ../dirwalk.c:206
 msgid "1Il|"
 msgstr ""
 
+#: ../dirwalk.c:210
+msgid "<1>spare-1a"
+msgstr ""
+
+#: ../dirwalk.c:211
+msgid "<1>spare-1b"
+msgstr ""
+
+#: ../dirwalk.c:212
+msgid "<9>spare-9a"
+msgstr ""
+
+#: ../dirwalk.c:213
+msgid "<9>spare-9b"
+msgstr ""
+
 #. Congratulations #1
+#: ../great.h:37
 msgid "Great!"
 msgstr "¡Vesta bli liíl!"
 
 #. Congratulations #2
+#: ../great.h:40
 msgid "Cool!"
 msgstr "¡Besta niéey!"
 
 #. Congratulations #3
+#: ../great.h:43
 msgid "Keep it up!"
 msgstr "¡lí reeta vaá!"
 
 #. Congratulations #4
+#: ../great.h:46
 msgid "Good job!"
 msgstr "¡Vesta blil lí!"
 
 #. Input Method: English mode
+#: ../im.c:75
 msgid "English"
 msgstr "Skisha gring"
 
 #. Input Method: Japanese Romanized Hiragana mode
+#: ../im.c:78
 msgid "Hiragana"
 msgstr "Japonés (Hiragana)"
 
 #. Input Method: Japanese Romanized Katakana mode
+#: ../im.c:81
 msgid "Katakana"
 msgstr "Japonés (Katakana)"
 
 #. Input Method: Korean Hangul 2-Bul mode
+#: ../im.c:84
 msgid "Hangul"
 msgstr "Coreano (Hangul)"
 
 #. Input Method: Thai mode
+#: ../im.c:87
 msgid "Thai"
 msgstr ""
 
+#. Input Method: Traditional Chinese mode
+#: ../im.c:90
+msgid "ZH_TW"
+msgstr ""
+
 #. Square shape tool (4 equally-lengthed sides at right angles)
+#: ../shapes.h:171 ../shapes.h:172
 msgid "Square"
 msgstr "dhaáp lad igual"
 
 #. Rectangle shape tool (4 sides at right angles)
+#: ../shapes.h:175 ../shapes.h:176
 msgid "Rectangle"
 msgstr "Rectángulo"
 
 #. Circle shape tool (X radius and Y radius are the same)
+#: ../shapes.h:179 ../shapes.h:180
 msgid "Circle"
 msgstr "Koo redond"
 
 #. Ellipse shape tool (X radius and Y radius may differ)
+#: ../shapes.h:183 ../shapes.h:184
 msgid "Ellipse"
 msgstr "Elipse"
 
 #. Triangle shape tool (3 sides)
+#: ../shapes.h:187 ../shapes.h:188
 msgid "Triangle"
 msgstr "Sohón laad"
 
 #. Pentagone shape tool (5 sides)
+#: ../shapes.h:191 ../shapes.h:192
 msgid "Pentagon"
 msgstr "Gaáy Laad"
 
 #. Rhombus shape tool (4 sides, not at right angles)
+#: ../shapes.h:195 ../shapes.h:196
 msgid "Rhombus"
 msgstr "Rombo"
 
 #. Octagon shape tool (8 sides)
+#: ../shapes.h:199 ../shapes.h:200
 msgid "Octagon"
 msgstr "Shoón laad "
 
 #. Description of a square
+#: ../shapes.h:208 ../shapes.h:209
 msgid "A square is a rectangle with four equal sides."
 msgstr "Diíf cuadrado naák diíf rectángulo con reé taá lad igual."
 
 #. Description of a rectangle
+#: ../shapes.h:212 ../shapes.h:213
 msgid "A rectangle has four sides and four right angles."
 msgstr "Diíf rectángulo güenuú daap lad ner daap ángulos."
 
-msgid "A circle is a curve where all points have the same distance from the center."
+#: ../shapes.h:217 ../shapes.h:219
+msgid ""
+"A circle is a curve where all points have the same distance from the center."
 msgstr "Diíf círculo naák diíf curva koó reé punt duú igual medid del centro."
 
 #. Description of an ellipse
+#: ../shapes.h:222 ../shapes.h:223
 msgid "An ellipse is a stretched circle."
 msgstr "Diíf elipse naák diíf círculo per estirado."
 
 #. Description of a triangle
+#: ../shapes.h:226 ../shapes.h:227
 msgid "A triangle has three sides."
 msgstr "Diíf triángulo güe nuú sohon lad."
 
 #. Description of a pentagon
+#: ../shapes.h:230 ../shapes.h:231
 msgid "A pentagon has five sides."
 msgstr "Diíf pentágono güe nuú gaáy laad"
 
+#: ../shapes.h:235 ../shapes.h:237
 msgid "A rhombus has four equal sides, and opposite sides are parallel."
 msgstr "Diíf rombo güe nuú dhap laad igual, ner choop laad naáy naák paralelo."
 
+#: ../shapes.h:241 ../shapes.h:243
 msgid "An octagon has eight equal sides."
 msgstr "Diíf octágono güe nuú shoón laad igual taá naak."
 
 #. Title of tool selector (buttons down the left)
+#: ../titles.h:56
 msgid "Tools"
 msgstr "Koó queél sihiín"
 
 #. Title of color palette (buttons across the bottom)
+#: ../titles.h:59
 msgid "Colors"
 msgstr "Saá niey"
 
 #. Title of brush selector (buttons down the right for paint and line tools)
+#: ../titles.h:62
 msgid "Brushes"
 msgstr "Koó kuúmen"
 
 #. Title of eraser selector (buttons down the right for eraser tool)
+#: ../titles.h:65
 msgid "Erasers"
 msgstr "Paár te doót men naá"
 
 #. Title of stamp selector (buttons down the right for stamps tool)
+#: ../titles.h:68
 msgid "Stamps"
 msgstr "Paár queé men lo yeésh"
 
 #. Title of shape selector (buttons down the right for shapes tool)
+#. Shape creation tool (square, circle, etc.)
+#: ../titles.h:71 ../tools.h:69
 msgid "Shapes"
 msgstr "Reé muún"
 
 #. Title of font selector (buttons down the right for text tool)
+#: ../titles.h:74
 msgid "Letters"
 msgstr "Reé letr"
 
 #. Title of magic tool selector (buttons down the right for magic (effect plugin) tool)
+#. "Magic" effects tools (blur, flip image, etc.)
+#: ../titles.h:77 ../tools.h:75
 msgid "Magic"
 msgstr "Chaán bruj"
 
 #. Freehand painting tool
+#: ../tools.h:60
 msgid "Paint"
 msgstr "Ku Kua"
 
 #. Stamp tool (aka Rubber Stamps)
+#: ../tools.h:63
 msgid "Stamp"
 msgstr "Sey"
 
 #. Line drawing tool
+#: ../tools.h:66
 msgid "Lines"
 msgstr "diíf ray"
 
 #. Text tool
+#: ../tools.h:72
 msgid "Text"
 msgstr "keé leetr"
 
 #. Undo last action
+#: ../tools.h:78
 msgid "Undo"
 msgstr "¡Vereé!"
 
 #. Redo undone action
+#: ../tools.h:81
 msgid "Redo"
 msgstr "¡Teeneer!"
 
 #. Eraser tool
+#: ../tools.h:84
 msgid "Eraser"
 msgstr "Te doón naá"
 
 #. Start a new picture
+#: ../tools.h:87
 msgid "New"
 msgstr "Ko kuúb"
 
 #. Open a saved picture
+#. buttons for the file open dialog
 #. Open dialog: 'Open' button, to load the selected picture
+#: ../tools.h:90 ../tuxpaint.c:8005
 msgid "Open"
 msgstr "Sha al men"
 
 #. Save the current picture
+#: ../tools.h:93
 msgid "Save"
 msgstr "lo sohogaá"
 
 #. Print the current picture
+#: ../tools.h:96
 msgid "Print"
 msgstr "Keéy lo yehes"
 
 #. Quit/exit Tux Paint application
+#: ../tools.h:99
 msgid "Quit"
 msgstr "Ruú meén"
 
 #. Paint tool instructions
+#: ../tools.h:107
 msgid "Pick a color and a brush shape to draw with."
 msgstr "toob diíf color ner bshien diíf broch paár kuúl."
 
 #. Stamp tool instructions
+#: ../tools.h:110
 msgid "Pick a picture to stamp around your drawing."
 msgstr "Toob diif sello ner toob va  loo ko deliíl "
 
 #. Line tool instructions
+#: ../tools.h:113
 msgid "Click to start drawing a line. Let go to complete it."
 msgstr "Gaás kue, keéy, ner toó leé, será tuub vaa keey."
 
 #. Shape tool instructions
-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 "Escoge una figura. Haz clic para marcar el centro, arrastra, luego suelta cuando esté del tamaño deseado. Mueve alrededor para rotarla, haz clic para dibujarla."
+#: ../tools.h:116
+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 ""
+"Escoge una figura. Haz clic para marcar el centro, arrastra, luego suelta "
+"cuando esté del tamaño deseado. Mueve alrededor para rotarla, haz clic para "
+"dibujarla."
 
 #. Text tool instructions
+#: ../tools.h:119
 msgid "Choose a style of text. Click on your drawing and you can start typing."
 msgstr "Elige un estilo de texto. Haz clic en tu dibujo y comienza a escribir."
 
 #. Magic tool instruction
+#: ../tools.h:122
 msgid "Pick a magical effect to use on your drawing!"
 msgstr "¡tood diif efecto mágico ner keey loo koo deliil !"
 
 #. Response to 'undo' action
+#: ../tools.h:125
 msgid "Undo!"
 msgstr "¡Vereé!"
 
 #. Response to 'redo' action
+#: ../tools.h:128
 msgid "Redo!"
 msgstr "¡Teneer !"
 
 #. Eraser tool
+#: ../tools.h:131
 msgid "Eraser!"
 msgstr "¡Te doót naá!"
 
 #. Response to 'start a new image' action
+#: ../tools.h:134
 msgid "Pick a color or picture with which to start a new drawing."
 msgstr "Kuan diif color o diif moon ner tete kuú."
 
 #. Response to 'open' action (while file dialog is being constructed)
+#: ../tools.h:137
 msgid "Open…"
 msgstr "Shaala..."
 
 #. Response to 'save' action
+#: ../tools.h:140
 msgid "Your image has been saved!"
 msgstr "¡Moón naá luúu goóshog laá!"
 
 #. Response to 'print' action (while printing, or print dialog is being used)
+#: ../tools.h:143
 msgid "Printing…"
 msgstr "Deé queéy loó yehes..."
 
 #. Response to 'quit' (exit) action
+#: ../tools.h:146
 msgid "Bye bye!"
 msgstr "¡Maál naáp!"
 
 #. Instruction while using Line tool (after click, before release)
+#: ../tools.h:150
 msgid "Let go of the button to complete the line."
 msgstr "Laá diíin saha tee loo kue."
 
 #. Instruction while using Shape tool (after first click, before release)
+#: ../tools.h:153
 msgid "Hold the button to stretch the shape."
 msgstr "Sheen kue, saá taak tiíl mach ha."
 
 #. Instruction while finishing Shape tool (after release, during rotation step before second click)
+#: ../tools.h:156
 msgid "Move the mouse to rotate the shape. Click to draw it."
 msgstr "Mueve el ratón para rotar la figura. Haz clic para dibujarla."
 
 #. Notification that 'New' action was aborted (current image would have been lost)
+#: ../tools.h:159
 msgid "OK then… Let’s keep drawing this one!"
 msgstr "Vesta daal.. ¡kuún naal kue!"
 
 #. Prompt to confirm user wishes to quit
+#: ../tuxpaint.c:1858
 msgid "Do you really want to quit?"
 msgstr "¿Gua lií kaa lash luu ruul gaá?"
 
 #. Quit prompt positive response (quit)
-msgid "Yes, I'm done!"
+#: ../tuxpaint.c:1861
+#, fuzzy
+#| msgid "Yes, I'm done!"
+msgid "Yes, I’m done!"
 msgstr "¡ah, bliíl naay!"
 
 #. Quit prompt negative response (don't quit)
+#: ../tuxpaint.c:1864 ../tuxpaint.c:1891
 msgid "No, take me back!"
 msgstr "¡Yeet taá, naá last naá vereén!"
 
 #. Current picture is not saved; user is quitting
+#: ../tuxpaint.c:1868
 msgid "If you quit, you’ll lose your picture! Save it?"
 msgstr "¡This rul, tee guaán luu koo bliíl! ¿lash luú koo shog luy gaá?"
 
+#: ../tuxpaint.c:1869 ../tuxpaint.c:1874
 msgid "Yes, save it!"
 msgstr "¡ah, loó sobbaá!"
 
-msgid "No, don't bother saving!"
+#: ../tuxpaint.c:1870 ../tuxpaint.c:1875
+#, fuzzy
+#| msgid "No, don't bother saving!"
+msgid "No, don’t bother saving!"
 msgstr "¡yeénta, naá last naá loó soobluy!"
 
 #. Current picture is not saved; user is opening another picture
+#: ../tuxpaint.c:1873
 msgid "Save your picture first?"
 msgstr "¿Loó sog luú retrat antes gaá?"
 
 #. Error opening picture
+#: ../tuxpaint.c:1878
 msgid "Can’t open that picture!"
 msgstr "¡Naá gaad schial dibug reé!"
 
 #. Generic dialog dismissal
+#: ../tuxpaint.c:1881 ../tuxpaint.c:1886 ../tuxpaint.c:1895 ../tuxpaint.c:1902
+#: ../tuxpaint.c:1911
 msgid "OK"
 msgstr "ah"
 
 #. Notification that 'Open' dialog has nothing to show
+#: ../tuxpaint.c:1885
 msgid "There are no saved files!"
 msgstr "¡Yent kuan bloo sohog luú!"
 
 #. Verification of print action
+#: ../tuxpaint.c:1889
 msgid "Print your picture now?"
 msgstr "¿Lahaás luú keley loó yehes naál yaá?"
 
+#: ../tuxpaint.c:1890
 msgid "Yes, print it!"
 msgstr "¡Ah, toob vaá loó yehes!"
 
 #. Confirmation of successful (we hope) printing
+#: ../tuxpaint.c:1894
 msgid "Your picture has been printed!"
 msgstr "¡Mon naá luú duúl loó yehes!"
 
+#. We got an error printing
+#: ../tuxpaint.c:1898
+#, fuzzy
+#| msgid "Your picture has been printed!"
+msgid "Sorry! Your picture could not be printed!"
+msgstr "¡Mon naá luú duúl loó yehes!"
+
 #. Notification that it's too soon to print again (--printdelay option is in effect)
+#: ../tuxpaint.c:1901
 msgid "You can’t print yet!"
 msgstr "¡Na gaád toob luy loó yehes nal!"
 
 #. Prompt to confirm erasing a picture in the Open dialog
+#: ../tuxpaint.c:1905
 msgid "Erase this picture?"
 msgstr "¿Teé doót dibuj reé gaá?"
 
+#: ../tuxpaint.c:1906
 msgid "Yes, erase it!"
 msgstr "¡Ah, Te doót naá!"
 
-msgid "No, don't erase it!"
+#: ../tuxpaint.c:1907
+#, fuzzy
+#| msgid "No, don't erase it!"
+msgid "No, don’t erase it!"
 msgstr "¡Yee´nta, naá doót naá!"
 
 #. Reminder that Mouse Button 1 is the button to use in Tux Paint
+#: ../tuxpaint.c:1910
 msgid "Remember to use the left mouse button!"
 msgstr "¡Recuerda usar el botón izquierdo del ratón!"
 
 #. Sound has been muted (silenced) via keyboard shortcut
+#: ../tuxpaint.c:2039
 msgid "Sound muted."
 msgstr "Toóg saá  beés ha."
 
 #. Sound has been unmuted (unsilenced) via keyboard shortcut
+#: ../tuxpaint.c:2044
 msgid "Sound unmuted."
 msgstr "Saál saá beés ha."
 
 #. Wait while Text tool finishes loading fonts
-msgid "Please wait..."
+#: ../tuxpaint.c:2511
+#, fuzzy
+#| msgid "Please wait..."
+msgid "Please wait…"
 msgstr "Leé luút, Teés kiss luú..."
 
+#: ../tuxpaint.c:7228
 msgid "Pick a color."
 msgstr "kuan saa niey "
 
 #. Open dialog: 'Erase' button, to erase/deleted the selected picture
+#: ../tuxpaint.c:8008
 msgid "Erase"
 msgstr "Te doót naá"
 
 #. Open dialog: 'Slides' button, to switch to slide show mode
+#: ../tuxpaint.c:8011
 msgid "Slides"
 msgstr "Güi saá niey"
 
 #. Open dialog: 'Back' button, to dismiss Open dialog without opening a picture
+#: ../tuxpaint.c:8014
 msgid "Back"
 msgstr "Veré"
 
 #. Slideshow: 'Next' button, to load next slide (image)
+#: ../tuxpaint.c:8017
 msgid "Next"
 msgstr "Teneer ra"
 
 #. Slideshow: 'Play' button, to begin a slideshow sequence
+#: ../tuxpaint.c:8020
 msgid "Play"
 msgstr "Toob kiíy"
 
 #. 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:8667
 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:11670
 msgid "Yes"
 msgstr "haá"
 
+#: ../tuxpaint.c:11674
 msgid "No"
 msgstr "Yee´nta"
 
 #. Prompt to ask whether user wishes to save over old version of their file
+#: ../tuxpaint.c:12669
 msgid "Replace the picture with your changes?"
 msgstr "¿Seé eh dibug naá antes kon koó kuub gaá?"
 
 #. Positive response to saving over old version
+#. (like a 'File:Save' action in other applications)
+#: ../tuxpaint.c:12673
 msgid "Yes, replace the old one!"
 msgstr "¡ah, seéhell!"
 
 #. Negative response to saving over old version (saves a new image)
+#. (like a 'File:Save As...' action in other applications)
+#: ../tuxpaint.c:12677
 msgid "No, save a new file!"
 msgstr "¡Yeént ta, loó soógga leét diíf archiv kuúb!"
 
+#: ../tuxpaint.c:13440
 msgid "Choose the picture you want, then click “Open”."
 msgstr "Kuan koo lash luú, será toob \"Sahal laa\"."
 
 #. Let user choose images:
+#. Instructions for Slideshow file dialog (FIXME: Make a #define)
+#: ../tuxpaint.c:14427 ../tuxpaint.c:14741
 msgid "Choose the pictures you want, then click “Play”."
 msgstr "Kuan koo lash luú, será toob \"kee kiiy\"."
 
+#: ../tuxpaint.desktop.in.h:1
 msgid "A drawing program for children."
 msgstr "Diif program paar keé men Dibuj paar biét biss"
 
+#: ../tuxpaint.desktop.in.h:2
 msgid "Drawing program"
 msgstr "Diif program paar kuú men "
 
+#: ../tuxpaint.desktop.in.h:3
 msgid "Tux Paint"
 msgstr "Tux Paint"
 
+#: ../../magic/src/alien.c:64
+#, fuzzy
+#| msgid "Shift"
+msgid "Color Shift"
+msgstr "Teé tey"
+
+#: ../../magic/src/alien.c:67
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse to change the colors in parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/alien.c:68
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click to change the colors in your entire picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/blind.c:92
+msgid "Blind"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../magic/src/blocks_chalk_drip.c:132
 msgid "Blocks"
 msgstr "Bloques"
 
+#: ../../magic/src/blocks_chalk_drip.c:134
 msgid "Chalk"
 msgstr "Tiza"
 
+#: ../../magic/src/blocks_chalk_drip.c:136
 msgid "Drip"
 msgstr "Laá yiíy"
 
+#: ../../magic/src/blocks_chalk_drip.c:146
 msgid "Click and move the mouse around to make the picture blocky."
 msgstr "Haz clic y arrastra el ratón para cuadricular la imagen."
 
-msgid "Click and move the mouse around to turn the picture into a chalk drawing."
-msgstr "Haz clic y arrastra el ratón para que la imagen parezca hecha con tiza."
+#: ../../magic/src/blocks_chalk_drip.c:149
+msgid ""
+"Click and move the mouse around to turn the picture into a chalk drawing."
+msgstr ""
+"Haz clic y arrastra el ratón para que la imagen parezca hecha con tiza."
 
+#: ../../magic/src/blocks_chalk_drip.c:152
 msgid "Click and move the mouse around to make the picture drip."
 msgstr "Haz clic y arrastra el ratón para que la imagen gotee."
 
+#: ../../magic/src/blur.c:57
 msgid "Blur"
 msgstr "Desenfocar"
 
-msgid "Click and move the mouse around to blur the picture."
+#: ../../magic/src/blur.c:60
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse around to blur the image."
 msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
 
+#: ../../magic/src/blur.c:61
+#, fuzzy
+#| msgid "Click to make a mirror image."
+msgid "Click to blur the entire image."
+msgstr "Gaás ha par toób luú mon reveés ."
+
 #. Both are named "Bricks", at the moment:
+#: ../../magic/src/bricks.c:104
 msgid "Bricks"
 msgstr "Ladrillos"
 
+#: ../../magic/src/bricks.c:111
 msgid "Click and move to draw large bricks."
 msgstr "Haz clic y arrastra para dibujar ladrillos grandes."
 
+#: ../../magic/src/bricks.c:113
 msgid "Click and move to draw small bricks."
 msgstr "Haz clic y arrastra para dibujar ladrillos pequeños."
 
+#: ../../magic/src/calligraphy.c:108
 msgid "Calligraphy"
 msgstr "Caligrafía"
 
+#: ../../magic/src/calligraphy.c:115
 msgid "Click and move the mouse around to draw in calligraphy."
 msgstr "Haz clic y mueve el ratón para dibujar en modo caligrafía."
 
+#: ../../magic/src/cartoon.c:80
 msgid "Cartoon"
 msgstr "Diif dibug luút"
 
+#: ../../magic/src/cartoon.c:87
 msgid "Click and move the mouse around to turn the picture into a cartoon."
-msgstr "Haz clic y arrastra el ratón para que la imagen se vea como los dibujitos."
+msgstr ""
+"Haz clic y arrastra el ratón para que la imagen se vea como los dibujitos."
 
+#: ../../magic/src/confetti.c:63
+msgid "Confetti"
+msgstr ""
+
+#: ../../magic/src/confetti.c:65
+msgid "Click to throw confetti!"
+msgstr ""
+
+#: ../../magic/src/distortion.c:121
+msgid "Distortion"
+msgstr ""
+
+#: ../../magic/src/distortion.c:129
+#, fuzzy
+#| msgid "Click and drag the mouse to put glass tile over your picture."
+msgid "Click and drag the mouse to cause distortion in your picture."
+msgstr "Gaás ha ner te teé bdiín  par toób luú azule sihiís mon."
+
+#: ../../magic/src/emboss.c:76
 msgid "Emboss"
 msgstr "Bajorrelieve"
 
+#: ../../magic/src/emboss.c:82
 msgid "Click and drag the mouse to emboss the picture."
 msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
 
+#: ../../magic/src/fade_darken.c:119
 msgid "Lighten"
 msgstr "Toób va lo güis "
 
+#: ../../magic/src/fade_darken.c:121
 msgid "Darken"
 msgstr "Toób lo yaál"
 
-msgid "Click and move to fade the colors."
-msgstr "Haz clic y arrastra el ratón para desvanecer los colores."
+#: ../../magic/src/fade_darken.c:132
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse to lighten parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
 
-msgid "Click and move to darken the colors."
-msgstr "Haz clic y arrastra para oscurecer los colores."
+#: ../../magic/src/fade_darken.c:134
+#, fuzzy
+#| msgid "Click and drag to draw a beam of light on your picture."
+msgid "Click to lighten your entire picture."
+msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
 
+#: ../../magic/src/fade_darken.c:139
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse to darken parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/fade_darken.c:141
+#, fuzzy
+#| msgid "Click to make ripples appear over your picture."
+msgid "Click to darken your entire picture."
+msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
+
+#: ../../magic/src/fill.c:87
 msgid "Fill"
 msgstr "kuú reé taá"
 
+#: ../../magic/src/fill.c:94
 msgid "Click in the picture to fill that area with color."
 msgstr "Gaás loó mon par kuúl lugar reé."
 
+#: ../../magic/src/fisheye.c:78
+msgid "Fisheye"
+msgstr ""
+
+#. Needs better name
+#: ../../magic/src/fisheye.c:80
+msgid "Click on part of your picture to create a fisheye effect."
+msgstr ""
+
+#: ../../magic/src/flower.c:124
 msgid "Flower"
 msgstr "Yeé"
 
+#: ../../magic/src/flower.c:130
 msgid "Click and drag to draw a flower stalk. Let go to finish the flower."
-msgstr "Gaás ha ner te tey par toób luú gaá naá yeé. ¡Toó leéy par teé loó yeé."
+msgstr ""
+"Gaás ha ner te tey par toób luú gaá naá yeé. ¡Toó leéy par teé loó yeé."
 
+#: ../../magic/src/foam.c:104
 msgid "Foam"
 msgstr "Espuma"
 
+#: ../../magic/src/foam.c:110
 msgid "Click and drag the mouse to cover an area with foamy bubbles."
 msgstr "Haz clic y arrastra para cubrir un área con una espuma de burbujas."
 
+#: ../../magic/src/fold.c:84
+msgid "Fold"
+msgstr ""
+
+#: ../../magic/src/fold.c:86
+msgid ""
+"Choose a background color and click to turn the corner of the page over."
+msgstr ""
+
+#: ../../magic/src/glasstile.c:83
 msgid "Glass Tile"
 msgstr "Azulejo"
 
+#: ../../magic/src/glasstile.c:90
 msgid "Click and drag the mouse to put glass tile over your picture."
 msgstr "Gaás ha ner te teé bdiín  par toób luú azule sihiís mon."
 
+#: ../../magic/src/glasstile.c:92
+msgid "Click to cover your entire picture in glass tiles."
+msgstr ""
+
+#: ../../magic/src/grass.c:92
 msgid "Grass"
 msgstr "Yi ishh"
 
+#: ../../magic/src/grass.c:98
 msgid "Click and move to draw grass. Don’t forget the dirt!"
 msgstr "Gaás ha ner te tey par toób yi ishh ha. ¡Na bés laas luú yuú!"
 
+#: ../../magic/src/kalidescope.c:77
 msgid "Kaleidoscope"
 msgstr "Caleidoscopio"
 
-msgid "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
-msgstr "Haz clic y arrastra el ratón para dibujar con pinceles simétricos (un caleidoscopio)."
+#: ../../magic/src/kalidescope.c:83
+msgid ""
+"Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
+msgstr ""
+"Haz clic y arrastra el ratón para dibujar con pinceles simétricos (un "
+"caleidoscopio)."
 
+#: ../../magic/src/light.c:84
 msgid "Light"
 msgstr "Naá nií"
 
+#: ../../magic/src/light.c:90
 msgid "Click and drag to draw a beam of light on your picture."
 msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
 
+#: ../../magic/src/metalpaint.c:77
 msgid "Metal Paint"
 msgstr "Kuúy saá nie yiíb"
 
+#: ../../magic/src/metalpaint.c:83
 msgid "Click and drag the mouse to paint with a metallic color."
 msgstr "Haz clic y arrastra el ratón para pintar con un color metalizado."
 
+#: ../../magic/src/mirror_flip.c:94
 msgid "Mirror"
 msgstr "toób diif espej ah"
 
+#: ../../magic/src/mirror_flip.c:96
 msgid "Flip"
 msgstr "teé yeéc ha"
 
-msgid "Click to flip the picture upside-down."
-msgstr "Gaás ha par toób luú mon de yeec."
-
+#: ../../magic/src/mirror_flip.c:106
 msgid "Click to make a mirror image."
 msgstr "Gaás ha par toób luú mon reveés ."
 
+#: ../../magic/src/mirror_flip.c:109
+msgid "Click to flip the picture upside-down."
+msgstr "Gaás ha par toób luú mon de yeec."
+
+#: ../../magic/src/mosaic.c:75
+#, fuzzy
+#| msgid "Magic"
+msgid "Mosaic"
+msgstr "Chaán bruj"
+
+#: ../../magic/src/mosaic.c:78
+#, fuzzy
+#| msgid "Click and drag the mouse to put glass tile over your picture."
+msgid ""
+"Click and move the mouse to add a mosaic effect to parts of your picture."
+msgstr "Gaás ha ner te teé bdiín  par toób luú azule sihiís mon."
+
+#: ../../magic/src/mosaic.c:79
+#, fuzzy
+#| msgid "Click and drag the mouse to emboss the picture."
+msgid "Click to add a mosaic effect to your entire picture."
+msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/mosaic_shaped.c:134
+#, fuzzy
+#| msgid "Square"
+msgid "Square Mosaic"
+msgstr "dhaáp lad igual"
+
+#: ../../magic/src/mosaic_shaped.c:135
+msgid "Hexagon Mosaic"
+msgstr ""
+
+#: ../../magic/src/mosaic_shaped.c:136
+msgid "Irregular Mosaic"
+msgstr ""
+
+#: ../../magic/src/mosaic_shaped.c:141
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid ""
+"Click and move the mouse to add a square mosaic to parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/mosaic_shaped.c:142
+#, fuzzy
+#| msgid "Click and drag the mouse to emboss the picture."
+msgid "Click to add a square mosaic to your entire picture."
+msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/mosaic_shaped.c:144
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid ""
+"Click and move the mouse to add a hexagonal mosaic to parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/mosaic_shaped.c:145
+#, fuzzy
+#| msgid "Click and drag the mouse to emboss the picture."
+msgid "Click to add a hexagonal mosaic to your entire picture."
+msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/mosaic_shaped.c:147
+#, fuzzy
+#| msgid "Click and drag the mouse to put glass tile over your picture."
+msgid ""
+"Click and move the mouse to add an irregular mosaic to parts of your picture."
+msgstr "Gaás ha ner te teé bdiín  par toób luú azule sihiís mon."
+
+#: ../../magic/src/mosaic_shaped.c:148
+#, fuzzy
+#| msgid "Click and drag the mouse to emboss the picture."
+msgid "Click to add an irregular mosaic to your entire picture."
+msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/negative.c:72
 msgid "Negative"
 msgstr "Lú nagaat ha"
 
-msgid "Click and move the mouse around to draw a negative."
+#: ../../magic/src/negative.c:80
+#, fuzzy
+#| msgid "Click and move the mouse around to draw a negative."
+msgid "Click and move the mouse around to make your painting negative."
 msgstr "Haz clic y arrastra el ratón para dibujar en negativo."
 
+#: ../../magic/src/negative.c:83
+msgid "Click to turn your painting into its negative."
+msgstr ""
+
+#: ../../magic/src/noise.c:63
+msgid "Noise"
+msgstr ""
+
+#: ../../magic/src/noise.c:66
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse to add noise to parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/noise.c:67
+#, fuzzy
+#| msgid "Click and drag the mouse to emboss the picture."
+msgid "Click to add noise to your entire picture."
+msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/perspective.c:145
+msgid "Perspective"
+msgstr ""
+
+#: ../../magic/src/perspective.c:146
+msgid "Zoom"
+msgstr ""
+
+#: ../../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 "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/perspective.c:154
+#, fuzzy
+#| msgid "Click and drag the mouse to emboss the picture."
+msgid "Click and drag up to zoom in or drag down to zoom out the picture."
+msgstr "Haz clic y arrastra el ratón para hacer un bajorrelieve con la imagen."
+
+#: ../../magic/src/puzzle.c:79
+#, fuzzy
+#| msgid "Purple!"
+msgid "Puzzle"
+msgstr "¡Púrpura!"
+
+#: ../../magic/src/puzzle.c:86
+#, fuzzy
+#| msgid "Click and drag to shift your picture around on the canvas."
+msgid "Click the part of your picture where would you like a puzzle."
+msgstr "Haz clic y arrastra para desplazar tu dibujo sobre la tela."
+
+#: ../../magic/src/puzzle.c:87
+#, fuzzy
+#| msgid "Click to make a mirror image."
+msgid "Click to make a puzzle in fullscreen mode."
+msgstr "Gaás ha par toób luú mon reveés ."
+
+#: ../../magic/src/rails.c:101
+#, fuzzy
+#| msgid "Ripples"
+msgid "Rails"
+msgstr "Ondas"
+
+#: ../../magic/src/rails.c:103
+#, fuzzy
+#| msgid "Click and drag to draw a beam of light on your picture."
+msgid "Click and drag to draw train track rails on your picture."
+msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
+
+#: ../../magic/src/rainbow.c:107
 msgid "Rainbow"
 msgstr "Arcoiris"
 
+#: ../../magic/src/rainbow.c:114
 msgid "You can draw in rainbow colors!"
 msgstr "¡Puedes dibujar con los colores del arcoiris!"
 
+#: ../../magic/src/rain.c:65
+#, fuzzy
+#| msgid "Rainbow"
+msgid "Rain"
+msgstr "Arcoiris"
+
+#: ../../magic/src/rain.c:68
+#, fuzzy
+#| msgid "Click to make ripples appear over your picture."
+msgid "Click to place a rain drop onto your picture."
+msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
+
+#: ../../magic/src/rain.c:69
+#, fuzzy
+#| msgid "Pick a color or picture with which to start a new drawing."
+msgid "Click to cover your picture with rain drops."
+msgstr "Kuan diif color o diif moon ner tete kuú."
+
+#: ../../magic/src/realrainbow.c:86
+#, fuzzy
+#| msgid "Rainbow"
+msgid "Real Rainbow"
+msgstr "Arcoiris"
+
+#: ../../magic/src/realrainbow.c:88
+#, fuzzy
+#| msgid "Rainbow"
+msgid "ROYGBIV Rainbow"
+msgstr "Arcoiris"
+
+#: ../../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 ""
+
+#: ../../magic/src/ripples.c:81
 msgid "Ripples"
 msgstr "Ondas"
 
+#: ../../magic/src/ripples.c:87
 msgid "Click to make ripples appear over your picture."
 msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
 
+#: ../../magic/src/rosette.c:93
+msgid "Rosette"
+msgstr ""
+
+#: ../../magic/src/rosette.c:93
+msgid "Picasso"
+msgstr ""
+
+#: ../../magic/src/rosette.c:98
+#, fuzzy
+#| msgid "Click to start drawing a line. Let go to complete it."
+msgid "Click and start drawing your rosette."
+msgstr "Gaás kue, keéy, ner toó leé, será tuub vaa keey."
+
+#: ../../magic/src/rosette.c:100
+#, fuzzy
+#| msgid "You can draw in rainbow colors!"
+msgid "You can draw just like Picasso!"
+msgstr "¡Puedes dibujar con los colores del arcoiris!"
+
+#: ../../magic/src/sharpen.c:73
+msgid "Edges"
+msgstr ""
+
+#: ../../magic/src/sharpen.c:74
+#, fuzzy
+#| msgid "Shapes"
+msgid "Sharpen"
+msgstr "Reé muún"
+
+#: ../../magic/src/sharpen.c:75
+msgid "Silhouette"
+msgstr ""
+
+#: ../../magic/src/sharpen.c:78
+#, fuzzy
+#| msgid "Click and drag the mouse to put glass tile over your picture."
+msgid "Click and move the mouse to trace edges in parts of your picture."
+msgstr "Gaás ha ner te teé bdiín  par toób luú azule sihiís mon."
+
+#: ../../magic/src/sharpen.c:79
+#, fuzzy
+#| msgid "Click to make ripples appear over your picture."
+msgid "Click to trace edges in your entire picture."
+msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
+
+#: ../../magic/src/sharpen.c:80
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse to sharpen parts of your picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/sharpen.c:81
+#, fuzzy
+#| msgid "Click to make ripples appear over your picture."
+msgid "Click to sharpen the entire picture."
+msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
+
+#: ../../magic/src/sharpen.c:82
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click and move the mouse to create a black and white silhouette."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/sharpen.c:83
+#, fuzzy
+#| msgid "Click and drag to draw a beam of light on your picture."
+msgid "Click to create a black and white silhouette of your entire picture."
+msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
+
+#: ../../magic/src/shift.c:104
 msgid "Shift"
 msgstr "Teé tey"
 
+#: ../../magic/src/shift.c:110
 msgid "Click and drag to shift your picture around on the canvas."
 msgstr "Haz clic y arrastra para desplazar tu dibujo sobre la tela."
 
+#: ../../magic/src/smudge.c:77
 msgid "Smudge"
 msgstr "Teé yuúy"
 
+#: ../../magic/src/smudge.c:84
 msgid "Click and move the mouse around to smudge the picture."
 msgstr "Haz clic y arrastra el ratón para manchar la imagen."
 
+#: ../../magic/src/snow.c:68
+msgid "Snow Ball"
+msgstr ""
+
+#: ../../magic/src/snow.c:69
+msgid "Snow Flake"
+msgstr ""
+
+#: ../../magic/src/snow.c:72
+#, fuzzy
+#| msgid "Click to make ripples appear over your picture."
+msgid "Click to add snow balls to your picture."
+msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
+
+#: ../../magic/src/snow.c:73
+#, fuzzy
+#| msgid "Click to make ripples appear over your picture."
+msgid "Click to add snow flakes to your picture."
+msgstr "Haz clic para que aparezcan ondas sobre tu dibujo."
+
+#: ../../magic/src/string.c:120
+msgid "String edges"
+msgstr ""
+
+#: ../../magic/src/string.c:123
+msgid "String corner"
+msgstr ""
+
+#: ../../magic/src/string.c:126
+msgid "String 'V'"
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../magic/src/string.c:137
+#, fuzzy
+#| msgid "Click and drag to draw a beam of light on your picture."
+msgid "Click and drag to draw arrows made of string art."
+msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
+
+#: ../../magic/src/string.c:140
+msgid "Draw string art arrows with free angles."
+msgstr ""
+
+#: ../../magic/src/tint.c:71
 msgid "Tint"
 msgstr "Kuúy"
 
-msgid "Click and move the mouse around to change the picture’s color."
+#: ../../magic/src/tint.c:72
+msgid "Color & White"
+msgstr ""
+
+#: ../../magic/src/tint.c:75
+#, fuzzy
+#| msgid "Click and move the mouse around to change the picture’s color."
+msgid ""
+"Click and move the mouse around to change the color of parts of your picture."
 msgstr "Haz clic y arrastra el ratón para cambiar el color de la imagen."
 
+#: ../../magic/src/tint.c:76
+#, fuzzy
+#| msgid "Click and move the mouse around to blur the picture."
+msgid "Click to change the color of your entire picture."
+msgstr "Haz clic y arrastra el ratón para desenfocar la imagen."
+
+#: ../../magic/src/tint.c:77
+#, fuzzy
+#| msgid "Click and move the mouse around to turn the picture into a cartoon."
+msgid ""
+"Click and move the mouse around to turn parts of your picture into white and "
+"a color you choose."
+msgstr ""
+"Haz clic y arrastra el ratón para que la imagen se vea como los dibujitos."
+
+#: ../../magic/src/tint.c:78
+msgid "Click to turn your entire picture into white and a color you choose."
+msgstr ""
+
+#: ../../magic/src/toothpaste.c:65
+msgid "Toothpaste"
+msgstr ""
+
+#: ../../magic/src/toothpaste.c:68
+#, fuzzy
+#| msgid "Click and drag to draw a beam of light on your picture."
+msgid "Click and drag to squirt toothpaste onto your picture."
+msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
+
+#: ../../magic/src/tornado.c:127
+msgid "Tornado"
+msgstr ""
+
+#: ../../magic/src/tornado.c:133
+#, fuzzy
+#| msgid "Click and drag to draw a beam of light on your picture."
+msgid "Click and drag to draw a tornado funnel on your picture."
+msgstr "Gaás ha neér kuin naá paar toób luú diíf beél tií loó moón naá luú."
+
+#: ../../magic/src/tv.c:74
+msgid "TV"
+msgstr ""
+
+#: ../../magic/src/tv.c:79
+#, fuzzy
+#| msgid "Click and drag to shift your picture around on the canvas."
+msgid ""
+"Click and drag to make parts of your picture look like they are on "
+"television."
+msgstr "Haz clic y arrastra para desplazar tu dibujo sobre la tela."
+
+#: ../../magic/src/tv.c:82
+msgid "Click to make your picture look like it's on television."
+msgstr ""
+
+#: ../../magic/src/waves.c:80
 msgid "Waves"
 msgstr "Ondas"
 
-msgid "Click to make the picture 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 "Haz clic para dejar la imagen ondulada. Hacia arriba o abajo para obtener ondas más bajas o altas y hacia la izquierda o derecha para obtener ondas más cortas o largas."
+#: ../../magic/src/waves.c:81
+#, fuzzy
+#| msgid "Waves"
+msgid "Wavelets"
+msgstr "Ondas"
 
+#: ../../magic/src/waves.c:88
+#, fuzzy
+#| msgid ""
+#| "Click to make the picture wavy. Click toward the top for shorter waves, "
+#| "the bottom for taller waves, the left for small waves, and the right for "
+#| "long waves."
+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 ""
+"Haz clic para dejar la imagen ondulada. Hacia arriba o abajo para obtener "
+"ondas más bajas o altas y hacia la izquierda o derecha para obtener ondas "
+"más cortas o largas."
+
+#: ../../magic/src/waves.c:89
+#, fuzzy
+#| msgid ""
+#| "Click to make the picture wavy. Click toward the top for shorter waves, "
+#| "the bottom for taller waves, the left for small waves, and the right for "
+#| "long waves."
+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 ""
+"Haz clic para dejar la imagen ondulada. Hacia arriba o abajo para obtener "
+"ondas más bajas o altas y hacia la izquierda o derecha para obtener ondas "
+"más cortas o largas."
+
+#~ msgid "Click and move to fade the colors."
+#~ msgstr "Haz clic y arrastra el ratón para desvanecer los colores."
+
+#~ msgid "Click and move to darken the colors."
+#~ msgstr "Haz clic y arrastra para oscurecer los colores."
diff --git a/src/tuxpaint.desktop b/src/tuxpaint.desktop
index bf35ba526..5572c6a46 100644
--- a/src/tuxpaint.desktop
+++ b/src/tuxpaint.desktop
@@ -131,6 +131,7 @@ GenericName[ru]=Программа для рисования
 GenericName[sk]=Program na kreslenie
 GenericName[sl]=Risarski program
 GenericName[son]=Biiteeyan porogaram
+GenericName[sq]=Program për vizatim
 GenericName[sr]=Програм за цртање
 GenericName[sv]=Ritprogram
 GenericName[sw]=Programu ya kuchora
@@ -145,7 +146,7 @@ GenericName[vi]=Trình vẽ
 GenericName[wa]=Programe di dessinaedje
 GenericName[wo]=Lëlu natal
 GenericName[xh]=Inkqubo yokuzoba
-GenericName[zam]=Diif program paar keé men Dibuj
+GenericName[zam]=Diif program paar kuú men 
 GenericName[zh_CN]=绘图程序
 GenericName[zh_TW]=畫圖程式
 Comment=A drawing program for children.
@@ -203,6 +204,7 @@ Comment[ru]=Детская программа для рисования.
 Comment[sk]=Program na kreslenie pre deti.
 Comment[sl]=Risarski program za otroke
 Comment[son]=Biiteeyan porogaram zankey se.
+Comment[sq]=Program vizatimi për fëmijë.
 Comment[sr]=Дечји програм за цртање
 Comment[sv]=Ett ritprogram för barn.
 Comment[sw]=Programu kwa watoto kuchora.