Merge lp:~ttosttos/eidete/fix-989076 into lp:eidete

[ttosttos]

- Fixes Translations.cmake to make sure entire source tree is walked for translatable strings
- Updates eidete.pot

[Cody Garver (codygarver)]

review: Approve

=== modified file 'INSTALL'
--- INSTALL	2012-04-06 01:27:58 +0000
+++ INSTALL	2012-06-05 06:18:19 +0000
@@ -13,6 +13,6 @@
     cd eidete
     mkdir build
     cd build
-    cmake .. -DCMAKE_INSTALL_PREFIX
+    cmake .. -DCMAKE_INSTALL_PREFIX=/usr
     make
     sudo make install

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2011-12-30 00:26:42 +0000
+++ cmake/Translations.cmake	2012-06-05 06:18:19 +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/eidete.pot'
--- po/eidete.pot	2012-01-19 21:19:22 +0000
+++ po/eidete.pot	2012-06-05 06:18:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-19 22:19+0100\n"
+"POT-Creation-Date: 2012-06-04 22:56-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,95 +17,133 @@
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:128
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:27
+msgid "Recording starts in"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:33
+msgid "Focus Eidete to stop recording"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:24
+msgid "Recording done"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:27
+msgid "And now?"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:27
+msgid "</span>"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:31
+msgid "Go"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:64
+msgid "Could not contact Contractor. Click Save to save the file"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:66
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:103
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/savedialog.vala:8
+msgid "Save"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:139
 msgid "Monitor"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:143
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:154
 msgid "Fullscreen"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:144
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:155
 msgid "Custom"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:164
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:175
 msgid "Record"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:176
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:187
 msgid "Sound"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:177
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:188
 msgid "Record Computer Sounds"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:179
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:190
 msgid "Record from Microphone"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:181
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:192
 msgid "Video"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:182
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:193
 msgid "Record from Monitor"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:184
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:195
 msgid "Recording Area"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:186
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:197
 msgid "Width"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:188
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:199
 msgid "Height"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:198
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:218
 msgid "Show pressed keys on screen"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:204
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:220
+msgid "Show clicks on screen"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:222
+msgid "Show circle behind mouse"
+msgstr ""
+
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:228
 msgid "Behaviour"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:205
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:229
 msgid "Appearance"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:354
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:424
 msgid "Finish"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:355
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:425
 msgid "Finish recording"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:357
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:427
 msgid "Record more"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:371
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:502
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:441
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:588
 msgid "Recording paused"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:372
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:442
 msgid "You can continue or finish the recording now."
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/eidete.vala:512
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:598
 msgid "Pause recording"
 msgstr ""
 
-#: /home/tom/Programming/eidete/po/../src/savedialog.vala:8
-msgid "Save"
-msgstr ""
-
-#: /home/tom/Programming/eidete/po/../src/videobin_uploader.vala:45
+#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/videobin_uploader.vala:45
 msgid "Upload"
 msgstr ""