"profile locator/address" is now called "Identity Address" to reduce confusion

doc/Making-Friends.md

@@ -9,7 +9,7 @@ The first thing you can do is look at the Directory for somebody you would like
 
 Click that. It will take you to a "Connect" form.
 
-This is going to ask you for your profile locator. This is necessary so that this person's website can find yours. 
+This is going to ask you for your Identity Address. This is necessary so that this person's website can find yours. 
 
 What do you put in the box?
 
@@ -19,19 +19,19 @@ Notice this looks just like an email address. It was meant to be that way. It's
 
 You *could* also put in the URL of your profile page, such as "http://demo.friendika.com/profile/bob". 
 
-The email-style locator is certainly easier.
+The email-style address is certainly easier.
 
 When you've submitted the connection page, it will take you back to your own site where you must then login (if necessary) and verify the connection request on *your* site. Once you've done this, the two websites can communicate with each other to complete the process (after your new friend has approved the request). 
 
-If you already know somebody's profile location, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
+If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page. This will take you through a similar process.
 
-You can also use your profile locator or other people's profile locators to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks.  (Or you can put in Bob's profile URL if you wish).  You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendika. 
+You can also use your Identity Address or other people's Identity Addresses to become friends across networks. The list of possible networks is growing all the time. If you know (for instance) "bob" on identi.ca (a Status.Net site) you could put bob@identi.ca into your Contact page and become friends across networks.  (Or you can put in the URL to Bob's identi.ca page if you wish).  You can also be "partial" friends with somebody on Google Buzz by putting in their gmail address. Google Buzz does not yet support all the protocols we need for direct messaging, but you should be able to follow status updates from within Friendika. 
 
-This works from other networks as well. If a friend of yours has an identi.ca account, they can become friends with you by putting your Friendika profile locator into their identi.ca subscription dialog box. 
+This works from other networks as well. If a friend of yours has an identi.ca account, they can become friends with you by putting your Friendika Identity Address into their identi.ca subscription dialog box. 
 
 If this happens you will receive a notification. You will need to approve this before the friendship is complete.
 
-Some networks allow people to send you messages without being friends and without your approval. Friendika does not allow this by default. It would open a gateway for spam. So when you've approved a friend request from one of these networks, look at your contact page for that person (this will be displayed as soon as you approve the relationship). They might be marked as an "Ignored" contact. 
+Some networks allow people to send you messages without being friends and without your approval. Friendika does not allow this by default, as it would open a gateway for spam. So when you've approved a friend request from one of these networks, look at your contact page for that person (this will be displayed as soon as you approve the relationship). They might be marked as an "Ignored" contact. 
 
 This means they can see some of your posts (your public posts), but they aren't permitted to send you anything. You can "Un-ignore" them if you desire to allow them to contact you directly and to have their status updates appear in your Network feed. 
 

doc/Tags-and-Mentions.md

@@ -15,7 +15,7 @@ The following are various ways of indicating a person:
 
 * @mike - indicates a known contact in your social circle whose nickname is "mike"
 * @mike_macgirvin - indicates a known contact in your social circle whose  full name is "Mike Macgirvin". Note that spaces cannot be used inside tags.
-* @mike@macgirvin.com - indicates the profile locator of a person on a different network, or one that is *not* in your social circle. This can only be an email-style locator, not a web URL. 
+* @mike@macgirvin.com - indicates the Identity Address of a person on a different network, or one that is *not* in your social circle. This can only be an email-style locator, not a web URL. 
 
 Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts. Please note that Friendika often blocks incoming "mentions" from other networks and especially from people with no relationship to you. This is a spam prevention measure. 
 

mod/dfrn_request.php

@@ -618,17 +618,18 @@ function dfrn_request_content(&$a) {
 
 		$o .= replace_macros($tpl,array(
 			'$header' => t('Friend/Connection Request'),
+			'$desc' => t('Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'),
 			'$pls_answer' => t('Please answer the following:'),
 			'$does_know' => t('Does $name know you?'),
 			'$yes' => t('Yes'),
 			'$no' => t('No'),
 			'$add_note' => t('Add a personal note:'),
-			'$page_desc' => t('Please enter your profile address from one of the following supported social networks:'),
+			'$page_desc' => t("Please enter your 'Identity Address' from one of the following supported social networks:"),
 			'$friendika' => t('Friendika'),
 			'$statusnet' => t('StatusNet/Federated Social Web'),
 			'$private_net' => t("Private \x28secure\x29 network"),
 			'$public_net' => t("Public \x28insecure\x29 network"),
-			'$your_address' => t('Your profile address:'),
+			'$your_address' => t('Your Identity Address:'),
 			'$submit' => t('Submit Request'),
 			'$cancel' => t('Cancel'),
 			'$nickname' => $a->argv[1],

mod/settings.php

@@ -331,6 +331,7 @@ function settings_content(&$a) {
 			$theme_selector .= '<option val="' . basename($file) . '"' . $selected . '>' . basename($file) . '</option>';
 		}
 	}
+
 	$theme_selector .= '</select>';
 
 	$subdir = ((strlen($a->get_path())) ? '<br />' . t('or') . ' ' . $a->get_baseurl() . '/profile/' . $nickname : '');
@@ -338,7 +339,7 @@ function settings_content(&$a) {
 	$tpl_addr = load_view_file("view/settings_nick_set.tpl");
 
 	$prof_addr = replace_macros($tpl_addr,array(
-		'$desc' => t('Your profile address is'),
+		'$desc' => t('Your Identity Address is'),
 		'$nickname' => $nickname,
 		'$subdir' => $subdir,
 		'$basepath' => $a->get_hostname()

util/strings.php

@@ -209,17 +209,18 @@ $a->strings['Confirm'] = 'Confirm';
 $a->strings['[Name Withheld]'] = '[Name Withheld]';
 $a->strings["Introduction received at "] = "Introduction received at ";
 $a->strings['Friend/Connection Request'] = 'Friend/Connection Request';
+$a->strings['Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca'] = 'Examples: jojo@demo.friendika.com, http://demo.friendika.com/profile/jojo, testuser@identi.ca';
 $a->strings['Please answer the following:'] = 'Please answer the following:';
 $a->strings['Does $name know you?'] = 'Does $name know you?';
 $a->strings['Yes'] = 'Yes';
 $a->strings['No'] = 'No';
 $a->strings['Add a personal note:'] = 'Add a personal note:';
-$a->strings['Please enter your profile address from one of the following supported social networks:'] = 'Please enter your profile address from one of the following supported social networks:';
+$a->strings["Please enter your 'Identity Address' from one of the following supported social networks:"] = "Please enter your 'Identity Address' from one of the following supported social networks:";
 $a->strings['Friendika'] = 'Friendika';
 $a->strings['StatusNet/Federated Social Web'] = 'StatusNet/Federated Social Web';
 $a->strings["Private \x28secure\x29 network"] = "Private \x28secure\x29 network";
 $a->strings["Public \x28insecure\x29 network"] = "Public \x28insecure\x29 network";
-$a->strings['Your profile address:'] = 'Your profile address:';
+$a->strings['Your Identity Address:'] = 'Your Identity Address:';
 $a->strings['Submit Request'] = 'Submit Request';
 $a->strings['Cancel'] = 'Cancel';
 $a->strings["%d required parameter was not found at the given location"] = array(
@@ -261,6 +262,8 @@ $a->strings['Click on a contact to add or remove.'] = 'Click on a contact to add
 $a->strings['Group Editor'] = 'Group Editor';
 $a->strings['Members'] = 'Members';
 $a->strings['All Contacts'] = 'All Contacts';
+$a->strings['Help:'] = 'Help:';
+$a->strings['Help'] = 'Help';
 $a->strings["Welcome to %s"] = "Welcome to %s";
 $a->strings['Could not create/connect to database.'] = 'Could not create/connect to database.';
 $a->strings['Connected to database.'] = 'Connected to database.';
@@ -314,7 +317,6 @@ $a->strings['Unable to locate original post.'] = 'Unable to locate original post
 $a->strings['Empty post discarded.'] = 'Empty post discarded.';
 $a->strings['Wall Photos'] = 'Wall Photos';
 $a->strings["%s commented on your item at %s"] = "%s commented on your item at %s";
-$a->strings["Administrator"] = "Administrator";
 $a->strings["%s posted on your profile wall at %s"] = "%s posted on your profile wall at %s";
 $a->strings['System error. Post not saved.'] = 'System error. Post not saved.';
 $a->strings['You may visit them online at'] = 'You may visit them online at';
@@ -551,7 +553,7 @@ $a->strings[" \x28Optional\x29 Allow this OpenID to login to this account."
 $a->strings['Publish your default profile in site directory?'] = 'Publish your default profile in site directory?';
 $a->strings['Publish your default profile in global social directory?'] = 'Publish your default profile in global social directory?';
 $a->strings['Profile is <strong>not published</strong>.'] = 'Profile is <strong>not published</strong>.';
-$a->strings['Your profile address is'] = 'Your profile address is';
+$a->strings['Your Identity Address is'] = 'Your Identity Address is';
 $a->strings['Export Personal Data'] = 'Export Personal Data';
 $a->strings['Basic Settings'] = 'Basic Settings';
 $a->strings['Full Name:'] = 'Full Name:';
@@ -637,11 +639,9 @@ $a->strings['Create a new group'] = 'Create a new group';
 $a->strings['Everybody'] = 'Everybody';
 $a->strings['Birthday:'] = 'Birthday:';
 $a->strings['Home'] = 'Home';
-$a->strings['Help'] = 'Help';
 $a->strings['Apps'] = 'Apps';
 $a->strings['Directory'] = 'Directory';
 $a->strings['Network'] = 'Network';
-$a->strings['Notifications'] = 'Notifications';
 $a->strings['Manage'] = 'Manage';
 $a->strings['Settings'] = 'Settings';
 $a->strings['Embedding disabled'] = 'Embedding disabled';

view/dfrn_request.tpl

@@ -7,6 +7,7 @@ $page_desc<br />
 <li><a href="http://friendika.com" title="$private_net">$friendika</a> <img src="images/lock_icon.gif" alt="$private_net" title="$private_net" /></li>
 <li><a href="http://ostatus.org" title="$public_net" >$statusnet</a> <img src="images/unlock_icon.gif" alt="$public_net" title="$public_net"/></li>
 </ul>
+$desc
 </p>
 
 <form action="dfrn_request/$nickname" method="post" />