From 63d450c1c135d99c7a6897ab2eea7eb8ab49d403 Mon Sep 17 00:00:00 2001
From: Tomeu Vizoso <tomeu@sugarlabs.org>
Date: Sat, 13 Jun 2009 18:57:52 +0000
Subject: Merge branch 'sucrose-0.84' of gitorious@git.sugarlabs.org:sugar-toolkit/mainline into sucrose-0.84

---
diff --git a/configure.ac b/configure.ac
index eb84ae8..c1e1aed 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([sugar-toolkit],[0.84.3],[],[sugar-toolkit])
+AC_INIT([sugar-toolkit],[0.84.4],[],[sugar-toolkit])
 
 AC_PREREQ([2.59])
 
diff --git a/po/de.po b/po/de.po
index 4589e6d..07d49a8 100644
--- a/po/de.po
+++ b/po/de.po
@@ -7,8 +7,8 @@ msgstr ""
 "Project-Id-Version: sugar-toolkit\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2009-01-20 00:31-0500\n"
-"PO-Revision-Date: 2009-03-15 13:05-0400\n"
-"Last-Translator: Markus Schlager <m.slg@gmx.de>\n"
+"PO-Revision-Date: 2009-03-24 12:25-0400\n"
+"Last-Translator: Simon Schampijer <simon@laptop.org>\n"
 "Language-Team: OLPC-German <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -171,12 +171,13 @@ msgid_plural "%d weeks"
 msgstr[0] "%d Woche"
 msgstr[1] "%d Wochen"
 
+# Der String ergibt in dem UI - 'vor x Tagen', weswegen das 'n' hier wichtig ist.
 #: ../src/sugar/util.py:218
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
-msgstr[1] "%d Tage"
+msgstr[1] "%d Tagen"
 
 #: ../src/sugar/util.py:219
 #, python-format
diff --git a/po/es.po b/po/es.po
index 0a9126f..b330593 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,28 +6,28 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:07+0530\n"
-"PO-Revision-Date: 2008-07-20 14:39-0400\n"
-"Last-Translator: Chema Q <jameson.quinn@gmail.com>\n"
+"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"PO-Revision-Date: 2009-01-30 20:27-0500\n"
+"Last-Translator: Maria del Pilar Saenz Rodriguez <mapisaro@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"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.1.0rc2\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: .\n"
 
-#: ../src/sugar/activity/activity.py:120
+#: ../src/sugar/activity/activity.py:123
 msgid "Share with:"
 msgstr "Compartir con:"
 
-#: ../src/sugar/activity/activity.py:122
+#: ../src/sugar/activity/activity.py:125
 msgid "Private"
 msgstr "Privado"
 
-#: ../src/sugar/activity/activity.py:123
+#: ../src/sugar/activity/activity.py:126
 msgid "My Neighborhood"
 msgstr "Mi Vecindario"
 
@@ -35,127 +35,164 @@ msgstr "Mi Vecindario"
 # TODO: Implement stopping downloads
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
-#: ../src/sugar/activity/activity.py:130
+#: ../src/sugar/activity/activity.py:133
+#: ../src/sugar/activity/namingalert.py:65
 msgid "Keep"
 msgstr "Guardar"
 
-#: ../src/sugar/activity/activity.py:136
+#: ../src/sugar/activity/activity.py:144
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/sugar/activity/activity.py:251
+#: ../src/sugar/activity/activity.py:258
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/sugar/activity/activity.py:256
+#: ../src/sugar/activity/activity.py:263
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/sugar/activity/activity.py:266
+#: ../src/sugar/activity/activity.py:273
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/sugar/activity/activity.py:271
+#: ../src/sugar/activity/activity.py:278
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../src/sugar/activity/activity.py:297
+#: ../src/sugar/activity/activity.py:304
 msgid "Activity"
 msgstr "Actividad"
 
-#: ../src/sugar/activity/activity.py:469
+#: ../src/sugar/activity/activity.py:542
 #, python-format
 msgid "%s Activity"
 msgstr "Actividad %s"
 
-#: ../src/sugar/activity/activity.py:856
+#: ../src/sugar/activity/activity.py:910
 msgid "Keep error"
 msgstr "Error al guardar"
 
-#: ../src/sugar/activity/activity.py:857
+#: ../src/sugar/activity/activity.py:911
 msgid "Keep error: all changes will be lost"
 msgstr "Error al guardar: todos los cambios se perderán"
 
-#: ../src/sugar/activity/activity.py:860
+#: ../src/sugar/activity/activity.py:914
 msgid "Don't stop"
 msgstr "No detener"
 
-#: ../src/sugar/activity/activity.py:863
+#: ../src/sugar/activity/activity.py:917
 msgid "Stop anyway"
 msgstr "Detener de todas formas"
 
-#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
+#: ../src/sugar/activity/namingalert.py:60
+msgid "Name this entry"
+msgstr "Nombre esta entrada"
+
+#: ../src/sugar/activity/namingalert.py:248
+msgid "Untitled"
+msgstr "Sin título"
+
+#: ../src/sugar/activity/namingalert.py:255
+msgid "Description:"
+msgstr "Descripción:"
+
+#: ../src/sugar/activity/namingalert.py:279
+msgid "Tags:"
+msgstr "Etiquetas:"
+
+#: ../src/sugar/graphics/alert.py:288 ../src/sugar/graphics/alert.py:367
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: ../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 "Continuar"
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/graphics/colorbutton.py:49
+msgid "Choose a color"
+msgstr "Escoja un color"
+
+#: ../src/sugar/graphics/colorbutton.py:262
+msgid "Red"
+msgstr "Rojo"
+
+#: ../src/sugar/graphics/colorbutton.py:264
+msgid "Green"
+msgstr "Verde"
+
+#: ../src/sugar/graphics/colorbutton.py:266
+msgid "Blue"
+msgstr "Azul"
+
+#: ../src/sugar/util.py:194
 msgid " and "
 msgstr " y "
 
-#: ../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 "Segundos atrás"
 
 # I used an expression, not a literal translation, but I think it's OK.
+# 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 atrás"
 
 # No entiendo porque colocaron el plural igual que el singular.
 # Traduction: I don't know why somebody wrote the same for plural and singular traduction.
+# 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 año"
 msgstr[1] "%d años"
 
-#: ../src/sugar/util.py:203
+#: ../src/sugar/util.py:216
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d mes"
 msgstr[1] "%d meses"
 
-#: ../src/sugar/util.py:204
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d semana"
 msgstr[1] "%d semanas"
 
-#: ../src/sugar/util.py:205
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d día"
 msgstr[1] "%d días"
 
-#: ../src/sugar/util.py:206
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d hora"
 msgstr[1] "%d horas"
 
-#: ../src/sugar/util.py:207
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
diff --git a/po/it.po b/po/it.po
index b829f1b..722ed3a 100644
--- a/po/it.po
+++ b/po/it.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"POT-Creation-Date: 2009-04-29 17:35-0400\n"
 "PO-Revision-Date: 2009-01-29 16:32-0500\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid "My Neighborhood"
 msgstr "I miei vicini"
 
 #: ../src/sugar/activity/activity.py:133
-#: ../src/sugar/activity/namingalert.py:65
+#: ../src/sugar/activity/namingalert.py:84
 msgid "Keep"
 msgstr "Memorizza"
 
@@ -56,40 +56,40 @@ msgstr "Incolla"
 msgid "Activity"
 msgstr "Attività"
 
-#: ../src/sugar/activity/activity.py:542
+#: ../src/sugar/activity/activity.py:543
 #, python-format
 msgid "%s Activity"
 msgstr "Attività %s "
 
-#: ../src/sugar/activity/activity.py:910
+#: ../src/sugar/activity/activity.py:924
 msgid "Keep error"
 msgstr "Errore di memorizzazione"
 
-#: ../src/sugar/activity/activity.py:911
+#: ../src/sugar/activity/activity.py:925
 msgid "Keep error: all changes will be lost"
 msgstr "Errore di memorizzazione: tutte le modifiche saranno perse"
 
-#: ../src/sugar/activity/activity.py:914
+#: ../src/sugar/activity/activity.py:928
 msgid "Don't stop"
 msgstr "Non Fermare"
 
-#: ../src/sugar/activity/activity.py:917
+#: ../src/sugar/activity/activity.py:931
 msgid "Stop anyway"
 msgstr "Ferma comunque"
 
-#: ../src/sugar/activity/namingalert.py:60
+#: ../src/sugar/activity/namingalert.py:79
 msgid "Name this entry"
 msgstr "Dai un nome a questo oggetto"
 
-#: ../src/sugar/activity/namingalert.py:248
+#: ../src/sugar/activity/namingalert.py:275
 msgid "Untitled"
 msgstr "Senza nome"
 
-#: ../src/sugar/activity/namingalert.py:255
+#: ../src/sugar/activity/namingalert.py:282
 msgid "Description:"
 msgstr "Descrizione:"
 
-#: ../src/sugar/activity/namingalert.py:279
+#: ../src/sugar/activity/namingalert.py:306
 msgid "Tags:"
 msgstr "Etichette:"
 
@@ -109,29 +109,29 @@ msgstr "Continua"
 msgid "Choose a color"
 msgstr "Scegli un colore"
 
-#: ../src/sugar/graphics/colorbutton.py:262
+#: ../src/sugar/graphics/colorbutton.py:267
 msgid "Red"
 msgstr "Rosso"
 
-#: ../src/sugar/graphics/colorbutton.py:264
+#: ../src/sugar/graphics/colorbutton.py:269
 msgid "Green"
 msgstr "Verde"
 
-#: ../src/sugar/graphics/colorbutton.py:266
+#: ../src/sugar/graphics/colorbutton.py:271
 msgid "Blue"
 msgstr "Blu"
 
-#: ../src/sugar/util.py:194
+#: ../src/sugar/util.py:196
 msgid " and "
 msgstr " e "
 
-#: ../src/sugar/util.py:195
+#: ../src/sugar/util.py:197
 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:198
+#: ../src/sugar/util.py:200
 msgid "Seconds ago"
 msgstr "Pochi secondi fa"
 
@@ -139,7 +139,7 @@ msgstr "Pochi secondi fa"
 # "[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:202
+#: ../src/sugar/util.py:204
 #, python-format
 msgid "%s ago"
 msgstr "%s fa"
@@ -147,7 +147,7 @@ msgstr "%s fa"
 # True if Plural Form 1 means Singular.... (cf 2008_06_23)
 # TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:215
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
@@ -155,7 +155,7 @@ msgstr[0] "%d anno"
 msgstr[1] "%d anni"
 
 # True if Plural Form 1 means Singular.... (cf 2008_06_23)
-#: ../src/sugar/util.py:216
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
@@ -163,7 +163,7 @@ msgstr[0] "%d mese"
 msgstr[1] "%d mesi"
 
 # True if Plural Form 1 means Singular.... (cf 2008_06_23)
-#: ../src/sugar/util.py:217
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
@@ -171,7 +171,7 @@ msgstr[0] "%d settimana"
 msgstr[1] "%d settimane"
 
 # True if Plural Form 1 means Singular.... (cf 2008_06_23)
-#: ../src/sugar/util.py:218
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -179,14 +179,14 @@ msgstr[0] "%d giorno"
 msgstr[1] "%d giorni"
 
 # True if Plural Form 1 means Singular.... (cf 2008_06_23)
-#: ../src/sugar/util.py:219
+#: ../src/sugar/util.py:221
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d ora"
 msgstr[1] "%d ore"
 
-#: ../src/sugar/util.py:220
+#: ../src/sugar/util.py:222
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
diff --git a/po/nl.po b/po/nl.po
index 1e5493c..b4fcf27 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"POT-Creation-Date: 2009-04-29 17:35-0400\n"
 "PO-Revision-Date: 2009-01-28 15:04-0500\n"
 "Last-Translator: Myckel Habets <myckel@sdf.lonestar.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid "My Neighborhood"
 msgstr "Mijn omgeving"
 
 #: ../src/sugar/activity/activity.py:133
-#: ../src/sugar/activity/namingalert.py:65
+#: ../src/sugar/activity/namingalert.py:84
 msgid "Keep"
 msgstr "Behouden"
 
@@ -56,40 +56,40 @@ msgstr "Plakken"
 msgid "Activity"
 msgstr "Activiteit"
 
-#: ../src/sugar/activity/activity.py:542
+#: ../src/sugar/activity/activity.py:543
 #, python-format
 msgid "%s Activity"
 msgstr "%s activiteit"
 
-#: ../src/sugar/activity/activity.py:910
+#: ../src/sugar/activity/activity.py:924
 msgid "Keep error"
 msgstr "Bewaarfout"
 
-#: ../src/sugar/activity/activity.py:911
+#: ../src/sugar/activity/activity.py:925
 msgid "Keep error: all changes will be lost"
 msgstr "Bewaarfout: alle veranderingen zijn verloren gegaan"
 
-#: ../src/sugar/activity/activity.py:914
+#: ../src/sugar/activity/activity.py:928
 msgid "Don't stop"
 msgstr "Niet stoppen"
 
-#: ../src/sugar/activity/activity.py:917
+#: ../src/sugar/activity/activity.py:931
 msgid "Stop anyway"
 msgstr "Toch stoppen"
 
-#: ../src/sugar/activity/namingalert.py:60
+#: ../src/sugar/activity/namingalert.py:79
 msgid "Name this entry"
 msgstr "Benoem deze ingang"
 
-#: ../src/sugar/activity/namingalert.py:248
+#: ../src/sugar/activity/namingalert.py:275
 msgid "Untitled"
 msgstr "Naamloos"
 
-#: ../src/sugar/activity/namingalert.py:255
+#: ../src/sugar/activity/namingalert.py:282
 msgid "Description:"
 msgstr "Beschrijving:"
 
-#: ../src/sugar/activity/namingalert.py:279
+#: ../src/sugar/activity/namingalert.py:306
 msgid "Tags:"
 msgstr "Labels:"
 
@@ -109,29 +109,29 @@ msgstr "Doorgaan"
 msgid "Choose a color"
 msgstr "Kies een kleur"
 
-#: ../src/sugar/graphics/colorbutton.py:262
+#: ../src/sugar/graphics/colorbutton.py:267
 msgid "Red"
 msgstr "Rood"
 
-#: ../src/sugar/graphics/colorbutton.py:264
+#: ../src/sugar/graphics/colorbutton.py:269
 msgid "Green"
 msgstr "Groen"
 
-#: ../src/sugar/graphics/colorbutton.py:266
+#: ../src/sugar/graphics/colorbutton.py:271
 msgid "Blue"
 msgstr "Blauw"
 
-#: ../src/sugar/util.py:194
+#: ../src/sugar/util.py:196
 msgid " and "
 msgstr " en "
 
-#: ../src/sugar/util.py:195
+#: ../src/sugar/util.py:197
 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:198
+#: ../src/sugar/util.py:200
 msgid "Seconds ago"
 msgstr "Seconden geleden"
 
@@ -139,49 +139,49 @@ msgstr "Seconden geleden"
 # "[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:202
+#: ../src/sugar/util.py:204
 #, python-format
 msgid "%s ago"
 msgstr "%s geleden"
 
 # TRANS: Relative dates (eg. 1 month and 5 days).
 #. TRANS: Relative dates (eg. 1 month and 5 days).
-#: ../src/sugar/util.py:215
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d jaar"
 msgstr[1] "%d jaren"
 
-#: ../src/sugar/util.py:216
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d maand"
 msgstr[1] "%d maanden"
 
-#: ../src/sugar/util.py:217
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d week"
 msgstr[1] "%d weken"
 
-#: ../src/sugar/util.py:218
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagen"
 
-#: ../src/sugar/util.py:219
+#: ../src/sugar/util.py:221
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d uur"
 msgstr[1] "%d uren"
 
-#: ../src/sugar/util.py:220
+#: ../src/sugar/util.py:222
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
diff --git a/po/zh_TW.po b/po/zh_TW.po
index 2cacea2..975283a 100644
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-01-20 00:31-0500\n"
+"POT-Creation-Date: 2009-04-29 17:35-0400\n"
 "PO-Revision-Date: 2009-01-28 19:22-0500\n"
 "Last-Translator: Yuan Chao <yuanchao@gmail.com>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -28,7 +28,7 @@ msgid "My Neighborhood"
 msgstr "我的鄰居"
 
 #: ../src/sugar/activity/activity.py:133
-#: ../src/sugar/activity/namingalert.py:65
+#: ../src/sugar/activity/namingalert.py:84
 msgid "Keep"
 msgstr "保存"
 
@@ -56,40 +56,40 @@ msgstr "貼上"
 msgid "Activity"
 msgstr "活動"
 
-#: ../src/sugar/activity/activity.py:542
+#: ../src/sugar/activity/activity.py:543
 #, python-format
 msgid "%s Activity"
 msgstr "%s 活動"
 
-#: ../src/sugar/activity/activity.py:910
+#: ../src/sugar/activity/activity.py:924
 msgid "Keep error"
 msgstr "保存時發生錯誤"
 
-#: ../src/sugar/activity/activity.py:911
+#: ../src/sugar/activity/activity.py:925
 msgid "Keep error: all changes will be lost"
 msgstr "保存時發生錯誤：所作的變動將遺失"
 
-#: ../src/sugar/activity/activity.py:914
+#: ../src/sugar/activity/activity.py:928
 msgid "Don't stop"
 msgstr "不停止"
 
-#: ../src/sugar/activity/activity.py:917
+#: ../src/sugar/activity/activity.py:931
 msgid "Stop anyway"
 msgstr "確定停止"
 
-#: ../src/sugar/activity/namingalert.py:60
+#: ../src/sugar/activity/namingalert.py:79
 msgid "Name this entry"
 msgstr "命名"
 
-#: ../src/sugar/activity/namingalert.py:248
+#: ../src/sugar/activity/namingalert.py:275
 msgid "Untitled"
 msgstr "未命名"
 
-#: ../src/sugar/activity/namingalert.py:255
+#: ../src/sugar/activity/namingalert.py:282
 msgid "Description:"
 msgstr "描述："
 
-#: ../src/sugar/activity/namingalert.py:279
+#: ../src/sugar/activity/namingalert.py:306
 msgid "Tags:"
 msgstr "標籤："
 
@@ -109,29 +109,29 @@ msgstr "繼續"
 msgid "Choose a color"
 msgstr "選擇喜歡的顏色"
 
-#: ../src/sugar/graphics/colorbutton.py:262
+#: ../src/sugar/graphics/colorbutton.py:267
 msgid "Red"
 msgstr "紅色"
 
-#: ../src/sugar/graphics/colorbutton.py:264
+#: ../src/sugar/graphics/colorbutton.py:269
 msgid "Green"
 msgstr "綠色"
 
-#: ../src/sugar/graphics/colorbutton.py:266
+#: ../src/sugar/graphics/colorbutton.py:271
 msgid "Blue"
 msgstr "藍色"
 
-#: ../src/sugar/util.py:194
+#: ../src/sugar/util.py:196
 msgid " and "
 msgstr " 和 "
 
-#: ../src/sugar/util.py:195
+#: ../src/sugar/util.py:197
 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:198
+#: ../src/sugar/util.py:200
 msgid "Seconds ago"
 msgstr "秒鐘前"
 
@@ -139,44 +139,44 @@ msgstr "秒鐘前"
 # "[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:202
+#: ../src/sugar/util.py:204
 #, 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:215
+#: ../src/sugar/util.py:217
 #, python-format
 msgid "%d year"
 msgid_plural "%d years"
 msgstr[0] "%d 年"
 
-#: ../src/sugar/util.py:216
+#: ../src/sugar/util.py:218
 #, python-format
 msgid "%d month"
 msgid_plural "%d months"
 msgstr[0] "%d 個月"
 
-#: ../src/sugar/util.py:217
+#: ../src/sugar/util.py:219
 #, python-format
 msgid "%d week"
 msgid_plural "%d weeks"
 msgstr[0] "%d 週"
 
-#: ../src/sugar/util.py:218
+#: ../src/sugar/util.py:220
 #, python-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d 天"
 
-#: ../src/sugar/util.py:219
+#: ../src/sugar/util.py:221
 #, python-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d 小時"
 
-#: ../src/sugar/util.py:220
+#: ../src/sugar/util.py:222
 #, python-format
 msgid "%d minute"
 msgid_plural "%d minutes"
--
cgit v0.9.1