3 files changed, 8 insertions, 8 deletions
diff --git a/phpBB/language/en/acp/board.php b/phpBB/language/en/acp/board.php
index 16030b81f4..416e041706 100644
--- a/phpBB/language/en/acp/board.php
+++ b/phpBB/language/en/acp/board.php
@@ -42,7 +42,6 @@ $lang = array_merge($lang, array(
 	'DISABLE_BOARD_EXPLAIN'			=> 'This will make the board unavailable to users. You can also enter a short (255 character) message to display if you wish.',
 	'OVERRIDE_STYLE'				=> 'Override user style',
 	'OVERRIDE_STYLE_EXPLAIN'		=> 'Replaces user’s style with the default.',
-	'RELATIVE_DAYS'					=> 'Relative days',
 	'SITE_DESC'						=> 'Site description',
 	'SITE_NAME'						=> 'Site name',
 	'SYSTEM_DST'					=> 'Enable Summer Time/<abbr title="Daylight Saving Time">DST</abbr>',
diff --git a/phpBB/language/en/common.php b/phpBB/language/en/common.php
index c0d2fa4619..d7bfa6a613 100644
--- a/phpBB/language/en/common.php
+++ b/phpBB/language/en/common.php
@@ -593,6 +593,7 @@ $lang = array_merge($lang, array(
 	'USERS'					=> 'Users',
 	'USE_PERMISSIONS'		=> 'Test out user’s permissions',
 
+	'VARIANT_DATE_SEPARATOR'	=> ' / ',	// Used in date format dropdown, eg: "Today, 13:37 / 01 Jan 2007, 13:37" ... to join a relative date with calendar date
 	'VIEWED'					=> 'Viewed',
 	'VIEWING_FAQ'				=> 'Viewing FAQ',
 	'VIEWING_MEMBERS'			=> 'Viewing member details',
@@ -642,9 +643,9 @@ $lang = array_merge($lang, array(
 	'YOU_NO_NEW_PM'		=> 'No new private messages are waiting for you',
 
 	'datetime'			=> array(
-		'TODAY'		=> 'Today, ',
-		'TOMORROW'	=> 'Tomorrow, ',
-		'YESTERDAY'	=> 'Yesterday, ',
+		'TODAY'		=> 'Today',
+		'TOMORROW'	=> 'Tomorrow',
+		'YESTERDAY'	=> 'Yesterday',
 
 		'Sunday'	=> 'Sunday',
 		'Monday'	=> 'Monday',
@@ -776,12 +777,13 @@ $lang = array_merge($lang, array(
 
 	// The value is only an example and will get replaced by the current time on view
 	'dateformats'	=> array(
-		'|d M Y| H:i'			=> '01 Jan 2007 13:37 [Relative days]',
+		'|d M Y|, H:i'			=> 'Today, 13:37 / 01 Jan 2007, 13:37',
 		'd M Y, H:i'			=> '01 Jan 2007, 13:37',
 		'd M Y H:i'				=> '01 Jan 2007 13:37',
+		'M jS, \'y, H:i'		=> 'Jan 1st, \'07, 13:37',
 		'D M d, Y g:i a'		=> 'Mon Jan 01, 2007 1:37 pm',
-		'M jS, y, H:i'			=> 'Jan 1st, 07, 1:37 pm',
-		'F jS, Y, g:i a'			=> 'January 1st, 2007, 1:37 pm'
+		'F jS, Y, g:i a'		=> 'January 1st, 2007, 1:37 pm',
+		'|F jS, Y|, g:i a'		=> 'Today, 1:37 pm / January 1st, 2007, 1:37 pm'
 	),
 
 	// The default dateformat which will be used on new installs in this language
diff --git a/phpBB/language/en/ucp.php b/phpBB/language/en/ucp.php
index c7eb71998e..d794efdf5a 100644
--- a/phpBB/language/en/ucp.php
+++ b/phpBB/language/en/ucp.php
@@ -340,7 +340,6 @@ $lang = array_merge($lang, array(
 	'RECIPIENT'							=> 'Recipient',
 	'RECIPIENTS'						=> 'Recipients',
 	'REGISTRATION'						=> 'Registration',
-	'RELATIVE_DAYS'						=> 'Relative days',
 	'RELEASE_MESSAGES'					=> '%sRelease all on-hold messages%s… they will be re-sorted into the appropriate folder if enough space is made available.',
 	'REMOVE_ADDRESS'					=> 'Remove address',
 	'REMOVE_SELECTED_BOOKMARKS'			=> 'Remove selected bookmarks',