WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@638 7be80a69-a1ef-0310-a953-fb0f7c49ff36

1 files changed, 10 insertions, 10 deletions

diff --git a/wp-admin/edit-link-form.php b/wp-admin/edit-link-form.php
index 5534f1d..30002e6 100644
--- a/wp-admin/edit-link-form.php
+++ b/wp-admin/edit-link-form.php
@@ -1,12 +1,12 @@
 <?php

 if ( ! empty($link_id) ) {

-	$heading = __('Edit Bookmark');

+	$heading = __('Edit Link');

 	$submit_text = __('Save Changes &raquo;');

 	$form = '<form name="editlink" id="editlink" method="post" action="link.php">';

 	$nonce_action = 'update-bookmark_' . $link_id;

 } else {

-	$heading = __('Create Bookmark');

-	$submit_text = __('Add Bookmark &raquo;');

+	$heading = __('Add Link');

+	$submit_text = __('Add Link &raquo;');

 	$form = '<form name="addlink" id="addlink" method="post" action="link.php">';

 	$nonce_action = 'add-bookmark';

 }

@@ -84,14 +84,14 @@ function xfn_check($class, $value = '', $type = 'check') {
 

 <table class="editform" width="100%" cellspacing="2" cellpadding="5">

 <tr>

-<th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('URI:') ?></label></th>

-<td width="80%"><input type="text" name="link_url" value="<?php echo $link->link_url; ?>" style="width: 95%" /></td>

-</tr>

-<tr>

 <th scope="row" valign="top"><label for="link_name"><?php _e('Name:') ?></label></th>

 <td><input type="text" name="link_name" value="<?php echo $link->link_name; ?>" style="width: 95%" /></td>

 </tr>

 <tr>

+<th width="20%" scope="row" valign="top"><label for="link_url"><?php _e('Address:') ?></label></th>

+<td width="80%"><input type="text" name="link_url" value="<?php echo $link->link_url; if ( empty( $link->link_url ) ) echo 'http://'; ?>" style="width: 95%" /></td>

+</tr>

+<tr>

 <th scope="row" valign="top"><label for="link_description"><?php _e('Description:') ?></label></th>

 <td><input type="text" name="link_description" value="<?php echo $link->link_description; ?>" style="width: 95%" /></td>

 </tr>

@@ -130,7 +130,7 @@ function xfn_check($class, $value = '', $type = 'check') {
 						<input class="valinp" type="radio" name="friendship" value="contact" id="contact" <?php xfn_check('friendship', 'contact', 'radio'); ?> /> <?php _e('contact') ?></label>

 						<label for="acquaintance">

 						<input class="valinp" type="radio" name="friendship" value="acquaintance" id="acquaintance" <?php xfn_check('friendship', 'acquaintance', 'radio'); ?> />  <?php _e('acquaintance') ?></label>

-						<label id="friend">

+						<label for="friend">

 						<input class="valinp" type="radio" name="friendship" value="friend" id="friend" <?php xfn_check('friendship', 'friend', 'radio'); ?> /> <?php _e('friend') ?></label>

 						<label for="friendship">

 						<input name="friendship" type="radio" class="valinp" value="" id="friendship" <?php xfn_check('friendship', '', 'radio'); ?> /> <?php _e('none') ?></label>

@@ -221,11 +221,11 @@ function xfn_check($class, $value = '', $type = 'check') {
 <div class="dbx-content">

 <table class="editform" width="100%" cellspacing="2" cellpadding="5">

 	<tr>

-		<th width="20%" scope="row"><?php _e('Image URI:') ?></th>

+		<th width="20%" scope="row"><?php _e('Image Address:') ?></th>

 		<td width="80%"><input type="text" name="link_image" size="50" value="<?php echo $link->link_image; ?>" style="width: 95%" /></td>

 	</tr>

 	<tr>

-		<th scope="row"><?php _e('RSS URI:') ?> </th>

+		<th scope="row"><?php _e('RSS Address:') ?> </th>

 		<td><input name="link_rss" type="text" id="rss_uri" value="<?php echo $link->link_rss; ?>" size="50" style="width: 95%" /></td>

 	</tr>

 	<tr>