Index: flag.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag.module,v
retrieving revision 1.11.2.72.2.28
diff -u -r1.11.2.72.2.28 flag.module
--- flag.module	3 Nov 2009 02:10:45 -0000	1.11.2.72.2.28
+++ flag.module	3 Nov 2009 03:06:27 -0000
@@ -308,7 +308,7 @@
         $var = 'flag_'. $flag->name .'_default';
         $form['workflow']['flag'][$var] = array(
           '#type' => 'checkbox',
-          '#title' => $flag->get_label('flag_short'),
+          '#title' => $flag->get_label('flag_short', $form['#node_type']->type),
           '#default_value' => variable_get($var .'_'. $form['#node_type']->type, 0),
           '#return_value' => 1,
         );
@@ -358,8 +358,8 @@
       // Add the flag checkbox if displaying on the form.
       $form['flag'][$flag->name] = array(
         '#type' => 'checkbox',
-        '#title' => $flag->get_label('flag_short', $nid),
-        '#description' => $flag->get_label('flag_long', $nid),
+        '#title' => $flag->get_label('flag_short', $nid ? $nid : $form['type']['#value']),
+        '#description' => $flag->get_label('flag_long', $nid ? $nid : $form['type']['#value']),
         '#default_value' => $flag_status,
         '#return_value' => 1,
       );
Index: flag.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/flag/Attic/flag.inc,v
retrieving revision 1.1.2.30.2.16
diff -u -r1.1.2.30.2.16 flag.inc
--- flag.inc	28 Oct 2009 02:38:10 -0000	1.1.2.30.2.16
+++ flag.inc	3 Nov 2009 03:06:27 -0000
@@ -1184,9 +1184,19 @@
   }
 
   function replace_tokens($label, $contexts, $content_id) {
-    if ($content_id && ($node = $this->fetch_content($content_id))) {
+    if (is_numeric($content_id) && ($node = $this->fetch_content($content_id))) {
       $contexts['node'] = $node;
     }
+    // Nodes accept the node-type as a $content_id in the case that a new node
+    // is being created and a full node object does not yet exist.
+    elseif (!empty($content_id) && ($type = node_get_types('type', $content_id))) {
+      $content_id = NULL;
+      $contexts['node'] = (object) array(
+        'nid' => NULL,
+        'type' => $type->type,
+        'title' => '',
+      );
+    }
     return parent::replace_tokens($label, $contexts, $content_id);
   }