From 20f21cc481f99d1ec7a6eceec395434fa32f1aeb Mon Sep 17 00:00:00 2001
From: Richard Hughes <richard@hughsie.com>
Date: Tue, 28 Feb 2017 13:31:07 +0000
Subject: [PATCH] Use the pre-gnome-software application names

---
 data/gpk-log.desktop.in                  | 2 +-
 data/gpk-prefs.desktop.in                | 4 ++--
 data/org.gnome.PackageUpdater.desktop.in | 2 +-
 data/org.gnome.Packages.desktop.in       | 2 +-
 src/gpk-application.c                    | 2 +-
 src/gpk-application.ui                   | 6 +++---
 src/gpk-log.ui                           | 2 +-
 src/gpk-prefs.ui                         | 2 +-
 src/gpk-update-viewer.ui                 | 2 +-
 9 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/data/gpk-log.desktop.in b/data/gpk-log.desktop.in
index 4c15e65..9719ef5 100644
--- a/data/gpk-log.desktop.in
+++ b/data/gpk-log.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Package Log
+Name=Software Log Viewer
 Comment=View past package management tasks
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=gpk-log
diff --git a/data/gpk-prefs.desktop.in b/data/gpk-prefs.desktop.in
index 50b71d8..93bbe71 100644
--- a/data/gpk-prefs.desktop.in
+++ b/data/gpk-prefs.desktop.in
@@ -1,6 +1,6 @@
 [Desktop Entry]
-Name=Package Sources
-Comment=Enable or disable package repositories
+Name=Software Settings
+Comment=Change software update preferences and enable or disable software sources
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=gpk-prefs
 Exec=gpk-prefs
diff --git a/data/org.gnome.PackageUpdater.desktop.in b/data/org.gnome.PackageUpdater.desktop.in
index 44e5d27..5c6ea5d 100644
--- a/data/org.gnome.PackageUpdater.desktop.in
+++ b/data/org.gnome.PackageUpdater.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Package Updater
+Name=Software Update
 Comment=Update software installed on the system
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=system-software-update
diff --git a/data/org.gnome.Packages.desktop.in b/data/org.gnome.Packages.desktop.in
index d7c4b70..589cf78 100644
--- a/data/org.gnome.Packages.desktop.in
+++ b/data/org.gnome.Packages.desktop.in
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Name=Packages
+Name=Software
 Comment=Add or remove software installed on the system
 # Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=system-software-install
diff --git a/src/gpk-application.c b/src/gpk-application.c
index 96ec326..03ab714 100644
--- a/src/gpk-application.c
+++ b/src/gpk-application.c
@@ -2169,7 +2169,7 @@ gpk_application_activate_about_cb (GSimpleAction *action,
 
 	gtk_window_set_default_icon_name (GPK_ICON_SOFTWARE_INSTALLER);
 	gtk_show_about_dialog (GTK_WINDOW (main_window),
-                               "program-name", _("Packages"),
+                               "program-name", _("Software"),
 			       "version", PACKAGE_VERSION,
 			       "copyright", "Copyright \xc2\xa9 2007-2009 Richard Hughes",
 			       "license", license_trans,
diff --git a/src/gpk-application.ui b/src/gpk-application.ui
index 5620964..9ba0771 100644
--- a/src/gpk-application.ui
+++ b/src/gpk-application.ui
@@ -356,7 +356,7 @@
       <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Packages</property>
+        <property name="title" translatable="yes">Software</property>
         <property name="show_close_button">True</property>
         <child>
           <object class="GtkButton" id="button_clear">
@@ -417,7 +417,7 @@
         <attribute name="action">app.updates</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Package Sources</attribute>
+        <attribute name="label" translatable="yes">Software Sources</attribute>
         <attribute name="action">app.sources</attribute>
       </item>
       <item>
@@ -425,7 +425,7 @@
         <attribute name="action">app.refresh</attribute>
       </item>
       <item>
-        <attribute name="label" translatable="yes">Package Log</attribute>
+        <attribute name="label" translatable="yes">Software Log</attribute>
         <attribute name="action">app.log</attribute>
       </item>
     </section>
diff --git a/src/gpk-log.ui b/src/gpk-log.ui
index fb3842d..45f40d7 100644
--- a/src/gpk-log.ui
+++ b/src/gpk-log.ui
@@ -76,7 +76,7 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Package Log</property>
+        <property name="title" translatable="yes">Software Log Viewer</property>
         <property name="has_subtitle">False</property>
         <property name="show_close_button">True</property>
         <child>
diff --git a/src/gpk-prefs.ui b/src/gpk-prefs.ui
index eb3765d..6fb9acb 100644
--- a/src/gpk-prefs.ui
+++ b/src/gpk-prefs.ui
@@ -117,7 +117,7 @@
       <object class="GtkHeaderBar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Package Sources</property>
+        <property name="title" translatable="yes">Software Update Preferences</property>
         <property name="has_subtitle">False</property>
         <property name="show_close_button">True</property>
       </object>
diff --git a/src/gpk-update-viewer.ui b/src/gpk-update-viewer.ui
index 24cc216..256980a 100644
--- a/src/gpk-update-viewer.ui
+++ b/src/gpk-update-viewer.ui
@@ -286,7 +286,7 @@
       <object class="GtkHeaderBar" id="headerbar">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="title" translatable="yes">Package Updater</property>
+        <property name="title" translatable="yes">Software Update</property>
         <property name="show_close_button">True</property>
         <child>
           <object class="GtkButton" id="button_install">
-- 
2.9.3