Merge lp:~cjohnston/launchpad/627628 into lp:launchpad

[Chris Johnston]

[r=henninge][bug=627628] Changes the "Add Answer" to "Propose Answer" as proposing an answer better describes the act.

[Henning Eggers (henninge)]

Thank you. ;)

review: Approve

=== modified file 'lib/lp/answers/browser/question.py'
--- lib/lp/answers/browser/question.py	2011-05-11 10:49:45 +0000
+++ lib/lp/answers/browser/question.py	2011-05-16 11:42:36 +0000
@@ -924,7 +924,7 @@
                 self.user != self.context.owner and
                 self.context.can_give_answer)
 
-    @action(_('Add Answer'), name='answer', condition=canAddAnswer)
+    @action(_('Propose Answer'), name='answer', condition=canAddAnswer)
     def answer_action(self, action, data):
         """Add an answer to the question."""
         self.context.giveAnswer(self.user, data['message'])

=== modified file 'lib/lp/answers/stories/question-workflow.txt'
--- lib/lp/answers/stories/question-workflow.txt	2009-11-14 21:48:41 +0000
+++ lib/lp/answers/stories/question-workflow.txt	2011-05-16 11:42:36 +0000
@@ -139,14 +139,14 @@
 
 Once the question is clarified, it is easier for a user to give an
 answer. This is done by entering the answer in the 'Message' box
-and clicking the 'Add Answer' button.
+and clicking the 'Propose Answer' button.
 
     >>> support_browser.open(
     ...     'http://launchpad.dev/firefox/+question/2')
     >>> support_browser.getControl('Message').value = (
     ...     "New version of the firefox package are available with SVG "
     ...     "support enabled. You can use apt-get or adept to upgrade.")
-    >>> support_browser.getControl('Add Answer').click()
+    >>> support_browser.getControl('Propose Answer').click()
 
 This moves the the question to the Answered state and adds the
 answer to the end of the discussion: