Footnote

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

  1. fix-989076
  2. Merge into footnote
Proposed by ttosttos
Status: Merged
Approved by: Jaap Broekhuizen
Approved revision: 220
Merged at revision: 220
Proposed branch: lp:~ttosttos/footnote/fix-989076
Merge into: lp:footnote
Diff against target: 355 lines (+190/-41)
3 files modified
INSTALL (+1/-1)
cmake/Translations.cmake (+3/-3)
po/footnote.pot (+186/-37)
To merge this branch: bzr merge lp:~ttosttos/footnote/fix-989076
Reviewer Review Type Date Requested Status
Jaap Broekhuizen (community) Approve
Review via email: mp+108674@code.launchpad.net

Description of the change

- Updated Translations.cmake to make sure that the entire source tree gets walked for translatable strings
- Updated template (footnote.pot)

To post a comment you must log in.
Revision history for this message
Jaap Broekhuizen (jaapz-b) wrote :

I can not merge it now, will merge it later today or tomorrow.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'INSTALL'
2--- INSTALL 2012-02-16 16:55:03 +0000
3+++ INSTALL 2012-06-05 05:50:28 +0000
4@@ -13,6 +13,6 @@
5 cd footnote
6 mkdir build
7 cd build
8- cmake .. -DCMAKE_INSTALL_PREFIX
9+ cmake .. -DCMAKE_INSTALL_PREFIX=/usr
10 make
11 sudo make install
12
13=== modified file 'cmake/Translations.cmake'
14--- cmake/Translations.cmake 2011-12-09 17:30:40 +0000
15+++ cmake/Translations.cmake 2012-06-05 05:50:28 +0000
16@@ -24,11 +24,11 @@
17 set(C_SOURCE "")
18
19 foreach(FILES_INPUT ${ARGN})
20- file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
21+ file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
22 foreach(C_FILE ${SOURCE_FILES})
23 set(C_SOURCE ${C_SOURCE} ${C_FILE})
24 endforeach()
25- file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
26+ file (GLOB_RECURSE SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
27 foreach(C_FILE ${SOURCE_FILES})
28 set(C_SOURCE ${C_SOURCE} ${C_FILE})
29 endforeach()
30@@ -36,6 +36,6 @@
31
32 add_custom_command (TARGET pot COMMAND
33 ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
34- ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
35+ ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --keyword="N_" --from-code=UTF-8
36 )
37 endmacro()
38
39=== modified file 'po/footnote.pot'
40--- po/footnote.pot 2012-04-02 10:38:24 +0000
41+++ po/footnote.pot 2012-06-05 05:50:28 +0000
42@@ -8,7 +8,7 @@
43 msgstr ""
44 "Project-Id-Version: PACKAGE VERSION\n"
45 "Report-Msgid-Bugs-To: \n"
46-"POT-Creation-Date: 2012-04-02 12:38+0200\n"
47+"POT-Creation-Date: 2012-06-04 22:43-0700\n"
48 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
49 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
50 "Language-Team: LANGUAGE <LL@li.org>\n"
51@@ -17,119 +17,268 @@
52 "Content-Type: text/plain; charset=CHARSET\n"
53 "Content-Transfer-Encoding: 8bit\n"
54
55-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:220
56+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:230
57+msgid "Unsorted Notes"
58+msgstr ""
59+
60+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:232
61+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:256
62+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:275
63+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Notebook.vala:60
64 msgid "Untitled"
65 msgstr ""
66
67-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:247
68+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:265
69 msgid "Write things down"
70 msgstr ""
71
72-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:247
73+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:265
74 msgid "Footnote can't seem to find your notes"
75 msgstr ""
76
77-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:254
78+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:272
79 msgid "Type to Search..."
80 msgstr ""
81
82-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:266
83+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:273
84+msgid "Export current notebook..."
85+msgstr ""
86+
87+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:285
88 msgid "Notebooks"
89 msgstr ""
90
91-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:267
92+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:286
93 msgid "Bookmarks"
94 msgstr ""
95
96-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:282
97+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:300
98+msgid "Note has been deleted."
99+msgstr ""
100+
101+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:302
102 msgid "Import"
103 msgstr ""
104
105-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:282
106+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:302
107 msgid "Add notes from your hard drive"
108 msgstr ""
109
110-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:283
111+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:303
112+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:304
113 msgid "Create"
114 msgstr ""
115
116-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:283
117-msgid "Make a new notebook"
118-msgstr ""
119-
120-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:311
121-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:408
122-msgid "Search Term"
123-msgstr ""
124-
125-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:328
126+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:303
127+msgid "Make a new note"
128+msgstr ""
129+
130+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:304
131+msgid "Create a new notebook"
132+msgstr ""
133+
134+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:347
135 msgid "Any"
136 msgstr ""
137
138-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:351
139+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:365
140 msgid "All"
141 msgstr ""
142
143-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:358
144+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:372
145 msgid "January"
146 msgstr ""
147
148-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:358
149+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:372
150 msgid "February"
151 msgstr ""
152
153-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:358
154+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:372
155 msgid "March"
156 msgstr ""
157
158-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:358
159+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:372
160 msgid "April"
161 msgstr ""
162
163-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:358
164+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:372
165 msgid "May"
166 msgstr ""
167
168-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
169+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
170 msgid "June"
171 msgstr ""
172
173-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
174+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
175 msgid "July"
176 msgstr ""
177
178-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
179+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
180 msgid "August"
181 msgstr ""
182
183-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
184+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
185 msgid "September"
186 msgstr ""
187
188-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
189+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
190 msgid "October"
191 msgstr ""
192
193-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
194+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
195 msgid "November"
196 msgstr ""
197
198-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:359
199+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:373
200 msgid "December"
201 msgstr ""
202
203-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:424
204+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:450
205+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Notebook.vala:143
206 msgid "Notebook name"
207 msgstr ""
208
209-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:427
210+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:453
211+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Notebook.vala:149
212 msgid "Name"
213 msgstr ""
214
215-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:429
216+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:455
217+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Notebook.vala:151
218 msgid "Color"
219 msgstr ""
220
221-#: /home/tom/Programming/footnote/po/../src/Footnote.vala:501
222+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:525
223+msgid "Search Term"
224+msgstr ""
225+
226+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:539
227 msgid "Open the database"
228 msgstr ""
229+
230+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:606
231+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:607
232+msgid "Quit"
233+msgstr ""
234+
235+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:611
236+msgid "New Note"
237+msgstr ""
238+
239+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:612
240+msgid "Create a new note"
241+msgstr ""
242+
243+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:615
244+msgid "Delete Note"
245+msgstr ""
246+
247+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:616
248+msgid "Move the note into the trash"
249+msgstr ""
250+
251+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:619
252+msgid "Fullscreen"
253+msgstr ""
254+
255+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:620
256+msgid "Toggle fullscreen"
257+msgstr ""
258+
259+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:625
260+msgid "Set Bold"
261+msgstr ""
262+
263+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:626
264+msgid "Set the selected text to bold"
265+msgstr ""
266+
267+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:629
268+msgid "Strike through"
269+msgstr ""
270+
271+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:630
272+msgid "Strike though the selected text"
273+msgstr ""
274+
275+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:633
276+msgid "Set Italic"
277+msgstr ""
278+
279+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:634
280+msgid "Set the selected text to italic"
281+msgstr ""
282+
283+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:637
284+msgid "Set Marked"
285+msgstr ""
286+
287+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Footnote.vala:638
288+msgid "Mark the selected text"
289+msgstr ""
290+
291+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/ExportDialog.vala:165
292+msgid "Advanced Options"
293+msgstr ""
294+
295+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:91
296+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/NoteView.vala:40
297+msgid "Export"
298+msgstr ""
299+
300+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:92
301+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/NoteView.vala:41
302+msgid "Edit"
303+msgstr ""
304+
305+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:93
306+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:179
307+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/NoteView.vala:42
308+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/NoteView.vala:112
309+msgid "Delete"
310+msgstr ""
311+
312+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:183
313+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/NoteView.vala:116
314+msgid "Sure?"
315+msgstr ""
316+
317+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:262
318+msgid "Monday"
319+msgstr ""
320+
321+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:262
322+msgid "Tuesday"
323+msgstr ""
324+
325+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:262
326+msgid "Wednesday"
327+msgstr ""
328+
329+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:262
330+msgid "Thursday"
331+msgstr ""
332+
333+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:263
334+msgid "Friday"
335+msgstr ""
336+
337+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:263
338+msgid "Saturday"
339+msgstr ""
340+
341+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Note.vala:263
342+msgid "Sunday"
343+msgstr ""
344+
345+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/Notebook.vala:182
346+msgid "Delete topic with all its notes?"
347+msgstr ""
348+
349+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/EditView.vala:34
350+msgid "Cancel"
351+msgstr ""
352+
353+#: /home/ttosttos/Projects/elementary/Bugs/footnote-fix-989076/po/../src/Widgets/EditView.vala:35
354+msgid "Done"
355+msgstr ""

Subscribers

People subscribed via source and target branches

to all changes: