From 346751667560369ad90a808ad15e746347f081c5 Mon Sep 17 00:00:00 2001
From: ddtddt <ddtddt@piwigo.org>
Date: Sun, 7 Mar 2010 16:07:44 +0000
Subject: Trunk merge 5070 bug:1486

git-svn-id: http://piwigo.org/svn/trunk@5075 68402e56-0260-453c-a942-63ccdbb3a9ee
---
 admin/permalinks.php               | 2 +-
 admin/template/goto/permalinks.tpl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

(limited to 'admin')

diff --git a/admin/permalinks.php b/admin/permalinks.php
index bb9dc4934..342bf44d5 100644
--- a/admin/permalinks.php
+++ b/admin/permalinks.php
@@ -100,7 +100,7 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.'
   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 !'));
 }
 
 
diff --git a/admin/template/goto/permalinks.tpl b/admin/template/goto/permalinks.tpl
index 0b5607fad..ef5c7f802 100644
--- a/admin/template/goto/permalinks.tpl
+++ b/admin/template/goto/permalinks.tpl
@@ -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}
-- 
cgit v1.2.3