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

[Cody Garver]

Change "System" category to "Administration" to fix bug #1194167.

[David Gomes (davidgomes)]

review: Approve

=== modified file 'po/switchboard.pot'
--- po/switchboard.pot	2013-12-14 16:45:44 +0000
+++ po/switchboard.pot	2014-01-17 23:42:24 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2013-12-14 17:45+0100\n"
+"POT-Creation-Date: 2014-01-17 17:40-0600\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,56 +17,51 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/noelco/libpeas-isis/po/../src//DesktopLauncher.vala:6
-msgid "Change system and user settings"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//DesktopLauncher.vala:7
-msgid "Settings Center"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:174
-#, c-format
-msgid "Unable to load plug %s's icon: %s"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:211
-#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:132
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//Switchboard.vala:21
+msgid "Open a plug"
+msgstr ""
+
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//Switchboard.vala:53
+msgid "All Settings"
+msgstr ""
+
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//Switchboard.vala:201
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//CategoryView.vala:233
 msgid "No settings found"
 msgstr ""
 
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:211
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//Switchboard.vala:201
+msgid "Install some and re-launch Switchboard"
+msgstr ""
+
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//Switchboard.vala:263
+msgid "Search Settings"
+msgstr ""
+
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//CategoryView.vala:233
 msgid "Try changing your search terms"
 msgstr ""
 
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:302
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//CategoryView.vala:323
 msgid "Personal"
 msgstr ""
 
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:305
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//CategoryView.vala:325
 msgid "Hardware"
 msgstr ""
 
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:308
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//CategoryView.vala:327
 msgid "Network and Wireless"
 msgstr ""
 
-#: /home/noelco/libpeas-isis/po/../src//CategoryView.vala:311
-msgid "System"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:38
-msgid "All Settings"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:132
-msgid "Install some and re-launch Switchboard"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:215
-msgid "Search Settings"
-msgstr ""
-
-#: /home/noelco/libpeas-isis/po/../src//Switchboard.vala:315
-msgid "Open a plug"
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//CategoryView.vala:329
+msgid "Administration"
+msgstr ""
+
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//DesktopLauncher.vala:6
+msgid "Change system and user settings"
+msgstr ""
+
+#: /tmp/tmp.KVRL5pG1d8/s/po/../src//DesktopLauncher.vala:7
+msgid "Settings Center"
 msgstr ""

=== modified file 'src/CategoryView.vala'
--- src/CategoryView.vala	2014-01-02 20:29:12 +0000
+++ src/CategoryView.vala	2014-01-17 23:42:24 +0000
@@ -326,10 +326,10 @@
                 case Plug.Category.NETWORK:
                     return _("Network and Wireless");
                 case Plug.Category.SYSTEM:
-                    return _("System");
+                    return _("Administration");
             }
 
             return null;
         }
     }
-}
\ No newline at end of file
+}