diff --git a/src/po/bg.po b/src/po/bg.po
index 13eb5f8c8..a1c415baf 100644
--- a/src/po/bg.po
+++ b/src/po/bg.po
@@ -6,503 +6,385 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: tuxpaint 0.9.14\n"
-"POT-Creation-Date: 2004-03-22 11:23-0800\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-09-14 22:06+0200\n"
 "PO-Revision-Date: 2004-08-19 20:32-0800\n"
 "Last-Translator: kill_u <mjekov@bginfo.net>\n"
 "Language-Team: Martin Zhekov <mjekov@bginfo.net>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: tuxpaint.c:809
-msgid "Do you really want to quit?"
-msgstr "Искаш да излезеш?"
+msgid "A drawing program for children."
+msgstr ""
 
-#: tuxpaint.c:810
-#: tuxpaint.c:814
-#: tuxpaint.c:818
-#: tuxpaint.c:832
-#: tuxpaint.c:842
-#: tuxpaint.c:8442
-#: tuxpaint.c:9149
-msgid "Yes"
-msgstr "Да"
+msgid "Drawing program"
+msgstr ""
 
-#: tuxpaint.c:811
-#: tuxpaint.c:815
-#: tuxpaint.c:819
-#: tuxpaint.c:833
-#: tuxpaint.c:843
-#: tuxpaint.c:8445
-msgid "No"
-msgstr "Не"
+#, fuzzy
+msgid "Tux Paint"
+msgstr "Оцвети"
 
-#: tuxpaint.c:813
-msgid "If you quit, you’ll lose your picture! Save it?"
-msgstr "Ако излезеш ще загубиш картинката. Искаш ли?"
-
-#: tuxpaint.c:817
-msgid "Save your picture first?"
-msgstr "Запиши първо картинката?"
-
-#: tuxpaint.c:821
-msgid "Can’t open that picture!"
-msgstr "Не мога да отворя тази картинка!"
-
-#: tuxpaint.c:822
-#: tuxpaint.c:829
-#: tuxpaint.c:836
-#: tuxpaint.c:839
-msgid "OK"
-msgstr "ОК"
-
-#: tuxpaint.c:824
-msgid "Starting a new picture will erase the current one!"
-msgstr "Ако започнеш нова картинка сегашната ще се изтрие!"
-
-#: tuxpaint.c:825
-msgid "That’s OK!"
-msgstr "Така е добре!"
-
-#: tuxpaint.c:826
-msgid "Never mind!"
-msgstr "Няма значение!"
-
-#: tuxpaint.c:828
-msgid "There are no saved files!"
-msgstr "Няма записани файлове!"
-
-#: tuxpaint.c:831
-msgid "Print your picture now?"
-msgstr "Да отпечатам ли картинката ?"
-
-#: tuxpaint.c:835
-msgid "Your picture has been printed!"
-msgstr "Картината Ви е отпечатана!"
-
-#: tuxpaint.c:838
-msgid "You can’t print yet!"
-msgstr "Не мога да принтирам!"
-
-#: tuxpaint.c:841
-msgid "Erase this picture?"
-msgstr "Да изтрия картинката?"
-
-#: tuxpaint.c:5495
-#: tools.h:52
-msgid "Open"
-msgstr "Отвори"
-
-#: tuxpaint.c:5500
-msgid "Erase"
-msgstr "Изтрий"
-
-#: tuxpaint.c:5505
-msgid "Back"
-msgstr "Назад"
-
-#: tuxpaint.c:9148
-msgid "Save over the older version of this picture?"
-msgstr "Да запиша върху предишната картинка?"
-
-#: tuxpaint.c:9150
-msgid "No, save a new file"
-msgstr "Не, запиши нов файл"
-
-#: tuxpaint.c:10007
-msgid "Choose the picture you want, then click “Open”."
-msgstr "Избери картинката, която искаш и тогава натиснии  “Отвори”."
-
-#: colors.h:62
 msgid "Black!"
 msgstr "Черно!"
 
-#: colors.h:63
 msgid "White!"
 msgstr "Бяло!"
 
-#: colors.h:64
 msgid "Red!"
 msgstr ")ервено!"
 
-#: colors.h:65
 msgid "Pink!"
 msgstr "Розово!"
 
-#: colors.h:66
 msgid "Orange!"
 msgstr "Оранжево!"
 
-#: colors.h:67
 msgid "Yellow!"
 msgstr "Жълто!"
 
-#: colors.h:68
 msgid "Lime!"
 msgstr "Лимон!"
 
-#: colors.h:69
 msgid "Green!"
 msgstr "Зелено!"
 
-#: colors.h:70
 msgid "Cyan!"
 msgstr "Синьо-зелено!"
 
-#: colors.h:71
 msgid "Blue!"
 msgstr "Синьо!"
 
-#: colors.h:72
 msgid "Purple!"
 msgstr "Лилаво!"
 
-#: colors.h:73
 msgid "Fuchsia!"
 msgstr "Обици!"
 
-#: colors.h:74
 msgid "Brown!"
 msgstr "Кафяво!"
 
-#: colors.h:75
 msgid "Gray!"
 msgstr "Сиво!"
 
-#: colors.h:76
 msgid "Silver!"
 msgstr "Сребро!"
 
-#: great.h:20
 msgid "Great!"
 msgstr "Страхотно!"
 
-#: great.h:21
 msgid "Cool!"
 msgstr "Супер!"
 
-#: great.h:22
 msgid "Keep it up!"
 msgstr "Запази го!"
 
-#: great.h:23
 msgid "Good job!"
 msgstr "Добра работа!"
 
-#: magic.h:48
 msgid "Rainbow"
 msgstr "Дъга!"
 
-#: magic.h:49
 msgid "Sparkles"
 msgstr "Искри"
 
-#: magic.h:51
 msgid "Mirror"
 msgstr "Огледало"
 
-#: magic.h:52
 msgid "Flip"
 msgstr "Преобърни"
 
-#: magic.h:54
 msgid "Blur"
 msgstr "Замъглявам"
 
-#: magic.h:55
 msgid "Blocks"
 msgstr "Парчета"
 
-#: magic.h:57
 msgid "Negative"
 msgstr "Негатив"
 
-#: magic.h:58
 msgid "Fade"
 msgstr "Избелване"
 
-#: magic.h:60
 msgid "Chalk"
 msgstr "Размазвам"
 
-#: magic.h:61
 msgid "Drip"
 msgstr "Разкапвам"
 
-#: magic.h:63
 msgid "Thick"
 msgstr "Удебелявам"
 
-#: magic.h:64
 msgid "Thin"
 msgstr "Тънък"
 
-#: magic.h:66
 msgid "Fill"
 msgstr "Запълни"
 
-#: magic.h:73
 msgid "You can draw in rainbow colors!"
 msgstr "Можеш да чертаеш дъга!"
 
-#: magic.h:74
 msgid "Click and move to draw sparkles."
 msgstr "Щтракни и движи за да начертаеш искри."
 
-#: magic.h:76
 msgid "Click to make a mirror image."
 msgstr "Щтракни за д направиш огледално изображение."
 
-#: magic.h:77
 msgid "Click to flip the picture upside-down."
 msgstr "Щтракни да обърнеш картинката."
 
-#: magic.h:79
 msgid "Click and move the mouse around to blur the picture."
 msgstr "Щтракни и движи мишката за да замъглиш картинката."
 
-#: magic.h:80
 msgid "Click and move the mouse around to make the picture blocky."
 msgstr "Щтракни и движи мишката за да направиш картинката на парчета."
 
-#: magic.h:82
 msgid "Click and move the mouse around to draw a negative."
 msgstr "Щтракни и движи мишката за да направиш негатив."
 
-#: magic.h:83
 msgid "Click and move to fade the colors."
 msgstr "Щтракни и движи за да избелиш картинката."
 
-#: magic.h:85
-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 "Щтракни и движи мишката за размажеш."
 
-#: magic.h:86
 msgid "Click and move the mouse around to make the picture drip."
 msgstr "Щтракни и движи за да разкапеш картинката."
 
-#: magic.h:88
 msgid "Click and move the mouse to thicken the picture."
 msgstr "Щтракни и движи за да удебелиш линиите."
 
-#: magic.h:89
 msgid "Click and move the mouse to thin the picture."
 msgstr "Щтракни и движи за да уплътниш линиите."
 
-#: magic.h:91
 msgid "Click in the picture to fill that area with color."
 msgstr "Щтракни за да оцветиш в цвят."
 
-#: shapes.h:141
-#: shapes.h:142
 msgid "Square"
 msgstr "Квадратче"
 
-#: shapes.h:143
-#: shapes.h:144
 msgid "Rectangle"
 msgstr "Правоъгълник"
 
-#: shapes.h:145
-#: shapes.h:146
 msgid "Circle"
 msgstr "Кръг"
 
-#: shapes.h:147
-#: shapes.h:148
-#: shapes.h:167
-#: shapes.h:168
 msgid "Oval"
 msgstr "Овал"
 
-#: shapes.h:149
-#: shapes.h:150
 msgid "Triangle"
 msgstr "Триъгълник"
 
-#: shapes.h:151
-#: shapes.h:152
 msgid "Pentagon"
 msgstr "Петоъгълник"
 
-#: shapes.h:153
-#: shapes.h:154
 msgid "Diamond"
 msgstr "Диамант"
 
-#: shapes.h:161
-#: shapes.h:162
 msgid "A square has four sides, each the same length."
 msgstr "Квадрата има четири страни всяка с еднаква дължина."
 
-#: shapes.h:163
-#: shapes.h:164
 msgid "A rectangle has four sides."
 msgstr "Правоъгълника има четири страни."
 
-#: shapes.h:165
-#: shapes.h:166
 msgid "A circle is exactly round."
 msgstr "Кръга е точно кръгъл."
 
-#: shapes.h:169
-#: shapes.h:170
 msgid "A triangle has three sides."
 msgstr "Триъгълника има три страни."
 
-#: shapes.h:171
-#: shapes.h:172
 msgid "A pentagon has five sides."
 msgstr "Петоъгълника естествено има пет страни."
 
-#: shapes.h:173
-#: shapes.h:174
 msgid "A diamond is a square, turned around slightly."
 msgstr "Диаманта е квадрат обърнат на една страна."
 
-#: titles.h:37
 msgid "Tools"
 msgstr "Инструменти"
 
-#: titles.h:38
 msgid "Colors"
 msgstr "Цветове"
 
-#: titles.h:39
 msgid "Brushes"
 msgstr "Четчици"
 
-#: titles.h:40
 msgid "Stamps"
 msgstr "Печати"
 
-#: titles.h:41
-#: tools.h:45
 msgid "Shapes"
 msgstr "Очертания1"
 
-#: titles.h:42
 msgid "Letters"
 msgstr "Писма"
 
-#: titles.h:43
-#: tools.h:47
 msgid "Magic"
 msgstr "Магия"
 
-#: tools.h:42
 msgid "Paint"
 msgstr "Оцвети"
 
-#: tools.h:43
 msgid "Stamp"
 msgstr "Печат"
 
-#: tools.h:44
 msgid "Lines"
 msgstr "Линия"
 
-#: tools.h:46
 msgid "Text"
 msgstr "Текст"
 
-#: tools.h:48
 msgid "Undo"
 msgstr "Върни"
 
-#: tools.h:49
 msgid "Redo"
 msgstr "Напред"
 
-#: tools.h:50
 msgid "Eraser"
 msgstr "Итривач"
 
-#: tools.h:51
 msgid "New"
 msgstr "Ново"
 
-#: tools.h:53
+#. 'Open' label:
+msgid "Open"
+msgstr "Отвори"
+
 msgid "Save"
 msgstr "Запиши"
 
-#: tools.h:54
 msgid "Print"
 msgstr "Принтвай"
 
-#: tools.h:55
 msgid "Quit"
 msgstr "Изход?"
 
-#: tools.h:62
 msgid "Pick a color and a brush shape to draw with."
 msgstr "Pick a color and a brush shape to draw with."
 
-#: tools.h:63
 msgid "Pick a picture to stamp around your drawing."
 msgstr "Избери си печат от картинките"
 
-#: tools.h:64
 msgid "Click to start drawing a line. Let go to complete it."
 msgstr "Щтракни за да започнеш да чертаеш линия. Нека да я завършим."
 
-#: 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 "Избери си форма. След това кликни там където искаш да и е центъра . Дръпин за да я очертаеш и я завърти."
+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
 msgid "Choose a style of text. Click on your drawing and you can start typing."
 msgstr "Избери с текст. Щтракни върху картинката и пиши."
 
-#: tools.h:67
 msgid "Pick a magical effect to use on your drawing!"
 msgstr "Избери магия и оцвети твоята картинка!"
 
-#: tools.h:68
+#. Undo
 msgid "Undo!"
 msgstr "Назад!"
 
-#: tools.h:69
+#. Redo
 msgid "Redo!"
 msgstr "Напред!"
 
-#: tools.h:70
+#. Eraser
 msgid "Eraser!"
 msgstr "Изтривач!"
 
-#: tools.h:71
+#. New
 msgid "You now have a blank sheet to draw on!"
 msgstr "Сега имаш празно поле за рисуване!"
 
-#: tools.h:72
+#. Open
 msgid "Open…"
 msgstr "Отвори…"
 
-#: tools.h:73
+#. Save
 msgid "Your image has been saved!"
 msgstr "Картинката ти се записа!"
 
-#: tools.h:74
+#. Print
 msgid "Printing…"
 msgstr "Отпечатва..."
 
-#: tools.h:75
+#. Quit
 msgid "Bye bye!"
 msgstr "Довиждане !"
 
-#: tools.h:78
 msgid "Let go of the button to complete the line."
 msgstr "Let go of the button to complete the line."
 
-#: tools.h:79
 msgid "Hold the button to stretch the shape."
 msgstr "Задръж бутона за да разтегнеш формата."
 
-#: tools.h:80
 msgid "Move the mouse to rotate the shape. Click to draw it."
 msgstr "Движи мишката за да въртиш формата. Щтракни да я начертаеш."
 
-#: tools.h:81
 msgid "OK then… Let’s keep drawing this one!"
 msgstr "Добре тогава… Нека да оставим тази картинка!"
 
+#. FIXME: Move elsewhere!!!
+msgid "Do you really want to quit?"
+msgstr "Искаш да излезеш?"
+
+#. FIXME: Move elsewhere! Or not?!
+msgid "Yes"
+msgstr "Да"
+
+msgid "No"
+msgstr "Не"
+
+msgid "If you quit, you’ll lose your picture! Save it?"
+msgstr "Ако излезеш ще загубиш картинката. Искаш ли?"
+
+msgid "Save your picture first?"
+msgstr "Запиши първо картинката?"
+
+msgid "Can’t open that picture!"
+msgstr "Не мога да отворя тази картинка!"
+
+msgid "OK"
+msgstr "ОК"
+
+msgid "Starting a new picture will erase the current one!"
+msgstr "Ако започнеш нова картинка сегашната ще се изтрие!"
+
+msgid "That’s OK!"
+msgstr "Така е добре!"
+
+msgid "Never mind!"
+msgstr "Няма значение!"
+
+msgid "There are no saved files!"
+msgstr "Няма записани файлове!"
+
+msgid "Print your picture now?"
+msgstr "Да отпечатам ли картинката ?"
+
+msgid "Your picture has been printed!"
+msgstr "Картината Ви е отпечатана!"
+
+msgid "You can’t print yet!"
+msgstr "Не мога да принтирам!"
+
+msgid "Erase this picture?"
+msgstr "Да изтрия картинката?"
+
+#. 'Erase' label:
+msgid "Erase"
+msgstr "Изтрий"
+
+#. 'Back' label:
+msgid "Back"
+msgstr "Назад"
+
+#. FIXME: Move elsewhere!!!
+msgid "Save over the older version of this picture?"
+msgstr "Да запиша върху предишната картинка?"
+
+msgid "No, save a new file"
+msgstr "Не, запиши нов файл"
+
+msgid "Choose the picture you want, then click “Open”."
+msgstr "Избери картинката, която искаш и тогава натиснии  “Отвори”."
diff --git a/src/po/pt_br.po b/src/po/pt_br.po
index f86f04626..e370b7cad 100644
--- a/src/po/pt_br.po
+++ b/src/po/pt_br.po
@@ -4,7 +4,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: TuxPaint 0.0.1pre\n"
-"POT-Creation-Date: 2004-07-16 21:12+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2004-09-14 22:06+0200\n"
 "PO-Revision-Date: 2004-09-03 13:06-0300\n"
 "Last-Translator: Daniel José Viana <danjovic@vespanet.com.br>\n"
 "Language-Team: Português Brasileiro <danjovic@vespanet.com.br>\n"
@@ -142,11 +143,15 @@ msgstr "Clique e mova o mouse para inverter as cores da imagem."
 msgid "Click and move to fade the colors."
 msgstr "Clique e mova o mouse para desbotar as cores."
 
-msgid "Click and move the mouse around to turn the picture into a chalk drawing."
-msgstr "Clique e mova o mouse para transformar a imagem em desenho feito com giz."
+msgid ""
+"Click and move the mouse around to turn the picture into a chalk drawing."
+msgstr ""
+"Clique e mova o mouse para transformar a imagem em desenho feito com giz."
 
 msgid "Click and move the mouse around to make the picture drip."
-msgstr "Clique e mova o mouse para escorrer a tinta e deixar a figura com jeito de respingada."
+msgstr ""
+"Clique e mova o mouse para escorrer a tinta e deixar a figura com jeito de "
+"respingada."
 
 msgid "Click and move the mouse to thicken the picture."
 msgstr "Clique e mova o mouse para engrossar o desenho"
@@ -242,6 +247,7 @@ msgid "New"
 msgstr "Novo"
 
 #  'Open' label:
+#. 'Open' label:
 msgid "Open"
 msgstr "Abrir"
 
@@ -261,33 +267,46 @@ msgid "Pick a picture to stamp around your drawing."
 msgstr "Escolha uma figura para carimbar no seu desenho."
 
 msgid "Click to start drawing a line. Let go to complete it."
-msgstr "Clique e segure para começar a desenhar a linha. Solte onde quiser que ela termine."
+msgstr ""
+"Clique e segure para começar a desenhar a linha. Solte onde quiser que ela "
+"termine."
 
 # #: 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."
-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 "Escolha uma forma para desenhar. Clique uma vez para marcar o centro. Mantenha clicado enquanto arrasta para ajustar o tamanho e então solte quando a figura estiver do tamanho que você quiser. Mova o mouse pela tela para girar a figura. Clique novamente para desenhá-la de vez."
+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 ""
+"Escolha uma forma para desenhar. Clique uma vez para marcar o centro. "
+"Mantenha clicado enquanto arrasta para ajustar o tamanho e então solte "
+"quando a figura estiver do tamanho que você quiser. Mova o mouse pela tela "
+"para girar a figura. Clique novamente para desenhá-la de vez."
 
 msgid "Choose a style of text. Click on your drawing and you can start typing."
-msgstr "Escolha um tipo de letra e então clique no desenho para começar a escrever."
+msgstr ""
+"Escolha um tipo de letra e então clique no desenho para começar a escrever."
 
 msgid "Pick a magical effect to use on your drawing!"
 msgstr "Escolha um efeito mágico para usar no seu desenho!"
 
 #  Undo
+#. Undo
 msgid "Undo!"
 msgstr "Desfazer!"
 
 #  Redo
+#. Redo
 msgid "Redo!"
 msgstr "Refazer!"
 
 #  Eraser
+#. Eraser
 msgid "Eraser!"
 msgstr "Borracha!"
 
 #  New
+#. New
 msgid "You now have a blank sheet to draw on!"
 msgstr "Agora você tem uma nova folha para desenhar!"
 
@@ -367,14 +386,17 @@ msgid "Erase this picture?"
 msgstr "Apagar este desenho?"
 
 #  'Erase' label:
+#. 'Erase' label:
 msgid "Erase"
 msgstr "Apagar"
 
 #  'Back' label:
+#. 'Back' label:
 msgid "Back"
 msgstr "Voltar"
 
 #  FIXME: Move elsewhere!!!
+#. FIXME: Move elsewhere!!!
 msgid "Save over the older version of this picture?"
 msgstr "Guardar por cima do seu desenho anterior?"
 
@@ -383,4 +405,3 @@ msgstr "Não, guardar um novo desenho"
 
 msgid "Choose the picture you want, then click “Open”."
 msgstr "Escolha um desenho e então clique em “Abrir“"
-