From d9fd2c5cbfb6ab8bf8ebcdb0a7b0be95d7108617 Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Tue, 16 Apr 2013 20:40:07 +0000
Subject: Merge remote-tracking branch 'ajay/0.97.7-as-base' into devel

---
diff --git a/po/es.po b/po/es.po
index 4474e39..e971958 100644
--- a/po/es.po
+++ b/po/es.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-04-01 22:15+0530\n"
+"POT-Creation-Date: 2013-04-17 01:26+0530\n"
 "PO-Revision-Date: 2012-10-15 21:21+0200\n"
 "Last-Translator: Rafael Ortiz <rafael@laptop.org>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1942,10 +1942,18 @@ msgstr "Ver fuente"
 msgid "Start new"
 msgstr "Empezar nuevo"
 
+#: src/jarabe/view/palettes.py:245
+msgid "Remove"
+msgstr "Quitar"
+
 #: src/jarabe/view/palettes.py:316
 msgid "Reload"
 msgstr "Recargar"
 
+#: src/jarabe/view/palettes.py:327
+msgid "Unmount"
+msgstr "Desmontar"
+
 #: src/jarabe/view/palettes.py:368
 msgid "Restore Journal"
 msgstr "Restaurar Diario"
@@ -2310,10 +2318,6 @@ msgstr "Sugar en una ventana"
 #~ msgid "%s (%s)"
 #~ msgstr "%s (%s)"
 
-#~ msgctxt "Clipboard"
-#~ msgid "Remove"
-#~ msgstr "Eliminar"
-
 #~ msgid "Clear history"
 #~ msgstr "Borrar historial"
 
@@ -2339,10 +2343,6 @@ msgstr "Sugar en una ventana"
 #~ msgid "Remove"
 #~ msgstr "Quitar"
 
-#~ msgctxt "Share"
-#~ msgid "Unmount"
-#~ msgstr "Desmontar"
-
 #~ msgid "Download size: %s"
 #~ msgstr "Tamaño de descarga: %s"
 
diff --git a/src/jarabe/view/palettes.py b/src/jarabe/view/palettes.py
index db5298b..8256757 100644
--- a/src/jarabe/view/palettes.py
+++ b/src/jarabe/view/palettes.py
@@ -242,7 +242,7 @@ class VolumePalette(Palette):
         self.set_content(self.content_box)
         self.content_box.show()
 
-        menu_item = PaletteMenuItem(pgettext('Volume', 'Remove'))
+        menu_item = PaletteMenuItem(pgettext('Volume', _('Remove')))
 
         icon = Icon(icon_name='media-eject', icon_size=Gtk.IconSize.MENU)
         menu_item.set_image(icon)
@@ -324,7 +324,7 @@ class RemoteSharePalette(Palette):
 
 
         if show_unmount_option == True:
-            menu_item = PaletteMenuItem(pgettext('Share', 'Unmount'))
+            menu_item = PaletteMenuItem(pgettext('Share', _('Unmount')))
             icon = Icon(icon_name='media-eject', icon_size=Gtk.IconSize.MENU)
             menu_item.set_image(icon)
             icon.show()
--
cgit v0.9.1