Merge branch 'MAINT_4_5_2' into QA_4_5

This commit is contained in:
Marc Delisle 2015-11-21 21:07:08 -05:00
commit 1defe1a68a

View File

@ -294,8 +294,8 @@ $js_messages['strGo'] = __('Go');
$js_messages['strCancel'] = __('Cancel');
/* For page-related settings */
$js_messages['strPageSettings'] = _('Page-related settings');
$js_messages['strApply'] = _('Apply');
$js_messages['strPageSettings'] = __('Page-related settings');
$js_messages['strApply'] = __('Apply');
/* For Ajax Notifications */
$js_messages['strLoading'] = __('Loading…');