Eidete

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

  1. fix-989076
  2. Merge into trunk
Proposed by ttosttos
Status: Merged
Merged at revision: 60
Proposed branch: lp:~ttosttos/eidete/fix-989076
Merge into: lp:eidete
Diff against target: 211 lines (+70/-32)
3 files modified
INSTALL (+1/-1)
cmake/Translations.cmake (+3/-3)
po/eidete.pot (+66/-28)
To merge this branch: bzr merge lp:~ttosttos/eidete/fix-989076
Reviewer Review Type Date Requested Status
Cody Garver (community) Approve
Review via email: mp+108677@code.launchpad.net

Description of the change

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

To post a comment you must log in.
Revision history for this message
Cody Garver (codygarver) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'INSTALL'
--- INSTALL 2012-04-06 01:27:58 +0000
+++ INSTALL 2012-06-05 06:18:19 +0000
@@ -13,6 +13,6 @@
13 cd eidete13 cd eidete
14 mkdir build14 mkdir build
15 cd build15 cd build
16 cmake .. -DCMAKE_INSTALL_PREFIX16 cmake .. -DCMAKE_INSTALL_PREFIX=/usr
17 make17 make
18 sudo make install18 sudo make install
1919
=== 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 @@
24 set(C_SOURCE "")24 set(C_SOURCE "")
2525
26 foreach(FILES_INPUT ${ARGN})26 foreach(FILES_INPUT ${ARGN})
27 file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)27 file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
28 foreach(C_FILE ${SOURCE_FILES})28 foreach(C_FILE ${SOURCE_FILES})
29 set(C_SOURCE ${C_SOURCE} ${C_FILE})29 set(C_SOURCE ${C_SOURCE} ${C_FILE})
30 endforeach()30 endforeach()
31 file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)31 file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
32 foreach(C_FILE ${SOURCE_FILES})32 foreach(C_FILE ${SOURCE_FILES})
33 set(C_SOURCE ${C_SOURCE} ${C_FILE})33 set(C_SOURCE ${C_SOURCE} ${C_FILE})
34 endforeach()34 endforeach()
@@ -36,6 +36,6 @@
3636
37 add_custom_command (TARGET pot COMMAND37 add_custom_command (TARGET pot COMMAND
38 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot38 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
39 ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-839 ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
40 )40 )
41endmacro()41endmacro()
4242
=== 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 @@
8msgstr ""8msgstr ""
9"Project-Id-Version: PACKAGE VERSION\n"9"Project-Id-Version: PACKAGE VERSION\n"
10"Report-Msgid-Bugs-To: \n"10"Report-Msgid-Bugs-To: \n"
11"POT-Creation-Date: 2012-01-19 22:19+0100\n"11"POT-Creation-Date: 2012-06-04 22:56-0700\n"
12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"12"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"13"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
14"Language-Team: LANGUAGE <LL@li.org>\n"14"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -17,95 +17,133 @@
17"Content-Type: text/plain; charset=CHARSET\n"17"Content-Type: text/plain; charset=CHARSET\n"
18"Content-Transfer-Encoding: 8bit\n"18"Content-Transfer-Encoding: 8bit\n"
1919
20#: /home/tom/Programming/eidete/po/../src/eidete.vala:12820#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:27
21msgid "Recording starts in"
22msgstr ""
23
24#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/countdown.vala:33
25msgid "Focus Eidete to stop recording"
26msgstr ""
27
28#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:24
29msgid "Recording done"
30msgstr ""
31
32#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:27
33msgid "And now?"
34msgstr ""
35
36#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:27
37msgid "</span>"
38msgstr ""
39
40#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:31
41msgid "Go"
42msgstr ""
43
44#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:64
45msgid "Could not contact Contractor. Click Save to save the file"
46msgstr ""
47
48#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:66
49#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/Widgets/end_dialog.vala:103
50#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/savedialog.vala:8
51msgid "Save"
52msgstr ""
53
54#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:139
21msgid "Monitor"55msgid "Monitor"
22msgstr ""56msgstr ""
2357
24#: /home/tom/Programming/eidete/po/../src/eidete.vala:14358#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:154
25msgid "Fullscreen"59msgid "Fullscreen"
26msgstr ""60msgstr ""
2761
28#: /home/tom/Programming/eidete/po/../src/eidete.vala:14462#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:155
29msgid "Custom"63msgid "Custom"
30msgstr ""64msgstr ""
3165
32#: /home/tom/Programming/eidete/po/../src/eidete.vala:16466#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:175
33msgid "Record"67msgid "Record"
34msgstr ""68msgstr ""
3569
36#: /home/tom/Programming/eidete/po/../src/eidete.vala:17670#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:187
37msgid "Sound"71msgid "Sound"
38msgstr ""72msgstr ""
3973
40#: /home/tom/Programming/eidete/po/../src/eidete.vala:17774#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:188
41msgid "Record Computer Sounds"75msgid "Record Computer Sounds"
42msgstr ""76msgstr ""
4377
44#: /home/tom/Programming/eidete/po/../src/eidete.vala:17978#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:190
45msgid "Record from Microphone"79msgid "Record from Microphone"
46msgstr ""80msgstr ""
4781
48#: /home/tom/Programming/eidete/po/../src/eidete.vala:18182#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:192
49msgid "Video"83msgid "Video"
50msgstr ""84msgstr ""
5185
52#: /home/tom/Programming/eidete/po/../src/eidete.vala:18286#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:193
53msgid "Record from Monitor"87msgid "Record from Monitor"
54msgstr ""88msgstr ""
5589
56#: /home/tom/Programming/eidete/po/../src/eidete.vala:18490#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:195
57msgid "Recording Area"91msgid "Recording Area"
58msgstr ""92msgstr ""
5993
60#: /home/tom/Programming/eidete/po/../src/eidete.vala:18694#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:197
61msgid "Width"95msgid "Width"
62msgstr ""96msgstr ""
6397
64#: /home/tom/Programming/eidete/po/../src/eidete.vala:18898#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:199
65msgid "Height"99msgid "Height"
66msgstr ""100msgstr ""
67101
68#: /home/tom/Programming/eidete/po/../src/eidete.vala:198102#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:218
69msgid "Show pressed keys on screen"103msgid "Show pressed keys on screen"
70msgstr ""104msgstr ""
71105
72#: /home/tom/Programming/eidete/po/../src/eidete.vala:204106#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:220
107msgid "Show clicks on screen"
108msgstr ""
109
110#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:222
111msgid "Show circle behind mouse"
112msgstr ""
113
114#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:228
73msgid "Behaviour"115msgid "Behaviour"
74msgstr ""116msgstr ""
75117
76#: /home/tom/Programming/eidete/po/../src/eidete.vala:205118#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:229
77msgid "Appearance"119msgid "Appearance"
78msgstr ""120msgstr ""
79121
80#: /home/tom/Programming/eidete/po/../src/eidete.vala:354122#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:424
81msgid "Finish"123msgid "Finish"
82msgstr ""124msgstr ""
83125
84#: /home/tom/Programming/eidete/po/../src/eidete.vala:355126#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:425
85msgid "Finish recording"127msgid "Finish recording"
86msgstr ""128msgstr ""
87129
88#: /home/tom/Programming/eidete/po/../src/eidete.vala:357130#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:427
89msgid "Record more"131msgid "Record more"
90msgstr ""132msgstr ""
91133
92#: /home/tom/Programming/eidete/po/../src/eidete.vala:371134#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:441
93#: /home/tom/Programming/eidete/po/../src/eidete.vala:502135#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:588
94msgid "Recording paused"136msgid "Recording paused"
95msgstr ""137msgstr ""
96138
97#: /home/tom/Programming/eidete/po/../src/eidete.vala:372139#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:442
98msgid "You can continue or finish the recording now."140msgid "You can continue or finish the recording now."
99msgstr ""141msgstr ""
100142
101#: /home/tom/Programming/eidete/po/../src/eidete.vala:512143#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/eidete.vala:598
102msgid "Pause recording"144msgid "Pause recording"
103msgstr ""145msgstr ""
104146
105#: /home/tom/Programming/eidete/po/../src/savedialog.vala:8147#: /home/ttosttos/Projects/elementary/Bugs/eidete-fix-989076/po/../src/videobin_uploader.vala:45
106msgid "Save"
107msgstr ""
108
109#: /home/tom/Programming/eidete/po/../src/videobin_uploader.vala:45
110msgid "Upload"148msgid "Upload"
111msgstr ""149msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: