Merge branch 'master' of git.sugarlabs.org:paint/mainline

6 files changed, 299 insertions, 275 deletions

diff --git a/po/da.po b/po/da.po
index 600d6cd..1999205 100644
--- a/po/da.po
+++ b/po/da.po
@@ -6,186 +6,190 @@ msgid ""
 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-06-02 18:22+0200\n"
-"Last-Translator: Aputsiaq <aj@isit.gl>\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\n"
+"PO-Revision-Date: 2012-04-21 18:30+0200\n"
+"Last-Translator: Aputsiaq Niels <aj@isit.gl>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: da\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 "Mal"
 
-#: toolbox.py:101
+#: toolbox.py:103
 msgid "Edit"
 msgstr "Redigér"
 
-#: toolbox.py:111
+#: toolbox.py:113
 msgid "Shapes"
 msgstr "Former"
 
-#: toolbox.py:117
+#: toolbox.py:119
 msgid "Fonts"
 msgstr "Skrifttyper"
 
-#: toolbox.py:123
+#: toolbox.py:125
 msgid "Image"
 msgstr "Billede"
 
-#: toolbox.py:153
+#: toolbox.py:150
 msgid "Undo"
 msgstr "Fortryd"
 
-#: toolbox.py:154
+#: toolbox.py:151
 msgid "Redo"
 msgstr "Omgør"
 
-#: toolbox.py:155
+#: toolbox.py:152
 msgid "Copy"
 msgstr "Kopiér"
 
-#: toolbox.py:156
+#: toolbox.py:153
 msgid "Paste"
 msgstr "Indsæt"
 
-#: toolbox.py:164
+#: toolbox.py:161
 msgid "Clear"
 msgstr "Ryd"
 
-#: toolbox.py:244 widgets.py:311
+#: toolbox.py:242 widgets.py:311
 msgid "Brush properties"
 msgstr "Egenskaber for pensel"
 
-#: toolbox.py:261
+#: toolbox.py:253
 msgid "Brush"
 msgstr "Pensel"
 
-#: toolbox.py:266
+#: toolbox.py:258
 msgid "Eraser"
 msgstr "Viskelæder"
 
-#: toolbox.py:270
+#: toolbox.py:262
 msgid "Bucket"
 msgstr "Spand"
 
-#: toolbox.py:274
+#: toolbox.py:266
+msgid "Picker"
+msgstr "Udvælgelse"
+
+#: toolbox.py:270
 msgid "Stamp"
 msgstr "Stempel"
 
-#: toolbox.py:287
+#: toolbox.py:283
 msgid "Select Area"
 msgstr "Markér område"
 
-#: toolbox.py:380
+#: toolbox.py:378
 msgid "Fill"
 msgstr "Fyld"
 
-#: toolbox.py:386 widgets.py:277
+#: toolbox.py:384 widgets.py:277
 msgid "Keep aspect"
 msgstr "Bevar aspekt"
 
-#: toolbox.py:403
+#: toolbox.py:401
 msgid "Sides: "
 msgstr "Sider: "
 
-#: toolbox.py:458
+#: toolbox.py:456
 msgid "Shapes properties"
 msgstr "Egenskaber for former"
 
-#: toolbox.py:470
+#: toolbox.py:468
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:474
+#: toolbox.py:472
 msgid "Rectangle"
 msgstr "Rektangel"
 
-#: toolbox.py:478
+#: toolbox.py:476
 msgid "Line"
 msgstr "Linje"
 
-#: toolbox.py:482
+#: toolbox.py:480
 msgid "Free form"
 msgstr "Fri form"
 
-#: toolbox.py:486
+#: toolbox.py:484
 msgid "Polygon"
 msgstr "Polygon"
 
-#: toolbox.py:490
+#: toolbox.py:488
 msgid "Heart"
 msgstr "Hjerte"
 
-#: toolbox.py:494
+#: toolbox.py:492
 msgid "Parallelogram"
 msgstr "Parallelogram"
 
-#: toolbox.py:498
+#: toolbox.py:496
 msgid "Arrow"
 msgstr "Pil"
 
-#: toolbox.py:502
+#: toolbox.py:500
 msgid "Star"
 msgstr "Stjerne"
 
-#: toolbox.py:506
+#: toolbox.py:504
 msgid "Trapezoid"
 msgstr "Trapez"
 
-#: toolbox.py:510
+#: toolbox.py:508
 msgid "Triangle"
 msgstr "Trekant"
 
-#: toolbox.py:557
+#: toolbox.py:555
 msgid "Type"
 msgstr "Type"
 
-#: toolbox.py:677
+#: toolbox.py:666
 msgid "Insert Image"
 msgstr "Indsæt billede"
 
-#: toolbox.py:690
+#: toolbox.py:679
 msgid "Rotate Left"
 msgstr "Rotér til venstre"
 
-#: toolbox.py:694
+#: toolbox.py:683
 msgid "Rotate Right"
 msgstr "Rotér til højre"
 
-#: toolbox.py:699
+#: toolbox.py:688
 msgid "Horizontal Mirror"
 msgstr "Spejlvend vandret"
 
-#: toolbox.py:704
+#: toolbox.py:693
 msgid "Vertical Mirror"
 msgstr "Spejlvend lodret"
 
-#: toolbox.py:708
+#: toolbox.py:697
 msgid "Height"
 msgstr "Højde"
 
-#: toolbox.py:719
+#: toolbox.py:708
 msgid "Width"
 msgstr "Bredde"
 
-#: toolbox.py:734
+#: toolbox.py:723
 msgid "Grayscale"
 msgstr "Gråskala"
 
-#: toolbox.py:737
+#: toolbox.py:726
 msgid "Rainbow"
 msgstr "Regnbue"
 
-#: toolbox.py:742
+#: toolbox.py:731
 msgid "Invert Colors"
 msgstr "Invertér farver"
 
-#: toolbox.py:839
+#: toolbox.py:806 toolbox.py:810
 msgid "Choose image"
 msgstr "Vælg billede"
 
diff --git a/po/en.po b/po/en.po
index 73d17c2..8d42fd2 100644
--- a/po/en.po
+++ b/po/en.po
@@ -42,186 +42,190 @@ msgid ""
 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-07 06:35+0200\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\n"
+"PO-Revision-Date: 2012-04-21 07:01+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: en\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"
 msgstr "Paint"
 
-#: toolbox.py:101
+#: toolbox.py:103
 msgid "Edit"
 msgstr "Edit"
 
-#: toolbox.py:111
+#: toolbox.py:113
 msgid "Shapes"
 msgstr "Shapes"
 
-#: toolbox.py:117
+#: toolbox.py:119
 msgid "Fonts"
 msgstr "Fonts"
 
-#: toolbox.py:123
+#: toolbox.py:125
 msgid "Image"
 msgstr "Image"
 
-#: toolbox.py:153
+#: toolbox.py:150
 msgid "Undo"
 msgstr "Undo"
 
-#: toolbox.py:154
+#: toolbox.py:151
 msgid "Redo"
 msgstr "Redo"
 
-#: toolbox.py:155
+#: toolbox.py:152
 msgid "Copy"
 msgstr "Copy"
 
-#: toolbox.py:156
+#: toolbox.py:153
 msgid "Paste"
 msgstr "Paste"
 
-#: toolbox.py:164
+#: toolbox.py:161
 msgid "Clear"
 msgstr "Clear"
 
-#: toolbox.py:244 widgets.py:311
+#: toolbox.py:242 widgets.py:311
 msgid "Brush properties"
 msgstr "Brush properties"
 
-#: toolbox.py:261
+#: toolbox.py:253
 msgid "Brush"
 msgstr "Brush"
 
-#: toolbox.py:266
+#: toolbox.py:258
 msgid "Eraser"
 msgstr "Eraser"
 
-#: toolbox.py:270
+#: toolbox.py:262
 msgid "Bucket"
 msgstr "Bucket"
 
-#: toolbox.py:274
+#: toolbox.py:266
+msgid "Picker"
+msgstr "Picker"
+
+#: toolbox.py:270
 msgid "Stamp"
 msgstr "Stamp"
 
-#: toolbox.py:287
+#: toolbox.py:283
 msgid "Select Area"
 msgstr "Select Area"
 
-#: toolbox.py:380
+#: toolbox.py:378
 msgid "Fill"
 msgstr "Fill"
 
-#: toolbox.py:386 widgets.py:277
+#: toolbox.py:384 widgets.py:277
 msgid "Keep aspect"
 msgstr "Keep aspect"
 
-#: toolbox.py:403
+#: toolbox.py:401
 msgid "Sides: "
 msgstr "Sides: "
 
-#: toolbox.py:458
+#: toolbox.py:456
 msgid "Shapes properties"
 msgstr "Shapes properties"
 
-#: toolbox.py:470
+#: toolbox.py:468
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:474
+#: toolbox.py:472
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: toolbox.py:478
+#: toolbox.py:476
 msgid "Line"
 msgstr "Line"
 
-#: toolbox.py:482
+#: toolbox.py:480
 msgid "Free form"
 msgstr "Free form"
 
-#: toolbox.py:486
+#: toolbox.py:484
 msgid "Polygon"
 msgstr "Polygon"
 
-#: toolbox.py:490
+#: toolbox.py:488
 msgid "Heart"
 msgstr "Heart"
 
-#: toolbox.py:494
+#: toolbox.py:492
 msgid "Parallelogram"
 msgstr "Parallelogram"
 
-#: toolbox.py:498
+#: toolbox.py:496
 msgid "Arrow"
 msgstr "Arrow"
 
-#: toolbox.py:502
+#: toolbox.py:500
 msgid "Star"
 msgstr "Star"
 
-#: toolbox.py:506
+#: toolbox.py:504
 msgid "Trapezoid"
 msgstr "Trapezoid"
 
-#: toolbox.py:510
+#: toolbox.py:508
 msgid "Triangle"
 msgstr "Triangle"
 
-#: toolbox.py:557
+#: toolbox.py:555
 msgid "Type"
 msgstr "Type"
 
-#: toolbox.py:677
+#: toolbox.py:666
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: toolbox.py:690
+#: toolbox.py:679
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
-#: toolbox.py:694
+#: toolbox.py:683
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: toolbox.py:699
+#: toolbox.py:688
 msgid "Horizontal Mirror"
 msgstr "Horizontal Mirror"
 
-#: toolbox.py:704
+#: toolbox.py:693
 msgid "Vertical Mirror"
 msgstr "Vertical Mirror"
 
-#: toolbox.py:708
+#: toolbox.py:697
 msgid "Height"
 msgstr "Height"
 
-#: toolbox.py:719
+#: toolbox.py:708
 msgid "Width"
 msgstr "Width"
 
-#: toolbox.py:734
+#: toolbox.py:723
 msgid "Grayscale"
 msgstr "Grayscale"
 
-#: toolbox.py:737
+#: toolbox.py:726
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: toolbox.py:742
+#: toolbox.py:731
 msgid "Invert Colors"
 msgstr "Invert Colors"
 
-#: toolbox.py:839
+#: toolbox.py:806 toolbox.py:810
 msgid "Choose image"
 msgstr "Choose image"
 
diff --git a/po/en_GB.po b/po/en_GB.po
index a72dcd5..0d2c995 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -26,11 +26,11 @@ msgid ""
 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: 2012-02-01 00:45+0200\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\n"
+"PO-Revision-Date: 2012-04-21 09:12+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: en_GB\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -41,171 +41,175 @@ msgstr ""
 msgid "Paint"
 msgstr "Paint"
 
-#: toolbox.py:101
+#: toolbox.py:103
 msgid "Edit"
 msgstr "Edit"
 
-#: toolbox.py:111
+#: toolbox.py:113
 msgid "Shapes"
 msgstr "Shapes"
 
-#: toolbox.py:117
+#: toolbox.py:119
 msgid "Fonts"
 msgstr "Fonts"
 
-#: toolbox.py:123
+#: toolbox.py:125
 msgid "Image"
 msgstr "Image"
 
-#: toolbox.py:153
+#: toolbox.py:150
 msgid "Undo"
 msgstr "Undo"
 
-#: toolbox.py:154
+#: toolbox.py:151
 msgid "Redo"
 msgstr "Redo"
 
-#: toolbox.py:155
+#: toolbox.py:152
 msgid "Copy"
 msgstr "Copy"
 
-#: toolbox.py:156
+#: toolbox.py:153
 msgid "Paste"
 msgstr "Paste"
 
-#: toolbox.py:164
+#: toolbox.py:161
 msgid "Clear"
 msgstr "Clear"
 
-#: toolbox.py:244 widgets.py:311
+#: toolbox.py:242 widgets.py:311
 msgid "Brush properties"
 msgstr "Brush properties"
 
-#: toolbox.py:261
+#: toolbox.py:253
 msgid "Brush"
 msgstr "Brush"
 
-#: toolbox.py:266
+#: toolbox.py:258
 msgid "Eraser"
 msgstr "Eraser"
 
-#: toolbox.py:270
+#: toolbox.py:262
 msgid "Bucket"
 msgstr "Bucket"
 
-#: toolbox.py:274
+#: toolbox.py:266
+msgid "Picker"
+msgstr "Picker"
+
+#: toolbox.py:270
 msgid "Stamp"
 msgstr "Stamp"
 
-#: toolbox.py:287
+#: toolbox.py:283
 msgid "Select Area"
 msgstr "Select Area"
 
-#: toolbox.py:380
+#: toolbox.py:378
 msgid "Fill"
 msgstr "Fill"
 
-#: toolbox.py:386 widgets.py:277
+#: toolbox.py:384 widgets.py:277
 msgid "Keep aspect"
 msgstr "Keep aspect"
 
-#: toolbox.py:403
+#: toolbox.py:401
 msgid "Sides: "
 msgstr "Sides: "
 
-#: toolbox.py:458
+#: toolbox.py:456
 msgid "Shapes properties"
 msgstr "Shapes properties"
 
-#: toolbox.py:470
+#: toolbox.py:468
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:474
+#: toolbox.py:472
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: toolbox.py:478
+#: toolbox.py:476
 msgid "Line"
 msgstr "Line"
 
-#: toolbox.py:482
+#: toolbox.py:480
 msgid "Free form"
 msgstr "Free form"
 
-#: toolbox.py:486
+#: toolbox.py:484
 msgid "Polygon"
 msgstr "Polygon"
 
-#: toolbox.py:490
+#: toolbox.py:488
 msgid "Heart"
 msgstr "Heart"
 
-#: toolbox.py:494
+#: toolbox.py:492
 msgid "Parallelogram"
 msgstr "Parallelogram"
 
-#: toolbox.py:498
+#: toolbox.py:496
 msgid "Arrow"
 msgstr "Arrow"
 
-#: toolbox.py:502
+#: toolbox.py:500
 msgid "Star"
 msgstr "Star"
 
-#: toolbox.py:506
+#: toolbox.py:504
 msgid "Trapezoid"
 msgstr "Trapezoid"
 
-#: toolbox.py:510
+#: toolbox.py:508
 msgid "Triangle"
 msgstr "Triangle"
 
-#: toolbox.py:557
+#: toolbox.py:555
 msgid "Type"
 msgstr "Type"
 
-#: toolbox.py:677
+#: toolbox.py:666
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: toolbox.py:690
+#: toolbox.py:679
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
-#: toolbox.py:694
+#: toolbox.py:683
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: toolbox.py:699
+#: toolbox.py:688
 msgid "Horizontal Mirror"
 msgstr "Horizontal Mirror"
 
-#: toolbox.py:704
+#: toolbox.py:693
 msgid "Vertical Mirror"
 msgstr "Vertical Mirror"
 
-#: toolbox.py:708
+#: toolbox.py:697
 msgid "Height"
 msgstr "Height"
 
-#: toolbox.py:719
+#: toolbox.py:708
 msgid "Width"
 msgstr "Width"
 
-#: toolbox.py:734
+#: toolbox.py:723
 msgid "Grayscale"
 msgstr "Greyscale"
 
-#: toolbox.py:737
+#: toolbox.py:726
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: toolbox.py:742
+#: toolbox.py:731
 msgid "Invert Colors"
 msgstr "Invert Colours"
 
-#: toolbox.py:839
+#: toolbox.py:806 toolbox.py:810
 msgid "Choose image"
 msgstr "Choose image"
 
diff --git a/po/en_US.po b/po/en_US.po
index 6169947..d8ee42b 100644
--- a/po/en_US.po
+++ b/po/en_US.po
@@ -30,186 +30,190 @@ msgid ""
 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-06-02 07:53+0200\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\n"
+"PO-Revision-Date: 2012-04-21 09:12+0200\n"
 "Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: en_US\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 "Paint"
 
-#: toolbox.py:101
+#: toolbox.py:103
 msgid "Edit"
 msgstr "Edit"
 
-#: toolbox.py:111
+#: toolbox.py:113
 msgid "Shapes"
 msgstr "Shapes"
 
-#: toolbox.py:117
+#: toolbox.py:119
 msgid "Fonts"
 msgstr "Fonts"
 
-#: toolbox.py:123
+#: toolbox.py:125
 msgid "Image"
 msgstr "Image"
 
-#: toolbox.py:153
+#: toolbox.py:150
 msgid "Undo"
 msgstr "Undo"
 
-#: toolbox.py:154
+#: toolbox.py:151
 msgid "Redo"
 msgstr "Redo"
 
-#: toolbox.py:155
+#: toolbox.py:152
 msgid "Copy"
 msgstr "Copy"
 
-#: toolbox.py:156
+#: toolbox.py:153
 msgid "Paste"
 msgstr "Paste"
 
-#: toolbox.py:164
+#: toolbox.py:161
 msgid "Clear"
 msgstr "Clear"
 
-#: toolbox.py:244 widgets.py:311
+#: toolbox.py:242 widgets.py:311
 msgid "Brush properties"
 msgstr "Brush properties"
 
-#: toolbox.py:261
+#: toolbox.py:253
 msgid "Brush"
 msgstr "Brush"
 
-#: toolbox.py:266
+#: toolbox.py:258
 msgid "Eraser"
 msgstr "Eraser"
 
-#: toolbox.py:270
+#: toolbox.py:262
 msgid "Bucket"
 msgstr "Bucket"
 
-#: toolbox.py:274
+#: toolbox.py:266
+msgid "Picker"
+msgstr "Picker"
+
+#: toolbox.py:270
 msgid "Stamp"
 msgstr "Stamp"
 
-#: toolbox.py:287
+#: toolbox.py:283
 msgid "Select Area"
 msgstr "Select Area"
 
-#: toolbox.py:380
+#: toolbox.py:378
 msgid "Fill"
 msgstr "Fill"
 
-#: toolbox.py:386 widgets.py:277
+#: toolbox.py:384 widgets.py:277
 msgid "Keep aspect"
 msgstr "Keep aspect"
 
-#: toolbox.py:403
+#: toolbox.py:401
 msgid "Sides: "
 msgstr "Sides: "
 
-#: toolbox.py:458
+#: toolbox.py:456
 msgid "Shapes properties"
 msgstr "Shapes properties"
 
-#: toolbox.py:470
+#: toolbox.py:468
 msgid "Ellipse"
 msgstr "Ellipse"
 
-#: toolbox.py:474
+#: toolbox.py:472
 msgid "Rectangle"
 msgstr "Rectangle"
 
-#: toolbox.py:478
+#: toolbox.py:476
 msgid "Line"
 msgstr "Line"
 
-#: toolbox.py:482
+#: toolbox.py:480
 msgid "Free form"
 msgstr "Free form"
 
-#: toolbox.py:486
+#: toolbox.py:484
 msgid "Polygon"
 msgstr "Polygon"
 
-#: toolbox.py:490
+#: toolbox.py:488
 msgid "Heart"
 msgstr "Heart"
 
-#: toolbox.py:494
+#: toolbox.py:492
 msgid "Parallelogram"
 msgstr "Parallelogram"
 
-#: toolbox.py:498
+#: toolbox.py:496
 msgid "Arrow"
 msgstr "Arrow"
 
-#: toolbox.py:502
+#: toolbox.py:500
 msgid "Star"
 msgstr "Star"
 
-#: toolbox.py:506
+#: toolbox.py:504
 msgid "Trapezoid"
 msgstr "Trapezoid"
 
-#: toolbox.py:510
+#: toolbox.py:508
 msgid "Triangle"
 msgstr "Triangle"
 
-#: toolbox.py:557
+#: toolbox.py:555
 msgid "Type"
 msgstr "Type"
 
-#: toolbox.py:677
+#: toolbox.py:666
 msgid "Insert Image"
 msgstr "Insert Image"
 
-#: toolbox.py:690
+#: toolbox.py:679
 msgid "Rotate Left"
 msgstr "Rotate Left"
 
-#: toolbox.py:694
+#: toolbox.py:683
 msgid "Rotate Right"
 msgstr "Rotate Right"
 
-#: toolbox.py:699
+#: toolbox.py:688
 msgid "Horizontal Mirror"
 msgstr "Horizontal Mirror"
 
-#: toolbox.py:704
+#: toolbox.py:693
 msgid "Vertical Mirror"
 msgstr "Vertical Mirror"
 
-#: toolbox.py:708
+#: toolbox.py:697
 msgid "Height"
 msgstr "Height"
 
-#: toolbox.py:719
+#: toolbox.py:708
 msgid "Width"
 msgstr "Width"
 
-#: toolbox.py:734
+#: toolbox.py:723
 msgid "Grayscale"
 msgstr "Grayscale"
 
-#: toolbox.py:737
+#: toolbox.py:726
 msgid "Rainbow"
 msgstr "Rainbow"
 
-#: toolbox.py:742
+#: toolbox.py:731
 msgid "Invert Colors"
 msgstr "Invert Colors"
 
-#: toolbox.py:839
+#: toolbox.py:806 toolbox.py:810
 msgid "Choose image"
 msgstr "Choose image"
 
diff --git a/po/pt.po b/po/pt.po
index 0159367..cd90b1a 100644
--- a/po/pt.po
+++ b/po/pt.po
@@ -34,11 +34,11 @@ msgid ""
 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: 2012-04-13 11:31+0200\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\n"
+"PO-Revision-Date: 2012-04-21 15:30+0200\n"
 "Last-Translator: Eduardo H. <hoboprimate@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Language: pt\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,171 +49,175 @@ msgstr ""
 msgid "Paint"
 msgstr "Pintar"
 
-#: toolbox.py:101
+#: toolbox.py:103
 msgid "Edit"
 msgstr "Editar"
 
-#: toolbox.py:111
+#: toolbox.py:113
 msgid "Shapes"
 msgstr "Formas"
 
-#: toolbox.py:117
+#: toolbox.py:119
 msgid "Fonts"
 msgstr "Tipos de letra"
 
-#: toolbox.py:123
+#: toolbox.py:125
 msgid "Image"
 msgstr "Imagem"
 
-#: toolbox.py:153
+#: toolbox.py:150
 msgid "Undo"
 msgstr "Desfazer"
 
-#: toolbox.py:154
+#: toolbox.py:151
 msgid "Redo"
 msgstr "Refazer"
 
-#: toolbox.py:155
+#: toolbox.py:152
 msgid "Copy"
 msgstr "Copiar"
 
-#: toolbox.py:156
+#: toolbox.py:153
 msgid "Paste"
 msgstr "Colar"
 
-#: toolbox.py:164
+#: toolbox.py:161
 msgid "Clear"
 msgstr "Limpar"
 
-#: toolbox.py:244 widgets.py:311
+#: toolbox.py:242 widgets.py:311
 msgid "Brush properties"
 msgstr "Propriedades do pincel"
 
-#: toolbox.py:261
+#: toolbox.py:253
 msgid "Brush"
 msgstr "Pincel"
 
-#: toolbox.py:266
+#: toolbox.py:258
 msgid "Eraser"
 msgstr "Borracha"
 
-#: toolbox.py:270
+#: toolbox.py:262
 msgid "Bucket"
 msgstr "Balde"
 
-#: toolbox.py:274
+#: toolbox.py:266
+msgid "Picker"
+msgstr "Selecionar Cor"
+
+#: toolbox.py:270
 msgid "Stamp"
 msgstr "Carimbo"
 
-#: toolbox.py:287
+#: toolbox.py:283
 msgid "Select Area"
 msgstr "Selecionar Área"
 
-#: toolbox.py:380
+#: toolbox.py:378
 msgid "Fill"
 msgstr "Preencher"
 
-#: toolbox.py:386 widgets.py:277
+#: toolbox.py:384 widgets.py:277
 msgid "Keep aspect"
 msgstr "Manter aspeto"
 
-#: toolbox.py:403
+#: toolbox.py:401
 msgid "Sides: "
 msgstr "Lados: "
 
-#: toolbox.py:458
+#: toolbox.py:456
 msgid "Shapes properties"
 msgstr "Propriedades da Forma"
 
-#: toolbox.py:470
+#: toolbox.py:468
 msgid "Ellipse"
 msgstr "Elipse"
 
-#: toolbox.py:474
+#: toolbox.py:472
 msgid "Rectangle"
 msgstr "Retângulo"
 
-#: toolbox.py:478
+#: toolbox.py:476
 msgid "Line"
 msgstr "Linha"
 
-#: toolbox.py:482
+#: toolbox.py:480
 msgid "Free form"
 msgstr "Forma Livre"
 
-#: toolbox.py:486
+#: toolbox.py:484
 msgid "Polygon"
 msgstr "Polígono"
 
-#: toolbox.py:490
+#: toolbox.py:488
 msgid "Heart"
 msgstr "Coração"
 
-#: toolbox.py:494
+#: toolbox.py:492
 msgid "Parallelogram"
 msgstr "Paralelogramo"
 
-#: toolbox.py:498
+#: toolbox.py:496
 msgid "Arrow"
 msgstr "Seta"
 
-#: toolbox.py:502
+#: toolbox.py:500
 msgid "Star"
 msgstr "Estrela"
 
-#: toolbox.py:506
+#: toolbox.py:504
 msgid "Trapezoid"
 msgstr "Trapezoide"
 
-#: toolbox.py:510
+#: toolbox.py:508
 msgid "Triangle"
 msgstr "Triângulo"
 
-#: toolbox.py:557
+#: toolbox.py:555
 msgid "Type"
 msgstr "Escrever"
 
-#: toolbox.py:677
+#: toolbox.py:666
 msgid "Insert Image"
 msgstr "Inserir Imagem"
 
-#: toolbox.py:690
+#: toolbox.py:679
 msgid "Rotate Left"
 msgstr "Rodar para a Esquerda"
 
-#: toolbox.py:694
+#: toolbox.py:683
 msgid "Rotate Right"
 msgstr "Rodar para a Direita"
 
-#: toolbox.py:699
+#: toolbox.py:688
 msgid "Horizontal Mirror"
 msgstr "Espelhar Horizontalmente"
 
-#: toolbox.py:704
+#: toolbox.py:693
 msgid "Vertical Mirror"
 msgstr "Espelhar Verticalmente"
 
-#: toolbox.py:708
+#: toolbox.py:697
 msgid "Height"
 msgstr "Altura"
 
-#: toolbox.py:719
+#: toolbox.py:708
 msgid "Width"
 msgstr "Largura"
 
-#: toolbox.py:734
+#: toolbox.py:723
 msgid "Grayscale"
 msgstr "Tons de cinzento"
 
-#: toolbox.py:737
+#: toolbox.py:726
 msgid "Rainbow"
 msgstr "Arco-íris"
 
-#: toolbox.py:742
+#: toolbox.py:731
 msgid "Invert Colors"
 msgstr "Inverter Cores"
 
-#: toolbox.py:839
+#: toolbox.py:806 toolbox.py:810
 msgid "Choose image"
 msgstr "Escolhe a imagem"
 
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8da312d..1c57629 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -34,11 +34,11 @@ msgid ""
 msgstr ""
 "Project-Id-Version: OLPC Paint\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-04 15:26-0300\n"
-"PO-Revision-Date: 2011-12-22 15:45+0200\n"
-"Last-Translator: lite <litekok@gmail.com>\n"
+"POT-Creation-Date: 2012-04-19 00:33-0400\n"
+"PO-Revision-Date: 2012-04-21 08:59+0200\n"
+"Last-Translator: Xin <dram.wang@gmail.com>\n"
 "Language-Team: Yuan CHAO <yuanchao@gmail.com>\n"
-"Language: \n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,171 +49,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 "选择图片"