aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2008-12-03 11:18:31 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2008-12-03 11:18:31 +0000
commitd4a7d7a8ad49fae04112f641dfc147b77320e993 (patch)
tree9eadf33bfedf9062b6d03c4a3c2fd725d6b4bca7 /phpBB/language/en
parent10da18e82974374dda9dc6f4e1a90f2ccb403153 (diff)
downloadforums-d4a7d7a8ad49fae04112f641dfc147b77320e993.tar
forums-d4a7d7a8ad49fae04112f641dfc147b77320e993.tar.gz
forums-d4a7d7a8ad49fae04112f641dfc147b77320e993.tar.bz2
forums-d4a7d7a8ad49fae04112f641dfc147b77320e993.tar.xz
forums-d4a7d7a8ad49fae04112f641dfc147b77320e993.zip
Use "less than a minute ago" instead of "0 minutes ago"
Use "Sent: {DATE}" in pm's, instead of "Sent at: {DATE}" git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@9162 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en')
-rw-r--r--phpBB/language/en/common.php2
-rw-r--r--phpBB/language/en/ucp.php6
2 files changed, 4 insertions, 4 deletions
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index fab72b1780..7e889db7d8 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -698,7 +698,7 @@ $lang = array_merge($lang, array(
'TOMORROW' => 'Tomorrow',
'YESTERDAY' => 'Yesterday',
'AGO' => array(
- 0 => '%d minutes ago',
+ 0 => 'less than a minute ago',
1 => '%d minute ago',
2 => '%d minutes ago',
60 => '1 hour ago',
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index f18ebbaf8b..4ece142031 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -118,7 +118,7 @@ $lang = array_merge($lang, array(
'CHANGE_PASSWORD' => 'Change password',
'CLICK_RETURN_FOLDER' => '%1$sReturn to your ā€œ%3$sā€ folder%2$s',
'CONFIRMATION' => 'Confirmation of registration',
- 'CONFIRM_CHANGES' => 'Confirm changes',
+ 'CONFIRM_CHANGES' => 'Confirm changes',
'CONFIRM_EMAIL' => 'Confirm e-mail address',
'CONFIRM_EMAIL_EXPLAIN' => 'You only need to specify this if you are changing your e-mail address.',
'CONFIRM_EXPLAIN' => 'To prevent automated registrations the board requires you to enter a confirmation code. The code is displayed in the image you should see below. If you are visually impaired or cannot otherwise read this code please contact the %sBoard Administrator%s.',
@@ -378,7 +378,7 @@ $lang = array_merge($lang, array(
'SAME_PASSWORD_ERROR' => 'The new password you entered is the same as your current password.',
'SEARCH_YOUR_POSTS' => 'Show your posts',
'SEND_PASSWORD' => 'Send password',
- 'SENT_AT' => 'Sent at',
+ 'SENT_AT' => 'Sent', // Used before dates in private messages
'SHOW_EMAIL' => 'Users can contact me by e-mail',
'SIGNATURE_EXPLAIN' => 'This is a block of text that can be added to posts you make. There is a %d character limit.',
'SIGNATURE_PREVIEW' => 'Your signature will appear like this in posts',
@@ -421,7 +421,7 @@ $lang = array_merge($lang, array(
'UCP_PREFS_PERSONAL' => 'Edit global settings',
'UCP_PREFS_POST' => 'Edit posting defaults',
'UCP_PREFS_VIEW' => 'Edit display options',
-
+
'UCP_PM' => 'Private messages',
'UCP_PM_COMPOSE' => 'Compose message',
'UCP_PM_DRAFTS' => 'Manage PM drafts',