diff --git a/src/po/tuxpaint.pot b/src/po/tuxpaint.pot
index e436e5533..412177b53 100644
--- a/src/po/tuxpaint.pot
+++ b/src/po/tuxpaint.pot
@@ -1,14 +1,14 @@
-# Tux Paint message catalog
-# Copyright (C) 2002-2005
-# This file is distributed under the same license as the Tux Paint package.
-# Bill Kendrick <bill@newbreedsoftware.com>, 2005.
+# 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.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Tux Paint 0.9.15\n"
+"Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-10-10 00:06-0700\n"
+"POT-Creation-Date: 2005-10-10 00:11-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"
@@ -16,561 +16,585 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tuxpaint.c:2684
-msgid "Do you really want to quit?"
+#: ../tuxpaint.desktop.in.h:1
+msgid "A drawing program for children."
 msgstr ""
 
-#: tuxpaint.c:2685 tuxpaint.c:2689 tuxpaint.c:2693 tuxpaint.c:2707
-#: tuxpaint.c:2717 tuxpaint.c:11941 tuxpaint.c:12782
-msgid "Yes"
+#: ../tuxpaint.desktop.in.h:2
+msgid "Drawing program"
 msgstr ""
 
-#: tuxpaint.c:2686 tuxpaint.c:2690 tuxpaint.c:2694 tuxpaint.c:2708
-#: tuxpaint.c:2718 tuxpaint.c:11945
-msgid "No"
+#: ../tuxpaint.desktop.in.h:3
+msgid "Tux Paint"
 msgstr ""
 
-#: tuxpaint.c:2688
-msgid "If you quit, you’ll lose your picture! Save it?"
-msgstr ""
-
-#: tuxpaint.c:2692
-msgid "Save your picture first?"
-msgstr ""
-
-#: tuxpaint.c:2696
-msgid "Can’t open that picture!"
-msgstr ""
-
-#: tuxpaint.c:2697 tuxpaint.c:2704 tuxpaint.c:2711 tuxpaint.c:2714
-#: tuxpaint.c:2721
-msgid "OK"
-msgstr ""
-
-#: tuxpaint.c:2699
-msgid "Starting a new picture will erase the current one!"
-msgstr ""
-
-#: tuxpaint.c:2700
-msgid "That’s OK!"
-msgstr ""
-
-#: tuxpaint.c:2701
-msgid "Never mind!"
-msgstr ""
-
-#: tuxpaint.c:2703
-msgid "There are no saved files!"
-msgstr ""
-
-#: tuxpaint.c:2706
-msgid "Print your picture now?"
-msgstr ""
-
-#: tuxpaint.c:2710
-msgid "Your picture has been printed!"
-msgstr ""
-
-#: tuxpaint.c:2713
-msgid "You can’t print yet!"
-msgstr ""
-
-#: tuxpaint.c:2716
-msgid "Erase this picture?"
-msgstr ""
-
-#: tuxpaint.c:2720
-msgid "Remember to use the left mouse button!"
-msgstr ""
-
-#: tuxpaint.c:6682
-msgid "jq"
-msgstr ""
-
-#: tuxpaint.c:6682
-msgid "JQ"
-msgstr ""
-
-#: tuxpaint.c:6694
-msgid "oO"
-msgstr ""
-
-#: tuxpaint.c:6695
-msgid "`\\%_@$~#{}<>^&*"
-msgstr ""
-
-#: tuxpaint.c:6696
-msgid ",.?!"
-msgstr ""
-
-#: tuxpaint.c:6697
-msgid "017"
-msgstr ""
-
-#: tuxpaint.c:6698
-msgid "O0"
-msgstr ""
-
-#: tuxpaint.c:6699
-msgid "1Il|"
-msgstr ""
-
-#: tuxpaint.c:8829 tools.h:52
-msgid "Open"
-msgstr ""
-
-#: tuxpaint.c:8830
-msgid "Erase"
-msgstr ""
-
-#: tuxpaint.c:8831
-msgid "Back"
-msgstr ""
-
-#: tuxpaint.c:9425
-msgid "Aa"
-msgstr ""
-
-#: tuxpaint.c:12781
-msgid "Save over the older version of this picture?"
-msgstr ""
-
-#: tuxpaint.c:12783
-msgid "No, save a new file"
-msgstr ""
-
-#: tuxpaint.c:13707
-msgid "Choose the picture you want, then click “Open”."
-msgstr ""
-
-#: colors.h:66
+#: ../colors.h:66
 msgid "Black!"
 msgstr ""
 
-#: colors.h:67
+#: ../colors.h:67
 msgid "Dark grey! Some people spell it “dark gray”."
 msgstr ""
 
-#: colors.h:68
+#: ../colors.h:68
 msgid "Light grey! Some people spell it “light gray”."
 msgstr ""
 
-#: colors.h:69
+#: ../colors.h:69
 msgid "White!"
 msgstr ""
 
-#: colors.h:70
+#: ../colors.h:70
 msgid "Red!"
 msgstr ""
 
-#: colors.h:71
+#: ../colors.h:71
 msgid "Orange!"
 msgstr ""
 
-#: colors.h:72
+#: ../colors.h:72
 msgid "Yellow!"
 msgstr ""
 
-#: colors.h:73
+#: ../colors.h:73
 msgid "Light green!"
 msgstr ""
 
-#: colors.h:74
+#: ../colors.h:74
 msgid "Dark green!"
 msgstr ""
 
-#: colors.h:75
+#: ../colors.h:75
 msgid "Sky blue!"
 msgstr ""
 
-#: colors.h:76
+#: ../colors.h:76
 msgid "Blue!"
 msgstr ""
 
-#: colors.h:77
+#: ../colors.h:77
 msgid "Lavender!"
 msgstr ""
 
-#: colors.h:78
+#: ../colors.h:78
 msgid "Purple!"
 msgstr ""
 
-#: colors.h:79
+#: ../colors.h:79
 msgid "Pink!"
 msgstr ""
 
-#: colors.h:80
+#: ../colors.h:80
 msgid "Brown!"
 msgstr ""
 
-#: colors.h:81
+#: ../colors.h:81
 msgid "Tan!"
 msgstr ""
 
-#: colors.h:82
+#: ../colors.h:82
 msgid "Beige!"
 msgstr ""
 
-#: great.h:20
+#: ../great.h:20
 msgid "Great!"
 msgstr ""
 
-#: great.h:21
+#: ../great.h:21
 msgid "Cool!"
 msgstr ""
 
-#: great.h:22
+#: ../great.h:22
 msgid "Keep it up!"
 msgstr ""
 
-#: great.h:23
+#: ../great.h:23
 msgid "Good job!"
 msgstr ""
 
-#: magic.h:83
+#: ../magic.h:83
 msgid "Fill"
 msgstr ""
 
-#: magic.h:84
+#: ../magic.h:84
 msgid "Grass"
 msgstr ""
 
-#: magic.h:86 magic.h:87
+#: ../magic.h:86 ../magic.h:87
 msgid "Bricks"
 msgstr ""
 
-#: magic.h:89
+#: ../magic.h:89
 msgid "Rainbow"
 msgstr ""
 
-#: magic.h:90
+#: ../magic.h:90
 msgid "Sparkles"
 msgstr ""
 
-#: magic.h:92
+#: ../magic.h:92
 msgid "Blur"
 msgstr ""
 
-#: magic.h:93
+#: ../magic.h:93
 msgid "Smudge"
 msgstr ""
 
-#: magic.h:95
+#: ../magic.h:95
 msgid "Lighten"
 msgstr ""
 
-#: magic.h:96
+#: ../magic.h:96
 msgid "Darken"
 msgstr ""
 
-#: magic.h:98
+#: ../magic.h:98
 msgid "Chalk"
 msgstr ""
 
-#: magic.h:99
+#: ../magic.h:99
 msgid "Blocks"
 msgstr ""
 
-#: magic.h:101
+#: ../magic.h:101
 msgid "Negative"
 msgstr ""
 
-#: magic.h:102
+#: ../magic.h:102
 msgid "Tint"
 msgstr ""
 
-#: magic.h:104
+#: ../magic.h:104
 msgid "Drip"
 msgstr ""
 
-#: magic.h:105
+#: ../magic.h:105
 msgid "Cartoon"
 msgstr ""
 
-#: magic.h:107
+#: ../magic.h:107
 msgid "Mirror"
 msgstr ""
 
-#: magic.h:108
+#: ../magic.h:108
 msgid "Flip"
 msgstr ""
 
-#: magic.h:115
+#: ../magic.h:115
 msgid "Click in the picture to fill that area with color."
 msgstr ""
 
-#: magic.h:116
+#: ../magic.h:116
 msgid "Click and move to draw grass. Don’t forget the dirt!"
 msgstr ""
 
-#: magic.h:118
+#: ../magic.h:118
 msgid "Click and move to draw large bricks."
 msgstr ""
 
-#: magic.h:119
+#: ../magic.h:119
 msgid "Click and move to draw small bricks."
 msgstr ""
 
-#: magic.h:121
+#: ../magic.h:121
 msgid "You can draw in rainbow colors!"
 msgstr ""
 
-#: magic.h:122
+#: ../magic.h:122
 msgid "Click and move to draw sparkles."
 msgstr ""
 
-#: magic.h:124
+#: ../magic.h:124
 msgid "Click and move the mouse around to blur the picture."
 msgstr ""
 
-#: magic.h:125
+#: ../magic.h:125
 msgid "Click and move the mouse around to smudge the picture."
 msgstr ""
 
-#: magic.h:127
+#: ../magic.h:127
 msgid "Click and move to fade the colors."
 msgstr ""
 
-#: magic.h:128
+#: ../magic.h:128
 msgid "Click and move to darken the colors."
 msgstr ""
 
-#: magic.h:130
+#: ../magic.h:130
 msgid ""
 "Click and move the mouse around to turn the picture into a chalk drawing."
 msgstr ""
 
-#: magic.h:131
+#: ../magic.h:131
 msgid "Click and move the mouse around to make the picture blocky."
 msgstr ""
 
-#: magic.h:133
+#: ../magic.h:133
 msgid "Click and move the mouse around to draw a negative."
 msgstr ""
 
-#: magic.h:134
+#: ../magic.h:134
 msgid "Click and move the mouse around to change the picture’s color."
 msgstr ""
 
-#: magic.h:136
+#: ../magic.h:136
 msgid "Click and move the mouse around to make the picture drip."
 msgstr ""
 
-#: magic.h:137
+#: ../magic.h:137
 msgid "Click and move the mouse around to turn the picture into a cartoon."
 msgstr ""
 
-#: magic.h:139
+#: ../magic.h:139
 msgid "Click to make a mirror image."
 msgstr ""
 
-#: magic.h:140
+#: ../magic.h:140
 msgid "Click to flip the picture upside-down."
 msgstr ""
 
-#: shapes.h:141 shapes.h:142
+#: ../shapes.h:141 ../shapes.h:142
 msgid "Square"
 msgstr ""
 
-#: shapes.h:143 shapes.h:144
+#: ../shapes.h:143 ../shapes.h:144
 msgid "Rectangle"
 msgstr ""
 
-#: shapes.h:145 shapes.h:146
+#: ../shapes.h:145 ../shapes.h:146
 msgid "Circle"
 msgstr ""
 
-#: shapes.h:147 shapes.h:148
+#: ../shapes.h:147 ../shapes.h:148
 msgid "Ellipse"
 msgstr ""
 
-#: shapes.h:149 shapes.h:150
+#: ../shapes.h:149 ../shapes.h:150
 msgid "Triangle"
 msgstr ""
 
-#: shapes.h:151 shapes.h:152
+#: ../shapes.h:151 ../shapes.h:152
 msgid "Pentagon"
 msgstr ""
 
-#: shapes.h:153 shapes.h:154
+#: ../shapes.h:153 ../shapes.h:154
 msgid "Rhombus"
 msgstr ""
 
-#: shapes.h:161 shapes.h:162
+#: ../shapes.h:161 ../shapes.h:162
 msgid "A square is a rectangle with four equal sides."
 msgstr ""
 
-#: shapes.h:163 shapes.h:164
+#: ../shapes.h:163 ../shapes.h:164
 msgid "A rectangle has four sides and four right angles."
 msgstr ""
 
-#: shapes.h:165 shapes.h:166
+#: ../shapes.h:165 ../shapes.h:166
 msgid ""
 "A circle is a curve where all points have the same distance from the centre."
 msgstr ""
 
-#: shapes.h:167 shapes.h:168
+#: ../shapes.h:167 ../shapes.h:168
 msgid "An ellipse is a stretched circle."
 msgstr ""
 
-#: shapes.h:169 shapes.h:170
+#: ../shapes.h:169 ../shapes.h:170
 msgid "A triangle has three sides."
 msgstr ""
 
-#: shapes.h:171 shapes.h:172
+#: ../shapes.h:171 ../shapes.h:172
 msgid "A pentagon has five sides."
 msgstr ""
 
-#: shapes.h:173 shapes.h:174
+#: ../shapes.h:173 ../shapes.h:174
 msgid "A rhombus has four equal sides, and opposite sides are parallel."
 msgstr ""
 
-#: titles.h:38
+#: ../titles.h:38
 msgid "Tools"
 msgstr ""
 
-#: titles.h:39
+#: ../titles.h:39
 msgid "Colors"
 msgstr ""
 
-#: titles.h:40
+#: ../titles.h:40
 msgid "Brushes"
 msgstr ""
 
-#: titles.h:41
+#: ../titles.h:41
 msgid "Erasers"
 msgstr ""
 
-#: titles.h:42
+#: ../titles.h:42
 msgid "Stamps"
 msgstr ""
 
-#: titles.h:43 tools.h:45
+#: ../titles.h:43 ../tools.h:45
 msgid "Shapes"
 msgstr ""
 
-#: titles.h:44
+#: ../titles.h:44
 msgid "Letters"
 msgstr ""
 
-#: titles.h:45 tools.h:47
+#: ../titles.h:45 ../tools.h:47
 msgid "Magic"
 msgstr ""
 
-#: tools.h:42
+#: ../tools.h:42
 msgid "Paint"
 msgstr ""
 
-#: tools.h:43
+#: ../tools.h:43
 msgid "Stamp"
 msgstr ""
 
-#: tools.h:44
+#: ../tools.h:44
 msgid "Lines"
 msgstr ""
 
-#: tools.h:46
+#: ../tools.h:46
 msgid "Text"
 msgstr ""
 
-#: tools.h:48
+#: ../tools.h:48
 msgid "Undo"
 msgstr ""
 
-#: tools.h:49
+#: ../tools.h:49
 msgid "Redo"
 msgstr ""
 
-#: tools.h:50
+#: ../tools.h:50
 msgid "Eraser"
 msgstr ""
 
-#: tools.h:51
+#: ../tools.h:51
 msgid "New"
 msgstr ""
 
-#: tools.h:53
+#. buttons for the file open dialog
+#: ../tools.h:52 ../tuxpaint.c:8829
+msgid "Open"
+msgstr ""
+
+#: ../tools.h:53
 msgid "Save"
 msgstr ""
 
-#: tools.h:54
+#: ../tools.h:54
 msgid "Print"
 msgstr ""
 
-#: tools.h:55
+#: ../tools.h:55
 msgid "Quit"
 msgstr ""
 
-#: tools.h:62
+#: ../tools.h:62
 msgid "Pick a color and a brush shape to draw with."
 msgstr ""
 
-#: tools.h:63
+#: ../tools.h:63
 msgid "Pick a picture to stamp around your drawing."
 msgstr ""
 
-#: tools.h:64
+#: ../tools.h:64
 msgid "Click to start drawing a line. Let go to complete it."
 msgstr ""
 
-#: tools.h:65
+#: ../tools.h:65
 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 ""
 
-#: tools.h:66
+#: ../tools.h:66
 msgid "Choose a style of text. Click on your drawing and you can start typing."
 msgstr ""
 
-#: tools.h:67
+#: ../tools.h:67
 msgid "Pick a magical effect to use on your drawing!"
 msgstr ""
 
-#: tools.h:68
+#. Undo
+#: ../tools.h:68
 msgid "Undo!"
 msgstr ""
 
-#: tools.h:69
+#. Redo
+#: ../tools.h:69
 msgid "Redo!"
 msgstr ""
 
-#: tools.h:70
+#. Eraser
+#: ../tools.h:70
 msgid "Eraser!"
 msgstr ""
 
-#: tools.h:71
+#. New
+#: ../tools.h:71
 msgid "You now have a blank sheet to draw on!"
 msgstr ""
 
-#: tools.h:72
+#. Open
+#: ../tools.h:72
 msgid "Open…"
 msgstr ""
 
-#: tools.h:73
+#. Save
+#: ../tools.h:73
 msgid "Your image has been saved!"
 msgstr ""
 
-#: tools.h:74
+#. Print
+#: ../tools.h:74
 msgid "Printing…"
 msgstr ""
 
-#: tools.h:75
+#. Quit
+#: ../tools.h:75
 msgid "Bye bye!"
 msgstr ""
 
-#: tools.h:78
+#: ../tools.h:78
 msgid "Let go of the button to complete the line."
 msgstr ""
 
-#: tools.h:79
+#: ../tools.h:79
 msgid "Hold the button to stretch the shape."
 msgstr ""
 
-#: tools.h:80
+#: ../tools.h:80
 msgid "Move the mouse to rotate the shape. Click to draw it."
 msgstr ""
 
-#: tools.h:81
+#: ../tools.h:81
 msgid "OK then… Let’s keep drawing this one!"
 msgstr ""
+
+#. FIXME: Move elsewhere!!!
+#: ../tuxpaint.c:2684
+msgid "Do you really want to quit?"
+msgstr ""
+
+#. FIXME: Move elsewhere! Or not?!
+#: ../tuxpaint.c:2685 ../tuxpaint.c:2689 ../tuxpaint.c:2693 ../tuxpaint.c:2707
+#: ../tuxpaint.c:2717 ../tuxpaint.c:11941 ../tuxpaint.c:12782
+msgid "Yes"
+msgstr ""
+
+#: ../tuxpaint.c:2686 ../tuxpaint.c:2690 ../tuxpaint.c:2694 ../tuxpaint.c:2708
+#: ../tuxpaint.c:2718 ../tuxpaint.c:11945
+msgid "No"
+msgstr ""
+
+#: ../tuxpaint.c:2688
+msgid "If you quit, you’ll lose your picture! Save it?"
+msgstr ""
+
+#: ../tuxpaint.c:2692
+msgid "Save your picture first?"
+msgstr ""
+
+#: ../tuxpaint.c:2696
+msgid "Can’t open that picture!"
+msgstr ""
+
+#: ../tuxpaint.c:2697 ../tuxpaint.c:2704 ../tuxpaint.c:2711 ../tuxpaint.c:2714
+#: ../tuxpaint.c:2721
+msgid "OK"
+msgstr ""
+
+#: ../tuxpaint.c:2699
+msgid "Starting a new picture will erase the current one!"
+msgstr ""
+
+#: ../tuxpaint.c:2700
+msgid "That’s OK!"
+msgstr ""
+
+#: ../tuxpaint.c:2701
+msgid "Never mind!"
+msgstr ""
+
+#: ../tuxpaint.c:2703
+msgid "There are no saved files!"
+msgstr ""
+
+#: ../tuxpaint.c:2706
+msgid "Print your picture now?"
+msgstr ""
+
+#: ../tuxpaint.c:2710
+msgid "Your picture has been printed!"
+msgstr ""
+
+#: ../tuxpaint.c:2713
+msgid "You can’t print yet!"
+msgstr ""
+
+#: ../tuxpaint.c:2716
+msgid "Erase this picture?"
+msgstr ""
+
+#: ../tuxpaint.c:2720
+msgid "Remember to use the left mouse button!"
+msgstr ""
+
+#: ../tuxpaint.c:6682
+msgid "jq"
+msgstr ""
+
+#: ../tuxpaint.c:6682
+msgid "JQ"
+msgstr ""
+
+#: ../tuxpaint.c:6694
+msgid "oO"
+msgstr ""
+
+#: ../tuxpaint.c:6695
+msgid "`\\%_@$~#{}<>^&*"
+msgstr ""
+
+#: ../tuxpaint.c:6696
+msgid ",.?!"
+msgstr ""
+
+#: ../tuxpaint.c:6697
+msgid "017"
+msgstr ""
+
+#: ../tuxpaint.c:6698
+msgid "O0"
+msgstr ""
+
+#: ../tuxpaint.c:6699
+msgid "1Il|"
+msgstr ""
+
+#: ../tuxpaint.c:8830
+msgid "Erase"
+msgstr ""
+
+#: ../tuxpaint.c:8831
+msgid "Back"
+msgstr ""
+
+#: ../tuxpaint.c:9425
+msgid "Aa"
+msgstr ""
+
+#. FIXME: Move elsewhere!!!
+#: ../tuxpaint.c:12781
+msgid "Save over the older version of this picture?"
+msgstr ""
+
+#: ../tuxpaint.c:12783
+msgid "No, save a new file"
+msgstr ""
+
+#: ../tuxpaint.c:13707
+msgid "Choose the picture you want, then click “Open”."
+msgstr ""