On Fri, 2010-06-25 at 16:26 -0500, Sijis Aviles wrote:
> On Fri, Jun 11, 2010 at 5:12 PM, Ian MacGregor <ardchoille42@xxxxxxxxx> wrote:
> > Currently the "Join Fedora" link at http://fedoraproject.org/ points to:
> > http://fedoraproject.org/en/join-fedora and that page is almost empty.
> >
> > I think it should point to http://fedoraproject.org/wiki/Join as that
> > page is much better. So I have attached a patch to this email. The patch
> > makes one change to fedoraproject.org/data/templates/sidebar.html
> > --
> > Regards,
> > Rev. Dr. Ian MacGregor
> > http://fedoraproject.org/wiki/User:Ardchoille42
> >
> > --
> > websites mailing list
> > websites@xxxxxxxxxxxxxxxxxxxxxxx
> > https://admin.fedoraproject.org/mailman/listinfo/websites
> >
>
> This is what i think, on how to fix this:
>
> 1. make the page more engaging
> 2. point it to wiki/Join (patch submitted)
> 3. point to wiki/Join and fix en/join-fedora in the meantime
>
> I like option #3.
>
> I spoke with Ian and he's going to work on beautifying join-fedora
> page, based on what's on wiki/Join.
>
> I think in the meantime it's a good idea to apply this patch and point
> it to the wiki/Join page. if i don't hear any responses, i'll apply
> the changes Sunday.
>
> Sijis
Attached to this email are two patches:
patches01.patch = changes to data/content/join-fedora.html
patches02.patch = changes to po/fedora-web.pot
These changes involve re-populating en/join-fedora with the content in
wiki/Join . I verified these changes (make en test) and everything looks
good here, so this is one step closer to implementing option #3 as
stated in sijis' email above.
--
Regards,
Rev. Dr. Ian MacGregor
http://fedoraproject.org/wiki/User:Ardchoille42
diff --git a/fedoraproject.org/data/content/join-fedora.html b/fedoraproject.org/data/content/join-fedora.html
index 639c12a..90b4a0c 100644
--- a/fedoraproject.org/data/content/join-fedora.html
+++ b/fedoraproject.org/data/content/join-fedora.html
@@ -14,26 +14,492 @@
<div id="subprojects">
<p>${Markup(_('If you want to take an active hand in making Fedora even better, there are many ways to help. What role do you want to fill?'))}</p>
<p><strong>${Markup(_('Click on a role below to learn more about how you can help the Fedora Project.'))}</strong></p>
- <ul class="roles">
- <li>
- ${Markup(_('<a href="http://fedoraproject.org/wiki/Join#ContentWriter"><img src="%s/%s/static/images/ContentDeveloper.png" alt="Content Writer"><br>Content Writer</a>') % (path, lang))}
- </li>
- <li>
- ${Markup(_('<a href="http://fedoraproject.org/wiki/Join#Designer"><img src="%s/%s/static/images/Designer.png" alt="Designer"><br>Designer</a>') % (path, lang))}
- </li>
- <li>
- ${Markup(_('<a href="http://fedoraproject.org/wiki/Join#PeoplePerson"><img src="%s/%s/static/images/PeoplePerson.png" alt="People Person"><br>People Person</a>') % (path, lang))}
- </li>
- <li>
- ${Markup(_('<a href="http://fedoraproject.org/wiki/Join#OSDeveloper"><img src="%s/%s/static/images/OSDeveloper.png" alt="OS Developer"><br>OS Developer</a>') % (path, lang))}
- </li>
- <li>
- ${Markup(_('<a href="http://fedoraproject.org/wiki/Join#Translator"><img src="%s/%s/static/images/Translator.png" alt="Translator"><br>Translator</a>') % (path, lang))}
- </li>
- <li>
- ${Markup(_('<a href="http://fedoraproject.org/wiki/Join#WebDeveloperAdministrator"><img src="%s/%s/static/images/WebDeveloper.png" alt="Web Developer or Administrator"><br>Web Developer<br>or Administrator</a>') % (path, lang))}
- </li>
- </ul>
+<table class="wikitable" cellspacing="0" cellpadding="5" width="100%" style="background:#eeeeff;border:5px solid white;text-align:center;">
+<tr>
+<td valign="TOP" width="33%" style="border:5px solid white;">
+<p><a href="#Content_Writer" title="#Content Writer"><img alt="" src="/static/images/ContentDeveloper.png" width="86" height="86" border="0" /></a>
+</p><p><a href="#Content_Writer" title=""> Content Writer</a>
+</p>
+</td><td valign="TOP" width="33%" style="border:5px solid white;">
+<p><a href="#Designer" title="#Designer"><img alt="" src="/static/images/Designer.png" width="86" height="86" border="0" /></a>
+</p><p><a href="#Designer" title=""> Designer</a>
+</p>
+</td><td valign="TOP" width="33%" style="border:5px solid white;">
+<p><a href="#People_Person" title="#People Person"><img alt="" src="/static/images/PeoplePerson.png" width="86" height="86" border="0" /></a>
+</p><p><a href="#People_Person" title=""> People Person</a>
+</p>
+</td></tr>
+<tr>
+<td valign="TOP" width="33%" style="border:5px solid white;">
+<p><a href="#OS_Developer" title="#OS Developer"><img alt="" src="/static/images/OSDeveloper.png" width="86" height="86" border="0" /></a>
+</p><p><a href="#OS_Developer" title=""> OS Developer</a>
+</p>
+</td><td valign="TOP" width="33%" style="border:5px solid white;">
+<p><a href="#Translator" title="#Translator"><img alt="" src="/static/images/Translator.png" width="86" height="86" border="0" /></a>
+</p><p><a href="#Translator" title=""> Translator</a>
+</p>
+</td><td valign="TOP" width="33%" style="border:5px solid white;">
+<p><a href="#Web_Developer_or_Administrator" title="#Web Developer or Administrator"><img alt="" src="/static/images/WebDeveloper.png" width="86" height="86" border="0" /></a>
+</p><p><a href="#Web_Developer_or_Administrator" title=""> Web Developer or Administrator</a>
+</p>
+</td></tr></table>
+<div class="messagebox" style="background-color: #f9f6b7; border: 1px solid #c4c295; color: black; padding: 5px; margin: 1ex 0; min-height: 35px; padding-left: 5px;">
+<div><b>This is a starting point.</b><br />There are many ways to participate in Fedora, this page is just a beginning spot.</div>
+</div>
+<p>Financial contributions are discussed on the <a href="/wiki/Contribute" title="Contribute">Contribute</a> page.
+</p><p>Making changes to the Fedora wiki is discussed on the <a href="/wiki/WikiEditing" title="WikiEditing" class="mw-redirect"> wiki editing</a> page.
+</p><p><br />
+<span id="ContentWriter"></span>
+</p>
+<a name="Content_Writer" id="Content_Writer"></a><h2><span class="mw-headline"> Content Writer </span></h2>
+<p><a href="/wiki/File:Join_ContentDeveloper.png" class="image" title="Image:Join_ContentDeveloper.png"><img alt="Image:Join_ContentDeveloper.png" src="/static/images/ContentDeveloper.png" width="86" height="86" border="0" /></a>
+</p><p><b>Description of this role:</b> Communicate through words.
+</p><p><b>Skills you possess or want to learn</b>:
+</p>
+<ul><li> Writing, editing, grammar (wordsmith), technical, explaining complex ideas well, teaching, Doc``Book, XML, Wiki markup, technical knowledge (specific and general)
+</li></ul>
+<p><b>Examples of where and how you can contribute in this role</b>:
+</p>
+<ul><li><i>Remember that you have complete freedom to do less, more or different tasks in the many projects and teams. Only your imagination sets the limits.</i>
+</li></ul>
+<table>
+
+<tr style="color: #fff; background-color: #3074c2;">
+<td> <b>Team/Project</b> </td><td> <b>Example tasks</b><br />
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Artwork" title="Artwork">Artwork</a>
+</p>
+</td><td>
+<ul><li> write tutorials and articles for the use of the FOSS creative tools available in Fedora.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/DocsProject" title="DocsProject" class="mw-redirect">Docs</a>
+</p>
+</td><td>
+<ul><li> write documents, guides, how-tos, FAQs, marketing material, process/methodology docs, release notes.
+</li><li> write content in the knowledgebase (kbase) and on this Wiki.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/NewsProject" title="NewsProject">News</a>
+</p>
+</td><td>
+<ul><li> write content for the <a href="https://fedoraproject.org/wiki/FWN/LatestIssue"; class="external text" title="https://fedoraproject.org/wiki/FWN/LatestIssue";>Fedora Weekly News</a> which is published every week via <a href="https://admin.fedoraproject.org/mailman/listinfo/announce"; class="external text" title="https://admin.fedoraproject.org/mailman/listinfo/announce";>fedora-announce-list</a> and <a href="https://admin.fedoraproject.org/mailman/listinfo/news"; class="external text" title="https://admin.fedoraproject.org/mailman/listinfo/news";>fedora-news-list</a>.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts SIG</a>
+</p>
+</td><td>
+<ul><li> document font creation tasks,
+</li><li> document free/libre font release best practices,
+</li><li> document free/libre font packaging,
+</li><li> clarify, complete and improve our wiki,
+</li><li> identify interesting third-party material, and link it here,
+</li><li> convert wiki information to other document formats.
+</li><li> convince foundries to release fonts under a free/libre Fedora-friendly <a href="/wiki/Legal_considerations_for_fonts" title="Legal considerations for fonts"> license</a>,
+</li><li> recruit possible free/libre font authors,
+</li><li> recruit new SIG members,
+</li><li> <a href="/wiki/Category:Fonts_and_text_QA" title="Category:Fonts and text QA">get</a> font or text problems fixed,
+</li><li> improve the SIG visibility by getting it linked and quoted everywhere,
+</li><li> identify font or text <a href="/wiki/Fonts_and_text_quality_assurance" title="Fonts and text quality assurance" class="mw-redirect"> problems</a> in applications and libraries,
+</li><li> improve font package descriptions and summaries to help users choose the right fonts for their needs.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/SIGs/Games" title="SIGs/Games">Games SIG</a>
+</p>
+</td><td>
+<ul><li> document the available games, including wiki documentation and listing in comps.xml.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Usability" title="Usability">Usability SIG</a>
+</p>
+</td><td>
+<ul><li> write documentation about usability.
+</li></ul>
+</td></tr></table>
+<p><b>Teams/projects supporting or supported by this role</b>:
+</p>
+<ul><li> <a href="/wiki/Docs_Project" title="Docs Project">Docs</a>, <a href="/wiki/Marketing" title="Marketing">Marketing</a>, <a href="/wiki/L10N" title="L10N"> Localization (L10n)</a>, <a href="/wiki/NewsProject" title="NewsProject">News</a>
+</li></ul>
+<a name="Designer" id="Designer"></a><h2><span class="mw-headline"> Designer </span></h2>
+<p><a href="/wiki/File:Join_Designer.png" class="image" title="Image:Join_Designer.png"><img alt="Image:Join_Designer.png" src="/static/images/Designer.png" width="86" height="86" border="0" /></a>
+</p><p><b>Description of this role:</b> Communicate through images.
+</p><p><b>Skills you possess or want to learn</b>:
+</p>
+<ul><li> Ink scape, GIMP, OO.org, design, usability/interaction
+</li></ul>
+<p><b>Examples of where and how you can contribute in this role</b>:
+</p>
+<ul><li><i>Remember that you have complete freedom to do less, more or different tasks in the many projects and teams. Only your imagination sets the limits.</i>
+</li></ul>
+<table>
+
+<tr style="color: #fff; background-color: #3074c2;">
+<td> <b>Team/Project</b> </td><td> <b>Example tasks</b><br />
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Artwork" title="Artwork">Artwork</a>
+</p>
+</td><td>
+<ul><li> serve as a part of a design firm for the Fedora community, creating artwork and designs to for the Fedora community on request.<br />
+</li><li> design projects including: <a href="/wiki/Logo" title="Logo">Fedora Logo</a>, <a href="/wiki/Artwork/MarketingCollateral" title="Artwork/MarketingCollateral" class="mw-redirect"> MarketingCollateral</a>, <a href="/wiki/Artwork/PromoBanners" title="Artwork/PromoBanners"> PromoBanners</a>, <a href="/wiki/Artwork/Widgets" title="Artwork/Widgets"> Widgets</a>, <a href="/wiki/Artwork/ThemingOverview" title="Artwork/ThemingOverview"> Theming Overview</a>, <a href="https://fedorahosted.org/bluecurve"; class="external text" title="https://fedorahosted.org/bluecurve";>Bluecurve Icon Theme</a>, <a href="/wiki/Artwork/EchoIconTheme" title="Artwork/EchoIconTheme"> Echo Icon Theme</a>, <a href="/wiki/Artwork/MediaArt" title="Artwork/MediaArt" class="mw-redirect"> MediaArt</a>, <a href="/wiki/SummerOfCode/Posters" title="SummerOfCode/Posters" class="mw-redirect"> SoC Posters</a>, <a href="/wiki/Artwork/T-Shirt" title="Artwork/T-Shirt"> T-Shirt Design</a>, <a href="/wiki/Artwork/Gallery" title="Artwork/Gallery"> Media Gallery</a>
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts SIG</a>
+</p>
+</td><td>
+<ul><li> <a href="/wiki/Category:Font_wishlist" title="Category:Font wishlist">find</a> the best fonts to include, to please <a href="/wiki/Category:Decorative_fonts" title="Category:Decorative fonts"> artists</a>,
+</li><li> <a href="/wiki/PackageMaintainers/WishList#General_Fedora_Packages_WishList" title="PackageMaintainers/WishList" class="mw-redirect">identify</a> font creation tools needing packaging,
+</li><li> <a href="/wiki/Fonts_and_text-related_creative_tasks#font-creation" title="Fonts and text-related creative tasks">create and improve</a> Fedora fonts,
+</li><li> <a href="/wiki/Fonts_SIG_mailing_lists" title="Fonts SIG mailing lists">propose</a> good Fedora fonts defaults.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Usability" title="Usability">Usability SIG</a>
+</p>
+</td><td>
+<ul><li> improve end-user experience with coherent, accessible and intuitive design for Fedora.
+</li></ul>
+</td></tr></table>
+<p><b>Teams/projects supporting or supported by this role</b>:
+</p>
+<ul><li> <a href="/wiki/Artwork" title="Artwork">Artwork</a>, <a href="/wiki/DocsProject" title="DocsProject" class="mw-redirect">Docs</a>, <a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts</a>, <a href="/wiki/Marketing" title="Marketing">Marketing</a>, <a href="/wiki/Usability" title="Usability">Usability</a>, <a href="/wiki/Websites" title="Websites">Websites</a>
+</li></ul>
+<p><br />
+<span id="OSDeveloper"></span>
+</p>
+<a name="OS_Developer" id="OS_Developer"></a><h2><span class="mw-headline"> OS Developer </span></h2>
+<p><a href="/wiki/File:Join_OSDeveloper.png" class="image" title="Image:Join_OSDeveloper.png"><img alt="Image:Join_OSDeveloper.png" src="/static/images/OSDeveloper.png" width="86" height="86" border="0" /></a>
+</p><p><br />
+<b>Description of this role:</b> Communicate through code.
+</p><p><b>Skills you possess or want to learn</b>:
+</p>
+<ul><li> Programming, RPM/Packaging, Bugfiling
+</li></ul>
+<p><b>Examples of where and how you can contribute in this role</b>:
+</p>
+<ul><li><i>Remember that you have complete freedom to do less, more or different tasks in the many projects and teams. Only your imagination sets the limts.</i>
+</li></ul>
+<table>
+
+<tr style="color: #fff; background-color: #3074c2;">
+<td> <b>Team/Project</b> </td><td> <b>Example tasks</b><br />
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/BugZappers" title="BugZappers">Bug triage</a>
+</p>
+</td><td>
+<ul><li> track down and shoot Fedora bugs in <a href="https://bugzilla.redhat.com"; class="external text" title="https://bugzilla.redhat.com";>bugzilla.redhat.com</a>.
+</li><li> strive to be a bridge between users and developers that aids in fixing and closing bugs.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Infrastructure" title="Infrastructure">Infrastructure</a>
+</p>
+</td><td>
+<ul><li> help to provide servers, tools and utilities for the Fedora Project.
+</li><li> create new applications to make development of Fedora go smoother.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/I18N" title="I18N">Internationalization (I18n)</a>
+</p>
+</td><td>
+<ul><li> develop, package, and maintain applications like input methods for different languages.
+</li><li> improve applications and utilities to support and process different languages.4
+</li><li> quality-assure that existing applications meet i18n standards.
+</li><li> support the infrastructure of the Fedora translation community.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/PackageMaintainers/Join" title="PackageMaintainers/Join" class="mw-redirect">Packaging</a>
+</p>
+</td><td>
+<ul><li> become a package maintainer to create and maintain RPM packages for software in Fedora.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Websites" title="Websites">Websites</a>
+</p>
+</td><td>
+<ul><li> improve Fedora's image and create the best possible interface for users and contributors on the Internet.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts SIG</a>
+</p>
+</td><td>
+<ul><li> <a href="/wiki/Category:Fonts_packaging" title="Category:Fonts packaging">package</a> new <a href="/wiki/Category:Font_wishlist" title="Category:Font wishlist">fonts</a> and font tools,
+</li><li> <a href="/wiki/Category:In-progress_fonts" title="Category:In-progress fonts">review</a> font packages before Fedora inclusion,
+</li><li> fix font or text <a href="/wiki/Fonts_and_text_quality_assurance" title="Fonts and text quality assurance" class="mw-redirect"> problems</a> in applications and libraries,
+</li><li> <a href="/wiki/Fonts_SIG_mailing_lists" title="Fonts SIG mailing lists">propose</a> good Fedora fonts defaults,
+</li><li> identify font or text <a href="/wiki/Fonts_and_text_quality_assurance" title="Fonts and text quality assurance" class="mw-redirect"> problems</a> in applications and libraries,
+</li><li> improve font package descriptions and summaries to help users choose the right fonts for their needs.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/SIGs/Games" title="SIGs/Games">Games SIG</a>
+</p>
+</td><td>
+<ul><li> create high quality packages of games, gaming-related libraries, and game development tools.
+</li><li> help and fix bugs that have been filed against game packages.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Category:SciTech_SIG" title="Category:SciTech SIG">Science and Technology SIG</a>
+</p>
+</td><td>
+<ul><li> improve the number and quality of packages available for scientific and technical users
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Usability" title="Usability">Usability SIG</a>
+</p>
+</td><td>
+<ul><li> improve end-user experience with coherent, accessible and intuitive interfaces for Fedora.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="https://fedoraproject.org/wiki/ElectronicLab_Spin"; class="external text" title="https://fedoraproject.org/wiki/ElectronicLab_Spin";>Electronic Lab</a>
+</p>
+</td><td>
+<ul><li> Ensure Electronic design flows (Analog, Digital, Embedded,...)
+</li><li> Work with upstream to ensure new design and simulation features.
+</li><li> Package <a href="http://spins.fedoraproject.org/fel/"; class="external text" title="http://spins.fedoraproject.org/fel/";>new tools and close tickets</a>.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/QA" title="QA">Testing</a>
+</p>
+</td><td>
+<ul><li> test/break Fedora.
+</li><li> do quality assurances to help maintain a robust platform for Fedora.
+</li></ul>
+</td></tr></table>
+<p><b>Teams/projects supporting or supported by this role</b>:
+</p>
+<ul><li> <a href="/wiki/BugZappers" title="BugZappers">Bug triage</a>, <a href="/wiki/DocsProject" title="DocsProject" class="mw-redirect">Docs</a>, <a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts</a>, <a href="/wiki/I18N" title="I18N">Internationalization (I18n)</a>, <a href="/wiki/Infrastructure" title="Infrastructure">Infrastructure</a>, <a href="/wiki/PackageMaintainers/Join" title="PackageMaintainers/Join" class="mw-redirect">Packaging</a>, <a href="/wiki/QA" title="QA">Testing</a>, <a href="/wiki/Usability" title="Usability">Usability</a>, <a href="/wiki/Websites" title="Websites">Websites</a>.
+</li></ul>
+<p><br />
+<span id="PeoplePerson"></span>
+</p>
+<a name="People_Person" id="People_Person"></a><h2><span class="mw-headline"> People Person </span></h2>
+<p><a href="/wiki/File:Join_PeoplePerson.png" class="image" title="Image:Join_PeoplePerson.png"><img alt="Image:Join_PeoplePerson.png" src="/static/images/PeoplePerson.png" width="86" height="86" border="0" /></a>
+</p><p><b>Description of this role:</b> Communicate through one-on-one contact.
+</p><p><b>Skills you possess or want to learn</b>:
+</p>
+<ul><li> People skills, event organization, customer service/support, enthusiasm
+</li></ul>
+<p><b>Examples of where and how you can contribute in this role</b>:
+</p>
+<ul><li><i>Remember that you have complete freedom to do less, more or different tasks in the many projects and teams. Only your imagination sets the limts.</i>
+</li></ul>
+<table>
+
+<tr style="color: #fff; background-color: #3074c2;">
+<td> <b>Team/Project</b> </td><td> <b>Example tasks</b><br />
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Ambassadors" title="Ambassadors">Ambassadors</a>
+</p>
+</td><td>
+<ul><li> represent Fedora Project to the wider public.
+</li><li> help spread the word about Fedora, Linux, and Open Source.
+</li><li> be a point of contact for local community members and channel the feedback to Fedora Project.
+</li><li> help recruit project contributors.
+</li><li> think of creative ways for promoting Fedora in your region
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts SIG</a>
+</p>
+</td><td>
+<ul><li> convince foundries to release fonts under a free/libre Fedora-friendly <a href="/wiki/Legal_considerations_for_fonts" title="Legal considerations for fonts"> license</a>,
+</li><li> recruit possible free/libre font authors,
+</li><li> recruit new SIG members,
+</li><li> <a href="/wiki/Category:Fonts_and_text_QA" title="Category:Fonts and text QA">get</a> font or text problems fixed,
+</li><li> improve the SIG visibility by getting it linked and quoted everywhere.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/SIGs/Games" title="SIGs/Games">Games SIG</a>
+</p>
+</td><td>
+<ul><li> seek publicity for games in Fedora.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Distribution/FreeMedia" title="Distribution/FreeMedia" class="mw-redirect">Free Media</a>
+</p>
+</td><td>
+<ul><li> help the Fedora Free Media Program to distribute Fedora Core media (DVDs) for free to individuals.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Marketing" title="Marketing">Marketing</a>
+</p>
+</td><td>
+<ul><li> develop marketing strategy to promote the usage and support of Fedora worldwide.
+</li><li> support the efforts of other Fedora projects to spread Fedora and help provide a central repository of ideas and information that can be used to deliver Fedora to new audiences.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Mentors" title="Mentors">Mentoring</a>
+</p>
+</td><td>
+<ul><li> become a mentor in the Fedora community and help, empower and mentor people in your area of expertise.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Communicate" title="Communicate" class="mw-redirect">Support/help</a>
+</p>
+</td><td>
+<ul><li> provide help and support on mailing lists and in Fedora IRC channels on Freenode.
+</li><li> provide Feedback to Developers about bugs.
+</li></ul>
+</td></tr></table>
+<p><b>Teams/projects supporting or supported by this role</b>:
+</p>
+<ul><li> <a href="/wiki/Ambassadors" title="Ambassadors">Ambassadors</a>, <a href="/wiki/Distribution/FreeMedia" title="Distribution/FreeMedia" class="mw-redirect">Free Media</a> / <a href="/wiki/Distribution/Project" title="Distribution/Project">Distribution</a>, <a href="/wiki/Marketing" title="Marketing">Marketing</a>, <a href="/wiki/Mentors" title="Mentors">Mentoring</a>, <a href="/wiki/Communicate" title="Communicate" class="mw-redirect">Support/help</a>
+</li></ul>
+<p><span id="Translator"></span>
+</p>
+<a name="Translator_--_.28Click_to_Join_L10n_.28Localization.29.29" id="Translator_--_.28Click_to_Join_L10n_.28Localization.29.29"></a><h2><span class="mw-headline"> Translator -- (Click to Join <a href="/wiki/L10N" title="L10N">L10n (Localization)</a>)</span></h2>
+<p><a href="/wiki/File:Join_Translator.png" class="image" title="Image:Join_Translator.png"><img alt="Image:Join_Translator.png" src="/static/images/Translator.png" width="86" height="86" border="0" /></a>
+</p><p><b>Description of this role:</b> Communicate through translation.
+</p><p><b>Skills you possess or want to learn</b>:
+</p>
+<ul><li> English, Non-English native language, technical knowledge, diff, PO, translation, babel tool (kbabel, etc.)
+</li></ul>
+<p><b>Examples of where and how you can contribute in this role</b>:
+</p>
+<ul><li><i>Remember that you have complete freedom to do less, more or different tasks in the many projects and teams. Only your imagination sets the limts.</i>
+</li></ul>
+<table>
+
+<tr style="color: #fff; background-color: #3074c2;">
+<td> <b>Team/Project</b> </td><td> <b>Example tasks</b><br />
+</td></tr>
+<tr>
+<td>
+<p>Work with <a href="/wiki/I18N" title="I18N">I18n (internationalization)</a>
+</p>
+</td><td>
+<ul><li> develop, package, and maintain applications like input methods for different languages.<br />
+</li><li> improve applications and utilities to support and process different languages.<br />
+</li><li> quality-assure that existing applications meet i18n standards.<br />
+</li><li> support the infrastructure of the translation project <a href="/wiki/L10N" title="L10N">L10n</a>.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p>Work with <a href="/wiki/PackageMaintainers/Join" title="PackageMaintainers/Join" class="mw-redirect">OS Developer (Packaging)</a>
+</p>
+</td><td>
+<ul><li> translate the software to your native language.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p>Work with <a href="/wiki/Category:Fonts_SIG" title="Category:Fonts SIG">Fonts SIG</a>
+</p>
+</td><td>
+<ul><li> <a href="/wiki/Category:Font_wishlist" title="Category:Font wishlist">find</a> the best fonts to include, for <a href="/wiki/Category:International_fonts" title="Category:International fonts"> internationalization</a> reasons,
+</li><li> <a href="/wiki/Localization_fonts_requirements" title="Localization fonts requirements"> document</a> the preferred fonts for your locale,
+</li><li> improve the way a font supports your script by identifying problems and <a href="/wiki/Fonts_and_text_quality_assurance" title="Fonts and text quality assurance" class="mw-redirect">proposing</a> ameliorations,
+</li><li> <a href="/wiki/Fonts_SIG_mailing_lists" title="Fonts SIG mailing lists">propose</a> good Fedora fonts defaults,
+</li><li> identify font or text <a href="/wiki/Fonts_and_text_quality_assurance" title="Fonts and text quality assurance" class="mw-redirect"> problems</a> in applications and libraries,
+</li><li> improve font package descriptions and summaries to help users choose the right fonts for their needs,
+</li><li> convince foundries to release fonts under a free/libre Fedora-friendly <a href="/wiki/Legal_considerations_for_fonts" title="Legal considerations for fonts"> license</a>,
+</li><li> recruit possible free/libre font authors,
+</li><li> recruit new SIG members,
+</li><li> <a href="/wiki/Category:Fonts_and_text_QA" title="Category:Fonts and text QA">get</a> font or text problems fixed,
+</li><li> improve the SIG visibility by getting it linked and quoted everywhere,
+</li><li> document font creation tasks,
+</li><li> document free/libre font release best practices,
+</li><li> document free/libre font packaging,
+</li><li> clarify, complete and improve our wiki,
+</li><li> identify interesting third-party material, and link it here,
+</li><li> convert wiki information to other document formats.
+</li></ul>
+</td></tr></table>
+<p><b>Teams/projects supporting or supported by this role</b>:
+</p>
+<ul><li> <a href="/wiki/Ambassadors" title="Ambassadors">Ambassadors</a>, <a href="/wiki/DocsProject" title="DocsProject" class="mw-redirect">Docs</a>, <a href="/wiki/L10N" title="L10N">L10n (localization)</a>, <a href="/wiki/I18N" title="I18N">I18n (internationalization)</a>, <a href="/wiki/PackageMaintainers/Join" title="PackageMaintainers/Join" class="mw-redirect">OS Developer (Packaging)</a>
+</li></ul>
+<p><br />
+<span id="WebDeveloperAdministrator"></span>
+</p>
+<a name="Web_Developer_or_Administrator" id="Web_Developer_or_Administrator"></a><h2><span class="mw-headline"> Web Developer or Administrator </span></h2>
+<p><a href="/wiki/File:Join_WebDeveloper.png" class="image" title="Image:Join_WebDeveloper.png"><img alt="Image:Join_WebDeveloper.png" src="/static/images/WebDeveloper.png" width="86" height="86" border="0" /></a>
+</p><p><b>Description of this role:</b> Communicate through the World Wide Web.
+</p><p><b>Skills you possess or want to learn</b>:
+</p>
+<ul><li> Python, XML/XHTML, CSS, XSL/XSLT, TurboGears, Web app development, Linux system administration
+</li></ul>
+<p><b>Examples of where and how you can contribute in this role</b>:
+</p>
+<ul><li><i>Remember that you have complete freedom to do less, more or different tasks in the many projects and teams. Only your imagination sets the limits.</i>
+</li></ul>
+<table>
+
+<tr style="color: #fff; background-color: #3074c2;">
+<td> <b>Team/Project</b> </td><td> <b>Example tasks</b><br />
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Infrastructure" title="Infrastructure">Infrastructure</a>
+</p>
+</td><td>
+<ul><li> become one of the dedicated volunteers and professionals who provide servers, tools and utilities for the Fedora Project.
+</li><li> track down and shoot bugs on the Fedora websites.
+</li></ul>
+</td></tr>
+<tr>
+<td>
+<p><a href="/wiki/Websites" title="Websites">Websites</a>
+</p>
+</td><td>
+<ul><li> improve Fedora's image and to create the best possible web interface for users and contributors on the Internet.
+</li></ul>
+</td></tr></table>
+<p><b>Teams/projects supporting or supported by this role</b>:
+</p>
+<ul><li> <a href="/wiki/DocsProject" title="DocsProject" class="mw-redirect">Docs</a>, <a href="/wiki/I18N" title="I18N">I18n (internationalization)</a>, <a href="/wiki/Infrastructure" title="Infrastructure">Infrastructure</a>, <a href="/wiki/Marketing" title="Marketing">Marketing</a>, <a href="/wiki/Websites" title="Websites">Websites</a>
+</li></ul>
</div>
</body>
</html>
diff --git a/fedoraproject.org/po/fedora-web.pot b/fedoraproject.org/po/fedora-web.pot
index 99b610e..b9e77f7 100644
--- a/fedoraproject.org/po/fedora-web.pot
+++ b/fedoraproject.org/po/fedora-web.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2010-05-25 00:19-0400\n"
+"POT-Creation-Date: 2010-06-25 16:36-0700\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@xxxxxx>\n"
@@ -65,6 +65,24 @@ msgid ""
"instructions</a> instead."
msgstr ""
+#: data/totranslate.py:8
+msgid ""
+"http://docs.fedoraproject.org/en-";
+"US/Fedora/13/html/Installation_Guide/index.html"
+msgstr ""
+
+#: data/totranslate.py:9
+msgid ""
+"http://docs.fedoraproject.org/en-";
+"US/Fedora/13/html/Installation_Quick_Start_Guide/index.html"
+msgstr ""
+
+#: data/totranslate.py:10
+msgid ""
+"http://docs.fedoraproject.org/en-";
+"US/Fedora/13/html/Release_Notes/index.html"
+msgstr ""
+
#: data/content/contact.html:7
msgid "Contact - Fedora Project"
msgstr ""
@@ -331,7 +349,7 @@ msgstr ""
#: data/content/get-fedora-all.html:112 data/content/get-fedora-all.html:113
#: data/content/get-fedora-all.html:119 data/content/get-fedora-all.html:120
#: data/content/get-fedora-all.html:126 data/content/get-fedora-all.html:127
-#: data/content/get-fedora-kde.html:37 data/content/get-fedora.html:39
+#: data/content/get-fedora-kde.html:37 data/content/get-fedora.html:48
#: data/content/get-prerelease.html:75 data/content/get-prerelease.html:76
#: data/content/get-prerelease.html:82 data/content/get-prerelease.html:83
msgid "Live CD"
@@ -361,15 +379,19 @@ msgstr ""
msgid "See all custom spins"
msgstr ""
-#: data/content/get-fedora-all.html:139 data/content/get-fedora-kde.html:73
+#: data/content/get-fedora-all.html:137
+msgid "See old versions of Fedora"
+msgstr ""
+
+#: data/content/get-fedora-all.html:140 data/content/get-fedora-kde.html:73
msgid "Slow Internet? No Internet?"
msgstr ""
-#: data/content/get-fedora-all.html:140 data/content/get-fedora-kde.html:74
+#: data/content/get-fedora-all.html:141 data/content/get-fedora-kde.html:74
msgid "Get a copy of Fedora Media sent via postal mail."
msgstr ""
-#: data/content/get-fedora-all.html:142 data/content/get-fedora-kde.html:76
+#: data/content/get-fedora-all.html:143 data/content/get-fedora-kde.html:76
msgid ""
"Purchase installation media for Fedora from <a name=\"media\" "
"href=\"http://fedoraproject.org/wiki/Distribution/OnlineVendors\";>online "
@@ -378,7 +400,7 @@ msgid ""
"vendor</a> in your area."
msgstr ""
-#: data/content/get-fedora-all.html:143 data/content/get-fedora-kde.html:77
+#: data/content/get-fedora-all.html:144 data/content/get-fedora-kde.html:77
msgid ""
"Can't afford the price of installation media? Request Fedora installation"
" media from the <a "
@@ -386,7 +408,7 @@ msgid ""
" Media Program</a>."
msgstr ""
-#: data/content/get-fedora-all.html:145 data/content/get-fedora-kde.html:80
+#: data/content/get-fedora-all.html:146 data/content/get-fedora-kde.html:80
msgid ""
"When you place an order with a <a "
"href=\"http://fedoraproject.org/wiki/Distribution/SponsoredMedia\";>participating"
@@ -402,7 +424,6 @@ msgid "Show me all download options in one page!"
msgstr ""
#: data/content/get-fedora-kde.html:17 data/content/get-fedora-options.html:20
-#: data/content/get-fedora.html:31
msgid "There's More Fedora!"
msgstr ""
@@ -425,26 +446,11 @@ msgstr ""
msgid "Resources"
msgstr ""
-#: data/content/get-fedora-kde.html:30 data/content/get-fedora-options.html:27
-#: data/content/get-fedora.html:25
-msgid ""
-"http://docs.fedoraproject.org/en-";
-"US/Fedora/13/html/Installation_Guide/index.html"
-msgstr ""
-
#: data/content/get-fedora-kde.html:30
msgid "Fedora 13 Installation Guide"
msgstr ""
#: data/content/get-fedora-kde.html:31 data/content/get-fedora-kde.html:51
-#: data/content/get-fedora-options.html:28 data/content/get-fedora.html:26
-#: data/content/index.html:15
-msgid ""
-"http://docs.fedoraproject.org/en-";
-"US/Fedora/13/html/Release_Notes/index.html"
-msgstr ""
-
-#: data/content/get-fedora-kde.html:31 data/content/get-fedora-kde.html:51
msgid "Fedora 13 Release Notes"
msgstr ""
@@ -475,20 +481,20 @@ msgid ""
msgstr ""
#: data/content/get-fedora-kde.html:43 data/content/get-fedora-kde.html:63
-#: data/content/get-fedora-options.html:75
-#: data/content/get-fedora-options.html:80
-#: data/content/get-fedora-options.html:105
-#: data/content/get-fedora-options.html:110
-#: data/content/get-fedora-options.html:135
-#: data/content/get-fedora-options.html:140
-#: data/content/get-fedora-options.html:165
-#: data/content/get-fedora-options.html:170
-#: data/content/get-fedora-options.html:188
-#: data/content/get-fedora-options.html:194
-#: data/content/get-fedora-options.html:204
-#: data/content/get-fedora-options.html:210
-#: data/content/get-fedora-options.html:241
-#: data/content/get-fedora-options.html:251 data/content/get-fedora.html:42
+#: data/content/get-fedora-options.html:78
+#: data/content/get-fedora-options.html:83
+#: data/content/get-fedora-options.html:108
+#: data/content/get-fedora-options.html:113
+#: data/content/get-fedora-options.html:138
+#: data/content/get-fedora-options.html:143
+#: data/content/get-fedora-options.html:168
+#: data/content/get-fedora-options.html:173
+#: data/content/get-fedora-options.html:191
+#: data/content/get-fedora-options.html:197
+#: data/content/get-fedora-options.html:207
+#: data/content/get-fedora-options.html:213
+#: data/content/get-fedora-options.html:244
+#: data/content/get-fedora-options.html:254 data/content/get-fedora.html:51
#: data/content/index.html:26
msgid "Download Now!"
msgstr ""
@@ -542,192 +548,192 @@ msgstr ""
msgid "Get it here"
msgstr ""
-#: data/content/get-fedora-options.html:24 data/content/get-fedora.html:22
+#: data/content/get-fedora-options.html:24 data/content/get-fedora.html:28
msgid "Handy Resources"
msgstr ""
-#: data/content/get-fedora-options.html:26 data/content/get-fedora.html:24
-msgid ""
-"http://docs.fedoraproject.org/en-";
-"US/Fedora/13/html/Installation_Quick_Start_Guide/index.html"
-msgstr ""
-
-#: data/content/get-fedora-options.html:26 data/content/get-fedora.html:24
+#: data/content/get-fedora-options.html:26 data/content/get-fedora.html:30
msgid "Installation Quickstart Guide"
msgstr ""
-#: data/content/get-fedora-options.html:27 data/content/get-fedora.html:25
+#: data/content/get-fedora-options.html:27 data/content/get-fedora.html:31
msgid "Installation Guide"
msgstr ""
-#: data/content/get-fedora-options.html:28 data/content/get-fedora.html:26
+#: data/content/get-fedora-options.html:28 data/content/get-fedora.html:32
msgid "Release Notes"
msgstr ""
-#: data/content/get-fedora-options.html:29 data/content/get-fedora.html:27
+#: data/content/get-fedora-options.html:29 data/content/get-fedora.html:33
msgid "Upgrading Fedora"
msgstr ""
-#: data/content/get-fedora-options.html:30 data/content/get-fedora.html:28
+#: data/content/get-fedora-options.html:30 data/content/get-fedora.html:34
msgid "Help & Support"
msgstr ""
-#: data/content/get-fedora-options.html:31 data/content/get-fedora.html:29
+#: data/content/get-fedora-options.html:31 data/content/get-fedora.html:35
msgid "Verify Download"
msgstr ""
-#: data/content/get-fedora-options.html:35
-msgid "Looking for older release?"
+#: data/content/get-fedora-options.html:35 data/content/get-fedora.html:37
+msgid "Other ways to get Fedora"
msgstr ""
-#: data/content/get-fedora-options.html:36
-msgid "Older Fedora releases are available in our release archive at:"
+#: data/content/get-fedora-options.html:36 data/content/get-fedora.html:38
+msgid ""
+"We offer several alternative Fedora download methods for advanced users, "
+"including torrents:"
+msgstr ""
+
+#: data/content/get-fedora-options.html:38 data/content/get-fedora.html:40
+msgid "All download methods"
msgstr ""
-#: data/content/get-fedora-options.html:45 data/content/get-fedora.html:51
+#: data/content/get-fedora-options.html:48 data/content/get-fedora.html:60
msgid "Desktops"
msgstr ""
-#: data/content/get-fedora-options.html:46
+#: data/content/get-fedora-options.html:49
msgid "Architecture"
msgstr ""
-#: data/content/get-fedora-options.html:47 data/content/get-fedora.html:49
+#: data/content/get-fedora-options.html:50 data/content/get-fedora.html:58
msgid "Formats"
msgstr ""
-#: data/content/get-fedora-options.html:48
+#: data/content/get-fedora-options.html:51
msgid "Activities"
msgstr ""
-#: data/content/get-fedora-options.html:55
+#: data/content/get-fedora-options.html:58
msgid "Fedora Desktops"
msgstr ""
-#: data/content/get-fedora-options.html:56
+#: data/content/get-fedora-options.html:59
msgid ""
"There are multiple desktops available for use with Fedora. Each has a "
"slightly different look and feel and offers varying levels of "
"customization. Desktops affect how windows, icons, menus, and various "
"basic desktop interfaces look and feel. You may want to try a few "
-"different ones and figure out which ones is best for you!"
+"different ones and figure out which one is best for you!"
msgstr ""
-#: data/content/get-fedora-options.html:58
-#: data/content/get-fedora-options.html:186
-#: data/content/get-fedora-options.html:202
+#: data/content/get-fedora-options.html:61
+#: data/content/get-fedora-options.html:189
+#: data/content/get-fedora-options.html:205
msgid "Fedora 13 Desktop Edition"
msgstr ""
-#: data/content/get-fedora-options.html:58
+#: data/content/get-fedora-options.html:61
msgid "Fedora Default"
msgstr ""
-#: data/content/get-fedora-options.html:62
-#: data/content/get-fedora-options.html:92
-#: data/content/get-fedora-options.html:122
-#: data/content/get-fedora-options.html:152
-#: data/content/get-fedora-options.html:187
-#: data/content/get-fedora-options.html:193
-#: data/content/get-fedora-options.html:224
-#: data/content/get-fedora-options.html:233
-#: data/content/get-fedora-options.html:258
+#: data/content/get-fedora-options.html:65
+#: data/content/get-fedora-options.html:95
+#: data/content/get-fedora-options.html:125
+#: data/content/get-fedora-options.html:155
+#: data/content/get-fedora-options.html:190
+#: data/content/get-fedora-options.html:196
+#: data/content/get-fedora-options.html:227
+#: data/content/get-fedora-options.html:236
+#: data/content/get-fedora-options.html:261
msgid "32-bit PC Edition"
msgstr ""
-#: data/content/get-fedora-options.html:64
+#: data/content/get-fedora-options.html:67
msgid "The GNOME-based default Fedora Desktop."
msgstr ""
-#: data/content/get-fedora-options.html:66
+#: data/content/get-fedora-options.html:69
msgid "Fedora Desktop spin homepage"
msgstr ""
-#: data/content/get-fedora-options.html:67
+#: data/content/get-fedora-options.html:70
msgid "GNOME.org website"
msgstr ""
-#: data/content/get-fedora-options.html:74
-#: data/content/get-fedora-options.html:104
-#: data/content/get-fedora-options.html:134
-#: data/content/get-fedora-options.html:164
-#: data/content/get-fedora-options.html:238
+#: data/content/get-fedora-options.html:77
+#: data/content/get-fedora-options.html:107
+#: data/content/get-fedora-options.html:137
+#: data/content/get-fedora-options.html:167
+#: data/content/get-fedora-options.html:241
msgid "32-bit"
msgstr ""
-#: data/content/get-fedora-options.html:76
-#: data/content/get-fedora-options.html:81
-#: data/content/get-fedora-options.html:106
-#: data/content/get-fedora-options.html:111
-#: data/content/get-fedora-options.html:136
-#: data/content/get-fedora-options.html:141
-#: data/content/get-fedora-options.html:166
-#: data/content/get-fedora-options.html:171
-#, python-format
-msgid "%s CD ISO"
-msgstr ""
-
#: data/content/get-fedora-options.html:79
+#: data/content/get-fedora-options.html:84
#: data/content/get-fedora-options.html:109
+#: data/content/get-fedora-options.html:114
#: data/content/get-fedora-options.html:139
+#: data/content/get-fedora-options.html:144
#: data/content/get-fedora-options.html:169
-#: data/content/get-fedora-options.html:248
+#: data/content/get-fedora-options.html:174
+#, python-format
+msgid "%s CD ISO"
+msgstr ""
+
+#: data/content/get-fedora-options.html:82
+#: data/content/get-fedora-options.html:112
+#: data/content/get-fedora-options.html:142
+#: data/content/get-fedora-options.html:172
+#: data/content/get-fedora-options.html:251
msgid "64-bit"
msgstr ""
-#: data/content/get-fedora-options.html:88
+#: data/content/get-fedora-options.html:91
msgid "Fedora 13 KDE Spin"
msgstr ""
-#: data/content/get-fedora-options.html:94
+#: data/content/get-fedora-options.html:97
msgid "KDE-based Fedora desktop."
msgstr ""
-#: data/content/get-fedora-options.html:96
+#: data/content/get-fedora-options.html:99
msgid "Fedora KDE Spin homepage"
msgstr ""
-#: data/content/get-fedora-options.html:97
+#: data/content/get-fedora-options.html:100
msgid "KDE.org website"
msgstr ""
-#: data/content/get-fedora-options.html:118
+#: data/content/get-fedora-options.html:121
msgid "Fedora 13 LXDE Spin"
msgstr ""
-#: data/content/get-fedora-options.html:124
+#: data/content/get-fedora-options.html:127
msgid "LXDE-based Fedora desktop."
msgstr ""
-#: data/content/get-fedora-options.html:126
+#: data/content/get-fedora-options.html:129
msgid "Fedora LXDE Spin homepage"
msgstr ""
-#: data/content/get-fedora-options.html:127
+#: data/content/get-fedora-options.html:130
msgid "LXDE.org website"
msgstr ""
-#: data/content/get-fedora-options.html:148
+#: data/content/get-fedora-options.html:151
msgid "Fedora 13 XFCE Spin"
msgstr ""
-#: data/content/get-fedora-options.html:154
+#: data/content/get-fedora-options.html:157
msgid "XFCE-based Fedora desktop."
msgstr ""
-#: data/content/get-fedora-options.html:156
+#: data/content/get-fedora-options.html:159
msgid "Fedora XFCE Spin homepage"
msgstr ""
-#: data/content/get-fedora-options.html:157
+#: data/content/get-fedora-options.html:160
msgid "XFCE.org website"
msgstr ""
-#: data/content/get-fedora-options.html:180
+#: data/content/get-fedora-options.html:183
msgid "Fedora Downloads by Architecture"
msgstr ""
-#: data/content/get-fedora-options.html:181
+#: data/content/get-fedora-options.html:184
msgid ""
"Not sure which of these architectures are right for you? Need help "
"figuring out what a particular computer's architecture is? We've <a "
@@ -735,108 +741,108 @@ msgid ""
"users.html#sn-which-arch\">got a helpful guide</a>."
msgstr ""
-#: data/content/get-fedora-options.html:183
-#: data/content/get-fedora-options.html:199
+#: data/content/get-fedora-options.html:186
+#: data/content/get-fedora-options.html:202
msgid "PC-Compatible"
msgstr ""
-#: data/content/get-fedora-options.html:183
+#: data/content/get-fedora-options.html:186
msgid " 32-bit"
msgstr ""
-#: data/content/get-fedora-options.html:183
-#: data/content/get-fedora-options.html:241
+#: data/content/get-fedora-options.html:186
+#: data/content/get-fedora-options.html:244
msgid "Most Compatible"
msgstr ""
-#: data/content/get-fedora-options.html:184
+#: data/content/get-fedora-options.html:187
msgid ""
"Because they run on both 32-bit and 64-bit Intel and AMD-compatible PCs, "
"the 32-bit PC-compatible versions of Fedora are the most versatile."
msgstr ""
-#: data/content/get-fedora-options.html:187
-#: data/content/get-fedora-options.html:203
+#: data/content/get-fedora-options.html:190
+#: data/content/get-fedora-options.html:206
msgid "Bootable Live Media version of Fedora's default desktop."
msgstr ""
-#: data/content/get-fedora-options.html:189
-#: data/content/get-fedora-options.html:205
+#: data/content/get-fedora-options.html:192
+#: data/content/get-fedora-options.html:208
#, python-format
msgid "%s, CD ISO disc image for %s-bit PC"
msgstr ""
-#: data/content/get-fedora-options.html:192
-#: data/content/get-fedora-options.html:208
-#: data/content/get-fedora-options.html:232
+#: data/content/get-fedora-options.html:195
+#: data/content/get-fedora-options.html:211
+#: data/content/get-fedora-options.html:235
msgid "Fedora 13 DVD"
msgstr ""
-#: data/content/get-fedora-options.html:193
-#: data/content/get-fedora-options.html:209
+#: data/content/get-fedora-options.html:196
+#: data/content/get-fedora-options.html:212
msgid "Close to 4 GB of Fedora goodness in an installable DVD ISO image."
msgstr ""
-#: data/content/get-fedora-options.html:195
-#: data/content/get-fedora-options.html:211
+#: data/content/get-fedora-options.html:198
+#: data/content/get-fedora-options.html:214
#, python-format
msgid "%s, DVD ISO disc image for %s-bit PC"
msgstr ""
-#: data/content/get-fedora-options.html:199
+#: data/content/get-fedora-options.html:202
msgid " 64-bit"
msgstr ""
-#: data/content/get-fedora-options.html:200
+#: data/content/get-fedora-options.html:203
msgid ""
"Harness the full power of your 64-bit Intel or AMD-compatible PC. Go "
"64-bit."
msgstr ""
-#: data/content/get-fedora-options.html:203
-#: data/content/get-fedora-options.html:209
+#: data/content/get-fedora-options.html:206
+#: data/content/get-fedora-options.html:212
msgid "64-bit PC Edition"
msgstr ""
-#: data/content/get-fedora-options.html:215
+#: data/content/get-fedora-options.html:218
msgid "SPARC"
msgstr ""
-#: data/content/get-fedora-options.html:216
+#: data/content/get-fedora-options.html:219
#, python-format
msgid ""
"Limited support for SPARC systems is available through <a href=\"%s\">the"
" Fedora SPARC team</a>"
msgstr ""
-#: data/content/get-fedora-options.html:221
+#: data/content/get-fedora-options.html:224
msgid "Fedora Downloads by Formats"
msgstr ""
-#: data/content/get-fedora-options.html:223
+#: data/content/get-fedora-options.html:226
msgid "Fedora 13 Live Media / Spins"
msgstr ""
-#: data/content/get-fedora-options.html:225
+#: data/content/get-fedora-options.html:228
msgid ""
"Fedora Live Media images may be used via bootable CD, DVD, or USB drives,"
" and also may be used to install Fedora to hard disk. They are a great "
"way to give Fedora a try, low-risk."
msgstr ""
-#: data/content/get-fedora-options.html:226
+#: data/content/get-fedora-options.html:229
msgid "Get Fedora now"
msgstr ""
-#: data/content/get-fedora-options.html:227
+#: data/content/get-fedora-options.html:230
msgid "A directory of alternate Fedora images called Spins may be found at:"
msgstr ""
-#: data/content/get-fedora-options.html:229
+#: data/content/get-fedora-options.html:232
msgid "Go to Spins Directory"
msgstr ""
-#: data/content/get-fedora-options.html:234
+#: data/content/get-fedora-options.html:237
msgid ""
"The DVD edition of Fedora is not Live Media, but it is bootable. When "
"you boot from this media, you will be running the installation program. "
@@ -845,33 +851,33 @@ msgid ""
"Fedora is not connected to the Internet."
msgstr ""
-#: data/content/get-fedora-options.html:237
-#: data/content/get-fedora-options.html:247
+#: data/content/get-fedora-options.html:240
+#: data/content/get-fedora-options.html:250
msgid "Intel & AMD / PC compatible"
msgstr ""
-#: data/content/get-fedora-options.html:242
+#: data/content/get-fedora-options.html:245
#, python-format
msgid "%s ISO disk image for 32-bit PC"
msgstr ""
-#: data/content/get-fedora-options.html:252
+#: data/content/get-fedora-options.html:255
#, python-format
msgid "%s ISO disk image for 64-bit PC"
msgstr ""
-#: data/content/get-fedora-options.html:255
+#: data/content/get-fedora-options.html:258
msgid ""
"For help determining what architecture your system is, <a "
"href=\"http://docs.fedoraproject.org/install-guide/f13/en-US/html/ch-new-";
"users.html#sn-which-arch\">please view our architecture help guide</a>."
msgstr ""
-#: data/content/get-fedora-options.html:257
+#: data/content/get-fedora-options.html:260
msgid "Fedora 13 Media by Mail"
msgstr ""
-#: data/content/get-fedora-options.html:259
+#: data/content/get-fedora-options.html:262
#, python-format
msgid ""
"Slow internet? No internet? You can get a copy of Fedora media sent via "
@@ -879,92 +885,130 @@ msgid ""
"href=\"%s\">Fedora Free Media</a> program."
msgstr ""
-#: data/content/get-fedora-options.html:260
+#: data/content/get-fedora-options.html:263
msgid "Purchase Fedora Media from a Vendor"
msgstr ""
-#: data/content/get-fedora-options.html:263
+#: data/content/get-fedora-options.html:266
msgid "Locate a Vendor in Your Area"
msgstr ""
-#: data/content/get-fedora-options.html:264
+#: data/content/get-fedora-options.html:267
msgid ""
"Select vendors worldwide carry copies of Fedora media at a reasonable "
"price. If a vendor exists in your area and you'd rather not wait for "
"shipping, this may be a good option for you."
msgstr ""
-#: data/content/get-fedora-options.html:265
+#: data/content/get-fedora-options.html:268
msgid "View Local Vendor Directory"
msgstr ""
-#: data/content/get-fedora-options.html:268
+#: data/content/get-fedora-options.html:271
msgid "Online Vendors"
msgstr ""
-#: data/content/get-fedora-options.html:269
+#: data/content/get-fedora-options.html:272
msgid ""
"Numerous vendors worldwide offer Fedora media for online purchase. Select"
" the vendor closest to you to keep your shipping costs lower."
msgstr ""
-#: data/content/get-fedora-options.html:270
+#: data/content/get-fedora-options.html:273
msgid "View Online Vendor Directory"
msgstr ""
-#: data/content/get-fedora-options.html:273
+#: data/content/get-fedora-options.html:276
msgid "Fedora Free Media Program"
msgstr ""
-#: data/content/get-fedora-options.html:274
+#: data/content/get-fedora-options.html:277
msgid ""
"Can't afford the price of installation media? Request Fedora installation"
" media from the Fedora Free Media Program."
msgstr ""
-#: data/content/get-fedora-options.html:275
+#: data/content/get-fedora-options.html:278
msgid "Learn More"
msgstr ""
-#: data/content/get-fedora-options.html:280
+#: data/content/get-fedora-options.html:283
msgid "Fedoras that do what you need."
msgstr ""
+#: data/content/get-fedora-options.html:284
+msgid ""
+"Fedora spins are alternate versions of Fedora, tailored for various types"
+" of users via hand-picked application sets and other customizations."
+msgstr ""
+
+#: data/content/get-fedora-options.html:284
+msgid "Learn more about spins >"
+msgstr ""
+
#: data/content/get-fedora-options.html:285
-msgid "Security analysis tools."
+msgid "Below is just a sampling of the Fedora spins that are available. Visit "
msgstr ""
#: data/content/get-fedora-options.html:285
-#: data/content/get-fedora-options.html:289
-#: data/content/get-fedora-options.html:293
-#: data/content/get-fedora-options.html:297
-#: data/content/get-fedora-options.html:301
+msgid " for a full listing of all available Fedora spins."
+msgstr ""
+
+#: data/content/get-fedora-options.html:290
+msgid "Fedora Security Lab"
+msgstr ""
+
+#: data/content/get-fedora-options.html:290
+msgid "Security analysis tools."
+msgstr ""
+
+#: data/content/get-fedora-options.html:290
+#: data/content/get-fedora-options.html:294
+#: data/content/get-fedora-options.html:298
+#: data/content/get-fedora-options.html:302
+#: data/content/get-fedora-options.html:306
msgid "More details at spins.fedoraproject.org >"
msgstr ""
-#: data/content/get-fedora-options.html:289
+#: data/content/get-fedora-options.html:294
+msgid "Sugar on a Stick"
+msgstr ""
+
+#: data/content/get-fedora-options.html:294
msgid "Discover. Reflect. Share. Learn."
msgstr ""
-#: data/content/get-fedora-options.html:293
+#: data/content/get-fedora-options.html:298
+msgid "Fedora Design Suite"
+msgstr ""
+
+#: data/content/get-fedora-options.html:298
msgid "Open Creativity."
msgstr ""
-#: data/content/get-fedora-options.html:297
+#: data/content/get-fedora-options.html:302
+msgid "Fedora Games Spin"
+msgstr ""
+
+#: data/content/get-fedora-options.html:302
msgid "A perfect show-case of the best games available in Fedora."
msgstr ""
-#: data/content/get-fedora-options.html:301
+#: data/content/get-fedora-options.html:306
+msgid "Fedora Electronic Lab"
+msgstr ""
+
+#: data/content/get-fedora-options.html:306
msgid "Fedora's high-end hardware design and simulation platform."
msgstr ""
-#: data/content/get-fedora-options.html:305
+#: data/content/get-fedora-options.html:310
msgid ""
"Get these and more at <a "
"href=\"https://spins.fedoraproject.org\";>spins.fedoraproject.org</a>."
msgstr ""
-#: data/content/get-fedora-options.html:312
+#: data/content/get-fedora-options.html:318
msgid "Export Regulations"
msgstr ""
@@ -976,6 +1020,15 @@ msgstr ""
msgid "A blank CD or DVD"
msgstr ""
+#: data/content/get-fedora.html:16
+msgid " or "
+msgstr ""
+
+#: data/content/get-fedora.html:16
+#, python-format
+msgid "a blank %s USB stick."
+msgstr ""
+
#: data/content/get-fedora.html:17
#, python-format
msgid "A %s or faster processor"
@@ -992,16 +1045,36 @@ msgid "At least %s hard drive space (only required for installation)"
msgstr ""
#: data/content/get-fedora.html:21
-msgid "Follow the steps below in order to use the ISO file."
+msgid "What do I do?"
msgstr ""
-#: data/content/get-fedora.html:37
+#: data/content/get-fedora.html:23
+msgid "First, "
+msgstr ""
+
+#: data/content/get-fedora.html:23
+msgid "download a Fedora ISO image"
+msgstr ""
+
+#: data/content/get-fedora.html:24
+msgid "To install Fedora using a USB stick, "
+msgstr ""
+
+#: data/content/get-fedora.html:24 data/content/get-fedora.html:25
+msgid "follow these instructions."
+msgstr ""
+
+#: data/content/get-fedora.html:25
+msgid "To install Fedora using a blank CD or DVD, "
+msgstr ""
+
+#: data/content/get-fedora.html:46
msgid ""
"Fedora 13 Desktop Edition <em class=\"download-tagline\">Installable Live"
" CD</em>"
msgstr ""
-#: data/content/get-fedora.html:40
+#: data/content/get-fedora.html:49
msgid ""
"This is the latest version of the Fedora Linux operating system's Desktop"
" Edition. It's everything you need to try out Fedora—you don't have to "
@@ -1011,52 +1084,52 @@ msgid ""
"Media desktop if you like."
msgstr ""
-#: data/content/get-fedora.html:43
+#: data/content/get-fedora.html:52
#, python-format
-msgid "%s, ISO format, CD-ROM disc image for Intel-compatible PCs (32-bit)"
+msgid "%s, ISO format image for Intel-compatible PCs (32-bit)"
msgstr ""
-#: data/content/get-fedora.html:43
+#: data/content/get-fedora.html:52
msgid "More download options..."
msgstr ""
-#: data/content/get-fedora.html:47
+#: data/content/get-fedora.html:56
msgid "Other Options"
msgstr ""
-#: data/content/get-fedora.html:49
+#: data/content/get-fedora.html:58
msgid "DVD ISOs, Physical Media"
msgstr ""
-#: data/content/get-fedora.html:50
+#: data/content/get-fedora.html:59
msgid "Architectures"
msgstr ""
-#: data/content/get-fedora.html:50
+#: data/content/get-fedora.html:59
msgid "32-bit, 64-bit, and others"
msgstr ""
-#: data/content/get-fedora.html:51
+#: data/content/get-fedora.html:60
msgid "KDE, XFCE, GNOME, and others"
msgstr ""
-#: data/content/get-fedora.html:52
+#: data/content/get-fedora.html:61
msgid "Spins"
msgstr ""
-#: data/content/get-fedora.html:52
+#: data/content/get-fedora.html:61
msgid "Electronics Lab, Education, and others"
msgstr ""
-#: data/content/get-fedora.html:54
-msgid "View full list of options for getting Fedora ..."
+#: data/content/get-fedora.html:63
+msgid "View more Fedora options..."
msgstr ""
-#: data/content/get-fedora.html:57
+#: data/content/get-fedora.html:66
msgid "Need to upgrade Fedora?"
msgstr ""
-#: data/content/get-fedora.html:58
+#: data/content/get-fedora.html:67
msgid ""
"Live Media can't be used to upgrade Fedora installations. Instead, you "
"can upgrade Fedora right from your desktop. Do this by using Preupgrade -"
@@ -1064,7 +1137,7 @@ msgid ""
"Fedora."
msgstr ""
-#: data/content/get-fedora.html:59
+#: data/content/get-fedora.html:68
msgid ""
"<a href=\"http://fedoraproject.org/wiki/Upgrading\";>Learn more about "
"upgrading Fedora...</a>"
@@ -1280,55 +1353,6 @@ msgid ""
"Project."
msgstr ""
-#: data/content/join-fedora.html:19
-#, python-format
-msgid ""
-"<a href=\"http://fedoraproject.org/wiki/Join#ContentWriter\";><img "
-"src=\"%s/%s/static/images/ContentDeveloper.png\" alt=\"Content "
-"Writer\"><br>Content Writer</a>"
-msgstr ""
-
-#: data/content/join-fedora.html:22
-#, python-format
-msgid ""
-"<a href=\"http://fedoraproject.org/wiki/Join#Designer\";><img "
-"src=\"%s/%s/static/images/Designer.png\" "
-"alt=\"Designer\"><br>Designer</a>"
-msgstr ""
-
-#: data/content/join-fedora.html:25
-#, python-format
-msgid ""
-"<a href=\"http://fedoraproject.org/wiki/Join#PeoplePerson\";><img "
-"src=\"%s/%s/static/images/PeoplePerson.png\" alt=\"People "
-"Person\"><br>People Person</a>"
-msgstr ""
-
-#: data/content/join-fedora.html:28
-#, python-format
-msgid ""
-"<a href=\"http://fedoraproject.org/wiki/Join#OSDeveloper\";><img "
-"src=\"%s/%s/static/images/OSDeveloper.png\" alt=\"OS Developer\"><br>OS "
-"Developer</a>"
-msgstr ""
-
-#: data/content/join-fedora.html:31
-#, python-format
-msgid ""
-"<a href=\"http://fedoraproject.org/wiki/Join#Translator\";><img "
-"src=\"%s/%s/static/images/Translator.png\" "
-"alt=\"Translator\"><br>Translator</a>"
-msgstr ""
-
-#: data/content/join-fedora.html:34
-#, python-format
-msgid ""
-"<a "
-"href=\"http://fedoraproject.org/wiki/Join#WebDeveloperAdministrator\";><img"
-" src=\"%s/%s/static/images/WebDeveloper.png\" alt=\"Web Developer or "
-"Administrator\"><br>Web Developer<br>or Administrator</a>"
-msgstr ""
-
#: data/content/keys.html:10
msgid "GPG keys used by Fedora Project"
msgstr ""
@@ -1656,7 +1680,7 @@ msgid ""
"substantial support:"
msgstr ""
-#: data/content/sponsors.html:41
+#: data/content/sponsors.html:42
msgid ""
"Interested in sponsoring something for Fedora? Contact admin at "
"fedoraproject * org or stop by #fedora-admin on irc.freenode.net."
--
websites mailing list
websites@xxxxxxxxxxxxxxxxxxxxxxx
https://admin.fedoraproject.org/mailman/listinfo/websites
