Changeset 8453

Timestamp:

05/27/2014 05:10:54 AM (11 years ago)

Author:

johnjamesjacoby

Message:

First pass at unbundling inline jQuery plugins from BP Legacy's buddypress.js and BP Default's global.js. See #5208.

Location:

trunk/src

Files:

• bp-core/bp-core-cssjs.php (modified) (5 diffs)
• bp-core/bp-core-functions.php (modified) (1 diff)
• bp-core/bp-core-widgets.php (modified) (1 diff)
• bp-core/js/jquery-cookie.js (added)
• bp-core/js/jquery-query.js (added)
• bp-core/js/jquery-scroll-to.js (added)
• bp-languages/buddypress.pot (modified) (104 diffs)
• bp-templates/bp-legacy/js/buddypress.js (modified) (3 diffs)
• bp-themes/bp-default/_inc/global.js (modified) (3 diffs)

trunk/src/bp-core/bp-core-cssjs.php

@@ -9 +9 @@
 // Exit if accessed directly
 if ( !defined( 'ABSPATH' ) ) exit;
+
+/**
+ * Register scripts commonly used by BuddyPress plugins and themes.
+ *
+ * @since BuddyPress (2.1.0)
+ */
+function bp_core_register_common_scripts() {
+
+    // Whether or not to use minified versions
+    $min  = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '.js' : '.min.js';
+
+    // Get the version for busting caches
+    $ver  = bp_get_version();
+
+    // Get the common core JS URL
+    $url  = buddypress()->plugin_url . 'bp-core/js/';
+    
+    // Array of common scripts
+    $scripts = apply_filters( 'bp_core_register_common_scripts', array(
+        'bp-confirm'          => 'confirm',
+        'bp-widget-members'   => 'widget-members',
+        'bp-jquery-query'     => 'jquery-query',
+        'bp-jquery-cookie'    => 'jquery-cookie',
+        'bp-jquery-scroll-to' => 'jquery-scroll-to',
+    ) );
+
+    // Register scripts commonly used by BuddyPress themes
+    foreach ( $scripts as $id => $file ) {
+        wp_register_script( $id, $url . $file . $min, array( 'jquery' ), $ver );
+    }
+}
+add_action( 'bp_enqueue_scripts', 'bp_core_register_common_scripts', 1 );
 
 /**
@@ -18 +50 @@
     }
 
-    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-    wp_enqueue_script( 'bp-confirm', buddypress()->plugin_url . "bp-core/js/confirm{$min}.js", array( 'jquery' ), bp_get_version() );
+    wp_enqueue_script( 'bp-confirm' );
 
     wp_localize_script( 'bp-confirm', 'BP_Confirm', array(
@@ -26 +57 @@
 
 }
-add_action( 'wp_enqueue_scripts',    'bp_core_confirmation_js' );
+add_action( 'bp_enqueue_scripts',    'bp_core_confirmation_js' );
 add_action( 'admin_enqueue_scripts', 'bp_core_confirmation_js' );
 
@@ -70 +101 @@
             jQuery('#avatar-to-crop').Jcrop({
                 onChange: showPreview,
-                onSelect: showPreview,
                 onSelect: updateCoords,
                 aspectRatio: <?php echo $aspect_ratio; ?>,
@@ -154 +184 @@
     return apply_filters( 'bp_core_ajax_url', admin_url( 'admin-ajax.php', is_ssl() ? 'admin' : 'http' ) );
 }
+
+/**
+ * Get the javascript dependencies for buddypress.js.
+ *
+ * @since BuddyPress (2.0.0)
+ *
+ * @uses apply_filters() to allow other component to load extra dependencies
+ *
+ * @return array The javascript dependencies.
+ */
+function bp_core_get_js_dependencies() {
+    return apply_filters( 'bp_core_get_js_dependencies', array(
+        'jquery',
+        'bp-confirm',
+        'bp-widget-members',
+        'bp-jquery-query',
+        'bp-jquery-cookie',
+        'bp-jquery-scroll-to'
+    ) );
+}

trunk/src/bp-core/bp-core-functions.php

@@ -1877 +1877 @@
     return $nav_item_url;
 }
-
-/**
- * Get the javascript dependencies for buddypress.js.
- *
- * @since BuddyPress (2.0.0)
- *
- * @uses apply_filters() to allow other component to load extra dependencies
- *
- * @return array The javascript dependencies.
- */
-function bp_core_get_js_dependencies() {
-    return apply_filters( 'bp_core_get_js_dependencies', array( 'jquery' ) );
-}

trunk/src/bp-core/bp-core-widgets.php

@@ -155 +155 @@
 
         if ( is_active_widget( false, false, $this->id_base ) && !is_admin() && !is_network_admin() ) {
-            $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min';
-            wp_enqueue_script( 'bp_core_widget_members-js', buddypress()->plugin_url . "bp-core/js/widget-members{$min}.js", array( 'jquery' ), bp_get_version() );
+            wp_enqueue_script( 'bp-widget-members' );
         }
     }

trunk/src/bp-languages/buddypress.pot

@@ -5 +5 @@
 "Project-Id-Version: BuddyPress 2.1-alpha\n"
 "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/buddypress\n"
-"POT-Creation-Date: 2014-05-10 02:25:30+00:00\n"
+"POT-Creation-Date: 2014-05-27 05:05:17+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
@@ -159 +159 @@
 #: bp-core/admin/bp-core-functions.php:486
 #: bp-core/admin/bp-core-functions.php:505 bp-groups/bp-groups-admin.php:111
-#: bp-groups/bp-groups-admin.php:146 bp-members/bp-members-admin.php:384
-#: bp-members/bp-members-admin.php:925
+#: bp-groups/bp-groups-admin.php:146 bp-members/bp-members-admin.php:660
+#: bp-members/bp-members-admin.php:1236
 msgid "Overview"
 msgstr ""
@@ -224 +224 @@
 #: bp-core/admin/bp-core-functions.php:492
 #: bp-core/admin/bp-core-functions.php:511 bp-groups/bp-groups-admin.php:119
-#: bp-groups/bp-groups-admin.php:162 bp-members/bp-members-admin.php:393
-#: bp-members/bp-members-admin.php:946
+#: bp-groups/bp-groups-admin.php:162 bp-members/bp-members-admin.php:669
+#: bp-members/bp-members-admin.php:1257
 msgid "For more information:"
 msgstr ""
@@ -241 +241 @@
 #: bp-core/admin/bp-core-functions.php:494
 #: bp-core/admin/bp-core-functions.php:513 bp-groups/bp-groups-admin.php:163
-#: bp-members/bp-members-admin.php:395 bp-members/bp-members-admin.php:947
+#: bp-members/bp-members-admin.php:671 bp-members/bp-members-admin.php:1258
 msgid "<a href=\"http://buddypress.org/support/\">Support Forums</a>"
 msgstr ""
@@ -312 +312 @@
 #: bp-activity/bp-activity-akismet.php:197
 #: bp-activity/bp-activity-akismet.php:226
+#: bp-core/admin/bp-core-functions.php:827
 msgid "Spam"
 msgstr ""
 
-#: bp-activity/bp-activity-admin.php:669 bp-members/bp-members-admin.php:650
-#: bp-members/bp-members-admin.php:711
+#: bp-activity/bp-activity-admin.php:669 bp-members/bp-members-admin.php:912
+#: bp-members/bp-members-admin.php:974
 #. translators: Publish box date format, see http:php.net/date
 msgid "M j, Y @ G:i"
@@ -326 +327 @@
 
 #: bp-activity/bp-activity-admin.php:672 bp-activity/bp-activity-admin.php:1391
-#: bp-forums/bp-forums-template.php:2112 bp-groups/bp-groups-admin.php:1400
+#: bp-forums/bp-forums-template.php:2112 bp-groups/bp-groups-admin.php:1399
 #: bp-themes/bp-default/functions.php:509 bp-xprofile/bp-xprofile-admin.php:402
 #: bp-xprofile/bp-xprofile-loader.php:195
@@ -410 +411 @@
 msgstr ""
 
-#: bp-activity/bp-activity-admin.php:910 bp-groups/bp-groups-admin.php:649
-#: bp-members/bp-members-admin.php:1304
+#: bp-activity/bp-activity-admin.php:910 bp-groups/bp-groups-admin.php:645
+#: bp-members/bp-members-admin.php:1652
 msgid "Search results for &#8220;%s&#8221;"
 msgstr ""
@@ -423 +424 @@
 msgstr ""
 
-#: bp-activity/bp-activity-admin.php:938 bp-groups/bp-groups-admin.php:603
-#: bp-members/bp-members-admin.php:1429
+#: bp-activity/bp-activity-admin.php:938 bp-groups/bp-groups-admin.php:599
+#: bp-members/bp-members-admin.php:1783
 #: bp-templates/bp-legacy/buddypress/activity/entry.php:102
 #: bp-templates/bp-legacy/buddypress/forums/index.php:116
 #: bp-themes/bp-default/forums/index.php:134
-#: bp-xprofile/bp-xprofile-classes.php:506
-#: bp-xprofile/bp-xprofile-classes.php:891
+#: bp-xprofile/bp-xprofile-classes.php:508
+#: bp-xprofile/bp-xprofile-classes.php:893
 msgid "Cancel"
 msgstr ""
@@ -445 +446 @@
 msgstr ""
 
-#: bp-activity/bp-activity-admin.php:1205 bp-groups/bp-groups-admin.php:1271
+#: bp-activity/bp-activity-admin.php:1205 bp-groups/bp-groups-admin.php:1272
 #: bp-messages/bp-messages-template.php:538
 msgid "All"
@@ -455 +456 @@
 
 #: bp-activity/bp-activity-admin.php:1222
-#: bp-core/admin/bp-core-functions.php:812
 msgid "Mark as Spam"
 msgstr ""
@@ -461 +461 @@
 #: bp-activity/bp-activity-admin.php:1223
 #: bp-activity/bp-activity-admin.php:1396
-#: bp-core/admin/bp-core-functions.php:810
+#: bp-core/admin/bp-core-functions.php:821
 msgid "Not Spam"
 msgstr ""
 
 #: bp-activity/bp-activity-admin.php:1224
-#: bp-activity/bp-activity-admin.php:1401 bp-groups/bp-groups-admin.php:602
+#: bp-activity/bp-activity-admin.php:1401 bp-groups/bp-groups-admin.php:598
 msgid "Delete Permanently"
 msgstr ""
@@ -502 +502 @@
 msgstr ""
 
-#: bp-activity/bp-activity-admin.php:1401 bp-core/bp-core-cssjs.php:24
+#: bp-activity/bp-activity-admin.php:1401 bp-core/bp-core-cssjs.php:55
 msgid "Are you sure?"
 msgstr ""
@@ -597 +597 @@
 msgstr ""
 
-#: bp-activity/bp-activity-functions.php:837
+#: bp-activity/bp-activity-functions.php:843
 msgid "Posted a status update"
 msgstr ""
 
-#: bp-activity/bp-activity-functions.php:844
+#: bp-activity/bp-activity-functions.php:845
+#: bp-themes/bp-default/activity/index.php:99
+#: bp-themes/bp-default/groups/single/activity.php:11
+#: bp-themes/bp-default/members/single/activity.php:21
+msgid "Updates"
+msgstr ""
+
+#: bp-activity/bp-activity-functions.php:852
 msgid "Replied to a status update"
 msgstr ""
 
-#: bp-activity/bp-activity-functions.php:895
+#: bp-activity/bp-activity-functions.php:854
+msgid "Activity Comments"
+msgstr ""
+
+#: bp-activity/bp-activity-functions.php:904
 msgid "%s posted an update"
 msgstr ""
 
-#: bp-activity/bp-activity-functions.php:909
+#: bp-activity/bp-activity-functions.php:918
 msgid "%s posted a new activity comment"
 msgstr ""
 
-#: bp-activity/bp-activity-functions.php:1671
+#: bp-activity/bp-activity-functions.php:1680
 msgid "Thumbnail"
 msgstr ""
@@ -652 +663 @@
 #: bp-activity/bp-activity-loader.php:313 bp-core/bp-core-template.php:389
 #: bp-groups/bp-groups-admin.php:32 bp-groups/bp-groups-admin.php:33
-#: bp-groups/bp-groups-admin.php:642 bp-groups/bp-groups-loader.php:365
+#: bp-groups/bp-groups-admin.php:638 bp-groups/bp-groups-loader.php:365
 #: bp-groups/bp-groups-loader.php:540 bp-groups/bp-groups-notifications.php:377
 #: bp-groups/bp-groups-notifications.php:413
@@ -682 +693 @@
 #: bp-groups/bp-groups-template.php:2263 bp-groups/bp-groups-template.php:2272
 #: bp-groups/bp-groups-template.php:2281 bp-groups/bp-groups-template.php:3197
-#: bp-members/bp-members-buddybar.php:64 bp-members/bp-members-loader.php:235
+#: bp-members/bp-members-buddybar.php:64 bp-members/bp-members-loader.php:251
 #: bp-members/bp-members-template.php:703
 #: bp-members/bp-members-template.php:1136
@@ -784 +795 @@
 msgstr ""
 
-#: bp-activity/bp-activity-screens.php:271 bp-blogs/bp-blogs-template.php:1035
+#: bp-activity/bp-activity-screens.php:271 bp-blogs/bp-blogs-template.php:1033
 #: bp-friends/bp-friends-screens.php:86 bp-groups/bp-groups-screens.php:937
 #: bp-messages/bp-messages-screens.php:169
@@ -792 +803 @@
 msgstr ""
 
-#: bp-activity/bp-activity-screens.php:272 bp-blogs/bp-blogs-template.php:1039
+#: bp-activity/bp-activity-screens.php:272 bp-blogs/bp-blogs-template.php:1037
 #: bp-friends/bp-friends-screens.php:87 bp-groups/bp-groups-screens.php:938
 #: bp-messages/bp-messages-screens.php:170
@@ -822 +833 @@
 msgstr ""
 
-#: bp-activity/bp-activity-template.php:1338 bp-groups/bp-groups-admin.php:1414
+#: bp-activity/bp-activity-template.php:1338 bp-groups/bp-groups-admin.php:1416
 #: bp-groups/bp-groups-template.php:539
 msgid "Group logo of %s"
@@ -836 +847 @@
 
 #: bp-activity/bp-activity-template.php:2481
-#: bp-forums/bp-forums-template.php:2113 bp-groups/bp-groups-admin.php:1290
-#: bp-groups/bp-groups-admin.php:1403 bp-groups/bp-groups-template.php:1551
-#: bp-members/admin/bp-members-classes.php:148
-#: bp-members/admin/bp-members-classes.php:280
-#: bp-members/admin/bp-members-classes.php:466
-#: bp-members/admin/bp-members-classes.php:591
+#: bp-forums/bp-forums-template.php:2113 bp-groups/bp-groups-admin.php:1291
+#: bp-groups/bp-groups-admin.php:1402 bp-groups/bp-groups-template.php:1551
+#: bp-members/admin/bp-members-classes.php:146
+#: bp-members/admin/bp-members-classes.php:277
+#: bp-members/admin/bp-members-classes.php:462
+#: bp-members/admin/bp-members-classes.php:588
 #: bp-notifications/bp-notifications-template.php:826
 #: bp-templates/bp-legacy/buddypress/activity/comment.php:43
@@ -854 +865 @@
 
 #: bp-activity/bp-activity-template.php:2529
-#: bp-core/admin/bp-core-slugs.php:109 bp-core/admin/bp-core-slugs.php:172
-#: bp-core/bp-core-loader.php:244 bp-members/bp-members-loader.php:211
+#: bp-core/admin/bp-core-functions.php:833 bp-core/admin/bp-core-slugs.php:109
+#: bp-core/admin/bp-core-slugs.php:172 bp-core/bp-core-loader.php:244
+#: bp-groups/bp-groups-admin.php:1405 bp-members/bp-members-loader.php:227
 #: bp-members/bp-members-template.php:860
 #: bp-templates/bp-legacy/buddypress-functions.php:248
@@ -889 +901 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:42
+#: bp-blogs/bp-blogs-activity.php:36
+msgid "New Sites"
+msgstr ""
+
+#: bp-blogs/bp-blogs-activity.php:43
 msgid "New post published"
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:49
+#: bp-blogs/bp-blogs-activity.php:45 bp-core/bp-core-template.php:397
+#: bp-templates/bp-legacy/buddypress/forums/forums-loop.php:40
+#: bp-themes/bp-default/activity/index.php:103
+#: bp-themes/bp-default/forums/forums-loop.php:40
+#: bp-themes/bp-default/members/single/activity.php:27
+msgid "Posts"
+msgstr ""
+
+#: bp-blogs/bp-blogs-activity.php:52
 msgid "New post comment posted"
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:69
+#: bp-blogs/bp-blogs-activity.php:54
+#: bp-themes/bp-default/activity/index.php:104
+#: bp-themes/bp-default/members/single/activity.php:28
+msgid "Comments"
+msgstr ""
+
+#: bp-blogs/bp-blogs-activity.php:74
 msgid "%s created the site %s"
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:128 bp-blogs/bp-blogs-functions.php:452
+#: bp-blogs/bp-blogs-activity.php:133 bp-blogs/bp-blogs-functions.php:452
 msgid "%1$s wrote a new post, %2$s, on the site %3$s"
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:130 bp-blogs/bp-blogs-functions.php:454
+#: bp-blogs/bp-blogs-activity.php:135 bp-blogs/bp-blogs-functions.php:454
 msgid "%1$s wrote a new post, %2$s"
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:195
+#: bp-blogs/bp-blogs-activity.php:200
 msgid "%1$s commented on the post, %2$s, on the site %3$s"
 msgstr ""
 
-#: bp-blogs/bp-blogs-activity.php:197
+#: bp-blogs/bp-blogs-activity.php:202
 msgid "%1$s commented on the post, %2$s"
 msgstr ""
@@ -960 +990 @@
 
 #: bp-blogs/bp-blogs-loader.php:208 bp-blogs/bp-blogs-screens.php:204
-#: bp-blogs/bp-blogs-template.php:1152 bp-blogs/bp-blogs-template.php:1220
-#: bp-blogs/bp-blogs-template.php:1221 bp-core/bp-core-filters.php:466
+#: bp-blogs/bp-blogs-template.php:1150 bp-blogs/bp-blogs-template.php:1218
+#: bp-blogs/bp-blogs-template.php:1219 bp-core/bp-core-filters.php:466
 #: bp-themes/bp-default/blogs/create.php:21
 #: bp-themes/bp-default/blogs/index.php:21
@@ -967 +997 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:439
+#: bp-blogs/bp-blogs-template.php:437
 msgid "Viewing site %1$s to %2$s (of %3$s site)"
 msgid_plural "Viewing site %1$s to %2$s (of %3$s sites)"
@@ -973 +1003 @@
 msgstr[1] ""
 
-#: bp-blogs/bp-blogs-template.php:504
+#: bp-blogs/bp-blogs-template.php:502
 msgid "Profile picture of site author %s"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:661 bp-core/bp-core-classes.php:816
+#: bp-blogs/bp-blogs-template.php:659 bp-core/bp-core-classes.php:816
 #: bp-groups/bp-groups-template.php:3414 bp-groups/bp-groups-widgets.php:85
 #: bp-groups/bp-groups-widgets.php:197 bp-members/bp-members-template.php:811
@@ -988 +1018 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:666 bp-members/bp-members-template.php:816
+#: bp-blogs/bp-blogs-template.php:664 bp-members/bp-members-template.php:816
 msgid "Never active"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:702
+#: bp-blogs/bp-blogs-template.php:700
 msgid "Latest Post: %s"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:953
+#: bp-blogs/bp-blogs-template.php:951
 msgid "There was a problem, please correct the form below and try again."
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:956
+#: bp-blogs/bp-blogs-template.php:954
 msgid ""
 "By filling out the form below, you can <strong>add a site to your "
@@ -1007 +1037 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:958
+#: bp-blogs/bp-blogs-template.php:956
 msgid ""
 "If you&#8217;re not going to use a great domain, leave it for a new user. "
@@ -1013 +1043 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:967
+#: bp-blogs/bp-blogs-template.php:965
 msgid "Create Site"
 msgstr ""
 
+#: bp-blogs/bp-blogs-template.php:987
+msgid "Site Name:"
+msgstr ""
+
 #: bp-blogs/bp-blogs-template.php:989
-msgid "Site Name:"
-msgstr ""
-
-#: bp-blogs/bp-blogs-template.php:991
 msgid "Site Domain:"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1005
+#: bp-blogs/bp-blogs-template.php:1003
 msgid "Your address will be "
 msgstr ""
 
+#: bp-blogs/bp-blogs-template.php:1006
+msgid "blogname"
+msgstr ""
+
 #: bp-blogs/bp-blogs-template.php:1008
-msgid "blogname"
-msgstr ""
-
-#: bp-blogs/bp-blogs-template.php:1010
 msgid "domain."
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1013
+#: bp-blogs/bp-blogs-template.php:1011
 msgid ""
 "Must be at least 4 characters, letters and numbers only. It cannot be "
@@ -1043 +1073 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1019
+#: bp-blogs/bp-blogs-template.php:1017
 msgid "Site Title:"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1030
+#: bp-blogs/bp-blogs-template.php:1028
 msgid "Privacy:"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1031
+#: bp-blogs/bp-blogs-template.php:1029
 #: bp-templates/bp-legacy/buddypress/members/register.php:145
 #: bp-themes/bp-default/registration/register.php:229
@@ -1059 +1089 @@
 msgstr ""
 
+#: bp-blogs/bp-blogs-template.php:1136
+msgid "Congratulations! You have successfully registered a new site."
+msgstr ""
+
 #: bp-blogs/bp-blogs-template.php:1138
-msgid "Congratulations! You have successfully registered a new site."
-msgstr ""
-
-#: bp-blogs/bp-blogs-template.php:1140
 msgid ""
 "<a href=\"%1$s\">%2$s</a> is your new site.  <a href=\"%3$s\">Login</a> as "
@@ -1069 +1099 @@
 msgstr ""
 
+#: bp-blogs/bp-blogs-template.php:1167
+msgid "%s's Sites"
+msgstr ""
+
+#: bp-blogs/bp-blogs-template.php:1168
+msgid "%s's Recent Posts"
+msgstr ""
+
 #: bp-blogs/bp-blogs-template.php:1169
-msgid "%s's Sites"
-msgstr ""
-
-#: bp-blogs/bp-blogs-template.php:1170
-msgid "%s's Recent Posts"
-msgstr ""
-
-#: bp-blogs/bp-blogs-template.php:1171
 msgid "%s's Recent Comments"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1187 bp-core/deprecated/1.5.php:417
+#: bp-blogs/bp-blogs-template.php:1185 bp-core/deprecated/1.5.php:417
 #: bp-forums/bp-forums-template.php:2196 bp-groups/bp-groups-template.php:2818
 #: bp-members/bp-members-template.php:999
@@ -1089 +1119 @@
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1270 bp-blogs/bp-blogs-template.php:1271
+#: bp-blogs/bp-blogs-template.php:1268 bp-blogs/bp-blogs-template.php:1269
 msgid "Visit Site"
 msgstr ""
 
-#: bp-blogs/bp-blogs-template.php:1326
+#: bp-blogs/bp-blogs-template.php:1324
 msgid "%s site"
 msgid_plural "%s sites"
@@ -1208 +1238 @@
 
 #: bp-core/admin/bp-core-components.php:189
-#: bp-members/admin/bp-members-classes.php:226
-#: bp-members/admin/bp-members-classes.php:539
+#: bp-members/admin/bp-members-classes.php:224
+#: bp-members/admin/bp-members-classes.php:535
 msgid "Select %s"
 msgstr ""
@@ -1324 +1354 @@
 
 #: bp-core/admin/bp-core-functions.php:272 bp-core/admin/bp-core-slugs.php:135
-#: bp-members/admin/bp-members-classes.php:271
-#: bp-members/admin/bp-members-classes.php:275
+#: bp-members/admin/bp-members-classes.php:269
+#: bp-members/admin/bp-members-classes.php:273
+#: bp-members/admin/bp-members-classes.php:580
 #: bp-members/admin/bp-members-classes.php:584
-#: bp-members/admin/bp-members-classes.php:586
 #: bp-messages/bp-messages-template.php:662
 #: bp-templates/bp-legacy/buddypress/members/activate.php:29
@@ -1454 +1484 @@
 msgstr ""
 
-#: bp-core/admin/bp-core-functions.php:865 bp-members/bp-members-actions.php:54
-#: bp-members/bp-members-admin.php:489
+#: bp-core/admin/bp-core-functions.php:885 bp-members/bp-members-actions.php:54
+#: bp-members/bp-members-admin.php:290
 msgid "User marked as spammer. Spam users are visible only to site admins."
 msgstr ""
 
-#: bp-core/admin/bp-core-functions.php:867
+#: bp-core/admin/bp-core-functions.php:887
 msgid "User removed from spam."
 msgstr ""
@@ -1538 +1568 @@
 #: bp-templates/bp-legacy/buddypress/members/single/settings/capabilities.php:13
 #: bp-themes/bp-default/members/single/settings/capabilities.php:61
-#: bp-xprofile/bp-xprofile-classes.php:501
-#: bp-xprofile/bp-xprofile-classes.php:888
+#: bp-xprofile/bp-xprofile-classes.php:503
+#: bp-xprofile/bp-xprofile-classes.php:890
 msgid "Save"
 msgstr ""
@@ -1766 +1796 @@
 
 #: bp-core/bp-core-admin.php:524 bp-core/bp-core-template.php:386
-#: bp-core/bp-core-widgets.php:276 bp-groups/bp-groups-admin.php:785
-#: bp-groups/bp-groups-template.php:1541 bp-members/bp-members-loader.php:22
+#: bp-core/bp-core-widgets.php:275 bp-groups/bp-groups-admin.php:778
+#: bp-groups/bp-groups-template.php:1541 bp-members/bp-members-loader.php:23
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:231
 #: bp-themes/bp-default/groups/single/admin.php:231
@@ -2029 +2059 @@
 msgstr ""
 
-#: bp-core/bp-core-buddybar.php:645 bp-groups/bp-groups-admin.php:1397
+#: bp-core/bp-core-buddybar.php:645
 msgid "Visit"
 msgstr ""
@@ -2191 +2221 @@
 msgstr ""
 
-#: bp-core/bp-core-loader.php:233 bp-members/bp-members-admin.php:329
-#: bp-members/bp-members-loader.php:197 bp-xprofile/bp-xprofile-loader.php:164
+#: bp-core/bp-core-loader.php:233 bp-members/bp-members-admin.php:606
+#: bp-members/bp-members-admin.php:765 bp-members/bp-members-loader.php:213
+#: bp-xprofile/bp-xprofile-loader.php:164
 #: bp-xprofile/bp-xprofile-loader.php:225
 #: bp-xprofile/bp-xprofile-loader.php:257
@@ -2215 +2246 @@
 msgstr ""
 
-#: bp-core/bp-core-template.php:397
-#: bp-templates/bp-legacy/buddypress/activity/index.php:83
-#: bp-templates/bp-legacy/buddypress/forums/forums-loop.php:40
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:27
-#: bp-themes/bp-default/activity/index.php:103
-#: bp-themes/bp-default/forums/forums-loop.php:40
-#: bp-themes/bp-default/members/single/activity.php:27
-msgid "Posts"
-msgstr ""
-
 #: bp-core/bp-core-template.php:400
 msgid "Search these:"
@@ -2247 +2268 @@
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:82 bp-members/admin/bp-members-classes.php:127
-#: bp-members/admin/bp-members-classes.php:445
+#: bp-core/bp-core-widgets.php:82 bp-members/admin/bp-members-classes.php:125
+#: bp-members/admin/bp-members-classes.php:441
 #: bp-templates/bp-legacy/buddypress/members/register.php:32
 #: bp-themes/bp-default/registration/register.php:37
@@ -2267 +2288 @@
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:133 bp-core/bp-core-widgets.php:289
-#: bp-core/bp-core-widgets.php:405 bp-core/bp-core-widgets.php:508
+#: bp-core/bp-core-widgets.php:133 bp-core/bp-core-widgets.php:288
+#: bp-core/bp-core-widgets.php:404 bp-core/bp-core-widgets.php:507
 #: bp-groups/bp-groups-widgets.php:137 bp-messages/bp-messages-widgets.php:110
 #: bp-templates/bp-legacy/buddypress/forums/index.php:86
@@ -2283 +2304 @@
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:200 bp-core/bp-core-widgets.php:298
+#: bp-core/bp-core-widgets.php:199 bp-core/bp-core-widgets.php:297
 #: bp-core/deprecated/1.6.php:129 bp-core/deprecated/1.6.php:152
 #: bp-friends/bp-friends-widgets.php:98 bp-friends/bp-friends-widgets.php:186
@@ -2295 +2316 @@
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:201 bp-core/bp-core-widgets.php:299
+#: bp-core/bp-core-widgets.php:200 bp-core/bp-core-widgets.php:298
 #: bp-friends/bp-friends-widgets.php:99 bp-friends/bp-friends-widgets.php:187
 #: bp-groups/bp-groups-widgets.php:66 bp-groups/bp-groups-widgets.php:147
-#: bp-members/bp-members-admin.php:642
+#: bp-members/bp-members-admin.php:902
 msgid "Active"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:205 bp-core/bp-core-widgets.php:300
+#: bp-core/bp-core-widgets.php:204 bp-core/bp-core-widgets.php:299
 #: bp-friends/bp-friends-widgets.php:100 bp-friends/bp-friends-widgets.php:188
 #: bp-groups/bp-groups-widgets.php:67 bp-groups/bp-groups-widgets.php:148
@@ -2308 +2329 @@
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:242
+#: bp-core/bp-core-widgets.php:241
 msgid "No one has signed up yet!"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:291 bp-friends/bp-friends-widgets.php:179
+#: bp-core/bp-core-widgets.php:290 bp-friends/bp-friends-widgets.php:179
 msgid "Link widget title to Members directory"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:293
+#: bp-core/bp-core-widgets.php:292
 msgid "Max members to show:"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:296
+#: bp-core/bp-core-widgets.php:295
 msgid "Default members to show:"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:318
+#: bp-core/bp-core-widgets.php:317
 msgid "Avatars of users who are currently online"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:365
+#: bp-core/bp-core-widgets.php:364
 msgid "There are no users currently online"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:396
+#: bp-core/bp-core-widgets.php:395
 msgid "Who's Online"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:407 bp-core/bp-core-widgets.php:510
+#: bp-core/bp-core-widgets.php:406 bp-core/bp-core-widgets.php:509
 msgid "Max Members to show:"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:421
+#: bp-core/bp-core-widgets.php:420
 msgid "Avatars of recently active members"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:468
+#: bp-core/bp-core-widgets.php:467
 msgid "There are no recently active members"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:499
+#: bp-core/bp-core-widgets.php:498
 msgid "Recently Active Members"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:572 bp-friends/bp-friends-widgets.php:252
+#: bp-core/bp-core-widgets.php:571 bp-friends/bp-friends-widgets.php:252
 msgid "There were no members found, please try another filter."
 msgstr ""
@@ -2365 +2386 @@
 msgstr ""
 
-#: bp-core/deprecated/1.5.php:149 bp-members/admin/bp-members-classes.php:128
-#: bp-members/admin/bp-members-classes.php:446
+#: bp-core/deprecated/1.5.php:149 bp-members/admin/bp-members-classes.php:126
+#: bp-members/admin/bp-members-classes.php:442
 #: bp-templates/bp-legacy/buddypress/members/single/profile/profile-wp.php:15
 #: bp-themes/bp-default/functions.php:643
@@ -2747 +2768 @@
 msgstr ""
 
-#: bp-friends/bp-friends-activity.php:105
-msgid "New friendships"
-msgstr ""
-
-#: bp-friends/bp-friends-activity.php:110
-msgid "New friendship created"
-msgstr ""
-
-#: bp-friends/bp-friends-activity.php:128
-#: bp-friends/bp-friends-activity.php:154
-msgid "%1$s and %2$s are now friends"
-msgstr ""
-
-#: bp-friends/bp-friends-loader.php:92
-msgid "Search Friends..."
-msgstr ""
-
-#: bp-friends/bp-friends-loader.php:119
-msgid "Friends <span class=\"%s\">%s</span>"
-msgstr ""
-
-#: bp-friends/bp-friends-loader.php:140 bp-friends/bp-friends-loader.php:204
-#: bp-friends/bp-friends-loader.php:229
-#: bp-templates/bp-legacy/buddypress/activity/index.php:104
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:35
+#: bp-friends/bp-friends-activity.php:100
+#: bp-friends/bp-friends-activity.php:109 bp-friends/bp-friends-loader.php:140
+#: bp-friends/bp-friends-loader.php:204 bp-friends/bp-friends-loader.php:229
 #: bp-themes/bp-default/activity/index.php:124
 #: bp-themes/bp-default/members/single/activity.php:35
 msgid "Friendships"
+msgstr ""
+
+#: bp-friends/bp-friends-activity.php:107
+msgid "New friendships"
+msgstr ""
+
+#: bp-friends/bp-friends-activity.php:114
+msgid "New friendship created"
+msgstr ""
+
+#: bp-friends/bp-friends-activity.php:132
+#: bp-friends/bp-friends-activity.php:158
+msgid "%1$s and %2$s are now friends"
+msgstr ""
+
+#: bp-friends/bp-friends-loader.php:92
+msgid "Search Friends..."
+msgstr ""
+
+#: bp-friends/bp-friends-loader.php:119
+msgid "Friends <span class=\"%s\">%s</span>"
 msgstr ""
 
@@ -3025 +3045 @@
 msgstr ""
 
-#: bp-groups/bp-groups-activity.php:36
+#: bp-groups/bp-groups-activity.php:31
+#: bp-themes/bp-default/activity/index.php:117
+#: bp-themes/bp-default/members/single/activity.php:50
+msgid "New Groups"
+msgstr ""
+
+#: bp-groups/bp-groups-activity.php:38
 msgid "Joined a group"
 msgstr ""
 
-#: bp-groups/bp-groups-activity.php:44
+#: bp-groups/bp-groups-activity.php:40
+#: bp-themes/bp-default/activity/index.php:118
+#: bp-themes/bp-default/groups/single/activity.php:18
+#: bp-themes/bp-default/members/single/activity.php:51
+msgid "Group Memberships"
+msgstr ""
+
+#: bp-groups/bp-groups-activity.php:51
 msgid "New group forum topic"
 msgstr ""
 
-#: bp-groups/bp-groups-activity.php:45
+#: bp-groups/bp-groups-activity.php:53
+#: bp-themes/bp-default/activity/index.php:110
+#: bp-themes/bp-default/groups/single/activity.php:14
+#: bp-themes/bp-default/members/single/activity.php:43
+msgid "Forum Topics"
+msgstr ""
+
+#: bp-groups/bp-groups-activity.php:60
 msgid "New group forum post"
 msgstr ""
 
-#: bp-groups/bp-groups-activity.php:70
+#: bp-groups/bp-groups-activity.php:62
+#: bp-themes/bp-default/activity/index.php:111
+#: bp-themes/bp-default/groups/single/activity.php:15
+#: bp-themes/bp-default/members/single/activity.php:44
+msgid "Forum Replies"
+msgstr ""
+
+#: bp-groups/bp-groups-activity.php:89
 msgid "%1$s created the group %2$s"
 msgstr ""
 
-#: bp-groups/bp-groups-activity.php:93 bp-groups/bp-groups-activity.php:259
+#: bp-groups/bp-groups-activity.php:112 bp-groups/bp-groups-activity.php:278
 msgid "%1$s joined the group %2$s"
 msgstr ""
@@ -3106 +3153 @@
 msgstr ""
 
+#: bp-groups/bp-groups-admin.php:449
+msgid "You cannot remove all administrators from a group."
+msgstr ""
+
 #: bp-groups/bp-groups-admin.php:453
-msgid "You cannot remove all administrators from a group."
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:457
 msgid "An error occurred when trying to update your group details."
 msgstr ""
 
+#: bp-groups/bp-groups-admin.php:455
+msgid "The group has been updated successfully."
+msgstr ""
+
 #: bp-groups/bp-groups-admin.php:459
-msgid "The group has been updated successfully."
+msgid "The following users could not be added to the group: <em>%s</em>"
 msgstr ""
 
 #: bp-groups/bp-groups-admin.php:463
-msgid "The following users could not be added to the group: <em>%s</em>"
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:467
 msgid "The following users were successfully added to the group: <em>%s</em>"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:472
+#: bp-groups/bp-groups-admin.php:468
 msgid "An error occurred when trying to modify the following members: <em>%s</em>"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:477
+#: bp-groups/bp-groups-admin.php:473
 msgid "The following members were successfully modified: <em>%s</em>"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:496 bp-groups/bp-groups-adminbar.php:39
+#: bp-groups/bp-groups-admin.php:492 bp-groups/bp-groups-adminbar.php:39
 #: bp-xprofile/bp-xprofile-admin.php:114
 msgid "Edit Group"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:499 bp-groups/bp-groups-admin.php:645
+#: bp-groups/bp-groups-admin.php:495 bp-groups/bp-groups-admin.php:641
 msgid "Add New"
 msgstr ""
 
+#: bp-groups/bp-groups-admin.php:514
+msgid "Name and Description"
+msgstr ""
+
 #: bp-groups/bp-groups-admin.php:518
-msgid "Name and Description"
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:522
 msgid "Permalink:"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:522
+#: bp-groups/bp-groups-admin.php:518
 msgid "Visit Group"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:549
+#: bp-groups/bp-groups-admin.php:545
 msgid "No group found with this ID. <a href=\"%s\">Go back and try again</a>."
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:591
+#: bp-groups/bp-groups-admin.php:587
 msgid "Delete Groups"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:592
+#: bp-groups/bp-groups-admin.php:588
 msgid "You are about to delete the following groups:"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:600 bp-members/bp-members-admin.php:1425
+#: bp-groups/bp-groups-admin.php:596 bp-members/bp-members-admin.php:1778
 msgid "This action cannot be undone."
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:629
+#: bp-groups/bp-groups-admin.php:625
 msgid "%s group has been permanently deleted."
 msgid_plural "%s groups have been permanently deleted."
@@ -3177 +3224 @@
 msgstr[1] ""
 
-#: bp-groups/bp-groups-admin.php:662
+#: bp-groups/bp-groups-admin.php:658
 msgid "Search all Groups"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:685
+#: bp-groups/bp-groups-admin.php:681
 #: bp-templates/bp-legacy/buddypress/groups/create.php:112
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:47
@@ -3189 +3236 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:691
+#: bp-groups/bp-groups-admin.php:687
 msgid "Privacy"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:694 bp-groups/bp-groups-admin.php:1451
+#: bp-groups/bp-groups-admin.php:690 bp-groups/bp-groups-admin.php:1453
 #: bp-groups/bp-groups-template.php:684
 msgid "Public"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:695 bp-groups/bp-groups-admin.php:1454
+#: bp-groups/bp-groups-admin.php:691 bp-groups/bp-groups-admin.php:1456
 #: bp-groups/bp-groups-template.php:686
 msgid "Private"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:696 bp-groups/bp-groups-admin.php:1457
+#: bp-groups/bp-groups-admin.php:692 bp-groups/bp-groups-admin.php:1459
 msgid "Hidden"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:703
+#: bp-groups/bp-groups-admin.php:699
 msgid "Who can invite others to this group?"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:706
+#: bp-groups/bp-groups-admin.php:702
 #: bp-templates/bp-legacy/buddypress/groups/create.php:89
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:99
@@ -3219 +3266 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:707
+#: bp-groups/bp-groups-admin.php:703
 #: bp-templates/bp-legacy/buddypress/groups/create.php:94
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:104
@@ -3227 +3274 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:708
+#: bp-groups/bp-groups-admin.php:704
 #: bp-templates/bp-legacy/buddypress/groups/create.php:99
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:109
@@ -3235 +3282 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:724
+#: bp-groups/bp-groups-admin.php:720
 msgid "Enter a comma-separated list of user logins."
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:783
+#: bp-groups/bp-groups-admin.php:776
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:177
 #: bp-themes/bp-default/groups/single/admin.php:177
@@ -3245 +3292 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:784
+#: bp-groups/bp-groups-admin.php:777
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:205
 #: bp-themes/bp-default/groups/single/admin.php:205
@@ -3251 +3298 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:786
-msgid "Banned Users"
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:823
+#: bp-groups/bp-groups-admin.php:779
+msgid "Banned Members"
+msgstr ""
+
+#: bp-groups/bp-groups-admin.php:815
+msgid "Roles"
+msgstr ""
+
+#: bp-groups/bp-groups-admin.php:816
 msgid "Administrator"
 msgstr ""
 
+#: bp-groups/bp-groups-admin.php:817
+msgid "Moderator"
+msgstr ""
+
+#: bp-groups/bp-groups-admin.php:818 bp-members/bp-members-admin.php:698
+msgid "Member"
+msgstr ""
+
+#: bp-groups/bp-groups-admin.php:820
+msgid "Banned"
+msgstr ""
+
+#: bp-groups/bp-groups-admin.php:823 bp-members/bp-members-admin.php:1246
+#: bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php:7
+#: bp-themes/bp-default/members/single/notifications/notifications-loop.php:7
+msgid "Actions"
+msgstr ""
+
 #: bp-groups/bp-groups-admin.php:824
-msgid "Moderator"
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:825
-msgid "Member"
+msgid "Remove"
 msgstr ""
 
 #: bp-groups/bp-groups-admin.php:826
-msgid "Banned"
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:827
-msgid "Remove From Group"
-msgstr ""
-
-#: bp-groups/bp-groups-admin.php:860
+msgid "Ban"
+msgstr ""
+
+#: bp-groups/bp-groups-admin.php:862
 msgid "No members of this type"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:886 bp-groups/bp-groups-adminbar.php:101
+#: bp-groups/bp-groups-admin.php:887 bp-groups/bp-groups-adminbar.php:101
 #: bp-groups/bp-groups-buddybar.php:58
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:332
@@ -3287 +3348 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:890 bp-groups/bp-groups-classes.php:3187
+#: bp-groups/bp-groups-admin.php:891 bp-groups/bp-groups-classes.php:3187
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:32
 #: bp-templates/bp-legacy/buddypress/groups/single/admin.php:117
@@ -3302 +3363 @@
 #: bp-themes/bp-default/members/single/settings/general.php:72
 #: bp-themes/bp-default/members/single/settings/notifications.php:61
-#: bp-xprofile/bp-xprofile-classes.php:460
+#: bp-xprofile/bp-xprofile-classes.php:462
 msgid "Save Changes"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:939
+#: bp-groups/bp-groups-admin.php:940
 msgid "&laquo;"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:940
+#: bp-groups/bp-groups-admin.php:941
 msgid "&raquo;"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:946
+#: bp-groups/bp-groups-admin.php:947
 msgid "Viewing %1$s - %2$s of %3$s"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:949 bp-groups/bp-groups-template.php:1025
+#: bp-groups/bp-groups-admin.php:950 bp-groups/bp-groups-template.php:1025
 msgid "%s member"
 msgid_plural "%s members"
@@ -3324 +3385 @@
 msgstr[1] ""
 
-#: bp-groups/bp-groups-admin.php:1015
+#: bp-groups/bp-groups-admin.php:1016
 #. translators: 1: user_login, 2: user_email
 msgid "%1$s (%2$s)"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1199
+#: bp-groups/bp-groups-admin.php:1200
 msgid "No groups found."
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1272
+#: bp-groups/bp-groups-admin.php:1273
 msgid "Public <span class=\"count\">(%s)</span>"
 msgid_plural "Public <span class=\"count\">(%s)</span>"
@@ -3339 +3400 @@
 msgstr[1] ""
 
-#: bp-groups/bp-groups-admin.php:1273
+#: bp-groups/bp-groups-admin.php:1274
 msgid "Private <span class=\"count\">(%s)</span>"
 msgid_plural "Private <span class=\"count\">(%s)</span>"
@@ -3345 +3406 @@
 msgstr[1] ""
 
-#: bp-groups/bp-groups-admin.php:1274
+#: bp-groups/bp-groups-admin.php:1275
 msgid "Hidden <span class=\"count\">(%s)</span>"
 msgid_plural "Hidden <span class=\"count\">(%s)</span>"
@@ -3351 +3412 @@
 msgstr[1] ""
 
-#: bp-groups/bp-groups-admin.php:1349
+#: bp-groups/bp-groups-admin.php:1350
 msgid "Select group %1$d"
 msgstr ""
@@ -3796 +3857 @@
 msgstr ""
 
-#: bp-groups/bp-groups-screens.php:651 bp-members/bp-members-admin.php:506
+#: bp-groups/bp-groups-screens.php:651 bp-members/bp-members-admin.php:308
 #: bp-xprofile/bp-xprofile-actions.php:41
 msgid "There was a problem deleting that avatar, please try again."
@@ -4157 +4218 @@
 msgstr ""
 
-#: bp-members/admin/bp-members-classes.php:129
-#: bp-members/admin/bp-members-classes.php:277
-#: bp-members/admin/bp-members-classes.php:447
-#: bp-members/admin/bp-members-classes.php:588
+#: bp-members/admin/bp-members-classes.php:127
+#: bp-members/admin/bp-members-classes.php:274
+#: bp-members/admin/bp-members-classes.php:443
+#: bp-members/admin/bp-members-classes.php:585
 #: bp-settings/bp-settings-loader.php:106
 #: bp-settings/bp-settings-loader.php:179
@@ -4167 +4228 @@
 msgstr ""
 
+#: bp-members/admin/bp-members-classes.php:128
+#: bp-members/admin/bp-members-classes.php:444
+msgid "Registered"
+msgstr ""
+
+#: bp-members/admin/bp-members-classes.php:129
+#: bp-members/admin/bp-members-classes.php:445
+msgid "Last Sent"
+msgstr ""
+
 #: bp-members/admin/bp-members-classes.php:130
-#: bp-members/admin/bp-members-classes.php:448
-msgid "Registered"
-msgstr ""
-
-#: bp-members/admin/bp-members-classes.php:131
-#: bp-members/admin/bp-members-classes.php:449
-msgid "Last Sent"
-msgstr ""
-
-#: bp-members/admin/bp-members-classes.php:132
-#: bp-members/admin/bp-members-classes.php:450
-msgid "# Times Emailed"
-msgstr ""
-
-#: bp-members/admin/bp-members-classes.php:164
-#: bp-members/admin/bp-members-classes.php:481
+#: bp-members/admin/bp-members-classes.php:446
+msgid "Emails Sent"
+msgstr ""
+
+#: bp-members/admin/bp-members-classes.php:162
+#: bp-members/admin/bp-members-classes.php:477
 msgid "No pending accounts found."
 msgstr ""
 
+#: bp-members/admin/bp-members-classes.php:168
 #: bp-members/admin/bp-members-classes.php:170
-#: bp-members/admin/bp-members-classes.php:172
-#: bp-members/admin/bp-members-classes.php:486
+#: bp-members/admin/bp-members-classes.php:482
 msgid "Edit settings"
 msgstr ""
 
-#: bp-members/admin/bp-members-classes.php:175
-#: bp-members/admin/bp-members-classes.php:489
+#: bp-members/admin/bp-members-classes.php:173
+#: bp-members/admin/bp-members-classes.php:485
 msgid "Registration is disabled. %s"
 msgstr ""
 
-#: bp-members/bp-members-actions.php:56 bp-members/bp-members-admin.php:483
+#: bp-members/bp-members-actions.php:56 bp-members/bp-members-admin.php:284
 msgid "User removed as spammer."
 msgstr ""
@@ -4210 +4271 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:190 bp-members/bp-members-admin.php:191
+#: bp-members/bp-members-admin.php:278
+msgid "Avatar was deleted successfully!"
+msgstr ""
+
+#: bp-members/bp-members-admin.php:296
+msgid "Profile updated."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:314
+msgid "User could not be removed as spammer."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:320
+msgid "User could not be marked as spammer."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:326
+msgid "An error occured while trying to update the profile."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:332 bp-xprofile/bp-xprofile-screens.php:96
+msgid ""
+"Please make sure you fill in all required fields in this profile field "
+"group before saving."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:338 bp-xprofile/bp-xprofile-screens.php:138
+msgid ""
+"There was a problem updating some of your profile information, please try "
+"again."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:363 bp-members/bp-members-admin.php:364
+#: bp-members/bp-members-admin.php:402 bp-members/bp-members-admin.php:403
 #: bp-members/bp-members-adminbar.php:100
 #: bp-xprofile/bp-xprofile-template.php:688
@@ -4217 +4311 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:199 bp-members/bp-members-admin.php:200
+#: bp-members/bp-members-admin.php:414 bp-members/bp-members-admin.php:415
 msgid "Manage Signups"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:331 bp-members/bp-members-admin.php:754
+#: bp-members/bp-members-admin.php:610
 msgid "Extended Profile"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:352
-msgid "No users were found"
-msgstr ""
-
-#: bp-members/bp-members-admin.php:386
+#: bp-members/bp-members-admin.php:633
+msgid "You cannot edit the requested user."
+msgstr ""
+
+#: bp-members/bp-members-admin.php:662
 msgid "This is the admin view of a user&#39;s profile."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:387
+#: bp-members/bp-members-admin.php:663
 msgid ""
 "In the main column, you can edit the fields of the user&#39;s extended "
@@ -4239 +4333 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:388
+#: bp-members/bp-members-admin.php:664
 msgid ""
 "In the right-hand column, you can update the user&#39;s status, delete the "
@@ -4245 +4339 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:394
+#: bp-members/bp-members-admin.php:670
 msgid ""
 "<a "
@@ -4252 +4346 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:477
-msgid "Avatar was deleted successfully!"
-msgstr ""
-
-#: bp-members/bp-members-admin.php:495
-msgid "Profile updated."
-msgstr ""
-
-#: bp-members/bp-members-admin.php:512
-msgid "User could not be removed as spammer."
-msgstr ""
-
-#: bp-members/bp-members-admin.php:518
-msgid "User could not be marked as spammer."
-msgstr ""
-
-#: bp-members/bp-members-admin.php:524
-msgid "An error occured while trying to update the profile."
-msgstr ""
-
-#: bp-members/bp-members-admin.php:530 bp-xprofile/bp-xprofile-screens.php:96
-msgid ""
-"Please make sure you fill in all required fields in this profile field "
-"group before saving."
-msgstr ""
-
-#: bp-members/bp-members-admin.php:536 bp-xprofile/bp-xprofile-screens.php:138
-msgid ""
-"There was a problem updating some of your profile information, please try "
-"again."
-msgstr ""
-
-#: bp-members/bp-members-admin.php:550
+#: bp-members/bp-members-admin.php:767
+msgid "Edit User"
+msgstr ""
+
+#: bp-members/bp-members-admin.php:789
 msgid "&larr; Back to Users"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:559
-msgid "Edit User"
-msgstr ""
-
-#: bp-members/bp-members-admin.php:598
+#: bp-members/bp-members-admin.php:847
 msgid "No user found with this ID. <a href=\"%s\">Go back and try again</a>."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:625
+#: bp-members/bp-members-admin.php:877
 msgid "User account has not yet been activated"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:643
+#: bp-members/bp-members-admin.php:903
 msgid "Spammer"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:653
+#: bp-members/bp-members-admin.php:915
 msgid "Registered on: <strong>%1$s</strong>"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:663
+#: bp-members/bp-members-admin.php:925
 msgid "View Profile"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:664
+#: bp-members/bp-members-admin.php:926
 msgid "Update Profile"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:684 bp-xprofile/bp-xprofile-admin.php:760
+#: bp-members/bp-members-admin.php:946 bp-xprofile/bp-xprofile-admin.php:803
 msgid ""
 "%s has been marked as a spammer. All BuddyPress data associated with the "
@@ -4322 +4384 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:715
-msgid "Last active: <strong>%1$s</strong>"
-msgstr ""
-
-#: bp-members/bp-members-admin.php:927
+#: bp-members/bp-members-admin.php:978
+msgid "Last active: %1$s"
+msgstr ""
+
+#: bp-members/bp-members-admin.php:1024
+msgid "Extended"
+msgstr ""
+
+#: bp-members/bp-members-admin.php:1238
 msgid "This is the admininistration screen for pending accounts on your site."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:928
+#: bp-members/bp-members-admin.php:1239
 msgid ""
 "From the screen options, you can customize the displayed columns and the "
@@ -4336 +4402 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:929
+#: bp-members/bp-members-admin.php:1240
 msgid ""
 "You can reorder the list of your pending accounts by clicking on the "
@@ -4342 +4408 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:930
+#: bp-members/bp-members-admin.php:1241
 msgid ""
 "Using the search form, you can find pending accounts more easily. The "
@@ -4348 +4414 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:935
-#: bp-templates/bp-legacy/buddypress/members/single/notifications/notifications-loop.php:7
-#: bp-themes/bp-default/members/single/notifications/notifications-loop.php:7
-msgid "Actions"
-msgstr ""
-
-#: bp-members/bp-members-admin.php:937
+#: bp-members/bp-members-admin.php:1248
 msgid ""
 "Hovering over a row in the pending accounts list will display action links "
@@ -4361 +4421 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:938
+#: bp-members/bp-members-admin.php:1249
 msgid ""
 "\"Email\" takes you to the confirmation screen before being able to send "
@@ -4368 +4428 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:939
+#: bp-members/bp-members-admin.php:1250
 msgid ""
 "\"Delete\" allows you to delete a pending account from your site. You will "
@@ -4374 +4434 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:940
+#: bp-members/bp-members-admin.php:1251
 msgid ""
 "By clicking on a Username you will be able to activate a pending account "
@@ -4380 +4440 @@
 msgstr ""
 
-#: bp-members/bp-members-admin.php:941
+#: bp-members/bp-members-admin.php:1252
 msgid "Bulk actions allow you to perform these 3 actions for the selected rows."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1195
+#: bp-members/bp-members-admin.php:1508
 msgid "There was a problem sending the activation emails, please try again."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1202
+#: bp-members/bp-members-admin.php:1515
 msgid "There was a problem activating accounts, please try again."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1209
+#: bp-members/bp-members-admin.php:1522
 msgid "There was a problem deleting sign-ups, please try again."
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1296
+#: bp-members/bp-members-admin.php:1639
 msgid "Users"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1315
-msgid "Search Pending Accounts"
-msgstr ""
-
-#: bp-members/bp-members-admin.php:1361
+#: bp-members/bp-members-admin.php:1663
+msgid "Search Pending Users"
+msgstr ""
+
+#: bp-members/bp-members-admin.php:1709
 msgid "Delete Pending Accounts"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1362
+#: bp-members/bp-members-admin.php:1710
 msgid "You are about to delete the following account:"
 msgid_plural "You are about to delete the following accounts:"
@@ -4414 +4474 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1366
+#: bp-members/bp-members-admin.php:1714
 msgid "Activate Pending Accounts"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1367
+#: bp-members/bp-members-admin.php:1715
 msgid "You are about to activate the following account:"
 msgid_plural "You are about to activate the following accounts:"
@@ -4424 +4484 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1371
+#: bp-members/bp-members-admin.php:1719
 msgid "Resend Activation Emails"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1372
+#: bp-members/bp-members-admin.php:1720
 msgid "You are about to resend an activation email to the following account:"
 msgid_plural "You are about to resend activation emails to the following accounts:"
@@ -4434 +4494 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1411
+#: bp-members/bp-members-admin.php:1760
 msgid "Last notified: %s"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1414
+#: bp-members/bp-members-admin.php:1764
 msgid "(less than 24 hours ago)"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1428
+#: bp-members/bp-members-admin.php:1782
 msgid "Confirm"
 msgstr ""
@@ -4601 +4661 @@
 msgstr ""
 
-#: bp-members/bp-members-loader.php:85
+#: bp-members/bp-members-loader.php:89
 msgid "Search Members..."
 msgstr ""
 
-#: bp-members/bp-members-loader.php:230
+#: bp-members/bp-members-loader.php:245
 msgid "You"
 msgstr ""
@@ -4882 +4942 @@
 #: bp-themes/bp-default/members/single/profile/edit.php:130
 #: bp-themes/bp-default/registration/register.php:173
-#: bp-xprofile/bp-xprofile-admin.php:736
+#: bp-xprofile/bp-xprofile-admin.php:779
 msgid "Close"
 msgstr ""
@@ -5180 +5240 @@
 #: bp-themes/bp-default/groups/single/activity.php:10
 #: bp-themes/bp-default/members/single/activity.php:20
-msgid "Everything"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:79
-#: bp-templates/bp-legacy/buddypress/groups/single/activity.php:11
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:21
-#: bp-themes/bp-default/activity/index.php:99
-#: bp-themes/bp-default/groups/single/activity.php:11
-#: bp-themes/bp-default/members/single/activity.php:21
-msgid "Updates"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:84
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:28
-#: bp-themes/bp-default/activity/index.php:104
-#: bp-themes/bp-default/members/single/activity.php:28
-msgid "Comments"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:90
-#: bp-templates/bp-legacy/buddypress/groups/single/activity.php:14
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:43
-#: bp-themes/bp-default/activity/index.php:110
-#: bp-themes/bp-default/groups/single/activity.php:14
-#: bp-themes/bp-default/members/single/activity.php:43
-msgid "Forum Topics"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:91
-#: bp-templates/bp-legacy/buddypress/groups/single/activity.php:15
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:44
-#: bp-themes/bp-default/activity/index.php:111
-#: bp-themes/bp-default/groups/single/activity.php:15
-#: bp-themes/bp-default/members/single/activity.php:44
-msgid "Forum Replies"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:97
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:50
-#: bp-themes/bp-default/activity/index.php:117
-#: bp-themes/bp-default/members/single/activity.php:50
-msgid "New Groups"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:98
-#: bp-templates/bp-legacy/buddypress/groups/single/activity.php:18
-#: bp-templates/bp-legacy/buddypress/members/single/activity.php:51
-#: bp-themes/bp-default/activity/index.php:118
-#: bp-themes/bp-default/groups/single/activity.php:18
-#: bp-themes/bp-default/members/single/activity.php:51
-msgid "Group Memberships"
-msgstr ""
-
-#: bp-templates/bp-legacy/buddypress/activity/index.php:108
-#: bp-themes/bp-default/activity/index.php:128
-msgid "New Members"
+msgid "&mdash; Everything &mdash;"
 msgstr ""
 
@@ -5391 +5396 @@
 #: bp-templates/bp-legacy/buddypress/forums/index.php:98
 #: bp-themes/bp-default/forums/index.php:116
-#: bp-xprofile/bp-xprofile-classes.php:1594
-#: bp-xprofile/bp-xprofile-classes.php:1619
-#: bp-xprofile/bp-xprofile-classes.php:1627
-#: bp-xprofile/bp-xprofile-classes.php:2195
+#: bp-xprofile/bp-xprofile-classes.php:1596
+#: bp-xprofile/bp-xprofile-classes.php:1621
+#: bp-xprofile/bp-xprofile-classes.php:1629
+#: bp-xprofile/bp-xprofile-classes.php:2197
 #. translators: no option picked in select box
 msgid "----"
@@ -5680 +5685 @@
 #: bp-themes/bp-default/groups/single/admin.php:139
 #: bp-themes/bp-default/members/single/profile/change-avatar.php:24
-#: bp-xprofile/bp-xprofile-admin.php:804
+#: bp-xprofile/bp-xprofile-admin.php:844
 msgid "Delete Avatar"
 msgstr ""
@@ -5938 +5943 @@
 #: bp-themes/bp-default/registration/register.php:216
 #: bp-themes/bp-default/registration/register.php:225
-#: bp-xprofile/bp-xprofile-classes.php:1516
-#: bp-xprofile/bp-xprofile-classes.php:1741
-#: bp-xprofile/bp-xprofile-classes.php:1879
-#: bp-xprofile/bp-xprofile-classes.php:2024
-#: bp-xprofile/bp-xprofile-classes.php:2169
-#: bp-xprofile/bp-xprofile-classes.php:2309
-#: bp-xprofile/bp-xprofile-classes.php:2392
-#: bp-xprofile/bp-xprofile-classes.php:2472
+#: bp-xprofile/bp-xprofile-classes.php:1518
+#: bp-xprofile/bp-xprofile-classes.php:1743
+#: bp-xprofile/bp-xprofile-classes.php:1881
+#: bp-xprofile/bp-xprofile-classes.php:2026
+#: bp-xprofile/bp-xprofile-classes.php:2171
+#: bp-xprofile/bp-xprofile-classes.php:2311
+#: bp-xprofile/bp-xprofile-classes.php:2394
+#: bp-xprofile/bp-xprofile-classes.php:2474
 msgid "(required)"
 msgstr ""
@@ -5986 +5991 @@
 #: bp-themes/bp-default/members/single/profile/edit.php:125
 #: bp-themes/bp-default/registration/register.php:168
-#: bp-xprofile/bp-xprofile-admin.php:733
+#: bp-xprofile/bp-xprofile-admin.php:774
 msgid "Who can see this field?"
 msgstr ""
@@ -6217 +6222 @@
 #: bp-templates/bp-legacy/buddypress/members/single/profile/edit.php:33
 #: bp-themes/bp-default/members/single/profile/edit.php:120
-#: bp-xprofile/bp-xprofile-admin.php:726
+#: bp-xprofile/bp-xprofile-admin.php:765
 msgid "Change"
 msgstr ""
@@ -6464 +6469 @@
 msgstr ""
 
+#: bp-themes/bp-default/activity/index.php:128
+#: bp-xprofile/bp-xprofile-activity.php:35
+msgid "New Members"
+msgstr ""
+
 #: bp-themes/bp-default/archive.php:10
 msgid "You are browsing the archive for %1$s."
@@ -6676 +6686 @@
 #: bp-themes/bp-default/members/single/profile/edit.php:73
 #: bp-themes/bp-default/registration/register.php:121
-#: bp-xprofile/bp-xprofile-classes.php:1884
-#: bp-xprofile/bp-xprofile-classes.php:1953
-#: bp-xprofile/bp-xprofile-classes.php:2031
+#: bp-xprofile/bp-xprofile-classes.php:1886
+#: bp-xprofile/bp-xprofile-classes.php:1955
+#: bp-xprofile/bp-xprofile-classes.php:2033
 msgid "Clear"
 msgstr ""
@@ -6730 +6740 @@
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-activity.php:26
+#: bp-xprofile/bp-xprofile-activity.php:25
 msgid "Member changed profile picture"
+msgstr ""
+
+#: bp-xprofile/bp-xprofile-activity.php:27
+msgid "Updated Avatars"
 msgstr ""
 
@@ -6738 +6752 @@
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-activity.php:40
+#: bp-xprofile/bp-xprofile-activity.php:42
 msgid "Updated Profile"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-activity.php:59
+#: bp-xprofile/bp-xprofile-activity.php:44
+#: bp-xprofile/bp-xprofile-activity.php:321
+msgid "Profile Updates"
+msgstr ""
+
+#: bp-xprofile/bp-xprofile-activity.php:63
 msgid "%s changed their profile picture"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-activity.php:80
+#: bp-xprofile/bp-xprofile-activity.php:84
 msgid "%s became a registered member"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-activity.php:105
+#: bp-xprofile/bp-xprofile-activity.php:109
 msgid "%s&#8217;s profile was updated"
-msgstr ""
-
-#: bp-xprofile/bp-xprofile-activity.php:316
-msgid "Profile Updates"
 msgstr ""
 
@@ -6762 +6777 @@
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-admin.php:72 bp-xprofile/bp-xprofile-classes.php:454
+#: bp-xprofile/bp-xprofile-admin.php:72 bp-xprofile/bp-xprofile-classes.php:456
 msgid "Add New Field Group"
 msgstr ""
@@ -6834 +6849 @@
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-admin.php:723
+#: bp-xprofile/bp-xprofile-admin.php:761
 msgid "This field can be seen by: <span class=\"%s\">%s</span>"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:366
+#: bp-xprofile/bp-xprofile-classes.php:368
 msgid "Please make sure you give the group a name."
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:456
+#: bp-xprofile/bp-xprofile-classes.php:458
 msgid "Create Field Group"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:458
+#: bp-xprofile/bp-xprofile-classes.php:460
 msgid "Edit Field Group"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:484
-#: bp-xprofile/bp-xprofile-classes.php:485
+#: bp-xprofile/bp-xprofile-classes.php:486
+#: bp-xprofile/bp-xprofile-classes.php:487
 msgid "Field Group Title"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:491
+#: bp-xprofile/bp-xprofile-classes.php:493
 msgid "Group Description"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:837
+#: bp-xprofile/bp-xprofile-classes.php:839
 msgid "Add Field"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:849
+#: bp-xprofile/bp-xprofile-classes.php:851
 msgid "Edit Field"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:873
+#: bp-xprofile/bp-xprofile-classes.php:875
 msgid "Field Description"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:882
+#: bp-xprofile/bp-xprofile-classes.php:884
 msgid "Submit"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:904
+#: bp-xprofile/bp-xprofile-classes.php:906
 msgid "Default Visibility"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:922
+#: bp-xprofile/bp-xprofile-classes.php:924
 msgid "Per-Member Visibility"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:927
+#: bp-xprofile/bp-xprofile-classes.php:929
 msgid "Let members change this field's visibility"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:931
+#: bp-xprofile/bp-xprofile-classes.php:933
 msgid "Enforce the default visibility for all members"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:946
+#: bp-xprofile/bp-xprofile-classes.php:948
 msgid "Field Requirement"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:949
+#: bp-xprofile/bp-xprofile-classes.php:951
 msgid "Not Required"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:950
+#: bp-xprofile/bp-xprofile-classes.php:952
 msgid "Required"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:956
+#: bp-xprofile/bp-xprofile-classes.php:958
 msgid "Field Type"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:994
+#: bp-xprofile/bp-xprofile-classes.php:996
 msgid "Please make sure you fill out all required fields."
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1002
+#: bp-xprofile/bp-xprofile-classes.php:1004
 msgid "This field type require at least one option. Please add options below."
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1605
+#: bp-xprofile/bp-xprofile-classes.php:1607
 msgid "January"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1606
+#: bp-xprofile/bp-xprofile-classes.php:1608
 msgid "February"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1607
+#: bp-xprofile/bp-xprofile-classes.php:1609
 msgid "March"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1608
+#: bp-xprofile/bp-xprofile-classes.php:1610
 msgid "April"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1609
+#: bp-xprofile/bp-xprofile-classes.php:1611
 msgid "May"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1610
+#: bp-xprofile/bp-xprofile-classes.php:1612
 msgid "June"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1611
+#: bp-xprofile/bp-xprofile-classes.php:1613
 msgid "July"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1612
+#: bp-xprofile/bp-xprofile-classes.php:1614
 msgid "August"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1613
+#: bp-xprofile/bp-xprofile-classes.php:1615
 msgid "September"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1614
+#: bp-xprofile/bp-xprofile-classes.php:1616
 msgid "October"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1615
+#: bp-xprofile/bp-xprofile-classes.php:1617
 msgid "November"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1616
+#: bp-xprofile/bp-xprofile-classes.php:1618
 msgid "December"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2767
+#: bp-xprofile/bp-xprofile-classes.php:2769
 msgid "Please enter options for this Field:"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2770
+#: bp-xprofile/bp-xprofile-classes.php:2772
 msgid "Sort Order:"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2772
+#: bp-xprofile/bp-xprofile-classes.php:2774
 msgid "Custom"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2773
+#: bp-xprofile/bp-xprofile-classes.php:2775
 msgid "Ascending"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2774
+#: bp-xprofile/bp-xprofile-classes.php:2776
 msgid "Descending"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2835
+#: bp-xprofile/bp-xprofile-classes.php:2837
 msgid "Default Value"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2843
+#: bp-xprofile/bp-xprofile-classes.php:2845
 msgid "Add Another Option"
 msgstr ""
@@ -7110 +7125 @@
 msgstr ""
 
-#: bp-members/bp-members-loader.php:80
+#: bp-members/bp-members-loader.php:88
 msgctxt "component directory title"
 msgid "Members"
@@ -7145 +7160 @@
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:321
+#: bp-core/bp-core-widgets.php:320
 msgctxt "widget name"
 msgid "(BuddyPress) Who's Online"
 msgstr ""
 
-#: bp-core/bp-core-widgets.php:424
+#: bp-core/bp-core-widgets.php:423
 msgctxt "widget name"
 msgid "(BuddyPress) Recently Active Members"
@@ -7282 +7297 @@
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:799
+#: bp-groups/bp-groups-admin.php:791
 msgctxt "Group member user_id in group admin"
 msgid "ID"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:800
+#: bp-groups/bp-groups-admin.php:792
 msgctxt "Group member name in group admin"
 msgid "Name"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:801
+#: bp-groups/bp-groups-admin.php:793
 msgctxt "Group member role in group admin"
 msgid "Group Role"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1306
+#: bp-groups/bp-groups-admin.php:1307
 msgctxt "Groups admin Group Name column header"
 msgid "Name"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1307
+#: bp-groups/bp-groups-admin.php:1308
 msgctxt "Groups admin Group Description column header"
 msgid "Description"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1308
+#: bp-groups/bp-groups-admin.php:1309
 msgctxt "Groups admin Privacy Status column header"
 msgid "Status"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1309
+#: bp-groups/bp-groups-admin.php:1310
 msgctxt "Groups admin Members column header"
 msgid "# Members"
 msgstr ""
 
-#: bp-groups/bp-groups-admin.php:1310
+#: bp-groups/bp-groups-admin.php:1311
 msgctxt "Groups admin Last Active column header"
 msgid "Last Active"
@@ -7337 +7352 @@
 msgstr ""
 
-#: bp-members/admin/bp-members-classes.php:102
-#: bp-members/admin/bp-members-classes.php:432
-#: bp-members/bp-members-admin.php:860
+#: bp-members/admin/bp-members-classes.php:100
+#: bp-members/admin/bp-members-classes.php:428
+#: bp-members/bp-members-admin.php:1169
 msgctxt "signup users"
-msgid "Pending <span class=\"count\">(%s)</span>"
-msgstr ""
-
-#: bp-members/admin/bp-members-classes.php:143
-#: bp-members/admin/bp-members-classes.php:461
+msgid "Pending %s"
+msgstr ""
+
+#: bp-members/admin/bp-members-classes.php:141
+#: bp-members/admin/bp-members-classes.php:457
 msgctxt "Pending signup action"
 msgid "Activate"
 msgstr ""
 
-#: bp-members/admin/bp-members-classes.php:144
-#: bp-members/admin/bp-members-classes.php:462
+#: bp-members/admin/bp-members-classes.php:142
+#: bp-members/admin/bp-members-classes.php:458
 msgctxt "Pending signup action"
 msgid "Email"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:399
+#: bp-members/bp-members-admin.php:677
 msgctxt "members user-admin edit screen"
 msgid "Status"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:561 bp-members/bp-members-admin.php:1298
+#: bp-members/bp-members-admin.php:704
+msgctxt "members user-admin edit screen"
+msgid "%s's Stats"
+msgstr ""
+
+#: bp-members/bp-members-admin.php:805 bp-members/bp-members-admin.php:1643
 msgctxt "user"
 msgid "Add New"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:563 bp-members/bp-members-admin.php:1300
+#: bp-members/bp-members-admin.php:809 bp-members/bp-members-admin.php:1647
 msgctxt "user"
 msgid "Add Existing"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:921
+#: bp-members/bp-members-admin.php:1232
 msgctxt "Pending Accounts per page (screen options)"
 msgid "Pending Accounts"
 msgstr ""
 
-#: bp-members/bp-members-admin.php:1093
+#: bp-members/bp-members-admin.php:1406
 msgctxt "signup resent"
 msgid "%s activation email successfully sent! "
@@ -7383 +7403 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1127
+#: bp-members/bp-members-admin.php:1440
 msgctxt "signup resent"
 msgid "%s account successfully activated! "
@@ -7390 +7410 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1104
+#: bp-members/bp-members-admin.php:1417
 msgctxt "signup notsent"
 msgid "%s activation email was not sent."
@@ -7397 +7417 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1138
+#: bp-members/bp-members-admin.php:1451
 msgctxt "signup notsent"
 msgid "%s account was not activated."
@@ -7404 +7424 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1161
+#: bp-members/bp-members-admin.php:1474
 msgctxt "signup deleted"
 msgid "%s sign-up successfully deleted!"
@@ -7411 +7431 @@
 msgstr[1] ""
 
-#: bp-members/bp-members-admin.php:1172
+#: bp-members/bp-members-admin.php:1485
 msgctxt "signup notdeleted"
 msgid "%s sign-up was not deleted."
@@ -7504 +7524 @@
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1466
-#: bp-xprofile/bp-xprofile-classes.php:2279
-#: bp-xprofile/bp-xprofile-classes.php:2362
-#: bp-xprofile/bp-xprofile-classes.php:2442
+#: bp-xprofile/bp-xprofile-classes.php:1468
+#: bp-xprofile/bp-xprofile-classes.php:2281
+#: bp-xprofile/bp-xprofile-classes.php:2364
+#: bp-xprofile/bp-xprofile-classes.php:2444
 msgctxt "xprofile field type category"
 msgid "Single Fields"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1711
-#: bp-xprofile/bp-xprofile-classes.php:1851
-#: bp-xprofile/bp-xprofile-classes.php:1987
-#: bp-xprofile/bp-xprofile-classes.php:2141
+#: bp-xprofile/bp-xprofile-classes.php:1713
+#: bp-xprofile/bp-xprofile-classes.php:1853
+#: bp-xprofile/bp-xprofile-classes.php:1989
+#: bp-xprofile/bp-xprofile-classes.php:2143
 msgctxt "xprofile field type category"
 msgid "Multi Fields"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-admin.php:559
+#: bp-xprofile/bp-xprofile-admin.php:573
 msgctxt "xprofile user-admin edit screen"
 msgid "User marked as a spammer"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-admin.php:563
+#: bp-xprofile/bp-xprofile-admin.php:584
 msgctxt "xprofile user-admin edit screen"
 msgid "Avatar"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1467
+#: bp-xprofile/bp-xprofile-classes.php:1469
 msgctxt "xprofile field type"
 msgid "Date Selector"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1712
+#: bp-xprofile/bp-xprofile-classes.php:1714
 msgctxt "xprofile field type"
 msgid "Checkboxes"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1852
+#: bp-xprofile/bp-xprofile-classes.php:1854
 msgctxt "xprofile field type"
 msgid "Radio Buttons"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:1988
+#: bp-xprofile/bp-xprofile-classes.php:1990
 msgctxt "xprofile field type"
 msgid "Multi Select Box"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2142
+#: bp-xprofile/bp-xprofile-classes.php:2144
 msgctxt "xprofile field type"
 msgid "Drop Down Select Box"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2280
+#: bp-xprofile/bp-xprofile-classes.php:2282
 msgctxt "xprofile field type"
 msgid "Multi-line Text Area"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2363
+#: bp-xprofile/bp-xprofile-classes.php:2365
 msgctxt "xprofile field type"
 msgid "Text Box"
 msgstr ""
 
-#: bp-xprofile/bp-xprofile-classes.php:2443
+#: bp-xprofile/bp-xprofile-classes.php:2445
 msgctxt "xprofile field type"
 msgid "Number"

trunk/src/bp-templates/bp-legacy/js/buddypress.js

@@ -29 +29 @@
 
     /* @mention Compose Scrolling */
-    if ( jq.query.get('r') && $whats_new.length ) {
+    if ( $whats_new.length && bp_get_querystring('r') ) {
+        var $member_nicename = $whats_new.val();
+
         jq('#whats-new-options').animate({
             height:'40px'
         });
-        jq('#whats-new-form textarea').animate({
+
+        $whats_new.animate({
             height:'50px'
         });
+
         jq.scrollTo( $whats_new, 500, {
             offset:-125,
             easing:'swing'
         } );
-        $whats_new.val('').focus().val( $whats_new.val() );
+
+        $whats_new.val('').focus().val( $member_nicename );
     }
 
@@ -1671 +1676 @@
     }
 
-    if ( jq.query.get('s') && !search_terms ) {
-        search_terms = jq.query.get('s');
+    if ( bp_get_querystring('s') && !search_terms ) {
+        search_terms = bp_get_querystring('s');
     }
 
@@ -1906 +1911 @@
     return encodeURIComponent( jq.param(bpCookies) );
 }
-
-/* ScrollTo plugin - just inline and minified */
-;(function($){var h=$.scrollTo=function(a,b,c){$(window).scrollTo(a,b,c)};h.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1,limit:true};h.window=function(a){return $(window)._scrollable()};$.fn._scrollable=function(){return this.map(function(){var a=this,isWin=!a.nodeName||$.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!isWin)return a;var b=(a.contentWindow||a).document||a.ownerDocument||a;return/webkit/i.test(navigator.userAgent)||b.compatMode=='BackCompat'?b.body:b.documentElement})};$.fn.scrollTo=function(e,f,g){if(typeof f=='object'){g=f;f=0}if(typeof g=='function')g={onAfter:g};if(e=='max')e=9e9;g=$.extend({},h.defaults,g);f=f||g.duration;g.queue=g.queue&&g.axis.length>1;if(g.queue)f/=2;g.offset=both(g.offset);g.over=both(g.over);return this._scrollable().each(function(){if(e==null)return;var d=this,$elem=$(d),targ=e,toff,attr={},win=$elem.is('html,body');switch(typeof targ){case'number':case'string':if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(targ)){targ=both(targ);break}targ=$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}$.each(g.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=h.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(g.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=g.offset[pos]||0;if(g.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*g.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(g.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&g.queue){if(old!=attr[key])animate(g.onAfterFirst);delete attr[key]}});animate(g.onAfter);function animate(a){$elem.animate(attr,f,g.easing,a&&function(){a.call(this,e,g)})}}).end()};h.max=function(a,b){var c=b=='x'?'Width':'Height',scroll='scroll'+c;if(!$(a).is('html,body'))return a[scroll]-$(a)[c.toLowerCase()]();var d='client'+c,html=a.ownerDocument.documentElement,body=a.ownerDocument.body;return Math.max(html[scroll],body[scroll])-Math.min(html[d],body[d])};function both(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
-
-/* jQuery Cookie plugin */
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
-
-/* jQuery querystring plugin */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('M 6(A){4 $11=A.11||\'&\';4 $V=A.V===r?r:j;4 $1p=A.1p===r?\'\':\'[]\';4 $13=A.13===r?r:j;4 $D=$13?A.D===j?"#":"?":"";4 $15=A.15===r?r:j;v.1o=M 6(){4 f=6(o,t){8 o!=1v&&o!==x&&(!!t?o.1t==t:j)};4 14=6(1m){4 m,1l=/\\[([^[]*)\\]/g,T=/^([^[]+)(\\[.*\\])?$/.1r(1m),k=T[1],e=[];19(m=1l.1r(T[2]))e.u(m[1]);8[k,e]};4 w=6(3,e,7){4 o,y=e.1b();b(I 3!=\'X\')3=x;b(y===""){b(!3)3=[];b(f(3,L)){3.u(e.h==0?7:w(x,e.z(0),7))}n b(f(3,1a)){4 i=0;19(3[i++]!=x);3[--i]=e.h==0?7:w(3[i],e.z(0),7)}n{3=[];3.u(e.h==0?7:w(x,e.z(0),7))}}n b(y&&y.T(/^\\s*[0-9]+\\s*$/)){4 H=1c(y,10);b(!3)3=[];3[H]=e.h==0?7:w(3[H],e.z(0),7)}n b(y){4 H=y.B(/^\\s*|\\s*$/g,"");b(!3)3={};b(f(3,L)){4 18={};1w(4 i=0;i<3.h;++i){18[i]=3[i]}3=18}3[H]=e.h==0?7:w(3[H],e.z(0),7)}n{8 7}8 3};4 C=6(a){4 p=d;p.l={};b(a.C){v.J(a.Z(),6(5,c){p.O(5,c)})}n{v.J(1u,6(){4 q=""+d;q=q.B(/^[?#]/,\'\');q=q.B(/[;&]$/,\'\');b($V)q=q.B(/[+]/g,\' \');v.J(q.Y(/[&;]/),6(){4 5=1e(d.Y(\'=\')[0]||"");4 c=1e(d.Y(\'=\')[1]||"");b(!5)8;b($15){b(/^[+-]?[0-9]+\\.[0-9]*$/.1d(c))c=1A(c);n b(/^[+-]?[0-9]+$/.1d(c))c=1c(c,10)}c=(!c&&c!==0)?j:c;b(c!==r&&c!==j&&I c!=\'1g\')c=c;p.O(5,c)})})}8 p};C.1H={C:j,1G:6(5,1f){4 7=d.Z(5);8 f(7,1f)},1h:6(5){b(!f(5))8 d.l;4 K=14(5),k=K[0],e=K[1];4 3=d.l[k];19(3!=x&&e.h!=0){3=3[e.1b()]}8 I 3==\'1g\'?3:3||""},Z:6(5){4 3=d.1h(5);b(f(3,1a))8 v.1E(j,{},3);n b(f(3,L))8 3.z(0);8 3},O:6(5,c){4 7=!f(c)?x:c;4 K=14(5),k=K[0],e=K[1];4 3=d.l[k];d.l[k]=w(3,e.z(0),7);8 d},w:6(5,c){8 d.N().O(5,c)},1s:6(5){8 d.O(5,x).17()},1z:6(5){8 d.N().1s(5)},1j:6(){4 p=d;v.J(p.l,6(5,7){1y p.l[5]});8 p},1F:6(Q){4 D=Q.B(/^.*?[#](.+?)(?:\\?.+)?$/,"$1");4 S=Q.B(/^.*?[?](.+?)(?:#.+)?$/,"$1");8 M C(Q.h==S.h?\'\':S,Q.h==D.h?\'\':D)},1x:6(){8 d.N().1j()},N:6(){8 M C(d)},17:6(){6 F(G){4 R=I G=="X"?f(G,L)?[]:{}:G;b(I G==\'X\'){6 1k(o,5,7){b(f(o,L))o.u(7);n o[5]=7}v.J(G,6(5,7){b(!f(7))8 j;1k(R,5,F(7))})}8 R}d.l=F(d.l);8 d},1B:6(){8 d.N().17()},1D:6(){4 i=0,U=[],W=[],p=d;4 16=6(E){E=E+"";b($V)E=E.B(/ /g,"+");8 1C(E)};4 1n=6(1i,5,7){b(!f(7)||7===r)8;4 o=[16(5)];b(7!==j){o.u("=");o.u(16(7))}1i.u(o.P(""))};4 F=6(R,k){4 12=6(5){8!k||k==""?[5].P(""):[k,"[",5,"]"].P("")};v.J(R,6(5,7){b(I 7==\'X\')F(7,12(5));n 1n(W,12(5),7)})};F(d.l);b(W.h>0)U.u($D);U.u(W.P($11));8 U.P("")}};8 M C(1q.S,1q.D)}}(v.1o||{});',62,106,'|||target|var|key|function|value|return|||if|val|this|tokens|is||length||true|base|keys||else||self||false|||push|jQuery|set|null|token|slice|settings|replace|queryObject|hash|str|build|orig|index|typeof|each|parsed|Array|new|copy|SET|join|url|obj|search|match|queryString|spaces|chunks|object|split|get||separator|newKey|prefix|parse|numbers|encode|COMPACT|temp|while|Object|shift|parseInt|test|decodeURIComponent|type|number|GET|arr|EMPTY|add|rx|path|addFields|query|suffix|location|exec|REMOVE|constructor|arguments|undefined|for|empty|delete|remove|parseFloat|compact|encodeURIComponent|toString|extend|load|has|prototype'.split('|'),0,{}))

trunk/src/bp-themes/bp-default/_inc/global.js

@@ -22 +22 @@
 
     /* @mention Compose Scrolling */
-    if ( jq.query.get('r') && jq('textarea#whats-new').length ) {
+    if ( bp_get_querystring('r') && jq('textarea#whats-new').length ) {
         jq('#whats-new-options').animate({
             height:'40px'
@@ -1354 +1354 @@
         return false;
 
-    if ( jq.query.get('s') && !search_terms )
-        search_terms = jq.query.get('s');
+    if ( bp_get_querystring('s') && !search_terms )
+        search_terms = bp_get_querystring('s');
 
     if ( null == scope )
@@ -1566 +1566 @@
     return encodeURIComponent( jq.param(bpCookies) );
 }
-
-/* ScrollTo plugin - just inline and minified */
-;(function($){var h=$.scrollTo=function(a,b,c){$(window).scrollTo(a,b,c)};h.defaults={axis:'xy',duration:parseFloat($.fn.jquery)>=1.3?0:1,limit:true};h.window=function(a){return $(window)._scrollable()};$.fn._scrollable=function(){return this.map(function(){var a=this,isWin=!a.nodeName||$.inArray(a.nodeName.toLowerCase(),['iframe','#document','html','body'])!=-1;if(!isWin)return a;var b=(a.contentWindow||a).document||a.ownerDocument||a;return/webkit/i.test(navigator.userAgent)||b.compatMode=='BackCompat'?b.body:b.documentElement})};$.fn.scrollTo=function(e,f,g){if(typeof f=='object'){g=f;f=0}if(typeof g=='function')g={onAfter:g};if(e=='max')e=9e9;g=$.extend({},h.defaults,g);f=f||g.duration;g.queue=g.queue&&g.axis.length>1;if(g.queue)f/=2;g.offset=both(g.offset);g.over=both(g.over);return this._scrollable().each(function(){if(e==null)return;var d=this,$elem=$(d),targ=e,toff,attr={},win=$elem.is('html,body');switch(typeof targ){case'number':case'string':if(/^([+-]=?)?\d+(\.\d+)?(px|%)?$/.test(targ)){targ=both(targ);break}targ=$(targ,this);if(!targ.length)return;case'object':if(targ.is||targ.style)toff=(targ=$(targ)).offset()}$.each(g.axis.split(''),function(i,a){var b=a=='x'?'Left':'Top',pos=b.toLowerCase(),key='scroll'+b,old=d[key],max=h.max(d,a);if(toff){attr[key]=toff[pos]+(win?0:old-$elem.offset()[pos]);if(g.margin){attr[key]-=parseInt(targ.css('margin'+b))||0;attr[key]-=parseInt(targ.css('border'+b+'Width'))||0}attr[key]+=g.offset[pos]||0;if(g.over[pos])attr[key]+=targ[a=='x'?'width':'height']()*g.over[pos]}else{var c=targ[pos];attr[key]=c.slice&&c.slice(-1)=='%'?parseFloat(c)/100*max:c}if(g.limit&&/^\d+$/.test(attr[key]))attr[key]=attr[key]<=0?0:Math.min(attr[key],max);if(!i&&g.queue){if(old!=attr[key])animate(g.onAfterFirst);delete attr[key]}});animate(g.onAfter);function animate(a){$elem.animate(attr,f,g.easing,a&&function(){a.call(this,e,g)})}}).end()};h.max=function(a,b){var c=b=='x'?'Width':'Height',scroll='scroll'+c;if(!$(a).is('html,body'))return a[scroll]-$(a)[c.toLowerCase()]();var d='client'+c,html=a.ownerDocument.documentElement,body=a.ownerDocument.body;return Math.max(html[scroll],body[scroll])-Math.min(html[d],body[d])};function both(a){return typeof a=='object'?a:{top:a,left:a}}})(jQuery);
-
-/* jQuery Cookie plugin */
-jQuery.cookie=function(name,value,options){if(typeof value!='undefined'){options=options||{};if(value===null){value='';options.expires=-1;}var expires='';if(options.expires&&(typeof options.expires=='number'||options.expires.toUTCString)){var date;if(typeof options.expires=='number'){date=new Date();date.setTime(date.getTime()+(options.expires*24*60*60*1000));}else{date=options.expires;}expires='; expires='+date.toUTCString();}var path=options.path?'; path='+(options.path):'';var domain=options.domain?'; domain='+(options.domain):'';var secure=options.secure?'; secure':'';document.cookie=[name,'=',encodeURIComponent(value),expires,path,domain,secure].join('');}else{var cookieValue=null;if(document.cookie&&document.cookie!=''){var cookies=document.cookie.split(';');for(var i=0;i<cookies.length;i++){var cookie=jQuery.trim(cookies[i]);if(cookie.substring(0,name.length+1)==(name+'=')){cookieValue=decodeURIComponent(cookie.substring(name.length+1));break;}}}return cookieValue;}};
-
-/* jQuery querystring plugin */
-eval(function(p,a,c,k,e,d){e=function(c){return(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--){d[e(c)]=k[c]||e(c)}k=[function(e){return d[e]}];e=function(){return'\\w+'};c=1};while(c--){if(k[c]){p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c])}}return p}('M 6(A){4 $11=A.11||\'&\';4 $V=A.V===r?r:j;4 $1p=A.1p===r?\'\':\'[]\';4 $13=A.13===r?r:j;4 $D=$13?A.D===j?"#":"?":"";4 $15=A.15===r?r:j;v.1o=M 6(){4 f=6(o,t){8 o!=1v&&o!==x&&(!!t?o.1t==t:j)};4 14=6(1m){4 m,1l=/\\[([^[]*)\\]/g,T=/^([^[]+)(\\[.*\\])?$/.1r(1m),k=T[1],e=[];19(m=1l.1r(T[2]))e.u(m[1]);8[k,e]};4 w=6(3,e,7){4 o,y=e.1b();b(I 3!=\'X\')3=x;b(y===""){b(!3)3=[];b(f(3,L)){3.u(e.h==0?7:w(x,e.z(0),7))}n b(f(3,1a)){4 i=0;19(3[i++]!=x);3[--i]=e.h==0?7:w(3[i],e.z(0),7)}n{3=[];3.u(e.h==0?7:w(x,e.z(0),7))}}n b(y&&y.T(/^\\s*[0-9]+\\s*$/)){4 H=1c(y,10);b(!3)3=[];3[H]=e.h==0?7:w(3[H],e.z(0),7)}n b(y){4 H=y.B(/^\\s*|\\s*$/g,"");b(!3)3={};b(f(3,L)){4 18={};1w(4 i=0;i<3.h;++i){18[i]=3[i]}3=18}3[H]=e.h==0?7:w(3[H],e.z(0),7)}n{8 7}8 3};4 C=6(a){4 p=d;p.l={};b(a.C){v.J(a.Z(),6(5,c){p.O(5,c)})}n{v.J(1u,6(){4 q=""+d;q=q.B(/^[?#]/,\'\');q=q.B(/[;&]$/,\'\');b($V)q=q.B(/[+]/g,\' \');v.J(q.Y(/[&;]/),6(){4 5=1e(d.Y(\'=\')[0]||"");4 c=1e(d.Y(\'=\')[1]||"");b(!5)8;b($15){b(/^[+-]?[0-9]+\\.[0-9]*$/.1d(c))c=1A(c);n b(/^[+-]?[0-9]+$/.1d(c))c=1c(c,10)}c=(!c&&c!==0)?j:c;b(c!==r&&c!==j&&I c!=\'1g\')c=c;p.O(5,c)})})}8 p};C.1H={C:j,1G:6(5,1f){4 7=d.Z(5);8 f(7,1f)},1h:6(5){b(!f(5))8 d.l;4 K=14(5),k=K[0],e=K[1];4 3=d.l[k];19(3!=x&&e.h!=0){3=3[e.1b()]}8 I 3==\'1g\'?3:3||""},Z:6(5){4 3=d.1h(5);b(f(3,1a))8 v.1E(j,{},3);n b(f(3,L))8 3.z(0);8 3},O:6(5,c){4 7=!f(c)?x:c;4 K=14(5),k=K[0],e=K[1];4 3=d.l[k];d.l[k]=w(3,e.z(0),7);8 d},w:6(5,c){8 d.N().O(5,c)},1s:6(5){8 d.O(5,x).17()},1z:6(5){8 d.N().1s(5)},1j:6(){4 p=d;v.J(p.l,6(5,7){1y p.l[5]});8 p},1F:6(Q){4 D=Q.B(/^.*?[#](.+?)(?:\\?.+)?$/,"$1");4 S=Q.B(/^.*?[?](.+?)(?:#.+)?$/,"$1");8 M C(Q.h==S.h?\'\':S,Q.h==D.h?\'\':D)},1x:6(){8 d.N().1j()},N:6(){8 M C(d)},17:6(){6 F(G){4 R=I G=="X"?f(G,L)?[]:{}:G;b(I G==\'X\'){6 1k(o,5,7){b(f(o,L))o.u(7);n o[5]=7}v.J(G,6(5,7){b(!f(7))8 j;1k(R,5,F(7))})}8 R}d.l=F(d.l);8 d},1B:6(){8 d.N().17()},1D:6(){4 i=0,U=[],W=[],p=d;4 16=6(E){E=E+"";b($V)E=E.B(/ /g,"+");8 1C(E)};4 1n=6(1i,5,7){b(!f(7)||7===r)8;4 o=[16(5)];b(7!==j){o.u("=");o.u(16(7))}1i.u(o.P(""))};4 F=6(R,k){4 12=6(5){8!k||k==""?[5].P(""):[k,"[",5,"]"].P("")};v.J(R,6(5,7){b(I 7==\'X\')F(7,12(5));n 1n(W,12(5),7)})};F(d.l);b(W.h>0)U.u($D);U.u(W.P($11));8 U.P("")}};8 M C(1q.S,1q.D)}}(v.1o||{});',62,106,'|||target|var|key|function|value|return|||if|val|this|tokens|is||length||true|base|keys||else||self||false|||push|jQuery|set|null|token|slice|settings|replace|queryObject|hash|str|build|orig|index|typeof|each|parsed|Array|new|copy|SET|join|url|obj|search|match|queryString|spaces|chunks|object|split|get||separator|newKey|prefix|parse|numbers|encode|COMPACT|temp|while|Object|shift|parseInt|test|decodeURIComponent|type|number|GET|arr|EMPTY|add|rx|path|addFields|query|suffix|location|exec|REMOVE|constructor|arguments|undefined|for|empty|delete|remove|parseFloat|compact|encodeURIComponent|toString|extend|load|has|prototype'.split('|'),0,{}))