Merge lp:~ttosttos/switchboard/fix-1004294 into lp:~elementary-pantheon/switchboard/switchboard

[ttosttos]

- Added gettext domain key to switchboard.desktop
- created desktop-launcher.vala to have xgettext automatically add launcher strings to translation template

[Avi Romanoff (aroman)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-04-17 07:07:02 +0000
+++ CMakeLists.txt	2012-06-07 06:26:20 +0000
@@ -72,6 +72,7 @@
     Switchboard/switchboard-app.vala
     Switchboard/switchboard-categoryview.vala
     Switchboard/switchboard-resources.vala
+    Switchboard/desktop-launcher.vala
 PACKAGES
     granite
     gee-1.0
 
=== added file 'Switchboard/desktop-launcher.vala'
--- Switchboard/desktop-launcher.vala	1970-01-01 00:00:00 +0000
+++ Switchboard/desktop-launcher.vala	2012-06-07 06:26:20 +0000
@@ -0,0 +1,8 @@
+namespace DesktopLauncher {
+    /* Translatable launcher (.desktop) strings to be added to   */
+    /* template (.pot) file. These strings MUST reflect any      */
+    /* changes in these launcher keys in .desktop file.          */
+    public const string COMMENT = N_("Change system and user settings");
+    public const string GENERIC_NAME = N_("Settings Center");
+
+}
 
=== modified file 'data/switchboard.desktop'
--- data/switchboard.desktop	2012-01-17 04:13:54 +0000
+++ data/switchboard.desktop	2012-06-07 06:26:20 +0000
@@ -2,9 +2,10 @@
 Type=Application
 Version=0.8
 Name=Switchboard
-_GenericName=Settings Center
-_Comment=Change system and user settings
+GenericName=Settings Center
+Comment=Change system and user settings
 Exec=switchboard
 Icon=preferences-desktop
 Terminal=false
 Categories=GTK;Administration;
+X-GNOME-Gettext-Domain=switchboard
 
=== modified file 'po/switchboard.pot'
--- po/switchboard.pot	2012-06-05 05:30:28 +0000
+++ po/switchboard.pot	2012-06-07 06:26:20 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-06-04 22:26-0700\n"
+"POT-Creation-Date: 2012-06-06 23:20-0700\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -17,22 +17,30 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-app.vala:387
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//desktop-launcher.vala:5
+msgid "Change system and user settings"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//desktop-launcher.vala:6
+msgid "Settings Center"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-app.vala:387
 msgid "Search Plugs"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "Personal"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "Hardware"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "Network and Wireless"
 msgstr ""
 
-#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-1004294/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "System"
 msgstr ""