Changeset 5075


Ignore:
Timestamp:
03/07/10 17:07:44 (10 years ago)
Author:
ddtddt
Message:

Trunk merge 5070 bug:1486

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/admin/permalinks.php

    r4833 r5075  
    101101  pwg_query($query); 
    102102  if (pwg_db_affected_rows()==0) 
    103     array_push($page['errors'], 'Cannot delete the old permalink !'); 
     103    array_push($page['errors'], l10n('Cannot delete the old permalink !')); 
    104104} 
    105105 
  • trunk/admin/template/goto/permalinks.tpl

    r5021 r5075  
    4848                <td>{'Category'|@translate}</td> 
    4949                <td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td> 
    50                 <td>Deleted on {$SORT_OLD_DATE_DELETED}</td> 
    51                 <td>Last hit {$SORT_OLD_LAST_HIT}</td> 
    52                 <td style="width:20px;">Hit {$SORT_OLD_HIT}</td> 
     50                <td>{'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED}</td> 
     51                <td>{'Last hit'|@translate} {$SORT_OLD_LAST_HIT}</td> 
     52                <td style="width:20px;">{'Hit'|@translate} {$SORT_OLD_HIT}</td> 
    5353                <td style="width:5px;"></td> 
    5454        </tr> 
  • trunk/language/en_UK/admin.lang.php

    r4626 r5075  
    662662$lang['Email administrators when a comment is modified'] = 'Email administrators when a comment is modified'; 
    663663$lang['Email administrators when a comment is deleted'] = 'Email administrators when a comment is deleted'; 
     664$lang['Cannot delete the old permalink !'] = 'Cannot delete the old permalink !'; 
     665$lang['Deleted on'] = 'Deleted on'; 
     666$lang['Last hit'] = 'Last hit'; 
     667$lang['Hit'] = 'Hit'; 
    664668?> 
  • trunk/language/fr_FR/admin.lang.php

    r4881 r5075  
    663663$lang['Email administrators when a comment is modified'] = 'Notifier les administrateurs quand un commentaire est modifié'; 
    664664$lang['Email administrators when a comment is deleted'] = 'Notifier les administrateurs quand un commentaire est supprimé'; 
     665$lang['Cannot delete the old permalink !'] = 'Impossible de supprimer cet ancien lien permanent !'; 
     666$lang['Deleted on'] = 'Supprimés sur'; 
     667$lang['Last hit'] = 'dernier score'; 
     668$lang['Hit'] = 'score'; 
    665669?> 
Note: See TracChangeset for help on using the changeset viewer.