aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddtddt <ddtddt@piwigo.org>2010-03-07 16:07:44 +0000
committerddtddt <ddtddt@piwigo.org>2010-03-07 16:07:44 +0000
commit346751667560369ad90a808ad15e746347f081c5 (patch)
treeea1a483f20dd5c8fab4f171c5c5a6fe28979bd88
parent3088ccc5a2005fece7d79e3a4b136b680dbf1f09 (diff)
Trunk merge 5070 bug:1486
git-svn-id: http://piwigo.org/svn/trunk@5075 68402e56-0260-453c-a942-63ccdbb3a9ee
-rw-r--r--admin/permalinks.php2
-rw-r--r--admin/template/goto/permalinks.tpl6
-rw-r--r--language/en_UK/admin.lang.php4
-rw-r--r--language/fr_FR/admin.lang.php4
4 files changed, 12 insertions, 4 deletions
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}
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index a136868e0..f2c165608 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -661,4 +661,8 @@ $lang['Allow users to edit theirs owns comments'] = 'Allow users to edit theirs
$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';
?> \ No newline at end of file
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 345ddee39..7517a093c 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -662,4 +662,8 @@ $lang['Allow users to edit theirs owns comments'] = 'Autoriser les utilisateurs
$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';
?> \ No newline at end of file