Merge branch 'master' of git+ssh://dev.laptop.org/git/sugar

4 files changed, 171 insertions, 75 deletions

diff --git a/NEWS b/NEWS
index 05e4801..1f1d53f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,9 @@
+* Don't follow the cursor when expanding to secondary palette. (marco)
+* #2370 Update spanish translation. (marco)
+* #2014 Add icons in the share dropdown in activities. (marco)
+
+Snapshot 9ac5d38e90
+
 * #2361 Ensure secondary palette state doesn't go out of screen. (marco)
 * #2014 Use a combobox to represent activity network state. (marco)
 
diff --git a/po/es.po b/po/es.po
index 50b6dbe..5f27c05 100644
--- a/po/es.po
+++ b/po/es.po
@@ -7,9 +7,10 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-03-23 14:50+0100\n"
+"POT-Creation-Date: 2007-07-17 17:45-0700\n"
 "PO-Revision-Date: 2007-05-02 15:17-0300\n"
-"Last-Translator: UYLUG Grupo de usuarios Linux en Uruguay <uylug-linux@uylug.org.uy>\n"
+"Last-Translator: UYLUG Grupo de usuarios Linux en Uruguay <uylug-linux@uylug."
+"org.uy>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -19,96 +20,174 @@ msgstr ""
 "X-Poedit-Country: SPAIN\n"
 "X-Poedit-Basepath: .\n"
 
-#: ../services/clipboard/typeregistry.py:29
-msgid "Text snippet"
-msgstr "Recorte de texto"
+#: ../shell/intro/intro.py:61
+#, fuzzy
+msgid "Name:"
+msgstr "Nombre:"
 
-#: ../services/clipboard/typeregistry.py:57
+#: ../shell/intro/intro.py:84
+msgid "Click to change color:"
+msgstr "Clic para cambiar de color:"
+
+#: ../shell/intro/intro.py:134
+msgid "Back"
+msgstr "Atrás"
+
+#: ../shell/intro/intro.py:142
+msgid "Done"
+msgstr ""
+
+#: ../shell/intro/intro.py:145
+msgid "Next"
+msgstr "Siguiente"
+
+#: ../shell/view/BuddyMenu.py:82
+msgid "Remove friend"
+msgstr "Eliminar amigo"
+
+#: ../shell/view/BuddyMenu.py:85
+msgid "Make friend"
+msgstr "Agregar amigo"
+
+#. FIXME check that the buddy is not in the activity already
+#: ../shell/view/BuddyMenu.py:96
+msgid "Invite"
+msgstr "Invitar"
+
+#: ../shell/view/clipboardmenu.py:66
+msgid "Remove"
+msgstr "Eliminar"
+
+#: ../shell/view/clipboardmenu.py:70
+msgid "Open"
+msgstr "Abrir"
+
+#. self._stop_item = MenuItem(_('Stop download'), 'stock-close')
+#. TODO: Implement stopping downloads
+#. self._stop_item.connect('activate', self._stop_item_activate_cb)
+#. self.append_menu_item(self._stop_item)
+#: ../shell/view/clipboardmenu.py:79
+msgid "Add to journal"
+msgstr "Agregar al diario"
+
+#: ../shell/view/clipboardmenu.py:180
+#, python-format
+msgid "Clipboard object: %s."
+msgstr "Objeto de portapapel: %s"
+
+#: ../shell/view/frame/zoombox.py:42
+msgid "Neighborhood"
+msgstr "Vecindario"
+
+#: ../shell/view/frame/zoombox.py:55
+msgid "Group"
+msgstr "Grupo"
+
+#: ../shell/view/frame/zoombox.py:68
+msgid "Home"
+msgstr "Hogar"
+
+#: ../shell/view/frame/zoombox.py:81
+msgid "Activity"
+msgstr "Actividad"
+
+#: ../services/clipboard/objecttypeservice.py:32
+msgid "Text"
+msgstr "Texto"
+
+#: ../services/clipboard/objecttypeservice.py:36
 msgid "Image"
 msgstr "Imagen"
 
-#: ../services/clipboard/typeregistry.py:77
-msgid "Web Page"
-msgstr "Página web"
+#: ../shell/view/Shell.py:202
+msgid "Screenshot"
+msgstr "Captura de pantalla"
 
-#: ../services/clipboard/typeregistry.py:103
-msgid "PDF file"
-msgstr "Archivo PDF"
+#: ../shell/view/home/HomeBox.py:140
+msgid "Shutdown"
+msgstr "Apagar"
 
-#: ../services/clipboard/typeregistry.py:123
-msgid "MS Word file"
-msgstr "Archivo MS Word"
+#: ../shell/view/home/MeshBox.py:126
+msgid "Mesh Network"
+msgstr "Red Malla"
 
-#: ../services/clipboard/typeregistry.py:143
-msgid "RTF file"
-msgstr "Archivo RTF"
+#: ../shell/view/devices/battery.py:34
+msgid "My Battery life"
+msgstr "Carga de mi batería"
 
-#: ../services/clipboard/typeregistry.py:154
-msgid "Abiword file"
-msgstr "Archivo Abiword"
+#: ../shell/view/devices/battery.py:87
+msgid "Battery charging"
+msgstr "Batería cargandose"
 
-#: ../services/clipboard/typeregistry.py:165
-msgid "Squeak project"
-msgstr "Proyecto de Squeak"
+#: ../shell/view/devices/battery.py:89
+msgid "Battery discharging"
+msgstr "Batería descargandose"
 
-#: ../services/clipboard/typeregistry.py:185
-msgid "OpenOffice text file"
-msgstr "Archivo de texto de Openoffice"
+#: ../shell/view/devices/battery.py:91
+msgid "Battery fully charged"
+msgstr "Batería totalmente cargada"
 
-#: ../services/clipboard/typeregistry.py:202
-msgid "Object"
-msgstr "Objeto"
+#: ../sugar/activity/activity.py:68
+msgid "Keep"
+msgstr "Guardar"
 
-#: ../shell/intro/intro.py:78
-msgid "Pick a buddy picture"
-msgstr "Elegir la imagen de amigo"
+#: ../sugar/activity/activity.py:74
+msgid "Share"
+msgstr "Compartir"
 
-#: ../shell/intro/intro.py:101
-msgid "My Picture:"
-msgstr "Mi imagen:"
+#: ../sugar/activity/activity.py:87
+msgid "Stop"
+msgstr "Parar"
 
-#: ../shell/intro/intro.py:181
-msgid "My Name:"
-msgstr "Mi nombre:"
+#: ../sugar/activity/activity.py:248
+#, python-format
+msgid "%s Activity"
+msgstr "Actividad %s"
 
-#: ../shell/intro/intro.py:203
-msgid "My Color:"
-msgstr "Mi color:"
+#~ msgid "Text snippet"
+#~ msgstr "Recorte de texto"
 
-#: ../shell/view/BuddyMenu.py:89
-msgid "Remove friend"
-msgstr "Eliminar amigo"
+#~ msgid "Web Page"
+#~ msgstr "Página web"
 
-#: ../shell/view/BuddyMenu.py:93
-msgid "Make friend"
-msgstr "Agregar amigo"
+#~ msgid "PDF file"
+#~ msgstr "Archivo PDF"
 
-#: ../shell/view/BuddyMenu.py:103
-msgid "Invite"
-msgstr "Invitar"
+#~ msgid "MS Word file"
+#~ msgstr "Archivo MS-Word"
 
-#: ../shell/view/clipboardmenu.py:63
-#: ../shell/view/clipboardmenu.py:79
-msgid "Remove"
-msgstr "Eliminar"
+#~ msgid "RTF file"
+#~ msgstr "Archivo RTF"
 
-#: ../shell/view/clipboardmenu.py:69
-msgid "Open"
-msgstr "Abrir"
+#~ msgid "Abiword file"
+#~ msgstr "Archivo Abiword"
+
+#~ msgid "Squeak project"
+#~ msgstr "Proyecto de Squeak"
+
+#~ msgid "OpenOffice text file"
+#~ msgstr "Archivo de texto de OpenOffice"
+
+#~ msgid "Object"
+#~ msgstr "Objeto"
+
+#~ msgid "Pick a buddy picture"
+#~ msgstr "Elegir la imagen de amigo"
+
+#~ msgid "My Picture:"
+#~ msgstr "Mi imagen:"
 
-#: ../shell/view/clipboardmenu.py:93
-msgid "Stop download"
-msgstr "Interrumpir la bajada"
+#~ msgid "My Color:"
+#~ msgstr "Mi color:"
 
-#: ../shell/view/frame/ZoomBox.py:41
-msgid "Close"
-msgstr "Cerrar"
+#~ msgid "Stop download"
+#~ msgstr "Interrumpir la bajada"
 
-#: ../sugar/graphics/optionmenu.py:72
-msgid "No options"
-msgstr "Ninguna opción"
+#~ msgid "Close"
+#~ msgstr "Cerrar"
 
-#: ../sugar/chat/ChatEditor.py:56
-msgid "Send"
-msgstr "Enviar"
+#~ msgid "No options"
+#~ msgstr "Ninguna opción"
 
+#~ msgid "Send"
+#~ msgstr "Enviar"
diff --git a/sugar/activity/activity.py b/sugar/activity/activity.py
index 5615f38..31b8d95 100644
--- a/sugar/activity/activity.py
+++ b/sugar/activity/activity.py
@@ -70,8 +70,10 @@ class ActivityToolbar(gtk.Toolbar):
 
         self.share = ToolComboBox(label_text='Share with:')
         self.share.combo.connect('changed', self._share_changed_cb)
-        self.share.combo.append_item(None, _('Private'))
-        self.share.combo.append_item(None, _('My Neighborhood'))
+        self.share.combo.append_item(None, _('Private'),
+                                     'theme:zoom-home-mini')
+        self.share.combo.append_item(None, _('My Neighborhood'),
+                                     'theme:zoom-neighborhood-mini')
         self._update_share()
 
         self.insert(self.share, -1)
diff --git a/sugar/graphics/palette.py b/sugar/graphics/palette.py
index 8996138..b779eec 100644
--- a/sugar/graphics/palette.py
+++ b/sugar/graphics/palette.py
@@ -69,6 +69,8 @@ class Palette(gobject.GObject):
         gobject.GObject.__init__(self)
 
         self._full_request = [0, 0]
+        self._cursor_x = 0
+        self._cursor_y = 0
         self._state = self._SECONDARY  
         self._invoker = None
         self._group_id = None
@@ -250,6 +252,12 @@ class Palette(gobject.GObject):
 
         self._set_state(state)
 
+    def _update_cursor_position(self):
+        display = gtk.gdk.display_get_default()
+        screen, x, y, mask = display.get_pointer()
+        self._cursor_x = x
+        self._cursor_y = y
+
     def _update_position(self):
         x = y = 0
 
@@ -259,11 +267,11 @@ class Palette(gobject.GObject):
             position = self._position
 
         if position == self.AT_CURSOR:
-            display = gtk.gdk.display_get_default()
-            screen, x, y, mask = display.get_pointer()
             dist = style.PALETTE_CURSOR_DISTANCE
+            rect = gtk.gdk.Rectangle(self._cursor_x - dist,
+                                     self._cursor_y - dist,
+                                     dist * 2, dist * 2)
 
-            rect = gtk.gdk.Rectangle(x - dist, y - dist, dist * 2, dist * 2)
             x, y = self._get_at_cursor_position(rect)
         elif position == self.AROUND:
             x, y = self._get_around_position()
@@ -282,6 +290,7 @@ class Palette(gobject.GObject):
         if self._up:
             return
 
+        self._update_cursor_position()        
         self._update_full_request()
 
         self._invoker.connect_to_parent()