diff --git a/wp-admin/admin-functions.php b/wp-admin/admin-functions.php
index 720997e33a..2c17efbf5b 100644
--- a/wp-admin/admin-functions.php
+++ b/wp-admin/admin-functions.php
@@ -974,13 +974,13 @@ function get_plugin_data($plugin_file) {
 	$name = trim($name);
 	$plugin = $name;
 	if ('' != $plugin_uri[1] && '' != $name) {
-		$plugin = __("<a href='{$plugin_uri[1]}' title='Visit plugin homepage'>{$plugin}</a>");
+		$plugin = '<a href="' . $plugin_uri[1] . '" title="' . __('Visit plugin homepage') . '">' . $plugin . '</a>';
 	}
 
 	if ('' == $author_uri[1]) {
 		$author = $author_name[1];
 	} else {
-		$author = __("<a href='{$author_uri[1]}' title='Visit author homepage'>{$author_name[1]}</a>");
+		$author = '<a href="' . $author_uri[1] . '" title="' . __('Visit author homepage') . '">' . $author_name[1] . '</a>';
 	}
 
 	return array('Name' => $name, 'Title' => $plugin, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]);
diff --git a/wp-admin/link-categories.php b/wp-admin/link-categories.php
index ae49fac2be..69244981ad 100644
--- a/wp-admin/link-categories.php
+++ b/wp-admin/link-categories.php
@@ -338,13 +338,13 @@ foreach ($results as $row) {
               <tr valign="middle" align="center" <?php echo $style ?> style="border-bottom: 1px dotted #9C9A9C;">
                 <td><?php echo wp_specialchars($row->cat_name)?></td>
 				<td ><?php echo $row->cat_id?></td>
-                <td><?php echo $row->auto_toggle == 'Y' ? __('Y') : __('N') ?></td>
-                <td><?php echo $row->show_images == 'Y' ? __('Y') : __('N') ?></td>
-                <td><?php echo $row->show_description == 'Y' ? __('Y') : __('N') ?></td>
-                <td><?php echo $row->show_rating == 'Y' ? __('Y') : __('N') ?></td>
-                <td><?php echo $row->show_updated == 'Y' ? __('Y') : __('N') ?></td>
+                <td><?php echo $row->auto_toggle == 'Y' ? __('Yes') : __('No') ?></td>
+                <td><?php echo $row->show_images == 'Y' ? __('Yes') : __('No') ?></td>
+                <td><?php echo $row->show_description == 'Y' ? __('Yes') : __('No') ?></td>
+                <td><?php echo $row->show_rating == 'Y' ? __('Yes') : __('No') ?></td>
+                <td><?php echo $row->show_updated == 'Y' ? __('Yes') : __('No') ?></td>
                 <td><?php echo $row->sort_order ?></td>
-                <td><?php echo $row->sort_desc == 'Y' ? __('Y') : __('N') ?></td>
+                <td><?php echo $row->sort_desc == 'Y' ? __('Yes') : __('No') ?></td>
                 <td nowrap="nowrap"><?php echo htmlentities($row->text_before_link)?>&nbsp;</td>
                 <td nowrap="nowrap"><?php echo htmlentities($row->text_after_link)?>&nbsp;</td>
                 <td nowrap="nowrap"><?php echo htmlentities($row->text_after_all)?></td>
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index 2e76f50bdc..d45e569fc2 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -1397,13 +1397,13 @@ function get_theme_data($theme_file) {
 	$name = trim($name);
 	$theme = $name;
 	if ('' != $theme_uri[1] && '' != $name) {
-		$theme = __("<a href='{$theme_uri[1]}' title='Visit theme homepage'>{$theme}</a>");
+		$theme = '<a href="' . $theme_uri[1] . '" title="' . __('Visit theme homepage') . '">' . $theme . '</a>';
 	}
 
 	if ('' == $author_uri[1]) {
 		$author = $author_name[1];
 	} else {
-		$author = __("<a href='{$author_uri[1]}' title='Visit author homepage'>{$author_name[1]}</a>");
+		$author = '<a href="' . $author_uri[1] . '" title="' . __('Visit author homepage') . '">' . $author_name[1] . '</a>';
 	}
 
 	return array('Name' => $name, 'Title' => $theme, 'Description' => $description, 'Author' => $author, 'Version' => $version, 'Template' => $template[1]);