Release version 10.v10trial-3

21 files changed, 787 insertions, 690 deletions

diff --git a/NEWS b/NEWS
index a2dd55a..6543ac7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,7 @@
+10
+
+* Bug #3558 update spanish translations
+
 9
 
 8
diff --git a/activity/activity.info b/activity/activity.info
index bb2f19d..e446393 100644
--- a/activity/activity.info
+++ b/activity/activity.info
@@ -1,6 +1,6 @@
 [Activity]
 name = Paint
-activity_version = 9
+activity_version = 10
 service_name = org.laptop.Oficina
 icon = activity-paint
 class = OficinaActivity.OficinaActivity
diff --git a/locale/ar/LC_MESSAGES/org.laptop.Oficina.mo b/locale/ar/LC_MESSAGES/org.laptop.Oficina.mo
index f591804..4ac1cce 100644
--- a/locale/ar/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/ar/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/de/LC_MESSAGES/org.laptop.Oficina.mo b/locale/de/LC_MESSAGES/org.laptop.Oficina.mo
index 9251667..4b1f599 100644
--- a/locale/de/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/de/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/el/LC_MESSAGES/org.laptop.Oficina.mo b/locale/el/LC_MESSAGES/org.laptop.Oficina.mo
index 03c5065..e4f6ae9 100644
--- a/locale/el/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/el/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/es/LC_MESSAGES/org.laptop.Oficina.mo b/locale/es/LC_MESSAGES/org.laptop.Oficina.mo
index 9c1b8c8..89c6ab2 100644
--- a/locale/es/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/es/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/fr/LC_MESSAGES/org.laptop.Oficina.mo b/locale/fr/LC_MESSAGES/org.laptop.Oficina.mo
index 4657758..64813d9 100644
--- a/locale/fr/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/fr/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/ko_KO/LC_MESSAGES/org.laptop.Oficina.mo b/locale/ko_KO/LC_MESSAGES/org.laptop.Oficina.mo
index 60031b2..84477f2 100644
--- a/locale/ko_KO/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/ko_KO/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/pt_BR/LC_MESSAGES/org.laptop.Oficina.mo b/locale/pt_BR/LC_MESSAGES/org.laptop.Oficina.mo
index 29f4ed4..30ccf02 100644
--- a/locale/pt_BR/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/pt_BR/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/zh_CN/LC_MESSAGES/org.laptop.Oficina.mo b/locale/zh_CN/LC_MESSAGES/org.laptop.Oficina.mo
index 20f2d1a..ed4f820 100644
--- a/locale/zh_CN/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/zh_CN/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/locale/zh_TW/LC_MESSAGES/org.laptop.Oficina.mo b/locale/zh_TW/LC_MESSAGES/org.laptop.Oficina.mo
index eed4904..bb24ba1 100644
--- a/locale/zh_TW/LC_MESSAGES/org.laptop.Oficina.mo
+++ b/locale/zh_TW/LC_MESSAGES/org.laptop.Oficina.mo
diff --git a/po/Paint.pot b/po/Paint.pot
index e39030a..aa7b326 100644
--- a/po/Paint.pot
+++ b/po/Paint.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"POT-Creation-Date: 2007-09-19 09:32-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"
@@ -16,234 +16,242 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr ""
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr ""
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr ""
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr ""
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr ""
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr ""
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr ""
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr ""
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr ""
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr ""
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr ""
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr ""
 
-#: toolbox.py:313
-msgid "Square"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
 msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr ""
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr ""
+
+#: toolbox.py:462 toolbox.py:1450
+msgid "Shape"
+msgstr ""
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr ""
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr ""
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr ""
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr ""
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr ""
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr ""
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr ""
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr ""
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr ""
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr ""
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr ""
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr ""
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr ""
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr ""
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr ""
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr ""
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr ""
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr ""
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr ""
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr ""
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr ""
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr ""
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr ""
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr ""
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr ""
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr ""
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr ""
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr ""
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr ""
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr ""
diff --git a/po/ar.po b/po/ar.po
index 8f9e013..3e2f39d 100644
--- a/po/ar.po
+++ b/po/ar.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 14:09-0300\n"
 "Last-Translator: Khaled Hosny <khaledhosny@eglug.org>\n"
 "Language-Team: Arabic <doc@arabeyes.org>\n"
@@ -15,242 +15,248 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.11.4\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;\nnplurals=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"
+"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"
+"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"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "حرّر"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "أدوات"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "أشكال"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "نص"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "صورة"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "مؤثِّرات"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "قلم"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "فرشاة"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "ممحاة"
 
-#: toolbox.py:250
-#: toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "مضلع"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "محفظة"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "معلِّمة مربّعة"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "مربّع"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
+msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "دائرة"
 
-#: toolbox.py:333
-#: toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "مربّع"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "أشكال"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "١"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "٢"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "٣"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "٥"
 
-#: toolbox.py:561
-#: toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "١٠"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "٢٠"
 
-#: toolbox.py:563
-#: toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "٥٠"
 
-#: toolbox.py:564
-#: toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "١٠٠"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "بيضاوي"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "مستطيل"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "خط"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "قلب"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "متوازي أضلا"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "سهم"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "نجمة"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "معيّن"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "مثلّث"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "نوع"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "أدرج صورة"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "الارتفا"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "العرض"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "افتح ملف..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "تدرج رمادي"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr ""
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr ""
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr ""
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr ""
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr ""
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "زووم +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "زووم -"
-
diff --git a/po/de.po b/po/de.po
index f3deb97..1d56899 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 13:57-0300\n"
 "Last-Translator: Nathalia <nathalia.sautchuk@gmail.com>\n"
 "Language-Team: Language locale/de/LC\n"
@@ -15,234 +15,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "Werkzeuge"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "Formen"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "Text"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "Bild"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "Effekte"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "Bleistift"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "Pinsel"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "Radiergummi"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "Polygon"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "Farbeimer"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "Rechteckige Auswahl"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "Quadrat"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
+msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "Kreis"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "Quadrat"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "Formen"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "Viereck"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "Linie"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "Herz"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "Parallelogramm"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "Pfeil"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "Stern"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "Paralleltrapez"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "Dreieck"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "Type"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "Bild-einsetzen"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "Höhe"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "Breite"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "Datei öffnen…"
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "Graustufen"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ZOOM +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ZOOM -"
diff --git a/po/el.po b/po/el.po
index 9371997..e75ebce 100644
--- a/po/el.po
+++ b/po/el.po
@@ -8,8 +8,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 13:58-0300\n"
 "Last-Translator: Simos Xenitellis <simos.lists@googlemail.com>\n"
 "Language-Team: Greek <olpc-l10n-el@googlegroups.com>\n"
@@ -17,234 +17,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "Επεξεργασία"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "Εργαλεία"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "Σχήματα"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "Κείμενο"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "Εικόνα"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "Εφέ"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "Μολύβι"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "Πινέλο"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "Γόμα"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "Πολύγωνο"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "Κουβάς"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "Ορθογώνια επιλογή"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "Τετράγωνο"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
+msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "Κύκλος"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "Τετράγωνο"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "Σχήματα"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "Έλλειψη"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "Ορθογώνιο"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "Γραμμή"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "Καρδιά"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "Παραλληλόγραμμο"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "Βέλος"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "Άστρο"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "Τραπέζιο"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "Τρίγωνο"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "Τύπος"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "Εισαγωγή εικόνας"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "Ύψος"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "Πλάτος"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "Άνοιγμα αρχείου..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "Κλίμακα του γκρι"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ΕΣΤΙΑΣΗ +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ΕΣΤΙΑΣΗ -"
diff --git a/po/es.po b/po/es.po
index bed109e..91d9575 100644
--- a/po/es.po
+++ b/po/es.po
@@ -1,248 +1,260 @@
 # Spanish translation of Drawing activity.
 # Copyright (C) 2007 NATE LSI-USP
 # This file is distributed under the same license as the Oficina package.
-# 
+#
 # Nathalia <nathalia.sautchuk@gmail.com>, 2007.
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
-"PO-Revision-Date: 2007-09-11 13:58-0300\n"
-"Last-Translator: Nathalia <nathalia.sautchuk@gmail.com>\n"
-"Language-Team: Language locale/es/LC\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
+"PO-Revision-Date: 2007-09-18 09:26-0300\n"
+"Last-Translator: Domingo Becker <domingobecker@gmail.com>\n"
+"Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"X-Poedit-Language: Spanish\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+#, fuzzy
+msgid "Paint"
+msgstr "Puntos: "
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "Editar"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "Herramientas"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "Formas"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "Texto"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "Imagen"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "Efectos"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr "Deshacer"
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr "Rehacer"
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr "Copiar"
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr "Pegar"
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr "Limpiar"
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr "Color da Herramienta"
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "Lápiz"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "Pincel"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "Borrador"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "Polígono"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "Balde"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "Selección Rectangular"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "Cuadrado"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+#, fuzzy
+msgid "Size: "
+msgstr "Tamaño"
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "Círculo"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "Cuadrado"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "Formas"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr "Llenar"
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr "Color de llenado"
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr "Color de llenado"
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr "Color de trazo"
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "Elipse"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "Rectángulo"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "Línea"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "Corazón"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "Paralelogramo"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "Flecha"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "Estrella"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "Trapezoide"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "Triángulo"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr "Lados: "
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr "Puntos: "
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "Teclear"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "Insertar Imagen"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "Altura"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "Anchura"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr "Retamañar (%)"
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "Abrir Archivo..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "Escala de Gris"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr "Arco iris"
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr "Tamaño"
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ZOOM +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ZOOM -"
diff --git a/po/fr.po b/po/fr.po
index 31edd15..a6f141f 100644
--- a/po/fr.po
+++ b/po/fr.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 13:59-0300\n"
 "Last-Translator: Nathalia <nathalia.sautchuk@gmail.com>\n"
 "Language-Team: Language locale/fr/LC\n"
@@ -15,234 +15,245 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+#, fuzzy
+msgid "Paint"
+msgstr "Points: "
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "Éditer"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "Outils"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "Formes"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "Texte"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "Image"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "Effet"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr "Défaire"
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr "Refaire"
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr "Copier"
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr "Collier"
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr "Nettoyer"
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr "Couleur de le Outil"
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "Crayon"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "Pinceau"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "Gomme"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "Polygone"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "Seau"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "Sélection Rectangulaire"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "Carré"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+#, fuzzy
+msgid "Size: "
+msgstr "Taille"
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "Cercle"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "Carré"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "Formes"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "Ligne"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "Coeur"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "Parallélogramme"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "Flèche"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "Étoile"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "Trapèze"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "Triangle"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr "Côtés: "
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr "Points: "
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "Saisir"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "Insérer la Image"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "Hauteur"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "Largeur"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "Ouvrir le Dossier..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "Escale de Gris"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr "Arc-en-ciel"
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr "Taille"
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ZOOM +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ZOOM -"
diff --git a/po/ko_KO.po b/po/ko_KO.po
index ebaf512..0b722a8 100644
--- a/po/ko_KO.po
+++ b/po/ko_KO.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 13:59-0300\n"
 "Last-Translator: Do Young-Min <jeju123@gmail.com>\n"
 "Language-Team: Language locale/ko\n"
@@ -15,234 +15,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "편집"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "툴"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "도형"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "텍스트"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "이미지"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "효과"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "연필"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "붓"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "지우개"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "다각형"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "부켓"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "사각 선택툴"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "사각형"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
+msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "원"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "사각형"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "도형"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "이클립스"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "사각형"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "선"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "중심"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "평행사각형"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "화살표"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "별표"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "사다리꼴"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "삼각형"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "타입"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "이미지 삽입"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "높이"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "폭"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "파일 열기…"
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "그레이 스케일"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "줌 +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "줌 -"
diff --git a/po/pt_BR.po b/po/pt_BR.po
index f32772b..5fa7333 100644
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 14:00-0300\n"
 "Last-Translator: Nathalia <nathalia.sautchuk@gmail.com>\n"
 "Language-Team: Language locale/pt\n"
@@ -15,234 +15,245 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+#, fuzzy
+msgid "Paint"
+msgstr "Pontos: "
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "Editar"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "Ferramentas"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "Formas"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "Texto"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "Imagem"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "Efeitos"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr "Desfazer"
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr "Refazer"
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr "Copiar"
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr "Colar"
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr "Limpar"
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr "Cor da Ferramenta"
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "Lápis"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "Pincel"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "Borracha"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "Polígono"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "Balde"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "Seleção Rectangular"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "Quadrado"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+#, fuzzy
+msgid "Size: "
+msgstr "Tamanho"
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "Círculo"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "Quadrado"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "Formas"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr "Preenchimento"
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr "Cor do Preenchimento"
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr "Cor do Preenchimento"
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr "Cor da Linha"
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "Elipse"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "Retângulo"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "Linha"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "Coração"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "Paralelogramo"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "Seta"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "Estrela"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "Trapézio"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "Triângulo"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr "Lados: "
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr "Pontos: "
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "Digite"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "Inserir Imagem"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "Altura"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "Largura"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr "Redimensionar (%): "
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "Abrir Arquivo..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "Escala de Cinza"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr "Arco-Íris"
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr "Tamanho"
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ZOOM +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ZOOM -"
diff --git a/po/zh_CN.po b/po/zh_CN.po
index fb72bc2..7426bcc 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 14:01-0300\n"
 "Last-Translator: Ho Tsung Yin <johnytyh@lsi.usp.br>\n"
 "Language-Team: Language locale/zh\n"
@@ -15,234 +15,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "编辑"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "工具"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "形状"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "文字"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "图片"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "效果"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "铅笔"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "刷子"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "橡皮艇"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "多边形"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "色彩桶"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "方形选择"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "方形"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
+msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "圆形"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "方形"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "形状"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "椭圆形"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "矩形"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "线条"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "中心"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "平行四边形"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "箭头"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "星状"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "梯形"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "三角形"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "类型"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "插入物件"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "高度"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "宽度"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "开启旧档..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "灰阶"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ZOOM +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ZOOM -"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index c688c42..28b1ad1 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,8 +6,8 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: drawing.master\n"
-"Report-Msgid-Bugs-To: oficina@lsi.usp.br\n"
-"POT-Creation-Date: 2007-09-11 13:52-0300\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-09-19 09:32-0400\n"
 "PO-Revision-Date: 2007-09-11 14:01-0300\n"
 "Last-Translator: Ho Tsung Yin <johnytyh@lsi.usp.br>\n"
 "Language-Team: Language locale/zh\n"
@@ -15,234 +15,243 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: toolbox.py:75
+#: activity/activity.info:2 OficinaActivity.py:79
+msgid "Paint"
+msgstr ""
+
+#: toolbox.py:76
 msgid "Edit"
 msgstr "編輯"
 
-#: toolbox.py:79
+#: toolbox.py:80
 msgid "Tools"
 msgstr "工具"
 
-#: toolbox.py:83
+#: toolbox.py:84
 msgid "Shapes"
 msgstr "形狀"
 
-#: toolbox.py:87
+#: toolbox.py:88
 msgid "Text"
 msgstr "文字"
 
-#: toolbox.py:91
+#: toolbox.py:92
 msgid "Image"
 msgstr "圖片"
 
-#: toolbox.py:95
+#: toolbox.py:96
 msgid "Effects"
 msgstr "效果"
 
-#: toolbox.py:110
+#: toolbox.py:114
 msgid "Undo"
 msgstr ""
 
-#: toolbox.py:111
+#: toolbox.py:115
 msgid "Redo"
 msgstr ""
 
-#: toolbox.py:112
+#: toolbox.py:116
 msgid "Copy"
 msgstr ""
 
-#: toolbox.py:113
+#: toolbox.py:117
 msgid "Paste"
 msgstr ""
 
-#: toolbox.py:123
+#: toolbox.py:127
 msgid "Clear"
 msgstr ""
 
-#: toolbox.py:198
+#: toolbox.py:284
 msgid "Tool Color"
 msgstr ""
 
-#: toolbox.py:227
+#: toolbox.py:313
 msgid "Pencil"
 msgstr "鉛筆"
 
-#: toolbox.py:232
+#: toolbox.py:322
 msgid "Brush"
 msgstr "刷子"
 
-#: toolbox.py:241
+#: toolbox.py:331
 msgid "Eraser"
 msgstr "橡皮艇"
 
-#: toolbox.py:250 toolbox.py:715
+#: toolbox.py:340 toolbox.py:857
 msgid "Polygon"
 msgstr "多邊形"
 
-#: toolbox.py:259
+#: toolbox.py:349
 msgid "Bucket"
 msgstr "色彩桶"
 
-#: toolbox.py:283
+#: toolbox.py:378
 msgid "Rectangular Marquee"
 msgstr "矩形選擇"
 
-#: toolbox.py:313
-msgid "Square"
-msgstr "方形"
+#: toolbox.py:429 toolbox.py:1102 toolbox.py:1420
+msgid "Size: "
+msgstr ""
 
-#: toolbox.py:314
+#: toolbox.py:442 toolbox.py:1430
 msgid "Circle"
 msgstr "圓形"
 
-#: toolbox.py:333 toolbox.py:949
+#: toolbox.py:451 toolbox.py:1439
+msgid "Square"
+msgstr "方形"
+
+#: toolbox.py:462 toolbox.py:1450
+#, fuzzy
+msgid "Shape"
+msgstr "形狀"
+
+#: toolbox.py:481 toolbox.py:1080
 msgid "Fill"
 msgstr ""
 
-#: toolbox.py:557
+#: toolbox.py:491 toolbox.py:795
+msgid "Fill Color"
+msgstr ""
+
+#: toolbox.py:598
 msgid "1"
 msgstr "1"
 
-#: toolbox.py:558
+#: toolbox.py:599
 msgid "2"
 msgstr "2"
 
-#: toolbox.py:559
+#: toolbox.py:600
 msgid "3"
 msgstr "3"
 
-#: toolbox.py:560
+#: toolbox.py:601
 msgid "5"
 msgstr "5"
 
-#: toolbox.py:561 toolbox.py:1306
+#: toolbox.py:602 toolbox.py:1503
 msgid "10"
 msgstr "10"
 
-#: toolbox.py:562
+#: toolbox.py:603
 msgid "20"
 msgstr "20"
 
-#: toolbox.py:563 toolbox.py:1304
+#: toolbox.py:604 toolbox.py:1501
 msgid "50"
 msgstr "50"
 
-#: toolbox.py:564 toolbox.py:1303
+#: toolbox.py:605 toolbox.py:1500
 msgid "100"
 msgstr "100"
 
-#: toolbox.py:657
-msgid "Fill Color"
-msgstr ""
-
-#: toolbox.py:669
+#: toolbox.py:807
 msgid "Stroke Color"
 msgstr ""
 
-#: toolbox.py:692
+#: toolbox.py:830
 msgid "Ellipse"
 msgstr "橢圓形"
 
-#: toolbox.py:701
+#: toolbox.py:839
 msgid "Rectangle"
 msgstr "矩形"
 
-#: toolbox.py:710
+#: toolbox.py:848
 msgid "Line"
 msgstr "線條"
 
-#: toolbox.py:733
+#: toolbox.py:875
 msgid "Heart"
 msgstr "中心"
 
-#: toolbox.py:743
+#: toolbox.py:885
 msgid "Parallelogram"
 msgstr "平行四邊形"
 
-#: toolbox.py:752
+#: toolbox.py:894
 msgid "Arrow"
 msgstr "箭頭"
 
-#: toolbox.py:761
+#: toolbox.py:903
 msgid "Star"
 msgstr "星狀"
 
-#: toolbox.py:770
+#: toolbox.py:912
 msgid "Trapezoid"
 msgstr "梯形"
 
-#: toolbox.py:779
+#: toolbox.py:921
 msgid "Triangle"
 msgstr "三角形"
 
-#: toolbox.py:882
+#: toolbox.py:1011
 msgid "Sides: "
 msgstr ""
 
-#: toolbox.py:925
+#: toolbox.py:1053
 msgid "Points: "
 msgstr ""
 
-#: toolbox.py:987
+#: toolbox.py:1145
 msgid "Type"
 msgstr "類型"
 
-#: toolbox.py:1061
+#: toolbox.py:1215
 msgid "Insert Image"
 msgstr "插入物件"
 
-#: toolbox.py:1083
+#: toolbox.py:1237
 msgid "Height"
 msgstr "高度"
 
-#: toolbox.py:1088
+#: toolbox.py:1242
 msgid "Width"
 msgstr "寬度"
 
-#: toolbox.py:1139
+#: toolbox.py:1293
 msgid "Resize (%): "
 msgstr ""
 
-#: toolbox.py:1148
+#: toolbox.py:1302
 msgid "Open File..."
 msgstr "開啟舊檔..."
 
-#: toolbox.py:1188
+#: toolbox.py:1350
 msgid "Grayscale"
 msgstr "灰階"
 
-#: toolbox.py:1193
+#: toolbox.py:1355
 msgid "Rainbow"
 msgstr ""
 
-#: toolbox.py:1262
-msgid "Size"
-msgstr ""
-
-#: toolbox.py:1299
+#: toolbox.py:1496
 msgid "1000"
 msgstr "1000"
 
-#: toolbox.py:1300
+#: toolbox.py:1497
 msgid "500"
 msgstr "500"
 
-#: toolbox.py:1301
+#: toolbox.py:1498
 msgid "200"
 msgstr "200"
 
-#: toolbox.py:1302
+#: toolbox.py:1499
 msgid "150"
 msgstr "150"
 
-#: toolbox.py:1305
+#: toolbox.py:1502
 msgid "25"
 msgstr "25"
 
-#: toolbox.py:1319
+#: toolbox.py:1516
 msgid "ZOOM +"
 msgstr "ZOOM +"
 
-#: toolbox.py:1324
+#: toolbox.py:1521
 msgid "ZOOM -"
 msgstr "ZOOM -"