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

[ttosttos]

- uses the most recent Translations.cmake so all translatable strings get pulled into template by xgettext
- made logging messages non-translatable. They were being incorrectly marked for translation.
- Updated template (switchboard.pot)

[Cody Garver (codygarver)]

review: Approve

=== modified file 'Switchboard/switchboard-app.vala'
--- Switchboard/switchboard-app.vala	2012-03-27 10:51:17 +0000
+++ Switchboard/switchboard-app.vala	2012-06-05 05:38:18 +0000
@@ -141,7 +141,7 @@
             if (current_plug["title"] != title) {
                 try {
                     // The plug is already selected
-                    debug(_("Exiting plug \"%s\" from Switchboard controller.."), current_plug["title"]);
+                    debug("Exiting plug \"%s\" from Switchboard controller..", current_plug["title"]);
                     plug_closed();
                     var cmd_exploded = executable.split(" ");
                     string working_directory = File.new_for_path(cmd_exploded[0]).get_parent().get_path();
@@ -153,7 +153,7 @@
                     navigation_button.stock_id = Gtk.Stock.HOME;
                     switch_to_socket ();
                 } catch {
-                    warning(_("Failed to launch plug: title %s | executable %s"), title, executable);
+                    warning("Failed to launch plug: title %s | executable %s", title, executable);
                 }
             }
             else {
@@ -294,7 +294,7 @@
             }
             catch
             {
-                warning(_(@"Unable to iterate over enumerated plug directory \"$path\"'s contents"));
+                warning(@"Unable to iterate over enumerated plug directory \"$path\"'s contents");
             }
             return keyfiles;
         }
@@ -444,16 +444,16 @@
         var logger = new Granite.Services.Logger ();
         logger.initialize(APP_TITLE);
         logger.DisplayLevel = Granite.Services.LogLevel.INFO;
-        message(_(@"Welcome to $APP_TITLE"));
-        message(_(@"Version: $VERSION"));
-        message(_("Report any issues/bugs you mind find to lp:switchboard"));
+        message(@"Welcome to $APP_TITLE");
+        message(@"Version: $VERSION");
+        message("Report any issues/bugs you mind find to lp:switchboard");
 
         Gtk.init (ref args);
         Bus.own_name (BusType.SESSION, "org.elementary.switchboard",
                 BusNameOwnerFlags.NONE,
                 (conn) => {on_bus_aquired (conn, args);},
                 () => {},
-                () => {logger.notification(_("Switchboard already running. Exiting..")); Process.exit(1);});
+                () => {logger.notification("Switchboard already running. Exiting.."); Process.exit(1);});
 
         Gtk.main ();
         return 0;
 
=== modified file 'Switchboard/switchboard-categoryview.vala'
--- Switchboard/switchboard-categoryview.vala	2012-01-30 16:20:38 +0000
+++ Switchboard/switchboard-categoryview.vala	2012-06-05 05:38:18 +0000
@@ -65,14 +65,14 @@
             Gtk.TreeIter root;
             string plug_down = plug["category"].down();
             if (!(plug_down in category_ids)) {
-                warning(_("Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"), plug["title"], plug["category"]);
+                warning("Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added", plug["title"], plug["category"]);
             }
             category_store[plug_down].append(out root);
             try {
                 var icon_pixbuf = theme.load_icon (plug["icon"], 48, Gtk.IconLookupFlags.GENERIC_FALLBACK);
                 category_store[plug_down].set(root, 1, icon_pixbuf);
             } catch {
-                warning(_("Unable to load plug %'s icon: %s"), plug["title"], plug["icon"]);
+                warning("Unable to load plug %'s icon: %s", plug["title"], plug["icon"]);
             }
             category_store[plug_down].set(root, 0, plug["title"]);
             category_store[plug_down].set(root, 2, plug["exec"]);
 
=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2012-01-13 17:02:58 +0000
+++ cmake/Translations.cmake	2012-06-05 05:38:18 +0000
@@ -24,11 +24,11 @@
     set(C_SOURCE "")
 
     foreach(FILES_INPUT ${ARGN})
-        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
         foreach(C_FILE ${SOURCE_FILES})
             set(C_SOURCE ${C_SOURCE} ${C_FILE})
         endforeach()
-        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
         foreach(C_FILE ${SOURCE_FILES})
             set(C_SOURCE ${C_SOURCE} ${C_FILE})
         endforeach()
@@ -36,6 +36,6 @@
 
     add_custom_command (TARGET pot COMMAND
         ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
-        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
         )
 endmacro()
 
=== modified file 'po/switchboard.pot'
--- po/switchboard.pot	2012-01-13 17:02:58 +0000
+++ po/switchboard.pot	2012-06-05 05:38:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-13 18:01+0100\n"
+"POT-Creation-Date: 2012-06-04 22:26-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,63 +17,22 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:114
-#, c-format
-msgid "Exiting plug \"%s\" from Switchboard controller.."
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:131
-#, c-format
-msgid "Failed to launch plug: title %s | executable %s"
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:263
-msgid "Unable to iterate over enumerated plug directory \"$path\"'s contents"
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:351
-msgid "Type to search ..."
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:390
-msgid "Welcome to $APP_TITLE"
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:391
-msgid "Version: $VERSION"
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:392
-msgid "Report any issues/bugs you mind find to lp:switchboard"
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-app.vala:399
-msgid "Switchboard already running. Exiting.."
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-categoryview.vala:31
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-app.vala:387
+msgid "Search Plugs"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "Personal"
 msgstr ""
 
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-categoryview.vala:32
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "Hardware"
 msgstr ""
 
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-categoryview.vala:33
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "Network and Wireless"
 msgstr ""
 
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-categoryview.vala:34
+#: /home/ttosttos/Projects/elementary/Bugs/switchboard-fix-989076/po/../Switchboard//switchboard-categoryview.vala:29
 msgid "System"
 msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-categoryview.vala:68
-#, c-format
-msgid ""
-"Keyfile \"%s\" contains an invalid category: \"%s\", and will not be added"
-msgstr ""
-
-#: /home/xapantu/Dev/switchboard/trunk/po/../Switchboard//switchboard-categoryview.vala:75
-#, c-format
-msgid "Unable to load plug %'s icon: %s"
-msgstr ""