From 50e69d894c46a8b6ad46ee609784627f1874b4b7 Mon Sep 17 00:00:00 2001
From: Santiago Collazo <scollazo@activitycentral.com>
Date: Mon, 18 Mar 2013 18:40:06 +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 e294013..cde7114 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-03-07 20:50+0530\n"
+"POT-Creation-Date: 2013-03-18 22:40+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"
@@ -432,7 +432,7 @@ msgid ""
 "server will be able to see each other, even when they aren't on the same "
 "network."
 msgstr ""
-"Todos las personas asociadas al siguiente servidor podrán comunicarse entre sí, "
+"Todas las personas asociadas al siguiente servidor podrán comunicarse entre sí, "
 "aún cuando no estén dentro de la misma red"
 
 #: extensions/cpsection/network/view.py:768
@@ -861,16 +861,10 @@ msgstr "Después"
 msgid "Restart now"
 msgstr "Reiniciar ahora"
 
-#: src/jarabe/controlpanel/toolbar.py:56 src/jarabe/desktop/viewtoolbar.py:100
-#: src/jarabe/journal/journaltoolbox.py:91
-#, fuzzy, python-format
-msgid "Search in %s"
-msgstr "Buscar en el %s"
-
 #: src/jarabe/controlpanel/toolbar.py:56
 #, fuzzy
-msgid "Settings"
-msgstr "Mis ajustes"
+msgid "Search in Settings"
+msgstr "Buscar en la Configuración"
 
 #: src/jarabe/controlpanel/toolbar.py:65 src/jarabe/intro/window.py:272
 msgid "Done"
@@ -1105,6 +1099,11 @@ msgstr "Vista en lista"
 msgid "<Ctrl>2"
 msgstr "<Ctrl>2"
 
+#: src/jarabe/desktop/viewtoolbar.py:100
+#, fuzzy, python-format
+msgid "Search in %s"
+msgstr "Buscar en el %s"
+
 #: src/jarabe/desktop/viewtoolbar.py:149
 msgid "Favorites view"
 msgstr "Vista de favoritos"
@@ -1289,7 +1288,7 @@ msgid "Tags:"
 msgstr "Etiquetas:"
 
 #: src/jarabe/journal/journalactivity.py:126
-#: src/jarabe/journal/journaltoolbox.py:91 src/jarabe/journal/palettes.py:1228
+#: src/jarabe/journal/palettes.py:1228
 #: src/jarabe/journal/volumestoolbar.py:472
 msgid "Journal"
 msgstr "Diario"
@@ -1302,6 +1301,11 @@ msgstr "Parar"
 msgid "Continue"
 msgstr "Continuar"
 
+#: src/jarabe/journal/journaltoolbox.py:91
+#, fuzzy
+msgid "Search in Journal"
+msgstr "Buscar en el Diario"
+
 #: src/jarabe/journal/journaltoolbox.py:141
 msgid "Anytime"
 msgstr "Cualquier momento"
diff --git a/src/jarabe/controlpanel/toolbar.py b/src/jarabe/controlpanel/toolbar.py
index 1423e94..8386967 100644
--- a/src/jarabe/controlpanel/toolbar.py
+++ b/src/jarabe/controlpanel/toolbar.py
@@ -53,7 +53,7 @@ class MainToolbar(Gtk.Toolbar):
                                               'system-search')
         self._search_entry.add_clear_button()
         self._search_entry.set_width_chars(25)
-        text = _('Search in %s') % _('Settings')
+        text = _('Search in Settings')
         self._search_entry.set_placeholder_text(text)
         self._search_entry.connect('changed', self.__search_entry_changed_cb)
         tool_item.add(self._search_entry)
diff --git a/src/jarabe/desktop/viewtoolbar.py b/src/jarabe/desktop/viewtoolbar.py
index 5cb0186..803c51a 100644
--- a/src/jarabe/desktop/viewtoolbar.py
+++ b/src/jarabe/desktop/viewtoolbar.py
@@ -97,7 +97,7 @@ class ViewToolbar(Gtk.Toolbar):
         self.search_entry.props.text = ''
 
     def set_placeholder_text_for_view(self, view_name):
-        text = _('Search in %s') % view_name
+        text = _('Search in %s' % view_name)
         self.search_entry.set_placeholder_text(text)
 
     def _add_separator(self, expand=False):
diff --git a/src/jarabe/journal/journaltoolbox.py b/src/jarabe/journal/journaltoolbox.py
index 1e0b2d5..8b66cac 100644
--- a/src/jarabe/journal/journaltoolbox.py
+++ b/src/jarabe/journal/journaltoolbox.py
@@ -88,7 +88,7 @@ class MainToolbox(ToolbarBox):
         self.search_entry = iconentry.IconEntry()
         self.search_entry.set_icon_from_name(iconentry.ICON_ENTRY_PRIMARY,
                                              'system-search')
-        text = _('Search in %s') % _('Journal')
+        text = _('Search in Journal')
         self.search_entry.set_placeholder_text(text)
         self.search_entry.connect('activate', self._search_entry_activated_cb)
         self.search_entry.connect('changed', self._search_entry_changed_cb)
--
cgit v0.9.1