Merge branch 'QA_4_3'

Conflicts:
	js/messages.php

Signed-off-by: Atul Pratap Singh <atulpratapsingh05@gmail.com>
This commit is contained in:
Atul Pratap Singh 2015-01-21 23:55:56 +05:30
commit a1137cd105

View File

@ -476,7 +476,7 @@ $js_messages['strHidePanel'] = __('Hide Panel');
$js_messages['strUnhideNavItem'] = __('Show hidden navigation tree items.');
$js_messages['linkWithMain'] = __('Link with main panel');
$js_messages['unlinkWithMain'] = __('Unlink from main panel');
$js_messages['strHoverFastFilter'] = __('Press enter after a search term, to make a search on server');
$js_messages['strHoverFastFilter'] = __('To search all databases on server, press Enter after a search term');
/* microhistory */
$js_messages['strInvalidPage'] = __('The requested page was not found in the history, it may have expired.');