Changeset 5075

Timestamp:

Mar 7, 2010, 5:07:44 PM (14 years ago)

Author:

ddtddt

Message:

Trunk merge 5070 bug:1486

Location:

trunk

Files:

• admin/permalinks.php (modified) (1 diff)
• admin/template/goto/permalinks.tpl (modified) (1 diff)
• language/en_UK/admin.lang.php (modified) (1 diff)
• language/fr_FR/admin.lang.php (modified) (1 diff)

trunk/admin/permalinks.php

@@ -101 +101 @@
   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 !'));
 }
 

trunk/admin/template/goto/permalinks.tpl

@@ -48 +48 @@
                 <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>

trunk/language/en_UK/admin.lang.php

@@ -662 +662 @@
 $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';
 ?>

trunk/language/fr_FR/admin.lang.php

@@ -663 +663 @@
 $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';
 ?>