Merge commit 'refs/top-bases/t/bug-1786' into t/bug-1786

3 files changed, 163 insertions, 110 deletions

diff --git a/po/es.po b/po/es.po
index 836bd44..183a54e 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,38 +6,38 @@ msgid ""
 msgstr ""
 "Project-Id-Version: olpc-sugar\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-08-26 00:33-0400\n"
-"PO-Revision-Date: 2009-09-02 18:26-0400\n"
-"Last-Translator: Rafael Ortiz <rafael@laptop.org>\n"
+"POT-Creation-Date: 2010-01-20 13:10-0500\n"
+"PO-Revision-Date: 2010-03-11 23:18+0200\n"
+"Last-Translator: Roger Orellana <rjorellana@gmail.com>\n"
 "Language-Team: Fedora Spanish <fedora-trans-es@redhat.com>\n"
 "Language: es\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.2.1\n"
+"X-Generator: Pootle 2.0.1\n"
 "X-Poedit-Language: Spanish\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "X-Poedit-Basepath: .\n"
 
-#: ../src/sugar/activity/activity.py:329
+#: ../src/sugar/activity/activity.py:338
 #, python-format
 msgid "%s Activity"
 msgstr "Actividad %s"
 
-#: ../src/sugar/activity/activity.py:714
+#: ../src/sugar/activity/activity.py:738
 msgid "Keep error"
 msgstr "Error al guardar"
 
-#: ../src/sugar/activity/activity.py:715
+#: ../src/sugar/activity/activity.py:739
 msgid "Keep error: all changes will be lost"
 msgstr "Error al guardar: todos los cambios se perderán"
 
-#: ../src/sugar/activity/activity.py:718
+#: ../src/sugar/activity/activity.py:742
 msgid "Don't stop"
 msgstr "No detener"
 
-#: ../src/sugar/activity/activity.py:721
+#: ../src/sugar/activity/activity.py:745
 msgid "Stop anyway"
 msgstr "Detener de todas formas"
 
@@ -50,7 +50,7 @@ msgstr "Nombre esta entrada"
 # self._stop_item.connect('activate', self._stop_item_activate_cb)
 # self.append_menu_item(self._stop_item)
 #: ../src/sugar/activity/namingalert.py:87
-#: ../src/sugar/activity/widgets.py:162
+#: ../src/sugar/activity/widgets.py:166
 msgid "Keep"
 msgstr "Guardar"
 
@@ -66,35 +66,35 @@ msgstr "Descripción:"
 msgid "Tags:"
 msgstr "Etiquetas:"
 
-#: ../src/sugar/activity/widgets.py:79
+#: ../src/sugar/activity/widgets.py:83
 msgid "Stop"
 msgstr "Parar"
 
-#: ../src/sugar/activity/widgets.py:91
+#: ../src/sugar/activity/widgets.py:95
 msgid "Undo"
 msgstr "Deshacer"
 
-#: ../src/sugar/activity/widgets.py:99
+#: ../src/sugar/activity/widgets.py:103
 msgid "Redo"
 msgstr "Rehacer"
 
-#: ../src/sugar/activity/widgets.py:106
+#: ../src/sugar/activity/widgets.py:110
 msgid "Copy"
 msgstr "Copiar"
 
-#: ../src/sugar/activity/widgets.py:113
+#: ../src/sugar/activity/widgets.py:117
 msgid "Paste"
 msgstr "Pegar"
 
-#: ../src/sugar/activity/widgets.py:123
+#: ../src/sugar/activity/widgets.py:127
 msgid "Private"
 msgstr "Privado"
 
-#: ../src/sugar/activity/widgets.py:130
+#: ../src/sugar/activity/widgets.py:134
 msgid "My Neighborhood"
 msgstr "Mi Vecindario"
 
-#: ../src/sugar/activity/widgets.py:341
+#: ../src/sugar/activity/widgets.py:345
 msgid "Activity"
 msgstr "Actividad"
 
@@ -104,7 +104,7 @@ msgstr "Cancelar"
 
 #: ../src/sugar/graphics/alert.py:290 ../src/sugar/graphics/alert.py:424
 msgid "Ok"
-msgstr "Ok"
+msgstr "Aceptar"
 
 #: ../src/sugar/graphics/alert.py:375
 msgid "Continue"
diff --git a/po/hi.po b/po/hi.po
index 93a56e3..321676a 100644
--- a/po/hi.po
+++ b/po/hi.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2008-06-24 00:07+0530\n"
+"POT-Creation-Date: 2010-01-20 13:10-0500\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,138 +16,191 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: Translate Toolkit 1.1.1rc4\n"
 
-#: ../src/sugar/activity/activity.py:120
-msgid "Share with:"
-msgstr ""
+#: ../src/sugar/activity/activity.py:338
+#, python-format
+msgid "%s Activity"
+msgstr "%s क्रियाएँ"
 
-#: ../src/sugar/activity/activity.py:122
-msgid "Private"
-msgstr ""
+#: ../src/sugar/activity/activity.py:738
+msgid "Keep error"
+msgstr "त्रुटि को रखे रहें"
 
-#: ../src/sugar/activity/activity.py:123
-msgid "My Neighborhood"
-msgstr ""
+#: ../src/sugar/activity/activity.py:739
+msgid "Keep error: all changes will be lost"
+msgstr "त्रुटि को रखे रहें: सारे परिवर्तन खो जाएँगे"
+
+#: ../src/sugar/activity/activity.py:742
+msgid "Don't stop"
+msgstr "बन्द न करें"
+
+#: ../src/sugar/activity/activity.py:745
+msgid "Stop anyway"
+msgstr "जैसे भी हो बन्द करें"
+
+#: ../src/sugar/activity/namingalert.py:82
+msgid "Name this entry"
+msgstr "इस प्रविष्टि को नाम दें"
 
-#: ../src/sugar/activity/activity.py:130
+#: ../src/sugar/activity/namingalert.py:87
+#: ../src/sugar/activity/widgets.py:166
 msgid "Keep"
-msgstr ""
+msgstr "रखें"
+
+#: ../src/sugar/activity/namingalert.py:283
+msgid "Untitled"
+msgstr "बिना शीर्षक"
 
-#: ../src/sugar/activity/activity.py:136
+#: ../src/sugar/activity/namingalert.py:290
+msgid "Description:"
+msgstr "वर्णन:"
+
+#: ../src/sugar/activity/namingalert.py:314
+msgid "Tags:"
+msgstr "टैग्स:"
+
+#: ../src/sugar/activity/widgets.py:83
 msgid "Stop"
-msgstr ""
+msgstr "रूकें"
 
-#: ../src/sugar/activity/activity.py:251
+#: ../src/sugar/activity/widgets.py:95
 msgid "Undo"
-msgstr ""
+msgstr "पहले जैसा"
 
-#: ../src/sugar/activity/activity.py:256
+#: ../src/sugar/activity/widgets.py:103
 msgid "Redo"
-msgstr ""
+msgstr "दोहराएँ"
 
-#: ../src/sugar/activity/activity.py:266
+#: ../src/sugar/activity/widgets.py:110
 msgid "Copy"
-msgstr ""
+msgstr "नक़ल"
 
-#: ../src/sugar/activity/activity.py:271
+#: ../src/sugar/activity/widgets.py:117
 msgid "Paste"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:297
-msgid "Activity"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:469
-#, python-format
-msgid "%s Activity"
-msgstr ""
-
-#: ../src/sugar/activity/activity.py:856
-msgid "Keep error"
-msgstr ""
+msgstr "चिपकाएँ"
 
-#: ../src/sugar/activity/activity.py:857
-msgid "Keep error: all changes will be lost"
-msgstr ""
+#: ../src/sugar/activity/widgets.py:127
+msgid "Private"
+msgstr "निजी"
 
-#: ../src/sugar/activity/activity.py:860
-msgid "Don't stop"
-msgstr ""
+#: ../src/sugar/activity/widgets.py:134
+msgid "My Neighborhood"
+msgstr "मेरा पड़ोस"
 
-#: ../src/sugar/activity/activity.py:863
-msgid "Stop anyway"
-msgstr ""
+#: ../src/sugar/activity/widgets.py:345
+msgid "Activity"
+msgstr "क्रियाएँ"
 
-#: ../src/sugar/graphics/alert.py:166 ../src/sugar/graphics/alert.py:209
+#: ../src/sugar/graphics/alert.py:286 ../src/sugar/graphics/alert.py:365
 msgid "Cancel"
-msgstr ""
+msgstr "रद्द करें"
 
-#: ../src/sugar/graphics/alert.py:170 ../src/sugar/graphics/alert.py:247
+#: ../src/sugar/graphics/alert.py:290 ../src/sugar/graphics/alert.py:424
 msgid "Ok"
-msgstr ""
+msgstr "ठीक"
 
-#: ../src/sugar/graphics/alert.py:219
+#: ../src/sugar/graphics/alert.py:375
 msgid "Continue"
-msgstr ""
+msgstr "जारी रखें"
+
+#: ../src/sugar/graphics/colorbutton.py:52
+msgid "Choose a color"
+msgstr "रंग चुनें"
+
+#: ../src/sugar/graphics/colorbutton.py:272
+msgid "Red"
+msgstr "लाल"
 
-#: ../src/sugar/util.py:181
+#: ../src/sugar/graphics/colorbutton.py:274
+msgid "Green"
+msgstr "हरा"
+
+#: ../src/sugar/graphics/colorbutton.py:276
+msgid "Blue"
+msgstr "नीला"
+
+#: ../src/sugar/util.py:218
 msgid " and "
-msgstr ""
+msgstr " और"
 
-#: ../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 "सेकण्ड पहले"
 
 #. 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 पहले"
 
 #. 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 वर्ष"
+msgstr[1] "%d वर्ष"
 
-#: ../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 माह"
+msgstr[1] "%d माह"
 
-#: ../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 सप्ताह"
+msgstr[1] "%d सप्ताह"
 
-#: ../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 दिन"
+msgstr[1] "%d दिन"
 
-#: ../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 घंटा"
+msgstr[1] "%d घंटा"
 
-#: ../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 मिनट"
+msgstr[1] "%d मिनट"
+
+#: ../src/sugar/util.py:339
+msgid "Empty"
+msgstr "रिक्त"
+
+#: ../src/sugar/util.py:341
+#, python-format
+msgid "%d B"
+msgstr "%d बा."
+
+#: ../src/sugar/util.py:343
+#, python-format
+msgid "%d KB"
+msgstr "%d कि.बा."
+
+#: ../src/sugar/util.py:345
+#, python-format
+msgid "%d MB"
+msgstr "%d मे.बा."
+
+#: ../src/sugar/util.py:347
+#, python-format
+msgid "%d GB"
+msgstr "%d गी.बा."
diff --git a/po/it.po b/po/it.po
index 2f7a6a8..0013608 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-08-26 00:33-0400\n"
+"POT-Creation-Date: 2010-01-20 13:10-0500\n"
 "PO-Revision-Date: 2009-09-01 12:12-0400\n"
 "Last-Translator: Carlo Falciola <cfalciola@yahoo.it>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,24 +17,24 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Pootle 1.2.1\n"
 
-#: ../src/sugar/activity/activity.py:329
+#: ../src/sugar/activity/activity.py:338
 #, python-format
 msgid "%s Activity"
 msgstr "Attività %s "
 
-#: ../src/sugar/activity/activity.py:714
+#: ../src/sugar/activity/activity.py:738
 msgid "Keep error"
 msgstr "Errore di memorizzazione"
 
-#: ../src/sugar/activity/activity.py:715
+#: ../src/sugar/activity/activity.py:739
 msgid "Keep error: all changes will be lost"
 msgstr "Errore di memorizzazione: tutte le modifiche saranno perse"
 
-#: ../src/sugar/activity/activity.py:718
+#: ../src/sugar/activity/activity.py:742
 msgid "Don't stop"
 msgstr "Non Fermare"
 
-#: ../src/sugar/activity/activity.py:721
+#: ../src/sugar/activity/activity.py:745
 msgid "Stop anyway"
 msgstr "Ferma comunque"
 
@@ -43,7 +43,7 @@ msgid "Name this entry"
 msgstr "Dai un nome a questo oggetto"
 
 #: ../src/sugar/activity/namingalert.py:87
-#: ../src/sugar/activity/widgets.py:162
+#: ../src/sugar/activity/widgets.py:166
 msgid "Keep"
 msgstr "Memorizza"
 
@@ -59,35 +59,35 @@ msgstr "Descrizione:"
 msgid "Tags:"
 msgstr "Etichette:"
 
-#: ../src/sugar/activity/widgets.py:79
+#: ../src/sugar/activity/widgets.py:83
 msgid "Stop"
 msgstr "Chiudi"
 
-#: ../src/sugar/activity/widgets.py:91
+#: ../src/sugar/activity/widgets.py:95
 msgid "Undo"
 msgstr "Annulla"
 
-#: ../src/sugar/activity/widgets.py:99
+#: ../src/sugar/activity/widgets.py:103
 msgid "Redo"
 msgstr "Ripeti"
 
-#: ../src/sugar/activity/widgets.py:106
+#: ../src/sugar/activity/widgets.py:110
 msgid "Copy"
 msgstr "Copia"
 
-#: ../src/sugar/activity/widgets.py:113
+#: ../src/sugar/activity/widgets.py:117
 msgid "Paste"
 msgstr "Incolla"
 
-#: ../src/sugar/activity/widgets.py:123
+#: ../src/sugar/activity/widgets.py:127
 msgid "Private"
 msgstr "Privato"
 
-#: ../src/sugar/activity/widgets.py:130
+#: ../src/sugar/activity/widgets.py:134
 msgid "My Neighborhood"
 msgstr "I miei vicini"
 
-#: ../src/sugar/activity/widgets.py:341
+#: ../src/sugar/activity/widgets.py:345
 msgid "Activity"
 msgstr "Attività"