? 1009116-07-node_to_content-d7.patch
Index: API.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/API.txt,v
retrieving revision 1.9
diff -u -p -r1.9 API.txt
--- API.txt	8 Jun 2010 23:19:09 -0000	1.9
+++ API.txt	12 Jan 2011 05:21:31 -0000
@@ -48,14 +48,14 @@ settings:
 
 module - The name of your module (e.g., 'node')
 groupheader - The translated label for the settings group (e.g.,
-  t('Node path settings')
+  t('Content path settings')
 patterndescr - The translated label for the default pattern (e.g.,
-  t('Default path pattern (applies to all node types with blank patterns below)')
+  t('Default path pattern (applies to all content types with blank patterns below)')
 patterndefault - A translated default pattern (e.g., t('[cat]/[title].html'))
 token_type - The token type (e.g. 'node', 'user') that can be used.
 patternitems - For modules which need to express multiple patterns
   (for example, the node module supports a separate pattern for each
-  node type), an array whose keys consist of identifiers for each
+  content type), an array whose keys consist of identifiers for each
   pattern (e.g., the node type name) and values consist of the
   translated label for the pattern
 supportsfeeds - Modules which support RSS feeds should set this to the
@@ -63,10 +63,10 @@ supportsfeeds - Modules which support RS
   when administrators enable "Create feed aliases" an alias for this
   content type's feed will be generated in addition to the base alias.
 bulkname - For modules which support a bulk update operation, the
-  translated label for the action (e.g., t('Bulk update node paths'))
+  translated label for the action (e.g., t('Bulk update content paths'))
 bulkdescr - For modules which support a bulk update operation, a
   translated, more thorough description of what the operation will do
-  (e.g., t('Generate aliases for all existing nodes which do not already have aliases.'))
+  (e.g., t('Generate aliases for all existing content items which do not already have aliases.'))
 
 
 ==================
Index: README.txt
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/README.txt,v
retrieving revision 1.16
diff -u -p -r1.16 README.txt
--- README.txt	21 Jun 2008 18:20:38 -0000	1.16
+++ README.txt	12 Jan 2011 05:21:31 -0000
@@ -26,16 +26,16 @@ enhanced.
 See the INSTALL.txt file.
 
 **Notices:
-Pathauto just adds URL aliases to nodes, users, and taxonomy terms. Because 
-it's an alias, the standard Drupal URL (for example node/123 or 
+Pathauto just adds URL aliases to content, users, and taxonomy terms.
+Because it's an alias, the standard Drupal URL (for example node/123 or 
 taxonomy/term/1) will still function as normal.  If you have external links 
 to your site pointing to standard Drupal URLs, or hardcoded links in a module, 
-template, node or menu which point to standard Drupal URLs it will bypass the 
-alias set by Pathauto.
+template, content or menu which point to standard Drupal URLs it will
+bypass the alias set by Pathauto.
 
 There are reasons you might not want two URLs for the same content on your 
 site. If this applies to you, please note that you will need to update any 
-hard coded links in your nodes or blocks. 
+hard coded links in your content or blocks. 
 
 If you use the "system path" (i.e. node/10) for menu items and settings like
 that, Drupal will replace it with the url_alias.
@@ -57,10 +57,10 @@ Drupal API instead:
 See http://api.drupal.org/api/HEAD/function/url and 
 http://api.drupal.org/api/HEAD/function/l for more information.
 
-** Disabling Pathauto for a specific node type (or taxonomy)
-When the pattern for a node type is left blank, the default pattern will be 
+** Disabling Pathauto for a specific content type (or taxonomy)
+When the pattern for a content type is left blank, the default pattern will be 
 used. But if the default pattern is also blank, Pathauto will be disabled 
-for that node type.
+for that content type.
 
 ** Bulk Updates Must be Run Multiple Times:
 As of 5.x-2.x Pathauto now performs bulk updates in a manner which is more 
Index: pathauto.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.module,v
retrieving revision 1.168
diff -u -p -r1.168 pathauto.module
--- pathauto.module	3 Jan 2011 20:39:35 -0000	1.168
+++ pathauto.module	12 Jan 2011 05:21:31 -0000
@@ -137,7 +137,7 @@ function pathauto_menu() {
  * @param $entity
  *   An entity (e.g. node, taxonomy, user, etc.)
  * @param $bundle
- *   A bundle (e.g. node type, vocabulary ID, etc.)
+ *   A bundle (e.g. content type, vocabulary ID, etc.)
  * @param $language
  *   A language code, defaults to the LANGUAGE_NONE constant.
  */
@@ -319,7 +319,7 @@ function pathauto_form_alter(&$form, &$f
   if (!empty($form['#node_edit_form'])) {
     $node = $form['#node'];
 
-    // Find if there is an automatic alias pattern for this node type.
+    // Find if there is an automatic alias pattern for this content type.
     $language = isset($node->language) ? $node->language : LANGUAGE_NONE;
     $pattern = pathauto_pattern_load_by_entity('node', $node->type, $language);
 
Index: pathauto.pathauto.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.pathauto.inc,v
retrieving revision 1.6
diff -u -p -r1.6 pathauto.pathauto.inc
--- pathauto.pathauto.inc	11 Jan 2011 19:55:39 -0000	1.6
+++ pathauto.pathauto.inc	12 Jan 2011 05:21:31 -0000
@@ -53,8 +53,8 @@ function node_pathauto($op) {
       $settings = array();
       $settings['module'] = 'node';
       $settings['token_type'] = 'node';
-      $settings['groupheader'] = t('Node paths');
-      $settings['patterndescr'] = t('Default path pattern (applies to all node types with blank patterns below)');
+      $settings['groupheader'] = t('Content paths');
+      $settings['patterndescr'] = t('Default path pattern (applies to all content types with blank patterns below)');
       $settings['patterndefault'] = 'content/[node:title]';
       $settings['batch_update_callback'] = 'node_pathauto_bulk_update_batch_process';
       $settings['batch_file'] = drupal_get_path('module', 'pathauto') . '/pathauto.pathauto.inc';
@@ -66,7 +66,7 @@ function node_pathauto($op) {
 
       foreach (node_type_get_names() as $node_type => $node_name) {
         if (count($languages) && variable_get('language_content_type_' . $node_type, 0)) {
-          $settings['patternitems'][$node_type] = t('Default path pattern for @node_type (applies to all @node_type node types with blank patterns below)', array('@node_type' => $node_name));
+          $settings['patternitems'][$node_type] = t('Default path pattern for @node_type (applies to all @node_type content types with blank patterns below)', array('@node_type' => $node_name));
           foreach ($languages as $lang_code => $lang_name) {
             $settings['patternitems'][$node_type . '_' . $lang_code] = t('Pattern for all @language @node_type paths', array('@node_type' => $node_name, '@language' => $lang_name));
           }
Index: pathauto.test
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/pathauto.test,v
retrieving revision 1.36
diff -u -p -r1.36 pathauto.test
--- pathauto.test	11 Jan 2011 19:55:39 -0000	1.36
+++ pathauto.test	12 Jan 2011 05:21:31 -0000
@@ -465,7 +465,7 @@ class PathautoFunctionalTestCase extends
     $edit['pathauto_node_pattern'] = '[node:title]/[user:name]/[term:name]';
     $edit['pathauto_node_page_pattern'] = 'page';
     $this->drupalPost('admin/config/search/path/patterns', $edit, 'Save configuration');
-    $this->assertText('The Default path pattern (applies to all node types with blank patterns below) is using the following invalid tokens: [user:name], [term:name].');
+    $this->assertText('The Default path pattern (applies to all content types with blank patterns below) is using the following invalid tokens: [user:name], [term:name].');
     $this->assertText('The Pattern for all Basic page paths cannot contain fewer than one token.');
     $this->assertNoText('The configuration options have been saved.');
 
Index: translations/ru.po
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/translations/ru.po,v
retrieving revision 1.1
diff -u -p -r1.1 ru.po
--- translations/ru.po	2 May 2008 13:26:13 -0000	1.1
+++ translations/ru.po	12 Jan 2011 05:21:31 -0000
@@ -186,7 +186,7 @@ msgid "Node path settings"
 msgstr "Настройки адреса материала"
 
 #: pathauto_node.inc:14
-msgid "Default path pattern (applies to all node types with blank patterns below)"
+msgid "Default path pattern (applies to all content types with blank patterns below)"
 msgstr "Шаблон адреса по умолчанию (будет применено ко всем типам материалов ниже, для которых шаблоны не определены)"
 
 #: ;21;116
@@ -224,7 +224,7 @@ msgid "[type]"
 msgstr "[type]"
 
 #: pathauto_node.inc:24
-msgid "The node type (e.g., \"page\", \"story\", etc.)."
+msgid "The content type (e.g., \"page\", \"story\", etc.)."
 msgstr "Тип материала (например \"page\", \"story\" и т.д.)"
 
 #: pathauto_node.inc:25
Index: translations/sk.po
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/translations/sk.po,v
retrieving revision 1.1
diff -u -p -r1.1 sk.po
--- translations/sk.po	13 Dec 2008 23:57:33 -0000	1.1
+++ translations/sk.po	12 Jan 2011 05:21:31 -0000
@@ -224,7 +224,7 @@ msgstr "Nastavenia ciest uzlov"
 
 #: pathauto_node.inc:21,14,21,14,14
 msgid ""
-"Default path pattern (applies to all node types with blank patterns "
+"Default path pattern (applies to all content types with blank patterns "
 "below)"
 msgstr ""
 "Predvolený vzor cesty (aplikovaný na všetky typy obsahu, ktoré "
Index: translations/uk-ua.po
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/pathauto/translations/uk-ua.po,v
retrieving revision 1.3
diff -u -p -r1.3 uk-ua.po
--- translations/uk-ua.po	12 Nov 2009 01:33:02 -0000	1.3
+++ translations/uk-ua.po	12 Jan 2011 05:21:31 -0000
@@ -209,7 +209,7 @@ msgid "Created new alias %dst for %src, 
 msgstr "Створений новий псевдонім %dst для %src замість %oldalias"
 
 msgid ""
-"Default path pattern (applies to all node types with blank patterns below)"
+"Default path pattern (applies to all content types with blank patterns below)"
 msgstr ""
 "Шаблон адреси базово (буде пременено до всіх типів матеріалів нижче, для "
 "яких шаблони не визначені)"