Merge lp:~vinzjobard/uak/trunk into lp:uak

Proposed by Winael
Status: Merged
Approved by: Randall Ross
Approved revision: 78
Merged at revision: 101
Proposed branch: lp:~vinzjobard/uak/trunk
Merge into: lp:uak
Diff against target: 736 lines (+324/-182)
4 files modified
adk/materials-transcripts.rst (+17/-0)
adk/materials.rst (+1/-0)
material/en/media/ubuntu_ads-what_is_maas_ENG.srt (+224/-0)
po/fr.po (+82/-182)
To merge this branch: bzr merge lp:~vinzjobard/uak/trunk
Reviewer Review Type Date Requested Status
Randall Ross Approve
Review via email: mp+143976@code.launchpad.net

Description of the change

Adding a material section with some files transcripts of the Officials videos of Ubuntu, to help LoCo to create subtitles in their native language.

To post a comment you must log in.
Revision history for this message
Randall Ross (randall) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== added file 'adk/materials-transcripts.rst'
2--- adk/materials-transcripts.rst 1970-01-01 00:00:00 +0000
3+++ adk/materials-transcripts.rst 2013-01-19 01:04:21 +0000
4@@ -0,0 +1,17 @@
5+================
6+File transcripts
7+================
8+
9+Below are some file transcripts of the officials Ubuntu ads, as the `What is Maas ? <http://www.youtube.com/watch?v=J1XH0SQARgo>`_ or `What is JuJu ? <http://www.youtube.com/watch?v=1yoIdgdqzLk>`_ videos, available on the Ubuntu Website. The idea is to enable LoCo teams to easily create subtitles in their native language from the official videos of Ubuntu
10+
11+Videos from Ubuntu Website
12+--------------------------
13+
14+What is Maas ?
15+~~~~~~~~~~~~~~
16+
17+.. image:: ../material/en/media/what_is_maas-thumb.jpg
18+
19+**Download**:
20+
21+ * :download:`English Subtitles <../material/en/media/ubuntu_ads-what_is_maas_ENG.srt>`
22
23=== modified file 'adk/materials.rst'
24--- adk/materials.rst 2012-12-14 21:41:28 +0000
25+++ adk/materials.rst 2013-01-19 01:04:21 +0000
26@@ -13,3 +13,4 @@
27
28 materials-logos
29 materials-media
30+ materials-transcripts
31
32=== added file 'material/en/media/ubuntu_ads-what_is_maas_ENG.srt'
33--- material/en/media/ubuntu_ads-what_is_maas_ENG.srt 1970-01-01 00:00:00 +0000
34+++ material/en/media/ubuntu_ads-what_is_maas_ENG.srt 2013-01-19 01:04:21 +0000
35@@ -0,0 +1,224 @@
36+1
37+00:00:00,000 --> 00:00:02,500
38+When we need some servers setup FAST....
39+
40+2
41+00:00:02,500 --> 00:00:04,775
42+we ALL LOVE Ubuntu in the cloud :
43+
44+3
45+00:00:04,775 --> 00:00:06,000
46+Just spin up some VMs,
47+
48+4
49+00:00:06,000 --> 00:00:08,000
50+and you're ready to rock.
51+
52+5
53+00:00:08,000 --> 00:00:10,225
54+But the cloud is full of virtual machines...
55+
56+6
57+00:00:10,225 --> 00:00:12,225
58+and sometimes a VIRTUAL machine,
59+
60+7
61+00:00:12,225 --> 00:00:13,775
62+is too.... VIRTUAL.
63+
64+8
65+00:00:14,000 --> 00:00:17,225
66+Sometimes, real work requires REAL SERVERS.
67+
68+9
69+00:00:17,225 --> 00:00:19,500
70+And when you feel the need for a little...
71+
72+10
73+00:00:19,500 --> 00:00:20,225
74+METAL...
75+
76+11
77+00:00:20,000 --> 00:00:22,000
78+You need to LOSE THAT VIRT
79+
80+12
81+00:00:22,000 --> 00:00:24,000
82+and run right on the server itself !
83+
84+13
85+00:00:24,000 --> 00:00:25,775
86+But setting up REAL hardware,
87+
88+14
89+00:00:25,775 --> 00:00:27,500
90+is like going back to the 90's,
91+
92+15
93+00:00:27,500 --> 00:00:28,225
94+pre-cloud.
95+
96+16
97+00:00:28,225 --> 00:00:30,000
98+It takes a LONG time...
99+
100+17
101+00:00:30,000 --> 00:00:32,775
102+no matter how good your ninja IT skills are.
103+
104+18
105+00:00:32,775 --> 00:00:34,000
106+I guess you've got to choose
107+
108+19
109+00:00:34,000 --> 00:00:36,000
110+between the flexibility of the cloud...
111+
112+20
113+00:00:36,000 --> 00:00:37,775
114+and the raw power of real metal.
115+
116+21
117+00:00:38,000 --> 00:00:40,000
118+Well, what if you didn't have to compromise ?
119+
120+22
121+00:00:40,000 --> 00:00:41,225
122+What if you could have
123+
124+23
125+00:00:41,225 --> 00:00:43,500
126+the SPEED and FLEXIBILITY of the CLOUD....
127+
128+24
129+00:00:43,500 --> 00:00:44,775
130+but on REAL METAL ?
131+
132+25
133+00:00:45,000 --> 00:00:46,775
134+That's where MAAS comes in,
135+
136+26
137+00:00:46,775 --> 00:00:49,225
138+from Canonical... the Ubuntu people.
139+
140+27
141+00:00:49,225 --> 00:00:50,500
142+"Metal as a Service"...
143+
144+28
145+00:00:50,500 --> 00:00:52,500
146+delivers REAL servers on demand
147+
148+29
149+00:00:52,500 --> 00:00:55,225
150+just like a cloud delivers VIRTUAL machines...
151+
152+30
153+00:00:55,000 --> 00:00:56,775
154+So you can give a few servers to MAAS,
155+
156+31
157+00:00:57,000 --> 00:00:59,000
158+then spin them up on demand
159+
160+32
161+00:00:59,000 --> 00:01:01,225
162+just like a cloud, only TOUGHER.
163+
164+33
165+00:01:01,225 --> 00:01:03,225
166+MAAS handles all the boring stuff
167+
168+34
169+00:01:03,225 --> 00:01:08,500
170+IPMI, DNS, DHCP, PXE, blah blah blah
171+
172+35
173+00:01:08,500 --> 00:01:10,000
174+So you just snap your fingers
175+
176+36
177+00:01:10,000 --> 00:01:12,000
178+and MAAS serves up the machine
179+
180+37
181+00:01:12,000 --> 00:01:14,500
182+All spruced up, ready for your apps and services
183+
184+38
185+00:01:14,500 --> 00:01:15,500
186+Any time...
187+
188+39
189+00:01:15,500 --> 00:01:18,225
190+Right on the metal, no virt required.
191+
192+40
193+00:01:18,225 --> 00:01:19,775
194+Your MAAS can start small,
195+
196+41
197+00:01:19,775 --> 00:01:21,775
198+or stretch to hundreds of clusters
199+
200+42
201+00:01:21,775 --> 00:01:24,500
202+for going hyperscale with THOUSANDS of servers...
203+
204+43
205+00:01:24,500 --> 00:01:27,000
206+say, if you wanted to build your OWN cloudzilla!
207+
208+44
209+00:01:27,000 --> 00:01:28,775
210+And if you think THAT'S magic...
211+
212+45
213+00:01:28,775 --> 00:01:30,500
214+Wait 'til you add a little Juju!
215+
216+46
217+00:01:30,500 --> 00:01:32,225
218+It has these things called CHARMS
219+
220+47
221+00:01:32,225 --> 00:01:34,225
222+that configure and connect services anywhere.
223+
224+48
225+00:01:34,225 --> 00:01:36,000
226+Even on your MAAS metal !
227+
228+49
229+00:01:36,000 --> 00:01:37,225
230+So you can deploy amazingly
231+
232+50
233+00:01:37,225 --> 00:01:38,775
234+complex clusters in minutes
235+
236+51
237+00:01:38,775 --> 00:01:40,225
238+with MAAS and Juju.
239+
240+52
241+00:01:40,225 --> 00:01:41,775
242+Forget compromise....
243+
244+53
245+00:01:41,775 --> 00:01:42,500
246+MAAS gives you
247+
248+54
249+00:01:42,500 --> 00:01:45,225
250+the power of metal at the SPEED of the cloud...
251+
252+55
253+00:01:45,225 --> 00:01:47,775
254+See how fast you can set up some Metal of your own...
255+
256+56
257+00:01:47,775 --> 00:01:49,775
258+starting at Ubuntu dot com.
259+
260
261=== added file 'material/en/media/what_is_maas-thumb.jpg'
262Binary files material/en/media/what_is_maas-thumb.jpg 1970-01-01 00:00:00 +0000 and material/en/media/what_is_maas-thumb.jpg 2013-01-19 01:04:21 +0000 differ
263=== modified file 'po/fr.po'
264--- po/fr.po 2013-01-11 05:12:42 +0000
265+++ po/fr.po 2013-01-19 01:04:21 +0000
266@@ -7,10 +7,11 @@
267 msgstr ""
268 "Project-Id-Version: Advocacy Development Kit 0.1\n"
269 "Report-Msgid-Bugs-To: \n"
270-"POT-Creation-Date: 2012-12-14 13:41+0000\n"
271+"POT-Creation-Date: 2012-12-13 17:42\n"
272 "PO-Revision-Date: 2013-01-10 12:01+0000\n"
273 "Last-Translator: gisele perreault <Unknown>\n"
274 "Language-Team: LANGUAGE <LL@li.org>\n"
275+"Language: \n"
276 "MIME-Version: 1.0\n"
277 "Content-Type: text/plain; charset=UTF-8\n"
278 "Content-Transfer-Encoding: 8bit\n"
279@@ -35,8 +36,8 @@
280 #: ../adk/adk.rst:14
281 msgid ""
282 "If you find a problem in the ADK, such as broken pages, types, or other "
283-"issues, please `report it by clicking here "
284-"<https://bugs.launchpad.net/ubuntu-adk/+filebug>`_."
285+"issues, please `report it by clicking here <https://bugs.launchpad.net/"
286+"ubuntu-adk/+filebug>`_."
287 msgstr ""
288 "Si vous rencontrez un problème dans l'ADK comme des pages cassées, des "
289 "fautes d'orthographe ou d'autres problèmes, s'il vous plait signalez-le-nous "
290@@ -104,8 +105,7 @@
291
292 #: ../adk/adk-documentation.rst:15
293 msgid "To get started, you will need a few tools installed::"
294-msgstr ""
295-"Pour commencer, vous aurez besoin d'avoir quelques outils installés::"
296+msgstr "Pour commencer, vous aurez besoin d'avoir quelques outils installés::"
297
298 #: ../adk/adk-documentation.rst:19
299 msgid "Now get the source of the ADK::"
300@@ -174,8 +174,7 @@
301 msgstr "Voici quelques conseils pour écrire du contenu intéressant :"
302
303 #: ../adk/adk-documentation.rst:55
304-msgid ""
305-"First ask yourself the question \"is this content going to be generally"
306+msgid "First ask yourself the question \"is this content going to be generally"
307 msgstr ""
308
309 #: ../adk/adk-documentation.rst:55
310@@ -224,10 +223,9 @@
311
312 #: ../adk/adk-documentation.rst:70
313 msgid ""
314-"Content in the ADK is written using `reStructuredText "
315-"<http://en.wikipedia.org/wiki/ReStructuredText>`_. This is a simple "
316-"formatting style that lets you write your content and easily format it as "
317-"you write it."
318+"Content in the ADK is written using `reStructuredText <http://en.wikipedia."
319+"org/wiki/ReStructuredText>`_. This is a simple formatting style that lets "
320+"you write your content and easily format it as you write it."
321 msgstr ""
322
323 #: ../adk/adk-documentation.rst:74
324@@ -347,41 +345,18 @@
325 msgstr ""
326
327 #: ../adk/index.rst:19
328-msgid "Who Is This Kit For?"
329+msgid "Navigating The Kit"
330 msgstr ""
331
332 #: ../adk/index.rst:21
333 msgid ""
334-"This kit is designed for *anyone* who wants to advocate, share, and spread "
335-"the word about Ubuntu."
336-msgstr ""
337-
338-#: ../adk/index.rst:24
339-msgid ""
340-"Although many people gather together in LoCo Teams to advocate Ubuntu "
341-"together, you *don't have to join a LoCo Team* to help advocate Ubuntu. We "
342-"typically recommend joining a LoCo Team as it can be a lot of fun, but it is "
343-"certainly not a requirement."
344-msgstr ""
345-
346-#: ../adk/index.rst:29
347-msgid "If you want to share Ubuntu with others, this kit is for you!"
348-msgstr ""
349-"Si vous souhaitez partager Ubuntu avec d'autres, ce kit est fait pour vous !"
350-
351-#: ../adk/index.rst:32
352-msgid "Navigating The Kit"
353-msgstr ""
354-
355-#: ../adk/index.rst:34
356-msgid ""
357 "At the top of the page you can see the main sections available. This is what "
358 "they provide:"
359 msgstr ""
360 "En haut de la page, vous pouvez voir les principales sections disponibles. "
361 "Voici ce qu'elles fournissent :"
362
363-#: ../adk/index.rst:38
364+#: ../adk/index.rst:25
365 msgid ""
366 "`Documentation <./documentation.html>`_ - a wide range of guidance, "
367 "information"
368@@ -389,71 +364,44 @@
369 "`Documentation <./documentation.html>`_ - Un large éventail de conseils, "
370 "d'informations"
371
372-#: ../adk/index.rst:38
373+#: ../adk/index.rst:25
374 msgid ""
375 "and expertise about how to advocate Ubuntu and spread the word, and how to "
376 "join, create, and organize Ubuntu LoCo Teams."
377 msgstr ""
378
379-#: ../adk/index.rst:41
380+#: ../adk/index.rst:28
381 msgid ""
382 "`Materials <./materials.html>`_ - a wide range of high-quality logos, "
383 "posters,"
384 msgstr ""
385
386-#: ../adk/index.rst:41
387+#: ../adk/index.rst:28
388 msgid ""
389 "and other content available at your finger tips to perform your advocacy "
390 "with."
391 msgstr ""
392
393-#: ../adk/index.rst:43
394-msgid "`About <./adk.html>`_ - general information about the Ubuntu Advocacy"
395-msgstr ""
396-
397-#: ../adk/index.rst:44
398-msgid "Development Kit and how to contribute to the kit."
399-msgstr ""
400-
401-#: ../adk/index.rst:46
402+#: ../adk/index.rst:30
403+msgid "`About <./adk.html>`_ - general information about the *Ubuntu Advocacy"
404+msgstr ""
405+
406+#: ../adk/index.rst:31
407+msgid "Development Kit* and how to contribute to the kit."
408+msgstr ""
409+
410+#: ../adk/index.rst:33
411 msgid ""
412 "`Ask a Question <http://www.askubuntu.com//questions/ask?tags=locoteams>`_ - "
413 "a direct"
414 msgstr ""
415
416-#: ../adk/index.rst:46
417+#: ../adk/index.rst:33
418 msgid ""
419 "link to ask a question on *Ask Ubuntu*; our primary resource for asking and "
420 "answering questions."
421 msgstr ""
422
423-#: ../adk/index.rst:50
424-msgid ""
425-"`Answer a Question "
426-"<http://askubuntu.com/questions/tagged/locoteams?sort=unanswered>`_ - a "
427-"direct"
428-msgstr ""
429-
430-#: ../adk/index.rst:49
431-msgid ""
432-"link to questions from community members that you might be able to answer."
433-msgstr ""
434-"lien vers les questions des membres de la communauté auxquelles vous "
435-"pourriez être en mesure de répondre."
436-
437-#: ../adk/index.rst:52
438-msgid ""
439-"We ship this kit in other formats as well which are suitable for offline "
440-"usage:"
441-msgstr ""
442-
443-#: ../adk/index.rst:54
444-msgid ""
445-"You can also download the kit in `PDF "
446-"<../../../AdvocacyDevelopmentKit.pdf.gz>`_ and `ePub "
447-"<../../../AdvocacyDevelopmentKit.epub.gz>`_ format."
448-msgstr ""
449-
450 #: ../adk/locoteams-activities.rst:3
451 msgid "Activities For LoCo Teams"
452 msgstr "Activités pour les équipes LoCo"
453@@ -582,13 +530,11 @@
454 "some of the shipment expenses."
455 msgstr ""
456
457-#: ../adk/locoteams-activities.rst:89
458-#: ../adk/locoteams-creating.rst:217
459-#: ../adk/locoteams-joining.rst:58
460-#: ../adk/locoteams-running.rst:78
461+#: ../adk/locoteams-activities.rst:89 ../adk/locoteams-creating.rst:217
462+#: ../adk/locoteams-joining.rst:58 ../adk/locoteams-running.rst:78
463 msgid ""
464-"Have more more questions? Be sure to `ask them on Ask Ubuntu "
465-"<http://www.askubuntu.com//questions/ask?tags=locoteams>`_!"
466+"Have more more questions? Be sure to `ask them on Ask Ubuntu <http://www."
467+"askubuntu.com//questions/ask?tags=locoteams>`_!"
468 msgstr ""
469
470 #: ../adk/locoteams-creating.rst:3
471@@ -645,9 +591,9 @@
472
473 #: ../adk/locoteams-creating.rst:33
474 msgid ""
475-"Each LoCo team is intended to support all variants of "
476-"Ubuntu/Kubuntu/Edubuntu etc. If you want to set up a specific group for a "
477-"derivative, you should do it as part of an existing ubuntu-* team."
478+"Each LoCo team is intended to support all variants of Ubuntu/Kubuntu/"
479+"Edubuntu etc. If you want to set up a specific group for a derivative, you "
480+"should do it as part of an existing ubuntu-* team."
481 msgstr ""
482
483 #: ../adk/locoteams-creating.rst:37
484@@ -825,21 +771,21 @@
485
486 #: ../adk/locoteams-creating.rst:125
487 msgid ""
488-"First `register your nickname "
489-"<http://freenode.net/faq.shtml#userregistration>`_."
490+"First `register your nickname <http://freenode.net/faq."
491+"shtml#userregistration>`_."
492 msgstr ""
493
494 #: ../adk/locoteams-creating.rst:126
495 msgid ""
496 "Now `create your channel <http://wiki.ubuntu.com/IrcTeam/CreatingChannels>`_ "
497-"(named according to the `channel naming guidelines "
498-"<http://wiki.ubuntu.com/IrcTeam/ChannelNaming>`_"
499+"(named according to the `channel naming guidelines <http://wiki.ubuntu.com/"
500+"IrcTeam/ChannelNaming>`_"
501 msgstr ""
502
503 #: ../adk/locoteams-creating.rst:127
504 msgid ""
505-"Please ensure that `channel coordination "
506-"<http://wiki.ubuntu.com/IrcTeam/Coordination>`_ is made as easy as possible."
507+"Please ensure that `channel coordination <http://wiki.ubuntu.com/IrcTeam/"
508+"Coordination>`_ is made as easy as possible."
509 msgstr ""
510
511 #: ../adk/locoteams-creating.rst:129
512@@ -866,8 +812,8 @@
513 msgid ""
514 "The ScribesTeam (#ubuntu-scribes on freenode) is a team dedicated to making "
515 "your meeting note's more understandable to the general community. When you "
516-"have a meeting coming up please see "
517-"https://wiki.ubuntu.com/ScribesTeam/SubmitMeeting to get it summarized."
518+"have a meeting coming up please see https://wiki.ubuntu.com/ScribesTeam/"
519+"SubmitMeeting to get it summarized."
520 msgstr ""
521
522 #: ../adk/locoteams-creating.rst:144
523@@ -887,9 +833,9 @@
524 "When starting your team, we recommend you create a page on wiki.ubuntu.com "
525 "which can act as your homepage. See the excellent `MassachusettsTeam "
526 "<https://wiki.ubuntu.com/MassachusettsTeam>`_ page for an example a great "
527-"looking page. Ensure you use a sensible name for the page such as "
528-"http://wiki.ubuntu.com/UKTeam for the UK team or "
529-"https://wiki.ubuntu.com/AustralianTeam for the Australian team."
530+"looking page. Ensure you use a sensible name for the page such as http://"
531+"wiki.ubuntu.com/UKTeam for the UK team or https://wiki.ubuntu.com/"
532+"AustralianTeam for the Australian team."
533 msgstr ""
534
535 #: ../adk/locoteams-creating.rst:158
536@@ -1002,12 +948,11 @@
537 #: ../adk/locoteams-creating.rst:207
538 msgid ""
539 "The LoCo Team Portal should do its magic and have your team available for "
540-"sharing. For more on the LoCo Team Portal, `click here "
541-"<http://loco.ubuntu.com/about/>`_."
542+"sharing. For more on the LoCo Team Portal, `click here <http://loco.ubuntu."
543+"com/about/>`_."
544 msgstr ""
545
546-#: ../adk/locoteams-creating.rst:212
547-#: ../adk/locoteams-joining.rst:53
548+#: ../adk/locoteams-creating.rst:212 ../adk/locoteams-joining.rst:53
549 #: ../adk/locoteams-running.rst:72
550 msgid "Discover More"
551 msgstr ""
552@@ -1018,8 +963,7 @@
553 "LoCo Team active."
554 msgstr ""
555
556-#: ../adk/locoteams-creating.rst:215
557-#: ../adk/locoteams-joining.rst:56
558+#: ../adk/locoteams-creating.rst:215 ../adk/locoteams-joining.rst:56
559 #: ../adk/locoteams-running.rst:74
560 msgid ""
561 ":doc:`LoCo Team Activities<./locoteams-activities>` - learn the different "
562@@ -1064,8 +1008,8 @@
563
564 #: ../adk/locoteams-joining.rst:25
565 msgid ""
566-"To find a team to join, visit `http://loco.ubuntu.com/teams/ "
567-"<http://loco.ubuntu.com/teams/>`_"
568+"To find a team to join, visit `http://loco.ubuntu.com/teams/ <http://loco."
569+"ubuntu.com/teams/>`_"
570 msgstr ""
571
572 #: ../adk/locoteams-joining.rst:27
573@@ -1080,8 +1024,8 @@
574 "To join the team, simply join the team's mailing list or IRC channel and say "
575 "you would like to get involved. You are sure to get a warm welcome by the "
576 "team and you are all set to go. There is no payment or initiation to go "
577-"through, just talking and being with the team is considered being a member! "
578-":)"
579+"through, just talking and being with the team is considered being a "
580+"member! :)"
581 msgstr ""
582
583 #: ../adk/locoteams-joining.rst:38
584@@ -1254,17 +1198,15 @@
585 msgid ""
586 "All of these logos are available as `.svg` files. These files are fully "
587 "scalable and can be re-sized as large or small as needed without losing "
588-"quality. You can use `Inkscape "
589-"<https://apps.ubuntu.com/cat/applications/inkscape/>`_ to load and use these "
590-"files when creating your own content."
591+"quality. You can use `Inkscape <https://apps.ubuntu.com/cat/applications/"
592+"inkscape/>`_ to load and use these files when creating your own content."
593 msgstr ""
594
595 #: ../adk/materials-logos.rst:12
596-#: ../adk/materials-media.rst:15
597 msgid ""
598-"Please remember to follow the `Brand Guidelines "
599-"<http://design.ubuntu.com/assets/ubuntu-logo>`_ and `Trademark Policy "
600-"<http://www.ubuntu.com/aboutus/trademarkpolicy>`_ when using these logos."
601+"Please remember to follow the `Brand Guidelines <http://design.ubuntu.com/"
602+"assets/ubuntu-logo>`_ and `Trademark Policy <http://www.ubuntu.com/aboutus/"
603+"trademarkpolicy>`_ when using these logos."
604 msgstr ""
605
606 #: ../adk/materials-logos.rst:15
607@@ -1279,20 +1221,20 @@
608
609 #: ../adk/materials-logos.rst:24
610 msgid ""
611-":download:`Download <../material/en/logos/logo-ubuntu_no_trademarksign-"
612-"orange-hex1.svg>`"
613+":download:`Download <../material/en/logo-ubuntu_no_trademarksign-orange-hex1."
614+"svg>`"
615 msgstr ""
616
617 #: ../adk/materials-logos.rst:29
618 msgid ""
619-":download:`Download <../material/en/logos/logo-ubuntu_no_trademarksign-"
620+":download:`Download <../material/en/logo-ubuntu_no_trademarksign-"
621 "black_orange-hex.svg>`"
622 msgstr ""
623
624 #: ../adk/materials-logos.rst:31
625 msgid ""
626-"`Find more Ubuntu logos here "
627-"<http://design.ubuntu.com/downloads?metadata=element-logo+brand-ubuntu>`_"
628+"`Find more Ubuntu logos here <http://design.ubuntu.com/downloads?"
629+"metadata=element-logo+brand-ubuntu>`_"
630 msgstr ""
631
632 #: ../adk/materials-logos.rst:34
633@@ -1300,7 +1242,7 @@
634 msgstr "Kubuntu"
635
636 #: ../adk/materials-logos.rst:39
637-msgid ":download:`Download <../material/en/logos/kubuntu-logo.svg>`"
638+msgid ":download:`Download <../material/en/kubuntu-logo.svg>`"
639 msgstr ""
640
641 #: ../adk/materials-logos.rst:42
642@@ -1308,69 +1250,7 @@
643 msgstr "Edubuntu"
644
645 #: ../adk/materials-logos.rst:47
646-msgid ":download:`Download <../material/en/logos/edubuntu-logo.svg>`"
647-msgstr ""
648-
649-#: ../adk/materials-media.rst:3
650-msgid "DVD Media Art"
651-msgstr ""
652-
653-#: ../adk/materials-media.rst:5
654-msgid ""
655-"Below are the front, back, and disc covers for our current releases of "
656-"Ubuntu."
657-msgstr ""
658-
659-#: ../adk/materials-media.rst:7
660-msgid ""
661-"You can use this artwork to print out your own covers for distributing "
662-"Ubuntu to others."
663-msgstr ""
664-
665-#: ../adk/materials-media.rst:10
666-msgid ""
667-"All of these logos are available as PDF files. These files are fully "
668-"scalable and can be re-sized as large or small as needed without losing "
669-"quality. You can use `Inkscape "
670-"<https://apps.ubuntu.com/cat/applications/inkscape/>`_ to load and use these "
671-"files when creating your own content."
672-msgstr ""
673-
674-#: ../adk/materials-media.rst:19
675-msgid "Ubuntu 12.10 Desktop"
676-msgstr "Bureau Ubuntu 12.10"
677-
678-#: ../adk/materials-media.rst:23
679-#: ../adk/materials-media.rst:34
680-msgid "**Download**:"
681-msgstr ""
682-
683-#: ../adk/materials-media.rst:25
684-msgid ":download:`Front Cover <../material/en/media/desktop-front.pdf>`"
685-msgstr ""
686-
687-#: ../adk/materials-media.rst:26
688-msgid ":download:`Back Cover <../material/en/media/desktop-back.pdf>`"
689-msgstr ""
690-
691-#: ../adk/materials-media.rst:27
692-msgid ":download:`Disc Art <../material/en/media/desktop-disc.pdf>`"
693-msgstr ""
694-
695-#: ../adk/materials-media.rst:30
696-msgid "Ubuntu 12.10 Server"
697-msgstr "Ubuntu 12.10 Serveur"
698-
699-#: ../adk/materials-media.rst:36
700-msgid ":download:`Front Cover <../material/en/media/server-front.pdf>`"
701-msgstr ":download:`Couverture <../material/en/media/server-front.pdf>`"
702-
703-#: ../adk/materials-media.rst:37
704-msgid ":download:`Back Cover <../material/en/media/server-back.pdf>`"
705-msgstr ""
706-
707-#: ../adk/materials-media.rst:38
708-msgid ":download:`Disc Art <../material/en/media/server-disc.pdf>`"
709+msgid ":download:`Download <../material/en/edubuntu-logo.svg>`"
710 msgstr ""
711
712 #: ../adk/posters.rst:3
713@@ -1388,3 +1268,23 @@
714 #: ../adk/posters.rst:9
715 msgid ":download:`The Ubuntu logo <../material/en/logo-ubuntu.svg>`"
716 msgstr ""
717+
718+#~ msgid "If you want to share Ubuntu with others, this kit is for you!"
719+#~ msgstr ""
720+#~ "Si vous souhaitez partager Ubuntu avec d'autres, ce kit est fait pour "
721+#~ "vous !"
722+
723+#~ msgid ""
724+#~ "link to questions from community members that you might be able to answer."
725+#~ msgstr ""
726+#~ "lien vers les questions des membres de la communauté auxquelles vous "
727+#~ "pourriez être en mesure de répondre."
728+
729+#~ msgid "Ubuntu 12.10 Desktop"
730+#~ msgstr "Bureau Ubuntu 12.10"
731+
732+#~ msgid "Ubuntu 12.10 Server"
733+#~ msgstr "Ubuntu 12.10 Serveur"
734+
735+#~ msgid ":download:`Front Cover <../material/en/media/server-front.pdf>`"
736+#~ msgstr ":download:`Couverture <../material/en/media/server-front.pdf>`"

Subscribers

People subscribed via source and target branches