<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[BuddyPress][8677] trunk/src: Rename "Avatar" to "Profile Photo".</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://buddypress.trac.wordpress.org/changeset/8677">8677</a></dd>
<dt>Author</dt> <dd>djpaul</dd>
<dt>Date</dt> <dd>2014-07-23 18:30:22 +0000 (Wed, 23 Jul 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Rename "Avatar" to "Profile Photo".

"Profile photo" is probably more easily understood by most people (and translators), and better describes what BuddyPress' member and group avatar features actually are; that we're asking for a person's photograph. Sometimes, avatar can mean "graphic" or "illustration".

This subtle change in phrasing also makes BuddyPress more consistent with the significant majority of other online platform services (Twitter, Facebook, etc).

Fixes <a href="http://buddypress.trac.wordpress.org/ticket/5758">#5758</a>, props sooskriszta</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcbpcorebpcoreadminphp">trunk/src/bp-core/bp-core-admin.php</a></li>
<li><a href="#trunksrcbpcorebpcoreavatarsphp">trunk/src/bp-core/bp-core-avatars.php</a></li>
<li><a href="#trunksrcbpcorebpcoreclassesphp">trunk/src/bp-core/bp-core-classes.php</a></li>
<li><a href="#trunksrcbpcorebpcoretemplatephp">trunk/src/bp-core/bp-core-template.php</a></li>
<li><a href="#trunksrcbpcorebpcorewidgetsphp">trunk/src/bp-core/bp-core-widgets.php</a></li>
<li><a href="#trunksrcbpcoredeprecated21php">trunk/src/bp-core/deprecated/2.1.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsadminbarphp">trunk/src/bp-groups/bp-groups-adminbar.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupsloaderphp">trunk/src/bp-groups/bp-groups-loader.php</a></li>
<li><a href="#trunksrcbpgroupsbpgroupstemplatephp">trunk/src/bp-groups/bp-groups-template.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersadminphp">trunk/src/bp-members/bp-members-admin.php</a></li>
<li><a href="#trunksrcbpmembersbpmembersadminbarphp">trunk/src/bp-members/bp-members-adminbar.php</a></li>
<li><a href="#trunksrcbpmembersbpmemberstemplatephp">trunk/src/bp-members/bp-members-template.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressgroupscreatephp">trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressgroupssingleadminphp">trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php</a></li>
<li><a href="#trunksrcbptemplatesbplegacybuddypressmemberssingleprofilechangeavatarphp">trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileactivityphp">trunk/src/bp-xprofile/bp-xprofile-activity.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileadminphp">trunk/src/bp-xprofile/bp-xprofile-admin.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofileloaderphp">trunk/src/bp-xprofile/bp-xprofile-loader.php</a></li>
<li><a href="#trunksrcbpxprofilebpxprofiletemplatephp">trunk/src/bp-xprofile/bp-xprofile-template.php</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcbpcorebpcoreadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-admin.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-admin.php      2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-core/bp-core-admin.php 2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> 
</span><span class="cx">          if ( ! empty( $avatar_setting ) ) {
</span><span class="cx">              // Allow avatar uploads
</span><del>-                   add_settings_field( 'bp-disable-avatar-uploads', __( 'Avatar Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
</del><ins>+                    add_settings_field( 'bp-disable-avatar-uploads', __( 'Profile Photo Uploads',   'buddypress' ), 'bp_admin_setting_callback_avatar_uploads',   'buddypress', $avatar_setting );
</ins><span class="cx">               register_setting  ( 'buddypress',         'bp-disable-avatar-uploads',   'intval'                                                                                    );
</span><span class="cx">          }
</span><span class="cx">  }
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreavatarsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-avatars.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-avatars.php    2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-core/bp-core-avatars.php       2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -300,7 +300,7 @@
</span><span class="cx"> 
</span><span class="cx">  // Get a fallback for the 'alt' parameter
</span><span class="cx">  if ( empty( $alt ) )
</span><del>-               $alt = __( 'Avatar Image', 'buddypress' );
</del><ins>+                $alt = __( 'Profile Photo', 'buddypress' );
</ins><span class="cx"> 
</span><span class="cx">  $html_alt = ' alt="' . esc_attr( $alt ) . '"';
</span><span class="cx"> 
</span><span class="lines">@@ -853,7 +853,7 @@
</span><span class="cx"> 
</span><span class="cx">  // Image alt tag
</span><span class="cx">  if ( empty( $alt ) ) {
</span><del>-               $alt = sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
</del><ins>+                $alt = sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $id ) );
</ins><span class="cx">   }
</span><span class="cx"> 
</span><span class="cx">  // Use the 'thumb' type, unless the requested width is bigger than
</span></span></pre></div>
<a id="trunksrcbpcorebpcoreclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-classes.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-classes.php    2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-core/bp-core-classes.php       2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -823,9 +823,9 @@
</span><span class="cx">          wp_cache_set( 'bp_user_email_' . $this->id, $this->email, 'bp' );
</span><span class="cx">          wp_cache_set( 'bp_user_url_' . $this->id, $this->user_url, 'bp' );
</span><span class="cx"> 
</span><del>-               $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ) ) );
-               $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ) ) );
-               $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->fullname ), 'width' => 30, 'height' => 30 ) );
</del><ins>+                $this->avatar       = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'full', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ) ) );
+               $this->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ) ) );
+               $this->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $this->id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->fullname ), 'width' => 30, 'height' => 30 ) );
</ins><span class="cx">           $this->last_active  = bp_core_get_last_activity( bp_get_user_last_activity( $this->id ), __( 'active %s', 'buddypress' ) );
</span><span class="cx">  }
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcbpcorebpcoretemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-template.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-template.php   2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-core/bp-core-template.php      2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">  global $comment;
</span><span class="cx"> 
</span><span class="cx">  if ( function_exists( 'bp_core_fetch_avatar' ) )
</span><del>-               echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) ) ) ) );
</del><ins>+                echo apply_filters( 'bp_comment_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $comment->user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $comment->user_id ) ) ) ) );
</ins><span class="cx">   else if ( function_exists('get_avatar') )
</span><span class="cx">          get_avatar();
</span><span class="cx"> }
</span><span class="lines">@@ -173,7 +173,7 @@
</span><span class="cx">  global $post;
</span><span class="cx"> 
</span><span class="cx">  if ( function_exists( 'bp_core_fetch_avatar' ) )
</span><del>-               echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) ) ) ) );
</del><ins>+                echo apply_filters( 'bp_post_author_avatar', bp_core_fetch_avatar( array( 'item_id' => $post->post_author, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), bp_core_get_user_displayname( $post->post_author ) ) ) ) );
</ins><span class="cx">   else if ( function_exists('get_avatar') )
</span><span class="cx">          get_avatar();
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunksrcbpcorebpcorewidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/bp-core-widgets.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/bp-core-widgets.php    2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-core/bp-core-widgets.php       2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx">   */
</span><span class="cx">  function __construct() {
</span><span class="cx">          $widget_ops = array(
</span><del>-                       'description' => __( 'Avatars of users who are currently online', 'buddypress' ),
</del><ins>+                        'description' => __( 'Profile photos of online users', 'buddypress' ),
</ins><span class="cx">                   'classname' => 'widget_bp_core_whos_online_widget buddypress widget',
</span><span class="cx">          );
</span><span class="cx">          parent::__construct( false, $name = _x( "(BuddyPress) Who's Online", 'widget name', 'buddypress' ), $widget_ops );
</span><span class="lines">@@ -417,7 +417,7 @@
</span><span class="cx">   */
</span><span class="cx">  function __construct() {
</span><span class="cx">          $widget_ops = array(
</span><del>-                       'description' => __( 'Avatars of recently active members', 'buddypress' ),
</del><ins>+                        'description' => __( 'Profile photos of recently active members', 'buddypress' ),
</ins><span class="cx">                   'classname' => 'widget_bp_core_recently_active_widget buddypress widget',
</span><span class="cx">          );
</span><span class="cx">          parent::__construct( false, $name = _x( '(BuddyPress) Recently Active Members', 'widget name', 'buddypress' ), $widget_ops );
</span></span></pre></div>
<a id="trunksrcbpcoredeprecated21php"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-core/deprecated/2.1.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-core/deprecated/2.1.php     2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-core/deprecated/2.1.php        2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -389,7 +389,7 @@
</span><span class="cx"> 
</span><span class="cx">                  <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</span><span class="cx"> 
</span><del>-                               <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Avatar', 'buddypress' ); ?></a></li>
</del><ins>+                                <li><a href="<?php bp_groups_action_link( 'admin/group-avatar' ); ?>"><?php _e( 'Group Profile Photo', 'buddypress' ); ?></a></li>
</ins><span class="cx"> 
</span><span class="cx">                  <?php endif; ?>
</span><span class="cx"> 
</span><span class="lines">@@ -512,7 +512,7 @@
</span><span class="cx"> 
</span><span class="cx">                  <?php endif ?>
</span><span class="cx"> 
</span><del>-                       <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Avatar", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
</del><ins>+                        <li><a href="<?php bp_members_component_link( 'profile', 'change-avatar' ); ?>"><?php printf( __( "Edit %s's Profile Photo", 'buddypress' ), esc_attr( bp_get_displayed_user_fullname() ) ) ?></a></li>
</ins><span class="cx"> 
</span><span class="cx">                  <li><a href="<?php bp_members_component_link( 'settings', 'capabilities' ); ?>"><?php _e( 'User Capabilities', 'buddypress' ); ?></a></li>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-adminbar.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-adminbar.php       2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-groups/bp-groups-adminbar.php  2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -61,7 +61,7 @@
</span><span class="cx">          $wp_admin_bar->add_menu( array(
</span><span class="cx">                  'parent' => $bp->group_admin_menu_id,
</span><span class="cx">                  'id'     => 'group-avatar',
</span><del>-                       'title'  => __( 'Edit Avatar', 'buddypress' ),
</del><ins>+                        'title'  => __( 'Edit Profile Photo', 'buddypress' ),
</ins><span class="cx">                   'href'   =>  bp_get_groups_action_link( 'admin/group-avatar' )
</span><span class="cx">          ) );
</span><span class="cx">  }
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupsloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-loader.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-loader.php 2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-groups/bp-groups-loader.php    2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -255,7 +255,7 @@
</span><span class="cx">          // If avatar uploads are not disabled, add avatar option
</span><span class="cx">          if ( ! (int) buddypress()->site_options['bp-disable-avatar-uploads'] ) {
</span><span class="cx">                  $this->group_creation_steps['group-avatar'] = array(
</span><del>-                               'name'     => __( 'Avatar',   'buddypress' ),
</del><ins>+                                'name'     => __( 'Profile Photo',   'buddypress' ),
</ins><span class="cx">                           'position' => 20
</span><span class="cx">                  );
</span><span class="cx">          }
</span><span class="lines">@@ -584,11 +584,11 @@
</span><span class="cx">                                  'object'     => 'group',
</span><span class="cx">                                  'type'       => 'thumb',
</span><span class="cx">                                  'avatar_dir' => 'group-avatars',
</span><del>-                                       'alt'        => __( 'Group Avatar', 'buddypress' )
</del><ins>+                                        'alt'        => __( 'Group Profile Photo', 'buddypress' )
</ins><span class="cx">                           ) );
</span><span class="cx"> 
</span><span class="cx">                          if ( empty( $bp->bp_options_avatar ) ) {
</span><del>-                                       $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Avatar', 'buddypress' ) . '" class="avatar" />';
</del><ins>+                                        $bp->bp_options_avatar = '<img src="' . esc_url( bp_core_avatar_default_thumb() ) . '" alt="' . esc_attr__( 'No Group Profile Photo', 'buddypress' ) . '" class="avatar" />';
</ins><span class="cx">                           }
</span><span class="cx">                  }
</span><span class="cx">          }
</span></span></pre></div>
<a id="trunksrcbpgroupsbpgroupstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-groups/bp-groups-template.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-groups/bp-groups-template.php       2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-groups/bp-groups-template.php  2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -1560,7 +1560,7 @@
</span><span class="cx"> 
</span><span class="cx">  <?php if ( !(int)bp_get_option( 'bp-disable-avatar-uploads' ) ) : ?>
</span><span class="cx"> 
</span><del>-               <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Avatar', 'buddypress' ); ?></a></li>
</del><ins>+                <li<?php if ( 'group-avatar'   == $current_tab ) : ?> class="current"<?php endif; ?>><a href="<?php echo trailingslashit( bp_get_group_permalink( $group ) . 'admin/group-avatar' ) ?>"><?php _e( 'Profile Photo', 'buddypress' ); ?></a></li>
</ins><span class="cx"> 
</span><span class="cx">  <?php endif; ?>
</span><span class="cx"> 
</span><span class="lines">@@ -3455,9 +3455,9 @@
</span><span class="cx">                  $this->invite->user->profile_data = BP_XProfile_ProfileData::get_all_for_user( $user_id );
</span><span class="cx">          }
</span><span class="cx"> 
</span><del>-               $this->invite->user->avatar       = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
-               $this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
-               $this->invite->user->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Avatar of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
</del><ins>+                $this->invite->user->avatar       = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'full', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
+               $this->invite->user->avatar_thumb = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ) ) );
+               $this->invite->user->avatar_mini  = bp_core_fetch_avatar( array( 'item_id' => $user_id, 'type' => 'thumb', 'alt' => sprintf( __( 'Profile photo of %s', 'buddypress' ), $this->invite->user->fullname ), 'width' => 30, 'height' => 30 ) );
</ins><span class="cx">           $this->invite->user->email        = $this->invite->user->user_email;
</span><span class="cx">          $this->invite->user->user_url     = bp_core_get_user_domain( $user_id, $this->invite->user->user_nicename, $this->invite->user->user_login );
</span><span class="cx">          $this->invite->user->user_link    = "<a href='{$this->invite->user->user_url}' title='{$this->invite->user->fullname}'>{$this->invite->user->fullname}</a>";
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-admin.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-admin.php        2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-members/bp-members-admin.php   2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -278,7 +278,7 @@
</span><span class="cx">                  case 'avatar':
</span><span class="cx">                          $notice = array(
</span><span class="cx">                                  'class'   => 'updated',
</span><del>-                                       'message' => __( 'Avatar was deleted successfully!', 'buddypress' )
</del><ins>+                                        'message' => __( 'Profile photo was deleted.', 'buddypress' )
</ins><span class="cx">                           );
</span><span class="cx">                          break;
</span><span class="cx">                  case 'ham' :
</span></span></pre></div>
<a id="trunksrcbpmembersbpmembersadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-adminbar.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-adminbar.php     2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-members/bp-members-adminbar.php        2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx">                  $wp_admin_bar->add_menu( array(
</span><span class="cx">                          'parent' => $bp->user_admin_menu_id,
</span><span class="cx">                          'id'     => $bp->user_admin_menu_id . '-change-avatar',
</span><del>-                               'title'  => __( "Edit Avatar", 'buddypress' ),
</del><ins>+                                'title'  => __( "Edit Profile Photo", 'buddypress' ),
</ins><span class="cx">                           'href'   => bp_get_members_component_link( 'profile', 'change-avatar' )
</span><span class="cx">                  ) );
</span><span class="cx">          }
</span></span></pre></div>
<a id="trunksrcbpmembersbpmemberstemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-members/bp-members-template.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-members/bp-members-template.php     2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-members/bp-members-template.php        2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -1690,7 +1690,7 @@
</span><span class="cx">          $defaults = array(
</span><span class="cx">                  'size' => bp_core_avatar_full_width(),
</span><span class="cx">                  'class' => 'avatar',
</span><del>-                       'alt' => __( 'Your Avatar', 'buddypress' )
</del><ins>+                        'alt' => __( 'Your Profile Photo', 'buddypress' )
</ins><span class="cx">           );
</span><span class="cx"> 
</span><span class="cx">          $r = wp_parse_args( $args, $defaults );
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressgroupscreatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php    2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-templates/bp-legacy/buddypress/groups/create.php       2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -154,12 +154,12 @@
</span><span class="cx"> 
</span><span class="cx">                          <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
</span><span class="cx"> 
</span><del>-                                       <h4><?php _e( 'Crop Group Avatar', 'buddypress' ); ?></h4>
</del><ins>+                                        <h4><?php _e( 'Crop Group Profile Photo', 'buddypress' ); ?></h4>
</ins><span class="cx"> 
</span><del>-                                       <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
</del><ins>+                                        <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
</ins><span class="cx"> 
</span><span class="cx">                                  <div id="avatar-crop-pane">
</span><del>-                                               <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
</del><ins>+                                                <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile photo preview', 'buddypress' ); ?>" />
</ins><span class="cx">                                   </div>
</span><span class="cx"> 
</span><span class="cx">                                  <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressgroupssingleadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php      2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-templates/bp-legacy/buddypress/groups/single/admin.php 2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> 
</span><span class="cx">                          <p><?php _e( "If you'd like to remove the existing avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
</span><span class="cx"> 
</span><del>-                               <?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Avatar', 'buddypress' ), 'link_text' => __( 'Delete Avatar', 'buddypress' ) ) ); ?>
</del><ins>+                                <?php bp_button( array( 'id' => 'delete_group_avatar', 'component' => 'groups', 'wrapper_id' => 'delete-group-avatar-button', 'link_class' => 'edit', 'link_href' => bp_get_group_avatar_delete_link(), 'link_title' => __( 'Delete Profile Photo', 'buddypress' ), 'link_text' => __( 'Delete Profile Photo', 'buddypress' ) ) ); ?>
</ins><span class="cx"> 
</span><span class="cx">                  <?php endif; ?>
</span><span class="cx"> 
</span><span class="lines">@@ -146,12 +146,12 @@
</span><span class="cx"> 
</span><span class="cx">  <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
</span><span class="cx"> 
</span><del>-               <h4><?php _e( 'Crop Avatar', 'buddypress' ); ?></h4>
</del><ins>+                <h4><?php _e( 'Crop Profile Photo', 'buddypress' ); ?></h4>
</ins><span class="cx"> 
</span><del>-               <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
</del><ins>+                <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile photo to crop', 'buddypress' ); ?>" />
</ins><span class="cx"> 
</span><span class="cx">          <div id="avatar-crop-pane">
</span><del>-                       <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
</del><ins>+                        <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile photo preview', 'buddypress' ); ?>" />
</ins><span class="cx">           </div>
</span><span class="cx"> 
</span><span class="cx">          <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
</span></span></pre></div>
<a id="trunksrcbptemplatesbplegacybuddypressmemberssingleprofilechangeavatarphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php     2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-templates/bp-legacy/buddypress/members/single/profile/change-avatar.php        2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -1,4 +1,4 @@
</span><del>-<h4><?php _e( 'Change Avatar', 'buddypress' ); ?></h4>
</del><ins>+<h4><?php _e( 'Change Profile Photo', 'buddypress' ); ?></h4>
</ins><span class="cx"> 
</span><span class="cx"> <?php do_action( 'bp_before_profile_avatar_upload_content' ); ?>
</span><span class="cx"> 
</span><span class="lines">@@ -21,19 +21,19 @@
</span><span class="cx"> 
</span><span class="cx">                  <?php if ( bp_get_user_has_avatar() ) : ?>
</span><span class="cx">                          <p><?php _e( "If you'd like to delete your current avatar but not upload a new one, please use the delete avatar button.", 'buddypress' ); ?></p>
</span><del>-                               <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>"><?php _e( 'Delete My Avatar', 'buddypress' ); ?></a></p>
</del><ins>+                                <p><a class="button edit" href="<?php bp_avatar_delete_link(); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>"><?php _e( 'Delete My Profile Photo', 'buddypress' ); ?></a></p>
</ins><span class="cx">                   <?php endif; ?>
</span><span class="cx"> 
</span><span class="cx">          <?php endif; ?>
</span><span class="cx"> 
</span><span class="cx">          <?php if ( 'crop-image' == bp_get_avatar_admin_step() ) : ?>
</span><span class="cx"> 
</span><del>-                       <h5><?php _e( 'Crop Your New Avatar', 'buddypress' ); ?></h5>
</del><ins>+                        <h5><?php _e( 'Crop Your New Profile Photo', 'buddypress' ); ?></h5>
</ins><span class="cx"> 
</span><del>-                       <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Avatar to crop', 'buddypress' ); ?>" />
</del><ins>+                        <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-to-crop" class="avatar" alt="<?php esc_attr_e( 'Profile Photo to crop', 'buddypress' ); ?>" />
</ins><span class="cx"> 
</span><span class="cx">                  <div id="avatar-crop-pane">
</span><del>-                               <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Avatar preview', 'buddypress' ); ?>" />
</del><ins>+                                <img src="<?php bp_avatar_to_crop(); ?>" id="avatar-crop-preview" class="avatar" alt="<?php esc_attr_e( 'Profile Photo preview', 'buddypress' ); ?>" />
</ins><span class="cx">                   </div>
</span><span class="cx"> 
</span><span class="cx">                  <input type="submit" name="avatar-crop-submit" id="avatar-crop-submit" value="<?php esc_attr_e( 'Crop Image', 'buddypress' ); ?>" />
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileactivityphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-activity.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-activity.php   2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-xprofile/bp-xprofile-activity.php      2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -24,7 +24,7 @@
</span><span class="cx">          'new_avatar',
</span><span class="cx">          __( 'Member changed profile picture', 'buddypress' ),
</span><span class="cx">          'bp_xprofile_format_activity_action_new_avatar',
</span><del>-               __( 'Updated Avatars', 'buddypress' )
</del><ins>+                __( 'Updated Profile Photos', 'buddypress' )
</ins><span class="cx">   );
</span><span class="cx"> 
</span><span class="cx">  bp_activity_set_action(
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileadminphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-admin.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-admin.php      2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-xprofile/bp-xprofile-admin.php 2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -583,7 +583,7 @@
</span><span class="cx">          // Avatar Metabox
</span><span class="cx">          add_meta_box(
</span><span class="cx">                  'bp_xprofile_user_admin_avatar',
</span><del>-                       _x( 'Avatar', 'xprofile user-admin edit screen', 'buddypress' ),
</del><ins>+                        _x( 'Profile Photo', 'xprofile user-admin edit screen', 'buddypress' ),
</ins><span class="cx">                   array( $this, 'user_admin_avatar_metabox' ),
</span><span class="cx">                  $screen_id,
</span><span class="cx">                  'side',
</span><span class="lines">@@ -843,7 +843,7 @@
</span><span class="cx">                          $community_url = add_query_arg( $query_args, buddypress()->members->admin->edit_profile_url );
</span><span class="cx">                          $delete_link   = wp_nonce_url( $community_url, 'delete_avatar' ); ?>
</span><span class="cx"> 
</span><del>-                               <a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Avatar', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Avatar', 'buddypress' ); ?></a></li>
</del><ins>+                                <a href="<?php echo esc_url( $delete_link ); ?>" title="<?php esc_attr_e( 'Delete Profile Photo', 'buddypress' ); ?>" class="bp-xprofile-avatar-user-admin"><?php esc_html_e( 'Delete Profile Photo', 'buddypress' ); ?></a></li>
</ins><span class="cx"> 
</span><span class="cx">                  <?php endif; ?>
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofileloaderphp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-loader.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-loader.php     2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-xprofile/bp-xprofile-loader.php        2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">          // Change Avatar
</span><span class="cx">          if ( buddypress()->avatar->show_avatars ) {
</span><span class="cx">                  $sub_nav[] = array(
</span><del>-                               'name'            => __( 'Change Avatar', 'buddypress' ),
</del><ins>+                                'name'            => __( 'Change Profile Photo', 'buddypress' ),
</ins><span class="cx">                           'slug'            => 'change-avatar',
</span><span class="cx">                          'parent_url'      => $profile_link,
</span><span class="cx">                          'parent_slug'     => $this->slug,
</span><span class="lines">@@ -305,7 +305,7 @@
</span><span class="cx">                          $wp_admin_nav[] = array(
</span><span class="cx">                                  'parent' => 'my-account-' . $this->id,
</span><span class="cx">                                  'id'     => 'my-account-' . $this->id . '-change-avatar',
</span><del>-                                       'title'  => __( 'Change Avatar', 'buddypress' ),
</del><ins>+                                        'title'  => __( 'Change Profile Photo', 'buddypress' ),
</ins><span class="cx">                                   'href'   => trailingslashit( $profile_link . 'change-avatar' )
</span><span class="cx">                          );
</span><span class="cx">                  }
</span></span></pre></div>
<a id="trunksrcbpxprofilebpxprofiletemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/src/bp-xprofile/bp-xprofile-template.php (8676 => 8677)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/src/bp-xprofile/bp-xprofile-template.php   2014-07-23 18:07:39 UTC (rev 8676)
+++ trunk/src/bp-xprofile/bp-xprofile-template.php      2014-07-23 18:30:22 UTC (rev 8677)
</span><span class="lines">@@ -648,7 +648,7 @@
</span><span class="cx">  if ( !(int) $bp->site_options['bp-disable-avatar-uploads'] )
</span><span class="cx">          bp_core_avatar_admin( null, bp_loggedin_user_domain() . $bp->profile->slug . '/change-avatar/', bp_loggedin_user_domain() . $bp->profile->slug . '/delete-avatar/' );
</span><span class="cx">  else
</span><del>-               _e( 'Avatar uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
</del><ins>+                _e( 'Profile photo uploads are currently disabled. Why not use a <a href="http://gravatar.com" target="_blank">gravatar</a> instead?', 'buddypress' );
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> function bp_profile_last_updated() {
</span></span></pre>
</div>
</div>

</body>
</html>