Merge lp:~ttosttos/scratch/fix-1006040 into lp:~elementary-apps/scratch/scratch
- fix-1006040
- Merge into scratch
Proposed by
ttosttos
Status: | Merged | ||||
---|---|---|---|---|---|
Merge reported by: | Mario Guerriero | ||||
Merged at revision: | not available | ||||
Proposed branch: | lp:~ttosttos/scratch/fix-1006040 | ||||
Merge into: | lp:~elementary-apps/scratch/scratch | ||||
Diff against target: |
716 lines (+196/-196) 3 files modified
data/scratch.desktop (+2/-2) po/scratch.pot (+178/-181) src/config.vala.cmake (+16/-13) |
||||
To merge this branch: | bzr merge lp:~ttosttos/scratch/fix-1006040 | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Mario Guerriero (community) | Approve | ||
Review via email: mp+107946@code.launchpad.net |
Commit message
Description of the change
To post a comment you must log in.
lp:~ttosttos/scratch/fix-1006040
updated
Revision history for this message
Mario Guerriero (mefrio-g) : | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1 | === modified file 'data/scratch.desktop' |
2 | --- data/scratch.desktop 2012-05-25 14:56:31 +0000 |
3 | +++ data/scratch.desktop 2012-05-30 10:31:18 +0000 |
4 | @@ -17,12 +17,12 @@ |
5 | X-GNOME-Gettext-Domain=scratch |
6 | |
7 | [NewDocument Shortcut Group] |
8 | -Name=Create a new document |
9 | +Name=New Document |
10 | Exec=scratch --new-tab |
11 | TargetEnvironment=Unity |
12 | |
13 | [NewWindow Shortcut Group] |
14 | -Name=Create a new window |
15 | +Name=New Window |
16 | Exec=scratch -n |
17 | TargetEnvironment=Unity |
18 | |
19 | |
20 | === modified file 'po/scratch.pot' |
21 | --- po/scratch.pot 2012-05-25 14:56:31 +0000 |
22 | +++ po/scratch.pot 2012-05-30 10:31:18 +0000 |
23 | @@ -8,7 +8,7 @@ |
24 | msgstr "" |
25 | "Project-Id-Version: PACKAGE VERSION\n" |
26 | "Report-Msgid-Bugs-To: \n" |
27 | -"POT-Creation-Date: 2012-05-25 16:55+0200\n" |
28 | +"POT-Creation-Date: 2012-05-30 02:49-0700\n" |
29 | "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" |
30 | "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" |
31 | "Language-Team: LANGUAGE <LL@li.org>\n" |
32 | @@ -17,470 +17,467 @@ |
33 | "Content-Type: text/plain; charset=CHARSET\n" |
34 | "Content-Transfer-Encoding: 8bit\n" |
35 | |
36 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:477 |
37 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:915 |
38 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:13 |
39 | +msgid "Edit text files" |
40 | +msgstr "" |
41 | + |
42 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:14 |
43 | +msgid "Text Editor" |
44 | +msgstr "" |
45 | + |
46 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:15 |
47 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/config.vala:16 |
48 | +msgid "New Window" |
49 | +msgstr "" |
50 | + |
51 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Scratch.vala:177 |
52 | +msgid "Set of plugins" |
53 | +msgstr "" |
54 | + |
55 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Scratch.vala:178 |
56 | +msgid "Argument for the set of plugins" |
57 | +msgstr "" |
58 | + |
59 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Scratch.vala:179 |
60 | +msgid "Create a new instance" |
61 | +msgstr "" |
62 | + |
63 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:477 |
64 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:915 |
65 | msgid "Preferences" |
66 | msgstr "" |
67 | |
68 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:534 |
69 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:900 |
70 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:534 |
71 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:900 |
72 | msgid "Open a file" |
73 | msgstr "" |
74 | |
75 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:541 |
76 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:541 |
77 | msgid "All files" |
78 | msgstr "" |
79 | |
80 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:544 |
81 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:544 |
82 | msgid "Text files" |
83 | msgstr "" |
84 | |
85 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:834 |
86 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:835 |
87 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:834 |
88 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:835 |
89 | msgid "Find..." |
90 | msgstr "" |
91 | |
92 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:838 |
93 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:839 |
94 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:838 |
95 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:839 |
96 | msgid "Hide search bar" |
97 | msgstr "" |
98 | |
99 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:842 |
100 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:843 |
101 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:842 |
102 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:843 |
103 | msgid "Go to line..." |
104 | msgstr "" |
105 | |
106 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:846 |
107 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:847 |
108 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:846 |
109 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:847 |
110 | msgid "Quit" |
111 | msgstr "" |
112 | |
113 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:850 |
114 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:851 |
115 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:850 |
116 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:851 |
117 | msgid "Close" |
118 | msgstr "" |
119 | |
120 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:854 |
121 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:855 |
122 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:854 |
123 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:855 |
124 | msgid "Replace" |
125 | msgstr "" |
126 | |
127 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:858 |
128 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:124 |
129 | -#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:170 |
130 | -#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:345 |
131 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:858 |
132 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:124 |
133 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:170 |
134 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:345 |
135 | msgid "New document" |
136 | msgstr "" |
137 | |
138 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:859 |
139 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:859 |
140 | msgid "Create a new document in a new tab" |
141 | msgstr "" |
142 | |
143 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:862 |
144 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:862 |
145 | msgid "Add New View" |
146 | msgstr "" |
147 | |
148 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:863 |
149 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:863 |
150 | msgid "Add a new view" |
151 | msgstr "" |
152 | |
153 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:867 |
154 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:867 |
155 | msgid "Remove Current View" |
156 | msgstr "" |
157 | |
158 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:868 |
159 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:868 |
160 | msgid "Remove this view" |
161 | msgstr "" |
162 | |
163 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:871 |
164 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:871 |
165 | msgid "Undo" |
166 | msgstr "" |
167 | |
168 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:872 |
169 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:872 |
170 | msgid "Undo the last action" |
171 | msgstr "" |
172 | |
173 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:875 |
174 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:875 |
175 | msgid "Redo" |
176 | msgstr "" |
177 | |
178 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:876 |
179 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:876 |
180 | msgid "Redo the last undone action" |
181 | msgstr "" |
182 | |
183 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:880 |
184 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:880 |
185 | msgid "Revert" |
186 | msgstr "" |
187 | |
188 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:881 |
189 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:881 |
190 | msgid "Restore this file" |
191 | msgstr "" |
192 | |
193 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:885 |
194 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:886 |
195 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:885 |
196 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:886 |
197 | msgid "Next Search" |
198 | msgstr "" |
199 | |
200 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:889 |
201 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:890 |
202 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:889 |
203 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:890 |
204 | msgid "Previous Search" |
205 | msgstr "" |
206 | |
207 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:894 |
208 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:895 |
209 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:894 |
210 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:895 |
211 | msgid "Duplicate selected strings" |
212 | msgstr "" |
213 | |
214 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:899 |
215 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:899 |
216 | msgid "Open" |
217 | msgstr "" |
218 | |
219 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:903 |
220 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:903 |
221 | msgid "Save" |
222 | msgstr "" |
223 | |
224 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:904 |
225 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:904 |
226 | msgid "Save the current file" |
227 | msgstr "" |
228 | |
229 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:907 |
230 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Tab.vala:106 |
231 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Tab.vala:173 |
232 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:907 |
233 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Tab.vala:106 |
234 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Tab.vala:173 |
235 | msgid "Save as" |
236 | msgstr "" |
237 | |
238 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:908 |
239 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:908 |
240 | msgid "Save the current file with a different name" |
241 | msgstr "" |
242 | |
243 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:911 |
244 | -#: /home/mario/elementary/scratch/po/../scratchcore/TemplateManager.vala:123 |
245 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:911 |
246 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/TemplateManager.vala:123 |
247 | msgid "Templates" |
248 | msgstr "" |
249 | |
250 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:912 |
251 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:912 |
252 | msgid "Create a new document from a template" |
253 | msgstr "" |
254 | |
255 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:916 |
256 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:916 |
257 | msgid "Change Scratch settings" |
258 | msgstr "" |
259 | |
260 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:922 |
261 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:923 |
262 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:922 |
263 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:923 |
264 | msgid "Fullscreen" |
265 | msgstr "" |
266 | |
267 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:926 |
268 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:927 |
269 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:926 |
270 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:927 |
271 | msgid "Sidebar" |
272 | msgstr "" |
273 | |
274 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:930 |
275 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:931 |
276 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:930 |
277 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:931 |
278 | msgid "Context View" |
279 | msgstr "" |
280 | |
281 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:934 |
282 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:935 |
283 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:934 |
284 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:935 |
285 | msgid "Status Bar" |
286 | msgstr "" |
287 | |
288 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:938 |
289 | -#: /home/mario/elementary/scratch/po/../src/MainWindow.vala:939 |
290 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:938 |
291 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/MainWindow.vala:939 |
292 | msgid "Bottom Panel" |
293 | msgstr "" |
294 | |
295 | -#: /home/mario/elementary/scratch/po/../src/Scratch.vala:177 |
296 | -msgid "Set of plugins" |
297 | -msgstr "" |
298 | - |
299 | -#: /home/mario/elementary/scratch/po/../src/Scratch.vala:178 |
300 | -msgid "Argument for the set of plugins" |
301 | -msgstr "" |
302 | - |
303 | -#: /home/mario/elementary/scratch/po/../src/Scratch.vala:179 |
304 | -msgid "Create a new instance" |
305 | -msgstr "" |
306 | - |
307 | -#: /home/mario/elementary/scratch/po/../src/config.vala:10 |
308 | -msgid "Edit text files" |
309 | -msgstr "" |
310 | - |
311 | -#: /home/mario/elementary/scratch/po/../src/config.vala:11 |
312 | -msgid "Text Editor" |
313 | -msgstr "" |
314 | - |
315 | -#: /home/mario/elementary/scratch/po/../src/config.vala:12 |
316 | -msgid "Create a new document" |
317 | -msgstr "" |
318 | - |
319 | -#: /home/mario/elementary/scratch/po/../src/config.vala:13 |
320 | -msgid "Create a new window" |
321 | -msgstr "" |
322 | - |
323 | -#: /home/mario/elementary/scratch/po/../src/Widgets/ShareMenu.vala:56 |
324 | -msgid "Share" |
325 | -msgstr "" |
326 | - |
327 | -#: /home/mario/elementary/scratch/po/../src/Widgets/ComboSyntax.vala:38 |
328 | -#: /home/mario/elementary/scratch/po/../scratchcore/SourceView.vala:101 |
329 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/ComboSyntax.vala:38 |
330 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SourceView.vala:101 |
331 | msgid "Normal text" |
332 | msgstr "" |
333 | |
334 | -#: /home/mario/elementary/scratch/po/../src/Widgets/NotificationBar.vala:45 |
335 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/NotificationBar.vala:45 |
336 | msgid "Dismiss" |
337 | msgstr "" |
338 | |
339 | -#: /home/mario/elementary/scratch/po/../src/Widgets/NotificationBar.vala:52 |
340 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/NotificationBar.vala:52 |
341 | msgid "Save as New File" |
342 | msgstr "" |
343 | |
344 | -#: /home/mario/elementary/scratch/po/../src/Widgets/NotificationBar.vala:60 |
345 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/NotificationBar.vala:60 |
346 | msgid "Choose the new location" |
347 | msgstr "" |
348 | |
349 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:208 |
350 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:208 |
351 | msgid "No files are open." |
352 | msgstr "" |
353 | |
354 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:208 |
355 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:208 |
356 | msgid "Open a file to begin editing." |
357 | msgstr "" |
358 | |
359 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:210 |
360 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:210 |
361 | msgid "Open file" |
362 | msgstr "" |
363 | |
364 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:210 |
365 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:210 |
366 | msgid "Open a saved file." |
367 | msgstr "" |
368 | |
369 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:211 |
370 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:211 |
371 | msgid "New file" |
372 | msgstr "" |
373 | |
374 | -#: /home/mario/elementary/scratch/po/../src/Widgets/Notebook.vala:211 |
375 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/Notebook.vala:211 |
376 | msgid "Create a new empty file." |
377 | msgstr "" |
378 | |
379 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:39 |
380 | -msgid "Save changes to document" |
381 | -msgstr "" |
382 | - |
383 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:39 |
384 | -msgid "New File" |
385 | -msgstr "" |
386 | - |
387 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:39 |
388 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:42 |
389 | -msgid "before closing?" |
390 | -msgstr "" |
391 | - |
392 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:40 |
393 | -msgid "" |
394 | -"If you don't save, changes from the last 4 seconds will be permanently lost." |
395 | -msgstr "" |
396 | - |
397 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveOnCloseDialog.vala:42 |
398 | -msgid "Close without saving" |
399 | -msgstr "" |
400 | - |
401 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:69 |
402 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Widgets/ShareMenu.vala:56 |
403 | +msgid "Share" |
404 | +msgstr "" |
405 | + |
406 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:69 |
407 | msgid "Behavior" |
408 | msgstr "" |
409 | |
410 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:73 |
411 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:73 |
412 | msgid "Interface" |
413 | msgstr "" |
414 | |
415 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:78 |
416 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:78 |
417 | msgid "Extensions" |
418 | msgstr "" |
419 | |
420 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:121 |
421 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:121 |
422 | msgid "Show welcome screen" |
423 | msgstr "" |
424 | |
425 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:122 |
426 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:122 |
427 | msgid "Show last open tabs" |
428 | msgstr "" |
429 | |
430 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:138 |
431 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:138 |
432 | msgid "General:" |
433 | msgstr "" |
434 | |
435 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:144 |
436 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:144 |
437 | msgid "When Scratch starts:" |
438 | msgstr "" |
439 | |
440 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:147 |
441 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:147 |
442 | msgid "Save files when changed:" |
443 | msgstr "" |
444 | |
445 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:152 |
446 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:152 |
447 | msgid "Tabs:" |
448 | msgstr "" |
449 | |
450 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:157 |
451 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:157 |
452 | msgid "Automatic indentation:" |
453 | msgstr "" |
454 | |
455 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:160 |
456 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:160 |
457 | msgid "Insert spaces instead of tabs:" |
458 | msgstr "" |
459 | |
460 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:164 |
461 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:164 |
462 | msgid "Tab width:" |
463 | msgstr "" |
464 | |
465 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:194 |
466 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:194 |
467 | msgid "Editor:" |
468 | msgstr "" |
469 | |
470 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:209 |
471 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:209 |
472 | msgid "Highlight current line:" |
473 | msgstr "" |
474 | |
475 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:210 |
476 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:210 |
477 | msgid "Highlight matching brackets:" |
478 | msgstr "" |
479 | |
480 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:211 |
481 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:211 |
482 | msgid "Draw spaces:" |
483 | msgstr "" |
484 | |
485 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:212 |
486 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:212 |
487 | msgid "Show line numbers:" |
488 | msgstr "" |
489 | |
490 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:215 |
491 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:215 |
492 | msgid "Show margin on right:" |
493 | msgstr "" |
494 | |
495 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:222 |
496 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:222 |
497 | msgid "Margin width:" |
498 | msgstr "" |
499 | |
500 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:227 |
501 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:227 |
502 | msgid "Font and colors:" |
503 | msgstr "" |
504 | |
505 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:241 |
506 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:241 |
507 | msgid "Select font:" |
508 | msgstr "" |
509 | |
510 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:244 |
511 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:244 |
512 | msgid "Color scheme:" |
513 | msgstr "" |
514 | |
515 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/PreferencesDialog.vala:249 |
516 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/PreferencesDialog.vala:249 |
517 | msgid "Custom font:" |
518 | msgstr "" |
519 | |
520 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:40 |
521 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:40 |
522 | msgid "Save unsaved changes to file before closing?" |
523 | msgstr "" |
524 | |
525 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:42 |
526 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:42 |
527 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:39 |
528 | +msgid "before closing?" |
529 | +msgstr "" |
530 | + |
531 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:42 |
532 | msgid "Save unsaved changes to file \"" |
533 | msgstr "" |
534 | |
535 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:45 |
536 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:45 |
537 | msgid "Changes to this file haven't been saved." |
538 | msgstr "" |
539 | |
540 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/SaveDialog.vala:45 |
541 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveDialog.vala:45 |
542 | msgid "Do you want to save changes before closing this file?" |
543 | msgstr "" |
544 | |
545 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:49 |
546 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:57 |
547 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:39 |
548 | +msgid "Save changes to document" |
549 | +msgstr "" |
550 | + |
551 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:39 |
552 | +msgid "New File" |
553 | +msgstr "" |
554 | + |
555 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:40 |
556 | +msgid "" |
557 | +"If you don't save, changes from the last 4 seconds will be permanently lost." |
558 | +msgstr "" |
559 | + |
560 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/SaveOnCloseDialog.vala:42 |
561 | +msgid "Close without saving" |
562 | +msgstr "" |
563 | + |
564 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:49 |
565 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:57 |
566 | msgid "The file:" |
567 | msgstr "" |
568 | |
569 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:50 |
570 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:50 |
571 | msgid "Do you want to reload it?" |
572 | msgstr "" |
573 | |
574 | -#: /home/mario/elementary/scratch/po/../src/Dialogs/WarnDialog.vala:58 |
575 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Dialogs/WarnDialog.vala:58 |
576 | msgid "Do you want to create it again?" |
577 | msgstr "" |
578 | |
579 | -#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:265 |
580 | -#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:491 |
581 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:265 |
582 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:491 |
583 | msgid "You can't save changes to:" |
584 | msgstr "" |
585 | |
586 | -#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:265 |
587 | -#: /home/mario/elementary/scratch/po/../src/Services/Document.vala:491 |
588 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:265 |
589 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../src/Services/Document.vala:491 |
590 | msgid "Do you want to save the changes to this file in a different location?" |
591 | msgstr "" |
592 | |
593 | -#: /home/mario/elementary/scratch/po/../scratchcore/SearchManager.vala:66 |
594 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SourceView.vala:95 |
595 | +msgid "Syntax Highlighting" |
596 | +msgstr "" |
597 | + |
598 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SearchManager.vala:66 |
599 | msgid "Find" |
600 | msgstr "" |
601 | |
602 | -#: /home/mario/elementary/scratch/po/../scratchcore/SearchManager.vala:67 |
603 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SearchManager.vala:67 |
604 | msgid "Replace With" |
605 | msgstr "" |
606 | |
607 | -#: /home/mario/elementary/scratch/po/../scratchcore/SearchManager.vala:82 |
608 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../scratchcore/SearchManager.vala:82 |
609 | msgid "Go To Line:" |
610 | msgstr "" |
611 | |
612 | -#: /home/mario/elementary/scratch/po/../scratchcore/SourceView.vala:95 |
613 | -msgid "Syntax Highlighting" |
614 | -msgstr "" |
615 | - |
616 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:254 |
617 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:254 |
618 | msgid "Share via PasteBin" |
619 | msgstr "" |
620 | |
621 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:273 |
622 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:273 |
623 | msgid "Name:" |
624 | msgstr "" |
625 | |
626 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:279 |
627 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:279 |
628 | msgid "Format: " |
629 | msgstr "" |
630 | |
631 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:281 |
632 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:281 |
633 | msgid "Others..." |
634 | msgstr "" |
635 | |
636 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:306 |
637 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:306 |
638 | msgid "Expiry time:" |
639 | msgstr "" |
640 | |
641 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:311 |
642 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:311 |
643 | msgid "Keep this paste private" |
644 | msgstr "" |
645 | |
646 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:314 |
647 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:314 |
648 | msgid "Upload" |
649 | msgstr "" |
650 | |
651 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:345 |
652 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:345 |
653 | msgid "Other formats" |
654 | msgstr "" |
655 | |
656 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:544 |
657 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:544 |
658 | msgid "Never" |
659 | msgstr "" |
660 | |
661 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:545 |
662 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:545 |
663 | msgid "Ten minutes" |
664 | msgstr "" |
665 | |
666 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:546 |
667 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:546 |
668 | msgid "One hour" |
669 | msgstr "" |
670 | |
671 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:547 |
672 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:547 |
673 | msgid "One day" |
674 | msgstr "" |
675 | |
676 | -#: /home/mario/elementary/scratch/po/../plugins/pastebin/pastebin_dialog.vala:548 |
677 | +#: /home/ttosttos/Projects/elementary/Bugs/scratch-fix-1006040/po/../plugins/pastebin/pastebin_dialog.vala:548 |
678 | msgid "One month" |
679 | msgstr "" |
680 | |
681 | === modified file 'src/config.vala.cmake' |
682 | --- src/config.vala.cmake 2012-05-25 14:56:31 +0000 |
683 | +++ src/config.vala.cmake 2012-05-30 10:31:18 +0000 |
684 | @@ -1,15 +1,18 @@ |
685 | namespace Constants { |
686 | -public const string DATADIR = "@DATADIR@"; |
687 | -public const string PKGDATADIR = "@PKGDATADIR@"; |
688 | -public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; |
689 | -public const string RELEASE_NAME = "@RELEASE_NAME@"; |
690 | -public const string VERSION = "@VERSION@"; |
691 | -public const string VERSION_INFO = "@VERSION_INFO@"; |
692 | -public const string PLUGINDIR = "@PLUGINDIR@"; |
693 | -/* Translation template for .desktop file */ |
694 | -public const string COMMENT = N_("Edit text files"); |
695 | -public const string GENERIC = N_("Text Editor"); |
696 | -public const string NEW_DOCUMENT = N_("Create a new document"); |
697 | -public const string NEW_WINDOW = N_("Create a new window"); |
698 | + public const string DATADIR = "@DATADIR@"; |
699 | + public const string PKGDATADIR = "@PKGDATADIR@"; |
700 | + public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@"; |
701 | + public const string RELEASE_NAME = "@RELEASE_NAME@"; |
702 | + public const string VERSION = "@VERSION@"; |
703 | + public const string VERSION_INFO = "@VERSION_INFO@"; |
704 | + public const string PLUGINDIR = "@PLUGINDIR@"; |
705 | + |
706 | + /* Translatable launcher (.desktop) strings to be added to */ |
707 | + /* template (.pot) file. These strings should reflect any */ |
708 | + /* changes in these launcher keys in .desktop file. */ |
709 | + public const string COMMENT = N_("Edit text files"); |
710 | + public const string GENERIC = N_("Text Editor"); |
711 | + public const string NEW_DOCUMENT = N_("New Document"); |
712 | + public const string NEW_WINDOW = N_("New Window"); |
713 | } |
714 | - |
715 | \ No newline at end of file |
716 | + |
in config.vala.cmake the string: "public const string NEW_DOCUMENT = N_("New Window");" should be fixed replaceing "Window" with "Document"