diff options
| author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
|---|---|---|
| committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
| commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
| tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /actions/editapplication.php | |
| parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
| parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) | |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'actions/editapplication.php')
| -rw-r--r-- | actions/editapplication.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/actions/editapplication.php b/actions/editapplication.php index d1c7a5c3d..760b1d284 100644 --- a/actions/editapplication.php +++ b/actions/editapplication.php @@ -185,7 +185,7 @@ class EditApplicationAction extends OwnerDesignAction return; } elseif (mb_strlen($name) > 255) { // TRANS: Validation error shown when providing too long a name in the "Edit application" form. - $this->showForm(_('Name is too long (max 255 characters).')); + $this->showForm(_('Name is too long (maximum 255 characters).')); return; } else if ($this->nameExists($name)) { // TRANS: Validation error shown when providing a name for an application that already exists in the "Edit application" form. |