diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:52 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-06-05 01:58:52 +0200 |
| commit | a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe (patch) | |
| tree | b8d16b0cf52e8379aa1518f67a5107d8d3883148 /phpBB/language | |
| parent | c504888f037aaff9e202c765e7eb43a6b6abeb25 (diff) | |
| parent | 27e1f1319f17277e29e7e14fbf623e81bb0289f2 (diff) | |
| download | forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar.gz forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar.bz2 forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.tar.xz forums-a30ec6e052f0566ce3ae0076aeb2eb251bc3c3fe.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/10158] Remove some code duplication from generating the message.
[ticket/10195] Return false in session::check_dnsbl() when IPv6 is passed.
[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 2bb9025037..02b3ea0954 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', |