diff --git a/po/sugar-toolkit-gtk3.pot b/po/sugar-toolkit-gtk3.pot
index bcabc902..e5b0c2b5 100644
--- a/po/sugar-toolkit-gtk3.pot
+++ b/po/sugar-toolkit-gtk3.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2014-10-08 09:45-0400\n"
+"POT-Creation-Date: 2017-10-16 18:58+1100\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,237 +16,247 @@ msgstr ""
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
-#: ../src/sugar3/activity/activity.py:416
+#: ../src/sugar3/activity/activity.py:416 src/sugar3/activity/activity.py:467
 #, python-format
 msgid "%s Activity"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:967
+#: ../src/sugar3/activity/activity.py:967 src/sugar3/activity/activity.py:1127
 msgid "Keep error"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:968
+#: ../src/sugar3/activity/activity.py:968 src/sugar3/activity/activity.py:1128
 msgid "Keep error: all changes will be lost"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:971
+#: ../src/sugar3/activity/activity.py:971 src/sugar3/activity/activity.py:1131
 msgid "Don't stop"
 msgstr ""
 
-#: ../src/sugar3/activity/activity.py:975
+#: ../src/sugar3/activity/activity.py:975 src/sugar3/activity/activity.py:1135
 msgid "Stop anyway"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:86
+#: ../src/sugar3/activity/widgets.py:86 src/sugar3/activity/activity.py:1169
+#: src/sugar3/activity/widgets.py:86
 msgid "Stop"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:98
+#: ../src/sugar3/activity/widgets.py:98 src/sugar3/activity/widgets.py:99
 msgid "Undo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:106
+#: ../src/sugar3/activity/widgets.py:106 src/sugar3/activity/widgets.py:107
 msgid "Redo"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:113
+#: ../src/sugar3/activity/widgets.py:113 src/sugar3/activity/widgets.py:114
 msgid "Copy"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:121
+#: ../src/sugar3/activity/widgets.py:121 src/sugar3/activity/widgets.py:122
 msgid "Paste"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:132
+#: ../src/sugar3/activity/widgets.py:132 src/sugar3/activity/widgets.py:133
 msgid "Private"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:139
+#: ../src/sugar3/activity/widgets.py:139 src/sugar3/activity/widgets.py:140
 msgid "My Neighborhood"
 msgstr ""
 
-#: ../src/sugar3/activity/widgets.py:233
+#: ../src/sugar3/activity/widgets.py:233 src/sugar3/activity/widgets.py:234
 msgid "Description"
 msgstr ""
 
 #: ../src/sugar3/graphics/alert.py:287 ../src/sugar3/graphics/alert.py:429
+#: src/sugar3/activity/activity.py:1189 src/sugar3/graphics/alert.py:301
+#: src/sugar3/graphics/alert.py:467
 msgid "Cancel"
 msgstr ""
 
 #: ../src/sugar3/graphics/alert.py:291 ../src/sugar3/graphics/alert.py:337
-#: ../src/sugar3/graphics/alert.py:479
+#: ../src/sugar3/graphics/alert.py:479 src/sugar3/graphics/alert.py:305
+#: src/sugar3/graphics/alert.py:346 src/sugar3/graphics/alert.py:393
+#: src/sugar3/graphics/alert.py:512
 msgid "Ok"
 msgstr ""
 
-#: ../src/sugar3/graphics/alert.py:434
+#: ../src/sugar3/graphics/alert.py:434 src/sugar3/graphics/alert.py:464
 msgid "Continue"
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:54
+#: src/sugar3/graphics/colorbutton.py:55
 msgid "Choose a color"
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:279
+#: src/sugar3/graphics/colorbutton.py:300
 msgid "Red"
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:281
+#: src/sugar3/graphics/colorbutton.py:302
 msgid "Green"
 msgstr ""
 
 #: ../src/sugar3/graphics/colorbutton.py:283
+#: src/sugar3/graphics/colorbutton.py:304
 msgid "Blue"
 msgstr ""
 
-#: ../src/sugar3/util.py:217
+#: ../src/sugar3/util.py:217 src/sugar3/util.py:217
 msgid " and "
 msgstr ""
 
-#: ../src/sugar3/util.py:218
+#: ../src/sugar3/util.py:218 src/sugar3/util.py:218
 msgid ", "
 msgstr ""
 
 #. TRANS: Indicating something that just happened, eg. "just now", "moments ago"
-#: ../src/sugar3/util.py:221
+#: ../src/sugar3/util.py:221 src/sugar3/util.py:221
 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"
-#: ../src/sugar3/util.py:225
+#: ../src/sugar3/util.py:225 src/sugar3/util.py:225
 #, python-format
 msgid "%s ago"
 msgstr ""
 
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar3/util.py:240
+#: ../src/sugar3/util.py:240 src/sugar3/util.py:240
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar3/util.py:241
+#: ../src/sugar3/util.py:241 src/sugar3/util.py:241
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar3/util.py:242
+#: ../src/sugar3/util.py:242 src/sugar3/util.py:242
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar3/util.py:243
+#: ../src/sugar3/util.py:243 src/sugar3/util.py:243
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar3/util.py:244
+#: ../src/sugar3/util.py:244 src/sugar3/util.py:244
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar3/util.py:245
+#: ../src/sugar3/util.py:245 src/sugar3/util.py:245
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../src/sugar3/util.py:346
+#: ../src/sugar3/util.py:346 src/sugar3/util.py:346
 msgid "Empty"
 msgstr ""
 
-#: ../src/sugar3/util.py:348
+#: ../src/sugar3/util.py:348 src/sugar3/util.py:348
 #, python-format
 msgid "%d B"
 msgstr ""
 
-#: ../src/sugar3/util.py:350
+#: ../src/sugar3/util.py:350 src/sugar3/util.py:350
 #, python-format
 msgid "%d KB"
 msgstr ""
 
-#: ../src/sugar3/util.py:352
+#: ../src/sugar3/util.py:352 src/sugar3/util.py:352
 #, python-format
 msgid "%d MB"
 msgstr ""
 
-#: ../src/sugar3/util.py:354
+#: ../src/sugar3/util.py:354 src/sugar3/util.py:354
 #, python-format
 msgid "%d GB"
 msgstr ""
 
-#: ../src/sugar3/mime.py:56
+#: ../src/sugar3/mime.py:56 src/sugar3/mime.py:59
 msgid "Text"
 msgstr ""
 
-#: ../src/sugar3/mime.py:63
+#: ../src/sugar3/mime.py:63 src/sugar3/mime.py:66
 msgid "Image"
 msgstr ""
 
-#: ../src/sugar3/mime.py:68
+#: ../src/sugar3/mime.py:68 src/sugar3/mime.py:71
 msgid "Audio"
 msgstr ""
 
-#: ../src/sugar3/mime.py:75
+#: ../src/sugar3/mime.py:75 src/sugar3/mime.py:78
 msgid "Video"
 msgstr ""
 
-#: ../src/sugar3/mime.py:86
+#: ../src/sugar3/mime.py:86 src/sugar3/mime.py:89
 msgid "Link"
 msgstr ""
 
-#: ../src/sugar3/mime.py:91
+#: ../src/sugar3/mime.py:91 src/sugar3/mime.py:94
 msgid "Bundle"
 msgstr ""
 
-#: ../src/sugar3/speech.py:48
+#: ../src/sugar3/speech.py:48 src/sugar3/speech.py:56
 msgid "Afrikaans"
 msgstr ""
 
-#: ../src/sugar3/speech.py:49
+#: ../src/sugar3/speech.py:49 src/sugar3/speech.py:58
 msgid "Aragonese"
 msgstr ""
 
-#: ../src/sugar3/speech.py:50
+#: ../src/sugar3/speech.py:50 src/sugar3/speech.py:60
 msgid "Bulgarian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:51
+#: ../src/sugar3/speech.py:51 src/sugar3/speech.py:62
 msgid "Bosnian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:52
+#: ../src/sugar3/speech.py:52 src/sugar3/speech.py:64
 msgid "Catalan"
 msgstr ""
 
-#: ../src/sugar3/speech.py:53
+#: ../src/sugar3/speech.py:53 src/sugar3/speech.py:66
 msgid "Czech"
 msgstr ""
 
-#: ../src/sugar3/speech.py:54
+#: ../src/sugar3/speech.py:54 src/sugar3/speech.py:68
 msgid "Welsh"
 msgstr ""
 
-#: ../src/sugar3/speech.py:55
+#: ../src/sugar3/speech.py:55 src/sugar3/speech.py:70
 msgid "Danish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:56
+#: ../src/sugar3/speech.py:56 src/sugar3/speech.py:72
 msgid "German"
 msgstr ""
 
-#: ../src/sugar3/speech.py:57
+#: ../src/sugar3/speech.py:57 src/sugar3/speech.py:74
 msgid "Greek"
 msgstr ""
 
@@ -254,27 +264,27 @@ msgstr ""
 msgid "Default"
 msgstr ""
 
-#: ../src/sugar3/speech.py:59
+#: ../src/sugar3/speech.py:59 src/sugar3/speech.py:77
 msgid "English Britain"
 msgstr ""
 
-#: ../src/sugar3/speech.py:60
+#: ../src/sugar3/speech.py:60 src/sugar3/speech.py:79
 msgid "English scottish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:61
+#: ../src/sugar3/speech.py:61 src/sugar3/speech.py:80
 msgid "English-north"
 msgstr ""
 
-#: ../src/sugar3/speech.py:62
+#: ../src/sugar3/speech.py:62 src/sugar3/speech.py:82
 msgid "English_rp"
 msgstr ""
 
-#: ../src/sugar3/speech.py:63
+#: ../src/sugar3/speech.py:63 src/sugar3/speech.py:84
 msgid "English_wmids"
 msgstr ""
 
-#: ../src/sugar3/speech.py:64
+#: ../src/sugar3/speech.py:64 src/sugar3/speech.py:86
 msgid "English USA"
 msgstr ""
 
@@ -282,171 +292,171 @@ msgstr ""
 msgid "English west indies"
 msgstr ""
 
-#: ../src/sugar3/speech.py:66
+#: ../src/sugar3/speech.py:66 src/sugar3/speech.py:90
 msgid "Esperanto"
 msgstr ""
 
-#: ../src/sugar3/speech.py:67
+#: ../src/sugar3/speech.py:67 src/sugar3/speech.py:92
 msgid "Spanish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:68
+#: ../src/sugar3/speech.py:68 src/sugar3/speech.py:93
 msgid "Spanish latin american"
 msgstr ""
 
-#: ../src/sugar3/speech.py:69
+#: ../src/sugar3/speech.py:69 src/sugar3/speech.py:95
 msgid "Estonian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:70
+#: ../src/sugar3/speech.py:70 src/sugar3/speech.py:97
 msgid "Farsi"
 msgstr ""
 
-#: ../src/sugar3/speech.py:71
+#: ../src/sugar3/speech.py:71 src/sugar3/speech.py:99
 msgid "Farsi-pinglish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:72
+#: ../src/sugar3/speech.py:72 src/sugar3/speech.py:101
 msgid "Finnish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:73
+#: ../src/sugar3/speech.py:73 src/sugar3/speech.py:103
 msgid "French belgium"
 msgstr ""
 
-#: ../src/sugar3/speech.py:74
+#: ../src/sugar3/speech.py:74 src/sugar3/speech.py:105
 msgid "French"
 msgstr ""
 
-#: ../src/sugar3/speech.py:75
+#: ../src/sugar3/speech.py:75 src/sugar3/speech.py:107
 msgid "Irish-gaeilge"
 msgstr ""
 
-#: ../src/sugar3/speech.py:76
+#: ../src/sugar3/speech.py:76 src/sugar3/speech.py:109
 msgid "Greek-ancient"
 msgstr ""
 
-#: ../src/sugar3/speech.py:77
+#: ../src/sugar3/speech.py:77 src/sugar3/speech.py:111
 msgid "Hindi"
 msgstr ""
 
-#: ../src/sugar3/speech.py:78
+#: ../src/sugar3/speech.py:78 src/sugar3/speech.py:113
 msgid "Croatian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:79
+#: ../src/sugar3/speech.py:79 src/sugar3/speech.py:115
 msgid "Hungarian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:80
+#: ../src/sugar3/speech.py:80 src/sugar3/speech.py:117
 msgid "Armenian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:81
+#: ../src/sugar3/speech.py:81 src/sugar3/speech.py:119
 msgid "Armenian (west)"
 msgstr ""
 
-#: ../src/sugar3/speech.py:82
+#: ../src/sugar3/speech.py:82 src/sugar3/speech.py:121
 msgid "Indonesian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:83
+#: ../src/sugar3/speech.py:83 src/sugar3/speech.py:123
 msgid "Icelandic"
 msgstr ""
 
-#: ../src/sugar3/speech.py:84
+#: ../src/sugar3/speech.py:84 src/sugar3/speech.py:125
 msgid "Italian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:85
+#: ../src/sugar3/speech.py:85 src/sugar3/speech.py:127
 msgid "Lojban"
 msgstr ""
 
-#: ../src/sugar3/speech.py:86
+#: ../src/sugar3/speech.py:86 src/sugar3/speech.py:129
 msgid "Georgian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:87
+#: ../src/sugar3/speech.py:87 src/sugar3/speech.py:131
 msgid "Kannada"
 msgstr ""
 
-#: ../src/sugar3/speech.py:88
+#: ../src/sugar3/speech.py:88 src/sugar3/speech.py:133
 msgid "Kurdish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:89
+#: ../src/sugar3/speech.py:89 src/sugar3/speech.py:135
 msgid "Latin"
 msgstr ""
 
-#: ../src/sugar3/speech.py:90
+#: ../src/sugar3/speech.py:90 src/sugar3/speech.py:137
 msgid "Lithuanian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:91
+#: ../src/sugar3/speech.py:91 src/sugar3/speech.py:139
 msgid "Latvian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:92
+#: ../src/sugar3/speech.py:92 src/sugar3/speech.py:141
 msgid "Macedonian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:93
+#: ../src/sugar3/speech.py:93 src/sugar3/speech.py:143
 msgid "Malayalam"
 msgstr ""
 
-#: ../src/sugar3/speech.py:94
+#: ../src/sugar3/speech.py:94 src/sugar3/speech.py:145
 msgid "Malay"
 msgstr ""
 
-#: ../src/sugar3/speech.py:95
+#: ../src/sugar3/speech.py:95 src/sugar3/speech.py:147
 msgid "Nepali"
 msgstr ""
 
-#: ../src/sugar3/speech.py:96
+#: ../src/sugar3/speech.py:96 src/sugar3/speech.py:149
 msgid "Dutch"
 msgstr ""
 
-#: ../src/sugar3/speech.py:97
+#: ../src/sugar3/speech.py:97 src/sugar3/speech.py:151
 msgid "Norwegian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:98
+#: ../src/sugar3/speech.py:98 src/sugar3/speech.py:153
 msgid "Punjabi"
 msgstr ""
 
-#: ../src/sugar3/speech.py:99
+#: ../src/sugar3/speech.py:99 src/sugar3/speech.py:155
 msgid "Polish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:100
+#: ../src/sugar3/speech.py:100 src/sugar3/speech.py:157
 msgid "Portuguese (Brazil)"
 msgstr ""
 
-#: ../src/sugar3/speech.py:101
+#: ../src/sugar3/speech.py:101 src/sugar3/speech.py:159
 msgid "Portuguese (Portugal)"
 msgstr ""
 
-#: ../src/sugar3/speech.py:102
+#: ../src/sugar3/speech.py:102 src/sugar3/speech.py:161
 msgid "Romanian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:103
+#: ../src/sugar3/speech.py:103 src/sugar3/speech.py:163
 msgid "Russian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:104
+#: ../src/sugar3/speech.py:104 src/sugar3/speech.py:165
 msgid "Slovak"
 msgstr ""
 
-#: ../src/sugar3/speech.py:105
+#: ../src/sugar3/speech.py:105 src/sugar3/speech.py:167
 msgid "Albanian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:106
+#: ../src/sugar3/speech.py:106 src/sugar3/speech.py:169
 msgid "Serbian"
 msgstr ""
 
-#: ../src/sugar3/speech.py:107
+#: ../src/sugar3/speech.py:107 src/sugar3/speech.py:171
 msgid "Swedish"
 msgstr ""
 
@@ -454,30 +464,86 @@ msgstr ""
 msgid "Swahili-test"
 msgstr ""
 
-#: ../src/sugar3/speech.py:109
+#: ../src/sugar3/speech.py:109 src/sugar3/speech.py:175
 msgid "Tamil"
 msgstr ""
 
-#: ../src/sugar3/speech.py:110
+#: ../src/sugar3/speech.py:110 src/sugar3/speech.py:177
 msgid "Turkish"
 msgstr ""
 
-#: ../src/sugar3/speech.py:111
+#: ../src/sugar3/speech.py:111 src/sugar3/speech.py:179
 msgid "Vietnam"
 msgstr ""
 
-#: ../src/sugar3/speech.py:112
+#: ../src/sugar3/speech.py:112 src/sugar3/speech.py:180
 msgid "Vietnam_hue"
 msgstr ""
 
-#: ../src/sugar3/speech.py:113
+#: ../src/sugar3/speech.py:113 src/sugar3/speech.py:181
 msgid "Vietnam_sgn"
 msgstr ""
 
-#: ../src/sugar3/speech.py:114
+#: ../src/sugar3/speech.py:114 src/sugar3/speech.py:183
 msgid "Mandarin"
 msgstr ""
 
-#: ../src/sugar3/speech.py:115
+#: ../src/sugar3/speech.py:115 src/sugar3/speech.py:185
 msgid "Cantonese"
 msgstr ""
+
+#: src/sugar3/activity/activity.py:1170
+msgid "Stop: name your journal entry"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1193
+msgid "Cancel stop and continue the activity"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1230
+msgid "Save new"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1231
+msgid "Save a new journal entry"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1234
+msgid "Save"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1235
+msgid "Save into the old journal entry"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1241
+msgid "Erase changes"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1242
+msgid "Erase what you have done, and leave your old journal entry unchanged"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1245
+msgid "Erase"
+msgstr ""
+
+#: src/sugar3/activity/activity.py:1246
+msgid "Erase what you have done, and avoid making a journal entry"
+msgstr ""
+
+#: src/sugar3/graphics/popwindow.py:179
+msgid "Close"
+msgstr ""
+
+#: src/sugar3/speech.py:75
+msgid "English"
+msgstr ""
+
+#: src/sugar3/speech.py:88
+msgid "English West Indies"
+msgstr ""
+
+#: src/sugar3/speech.py:173
+msgid "Swahili"
+msgstr ""