[seahorse] Change menu item 'Places' to 'By keyring'

[Stefan Walter <stefw src gnome org>]

commit 3aa4130bfd35b4f62c9afa2bbdc669e5bd138580
Author: Stef Walter <stefw gnome org>
Date:   Fri Jan 27 13:21:21 2012 +0100

    Change menu item 'Places' to 'By keyring'
    
    https://bugzilla.gnome.org/show_bug.cgi?id=668784

 data/org.gnome.seahorse.manager.gschema.xml |   10 +++++-----
 libseahorse/seahorse-catalog.c              |    4 ++--
 src/seahorse-key-manager.c                  |    8 ++++----
 src/seahorse-key-manager.ui                 |    2 +-
 4 files changed, 12 insertions(+), 12 deletions(-)
---
diff --git a/data/org.gnome.seahorse.manager.gschema.xml b/data/org.gnome.seahorse.manager.gschema.xml
index efd3e2f..63a8c69 100644
--- a/data/org.gnome.seahorse.manager.gschema.xml
+++ b/data/org.gnome.seahorse.manager.gschema.xml
@@ -2,8 +2,8 @@
 	<schema id="org.gnome.seahorse.manager" path="/apps/seahorse/listing/">
 		<key name="sidebar-visible" type="b">
 			<default>false</default>
-			<summary>Show places sidebar</summary>
-			<description>Show places sidebar in seahorse.</description>
+			<summary>Show keyrings sidebar</summary>
+			<description>Show keyrings sidebar in seahorse.</description>
 		</key>
 		<key name="item-filter" type="s">
 			<default>"personal"</default>
@@ -16,10 +16,10 @@
 			<summary>Width of the side pane</summary>
 			<description>The default width of the side pane.</description>
 		</key>
-		<key name="places-selected" type="as">
+		<key name="keyrings-selected" type="as">
 			<default>["secret-service://login"]</default>
-			<summary>The places chosen</summary>
-			<description>The URIs of the places chosen in the sidebar.</description>
+			<summary>The keyrings chosen</summary>
+			<description>The URIs of the keyrings chosen in the sidebar.</description>
 		</key>
 
 		<!-- Unused, remove once stable -->
diff --git a/libseahorse/seahorse-catalog.c b/libseahorse/seahorse-catalog.c
index 95970e0..ffe2221 100644
--- a/libseahorse/seahorse-catalog.c
+++ b/libseahorse/seahorse-catalog.c
@@ -285,8 +285,8 @@ static const GtkActionEntry UI_ENTRIES[] = {
 	  N_("Delete selected items"), G_CALLBACK (on_object_delete) },
 	{ "properties-object", GTK_STOCK_PROPERTIES, NULL, NULL,
 	  N_("Show the properties of this item"), G_CALLBACK (on_properties_object) },
-	{ "properties-place", GTK_STOCK_PROPERTIES, NULL, NULL,
-	  N_("Show the properties of this place"), G_CALLBACK (on_properties_place) },
+	{ "properties-keyring", GTK_STOCK_PROPERTIES, NULL, NULL,
+	  N_("Show the properties of this keyring"), G_CALLBACK (on_properties_place) },
 	{ "app-preferences", GTK_STOCK_PREFERENCES, N_("Prefere_nces"), NULL,
 	  N_("Change preferences for this program"), G_CALLBACK (on_app_preferences) },
 	{ "view-menu", NULL, N_("_View") },
diff --git a/src/seahorse-key-manager.c b/src/seahorse-key-manager.c
index b65c3e6..a0eb17b 100644
--- a/src/seahorse-key-manager.c
+++ b/src/seahorse-key-manager.c
@@ -511,8 +511,8 @@ static const GtkActionEntry GENERAL_ACTIONS[] = {
 };
 
 static const GtkToggleActionEntry SIDEBAR_ACTIONS[] = {
-	{ "view-places", NULL, N_("P_laces"), NULL,
-	  N_("Show places sidebar"), NULL, FALSE },
+	{ "view-sidebar", NULL, N_("By _keyring"), NULL,
+	  N_("Show sidebar listing keyrings"), NULL, FALSE },
 };
 
 static const GtkRadioActionEntry VIEW_RADIO_ACTIONS[] = {
@@ -612,7 +612,7 @@ setup_sidebar (SeahorseKeyManager *self)
 	gtk_action_group_set_translation_domain (actions, GETTEXT_PACKAGE);
 	gtk_action_group_add_toggle_actions (actions, SIDEBAR_ACTIONS,
 	                                     G_N_ELEMENTS (SIDEBAR_ACTIONS), self);
-	action = gtk_action_group_get_action (actions, "view-places");
+	action = gtk_action_group_get_action (actions, "view-sidebar");
 	g_settings_bind (self->pv->settings, "sidebar-visible",
 	                 action, "active",
 	                 G_SETTINGS_BIND_DEFAULT);
@@ -625,7 +625,7 @@ setup_sidebar (SeahorseKeyManager *self)
 	seahorse_catalog_include_actions (SEAHORSE_CATALOG (self), actions);
 	g_object_unref (actions);
 
-	g_settings_bind (self->pv->settings, "places-selected",
+	g_settings_bind (self->pv->settings, "keyrings-selected",
 	                 self->pv->sidebar, "selected-uris",
 	                 G_SETTINGS_BIND_DEFAULT);
 
diff --git a/src/seahorse-key-manager.ui b/src/seahorse-key-manager.ui
index 3bbefc4..e110797 100644
--- a/src/seahorse-key-manager.ui
+++ b/src/seahorse-key-manager.ui
@@ -20,7 +20,7 @@
 		<placeholder name="RemoteMenu">
 		</placeholder>
 		<menu name="View" action="view-menu">
-			<menuitem action="view-places"/>
+			<menuitem action="view-sidebar"/>
 			<separator/>
 			<menuitem action="view-personal"/>
 			<menuitem action="view-trusted"/>