Merge lp:~codygarver/switchboard/fix-1027662 into lp:~elementary-pantheon/switchboard/switchboard

[Cody Garver]

[lp:~codygarver/switchboard/fix-1027662]

257. By Cody Garver on 2012-07-22

Change window title from "Switchboard" to _("System Settings").

[Danielle Foré (danrabbit)]

I'm +1 on changing the title. It seems kind of odd to change the .desktop and not the window title.

[lp:~codygarver/switchboard/fix-1027662]

258. By Cody Garver on 2012-07-22

Merge with trunk.

259. By Cody Garver on 2012-07-22

Updated POT file.

260. By Cody Garver on 2012-07-23

Hardcode program_name to Switchboard so that About does NOT display System Settings as the app's name.

261. By Cody Garver on 2012-07-23

Merge trunk.

[Cody Garver (codygarver)]

I hereby approve my own work.

review: Approve

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-07-23 00:18:24 +0000
+++ Switchboard/switchboard-app.vala	2012-07-23 00:45:20 +0000
@@ -24,7 +24,7 @@
         
         construct {
             application_id = "org.elementary.Switchboard";
-            program_name = APP_TITLE;
+            program_name = "Switchboard";
             app_years = "2011-2012";
 
             build_version = VERSION;

=== modified file 'Switchboard/switchboard-resources.vala'
--- Switchboard/switchboard-resources.vala	2012-07-23 00:21:12 +0000
+++ Switchboard/switchboard-resources.vala	2012-07-23 00:45:20 +0000
@@ -1,6 +1,6 @@
 namespace Switchboard {
 
-    public const string APP_TITLE = "Switchboard";
+    public const string APP_TITLE = _("System Settings");
     public const string COPYRIGHT = "Copyright (C) 2011-2012 Avi Romanoff";
     public const string WEBSITE = "https://launchpad.net/switchboard";
     public const string VERSION = "0.9";

=== modified file 'data/switchboard.desktop'
--- data/switchboard.desktop	2012-06-07 06:21:02 +0000
+++ data/switchboard.desktop	2012-07-23 00:45:20 +0000
@@ -1,8 +1,7 @@
 [Desktop Entry]
 Type=Application
 Version=0.8
-Name=Switchboard
-GenericName=Settings Center
+Name=System Settings
 Comment=Change system and user settings
 Exec=switchboard
 Icon=preferences-desktop

=== modified file 'po/switchboard.pot'
--- po/switchboard.pot	2012-07-22 22:23:37 +0000
+++ po/switchboard.pot	2012-07-23 00:45:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-22 17:23-0500\n"
+"POT-Creation-Date: 2012-07-22 18:44-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -106,3 +106,7 @@
 #: /home/codygarver/switchboard/po/../Switchboard//switchboard-app.vala:523
 msgid "Switchboard already running. Exiting.."
 msgstr ""
+
+#: /home/codygarver/switchboard/po/../Switchboard//switchboard-resources.vala:3
+msgid "System Settings"
+msgstr ""