diff --git a/po/de.po b/po/de.po
index 1fb7f114..c6ff013d 100644
--- a/po/de.po
+++ b/po/de.po
@@ -6,145 +6,188 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sugar-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:07+0530\n"
-"PO-Revision-Date: 2008-09-19 10:32-0400\n"
+"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"PO-Revision-Date: 2009-02-28 19:13+0100\n"
 "Last-Translator: Markus Schlager <m.slg@gmx.de>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language-Team: OLPC-German <LL@li.org>\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 1.1.0rc2\n"
 
-#: ../src/sugar/activity/activity.py:120
+#: ../src/sugar/activity/activity.py:123
 msgid "Share with:"
 msgstr "Teilen mit:"
 
-#: ../src/sugar/activity/activity.py:122
+#: ../src/sugar/activity/activity.py:125
 msgid "Private"
 msgstr "Privat"
 
-#: ../src/sugar/activity/activity.py:123
+#: ../src/sugar/activity/activity.py:126
 msgid "My Neighborhood"
 msgstr "Meine Umgebung"
 
-#: ../src/sugar/activity/activity.py:130
+#: ../src/sugar/activity/activity.py:133
+#: ../src/sugar/activity/namingalert.py:65
 msgid "Keep"
 msgstr "Behalten"
 
-#: ../src/sugar/activity/activity.py:136
+#: ../src/sugar/activity/activity.py:144
 msgid "Stop"
 msgstr "Stopp"
 
-#: ../src/sugar/activity/activity.py:251
+#: ../src/sugar/activity/activity.py:258
 msgid "Undo"
 msgstr "Rückgängig"
 
-#: ../src/sugar/activity/activity.py:256
+#: ../src/sugar/activity/activity.py:263
 msgid "Redo"
 msgstr "Wiederholen"
 
-#: ../src/sugar/activity/activity.py:266
+#: ../src/sugar/activity/activity.py:273
 msgid "Copy"
 msgstr "Kopieren"
 
-#: ../src/sugar/activity/activity.py:271
+#: ../src/sugar/activity/activity.py:278
 msgid "Paste"
 msgstr "Einfügen"
 
-#: ../src/sugar/activity/activity.py:297
+#: ../src/sugar/activity/activity.py:304
 msgid "Activity"
 msgstr "Aktivität"
 
-#: ../src/sugar/activity/activity.py:469
+#: ../src/sugar/activity/activity.py:542
 #, python-format
 msgid "%s Activity"
 msgstr "%s Aktivität"
 
-#: ../src/sugar/activity/activity.py:856
+#: ../src/sugar/activity/activity.py:910
 msgid "Keep error"
 msgstr "Fehler beim Speichern"
 
-#: ../src/sugar/activity/activity.py:857
+#: ../src/sugar/activity/activity.py:911
 msgid "Keep error: all changes will be lost"
 msgstr "Fehler beim Speichern: Alle Änderungen gehen verloren"
 
-#: ../src/sugar/activity/activity.py:860
+#: ../src/sugar/activity/activity.py:914
 msgid "Don't stop"
 msgstr "Nicht stoppen"
 
-#: ../src/sugar/activity/activity.py:863
+#: ../src/sugar/activity/activity.py:917
 msgid "Stop anyway"
 msgstr "Trotzdem stoppen"
 
-#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
+#: ../src/sugar/activity/namingalert.py:60
+#, fuzzy
+msgid "Name this entry"
+msgstr "Diesen Eintrag benennen"
+
+#: ../src/sugar/activity/namingalert.py:248
+msgid "Untitled"
+msgstr "Unbenannt"
+
+#: ../src/sugar/activity/namingalert.py:255
+msgid "Description:"
+msgstr "Beschreibung:"
+
+#: ../src/sugar/activity/namingalert.py:279
+#, fuzzy
+msgid "Tags:"
+msgstr "Stichwörter:"
+
+#: ../src/sugar/graphics/alert.py:288
+#: ../src/sugar/graphics/alert.py:367
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247
+#: ../src/sugar/graphics/alert.py:292
+#: ../src/sugar/graphics/alert.py:426
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/sugar/graphics/alert.py:219
+#: ../src/sugar/graphics/alert.py:377
 msgid "Continue"
 msgstr "Weitermachen"
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/graphics/colorbutton.py:49
+msgid "Choose a color"
+msgstr "Wähle eine Farbe"
+
+#: ../src/sugar/graphics/colorbutton.py:262
+#, fuzzy
+msgid "Red"
+msgstr "Wiederholen"
+
+#: ../src/sugar/graphics/colorbutton.py:264
+msgid "Green"
+msgstr "Grün"
+
+#: ../src/sugar/graphics/colorbutton.py:266
+msgid "Blue"
+msgstr "Blau"
+
+#: ../src/sugar/util.py:194
 msgid " and "
 msgstr " und "
 
-#: ../src/sugar/util.py:182
+#: ../src/sugar/util.py:195
 msgid ", "
 msgstr ", "
 
+# TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar/util.py:185
+#: ../src/sugar/util.py:198
 msgid "Seconds ago"
 msgstr "vor Sekunden"
 
+# TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
+# "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #. 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:202
 #, python-format
 msgid "%s ago"
 msgstr "vor %s"
 
+# TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:202
+#: ../src/sugar/util.py:215
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d Jahr"
 msgstr[1] "%d Jahre"
 
-#: ../src/sugar/util.py:203
+#: ../src/sugar/util.py:216
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d Monat"
 msgstr[1] "%d Monate"
 
-#: ../src/sugar/util.py:204
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
-#: ../src/sugar/util.py:205
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: ../src/sugar/util.py:206
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../src/sugar/util.py:207
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
diff --git a/po/ja.po b/po/ja.po
index 29ffda20..e000a95b 100644
--- a/po/ja.po
+++ b/po/ja.po
@@ -5,145 +5,179 @@ 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: 2008-10-10 12:45+0530\n"
-"Last-Translator: \n"
+"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"PO-Revision-Date: 2009-01-30 10:09-0500\n"
+"Last-Translator: korakurider <korakurider@gmail.com>\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: Pootle 1.1.0rc2\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/sugar/activity/activity.py:120
+#: ../src/sugar/activity/activity.py:123
 msgid "Share with:"
 msgstr "次の人と共有:"
 
-#: ../src/sugar/activity/activity.py:122
+#: ../src/sugar/activity/activity.py:125
 msgid "Private"
 msgstr "（共有しない）"
 
-#: ../src/sugar/activity/activity.py:123
+#: ../src/sugar/activity/activity.py:126
 msgid "My Neighborhood"
 msgstr "私のお隣さん"
 
-#: ../src/sugar/activity/activity.py:130
+#: ../src/sugar/activity/activity.py:133
+#: ../src/sugar/activity/namingalert.py:65
 msgid "Keep"
 msgstr "ジャーナルに保存"
 
-#: ../src/sugar/activity/activity.py:136
+#: ../src/sugar/activity/activity.py:144
 msgid "Stop"
 msgstr "停止"
 
-#: ../src/sugar/activity/activity.py:251
+#: ../src/sugar/activity/activity.py:258
 msgid "Undo"
 msgstr "元に戻す"
 
-#: ../src/sugar/activity/activity.py:256
+#: ../src/sugar/activity/activity.py:263
 msgid "Redo"
 msgstr "やり直し"
 
-#: ../src/sugar/activity/activity.py:266
+#: ../src/sugar/activity/activity.py:273
 msgid "Copy"
 msgstr "コピー"
 
-#: ../src/sugar/activity/activity.py:271
+#: ../src/sugar/activity/activity.py:278
 msgid "Paste"
 msgstr "貼り付け"
 
-#: ../src/sugar/activity/activity.py:297
+#: ../src/sugar/activity/activity.py:304
 msgid "Activity"
 msgstr "アクティビティ"
 
-#: ../src/sugar/activity/activity.py:469
+#: ../src/sugar/activity/activity.py:542
 #, python-format
 msgid "%s Activity"
 msgstr "%s アクティビティ"
 
-#: ../src/sugar/activity/activity.py:856
+#: ../src/sugar/activity/activity.py:910
 msgid "Keep error"
 msgstr "保存エラー"
 
-#: ../src/sugar/activity/activity.py:857
+#: ../src/sugar/activity/activity.py:911
 msgid "Keep error: all changes will be lost"
 msgstr "保存エラー: 全ての変更は失われてしまいます"
 
-#: ../src/sugar/activity/activity.py:860
+#: ../src/sugar/activity/activity.py:914
 msgid "Don't stop"
 msgstr "やめない"
 
-#: ../src/sugar/activity/activity.py:863
+#: ../src/sugar/activity/activity.py:917
 msgid "Stop anyway"
 msgstr "とにかくやめる"
 
-#: ../src/sugar/graphics/alert.py:166
-#: ../src/sugar/graphics/alert.py:209
+#: ../src/sugar/activity/namingalert.py:60
+msgid "Name this entry"
+msgstr "これに名前をつける"
+
+#: ../src/sugar/activity/namingalert.py:248
+msgid "Untitled"
+msgstr "タイトル無し"
+
+#: ../src/sugar/activity/namingalert.py:255
+msgid "Description:"
+msgstr "説明:"
+
+#: ../src/sugar/activity/namingalert.py:279
+msgid "Tags:"
+msgstr "タグ:"
+
+#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
 msgid "Cancel"
 msgstr "中止"
 
-#: ../src/sugar/graphics/alert.py:170
-#: ../src/sugar/graphics/alert.py:247
+#: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426
 msgid "Ok"
 msgstr "了解"
 
-#: ../src/sugar/graphics/alert.py:219
+#: ../src/sugar/graphics/alert.py:377
 msgid "Continue"
 msgstr "続ける"
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/graphics/colorbutton.py:49
+msgid "Choose a color"
+msgstr "色を選ぶ"
+
+#: ../src/sugar/graphics/colorbutton.py:262
+msgid "Red"
+msgstr "赤"
+
+#: ../src/sugar/graphics/colorbutton.py:264
+msgid "Green"
+msgstr "緑"
+
+#: ../src/sugar/graphics/colorbutton.py:266
+msgid "Blue"
+msgstr "青"
+
+#: ../src/sugar/util.py:194
 msgid " and "
 msgstr " そして "
 
-#: ../src/sugar/util.py:182
+#: ../src/sugar/util.py:195
 msgid ", "
 msgstr ", "
 
+# TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar/util.py:185
+#: ../src/sugar/util.py:198
 msgid "Seconds ago"
 msgstr "ちょっと前"
 
+# TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
+# "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #. 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:202
 #, python-format
 msgid "%s ago"
 msgstr "%s前"
 
+# TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:202
+#: ../src/sugar/util.py:215
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
 
-#: ../src/sugar/util.py:203
+#: ../src/sugar/util.py:216
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d 月"
 
-#: ../src/sugar/util.py:204
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週"
 
-#: ../src/sugar/util.py:205
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 日"
 
-#: ../src/sugar/util.py:206
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 時間"
 
-#: ../src/sugar/util.py:207
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d 分"
-
diff --git a/po/sl.po b/po/sl.po
index a7c04058..0109ec84 100644
--- a/po/sl.po
+++ b/po/sl.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-20 00:31-0500\n"
-"PO-Revision-Date: 2008-07-11 00:46-0400\n"
+"PO-Revision-Date: 2009-01-29 08:25-0500\n"
 "Last-Translator: Denis Oštir <denis.ostir@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -79,19 +79,19 @@ msgstr "Vseeno ustavi"
 
 #: ../src/sugar/activity/namingalert.py:60
 msgid "Name this entry"
-msgstr ""
+msgstr "Poimenuj ta vnos"
 
 #: ../src/sugar/activity/namingalert.py:248
 msgid "Untitled"
-msgstr ""
+msgstr "Neimenovan"
 
 #: ../src/sugar/activity/namingalert.py:255
 msgid "Description:"
-msgstr ""
+msgstr "Opis:"
 
 #: ../src/sugar/activity/namingalert.py:279
 msgid "Tags:"
-msgstr ""
+msgstr "Oznake:"
 
 #: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
 msgid "Cancel"
@@ -107,20 +107,19 @@ msgstr "Nadaljuj"
 
 #: ../src/sugar/graphics/colorbutton.py:49
 msgid "Choose a color"
-msgstr ""
+msgstr "Izberi barvo"
 
 #: ../src/sugar/graphics/colorbutton.py:262
-#, fuzzy
 msgid "Red"
-msgstr "Ponovi"
+msgstr "Rdeca"
 
 #: ../src/sugar/graphics/colorbutton.py:264
 msgid "Green"
-msgstr ""
+msgstr "Zelena"
 
 #: ../src/sugar/graphics/colorbutton.py:266
 msgid "Blue"
-msgstr ""
+msgstr "Modra"
 
 #: ../src/sugar/util.py:194
 msgid " and "
diff --git a/po/sv.po b/po/sv.po
index c0cc91c7..3c6d15ca 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -6,145 +6,182 @@ 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: 2008-10-08 05:46-0400\n"
-"Last-Translator: Mattias Ohlsson <mattias_oh@yahoo.com>\n"
+"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"PO-Revision-Date: 2009-01-28 15:29-0500\n"
+"Last-Translator: Susanna Björverud <susanna.bjorverud@telia.com>\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.1.1rc4\n"
+"X-Generator: Pootle 1.1.0rc2\n"
 
-#: ../src/sugar/activity/activity.py:120
+#: ../src/sugar/activity/activity.py:123
 msgid "Share with:"
 msgstr "Dela med:"
 
-#: ../src/sugar/activity/activity.py:122
+#: ../src/sugar/activity/activity.py:125
 msgid "Private"
 msgstr "Mig själv"
 
-#: ../src/sugar/activity/activity.py:123
+#: ../src/sugar/activity/activity.py:126
 msgid "My Neighborhood"
 msgstr "Mina grannar"
 
-#: ../src/sugar/activity/activity.py:130
+#: ../src/sugar/activity/activity.py:133
+#: ../src/sugar/activity/namingalert.py:65
 msgid "Keep"
 msgstr "Spara"
 
-#: ../src/sugar/activity/activity.py:136
+#: ../src/sugar/activity/activity.py:144
 msgid "Stop"
 msgstr "Avsluta"
 
-#: ../src/sugar/activity/activity.py:251
+#: ../src/sugar/activity/activity.py:258
 msgid "Undo"
 msgstr "Ångra"
 
-#: ../src/sugar/activity/activity.py:256
+#: ../src/sugar/activity/activity.py:263
 msgid "Redo"
 msgstr "Återställ"
 
-#: ../src/sugar/activity/activity.py:266
+#: ../src/sugar/activity/activity.py:273
 msgid "Copy"
 msgstr "Kopiera"
 
-#: ../src/sugar/activity/activity.py:271
+#: ../src/sugar/activity/activity.py:278
 msgid "Paste"
 msgstr "Klistra in"
 
-#: ../src/sugar/activity/activity.py:297
+#: ../src/sugar/activity/activity.py:304
 msgid "Activity"
 msgstr "Aktivitet"
 
-#: ../src/sugar/activity/activity.py:469
+#: ../src/sugar/activity/activity.py:542
 #, python-format
 msgid "%s Activity"
 msgstr "(%s)aktivitet"
 
-#: ../src/sugar/activity/activity.py:856
+#: ../src/sugar/activity/activity.py:910
 msgid "Keep error"
 msgstr "Sparfel"
 
-#: ../src/sugar/activity/activity.py:857
+#: ../src/sugar/activity/activity.py:911
 msgid "Keep error: all changes will be lost"
 msgstr "Sparfel: alla ändringar kommer att förloras"
 
-#: ../src/sugar/activity/activity.py:860
+#: ../src/sugar/activity/activity.py:914
 msgid "Don't stop"
 msgstr "Avsluta inte"
 
-#: ../src/sugar/activity/activity.py:863
+#: ../src/sugar/activity/activity.py:917
 msgid "Stop anyway"
 msgstr "Stäng utan att spara"
 
-#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
+#: ../src/sugar/activity/namingalert.py:60
+msgid "Name this entry"
+msgstr "Ge ett namn till denna post"
+
+#: ../src/sugar/activity/namingalert.py:248
+msgid "Untitled"
+msgstr "Namnlös"
+
+#: ../src/sugar/activity/namingalert.py:255
+msgid "Description:"
+msgstr "Beskrivning:"
+
+#: ../src/sugar/activity/namingalert.py:279
+msgid "Tags:"
+msgstr "Nyckelord:"
+
+#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247
+#: ../src/sugar/graphics/alert.py:292 ../src/sugar/graphics/alert.py:426
 msgid "Ok"
 msgstr "Ok"
 
-#: ../src/sugar/graphics/alert.py:219
+#: ../src/sugar/graphics/alert.py:377
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/graphics/colorbutton.py:49
+msgid "Choose a color"
+msgstr "Välj en färg"
+
+#: ../src/sugar/graphics/colorbutton.py:262
+msgid "Red"
+msgstr "Röd"
+
+#: ../src/sugar/graphics/colorbutton.py:264
+msgid "Green"
+msgstr "Grön"
+
+#: ../src/sugar/graphics/colorbutton.py:266
+msgid "Blue"
+msgstr "Blå"
+
+#: ../src/sugar/util.py:194
 msgid " and "
 msgstr " och "
 
-#: ../src/sugar/util.py:182
+#: ../src/sugar/util.py:195
 msgid ", "
 msgstr ", "
 
+# TRANS: Indicating something that just happened, eg. "just now", "moments ago"
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar/util.py:185
+#: ../src/sugar/util.py:198
 msgid "Seconds ago"
 msgstr "sekunder sedan"
 
+# TRANS: Indicating time passed, eg. "[10 day, 5 hours] ago",
+# "[2 minutes] in the past", or "[3 years, 1 month] earlier"
 #. 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:202
 #, python-format
 msgid "%s ago"
 msgstr "%s gammalt"
 
+# TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:202
+#: ../src/sugar/util.py:215
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d år"
 msgstr[1] "%d år"
 
-#: ../src/sugar/util.py:203
+#: ../src/sugar/util.py:216
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d månad"
 msgstr[1] "%d månader"
 
-#: ../src/sugar/util.py:204
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d vecka"
 msgstr[1] "%d veckor"
 
-#: ../src/sugar/util.py:205
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../src/sugar/util.py:206
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../src/sugar/util.py:207
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
diff --git a/src/sugar/bundle/activitybundle.py b/src/sugar/bundle/activitybundle.py
index eb35307d..268576e1 100644
--- a/src/sugar/bundle/activitybundle.py
+++ b/src/sugar/bundle/activitybundle.py
@@ -251,7 +251,7 @@ class ActivityBundle(Bundle):
             return os.path.join(self._path, icon_path)
         else:
             icon_data = self.get_file(icon_path).read()
-            temp_file, temp_file_path = tempfile.mkstemp(self._icon)
+            temp_file, temp_file_path = tempfile.mkstemp(prefix=self._icon, suffix='.svg')
             os.write(temp_file, icon_data)
             os.close(temp_file)
             return util.TempFilePath(temp_file_path)
@@ -350,6 +350,12 @@ class ActivityBundle(Bundle):
         return install_path
 
     def uninstall(self, install_path, force=False):
+        if os.path.islink(install_path):
+            # Don't remove the actual activity dir if it's a symbolic link
+            # because we may be removing user data.
+            os.unlink(install_path)
+            return
+
         xdg_data_home = os.getenv('XDG_DATA_HOME',
                                   os.path.expanduser('~/.local/share'))