diff options
author | Brion Vibber <brion@pobox.com> | 2010-05-19 12:51:25 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-05-19 12:51:25 -0700 |
commit | 7005ef66617b265ddccdd9082c2368bf014a7e83 (patch) | |
tree | 52f853c4d47063f0af488a7ff5fb52df50b430bb /locale | |
parent | 48dc899acb9a0ac87140353092dab1f5e67753d8 (diff) | |
parent | a39a934dd4a133bad6e76fa9a5018cedcb70225c (diff) |
Merge branch 'testing' into 0.9.x
Conflicts:
plugins/OpenID/openidlogin.php
Diffstat (limited to 'locale')
-rw-r--r-- | locale/en_GB/LC_MESSAGES/statusnet.po | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/locale/en_GB/LC_MESSAGES/statusnet.po b/locale/en_GB/LC_MESSAGES/statusnet.po index 03e7a669f..a3c1605ee 100644 --- a/locale/en_GB/LC_MESSAGES/statusnet.po +++ b/locale/en_GB/LC_MESSAGES/statusnet.po @@ -4915,7 +4915,7 @@ msgstr "Primary site navigation" #: lib/action.php:432 msgctxt "TOOLTIP" msgid "Personal profile and friends timeline" -msgstr "ersonal profile and friends timeline" +msgstr "Personal profile and friends timeline" #. TRANS: Main menu option when logged in for access to personal profile and friends timeline #: lib/action.php:435 |