diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index e73d3d6364b097db99e7de79c3169181b7bc572a..c889eb3d34124e1cde45b45505843a604ecbd2e5 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -5,6 +5,7 @@ CCK 6.2-dev
 
 Be sure to visit update.php after uploading this release.
 
+- #312546 by stella - Change some links to make translation easier.
 - Added the #delta value to the wrong place in the element, it was inaccessible to the formatter theme.
 - #119102 Combo field prep, rework the field overview form so it can hanle other kinds of groups.
 - #119102 Combo field prep, add hooks to the fieldgroup module so other modules can alter group info.
diff --git a/includes/content.admin.inc b/includes/content.admin.inc
index 2fdfe0de3d10f94a0f23c72c0ed51f4995864085..7d390ea2be18db7c3a2eb11d01d6a8b6cc712dc9 100644
--- a/includes/content.admin.inc
+++ b/includes/content.admin.inc
@@ -1047,9 +1047,9 @@ function content_field_edit_form(&$form_state, $type_name, $field_name) {
         '#default_value' => isset($field['widget']['default_value_php']) ? $field['widget']['default_value_php'] : '',
         '#rows' => 6,
         '#tree' => TRUE,
-        '#description' => t("Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>Using !link_devel 'devel load' tab on a %type content page might help you figure out the expected format.", array(
+        '#description' => t('Advanced usage only: PHP code that returns a default value. Should not include &lt;?php ?&gt; delimiters. If this field is filled out, the value returned by this code will override any value specified above. Expected format: <pre>!sample</pre>To figure out the expected format, you can use the <em>devel load</em> tab provided by <a href="@link_devel">devel module</a> on a %type content page.', array(
           '!sample' => $sample,
-          '!link_devel' => l("devel.module's", 'http://www.drupal.org/project/devel'),
+          '@link_devel' => url('http://www.drupal.org/project/devel'),
           '%type' => $type_name)),
       );
     }
diff --git a/tests/content.crud.test b/tests/content.crud.test
index c4b975d45b877343ccce41d140875236c5d5243a..93532bf07881127e030392f6ddfd635919c6671d 100644
--- a/tests/content.crud.test
+++ b/tests/content.crud.test
@@ -379,7 +379,7 @@ class ContentCrudBasicTest extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('CRUD - Basic API tests'),
-      'description' => t('Tests the field CRUD (create, read, update, delete) API. <b>Requires !schema_link.</b>', array('!schema_link' => l('Schema module', 'http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the field CRUD (create, read, update, delete) API. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
       'group' => t('CCK'),
     );
   }
@@ -435,7 +435,7 @@ class ContentCrudSingleToMultipleTest extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('CRUD - Single to multiple'),
-      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a single value field and changing it to a multivalue field, sharing it between several content types. <b>Requires !schema_link.</b>', array('!schema_link' => l('Schema module', 'http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a single value field and changing it to a multivalue field, sharing it between several content types. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
       'group' => t('CCK'),
     );
   }
@@ -510,7 +510,7 @@ class ContentCrudMultipleToSingleTest extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('CRUD - Multiple to single'),
-      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a multivalue field and changing it to a single value field, sharing it between several content types. <b>Requires !schema_link.</b>', array('!schema_link' => l('Schema module', 'http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the field CRUD (create, read, update, delete) API by creating a multivalue field and changing it to a single value field, sharing it between several content types. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
       'group' => t('CCK'),
     );
   }
@@ -644,7 +644,7 @@ class ContentUICrud extends ContentCrudTestCase {
   function getInfo() {
     return array(
       'name' => t('Admin UI'),
-      'description' => t('Tests the CRUD (create, read, update, delete) operations for content fields via the UI. <b>Requires !schema_link.</b>', array('!schema_link' => l('Schema module', 'http://www.drupal.org/projects/schema'))),
+      'description' => t('Tests the CRUD (create, read, update, delete) operations for content fields via the UI. <b>Requires <a href="@schema_link">Schema module</a>.</b>', array('@schema_link' => url('http://www.drupal.org/projects/schema'))),
       'group' => t('CCK'),
     );
   }