diff --git a/po/pl.po b/po/pl.po
index 93a56e35..255bb34d 100644
--- a/po/pl.po
+++ b/po/pl.po
@@ -2,152 +2,226 @@
 # 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
+# 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.
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:07+0530\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2010-09-28 06:08-0400\n"
+"PO-Revision-Date: 2011-03-29 17:43+0200\n"
+"Last-Translator: Chris <cjl@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Translate Toolkit 1.1.1rc4\n"
+"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
+"|| n%100>=20) ? 1 : 2);\n"
+"X-Generator: Pootle 2.0.1\n"
 
-#: ../src/sugar/activity/activity.py:120
-msgid "Share with:"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:122
-msgid "Private"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:123
-msgid "My Neighborhood"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:130
-msgid "Keep"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:136
-msgid "Stop"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:251
-msgid "Undo"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:256
-msgid "Redo"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:266
-msgid "Copy"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:271
-msgid "Paste"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:297
-msgid "Activity"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:469
+#: ../src/sugar/activity/activity.py:336
 #, python-format
 msgid "%s Activity"
-msgstr ""
+msgstr "%s Czynność"
 
-#: ../src/sugar/activity/activity.py:856
+#: ../src/sugar/activity/activity.py:791
 msgid "Keep error"
-msgstr ""
+msgstr "Zachowaj błąd"
 
-#: ../src/sugar/activity/activity.py:857
+#: ../src/sugar/activity/activity.py:792
 msgid "Keep error: all changes will be lost"
-msgstr ""
+msgstr "Zachowaj błąd: wszystkie zmiany zostaną utracone"
 
-#: ../src/sugar/activity/activity.py:860
+#: ../src/sugar/activity/activity.py:795
 msgid "Don't stop"
-msgstr ""
+msgstr "Nie zatrzymuj"
 
-#: ../src/sugar/activity/activity.py:863
+#: ../src/sugar/activity/activity.py:798
 msgid "Stop anyway"
-msgstr ""
+msgstr "Zatrzymaj mimo wszystko"
 
-#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
+#: ../src/sugar/activity/namingalert.py:82
+msgid "Name this entry"
+msgstr "Nazwij ten wpis"
+
+#: ../src/sugar/activity/namingalert.py:87
+#: ../src/sugar/activity/widgets.py:169
+msgid "Keep"
+msgstr "Zachowaj"
+
+#: ../src/sugar/activity/namingalert.py:283
+msgid "Untitled"
+msgstr "Bez tytułu"
+
+#: ../src/sugar/activity/namingalert.py:290
+msgid "Description:"
+msgstr "Opis:"
+
+#: ../src/sugar/activity/namingalert.py:314
+msgid "Tags:"
+msgstr "Tagi:"
+
+#: ../src/sugar/activity/widgets.py:83
+msgid "Stop"
+msgstr "Stop"
+
+#: ../src/sugar/activity/widgets.py:95
+msgid "Undo"
+msgstr "Cofnij"
+
+#: ../src/sugar/activity/widgets.py:103
+msgid "Redo"
+msgstr "Przywróć"
+
+#: ../src/sugar/activity/widgets.py:110
+msgid "Copy"
+msgstr "Kopiuj"
+
+#: ../src/sugar/activity/widgets.py:118
+msgid "Paste"
+msgstr "Wklej"
+
+#: ../src/sugar/activity/widgets.py:129
+msgid "Private"
+msgstr "Prywatne"
+
+#: ../src/sugar/activity/widgets.py:136
+msgid "My Neighborhood"
+msgstr "Moje sąsiedztwo"
+
+#: ../src/sugar/activity/widgets.py:349
+msgid "Activity"
+msgstr "Czynność"
+
+#: ../src/sugar/graphics/alert.py:287 ../src/sugar/graphics/alert.py:410
 msgid "Cancel"
-msgstr ""
+msgstr "Anuluj"
 
-#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247
+#: ../src/sugar/graphics/alert.py:291 ../src/sugar/graphics/alert.py:336
+#: ../src/sugar/graphics/alert.py:469
 msgid "Ok"
-msgstr ""
+msgstr "Ok"
 
-#: ../src/sugar/graphics/alert.py:219
+#: ../src/sugar/graphics/alert.py:420
 msgid "Continue"
-msgstr ""
+msgstr "Kontynuuj"
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/graphics/colorbutton.py:52
+msgid "Choose a color"
+msgstr "Wybierz kolor"
+
+#: ../src/sugar/graphics/colorbutton.py:272
+msgid "Red"
+msgstr "Czerwony"
+
+#: ../src/sugar/graphics/colorbutton.py:274
+msgid "Green"
+msgstr "Zielony"
+
+#: ../src/sugar/graphics/colorbutton.py:276
+msgid "Blue"
+msgstr "Niebieski"
+
+#: ../src/sugar/util.py:218
 msgid " and "
-msgstr ""
+msgstr " i "
 
-#: ../src/sugar/util.py:182
+#: ../src/sugar/util.py:219
 msgid ", "
-msgstr ""
+msgstr ", "
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar/util.py:185
+#: ../src/sugar/util.py:222
 msgid "Seconds ago"
-msgstr ""
+msgstr "Przed chwilą"
 
 #. TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
 #. "[2 minutes] in the past", or "[3 years, 1 month] earlier"
-#: ../src/sugar/util.py:189
+#: ../src/sugar/util.py:226
 #, python-format
 msgid "%s ago"
-msgstr ""
+msgstr "%s temu"
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:202
+#: ../src/sugar/util.py:241
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d rok"
+msgstr[1] "%d lata"
+msgstr[2] "%d lat"
 
-#: ../src/sugar/util.py:203
+#: ../src/sugar/util.py:242
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d miesiąc"
+msgstr[1] "%d miesiące"
+msgstr[2] "%d miesięcy"
 
-#: ../src/sugar/util.py:204
+#: ../src/sugar/util.py:243
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d tydzień"
+msgstr[1] "%d tygodnie"
+msgstr[2] "%d tygodni"
 
-#: ../src/sugar/util.py:205
+#: ../src/sugar/util.py:244
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d dzień"
+msgstr[1] "%d dni"
+msgstr[2] "%d dni"
 
-#: ../src/sugar/util.py:206
+#: ../src/sugar/util.py:245
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d godzina"
+msgstr[1] "%d godziny"
+msgstr[2] "%d godzin"
 
-#: ../src/sugar/util.py:207
+#: ../src/sugar/util.py:246
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d minuta"
+msgstr[1] "%d minuty"
+msgstr[2] "%d minut"
+
+#: ../src/sugar/util.py:339
+msgid "Empty"
+msgstr "Pusty"
+
+#: ../src/sugar/util.py:341
+#, python-format
+msgid "%d B"
+msgstr "%d B"
+
+#: ../src/sugar/util.py:343
+#, python-format
+msgid "%d KB"
+msgstr "%d KB"
+
+#: ../src/sugar/util.py:345
+#, python-format
+msgid "%d MB"
+msgstr "%d MB"
+
+#: ../src/sugar/util.py:347
+#, python-format
+msgid "%d GB"
+msgstr "%d GB"