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

[ttosttos]

- Translations.cmake now walks entire source directory recursively for translatable strings
- Gettext template (granite.pot) updated

[Cody Garver (codygarver)]

review: Approve

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2011-08-30 12:55:45 +0000
+++ cmake/Translations.cmake	2012-06-05 05:11: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/granite.pot'
--- po/granite.pot	2011-08-30 12:55:45 +0000
+++ po/granite.pot	2012-06-05 05:11:18 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-30 14:55+0200\n"
+"POT-Creation-Date: 2012-06-04 21:59-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,31 +17,68 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//TimePicker.vala:25
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/DatePicker.vala:25
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//DatePicker.vala:25
+msgid "%B %e, %Y"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/TimePicker.vala:37
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/TimePicker.vala:98
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//TimePicker.vala:37
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//TimePicker.vala:98
 msgid "%l:%M %p"
 msgstr ""
 
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//DatePicker.vala:25
-msgid "%B %e, %Y"
-msgstr ""
-
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//AppMenu.vala:38
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//AppMenu.vala:52
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/AboutDialog.vala:133
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//AboutDialog.vala:133
+msgid "Translate This App"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/AboutDialog.vala:138
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//AboutDialog.vala:138
+msgid "Report a Problem"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/ContractorView.vala:99
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//ContractorView.vala:99
+msgid "Could not contact Contractor. You may need to install it"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/ContractorView.vala:99
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//ContractorView.vala:99
+msgid "No action found for this file"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/AppMenu.vala:32
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/AppMenu.vala:37
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/AppMenu.vala:51
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//AppMenu.vala:32
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//AppMenu.vala:37
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//AppMenu.vala:51
 msgid "Menu"
 msgstr ""
 
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//AppMenu.vala:64
-msgid "Get Help Online..."
-msgstr ""
-
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//AppMenu.vala:65
-msgid "Translate This Application..."
-msgstr ""
-
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//AppMenu.vala:66
-msgid "Report a Problem..."
-msgstr ""
-
-#: /home/xapantu/granite-cmake/po/../lib/Widgets//AppMenu.vala:67
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//Widgets/AppMenu.vala:56
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib/Widgets//AppMenu.vala:56
 msgid "About"
 msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//GtkPatch/AboutDialog.vala:40
+msgid "Designed by"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//GtkPatch/AboutDialog.vala:59
+msgid "Written by"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//GtkPatch/AboutDialog.vala:175
+msgid "Translated by "
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//GtkPatch/AboutDialog.vala:444
+msgid "This program is published under the terms of the "
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/granite-fix-989076/po/../lib//GtkPatch/AboutDialog.vala:444
+msgid " license, it comes with ABSOLUTELY NO WARRANTY; for details, visit "
+msgstr ""