From 275f706fc92eef8cd943f1fa12ff0209efd9bada Mon Sep 17 00:00:00 2001
From: Pootle daemon <pootle@pootle.sugarlabs.org>
Date: Thu, 19 Apr 2012 17:55:13 +0000
Subject: Pushing many files from Poolte

---
(limited to 'po')

diff --git a/po/Paint.pot b/po/Paint.pot
index 94a3121..ab43a24 100644
--- a/po/Paint.pot
+++ b/po/Paint.pot
@@ -8,11 +8,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\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"
-"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -21,171 +20,175 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:101
+#: toolbox.py:103
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:113
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:117
+#: toolbox.py:119
 msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:125
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:153
+#: toolbox.py:150
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:154
+#: toolbox.py:151
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:155
+#: toolbox.py:152
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:156
+#: toolbox.py:153
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:164
+#: toolbox.py:161
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:244 widgets.py:311
+#: toolbox.py:242 widgets.py:311
 msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:261
+#: toolbox.py:253
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:266
+#: toolbox.py:258
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:270
+#: toolbox.py:262
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:274
+#: toolbox.py:266
+msgid "Picker"
+msgstr ""
+
+#: toolbox.py:270
 msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:287
+#: toolbox.py:283
 msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:380
+#: toolbox.py:378
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:386 widgets.py:277
+#: toolbox.py:384 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:403
+#: toolbox.py:401
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:458
+#: toolbox.py:456
 msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:470
+#: toolbox.py:468
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:474
+#: toolbox.py:472
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:478
+#: toolbox.py:476
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:482
+#: toolbox.py:480
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:486
+#: toolbox.py:484
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:490
+#: toolbox.py:488
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:494
+#: toolbox.py:492
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:498
+#: toolbox.py:496
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:502
+#: toolbox.py:500
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:506
+#: toolbox.py:504
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:510
+#: toolbox.py:508
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:555
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:677
+#: toolbox.py:666
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:690
+#: toolbox.py:679
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:694
+#: toolbox.py:683
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:699
+#: toolbox.py:688
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:704
+#: toolbox.py:693
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:708
+#: toolbox.py:697
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:719
+#: toolbox.py:708
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:734
+#: toolbox.py:723
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:737
+#: toolbox.py:726
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:742
+#: toolbox.py:731
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:839
+#: toolbox.py:806 toolbox.py:810
 msgid "Choose image"
 msgstr ""
 
diff --git a/po/ak.po b/po/ak.po
index 3ac3112..336b031 100644
--- a/po/ak.po
+++ b/po/ak.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,242 +21,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 522db5f..65f6695 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -11,11 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-02-19 18:19+0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
-"Language: ar\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -29,245 +29,248 @@ msgstr ""
 msgid "Paint"
 msgstr "ارسم"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "تحرير"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "أدوات"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "أشكال"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "نص"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "صورة"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "مؤثِّرات"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "تراجع"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "أعِد"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "انسخ"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "الصق"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "امسح"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "لون الخط:"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "قلم"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "فرشاة"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "ممحاة"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "محفظة"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "الحجم: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "دائرة"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "مربّع"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "شكل"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "املأ"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "لون الملء"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "الجوانب: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "بيضاوي"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "مستطيل"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "خط"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "مضلع"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "قلب"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "متوازي أضلاع"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "سهم"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "نجمة"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "معيّن"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "مثلّث"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "الجوانب: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "النقاط: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "املأ"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "اكتب"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "أدرج صورة"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "أدِر لليسار"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "أدِر لليمين"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "الارتفاع"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "العرض"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "اختر صورة"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "تدرج رمادي"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "ألوان الطيف"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "اختر صورة"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "الحجم: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "دائرة"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "مربّع"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "شكل"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "أدوات"
+
+#~ msgid "Text"
+#~ msgstr "نص"
+
+#~ msgid "Effects"
+#~ msgstr "مؤثِّرات"
+
+#~ msgid "Stroke Color"
+#~ msgstr "لون الخط:"
+
+#~ msgid "Pencil"
+#~ msgstr "قلم"
+
+#~ msgid "Fill Color"
+#~ msgstr "لون الملء"
+
+#~ msgid "Points: "
+#~ msgstr "النقاط: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "قرّب +"
+#~ msgid "ZOOM +"
+#~ msgstr "قرّب +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "بعّد -"
+#~ msgid "ZOOM -"
+#~ msgstr "بعّد -"
 
 #~ msgid "Tool Color"
 #~ msgstr "لون الأداة"
diff --git a/po/ar_SY.po b/po/ar_SY.po
deleted file mode 100644
index 6c2fa42..0000000
--- a/po/ar_SY.po
+++ /dev/null
@@ -1,329 +0,0 @@
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# Arabian translation for Oficina package.
-# Copyright (C) 2007 NATE LSI-USP
-# This file is distributed under the same license as the Oficina package.
-# 
-# Khaled Hosny <khaledhosny@eglug.org>, 2007, 2010.
-msgid ""
-msgstr ""
-"Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2010-02-19 18:19+0300\n"
-"Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
-"Language-Team: Arabic <doc@arabeyes.org>\n"
-"Language: ar\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n%100>=3 "
-"&& n%100<=10 ? 3 : n%100>=11 && n%100<=99 ? 4 : 5;\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
-"Nplurals=6; Plural=N==0 ? 0: n==1 ? 1 : n==2 ? 2 : n%100>=3 && n%100<=10 ? 3 "
-": n%100>=11 && n%100<=99 ? 4 : 5;\n"
-
-#: activity/activity.info:2
-msgid "Paint"
-msgstr "ارسم"
-
-#: toolbox.py:177
-msgid "Edit"
-msgstr "تحرير"
-
-#: toolbox.py:181
-msgid "Tools"
-msgstr "أدوات"
-
-#: toolbox.py:185
-msgid "Shapes"
-msgstr "أشكال"
-
-#: toolbox.py:189
-msgid "Text"
-msgstr "نص"
-
-#: toolbox.py:193
-msgid "Image"
-msgstr "صورة"
-
-#: toolbox.py:197
-msgid "Effects"
-msgstr "مؤثِّرات"
-
-#: toolbox.py:215
-msgid "Undo"
-msgstr "تراجع"
-
-#: toolbox.py:216
-msgid "Redo"
-msgstr "أعِد"
-
-#: toolbox.py:217
-msgid "Copy"
-msgstr "انسخ"
-
-#: toolbox.py:218
-msgid "Paste"
-msgstr "الصق"
-
-#: toolbox.py:226
-msgid "Clear"
-msgstr "امسح"
-
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "لون الخط:"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "قلم"
-
-#: toolbox.py:384
-msgid "Brush"
-msgstr "فرشاة"
-
-#: toolbox.py:392
-msgid "Eraser"
-msgstr "ممحاة"
-
-#: toolbox.py:400
-msgid "Bucket"
-msgstr "محفظة"
-
-#: toolbox.py:428
-msgid "Select Area"
-msgstr ""
-
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "الحجم: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "دائرة"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "مربّع"
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "شكل"
-
-#: toolbox.py:522
-msgid "Keep aspect"
-msgstr ""
-
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "لون الملء"
-
-#: toolbox.py:724
-msgid "Ellipse"
-msgstr "بيضاوي"
-
-#: toolbox.py:732
-msgid "Rectangle"
-msgstr "مستطيل"
-
-#: toolbox.py:740
-msgid "Line"
-msgstr "خط"
-
-#: toolbox.py:748
-msgid "Free form"
-msgstr ""
-
-#: toolbox.py:757
-msgid "Polygon"
-msgstr "مضلع"
-
-#: toolbox.py:765
-msgid "Heart"
-msgstr "قلب"
-
-#: toolbox.py:773
-msgid "Parallelogram"
-msgstr "متوازي أضلاع"
-
-#: toolbox.py:781
-msgid "Arrow"
-msgstr "سهم"
-
-#: toolbox.py:789
-msgid "Star"
-msgstr "نجمة"
-
-#: toolbox.py:797
-msgid "Trapezoid"
-msgstr "معيّن"
-
-#: toolbox.py:805
-msgid "Triangle"
-msgstr "مثلّث"
-
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "الجوانب: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "النقاط: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "املأ"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
-msgid "Type"
-msgstr "اكتب"
-
-#: toolbox.py:1153
-msgid "Insert Image"
-msgstr "أدرج صورة"
-
-#: toolbox.py:1166
-msgid "Rotate Left"
-msgstr "أدِر لليسار"
-
-#: toolbox.py:1171
-msgid "Rotate Right"
-msgstr "أدِر لليمين"
-
-#: toolbox.py:1177
-msgid "Horizontal Mirror"
-msgstr ""
-
-#: toolbox.py:1182
-msgid "Vertical Mirror"
-msgstr ""
-
-#: toolbox.py:1186
-msgid "Height"
-msgstr "الارتفاع"
-
-#: toolbox.py:1197
-msgid "Width"
-msgstr "العرض"
-
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "اختر صورة"
-
-#: toolbox.py:1351
-msgid "Grayscale"
-msgstr "تدرج رمادي"
-
-#: toolbox.py:1354
-msgid "Rainbow"
-msgstr "ألوان الطيف"
-
-#: toolbox.py:1361
-msgid "Invert Colors"
-msgstr ""
-
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
-
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
-
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
-
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
-
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
-
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
-
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
-
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
-
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "قرّب +"
-
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "بعّد -"
-
-#~ msgid "Rectangular Marquee"
-#~ msgstr "معلِّمة مربّعة"
-
-#~ msgid "Tool Color"
-#~ msgstr "لون الأداة"
-
-#~ msgid "Fill Color: "
-#~ msgstr "لون الملء: "
-
-#~ msgid "1"
-#~ msgstr "١"
-
-#~ msgid "2"
-#~ msgstr "٢"
-
-#~ msgid "3"
-#~ msgstr "٣"
-
-#~ msgid "5"
-#~ msgstr "٥"
-
-#~ msgid "20"
-#~ msgstr "٢٠"
-
-#~ msgid "Open File..."
-#~ msgstr "افتح ملف..."
diff --git a/po/ay.po b/po/ay.po
deleted file mode 100644
index 490194f..0000000
--- a/po/ay.po
+++ /dev/null
@@ -1,293 +0,0 @@
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
-
-#: activity/activity.info:2
-msgid "Paint"
-msgstr ""
-
-#: toolbox.py:177
-msgid "Edit"
-msgstr ""
-
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
-msgid "Shapes"
-msgstr ""
-
-#: toolbox.py:189
-msgid "Text"
-msgstr ""
-
-#: toolbox.py:193
-msgid "Image"
-msgstr ""
-
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
-msgid "Undo"
-msgstr ""
-
-#: toolbox.py:216
-msgid "Redo"
-msgstr ""
-
-#: toolbox.py:217
-msgid "Copy"
-msgstr ""
-
-#: toolbox.py:218
-msgid "Paste"
-msgstr ""
-
-#: toolbox.py:226
-msgid "Clear"
-msgstr ""
-
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
-msgid "Brush"
-msgstr ""
-
-#: toolbox.py:392
-msgid "Eraser"
-msgstr ""
-
-#: toolbox.py:400
-msgid "Bucket"
-msgstr ""
-
-#: toolbox.py:428
-msgid "Select Area"
-msgstr ""
-
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr ""
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr ""
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr ""
-
-#: toolbox.py:522
-msgid "Keep aspect"
-msgstr ""
-
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:724
-msgid "Ellipse"
-msgstr ""
-
-#: toolbox.py:732
-msgid "Rectangle"
-msgstr ""
-
-#: toolbox.py:740
-msgid "Line"
-msgstr ""
-
-#: toolbox.py:748
-msgid "Free form"
-msgstr ""
-
-#: toolbox.py:757
-msgid "Polygon"
-msgstr ""
-
-#: toolbox.py:765
-msgid "Heart"
-msgstr ""
-
-#: toolbox.py:773
-msgid "Parallelogram"
-msgstr ""
-
-#: toolbox.py:781
-msgid "Arrow"
-msgstr ""
-
-#: toolbox.py:789
-msgid "Star"
-msgstr ""
-
-#: toolbox.py:797
-msgid "Trapezoid"
-msgstr ""
-
-#: toolbox.py:805
-msgid "Triangle"
-msgstr ""
-
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
-msgid "Type"
-msgstr ""
-
-#: toolbox.py:1153
-msgid "Insert Image"
-msgstr ""
-
-#: toolbox.py:1166
-msgid "Rotate Left"
-msgstr ""
-
-#: toolbox.py:1171
-msgid "Rotate Right"
-msgstr ""
-
-#: toolbox.py:1177
-msgid "Horizontal Mirror"
-msgstr ""
-
-#: toolbox.py:1182
-msgid "Vertical Mirror"
-msgstr ""
-
-#: toolbox.py:1186
-msgid "Height"
-msgstr ""
-
-#: toolbox.py:1197
-msgid "Width"
-msgstr ""
-
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
-msgid "Grayscale"
-msgstr ""
-
-#: toolbox.py:1354
-msgid "Rainbow"
-msgstr ""
-
-#: toolbox.py:1361
-msgid "Invert Colors"
-msgstr ""
-
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
-
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
-
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
-
-#: toolbox.py:1495
-msgid "25"
-msgstr ""
-
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
-
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
-
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
diff --git a/po/aym.po b/po/aym.po
index 26beedd..cc160de 100644
--- a/po/aym.po
+++ b/po/aym.po
@@ -1,3 +1,7 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -6,7 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2011-11-23 06:15+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: aym\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/bg.po b/po/bg.po
index abafc5c..3e7ad78 100644
--- a/po/bg.po
+++ b/po/bg.po
@@ -38,10 +38,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-01-09 12:59+0000\n"
 "Last-Translator: Alexander Todorov <atodorov@redhat.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,245 +52,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Рисуване"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Редактиране"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Инструменти"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Форми"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Текст"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Изображение"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Ефекти"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Отмяна"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Възстановяване"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Копиране"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Вмъкване"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Изтриване"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Цвят на линията"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Молив"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Четка"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Гума"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Заливка"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Големина: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Кръг"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Квадрат"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Форма"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Запълване"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Цвят на запълването"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Страни: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Елипса"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Правоъгълник"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Линия"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Многоъгълник"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Сърце"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Успоредник"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Стрелка"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Звезда"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Трапец"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Триъгълник"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Страни: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Точки: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Запълване"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Писане"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Вмъкване на изображение"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Завъртане наляво"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Завъртане надясно"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Дължина"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Ширина"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Избор на изображение"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Черно-бял"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Дъга"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Избор на изображение"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Големина: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Кръг"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Квадрат"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Форма"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Инструменти"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Effects"
+#~ msgstr "Ефекти"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Цвят на линията"
+
+#~ msgid "Pencil"
+#~ msgstr "Молив"
+
+#~ msgid "Fill Color"
+#~ msgstr "Цвят на запълването"
+
+#~ msgid "Points: "
+#~ msgstr "Точки: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Увеличаване"
+#~ msgid "ZOOM +"
+#~ msgstr "Увеличаване"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Намаляване"
+#~ msgid "ZOOM -"
+#~ msgstr "Намаляване"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Правоъгълно маркиране"
diff --git a/po/bi.po b/po/bi.po
index 490194f..47c6917 100644
--- a/po/bi.po
+++ b/po/bi.po
@@ -39,10 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,242 +53,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/bn.po b/po/bn.po
index 65e0fa5..f2146ed 100644
--- a/po/bn.po
+++ b/po/bn.po
@@ -39,11 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: honey VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-03-29 03:21+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Bengali <ankur-bd-l10n@googlegroups.com>\n"
-"Language: bn\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -54,245 +54,248 @@ msgstr ""
 msgid "Paint"
 msgstr "রং করো"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "সম্পাদনা করো"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "টুল"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "আকৃতি"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "টেক্সট"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "চিত্র"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "প্রভাব"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "আগের অবস্থায় ফিরিয়ে আনো"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "আবার করো"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "অনুলিপি করো"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "প্রতিলেপন করো"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "মুছে ফেলো"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "রঙের আঁচড় টানো"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "পেন্সিল"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "ব্রাশ"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "ইরেজার"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "ঝুড়ি"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "আকার: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "বৃত্ত"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "বর্গক্ষেত্র"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "আকৃতি"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "পূরণ করো"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "রং দিয়ে পূরণ করো"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "পাশ: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "উপবৃত্ত"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "আয়তক্ষেত্র"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "রেখা"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "বহুভূজ"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "হৃদয়"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "সামান্তরিক ক্ষেত্র"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "তীর চিহ্ন"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "তারা"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "ট্রাপিজয়েড"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "ত্রিভুজ"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "পাশ: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "বিন্দু: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "পূরণ করো"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "ধরণ"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "চিত্র প্রবেশ করাও"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "বামে ঘোরাও"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "ডানে ঘোরাও"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "উচ্চতা"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "প্রস্থ"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "চিত্র বেছে নাও"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "গ্রেস্কেল"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "রংধনু"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "১০০০"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "চিত্র বেছে নাও"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "আকার: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "বৃত্ত"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "বর্গক্ষেত্র"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "আকৃতি"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "টুল"
+
+#~ msgid "Text"
+#~ msgstr "টেক্সট"
+
+#~ msgid "Effects"
+#~ msgstr "প্রভাব"
+
+#~ msgid "Stroke Color"
+#~ msgstr "রঙের আঁচড় টানো"
+
+#~ msgid "Pencil"
+#~ msgstr "পেন্সিল"
+
+#~ msgid "Fill Color"
+#~ msgstr "রং দিয়ে পূরণ করো"
+
+#~ msgid "Points: "
+#~ msgstr "বিন্দু: "
+
+#~ msgid "1000"
+#~ msgstr "১০০০"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "৫০০"
+#~ msgid "500"
+#~ msgstr "৫০০"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "২০০"
+#~ msgid "200"
+#~ msgstr "২০০"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "১৫০"
+#~ msgid "150"
+#~ msgstr "১৫০"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "১০০"
+#~ msgid "100"
+#~ msgstr "১০০"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "৫০"
+#~ msgid "50"
+#~ msgstr "৫০"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "২৫"
+#~ msgid "25"
+#~ msgstr "২৫"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "১০"
+#~ msgid "10"
+#~ msgstr "১০"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "ZOOM +"
+#~ msgid "ZOOM +"
+#~ msgstr "ZOOM +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "ZOOM -"
+#~ msgid "ZOOM -"
+#~ msgstr "ZOOM -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "আয়তাকার মার্কি"
diff --git a/po/bn_IN.po b/po/bn_IN.po
index 76dd72d..0335c16 100644
--- a/po/bn_IN.po
+++ b/po/bn_IN.po
@@ -37,10 +37,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: oficina\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-07-13 13:05+0530\n"
 "Last-Translator: Sankarshan Mukhopadhyay <sankarshan@randomink.org>\n"
 "Language-Team: Bengali (India) <discuss@ankur.org.in>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -51,250 +52,253 @@ msgstr ""
 msgid "Paint"
 msgstr "পেইন্ট"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "সম্পাদন"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "টুল"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "আকৃতি"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "টেক্সট"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "ছবি"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "এফেক্ট"
-
-#: toolbox.py:215
+#: toolbox.py:153
 #, fuzzy
 msgid "Undo"
 msgstr "বাতিল"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "আবার করুন"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "কপি"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "পেস্ট"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "মুছে ফেল"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "তুলির রঙ"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "পেন্সিল"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "ব্রাশ"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "ইরেজার"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "বাকেট"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "আকার: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "বৃত্ত"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "বর্গ ক্ষেত্র"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "আকৃতি"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "ভর্তি করো"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "ভর্তি করার রঙ"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "পার্শ্ব: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "উপবৃত্ত"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "আয়তক্ষেত্র"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "রেখা"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "পলিগন"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "হার্ট"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "সামান্তরিক"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "তীরচিহ্ন"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "তারাচিহ্ন"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "ট্র্যাপেজয়েড"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "ত্রিভুজ"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "পার্শ্ব: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "বিন্দুসমূহ: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "ভর্তি করো"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "টাইপ"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "ছবি ঢোকান"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 #, fuzzy
 msgid "Rotate Left"
 msgstr "বামে ঘোরাও"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 #, fuzzy
 msgid "Rotate Right"
 msgstr "ডানে ঘোরাও"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "দৈর্ঘ্য"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "প্রস্থ"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "ছবি বেছে নিন"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "গ্রস্কেল"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "১০০০"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "ছবি বেছে নিন"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "আকার: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "বৃত্ত"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "বর্গ ক্ষেত্র"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "আকৃতি"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "টুল"
+
+#~ msgid "Text"
+#~ msgstr "টেক্সট"
+
+#~ msgid "Effects"
+#~ msgstr "এফেক্ট"
+
+#~ msgid "Stroke Color"
+#~ msgstr "তুলির রঙ"
+
+#~ msgid "Pencil"
+#~ msgstr "পেন্সিল"
+
+#~ msgid "Fill Color"
+#~ msgstr "ভর্তি করার রঙ"
+
+#~ msgid "Points: "
+#~ msgstr "বিন্দুসমূহ: "
+
+#~ msgid "1000"
+#~ msgstr "১০০০"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "৫০০"
+#~ msgid "500"
+#~ msgstr "৫০০"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "২০০"
+#~ msgid "200"
+#~ msgstr "২০০"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "১৫০"
+#~ msgid "150"
+#~ msgstr "১৫০"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "১০০"
+#~ msgid "100"
+#~ msgstr "১০০"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "৫০"
+#~ msgid "50"
+#~ msgstr "৫০"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "২৫"
+#~ msgid "25"
+#~ msgstr "২৫"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "১০"
+#~ msgid "10"
+#~ msgstr "১০"
 
-#: toolbox.py:1506
 #, fuzzy
-msgid "ZOOM +"
-msgstr "বড় করো"
+#~ msgid "ZOOM +"
+#~ msgstr "বড় করো"
 
-#: toolbox.py:1510
 #, fuzzy
-msgid "ZOOM -"
-msgstr "ছোট করো"
+#~ msgid "ZOOM -"
+#~ msgstr "ছোট করো"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "চতুর্ভূজাকার মার্কিউই"
diff --git a/po/bs.po b/po/bs.po
index 2bd73d7..6f350be 100644
--- a/po/bs.po
+++ b/po/bs.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,242 +25,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ca.po b/po/ca.po
index 9017d6e..0df2406 100644
--- a/po/ca.po
+++ b/po/ca.po
@@ -42,78 +42,68 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2008-01-08 20:01+0000\n"
-"Last-Translator: Jaume <jaume@nualart.com>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-08-08 02:45+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "Pintar"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Editar"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Eines"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Formes"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Text"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Imatge"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Efectes"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Desfer"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Refer"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Copiar"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Enganxar"
 
 # segons termcat
 # http://www.termcat.cat/scripts/rwisapi.dll/@Termcat_dev.env
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Suprimir"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Traç de Color"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Llapis"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Pinzell"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Goma d'esborrar"
 
@@ -121,189 +111,205 @@ msgstr "Goma d'esborrar"
 # cubell m, galleda f, poal m; (of waterwheel) catúfol m
 #
 #
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Galleda"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Mida:"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Cercle"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Quadrat"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Forma"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Omplir"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Omplir amb color"
+# altres:
+# costat m, cantó m, banda f; (of disk, piece of paper) cara f;
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Cares: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "El·lipse"
 
-#: toolbox.py:732
+#: toolbox.py:474
+#, fuzzy
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Línia"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Polígon"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Cor"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Paral·lelogram"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Fletxa"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Estrella"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapezoide"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Triangle"
 
-# altres:
-# costat m, cantó m, banda f; (of disk, piece of paper) cara f;
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Cares:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Punts:"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Omplir"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
 # cal contetÑ
 # altres son: caixa, cos....
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Estil"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Insereix Imatge"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Girar cap a l'esquerre"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Girar cap a la dreta"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Alçada"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Amplada"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Tria Imatge"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Escala de grisos"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Arc de Sant Martí"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Tria Imatge"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Mida: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Cercle"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Quadrat"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Forma"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Eines"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Effects"
+#~ msgstr "Efectes"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Traç de Color"
+
+#~ msgid "Pencil"
+#~ msgstr "Llapis"
+
+#~ msgid "Fill Color"
+#~ msgstr "Omplir amb color"
+
+#~ msgid "Points: "
+#~ msgstr "Punts:"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "AMPLIAR +"
+#~ msgid "ZOOM +"
+#~ msgstr "AMPLIAR +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "REDUIR -"
+#~ msgid "ZOOM -"
+#~ msgstr "REDUIR -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Marquesina Rectangular"
diff --git a/po/cpp.po b/po/cpp.po
index 490194f..47c6917 100644
--- a/po/cpp.po
+++ b/po/cpp.po
@@ -39,10 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,242 +53,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/cs.po b/po/cs.po
index e801a8a..bc2791f 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -38,11 +38,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-04-14 05:47+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: cs\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -53,242 +53,227 @@ msgstr ""
 msgid "Paint"
 msgstr "Kreslit"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Úpravy"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Nástroje"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Text"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Obrázek"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Efekty"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Zrušit"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Znovu"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopírovat"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Vložit"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Smazat"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Velikost: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Řádek"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Trojúhelník"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Typ"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Výška"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Šířka"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr ""
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Velikost: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr ""
+
+#: widgets.py:259
+msgid "Square"
+msgstr ""
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#: widgets.py:271
+msgid "Shape"
+msgstr ""
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "Tools"
+#~ msgstr "Nástroje"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "Text"
+#~ msgstr "Text"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "Effects"
+#~ msgstr "Efekty"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#~ msgid "150"
+#~ msgstr "150"
+
+#~ msgid "100"
+#~ msgstr "100"
+
+#~ msgid "50"
+#~ msgstr "50"
+
+#~ msgid "25"
+#~ msgstr "25"
+
+#~ msgid "10"
+#~ msgstr "10"
diff --git a/po/de.po b/po/de.po
index 6dfa640..0965149 100644
--- a/po/de.po
+++ b/po/de.po
@@ -59,11 +59,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 00:31-0400\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-07-17 23:59+0200\n"
 "Last-Translator: Markus <m.slg@gmx.de>\n"
 "Language-Team: Language locale/de/LC\n"
-"Language: de\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -138,9 +138,9 @@ msgstr "Bereich wählen"
 msgid "Fill"
 msgstr "Anfüllen"
 
-#: toolbox.py:386
-msgid "Keep Aspect"
-msgstr "Aspekt behalten"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
+msgstr "Aspekt halten"
 
 #: toolbox.py:403
 msgid "Sides: "
@@ -262,14 +262,13 @@ msgstr "Quadrat"
 msgid "Shape"
 msgstr "Form"
 
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr "Aspekt halten"
-
 #: widgets.py:303
 msgid "Stamp properties"
 msgstr "Stempeleigenschaften"
 
+#~ msgid "Keep Aspect"
+#~ msgstr "Aspekt behalten"
+
 #~ msgid "Tools"
 #~ msgstr "Werkzeuge"
 
diff --git a/po/dz.po b/po/dz.po
index 73a0fd1..464bb75 100644
--- a/po/dz.po
+++ b/po/dz.po
@@ -43,10 +43,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -56,242 +57,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/en_GB.po b/po/en_GB.po
index fb6a020..a72dcd5 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -30,7 +30,7 @@ msgstr ""
 "PO-Revision-Date: 2012-02-01 00:45+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: en_GB\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/fa.po b/po/fa.po
index 311abaa..65af123 100644
--- a/po/fa.po
+++ b/po/fa.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-03-30 06:22+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: fa\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,245 +49,248 @@ msgstr ""
 msgid "Paint"
 msgstr "نقاشی"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "ویرایش"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "ابزار"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "اشکال"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "متن"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "تصویر"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "جلوه‌ها"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "بی‌اثر کردن"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "دوباره"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "کپی"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "چسباندن"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "رنگ روکش"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "مداد"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "قلم‌مو"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "پاک کن"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "سطل"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "اندازه:ـ"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "دایره"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "مربع"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "شکل"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "پر کردن"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "رنگ پر کردن"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "کناره‌ها:ـ"
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "بیضی"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "مستطیل"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "خط"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "چند گوشه"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "قلب"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "متوازی‌الاضلاع"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "پیکان"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "ستاره"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "ذوزنقه"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "مثلث"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "کناره‌ها:ـ"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "نقاط:ـ"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "پر کردن"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "نوع"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "جا دادن تصویر"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "چرخش به چپ"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "چرخش به راست"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "بلندی"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "پهنا"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "انتخاب تصویر"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "تناسب خاکستری"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "رنگین کمان"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "۱۰۰۰"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "انتخاب تصویر"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "اندازه:ـ"
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "دایره"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "مربع"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "شکل"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "ابزار"
+
+#~ msgid "Text"
+#~ msgstr "متن"
+
+#~ msgid "Effects"
+#~ msgstr "جلوه‌ها"
+
+#~ msgid "Stroke Color"
+#~ msgstr "رنگ روکش"
+
+#~ msgid "Pencil"
+#~ msgstr "مداد"
+
+#~ msgid "Fill Color"
+#~ msgstr "رنگ پر کردن"
+
+#~ msgid "Points: "
+#~ msgstr "نقاط:ـ"
+
+#~ msgid "1000"
+#~ msgstr "۱۰۰۰"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "۵۰۰"
+#~ msgid "500"
+#~ msgstr "۵۰۰"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "۲۰۰"
+#~ msgid "200"
+#~ msgstr "۲۰۰"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "۱۵۰"
+#~ msgid "150"
+#~ msgstr "۱۵۰"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "۱۰۰"
+#~ msgid "100"
+#~ msgstr "۱۰۰"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "۵۰"
+#~ msgid "50"
+#~ msgstr "۵۰"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "۲۵"
+#~ msgid "25"
+#~ msgstr "۲۵"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "۱۰"
+#~ msgid "10"
+#~ msgstr "۱۰"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "بزرگنمایی +"
+#~ msgid "ZOOM +"
+#~ msgstr "بزرگنمایی +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "کوچکنمایی -"
+#~ msgid "ZOOM -"
+#~ msgstr "کوچکنمایی -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "سایبان مستطیل شکل"
diff --git a/po/fa_AF.po b/po/fa_AF.po
index 97f32e1..c308a8b 100644
--- a/po/fa_AF.po
+++ b/po/fa_AF.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-03-02 04:35-0500\n"
 "Last-Translator: Sohaib Obaidi <ebtihaj_obaidi@yahoo.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,245 +49,248 @@ msgstr ""
 msgid "Paint"
 msgstr "رسامی"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "ویرایش"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "ابزار"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "اشکال"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "متن"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "تصویر"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "جلوه‌ها"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "نه کردن"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "دوباره"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "نقل گیری"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "چسباندن"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "پاک کردن"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "رنگ روکش"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "مداد"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "برس"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "پاک کن"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "سطل"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "اندازه: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "دایره"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "مربع"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "شکل"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "پر کردن"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "رنگ پر کردن"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "کناره‌ها: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "بیضی"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "مستطیل"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "خط"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "چند گوشه ی"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "قلب"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "متوازی‌الاضلاع"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "تیر"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "ستاره"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "ذوذنقه"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "مثلث"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "کناره‌ها: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "نقاط: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "پر کردن"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "نوع"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "جا دادن تصویر"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "چرخش به چپ"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "چرخش به راست"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "بلندی"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "پهنایی"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "انتخاب تصویر"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "تناسب خاکستری"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "رنگین کمان"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "انتخاب تصویر"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "اندازه: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "دایره"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "مربع"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "شکل"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "ابزار"
+
+#~ msgid "Text"
+#~ msgstr "متن"
+
+#~ msgid "Effects"
+#~ msgstr "جلوه‌ها"
+
+#~ msgid "Stroke Color"
+#~ msgstr "رنگ روکش"
+
+#~ msgid "Pencil"
+#~ msgstr "مداد"
+
+#~ msgid "Fill Color"
+#~ msgstr "رنگ پر کردن"
+
+#~ msgid "Points: "
+#~ msgstr "نقاط: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "نمایش +"
+#~ msgid "ZOOM +"
+#~ msgstr "نمایش +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "نمایش -"
+#~ msgid "ZOOM -"
+#~ msgstr "نمایش -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "سایبان مستطیل شکل"
diff --git a/po/ff.po b/po/ff.po
index 9492122..ee95a6b 100644
--- a/po/ff.po
+++ b/po/ff.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/fi.po b/po/fi.po
index 2bd73d7..6f350be 100644
--- a/po/fi.po
+++ b/po/fi.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,242 +25,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/fil.po b/po/fil.po
index 9492122..ee95a6b 100644
--- a/po/fil.po
+++ b/po/fil.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/gu.po b/po/gu.po
index 9492122..ee95a6b 100644
--- a/po/gu.po
+++ b/po/gu.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ha.po b/po/ha.po
index 9492122..ee95a6b 100644
--- a/po/ha.po
+++ b/po/ha.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/he.po b/po/he.po
index 3952dc8..c9c72ab 100644
--- a/po/he.po
+++ b/po/he.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2009-01-07 01:01-0500\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,244 +48,205 @@ msgstr ""
 msgid "Paint"
 msgstr "צבע"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "עריכה"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "כלים"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "צורות"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "טקסט"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "תמונה"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "אפקטים"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "ביטול"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "חזרה"
 
-#: toolbox.py:217
+#: toolbox.py:155
 #, fuzzy
 msgid "Copy"
 msgstr "העתק"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-#, fuzzy
-msgid "Shape"
-msgstr "צורות"
-
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1490
-msgid "500"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1491
-msgid "200"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1492
-msgid "150"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
+#: widgets.py:271
+#, fuzzy
+msgid "Shape"
+msgstr "צורות"
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
+#~ msgid "Tools"
+#~ msgstr "כלים"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
+#~ msgid "Text"
+#~ msgstr "טקסט"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#~ msgid "Effects"
+#~ msgstr "אפקטים"
diff --git a/po/hi.po b/po/hi.po
index 8a41607..73069be 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: oficina\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-03-22 23:16+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Hindi <indlinux-hindi@lists.sourceforge.net>\n"
-"Language: hi\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,245 +49,248 @@ msgstr ""
 msgid "Paint"
 msgstr "पेंट"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "संपादन"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "औज़ार"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "आकार"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "पाठ"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "छवि"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "प्रभाव"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "पहले जैसा"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "दोहराएँ"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "नक़ल"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "चिपकाएँ"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "साफ करें"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "लगाने का रंग"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "पेनसिल"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "बृश"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "रबबड"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "बालटी"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "आकार: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "वृत्त"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "वर्ग"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "रूप"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "भरें"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "रंग भरें"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "सिरे: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "दीर्घवृत्त"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "चतुर्भुज"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "पंक्ति"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "बहुभुज"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "दिल"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "समानान्तर चतुर्भुज"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "तीर"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "तारा"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "विषम चतुर्भुज"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "त्रिभुज"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "सिरे: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "बिन्दुएँ: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "भरें"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "क़िस्म"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "छवि डालें"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "बाएँ घुमाओ"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "दाएँ घुमाओ"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "ऊंचाई"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "चौड़ाई"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "छवि चुनो"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "श्वेत-श्याम"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "इंद्रधनुष"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "छवि चुनो"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "आकार: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "वृत्त"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "वर्ग"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "रूप"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "औज़ार"
+
+#~ msgid "Text"
+#~ msgstr "पाठ"
+
+#~ msgid "Effects"
+#~ msgstr "प्रभाव"
+
+#~ msgid "Stroke Color"
+#~ msgstr "लगाने का रंग"
+
+#~ msgid "Pencil"
+#~ msgstr "पेनसिल"
+
+#~ msgid "Fill Color"
+#~ msgstr "रंग भरें"
+
+#~ msgid "Points: "
+#~ msgstr "बिन्दुएँ: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "बड़ा करें +"
+#~ msgid "ZOOM +"
+#~ msgstr "बड़ा करें +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "छोटा करें -"
+#~ msgid "ZOOM -"
+#~ msgstr "छोटा करें -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "वर्गाकार घेरा"
diff --git a/po/ht.po b/po/ht.po
index 9604311..04e8b57 100644
--- a/po/ht.po
+++ b/po/ht.po
@@ -38,260 +38,263 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2008-08-28 14:42-0400\n"
-"Last-Translator: lacrete <le_teaseur@hotmail.com>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-08-10 06:01+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ht\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n !=1);\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "Pentire"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Chanje"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Zouti"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Fòm"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Tèks"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Imaj"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Efè"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Defè"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Refè"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopye"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Kole"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Debarase"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Koulè trè a"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Kreyon"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "penso"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Efase"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Bokit"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Dimansyon: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Wonn"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Kare"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Fòm"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Plen"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Plen koulè"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Kote yo: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "elips"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Rektang"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Liy"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Poligòn"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Kè"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Paralelogram"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Flèch"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Zetwal"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapèz"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Triyang"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Kote yo:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Pwen yo:_"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Plen"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Tip"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Mete imaj"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Vire agoch"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Vire adwat"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Wotè"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Lajè"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Chwazi imaj"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Mete an gri"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Lakansyèl"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Chwazi imaj"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Dimansyon: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Wonn"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Kare"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Fòm"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Zouti"
+
+#~ msgid "Text"
+#~ msgstr "Tèks"
+
+#~ msgid "Effects"
+#~ msgstr "Efè"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Koulè trè a"
+
+#~ msgid "Pencil"
+#~ msgstr "Kreyon"
+
+#~ msgid "Fill Color"
+#~ msgstr "Plen koulè"
+
+#~ msgid "Points: "
+#~ msgstr "Pwen yo:_"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Zoum +"
+#~ msgid "ZOOM +"
+#~ msgstr "Zoum +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Zoum -"
+#~ msgid "ZOOM -"
+#~ msgstr "Zoum -"
 
 #, fuzzy
 #~ msgid "Rectangular Marquee"
diff --git a/po/hu.po b/po/hu.po
index 209b4fc..b3fedd5 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2009-12-21 22:34-0400\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: hu\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +48,221 @@ msgstr ""
 msgid "Paint"
 msgstr "Kifestés"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Szerkesztés"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Szöveg"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Kép"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Visszavonás"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Másolás"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Beillesztés"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Méret: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Sor"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Háromszög"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Típus"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Magasság"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Szélesség"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr ""
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Méret: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr ""
+
+#: widgets.py:259
+msgid "Square"
+msgstr ""
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#: widgets.py:271
+msgid "Shape"
+msgstr ""
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "Text"
+#~ msgstr "Szöveg"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#~ msgid "50"
+#~ msgstr "50"
+
+#~ msgid "25"
+#~ msgstr "25"
+
+#~ msgid "10"
+#~ msgstr "10"
diff --git a/po/hus.po b/po/hus.po
index 7875dba..16d3b17 100644
--- a/po/hus.po
+++ b/po/hus.po
@@ -2,216 +2,215 @@
 # 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: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 00:31-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-08-29 07:22+0200\n"
+"Last-Translator: <saulleoart@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.1\n"
 
 #: activity/activity.info:2
 msgid "Paint"
-msgstr ""
+msgstr "Mukuy"
 
 #: toolbox.py:101
 msgid "Edit"
-msgstr ""
+msgstr "Dhu'cha'"
 
 #: toolbox.py:111
 msgid "Shapes"
-msgstr ""
+msgstr "in wal"
 
 #: toolbox.py:117
 msgid "Fonts"
-msgstr ""
+msgstr "Eleltalábchik"
 
 #: toolbox.py:123
 msgid "Image"
-msgstr ""
+msgstr "T'iplab"
 
 #: toolbox.py:153
 msgid "Undo"
-msgstr ""
+msgstr "Wichk'ow"
 
 #: toolbox.py:154
 msgid "Redo"
-msgstr ""
+msgstr "Tsáb ts'ejka'"
 
 #: toolbox.py:155
 msgid "Copy"
-msgstr ""
+msgstr "K'otbiy"
 
 #: toolbox.py:156
 msgid "Paste"
-msgstr ""
+msgstr "Ts'at'k'a'"
 
 #: toolbox.py:164
 msgid "Clear"
-msgstr ""
+msgstr "T'oka'"
 
 #: toolbox.py:244 widgets.py:311
 msgid "Brush properties"
-msgstr ""
+msgstr "In alwá' an pedh mukux"
 
 #: toolbox.py:261
 msgid "Brush"
-msgstr ""
+msgstr "Pedh mukux"
 
 #: toolbox.py:266
 msgid "Eraser"
-msgstr ""
+msgstr "Pakuxtaláb"
 
 #: toolbox.py:270
 msgid "Bucket"
-msgstr ""
+msgstr "Balixtaláb"
 
 #: toolbox.py:274
 msgid "Stamp"
-msgstr ""
+msgstr "Ts'o'om"
 
 #: toolbox.py:287
 msgid "Select Area"
-msgstr ""
+msgstr "Takudh puwel"
 
 #: toolbox.py:380
 msgid "Fill"
-msgstr ""
+msgstr "T'uchiy"
 
-#: toolbox.py:386
-msgid "Keep Aspect"
-msgstr ""
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
+msgstr "Ka ko'onchij antsaná' in majúl"
 
 #: toolbox.py:403
 msgid "Sides: "
-msgstr ""
+msgstr "Walte'lichik: "
 
 #: toolbox.py:458
 msgid "Shapes properties"
-msgstr ""
+msgstr "In alwá'chik an aytaláb"
 
 #: toolbox.py:470
 msgid "Ellipse"
-msgstr ""
+msgstr "Chek’wnib"
 
 #: toolbox.py:474
 msgid "Rectangle"
-msgstr ""
+msgstr "Pekmadh tse' walté'"
 
 #: toolbox.py:478
 msgid "Line"
-msgstr ""
+msgstr "Kilodh"
 
+# ayláb = forma
 #: toolbox.py:482
 msgid "Free form"
-msgstr ""
+msgstr "Walkadh ayláb"
 
 #: toolbox.py:486
 msgid "Polygon"
-msgstr ""
+msgstr "Yan walte'"
 
 #: toolbox.py:490
 msgid "Heart"
-msgstr ""
+msgstr "ichích"
 
+# ts'aklachik walte' = paralelogramo
 #: toolbox.py:494
 msgid "Parallelogram"
-msgstr ""
+msgstr "Ts'ak walte'"
 
 #: toolbox.py:498
 msgid "Arrow"
-msgstr ""
+msgstr "T'ich'ok'láb"
 
 #: toolbox.py:502
 msgid "Star"
-msgstr ""
+msgstr "ót"
 
 #: toolbox.py:506
 msgid "Trapezoid"
-msgstr ""
+msgstr "Yab junat ts'ak walte'"
 
 #: toolbox.py:510
 msgid "Triangle"
-msgstr ""
+msgstr "Óx ts'uptal"
 
 #: toolbox.py:557
 msgid "Type"
-msgstr ""
+msgstr "Ni’ninchij"
 
 #: toolbox.py:677
 msgid "Insert Image"
-msgstr ""
+msgstr "Ki punk'unchij i t'iplab"
 
 #: toolbox.py:690
 msgid "Rotate Left"
-msgstr ""
+msgstr "Ka wilk'iy ta k'watab"
 
 #: toolbox.py:694
 msgid "Rotate Right"
-msgstr ""
+msgstr "Ka wilk'iy ta winab"
 
 #: toolbox.py:699
 msgid "Horizontal Mirror"
-msgstr ""
+msgstr "Pelat lam"
 
 #: toolbox.py:704
 msgid "Vertical Mirror"
-msgstr ""
+msgstr "Kubat lám"
 
 #: toolbox.py:708
 msgid "Height"
-msgstr ""
+msgstr "T'ek'em"
 
 #: toolbox.py:719
 msgid "Width"
-msgstr ""
+msgstr "Ts'ikwel"
 
 #: toolbox.py:734
 msgid "Grayscale"
-msgstr ""
+msgstr "Aytal an aku'"
 
 #: toolbox.py:737
 msgid "Rainbow"
-msgstr ""
+msgstr "Pits'al"
 
 #: toolbox.py:742
 msgid "Invert Colors"
-msgstr ""
+msgstr "Ka Wenk´ow an mukuxtalábl"
 
 #: toolbox.py:839
 msgid "Choose image"
-msgstr ""
+msgstr "Ka takuy an t'iplab"
 
 #: widgets.py:24
 msgid "Choose brush properties"
-msgstr ""
+msgstr "Takuy in alwá'"
 
 #: widgets.py:238
 msgid "Size: "
-msgstr ""
+msgstr "Puwél: "
 
 #: widgets.py:249
 msgid "Circle"
-msgstr ""
+msgstr "Kwechodh"
 
 #: widgets.py:259
 msgid "Square"
-msgstr ""
+msgstr "Tsé' in walté'"
 
 #: widgets.py:271
 msgid "Shape"
-msgstr ""
-
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr ""
+msgstr "Aykíl"
 
 #: widgets.py:303
 msgid "Stamp properties"
-msgstr ""
+msgstr "In alwá'"
diff --git a/po/id.po b/po/id.po
index 14c8d1b..2312fe1 100644
--- a/po/id.po
+++ b/po/id.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-04-04 11:38+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: id\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Sunting"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ig.po b/po/ig.po
index 9492122..ee95a6b 100644
--- a/po/ig.po
+++ b/po/ig.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/is.po b/po/is.po
index c9f0d24..4493d7e 100644
--- a/po/is.po
+++ b/po/is.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,245 +49,245 @@ msgstr ""
 msgid "Paint"
 msgstr "Mála"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Breyta"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Tól"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Form"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Texti"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Myndir"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Afturkalla"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Endurgera"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Afrita"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Líma"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Hreinsa"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Striks litur"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Pensill"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Bursti"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Strokleður"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Fata"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Stærð: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Hringur"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Ferningur"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Form"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Fylla"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Fillingar litur"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Hliðar: "
 
-#: toolbox.py:724
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
+
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Rétthyrningur"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Lína"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Hjarta"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Ör"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Stjarna"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Þríhirningur"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Hliðar: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Punktar: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Fylla"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Gerðir"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Setja inn mynd"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Snúa til vinstri"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Snúa til hægri"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Hæð"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Breidd"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Velja mynd"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Gráskala"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Regnbogi"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Velja mynd"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Stærð: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Hringur"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Ferningur"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Form"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Tól"
+
+#~ msgid "Text"
+#~ msgstr "Texti"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Striks litur"
+
+#~ msgid "Pencil"
+#~ msgstr "Pensill"
+
+#~ msgid "Fill Color"
+#~ msgstr "Fillingar litur"
+
+#~ msgid "Points: "
+#~ msgstr "Punktar: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Stækka"
+#~ msgid "ZOOM +"
+#~ msgstr "Stækka"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Minnka"
+#~ msgid "ZOOM -"
+#~ msgstr "Minnka"
 
 #~ msgid "Tool Color"
 #~ msgstr "Tóla litur"
diff --git a/po/it.po b/po/it.po
index b838a9d..ca1a620 100644
--- a/po/it.po
+++ b/po/it.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-02-11 11:37+0200\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: it\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,245 +49,251 @@ msgstr ""
 msgid "Paint"
 msgstr "Disegna"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Modifica"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Strumenti"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Forme"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Testo"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Immagine"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Effetti"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Annulla"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Riesegui"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Copia"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Incolla"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Pulisci"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Colore Tratto"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Matita"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Pennello"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Gomma"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Secchio"
 
-#: toolbox.py:428
+#: toolbox.py:274
+msgid "Stamp"
+msgstr ""
+
+#: toolbox.py:287
 msgid "Select Area"
 msgstr "Seleziona Area"
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Dimensione: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Cerchio"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Quadrato"
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Forma"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Riempi"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr "Conserva le proporzioni"
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Colore Riempimento"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Lati: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Ellisse"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Rettangolo"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Linea"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr "Forma libera"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Poligono"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Cuore"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Parallelogramma"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Freccia"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Stella"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapezio"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Triangolo"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Lati: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Punti: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Riempi"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr "Conserva le proporzioni"
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Tipo"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Inserisci Immagine"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Ruota a Sinistra"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Ruota a Destra"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr "Specchio Orizzontale"
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr "Specchio Verticale"
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Altezza"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Larghezza"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Scegli immagine"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Scala di grigi"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Arcobaleno"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr "Inverti colori"
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Scegli immagine"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Dimensione: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Cerchio"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Quadrato"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Forma"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Strumenti"
+
+#~ msgid "Text"
+#~ msgstr "Testo"
+
+#~ msgid "Effects"
+#~ msgstr "Effetti"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Colore Tratto"
+
+#~ msgid "Pencil"
+#~ msgstr "Matita"
+
+#~ msgid "Fill Color"
+#~ msgstr "Colore Riempimento"
+
+#~ msgid "Points: "
+#~ msgstr "Punti: "
+
+#~ msgid "Keep Aspect"
+#~ msgstr "Conserva le proporzioni"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "ZOOM +"
+#~ msgid "ZOOM +"
+#~ msgstr "ZOOM +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "ZOOM -"
+#~ msgid "ZOOM -"
+#~ msgstr "ZOOM -"
 
 #~ msgid "Mirror Horizontal"
 #~ msgstr "Specchio orizzontale"
diff --git a/po/ja.po b/po/ja.po
index 5e74e69..114225e 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -34,258 +34,263 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2008-08-28 21:52-0400\n"
-"Last-Translator: korakurider <korakurider@gmail.com>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-12-16 06:01+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "ペイント"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "編集"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "ツール"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "図形"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "文字"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "画像"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "効果"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "元に戻す"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "やり直し"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "コピー"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "貼り付け"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "クリア"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "線の色"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "鉛筆"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "ブラシ"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "消しゴム"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "バケツ"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "サイズ:  "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "円"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "四角"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "形"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "塗りつぶし"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "塗りつぶしの色"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "辺: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "楕円"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "長方形"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "線"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "多角形"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "ハート形"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "平行四辺形"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "矢印"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "星型"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "台形"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "三角形"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "辺: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "点: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "塗りつぶし"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "文字入力"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "画像を挿入"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "左回転"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "右回転"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "高さ"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "幅"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "画像を選択"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "グレイスケール"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "虹"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "画像を選択"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "サイズ: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "円"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "四角"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "形"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "ツール"
+
+#~ msgid "Text"
+#~ msgstr "文字"
+
+#~ msgid "Effects"
+#~ msgstr "効果"
+
+#~ msgid "Stroke Color"
+#~ msgstr "線の色"
+
+#~ msgid "Pencil"
+#~ msgstr "鉛筆"
+
+#~ msgid "Fill Color"
+#~ msgstr "塗りつぶしの色"
+
+#~ msgid "Points: "
+#~ msgstr "点: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "拡大"
+#~ msgid "ZOOM +"
+#~ msgstr "拡大"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "縮小"
+#~ msgid "ZOOM -"
+#~ msgstr "縮小"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "四角のマーキー"
diff --git a/po/kn.po b/po/kn.po
index 2bd73d7..6f350be 100644
--- a/po/kn.po
+++ b/po/kn.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,242 +25,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ko.po b/po/ko.po
index 99b0ccd..69e9130 100644
--- a/po/ko.po
+++ b/po/ko.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2009-03-09 01:12-0400\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,264 +48,228 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 #, fuzzy
 msgid "Edit"
 msgstr "편집"
 
-#: toolbox.py:181
-#, fuzzy
-msgid "Tools"
-msgstr "툴"
-
-#: toolbox.py:185
+#: toolbox.py:111
 #, fuzzy
 msgid "Shapes"
 msgstr "도형"
 
-#: toolbox.py:189
-#, fuzzy
-msgid "Text"
-msgstr "텍스트"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 #, fuzzy
 msgid "Image"
 msgstr "이미지"
 
-#: toolbox.py:197
-#, fuzzy
-msgid "Effects"
-msgstr "효과"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:375
-#, fuzzy
-msgid "Pencil"
-msgstr "연필"
-
-#: toolbox.py:384
+#: toolbox.py:261
 #, fuzzy
 msgid "Brush"
 msgstr "붓"
 
-#: toolbox.py:392
+#: toolbox.py:266
 #, fuzzy
 msgid "Eraser"
 msgstr "지우개"
 
-#: toolbox.py:400
+#: toolbox.py:270
 #, fuzzy
 msgid "Bucket"
 msgstr "부켓"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:498 toolbox.py:1433
-#, fuzzy
-msgid "Circle"
-msgstr "원"
-
-#: toolbox.py:505 toolbox.py:1440
-#, fuzzy
-msgid "Square"
-msgstr "사각형"
-
-#: toolbox.py:514 toolbox.py:1449
-#, fuzzy
-msgid "Shape"
-msgstr "도형"
+#: toolbox.py:380
+msgid "Fill"
+msgstr ""
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr ""
+
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 #, fuzzy
 msgid "Ellipse"
 msgstr "이클립스"
 
-#: toolbox.py:732
+#: toolbox.py:474
 #, fuzzy
 msgid "Rectangle"
 msgstr "사각"
 
-#: toolbox.py:740
+#: toolbox.py:478
 #, fuzzy
 msgid "Line"
 msgstr "선"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 #, fuzzy
 msgid "Type"
 msgstr "타입"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 #, fuzzy
 msgid "Insert Image"
 msgstr "오브젝트 삽입"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 #, fuzzy
 msgid "Grayscale"
 msgstr "그레이 스케일"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1490
-msgid "500"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1491
-msgid "200"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
+#: widgets.py:249
+#, fuzzy
+msgid "Circle"
+msgstr "원"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
+#: widgets.py:259
+#, fuzzy
+msgid "Square"
+msgstr "사각형"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
+#: widgets.py:271
+#, fuzzy
+msgid "Shape"
+msgstr "도형"
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
+#, fuzzy
+#~ msgid "Tools"
+#~ msgstr "툴"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
+#, fuzzy
+#~ msgid "Text"
+#~ msgstr "텍스트"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#, fuzzy
+#~ msgid "Effects"
+#~ msgstr "효과"
+
+#, fuzzy
+#~ msgid "Pencil"
+#~ msgstr "연필"
 
 #, fuzzy
 #~ msgid "Rectangular Marquee"
diff --git a/po/kos.po b/po/kos.po
index 0d17094..18a7bb3 100644
--- a/po/kos.po
+++ b/po/kos.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2009-09-02 21:25-0400\n"
 "Last-Translator: Chris Leonard <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: kos\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Aoloah"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ku.po b/po/ku.po
index 7875dba..fed1310 100644
--- a/po/ku.po
+++ b/po/ku.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 00:31-0400\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,8 +85,8 @@ msgstr ""
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:386
-msgid "Keep Aspect"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
 #: toolbox.py:403
@@ -208,10 +209,6 @@ msgstr ""
 msgid "Shape"
 msgstr ""
 
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr ""
-
 #: widgets.py:303
 msgid "Stamp properties"
 msgstr ""
diff --git a/po/lt.po b/po/lt.po
index 3ac3112..336b031 100644
--- a/po/lt.po
+++ b/po/lt.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,242 +21,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/lv.po b/po/lv.po
index 2bd73d7..6f350be 100644
--- a/po/lv.po
+++ b/po/lv.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,242 +25,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/mg.po b/po/mg.po
index 39a32f0..769e4bd 100644
--- a/po/mg.po
+++ b/po/mg.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2009-05-23 06:39-0400\n"
 "Last-Translator: dina garnier oeliarisoa <dina.garnier.oeliarisoa@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mg\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,242 +49,233 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Soloy, Amboary"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Lahatsoratra"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Sary"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Ivereno"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Avereno"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Adikao"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Petaho"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Fafao"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Pensily"
-
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Famafana"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Faribolana"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Efamira"
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
+
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Tsipika"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Kintana"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Telozoro"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Teboka:"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Ampidiro sary"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Aodino mankany ankavia"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Aodino mankany ankavanana"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Haavo"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Sakany"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Mifidiana sary"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Avana"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Mifidiana sary"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr ""
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Faribolana"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Efamira"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr ""
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Text"
+#~ msgstr "Lahatsoratra"
+
+#~ msgid "Pencil"
+#~ msgstr "Pensily"
+
+#~ msgid "Points: "
+#~ msgstr "Teboka:"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Akaikezo"
+#~ msgid "ZOOM +"
+#~ msgstr "Akaikezo"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Alaviro"
+#~ msgid "ZOOM -"
+#~ msgstr "Alaviro"
diff --git a/po/mk.po b/po/mk.po
index 8dfac08..fa9aa3e 100644
--- a/po/mk.po
+++ b/po/mk.po
@@ -38,10 +38,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2007-12-16 17:06+0000\n"
 "Last-Translator: novica <nnovica@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,245 +53,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Боење"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Уреди"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Алатки"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Форми"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Текст"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Слика"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Ефекти"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Врати"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Повтори"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Копирај"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Вметни"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Исчисти"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Исцртај со боја"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Молив"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Четка"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Гума"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Кофа"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Големина:"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Круг"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Квадрат"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Форма"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Пополни"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Пополни со боја"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Страни:"
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Елипса"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Правоаголник"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Линија"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Многуаголник"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Срце"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Паралелограм"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Стрелка"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Ѕвезда"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Трапез"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Триаголник"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Страни:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Поени:"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Пополни"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Тип"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Внеси слика"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Ротирај налево"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Ротирја надесно"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Височина"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Широчина"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Избери слика"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Црно бело"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Виножито"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Избери слика"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Големина:"
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Круг"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Квадрат"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Форма"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Алатки"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Effects"
+#~ msgstr "Ефекти"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Исцртај со боја"
+
+#~ msgid "Pencil"
+#~ msgstr "Молив"
+
+#~ msgid "Fill Color"
+#~ msgstr "Пополни со боја"
+
+#~ msgid "Points: "
+#~ msgstr "Поени:"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "ЗГОЛЕМИ +"
+#~ msgid "ZOOM +"
+#~ msgstr "ЗГОЛЕМИ +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "НАМАЛИ -"
+#~ msgid "ZOOM -"
+#~ msgstr "НАМАЛИ -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Правоаголна табла"
diff --git a/po/ml.po b/po/ml.po
index 6162518..fdb3576 100644
--- a/po/ml.po
+++ b/po/ml.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-03-07 08:12-0500\n"
 "Last-Translator: Ani Peter <peter.ani@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,242 +48,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "തിരുത്തുക"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/mn.po b/po/mn.po
index f88818f..c50f6a9 100644
--- a/po/mn.po
+++ b/po/mn.po
@@ -34,260 +34,263 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2010-10-07 16:50+0200\n"
-"Last-Translator: Cris Anderson <anderson861@gmail.com>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2012-01-26 01:33+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mn\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "Зурах"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Засварлах"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Хэрэгслүүд"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Дүрснүүд"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Бичих"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Зураг"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "эффект"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Буцаах"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Давтах"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Хуулах"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Тавих"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Арилгах"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Хүрээний өнгө"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Харандаа"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Багс"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Баллуур"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Будах"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Хэмжээ: _"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Дугуй"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Тэгш өнцөгт"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Дүрс"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Будах"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Будах өнгө"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Талууд: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Зуйван"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Тэгш өнцөгт"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Шугам"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Олон өнцөгт"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Зүрх"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Пралелограм"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Сум"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Од"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Трапец"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Гурвалжин"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Талууд:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Хошуу:"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Будах"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Юм бичих"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Зураг оруулах"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Зүүн тийш эргүүлэх"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Баруун тийш эргүүлэх"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Өндөр"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Өргөн"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Зургаа сонгох"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Хар цагаан"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Солонго"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Зургаа сонгох"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Хэмжээ: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Дугуй"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Тэгш өнцөгт"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Дүрс"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Хэрэгслүүд"
+
+#~ msgid "Text"
+#~ msgstr "Бичих"
+
+#~ msgid "Effects"
+#~ msgstr "эффект"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Хүрээний өнгө"
+
+#~ msgid "Pencil"
+#~ msgstr "Харандаа"
+
+#~ msgid "Fill Color"
+#~ msgstr "Будах өнгө"
+
+#~ msgid "Points: "
+#~ msgstr "Хошуу: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Ойртуулах +"
+#~ msgid "ZOOM +"
+#~ msgstr "Ойртуулах +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Холдуулах -"
+#~ msgid "ZOOM -"
+#~ msgstr "Холдуулах -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Тэгш өнцөгт .."
diff --git a/po/mr.po b/po/mr.po
index 3934e3c..cbde1d8 100644
--- a/po/mr.po
+++ b/po/mr.po
@@ -42,11 +42,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-03-27 20:54+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: mr\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,245 +57,248 @@ msgstr ""
 msgid "Paint"
 msgstr "रंगवणे"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "संपादन करणे"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "साधने"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "आकार"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "शब्द"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "छायाचित्र"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "परिणाम"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "केलेल्या गोष्टीवर बोला फिरवने"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "परत करा"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "नक्कल"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "छापणे"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "साफ करणे"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "स्ट्रोक कलर"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "पेन्सिल"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "ब्रश"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "खोडरब्बर"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "बादली"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "आकार: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "वर्तुळ"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "चौकोन"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "आकार"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "भरणे"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "रंग भरा"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "बाजू: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "लंबवर्तुळ"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "आयत"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "रेषा"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "बहूभूज"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "हृदय"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "समांतरभुज चौकोन"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "बाण"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "तारे"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "असमांतरभुज चौकोन"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "त्रिकोण"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "बाजू: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "बिंदू: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "भरणे"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "टाइप"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "छायाचित्र आत घाला"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "डावीकडे फिरवा"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "उजवीकडे फिरवा"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "उंची"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "रुंदी"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "चित्र निवडा"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "राखाडी छटा"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "इंद्रधनुष्य"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "१०००"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "चित्र निवडा"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "आकार: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "वर्तुळ"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "चौकोन"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "आकार"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "साधने"
+
+#~ msgid "Text"
+#~ msgstr "शब्द"
+
+#~ msgid "Effects"
+#~ msgstr "परिणाम"
+
+#~ msgid "Stroke Color"
+#~ msgstr "स्ट्रोक कलर"
+
+#~ msgid "Pencil"
+#~ msgstr "पेन्सिल"
+
+#~ msgid "Fill Color"
+#~ msgstr "रंग भरा"
+
+#~ msgid "Points: "
+#~ msgstr "बिंदू: "
+
+#~ msgid "1000"
+#~ msgstr "१०००"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "५००"
+#~ msgid "500"
+#~ msgstr "५००"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "२००"
+#~ msgid "200"
+#~ msgstr "२००"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "१५०"
+#~ msgid "150"
+#~ msgstr "१५०"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "१००"
+#~ msgid "100"
+#~ msgstr "१००"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "५०"
+#~ msgid "50"
+#~ msgstr "५०"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "२५"
+#~ msgid "25"
+#~ msgstr "२५"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "१०"
+#~ msgid "10"
+#~ msgstr "१०"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "झूम +"
+#~ msgid "ZOOM +"
+#~ msgstr "झूम +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "झूम -"
+#~ msgid "ZOOM -"
+#~ msgstr "झूम -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "आयताकृती तंबू"
diff --git a/po/ms.po b/po/ms.po
index 9492122..ee95a6b 100644
--- a/po/ms.po
+++ b/po/ms.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/mvo.po b/po/mvo.po
index 9492122..ee95a6b 100644
--- a/po/mvo.po
+++ b/po/mvo.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/na.po b/po/na.po
index 9492122..ee95a6b 100644
--- a/po/na.po
+++ b/po/na.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/nah.po b/po/nah.po
index 7875dba..fed1310 100644
--- a/po/nah.po
+++ b/po/nah.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 00:31-0400\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -84,8 +85,8 @@ msgstr ""
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:386
-msgid "Keep Aspect"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
 #: toolbox.py:403
@@ -208,10 +209,6 @@ msgstr ""
 msgid "Shape"
 msgstr ""
 
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr ""
-
 #: widgets.py:303
 msgid "Stamp properties"
 msgstr ""
diff --git a/po/nb.po b/po/nb.po
index 47fe89e..27d9244 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: oficina\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-07-26 13:50+0200\n"
 "Last-Translator: Kent Dahl <kentda@pvv.org>\n"
 "Language-Team: Norsk bokmål <i18n-no@lister.ping.uio.no>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,248 +49,221 @@ msgstr ""
 msgid "Paint"
 msgstr "Male"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Endre"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Verktøy"
-
-#: toolbox.py:185
+#: toolbox.py:111
 #, fuzzy
 msgid "Shapes"
 msgstr "Former"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Tekst"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Bilde"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Effekter"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Angre"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Gjøre på nytt"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopier"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Lim inn"
 
-#: toolbox.py:226
+#: toolbox.py:164
 #, fuzzy
 msgid "Clear"
 msgstr "Slett"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Strekfarge"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Blyant"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Pensel"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Viskelær"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Bøtte"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Størrelse:"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Sirkel"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Kvadrat"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-#, fuzzy
-msgid "Shape"
-msgstr "Form"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Fyll"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Fyllfarge"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Sider:"
 
-#: toolbox.py:724
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
+
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Rektangel"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Linje"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Mangekant"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Hjerte"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Parallellogram"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Pil"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Stjerne"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapes"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Trekant"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Sider:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Punkter:"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Fyll"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Sett inn bilde"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Roter til venstre"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Roter til høyre"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Høyde"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Bredde"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Velg bilde"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Gråtoner"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Regnbue"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Velg bilde"
 
-#: toolbox.py:1490
-msgid "500"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
+#: widgets.py:238
+msgid "Size: "
+msgstr "Størrelse:"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
+#: widgets.py:249
+msgid "Circle"
+msgstr "Sirkel"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
+#: widgets.py:259
+msgid "Square"
+msgstr "Kvadrat"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
+#: widgets.py:271
+#, fuzzy
+msgid "Shape"
+msgstr "Form"
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
+#~ msgid "Tools"
+#~ msgstr "Verktøy"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
+#~ msgid "Text"
+#~ msgstr "Tekst"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#~ msgid "Effects"
+#~ msgstr "Effekter"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Strekfarge"
+
+#~ msgid "Pencil"
+#~ msgstr "Blyant"
+
+#~ msgid "Fill Color"
+#~ msgstr "Fyllfarge"
+
+#~ msgid "Points: "
+#~ msgstr "Punkter:"
 
 #~ msgid "Fill Color: "
 #~ msgstr "Fyllfarge:"
diff --git a/po/ne.po b/po/ne.po
index 98f2b55..c3df57f 100644
--- a/po/ne.po
+++ b/po/ne.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2011-06-13 12:28+0200\n"
-"Last-Translator:  <aman.maharjan@olenepal.org>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-07-20 08:21+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: ne\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,245 +49,251 @@ msgstr ""
 msgid "Paint"
 msgstr "रोगन"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "सम्पादन"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "औजारहरु"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "आकारहरु"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "पाठ"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "चित्र"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "श्रृगार"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "सच्याउ"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "पुन: सच्याउ"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "प्रतिलिपी बनाऊ"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "प्रतिलिपी सार"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "सफा गर"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "घेराको रङ्ग"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "सिशाकलम"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "बुरुस"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "मेट्ने"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "बाल्टिन"
 
-#: toolbox.py:428
+#: toolbox.py:274
+msgid "Stamp"
+msgstr ""
+
+#: toolbox.py:287
 msgid "Select Area"
 msgstr "क्षेत्र चयन गर्नुहोस्"
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "आकार:॒"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "वृत्त  "
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "वर्ग"
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "आकार"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "भर"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr "आकार राख्नुहोस"
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "भर्ने रङ्ग"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "सतहरु:॒ "
 
-#: toolbox.py:724
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
+
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "अण्डाकार क्षेत्र"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "चतुर्भुज"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "रेखा"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
-msgstr "  स्वतन्त्र रुप"
+msgstr "स्वतन्त्र रुप"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "बहुभुज"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "मुटु"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "समानान्तर चतुर्भुज"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "तीर"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "तारा"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "असमान्तर भुज"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "त्रिभुज"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "सतहरु:॒"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "बिन्दुहरु:॒"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "भर"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr "आकार राख्नुहोस"
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "प्रकार"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "चित्र घुसाऊ"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "बायाँ तिर घुमाऊ"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "दायाँ तिर घुमाऊ"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr "तेर्सो ऐना"
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr "ठाडो ऐना"
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "उचाई"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "चौडाई"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "चित्र छान"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "बेरङ्गी"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "इन्द्रेणी"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
-msgstr " रङहरु उल्टाउनुहोस्"
+msgstr "रङहरु उल्टाउनुहोस्"
+
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "चित्र छान"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "आकार:॒ "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "वृत्त"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "वर्ग"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "आकार"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "औजारहरु"
+
+#~ msgid "Text"
+#~ msgstr "पाठ"
+
+#~ msgid "Effects"
+#~ msgstr "श्रृगार"
+
+#~ msgid "Stroke Color"
+#~ msgstr "घेराको रङ्ग"
+
+#~ msgid "Pencil"
+#~ msgstr "सिशाकलम"
+
+#~ msgid "Fill Color"
+#~ msgstr "भर्ने रङ्ग"
+
+#~ msgid "Points: "
+#~ msgstr "बिन्दुहरु:॒ "
+
+#~ msgid "Keep Aspect"
+#~ msgstr "आकार राख्नुहोस"
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "१०००"
+#~ msgid "1000"
+#~ msgstr "१०००"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "५००"
+#~ msgid "500"
+#~ msgstr "५००"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "२००"
+#~ msgid "200"
+#~ msgstr "२००"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "१५०"
+#~ msgid "150"
+#~ msgstr "१५०"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "१००"
+#~ msgid "100"
+#~ msgstr "१००"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "५०"
+#~ msgid "50"
+#~ msgstr "५०"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "२५"
+#~ msgid "25"
+#~ msgstr "२५"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "१०"
+#~ msgid "10"
+#~ msgstr "१०"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "ठूलो +"
+#~ msgid "ZOOM +"
+#~ msgstr "ठूलो +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "सानो -"
+#~ msgid "ZOOM -"
+#~ msgstr "सानो -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "चतुर्भुजिय रेखा"
diff --git a/po/nn.po b/po/nn.po
index 2bd73d7..6f350be 100644
--- a/po/nn.po
+++ b/po/nn.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,242 +25,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/pa.po b/po/pa.po
index 9492122..ee95a6b 100644
--- a/po/pa.po
+++ b/po/pa.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/pap.po b/po/pap.po
index ccac42f..63c6620 100644
--- a/po/pap.po
+++ b/po/pap.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-11-13 21:33+0200\n"
 "Last-Translator: Jiehua <jiehuahe@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pap\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,248 +49,254 @@ msgstr ""
 msgid "Paint"
 msgstr "Pintura / ferf"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Edita"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Tools"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Formanan"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Teksto"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Imagen"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Efektonan"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Deshasí"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Rehasí"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopia"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Pega , pasta"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Limpia"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Kolor prefera"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Potlot"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Pincel"
 
 # skrap is meer fysich, stuf(Pap.)= gummen(NL>) in overdrachtelijke zin
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Gòm / Stùf"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Hèmber"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Grandura: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Sírkulo"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Vierkant"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Forma"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Jena"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr "Warda aspekto"
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Yena koló"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Bandanan: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Ellips"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Rechthoek"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Liña"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr "Tamaño liber"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Poligono"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Kurason"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Parallelogram"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Flecha"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Strea"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapezium"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Triángulo"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Bandanan: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Puntonan: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Jena"
-
-#: toolbox.py:1003
-#, fuzzy
-msgid "Keep Aspect"
-msgstr "Warda aspekto"
-
 # type (E) heeft vele betekenissen bv. the type font=karakter of letterteken, the type face=lettertype of soort, the type catagory=klasse, onderverdeling
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Tiep/tik"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Inserta Imagen"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Drei na man robes"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Drei na man drechi"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Haltura"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Hanchura"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Skohe imagen"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Koló Shinishi"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Regenboog"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Skohe imagen"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Grandura: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Sírkulo"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Vierkant"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Forma"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Tools"
+
+#~ msgid "Text"
+#~ msgstr "Teksto"
+
+#~ msgid "Effects"
+#~ msgstr "Efektonan"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Kolor prefera"
+
+#~ msgid "Pencil"
+#~ msgstr "Potlot"
+
+#~ msgid "Fill Color"
+#~ msgstr "Yena koló"
+
+#~ msgid "Points: "
+#~ msgstr "Puntonan: "
+
+#, fuzzy
+#~ msgid "Keep Aspect"
+#~ msgstr "Warda aspekto"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "ZOOM +"
+#~ msgid "ZOOM +"
+#~ msgstr "ZOOM +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "ZOOM -"
+#~ msgid "ZOOM -"
+#~ msgstr "ZOOM -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Selekshon Rektangular"
diff --git a/po/pis.po b/po/pis.po
index 490194f..47c6917 100644
--- a/po/pis.po
+++ b/po/pis.po
@@ -39,10 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,242 +53,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/pl.po b/po/pl.po
index 350feb1..f0e5087 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -38,7 +38,7 @@ msgstr ""
 "PO-Revision-Date: 2011-12-06 23:48+0200\n"
 "Last-Translator: FRKS <frks@frks.pl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pl\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ps.po b/po/ps.po
index 8846279..e72f039 100644
--- a/po/ps.po
+++ b/po/ps.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-03-02 05:00-0500\n"
 "Last-Translator: Ahmad Jawed Samsor <jawedsamsor@gmail.com>\n"
 "Language-Team: PASHTO <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,245 +48,248 @@ msgstr ""
 msgid "Paint"
 msgstr "رسامي"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "اېډېټ"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "وسيلې"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "بڼې"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "متن"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "انځور"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "اغيزې"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "ناکول"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "بیاکول"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "کاپي"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "سرېښل"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "پاکول"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "رنګ وهل"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "پنسل"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "برس"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "پاكوونكی"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "سلواغه"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "اندازه "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "دايره"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "مربع"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "بڼه"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "ډكول"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "رنګ ډكول"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "خواوې: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "هګيز"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "مستطيل"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "ليکه"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "څو ضلعي"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "زړه"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "متوازي الاضلاع"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "غشى"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "ستورى"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "منحرف-ډوله څلورضلعي"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "مثلث"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "خواوې: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "نقطې: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "ډكول"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "ډول"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "انځور ننويستل"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "كيڼ چورلول"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "ښی چورلول"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "لوړوالی"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "عرض"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "انځور انتخابول"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "خړ-مېچ"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "بوډۍ-ټال"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "۱۰۰۰"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "انځور انتخابول"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "اندازه "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "دايره"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "مربع"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "بڼه"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "وسيلې"
+
+#~ msgid "Text"
+#~ msgstr "متن"
+
+#~ msgid "Effects"
+#~ msgstr "اغيزې"
+
+#~ msgid "Stroke Color"
+#~ msgstr "رنګ وهل"
+
+#~ msgid "Pencil"
+#~ msgstr "پنسل"
+
+#~ msgid "Fill Color"
+#~ msgstr "رنګ ډكول"
+
+#~ msgid "Points: "
+#~ msgstr "نقطې: "
+
+#~ msgid "1000"
+#~ msgstr "۱۰۰۰"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "۵۰۰"
+#~ msgid "500"
+#~ msgstr "۵۰۰"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "۲۰۰"
+#~ msgid "200"
+#~ msgstr "۲۰۰"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "۱۵۰"
+#~ msgid "150"
+#~ msgstr "۱۵۰"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "۱۰۰"
+#~ msgid "100"
+#~ msgstr "۱۰۰"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "۵۰"
+#~ msgid "50"
+#~ msgstr "۵۰"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "۲۵"
+#~ msgid "25"
+#~ msgstr "۲۵"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "۱۰"
+#~ msgid "10"
+#~ msgstr "۱۰"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "لويوالی ډېرول"
+#~ msgid "ZOOM +"
+#~ msgstr "لويوالی ډېرول"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "لويوالی کمول"
+#~ msgid "ZOOM -"
+#~ msgstr "لويوالی کمول"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "مستطيل ډوله خوځمتن"
diff --git a/po/pt.po b/po/pt.po
index fd3cf8e..0159367 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -38,7 +38,7 @@ msgstr ""
 "PO-Revision-Date: 2012-04-13 11:31+0200\n"
 "Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: pt\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index 057a52a..6aecace 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -35,11 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-02 00:32-0400\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-09-01 17:25+0200\n"
 "Last-Translator: silviak <silviakist@gmail.com>\n"
 "Language-Team: Language locale/pt\n"
-"Language: pt_BR\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -114,9 +114,8 @@ msgstr ""
 msgid "Fill"
 msgstr "Preenchimento"
 
-#: toolbox.py:386
-#, fuzzy
-msgid "Keep Aspect"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr "Mantenha aspecto"
 
 #: toolbox.py:403
@@ -239,14 +238,14 @@ msgstr "Quadrado"
 msgid "Shape"
 msgstr "Forma"
 
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr "Mantenha aspecto"
-
 #: widgets.py:303
 msgid "Stamp properties"
 msgstr ""
 
+#, fuzzy
+#~ msgid "Keep Aspect"
+#~ msgstr "Mantenha aspecto"
+
 #~ msgid "Tools"
 #~ msgstr "Ferramentas"
 
diff --git a/po/qu.po b/po/qu.po
deleted file mode 100644
index 9492122..0000000
--- a/po/qu.po
+++ /dev/null
@@ -1,289 +0,0 @@
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
-
-#: activity/activity.info:2
-msgid "Paint"
-msgstr ""
-
-#: toolbox.py:177
-msgid "Edit"
-msgstr ""
-
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
-msgid "Shapes"
-msgstr ""
-
-#: toolbox.py:189
-msgid "Text"
-msgstr ""
-
-#: toolbox.py:193
-msgid "Image"
-msgstr ""
-
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
-msgid "Undo"
-msgstr ""
-
-#: toolbox.py:216
-msgid "Redo"
-msgstr ""
-
-#: toolbox.py:217
-msgid "Copy"
-msgstr ""
-
-#: toolbox.py:218
-msgid "Paste"
-msgstr ""
-
-#: toolbox.py:226
-msgid "Clear"
-msgstr ""
-
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
-msgid "Brush"
-msgstr ""
-
-#: toolbox.py:392
-msgid "Eraser"
-msgstr ""
-
-#: toolbox.py:400
-msgid "Bucket"
-msgstr ""
-
-#: toolbox.py:428
-msgid "Select Area"
-msgstr ""
-
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr ""
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr ""
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr ""
-
-#: toolbox.py:522
-msgid "Keep aspect"
-msgstr ""
-
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:724
-msgid "Ellipse"
-msgstr ""
-
-#: toolbox.py:732
-msgid "Rectangle"
-msgstr ""
-
-#: toolbox.py:740
-msgid "Line"
-msgstr ""
-
-#: toolbox.py:748
-msgid "Free form"
-msgstr ""
-
-#: toolbox.py:757
-msgid "Polygon"
-msgstr ""
-
-#: toolbox.py:765
-msgid "Heart"
-msgstr ""
-
-#: toolbox.py:773
-msgid "Parallelogram"
-msgstr ""
-
-#: toolbox.py:781
-msgid "Arrow"
-msgstr ""
-
-#: toolbox.py:789
-msgid "Star"
-msgstr ""
-
-#: toolbox.py:797
-msgid "Trapezoid"
-msgstr ""
-
-#: toolbox.py:805
-msgid "Triangle"
-msgstr ""
-
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
-msgid "Type"
-msgstr ""
-
-#: toolbox.py:1153
-msgid "Insert Image"
-msgstr ""
-
-#: toolbox.py:1166
-msgid "Rotate Left"
-msgstr ""
-
-#: toolbox.py:1171
-msgid "Rotate Right"
-msgstr ""
-
-#: toolbox.py:1177
-msgid "Horizontal Mirror"
-msgstr ""
-
-#: toolbox.py:1182
-msgid "Vertical Mirror"
-msgstr ""
-
-#: toolbox.py:1186
-msgid "Height"
-msgstr ""
-
-#: toolbox.py:1197
-msgid "Width"
-msgstr ""
-
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
-msgid "Grayscale"
-msgstr ""
-
-#: toolbox.py:1354
-msgid "Rainbow"
-msgstr ""
-
-#: toolbox.py:1361
-msgid "Invert Colors"
-msgstr ""
-
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
-
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
-
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
-
-#: toolbox.py:1495
-msgid "25"
-msgstr ""
-
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
-
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
-
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
diff --git a/po/quz.po b/po/quz.po
index d081b93..ffb7252 100644
--- a/po/quz.po
+++ b/po/quz.po
@@ -1,3 +1,7 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
@@ -6,7 +10,7 @@ msgstr ""
 "PO-Revision-Date: 2011-11-19 02:58+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: quz\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ro.po b/po/ro.po
index e209d81..b386de0 100644
--- a/po/ro.po
+++ b/po/ro.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-02-18 17:07-0500\n"
 "Last-Translator: Adi Roiban <adiroiban@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,245 +50,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Desenează"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Modifică"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Unelte"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Forme"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Text"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Imagini"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Efecte"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Anulează"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Refă"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Copiază"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Lipește"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Șterge"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Culoare pensulă"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Creion"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Pensulă"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Radieră"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Găleată"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Mărime: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Cerc"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Pătrat"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Formă"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Umple"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Culoare de umplere"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Laturi: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Elipsă"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Dreptunghi"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Linie"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Poligon"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Inimă"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Paralelogram"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Săgeată"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Stea"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapez"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Triunghi"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Laturi: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Puncte: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Umple"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Tip"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Introdu o imagine"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Rotește la stânga"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Rotește la dreapta"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Înălțime"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr " Lățime"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Alege imaginea"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Nuanţe de gri"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Curcubeu"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Alege imaginea"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Mărime: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Cerc"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Pătrat"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Formă"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Unelte"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Effects"
+#~ msgstr "Efecte"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Culoare pensulă"
+
+#~ msgid "Pencil"
+#~ msgstr "Creion"
+
+#~ msgid "Fill Color"
+#~ msgstr "Culoare de umplere"
+
+#~ msgid "Points: "
+#~ msgstr "Puncte: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Lupă +"
+#~ msgid "ZOOM +"
+#~ msgstr "Lupă +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Lupă -"
+#~ msgid "ZOOM -"
+#~ msgstr "Lupă -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Marcaj dreptunghiular"
diff --git a/po/ru.po b/po/ru.po
index 068b043..6d7ec05 100644
--- a/po/ru.po
+++ b/po/ru.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2007-11-24 11:11+0000\n"
 "Last-Translator: Maxim Osipov <maxim.osipov@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,245 +50,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Рисовать"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Редактировать"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Инструменты"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Формы"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Текст"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Картинка"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Эффекты"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Отменить"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Повторить"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Копировать"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Вставить"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Очистить"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Цвет Линий"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Карандаш"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Кисть"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Ластик"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Заливка"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Размер: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Круг"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Квадрат"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Фигура"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Заполнение"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Цвет Заполнения"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Стороны: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Эллипс"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Прямоугольник"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Линия"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Многоугольник"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Сердце"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Параллелограмм"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Стрелка"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Звезда"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Трапеция"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Треугольник"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Стороны: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Точки: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Заполнение"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Печатать"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Вставить Картинку"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Вращать Влево"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Вращать Вправо"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Высота"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Ширина"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Выбрать картинку"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Черно-белый"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Радуга"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Выбрать картинку"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Размер: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Круг"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Квадрат"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Фигура"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Инструменты"
+
+#~ msgid "Text"
+#~ msgstr "Текст"
+
+#~ msgid "Effects"
+#~ msgstr "Эффекты"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Цвет Линий"
+
+#~ msgid "Pencil"
+#~ msgstr "Карандаш"
+
+#~ msgid "Fill Color"
+#~ msgstr "Цвет Заполнения"
+
+#~ msgid "Points: "
+#~ msgstr "Точки: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "РАЗМЕР +"
+#~ msgid "ZOOM +"
+#~ msgstr "РАЗМЕР +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "РАЗМЕР -"
+#~ msgid "ZOOM -"
+#~ msgstr "РАЗМЕР -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Прямоугольник"
diff --git a/po/rw.po b/po/rw.po
index b37df6e..c5e5170 100644
--- a/po/rw.po
+++ b/po/rw.po
@@ -38,7 +38,7 @@ msgstr ""
 "PO-Revision-Date: 2012-03-30 07:12+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: rw\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sd.po b/po/sd.po
index 490194f..47c6917 100644
--- a/po/sd.po
+++ b/po/sd.po
@@ -39,10 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,242 +53,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/si.po b/po/si.po
index 856ba3f..f94f1d2 100644
--- a/po/si.po
+++ b/po/si.po
@@ -38,7 +38,7 @@ msgstr ""
 "PO-Revision-Date: 2011-09-28 08:24+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: si\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/sk.po b/po/sk.po
index 0ed1564..02f100d 100644
--- a/po/sk.po
+++ b/po/sk.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-04-01 17:34+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sk\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,242 +49,197 @@ msgstr ""
 msgid "Paint"
 msgstr "Maľovanie"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Editovať"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Text"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Obrázok"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopírovať"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Vložit"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Vyčistiť"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Veľkosť: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Trojuholník"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Typ"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Výška"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Širka"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1492
-msgid "150"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
+#: widgets.py:238
+msgid "Size: "
+msgstr "Veľkosť: "
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#~ msgid "Text"
+#~ msgstr "Text"
diff --git a/po/sl.po b/po/sl.po
index 280d2a2..2bf7ee5 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2010-02-07 05:23+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sl\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -50,245 +50,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Risar"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Urejanje"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Orodja"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Oblike"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Besedilo"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Slika"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Efekti"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Razveljavi"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Ponovi"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopiraj"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Prilepi"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Izbriši"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Barva pisala"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Svinčnik"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Čopič"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Radirka"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Vedro"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Velikost: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Krog"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Kvadrat"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Oblika"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Polnilo"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Barva polnila"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Stranice: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Elipsa"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Kvadrat"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Črta"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Večkotnik"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Srce"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Paraleloglam"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Puščica"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Zvezda"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Trapez"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Trikotnik"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Stranice: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Točke: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Polnilo"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Tip"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Vstavi sliko"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Zavrti v levo"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Zavrti v desno"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Višina"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Širina"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Izberi sliko"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Sivine"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Mavrica"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Izberi sliko"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Velikost: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Krog"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Kvadrat"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Oblika"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Orodja"
+
+#~ msgid "Text"
+#~ msgstr "Besedilo"
+
+#~ msgid "Effects"
+#~ msgstr "Efekti"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Barva pisala"
+
+#~ msgid "Pencil"
+#~ msgstr "Svinčnik"
+
+#~ msgid "Fill Color"
+#~ msgstr "Barva polnila"
+
+#~ msgid "Points: "
+#~ msgstr "Točke: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Približaj +"
+#~ msgid "ZOOM +"
+#~ msgstr "Približaj +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Oddalji -"
+#~ msgid "ZOOM -"
+#~ msgstr "Oddalji -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Pravokotno premično besedilo"
diff --git a/po/sm.po b/po/sm.po
index 0941682..ff4622c 100644
--- a/po/sm.po
+++ b/po/sm.po
@@ -22,11 +22,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-03-28 07:08+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sm\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -36,242 +36,203 @@ msgstr ""
 msgid "Paint"
 msgstr "vali"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "fa'asa'o"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "tusitusiga"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "ata"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "vi'o"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "tafatolu"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "filifili ata"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "filifili ata"
 
-#: toolbox.py:1490
-msgid "500"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1491
-msgid "200"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
+#: widgets.py:249
+msgid "Circle"
+msgstr "vi'o"
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
+#~ msgid "Text"
+#~ msgstr "tusitusiga"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "fa'a lapo'a"
+#~ msgid "ZOOM +"
+#~ msgstr "fa'a lapo'a"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "fa'a laititi"
+#~ msgid "ZOOM -"
+#~ msgstr "fa'a laititi"
diff --git a/po/sr.po b/po/sr.po
index 82ed7b2..83ff5cc 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -22,260 +22,214 @@
 # 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: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2012-02-16 07:39+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
-msgstr ""
+msgstr "Фарбај"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
-msgstr ""
-
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
+msgstr "Уреди"
 
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
-msgstr ""
+msgstr "Облици"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr ""
+#: toolbox.py:117
+msgid "Fonts"
+msgstr "Фонтови"
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
-msgstr ""
-
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
+msgstr "Слика"
 
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
-msgstr ""
+msgstr "Поништи"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
-msgstr ""
+msgstr "Поврати"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
-msgstr ""
+msgstr "Умножи"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
-msgstr ""
+msgstr "Убаци"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
-msgstr ""
-
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
+msgstr "Очисти"
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr "Својства четкице"
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
-msgstr ""
+msgstr "Четкица"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
-msgstr ""
+msgstr "Гумица"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
-msgstr ""
-
-#: toolbox.py:428
-msgid "Select Area"
-msgstr ""
+msgstr "Канта"
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr ""
+#: toolbox.py:274
+msgid "Stamp"
+msgstr "Печат"
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr ""
+#: toolbox.py:287
+msgid "Select Area"
+msgstr "Изабери Површину"
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr ""
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Попуни"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
-msgstr ""
+msgstr "Задржи аспект"
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr ""
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Стране: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr "Својства облика"
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
-msgstr ""
+msgstr "Елипса"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
-msgstr ""
+msgstr "Правоугаоник"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
-msgstr ""
+msgstr "Линија"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
-msgstr ""
+msgstr "Слободна форма"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
-msgstr ""
+msgstr "Полигон"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
-msgstr ""
+msgstr "Срце"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
-msgstr ""
+msgstr "Паралелограм"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
-msgstr ""
+msgstr "Стрела"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
-msgstr ""
+msgstr "Звезда"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
-msgstr ""
+msgstr "Трапез"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
-msgstr ""
-
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
+msgstr "Троугао"
 
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
-msgstr ""
+msgstr "Врста"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
-msgstr ""
+msgstr "Уметни Слику"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
-msgstr ""
+msgstr "Окрени Лево"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
-msgstr ""
+msgstr "Окрени Десно"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
-msgstr ""
+msgstr "Хоризонтално Огледало"
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
-msgstr ""
+msgstr "Вертикално Огледало"
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
-msgstr ""
+msgstr "Висина"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
-msgstr ""
+msgstr "Ширина"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
-msgstr ""
+msgstr "Сива лества"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
-msgstr ""
+msgstr "Дуга"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
-msgstr ""
-
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
+msgstr "Обрни Боје"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Изабери слику"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr "Изабери својства четкице"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
+#: widgets.py:238
+msgid "Size: "
+msgstr "Величина: "
 
-#: toolbox.py:1495
-msgid "25"
-msgstr ""
+#: widgets.py:249
+msgid "Circle"
+msgstr "Круг"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
+#: widgets.py:259
+msgid "Square"
+msgstr "Квадрат"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
+#: widgets.py:271
+msgid "Shape"
+msgstr "Облик"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr "Својства печата"
diff --git a/po/st.po b/po/st.po
index 2bd73d7..6f350be 100644
--- a/po/st.po
+++ b/po/st.po
@@ -11,10 +11,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -24,242 +25,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/sv.po b/po/sv.po
index 5c7e7e8..1431f71 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2009-01-11 13:50-0500\n"
 "Last-Translator: Nicci Manns <nicci@saunalahti.fi>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,246 +48,249 @@ msgstr ""
 msgid "Paint"
 msgstr "Rita"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Redigera"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Verktyg"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Former"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Text"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Bild"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Effekter"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Ångra"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Återställ"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopiera"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Klistra in"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Rensa"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Kantfärg"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Penna"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Pensel"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Suddigummi"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Fyllfärg"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Storlek: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Cirkel"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Fyrkant"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Form"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Fyll"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Fyllfärg"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Sidor: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Oval"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Rektangel"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Linje"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Månghörning"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Hjärtform"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Parallelogram"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Pil"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Stjärna"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Paralelltrapets"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Triangel"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Sidor: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Punkter: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Fyll"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Typ"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Infoga bild"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Vrid vänster"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Vrid höger"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Höjd"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Bredd"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Välj bild"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Gråskala"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Regnbåge"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Välj bild"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Storlek: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Cirkel"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Fyrkant"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Form"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Verktyg"
+
+#~ msgid "Text"
+#~ msgstr "Text"
+
+#~ msgid "Effects"
+#~ msgstr "Effekter"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Kantfärg"
+
+#~ msgid "Pencil"
+#~ msgstr "Penna"
+
+#~ msgid "Fill Color"
+#~ msgstr "Fyllfärg"
+
+#~ msgid "Points: "
+#~ msgstr "Punkter: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
 # Zooma in
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Zooma in"
+#~ msgid "ZOOM +"
+#~ msgstr "Zooma in"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Zooma ut"
+#~ msgid "ZOOM -"
+#~ msgstr "Zooma ut"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Fyrkantsmarkerare"
diff --git a/po/sw.po b/po/sw.po
index 8a775bd..80428ce 100644
--- a/po/sw.po
+++ b/po/sw.po
@@ -42,11 +42,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2011-04-24 12:46+0200\n"
 "Last-Translator: Christian <kryskaka@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: sw\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -57,242 +57,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Rangi"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Hariri"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "vifaa"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "sura"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "nakala"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Tawsira or image"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "athari"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "tengua"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "fanya mara mbili, redo"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Nakili, or nakala"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "kuweka"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "wazi or kuvuta"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "kiharusi michezo"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "penseli"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "brush"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "raba"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "ndoo"
 
-#: toolbox.py:428
+#: toolbox.py:274
+msgid "Stamp"
+msgstr ""
+
+#: toolbox.py:287
 msgid "Select Area"
 msgstr "kuchagua eneo"
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "michezo"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "duara"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "mraba"
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "sura"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "kujaza"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr "kweka kipengele"
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "kujaza michezo"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "pande"
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "duaradufu"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "mstatili"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "mpya"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr "fomu ya bure"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "pembenyingi"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "moyo"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "msambamba"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "arrow"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "nyota"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "trapezoid"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "triangle"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "pande"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "pointi"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "kujaza"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr "kuweka kipengle"
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "aina"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "kutiya image, ku insert image"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "muzunguko wa kushoto"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "muzunguko wa haki"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr "kioo usawa"
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr "kioo wima"
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "urefu"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "upana"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "chagua image, chagua picture,"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "grayscale"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "upunde wa mvua"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr "geuza michezo"
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "elfu moja"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "chagua image, chagua picture,"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "michezo"
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "duara"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "mraba"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "sura"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "vifaa"
+
+#~ msgid "Text"
+#~ msgstr "nakala"
+
+#~ msgid "Effects"
+#~ msgstr "athari"
+
+#~ msgid "Stroke Color"
+#~ msgstr "kiharusi michezo"
+
+#~ msgid "Pencil"
+#~ msgstr "penseli"
+
+#~ msgid "Fill Color"
+#~ msgstr "kujaza michezo"
+
+#~ msgid "Points: "
+#~ msgstr "pointi"
+
+#~ msgid "Keep Aspect"
+#~ msgstr "kuweka kipengle"
+
+#~ msgid "1000"
+#~ msgstr "elfu moja"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "mia tano"
+#~ msgid "500"
+#~ msgstr "mia tano"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "mia mbili"
+#~ msgid "200"
+#~ msgstr "mia mbili"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "mia moja na hamsini"
+#~ msgid "150"
+#~ msgstr "mia moja na hamsini"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "mia moja"
+#~ msgid "100"
+#~ msgstr "mia moja"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "hamsini"
+#~ msgid "50"
+#~ msgstr "hamsini"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "ishirini na tano"
+#~ msgid "25"
+#~ msgstr "ishirini na tano"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "kumi"
+#~ msgid "10"
+#~ msgstr "kumi"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "zoom+; zoom mingi"
+#~ msgid "ZOOM +"
+#~ msgstr "zoom+; zoom mingi"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "zoom -; zoom kidogo"
+#~ msgid "ZOOM -"
+#~ msgstr "zoom -; zoom kidogo"
diff --git a/po/ta.po b/po/ta.po
index 0a3b960..3df95b0 100644
--- a/po/ta.po
+++ b/po/ta.po
@@ -35,15 +35,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2011-08-04 15:26-0300\n"
-"PO-Revision-Date: 2011-08-30 08:02+0200\n"
-"Last-Translator: Thangamani <thangam.arunx@gmail.com>\n"
+"PO-Revision-Date: 2012-03-10 16:41+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Pootle 2.0.1\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
@@ -119,7 +119,7 @@ msgstr "பார்வையை வைத்திரு"
 
 #: toolbox.py:403
 msgid "Sides: "
-msgstr "பக்கங்கள்:"
+msgstr "பக்கங்கள்: "
 
 #: toolbox.py:458
 msgid "Shapes properties"
@@ -223,7 +223,7 @@ msgstr "தூரிகை பண்புகளை தெறிவுச்ச�
 
 #: widgets.py:238
 msgid "Size: "
-msgstr "அளவு:"
+msgstr "அளவு: "
 
 #: widgets.py:249
 msgid "Circle"
diff --git a/po/te.po b/po/te.po
index 086fd0c..bbe179c 100644
--- a/po/te.po
+++ b/po/te.po
@@ -34,258 +34,263 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2008-05-17 11:43+0100\n"
-"Last-Translator: Satyanarayana Murthy Saladi <saladism@gmail.com>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-11-27 06:15+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "చిత్రీకరించు"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "కూర్చు"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "పనిముట్లు"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "ఆకారములు"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "వచనం"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "బొమ్మ"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "ఫలములు"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "చివరిది చెరిపివేయి"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "చివరిది తిరిగిచేయి"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "నకలు"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "అతికించు"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "ఖాళీ చేయి"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "రంగులద్దు"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "పెన్ సిలు"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "కుంచె"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "చెరపడానికి రబ్బరు"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "బాల్చీ"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "కొలత"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "వృత్తము"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "నలుచదరము"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "ఆకారము"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "నింపు"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "రంగుతో నింపు"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "పక్కలు: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "అండాకారము"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "దీర్ఘచదరము"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "గీత"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "బహుకోణి"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "హ్రుదయము"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "నిలువువాటు చదరము"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "బాణం"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "నక్షత్రము"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "ట్రెపిజొయిడ్"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "త్రికోణము"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "పక్కలు:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "పాయింట్లు: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "నింపు"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "రకములు:"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "బొమ్మ దూర్చు"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "ఎడమవైపుకు తిప్పు"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "కుడివైపుకు తిప్పు"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "ఎత్తు"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "వెడల్పు"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "బొమ్మ కోరుకో"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
-msgstr "నలుపు తెలుపు "
+msgstr "నలుపు తెలుపు"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "ఇంద్రధనుస్సు"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "బొమ్మ కోరుకో"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "కొలత: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "వృత్తము"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "నలుచదరము"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "ఆకారము"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "పనిముట్లు"
+
+#~ msgid "Text"
+#~ msgstr "వచనం"
+
+#~ msgid "Effects"
+#~ msgstr "ఫలములు"
+
+#~ msgid "Stroke Color"
+#~ msgstr "రంగులద్దు"
+
+#~ msgid "Pencil"
+#~ msgstr "పెన్ సిలు"
+
+#~ msgid "Fill Color"
+#~ msgstr "రంగుతో నింపు"
+
+#~ msgid "Points: "
+#~ msgstr "పాయింట్లు: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "పెద్దదిగా చూపు"
+#~ msgid "ZOOM +"
+#~ msgstr "పెద్దదిగా చూపు"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "చిన్నదిగా చూపు"
+#~ msgid "ZOOM -"
+#~ msgstr "చిన్నదిగా చూపు"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "దీర్ఘచదరపు మార్ఖీ"
diff --git a/po/templates.po b/po/templates.po
deleted file mode 100644
index 1421391..0000000
--- a/po/templates.po
+++ /dev/null
@@ -1,237 +0,0 @@
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 00:31-0400\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.5.2\n"
-
-#: activity/activity.info:2
-msgid "Paint"
-msgstr ""
-
-#: toolbox.py:101
-msgid "Edit"
-msgstr ""
-
-#: toolbox.py:111
-msgid "Shapes"
-msgstr ""
-
-#: toolbox.py:117
-msgid "Fonts"
-msgstr ""
-
-#: toolbox.py:123
-msgid "Image"
-msgstr ""
-
-#: toolbox.py:153
-msgid "Undo"
-msgstr ""
-
-#: toolbox.py:154
-msgid "Redo"
-msgstr ""
-
-#: toolbox.py:155
-msgid "Copy"
-msgstr ""
-
-#: toolbox.py:156
-msgid "Paste"
-msgstr ""
-
-#: toolbox.py:164
-msgid "Clear"
-msgstr ""
-
-#: toolbox.py:244 widgets.py:311
-msgid "Brush properties"
-msgstr ""
-
-#: toolbox.py:261
-msgid "Brush"
-msgstr ""
-
-#: toolbox.py:266
-msgid "Eraser"
-msgstr ""
-
-#: toolbox.py:270
-msgid "Bucket"
-msgstr ""
-
-#: toolbox.py:274
-msgid "Stamp"
-msgstr ""
-
-#: toolbox.py:287
-msgid "Select Area"
-msgstr ""
-
-#: toolbox.py:380
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:386
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:403
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:458
-msgid "Shapes properties"
-msgstr ""
-
-#: toolbox.py:470
-msgid "Ellipse"
-msgstr ""
-
-#: toolbox.py:474
-msgid "Rectangle"
-msgstr ""
-
-#: toolbox.py:478
-msgid "Line"
-msgstr ""
-
-#: toolbox.py:482
-msgid "Free form"
-msgstr ""
-
-#: toolbox.py:486
-msgid "Polygon"
-msgstr ""
-
-#: toolbox.py:490
-msgid "Heart"
-msgstr ""
-
-#: toolbox.py:494
-msgid "Parallelogram"
-msgstr ""
-
-#: toolbox.py:498
-msgid "Arrow"
-msgstr ""
-
-#: toolbox.py:502
-msgid "Star"
-msgstr ""
-
-#: toolbox.py:506
-msgid "Trapezoid"
-msgstr ""
-
-#: toolbox.py:510
-msgid "Triangle"
-msgstr ""
-
-#: toolbox.py:557
-msgid "Type"
-msgstr ""
-
-#: toolbox.py:677
-msgid "Insert Image"
-msgstr ""
-
-#: toolbox.py:690
-msgid "Rotate Left"
-msgstr ""
-
-#: toolbox.py:694
-msgid "Rotate Right"
-msgstr ""
-
-#: toolbox.py:699
-msgid "Horizontal Mirror"
-msgstr ""
-
-#: toolbox.py:704
-msgid "Vertical Mirror"
-msgstr ""
-
-#: toolbox.py:708
-msgid "Height"
-msgstr ""
-
-#: toolbox.py:719
-msgid "Width"
-msgstr ""
-
-#: toolbox.py:734
-msgid "Grayscale"
-msgstr ""
-
-#: toolbox.py:737
-msgid "Rainbow"
-msgstr ""
-
-#: toolbox.py:742
-msgid "Invert Colors"
-msgstr ""
-
-#: toolbox.py:839
-msgid "Choose image"
-msgstr ""
-
-#: widgets.py:24
-msgid "Choose brush properties"
-msgstr ""
-
-#: widgets.py:238
-msgid "Size: "
-msgstr ""
-
-#: widgets.py:249
-msgid "Circle"
-msgstr ""
-
-#: widgets.py:259
-msgid "Square"
-msgstr ""
-
-#: widgets.py:271
-msgid "Shape"
-msgstr ""
-
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr ""
-
-#: widgets.py:303
-msgid "Stamp properties"
-msgstr ""
diff --git a/po/th.po b/po/th.po
index 69d5b4e..ba7834c 100644
--- a/po/th.po
+++ b/po/th.po
@@ -38,7 +38,7 @@ msgstr ""
 "PO-Revision-Date: 2012-03-09 10:24+0200\n"
 "Last-Translator: Meechai <malaku38@hotmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: th\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
diff --git a/po/ton.po b/po/ton.po
deleted file mode 100644
index 82ed7b2..0000000
--- a/po/ton.po
+++ /dev/null
@@ -1,281 +0,0 @@
-# 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.
-# 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.
-# 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.
-# 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.
-# 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.
-# 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: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\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"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
-
-#: activity/activity.info:2
-msgid "Paint"
-msgstr ""
-
-#: toolbox.py:177
-msgid "Edit"
-msgstr ""
-
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
-msgid "Shapes"
-msgstr ""
-
-#: toolbox.py:189
-msgid "Text"
-msgstr ""
-
-#: toolbox.py:193
-msgid "Image"
-msgstr ""
-
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
-msgid "Undo"
-msgstr ""
-
-#: toolbox.py:216
-msgid "Redo"
-msgstr ""
-
-#: toolbox.py:217
-msgid "Copy"
-msgstr ""
-
-#: toolbox.py:218
-msgid "Paste"
-msgstr ""
-
-#: toolbox.py:226
-msgid "Clear"
-msgstr ""
-
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr ""
-
-#: toolbox.py:384
-msgid "Brush"
-msgstr ""
-
-#: toolbox.py:392
-msgid "Eraser"
-msgstr ""
-
-#: toolbox.py:400
-msgid "Bucket"
-msgstr ""
-
-#: toolbox.py:428
-msgid "Select Area"
-msgstr ""
-
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr ""
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr ""
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr ""
-
-#: toolbox.py:522
-msgid "Keep aspect"
-msgstr ""
-
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:724
-msgid "Ellipse"
-msgstr ""
-
-#: toolbox.py:732
-msgid "Rectangle"
-msgstr ""
-
-#: toolbox.py:740
-msgid "Line"
-msgstr ""
-
-#: toolbox.py:748
-msgid "Free form"
-msgstr ""
-
-#: toolbox.py:757
-msgid "Polygon"
-msgstr ""
-
-#: toolbox.py:765
-msgid "Heart"
-msgstr ""
-
-#: toolbox.py:773
-msgid "Parallelogram"
-msgstr ""
-
-#: toolbox.py:781
-msgid "Arrow"
-msgstr ""
-
-#: toolbox.py:789
-msgid "Star"
-msgstr ""
-
-#: toolbox.py:797
-msgid "Trapezoid"
-msgstr ""
-
-#: toolbox.py:805
-msgid "Triangle"
-msgstr ""
-
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
-msgid "Type"
-msgstr ""
-
-#: toolbox.py:1153
-msgid "Insert Image"
-msgstr ""
-
-#: toolbox.py:1166
-msgid "Rotate Left"
-msgstr ""
-
-#: toolbox.py:1171
-msgid "Rotate Right"
-msgstr ""
-
-#: toolbox.py:1177
-msgid "Horizontal Mirror"
-msgstr ""
-
-#: toolbox.py:1182
-msgid "Vertical Mirror"
-msgstr ""
-
-#: toolbox.py:1186
-msgid "Height"
-msgstr ""
-
-#: toolbox.py:1197
-msgid "Width"
-msgstr ""
-
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
-msgid "Grayscale"
-msgstr ""
-
-#: toolbox.py:1354
-msgid "Rainbow"
-msgstr ""
-
-#: toolbox.py:1361
-msgid "Invert Colors"
-msgstr ""
-
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
-msgstr ""
-
-#: toolbox.py:1493
-msgid "100"
-msgstr ""
-
-#: toolbox.py:1494
-msgid "50"
-msgstr ""
-
-#: toolbox.py:1495
-msgid "25"
-msgstr ""
-
-#: toolbox.py:1496
-msgid "10"
-msgstr ""
-
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr ""
-
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr ""
diff --git a/po/tpi.po b/po/tpi.po
index 9492122..ee95a6b 100644
--- a/po/tpi.po
+++ b/po/tpi.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/tr.po b/po/tr.po
index 4aaadb5..6459b6b 100644
--- a/po/tr.po
+++ b/po/tr.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-10-06 10:52-0400\n"
 "Last-Translator: abdullah kocabas <abdullah.kocabas@abcdizustu.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,245 +48,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Boyama"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Düzenle"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Araçlar"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Şekiller"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Metin"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Görüntü"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Etkiler"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Geri al"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Yeniden yap"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Kopyala"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Yapıştır"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Temizle"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Boya Darbesi"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Kurşunkalem"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Fırça"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Silgi"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Kova"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Boyut"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Çember"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Kare"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Şekil"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Doldur"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Boya"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Kenarlar:"
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Elips"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Dikdörtgen"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Çizgi"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Çokgen"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Kalp"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Paralelkenar"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Ok"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Yıldız"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "İkizkenar yamuk"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Üçgen"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Kenarlar:"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Noktalar"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Doldur"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Yaz"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Resim Ekle"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Sola döndür"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Sağa döndür"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Yükseklik"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Genişlik"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Resim seç"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Gri ton"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Gökkuşağı"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Resim seç"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Boyut"
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Çember"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Kare"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Şekil"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Araçlar"
+
+#~ msgid "Text"
+#~ msgstr "Metin"
+
+#~ msgid "Effects"
+#~ msgstr "Etkiler"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Boya Darbesi"
+
+#~ msgid "Pencil"
+#~ msgstr "Kurşunkalem"
+
+#~ msgid "Fill Color"
+#~ msgstr "Boya"
+
+#~ msgid "Points: "
+#~ msgstr "Noktalar"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Yakınlaştır +"
+#~ msgid "ZOOM +"
+#~ msgstr "Yakınlaştır +"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Uzaklaştır -"
+#~ msgid "ZOOM -"
+#~ msgstr "Uzaklaştır -"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Dikdörtgen Çerçeve"
diff --git a/po/tvl.po b/po/tvl.po
index 9492122..ee95a6b 100644
--- a/po/tvl.po
+++ b/po/tvl.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/tyv.po b/po/tyv.po
index 3ac3112..336b031 100644
--- a/po/tyv.po
+++ b/po/tyv.po
@@ -7,10 +7,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -20,242 +21,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/tzm.po b/po/tzm.po
index 7875dba..5780d50 100644
--- a/po/tzm.po
+++ b/po/tzm.po
@@ -2,19 +2,20 @@
 # 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: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-06-04 00:31-0400\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-10-23 02:41+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.7.0\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
@@ -22,7 +23,7 @@ msgstr ""
 
 #: toolbox.py:101
 msgid "Edit"
-msgstr ""
+msgstr "ⴱⴷⴷⴻⵍ"
 
 #: toolbox.py:111
 msgid "Shapes"
@@ -34,7 +35,7 @@ msgstr ""
 
 #: toolbox.py:123
 msgid "Image"
-msgstr ""
+msgstr "ⵜⵓⴳⵏⴰ"
 
 #: toolbox.py:153
 msgid "Undo"
@@ -46,7 +47,7 @@ msgstr ""
 
 #: toolbox.py:155
 msgid "Copy"
-msgstr ""
+msgstr "ⵜⵓⵏⵖⵉⵍⵜ"
 
 #: toolbox.py:156
 msgid "Paste"
@@ -54,7 +55,7 @@ msgstr ""
 
 #: toolbox.py:164
 msgid "Clear"
-msgstr ""
+msgstr "ⵎⵃⵓ"
 
 #: toolbox.py:244 widgets.py:311
 msgid "Brush properties"
@@ -84,8 +85,8 @@ msgstr ""
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:386
-msgid "Keep Aspect"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
 #: toolbox.py:403
@@ -106,7 +107,7 @@ msgstr ""
 
 #: toolbox.py:478
 msgid "Line"
-msgstr ""
+msgstr "ⵉⵣⵔⵉⵔⵉ"
 
 #: toolbox.py:482
 msgid "Free form"
@@ -208,10 +209,6 @@ msgstr ""
 msgid "Shape"
 msgstr ""
 
-#: widgets.py:277
-msgid "Keep aspect"
-msgstr ""
-
 #: widgets.py:303
 msgid "Stamp properties"
 msgstr ""
diff --git a/po/tzo.po b/po/tzo.po
index 490194f..47c6917 100644
--- a/po/tzo.po
+++ b/po/tzo.po
@@ -39,10 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,242 +53,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ug.po b/po/ug.po
index 9492122..ee95a6b 100644
--- a/po/ug.po
+++ b/po/ug.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/uk.po b/po/uk.po
index 82ed7b2..9c0ed3f 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -27,10 +27,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -40,242 +41,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/ur.po b/po/ur.po
index 27dbe0a..4e1c20c 100644
--- a/po/ur.po
+++ b/po/ur.po
@@ -34,259 +34,266 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2008-03-19 05:14-0400\n"
-"Last-Translator: salman minhas <sulmanminhas@gmail.com>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2012-04-15 10:11+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "رنگ و روغن"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "تدوین کریں"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "آلات"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "شکلیں"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "متن"
+#: toolbox.py:117
+#, fuzzy
+msgid "Fonts"
+msgstr "فانٹ"
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "نقش"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "اثرات"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "کالعدم کریں"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "اعادہ کریں"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "نقل کریں"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "جوڑیں"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "صاف کریں"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "جنبش کا رنگ"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "پينسل"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "برش"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "ربر"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "بالٹی"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "سائز:_"
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "دائره"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "مربع"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "شکل"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "بهریں"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "بھرنے کا رنگ"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "اطراف: "
 
-#: toolbox.py:724
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
+
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "بیضوی شکل"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "مستطيل"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "لکير"
 
-#: toolbox.py:748
+#: toolbox.py:482
+#, fuzzy
 msgid "Free form"
-msgstr ""
+msgstr "آزاد شکل"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "کثیرالاضلاع"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "دل"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "متوازی اضلاع"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "تیر"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "ستاره"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "مربع منحرف نما"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "مثلث"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "اطراف:_"
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "پوائنٹ:_"
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "بهریں"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "قسم"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "نقش داخل کریں"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "بائیں گھمائیں"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "دائیں گھمائیں"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "اونچائی"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "چوڑائی"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "نقش منتخب کریں"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "مٹیالا پیمانه"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "قوس قزح"
 
-#: toolbox.py:1361
+#: toolbox.py:742
+#, fuzzy
 msgid "Invert Colors"
+msgstr "رنگ الٹائیں"
+
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "نقش منتخب کریں"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "سائز: "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "دائره"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "مربع"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "شکل"
+
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#~ msgid "Tools"
+#~ msgstr "آلات"
+
+#~ msgid "Text"
+#~ msgstr "متن"
+
+#~ msgid "Effects"
+#~ msgstr "اثرات"
+
+#~ msgid "Stroke Color"
+#~ msgstr "جنبش کا رنگ"
+
+#~ msgid "Pencil"
+#~ msgstr "پينسل"
+
+#~ msgid "Fill Color"
+#~ msgstr "بھرنے کا رنگ"
+
+#~ msgid "Points: "
+#~ msgstr "پوائنٹ:_"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "زوم+"
+#~ msgid "ZOOM +"
+#~ msgstr "زوم+"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "زوم- "
+#~ msgid "ZOOM -"
+#~ msgstr "زوم- "
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "مستطيل مارقی"
diff --git a/po/vi.po b/po/vi.po
index 906e671..83ffff3 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -34,10 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
 "PO-Revision-Date: 2008-06-01 04:39-0400\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -47,245 +48,248 @@ msgstr ""
 msgid "Paint"
 msgstr "Sơn"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "Sửa"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "Công cụ"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "Hình"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "Văn bản"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "Ảnh"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "Hiệu ứng"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "Hủy bước"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "Hoàn lại"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "Chép"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "Dán"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "Dọn"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "Màu nét"
-
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "Bút chì"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "Chổi"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "Cái cạo"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "Xô"
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "Kích cỡ : "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "Hình tròn"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "Hình vuông"
+#: toolbox.py:287
+msgid "Select Area"
+msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "Hình"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "Tô đầy"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "Màu tô đầy"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "Mặt: "
+
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "Hình bầu dục"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "Hình chữ nhật"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "Đường"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "Hình đa giác"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "Hình tim"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "Hình bình hành"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "Mũi tên"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "Hình sao"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "Hình thang"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "Hình tam giác"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "Mặt: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "Đỉnh: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "Tô đầy"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "Dạng"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "Chèn ảnh"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "Xoay sang trái"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "Xoay sang phải"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "Bề cao"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "Bề rộng"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "Chọn ảnh"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "Mức xám"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "Cầu vồng"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "Chọn ảnh"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr ""
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "Kích cỡ : "
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "Hình tròn"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "Hình vuông"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "Hình"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr ""
+
+#~ msgid "Tools"
+#~ msgstr "Công cụ"
+
+#~ msgid "Text"
+#~ msgstr "Văn bản"
+
+#~ msgid "Effects"
+#~ msgstr "Hiệu ứng"
+
+#~ msgid "Stroke Color"
+#~ msgstr "Màu nét"
+
+#~ msgid "Pencil"
+#~ msgstr "Bút chì"
+
+#~ msgid "Fill Color"
+#~ msgstr "Màu tô đầy"
+
+#~ msgid "Points: "
+#~ msgstr "Đỉnh: "
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "Phóng to"
+#~ msgid "ZOOM +"
+#~ msgstr "Phóng to"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "Thu nhỏ"
+#~ msgid "ZOOM -"
+#~ msgstr "Thu nhỏ"
 
 #~ msgid "Rectangular Marquee"
 #~ msgstr "Bảng chữ chạy hình chữ nhật"
diff --git a/po/wa.po b/po/wa.po
index 9492122..ee95a6b 100644
--- a/po/wa.po
+++ b/po/wa.po
@@ -35,10 +35,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -48,242 +49,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/yo.po b/po/yo.po
index 490194f..47c6917 100644
--- a/po/yo.po
+++ b/po/yo.po
@@ -39,10 +39,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -52,242 +53,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/zh_HK.po b/po/zh_HK.po
index 2e63827..fe1b4d1 100644
--- a/po/zh_HK.po
+++ b/po/zh_HK.po
@@ -15,10 +15,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\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"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -28,242 +29,194 @@ msgstr ""
 msgid "Paint"
 msgstr ""
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr ""
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:189
-msgid "Text"
+#: toolbox.py:117
+msgid "Fonts"
 msgstr ""
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr ""
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr ""
-
-#: toolbox.py:375
-msgid "Pencil"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
 msgstr ""
 
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:428
-msgid "Select Area"
+#: toolbox.py:274
+msgid "Stamp"
 msgstr ""
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr ""
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
+#: toolbox.py:287
+msgid "Select Area"
 msgstr ""
 
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
+#: toolbox.py:380
+msgid "Fill"
 msgstr ""
 
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
+#: toolbox.py:386 widgets.py:277
+msgid "Keep aspect"
 msgstr ""
 
-#: toolbox.py:522
-msgid "Keep aspect"
+#: toolbox.py:403
+msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:706
-msgid "Fill Color"
+#: toolbox.py:458
+msgid "Shapes properties"
 msgstr ""
 
-#: toolbox.py:724
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr ""
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr ""
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr ""
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr ""
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr ""
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr ""
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr ""
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr ""
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr ""
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr ""
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr ""
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr ""
-
-#: toolbox.py:1490
-msgid "500"
-msgstr ""
-
-#: toolbox.py:1491
-msgid "200"
-msgstr ""
-
-#: toolbox.py:1492
-msgid "150"
+#: toolbox.py:839
+msgid "Choose image"
 msgstr ""
 
-#: toolbox.py:1493
-msgid "100"
+#: widgets.py:24
+msgid "Choose brush properties"
 msgstr ""
 
-#: toolbox.py:1494
-msgid "50"
+#: widgets.py:238
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:1495
-msgid "25"
+#: widgets.py:249
+msgid "Circle"
 msgstr ""
 
-#: toolbox.py:1496
-msgid "10"
+#: widgets.py:259
+msgid "Square"
 msgstr ""
 
-#: toolbox.py:1506
-msgid "ZOOM +"
+#: widgets.py:271
+msgid "Shape"
 msgstr ""
 
-#: toolbox.py:1510
-msgid "ZOOM -"
+#: widgets.py:303
+msgid "Stamp properties"
 msgstr ""
diff --git a/po/zh_TW.po b/po/zh_TW.po
index ed4765c..c9660e2 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -30,260 +30,266 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OLPC Paint\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-01-10 14:52-0500\n"
-"PO-Revision-Date: 2011-05-26 23:14+0200\n"
-"Last-Translator: Kenzen <fallwind@seed.net.tw>\n"
+"POT-Creation-Date: 2011-08-04 15:26-0300\n"
+"PO-Revision-Date: 2011-11-08 19:26+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
-"Language: zh_TW\n"
+"Language: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Translate Toolkit 1.6.0\n"
+"X-Generator: Pootle 2.0.5\n"
 
 #: activity/activity.info:2
 msgid "Paint"
 msgstr "繪圖"
 
-#: toolbox.py:177
+#: toolbox.py:101
 msgid "Edit"
 msgstr "編輯"
 
-#: toolbox.py:181
-msgid "Tools"
-msgstr "工具"
-
-#: toolbox.py:185
+#: toolbox.py:111
 msgid "Shapes"
 msgstr "形狀"
 
-#: toolbox.py:189
-msgid "Text"
-msgstr "文字"
+#: toolbox.py:117
+msgid "Fonts"
+msgstr "字型"
 
-#: toolbox.py:193
+#: toolbox.py:123
 msgid "Image"
 msgstr "圖片"
 
-#: toolbox.py:197
-msgid "Effects"
-msgstr "特效"
-
-#: toolbox.py:215
+#: toolbox.py:153
 msgid "Undo"
 msgstr "復原"
 
-#: toolbox.py:216
+#: toolbox.py:154
 msgid "Redo"
 msgstr "取消復原"
 
-#: toolbox.py:217
+#: toolbox.py:155
 msgid "Copy"
 msgstr "複製"
 
-#: toolbox.py:218
+#: toolbox.py:156
 msgid "Paste"
 msgstr "貼上"
 
-#: toolbox.py:226
+#: toolbox.py:164
 msgid "Clear"
 msgstr "清除"
 
-#: toolbox.py:365 toolbox.py:714
-msgid "Stroke Color"
-msgstr "畫筆顏色"
+#: toolbox.py:244 widgets.py:311
+msgid "Brush properties"
+msgstr "筆刷屬性"
 
-#: toolbox.py:375
-msgid "Pencil"
-msgstr "鉛筆"
-
-#: toolbox.py:384
+#: toolbox.py:261
 msgid "Brush"
 msgstr "刷筆"
 
-#: toolbox.py:392
+#: toolbox.py:266
 msgid "Eraser"
 msgstr "橡皮擦"
 
-#: toolbox.py:400
+#: toolbox.py:270
 msgid "Bucket"
 msgstr "水彩桶"
 
-#: toolbox.py:428
+#: toolbox.py:274
+msgid "Stamp"
+msgstr "印章"
+
+#: toolbox.py:287
 msgid "Select Area"
 msgstr "選擇區域"
 
-#: toolbox.py:479 toolbox.py:988 toolbox.py:1420
-msgid "Size: "
-msgstr "尺寸大小: "
-
-#: toolbox.py:498 toolbox.py:1433
-msgid "Circle"
-msgstr "圓形"
-
-#: toolbox.py:505 toolbox.py:1440
-msgid "Square"
-msgstr "正方形"
-
-#: toolbox.py:514 toolbox.py:1449
-msgid "Shape"
-msgstr "形狀"
+#: toolbox.py:380
+msgid "Fill"
+msgstr "填滿"
 
-#: toolbox.py:522
+#: toolbox.py:386 widgets.py:277
 msgid "Keep aspect"
 msgstr "保持長寬比"
 
-#: toolbox.py:706
-msgid "Fill Color"
-msgstr "填滿顏色"
+#: toolbox.py:403
+msgid "Sides: "
+msgstr "邊:"
 
-#: toolbox.py:724
+#: toolbox.py:458
+msgid "Shapes properties"
+msgstr "多邊形屬性"
+
+#: toolbox.py:470
 msgid "Ellipse"
 msgstr "橢圓形"
 
-#: toolbox.py:732
+#: toolbox.py:474
 msgid "Rectangle"
 msgstr "矩形"
 
-#: toolbox.py:740
+#: toolbox.py:478
 msgid "Line"
 msgstr "線條"
 
-#: toolbox.py:748
+#: toolbox.py:482
 msgid "Free form"
 msgstr "自由格式"
 
-#: toolbox.py:757
+#: toolbox.py:486
 msgid "Polygon"
 msgstr "多邊形"
 
-#: toolbox.py:765
+#: toolbox.py:490
 msgid "Heart"
 msgstr "心形"
 
-#: toolbox.py:773
+#: toolbox.py:494
 msgid "Parallelogram"
 msgstr "平行四邊形"
 
-#: toolbox.py:781
+#: toolbox.py:498
 msgid "Arrow"
 msgstr "箭頭"
 
-#: toolbox.py:789
+#: toolbox.py:502
 msgid "Star"
 msgstr "星星"
 
-#: toolbox.py:797
+#: toolbox.py:506
 msgid "Trapezoid"
 msgstr "梯形"
 
-#: toolbox.py:805
+#: toolbox.py:510
 msgid "Triangle"
 msgstr "三角形"
 
-#: toolbox.py:892
-msgid "Sides: "
-msgstr "邊: "
-
-#: toolbox.py:934
-msgid "Points: "
-msgstr "頂點: "
-
-#: toolbox.py:973
-msgid "Fill"
-msgstr "填滿"
-
-#: toolbox.py:1003
-msgid "Keep Aspect"
-msgstr "保持比例"
-
-#: toolbox.py:1033
+#: toolbox.py:557
 msgid "Type"
 msgstr "類型"
 
-#: toolbox.py:1153
+#: toolbox.py:677
 msgid "Insert Image"
 msgstr "插入圖形"
 
-#: toolbox.py:1166
+#: toolbox.py:690
 msgid "Rotate Left"
 msgstr "向左轉"
 
-#: toolbox.py:1171
+#: toolbox.py:694
 msgid "Rotate Right"
 msgstr "向右轉"
 
-#: toolbox.py:1177
+#: toolbox.py:699
 msgid "Horizontal Mirror"
 msgstr "水平鏡像"
 
-#: toolbox.py:1182
+#: toolbox.py:704
 msgid "Vertical Mirror"
 msgstr "垂直鏡像"
 
-#: toolbox.py:1186
+#: toolbox.py:708
 msgid "Height"
 msgstr "高度"
 
-#: toolbox.py:1197
+#: toolbox.py:719
 msgid "Width"
 msgstr "寬度"
 
-#: toolbox.py:1306
-msgid "Choose image"
-msgstr "選擇圖片"
-
-#: toolbox.py:1351
+#: toolbox.py:734
 msgid "Grayscale"
 msgstr "灰階"
 
-#: toolbox.py:1354
+#: toolbox.py:737
 msgid "Rainbow"
 msgstr "漸層色"
 
-#: toolbox.py:1361
+#: toolbox.py:742
 msgid "Invert Colors"
 msgstr "對比色"
 
-#: toolbox.py:1489
-msgid "1000"
-msgstr "1000"
+#: toolbox.py:839
+msgid "Choose image"
+msgstr "選擇圖片"
+
+#: widgets.py:24
+msgid "Choose brush properties"
+msgstr "選擇筆刷屬性"
+
+#: widgets.py:238
+msgid "Size: "
+msgstr "尺寸大小:"
+
+#: widgets.py:249
+msgid "Circle"
+msgstr "圓形"
+
+#: widgets.py:259
+msgid "Square"
+msgstr "正方形"
+
+#: widgets.py:271
+msgid "Shape"
+msgstr "形狀"
+
+#: widgets.py:303
+msgid "Stamp properties"
+msgstr "印章屬性"
+
+#~ msgid "Tools"
+#~ msgstr "工具"
+
+#~ msgid "Text"
+#~ msgstr "文字"
+
+#~ msgid "Effects"
+#~ msgstr "特效"
+
+#~ msgid "Stroke Color"
+#~ msgstr "畫筆顏色"
+
+#~ msgid "Pencil"
+#~ msgstr "鉛筆"
+
+#~ msgid "Fill Color"
+#~ msgstr "填滿顏色"
+
+#~ msgid "Points: "
+#~ msgstr "頂點: "
+
+#~ msgid "Keep Aspect"
+#~ msgstr "保持比例"
+
+#~ msgid "1000"
+#~ msgstr "1000"
 
-#: toolbox.py:1490
-msgid "500"
-msgstr "500"
+#~ msgid "500"
+#~ msgstr "500"
 
-#: toolbox.py:1491
-msgid "200"
-msgstr "200"
+#~ msgid "200"
+#~ msgstr "200"
 
-#: toolbox.py:1492
-msgid "150"
-msgstr "150"
+#~ msgid "150"
+#~ msgstr "150"
 
-#: toolbox.py:1493
-msgid "100"
-msgstr "100"
+#~ msgid "100"
+#~ msgstr "100"
 
-#: toolbox.py:1494
-msgid "50"
-msgstr "50"
+#~ msgid "50"
+#~ msgstr "50"
 
-#: toolbox.py:1495
-msgid "25"
-msgstr "25"
+#~ msgid "25"
+#~ msgstr "25"
 
-#: toolbox.py:1496
-msgid "10"
-msgstr "10"
+#~ msgid "10"
+#~ msgstr "10"
 
-#: toolbox.py:1506
-msgid "ZOOM +"
-msgstr "放大"
+#~ msgid "ZOOM +"
+#~ msgstr "放大"
 
-#: toolbox.py:1510
-msgid "ZOOM -"
-msgstr "縮小"
+#~ msgid "ZOOM -"
+#~ msgstr "縮小"
 
 #~ msgid "Mirror Horizontal"
 #~ msgstr "水平鏡象"
--
cgit v0.9.1