aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-02-24 09:48:36 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-02-24 09:48:36 +0100
commitbd00b8e9bf989ad77024d45fa7ef95eb9b9acb93 (patch)
treedc51a6b0757e47d0f38ad58cb270dee672569d91 /phpBB/language
parent87dfd76100572092bf2de18b0a5e5601bae75d91 (diff)
downloadforums-bd00b8e9bf989ad77024d45fa7ef95eb9b9acb93.tar
forums-bd00b8e9bf989ad77024d45fa7ef95eb9b9acb93.tar.gz
forums-bd00b8e9bf989ad77024d45fa7ef95eb9b9acb93.tar.bz2
forums-bd00b8e9bf989ad77024d45fa7ef95eb9b9acb93.tar.xz
forums-bd00b8e9bf989ad77024d45fa7ef95eb9b9acb93.zip
[ticket/12227] "X from Y messages" should be "X out of Y messages"
PHPBB3-12227
Diffstat (limited to 'phpBB/language')
-rw-r--r--phpBB/language/en/ucp.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index fcfedfd2ca..08de2a3d40 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -216,8 +216,8 @@ $lang = array_merge($lang, array(
'FOES_UPDATED' => 'Your foes list has been updated successfully.',
'FOLDER_ADDED' => 'Folder successfully added.',
'FOLDER_MESSAGE_STATUS' => array(
- 1 => '%2$d from %1$s stored',
- 2 => '%2$d from %1$s stored',
+ 1 => '%2$d out of %1$s stored',
+ 2 => '%2$d out of %1$s stored',
),
'FOLDER_NAME_EMPTY' => 'You must enter a name for this folder.',
'FOLDER_NAME_EXIST' => 'Folder <strong>%s</strong> already exists.',
@@ -225,8 +225,8 @@ $lang = array_merge($lang, array(
'FOLDER_RENAMED' => 'Folder successfully renamed.',
'FOLDER_REMOVED' => 'Folder successfully removed.',
'FOLDER_STATUS_MSG' => array(
- 1 => 'Folder is %3$d%% full (%2$d from %1$s stored)',
- 2 => 'Folder is %3$d%% full (%2$d from %1$s stored)',
+ 1 => 'Folder is %3$d%% full (%2$d out of %1$s stored)',
+ 2 => 'Folder is %3$d%% full (%2$d out of %1$s stored)',
),
'FORWARD_PM' => 'Forward PM',
'FORCE_PASSWORD_EXPLAIN' => 'Before you may continue browsing the board you are required to change your password.',
@@ -297,8 +297,8 @@ $lang = array_merge($lang, array(
'MOVE_DOWN' => 'Move down',
'MOVE_MARKED_TO_FOLDER' => 'Move marked to %s',
'MOVE_PM_ERROR' => array(
- 1 => 'An error occurred while moving the messages to the new folder, only %2$d from %1$s was moved.',
- 2 => 'An error occurred while moving the messages to the new folder, only %2$d from %1$s were moved.',
+ 1 => 'An error occurred while moving the messages to the new folder, only %2$d out of %1$s was moved.',
+ 2 => 'An error occurred while moving the messages to the new folder, only %2$d out of %1$s were moved.',
),
'MOVE_TO_FOLDER' => 'Move to folder',
'MOVE_UP' => 'Move up',