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

[Cody Garver]

[Victor Martinez (victored)]

Looks fine to me. Could you please make line 40 on switchboard-categoryview.vala translatable too?

review: Approve

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

257. By Cody Garver on 2012-07-22

Made alert string translatable.

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-06-26 11:53:10 +0000
+++ Switchboard/switchboard-app.vala	2012-07-22 22:20:22 +0000
@@ -153,7 +153,7 @@
                     any_plugs = true;
 
             if (!any_plugs) {
-                show_alert(_("No plugs found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
+                show_alert(_("No settings found"), _("Install some and re-launch Switchboard"), Gtk.MessageType.WARNING);
                 search_box.sensitive = false;
             }
             
@@ -166,7 +166,7 @@
                     }
                 }
                 if (!found) {
-                    critical ("Couldn't find %s among the loaded plugs.", plug_to_open);
+                    critical ("Couldn't find %s among the loaded settings.", plug_to_open);
                 }
             }
             
@@ -456,7 +456,7 @@
             progress_toolitem.set_expand(true);
 
             // Searchbar
-            search_box = new Granite.Widgets.SearchBar (_("Search Plugs"));
+            search_box = new Granite.Widgets.SearchBar (_("Search Settings"));
             search_box.primary_icon_stock = "gtk-find";
             search_box.activate.connect(() => search_box_activated());
             search_box.changed.connect(() => {

=== modified file 'Switchboard/switchboard-categoryview.vala'
--- Switchboard/switchboard-categoryview.vala	2012-06-18 13:50:04 +0000
+++ Switchboard/switchboard-categoryview.vala	2012-07-22 22:20:22 +0000
@@ -134,7 +134,7 @@
                 }
             }
             if (!any_found) {
-                switchboard.show_alert("No plugs found", "Try changing your search terms", Gtk.MessageType.INFO);
+                switchboard.show_alert(_("No settings found"), _("Try changing your search terms"), Gtk.MessageType.INFO);
             } else {
                 switchboard.hide_alert();
             }