Merge lp:~dylanmccall/harvest/bug-627603 into lp:harvest

[Dylan McCall]

Improves some writing in the FAQ section of the landing page and makes all the strings on that page translatable.

[Daniel Holbach (dholbach)]

Good work.

review: Approve

=== modified file 'harvest/templates/index.html'
--- harvest/templates/index.html	2010-08-31 08:07:19 +0000
+++ harvest/templates/index.html	2010-08-31 23:54:44 +0000
@@ -10,9 +10,7 @@
 <div id="start">
 	<div id="introduction">
 		<h2 class="sectiontitle">{% trans "Welcome to Harvest" %}</h2>
-		{% blocktrans %}
-		<p>Harvest makes it easy to find low-hanging opportunities in Ubuntu. It aggregates the mass of todo lists we use every day so it's simple to find and coordinate work.</p>
-		{% endblocktrans %}
+		<p>{% blocktrans %}Harvest makes it easy to find low-hanging opportunities in Ubuntu. It aggregates the mass of todo lists we use every day so it's simple to find and coordinate work.{% endblocktrans %}</p>
 	</div>
 	
 	<div id="start_links"><nav>
@@ -33,19 +31,19 @@
 	<div>
 	<ul>
 		<li>
-		<span class="question">What can I do with Harvest?</span>
-		<p>Harvest helps find bugs that could be easy to address, as well as changes that can improve packages. When updating your packages, take a look at the available opportunities to get a feel for what's new both in and outside Ubuntu.</p>
-		</li>
-		
-		<li>
-		<span class="question">Why should I log in?</span>
-		<p>You can log in with your Launchpad account to help us organise opportunities in Harvest. A new Edit button will appear so you can review opportunities. Mark them Irrelevant if they don't apply to us or Applied if they have already been handled.</p>
-		<li>
-		</li>
-		
-		<li>
-		<span class="question">What are Notes?</span>
-		<p>Notes are short messages you can stick to opportunities for other Harvest users to see. They don't use much space, so just add them whenever they might help. For example, if you mark an opportunity Irrelevant, you can add a note explaining why.</p>
+		<span class="question">{% trans "What can I do with Harvest?" %}</span>
+		<p>{% blocktrans %}Harvest helps find bugs that could be easy to address, as well as changes that can improve packages. When updating your packages, take a look at the available opportunities to get a feel for what's new both in and outside Ubuntu.{% endblocktrans %}</p>
+		</li>
+		
+		<li>
+		<span class="question">{% trans "Why should I log in?" %}</span>
+		<p>{% blocktrans %}You can log in with your Launchpad account to help us organise opportunities in Harvest. Click an opportunity's Edit button to review it, then mark it Irrelevant if it doesn't apply to us or Applied if it's been handled.{% endblocktrans %}</p>
+		<li>
+		</li>
+		
+		<li>
+		<span class="question">{% trans "What are Notes?" %}</span>
+		<p>{% blocktrans %}Notes are short messages you can stick to opportunities for other Harvest users to see. They don't use much space, so just add them whenever they might help. For example, if you mark an opportunity Irrelevant, you can add a note explaining why.{% endblocktrans %}</p>
 		</li>
 	</ul>
 	</div>
@@ -53,13 +51,13 @@
 	<div>
 	<ul>
 		<li>
-		<span class="question">Why is Harvest the way it is?</span>
-		<p>Harvest is based on a simple design: let others do the hard work of assembling lists. Harvest just knows packages, lists and opportunities. It doesn't know what an open or fixed bug is or who upstream is.</p>
+		<span class="question">{% trans "Why is Harvest the way it is?" %}</span>
+		<p>{% blocktrans %}Harvest is based on a simple design: let others do the hard work of assembling lists. Harvest just knows packages, lists and opportunities. It doesn't know what an open or fixed bug is or who upstream is.{% endblocktrans %}</p>
 		</li>
 
 		<li>
-		<span class="question">I think I found a bug. What do I do?</span>
-		<p>If it's about the UI or the functionality of the page, please file a bug on <a href="http://bugs.launchpad.net/harvest/+filebug">harvest</a> in Launchpad. If it's about some piece of data that's on the harvest page, it's likely a bug in one of the scripts that fetches the data. In that case, please file it on <a href="https://bugs.launchpad.net/harvest-data/+filebug">harvest-data</a> instead. The <a href="http://bazaar.launchpad.net/~harvest-dev/harvest/trunk/annotate/head:/HACKING">hacking guide</a> has more information about that.</p>
+		<span class="question">{% trans "I found a bug. What do I do?" %}</span>
+		<p>{% blocktrans %}If it's about the UI or the functionality of the site, please file a bug on <a href="http://bugs.launchpad.net/harvest/+filebug">harvest</a> in Launchpad. If it's about some piece of data in Harvest, it's likely a script that fetches it. In that case, please file your bug on <a href="https://bugs.launchpad.net/harvest-data/+filebug">harvest-data</a> instead. The <a href="http://bazaar.launchpad.net/~harvest-dev/harvest/trunk/annotate/head:/HACKING">hacking guide</a> explains more.{% endblocktrans %}</p>
 		</li>
 	</ul>
 	</div>