Permalink
Browse files

Merge branch 'release/6.7.x' into develop

  • Loading branch information...
2 parents 38ebc72 + fc8d061 commit 6fa4067462ff751a060998e8fcbfa9f9ba4c537f @fplanque fplanque committed Jan 11, 2017
View
Oops, something went wrong.
@@ -49,7 +49,7 @@
else
{
$duration_seconds = strtotime( $cjob_row->clog_realstop_datetime ) - strtotime( $cjob_row->clog_realstart_datetime );
- $duration_icon = ( $duration_seconds > 60 ) ? ' '.get_icon( 'warning_yellow', 'imgtag', array( 'title' => T_('Execution time is more than 60 seconds!') ) ) : '';
+ $duration_icon = ( $duration_seconds > 60 ) ? ' '.get_icon( 'warning_yellow', 'imgtag', array( 'title' => T_('This job took more than 60 seconds to execute!') ) ) : '';
$Form->info( T_('Status'), '<span style="background-color:'.cron_status_color ( $cjob_row->clog_status ).';padding:0 5px;">'.$cjob_row->clog_status.'</span>'.$duration_icon );
$Form->info( T_('Real start time'), mysql2localedatetime( $cjob_row->clog_realstart_datetime ) );
@@ -76,7 +76,7 @@
{ // Asynchronous sending mode:
if( $edited_EmailCampaign->get_Cronjob() )
{ // Cron job was already created:
- $button_title = T_('Go to scheduler to see send jobs for this campaign');
+ $button_title = T_('See scheduled send jobs for this campaign');
$button_action = 'view_cron';
}
else
@@ -2320,10 +2320,10 @@ function display_dragdrop_upload_button( $params = array() )
sizeLimit: <?php echo ( $Settings->get( 'upload_maxkb' ) * 1024 ); ?>,
debug: true,
messages: {
- typeError: '<?php echo TS_('{file} has an invalid extension. Only {extensions} are allowed.'); ?>',
- sizeError: '<?php echo TS_('{file} cannot be uploaded because it is too large ({fileSize}). The maximum allowed upload size is {sizeLimit}.'); ?>',
- minSizeError: '<?php echo TS_('{file} is too small. The minimum file size is {minSizeLimit}.'); ?>',
- emptyError: '<?php echo TS_('{file} is empty. Please select non-empty files.'); ?>',
+ typeError: '<?php echo /* TRANS: strings in {} must NOT be translated */ TS_('{file} has an invalid extension. Only {extensions} are allowed.'); ?>',
+ sizeError: '<?php echo /* TRANS: strings in {} must NOT be translated */ TS_('{file} cannot be uploaded because it is too large ({fileSize}). The maximum allowed upload size is {sizeLimit}.'); ?>',
+ minSizeError: '<?php echo /* TRANS: strings in {} must NOT be translated */ TS_('{file} is too small. The minimum file size is {minSizeLimit}.'); ?>',
+ emptyError: '<?php echo /* TRANS: strings in {} must NOT be translated */ TS_('{file} is empty. Please select non-empty files.'); ?>',
onLeave: '<?php echo TS_('Files are currently being uploaded. If you leave this page now, the upload will be cancelled.'); ?>'
},
onSubmit: function( id, fileName )
Oops, something went wrong.

0 comments on commit 6fa4067

Please sign in to comment.