Index: nodeblock.module
===================================================================
--- nodeblock.module	(revision 176)
+++ nodeblock.module	(working copy)
@@ -156,20 +156,22 @@
   $links = array();
 
   if ($type == 'node' && nodeblock_type_enabled($node)) {
-    if (node_access('update', $node)) {
-      $links['nodeblock_edit'] = array(
-        'title' => t('Edit'),
-        'href' => 'node/'. $node->nid .'/edit',
-        'query' => drupal_get_destination(),
-      );
+    if (!module_exists('admin_links')) {
+      if (node_access('update', $node)) {
+        $links['nodeblock_edit'] = array(
+          'title' => t('Edit'),
+          'href' => 'node/'. $node->nid .'/edit',
+          'query' => drupal_get_destination(),
+        );
+      }
+      if (module_exists('translation') && _translation_tab_access($node)) {
+        $links['nodeblock_translate'] = array(
+          'title' => t('Translate'),
+          'href' => 'node/'. $node->nid .'/translate',
+          'query' => drupal_get_destination(),
+        );
+      }
     }
-    if (module_exists('translation') && _translation_tab_access($node)) {
-      $links['nodeblock_translate'] = array(
-        'title' => t('Translate'),
-        'href' => 'node/'. $node->nid .'/translate',
-        'query' => drupal_get_destination(),
-      );
-    }
     if (user_access('administer blocks')) {
       $links['nodeblock_configure'] = array(
         'title' => t('Configure'),