Index: gmap_location.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/gmap/gmap_location.module,v
retrieving revision 1.58
diff -u -p -r1.58 gmap_location.module
--- gmap_location.module	13 Mar 2009 17:10:45 -0000	1.58
+++ gmap_location.module	16 Oct 2009 19:11:10 -0000
@@ -516,7 +516,7 @@ function gmap_location_admin_settings() 
   foreach ($ntypes as $key => $value) {
     $form['node']['gmap_node_markers'][$key] = array(
       '#type' => 'gmap_markerchooser',
-      '#title' => t('Marker for %type', array('%type' => $value->name)),
+      '#title' => t('Marker for %type', array('%type' => gmap_tt("nodetype:type:$key:name", $value->name))),
       '#default_value' => isset($defaults[$key]) ? $defaults[$key] : 'drupal',
     );
     $settings = variable_get("location_settings_node_$key", FALSE);
@@ -561,7 +561,7 @@ function gmap_location_block($op = 'list
           if ((isset($settings['multiple']['max']) && $settings['multiple']['max']) || variable_get("location_maxnum_$key", 0)) {
             $form["gmap_location_block_macro_$key"] = array(
               '#type' => 'textfield',
-              '#title' => t('Map Macro for %type', array('%type' => $value->name)),
+              '#title' => t('Map Macro for %type', array('%type' => gmap_tt("nodetype:type:$key:name", $value->name))),
               '#size' => 60,
               '#maxlength' => 500,
               '#default_value' => variable_get("gmap_location_block_macro_$key", ''),
@@ -579,10 +579,14 @@ function gmap_location_block($op = 'list
           '#default_value' => variable_get('gmap_location_author_block_macro', '[gmap |width=100% |height=200px |control=None |behavior=+autozoom +notype]'),
         );
 
+        $ntypes = node_get_types('names');
+        foreach ($ntypes as $type => $name) {
+          $ntypes[$type] = check_plain(gmap_tt("nodetype:type:$type:name", $name));
+        }
         $form['gmap_location_author_block_types'] = array(
           '#type' => 'checkboxes',
           '#title' => t('Enable author block for the following content types'),
-          '#options' => array_map('check_plain', node_get_types('names')),
+          '#options' => $ntypes,
           '#default_value' => variable_get('gmap_location_author_block_types', array()),
         );
 
@@ -816,3 +820,15 @@ function gmap_location_node_type($op, $i
   }
   variable_set('gmap_node_markers', $temp);
 }
+
+/**   
+ * Wrapper function for tt() if i18nstrings enabled.   
+ */   
+function gmap_tt($name, $string, $langcode = NULL, $update = FALSE) {   
+  if (module_exists('18nstrings')) {   
+    return tt($name, $string, $langcode, $update);   
+  }   
+  else {   
+    return $string;   
+  }   
+}