Index: i18ncontent/i18ncontent.install
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18ncontent/i18ncontent.install,v
retrieving revision 1.1.2.10
diff -u -p -r1.1.2.10 i18ncontent.install
--- i18ncontent/i18ncontent.install	3 Oct 2008 11:32:23 -0000	1.1.2.10
+++ i18ncontent/i18ncontent.install	21 Nov 2008 05:27:39 -0000
@@ -27,7 +27,7 @@ function i18ncontent_disable() {
   // Remove and restore help texts.
   $langcode = language_default('language');
   foreach (node_get_types() as $type) {
-    if (!$type->help && ($help = ts("nodetype:$type->type:help", $langcode))) {
+    if (!$type->help && ($help = i18nstrings_ts("nodetype:$type->type:help", $langcode))) {
       $type->help = $help;
       node_type_save($type);
     }
@@ -43,4 +43,4 @@ function i18ncontent_update_1() {
   drupal_load('module', 'i18ncontent');
   i18ncontent_locale_refresh();
   return $ret;
-}
\ No newline at end of file
+}
Index: i18ncontent/i18ncontent.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18ncontent/i18ncontent.module,v
retrieving revision 1.1.2.8
diff -u -p -r1.1.2.8 i18ncontent.module
--- i18ncontent/i18ncontent.module	3 Oct 2008 11:32:23 -0000	1.1.2.8
+++ i18ncontent/i18ncontent.module	21 Nov 2008 05:27:39 -0000
@@ -31,7 +31,7 @@ function i18ncontent_help($path, $arg) {
 
   if ($arg[0] == 'node' && $arg[1] == 'add' && $arg[2]) {
     $type = str_replace('-', '_', $arg[2]);
-    if ($help = ts("nodetype:$type:help")) {
+    if ($help = i18nstrings_ts("nodetype:$type:help")) {
       return '<p>'. filter_xss_admin($help) .'</p>';
     }
   }
@@ -61,7 +61,7 @@ function i18ncontent_locale_refresh() {
     tt("nodetype:$type->type:title", $type->title_label, NULL, TRUE);
     tt("nodetype:$type->type:title", $type->body_label, NULL, TRUE);
     if ($type->help) {
-      ts("nodetype:$type->type:help", $type->help, NULL, TRUE);
+      i18nstrings_ts("nodetype:$type->type:help", $type->help, NULL, TRUE);
       $type->help = '';
       node_type_save($type);
     }
@@ -89,8 +89,8 @@ function i18ncontent_form_alter(&$form, 
     $language = language_default('language');
     // If we are creating a new one, just add the submission hook.
     if ($type) {
-      //$form['description']['#default_value'] = ts("nodetype:$type:description");
-      $form['submission']['help']['#default_value'] = ts("nodetype:$type:help", $form['submission']['help']['#default_value'], $language);
+      //$form['description']['#default_value'] = i18nstrings_ts("nodetype:$type:description");
+      $form['submission']['help']['#default_value'] = i18nstrings_ts("nodetype:$type:help", $form['submission']['help']['#default_value'], $language);
     }
     $form['#submit'] = array_merge(array('i18ncontent_form_submit'), $form['#submit']);
   }
@@ -118,7 +118,7 @@ function i18ncontent_form_submit($form, 
       i18nstrings_update_context("nodetype:$old_type:*", "nodetype:$type:*");
     }
     tt("nodetype:$type:name", $form_state['values']['name'], $language, TRUE);
-    ts("nodetype:$type:help", $form_state['values']['help'], $language, TRUE);
+    i18nstrings_ts("nodetype:$type:help", $form_state['values']['help'], $language, TRUE);
     // We remove help text so it's not produced later by node module.
     $form_state['values']['help'] = '';
   }
Index: i18nstrings/i18nstrings.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/i18n/i18nstrings/i18nstrings.module,v
retrieving revision 1.8.2.21
diff -u -p -r1.8.2.21 i18nstrings.module
--- i18nstrings/i18nstrings.module	16 Nov 2008 19:32:28 -0000	1.8.2.21
+++ i18nstrings/i18nstrings.module	21 Nov 2008 05:27:39 -0000
@@ -125,7 +125,7 @@ function tt($name, $string, $langcode = 
  *
  * As the original language string will be stored in locales too so it should be only used when updating.
  */
-function ts($name, $string = '', $langcode = NULL, $update = FALSE) {
+function i18nstrings_ts($name, $string = '', $langcode = NULL, $update = FALSE) {
   global $language;
 
   $langcode = $langcode ? $langcode : $language->language;