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

[Chris Johnston]

Correct branch creation form labels to not mention reassigning a branch that doesn't exist yet.

You can't reassign a branch that was never assigned.

[William Grant (wgrant)]

review: Approve (code)

=== modified file 'lib/lp/code/browser/branch.py'
--- lib/lp/code/browser/branch.py	2014-02-24 07:19:52 +0000
+++ lib/lp/code/browser/branch.py	2014-04-02 23:15:21 +0000
@@ -1133,7 +1133,7 @@
             owner_field = self.schema['owner']
             any_owner_choice = Choice(
                 __name__='owner', title=owner_field.title,
-                description=_("As an administrator you are able to reassign"
+                description=_("As an administrator you are able to assign"
                                 " this branch to any person or team."),
                 required=True, vocabulary='ValidPersonOrTeam')
             any_owner_field = form.Fields(

=== modified file 'lib/lp/code/browser/sourcepackagerecipe.py'
--- lib/lp/code/browser/sourcepackagerecipe.py	2013-08-22 01:26:23 +0000
+++ lib/lp/code/browser/sourcepackagerecipe.py	2014-04-02 23:15:21 +0000
@@ -884,7 +884,7 @@
             owner_field = self.schema['owner']
             any_owner_choice = PersonChoice(
                 __name__='owner', title=owner_field.title,
-                description=(u"As an administrator you are able to reassign"
+                description=(u"As an administrator you are able to assign"
                              u" this branch to any person or team."),
                 required=True, vocabulary='ValidPersonOrTeam')
             any_owner_field = form.Fields(