Index: translation/translation.module
===================================================================
--- translation/translation.module	(revision 621)
+++ translation/translation.module	(working copy)
@@ -518,7 +518,7 @@
   
   $sql = "SELECT n.nid, n.type, n.title, n.status, u.name, u.uid, i.language, i2.nid AS translation_nid, i2.status AS translation_status ".
     "FROM {node} n INNER JOIN {users} u ON n.uid = u.uid INNER JOIN {i18n_node} i ON n.nid = i.nid ".
-    "LEFT JOIN {i18n_node} i2 ON i.trid = i2.trid AND 0 != i2.trid AND i.language != i2.language $join".
+    "LEFT JOIN {i18n_node} i2 ON i.trid = i2.trid AND 0 <> i2.trid AND i.language <> i2.language $join".
     (count($where) ? ' WHERE '.implode(' AND ', $where) : '');
  
   // Fetch data
@@ -865,10 +865,10 @@
     $values[] = $value;
   }
   if(!$getall){ // If not all, a parameter must be nid
-    $conds[] = "n.nid != %d";
+    $conds[] = "n.nid <> %d";
     $values[] = $params['nid'];
   }
-  $conds[] = "b.trid != 0";
+  $conds[] = "b.trid <> 0";
   $sql = 'SELECT n.nid, n.title, n.status, a.language FROM {node} n INNER JOIN {i18n_node} a ON n.nid = a.nid INNER JOIN {i18n_node} b ON a.trid = b.trid WHERE '. implode(' AND ', $conds);
 
   i18n_selection_mode('off');
@@ -1052,10 +1052,10 @@
     $values[] = $value;
   }
   if(!$getall){ // If not all, a parameter must be tid
-    $conds[] = "t.tid != %d";
+    $conds[] = "t.tid <> %d";
     $values[] = $params['tid'];
   }
-  $conds[] = "t.trid != 0";
+  $conds[] = "t.trid <> 0";
   $sql = 'SELECT t.* FROM {term_data} t INNER JOIN {term_data} i ON t.trid = i.trid WHERE '. implode(' AND ', $conds);;
   $result = db_query($sql, $values);
   $items = array();
@@ -1105,7 +1105,7 @@
  *   Translated node nid if exists, or $default
  */
 function translation_node_nid($nid, $language = NULL, $default = NULL) {
-  $translation = db_result(db_query("SELECT n.nid FROM {i18n_node} n INNER JOIN {i18n_node} a ON n.trid = a.trid AND n.nid != a.nid WHERE a.nid = %d AND n.language = '%s' AND n.trid", $nid, $language ? $language : i18n_get_lang()));
+  $translation = db_result(db_query("SELECT n.nid FROM {i18n_node} n INNER JOIN {i18n_node} a ON n.trid = a.trid AND n.nid <> a.nid WHERE a.nid = %d AND n.language = '%s' AND n.trid is not null", $nid, $language ? $language : i18n_get_lang()));
   return $translation ? $translation : $default;
 }
 
@@ -1122,7 +1122,7 @@
  *   Translated term tid if exists, or $default
  */
 function translation_term_tid($tid, $language = NULL, $default = NULL) {
-  $translation = db_result(db_query("SELECT t.tid FROM {term_data} t INNER JOIN {term_data} a ON t.trid = a.trid AND t.tid != a.tid WHERE a.tid = %d AND t.language = '%s' AND t.trid", $tid, $language ? $language : i18n_get_lang()));
+  $translation = db_result(db_query("SELECT t.tid FROM {term_data} t INNER JOIN {term_data} a ON t.trid = a.trid AND t.tid <> a.tid WHERE a.tid = %d AND t.language = '%s' AND t.trid is not null", $tid, $language ? $language : i18n_get_lang()));
   return $translation ? $translation : $default;
 }