aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorddtddt <ddtddt@piwigo.org>2010-03-07 13:42:33 +0000
committerddtddt <ddtddt@piwigo.org>2010-03-07 13:42:33 +0000
commitd71468599514e8af1a9b0c0ca7718445ca7ce19b (patch)
treecaa353d4edc505521285ca7858253950d5f82469
parent61cf190aaf820731627eaaeca345ae3d71a11f39 (diff)
[Branche2] bug:1486
git-svn-id: http://piwigo.org/svn/branches/2.0@5070 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 bd56e69d8..517060850 100644
--- a/admin/permalinks.php
+++ b/admin/permalinks.php
@@ -100,7 +100,7 @@ DELETE FROM '.OLD_PERMALINKS_TABLE.'
LIMIT 1';
pwg_query($query);
if (mysql_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 3e04cc3d0..52677b7cb 100644
--- a/admin/template/goto/permalinks.tpl
+++ b/admin/template/goto/permalinks.tpl
@@ -48,9 +48,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 02f4c98b9..38e03eb46 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -654,4 +654,8 @@ $lang['Subscribe %s'] = 'Subscribe %s';
$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Subscribe %s to Piwigo Announcements Newsletter';
$lang['Purge search history'] = 'Purge search history';
$lang['Hide'] = 'Hide';
+$lang['Cannot delete the old permalink !'] = 'Cannot delete the old permalink !';
+$lang['Deleted on'] = 'Deleted on';
+$lang['Last hit'] = 'Last hit';
+$lang['Hit'] = 'Hit';
?>
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index e266df441..d4b5b3910 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -654,4 +654,8 @@ $lang['Subscribe %s'] = 'Abonner %s';
$lang['Subscribe %s to Piwigo Announcements Newsletter'] = 'Abonner %s à la newsletter Piwigo';
$lang['Purge search history'] = 'Purger l\'historique des recherches';
$lang['Hide'] = 'Masquer';
+$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';
?>