Ticket #5006: 5006.diff

bp-activity/bp-activity-loader.php

@@ -3 +3 @@
 /**
  * BuddyPress Activity Streams Loader
  *
- * An activity stream component, for users, groups, and blog tracking.
+ * An activity stream component, for users, groups, and site tracking.
  *
  * @package BuddyPress
  * @subpackage ActivityCore

bp-activity/bp-activity-admin.php

@@ -203 +203 @@
                         'title'   => __( 'Item, Link, Type', 'buddypress' ),
                         'content' =>
                                 '<p>' . __( '<strong>Primary Item/Secondary Item</strong> - These identify the object that created the activity. For example, the fields could reference a comment left on a specific site. Some types of activity may only use one, or none, of these fields.', 'buddypress' ) . '</p>' .
-                                '<p>' . __( '<strong>Link</strong> - Activity generated by blog posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item. Some types of activity may not use this field, even if it has been set.', 'buddypress' ) . '</p>' .
+                                '<p>' . __( '<strong>Link</strong> - Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item. Some types of activity may not use this field, even if it has been set.', 'buddypress' ) . '</p>' .
                                 '<p>' . __( '<strong>Type</strong> - Each distinct kind of activity has its own type. For example, <code>created_group</code> is used when a group is created and <code>joined_group</code> is used when a user joins a group.', 'buddypress' ) . '</p>' .
                                 '<p>' . __( 'For information about when and how BuddyPress uses all of these settings, see the Managing Activity link in the panel to the side.', 'buddypress' ) . '</p>'
                 ) );
@@ -693 +693 @@
 
         <label class="screen-reader-text" for="bp-activities-link"><?php _e( 'Link', 'buddypress' ); ?></label>
         <input type="url" name="bp-activities-link" value="<?php echo esc_url( $item->primary_link ); ?>" />
-        <p><?php _e( 'Activity generated by blog posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
+        <p><?php _e( 'Activity generated by posts and comments, forum topics and replies, and some plugins, uses the link field for a permalink back to the content item.', 'buddypress' ); ?></p>
 
 <?php
 }

bp-blogs/bp-blogs-loader.php

@@ -156 +156 @@
 
                         $blogs_link = trailingslashit( bp_loggedin_user_domain() . $this->slug );
 
-                        // Add the "Blogs" sub menu
+                        // Add the "Sites" sub menu
                         $wp_admin_nav[] = array(
                                 'parent' => $bp->my_account_menu_id,
                                 'id'     => 'my-account-' . $this->id,
@@ -164 +164 @@
                                 'href'   => trailingslashit( $blogs_link )
                         );
 
-                        // My Blogs
+                        // My Sites
                         $wp_admin_nav[] = array(
                                 'parent' => 'my-account-' . $this->id,
                                 'id'     => 'my-account-' . $this->id . '-my-sites',
@@ -172 +172 @@
                                 'href'   => trailingslashit( $blogs_link )
                         );
 
-                        // Create a Blog
+                        // Create a Site
                         if ( bp_blog_signup_enabled() ) {
                                 $wp_admin_nav[] = array(
                                         'parent' => 'my-account-' . $this->id,
                                         'id'     => 'my-account-' . $this->id . '-create',
-                                        'title'  => __( 'Create a Blog', 'buddypress' ),
+                                        'title'  => __( 'Create a Site', 'buddypress' ),
                                         'href'   => trailingslashit( bp_get_blogs_directory_permalink() . 'create' )
                                 );
                         }

bp-blogs/bp-blogs-screens.php

@@ -132 +132 @@
 
                 // Title based on ability to create blogs
                 if ( is_user_logged_in() && bp_blog_signup_enabled() ) {
-                        $title = __( 'Blogs', 'buddypress' ) . '&nbsp;<a class="button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create' ) . '">' . __( 'Create a Blog', 'buddypress' ) . '</a>';
+                        $title = __( 'Sites', 'buddypress' ) . '&nbsp;<a class="button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() . '/create' ) . '">' . __( 'Create a Site', 'buddypress' ) . '</a>';
                 } else {
-                        $title = __( 'Blogs', 'buddypress' );
+                        $title = __( 'Sites', 'buddypress' );
                 }
 
                 bp_theme_compat_reset_post( array(
@@ -193 +193 @@
 
                 // Title based on ability to create blogs
                 if ( is_user_logged_in() && bp_blog_signup_enabled() ) {
-                        $title = '<a class="button bp-title-button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '">' . __( 'Blogs', 'buddypress' ) . '</a>&nbsp;' . __( 'Create a Blog', 'buddypress' );
+                        $title = '<a class="button bp-title-button" href="' . trailingslashit( bp_get_root_domain() . '/' . bp_get_blogs_root_slug() ) . '">' . __( 'Sites', 'buddypress' ) . '</a>&nbsp;' . __( 'Create a Site', 'buddypress' );
                 } else {
-                        $title = __( 'Blogs', 'buddypress' );
+                        $title = __( 'Sites', 'buddypress' );
                 }
 
                 bp_theme_compat_reset_post( array(

bp-languages/buddypress.pot

@@ -910 +910 @@
 
 #: bp-blogs/bp-blogs-loader.php:188 bp-blogs/bp-blogs-screens.php:135
 #: bp-blogs/bp-blogs-screens.php:196
-msgid "Create a Blog"
+msgid "Create a Site"
 msgstr ""
 
 #: bp-blogs/bp-blogs-screens.php:135 bp-blogs/bp-blogs-screens.php:137
 #: bp-blogs/bp-blogs-screens.php:196 bp-blogs/bp-blogs-screens.php:198
 #: bp-core/bp-core-template.php:255
-msgid "Blogs"
+msgid "Sites"
 msgstr ""
 
 #: bp-blogs/bp-blogs-template.php:136
@@ -981 +981 @@
 msgstr ""
 
 #: bp-blogs/bp-blogs-template.php:656
-msgid "blogname"
+msgid "sitename"
 msgstr ""
 
 #: bp-blogs/bp-blogs-template.php:658
@@ -1067 +1067 @@
 msgstr ""
 
 #: bp-blogs/bp-blogs-widgets.php:109
-msgid "Link widget title to Blogs directory"
+msgid "Link widget title to Sites directory"
 msgstr ""
 
 #: bp-blogs/bp-blogs-widgets.php:110
@@ -1771 +1771 @@
 
 #: bp-core/bp-core-filters.php:257
 msgid ""
-"Thanks for registering! To complete the activation of your account and blog, please click the following link:\n"
+"Thanks for registering! To complete the activation of your account and site, please click the following link:\n"
 "\n"
 "%1$s\n"
 "\n"
 "\n"
 "\n"
-"After you activate, you can visit your blog here:\n"
+"After you activate, you can visit your site here:\n"
 "\n"
 "%2$s"
 msgstr ""

readme.txt

@@ -43 +43 @@
 
 = Will this work on WordPress multisite? =
 
-Yes! If your WordPress installation has multisite enabled, BuddyPress will support the global tracking of blogs, posts and comments.
+Yes! If your WordPress installation has multisite enabled, BuddyPress will support the global tracking of sitess, posts and comments.
 
 = Where can I get support? =
 
@@ -69 +69 @@
 4. **Extensible Groups** - Powerful public, private or hidden groups allow your users to break the discussion down into specific topics. Extend groups with your own custom features using the group extension API.
 5. **Friend Connections** - Let your users make connections so they can track the activity of others, or filter on only those users they care about the most.
 6. **Private Messaging** - Private messaging will allow your users to talk to each other directly and in private. Not just limited to one-on-one discussions, your users can send messages to multiple recipients.
-7. **Blogging Network** - Allow your users to start their own blogs using WordPress's Multisite feature, and track posts and comments from across your blog network in the activity stream.
+7. **Multisite Network** - Allow your users to start their own sites using WordPress's Multisite feature, and track posts and comments from across your network in the activity stream.
 
 == Languages ==