diff options
| author | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
|---|---|---|
| committer | Dave Whiteland <dave@mysociety.org> | 2012-04-29 18:14:32 +0100 |
| commit | 16061e060354affb25701a8c6111ee30df2ac19c (patch) | |
| tree | a2d0f949b532f582becff31ef7f79b5deacc4186 /templates/web/default/auth | |
| parent | b38ba427f7facd6e8042ae667b5b3bac1724803a (diff) | |
| parent | 1fc50dcc7f65ae04055a803579445a9397e3ffdf (diff) | |
Merge branch 'master' into barnet-integration
(prior to go-live... amongst other things, the Barnet web templates had changed.
NB conflict with carton.lock, accepted master in full)
Conflicts:
carton.lock
Diffstat (limited to 'templates/web/default/auth')
| -rw-r--r-- | templates/web/default/auth/general.html | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/templates/web/default/auth/general.html b/templates/web/default/auth/general.html index c2249fa46..f5e2e423f 100644 --- a/templates/web/default/auth/general.html +++ b/templates/web/default/auth/general.html @@ -34,7 +34,7 @@ <div id="form_sign_in_yes"> <p> - <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong>, I have a password:') %]</label> + <label class="n" for="password_sign_in">[% loc('<strong>Yes</strong> I have a password') %]</label> <input type="password" name="password_sign_in" id="password_sign_in" value=""> </p> |