sugarlabs
/
sugar-toolkit-gtk3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of gitorious@git.sugarlabs.org:sugar-toolkit/mainline

Browse Source
master
Simon Schampijer 15 years ago
parent a7daf73fae c5e5d3aeb7
commit 1d15b7f874
3 changed files with 79 additions and 37 deletions
Show Stats Download Patch File Download Diff File

101
po/es.po
Unescape Escape View File

@ -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"

13
src/sugar/activity/activity.py
Unescape Escape View File

@ -483,6 +483,7 @@ class Activity(Window, gtk.Container):
self._max_participants = 0
self._invites_queue = []
self._jobject = None
self._read_file_called = False
self._session = _get_session()
self._session.register(self)
@ -560,8 +561,6 @@ class Activity(Window, gtk.Container):
# https://dev.laptop.org/ticket/3071
datastore.write(self._jobject)
self.connect('map', self.__map_cb)
def get_active(self):
return self._active
@ -605,6 +604,8 @@ class Activity(Window, gtk.Container):
One commonly used canvas is gtk.ScrolledWindow
"""
Window.set_canvas(self, canvas)
if not self._read_file_called:
canvas.connect('map', self.__canvas_map_cb)
def __session_quit_requested_cb(self, session):
self._quit_requested = True
@ -617,9 +618,13 @@ class Activity(Window, gtk.Container):
def __session_quit_cb(self, client):
self._complete_close()
def __map_cb(self, canvas):
if self._jobject and self._jobject.file_path:
def __canvas_map_cb(self, canvas):
logging.debug('Activity.__canvas_map_cb')
if self._jobject and self._jobject.file_path and \
not self._read_file_called:
self.read_file(self._jobject.file_path)
self._read_file_called = True
canvas.disconnect_by_func(self.__canvas_map_cb)
def __jobject_create_cb(self):
pass

2
src/sugar/activity/bundlebuilder.py
Unescape Escape View File

@ -207,7 +207,7 @@ class SourcePackager(Packager):
self.config.tar_name)
def get_files(self):
git_ls = subprocess.Popen('git-ls-files', stdout=subprocess.PIPE,
git_ls = subprocess.Popen(['git', 'ls-files'], stdout=subprocess.PIPE,
cwd=self.config.source_dir)
stdout, _ = git_ls.communicate()
if git_ls.returncode :

Write Preview
Loading…
Cancel
Save