web/html/docs/translation-windows generated-index.php, 1.1, 1.2 index.php, 1.1, 1.2 s1-cvs.php, 1.1, 1.2 s1-cycle.php, 1.1, 1.2 s1-poedit.php, 1.1, 1.2 s1-reg.php, 1.1, 1.2 s1-resource.php, 1.1, 1.2 s1-setup.php, 1.1, 1.2 s1-ssh.php, 1.1, 1.2

["Paul W. Frields" (pfrields) <fedora-websites-list@xxxxxxxxxx>]

Author: pfrields

Update of /cvs/fedora/web/html/docs/translation-windows
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv5134

Modified Files:
	generated-index.php index.php s1-cvs.php s1-cycle.php 
	s1-poedit.php s1-reg.php s1-resource.php s1-setup.php 
	s1-ssh.php 
Log Message:
Publish new 0.1.6 version, with many style and grammatical corrections.


Index: generated-index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/generated-index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- generated-index.php	8 Dec 2005 11:01:03 -0000	1.1
+++ generated-index.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,13 +2,14 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Index</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-resource.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> </td></tr></table><hr></div><div class="index"><div class="titlepage"><div><div><h2 class="title"><a name="generated-index"></a>Index</h2></div></div><div></div></div><div class="index"><div class="indexdiv"><h3>F</h3><dl><dt>Fedora Account</dt><dd><dl><dt>register, <a href="s1-reg.php">Register Your Fedora Account</a></dt></dl></dd></dl></div><div class="indexdiv"><h3>I</h3><dl><dt>Introduction, <a href="index.php#s1-intro">Introduction</a></dt></dl></div><div class="indexdiv"><h3>L</h3><dl><dt>Lifecycle, <a href="s1-cycle.php">Translation Lifecycle</a></dt></dl></div><div class="indexdiv"><h3>P</h3><dl><dt>poEdit</dt><dd><dl><dt>download, <a href="s1-poedit.php#s2-poedit-install">Download and Install !
 poEdit</a></dt><dt>install, <a href="s1-poedit.php#s2-poedit-install">Download and Install poEdit</a></dt><dt>setup, <a href="s1-poedit.php#s2-poedit-setup">Setup poEdit</a></dt><dt>start, <a href="s1-poedit.php#s2-poedit-setup">Setup poEdit</a></dt></dl></dd></dl></div><div class="indexdiv"><h3>R</h3><dl><dt>resource</dt><dd><dl><dt>websites, <a href="s1-resource.php#s2-resource-website"> Related Websites </a></dt></dl></dd></dl></div><div class="indexdiv"><h3>S</h3><dl><dt>SSH keys, <a href="s1-ssh.php">Generate Your Digital ID</a></dt><dt>Status page</dt><dd><dl><dt>release, <a href="s1-cycle.php#s2-cycle-5"> Phase 5 </a></dt><dt>take, <a href="s1-cycle.php#s2-cycle-1"> Phase 1 </a></dt></dl></dd></dl></div><div class="indexdiv"><h3>T</h3><dl><dt>TortoiseCVS</dt><dd><dl><dt>connecting to cvs server, <a href="s1-setup.php#s2-setup-download"> Download Files from Fedora Server </a></dt><dt>cvs commit, <a href="s1-cycle.php#s2-cycle-4"> Phase 4 </a></dt><dt>cvs up, <a href="!
 s1-cycle.php#s2-cycle-2"> Phase 2 </a></dt><dt>download, <a hr!
 ef="s1
s.php">Download and Install TortoiseCVS</a></dt><dt>install, <a href="s1-cvs.php">Download and Install TortoiseCVS</a></dt><dt>setup, <a href="s1-setup.php#s2-setup-setup"> Set up TortoiseCVS </a></dt></dl></dd></dl></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-resource.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">8. Other Resources </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div>
-
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Index</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-resource.php">Prev</a>Â </td><th width="60%" align="center">Â </th><td width="20%" align="right">Â </td></tr></table><hr></div><div class="index" id="generated-index"><div class="titlepage"><div><div><h2 class="title"><a name="generated-index"></a>Index</h2></div></div></div><div class="index"><div class="indexdiv"><h3>F</h3><dl><dt>Fedora Account</dt><dd><dl><dt>register, <a href="s1-reg.php">Register Your Fedora Account</a></dt></dl></dd></dl></div><div class="indexdiv"><h3>I</h3><dl><dt>Introduction, <a href="index.php#s1-intro">Introduction</a></dt></dl></div><div class="indexdiv"><h3>L</h3><dl><dt>Lifecycle, <a href="s1-cycle.php">Translation Lifecycle</a></dt></dl></div><div class="indexdiv"><h3>P</h3><dl><dt>poEdit</dt><dd><dl><dt>download, <a href="s1-poedit.php#s2-poedit-install">Download!
  and Install poEdit</a></dt><dt>install, <a href="s1-poedit.php#s2-poedit-install">Download and Install poEdit</a></dt><dt>setup, <a href="s1-poedit.php#s2-poedit-setup">Setup poEdit</a></dt><dt>start, <a href="s1-poedit.php#s2-poedit-setup">Setup poEdit</a></dt></dl></dd></dl></div><div class="indexdiv"><h3>R</h3><dl><dt>resource</dt><dd><dl><dt>websites, <a href="s1-resource.php#s2-resource-website"> Related Websites </a></dt></dl></dd></dl></div><div class="indexdiv"><h3>S</h3><dl><dt>SSH keys, <a href="s1-ssh.php">Generate a Digital ID</a></dt><dt>Status page</dt><dd><dl><dt>release, <a href="s1-cycle.php#s2-cycle-5">Phase 5</a></dt><dt>take, <a href="s1-cycle.php#s2-cycle-1">Phase 1</a></dt></dl></dd></dl></div><div class="indexdiv"><h3>T</h3><dl><dt>TortoiseCVS</dt><dd><dl><dt>connecting to cvs server, <a href="s1-setup.php#s2-setup-download"> Download Files from Fedora Server </a></dt><dt>cvs commit, <a href="s1-cycle.php#s2-cycle-4">Phase 4</a></dt><dt>cvs up, <a hr!
 ef="s1-cycle.php#s2-cycle-2">Phase 2</a></dt><dt>download, <a !
 href="
cvs.php">Download and Install
+      TortoiseCVS</a></dt><dt>install, <a href="s1-cvs.php">Download and Install
+      TortoiseCVS</a></dt><dt>setup, <a href="s1-setup.php#s2-setup-setup"> Set up TortoiseCVS </a></dt></dl></dd></dl></div></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-resource.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> </td></tr><tr><td width="40%" align="left" valign="top">8. Other Resources </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> </td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: index.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/index.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- index.php	8 Dec 2005 11:01:03 -0000	1.1
+++ index.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,31 +2,37 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Translate Fedora in Microsoft Windows</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-cvs.php">Next</a></td></tr></table><hr></div><div class="article" lang="en"><div class="titlepage"><div><div><h1 class="title"><a name="windows-howto"></a>Translate Fedora in <span class="trademark">Microsoft</span>® <span class="trademark">Windows</span>®</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Chester</span> <span class="surname">Cheng</span></h3></div></div></div><div><p class="copyright">Copyright © 2004 Red Hat, Inc., Chester Cheng</p></div><div><a href="ln-legalnotice.php">Legal Notice</a></div></div><div></div><hr></div><div class="toc"><dl><dt>1. <a href="index.php#s1-intro">Introduction</a></dt><dt>2. <a href="s1-cvs.php">!
 Download and Install TortoiseCVS</a></dt><dt>3. <a href="s1-ssh.php">Generate Your Digital ID</a></dt><dt>4. <a href="s1-reg.php">Register Your Fedora Account</a></dt><dt>5. <a href="s1-setup.php">Using TortoiseCVS</a></dt><dd><dl><dt>5.1. <a href="s1-setup.php#s2-setup-setup"> Set up TortoiseCVS </a></dt><dt>5.2. <a href="s1-setup.php#s2-setup-download"> Download Files from Fedora Server </a></dt></dl></dd><dt>6. <a href="s1-poedit.php"> poEdit </a></dt><dd><dl><dt>6.1. <a href="s1-poedit.php#s2-poedit-install">Download and Install poEdit</a></dt><dt>6.2. <a href="s1-poedit.php#s2-poedit-setup">Setup poEdit</a></dt></dl></dd><dt>7. <a href="s1-cycle.php">Translation Lifecycle</a></dt><dd><dl><dt>7.1. <a href="s1-cycle.php#s2-cycle-1"> Phase 1 </a></dt><dt>7.2. <a href="s1-cycle.php#s2-cycle-2"> Phase 2 </a></dt><dt>7.3. <a href="s1-cycle.php#s2-cycle-3"> Phase 3 </a></dt><dt>7.4. <a href="s1-cycle.php#s2-cycle-4"> Phase 4 </a></dt><dt>7.5. <a href="s1-cycle.php#s2-cycle-5"!
 > Phase 5 </a></dt></dl></dd><dt>8. <a href="s1-resource.php">!
 Other 
ources</a></dt><dd><dl><dt>8.1. <a href="s1-resource.php#s2-resource-website"> Related Websites </a></dt><dt>8.2. <a href="s1-resource.php#s2-resource-feedback"> Your Feedback </a></dt></dl></dd></dl></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-intro"></a>1. Introduction</h2></div></div><div></div></div><a class="indexterm" name="id2816755"></a><p>
-      To join the Fedora translation team and work with people around the world
-      is easy in <span class="trademark">Microsoft</span>® <span class="trademark">Windows</span>® as well. To achieve this, several
-      tools are needed:
-	</p><div class="itemizedlist"><ul type="disc"><li><p>
-    A Web Browser that supports cookies
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">Translate Fedora in Microsoft Windows</th></tr><tr><td width="20%" align="left"> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-cvs.php">Next</a></td></tr></table><hr></div><div class="article" lang="en" id="windows-howto"><div class="titlepage"><div><div><h1 class="title"><a name="windows-howto"></a>Translate Fedora in Microsoft Windows</h1></div><div><div class="authorgroup"><div class="author"><h3 class="author"><span class="firstname">Chester</span> <span class="surname">Cheng</span></h3></div></div></div><div><p class="releaseinfo">Version 0.1.6 (2007-08-14)</p></div><div><p class="copyright">Copyright © 2004, 2007 Red Hat, Inc. and others</p></div><div><a href="ln-legalnotice-opl.php">Legal Notice</a></div><div><a href="rv-revhistory.php">Revision History</a></div></div><hr></div><div class="toc"><dl><dt><spa!
 n class="section"><a href="index.php#s1-intro">1. Introduction</a></span></dt><dt><span class="section"><a href="s1-cvs.php">2. Download and Install
+      <span><strong class="application">TortoiseCVS</strong></span></a></span></dt><dt><span class="section"><a href="s1-ssh.php">3. Generate a Digital ID</a></span></dt><dt><span class="section"><a href="s1-reg.php">4. Register Your Fedora Account</a></span></dt><dt><span class="section"><a href="s1-setup.php">5. Using TortoiseCVS</a></span></dt><dd><dl><dt><span class="section"><a href="s1-setup.php#s2-setup-setup">5.1.  Set up <span><strong class="application">TortoiseCVS</strong></span> </a></span></dt><dt><span class="section"><a href="s1-setup.php#s2-setup-download">5.2.  Download Files from Fedora Server </a></span></dt></dl></dd><dt><span class="section"><a href="s1-poedit.php">6. <span><strong class="application">poEdit</strong></span></a></span></dt><dd><dl><dt><span class="section"><a href="s1-poedit.php#s2-poedit-install">6.1. Download and Install poEdit</a></span></dt><dt><span class="section"><a href="s1-poedit.php#s2-poedit-setup">6.2. Setup poEdit</a></span>!
 </dt></dl></dd><dt><span class="section"><a href="s1-cycle.php">7. Translation Lifecycle</a></span></dt><dd><dl><dt><span class="section"><a href="s1-cycle.php#s2-cycle-1">7.1. Phase 1</a></span></dt><dt><span class="section"><a href="s1-cycle.php#s2-cycle-2">7.2. Phase 2</a></span></dt><dt><span class="section"><a href="s1-cycle.php#s2-cycle-3">7.3. Phase 3</a></span></dt><dt><span class="section"><a href="s1-cycle.php#s2-cycle-4">7.4. Phase 4</a></span></dt><dt><span class="section"><a href="s1-cycle.php#s2-cycle-5">7.5. Phase 5</a></span></dt></dl></dd><dt><span class="section"><a href="s1-resource.php">8. Other Resources</a></span></dt><dd><dl><dt><span class="section"><a href="s1-resource.php#s2-resource-website">8.1.  Related Websites </a></span></dt><dt><span class="section"><a href="s1-resource.php#s2-resource-feedback">8.2. Your Feedback</a></span></dt></dl></dd><dt><span class="index"><a href="generated-index.php">Index</a></span></dt></dl></div><div class="sectio!
 n" lang="en"><div class="titlepage"><div><div><h2 class="title!
 " styl
clear: both"><a name="s1-intro"></a>1. Introduction</h2></div></div></div><a class="indexterm" name="id3027091"></a><p>
+      People who use <span class="trademark">Microsoft</span>®
+      <span class="trademark">Windows</span>® can also join
+      the Fedora translation team and work with people around the world.
+      To participate, you need several tools:
+    </p><div class="itemizedlist"><ul type="disc"><li><p>
+	  A web browser that supports cookies
 	</p></li><li><p>
-    A <b class="application">Concurrent Versions System</b> (<span class="acronym">CVS</span>) client &#8212;
-	This artical uses <b class="application">TortoiseCVS</b>
+	  A <span><strong class="application">Concurrent Versions System</strong></span>
+	  (<acronym class="acronym">CVS</acronym>) client.  This article uses
+	  <span><strong class="application">TortoiseCVS</strong></span>.
 	</p></li><li><p>
-    An editor for <tt class="filename">.po</tt> files &#8212; This article uses <b class="application">poEdit</b>
+	  An editor for <code class="filename">.po</code> files.  This
+	  article uses <span><strong class="application">poEdit</strong></span>.
 	</p></li><li><p>
-    A Secury Shell (<span class="acronym">ssh</span>) client &#8212; This article uses <b class="application">puttygen</b>
-	which is a free utility that generates personalized digital ID, using public key infrastructure.
-	This utility is bundled within <b class="application">TortoiseCVS</b>
+	  A Secure Shell (<acronym class="acronym">ssh</acronym>) client.  This article
+	  uses <span><strong class="application">puttygen</strong></span>, a free utility that
+	  generates a personalized digital ID using a public key
+	  infrastructure. This utility is bundled within
+	  <span><strong class="application">TortoiseCVS</strong></span>.
 	</p></li></ul></div><p>
-	This article will introduce you where to find and download these tools, how to install and setup,
-	and even a brief description of how to use them.
-	</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-cvs.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> 2. Download and Install TortoiseCVS</td></tr></table></div>
-
+      This article shows you where to find and download these tools, how
+      to install and configure them, and how to use them.
+    </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-cvs.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top"> </td><td width="20%" align="center"> </td><td width="40%" align="right" valign="top"> 2. Download and Install
+      <span><strong class="application">TortoiseCVS</strong></span></td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-cvs.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-cvs.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-cvs.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-cvs.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,47 +2,39 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Download and Install TortoiseCVS</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-ssh.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-cvs"></a>2. Download and Install <b class="application">TortoiseCVS</b></h2></div></div><div></div></div><a class="indexterm" name="id2819462"></a><a class="indexterm" name="id2819477"></a><p>
-      To download <b class="application">TortoiseCVS</b>, go to:
-</p><pre class="screen">
-<a href="http://www.tortoisecvs.org/download.shtml"; target="_top">http://www.tortoisecvs.org/download.shtml</a>
-</pre><p>
-	  For demonstration purpose, this artical uses <tt class="filename">TortoiseCVS-1.6.14</tt>.
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">2. Download and Install
+      <span><strong class="application">TortoiseCVS</strong></span></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="index.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-ssh.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-cvs"></a>2. Download and Install
+      <span><strong class="application">TortoiseCVS</strong></span></h2></div></div></div><a class="indexterm" name="id2975308"></a><a class="indexterm" name="id2975320"></a><p>
+      To download <span><strong class="application">TortoiseCVS</strong></span>, visit <a href="http://www.tortoisecvs.org/download.shtml"; target="_top">http://www.tortoisecvs.org/download.shtml</a>. 
+      For demonstration purposes, this article uses
+      <code class="filename">TortoiseCVS-1.6.14</code>.
     </p><p>
-	To install <b class="application">TortoiseCVS</b>, double-click the file you just downloaded.
-	The following screenshots illustrate the installation process step by step:
-	</p><div class="itemizedlist"><ul type="disc"><li><p>
-    Step 1: Welcome to TortoiseCVS setup (as shown in
-	<a href="s1-cvs.php#fig-tortoise-setup1" title="Figure 1. Welcome to TortoiseCVS setup">Figure 1</a>). Press <b class="guibutton">Next&gt;</b> to continue.
-	</p></li><li><p>
-    Step 2: Select destination directory (as shown in <a href="s1-cvs.php#fig-tortoise-setup2" title="Figure 2. Select Destination Directory">Figure 2</a>).
-	Customize your directory or press <b class="guibutton">Next&gt;</b>
-	to accept the default setting.
-	</p></li><li><p>
-    Step 3: Select components (as shown in <a href="s1-cvs.php#fig-tortoise-setup3" title="Figure 3. Select Components">Figure 3</a>).
-	To accept <span class="emphasis"><em>full</em></span> installation, press <b class="guibutton">Next&gt;</b>.
-	</p></li><li><p>
-    Step 4: Installing (as shown in <a href="s1-cvs.php#fig-tortoise-setup4" title="Figure 4. Installing">Figure 4</a>).
-	</p></li><li><p>
-    Step 5: To make changes take effect, you need to restart the computer. Press
-	<b class="guibutton">Finish</b> to restart (as shown in <a href="s1-cvs.php#fig-tortoise-setup5" title="Figure 5. Finish">Figure 5</a>).
-	</p></li></ul></div><div class="figure"><a name="fig-tortoise-setup1"></a><div class="mediaobject"><img src="./figs/tortoise/image001.jpg" alt="
-			Welcome to TortoiseCVS setup.
-        "></div><p class="title"><b>Figure 1. Welcome to TortoiseCVS setup</b></p></div><div class="figure"><a name="fig-tortoise-setup2"></a><div class="mediaobject"><img src="./figs/tortoise/image002.jpg" alt="
-			Select destination directory.
-        "></div><p class="title"><b>Figure 2. Select Destination Directory</b></p></div><div class="figure"><a name="fig-tortoise-setup3"></a><div class="mediaobject"><img src="./figs/tortoise/image003.jpg" alt="
-			Select components.
-        "></div><p class="title"><b>Figure 3. Select Components</b></p></div><div class="figure"><a name="fig-tortoise-setup4"></a><div class="mediaobject"><img src="./figs/tortoise/image004.jpg" alt="
-			Installing.
-        "></div><p class="title"><b>Figure 4. Installing</b></p></div><div class="figure"><a name="fig-tortoise-setup5"></a><div class="mediaobject"><img src="./figs/tortoise/image005.jpg" alt="
-			Finish.
-        "></div><p class="title"><b>Figure 5. Finish</b></p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="s1-ssh.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Translate Fedora in Microsoft Windows </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 3. Generate Your Digital ID</td></tr></table></div>
-
+      To install <span><strong class="application">TortoiseCVS</strong></span>, double-click
+      the file you just downloaded. The following screenshots illustrate
+      the installation process step by step:
+    </p><div class="procedure"><ol type="1"><li><p>
+	  The <span><strong class="guilabel">Welcome to TortoiseCVS setup</strong></span> screen
+	  appears, as shown in
+	  <a href="s1-cvs.php#fig-tortoise-setup1" title="Figure 1. Welcome to TortoiseCVS setup">Figure 1, â??Welcome to TortoiseCVS setupâ??</a>. Press
+	  <span><strong class="guibutton">Next</strong></span> to continue.
+	</p><div class="figure"><a name="fig-tortoise-setup1"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/image001.jpg" alt="Welcome to TortoiseCVS setup."></div></div><p class="title"><b>Figure 1. Welcome to TortoiseCVS setup</b></p></div><br class="figure-break"></li><li><p>
+	  Select a destination directory, as shown in <a href="s1-cvs.php#fig-tortoise-setup2" title="Figure 2. Select Destination Directory">Figure 2, â??Select Destination Directoryâ??</a>. Customize your directory or
+	  press <span><strong class="guibutton">Next</strong></span> to accept the default
+	  setting.
+	</p><div class="figure"><a name="fig-tortoise-setup2"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/image002.jpg" alt="Select destination directory."></div></div><p class="title"><b>Figure 2. Select Destination Directory</b></p></div><br class="figure-break"></li><li><p>
+	  Select components, as shown in <a href="s1-cvs.php#fig-tortoise-setup3" title="Figure 3. Select Components">Figure 3, â??Select Componentsâ??</a>. To accept the default
+	  <span><strong class="guilabel">full</strong></span> installation, press
+	  <span><strong class="guibutton">Next</strong></span>.</p><div class="figure"><a name="fig-tortoise-setup3"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/image003.jpg" alt="Select components."></div></div><p class="title"><b>Figure 3. Select Components</b></p></div><br class="figure-break"><p>The <span><strong class="application">TortoiseCVS</strong></span> product then
+	  installs to your system, as shown in <a href="s1-cvs.php#fig-tortoise-setup4" title="Figure 4. Installing">Figure 4, â??Installingâ??</a>.</p><div class="figure"><a name="fig-tortoise-setup4"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/image004.jpg" alt="Installing."></div></div><p class="title"><b>Figure 4. Installing</b></p></div><br class="figure-break"></li><li><p>
+	  To make changes take effect, restart the computer. Press
+	  <span><strong class="guibutton">Finish</strong></span> to restart, as shown in
+	  <a href="s1-cvs.php#fig-tortoise-setup5" title="Figure 5. Finish">Figure 5, â??Finishâ??</a>.
+	</p><div class="figure"><a name="fig-tortoise-setup5"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/image005.jpg" alt="Finish."></div></div><p class="title"><b>Figure 5. Finish</b></p></div><br class="figure-break"></li></ol></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="index.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-ssh.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">Translate Fedora in Microsoft Windows </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 3. Generate a Digital ID</td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-cycle.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-cycle.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-cycle.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-cycle.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,124 +2,132 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">7. Translation Lifecycle</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-poedit.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-resource.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-cycle"></a>7. Translation Lifecycle</h2></div></div><div></div></div><a class="indexterm" name="id2817967"></a><p>
-To keep the consistency of all documents among Fedora repository and translators, a translation lifecycle is
-being established. The life cycle involves 5 phases as shown in <a href="s1-cycle.php#tb-lifecycle" title="Table 1. Fedora PO file translation life cycle">Table 1</a>.
-</p><div class="table"><a name="tb-lifecycle"></a><table summary="Fedora PO file translation life cycle" border="1"><colgroup><col><col><col><col><col></colgroup><thead><tr><th>Phase</th><th>Action</th><th>Software</th><th>Where</th><th>Login Requires</th></tr></thead><tbody><tr><td><a href="s1-cycle.php#s2-cycle-1" title="7.1.  Phase 1 ">Section 7.1, &#8220; Phase 1 &#8221;</a></td><td>Take the file you want to translate
-(if no other translators took it)</td><td>Any Web broswer with cookies enabled</td><td><a href="http://i18n.redhat.com/cgi-bin/i18n-status"; target="_top">Fedora Translation Status Page</a></td><td>Login name and PIN code</td></tr><tr><td><a href="s1-cycle.php#s2-cycle-2" title="7.2.  Phase 2 ">Section 7.2, &#8220; Phase 2 &#8221;</a></td><td>Download the latest file from Fedora repository</td><td><b class="application">TortoiseCVS</b> or other CVS client</td><td>In <b class="application">TortoiseCVS</b>, right click the <tt class="filename">translate</tt>
-folder, choose <b class="guimenuitem">CVS update</b></td><td>Passphrase of your private key</td></tr><tr><td><a href="s1-cycle.php#s2-cycle-3" title="7.3.  Phase 3 ">Section 7.3, &#8220; Phase 3 &#8221;</a></td><td>Edit the file you had taken.
-Save before you finish</td><td><b class="application">poEdit</b> or other editors</td><td>For <b class="application">poEdit</b>, click <b class="guimenu">start</b> =&gt;
-<b class="guimenuitem">All Programs</b> =&gt; <b class="guimenuitem">poEdit</b> =&gt;
-<b class="guimenuitem">poEdit</b>, then open the file you want to edit in the
-<tt class="filename">translate</tt> folder. Or double-click the file directly in
-<b class="application">Windows Explorer</b></td><td>N/A</td></tr><tr><td><a href="s1-cycle.php#s2-cycle-4" title="7.4.  Phase 4 ">Section 7.4, &#8220; Phase 4 &#8221;</a></td><td>Upload your file back to Fedora repository</td><td><b class="application">TortoiseCVS</b> or other CVS client</td><td>In <b class="application">TortoiseCVS</b>, right click <tt class="filename">translate</tt>
-folder, choose <b class="guimenu">CVS update</b>; Right click <tt class="filename">translate</tt> folder,
-choose <b class="guimenu">CVS commmit</b> if  there are no conflicts between files on your machine and the server.</td><td>Passphrase of your private key</td></tr><tr><td><a href="s1-cycle.php#s2-cycle-5" title="7.5.  Phase 5 ">Section 7.5, &#8220; Phase 5 &#8221;</a></td><td>Release the file you have taken if you don't wish to translate any more</td><td>Any Web broswer with cookies enabled</td><td><a href="http://i18n.redhat.com/cgi-bin/i18n-status"; target="_top">Fedora Translation Status Page</a></td><td>Login name and PIN code</td></tr></tbody></table><p class="title"><b>Table 1. Fedora PO file translation life cycle</b></p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-1"></a>7.1.  Phase 1 </h3></div></div><div></div></div><a class="indexterm" name="id2887550"></a><p>
-Open your browser and go to:
-</p><pre class="screen">
-<a href="http://i18n.redhat.com/cgi-bin/i18n-status"; target="_top">http://i18n.redhat.com/cgi-bin/i18n-status</a>
-</pre><p>
-After select your language, you'll see a web page similar to <a href="s1-cycle.php#fig-cycle-1" title="Figure 32. Take a File for Translation">Figure 32</a>.
-In this example, po file in package <tt class="filename">dist</tt> has 839 entries untranslated and not taken
-by any translator. To claim this file, press the <b class="guibutton">Take</b> link at the right hand side.
-</p><div class="figure"><a name="fig-cycle-1"></a><div class="mediaobject"><img src="./figs/cycle/fedora_take.jpg" alt="
-			To take a file for translation.
-        "></div><p class="title"><b>Figure 32. Take a File for Translation</b></p></div><p>
-If the file is not available for translation because someone else is working on it, you will see the
-status as <b class="guilabel">Assigned</b>, as shown in <a href="s1-cycle.php#fig-cycle-2" title="Figure 33. File Has Been Taken">Figure 33</a>.
-</p><div class="figure"><a name="fig-cycle-2"></a><div class="mediaobject"><img src="./figs/cycle/fedora_assigned.jpg" alt="
-			File has been taken.
-        "></div><p class="title"><b>Figure 33. File Has Been Taken</b></p></div><p>
-After click the <b class="guibutton">Take</b> link, you'll be prompted for username and password
-(<a href="s1-cycle.php#fig-cycle-3" title="Figure 34. Username and Password Prompt">Figure 34</a>). Please enter your Login name and PIN code as described in
-<a href="s1-reg.php#fig-account-setup3" title="Figure 12. Example Email">Figure 12</a>.
-</p><div class="figure"><a name="fig-cycle-3"></a><div class="mediaobject"><img src="./figs/cycle/fedora_login.jpg" alt="
-			Username and password prompt.
-        "></div><p class="title"><b>Figure 34. Username and Password Prompt</b></p></div><p> The system will assign the file to you after you successfully login (<a href="s1-cycle.php#fig-cycle-4" title="Figure 35. File is Assigned to You">Figure 35</a>), or display the error page upon unsuccessful login (<a href="s1-cycle.php#fig-cycle-5" title="Figure 36. Authentication Failed">Figure 36</a>). Please email <a href="mailto:i18n@xxxxxxxxxx"; target="_top">i18n@xxxxxxxxxx</a>
-to request your PIN code to be reissued if you have lost it.
-</p><div class="figure"><a name="fig-cycle-4"></a><div class="mediaobject"><img src="./figs/cycle/fedora_assign_to_you.jpg" alt="
-			File is assigned to you.
-        "></div><p class="title"><b>Figure 35. File is Assigned to You</b></p></div><div class="figure"><a name="fig-cycle-5"></a><div class="mediaobject"><img src="./figs/cycle/fedora_auth_denied.jpg" alt="
-			Authentication failed.
-        "></div><p class="title"><b>Figure 36. Authentication Failed</b></p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-2"></a>7.2.  Phase 2 </h3></div></div><div></div></div><a class="indexterm" name="id2887966"></a><p>
-To download the latest files from server, please right-click on the <tt class="filename">translate</tt>
-folder in <b class="application">Windows Explorer</b> and select <b class="guimenuitem">CVS Update</b>
-You'll be prompted to enter the passphrase of your private key before <b class="application">TortoiseCVS</b>
-can continue. <a href="s1-cycle.php#fig-cycle-6" title="Figure 37. Get Update Files from CVS">Figure 37</a> illustrates.
-</p><div class="figure"><a name="fig-cycle-6"></a><div class="mediaobject"><img src="./figs/cycle/cvs_up.jpg" alt="
-			Get update files from cvs repository.
-        "></div><p class="title"><b>Figure 37. Get Update Files from CVS</b></p></div><p>
-You'll see a screen similar to <a href="s1-cycle.php#fig-cycle-7" title="Figure 38. Update Successful">Figure 38</a> after the update successfully finished.
-The letter "P" in front of any file stands for "patched", which means minor changes from the server had been
-patched to your files; while "U" stands for "updated" that your file is overwritten by the latest version due
-to major changes. Don't be panic if you see "P" and "U" since we work in the community environment the files
-are bound to change from now and then. As long as you have committed your change, your version is never lost -
-that's the beauty of cvs.
-</p><div class="figure"><a name="fig-cycle-7"></a><div class="mediaobject"><img src="./figs/cycle/cvs_up_finish.jpg" alt="
-			Update successful.
-        "></div><p class="title"><b>Figure 38. Update Successful</b></p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-3"></a>7.3.  Phase 3 </h3></div></div><div></div></div><p>
-Open the file you had taken and downloaded from the server. You can either double click on the
-<tt class="filename">.po</tt> file or open the <tt class="filename">.po</tt> file within <b class="application">poEdit</b>
-application. Don't forget to save your changes before you finish everything.
-</p></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-4"></a>7.4.  Phase 4 </h3></div></div><div></div></div><a class="indexterm" name="id2888202"></a><p>
-To upload the file you've taken and subsequently translated back to cvs server is similar to
-download operation. Right-click on <tt class="filename">translate</tt> folder in <b class="application">Windows
-Explorer</b> and select <b class="guimenuitem">CVS Update</b>. You'll be prompted to enter
-the passphrase of your private key before <b class="application">TortoiseCVS</b> can continue.
-After you correctly input your passphrase, you may see a screen similar to <a href="s1-cycle.php#fig-cycle-8" title="Figure 39. Update Before Commit">Figure 39</a>.
-</p><div class="figure"><a name="fig-cycle-8"></a><div class="mediaobject"><img src="./figs/cycle/cvs_up_modified.jpg" alt="
-			Update before commit.
-        "></div><p class="title"><b>Figure 39. Update Before Commit</b></p></div><p>
-"M" stands for "modified". It indicates that this file had been modified on <span class="emphasis"><em>YOUR</em></span>
-local machine and needed to be uploaded to server.
-</p><p>
-If you see a capital "C" instead of "M", then it's time to panic. :P (See <a href="s1-cycle.php#fig-cycle-9" title="Figure 40. File Conflict">Figure 40</a>.)
-"C" stands for "conflict", which means while you were modifying your local file
-this file on the server has been changed at the same time.
-This may be caused by the package maintainer who merged your file with <tt class="filename">.pot</tt>
-file, or you forget to <span class="emphasis"><em>Take</em></span> the file before starting working on it and someone else
-had taken and committed the translation before you. The file conflicts have to be resolved manually
-and may cause lost translation and wasted effort. Please seek assistance through your community
-and relavant mailing lists.
-</p><div class="figure"><a name="fig-cycle-9"></a><div class="mediaobject"><img src="./figs/cycle/conflict.jpg" alt="
-			File conflict
-        "></div><p class="title"><b>Figure 40. File Conflict</b></p></div><p>
-If everything is fine, you can upload the file you had modified. Choose <b class="guimenuitem">CVS Commit</b>
-after you right-click on the <tt class="filename">translate</tt> folder, as shown in <a href="s1-cycle.php#fig-cycle-10" title="Figure 41. Commit Files to Server">Figure 41</a>.
-</p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note:  Note "><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left"> Note </th></tr><tr><td colspan="2" align="left" valign="top"><p>
-<tt class="command">cvs update</tt> will notify you the file modification on <span class="emphasis"><em>your local</em></span>
-computer. It will <span class="emphasis"><em>NOT</em></span>, however, upload the file back to server until you choose to
-<tt class="command">cvs commit</tt>.
-</p></td></tr></table></div><div class="figure"><a name="fig-cycle-10"></a><div class="mediaobject"><img src="./figs/cycle/cvs_up_menu_commit.jpg" alt="
-			Commit files to server.
-        "></div><p class="title"><b>Figure 41. Commit Files to Server</b></p></div><p>
-You'll see a list of modified files, as shown in <a href="s1-cycle.php#fig-cycle-101" title="Figure 42. Commit Files to Server">Figure 42</a>. Check the file(s)
-you will upload to the server. It is also recommended to key in some comments, so other translators
-can easily track what has been changed in any file. Press <b class="guibutton">OK</b> to upload the file.
-</p><div class="figure"><a name="fig-cycle-101"></a><div class="mediaobject"><img src="./figs/tortoise/cvs_commit.jpg" alt="
-			Commit files to server.
-        "></div><p class="title"><b>Figure 42. Commit Files to Server</b></p></div><p>
-Again, you'll be prompted the passphrase of your private key. After files are successfully uploaded
-to server, you will see a screen similar to <a href="s1-cycle.php#fig-cycle-11" title="Figure 43. Commit Files to Server Successfully">Figure 43</a>.
-</p><div class="figure"><a name="fig-cycle-11"></a><div class="mediaobject"><img src="./figs/cycle/cvs_up_commit.jpg" alt="
-			Commit files to server successfully.
-        "></div><p class="title"><b>Figure 43. Commit Files to Server Successfully</b></p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-5"></a>7.5.  Phase 5 </h3></div></div><div></div></div><a class="indexterm" name="id2888687"></a><p>
-The phase is an optional one, only occurs when you decide to stop working on a file before it's fully translated. For example, you may go on a holiday and don't want to keep working on a file but would like others to be able
-to resume the work. To do so, you need to go to the Fedora status page, find the package you had taken,
-and click the package name to view the detail. On the bottom of that page, you would see the
-<b class="guibutton">Release</b> link, as shown in <a href="s1-cycle.php#fig-cycle-12" title="Figure 44. Release File Screen">Figure 44</a>.
-</p><div class="figure"><a name="fig-cycle-12"></a><div class="mediaobject"><img src="./figs/cycle/fedora_released.jpg" alt="
-			Release file screen.
-        "></div><p class="title"><b>Figure 44. Release File Screen</b></p></div><p>
-This is the end of the life cycle of Fedora software translation. We do hope you enjoy being with part of the
-open source community and continue lending your support.
-</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-poedit.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="s1-resource.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">6.  poEdit  </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 8. Other Resources</td></tr></table></div>
-
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">7. Translation Lifecycle</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-poedit.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-resource.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-cycle"></a>7. Translation Lifecycle</h2></div></div></div><a class="indexterm" name="id3029375"></a><p>
+      To maintain consistency of all documents among Fedora repository
+      and translators, the Fedora Project uses a translation lifecycle.
+      The life cycle involves five phases, as shown in <a href="s1-cycle.php#tb-lifecycle" title="Fedora PO file translation life cycle">Fedora PO file translation life cycle</a>.
+    </p><div class="segmentedlist"><a name="tb-lifecycle"></a><div class="title"><strong><span class="title">Fedora PO file translation life cycle</span></strong></div><table border="0"><thead><tr class="segtitle"><th>Phase</th><th>Action</th><th>Software</th><th>Where</th><th>Login Requires</th></tr></thead><tbody><tr class="seglistitem"><td class="seg"><a href="s1-cycle.php#s2-cycle-1" title="7.1. Phase 1">Section 7.1, â??Phase 1â??</a></td><td class="seg">Take the file to translate, if no other translators have
+	  taken it</td><td class="seg">Any Web broswer with cookies enabled</td><td class="seg"><a href="http://i18n.redhat.com/cgi-bin/i18n-status"; target="_top">Fedora
+	    Translation Status Page</a></td><td class="seg">Login name and PIN code</td></tr><tr class="seglistitem"><td class="seg"><a href="s1-cycle.php#s2-cycle-2" title="7.2. Phase 2">Section 7.2, â??Phase 2â??</a></td><td class="seg">Download the latest file from Fedora repository</td><td class="seg"><span><strong class="application">TortoiseCVS</strong></span> or other CVS
+	  client</td><td class="seg">In <span><strong class="application">TortoiseCVS</strong></span>, right click the
+	  <code class="filename">translate</code> folder, choose <span><strong class="guimenuitem">CVS
+	    update</strong></span></td><td class="seg">Passphrase of your private key</td></tr><tr class="seglistitem"><td class="seg"><a href="s1-cycle.php#s2-cycle-3" title="7.3. Phase 3">Section 7.3, â??Phase 3â??</a></td><td class="seg">Edit the file you had taken. Save before you finish</td><td class="seg"><span><strong class="application">poEdit</strong></span> or other editors</td><td class="seg">For <span><strong class="application">poEdit</strong></span>, click
+	  <span><strong class="guimenu">start</strong></span> â?? <span><strong class="guisubmenu">All Programs</strong></span> â?? <span><strong class="guisubmenu">poEdit</strong></span> â?? <span><strong class="guimenuitem">poEdit</strong></span>, then open the file you want to edit in the
+	  <code class="filename">translate</code> folder. Or
+	  double-click the file directly in <span><strong class="application">Windows
+	    Explorer</strong></span></td><td class="seg">N/A</td></tr><tr class="seglistitem"><td class="seg"><a href="s1-cycle.php#s2-cycle-4" title="7.4. Phase 4">Section 7.4, â??Phase 4â??</a></td><td class="seg">Upload your file back to Fedora repository</td><td class="seg"><span><strong class="application">TortoiseCVS</strong></span> or other CVS
+	  client</td><td class="seg">In <span><strong class="application">TortoiseCVS</strong></span>, right click
+	  <code class="filename">translate</code> folder, choose <span><strong class="guimenu">CVS
+	    update</strong></span>. Right click <code class="filename">translate</code>
+	  folder, and choose <span><strong class="guimenu">CVS commmit</strong></span> if there are
+	  no conflicts between files on your machine and the
+	  server.</td><td class="seg">Passphrase of your private key</td></tr><tr class="seglistitem"><td class="seg"><a href="s1-cycle.php#s2-cycle-5" title="7.5. Phase 5">Section 7.5, â??Phase 5â??</a></td><td class="seg">Release the file you have taken if you don't wish to
+	  translate any more</td><td class="seg">Any Web broswer with cookies enabled</td><td class="seg"><a href="http://i18n.redhat.com/cgi-bin/i18n-status"; target="_top">Fedora
+	    Translation Status Page</a></td><td class="seg">Login name and PIN code</td></tr></tbody></table></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-1"></a>7.1. Phase 1</h3></div></div></div><a class="indexterm" name="id3029669"></a><p>
+	Open your browser and go to <a href="http://i18n.redhat.com/cgi-bin/i18n-status"; target="_top">http://i18n.redhat.com/cgi-bin/i18n-status</a>. Select a
+	language, and a web page similar to
+	<a href="s1-cycle.php#fig-cycle-1" title="Figure 32. Take a File for Translation">Figure 32, â??Take a File for Translationâ??</a> appears. In this example, the PO file
+	in package <code class="filename">dist</code> has 839 entries
+	untranslated and not taken by any translator. To claim this
+	file, press the <span><strong class="guibutton">Take</strong></span> link at the right
+	hand side.
+      </p><div class="figure"><a name="fig-cycle-1"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/fedora_take.jpg" alt="To take a file for translation."></div></div><p class="title"><b>Figure 32. Take a File for Translation</b></p></div><br class="figure-break"><p>
+	If the file is not available for translation because someone
+	else is working on it, the status appears as
+	<span><strong class="guilabel">Assigned</strong></span>, as shown in <a href="s1-cycle.php#fig-cycle-2" title="Figure 33. File Has Been Taken">Figure 33, â??File Has Been Takenâ??</a>.
+      </p><div class="figure"><a name="fig-cycle-2"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/fedora_assigned.jpg" alt="File has been taken."></div></div><p class="title"><b>Figure 33. File Has Been Taken</b></p></div><br class="figure-break"><p>
+	After you click the <span><strong class="guibutton">Take</strong></span> link, a prompt
+	appears for your username and password as shown in <a href="s1-cycle.php#fig-cycle-3" title="Figure 34. Username and Password Prompt">Figure 34, â??Username and Password Promptâ??</a>. Enter your login name and PIN code as
+	described in <a href="s1-reg.php#fig-account-setup3" title="Figure 12. Example Email">Figure 12, â??Example Emailâ??</a>.
+      </p><div class="figure"><a name="fig-cycle-3"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/fedora_login.jpg" alt="Username and password prompt."></div></div><p class="title"><b>Figure 34. Username and Password Prompt</b></p></div><br class="figure-break"><p>The system assigns the file to you after you successfully
+	login, as shown in <a href="s1-cycle.php#fig-cycle-4" title="Figure 35. File is Assigned to You">Figure 35, â??File is Assigned to Youâ??</a>, or it displays
+	an error page upon unsuccessful login, as shown in <a href="s1-cycle.php#fig-cycle-5" title="Figure 36. Authentication Failed">Figure 36, â??Authentication Failedâ??</a>. Please email <a href="mailto:i18n@xxxxxxxxxx"; target="_top">mailto:i18n@xxxxxxxxxx</a> to request a reissued PIN code
+	if you lose your PIN.</p><div class="figure"><a name="fig-cycle-4"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/fedora_assign_to_you.jpg" alt="File is assigned to you."></div></div><p class="title"><b>Figure 35. File is Assigned to You</b></p></div><br class="figure-break"><div class="figure"><a name="fig-cycle-5"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/fedora_auth_denied.jpg" alt="Authentication failed."></div></div><p class="title"><b>Figure 36. Authentication Failed</b></p></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-2"></a>7.2. Phase 2</h3></div></div></div><a class="indexterm" name="id3029975"></a><p>
+	To download the latest files from server, right-click the
+	<code class="filename">translate</code> folder in <span><strong class="application">Windows
+	  Explorer</strong></span> and select <span><strong class="guimenuitem">CVS
+	  Update</strong></span>.  A prompt appears for the passphrase of
+	your private key before <span><strong class="application">TortoiseCVS</strong></span>
+	can continue as shown in <a href="s1-cycle.php#fig-cycle-6" title="Figure 37. Get Update Files from CVS">Figure 37, â??Get Update Files from CVSâ??</a>.
+      </p><div class="figure"><a name="fig-cycle-6"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/cvs_up.jpg" alt="Get update files from cvs repository."></div></div><p class="title"><b>Figure 37. Get Update Files from CVS</b></p></div><br class="figure-break"><p>
+	A screen appears similar to <a href="s1-cycle.php#fig-cycle-7" title="Figure 38. Update Successful">Figure 38, â??Update Successfulâ??</a> after
+	the update successfully finishes. The letter "P" in front of any
+	file stands for "patched," which means minor changes from the
+	server had been patched to your files.  A letter "U" stands for
+	"updated," which means your file is overwritten by the latest
+	version due to major changes.  Do not panic if you see "P" and
+	"U." Since translation is done through collaboration, the files
+	are bound to change occasionally. As long as you have committed
+	your changes, your version is never lost, which is a benefit of
+	using CVS.
+      </p><div class="figure"><a name="fig-cycle-7"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/cvs_up_finish.jpg" alt="Update successful."></div></div><p class="title"><b>Figure 38. Update Successful</b></p></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-3"></a>7.3. Phase 3</h3></div></div></div><p>
+	Open the file you took and downloaded from the server. Either
+	double-click on the <code class="filename">.po</code> file, or open the
+	<code class="filename">.po</code> file within the
+	<span><strong class="application">poEdit</strong></span> application. Remember to save
+	your changes when you finish translating.
+      </p></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-4"></a>7.4. Phase 4</h3></div></div></div><a class="indexterm" name="id3030153"></a><p>
+	Uploading the file you have translated back to the CVS server is
+	similar to the download operation. Right-click on the
+	<code class="filename">translate</code> folder in <span><strong class="application">Windows
+	  Explorer</strong></span> and select <span><strong class="guimenuitem">CVS
+	  Update</strong></span>. A prompt appears to enter the passphrase
+	of your private key before
+	<span><strong class="application">TortoiseCVS</strong></span> can continue. After you
+	correctly input your passphrase, a screen appears similar to
+	<a href="s1-cycle.php#fig-cycle-8" title="Figure 39. Update Before Commit">Figure 39, â??Update Before Commitâ??</a>.
+      </p><div class="figure"><a name="fig-cycle-8"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/cvs_up_modified.jpg" alt="Update before commit."></div></div><p class="title"><b>Figure 39. Update Before Commit</b></p></div><br class="figure-break"><p>
+	"M" stands for "modified". It indicates that this file was
+	modified on <span class="emphasis"><em>your</em></span> local machine and needed
+	to be uploaded to server.
+      </p><p>
+	If you see a capital "C" instead of "M", as shown in <a href="s1-cycle.php#fig-cycle-9" title="Figure 40. File Conflict">Figure 40, â??File Conflictâ??</a>, then a
+	<em class="firstterm">conflict</em> has occurred.  A conflict occurs
+	if you modify part of your local file while the same part of the
+	same file on the CVS server is changed at the same time.
+	Conflicts may be caused by:</p><div class="itemizedlist"><ul type="disc"><li><p>A package maintainer who merged your file with the
+	    template <code class="filename">.pot</code> file</p></li><li><p>Forgetting to <span class="emphasis"><em>Take</em></span> the file before
+	    working on it, while someone else takes and commits their
+	    translation before you</p></li></ul></div><p>You must resolve file conflicts manually.  Conflicts may
+	cause lost translation and wasted effort.  Please seek
+	assistance through your translation community and relevant
+	mailing lists.
+      </p><div class="figure"><a name="fig-cycle-9"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/conflict.jpg" alt="File conflict"></div></div><p class="title"><b>Figure 40. File Conflict</b></p></div><br class="figure-break"><p>
+	If everything is fine, upload the file you modified. Choose
+	<span><strong class="guimenuitem">CVS Commit</strong></span> after you right-click on
+	the <code class="filename">translate</code> folder, as shown in <a href="s1-cycle.php#fig-cycle-10" title="Figure 41. Commit Files to Server">Figure 41, â??Commit Files to Serverâ??</a>.
+      </p><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: Updating and Committing"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left">Updating and Committing</th></tr><tr><td align="left" valign="top"><p>
+	  A CVS update will notify you about file modification on
+	  <span class="emphasis"><em>your local computer</em></span>. It will
+	  <span class="emphasis"><em>not</em></span>, however, upload the file back to
+	  server until you choose to perform a CVS commit.
+	</p></td></tr></table></div><div class="figure"><a name="fig-cycle-10"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/cvs_up_menu_commit.jpg" alt="Commit files to server."></div></div><p class="title"><b>Figure 41. Commit Files to Server</b></p></div><br class="figure-break"><p>
+	A list of modified files appears, as shown in <a href="s1-cycle.php#fig-cycle-101" title="Figure 42. Commit Files to Server">Figure 42, â??Commit Files to Serverâ??</a>. Check the files you plan to upload
+	to the server.  You should add some relevant comments, so other
+	translators can easily track what has been changed in any file.
+	Press <span><strong class="guibutton">OK</strong></span> to upload the file.
+      </p><div class="figure"><a name="fig-cycle-101"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/cvs_commit.jpg" alt="Commit files to server."></div></div><p class="title"><b>Figure 42. Commit Files to Server</b></p></div><br class="figure-break"><p>
+	A prompt appears for the passphrase of your private key. After
+	files are successfully uploaded to server, a screen appears
+	similar to <a href="s1-cycle.php#fig-cycle-11" title="Figure 43. Commit Files to Server Successfully">Figure 43, â??Commit Files to Server Successfullyâ??</a>.
+      </p><div class="figure"><a name="fig-cycle-11"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/cvs_up_commit.jpg" alt="Commit files to server successfully."></div></div><p class="title"><b>Figure 43. Commit Files to Server Successfully</b></p></div><br class="figure-break"></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-cycle-5"></a>7.5. Phase 5</h3></div></div></div><a class="indexterm" name="id3030531"></a><p>
+	This phase is optional, and only occurs when you stop working on
+	a file before it is fully translated. For example, you may go on
+	a holiday, but would like others to be able to resume the work.
+	To do so, visit the Fedora status page, find the package you
+	previously took, and click the package name to view the detail.
+	On the bottom of that page, a <span><strong class="guibutton">Release</strong></span>
+	link appears, as shown in <a href="s1-cycle.php#fig-cycle-12" title="Figure 44. Release File Screen">Figure 44, â??Release File Screenâ??</a>.
+      </p><div class="figure"><a name="fig-cycle-12"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/cycle/fedora_released.jpg" alt="Release file screen."></div></div><p class="title"><b>Figure 44. Release File Screen</b></p></div><br class="figure-break"><p>
+	This is the end of the life cycle of Fedora software
+	translation. We do hope you enjoy being with part of the open
+	source community and continue lending your support.
+      </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-poedit.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-resource.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">6. <span><strong class="application">poEdit</strong></span> </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 8. Other Resources</td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-poedit.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-poedit.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-poedit.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-poedit.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,76 +2,57 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">6.  poEdit </th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-setup.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-cycle.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-poedit"></a>6.  <b class="application">poEdit</b> </h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-poedit-install"></a>6.1. Download and Install poEdit</h3></div></div><div></div></div><a class="indexterm" name="id2877327"></a><a class="indexterm" name="id2877341"></a><p>
-	  To download <b class="application">poEdit</b>, go to
-</p><pre class="screen">
-<a href="http://poedit.sourceforge.net/download.php#win32"; target="_top">http://poedit.sourceforge.net/download.php#win32
-</a>
-</pre><p>
-	For demonstration purpose, this article uses <tt class="filename">poEdit-1.3.1</tt>.
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">6. <span><strong class="application">poEdit</strong></span></th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-setup.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-cycle.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-poedit"></a>6. <span><strong class="application">poEdit</strong></span></h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-poedit-install"></a>6.1. Download and Install poEdit</h3></div></div></div><a class="indexterm" name="id3028612"></a><a class="indexterm" name="id3028624"></a><p>
+	To download <span><strong class="application">poEdit</strong></span>, go to <a href="http://poedit.sourceforge.net/download.php#win32"; target="_top">http://poedit.sourceforge.net/download.php#win32</a>. For
+	demonstration purposes, this article uses version 1.3.1 of
+	<span><strong class="application">poEdit</strong></span>.
       </p><p>
-	  Installing <b class="application">poEdit</b> is as easy and straight-forward as installing
-	  <b class="application">TortoiseCVS</b>. The main steps are:
-	  </p><div class="itemizedlist"><ul type="disc"><li><p>
-    Step 1: Welcome. Double-click <tt class="filename">poEdit-1.3.1</tt> you just downloaded.
-	  A screen similar to <a href="s1-poedit.php#fig-poedit-setup1" title="Figure 21. Welcome">Figure 21</a> will appear
-	</p></li><li><p>
-    Step 2: You need to accept the agreement before you go on. See <a href="s1-poedit.php#fig-poedit-setup2" title="Figure 22. Licience Agreement">Figure 22</a>
-	</p></li><li><p>
-    Step 3: Select Destination Location. See <a href="s1-poedit.php#fig-poedit-setup3" title="Figure 23. Select Destination Location">Figure 23</a>
-	</p></li><li><p>
-    Step 4: Full installation is the default setting of component selection. Press
-	<b class="guibutton">Next&gt;</b> to accept. See <a href="s1-poedit.php#fig-poedit-setup4" title="Figure 24. Select Components">Figure 24</a>
-	</p></li><li><p>
-    Step 5: Create a folder in the Start menu. See <a href="s1-poedit.php#fig-poedit-setup5" title="Figure 25. Select Start Menu Folder">Figure 25</a>
-	</p></li><li><p>
-    Step 6: Final review of all the settings. Press <b class="guibutton">Install</b>
-	to accept. See <a href="s1-poedit.php#fig-poedit-setup6" title="Figure 26. Ready To Install">Figure 26</a>
-	</p></li><li><p>
-    Step 7: Installing. See <a href="s1-poedit.php#fig-poedit-setup7" title="Figure 27. Installing">Figure 27</a>
-	</p></li><li><p>
-    Step 8: Finish! See <a href="s1-poedit.php#fig-poedit-setup8" title="Figure 28. Finish">Figure 28</a>
-	</p></li></ul></div><div class="figure"><a name="fig-poedit-setup1"></a><div class="mediaobject"><img src="./figs/poedit/image001.jpg" alt="
-			Welcome
-        "></div><p class="title"><b>Figure 21. Welcome</b></p></div><div class="figure"><a name="fig-poedit-setup2"></a><div class="mediaobject"><img src="./figs/poedit/image002.jpg" alt="
-			Licience agreement
-        "></div><p class="title"><b>Figure 22. Licience Agreement</b></p></div><div class="figure"><a name="fig-poedit-setup3"></a><div class="mediaobject"><img src="./figs/poedit/image003.jpg" alt="
-			Select destination location
-        "></div><p class="title"><b>Figure 23. Select Destination Location</b></p></div><div class="figure"><a name="fig-poedit-setup4"></a><div class="mediaobject"><img src="./figs/poedit/image004.jpg" alt="
-			Select components
-        "></div><p class="title"><b>Figure 24. Select Components</b></p></div><div class="figure"><a name="fig-poedit-setup5"></a><div class="mediaobject"><img src="./figs/poedit/image005.jpg" alt="
-			Select start menu folder
-        "></div><p class="title"><b>Figure 25. Select Start Menu Folder</b></p></div><div class="figure"><a name="fig-poedit-setup6"></a><div class="mediaobject"><img src="./figs/poedit/image006.jpg" alt="
-			Ready to install
-        "></div><p class="title"><b>Figure 26. Ready To Install</b></p></div><div class="figure"><a name="fig-poedit-setup7"></a><div class="mediaobject"><img src="./figs/poedit/image007.jpg" alt="
-			Installing
-        "></div><p class="title"><b>Figure 27. Installing</b></p></div><div class="figure"><a name="fig-poedit-setup8"></a><div class="mediaobject"><img src="./figs/poedit/image008.jpg" alt="
-			Finish
-        "></div><p class="title"><b>Figure 28. Finish</b></p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-poedit-setup"></a>6.2. Setup poEdit</h3></div></div><div></div></div><a class="indexterm" name="id2878010"></a><a class="indexterm" name="id2878023"></a><p>
-	To start <b class="application">poEdit</b>, click <b class="guimenu">start</b> =&gt;
-	<b class="guimenuitem">All Programs</b> =&gt; <b class="guimenuitem">poEdit</b> =&gt;
-	<b class="guimenuitem">poEdit</b>. You will a screen similar to <a href="s1-poedit.php#fig-poedit-setup9" title="Figure 29. Starting poEdit">Figure 29</a>.
-	</p><div class="figure"><a name="fig-poedit-setup9"></a><div class="mediaobject"><img src="./figs/poedit/poEdit_start.jpg" alt="
-			Starting poEdit.
-        "></div><p class="title"><b>Figure 29. Starting poEdit</b></p></div><p>
-	To configure <b class="application">poEdit</b>, go to <b class="guimenu">File</b> =&gt;
-	<b class="guimenuitem">Preferences</b> (<a href="s1-poedit.php#fig-poedit-setup10" title="Figure 30. Preference Submenu">Figure 30</a>).
-	Enter your name and email address as shown in <a href="s1-poedit.php#fig-poedit-setup11" title="Figure 31. poEdit Preference Screen">Figure 31</a>, then press
-	<b class="guibutton">OK</b>.
-	</p><div class="figure"><a name="fig-poedit-setup10"></a><div class="mediaobject"><img src="./figs/poedit/menu_preferences.jpg" alt="
-			Preference submenu
-        "></div><p class="title"><b>Figure 30. Preference Submenu</b></p></div><div class="figure"><a name="fig-poedit-setup11"></a><div class="mediaobject"><img src="./figs/poedit/preferences.jpg" alt="
-			poEdit Preference screen
-        "></div><p class="title"><b>Figure 31. poEdit Preference Screen</b></p></div><p>
-	Huh~, finally! All the preparation has come to the end. In next section we'll step into
-	the real translation work.
-	</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-setup.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="s1-cycle.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">5. Using TortoiseCVS </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 7. Translation Lifecycle</td></tr></table></div>
-
+	To install <span><strong class="application">poEdit</strong></span>, follow this
+	procedure:
+      </p><div class="procedure"><ol type="1"><li><p>
+	    Double-click the <code class="filename">poEdit-1.3.1</code> file you
+	    just downloaded. A screen similar to <a href="s1-poedit.php#fig-poedit-setup1" title="Figure 21. Welcome">Figure 21, â??Welcomeâ??</a> appears.  Click
+	    <span><strong class="guibutton">Next</strong></span> to continue.
+	  </p><div class="figure"><a name="fig-poedit-setup1"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image001.jpg" alt="Welcome"></div></div><p class="title"><b>Figure 21. Welcome</b></p></div><br class="figure-break"></li><li><p>
+	    The license agreement appears, as shown in <a href="s1-poedit.php#fig-poedit-setup2" title="Figure 22. License Agreement">Figure 22, â??License Agreementâ??</a>.  Read it, select
+	    <span><strong class="guilabel">I accept the agreement</strong></span> if you agree,
+	    and then select <span><strong class="guibutton">Next</strong></span> to proceed.
+	  </p><div class="figure"><a name="fig-poedit-setup2"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image002.jpg" alt="License agreement"></div></div><p class="title"><b>Figure 22. License Agreement</b></p></div><br class="figure-break"></li><li><p>
+	    Select the destination location, as shown in <a href="s1-poedit.php#fig-poedit-setup3" title="Figure 23. Select Destination Location">Figure 23, â??Select Destination Locationâ??</a>.
+	  </p><div class="figure"><a name="fig-poedit-setup3"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image003.jpg" alt="Select destination location"></div></div><p class="title"><b>Figure 23. Select Destination Location</b></p></div><br class="figure-break"></li><li><p>
+	    The default as shown in <a href="s1-poedit.php#fig-poedit-setup4" title="Figure 24. Select Components">Figure 24, â??Select Componentsâ??</a> is a full installation of
+	    all components. Press <span><strong class="guibutton">Next&gt;</strong></span> to accept
+	    this configuration.
+	  </p><div class="figure"><a name="fig-poedit-setup4"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image004.jpg" alt="Select components"></div></div><p class="title"><b>Figure 24. Select Components</b></p></div><br class="figure-break"></li><li><p>
+	    To create a folder in the Start menu as shown in <a href="s1-poedit.php#fig-poedit-setup5" title="Figure 25. Select Start Menu Folder">Figure 25, â??Select Start Menu Folderâ??</a>, click
+	    <span><strong class="guibutton">Next</strong></span>.
+	  </p><div class="figure"><a name="fig-poedit-setup5"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image005.jpg" alt="Select start menu folder"></div></div><p class="title"><b>Figure 25. Select Start Menu Folder</b></p></div><br class="figure-break"></li><li><p>
+	    Review all the settings as shown in <a href="s1-poedit.php#fig-poedit-setup6" title="Figure 26. Ready To Install">Figure 26, â??Ready To Installâ??</a>. Press
+	    <span><strong class="guibutton">Install</strong></span> to accept.
+	  </p><div class="figure"><a name="fig-poedit-setup6"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image006.jpg" alt="Ready to install"></div></div><p class="title"><b>Figure 26. Ready To Install</b></p></div><br class="figure-break"></li><li><p>
+	    Installation proceeds as shown in <a href="s1-poedit.php#fig-poedit-setup7" title="Figure 27. Installing">Figure 27, â??Installingâ??</a>.
+	  </p><div class="figure"><a name="fig-poedit-setup7"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image007.jpg" alt="Installing"></div></div><p class="title"><b>Figure 27. Installing</b></p></div><br class="figure-break"></li><li><p>
+	    The dialog shown in <a href="s1-poedit.php#fig-poedit-setup8" title="Figure 28. Finish">Figure 28, â??Finishâ??</a>
+	    appears.  Select <span><strong class="guibutton">Finish</strong></span> to complete
+	    the process.
+	  </p><div class="figure"><a name="fig-poedit-setup8"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/image008.jpg" alt="Finish"></div></div><p class="title"><b>Figure 28. Finish</b></p></div><br class="figure-break"></li></ol></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-poedit-setup"></a>6.2. Setup poEdit</h3></div></div></div><a class="indexterm" name="id3029138"></a><a class="indexterm" name="id3029149"></a><p>
+	To start <span><strong class="application">poEdit</strong></span>, click
+	<span><strong class="guimenu">start</strong></span> â?? <span><strong class="guisubmenu">All Programs</strong></span> â?? <span><strong class="guisubmenu">poEdit</strong></span> â?? <span><strong class="guimenuitem">poEdit</strong></span>. 	A screen similar to
+	<a href="s1-poedit.php#fig-poedit-setup9" title="Figure 29. Starting poEdit">Figure 29, â??Starting poEditâ??</a> appears.
+      </p><div class="figure"><a name="fig-poedit-setup9"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/poEdit_start.jpg" alt="Starting poEdit."></div></div><p class="title"><b>Figure 29. Starting poEdit</b></p></div><br class="figure-break"><p>
+	To configure <span><strong class="application">poEdit</strong></span>, go to
+	<span><strong class="guimenu">File</strong></span> â?? <span><strong class="guimenuitem">Preferences</strong></span>, as shown in <a href="s1-poedit.php#fig-poedit-setup10" title="Figure 30. Preference Submenu">Figure 30, â??Preference Submenuâ??</a>. Enter your name and email
+	address as shown in <a href="s1-poedit.php#fig-poedit-setup11" title="Figure 31. poEdit Preference Screen">Figure 31, â??poEdit Preference Screenâ??</a>, then press
+	<span><strong class="guibutton">OK</strong></span>.
+      </p><div class="figure"><a name="fig-poedit-setup10"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/menu_preferences.jpg" alt="Preference submenu"></div></div><p class="title"><b>Figure 30. Preference Submenu</b></p></div><br class="figure-break"><div class="figure"><a name="fig-poedit-setup11"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/poedit/preferences.jpg" alt="poEdit Preference screen"></div></div><p class="title"><b>Figure 31. poEdit Preference Screen</b></p></div><br class="figure-break"><p>
+	The setup process is now complete. The next section discusses
+	how to perform actual translation work.
+      </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-setup.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-cycle.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">5. Using TortoiseCVS </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 7. Translation Lifecycle</td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-reg.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-reg.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-reg.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-reg.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,45 +2,43 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4. Register Your Fedora Account</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-ssh.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-setup.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-reg"></a>4. Register Your Fedora Account</h2></div></div><div></div></div><a class="indexterm" name="id2871582"></a><p>
-	It is essential to have an account and password to access Fedora translation CVS.
-	To become a translator please sign up at:
-</p><pre class="screen">
-<a href="http://i18n.redhat.com/cgi-bin/i18n-signup/"; target="_top">http://i18n.redhat.com/cgi-bin/i18n-signup/</a>
-</pre><p>
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">4. Register Your Fedora Account</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-ssh.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-setup.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-reg"></a>4. Register Your Fedora Account</h2></div></div></div><a class="indexterm" name="id2974605"></a><p>
+      It is essential to have an account and password to access Fedora
+      translation CVS. To become a translator please sign up at <a href="http://i18n.redhat.com/cgi-bin/i18n-signup/"; target="_top">http://i18n.redhat.com/cgi-bin/i18n-signup/</a>.
     </p><p>
-	You need to provide your basic information include Login name, Real Name, a valid email address,
-	the language or locale you are going to translate, as well as the SSH public key that generated
-	from the previous step (refer to <a href="s1-ssh.php" title="3. Generate Your Digital ID">Section 3, &#8220;Generate Your Digital ID&#8221;</a> and <a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9</a>).
-	This step is illustrated in <a href="s1-reg.php#fig-account-setup1" title="Figure 10. Account Sign up Screen">Figure 10</a>.
-	</p><div class="figure"><a name="fig-account-setup1"></a><div class="mediaobject"><img src="./figs/account/image001.jpg" alt="
-			Account Sign up screen.
-        "></div><p class="title"><b>Figure 10. Account Sign up Screen</b></p></div><p>
-	Press <b class="guibutton">Continue</b> once you are done. The next screen (<a href="s1-reg.php#fig-account-setup2" title="Figure 11. Confirm Account Details">Figure 11</a>)
-	shows your account detail. Press <b class="guibutton">Submit</b> to confirm.
-	</p><div class="figure"><a name="fig-account-setup2"></a><div class="mediaobject"><img src="./figs/account/image002.jpg" alt="
-			Confirm account details.
-        "></div><p class="title"><b>Figure 11. Confirm Account Details</b></p></div><p>
-	An email will be sent to the email address you provided advising your application is being processed.
-	Once the account is approved another email will be sent to you advising your login name and
-	<i class="firstterm">PIN code</i>. The example email is shown in <a href="s1-reg.php#fig-account-setup3" title="Figure 12. Example Email">Figure 12</a>.
-	</p><div class="figure"><a name="fig-account-setup3"></a><div class="mediaobject"><img src="./figs/account/image003.jpg" alt="
-			Example email.
-        "></div><p class="title"><b>Figure 12. Example Email</b></p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note:  Note "><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left"> Note </th></tr><tr><td colspan="2" align="left" valign="top"><p>
-	In the example, the Login name is <i class="wordasword">snowlet</i>, while the PIN code is
-	<i class="wordasword">0000</i>. They are the information you use to access Fedora
-	translation status page, to take or release a file, to apply to be a maintainer,
-	or to approve a QA'ed file.
-	</p></td></tr></table></div><p>
-	Once the account is activated, we can setup <b class="application">TortoiseCVS</b> to
-	download Fedora files.
-	</p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-ssh.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="s1-setup.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">3. Generate Your Digital ID </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 5. Using TortoiseCVS</td></tr></table></div>
-
+      Provide all basic information including a login name, your real
+      name, a valid email address, the language or locale you are going
+      to translate, and the SSH public key generated in the previous
+      step.  Refer to <a href="s1-ssh.php" title="3. Generate a Digital ID">Section 3, â??Generate a Digital IDâ??</a> and
+      <a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9, â??Key Generation In Progressâ??</a> if you have not already generated
+      a key pair. This step is illustrated in
+      <a href="s1-reg.php#fig-account-setup1" title="Figure 10. Account Sign up Screen">Figure 10, â??Account Sign up Screenâ??</a>.
+    </p><div class="figure"><a name="fig-account-setup1"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/account/image001.jpg" alt="Account Sign up screen."></div></div><p class="title"><b>Figure 10. Account Sign up Screen</b></p></div><br class="figure-break"><p>
+      Press <span><strong class="guibutton">Continue</strong></span> once you are done. The next
+      screen, <a href="s1-reg.php#fig-account-setup2" title="Figure 11. Confirm Account Details">Figure 11, â??Confirm Account Detailsâ??</a>, shows your account
+      detail. Press <span><strong class="guibutton">Submit</strong></span> to confirm.
+    </p><div class="figure"><a name="fig-account-setup2"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/account/image002.jpg" alt="Confirm account details."></div></div><p class="title"><b>Figure 11. Confirm Account Details</b></p></div><br class="figure-break"><p>
+      An email is sent to the email address you provided, advising your
+      application is being processed. Once the account is approved,
+      another email is sent to you providing your login name and
+      <em class="firstterm">PIN code</em>. The example email is shown in
+      <a href="s1-reg.php#fig-account-setup3" title="Figure 12. Example Email">Figure 12, â??Example Emailâ??</a>.
+    </p><div class="figure"><a name="fig-account-setup3"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/account/image003.jpg" alt="Example email."></div></div><p class="title"><b>Figure 12. Example Email</b></p></div><br class="figure-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: Login and PIN"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left">Login and PIN</th></tr><tr><td align="left" valign="top"><p>
+	In the example, the Login name is
+	<em class="wordasword">snowlet</em>, while the PIN code is
+	<em class="wordasword">0000</em>. Use this information to access
+	Fedora translation status page, to take or release a file, to
+	apply to be a maintainer, or to approve a file that has passed
+	quality assurance testing.
+      </p></td></tr></table></div><p>
+      Once the account is activated, continue with <a href="s1-setup.php" title="5. Using TortoiseCVS">Section 5, â??Using TortoiseCVSâ??</a> to setup
+      <span><strong class="application">TortoiseCVS</strong></span> and download Fedora files.
+    </p></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-ssh.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-setup.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">3. Generate a Digital ID </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 5. Using TortoiseCVS</td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-resource.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-resource.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-resource.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-resource.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,42 +2,34 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">8. Other Resources</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-cycle.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="generated-index.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-resource"></a>8. Other Resources</h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-resource-website"></a>8.1.  Related Websites </h3></div></div><div></div></div><a class="indexterm" name="id2888814"></a><div class="variablelist"><dl><dt><span class="term"> Official website of <b class="application">TortoiseCVS</b></span></dt><dd><p>
-	</p><pre class="screen">
-	<a href="http://www.tortoisecvs.org/"; target="_top">http://www.tortoisecvs.org/</a>
-	</pre><p>
-    </p></dd><dt><span class="term"> Official website of <b class="application">poEdit</b></span></dt><dd><p>
-	</p><pre class="screen">
-	<a href="http://poedit.sourceforge.net/"; target="_top">http://poedit.sourceforge.net/</a>
-	</pre><p>
-    </p></dd><dt><span class="term"> Official website of <b class="application">PuTTY</b></span></dt><dd><p>
-	</p><pre class="screen">
-	<a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"; target="_top">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>
-	</pre><p>
-    </p></dd><dt><span class="term">  <b class="application">WinCvs</b> CVS Client </span></dt><dd><p>
-	<b class="application">WinCvs</b> is an alternative CVS client you can use. The following article
-	describes its installation steps in detail.
-	</p><pre class="screen">
-	<a href="http://sourceforge.net/docman/display_doc.php?docid=766&amp;group_id=1"; target="_top">http://sourceforge.net/docman/display_doc.php?docid=766&amp;group_id=1</a>
-	</pre><p>
-    </p></dd><dt><span class="term"> A good CVS guide</span></dt><dd><p>
-	</p><pre class="screen">
-	<a href="http://www.loria.fr/~molli/cvs/doc/cvs_toc.html"; target="_top">http://www.loria.fr/~molli/cvs/doc/cvs_toc.html</a>
-	</pre><p>
-    </p></dd></dl></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-resource-feedback"></a>8.2.  Your Feedback </h3></div></div><div></div></div><p>
-Your feedback is always welcome! If you have spotted any typo or errors, please contact
-<a href="mailto:ccheng@xxxxxxxxxx?subject=%5BFedora%20translation%20in%20Windows%5D%20"; target="_top">Chester Cheng</a>,
-or simply discuss it through <a href="http://www.redhat.com/mailman/listinfo/fedora-trans-list"; target="_top">
-Fedora Translation List</a>.
-</p><p>
-Hope this article has helped you to set things up.  Looking forward to hearing from you!
-</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-cycle.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="generated-index.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">7. Translation Lifecycle </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> Index</td></tr></table></div>
-
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">8. Other Resources</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-cycle.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="generated-index.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-resource"></a>8. Other Resources</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-resource-website"></a>8.1.  Related Websites </h3></div></div></div><a class="indexterm" name="id3030626"></a><div class="variablelist"><dl><dt><span class="term">Official website of
+	    <span><strong class="application">TortoiseCVS</strong></span></span></dt><dd><p>
+	      <a href="http://www.tortoisecvs.org/"; target="_top">http://www.tortoisecvs.org/</a>
+	    </p></dd><dt><span class="term">Official website of
+	    <span><strong class="application">poEdit</strong></span></span></dt><dd><p>
+	      <a href="http://poedit.sourceforge.net/"; target="_top">http://poedit.sourceforge.net/</a>
+	    </p></dd><dt><span class="term">Official website of
+	    <span><strong class="application">PuTTY</strong></span></span></dt><dd><p>
+	      <a href="http://www.chiark.greenend.org.uk/~sgtatham/putty/"; target="_top">http://www.chiark.greenend.org.uk/~sgtatham/putty/</a>
+	    </p></dd><dt><span class="term"><span><strong class="application">WinCvs</strong></span> CVS Client</span></dt><dd><p>
+	      <span><strong class="application">WinCvs</strong></span> is an alternative CVS
+	      client you can use. The following article describes its
+	      installation steps in detail: <a href="http://sourceforge.net/docman/display_doc.php?docid=766&amp;group_id=1"; target="_top">http://sourceforge.net/docman/display_doc.php?docid=766&amp;group_id=1</a>
+	    </p></dd><dt><span class="term">A good CVS guide</span></dt><dd><p>
+	      <a href="http://www.loria.fr/~molli/cvs/doc/cvs_toc.html"; target="_top">http://www.loria.fr/~molli/cvs/doc/cvs_toc.html</a>
+	    </p></dd></dl></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-resource-feedback"></a>8.2. Your Feedback</h3></div></div></div><p>
+	Your feedback is always welcome. If you spot any typo or errors
+	in this document, please contact <a href="mailto:ccheng@xxxxxxxxxx?subject=%5BFedora%20translation%20in%20%20%20%20Windows%5D%20"; target="_top">Chester Cheng</a>, or simply discuss it through
+	<a href="http://www.redhat.com/mailman/listinfo/fedora-trans-list"; target="_top"> 
+	  Fedora Translation List</a>.  You can also file a bug in
+	Bugzilla against the product "Fedora Documentation," and the
+	component "translation-guide-windows."
+      </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-cycle.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="generated-index.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">7. Translation Lifecycle </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> Index</td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-setup.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-setup.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-setup.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-setup.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,77 +2,77 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">5. Using TortoiseCVS</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-reg.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-poedit.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-setup"></a>5. Using TortoiseCVS</h2></div></div><div></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-setup-setup"></a>5.1.  Set up <b class="application">TortoiseCVS</b> </h3></div></div><div></div></div><a class="indexterm" name="id2821547"></a><p>
-      To connect <b class="application">TortoiseCVS</b> to Fedora Translation Project CVS repository, you
-	  need to first setup the environment. These steps only need be done once. Right-click in
-	  <b class="application">Windows Explorer</b>, choose <b class="guimenu">CVS</b> =&gt;
-	  <b class="guimenuitem">Preferences&#8230;</b> as shown in <a href="s1-setup.php#fig-setup-setup1" title="Figure 13. Setup Preferences">Figure 13</a>.
-    </p><div class="figure"><a name="fig-setup-setup1"></a><div class="mediaobject"><img src="./figs/setup/image001.jpg" alt="
-			Setup preferences.
-        "></div><p class="title"><b>Figure 13. Setup Preferences</b></p></div><p>In <b class="guilabel">Preferences</b> popup window, click the <b class="guilabel">Tools</b> tab.
-	Add the parameter <tt class="option">&#8211;i <i class="replaceable"><tt>&lt;Your Private Key&gt;</tt></i></tt> as shown in
-	<a href="s1-setup.php#fig-setup-setup2" title="Figure 14. TortoiseCVS Preferences Window - Tools">Figure 14</a>. <i class="replaceable"><tt>&lt;Your Private Key&gt;</tt></i> is the private
-	key you generated and saved on your computer. Its corresponding public key has been
-	used to apply the Fedora account in <a href="s1-reg.php#fig-account-setup1" title="Figure 10. Account Sign up Screen">Figure 10</a>.
-	</p><div class="figure"><a name="fig-setup-setup2"></a><div class="mediaobject"><img src="./figs/setup/image002.jpg" alt="
-			TortoiseCVS Preferences Window - Tools
-        "></div><p class="title"><b>Figure 14. TortoiseCVS Preferences Window - Tools</b></p></div><p>
-	The next thing needs to be setup is <b class="guilabel">Network compression</b> (as shown in
-	<a href="s1-setup.php#fig-setup-setup3" title="Figure 15. TortoiseCVS Preferences Window - Advanced">Figure 15</a>), which will effectively speedup checkout process.
-	Set <b class="userinput"><tt>9 - Best</tt></b> for best compression if you have a powerful CPU.
-	</p><p>
-	Press <b class="guibutton">OK</b> when you're done. Now you are ready to download files from the Fedora server.
-	</p><div class="figure"><a name="fig-setup-setup3"></a><div class="mediaobject"><img src="./figs/setup/image003.jpg" alt="
-			TortoiseCVS Preferences Window - Advanced
-        "></div><p class="title"><b>Figure 15. TortoiseCVS Preferences Window - Advanced</b></p></div></div><div class="sect2" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-setup-download"></a>5.2.  Download Files from Fedora Server </h3></div></div><div></div></div><a class="indexterm" name="id2876822"></a><p>
-	To download files from the Fedora server for the first time, it is important to tell
-	<b class="application">TortoiseCVS</b> where to find them. Again, these only need to be done once.
-	The information are in the email sent to you when your account is activated. You may refer to the
-	following example, but don't forget to change 'snowlet' into your own username.
-	</p><p>
-	To start this, right click in <b class="application">Windows Explorer</b>, choose
-	<b class="guimenuitem">CVS checkout</b> (also referred as "cvs co"). See <a href="s1-setup.php#fig-account-setup31" title="Figure 16. CVS Checkout Menu">Figure 16</a>.
-	</p><div class="figure"><a name="fig-account-setup31"></a><div class="mediaobject"><img src="./figs/tortoise/cvs_right_click_menu.jpg" alt="
-			CVS Checkout menu.
-        "></div><p class="title"><b>Figure 16. CVS Checkout Menu</b></p></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note:  Note "><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left"> Note </th></tr><tr><td colspan="2" align="left" valign="top"><p>
-	Sometimes <b class="guimenuitem">CVS checkout</b> menu just doesn't appear.
-	Try to perform this action in "C:\" root directory.
-	</p></td></tr></table></div><p>
-	You can find the <i class="wordasword">CVSROOT</i> in the email Fedora had sent you.
-	The information in <a href="s1-setup.php#fig-account-setup32" title="Figure 17. CVS Root and Module">Figure 17</a> is for your reference only. Don't forget to change the
-	<b class="guilabel">User name:</b> field to match your own account. The module for Fedora translation
-	is <tt class="filename">translate</tt>.
-	</p><div class="figure"><a name="fig-account-setup32"></a><div class="mediaobject"><img src="./figs/tortoise/cvs_cvsroot_module.jpg" alt="
-			CVS root and module.
-        "></div><p class="title"><b>Figure 17. CVS Root and Module</b></p></div><p>
-	Press <b class="guibutton">OK</b> will lead you to <a href="s1-setup.php#fig-account-setup33" title="Figure 18. TortoisePlink">Figure 18</a>.
-	</p><div class="figure"><a name="fig-account-setup33"></a><div class="mediaobject"><img src="./figs/tortoise/cvs_tortoisePlink.jpg" alt="
-			TortoisePlink.
-        "></div><p class="title"><b>Figure 18. TortoisePlink</b></p></div><p>
-	Here, <b class="application">TortoiseCVS</b> is trying to connect Fedora CVS repository to get all
-	the files needed. Your passphrase of your private key is required before you go on. Press
-	<b class="guibutton">OK</b> after you input the passphrase.
-	</p><p>
-	<b class="application">TortoiseCVS</b> is downloading files from Fedora server
-	(<a href="s1-setup.php#fig-tortoise-co" title="Figure 19. Checking out Files">Figure 19</a>). It's time to take a
-	break before we go on to the next screen.
-	</p><div class="figure"><a name="fig-tortoise-co"></a><div class="mediaobject"><img src="./figs/tortoise/cvs_co.jpg" alt="
-			Checking out files.
-        "></div><p class="title"><b>Figure 19. Checking out Files</b></p></div><p>
-	Done! You'll find a folder called <tt class="filename">translate</tt> that contains all the files for
-	different locales and packages (<a href="s1-setup.php#fig-tortoise-cvs20" title='Figure 20. "translate" Folder'>Figure 20</a>).
-	</p><div class="figure"><a name="fig-tortoise-cvs20"></a><div class="mediaobject"><img src="./figs/tortoise/cvs20.jpg" alt='
-			"translate" folder.
-        '></div><p class="title"><b>Figure 20. "translate" Folder</b></p></div><p>
-	To edit these files, you can use plain text editor, or specialised po file editors, such as
-	<b class="application">poEdit</b>. The following section will discuss about this tool.
-	</p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-reg.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="s1-poedit.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">4. Register Your Fedora Account </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 6.  poEdit </td></tr></table></div>
-
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">5. Using TortoiseCVS</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-reg.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-poedit.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-setup"></a>5. Using TortoiseCVS</h2></div></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-setup-setup"></a>5.1.  Set up <span><strong class="application">TortoiseCVS</strong></span> </h3></div></div></div><a class="indexterm" name="id2989910"></a><p>
+	To connect <span><strong class="application">TortoiseCVS</strong></span> to Fedora
+	Translation Project CVS repository, first set up the
+	environment. Perform these steps only once.</p><div class="procedure"><ol type="1"><li><p>Right-click in <span><strong class="application">Windows
+	      Explorer</strong></span>, choose <span><strong class="guimenu">CVS</strong></span> â?? <span><strong class="guimenuitem">Preferences...</strong></span> as
+	    shown in <a href="s1-setup.php#fig-setup-setup1" title="Figure 13. Setup Preferences">Figure 13, â??Setup Preferencesâ??</a>.
+	  </p><div class="figure"><a name="fig-setup-setup1"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/setup/image001.jpg" alt="Setup preferences."></div></div><p class="title"><b>Figure 13. Setup Preferences</b></p></div><br class="figure-break"></li><li><p>In the <span><strong class="guilabel">Preferences</strong></span> popup window,
+	    click the <span><strong class="guilabel">Tools</strong></span> tab. Add the parameter
+	    <code class="option">-i <em class="replaceable"><code>&lt;Your Private
+		Key&gt;</code></em></code> as shown in <a href="s1-setup.php#fig-setup-setup2" title="Figure 14. TortoiseCVS Preferences Window - Tools">Figure 14, â??TortoiseCVS Preferences Window - Toolsâ??</a>.
+	    <em class="replaceable"><code>&lt;Your Private Key&gt;</code></em> is the
+	    file containing the private key you generated and saved on
+	    your computer. Its corresponding public key has been used to
+	    apply the Fedora account in <a href="s1-reg.php#fig-account-setup1" title="Figure 10. Account Sign up Screen">Figure 10, â??Account Sign up Screenâ??</a>.
+	  </p><div class="figure"><a name="fig-setup-setup2"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/setup/image002.jpg" alt="TortoiseCVS Preferences Window - Tools"></div></div><p class="title"><b>Figure 14. TortoiseCVS Preferences Window - Tools</b></p></div><br class="figure-break"></li><li><p>
+	    Set up <span><strong class="guilabel">Network compression</strong></span>, as shown in
+	    <a href="s1-setup.php#fig-setup-setup3" title="Figure 15. TortoiseCVS Preferences Window - Advanced">Figure 15, â??TortoiseCVS Preferences Window - Advancedâ??</a>, to effectively speed up the
+	    checkout process. Set <strong class="userinput"><code>9 - Best</code></strong> for
+	    best compression if you have a powerful CPU.
+	  </p><p>
+	    Press <span><strong class="guibutton">OK</strong></span> when you're done. Now you
+	    are ready to download files from the Fedora server.
+	  </p><div class="figure"><a name="fig-setup-setup3"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/setup/image003.jpg" alt="TortoiseCVS Preferences Window - Advanced"></div></div><p class="title"><b>Figure 15. TortoiseCVS Preferences Window - Advanced</b></p></div><br class="figure-break"></li></ol></div></div><div class="section" lang="en"><div class="titlepage"><div><div><h3 class="title"><a name="s2-setup-download"></a>5.2.  Download Files from Fedora Server </h3></div></div></div><a class="indexterm" name="id2990196"></a><p>
+	To download files from the Fedora server for the first time, you
+	must tell <span><strong class="application">TortoiseCVS</strong></span> where to find
+	them. This procedure only needs to be done once. The required
+	information is in the email you received when your account was
+	activated. When referring to the following example, remember to
+	change <code class="literal">snowlet</code> into your own username.
+      </p><div class="procedure"><ol type="1"><li><p>
+	    Right click in <span><strong class="application">Windows Explorer</strong></span>,
+	    and choose <span><strong class="guimenuitem">CVS checkout</strong></span>, as shown
+	    in <a href="s1-setup.php#fig-account-setup31" title="Figure 16. CVS Checkout Menu">Figure 16, â??CVS Checkout Menuâ??</a>.
+	  </p><div class="figure"><a name="fig-account-setup31"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/cvs_right_click_menu.jpg" alt="CVS Checkout menu."></div></div><p class="title"><b>Figure 16. CVS Checkout Menu</b></p></div><br class="figure-break"><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: CVS Checkout Missing"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left">CVS Checkout Missing</th></tr><tr><td align="left" valign="top"><p>
+	      Sometimes the <span><strong class="guimenuitem">CVS checkout</strong></span> menu
+	      does not appear. Try to perform this action in the
+	      <code class="filename">C:\</code> root directory.
+	    </p></td></tr></table></div></li><li><p>
+	    Locate the <em class="wordasword">CVSROOT</em> in the email you
+	    received during account setup. The information in <a href="s1-setup.php#fig-account-setup32" title="Figure 17. CVS Root and Module">Figure 17, â??CVS Root and Moduleâ??</a> is for your reference
+	    only. Remember to change the <span><strong class="guilabel">User name:</strong></span>
+	    field to match your own account. The module for Fedora
+	    translation is <code class="filename">translate</code>.
+	  </p><div class="figure"><a name="fig-account-setup32"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/cvs_cvsroot_module.jpg" alt="CVS root and module."></div></div><p class="title"><b>Figure 17. CVS Root and Module</b></p></div><br class="figure-break"></li><li><p>
+	    Press <span><strong class="guibutton">OK</strong></span> to display the dialog shown
+	    in <a href="s1-setup.php#fig-account-setup33" title="Figure 18. TortoisePlink">Figure 18, â??TortoisePlinkâ??</a>.
+	  </p><div class="figure"><a name="fig-account-setup33"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/cvs_tortoisePlink.jpg" alt="TortoisePlink."></div></div><p class="title"><b>Figure 18. TortoisePlink</b></p></div><br class="figure-break"></li><li><p>
+	    <span><strong class="application">TortoiseCVS</strong></span> tries to connect to
+	    the Fedora CVS repository to retrieve all the files needed.
+	    The passphrase of your private key is required to proceed.
+	    Press <span><strong class="guibutton">OK</strong></span> after you input the
+	    passphrase.
+	  </p></li><li><p>
+	    <span><strong class="application">TortoiseCVS</strong></span> downloads the files
+	    from the Fedora server, as shown in <a href="s1-setup.php#fig-tortoise-co" title="Figure 19. Checking out Files">Figure 19, â??Checking out Filesâ??</a>.  Downloading may take some
+	    time to complete.
+	  </p><div class="figure"><a name="fig-tortoise-co"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/cvs_co.jpg" alt="Checking out files."></div></div><p class="title"><b>Figure 19. Checking out Files</b></p></div><br class="figure-break"></li><li><p>
+	    Locate the folder called <code class="filename">translate</code> that
+	    contains all the files for different locales and packages,
+	    as shown in <a href="s1-setup.php#fig-tortoise-cvs20" title='Figure 20. "translate" Folder'>Figure 20, â??"translate" Folderâ??</a>.
+	  </p><div class="figure"><a name="fig-tortoise-cvs20"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/tortoise/cvs20.jpg" alt='"translate" folder.'></div></div><p class="title"><b>Figure 20. "translate" Folder</b></p></div><br class="figure-break"></li></ol></div><p>
+	To edit these files, you can use a plain text editor such as
+	<span><strong class="application">Notepad</strong></span>, or specialised PO file
+	editors, such as <span><strong class="application">poEdit</strong></span>. The
+	following section discusses this tool.
+      </p></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-reg.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-poedit.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">4. Register Your Fedora Account </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 6. <span><strong class="application">poEdit</strong></span></td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');


Index: s1-ssh.php
===================================================================
RCS file: /cvs/fedora/web/html/docs/translation-windows/s1-ssh.php,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- s1-ssh.php	8 Dec 2005 11:01:03 -0000	1.1
+++ s1-ssh.php	14 Aug 2007 15:20:10 -0000	1.2
@@ -2,51 +2,50 @@
 
 include("site.inc");
 $template = new Page;
-$template->initCommon(); 
+$template->initCommon();
 $template->displayHeader();
 
 ?>
 
-<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3. Generate Your Digital ID</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-cvs.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-reg.php">Next</a></td></tr></table><hr></div><div class="sect1" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-ssh"></a>3. Generate Your Digital ID</h2></div></div><div></div></div><a class="indexterm" name="id2871146"></a><p>
-      For security purpose, a pair of keys &#8212; private key and public key &#8212; is required to identify yourself.
-	  To generate the key pair, open your <b class="application">Windows Explorer</b>, and go to
-	  <tt class="filename">C:\Program Files\TortoiseCVS</tt> (or other folder where you installed
-	  <b class="application">TortoiseCVS</b>), then double-click <tt class="filename">puttygen.exe</tt> as shown
-	  in <a href="s1-ssh.php#fig-key-setup1" title="Figure 6. Start puttygen Program">Figure 6</a>.
-    </p><div class="figure"><a name="fig-key-setup1"></a><div class="mediaobject"><img src="./figs/key/image001.jpg" alt="
-			Start puttygen program.
-        "></div><p class="title"><b>Figure 6. Start puttygen Program</b></p></div><p>
-	Choose SSH2 DSA in <b class="guilabel">Parameters</b> (step 1), then press
-	<b class="guibutton">Generate</b> (step 2) as shown
-	in <a href="s1-ssh.php#fig-key-setup2" title="Figure 7. Generate DSA Keys">Figure 7</a>.
-	</p><div class="figure"><a name="fig-key-setup2"></a><div class="mediaobject"><img src="./figs/key/image002.jpg" alt="
-			Generate dsa keys.
-        "></div><p class="title"><b>Figure 7. Generate DSA Keys</b></p></div><p>
-	Move your mouse around the screen to generate the key pairs, as shown in <a href="s1-ssh.php#fig-key-setup3" title="Figure 8. Key Generation In Progress">Figure 8</a>.
-	</p><div class="figure"><a name="fig-key-setup3"></a><div class="mediaobject"><img src="./figs/key/image003.jpg" alt="
-			Key generation in progress.
-        "></div><p class="title"><b>Figure 8. Key Generation In Progress</b></p></div><p>
-	After the key pair is generated, enter some comment for this key pair (or accept the default comment).
-	Don&#8217;t forget to input the <i class="firstterm">key passphrase</i> twice to protect your private key.
-	This &#8220;key passphrase&#8221; will be used every time you connect to the Fedora CVS repository to get the
-	latest documents. (As shown in <a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9</a> step 1.)
-	</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Important: Important"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="./stylesheet-images/important.png"></td><th align="left">Important</th></tr><tr><td colspan="2" align="left" valign="top"><p>
-	It is very important to save your public and private keys in a safe place.
-	To save these keys, press <b class="guibutton">Save public key</b> and <b class="guibutton">Save private key</b>
-	as shown in <a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9</a> step 2.
-	</p></td></tr></table></div><div class="figure"><a name="fig-key-setup4"></a><div class="mediaobject"><img src="./figs/key/image004.jpg" alt="
-			Key generation in progress.
-        "></div><p class="title"><b>Figure 9. Key Generation In Progress</b></p></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Tip:  Tip "><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="./stylesheet-images/tip.png"></td><th align="left"> Tip </th></tr><tr><td colspan="2" align="left" valign="top"><p>
-	The text circled in yellow (<a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9</a>) is your public key that needs
-	to be copied and pasted when registering an
-	account (refer to <a href="s1-reg.php" title="4. Register Your Fedora Account">Section 4, &#8220;Register Your Fedora Account&#8221;</a> for more information). You may want to leave this windows open
-	for later use.
-	</p></td></tr></table></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note:  Note "><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left"> Note </th></tr><tr><td colspan="2" align="left" valign="top"><p>
-	It doesn&#8217;t matter where you save your keys
-	or what filenames you save them as. In this example, the filename <tt class="filename">id_dsa.ppk</tt> is used.
-	It is also important to make a copy of your key pairs and store in a safe place.
-	</p></td></tr></table></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-cvs.php">Prev</a> </td><td width="20%" align="center"><a accesskey="u" href="index.php">Up</a></td><td width="40%" align="right"> <a accesskey="n" href="s1-reg.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">2. Download and Install TortoiseCVS </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 4. Register Your Fedora Account</td></tr></table></div>
-
+<div class="navheader"><table width="100%" summary="Navigation header"><tr><th colspan="3" align="center">3. Generate a Digital ID</th></tr><tr><td width="20%" align="left"><a accesskey="p" href="s1-cvs.php">Prev</a> </td><th width="60%" align="center"> </th><td width="20%" align="right"> <a accesskey="n" href="s1-reg.php">Next</a></td></tr></table><hr></div><div class="section" lang="en"><div class="titlepage"><div><div><h2 class="title" style="clear: both"><a name="s1-ssh"></a>3. Generate a Digital ID</h2></div></div></div><a class="indexterm" name="id2977036"></a><p>
+      For security purposes, you identify yourself to the Fedora Project
+      with a <em class="firstterm">key pair</em> that consists of a public
+      and a private key. To generate the key pair, follow this
+      procedure.</p><div class="procedure"><ol type="1"><li><p>Open <span><strong class="application">Windows Explorer</strong></span>, and
+	  navigate to the folder where you installed
+	  <span><strong class="application">TortoiseCVS</strong></span>. In a default
+	  installation, this folder is <code class="filename">C:\Program
+	    Files\TortoiseCVS</code>.  Double-click
+	  <code class="filename">puttygen.exe</code> as shown in <a href="s1-ssh.php#fig-key-setup1" title="Figure 6. Start puttygen Program">Figure 6, â??Start puttygen Programâ??</a>.</p><div class="figure"><a name="fig-key-setup1"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/key/image001.jpg" alt="Start puttygen program."></div></div><p class="title"><b>Figure 6. Start puttygen Program</b></p></div><br class="figure-break"></li><li><p>
+	  Choose SSH2 DSA in <span><strong class="guilabel">Parameters</strong></span>, then press
+	  <span><strong class="guibutton">Generate</strong></span> as shown in
+	  <a href="s1-ssh.php#fig-key-setup2" title="Figure 7. Generate DSA Keys">Figure 7, â??Generate DSA Keysâ??</a>.
+	</p><div class="figure"><a name="fig-key-setup2"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/key/image002.jpg" alt="Generate dsa keys."></div></div><p class="title"><b>Figure 7. Generate DSA Keys</b></p></div><br class="figure-break"></li><li><p>
+	  Move your mouse around the screen to generate the key pairs,
+	  as shown in <a href="s1-ssh.php#fig-key-setup3" title="Figure 8. Key Generation In Progress">Figure 8, â??Key Generation In Progressâ??</a>.
+	</p><div class="figure"><a name="fig-key-setup3"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/key/image003.jpg" alt="Key generation in progress."></div></div><p class="title"><b>Figure 8. Key Generation In Progress</b></p></div><br class="figure-break"></li><li><p>
+	  After the key pair is generated, enter some comment for this
+	  key pair (or accept the default comment).  Input the
+	  <em class="firstterm">key passphrase</em> twice to protect your
+	  private key.  Use this "key passphrase" every time you connect
+	  to the Fedora CVS repository to get the latest documents, as
+	  shown in <a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9, â??Key Generation In Progressâ??</a>, area 1.
+	</p><div class="important" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Important: Important"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Important]" src="./stylesheet-images/important.png"></td><th align="left">Important</th></tr><tr><td align="left" valign="top"><p>
+	    Save your public and private keys in a safe place. To save
+	    these keys, press <span><strong class="guibutton">Save public key</strong></span> and
+	    <span><strong class="guibutton">Save private key</strong></span> as shown in <a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9, â??Key Generation In Progressâ??</a>, area 2.
+	  </p></td></tr></table></div><div class="figure"><a name="fig-key-setup4"></a><div class="figure-contents"><div class="mediaobject"><img src="./figs/key/image004.jpg" alt="Key generation in progress."></div></div><p class="title"><b>Figure 9. Key Generation In Progress</b></p></div><br class="figure-break"></li></ol></div><div class="tip" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Tip: The Public Key"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Tip]" src="./stylesheet-images/tip.png"></td><th align="left">The Public Key</th></tr><tr><td align="left" valign="top"><p>
+	The text circled in yellow (<a href="s1-ssh.php#fig-key-setup4" title="Figure 9. Key Generation In Progress">Figure 9, â??Key Generation In Progressâ??</a>) is
+	the public key you must copy and paste when registering an
+	account.  Refer to <a href="s1-reg.php" title="4. Register Your Fedora Account">Section 4, â??Register Your Fedora Accountâ??</a> for more
+	information. You may want to leave this window open for later
+	use.
+      </p></td></tr></table></div><div class="note" style="margin-left: 0.5in; margin-right: 0.5in;"><table border="0" summary="Note: Filenames"><tr><td rowspan="2" align="center" valign="top" width="25"><img alt="[Note]" src="./stylesheet-images/note.png"></td><th align="left">Filenames</th></tr><tr><td align="left" valign="top"><p>
+	It does not matter where you save your keys, or what filenames
+	you use to save them. In this example, the filename
+	<code class="filename">id_dsa.ppk</code> is used.
+      </p></td></tr></table></div></div><div class="navfooter"><hr><table width="100%" summary="Navigation footer"><tr><td width="40%" align="left"><a accesskey="p" href="s1-cvs.php">Prev</a> </td><td width="20%" align="center"> </td><td width="40%" align="right"> <a accesskey="n" href="s1-reg.php">Next</a></td></tr><tr><td width="40%" align="left" valign="top">2. Download and Install
+      <span><strong class="application">TortoiseCVS</strong></span> </td><td width="20%" align="center"><a accesskey="h" href="index.php">Home</a></td><td width="40%" align="right" valign="top"> 4. Register Your Fedora Account</td></tr></table></div>
 <?
 
 $template->displayFooter('$Date$');