diff --git a/docs/CHANGES.txt b/docs/CHANGES.txt
index f440ca063..1ad8a9051 100644
--- a/docs/CHANGES.txt
+++ b/docs/CHANGES.txt
@@ -8,7 +8,7 @@ http://www.tuxpaint.org/
 
 $Id$
 
-2010.June.17 (0.9.22)
+2010.July.2 (0.9.22)
   * New Tools:
     ----------
     * Label - A tool to add text to a drawing, which can be modified or
diff --git a/src/po/vec.po b/src/po/vec.po
index 2f24562c8..f6fe1ea48 100644
--- a/src/po/vec.po
+++ b/src/po/vec.po
@@ -3,14 +3,12 @@
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <mistro@elgalepin.com>, 2010.
 #
-#. Reserved...
-#: ../tools.h:133
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2010-04-03 11:56-0700\n"
-"PO-Revision-Date: 2010-04-02 17:14+0100\n"
+"PO-Revision-Date: 2010-06-28 17:38+0100\n"
 "Last-Translator: Fabio Lazarin <mistro@elgalepin.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -231,82 +229,95 @@ msgid "ZH_TW"
 msgstr "Cinexe tradisional"
 
 #. 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 "Cuadrato"
 
 #. Rectangle shape tool (4 sides at right angles)
-#: ../shapes.h:175 ../shapes.h:176
+#: ../shapes.h:175
+#: ../shapes.h:176
 msgid "Rectangle"
 msgstr "Retàngoƚo"
 
 #. 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 "Sercio"
 
 #. 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 "Elise"
 
 #. Triangle shape tool (3 sides)
-#: ../shapes.h:187 ../shapes.h:188
+#: ../shapes.h:187
+#: ../shapes.h:188
 msgid "Triangle"
 msgstr "Triàngoƚo"
 
 #. 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 "Ronbo"
 
 #. Octagon shape tool (8 sides)
-#: ../shapes.h:199 ../shapes.h:200
+#: ../shapes.h:199
+#: ../shapes.h:200
 msgid "Octagon"
 msgstr "Otà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 "Un cuadrato el xé un retàngoƚo co' i lai conpagni"
 
 #. 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 "Un retàngoƚo el gà cuatro ladi e cuatro àngoƚi in scuara"
 
-#: ../shapes.h:217 ../shapes.h:219
-msgid ""
-"A circle is a curve where all points have the same distance from the center."
-msgstr ""
-"Un sercio el xé na curva indove che tuti i ponti i xé a distansa conpagna da "
-"'l sentro."
+#: ../shapes.h:217
+#: ../shapes.h:219
+msgid "A circle is a curve where all points have the same distance from the center."
+msgstr "Un sercio el xé na curva indove che tuti i ponti i xé a distansa conpagna da 'l sentro."
 
 #. Description of an ellipse
-#: ../shapes.h:222 ../shapes.h:223
+#: ../shapes.h:222
+#: ../shapes.h:223
 msgid "An ellipse is a stretched circle."
 msgstr "Na elise ƚa xé un sercio strucà."
 
 #. Description of a triangle
-#: ../shapes.h:226 ../shapes.h:227
+#: ../shapes.h:226
+#: ../shapes.h:227
 msgid "A triangle has three sides."
 msgstr "Un triàngoƚo el gà trè lai."
 
 #. Description of a pentagon
-#: ../shapes.h:230 ../shapes.h:231
+#: ../shapes.h:230
+#: ../shapes.h:231
 msgid "A pentagon has five sides."
 msgstr "Un pentàgono el gà sincue lai."
 
-#: ../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 "Un ronbo el gà cuatro lai conpagni, e i lai opòsti i xé paralèƚi."
 
-#: ../shapes.h:241 ../shapes.h:243
+#: ../shapes.h:241
+#: ../shapes.h:243
 msgid "An octagon has eight equal sides."
 msgstr "Un otàgono el gà òto lai conpagni."
 
@@ -337,7 +348,8 @@ msgstr "Tinbri"
 
 #. Title of shape selector (buttons down the right for shapes tool)
 #. Shape creation tool (square, circle, etc.)
-#: ../titles.h:71 ../tools.h:71
+#: ../titles.h:71
+#: ../tools.h:71
 msgid "Shapes"
 msgstr "Forme"
 
@@ -348,7 +360,8 @@ msgstr "Létare"
 
 #. 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:83
+#: ../titles.h:77
+#: ../tools.h:83
 msgid "Magic"
 msgstr "Mago"
 
@@ -405,7 +418,8 @@ msgstr "Novo"
 #. Open a saved picture
 #. buttons for the file open dialog
 #. Open dialog: 'Open' button, to load the selected picture
-#: ../tools.h:98 ../tuxpaint.c:6802
+#: ../tools.h:98
+#: ../tuxpaint.c:6802
 msgid "Open"
 msgstr "Vèrxi"
 
@@ -441,33 +455,18 @@ msgstr "Clica par scominsiar na stricada. Mòƚa par conpletarla."
 
 #. Shape tool instructions
 #: ../tools.h:124
-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 ""
-"Desernisi na forma. Clica par far el sentro, strasina, pò mòƚa co ƚa xé "
-"granda fà basta. Movi par voltarla, e clica par piturarla."
+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 "Desernisi na forma. Clica par far el sentro, strasina, pò mòƚa co ƚa xé granda fà basta. Movi par voltarla, e clica par piturarla."
 
 #. Text tool instructions
 #: ../tools.h:127
-msgid ""
-"Choose a style of text. Click on your drawing and you can start typing. "
-"Press [Enter] or [Tab] to complete the text."
-msgstr ""
-"Desernisi un stil de tèsto, Clica so 'l to dixegno e scominsia a scrìvar. "
-"Struca [Invìo] o [Tab] par conpletar."
+msgid "Choose a style of text. Click on your drawing and you can start typing. Press [Enter] or [Tab] to complete the text."
+msgstr "Desernisi un stil de tèsto, Clica so 'l to dixegno e scominsia a scrìvar. Struca [Invìo] o [Tab] par conpletar."
 
 #. Label tool instructions
 #: ../tools.h:130
-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 ""
-"Desernisi un stil de tèsto, Clica so 'l to dixegno e scominsia a scrìvar. "
-"Struca [Invìo] o [Tab] par conpletar. A doparando el seƚesionador e clicando "
-"so' na ticheta existente, te pol móvarla, modifegarla e canbiarghe stil."
+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 "Desernisi un stil de tèsto, Clica so 'l to dixegno e scominsia a scrìvar. Struca [Invìo] o [Tab] par conpletar. A doparando el seƚesionador e clicando so' na ticheta existente, te pol móvarla, modifegarla e canbiarghe stil."
 
 #. Magic tool instruction
 #: ../tools.h:136
@@ -545,7 +544,8 @@ msgid "Yes, I’m done!"
 msgstr "Sì, a gò fenìo."
 
 #. Quit prompt negative response (don't quit)
-#: ../tuxpaint.c:1875 ../tuxpaint.c:1902
+#: ../tuxpaint.c:1875
+#: ../tuxpaint.c:1902
 msgid "No, take me back!"
 msgstr "Nò, méneme indrìo!"
 
@@ -554,11 +554,13 @@ msgstr "Nò, méneme indrìo!"
 msgid "If you quit, you’ll lose your picture! Save it?"
 msgstr "Se te và fora te perdarà el to dixegno! Vusto salvarlo?"
 
-#: ../tuxpaint.c:1880 ../tuxpaint.c:1885
+#: ../tuxpaint.c:1880
+#: ../tuxpaint.c:1885
 msgid "Yes, save it!"
 msgstr "Sì, salvémoƚo!"
 
-#: ../tuxpaint.c:1881 ../tuxpaint.c:1886
+#: ../tuxpaint.c:1881
+#: ../tuxpaint.c:1886
 msgid "No, don’t bother saving!"
 msgstr "Nò, no ocor salvarlo!"
 
@@ -573,7 +575,10 @@ msgid "Can’t open that picture!"
 msgstr "No se pol vèrxar sto dixegno!"
 
 #. Generic dialog dismissal
-#: ../tuxpaint.c:1892 ../tuxpaint.c:1897 ../tuxpaint.c:1906 ../tuxpaint.c:1913
+#: ../tuxpaint.c:1892
+#: ../tuxpaint.c:1897
+#: ../tuxpaint.c:1906
+#: ../tuxpaint.c:1913
 #: ../tuxpaint.c:1922
 msgid "OK"
 msgstr "Va bon."
@@ -703,7 +708,8 @@ msgstr "Desernisi el dixegno che te vol, e pò clica \"Vèrxi\"."
 
 #. Let user choose images:
 #. Instructions for Slideshow file dialog (FIXME: Make a #define)
-#: ../tuxpaint.c:13970 ../tuxpaint.c:14284
+#: ../tuxpaint.c:13970
+#: ../tuxpaint.c:14284
 msgid "Choose the pictures you want, then click “Play”."
 msgstr "Desernisi i dixegni che te vol, e pò clica \"Mostra\"."
 
@@ -729,8 +735,7 @@ msgstr "Variasion de coƚor"
 
 #: ../../magic/src/alien.c:67
 msgid "Click and move the mouse to change the colors in parts of your picture."
-msgstr ""
-"Clica e movi el mouse par canbiar i coƚori in porsion de 'l to dixegno."
+msgstr "Clica e movi el mouse par canbiar i coƚori in porsion de 'l to dixegno."
 
 #: ../../magic/src/alien.c:68
 msgid "Click to change the colors in your entire picture."
@@ -741,12 +746,8 @@ msgid "Blind"
 msgstr "Coltrine"
 
 #: ../../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 ""
-"Clica vèrso el bordo de 'l to dixegno ar tirar na coltrina. Movi in "
-"perpendìcoƚo par vèrxar e sarar ƚe coltrine."
+msgid "Click towards the edge of your picture to pull window blinds over it. Move perpendicularly to open or close the blinds."
+msgstr "Clica vèrso el bordo de 'l to dixegno ar tirar na coltrina. Movi in perpendìcoƚo par vèrxar e sarar ƚe coltrine."
 
 #: ../../magic/src/blocks_chalk_drip.c:132
 msgid "Blocks"
@@ -765,8 +766,7 @@ msgid "Click and move the mouse around to make the picture blocky."
 msgstr "Clica e strasina so 'l dixegno par farlo a blòchi."
 
 #: ../../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 strasina so 'l dixegno par farla cofà un dixegno a geseto."
 
 #: ../../magic/src/blocks_chalk_drip.c:152
@@ -900,10 +900,8 @@ msgid "Fold"
 msgstr "Piega"
 
 #: ../../magic/src/fold.c:86
-msgid ""
-"Choose a background color and click to turn the corner of the page over."
-msgstr ""
-"Desernisi un coƚor de sfondro e clica par voltar el canton de ƚa pàxena."
+msgid "Choose a background color and click to turn the corner of the page over."
+msgstr "Desernisi un coƚor de sfondro e clica par voltar el canton de ƚa pàxena."
 
 #: ../../magic/src/glasstile.c:83
 msgid "Glass Tile"
@@ -923,15 +921,14 @@ msgstr "Èrba"
 
 #: ../../magic/src/grass.c:98
 msgid "Click and move to draw grass. Don’t forget the dirt!"
-msgstr "CLica e strasina par dixegnar èrba. "
+msgstr "Clica e strasina par dixegnar èrba. "
 
 #: ../../magic/src/kalidescope.c:77
 msgid "Kaleidoscope"
 msgstr "Calèido"
 
 #: ../../magic/src/kalidescope.c:83
-msgid ""
-"Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
+msgid "Click and drag the mouse to draw with symmetric brushes (a kaleidoscope)."
 msgstr "Clica e strasina par dixegnar co' speneƚade simètriche"
 
 #: ../../magic/src/light.c:84
@@ -971,10 +968,8 @@ msgid "Mosaic"
 msgstr "Moxàico"
 
 #: ../../magic/src/mosaic.c:78
-msgid ""
-"Click and move the mouse to add a mosaic effect to parts of your picture."
-msgstr ""
-"Clica e strasina par xontar un efèto moxàico so porsion de 'l to dixegno."
+msgid "Click and move the mouse to add a mosaic effect to parts of your picture."
+msgstr "Clica e strasina par xontar un efèto moxàico so porsion de 'l to dixegno."
 
 #: ../../magic/src/mosaic.c:79
 msgid "Click to add a mosaic effect to your entire picture."
@@ -993,8 +988,7 @@ msgid "Irregular Mosaic"
 msgstr "M-Iregoƚar"
 
 #: ../../magic/src/mosaic_shaped.c:141
-msgid ""
-"Click and move the mouse to add a square 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 strasina par xontar moxàico cuadrato so 'l to dixegno."
 
 #: ../../magic/src/mosaic_shaped.c:142
@@ -1002,8 +996,7 @@ msgid "Click to add a square mosaic to your entire picture."
 msgstr "Clica par xontar moxàico cuadrato so tuto el to dixegno."
 
 #: ../../magic/src/mosaic_shaped.c:144
-msgid ""
-"Click and move the mouse to add a hexagonal 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 strasina par xontar moxàico exagonal so 'l to dixegno."
 
 #: ../../magic/src/mosaic_shaped.c:145
@@ -1011,8 +1004,7 @@ msgid "Click to add a hexagonal mosaic to your entire picture."
 msgstr "Clica par xontar moxàico exagonal so tuto el to dixegno."
 
 #: ../../magic/src/mosaic_shaped.c:147
-msgid ""
-"Click and move the mouse to add an 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 strasina par xontar moxàico iregoƚar so 'l to dixegno."
 
 #: ../../magic/src/mosaic_shaped.c:148
@@ -1053,8 +1045,7 @@ msgstr "Zoom"
 
 #: ../../magic/src/perspective.c:151
 msgid "Click on the corners and drag where you want to stretch the picture."
-msgstr ""
-"Clica i cantoni e strasina vèrso indove che te vol strucar ƚa prospetiva"
+msgstr "Clica i cantoni e strasina vèrso indove che te vol strucar ƚa prospetiva"
 
 #: ../../magic/src/perspective.c:154
 msgid "Click and drag up to zoom in or drag down to zoom out the picture."
@@ -1109,12 +1100,8 @@ msgid "ROYGBIV Rainbow"
 msgstr "I sète coƚori de 'l arcovèrxene."
 
 #: ../../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 indove che te vol che scominsie el to arcovèrxene, strasina indove che "
-"te vol che 'l fenisa, e mòƚa par dixegnar."
+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 indove che te vol che scominsie el to arcovèrxene, strasina indove che te vol che 'l fenisa, e mòƚa par dixegnar."
 
 #: ../../magic/src/ripples.c:81
 msgid "Ripples"
@@ -1231,12 +1218,8 @@ msgid "String 'V'"
 msgstr "\"V\" de ƚa stringa"
 
 #: ../../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 strasina par dixegnar a teƚarine de stringa. Strasina suxo-xoxo par "
-"far pì o manco stringhe, drèta-sanca par far el buxo pì grando."
+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 strasina par dixegnar a teƚarine de stringa. Strasina suxo-xoxo par far pì o manco stringhe, drèta-sanca par far el buxo pì grando."
 
 #: ../../magic/src/string.c:137
 msgid "Click and drag to draw arrows made of string art."
@@ -1255,8 +1238,7 @@ msgid "Color & White"
 msgstr "Coƚor e bianco"
 
 #: ../../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 strasina sora el dixegno par canbiar i coƚori de ƚa parte."
 
 #: ../../magic/src/tint.c:76
@@ -1264,12 +1246,8 @@ msgid "Click to change the color of your entire picture."
 msgstr "Clica par canbiar el coƚor de tuto el to dixegno."
 
 #: ../../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 strasina par canbiar parte de 'l to dixegno in bianco e un coƚor che "
-"te piaxe."
+msgid "Click and move the mouse around to turn parts of your picture into white and a color you choose."
+msgstr "Clica e strasina par canbiar parte de 'l to dixegno in bianco e un coƚor che te piaxe."
 
 #: ../../magic/src/tint.c:78
 msgid "Click to turn your entire picture into white and a color you choose."
@@ -1296,11 +1274,8 @@ 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 strasina par canbiar parte de 'l to dixegno cofà el fuse in tivixion."
+msgid "Click and drag to make parts of your picture look like they are on television."
+msgstr "Clica e strasina par canbiar parte de 'l to dixegno cofà el fuse in tivixion."
 
 #: ../../magic/src/tv.c:82
 msgid "Click to make your picture look like it's on television."
@@ -1315,21 +1290,10 @@ msgid "Wavelets"
 msgstr "Pieghe"
 
 #: ../../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 par far el to dixegno a onde orixontaƚi. Clica darente el bordo insima "
-"par onde pì base, darente el bordo in baso par onde pì alte, sanca par onde "
-"pì base, drèta par onde pì alte."
+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 par far el to dixegno a onde orixontaƚi. Clica darente el bordo insima par onde pì base, darente el bordo in baso par onde pì alte, sanca par onde pì base, drèta par onde pì alte."
 
 #: ../../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 par far el to dixegno a onde vericaƚi. Clica darente el bordo insima "
-"par onde pì base, darente el bordo in baso par onde pì alte, sanca par onde "
-"pì base, drèta par onde pì alte."
+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 par far el to dixegno a onde vericaƚi. Clica darente el bordo insima par onde pì base, darente el bordo in baso par onde pì alte, sanca par onde pì base, drèta par onde pì alte."
+