diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:37 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:37 +0200 |
| commit | 27e1f1319f17277e29e7e14fbf623e81bb0289f2 (patch) | |
| tree | 7bcb9b4a11df14db3d383f16ac28d5c331a969fb /phpBB/language | |
| parent | b1ae6f6407e300bf9948072f109057e40f967289 (diff) | |
| parent | 6b6705b852bcd2a86735fa99d00a77426bf12813 (diff) | |
| download | forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar.gz forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar.bz2 forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.tar.xz forums-27e1f1319f17277e29e7e14fbf623e81bb0289f2.zip | |
Merge branch 'ticket/nickvergessen/10158' into develop-olympus
* ticket/nickvergessen/10158:
[ticket/10158] Remove some code duplication from generating the message.
[ticket/10158] Only view "Return to" links if they are useful.
[ticket/10158] Add return-link to folder, when the user replied from a folder.
[ticket/10158] Add "Return to Inbox"-link to "PM send"-message.
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/ucp.php | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php index 02b8a282d9..ad7c1ccbff 100644 --- a/phpBB/language/en/ucp.php +++ b/phpBB/language/en/ucp.php @@ -119,6 +119,7 @@ $lang = array_merge($lang, array( 'CANNOT_REMOVE_FOLDER' => 'This folder cannot be removed.', 'CHANGE_DEFAULT_GROUP' => 'Change default group', 'CHANGE_PASSWORD' => 'Change password', + 'CLICK_GOTO_FOLDER' => '%1$sGo to your “%3$s” folder%2$s', 'CLICK_RETURN_FOLDER' => '%1$sReturn to your “%3$s” folder%2$s', 'CONFIRMATION' => 'Confirmation of registration', 'CONFIRM_CHANGES' => 'Confirm changes', |