diff options
Diffstat (limited to '')
-rw-r--r-- | admin/themes/default/template/site_manager.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/header.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/mail/text/html/notification_by_mail.tpl | 2 | ||||
-rw-r--r-- | themes/default/template/mail/text/plain/notification_by_mail.tpl | 2 | ||||
-rw-r--r-- | upload.php | 18 |
5 files changed, 13 insertions, 13 deletions
diff --git a/admin/themes/default/template/site_manager.tpl b/admin/themes/default/template/site_manager.tpl index 6dce1fec0..8e2ca0f9e 100644 --- a/admin/themes/default/template/site_manager.tpl +++ b/admin/themes/default/template/site_manager.tpl @@ -13,7 +13,7 @@ {/if} {if isset($local_listing)} -{'A local listing.xml file has been found for '|@translate} {$local_listing.URL} +{'A local listing.xml file has been found for'|@translate} {$local_listing.URL} {if isset($local_listing.CREATE)} <form action="{$F_ACTION}" method="post"> <input type="hidden" name="pwg_token" value="{$PWG_TOKEN}" /> diff --git a/themes/default/template/header.tpl b/themes/default/template/header.tpl index b83c54c8c..cbe3d8f02 100644 --- a/themes/default/template/header.tpl +++ b/themes/default/template/header.tpl @@ -17,7 +17,7 @@ {/if} {/if} -{if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('home'))} +{if (isset($REVERSE) and $REVERSE and $PAGE_TITLE == l10n('Home'))} <title>{$GALLERY_TITLE} | {$PAGE_TITLE}</title>{else} <title>{$PAGE_TITLE} | {$GALLERY_TITLE}</title>{/if} <link rel="shortcut icon" type="image/x-icon" href="{$ROOT_URL}{$themeconf.icon_dir}/favicon.ico"> diff --git a/themes/default/template/mail/text/html/notification_by_mail.tpl b/themes/default/template/mail/text/html/notification_by_mail.tpl index 7a749fe8b..a5639417a 100644 --- a/themes/default/template/mail/text/html/notification_by_mail.tpl +++ b/themes/default/template/mail/text/html/notification_by_mail.tpl @@ -42,7 +42,7 @@ <br><hr> {'To unsubscribe'|@translate}{', click on '|@translate}<a href="{$UNSUBSCRIBE_LINK}">{$UNSUBSCRIBE_LINK}</a><br> {'To subscribe '|@translate}{', click on '|@translate}<a href="{$SUBSCRIBE_LINK}">{$SUBSCRIBE_LINK}</a><br> -{'If you encounter problems or have any question, please send a message to '|@translate}<a href="mailto:{$CONTACT_EMAIL}?subject={'[NBM] Problems or questions'|@translate}">{$CONTACT_EMAIL}</a><br> +{'If you encounter problems or have any question, please send a message to'|@translate} <a href="mailto:{$CONTACT_EMAIL}?subject={'[NBM] Problems or questions'|@translate}">{$CONTACT_EMAIL}</a><br> <hr><br> </p> {if not empty($recent_posts)} diff --git a/themes/default/template/mail/text/plain/notification_by_mail.tpl b/themes/default/template/mail/text/plain/notification_by_mail.tpl index be527da64..4c396ccf2 100644 --- a/themes/default/template/mail/text/plain/notification_by_mail.tpl +++ b/themes/default/template/mail/text/plain/notification_by_mail.tpl @@ -37,5 +37,5 @@ ______________________________________________________________________________ {'To unsubscribe'|@translate}{', click on '|@translate}{$UNSUBSCRIBE_LINK} {'To subscribe'|@translate}{', click on '|@translate}{$SUBSCRIBE_LINK} -{'If you encounter problems or have any question, please send a message to '|@translate}{$CONTACT_EMAIL} +{'If you encounter problems or have any question, please send a message to'|@translate} {$CONTACT_EMAIL} ______________________________________________________________________________ diff --git a/upload.php b/upload.php index 31a200778..cd94dbdff 100644 --- a/upload.php +++ b/upload.php @@ -72,7 +72,7 @@ function validate_upload( $temp_name, $my_max_file_size, else if ( $_FILES['picture']['size'] > $my_max_file_size * 1024 ) { array_push( $result['error'], - l10n('the filesize of the picture must not exceed : ').$my_max_file_size.' KB' ); + l10n('the filesize of the picture must not exceed :').$my_max_file_size.' KB' ); } else { @@ -90,14 +90,14 @@ function validate_upload( $temp_name, $my_max_file_size, and $size[0] > $image_max_width ) { array_push( $result['error'], - l10n('the width of the picture must not exceed : ').$image_max_width.' px' ); + l10n('the width of the picture must not exceed :').$image_max_width.' px' ); } if ( isset( $image_max_height ) and $image_max_height != "" and $size[1] > $image_max_height ) { array_push( $result['error'], - l10n('the height of the picture must not exceed : ').$image_max_height.' px' ); + l10n('the height of the picture must not exceed :').$image_max_height.' px' ); } // $size[2] == 1 means GIF // $size[2] == 2 means JPG @@ -350,7 +350,7 @@ $u_form.= '&waiting_id='.$page['waiting_id']; if ( isset( $page['waiting_id'] ) ) { - $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to ').$_FILES['picture']['name']; + $advise_title = l10n('Optional, but recommended : choose a thumbnail to associate to').' '.$_FILES['picture']['name']; } else { @@ -381,7 +381,7 @@ if ( !$page['upload_successful'] ) //--------------------------------------------------------------------- advises if ( !empty($conf['upload_maxfilesize']) ) { - $content = l10n('the filesize of the picture must not exceed : '); + $content = l10n('the filesize of the picture must not exceed :'); $content.= $conf['upload_maxfilesize'].' KB'; $template->append('advises', $content); } @@ -390,13 +390,13 @@ if ( !$page['upload_successful'] ) { if ( $conf['upload_maxwidth_thumbnail'] != '' ) { - $content = l10n('the width of the picture must not exceed : '); + $content = l10n('the width of the picture must not exceed :'); $content.= $conf['upload_maxwidth_thumbnail'].' px'; $template->append('advises', $content); } if ( $conf['upload_maxheight_thumbnail'] != '' ) { - $content = l10n('the height of the picture must not exceed : '); + $content = l10n('the height of the picture must not exceed :'); $content.= $conf['upload_maxheight_thumbnail'].' px'; $template->append('advises', $content); } @@ -405,13 +405,13 @@ if ( !$page['upload_successful'] ) { if ( $conf['upload_maxwidth'] != '' ) { - $content = l10n('the width of the picture must not exceed : '); + $content = l10n('the width of the picture must not exceed :'); $content.= $conf['upload_maxwidth'].' px'; $template->append('advises', $content); } if ( $conf['upload_maxheight'] != '' ) { - $content = l10n('the height of the picture must not exceed : '); + $content = l10n('the height of the picture must not exceed :'); $content.= $conf['upload_maxheight'].' px'; $template->append('advises', $content); } |