Permalink
Browse files

Trunk merge 5070 bug:1486

git-svn-id: http://piwigo.org/svn/trunk@5075 68402e56-0260-453c-a942-63ccdbb3a9ee
  • Loading branch information...
ddtddt committed Mar 7, 2010
1 parent 3088ccc commit 346751667560369ad90a808ad15e746347f081c5
Showing with 12 additions and 4 deletions.
  1. +1 −1 admin/permalinks.php
  2. +3 −3 admin/template/goto/permalinks.tpl
  3. +4 −0 language/en_UK/admin.lang.php
  4. +4 −0 language/fr_FR/admin.lang.php
@@ -100,7 +100,7 @@ function parse_sort_variables(
LIMIT 1';
pwg_query($query);
if (pwg_db_affected_rows()==0)
array_push($page['errors'], 'Cannot delete the old permalink !');
array_push($page['errors'], l10n('Cannot delete the old permalink !'));
}
@@ -47,9 +47,9 @@
<td>Id {$SORT_OLD_CAT_ID}</td>
<td>{'Category'|@translate}</td>
<td>{'Permalink'|@translate} {$SORT_OLD_PERMALINK}</td>
<td>Deleted on {$SORT_OLD_DATE_DELETED}</td>
<td>Last hit {$SORT_OLD_LAST_HIT}</td>
<td style="width:20px;">Hit {$SORT_OLD_HIT}</td>
<td>{'Deleted on'|@translate} {$SORT_OLD_DATE_DELETED}</td>
<td>{'Last hit'|@translate} {$SORT_OLD_LAST_HIT}</td>
<td style="width:20px;">{'Hit'|@translate} {$SORT_OLD_HIT}</td>
<td style="width:5px;"></td>
</tr>
{foreach from=$deleted_permalinks item=permalink}
@@ -661,4 +661,8 @@
$lang['Allow users to delete theirs owns comments'] = 'Allow users to delete theirs owns comments';
$lang['Email administrators when a comment is modified'] = 'Email administrators when a comment is modified';
$lang['Email administrators when a comment is deleted'] = 'Email administrators when a comment is deleted';
$lang['Cannot delete the old permalink !'] = 'Cannot delete the old permalink !';
$lang['Deleted on'] = 'Deleted on';
$lang['Last hit'] = 'Last hit';
$lang['Hit'] = 'Hit';
?>
@@ -662,4 +662,8 @@
$lang['Allow users to delete theirs owns comments'] = 'Autoriser les utilisateurs à supprimer leurs propres commentaires';
$lang['Email administrators when a comment is modified'] = 'Notifier les administrateurs quand un commentaire est modifié';
$lang['Email administrators when a comment is deleted'] = 'Notifier les administrateurs quand un commentaire est supprimé';
$lang['Cannot delete the old permalink !'] = 'Impossible de supprimer cet ancien lien permanent !';
$lang['Deleted on'] = 'Supprimés sur';
$lang['Last hit'] = 'dernier score';
$lang['Hit'] = 'score';
?>

0 comments on commit 3467516

Please sign in to comment.