Merge lp:~blr/launchpad/project-configuration-rename into lp:launchpad

[Kit Randel]

Rename project configuration links to be consistent with the top navigation bar.

doctest testfix.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/registry/browser/tests/pillar-views.txt'
--- lib/lp/registry/browser/tests/pillar-views.txt	2015-01-29 16:28:30 +0000
+++ lib/lp/registry/browser/tests/pillar-views.txt	2015-06-15 06:48:41 +0000
@@ -87,11 +87,11 @@
 
     >>> for link in view.configuration_links:
     ...     print link['link'].name
+    set_branch
     configure_bugtracker
+    configure_translations
     configure_answers
-    configure_translations
-    set_branch
-
+    
 The registration status is determined with the 'configuration_states'
 property.  Notice that blueprints are not included in the
 configuration links nor the completeness computation as the use of
@@ -141,13 +141,13 @@
 
     >>> print find_tag_by_id(rendered, 'configuration_links')
     <table...
+    <a href="http://launchpad.dev/bread/trunk/+setbranch"...
+    <span class="sprite no action-icon">...
     <a href="http://launchpad.dev/bread/+configure-bugtracker"...
-    <span class="sprite no action-icon">...
-    <a href="http://launchpad.dev/bread/+configure-answers"...
-    <span class="sprite no action-icon">...
+    <span class="sprite no action-icon">...    
     <a href="http://launchpad.dev/bread/+configure-translations"...
     <span class="sprite yes action-icon">...
-    <a href="http://launchpad.dev/bread/trunk/+setbranch"...
+    <a href="http://launchpad.dev/bread/+configure-answers"...
     <span class="sprite no action-icon">...
     </table>