Incremental diff for test failures:

=== modified file 'lib/lp/answers/stories/answer-contact-report.txt'
--- lib/lp/answers/stories/answer-contact-report.txt	2009-09-18 18:54:36 +0000
+++ lib/lp/answers/stories/answer-contact-report.txt	2009-09-23 14:34:03 +0000
@@ -40,7 +40,7 @@
 
     >>> anon_browser.getLink('Gnome Baker').click()
     >>> print anon_browser.title
-    Questions for Gnome Baker : gnomebaker
+    Questions : gnomebaker
 
 When the user is logged in, and he is visiting this page in his profile
 he will see a link after each project to manage his registration.

=== modified file 'lib/lp/answers/stories/faq-add.txt'
--- lib/lp/answers/stories/faq-add.txt	2009-09-22 08:45:55 +0000
+++ lib/lp/answers/stories/faq-add.txt	2009-09-23 13:23:22 +0000
@@ -29,7 +29,7 @@
     >>> owner_browser.open('http://answers.launchpad.dev/firefox')
     >>> owner_browser.getLink('All FAQs').click()
     >>> print owner_browser.title
-    FAQs for Mozilla Firefox : Questions for Mozilla Firefox : Mozilla Firefox
+    FAQs for Mozilla Firefox : Questions : Mozilla Firefox
 
     >>> print extract_text(
     ...     find_tag_by_id(owner_browser.contents, 'faqs-listing'))
@@ -67,7 +67,7 @@
     >>> owner_browser.url
     'http://answers.launchpad.dev/firefox/+faq/...'
     >>> print owner_browser.title
-    Questions for...
+    Questions : Mozilla Firefox
 
     >>> content = find_main_content(owner_browser.contents)
     >>> extract_text(content.find('div', {'id' : 'faq-keywords'}))
@@ -80,7 +80,7 @@
 
     >>> owner_browser.getLink('List all FAQs').click()
     >>> print owner_browser.title
-    FAQs for Mozilla Firefox : Questions for Mozilla Firefox : Mozilla Firefox
+    FAQs for Mozilla Firefox : Questions : Mozilla Firefox
 
     >>> print extract_text(
     ...     find_tag_by_id(owner_browser.contents, 'faqs-listing'))

=== modified file 'lib/lp/answers/stories/faq-browse-and-search.txt'
--- lib/lp/answers/stories/faq-browse-and-search.txt	2009-09-22 08:45:55 +0000
+++ lib/lp/answers/stories/faq-browse-and-search.txt	2009-09-23 13:44:27 +0000
@@ -19,7 +19,7 @@
     >>> print browser.url
     http://answers.launchpad.dev/kubuntu/+faqs
     >>> print browser.title
-    FAQs for Kubuntu : Questions for Kubuntu - Free KDE-based Linux : Kubuntu
+    FAQs for Kubuntu : Questions : Kubuntu
 
     >>> print extract_text(find_main_content(browser.contents).find('p'))
     There are no FAQs for Kubuntu.
@@ -33,7 +33,7 @@
     >>> browser.open('http://answers.launchpad.dev/ubuntu')
     >>> browser.getLink('All FAQs').click()
     >>> print browser.title
-    FAQs for Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    FAQs for Ubuntu : Questions : Ubuntu
 
 She sees a listing of the current FAQs about Ubuntu:
 
@@ -49,7 +49,7 @@
 
     >>> browser.getLink('Next').click()
     >>> print browser.title
-    FAQs for Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    FAQs for Ubuntu : Questions : Ubuntu
     >>> print extract_text(find_tag_by_id(browser.contents, 'faqs-listing'))
     Wireless Networking Documentation
 
@@ -70,7 +70,7 @@
 
     >>> browser.getLink('How can I play MP3/Divx').click()
     >>> print backslashreplace(browser.title)
-    Questions for...
+    Questions : Ubuntu
     >>> print browser.url
     http://answers.launchpad.dev/ubuntu/+faq/6
 
@@ -78,7 +78,7 @@
 
     >>> browser.getLink('List all FAQs').click()
     >>> print browser.title
-    FAQs for Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    FAQs for Ubuntu : Questions : Ubuntu
     >>> print browser.url
     http://answers.launchpad.dev/ubuntu/+faqs
 
@@ -91,7 +91,7 @@
     >>> browser.getControl(name='field.search_text').value = 'crash on boot'
     >>> browser.getControl('Search', index=0).click()
     >>> print backslashreplace(browser.title)
-    FAQs matching \u201ccrash on boot\u201d for Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    FAQs matching \u201ccrash on boot\u201d for Ubuntu : Questions : Ubuntu
 
 When no matches are found, a simple message is displayed:
 
@@ -123,7 +123,7 @@
 
     >>> browser.getLink('1 question(s)').click()
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
 
     >>> questions = find_tag_by_id(browser.contents, 'question-listing')
     >>> for question in questions.findAll('td', 'questionTITLE'):
@@ -142,7 +142,7 @@
 
     >>> browser.getLink('1 FAQ(s)').click()
     >>> print backslashreplace(browser.title)
-    FAQs matching \u201cplugin\u201d for Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    FAQs matching \u201cplugin\u201d for Ubuntu : Questions : Ubuntu
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'faqs-listing'))
     How can I play MP3/Divx/DVDs/Quicktime/Realmedia files or view
@@ -159,7 +159,7 @@
     ...              '+source/mozilla-firefox')
     >>> browser.getLink('All FAQs').click()
     >>> print browser.title
-    FAQs for Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    FAQs for Ubuntu : Questions : Ubuntu
     >>> print browser.url
     http://answers.launchpad.dev/ubuntu/+faqs
 

=== modified file 'lib/lp/answers/stories/faq-edit.txt'
--- lib/lp/answers/stories/faq-edit.txt	2009-09-17 20:59:14 +0000
+++ lib/lp/answers/stories/faq-edit.txt	2009-09-23 13:46:25 +0000
@@ -11,7 +11,7 @@
     >>> from canonical.launchpad.helpers import backslashreplace
     >>> anon_browser.open('http://answers.launchpad.dev/firefox/+faq/7')
     >>> print backslashreplace(anon_browser.title)
-    Questions for...
+    Questions : Mozilla Firefox
 
     >>> anon_browser.getLink('Edit FAQ')
     Traceback (most recent call last):

=== modified file 'lib/lp/answers/stories/project-add-question.txt'
--- lib/lp/answers/stories/project-add-question.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/answers/stories/project-add-question.txt	2009-09-23 13:46:22 +0000
@@ -129,7 +129,7 @@
     >>> user_browser.url
     '.../thunderbird/+question/...'
     >>> print user_browser.title
-    Questions for...
+    Questions : Mozilla Thunderbird
 
 
 == Supported Language behaviour ==
@@ -329,4 +329,4 @@
     >>> user_browser.url
     '.../thunderbird/+question/...'
     >>> print user_browser.title
-    Questions for...
+    Questions : Mozilla Thunderbird

=== modified file 'lib/lp/answers/stories/question-add-in-other-languages.txt'
--- lib/lp/answers/stories/question-add-in-other-languages.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/answers/stories/question-add-in-other-languages.txt	2009-09-23 13:51:11 +0000
@@ -22,7 +22,7 @@
 
     >>> browser.addHeader('Authorization', 'Basic <email address hidden>:zeca')
     >>> browser.open('http://launchpad.dev/ubuntu/+addquestion')
-    
+
     >>> browser.getControl('Language').displayOptions
     ['English (en) *', 'Portuguese (Brazil) (pt_BR)']
 
@@ -78,7 +78,7 @@
     >>> browser.url
     '.../ubuntu/+question/...'
     >>> print browser.title
-    Questions for...
+    Questions : Ubuntu
 
 The page reports the question language both in the content and in the
 markup. Search engine robots and browsers will use the lang and dir
@@ -155,5 +155,5 @@
     >>> browser.url
     '.../ubuntu/+question/...'
     >>> print browser.title.decode('utf-8')
-    Questions for...
+    Questions : Ubuntu
     >>> portlet = find_tag_by_id(browser.contents, 'portlet-details')

=== modified file 'lib/lp/answers/stories/question-add.txt'
--- lib/lp/answers/stories/question-add.txt	2009-09-20 16:39:15 +0000
+++ lib/lp/answers/stories/question-add.txt	2009-09-23 13:48:18 +0000
@@ -6,7 +6,7 @@
 
     >>> browser.open('http://answers.launchpad.dev/ubuntu')
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
 
 Asking a new question requires logging in:
 
@@ -155,7 +155,7 @@
     >>> user_browser.url
     '.../ubuntu/+source/mozilla-firefox/+question/...'
     >>> user_browser.title
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package...
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
 
     >>> contents = find_main_content(user_browser.contents)
     >>> contents.findChild('div', id='question-details')

=== modified file 'lib/lp/answers/stories/question-answer-contact.txt'
--- lib/lp/answers/stories/question-answer-contact.txt	2009-09-18 18:54:36 +0000
+++ lib/lp/answers/stories/question-answer-contact.txt	2009-09-23 13:51:49 +0000
@@ -150,7 +150,7 @@
 
     >>> browser.open('http://answers.launchpad.dev/ubuntu/')
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
 
     >>> browser.getLink('Set answer contact').click()
     >>> browser.getControl("Landscape Developers").selected = True
@@ -189,11 +189,11 @@
 
     >>> browser.open('http://answers.launchpad.dev/ubuntu/')
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
 
     >>> browser.getLink('Play DVDs in Totem').click()
     >>> print extract_text(browser.title)
-    Questions for...
+    Questions : Ubuntu
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'question-lang'))
     Language: English
@@ -210,7 +210,7 @@
 
     >>> browser.open('http://answers.launchpad.dev/ubuntu/+question/12')
     >>> print browser.title
-    Questions for...
+    Questions : Ubuntu
 
     >>> print extract_text(find_tag_by_id(browser.contents, 'question-lang'))
     Language: Spanish

=== modified file 'lib/lp/answers/stories/question-answers-vhost.txt'
--- lib/lp/answers/stories/question-answers-vhost.txt	2009-09-20 20:58:38 +0000
+++ lib/lp/answers/stories/question-answers-vhost.txt	2009-09-23 13:53:43 +0000
@@ -8,35 +8,35 @@
 
     >>> anon_browser.open('http://answers.launchpad.dev/firefox')
     >>> print anon_browser.title
-    Questions for Mozilla Firefox : Mozilla Firefox
+    Questions : Mozilla Firefox
 
 == Distribution ==
 
     >>> anon_browser.open('http://answers.launchpad.dev/ubuntu')
     >>> print anon_browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
 
 == Soure Package ==
 
     >>> anon_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/+source/mozilla-firefox')
     >>> print anon_browser.title
-    Questions for “mozilla-firefox” package in Ubuntu : “mozilla-firefox” package : Ubuntu
+    Questions : “mozilla-firefox” package : Ubuntu
 
     >>> anon_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/hoary/+source/mozilla-firefox')
     >>> print anon_browser.title
-    Questions for mozilla-firefox in Ubuntu Hoary : “mozilla-firefox” source package : 5.04 : Ubuntu
+    Questions : “mozilla-firefox” source package : 5.04 : Ubuntu
 
 == Project ==
 
     >>> anon_browser.open(
     ...     'http://answers.launchpad.dev/mozilla')
     >>> print anon_browser.title
-    Questions for The Mozilla Project : the Mozilla Project
+    Questions : the Mozilla Project
 
 == Person ==
 
     >>> anon_browser.open('http://answers.launchpad.dev/~name16')
     >>> print anon_browser.title
-    Questions involving Foo Bar : Foo Bar
+    Questions : Foo Bar

=== modified file 'lib/lp/answers/stories/question-browse-and-search.txt'
--- lib/lp/answers/stories/question-browse-and-search.txt	2009-09-22 08:54:47 +0000
+++ lib/lp/answers/stories/question-browse-and-search.txt	2009-09-23 13:58:55 +0000
@@ -16,7 +16,7 @@
 He discovers that there are no questions on the Kubuntu Answers page:
 
     >>> print browser.title
-    Questions for Kubuntu - Free KDE-based Linux : Kubuntu
+    Questions : Kubuntu
 
     >>> print find_main_content(browser.contents).first('p').renderContents()
     There are no questions for Kubuntu with the requested statuses.
@@ -116,7 +116,7 @@
 
     >>> browser.getLink('Slow system').click()
     >>> print browser.title
-    Questions for Ubuntu...
+    Questions : Ubuntu
     >>> soup = find_main_content(browser.contents)
     >>> soup('div', 'report')
     [<div class="report"><p>I get really poor hard drive performance.</p></div>]
@@ -139,7 +139,7 @@
     >>> from canonical.launchpad.helpers import backslashreplace
     >>> locators = find_tags_by_class(browser.contents, 'main')
     >>> print backslashreplace(browser.title)
-    Questions for \u201cmozilla-firefox\u201d package...
+    Questions : \u201cmozilla-firefox\u201d package : Ubuntu
 
 While reading the Ubuntu forums for a solution to his problem,
 Average Joe finds some unlinked text that refers to how to
@@ -151,7 +151,7 @@
     >>> browser.getControl(name='field.search_text').value = ' #6 '
     >>> browser.getControl('Find Answers').click()
     >>> print backslashreplace(browser.title)
-    Questions for Mozilla...
+    Questions : Mozilla Firefox
 
 The Answer Tracker cannot identify Question ids within text. Average
 Joe finds a reference to question 8 in a blog. He copies 'question 8'
@@ -217,7 +217,7 @@
 
     >>> browser.getLink('Firefox is slow').click()
     >>> browser.title
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d...
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
 
 The user must choose at least one status when searching questions. An
 error is displayed when the user forgets to select a status.
@@ -244,7 +244,7 @@
     >>> browser.open('http://launchpad.dev/ubuntu/+questions')
     >>> browser.getLink('mozilla-firefox').click()
     >>> browser.title
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package in Ubuntu : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
     >>> soup = find_main_content(browser.contents)
     >>> soup('table', 'listing')
     [<table...
@@ -471,7 +471,7 @@
     >>> browser.open('http://launchpad.dev/~name16')
     >>> browser.getLink('Answers').click()
     >>> print browser.title
-    Questions involving Foo Bar : Foo Bar
+    Questions : Foo Bar
 
     >>> questions = find_tag_by_id(browser.contents, 'question-listing')
     >>> for question in questions.fetch('td', 'questionTITLE'):
@@ -502,7 +502,7 @@
 
     >>> browser.getLink('mozilla-firefox in ubuntu').click()
     >>> print repr(browser.title)
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package in Ubuntu : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
 
 The listing is searchable and can restrict also the list of displayed
 questions to a particular status:
@@ -619,7 +619,7 @@
     >>> browser.open('http://launchpad.dev/mozilla')
     >>> browser.getLink('Answers').click()
     >>> print browser.title
-    Questions for The Mozilla Project : the Mozilla Project
+    Questions : the Mozilla Project
 
 The results are displayed in a format similar to the Person reports:
 there is an 'In' column displaying where the questions were filed.
@@ -652,11 +652,11 @@
 
     >>> browser.getLink('Open').click()
     >>> print browser.title
-    Questions for The Mozilla Project : the Mozilla Project
+    Questions : the Mozilla Project
 
     >>> browser.getLink('Answered').click()
     >>> print browser.title
-    Questions for The Mozilla Project : the Mozilla Project
+    Questions : the Mozilla Project
 
     # The next two reports are only available to a logged-in user.
     >>> user_browser.open('http://launchpad.dev/mozilla/+questions')
@@ -766,7 +766,7 @@
     >>> anon_browser.getControl(name='field.scope.target').value = 'mozilla'
     >>> anon_browser.getControl('Find Answers').click()
     >>> print anon_browser.title
-    Questions for The Mozilla Project : the Mozilla Project
+    Questions : the Mozilla Project
 
 This works also with distributions:
 
@@ -776,7 +776,7 @@
     >>> anon_browser.getControl(name='field.scope.target').value = 'ubuntu'
     >>> anon_browser.getControl('Find Answers').click()
     >>> print anon_browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
 
 And also with products:
 
@@ -786,5 +786,5 @@
     >>> anon_browser.getControl(name='field.scope.target').value = 'firefox'
     >>> anon_browser.getControl('Find Answers').click()
     >>> print anon_browser.title
-    Questions for Mozilla Firefox : Mozilla Firefox
+    Questions : Mozilla Firefox
 

=== modified file 'lib/lp/answers/stories/question-compatibility-urls.txt'
--- lib/lp/answers/stories/question-compatibility-urls.txt	2009-09-18 18:52:34 +0000
+++ lib/lp/answers/stories/question-compatibility-urls.txt	2009-09-23 13:59:39 +0000
@@ -108,7 +108,7 @@
     ...        '&field.status=%s&field.status-empty-marker=1')
     >>> browser.open(url % (old_sort, old_status))
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
     >>> browser.getControl(name='field.sort').displayValue
     ['by status']
 
@@ -118,6 +118,6 @@
     >>> new_status = 'NEEDSINFO'
     >>> browser.open(url % (new_sort, new_status))
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
     >>> browser.getControl(name='field.sort').displayValue
     ['by status']

=== modified file 'lib/lp/answers/stories/question-message.txt'
--- lib/lp/answers/stories/question-message.txt	2009-09-18 12:42:56 +0000
+++ lib/lp/answers/stories/question-message.txt	2009-09-23 14:23:06 +0000
@@ -12,7 +12,7 @@
 
     >>> user_browser.open('http://answers.launchpad.dev/ubuntu/+question/11')
     >>> print user_browser.title.decode('utf-8')
-    Questions for Ubuntu...
+    Questions : Ubuntu
 
     >>> user_browser.getControl('Message').value = (
     ...     "Top quoting is bad netiquette.\n"
@@ -37,7 +37,7 @@
 authenticated already, He will see '<email address hidden>'
 
     >>> print user_browser.title.decode('utf-8')
-    Questions for Ubuntu...
+    Questions : Ubuntu
     >>> text = find_tags_by_class(
     ...     user_browser.contents, 'boardCommentBody')[-1]
     >>> print extract_text(text.findAll('p')[-1])
@@ -52,7 +52,7 @@
 
     >>> anon_browser.open('http://answers.launchpad.dev/ubuntu/+question/11')
     >>> print anon_browser.title
-    Questions for Ubuntu...
+    Questions : Ubuntu
 
     >>> text = find_tags_by_class(
     ...     anon_browser.contents, 'boardCommentBody')[-1]

=== modified file 'lib/lp/answers/stories/question-obfuscation.txt'
--- lib/lp/answers/stories/question-obfuscation.txt	2009-09-18 12:42:56 +0000
+++ lib/lp/answers/stories/question-obfuscation.txt	2009-09-23 14:23:08 +0000
@@ -54,7 +54,7 @@
     >>> user_browser.getControl('Link FAQ').click()
     >>> user_browser.getLink('How can I make VOIP calls?').click()
     >>> print user_browser.title
-    Questions for Ubuntu...
+    Questions : Ubuntu
 
     >>> portlet = find_portlet(user_browser.contents, 'Related questions')
     >>> portlet.a['title']
@@ -76,7 +76,7 @@
     ...     'The clicking mailto:<email address hidden> crashes the browser.')
     >>> user_browser.getControl('Add').click()
     >>> user_browser.title
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d...
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
 
     >>> user_browser.open('http://answers.launchpad.dev/')
     >>> question_portlet = find_tag_by_id(
@@ -144,7 +144,7 @@
 
     >>> anon_browser.getLink('How can I make VOIP calls?').click()
     >>> print anon_browser.title
-    Questions for Ubuntu...
+    Questions : Ubuntu
 
     >>> portlet = find_portlet(anon_browser.contents, 'Related questions')
     >>> portlet.a['title']

=== modified file 'lib/lp/answers/stories/question-overview.txt'
--- lib/lp/answers/stories/question-overview.txt	2009-09-18 22:08:12 +0000
+++ lib/lp/answers/stories/question-overview.txt	2009-09-23 14:35:08 +0000
@@ -53,7 +53,7 @@
 
     >>> browser.getLink('Problem showing the SVG demo on W3C site').click()
     >>> print browser.title
-    Questions for Mozilla Firefox...
+    Questions : Mozilla Firefox
     >>> print find_main_content(browser.contents).first('h1').renderContents()
     Problem showing the SVG demo on W3C site
 
@@ -80,7 +80,7 @@
     'http://answers.launchpad.dev/ubuntu'
     >>> browser.getLink('Answers').click()
     >>> print browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu
     >>> browser.getLink('Ask a question')
     <Link...>
 
@@ -103,8 +103,8 @@
     >>> browser.getLink('Answers').url
     'http://answers.launchpad.dev/ubuntu/hoary/+source/evolution'
     >>> browser.getLink('Answers').click()
-    >>> print browser.title
-    Questions for evolution in Ubuntu Hoary...
+    >>> browser.title
+    'Questions : \xe2\x80\x9cevolution\xe2\x80\x9d source package : 5.04 : Ubuntu'
     >>> browser.getLink('Ask a question').url
     '.../ubuntu/hoary/+source/evolution/+addquestion'
 
@@ -124,8 +124,8 @@
     >>> browser.getLink('Answers').url
     'http://answers.launchpad.dev/ubuntu/+source/mozilla-firefox'
     >>> browser.getLink('Answers').click()
-    >>> print browser.title
-    Questions for “mozilla-firefox” package in Ubuntu : “mozilla-firefox” package : Ubuntu
+    >>> browser.title
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
     >>> browser.getLink('Ask a question').url
     '.../ubuntu/+source/mozilla-firefox/+addquestion'
     >>> browser.getLink('Open').url
@@ -167,7 +167,7 @@
     'http://answers.launchpad.dev/~name16'
     >>> browser.getLink('Answers').click()
     >>> print browser.title
-    Questions involving Foo Bar : Foo Bar
+    Questions : Foo Bar
     >>> print find_main_content(browser.contents).first('h1').renderContents()
     Questions for Foo Bar
     >>> browser.getLink('Slow system').url

=== modified file 'lib/lp/answers/stories/question-search-multiple-languages.txt'
--- lib/lp/answers/stories/question-search-multiple-languages.txt	2009-09-22 08:54:47 +0000
+++ lib/lp/answers/stories/question-search-multiple-languages.txt	2009-09-23 14:23:11 +0000
@@ -274,7 +274,7 @@
 
     >>> user_browser.getLink('Portuguese (Brazil)').click()
     >>> print user_browser.title
-    Portuguese (Brazil) questions in Mozilla Firefox : Questions for Mozilla Firefox : Mozilla Firefox
+    Portuguese (Brazil) questions in Mozilla Firefox : Questions : Mozilla Firefox
 
     >>> language_field = user_browser.getControl(name='field.language')
     >>> print language_field.type
@@ -305,7 +305,7 @@
     >>> sample_person_browser.getLink('My questions').click()
     >>> sample_person_browser.getLink('Next').click()
     >>> print sample_person_browser.title
-    Questions you asked about Ubuntu : Questions for Ubuntu Linux : Ubuntu
+    Questions you asked about Ubuntu : Questions : Ubuntu
 
     >>> questions = find_tag_by_id(
     ...     sample_person_browser.contents, 'question-listing')

=== modified file 'lib/lp/answers/stories/questions-index.txt'
--- lib/lp/answers/stories/questions-index.txt	2009-09-18 18:52:34 +0000
+++ lib/lp/answers/stories/questions-index.txt	2009-09-23 14:07:06 +0000
@@ -69,4 +69,4 @@
     >>> print anon_browser.url
     http://answers.launchpad.dev/ubuntu
     >>> print anon_browser.title
-    Questions for Ubuntu Linux : Ubuntu
+    Questions : Ubuntu

=== modified file 'lib/lp/answers/stories/this-is-a-faq.txt'
--- lib/lp/answers/stories/this-is-a-faq.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/answers/stories/this-is-a-faq.txt	2009-09-23 14:23:12 +0000
@@ -21,7 +21,7 @@
     >>> user_browser.open(
     ...     'http://answers.launchpad.dev/firefox/+question/2')
     >>> print backslashreplace(user_browser.title)
-    Questions for Mozilla Firefox...
+    Questions : Mozilla Firefox
 
     >>> user_browser.getLink('Link to a FAQ').click()
     >>> print backslashreplace(user_browser.title)
@@ -279,7 +279,7 @@
     >>> print owner_browser.url
     http://answers.launchpad.dev/firefox/+faq/...
     >>> print backslashreplace(owner_browser.title)
-    Questions for Mozilla Firefox...
+    Questions : Mozilla Firefox
 
 The FAQ keywords and content appears just below:
 
@@ -320,7 +320,7 @@
     >>> user_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/+question/11')
     >>> print user_browser.title
-    Questions for Ubuntu...
+    Questions : Ubuntu
     >>> user_browser.getLink('Link to a FAQ').click()
     >>> print user_browser.title
     Is question #11 a FAQ...
@@ -329,7 +329,7 @@
     ...     'http://answers.launchpad.dev/ubuntu/+source/mozilla-firefox'
     ...     '/+question/8')
     >>> user_browser.title
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package...
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
     >>> user_browser.getLink('Link to a FAQ').click()
     >>> user_browser.title
     'Is question #8 a FAQ...
@@ -366,7 +366,7 @@
 discussion.
 
     >>> user_browser.title
-    'Questions for \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package...
+    'Questions : \xe2\x80\x9cmozilla-firefox\xe2\x80\x9d package : Ubuntu'
     >>> print_question_status(user_browser)
     Solved...
 

=== modified file 'lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt'
--- lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt	2009-09-11 08:09:21 +0000
+++ lib/lp/bugs/stories/bug-release-management/nomination-navigation.txt	2009-09-23 14:11:06 +0000
@@ -11,8 +11,7 @@
     ... 'http://bugs.launchpad.dev/ubuntu/+source/mozilla-firefox/+bug/1'
     ... '/nominations/2/+editstatus')
     >>> print_location(admin_browser.contents)
-    Hierarchy: Ubuntu > ?mozilla-firefox? package > 
-        Bugs in mozilla-firefox > Bug #1...
+    Hierarchy: Ubuntu > ?mozilla-firefox? package > Bugs > Bug #1...
     Tabs:
     * Overview - http://launchpad.dev/ubuntu/+source/mozilla-firefox
     * Code - http://code.launchpad.dev/ubuntu/+source/mozilla-firefox

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-activity.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2009-09-04 18:05:24 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-activity.txt	2009-09-23 14:11:53 +0000
@@ -11,8 +11,7 @@
 the main heading repeats the bug number for clarity:
 
     >>> print_location(anon_browser.contents)
-    Hierarchy: Debian > ?mozilla-firefox? package >
-        Bugs in mozilla-firefox > Bug #3...
+    Hierarchy: Debian > ?mozilla-firefox? package > Bugs > Bug #3...
     Tabs:
     * Overview - http://launchpad.dev/debian/+source/mozilla-firefox
     * Code - http://code.launchpad.dev/debian/+source/mozilla-firefox

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt	2009-09-10 20:12:12 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-comments-truncated.txt	2009-09-23 14:12:34 +0000
@@ -53,7 +53,7 @@
 The whole comment is visible on this page:
 
     >>> print browser.title
-    Bug #2 (blackhole) : Bugs in tomcat : Tomcat
+    Bug #2 (blackhole) : Bugs : Tomcat
 
     >>> print_comments(browser.contents) #doctest: -ELLIPSIS
     <div class="boardCommentBody">

=== modified file 'lib/lp/bugs/stories/bugs/xx-bug-create-question.txt'
--- lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2009-09-19 00:09:57 +0000
+++ lib/lp/bugs/stories/bugs/xx-bug-create-question.txt	2009-09-23 14:23:16 +0000
@@ -103,7 +103,7 @@
 bug. He uses the link to Related bug to return to the bug.
 
     >>> user_browser.title
-    'Questions for \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package...
+    'Questions : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
 
     >>> print extract_text(
     ...     find_tag_by_id(user_browser.contents, 'original-bug'))
@@ -239,7 +239,7 @@
     ...     'Copy, Cut and Delete operations should work on '
     ...     'selections').click()
     >>> print user_browser.title
-    Questions for Jokosher...
+    Questions : Jokosher
 
     >>> content = find_main_content(user_browser.contents)
     >>> print extract_text(content(['img'], src='/@@/question')[0].parent)

=== modified file 'lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt'
--- lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt	2009-09-19 08:30:29 +0000
+++ lib/lp/bugs/stories/distribution/xx-distribution-upstream-bug-report.txt	2009-09-23 14:23:17 +0000
@@ -122,8 +122,7 @@
 
     >>> browser.open(open_url)
     >>> browser.title
-    'Bugs in linux-source-2.6.15 : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d
-    package : Ubuntu'
+    'Bugs : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
     >>> table = find_tag_by_id(browser.contents, 'buglisting')
     >>> print extract_text(table)
     Summary             Importance  Status
@@ -134,8 +133,7 @@
 
     >>> browser.open(triaged_url)
     >>> browser.title
-    'Bugs in linux-source-2.6.15 : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d
-    package : Ubuntu'
+    'Bugs : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
     >>> table = find_tag_by_id(browser.contents, 'buglisting')
     >>> print extract_text(table)
     Summary             Importance  Status
@@ -146,8 +144,7 @@
 
     >>> browser.open(triaged_delta)
     >>> browser.title
-    'Bugs in linux-source-2.6.15 : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d
-    package : Ubuntu'
+    'Bugs : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
     >>> table = find_tag_by_id(browser.contents, 'buglisting')
     >>> print table
     None
@@ -156,8 +153,7 @@
 
     >>> browser.open(upstream_url)
     >>> browser.title
-    'Bugs in linux-source-2.6.15 : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d
-    package : Ubuntu'
+    'Bugs : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
     >>> table = find_tag_by_id(browser.contents, 'buglisting')
     >>> print extract_text(table)
     Summary             Importance  Status
@@ -168,8 +164,7 @@
 
     >>> browser.open(upstream_delta_url)
     >>> browser.title
-    'Bugs in linux-source-2.6.15 : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d
-    package : Ubuntu'
+    'Bugs : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
     >>> table = find_tag_by_id(browser.contents, 'buglisting')
     >>> print table
     None
@@ -178,8 +173,7 @@
 
     >>> browser.open(watch_delta_url)
     >>> browser.title
-    'Bugs in linux-source-2.6.15 : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d
-    package : Ubuntu'
+    'Bugs : \xe2\x80\x9clinux-source-2.6.15\xe2\x80\x9d package : Ubuntu'
     >>> table = find_tag_by_id(browser.contents, 'buglisting')
     >>> print extract_text(table)
     Summary             Importance  Status

=== modified file 'lib/lp/code/stories/branches/xx-branch-deletion.txt'
--- lib/lp/code/stories/branches/xx-branch-deletion.txt	2009-09-17 03:12:08 +0000
+++ lib/lp/code/stories/branches/xx-branch-deletion.txt	2009-09-23 14:23:14 +0000
@@ -11,7 +11,7 @@
     >>> browser.getControl('Name').value = 'to-delete'
     >>> browser.getControl('Register Branch').click()
     >>> print browser.title
-    to-delete : Branches for Mozilla Firefox : Mozilla Firefox
+    to-delete : Branches : Mozilla Firefox
 
 The newly created branch has an action 'Delete branch'.
 

=== modified file 'lib/lp/code/stories/branches/xx-branch-index.txt'
--- lib/lp/code/stories/branches/xx-branch-index.txt	2009-09-22 19:04:02 +0000
+++ lib/lp/code/stories/branches/xx-branch-index.txt	2009-09-23 14:17:37 +0000
@@ -412,7 +412,7 @@
     >>> browser.open(
     ...     'http://code.launchpad.dev/~name12/gnome-terminal/scanned')
     >>> print_location(browser.contents)
-    Hierarchy: GNOME Terminal > Branches for GNOME Terminal > scanned
+    Hierarchy: GNOME Terminal > Branches > scanned
     Tabs:
     * Overview - http://launchpad.dev/gnome-terminal
     * Code (selected) - http://code.launchpad.dev/gnome-terminal
@@ -424,7 +424,7 @@
 
     >>> browser.open('http://code.launchpad.dev/~name12/+junk/junk.dev')
     >>> print_location(browser.contents)
-    Hierarchy: Sample Person > Branches for Sample Person > junk.dev
+    Hierarchy: Sample Person > Branches > junk.dev
     Tabs:
     * Overview - http://launchpad.dev/~name12
     * Code (selected) - http://code.launchpad.dev/~name12

=== modified file 'lib/lp/code/stories/branches/xx-person-branches.txt'
--- lib/lp/code/stories/branches/xx-person-branches.txt	2009-09-18 15:24:30 +0000
+++ lib/lp/code/stories/branches/xx-person-branches.txt	2009-09-23 14:23:19 +0000
@@ -9,7 +9,7 @@
     >>> browser = setupBrowser(auth='Basic <email address hidden>:test')
     >>> browser.open('http://code.launchpad.dev/~name12')
     >>> print browser.title
-    Branches for Sample Person : Sample Person
+    Branches : Sample Person
 
 The heading in the main content is the same as the page title text.
 
@@ -54,7 +54,7 @@
     >>> browser.open('http://code.launchpad.dev/~name12')
     >>> browser.getLink('registered').click()
     >>> print browser.title
-    Registered : Branches for Sample Person : Sample Person
+    Registered : Branches : Sample Person
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)
@@ -71,7 +71,7 @@
     >>> browser.open('http://code.launchpad.dev/~name12')
     >>> browser.getLink('subscribed').click()
     >>> print browser.title
-    Subscribed : Branches for Sample Person : Sample Person
+    Subscribed : Branches : Sample Person
     >>> table = find_tag_by_id(browser.contents, 'branchtable')
     >>> for row in table.tbody.fetch('tr'):
     ...     print extract_text(row)

=== modified file 'lib/lp/code/stories/branches/xx-product-branches.txt'
--- lib/lp/code/stories/branches/xx-product-branches.txt	2009-09-18 03:29:53 +0000
+++ lib/lp/code/stories/branches/xx-product-branches.txt	2009-09-23 14:23:21 +0000
@@ -29,7 +29,7 @@
 
     >>> browser.open('http://code.launchpad.dev/applets')
     >>> print browser.title
-    Branches for Gnome Applets : Gnome Applets
+    Branches : Gnome Applets
 
 If there are not any branches, a helpful message is shown.
 

=== modified file 'lib/lp/code/stories/branches/xx-project-branches.txt'
--- lib/lp/code/stories/branches/xx-project-branches.txt	2009-09-17 03:12:08 +0000
+++ lib/lp/code/stories/branches/xx-project-branches.txt	2009-09-23 14:21:41 +0000
@@ -10,7 +10,7 @@
     >>> browser.open('http://launchpad.dev/mozilla')
     >>> browser.getLink('Code').click()
     >>> print browser.title
-    Branches for the Mozilla Project : the Mozilla Project
+    Branches : the Mozilla Project
 
 
 == Default page for code site ==
@@ -35,7 +35,7 @@
 
     >>> browser.open('http://code.launchpad.dev/aaa')
     >>> print browser.title
-    Branches for the Test Project : the Test Project
+    Branches : the Test Project
     >>> message = find_tag_by_id(browser.contents, 'no-branch-message')
     >>> print extract_text(message)
     There are no branches registered for the Test Project in Launchpad...

=== modified file 'lib/lp/soyuz/stories/packaging/package-pages-navigation.txt'
--- lib/lp/soyuz/stories/packaging/package-pages-navigation.txt	2009-09-19 08:30:29 +0000
+++ lib/lp/soyuz/stories/packaging/package-pages-navigation.txt	2009-09-23 14:23:03 +0000
@@ -31,7 +31,7 @@
 
     >>> anon_browser.open('http://bugs.launchpad.dev/ubuntu/+source/alsa-utils')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > ?alsa-utils? package > Bugs in alsa-utils
+    Hierarchy: Ubuntu > ?alsa-utils? package > Bugs
     Tabs:
     * Overview - http://launchpad.dev/ubuntu/+source/alsa-utils
     * Code - http://code.launchpad.dev/ubuntu/+source/alsa-utils
@@ -109,8 +109,7 @@
     >>> anon_browser.open(
     ...     'http://answers.launchpad.dev/ubuntu/hoary/+source/alsa-utils')
     >>> print_location(anon_browser.contents)
-    Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package >
-        Questions for alsa-utils...
+    Hierarchy: Ubuntu > 5.04 > ?alsa-utils? source package > Questions
     Tabs:
     * Overview - http://launchpad.dev/ubuntu/hoary/+source/alsa-utils
     * Code - http://code.launchpad.dev/ubuntu/hoary/+source/alsa-utils