Ubuntu Online Tour - OBSOLETE

Merge lp:~barry-mcgee/ubuntu-online-tour/tofrom-strings into lp:ubuntu-online-tour/14.04

  1. tofrom-strings
  2. Merge into 14.04
Proposed by Barry McGee
Status: Merged
Approved by: Anthony Dillon
Approved revision: 189
Merged at revision: 193
Proposed branch: lp:~barry-mcgee/ubuntu-online-tour/tofrom-strings
Merge into: lp:ubuntu-online-tour/14.04
Diff against target: 444 lines (+41/-41)
35 files modified
en/index.html (+2/-2)
po-html/az.po (+1/-1)
po-html/ca.po (+1/-1)
po-html/cs.po (+2/-2)
po-html/de.po (+1/-1)
po-html/el.po (+1/-1)
po-html/en_AU.po (+1/-1)
po-html/eo.po (+1/-1)
po-html/es.po (+1/-1)
po-html/fi.po (+1/-1)
po-html/fo.po (+1/-1)
po-html/fr.po (+1/-1)
po-html/gl.po (+1/-1)
po-html/he.po (+1/-1)
po-html/hu.po (+1/-1)
po-html/it.po (+1/-1)
po-html/ja.po (+2/-2)
po-html/ko.po (+1/-1)
po-html/lt.po (+1/-1)
po-html/lv.po (+1/-1)
po-html/ml.po (+1/-1)
po-html/ms.po (+2/-2)
po-html/my.po (+2/-2)
po-html/nb.po (+1/-1)
po-html/nl.po (+1/-1)
po-html/oc.po (+1/-1)
po-html/ro.po (+1/-1)
po-html/ru.po (+1/-1)
po-html/shn.po (+1/-1)
po-html/sl.po (+1/-1)
po-html/sr.po (+1/-1)
po-html/sv.po (+2/-2)
po-html/tr.po (+1/-1)
po-html/uz.po (+1/-1)
po-html/zh_CN.po (+1/-1)
To merge this branch: bzr merge lp:~barry-mcgee/ubuntu-online-tour/tofrom-strings
Reviewer Review Type Date Requested Status
Anthony Dillon Approve
Review via email: mp+281763@code.launchpad.net

Description of the change

* Changed 'To/From' text in Shotwell mockup to 'Starting/Ending' to prevent translations conflict with Email mockup.

To post a comment you must log in.
Revision history for this message
Anthony Dillon (ya-bo-ng) wrote :

LGTM +1

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'en/index.html'
2--- en/index.html 2016-01-05 11:38:05 +0000
3+++ en/index.html 2016-01-06 16:02:39 +0000
4@@ -828,10 +828,10 @@
5 Items: <span class="items">16 Photos</span>
6 </div>
7 <div>
8- From: <span class="from">Fri 26 Oct, 2001</span>
9+ Starting: <span class="from">Fri 26 Oct, 2001</span>
10 </div>
11 <div>
12- To: <span class="to">Mon 11 October, 2010</span>
13+ Ending: <span class="to">Mon 11 October, 2010</span>
14 </div>
15 </div>
16 <div class="single">
17
18=== modified file 'po-html/az.po'
19--- po-html/az.po 2016-01-05 05:43:34 +0000
20+++ po-html/az.po 2016-01-06 16:02:39 +0000
21@@ -1214,5 +1214,5 @@
22 msgid "Blender"
23 msgstr ""
24
25-#~ msgid "Happyness"
26+#~ msgid "Happiness"
27 #~ msgstr "Xoşbəxtlik"
28
29=== modified file 'po-html/ca.po'
30--- po-html/ca.po 2016-01-05 05:43:34 +0000
31+++ po-html/ca.po 2016-01-06 16:02:39 +0000
32@@ -1274,5 +1274,5 @@
33 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
34 #~ msgstr "Unifiqueu els contactes a l'escriptori, al mòbil i a la web"
35
36-#~ msgid "Happyness"
37+#~ msgid "Happiness"
38 #~ msgstr "Felicitat"
39
40=== modified file 'po-html/cs.po'
41--- po-html/cs.po 2016-01-05 05:43:34 +0000
42+++ po-html/cs.po 2016-01-06 16:02:39 +0000
43@@ -1323,8 +1323,8 @@
44 msgid "Blender"
45 msgstr "Blender"
46
47-#~ msgid "Happyness"
48-#~ msgstr "Happyness"
49+#~ msgid "Happiness"
50+#~ msgstr "Happiness"
51
52 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
53 #~ msgstr "Sjednoťte své kontakty mezi počítače, mobilem a webem"
54
55=== modified file 'po-html/de.po'
56--- po-html/de.po 2016-01-05 05:43:34 +0000
57+++ po-html/de.po 2016-01-06 16:02:39 +0000
58@@ -1346,7 +1346,7 @@
59 msgid "Blender"
60 msgstr "Blender"
61
62-#~ msgid "Happyness"
63+#~ msgid "Happiness"
64 #~ msgstr "Zufriedenheit"
65
66 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
67
68=== modified file 'po-html/el.po'
69--- po-html/el.po 2016-01-05 05:43:34 +0000
70+++ po-html/el.po 2016-01-06 16:02:39 +0000
71@@ -1354,7 +1354,7 @@
72 #~ "Διατηρήστε τους σελιδοδείκτες σας στον firefox και τις σημειώσεις σας στο "
73 #~ "Tomboy συγχρονισμένα"
74
75-#~ msgid "Happyness"
76+#~ msgid "Happiness"
77 #~ msgstr "Ευτυχία"
78
79 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
80
81=== modified file 'po-html/en_AU.po'
82--- po-html/en_AU.po 2016-01-05 05:43:34 +0000
83+++ po-html/en_AU.po 2016-01-06 16:02:39 +0000
84@@ -1316,7 +1316,7 @@
85 msgid "Blender"
86 msgstr "Blender"
87
88-#~ msgid "Happyness"
89+#~ msgid "Happiness"
90 #~ msgstr "Happiness"
91
92 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
93
94=== modified file 'po-html/eo.po'
95--- po-html/eo.po 2016-01-05 05:43:34 +0000
96+++ po-html/eo.po 2016-01-06 16:02:39 +0000
97@@ -1217,5 +1217,5 @@
98 msgid "Blender"
99 msgstr ""
100
101-#~ msgid "Happyness"
102+#~ msgid "Happiness"
103 #~ msgstr "Feliĉo"
104
105=== modified file 'po-html/es.po'
106--- po-html/es.po 2016-01-05 05:43:34 +0000
107+++ po-html/es.po 2016-01-06 16:02:39 +0000
108@@ -1304,7 +1304,7 @@
109 msgid "Blender"
110 msgstr "Blender"
111
112-#~ msgid "Happyness"
113+#~ msgid "Happiness"
114 #~ msgstr "Felicidad"
115
116 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
117
118=== modified file 'po-html/fi.po'
119--- po-html/fi.po 2016-01-05 05:43:34 +0000
120+++ po-html/fi.po 2016-01-06 16:02:39 +0000
121@@ -1325,7 +1325,7 @@
122 msgid "Blender"
123 msgstr "Blender"
124
125-#~ msgid "Happyness"
126+#~ msgid "Happiness"
127 #~ msgstr "Onnellisuus"
128
129 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
130
131=== modified file 'po-html/fo.po'
132--- po-html/fo.po 2016-01-05 05:43:34 +0000
133+++ po-html/fo.po 2016-01-06 16:02:39 +0000
134@@ -1234,5 +1234,5 @@
135 msgid "Blender"
136 msgstr "Blender"
137
138-#~ msgid "Happyness"
139+#~ msgid "Happiness"
140 #~ msgstr "Gleði"
141
142=== modified file 'po-html/fr.po'
143--- po-html/fr.po 2016-01-05 05:43:34 +0000
144+++ po-html/fr.po 2016-01-06 16:02:39 +0000
145@@ -1349,7 +1349,7 @@
146 msgid "Blender"
147 msgstr "Blender"
148
149-#~ msgid "Happyness"
150+#~ msgid "Happiness"
151 #~ msgstr "Bonheur"
152
153 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
154
155=== modified file 'po-html/gl.po'
156--- po-html/gl.po 2016-01-05 05:43:34 +0000
157+++ po-html/gl.po 2016-01-06 16:02:39 +0000
158@@ -1332,7 +1332,7 @@
159 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
160 #~ msgstr "Unifica os seus contactos entre o seu escritorio, móbil e web"
161
162-#~ msgid "Happyness"
163+#~ msgid "Happiness"
164 #~ msgstr "Felicidade"
165
166 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
167
168=== modified file 'po-html/he.po'
169--- po-html/he.po 2016-01-05 05:43:34 +0000
170+++ po-html/he.po 2016-01-06 16:02:39 +0000
171@@ -1215,7 +1215,7 @@
172 msgid "Blender"
173 msgstr ""
174
175-#~ msgid "Happyness"
176+#~ msgid "Happiness"
177 #~ msgstr "שמחה"
178
179 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
180
181=== modified file 'po-html/hu.po'
182--- po-html/hu.po 2016-01-05 05:43:34 +0000
183+++ po-html/hu.po 2016-01-06 16:02:39 +0000
184@@ -1331,7 +1331,7 @@
185 msgid "Blender"
186 msgstr "Blender"
187
188-#~ msgid "Happyness"
189+#~ msgid "Happiness"
190 #~ msgstr "Boldogság"
191
192 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
193
194=== modified file 'po-html/it.po'
195--- po-html/it.po 2016-01-05 05:43:34 +0000
196+++ po-html/it.po 2016-01-06 16:02:39 +0000
197@@ -1295,5 +1295,5 @@
198 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
199 #~ msgstr "Mantieni sincronizzati i segnalibri di Firefox e le note di Tomboy"
200
201-#~ msgid "Happyness"
202+#~ msgid "Happiness"
203 #~ msgstr "Felicità"
204
205=== modified file 'po-html/ja.po'
206--- po-html/ja.po 2016-01-05 05:43:34 +0000
207+++ po-html/ja.po 2016-01-06 16:02:39 +0000
208@@ -1287,8 +1287,8 @@
209 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
210 #~ msgstr "Firefox のブックマークや Tomboy のメモを同期します"
211
212-#~ msgid "Happyness"
213-#~ msgstr "Happyness"
214+#~ msgid "Happiness"
215+#~ msgstr "Happiness"
216
217 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
218 #~ msgstr "デスクトップやモバイル、ウェブを越えて連絡帳を一元管理します"
219
220=== modified file 'po-html/ko.po'
221--- po-html/ko.po 2016-01-05 05:43:34 +0000
222+++ po-html/ko.po 2016-01-06 16:02:39 +0000
223@@ -1274,7 +1274,7 @@
224 msgid "Blender"
225 msgstr "블렌더"
226
227-#~ msgid "Happyness"
228+#~ msgid "Happiness"
229 #~ msgstr "행복"
230
231 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
232
233=== modified file 'po-html/lt.po'
234--- po-html/lt.po 2016-01-05 05:43:34 +0000
235+++ po-html/lt.po 2016-01-06 16:02:39 +0000
236@@ -1295,7 +1295,7 @@
237 msgid "Blender"
238 msgstr "Blender"
239
240-#~ msgid "Happyness"
241+#~ msgid "Happiness"
242 #~ msgstr "Linksmybės"
243
244 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
245
246=== modified file 'po-html/lv.po'
247--- po-html/lv.po 2016-01-05 05:43:34 +0000
248+++ po-html/lv.po 2016-01-06 16:02:39 +0000
249@@ -1228,5 +1228,5 @@
250 msgid "Blender"
251 msgstr ""
252
253-#~ msgid "Happyness"
254+#~ msgid "Happiness"
255 #~ msgstr "Laime"
256
257=== modified file 'po-html/ml.po'
258--- po-html/ml.po 2016-01-05 05:43:34 +0000
259+++ po-html/ml.po 2016-01-06 16:02:39 +0000
260@@ -1213,5 +1213,5 @@
261 msgid "Blender"
262 msgstr ""
263
264-#~ msgid "Happyness"
265+#~ msgid "Happiness"
266 #~ msgstr "സന്തോഷം"
267
268=== modified file 'po-html/ms.po'
269--- po-html/ms.po 2016-01-05 05:43:34 +0000
270+++ po-html/ms.po 2016-01-06 16:02:39 +0000
271@@ -1331,8 +1331,8 @@
272 msgid "Blender"
273 msgstr "Blender"
274
275-#~ msgid "Happyness"
276-#~ msgstr "Happyness"
277+#~ msgid "Happiness"
278+#~ msgstr "Happiness"
279
280 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
281 #~ msgstr "Pastikan tanda buku firefox dan nota Tomboy anda disegerakan"
282
283=== modified file 'po-html/my.po'
284--- po-html/my.po 2016-01-05 05:43:34 +0000
285+++ po-html/my.po 2016-01-06 16:02:39 +0000
286@@ -1245,5 +1245,5 @@
287 msgid "Blender"
288 msgstr "Blender"
289
290-#~ msgid "Happyness"
291-#~ msgstr "Happyness"
292+#~ msgid "Happiness"
293+#~ msgstr "Happiness"
294
295=== modified file 'po-html/nb.po'
296--- po-html/nb.po 2016-01-05 05:43:34 +0000
297+++ po-html/nb.po 2016-01-06 16:02:39 +0000
298@@ -1272,7 +1272,7 @@
299 msgid "Blender"
300 msgstr "Blender"
301
302-#~ msgid "Happyness"
303+#~ msgid "Happiness"
304 #~ msgstr "Glede"
305
306 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
307
308=== modified file 'po-html/nl.po'
309--- po-html/nl.po 2016-01-05 05:43:34 +0000
310+++ po-html/nl.po 2016-01-06 16:02:39 +0000
311@@ -1331,7 +1331,7 @@
312 msgid "Blender"
313 msgstr "Blender"
314
315-#~ msgid "Happyness"
316+#~ msgid "Happiness"
317 #~ msgstr "Geluk"
318
319 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
320
321=== modified file 'po-html/oc.po'
322--- po-html/oc.po 2016-01-05 05:43:34 +0000
323+++ po-html/oc.po 2016-01-06 16:02:39 +0000
324@@ -1230,5 +1230,5 @@
325 msgid "Blender"
326 msgstr ""
327
328-#~ msgid "Happyness"
329+#~ msgid "Happiness"
330 #~ msgstr "Bonur"
331
332=== modified file 'po-html/ro.po'
333--- po-html/ro.po 2016-01-05 05:43:34 +0000
334+++ po-html/ro.po 2016-01-06 16:02:39 +0000
335@@ -1334,7 +1334,7 @@
336 msgid "Blender"
337 msgstr "Blender"
338
339-#~ msgid "Happyness"
340+#~ msgid "Happiness"
341 #~ msgstr "Fericire"
342
343 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
344
345=== modified file 'po-html/ru.po'
346--- po-html/ru.po 2016-01-05 05:43:34 +0000
347+++ po-html/ru.po 2016-01-06 16:02:39 +0000
348@@ -1339,7 +1339,7 @@
349 msgid "Blender"
350 msgstr "Blender"
351
352-#~ msgid "Happyness"
353+#~ msgid "Happiness"
354 #~ msgstr "Счастье"
355
356 #~ msgid "Unify you contacts across Desktop, Mobile and Web"
357
358=== modified file 'po-html/shn.po'
359--- po-html/shn.po 2016-01-05 05:43:34 +0000
360+++ po-html/shn.po 2016-01-06 16:02:39 +0000
361@@ -1378,7 +1378,7 @@
362 msgid "Blender"
363 msgstr "ပလႅၼ်ႇတႃႇ"
364
365-#~ msgid "Happyness"
366+#~ msgid "Happiness"
367 #~ msgstr "ၵၼ်မူၼ်ႈသိူဝ်း"
368
369 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
370
371=== modified file 'po-html/sl.po'
372--- po-html/sl.po 2016-01-05 05:43:34 +0000
373+++ po-html/sl.po 2016-01-06 16:02:39 +0000
374@@ -1326,7 +1326,7 @@
375 msgid "Blender"
376 msgstr "Blender"
377
378-#~ msgid "Happyness"
379+#~ msgid "Happiness"
380 #~ msgstr "Sreča"
381
382 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
383
384=== modified file 'po-html/sr.po'
385--- po-html/sr.po 2016-01-05 05:43:34 +0000
386+++ po-html/sr.po 2016-01-06 16:02:39 +0000
387@@ -1229,5 +1229,5 @@
388 msgid "Blender"
389 msgstr ""
390
391-#~ msgid "Happyness"
392+#~ msgid "Happiness"
393 #~ msgstr "Срећа"
394
395=== modified file 'po-html/sv.po'
396--- po-html/sv.po 2016-01-05 05:43:34 +0000
397+++ po-html/sv.po 2016-01-06 16:02:39 +0000
398@@ -1290,5 +1290,5 @@
399 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
400 #~ msgstr "Håll dina firefox-bokmärken och Tomboy-anteckningar synkroniserade"
401
402-#~ msgid "Happyness"
403-#~ msgstr "Happyness"
404+#~ msgid "Happiness"
405+#~ msgstr "Happiness"
406
407=== modified file 'po-html/tr.po'
408--- po-html/tr.po 2016-01-05 05:43:34 +0000
409+++ po-html/tr.po 2016-01-06 16:02:39 +0000
410@@ -1326,7 +1326,7 @@
411 msgid "Blender"
412 msgstr "Blender"
413
414-#~ msgid "Happyness"
415+#~ msgid "Happiness"
416 #~ msgstr "Mutluluk"
417
418 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
419
420=== modified file 'po-html/uz.po'
421--- po-html/uz.po 2016-01-05 05:43:34 +0000
422+++ po-html/uz.po 2016-01-06 16:02:39 +0000
423@@ -1253,7 +1253,7 @@
424 msgid "Blender"
425 msgstr "Blender"
426
427-#~ msgid "Happyness"
428+#~ msgid "Happiness"
429 #~ msgstr "Бахтли"
430
431 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
432
433=== modified file 'po-html/zh_CN.po'
434--- po-html/zh_CN.po 2016-01-05 05:43:34 +0000
435+++ po-html/zh_CN.po 2016-01-06 16:02:39 +0000
436@@ -1254,7 +1254,7 @@
437 #~ msgid "Keep you firefox bookmarks and Tomboy notes synced"
438 #~ msgstr "同步您的 Firefox 书签和 Tomboy 笔记"
439
440-#~ msgid "Happyness"
441+#~ msgid "Happiness"
442 #~ msgstr "喜悦"
443
444 #~ msgid "Unify you contacts across Desktop, Mobile and Web"

Subscribers

People subscribed via source and target branches