Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.549
diff -u -d -F^function -r1.549 common.inc
--- includes/common.inc	19 Jul 2006 07:45:35 -0000	1.549
+++ includes/common.inc	29 Jul 2006 16:19:02 -0000
@@ -534,23 +534,6 @@ function fix_gpc_magic() {
 }
 
 /**
- * @name Messages
- * @{
- * Frequently used messages.
- */
-
-/**
- * Return a string with a "not applicable" message.
- */
-function message_na() {
-  return t('n/a');
-}
-
-/**
- * @} End of "Messages".
- */
-
-/**
  * Initialize the localization system.
  */
 function locale_initialize() {
Index: includes/locale.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/locale.inc,v
retrieving revision 1.81
diff -u -d -F^function -r1.81 locale.inc
--- includes/locale.inc	6 Jul 2006 14:41:37 -0000	1.81
+++ includes/locale.inc	29 Jul 2006 16:19:06 -0000
@@ -86,7 +86,7 @@ function theme_locale_admin_manage_scree
   foreach ($form['name'] as $key => $element) {
     // Do not take form control structures.
     if (is_array($element) && element_child($key)) {
-      $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : message_na()), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : ''));
+      $rows[] = array(check_plain($key), form_render($form['name'][$key]), form_render($form['enabled'][$key]), form_render($form['site_default'][$key]), ($key != 'en' ? form_render($form['translation'][$key]) : t('n/a')), ($key != 'en' ? l(t('delete'), 'admin/locale/language/delete/'. $key) : ''));
     }
   }
   $header = array(array('data' => t('Code')), array('data' => t('English name')), array('data' => t('Enabled')), array('data' => t('Default')), array('data' => t('Translated')), array('data' => t('Operations')));
Index: modules/blogapi/blogapi.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/blogapi/blogapi.module,v
retrieving revision 1.87
diff -u -d -F^function -r1.87 blogapi.module
--- modules/blogapi/blogapi.module	26 Jul 2006 07:24:19 -0000	1.87
+++ modules/blogapi/blogapi.module	29 Jul 2006 16:19:08 -0000
@@ -247,7 +247,7 @@ function blogapi_blogger_edit_post($appk
 
   $node = node_load($postid);
   if (!$node) {
-    return blogapi_error(message_na());
+    return blogapi_error(t('n/a'));
   }
   // Let the teaser be re-generated.
   unset($node->teaser);
Index: modules/filter/filter.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/filter/filter.module,v
retrieving revision 1.127
diff -u -d -F^function -r1.127 filter.module
--- modules/filter/filter.module	19 Jul 2006 07:04:26 -0000	1.127
+++ modules/filter/filter.module	29 Jul 2006 16:19:11 -0000
@@ -776,7 +776,7 @@ function check_markup($text, $format = F
     }
   }
   else {
-    $text = message_na();
+    $text = t('n/a');
   }
 
   return $text;
Index: modules/forum/forum.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/forum/forum.module,v
retrieving revision 1.338
diff -u -d -F^function -r1.338 forum.module
--- modules/forum/forum.module	11 Jul 2006 07:04:34 -0000	1.338
+++ modules/forum/forum.module	29 Jul 2006 16:19:14 -0000
@@ -675,7 +675,7 @@ function _forum_format($topic) {
     return t('%time ago<br />by %author', array('%time' => format_interval(time() - $topic->timestamp), '%author' => theme('username', $topic)));
   }
   else {
-    return message_na();
+    return t('n/a');
   }
 }