Granite

Merge lp:~leonardolemos/granite/fix-1344887 into lp:~elementary-pantheon/granite/granite

  1. fix-1344887
  2. Merge into granite
Proposed by Leonardo Lemos
Status: Merged
Approved by: Danielle Foré
Approved revision: 909
Merged at revision: 908
Proposed branch: lp:~leonardolemos/granite/fix-1344887
Merge into: lp:~elementary-pantheon/granite/granite
Diff against target: 320 lines (+53/-31)
2 files modified
demo/GraniteDemo.vala (+2/-2)
po/granite.pot (+51/-29)
To merge this branch: bzr merge lp:~leonardolemos/granite/fix-1344887
Reviewer Review Type Date Requested Status
elementary Pantheon team Pending
Review via email: mp+279478@code.launchpad.net

Commit message

Translator Credit to "translator-credits"

To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'demo/GraniteDemo.vala'
2--- demo/GraniteDemo.vala 2015-10-26 17:09:41 +0000
3+++ demo/GraniteDemo.vala 2015-12-03 17:19:43 +0000
4@@ -60,7 +60,7 @@
5 };
6
7 about_comments = "A demo of the Granite toolkit";
8- about_translators = "Launchpad Translators";
9+ about_translators = _("translator-credits");
10 about_license_type = Gtk.License.GPL_3_0;
11 }
12
13@@ -312,4 +312,4 @@
14 var application = new Granite.Demo ();
15 return application.run (args);
16 }
17-}
18\ No newline at end of file
19+}
20
21=== modified file 'po/granite.pot'
22--- po/granite.pot 2015-11-18 22:35:52 +0000
23+++ po/granite.pot 2015-12-03 17:19:43 +0000
24@@ -8,7 +8,7 @@
25 msgstr ""
26 "Project-Id-Version: PACKAGE VERSION\n"
27 "Report-Msgid-Bugs-To: \n"
28-"POT-Creation-Date: 2015-11-18 16:35-0600\n"
29+"POT-Creation-Date: 2015-12-03 15:16-0200\n"
30 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
31 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
32 "Language-Team: LANGUAGE <LL@li.org>\n"
33@@ -18,12 +18,12 @@
34 "Content-Transfer-Encoding: 8bit\n"
35
36 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:36
37-#: ../lib//GtkPatch/AboutDialog.vala:36
38+#: ../lib//GtkPatch/AboutDialog.vala:36 ../lib/GtkPatch/AboutDialog.vala:36
39 msgid "Designed by:"
40 msgstr ""
41
42 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:55
43-#: ../lib//GtkPatch/AboutDialog.vala:55
44+#: ../lib//GtkPatch/AboutDialog.vala:55 ../lib/GtkPatch/AboutDialog.vala:55
45 msgid "Written by:"
46 msgstr ""
47
48@@ -35,17 +35,20 @@
49
50 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:111
51 #: ../lib//GtkPatch/AboutDialog.vala:111 ../lib//GtkPatch/AboutDialog.vala:115
52+#: ../lib/GtkPatch/AboutDialog.vala:115
53 msgid "Documented by:"
54 msgstr ""
55
56 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:171
57 #: ../lib//GtkPatch/AboutDialog.vala:171 ../lib//GtkPatch/AboutDialog.vala:175
58+#: ../lib/GtkPatch/AboutDialog.vala:175
59 #, c-format
60 msgid "Translated by %s"
61 msgstr ""
62
63 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:355
64 #: ../lib//GtkPatch/AboutDialog.vala:355 ../lib//GtkPatch/AboutDialog.vala:359
65+#: ../lib/GtkPatch/AboutDialog.vala:359
66 msgid "Close"
67 msgstr ""
68
69@@ -66,6 +69,7 @@
70
71 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Application.vala:258
72 #: ../lib//Application.vala:258 ../lib//Application.vala:265
73+#: ../lib/Application.vala:265
74 msgid "Website"
75 msgstr ""
76
77@@ -73,31 +77,38 @@
78 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:268
79 #: ../lib//Widgets/DynamicNotebook.vala:226
80 #: ../lib//Widgets/DynamicNotebook.vala:266
81+#: ../lib/Widgets/DynamicNotebook.vala:226
82+#: ../lib/Widgets/DynamicNotebook.vala:266
83 msgid "Close Tab"
84 msgstr ""
85
86 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:271
87 #: ../lib//Widgets/DynamicNotebook.vala:269
88+#: ../lib/Widgets/DynamicNotebook.vala:269
89 msgid "Open in a new Window"
90 msgstr ""
91
92 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:272
93 #: ../lib//Widgets/DynamicNotebook.vala:270
94+#: ../lib/Widgets/DynamicNotebook.vala:270
95 msgid "Duplicate"
96 msgstr ""
97
98 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:321
99 #: ../lib//Widgets/DynamicNotebook.vala:319
100+#: ../lib/Widgets/DynamicNotebook.vala:319
101 msgid "Close Other Tab"
102 msgstr ""
103
104 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:321
105 #: ../lib//Widgets/DynamicNotebook.vala:319
106+#: ../lib/Widgets/DynamicNotebook.vala:319
107 msgid "Close Other Tabs"
108 msgstr ""
109
110 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:497
111 #: ../lib//Widgets/DynamicNotebook.vala:496
112+#: ../lib/Widgets/DynamicNotebook.vala:496
113 msgid "Clear All"
114 msgstr ""
115
116@@ -105,26 +116,30 @@
117 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:815
118 #: ../lib//Widgets/DynamicNotebook.vala:780
119 #: ../lib//Widgets/DynamicNotebook.vala:813
120+#: ../lib/Widgets/DynamicNotebook.vala:780
121+#: ../lib/Widgets/DynamicNotebook.vala:813
122 msgid "New Tab"
123 msgstr ""
124
125 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:783
126 #: ../lib//Widgets/DynamicNotebook.vala:781
127+#: ../lib/Widgets/DynamicNotebook.vala:781
128 msgid "Undo Close Tab"
129 msgstr ""
130
131 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/DynamicNotebook.vala:825
132 #: ../lib//Widgets/DynamicNotebook.vala:823
133+#: ../lib/Widgets/DynamicNotebook.vala:823
134 msgid "Closed Tabs"
135 msgstr ""
136
137 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AboutDialog.vala:95
138-#: ../lib//Widgets/AboutDialog.vala:95
139+#: ../lib//Widgets/AboutDialog.vala:95 ../lib/Widgets/AboutDialog.vala:95
140 msgid "Suggest Translations"
141 msgstr ""
142
143 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AboutDialog.vala:100
144-#: ../lib//Widgets/AboutDialog.vala:100
145+#: ../lib//Widgets/AboutDialog.vala:100 ../lib/Widgets/AboutDialog.vala:100
146 msgid "Report a Problem"
147 msgstr ""
148
149@@ -132,140 +147,147 @@
150 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:59
151 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:72
152 #: ../lib//Widgets/AppMenu.vala:48 ../lib//Widgets/AppMenu.vala:59
153-#: ../lib//Widgets/AppMenu.vala:72
154+#: ../lib//Widgets/AppMenu.vala:72 ../lib/Widgets/AppMenu.vala:48
155+#: ../lib/Widgets/AppMenu.vala:59 ../lib/Widgets/AppMenu.vala:72
156 msgid "Menu"
157 msgstr ""
158
159 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/AppMenu.vala:82
160-#: ../lib//Widgets/AppMenu.vala:82
161+#: ../lib//Widgets/AppMenu.vala:82 ../lib/Widgets/AppMenu.vala:82
162 msgid "About"
163 msgstr ""
164
165 #. / TRANSLATORS: this will only show up when 12-hours clock is in use
166 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/TimePicker.vala:129
167-#: ../lib//Widgets/TimePicker.vala:129
168+#: ../lib//Widgets/TimePicker.vala:129 ../lib/Widgets/TimePicker.vala:129
169 msgid "PM"
170 msgstr ""
171
172 #. / TRANSLATORS: separates hours from minutes.
173 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/TimePicker.vala:149
174-#: ../lib//Widgets/TimePicker.vala:149
175+#: ../lib//Widgets/TimePicker.vala:149 ../lib/Widgets/TimePicker.vala:149
176 msgid ":"
177 msgstr ""
178
179 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
180 #: ../lib//Widgets/ContractorView.vala:105
181+#: ../lib/Widgets/ContractorView.vala:105
182 msgid "Could not contact Contractor. You may need to install it"
183 msgstr ""
184
185 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
186 #: ../lib//Widgets/ContractorView.vala:105
187+#: ../lib/Widgets/ContractorView.vala:105
188 msgid "No action found for this file"
189 msgstr ""
190
191 #. / TRANSLATORS: a GLib.DateTime format showing the hour (12h format) with seconds
192 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:77
193-#: ../lib//Widgets/Utils.vala:77
194+#: ../lib//Widgets/Utils.vala:77 ../lib/Widgets/Utils.vala:77
195 msgid "%l:%M:%S %p"
196 msgstr ""
197
198 #. / TRANSLATORS: a GLib.DateTime format showing the hour (12h format)
199 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:80
200-#: ../lib//Widgets/Utils.vala:80
201+#: ../lib//Widgets/Utils.vala:80 ../lib/Widgets/Utils.vala:80
202 msgid "%l:%M %p"
203 msgstr ""
204
205 #. / TRANSLATORS: a GLib.DateTime format showing the hour (24h format) with seconds
206 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:85
207-#: ../lib//Widgets/Utils.vala:85
208+#: ../lib//Widgets/Utils.vala:85 ../lib/Widgets/Utils.vala:85
209 msgid "%H:%M:%S"
210 msgstr ""
211
212 #. / TRANSLATORS: a GLib.DateTime format showing the hour (24h format)
213 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:88
214-#: ../lib//Widgets/Utils.vala:88
215+#: ../lib//Widgets/Utils.vala:88 ../lib/Widgets/Utils.vala:88
216 msgid "%H:%M"
217 msgstr ""
218
219 #. / TRANSLATORS: a GLib.DateTime format showing the weekday, date, and year
220 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:102
221-#: ../lib//Widgets/Utils.vala:102
222+#: ../lib//Widgets/Utils.vala:102 ../lib/Widgets/Utils.vala:102
223 msgid "%a %b %e %Y"
224 msgstr ""
225
226 #. / TRANSLATORS: a GLib.DateTime format showing the date and year
227 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:105
228-#: ../lib//Widgets/Utils.vala:105
229+#: ../lib//Widgets/Utils.vala:105 ../lib/Widgets/Utils.vala:105
230 msgid "%b %e %Y"
231 msgstr ""
232
233 #. / TRANSLATORS: a GLib.DateTime format showing the year
234 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:108
235-#: ../lib//Widgets/Utils.vala:108
236+#: ../lib//Widgets/Utils.vala:108 ../lib/Widgets/Utils.vala:108
237 msgid "%Y"
238 msgstr ""
239
240 #. / TRANSLATORS: a GLib.DateTime format showing the date
241 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:111
242-#: ../lib//Widgets/Utils.vala:111
243+#: ../lib//Widgets/Utils.vala:111 ../lib/Widgets/Utils.vala:111
244 msgid "%b %e"
245 msgstr ""
246
247 #. / TRANSLATORS: a GLib.DateTime format showing the weekday and year.
248 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:114
249-#: ../lib//Widgets/Utils.vala:114
250+#: ../lib//Widgets/Utils.vala:114 ../lib/Widgets/Utils.vala:114
251 msgid "%a %Y"
252 msgstr ""
253
254 #. / TRANSLATORS: a GLib.DateTime format showing the weekday
255 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:117
256-#: ../lib//Widgets/Utils.vala:117
257+#: ../lib//Widgets/Utils.vala:117 ../lib/Widgets/Utils.vala:117
258 #, c-format
259 msgid "%a"
260 msgstr ""
261
262 #. / TRANSLATORS: a GLib.DateTime format showing the weekday and date
263 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:120
264-#: ../lib//Widgets/Utils.vala:120
265+#: ../lib//Widgets/Utils.vala:120 ../lib/Widgets/Utils.vala:120
266 msgid "%a %b %e"
267 msgstr ""
268
269 #. / TRANSLATORS: a GLib.DateTime format showing the month.
270 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/Utils.vala:123
271-#: ../lib//Widgets/Utils.vala:123
272+#: ../lib//Widgets/Utils.vala:123 ../lib/Widgets/Utils.vala:123
273 msgid "%b"
274 msgstr ""
275
276-#: ../lib//Widgets/StorageBar.vala:53
277+#: ../lib//Widgets/StorageBar.vala:53 ../lib/Widgets/StorageBar.vala:53
278 msgid "Audio"
279 msgstr ""
280
281-#: ../lib//Widgets/StorageBar.vala:55
282+#: ../lib//Widgets/StorageBar.vala:55 ../lib/Widgets/StorageBar.vala:55
283 msgid "Videos"
284 msgstr ""
285
286-#: ../lib//Widgets/StorageBar.vala:57
287+#: ../lib//Widgets/StorageBar.vala:57 ../lib/Widgets/StorageBar.vala:57
288 msgid "Photos"
289 msgstr ""
290
291-#: ../lib//Widgets/StorageBar.vala:59
292+#: ../lib//Widgets/StorageBar.vala:59 ../lib/Widgets/StorageBar.vala:59
293 msgid "Apps"
294 msgstr ""
295
296-#: ../lib//Widgets/StorageBar.vala:61
297+#: ../lib//Widgets/StorageBar.vala:61 ../lib/Widgets/StorageBar.vala:61
298 msgid "Other"
299 msgstr ""
300
301-#: ../lib//Widgets/StorageBar.vala:196
302+#: ../lib//Widgets/StorageBar.vala:196 ../lib/Widgets/StorageBar.vala:196
303 msgid "%s free out of %s"
304 msgstr ""
305
306-#: ../lib//Application.vala:248
307+#: ../lib//Application.vala:248 ../lib/Application.vala:248
308 msgid "%s's Developers"
309 msgstr ""
310
311-#: ../lib//GtkPatch/AboutDialog.vala:460
312+#: ../lib//GtkPatch/AboutDialog.vala:460 ../lib/GtkPatch/AboutDialog.vala:460
313 msgid ""
314 "This program is published under the terms of the %s license, it comes with "
315 "ABSOLUTELY NO WARRANTY; for details, visit %s"
316 msgstr ""
317+
318+#: ../demo/GraniteDemo.vala:63
319+msgid "translator-credits"
320+msgstr ""

Subscribers

People subscribed via source and target branches