Changeset 4423

Timestamp:

11/15/2012 08:49:03 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Merge updated bbpress.pot file into trunk for 2.2.

File:

• trunk/languages/bbpress.pot (modified) (157 diffs)

trunk/languages/bbpress.pot

@@ -3 +3 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: bbPress 2.2-bleeding\n"
+"Project-Id-Version: bbPress 2.2-rc2\n"
 "Report-Msgid-Bugs-To: http://wordpress.org/tag/bbpress\n"
-"POT-Creation-Date: 2012-08-01 08:44:35+00:00\n"
+"POT-Creation-Date: 2012-11-15 08:47:40+00:00\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -13 +13 @@
 "Language-Team: ENGLISH <jjj@bbpress.org>\n"
 
-#: bbp-admin/bbp-admin.php:163 bbp-admin/bbp-functions.php:191
-#: bbp-admin/bbp-tools.php:34
+#: bbpress.php:130 bbpress.php:137
+msgid "Cheatin&#8217; huh?"
+msgstr ""
+
+#: bbpress.php:388 templates/bbp-default/bbpress-functions.php:68
+msgid "bbPress Default"
+msgstr ""
+
+#: bbpress.php:471 bbpress.php:472 includes/admin/admin.php:208
+#: includes/admin/admin.php:209 includes/admin/admin.php:219
+#: includes/admin/admin.php:220 includes/admin/users.php:82
+#: includes/extend/buddypress/group.php:427
+#: includes/extend/buddypress/loader.php:42
+#: includes/extend/buddypress/loader.php:170
+#: includes/extend/buddypress/loader.php:259
+#: includes/extend/buddypress/loader.php:310
+#: templates/bbp-default/extras/page-forum-statistics.php:39
+msgid "Forums"
+msgstr ""
+
+#: bbpress.php:473 includes/admin/forums.php:420
+#: includes/admin/metaboxes.php:50 includes/admin/metaboxes.php:358
+#: includes/admin/metaboxes.php:411 includes/admin/replies.php:621
+#: includes/admin/topics.php:686 includes/extend/buddypress/group.php:36
+#: includes/extend/buddypress/group.php:37
+#: includes/forums/template-tags.php:2135
+#: templates/bbp-default/bbpress/loop-forums.php:19
+msgid "Forum"
+msgstr ""
+
+#: bbpress.php:474 includes/admin/tools.php:1004
+msgid "All Forums"
+msgstr ""
+
+#: bbpress.php:475 bbpress.php:479
+msgid "New Forum"
+msgstr ""
+
+#: bbpress.php:476 templates/bbp-default/bbpress/form-forum.php:37
+msgid "Create New Forum"
+msgstr ""
+
+#: bbpress.php:477 bbpress.php:534 bbpress.php:591
+#: includes/common/template-tags.php:1959
+#: includes/replies/template-tags.php:1518
+#: includes/topics/template-tags.php:2261
+#: templates/bbp-default/bbpress/user-details.php:65
+msgid "Edit"
+msgstr ""
+
+#: bbpress.php:478
+msgid "Edit Forum"
+msgstr ""
+
+#: bbpress.php:480 bbpress.php:481
+msgid "View Forum"
+msgstr ""
+
+#: bbpress.php:482
+msgid "Search Forums"
+msgstr ""
+
+#: bbpress.php:483
+msgid "No forums found"
+msgstr ""
+
+#: bbpress.php:484
+msgid "No forums found in Trash"
+msgstr ""
+
+#: bbpress.php:485 templates/bbp-default/bbpress/form-forum.php:129
+msgid "Parent Forum:"
+msgstr ""
+
+#: bbpress.php:508
+msgid "bbPress Forums"
+msgstr ""
+
+#: bbpress.php:528 bbpress.php:529 includes/admin/forums.php:421
+#: includes/admin/settings.php:187 includes/admin/settings.php:208
+#: includes/admin/topics.php:685 includes/extend/buddypress/activity.php:399
+#: includes/extend/buddypress/group.php:431
+#: includes/forums/template-tags.php:2283
+#: templates/bbp-default/bbpress/loop-forums.php:20
+#: templates/bbp-default/extras/page-forum-statistics.php:44
+msgid "Topics"
+msgstr ""
+
+#: bbpress.php:530 includes/admin/metaboxes.php:67
+#: includes/admin/metaboxes.php:437 includes/admin/replies.php:622
+#: templates/bbp-default/bbpress/content-single-topic-lead.php:22
+#: templates/bbp-default/bbpress/content-single-topic-lead.php:94
+#: templates/bbp-default/bbpress/loop-topics.php:19
+msgid "Topic"
+msgstr ""
+
+#: bbpress.php:531 includes/admin/tools.php:1005
+#: includes/topics/functions.php:3208
+msgid "All Topics"
+msgstr ""
+
+#: bbpress.php:532 bbpress.php:536
+msgid "New Topic"
+msgstr ""
+
+#: bbpress.php:533 templates/bbp-default/bbpress/form-topic.php:43
+msgid "Create New Topic"
+msgstr ""
+
+#: bbpress.php:535
+msgid "Edit Topic"
+msgstr ""
+
+#: bbpress.php:537 bbpress.php:538
+msgid "View Topic"
+msgstr ""
+
+#: bbpress.php:539
+msgid "Search Topics"
+msgstr ""
+
+#: bbpress.php:540
+msgid "No topics found"
+msgstr ""
+
+#: bbpress.php:541
+msgid "No topics found in Trash"
+msgstr ""
+
+#: bbpress.php:542 includes/admin/metaboxes.php:357
+#: includes/admin/metaboxes.php:410 includes/extend/buddypress/group.php:729
+#: templates/bbp-default/bbpress/form-topic.php:125
+msgid "Forum:"
+msgstr ""
+
+#: bbpress.php:565
+msgid "bbPress Topics"
+msgstr ""
+
+#: bbpress.php:585 bbpress.php:586 includes/admin/forums.php:422
+#: includes/admin/settings.php:195 includes/admin/settings.php:216
+#: includes/admin/topics.php:687 includes/core/theme-compat.php:552
+#: includes/extend/buddypress/activity.php:400
+#: includes/forums/template-tags.php:2347
+#: templates/bbp-default/bbpress/loop-forums.php:21
+#: templates/bbp-default/bbpress/loop-replies.php:32
+#: templates/bbp-default/bbpress/loop-replies.php:62
+#: templates/bbp-default/bbpress/loop-topics.php:21
+#: templates/bbp-default/extras/page-forum-statistics.php:49
+msgid "Replies"
+msgstr ""
+
+#: bbpress.php:587 includes/admin/metaboxes.php:84
+msgid "Reply"
+msgstr ""
+
+#: bbpress.php:588 includes/admin/tools.php:1006
+#: includes/replies/functions.php:1501
+msgid "All Replies"
+msgstr ""
+
+#: bbpress.php:589 bbpress.php:593
+msgid "New Reply"
+msgstr ""
+
+#: bbpress.php:590
+msgid "Create New Reply"
+msgstr ""
+
+#: bbpress.php:592
+msgid "Edit Reply"
+msgstr ""
+
+#: bbpress.php:594 bbpress.php:595
+msgid "View Reply"
+msgstr ""
+
+#: bbpress.php:596
+msgid "Search Replies"
+msgstr ""
+
+#: bbpress.php:597
+msgid "No replies found"
+msgstr ""
+
+#: bbpress.php:598
+msgid "No replies found in Trash"
+msgstr ""
+
+#: bbpress.php:599 includes/admin/metaboxes.php:436
+msgid "Topic:"
+msgstr ""
+
+#: bbpress.php:622
+msgid "bbPress Replies"
+msgstr ""
+
+#: bbpress.php:657
+msgctxt "post"
+msgid "Closed"
+msgstr ""
+
+#: bbpress.php:658
+msgctxt "bbpress"
+msgid "Closed <span class=\"count\">(%s)</span>"
+msgid_plural "Closed <span class=\"count\">(%s)</span>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bbpress.php:668
+msgctxt "post"
+msgid "Spam"
+msgstr ""
+
+#: bbpress.php:669
+msgctxt "bbpress"
+msgid "Spam <span class=\"count\">(%s)</span>"
+msgid_plural "Spam <span class=\"count\">(%s)</span>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bbpress.php:681
+msgctxt "post"
+msgid "Orphan"
+msgstr ""
+
+#: bbpress.php:682
+msgctxt "bbpress"
+msgid "Orphan <span class=\"count\">(%s)</span>"
+msgid_plural "Orphans <span class=\"count\">(%s)</span>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bbpress.php:694
+msgctxt "post"
+msgid "Hidden"
+msgstr ""
+
+#: bbpress.php:695
+msgctxt "bbpress"
+msgid "Hidden <span class=\"count\">(%s)</span>"
+msgid_plural "Hidden <span class=\"count\">(%s)</span>"
+msgstr[0] ""
+msgstr[1] ""
+
+#: bbpress.php:740 templates/bbp-default/extras/page-forum-statistics.php:54
+msgid "Topic Tags"
+msgstr ""
+
+#: bbpress.php:741 includes/admin/metaboxes.php:103
+msgid "Topic Tag"
+msgstr ""
+
+#: bbpress.php:742
+msgid "Search Tags"
+msgstr ""
+
+#: bbpress.php:743
+msgid "Popular Tags"
+msgstr ""
+
+#: bbpress.php:744
+msgid "All Tags"
+msgstr ""
+
+#: bbpress.php:745
+msgid "Edit Tag"
+msgstr ""
+
+#: bbpress.php:746
+msgid "Update Tag"
+msgstr ""
+
+#: bbpress.php:747
+msgid "Add New Tag"
+msgstr ""
+
+#: bbpress.php:748
+msgid "New Tag Name"
+msgstr ""
+
+#: bbpress.php:749
+msgid "View Topic Tag"
+msgstr ""
+
+#: bbpress.php:787
+msgid "Topics with no replies"
+msgstr ""
+
+#: includes/admin/admin.php:173 includes/admin/functions.php:224
+#: includes/admin/tools.php:34
 msgid "Repair Forums"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:164
+#: includes/admin/admin.php:174
 msgid "Forum Repair"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:173 bbp-admin/bbp-functions.php:195
-#: bbp-admin/bbp-settings.php:1209
+#: includes/admin/admin.php:183 includes/admin/functions.php:228
+#: includes/admin/settings.php:1244
 msgid "Import Forums"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:174
+#: includes/admin/admin.php:184
 msgid "Forum Import"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:183 bbp-admin/bbp-functions.php:199
-#: bbp-admin/bbp-tools.php:855
+#: includes/admin/admin.php:193 includes/admin/functions.php:232
+#: includes/admin/tools.php:995
 msgid "Reset Forums"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:184
+#: includes/admin/admin.php:194
 msgid "Forum Reset"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:198 bbp-admin/bbp-admin.php:199
-#: bbp-admin/bbp-admin.php:209 bbp-admin/bbp-admin.php:210
-#: bbp-includes/bbp-extend-buddypress.php:834
-#: bbp-includes/bbp-extend-buddypress.php:891
-#: bbp-includes/bbp-extend-buddypress.php:982
-#: bbp-includes/bbp-extend-buddypress.php:1035
-#: bbp-includes/bbp-extend-buddypress.php:1430
-#: bbp-theme-compat/extras/page-forum-statistics.php:39
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:38 bbpress.php:475
-#: bbpress.php:476
-msgid "Forums"
-msgstr ""
-
-#: bbp-admin/bbp-admin.php:227 bbp-admin/bbp-admin.php:228
-#: bbp-admin/bbp-admin.php:732 bbp-admin/bbp-admin.php:808
+#: includes/admin/admin.php:232 includes/admin/admin.php:233
+#: includes/admin/admin.php:241 includes/admin/admin.php:242
+msgid "Welcome to bbPress"
+msgstr ""
+
+#: includes/admin/admin.php:255 includes/admin/admin.php:256
+#: includes/admin/admin.php:277 includes/admin/admin.php:278
+#: includes/admin/admin.php:1583 includes/admin/admin.php:1672
 msgid "Update Forums"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:351
+#: includes/admin/admin.php:468
 msgid "Settings"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:366
+#: includes/admin/admin.php:469
+msgid "About"
+msgstr ""
+
+#: includes/admin/admin.php:481
 msgid "Right Now in Forums"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:647
+#: includes/admin/admin.php:1237
+msgctxt "admin color scheme"
 msgid "Green"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:668 bbp-admin/bbp-admin.php:706
+#: includes/admin/admin.php:1278
+msgid "%s - %s"
+msgstr ""
+
+#: includes/admin/admin.php:1296 includes/admin/admin.php:1402
+msgid "Welcome to bbPress %s"
+msgstr ""
+
+#: includes/admin/admin.php:1297 includes/admin/admin.php:1403
+msgid ""
+"Thank you for updating to the latest version! bbPress %s is ready to make "
+"your community a safer, faster, and better looking place to hang out!"
+msgstr ""
+
+#: includes/admin/admin.php:1298 includes/admin/admin.php:1404
+msgid "Version %s"
+msgstr ""
+
+#: includes/admin/admin.php:1302 includes/admin/admin.php:1408
+msgid "What&#8217;s New"
+msgstr ""
+
+#: includes/admin/admin.php:1304 includes/admin/admin.php:1410
+msgid "Credits"
+msgstr ""
+
+#: includes/admin/admin.php:1309
+msgid "In-depth User Profiles"
+msgstr ""
+
+#: includes/admin/admin.php:1312
+msgid "User Details"
+msgstr ""
+
+#: includes/admin/admin.php:1313
+msgid ""
+"Forum profiles include the details of your forum activity, including your "
+"topics and replies, subscriptions, and favorites."
+msgstr ""
+
+#: includes/admin/admin.php:1315
+msgid "Easy Updating"
+msgstr ""
+
+#: includes/admin/admin.php:1316
+msgid "You can easily update your profile without leaving bbPress."
+msgstr ""
+
+#: includes/admin/admin.php:1321
+msgid "Theme Compatability"
+msgstr ""
+
+#: includes/admin/admin.php:1324
+msgid "Twenty Twelve"
+msgstr ""
+
+#: includes/admin/admin.php:1325
+msgid ""
+"Updated default templates are now Twenty Twelve compatible, and we refreshed "
+"our CSS to better integrate with other popular themes, too."
+msgstr ""
+
+#: includes/admin/admin.php:1330
+msgid "Improved User Management"
+msgstr ""
+
+#: includes/admin/admin.php:1333
+msgid "Dynamic User Roles and Capabilities"
+msgstr ""
+
+#: includes/admin/admin.php:1334
+msgid ""
+"bbPress now includes some fancy user-roles with smart default capabilities "
+"to help you manage your forums. New roles include Key Master (for complete "
+"administrative access), Moderator, and Participant for regular forum users."
+msgstr ""
+
+#: includes/admin/admin.php:1336
+msgid "Manage Forum Users from WordPress"
+msgstr ""
+
+#: includes/admin/admin.php:1337
+msgid ""
+"You can assign Forums roles to users individually, or bulk update them from "
+"the WordPress Users page. Users automatically start out as forum "
+"participants."
+msgstr ""
+
+#: includes/admin/admin.php:1342
+msgid "Better BuddyPress Integration"
+msgstr ""
+
+#: includes/admin/admin.php:1345
+msgid "Use bbPress for Your BuddyPress Group Forums"
+msgstr ""
+
+#: includes/admin/admin.php:1346
+msgid ""
+"You can now use bbPress to manage your BuddyPress Group Forums, allowing for "
+"seamless integration and improved plugin performance. Plugins developed for "
+"bbPress can now be extended to improve the BuddyPress Group Forums "
+"experience."
+msgstr ""
+
+#: includes/admin/admin.php:1348
+msgid "Activity Stream Syncing"
+msgstr ""
+
+#: includes/admin/admin.php:1349
+msgid ""
+"bbPress now keeps track of changes to topics and replies and keeps their "
+"corresponding BuddyPress Activity Stream updates synced."
+msgstr ""
+
+#: includes/admin/admin.php:1354
+msgid "Under the Hood"
+msgstr ""
+
+#: includes/admin/admin.php:1358
+msgid "Template Logic"
+msgstr ""
+
+#: includes/admin/admin.php:1359
+msgid ""
+"New functions and template stacks are in place to help plugin developers "
+"extend bbPress further."
+msgstr ""
+
+#: includes/admin/admin.php:1361
+msgid "Plugin Directory Structure"
+msgstr ""
+
+#: includes/admin/admin.php:1362
+msgid ""
+"We simplified the bbPress plugin directory structure, making it easier for "
+"plugin developers to find the relevant code."
+msgstr ""
+
+#: includes/admin/admin.php:1366
+msgid "Autocomplete"
+msgstr ""
+
+#: includes/admin/admin.php:1367
+msgid ""
+"In WordPress Admin, you now select a parent forum or topic via autocomplete "
+"rather than a dropdown."
+msgstr ""
+
+#: includes/admin/admin.php:1369
+msgid "Fancy Editor Support"
+msgstr ""
+
+#: includes/admin/admin.php:1370
+msgid ""
+"We improved our support of the Fancy Editor, giving forum users a better "
+"experience."
+msgstr ""
+
+#: includes/admin/admin.php:1374
+msgid "WordPress 3.5-ready"
+msgstr ""
+
+#: includes/admin/admin.php:1375
+msgid ""
+"bbPress 2.2 has been thoroughly tested against the ongoing development of "
+"WordPress 3.5."
+msgstr ""
+
+#: includes/admin/admin.php:1381 includes/admin/admin.php:1509
+msgid "Go to Forum Settings"
+msgstr ""
+
+#: includes/admin/admin.php:1414
+msgid "bbPress is created by a worldwide swarm of busy, busy bees."
+msgstr ""
+
+#: includes/admin/admin.php:1416
+msgid "Project Leaders"
+msgstr ""
+
+#: includes/admin/admin.php:1421
+msgid "Founding Developer"
+msgstr ""
+
+#: includes/admin/admin.php:1426
+msgid "Lead Developer"
+msgstr ""
+
+#: includes/admin/admin.php:1430
+msgid "Contributing Developers"
+msgstr ""
+
+#: includes/admin/admin.php:1449
+msgid "Codex Rockstars"
+msgstr ""
+
+#: includes/admin/admin.php:1468
+msgid "Core Contributors to bbPress 2.2"
+msgstr ""
+
+#: includes/admin/admin.php:1535 includes/admin/admin.php:1557
 msgid "Update Forum"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:695 bbp-admin/bbp-admin.php:749
+#: includes/admin/admin.php:1546 includes/admin/admin.php:1600
 msgid "All done!"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:696 bbp-admin/bbp-admin.php:750
+#: includes/admin/admin.php:1547 includes/admin/admin.php:1601
 msgid "Go Back"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:705
+#: includes/admin/admin.php:1556
 msgid ""
 "You can update your forum through this page. Hit the link below to update."
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:777
+#: includes/admin/admin.php:1628
 msgid ""
 "Warning! Problem updating %1$s. Your server may not be able to connect to "
@@ -93 +580 @@
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:788
+#: includes/admin/admin.php:1652
 msgid ""
 "If your browser doesn&#8217;t start loading the next page automatically, "
@@ -99 +586 @@
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:789
+#: includes/admin/admin.php:1653
 msgid "Next Forums"
 msgstr ""
 
-#: bbp-admin/bbp-admin.php:807
+#: includes/admin/admin.php:1671
 msgid ""
 "You can update all the forums on your network through this page. It works by "
@@ -110 +597 @@
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:80
+#: includes/admin/converter.php:80
 msgid "Database Settings"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:83
+#: includes/admin/converter.php:83
 msgid "Select Platform"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:87
+#: includes/admin/converter.php:87
 msgid "Database Server"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:91
+#: includes/admin/converter.php:91
 msgid "Database Port"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:95
+#: includes/admin/converter.php:95
 msgid "Database Name"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:99
+#: includes/admin/converter.php:99
 msgid "Database User"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:103
+#: includes/admin/converter.php:103
 msgid "Database Password"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:107
+#: includes/admin/converter.php:107
 msgid "Table Prefix"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:111
+#: includes/admin/converter.php:111
 msgid "Options"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:114
+#: includes/admin/converter.php:114
 msgid "Rows Limit"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:118
+#: includes/admin/converter.php:118
 msgid "Delay Time"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:122
+#: includes/admin/converter.php:122
 msgid "Convert Users"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:126
+#: includes/admin/converter.php:126
 msgid "Start Over"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:130
+#: includes/admin/converter.php:130
 msgid "Purge Previous Import"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:219
+#: includes/admin/converter.php:219
 msgid "Starting Conversion"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:244 bbp-admin/bbp-converter.php:471
+#: includes/admin/converter.php:244 includes/admin/converter.php:471
 msgid "Conversion Complete"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:338
+#: includes/admin/converter.php:338
 msgid "No data to clean"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:342
+#: includes/admin/converter.php:342
 msgid "Deleting previously converted data (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:358
+#: includes/admin/converter.php:358
 msgid "No users to convert"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:362
+#: includes/admin/converter.php:362
 msgid "Converting users (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:378
+#: includes/admin/converter.php:378
 msgid "No passwords to clear"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:382
+#: includes/admin/converter.php:382
 msgid "Delete users wordpress default passwords (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:397
+#: includes/admin/converter.php:397
 msgid "No forums to convert"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:401
+#: includes/admin/converter.php:401
 msgid "Converting forums (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:412
+#: includes/admin/converter.php:412
 msgid "No forum parents to convert"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:416
+#: includes/admin/converter.php:416
 msgid "Calculating forum hierarchy (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:427
+#: includes/admin/converter.php:427
 msgid "No topics to convert"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:431
+#: includes/admin/converter.php:431
 msgid "Converting topics (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:442
+#: includes/admin/converter.php:442
 msgid "No tags to convert"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:446
+#: includes/admin/converter.php:446
 msgid "Converting topic tags (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:457
+#: includes/admin/converter.php:457
 msgid "No replies to convert"
 msgstr ""
 
-#: bbp-admin/bbp-converter.php:461
+#: includes/admin/converter.php:461
 msgid "Converting replies (%1$s - %2$s)"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:120 bbp-admin/bbp-replies.php:132
-#: bbp-admin/bbp-settings.php:1249 bbp-admin/bbp-topics.php:132
+#: includes/admin/converters/bbPress1.php:540
+msgid "Re: "
+msgstr ""
+
+#: includes/admin/forums.php:120 includes/admin/replies.php:132
+#: includes/admin/settings.php:1284 includes/admin/topics.php:132
 msgid "Overview"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:122
+#: includes/admin/forums.php:122
 msgid ""
 "This screen displays the individual forums on your site. You can customize "
@@ -249 +740 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:128 bbp-admin/bbp-replies.php:140
-#: bbp-admin/bbp-topics.php:140
+#: includes/admin/forums.php:128 includes/admin/replies.php:140
+#: includes/admin/topics.php:140
 msgid "Screen Content"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:130 bbp-admin/bbp-replies.php:142
-#: bbp-admin/bbp-topics.php:142
+#: includes/admin/forums.php:130 includes/admin/replies.php:142
+#: includes/admin/topics.php:142
 msgid ""
 "You can customize the display of this screen&#8217;s contents in a number of "
@@ -261 +752 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:132
+#: includes/admin/forums.php:132
 msgid ""
 "You can hide/display columns based on your needs and decide how many forums "
@@ -267 +758 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:133
+#: includes/admin/forums.php:133
 msgid ""
 "You can filter the list of forums by forum status using the text links in "
@@ -274 +765 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:134
+#: includes/admin/forums.php:134
 msgid ""
 "You can refine the list to show only forums from a specific month by using "
@@ -282 +773 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:141 bbp-admin/bbp-replies.php:154
-#: bbp-admin/bbp-topics.php:153
+#: includes/admin/forums.php:141 includes/admin/replies.php:154
+#: includes/admin/topics.php:153
 msgid "Available Actions"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:143
+#: includes/admin/forums.php:143
 msgid ""
 "Hovering over a row in the forums list will display action links that allow "
@@ -293 +784 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:145 bbp-admin/bbp-topics.php:157
+#: includes/admin/forums.php:145
 msgid ""
 "<strong>Edit</strong> takes you to the editing screen for that forum. You "
@@ -299 +790 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:146 bbp-admin/bbp-topics.php:158
+#: includes/admin/forums.php:146
 msgid ""
 "<strong>Trash</strong> removes your forum from this list and places it in "
@@ -305 +796 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:147
+#: includes/admin/forums.php:147
 msgid ""
 "<strong>View</strong> will show you what your draft forum will look like if "
@@ -312 +803 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:154 bbp-admin/bbp-replies.php:169
-#: bbp-admin/bbp-topics.php:167
+#: includes/admin/forums.php:154 includes/admin/replies.php:169
+#: includes/admin/topics.php:170
 msgid "Bulk Actions"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:156
+#: includes/admin/forums.php:156
 msgid ""
 "You can also edit or move multiple forums to the trash at once. Select the "
@@ -324 +815 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:157
+#: includes/admin/forums.php:157
 msgid ""
 "When using Bulk Edit, you can change the metadata (categories, author, etc.) "
@@ -331 +822 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:162 bbp-admin/bbp-forums.php:233
-#: bbp-admin/bbp-replies.php:177 bbp-admin/bbp-replies.php:245
-#: bbp-admin/bbp-settings.php:1295 bbp-admin/bbp-topics.php:175
-#: bbp-admin/bbp-topics.php:243
+#: includes/admin/forums.php:162 includes/admin/forums.php:233
+#: includes/admin/replies.php:177 includes/admin/replies.php:245
+#: includes/admin/settings.php:1330 includes/admin/topics.php:178
+#: includes/admin/topics.php:246
 msgid "For more information:"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:163 bbp-admin/bbp-forums.php:234
-#: bbp-admin/bbp-replies.php:178 bbp-admin/bbp-replies.php:246
-#: bbp-admin/bbp-settings.php:1296 bbp-admin/bbp-topics.php:176
-#: bbp-admin/bbp-topics.php:244
+#: includes/admin/forums.php:163 includes/admin/forums.php:234
+#: includes/admin/replies.php:178 includes/admin/replies.php:246
+#: includes/admin/settings.php:1331 includes/admin/topics.php:179
+#: includes/admin/topics.php:247
 msgid ""
 "<a href=\"http://codex.bbpress.org\" target=\"_blank\">bbPress "
@@ -347 +838 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:164 bbp-admin/bbp-forums.php:235
-#: bbp-admin/bbp-replies.php:179 bbp-admin/bbp-replies.php:247
-#: bbp-admin/bbp-settings.php:1297 bbp-admin/bbp-topics.php:177
-#: bbp-admin/bbp-topics.php:245
+#: includes/admin/forums.php:164 includes/admin/forums.php:235
+#: includes/admin/replies.php:179 includes/admin/replies.php:247
+#: includes/admin/settings.php:1332 includes/admin/topics.php:180
+#: includes/admin/topics.php:248
 msgid ""
 "<a href=\"http://bbpress.org/forums/\" target=\"_blank\">bbPress Support "
@@ -356 +847 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:178
+#: includes/admin/forums.php:178
 msgid ""
 "The title field and the big forum editing Area are fixed in place, but you "
@@ -366 +857 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:182 bbp-admin/bbp-replies.php:197
-#: bbp-admin/bbp-topics.php:195
+#: includes/admin/forums.php:182 includes/admin/replies.php:197
+#: includes/admin/topics.php:198
 msgid "Customizing This Display"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:188
+#: includes/admin/forums.php:188
 msgid "Title and Forum Editor"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:190
+#: includes/admin/forums.php:190
 msgid ""
 "<strong>Title</strong> - Enter a title for your forum. After you enter a "
@@ -381 +872 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:191
+#: includes/admin/forums.php:191
 msgid ""
 "<strong>Forum Editor</strong> - Enter the text for your forum. There are two "
@@ -395 +886 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:194
+#: includes/admin/forums.php:194
 msgid ""
 "<strong>Publish</strong> - You can set the terms of publishing your forum in "
@@ -406 +897 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:197
+#: includes/admin/forums.php:197
 msgid ""
 "<strong>forum Format</strong> - This designates how your theme will display "
@@ -417 +908 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:201
+#: includes/admin/forums.php:201
 msgid ""
 "<strong>Featured Image</strong> - This allows you to associate an image with "
@@ -425 +916 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:206 bbp-admin/bbp-forums.php:254
+#: includes/admin/forums.php:206 includes/admin/forums.php:254
 msgid "Forum Attributes"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:208
+#: includes/admin/forums.php:208
 msgid "Select the attributes that your forum should have:"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:210
+#: includes/admin/forums.php:210
 msgid ""
 "<strong>Type</strong> indicates if the forum is a category or forum. "
@@ -439 +930 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:211
+#: includes/admin/forums.php:211
 msgid ""
 "<strong>Status</strong> allows you to close a forum to new topics and forums."
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:212
+#: includes/admin/forums.php:212
 msgid ""
 "<strong>Visibility</strong> lets you pick the scope of each forum and what "
@@ -450 +941 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:213
+#: includes/admin/forums.php:213
 msgid ""
 "<strong>Parent</strong> dropdown determines the parent forum. Select the "
@@ -457 +948 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:214
+#: includes/admin/forums.php:214
 msgid "<strong>Order</strong> allows you to order your forums numerically."
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:220 bbp-admin/bbp-replies.php:232
-#: bbp-admin/bbp-topics.php:230
+#: includes/admin/forums.php:220 includes/admin/replies.php:232
+#: includes/admin/topics.php:233
 msgid "Publish Box"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:226 bbp-admin/bbp-replies.php:238
-#: bbp-admin/bbp-topics.php:236
+#: includes/admin/forums.php:226 includes/admin/replies.php:238
+#: includes/admin/topics.php:239
 msgid "Discussion Settings"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:228 bbp-admin/bbp-replies.php:240
-#: bbp-admin/bbp-topics.php:238
+#: includes/admin/forums.php:228 includes/admin/replies.php:240
+#: includes/admin/topics.php:241
 msgid ""
 "<strong>Send Trackbacks</strong> - Trackbacks are a way to notify legacy "
@@ -480 +971 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:229
+#: includes/admin/forums.php:229
 msgid ""
 "<strong>Discussion</strong> - You can turn comments and pings on or off, and "
@@ -486 +977 @@
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:420 bbp-admin/bbp-metaboxes.php:50
-#: bbp-admin/bbp-metaboxes.php:349 bbp-admin/bbp-metaboxes.php:352
-#: bbp-admin/bbp-metaboxes.php:400 bbp-admin/bbp-metaboxes.php:403
-#: bbp-admin/bbp-replies.php:616 bbp-admin/bbp-topics.php:678
-#: bbp-includes/bbp-extend-buddypress.php:1405
-#: bbp-includes/bbp-forum-template.php:2124
-#: bbp-theme-compat/bbpress/loop-forums.php:19
-#: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:18 bbpress.php:477
-msgid "Forum"
-msgstr ""
-
-#: bbp-admin/bbp-forums.php:421 bbp-admin/bbp-settings.php:179
-#: bbp-admin/bbp-settings.php:200 bbp-admin/bbp-topics.php:677
-#: bbp-includes/bbp-extend-buddypress.php:432
-#: bbp-includes/bbp-extend-buddypress.php:1434
-#: bbp-includes/bbp-forum-template.php:2272
-#: bbp-theme-compat/bbpress/loop-forums.php:20
-#: bbp-theme-compat/extras/page-forum-statistics.php:44
-#: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:19
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:43 bbpress.php:532
-#: bbpress.php:533
-msgid "Topics"
-msgstr ""
-
-#: bbp-admin/bbp-forums.php:422 bbp-admin/bbp-settings.php:187
-#: bbp-admin/bbp-settings.php:208 bbp-admin/bbp-topics.php:679
-#: bbp-includes/bbp-extend-buddypress.php:433
-#: bbp-includes/bbp-forum-template.php:2336
-#: bbp-includes/bbp-theme-compatibility.php:493
-#: bbp-theme-compat/bbpress/loop-forums.php:21
-#: bbp-theme-compat/bbpress/loop-replies.php:32
-#: bbp-theme-compat/bbpress/loop-replies.php:62
-#: bbp-theme-compat/bbpress/loop-topics.php:21
-#: bbp-theme-compat/extras/page-forum-statistics.php:49
-#: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:20
-#: bbp-themes/bbp-twentyten/bbpress/loop-replies.php:30
-#: bbp-themes/bbp-twentyten/bbpress/loop-replies.php:49
-#: bbp-themes/bbp-twentyten/bbpress/loop-topics.php:19
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:48
-#: bbp-themes/bbp-twentyten/single-reply.php:30 bbpress.php:589
-#: bbpress.php:590
-msgid "Replies"
-msgstr ""
-
-#: bbp-admin/bbp-forums.php:423
-#: bbp-theme-compat/bbpress/content-single-topic-lead.php:18
-#: bbp-theme-compat/bbpress/content-single-topic-lead.php:90
-#: bbp-themes/bbp-twentyten/bbpress/content-single-topic-lead.php:17
+#: includes/admin/forums.php:423
+#: templates/bbp-default/bbpress/content-single-topic-lead.php:18
+#: templates/bbp-default/bbpress/content-single-topic-lead.php:90
 msgid "Creator"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:424 bbp-admin/bbp-replies.php:619
-#: bbp-admin/bbp-topics.php:682
+#: includes/admin/forums.php:424 includes/admin/replies.php:624
+#: includes/admin/topics.php:690
 msgid "Created"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:425 bbp-admin/bbp-topics.php:683
-#: bbp-theme-compat/bbpress/loop-forums.php:22
-#: bbp-theme-compat/bbpress/loop-topics.php:22
-#: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:21
-#: bbp-themes/bbp-twentyten/bbpress/loop-topics.php:20
+#: includes/admin/forums.php:425 includes/admin/topics.php:691
+#: templates/bbp-default/bbpress/loop-forums.php:22
+#: templates/bbp-default/bbpress/loop-topics.php:22
 msgid "Freshness"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:462 bbp-admin/bbp-replies.php:727
-#: bbp-admin/bbp-topics.php:762
+#: includes/admin/forums.php:462 includes/admin/replies.php:732
+#: includes/admin/topics.php:770
 msgid "%1$s <br /> %2$s"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:474 bbp-includes/bbp-forum-template.php:541
+#: includes/admin/forums.php:474 includes/forums/template-tags.php:533
 msgid "No Topics"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:540
+#: includes/admin/forums.php:540
 msgid "Forum updated. <a href=\"%s\">View forum</a>"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:543 bbp-admin/bbp-replies.php:899
-#: bbp-admin/bbp-topics.php:968
+#: includes/admin/forums.php:543 includes/admin/replies.php:904
+#: includes/admin/topics.php:976
 msgid "Custom field updated."
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:546 bbp-admin/bbp-replies.php:902
-#: bbp-admin/bbp-topics.php:971
+#: includes/admin/forums.php:546 includes/admin/replies.php:907
+#: includes/admin/topics.php:979
 msgid "Custom field deleted."
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:549
+#: includes/admin/forums.php:549
 msgid "Forum updated."
 msgstr ""
 
 #. translators: %s: date and time of the revision
-#: bbp-admin/bbp-forums.php:554
+#: includes/admin/forums.php:554
 msgid "Forum restored to revision from %s"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:558
+#: includes/admin/forums.php:558
 msgid "Forum created. <a href=\"%s\">View forum</a>"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:561
+#: includes/admin/forums.php:561
 msgid "Forum saved."
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:564
+#: includes/admin/forums.php:564
 msgid "Forum submitted. <a target=\"_blank\" href=\"%s\">Preview forum</a>"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:567
+#: includes/admin/forums.php:567
 msgid ""
 "Forum scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" href=\"%2$s"
@@ -601 +1045 @@
 
 #. translators: Publish box date format, see http:php.net/date
-#: bbp-admin/bbp-forums.php:569 bbp-admin/bbp-replies.php:925
-#: bbp-admin/bbp-topics.php:994
+#: includes/admin/forums.php:569 includes/admin/replies.php:930
+#: includes/admin/topics.php:1002
 msgid "M j, Y @ G:i"
 msgstr ""
 
-#: bbp-admin/bbp-forums.php:574
+#: includes/admin/forums.php:574
 msgid "Forum draft updated. <a target=\"_blank\" href=\"%s\">Preview forum</a>"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:42
+#: includes/admin/metaboxes.php:42
 msgid "Discussion"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:67 bbp-admin/bbp-metaboxes.php:425
-#: bbp-admin/bbp-metaboxes.php:428 bbp-admin/bbp-replies.php:617
-#: bbp-theme-compat/bbpress/content-single-topic-lead.php:22
-#: bbp-theme-compat/bbpress/content-single-topic-lead.php:94
-#: bbp-theme-compat/bbpress/loop-topics.php:19
-#: bbp-themes/bbp-twentyten/bbpress/content-single-topic-lead.php:20
-#: bbp-themes/bbp-twentyten/bbpress/loop-topics.php:17 bbpress.php:534
-msgid "Topic"
-msgid_plural "Topics"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbp-admin/bbp-metaboxes.php:84 bbpress.php:591
-msgid "Reply"
-msgid_plural "Replies"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbp-admin/bbp-metaboxes.php:103 bbpress.php:745
-msgid "Topic Tag"
-msgid_plural "Topic Tags"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbp-admin/bbp-metaboxes.php:127
+#: includes/admin/metaboxes.php:127
 msgid "Users &amp; Moderation"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:135
+#: includes/admin/metaboxes.php:135
 msgid "User"
 msgid_plural "Users"
@@ -648 +1068 @@
 msgstr[1] ""
 
-#: bbp-admin/bbp-metaboxes.php:154
+#: includes/admin/metaboxes.php:154
 msgid "Hidden Topic"
 msgid_plural "Hidden Topics"
@@ -654 +1074 @@
 msgstr[1] ""
 
-#: bbp-admin/bbp-metaboxes.php:176
+#: includes/admin/metaboxes.php:176
 msgid "Hidden Reply"
 msgid_plural "Hidden Replies"
@@ -660 +1080 @@
 msgstr[1] ""
 
-#: bbp-admin/bbp-metaboxes.php:198
+#: includes/admin/metaboxes.php:198
 msgid "Empty Topic Tag"
 msgid_plural "Empty Topic Tags"
@@ -666 +1086 @@
 msgstr[1] ""
 
-#: bbp-admin/bbp-metaboxes.php:222
+#: includes/admin/metaboxes.php:222
 msgid "You are using <span class=\"b\">bbPress %s</span>."
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:261 bbp-admin/bbp-metaboxes.php:262
+#: includes/admin/metaboxes.php:261 includes/admin/metaboxes.php:262
+#: includes/admin/metaboxes.php:351
 msgid "Type:"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:273 bbp-admin/bbp-metaboxes.php:274
-#: bbp-theme-compat/bbpress/form-forum.php:111
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:111
+#: includes/admin/metaboxes.php:273 includes/admin/metaboxes.php:274
+#: templates/bbp-default/bbpress/form-forum.php:111
 msgid "Status:"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:285 bbp-admin/bbp-metaboxes.php:286
-#: bbp-theme-compat/bbpress/form-forum.php:120
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:120
+#: includes/admin/metaboxes.php:285 includes/admin/metaboxes.php:286
+#: templates/bbp-default/bbpress/form-forum.php:120
 msgid "Visibility:"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:299
+#: includes/admin/metaboxes.php:299
 msgid "Parent:"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:300
+#: includes/admin/metaboxes.php:300
 msgid "Forum Parent"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:306 bbp-theme-compat/bbpress/form-forum.php:134
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:134
-msgid "(No Parent)"
-msgstr ""
-
-#: bbp-admin/bbp-metaboxes.php:315
+#: includes/admin/metaboxes.php:315 includes/admin/metaboxes.php:373
+#: includes/admin/metaboxes.php:426
+msgid "&mdash; No parent &mdash;"
+msgstr ""
+
+#: includes/admin/metaboxes.php:323
 msgid "Order:"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:316
+#: includes/admin/metaboxes.php:324
 msgid "Forum Order"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:346 bbp-admin/bbp-topics.php:740
-msgid "(No Forum)"
-msgstr ""
-
-#: bbp-admin/bbp-metaboxes.php:356 bbp-admin/bbp-metaboxes.php:359
+#: includes/admin/metaboxes.php:352
 msgid "Topic Type"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:397
-msgid "(Use Forum of Topic)"
-msgstr ""
-
-#: bbp-admin/bbp-metaboxes.php:418
-msgid "(No Topic)"
-msgstr ""
-
-#: bbp-admin/bbp-metaboxes.php:459 bbp-admin/bbp-metaboxes.php:462
-#: bbp-theme-compat/bbpress/form-user-edit.php:14
-#: bbp-theme-compat/bbpress/form-user-edit.php:19
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:14
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:19
+#: includes/admin/metaboxes.php:467
+#: templates/bbp-default/bbpress/form-topic-tag.php:35
+msgid "Name:"
+msgstr ""
+
+#: includes/admin/metaboxes.php:468
+#: templates/bbp-default/bbpress/form-user-edit.php:14
+#: templates/bbp-default/bbpress/form-user-edit.php:19
 msgid "Name"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:466 bbp-admin/bbp-metaboxes.php:469
-#: bbp-theme-compat/bbpress/form-user-edit.php:105
-#: bbp-theme-compat/bbpress/form-user-register.php:28
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:105
-#: bbp-themes/bbp-twentyten/bbpress/form-user-register.php:28
+#: includes/admin/metaboxes.php:473
+msgid "Email:"
+msgstr ""
+
+#: includes/admin/metaboxes.php:474
+#: templates/bbp-default/bbpress/form-user-edit.php:105
+#: templates/bbp-default/bbpress/form-user-register.php:28
 msgid "Email"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:473 bbp-admin/bbp-metaboxes.php:476
-#: bbp-theme-compat/bbpress/form-user-edit.php:57
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:57
+#: includes/admin/metaboxes.php:479
+#: templates/bbp-default/bbpress/form-anonymous.php:32
+msgid "Website:"
+msgstr ""
+
+#: includes/admin/metaboxes.php:480
+#: templates/bbp-default/bbpress/form-user-edit.php:57
 msgid "Website"
 msgstr ""
 
-#: bbp-admin/bbp-metaboxes.php:482 bbp-admin/bbp-metaboxes.php:485
+#: includes/admin/metaboxes.php:487
+msgid "IP:"
+msgstr ""
+
+#: includes/admin/metaboxes.php:488
 msgid "IP Address"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:134
+#: includes/admin/replies.php:134
 msgid ""
 "This screen provides access to all of your replies. You can customize the "
@@ -755 +1175 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:144
+#: includes/admin/replies.php:144
 msgid ""
 "You can hide/display columns based on your needs and decide how many replies "
@@ -761 +1181 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:145
+#: includes/admin/replies.php:145
 msgid ""
 "You can filter the list of replies by reply status using the text links in "
@@ -768 +1188 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:146
+#: includes/admin/replies.php:146
 msgid ""
 "You can view replies in a simple title list or with an excerpt. Choose the "
@@ -774 +1194 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:147
+#: includes/admin/replies.php:147
 msgid ""
 "You can refine the list to show only replies in a specific category or from "
@@ -782 +1202 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:156
+#: includes/admin/replies.php:156
 msgid ""
 "Hovering over a row in the replies list will display action links that allow "
@@ -788 +1208 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:158
+#: includes/admin/replies.php:158
 msgid ""
 "<strong>Edit</strong> takes you to the editing screen for that reply. You "
@@ -794 +1214 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:160
+#: includes/admin/replies.php:160
 msgid ""
 "<strong>Trash</strong> removes your reply from this list and places it in "
@@ -800 +1220 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:161
+#: includes/admin/replies.php:161
 msgid ""
 "<strong>Spam</strong> removes your reply from this list and places it in the "
@@ -806 +1226 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:162
+#: includes/admin/replies.php:162
 msgid ""
 "<strong>Preview</strong> will show you what your draft reply will look like "
@@ -813 +1233 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:171
+#: includes/admin/replies.php:171
 msgid ""
 "You can also edit or move multiple replies to the trash at once. Select the "
@@ -820 +1240 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:172
+#: includes/admin/replies.php:172
 msgid ""
 "When using Bulk Edit, you can change the metadata (categories, author, etc.) "
@@ -827 +1247 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:193
+#: includes/admin/replies.php:193
 msgid ""
 "The title field and the big reply editing Area are fixed in place, but you "
@@ -837 +1257 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:203
+#: includes/admin/replies.php:203
 msgid "Title and Reply Editor"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:205
+#: includes/admin/replies.php:205
 msgid ""
 "<strong>Title</strong> - Enter a title for your reply. After you enter a "
@@ -847 +1267 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:206
+#: includes/admin/replies.php:206
 msgid ""
 "<strong>Reply Editor</strong> - Enter the text for your reply. There are two "
@@ -861 +1281 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:209
+#: includes/admin/replies.php:209
 msgid ""
 "<strong>Publish</strong> - You can set the terms of publishing your reply in "
@@ -872 +1292 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:212
+#: includes/admin/replies.php:212
 msgid ""
 "<strong>reply Format</strong> - This designates how your theme will display "
@@ -883 +1303 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:216
+#: includes/admin/replies.php:216
 msgid ""
 "<strong>Featured Image</strong> - This allows you to associate an image with "
@@ -891 +1311 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:221 bbp-admin/bbp-replies.php:266
+#: includes/admin/replies.php:221 includes/admin/replies.php:266
 msgid "Reply Attributes"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:223
+#: includes/admin/replies.php:223
 msgid "Select the attributes that your reply should have:"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:225
+#: includes/admin/replies.php:225
 msgid ""
 "<strong>Forum</strong> dropdown determines the parent forum that the reply "
@@ -906 +1326 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:226
+#: includes/admin/replies.php:226
 msgid ""
 "<strong>Topic</strong> determines the parent topic that the reply belongs to."
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:241
+#: includes/admin/replies.php:241
 msgid ""
 "<strong>Discussion</strong> - You can turn comments and pings on or off, and "
@@ -917 +1337 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:351 bbp-admin/bbp-topics.php:366
-#: bbp-theme-compat/bbpress/form-anonymous.php:17
-#: bbp-themes/bbp-twentyten/bbpress/form-anonymous.php:17
+#: includes/admin/replies.php:351 includes/admin/topics.php:369
+#: templates/bbp-default/bbpress/form-anonymous.php:17
 msgid "Author Information"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:507
+#: includes/admin/replies.php:512
 msgid "The reply was not found!"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:510 bbp-admin/bbp-topics.php:533
+#: includes/admin/replies.php:515 includes/admin/topics.php:541
 msgid "You do not have the permission to do that!"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:578
+#: includes/admin/replies.php:583
 msgid "There was a problem marking the reply \"%1$s\" as spam."
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:578
+#: includes/admin/replies.php:583
 msgid "Reply \"%1$s\" successfully marked as spam."
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:582
+#: includes/admin/replies.php:587
 msgid "There was a problem unmarking the reply \"%1$s\" as spam."
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:582
+#: includes/admin/replies.php:587
 msgid "Reply \"%1$s\" successfully unmarked as spam."
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:615
+#: includes/admin/replies.php:620
 msgid "Title"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:618 bbp-admin/bbp-topics.php:681
-#: bbp-theme-compat/bbpress/loop-replies.php:18
-#: bbp-theme-compat/bbpress/loop-replies.php:52
-#: bbp-themes/bbp-twentyten/bbpress/loop-replies.php:17
-#: bbp-themes/bbp-twentyten/bbpress/loop-replies.php:40
-#: bbp-themes/bbp-twentyten/single-reply.php:29
+#: includes/admin/replies.php:623 includes/admin/topics.php:689
+#: templates/bbp-default/bbpress/loop-replies.php:18
+#: templates/bbp-default/bbpress/loop-replies.php:52
 msgid "Author"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:672 bbp-admin/bbp-replies.php:680
+#: includes/admin/replies.php:677 includes/admin/replies.php:685
 msgid "No Topic"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:698 bbp-admin/bbp-replies.php:713
-#: bbp-admin/bbp-topics.php:733
+#: includes/admin/replies.php:703 includes/admin/replies.php:718
+#: includes/admin/topics.php:741
 msgid "No Forum"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:704
+#: includes/admin/replies.php:709
 msgid "(Mismatch)"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:772 bbp-admin/bbp-topics.php:822
+#: includes/admin/replies.php:777 includes/admin/topics.php:830
 msgid "View &#8220;%s&#8221;"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:772 bbp-admin/bbp-topics.php:822
+#: includes/admin/replies.php:777 includes/admin/topics.php:830
 msgid "View"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:783
+#: includes/admin/replies.php:788
 msgid "Mark the reply as not spam"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:783 bbp-admin/bbp-topics.php:853
+#: includes/admin/replies.php:788 includes/admin/topics.php:861
 msgid "Not spam"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:785
+#: includes/admin/replies.php:790
 msgid "Mark this reply as spam"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:785 bbp-admin/bbp-topics.php:855
-#: bbp-includes/bbp-reply-template.php:1645
-#: bbp-includes/bbp-topic-template.php:2566
+#: includes/admin/replies.php:790 includes/admin/topics.php:863
+#: includes/replies/template-tags.php:1712
+#: includes/topics/template-tags.php:2643
 msgid "Spam"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:794 bbp-admin/bbp-topics.php:863
-#: bbp-includes/bbp-reply-template.php:1589
-#: bbp-includes/bbp-topic-template.php:2324
+#: includes/admin/replies.php:799 includes/admin/topics.php:871
+#: includes/replies/template-tags.php:1656
+#: includes/topics/template-tags.php:2401
 msgid "Restore this item from the Trash"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:794 bbp-admin/bbp-topics.php:863
-#: bbp-includes/bbp-reply-template.php:1575
-#: bbp-includes/bbp-topic-template.php:2310
+#: includes/admin/replies.php:799 includes/admin/topics.php:871
+#: includes/replies/template-tags.php:1642
+#: includes/topics/template-tags.php:2387
 msgid "Restore"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:796 bbp-admin/bbp-topics.php:865
-#: bbp-includes/bbp-reply-template.php:1591
-#: bbp-includes/bbp-topic-template.php:2326
+#: includes/admin/replies.php:801 includes/admin/topics.php:873
+#: includes/replies/template-tags.php:1658
+#: includes/topics/template-tags.php:2403
 msgid "Move this item to the Trash"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:796 bbp-admin/bbp-topics.php:865
-#: bbp-includes/bbp-reply-template.php:1574
-#: bbp-includes/bbp-topic-template.php:2309
+#: includes/admin/replies.php:801 includes/admin/topics.php:873
+#: includes/replies/template-tags.php:1641
+#: includes/topics/template-tags.php:2386
 msgid "Trash"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:800 bbp-admin/bbp-topics.php:869
-#: bbp-includes/bbp-reply-template.php:1595
-#: bbp-includes/bbp-topic-template.php:2330
+#: includes/admin/replies.php:805 includes/admin/topics.php:877
+#: includes/replies/template-tags.php:1662
+#: includes/topics/template-tags.php:2407
 msgid "Delete this item permanently"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:800 bbp-admin/bbp-topics.php:869
+#: includes/admin/replies.php:805 includes/admin/topics.php:877
 msgid "Delete Permanently"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:826 bbp-admin/bbp-topics.php:895
+#: includes/admin/replies.php:831 includes/admin/topics.php:903
 msgid "Empty Spam"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:836 bbp-admin/bbp-topics.php:905
+#: includes/admin/replies.php:841 includes/admin/topics.php:913
 msgid "In all forums"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:896
+#: includes/admin/replies.php:901
 msgid "Reply updated. <a href=\"%s\">View topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:905
+#: includes/admin/replies.php:910
 msgid "Reply updated."
 msgstr ""
 
 #. translators: %s: date and time of the revision
-#: bbp-admin/bbp-replies.php:910
+#: includes/admin/replies.php:915
 msgid "Reply restored to revision from %s"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:914
+#: includes/admin/replies.php:919
 msgid "Reply created. <a href=\"%s\">View topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:917
+#: includes/admin/replies.php:922
 msgid "Reply saved."
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:920
+#: includes/admin/replies.php:925
 msgid "Reply submitted. <a target=\"_blank\" href=\"%s\">Preview topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:923
+#: includes/admin/replies.php:928
 msgid ""
 "Reply scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" href=\"%2$s"
@@ -1072 +1488 @@
 msgstr ""
 
-#: bbp-admin/bbp-replies.php:930
+#: includes/admin/replies.php:935
 msgid "Reply draft updated. <a target=\"_blank\" href=\"%s\">Preview topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:24 bbp-admin/bbp-settings.php:1257
+#: includes/admin/settings.php:24 includes/admin/settings.php:1292
 msgid "Main Settings"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:29
+#: includes/admin/settings.php:29
 msgid "Theme Packages"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:34 bbp-admin/bbp-settings.php:1277
+#: includes/admin/settings.php:34 includes/admin/settings.php:1312
 msgid "Per Page"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:39
+#: includes/admin/settings.php:39
 msgid "Per RSS Page"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:44
+#: includes/admin/settings.php:44
 msgid "Archive Slugs"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:49
+#: includes/admin/settings.php:49
 msgid "Single Slugs"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:54
+#: includes/admin/settings.php:54
 msgid "BuddyPress"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:59
+#: includes/admin/settings.php:59
 msgid "Akismet"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:81
-msgid "Lock post editing after"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:89
-msgid "Throttle time"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:97 bbp-admin/bbp-settings.php:1377
+#: includes/admin/settings.php:81
+msgid "Disallow editing after"
+msgstr ""
+
+#: includes/admin/settings.php:89
+msgid "Throttle posting every"
+msgstr ""
+
+#: includes/admin/settings.php:97 includes/admin/settings.php:1425
 msgid "Revisions"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:105 bbp-includes/bbp-extend-buddypress.php:934
+#: includes/admin/settings.php:105 includes/extend/buddypress/loader.php:213
+#: templates/bbp-default/bbpress/user-details.php:48
 msgid "Favorites"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:113 bbp-includes/bbp-extend-buddypress.php:946
+#: includes/admin/settings.php:113 includes/extend/buddypress/loader.php:225
+#: templates/bbp-default/bbpress/user-details.php:58
 msgid "Subscriptions"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:121
-#: bbp-theme-compat/extras/page-forum-statistics.php:54
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:53 bbpress.php:744
-msgid "Topic Tags"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:129
-msgid "Anonymous Posting"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:137
-msgid "Global Access"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:145
-msgid "Fancy Editor"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:153
-msgid "Auto-embed Links"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:166
+#: includes/admin/settings.php:121
+msgid "Topic tags"
+msgstr ""
+
+#: includes/admin/settings.php:129
+msgid "Anonymous posting"
+msgstr ""
+
+#: includes/admin/settings.php:137
+msgid "Default user role"
+msgstr ""
+
+#: includes/admin/settings.php:145
+msgid "Auto role"
+msgstr ""
+
+#: includes/admin/settings.php:153
+msgid "Fancy editor"
+msgstr ""
+
+#: includes/admin/settings.php:161
+msgid "Auto-embed links"
+msgstr ""
+
+#: includes/admin/settings.php:174
 msgid "Current Package"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:221 bbp-admin/bbp-settings.php:1390
+#: includes/admin/settings.php:229 includes/admin/settings.php:1438
 msgid "Forums base"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:229 bbp-admin/bbp-settings.php:1393
+#: includes/admin/settings.php:237 includes/admin/settings.php:1441
 msgid "Topics base"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:242
+#: includes/admin/settings.php:250
 msgid "Forum Prefix"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:250 bbp-admin/bbp-settings.php:1396
+#: includes/admin/settings.php:258 includes/admin/settings.php:1444
 msgid "Forum slug"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:258 bbp-admin/bbp-settings.php:1399
+#: includes/admin/settings.php:266 includes/admin/settings.php:1447
 msgid "Topic slug"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:266 bbp-admin/bbp-settings.php:1411
+#: includes/admin/settings.php:274 includes/admin/settings.php:1459
 msgid "Topic tag slug"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:274 bbp-admin/bbp-settings.php:1402
+#: includes/admin/settings.php:282 includes/admin/settings.php:1450
 msgid "Reply slug"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:282
+#: includes/admin/settings.php:290
 msgid "User slug"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:290
+#: includes/admin/settings.php:298
 msgid "Topic view slug"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:303
+#: includes/admin/settings.php:311
 msgid "Enable Group Forums"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:311
+#: includes/admin/settings.php:319
 msgid "Group Forums Parent"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:324
+#: includes/admin/settings.php:332
 msgid "Use Akismet"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:362
+#: includes/admin/settings.php:370
 msgid "Main forum settings for enabling features and setting time limits"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:378 bbp-includes/bbp-common-functions.php:121
+#: includes/admin/settings.php:386 includes/common/functions.php:121
 msgid "minutes"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:394 bbp-includes/bbp-common-functions.php:122
+#: includes/admin/settings.php:402 includes/common/functions.php:122
 msgid "seconds"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:410
+#: includes/admin/settings.php:418
 msgid "Allow users to mark topics as favorites"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:426
+#: includes/admin/settings.php:434
 msgid "Allow users to subscribe to topics"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:442
+#: includes/admin/settings.php:450
 msgid "Allow topics to have tags"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:458
+#: includes/admin/settings.php:466
 msgid "Allow topic and reply revision logging"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:474
+#: includes/admin/settings.php:482
 msgid "Allow guest users without accounts to create topics and replies"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:490
-msgid "Allow all registered users to create topics and replies"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:506 bbp-admin/bbp-settings.php:554
+#: includes/admin/settings.php:498
+msgid ""
+"Automatically assign default role to new, registered users upon visiting the "
+"site."
+msgstr ""
+
+#: includes/admin/settings.php:536
 msgid "Use the fancy WordPress editor to create and edit topics and replies"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:519
+#: includes/admin/settings.php:549
 msgid "How your forum content is displayed within your existing theme."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:543
+#: includes/admin/settings.php:573
 msgid "%1$s - %2$s"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:549
+#: includes/admin/settings.php:579
 msgid "will serve all bbPress templates"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:570
+#: includes/admin/settings.php:583
+msgid "No template packages available."
+msgstr ""
+
+#: includes/admin/settings.php:599
 msgid ""
 "Embed media (YouTube, Twitter, Flickr, etc...) directly into topics and "
@@ -1260 +1686 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:585
+#: includes/admin/settings.php:614
 msgid "How many topics and replies to show per page"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:601 bbp-admin/bbp-settings.php:617
-#: bbp-admin/bbp-settings.php:648 bbp-admin/bbp-settings.php:664
+#: includes/admin/settings.php:630 includes/admin/settings.php:646
+#: includes/admin/settings.php:677 includes/admin/settings.php:693
 msgid "per page"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:632
+#: includes/admin/settings.php:661
 msgid "How many topics and replies to show per RSS page"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:682
+#: includes/admin/settings.php:711
 msgid ""
 "Custom root slugs to prefix your forums and topics with. These can be "
@@ -1279 +1705 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:731
+#: includes/admin/settings.php:760
 msgid ""
 "Custom slugs for single forums, topics, replies, tags, users, and views "
@@ -1285 +1711 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:747
+#: includes/admin/settings.php:776
 msgid "Prefix your forum area with the Forum Base slug (Recommended)"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:867
+#: includes/admin/settings.php:896
 msgid "Forum settings for BuddyPress"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:883
+#: includes/admin/settings.php:912
 msgid "Allow BuddyPress Groups to have their own forums"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:901
-msgid "(Forum Root)"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:907
+#: includes/admin/settings.php:929
+msgid "&mdash; Forum root &mdash;"
+msgstr ""
+
+#: includes/admin/settings.php:937
 msgid "is the parent for all group forums"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:908
+#: includes/admin/settings.php:938
 msgid ""
 "Using the Forum Root is not recommended. Changing this does not move "
@@ -1311 +1737 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:923
+#: includes/admin/settings.php:953
 msgid "Forum settings for Akismet"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:940
+#: includes/admin/settings.php:970
 msgid "Allow Akismet to actively prevent forum spam."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:963
-msgid "bbPress Settings"
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:972
-#: bbp-theme-compat/bbpress/form-user-edit.php:169
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:169
+#: includes/admin/settings.php:993
+msgid "Forums Settings"
+msgstr ""
+
+#: includes/admin/settings.php:1002
+#: templates/bbp-default/bbpress/form-user-edit.php:175
 msgid "Save Changes"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:991
+#: includes/admin/settings.php:1021
 msgid ""
 "Information about your previous forums database so that they can be "
@@ -1335 +1760 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1016
+#: includes/admin/settings.php:1051
 msgid "is the previous forum software"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1030
+#: includes/admin/settings.php:1065
 msgid "IP or hostname"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1044
+#: includes/admin/settings.php:1079
 msgid "Use default 3306 if unsure"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1058
+#: includes/admin/settings.php:1093
 msgid "User for your database connection"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1072
+#: includes/admin/settings.php:1107
 msgid "Password to access the database"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1086
+#: includes/admin/settings.php:1121
 msgid "Name of the database with your old forum data"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1099
+#: includes/admin/settings.php:1134
 msgid "Some optional parameters to help tune the conversion process."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1113
+#: includes/admin/settings.php:1148
 msgid ""
 "(If converting from BuddyPress Forums, use \"wp_bb_\" or your custom prefix)"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1127
+#: includes/admin/settings.php:1162
 msgid "rows to process at a time"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1128
+#: includes/admin/settings.php:1163
 msgid "Keep this low if you experience out-of-memory issues."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1142
+#: includes/admin/settings.php:1177
 msgid "second(s) delay between each group of rows"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1143
+#: includes/admin/settings.php:1178
 msgid "Keep this high to prevent too-many-connection issues."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1157
+#: includes/admin/settings.php:1192
 msgid "Start a fresh conversion from the beginning"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1158
+#: includes/admin/settings.php:1193
 msgid "You should clean old conversion information before starting over."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1172
+#: includes/admin/settings.php:1207
 msgid "Purge all information from a previously attempted import"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1173
+#: includes/admin/settings.php:1208
 msgid ""
 "Use this if an import failed and you want to remove that incomplete data."
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1187
+#: includes/admin/settings.php:1222
 msgid "Attempt to import user accounts from previous forums"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1188
+#: includes/admin/settings.php:1223
 msgid ""
 "Non-bbPress passwords cannot be automatically converted. They will be "
@@ -1411 +1836 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1218
+#: includes/admin/settings.php:1253
 msgid "Start"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1219
+#: includes/admin/settings.php:1254
 msgid "Stop"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1250
-msgid "This screen provides access to all of the bbPress settings."
-msgstr ""
-
-#: bbp-admin/bbp-settings.php:1251
+#: includes/admin/settings.php:1285
+msgid "This screen provides access to all of the Forums settings."
+msgstr ""
+
+#: includes/admin/settings.php:1286
 msgid ""
 "Please see the additional help tabs for more information on each indiviual "
@@ -1429 +1854 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1258
+#: includes/admin/settings.php:1293
 msgid "In the Main Settings you have a number of options:"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1261
+#: includes/admin/settings.php:1296
 msgid ""
 "You can choose to lock a post after a certain number of minutes. \"Locking "
@@ -1440 +1865 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1262
+#: includes/admin/settings.php:1297
 msgid ""
 "\"Throttle time\" is the amount of time required between posts from a single "
@@ -1447 +1872 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1263
+#: includes/admin/settings.php:1298
 msgid ""
 "Favorites are a way for users to save and later return to topics they favor. "
@@ -1453 +1878 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1264
+#: includes/admin/settings.php:1299
 msgid ""
 "Subscriptions allow users to subscribe for notifications to topics that "
@@ -1459 +1884 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1265
+#: includes/admin/settings.php:1300
 msgid ""
 "Topic-Tags allow users to filter topics between forums. This is enabled by "
@@ -1465 +1890 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1266
+#: includes/admin/settings.php:1301
 msgid ""
 "\"Anonymous Posting\" allows guest users who do not have accounts on your "
@@ -1471 +1896 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1267
+#: includes/admin/settings.php:1302
 msgid ""
 "The Fancy Editor brings the luxury of the Visual editor and HTML editor from "
@@ -1477 +1902 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1268
+#: includes/admin/settings.php:1303
 msgid ""
 "Auto-embed will embed the media content from a URL directly into the "
@@ -1483 +1908 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1271
+#: includes/admin/settings.php:1306
 msgid ""
 "You must click the Save Changes button at the bottom of the screen for new "
@@ -1489 +1914 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1278
+#: includes/admin/settings.php:1313
 msgid ""
 "Per Page settings allow you to control the number of topics and replies "
@@ -1495 +1920 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1279
+#: includes/admin/settings.php:1314
 msgid ""
 "This is comparable to the WordPress \"Reading Settings\" page, where you can "
@@ -1501 +1926 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1280
+#: includes/admin/settings.php:1315
 msgid ""
 "These are broken up into two separate groups: one for what appears in your "
@@ -1507 +1932 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1286
+#: includes/admin/settings.php:1321
 msgid "Slugs"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1287
+#: includes/admin/settings.php:1322
 msgid ""
 "The Slugs section allows you to control the permalink structure for your "
@@ -1517 +1942 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1288
+#: includes/admin/settings.php:1323
 msgid ""
 "\"Archive Slugs\" are used as the \"root\" for your forums and topics. If "
@@ -1524 +1949 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1289
+#: includes/admin/settings.php:1324
 msgid ""
 "\"Single Slugs\" are used as a prefix when viewing an individual forum, "
@@ -1530 +1955 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1290
+#: includes/admin/settings.php:1325
 msgid ""
 "In the event of a slug collision with WordPress or BuddyPress, a warning "
@@ -1536 +1961 @@
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1375 bbp-theme-compat/bbpress/loop-forums.php:21
-#: bbp-theme-compat/bbpress/loop-replies.php:24
-#: bbp-theme-compat/bbpress/loop-replies.php:58
-#: bbp-theme-compat/bbpress/loop-topics.php:21
-#: bbp-themes/bbp-twentyten/bbpress/loop-forums.php:20
-#: bbp-themes/bbp-twentyten/bbpress/loop-replies.php:22
-#: bbp-themes/bbp-twentyten/bbpress/loop-replies.php:45
-#: bbp-themes/bbp-twentyten/bbpress/loop-topics.php:19
+#: includes/admin/settings.php:1423
+#: templates/bbp-default/bbpress/loop-forums.php:21
+#: templates/bbp-default/bbpress/loop-replies.php:24
+#: templates/bbp-default/bbpress/loop-replies.php:58
+#: templates/bbp-default/bbpress/loop-topics.php:21
 msgid "Posts"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1376
+#: includes/admin/settings.php:1424
 msgid "Pages"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1378
+#: includes/admin/settings.php:1426
 msgid "Attachments"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1379
+#: includes/admin/settings.php:1427
 msgid "Menus"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1382
+#: includes/admin/settings.php:1430
 msgid "Tag base"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1385
+#: includes/admin/settings.php:1433
 msgid "Category base"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1405
+#: includes/admin/settings.php:1453
 msgid "User base"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1408
+#: includes/admin/settings.php:1456
 msgid "View base"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1423
+#: includes/admin/settings.php:1471
 msgid "%s page"
 msgstr ""
 
-#: bbp-admin/bbp-settings.php:1442
+#: includes/admin/settings.php:1490
 msgid "Possible %1$s conflict: <strong>%2$s</strong>"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:36
+#: includes/admin/tools.php:36
 msgid ""
 "bbPress keeps track of relationships between forums, topics, replies, and "
@@ -1591 +2013 @@
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:37
+#: includes/admin/tools.php:37
 msgid ""
 "Some of these tools create substantial database overhead. Avoid running more "
@@ -1597 +2019 @@
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:43
+#: includes/admin/tools.php:43
 msgid "Relationships to Repair:"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:46
+#: includes/admin/tools.php:46
 msgid "Repair"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:61
+#: includes/admin/tools.php:61
 msgid "Repair Items"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:160
+#: includes/admin/tools.php:160
 msgid "Recalculate the parent topic for each post"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:161
+#: includes/admin/tools.php:161
 msgid "Recalculate the parent forum for each post"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:162
+#: includes/admin/tools.php:162
 msgid "Recalculate private and hidden forums"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:163
+#: includes/admin/tools.php:163
+msgid "Recalculate last activity in each topic and forum"
+msgstr ""
+
+#: includes/admin/tools.php:164
+msgid "Repair BuddyPress Group Forum relationships"
+msgstr ""
+
+#: includes/admin/tools.php:165
 msgid "Count topics in each forum"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:164
+#: includes/admin/tools.php:166
 msgid "Count replies in each forum"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:165
+#: includes/admin/tools.php:167
 msgid "Count replies in each topic"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:166
+#: includes/admin/tools.php:168
 msgid "Count voices in each topic"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:167
+#: includes/admin/tools.php:169
 msgid "Count spammed & trashed replies in each topic"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:168
+#: includes/admin/tools.php:170
 msgid "Count topics for each user"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:169
+#: includes/admin/tools.php:171
 msgid "Count replies for each user"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:170
+#: includes/admin/tools.php:172
 msgid "Remove trashed topics from user favorites"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:171
+#: includes/admin/tools.php:173
 msgid "Remove trashed topics from user subscriptions"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:172
-msgid "Recalculate last activity in each topic and forum"
-msgstr ""
-
-#: bbp-admin/bbp-tools.php:195
+#: includes/admin/tools.php:174
+msgid "Remap existing users to default forum roles"
+msgstr ""
+
+#: includes/admin/tools.php:194
 msgid "Counting the number of replies in each topic&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:196 bbp-admin/bbp-tools.php:240
-#: bbp-admin/bbp-tools.php:283 bbp-admin/bbp-tools.php:313
-#: bbp-admin/bbp-tools.php:348 bbp-admin/bbp-tools.php:381
-#: bbp-admin/bbp-tools.php:428 bbp-admin/bbp-tools.php:475
-#: bbp-admin/bbp-tools.php:535 bbp-admin/bbp-tools.php:593
-#: bbp-admin/bbp-tools.php:701 bbp-admin/bbp-tools.php:748
-#: bbp-admin/bbp-tools.php:803
+#: includes/admin/tools.php:195 includes/admin/tools.php:238
+#: includes/admin/tools.php:280 includes/admin/tools.php:323
+#: includes/admin/tools.php:404 includes/admin/tools.php:438
+#: includes/admin/tools.php:470 includes/admin/tools.php:515
+#: includes/admin/tools.php:560 includes/admin/tools.php:622
+#: includes/admin/tools.php:689 includes/admin/tools.php:734
+#: includes/admin/tools.php:841 includes/admin/tools.php:890
+#: includes/admin/tools.php:944
 msgid "Failed!"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:222 bbp-admin/bbp-tools.php:266
-#: bbp-admin/bbp-tools.php:293 bbp-admin/bbp-tools.php:328
-#: bbp-admin/bbp-tools.php:363 bbp-admin/bbp-tools.php:410
-#: bbp-admin/bbp-tools.php:457 bbp-admin/bbp-tools.php:517
-#: bbp-admin/bbp-tools.php:576 bbp-admin/bbp-tools.php:683
-#: bbp-admin/bbp-tools.php:731 bbp-admin/bbp-tools.php:786
-#: bbp-admin/bbp-tools.php:832
+#: includes/admin/tools.php:221 includes/admin/tools.php:264
+#: includes/admin/tools.php:290 includes/admin/tools.php:419
+#: includes/admin/tools.php:453 includes/admin/tools.php:498
+#: includes/admin/tools.php:543 includes/admin/tools.php:605
+#: includes/admin/tools.php:666 includes/admin/tools.php:824
+#: includes/admin/tools.php:874 includes/admin/tools.php:928
+#: includes/admin/tools.php:973
 msgid "Complete!"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:239
+#: includes/admin/tools.php:237
 msgid "Counting the number of voices in each topic&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:282
+#: includes/admin/tools.php:279
 msgid ""
 "Counting the number of spammed and trashed replies in each topic&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:312
+#: includes/admin/tools.php:304
+msgid "Repairing BuddyPress group-forum relationships&hellip; %s"
+msgstr ""
+
+#: includes/admin/tools.php:375
+msgid "Group Forums"
+msgstr ""
+
+#: includes/admin/tools.php:384
+msgid "Complete! %s groups updated; %s forums updated."
+msgstr ""
+
+#: includes/admin/tools.php:403
 msgid "Counting the number of topics in each forum&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:347
+#: includes/admin/tools.php:437
 msgid "Counting the number of replies in each forum&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:380
+#: includes/admin/tools.php:469
 msgid "Counting the number of topics each user has created&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:427
+#: includes/admin/tools.php:514
 msgid "Counting the number of topics to which each user has replied&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:474
+#: includes/admin/tools.php:559
 msgid "Removing trashed topics from user favorites&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:501 bbp-admin/bbp-tools.php:560
+#: includes/admin/tools.php:589 includes/admin/tools.php:650
 msgid "Nothing to remove!"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:534
+#: includes/admin/tools.php:621
 msgid "Removing trashed topics from user subscriptions&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:592
+#: includes/admin/tools.php:683
+msgid "Remapping forum role for each user on this site&hellip; %s"
+msgstr ""
+
+#: includes/admin/tools.php:717
+msgid "Complete! %s users updated."
+msgstr ""
+
+#: includes/admin/tools.php:733
 msgid "Recomputing latest post in every topic and forum&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:700
+#: includes/admin/tools.php:840
 msgid "Recalculating forum visibility &hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:747
+#: includes/admin/tools.php:889
 msgid "Recalculating the forum for each post &hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:802
+#: includes/admin/tools.php:943
 msgid "Recalculating the topic for each post &hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:856
+#: includes/admin/tools.php:996
 msgid ""
 "This will revert your forums back to a brand new installation. This process "
@@ -1744 +2195 @@
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:862
+#: includes/admin/tools.php:1002
 msgid "The following data will be removed:"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:864 bbpress.php:478
-msgid "All Forums"
-msgstr ""
-
-#: bbp-admin/bbp-tools.php:865 bbp-includes/bbp-topic-functions.php:3134
-#: bbpress.php:535
-msgid "All Topics"
-msgstr ""
-
-#: bbp-admin/bbp-tools.php:866 bbp-includes/bbp-reply-functions.php:1458
-#: bbpress.php:592
-msgid "All Replies"
-msgstr ""
-
-#: bbp-admin/bbp-tools.php:867
+#: includes/admin/tools.php:1007
 msgid "All Topic Tags"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:868
+#: includes/admin/tools.php:1008
 msgid "Related Meta Data"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:869
+#: includes/admin/tools.php:1009
 msgid "Forum Settings"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:870
+#: includes/admin/tools.php:1010
 msgid "Forum Activity"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:871
+#: includes/admin/tools.php:1011
 msgid "Forum User Roles"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:872
+#: includes/admin/tools.php:1012
 msgid "Importer Helper Data"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:876
+#: includes/admin/tools.php:1016
 msgid "Are you sure you want to do this?"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:879
+#: includes/admin/tools.php:1019
 msgid "Say it ain't so!"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:880
+#: includes/admin/tools.php:1020
 msgid "This process cannot be undone."
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:888
+#: includes/admin/tools.php:1028
 msgid "Reset bbPress"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:913
+#: includes/admin/tools.php:1053
 msgid "Failed"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:914
+#: includes/admin/tools.php:1054
 msgid "Success!"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:921
+#: includes/admin/tools.php:1061
 msgid "Deleting Posts&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:934
+#: includes/admin/tools.php:1074
 msgid "Deleting Post Meta&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:947
+#: includes/admin/tools.php:1087
 msgid "Deleting User Meta&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:954
+#: includes/admin/tools.php:1094
 msgid "Deleting Conversion Table&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:966
+#: includes/admin/tools.php:1106
 msgid "Deleting Settings&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-tools.php:972
+#: includes/admin/tools.php:1112
 msgid "Deleting Roles and Capabilities&hellip; %s"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:134
+#: includes/admin/topics.php:134
 msgid ""
 "This screen displays the individual topics on your site. You can customize "
@@ -1840 +2277 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:144
+#: includes/admin/topics.php:144
 msgid ""
 "You can hide/display columns based on your needs and decide how many topics "
@@ -1846 +2283 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:145
-msgid ""
-"You can filter the list of topics by forum status using the text links in "
+#: includes/admin/topics.php:145
+msgid ""
+"You can filter the list of topics by topic status using the text links in "
 "the upper left to show All, Published, or Trashed topics. The default view "
 "is to show all topics."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:146
+#: includes/admin/topics.php:146
 msgid ""
 "You can refine the list to show only topics from a specific month by using "
 "the dropdown menus above the topics list. Click the Filter button after "
-"making your selection. You also can refine the list by clicking on the forum "
+"making your selection. You also can refine the list by clicking on the topic "
 "creator in the topics list."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:155
+#: includes/admin/topics.php:155
 msgid ""
 "Hovering over a row in the topics list will display action links that allow "
@@ -1867 +2304 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:159
+#: includes/admin/topics.php:157
+msgid ""
+"<strong>Edit</strong> takes you to the editing screen for that topic. You "
+"can also reach that screen by clicking on the topic title."
+msgstr ""
+
+#: includes/admin/topics.php:158
+msgid ""
+"<strong>Trash</strong> removes your topic from this list and places it in "
+"the trash, from which you can permanently delete it."
+msgstr ""
+
+#: includes/admin/topics.php:159
 msgid ""
 "<strong>Spam</strong> removes your topic from this list and places it in the "
@@ -1873 +2322 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:160
+#: includes/admin/topics.php:160
 msgid ""
 "<strong>Preview</strong> will show you what your draft topic will look like "
@@ -1880 +2329 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:169
+#: includes/admin/topics.php:161
+msgid ""
+"<strong>Close</strong> will mark the selected topic as &#8217;closed&#8217; "
+"and disable the option to post new replies to the topic."
+msgstr ""
+
+#: includes/admin/topics.php:162
+msgid ""
+"<strong>Stick</strong> will keep the selected topic &#8217;pinned&#8217; to "
+"the top the parent forum topic list."
+msgstr ""
+
+#: includes/admin/topics.php:163
+msgid ""
+"<strong>Stick <em>(to front)</em></strong> will keep the selected topic "
+"&#8217;pinned&#8217; to the top of ALL forums and be visable in any forums "
+"topics list."
+msgstr ""
+
+#: includes/admin/topics.php:172
 msgid ""
 "You can also edit or move multiple topics to the trash at once. Select the "
@@ -1887 +2355 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:170
+#: includes/admin/topics.php:173
 msgid ""
 "When using Bulk Edit, you can change the metadata (categories, author, etc.) "
@@ -1894 +2362 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:191
+#: includes/admin/topics.php:194
 msgid ""
 "The title field and the big topic editing Area are fixed in place, but you "
@@ -1904 +2372 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:201
+#: includes/admin/topics.php:204
 msgid "Title and Topic Editor"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:203
+#: includes/admin/topics.php:206
 msgid ""
 "<strong>Title</strong> - Enter a title for your topic. After you enter a "
@@ -1914 +2382 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:204
+#: includes/admin/topics.php:207
 msgid ""
 "<strong>Topic Editor</strong> - Enter the text for your topic. There are two "
@@ -1928 +2396 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:207
+#: includes/admin/topics.php:210
 msgid ""
 "<strong>Publish</strong> - You can set the terms of publishing your topic in "
@@ -1939 +2407 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:210
+#: includes/admin/topics.php:213
 msgid ""
 "<strong>topic Format</strong> - This designates how your theme will display "
@@ -1950 +2418 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:214
+#: includes/admin/topics.php:217
 msgid ""
 "<strong>Featured Image</strong> - This allows you to associate an image with "
@@ -1958 +2426 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:219 bbp-admin/bbp-topics.php:264
+#: includes/admin/topics.php:222 includes/admin/topics.php:267
 msgid "Topic Attributes"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:221
+#: includes/admin/topics.php:224
 msgid "Select the attributes that your topic should have:"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:223
+#: includes/admin/topics.php:226
 msgid ""
 "<strong>Forum</strong> dropdown determines the parent forum that the topic "
@@ -1973 +2441 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:224
+#: includes/admin/topics.php:227
 msgid ""
 "<strong>Topic Type</strong> dropdown indicates the sticky status of the "
@@ -1981 +2449 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:239
+#: includes/admin/topics.php:242
 msgid ""
 "<strong>Discussion</strong> - You can turn comments and pings on or off, and "
@@ -1987 +2455 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:530
+#: includes/admin/topics.php:538
 msgid "The topic was not found!"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:620
+#: includes/admin/topics.php:628
 msgid "There was a problem opening the topic \"%1$s\"."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:620
+#: includes/admin/topics.php:628
 msgid "Topic \"%1$s\" successfully opened."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:624
+#: includes/admin/topics.php:632
 msgid "There was a problem closing the topic \"%1$s\"."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:624
+#: includes/admin/topics.php:632
 msgid "Topic \"%1$s\" successfully closed."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:628
+#: includes/admin/topics.php:636
 msgid "There was a problem sticking the topic \"%1$s\" to front."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:628
+#: includes/admin/topics.php:636
 msgid "Topic \"%1$s\" successfully sticked to front."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:632
+#: includes/admin/topics.php:640
 msgid "There was a problem sticking the topic \"%1$s\"."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:632
+#: includes/admin/topics.php:640
 msgid "Topic \"%1$s\" successfully sticked."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:636
+#: includes/admin/topics.php:644
 msgid "There was a problem unsticking the topic \"%1$s\"."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:636
+#: includes/admin/topics.php:644
 msgid "Topic \"%1$s\" successfully unsticked."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:640
+#: includes/admin/topics.php:648
 msgid "There was a problem marking the topic \"%1$s\" as spam."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:640
+#: includes/admin/topics.php:648
 msgid "Topic \"%1$s\" successfully marked as spam."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:644
+#: includes/admin/topics.php:652
 msgid "There was a problem unmarking the topic \"%1$s\" as spam."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:644
+#: includes/admin/topics.php:652
 msgid "Topic \"%1$s\" successfully unmarked as spam."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:680 bbp-theme-compat/bbpress/loop-topics.php:20
-#: bbp-themes/bbp-twentyten/bbpress/loop-topics.php:18
+#: includes/admin/topics.php:688
+#: templates/bbp-default/bbpress/loop-topics.php:20
 msgid "Voices"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:775 bbp-includes/bbp-topic-template.php:1764
+#: includes/admin/topics.php:748
+msgid "(No Forum)"
+msgstr ""
+
+#: includes/admin/topics.php:783 includes/topics/template-tags.php:1828
 msgid "No Replies"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:832
+#: includes/admin/topics.php:840
 msgid "Close this topic"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:832
+#: includes/admin/topics.php:840
 msgctxt "Close a Topic"
 msgid "Close"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:834
+#: includes/admin/topics.php:842
 msgid "Open this topic"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:834
+#: includes/admin/topics.php:842
 msgctxt "Open a Topic"
 msgid "Open"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:843
+#: includes/admin/topics.php:851
 msgid "Unstick this topic"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:843 bbp-includes/bbp-topic-template.php:2440
+#: includes/admin/topics.php:851 includes/topics/template-tags.php:2517
 msgid "Unstick"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:846
+#: includes/admin/topics.php:854
 msgid "Stick this topic to its forum"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:846 bbp-includes/bbp-topic-template.php:2439
+#: includes/admin/topics.php:854 includes/topics/template-tags.php:2516
 msgid "Stick"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:846
+#: includes/admin/topics.php:854
 msgid "Stick this topic to front"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:846 bbp-includes/bbp-topic-template.php:2441
+#: includes/admin/topics.php:854 includes/topics/template-tags.php:2518
 msgid "to front"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:853
+#: includes/admin/topics.php:861
 msgid "Mark the topic as not spam"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:855
+#: includes/admin/topics.php:863
 msgid "Mark this topic as spam"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:965
+#: includes/admin/topics.php:973
 msgid "Topic updated. <a href=\"%s\">View topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:974
+#: includes/admin/topics.php:982
 msgid "Topic updated."
 msgstr ""
 
 #. translators: %s: date and time of the revision
-#: bbp-admin/bbp-topics.php:979
+#: includes/admin/topics.php:987
 msgid "Topic restored to revision from %s"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:983
+#: includes/admin/topics.php:991
 msgid "Topic created. <a href=\"%s\">View topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:986
+#: includes/admin/topics.php:994
 msgid "Topic saved."
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:989
+#: includes/admin/topics.php:997
 msgid "Topic submitted. <a target=\"_blank\" href=\"%s\">Preview topic</a>"
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:992
+#: includes/admin/topics.php:1000
 msgid ""
 "Topic scheduled for: <strong>%1$s</strong>. <a target=\"_blank\" href=\"%2$s"
@@ -2137 +2609 @@
 msgstr ""
 
-#: bbp-admin/bbp-topics.php:999
+#: includes/admin/topics.php:1007
 msgid "Topic draft updated. <a target=\"_blank\" href=\"%s\">Preview topic</a>"
 msgstr ""
 
-#: bbp-admin/converters/bbPress1.php:540
-msgid "Re: "
-msgstr ""
-
-#: bbp-includes/bbp-common-functions.php:110
+#: includes/admin/users.php:87 includes/admin/users.php:217
+#: templates/bbp-default/bbpress/form-user-roles.php:9
+msgid "Forum Role"
+msgstr ""
+
+#: includes/admin/users.php:96 includes/admin/users.php:100
+#: includes/users/template-tags.php:1017
+msgid "&mdash; No role for this forum &mdash;"
+msgstr ""
+
+#: includes/admin/users.php:138 includes/admin/users.php:140
+msgid "Change forum role to&hellip;"
+msgstr ""
+
+#: includes/admin/users.php:148
+msgid "Change"
+msgstr ""
+
+#: includes/admin/users.php:216
+msgid "Site Role"
+msgstr ""
+
+#: includes/common/functions.php:110
 msgid "sometime"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:111
+#: includes/common/functions.php:111
 msgid "right now"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:112
+#: includes/common/functions.php:112
 msgid "%s ago"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:116
+#: includes/common/functions.php:116
 msgid "year"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:116
+#: includes/common/functions.php:116
 msgid "years"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:117
+#: includes/common/functions.php:117
 msgid "month"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:117
+#: includes/common/functions.php:117
 msgid "months"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:118
+#: includes/common/functions.php:118
 msgid "week"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:118
+#: includes/common/functions.php:118
 msgid "weeks"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:119
+#: includes/common/functions.php:119
 msgid "day"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:119
+#: includes/common/functions.php:119
 msgid "days"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:120
+#: includes/common/functions.php:120
 msgid "hour"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:120
+#: includes/common/functions.php:120
 msgid "hours"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:121
+#: includes/common/functions.php:121
 msgid "minute"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:122
+#: includes/common/functions.php:122
 msgid "second"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:177
+#: includes/common/functions.php:177
 msgctxt "Separator in time since"
 msgid ","
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:488
-#: bbp-includes/bbp-common-functions.php:520
+#: includes/common/functions.php:488 includes/common/functions.php:520
 msgid "Private: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:489
-#: bbp-includes/bbp-common-functions.php:521
+#: includes/common/functions.php:489 includes/common/functions.php:521
 msgid "Spammed: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:490
-#: bbp-includes/bbp-common-functions.php:522
+#: includes/common/functions.php:490 includes/common/functions.php:522
 msgid "Trashed: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:597
+#: includes/common/functions.php:597
 msgid "<strong>ERROR</strong>: Invalid author name submitted!"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:601
+#: includes/common/functions.php:601
 msgid "<strong>ERROR</strong>: Invalid email address submitted!"
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:1024
+#: includes/common/functions.php:1024
 msgid ""
 "%1$s wrote:\n"
@@ -2248 +2735 @@
 msgstr ""
 
-#: bbp-includes/bbp-common-functions.php:1658
+#: includes/common/functions.php:1664
 msgid ""
 "Conditional query tags do not work before the query is run. Before then, "
@@ -2254 +2741 @@
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1225
+#: includes/common/template-tags.php:1339
 msgid "No topics available"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1230
+#: includes/common/template-tags.php:1344
 msgid "No forums available"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1235
+#: includes/common/template-tags.php:1349
 msgid "None available"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1352
-#: bbp-includes/bbp-common-template.php:1363
-#: bbp-includes/bbp-topic-functions.php:1192
-#: bbp-includes/bbp-topic-functions.php:1532
-#: bbp-theme-compat/bbpress/form-reply.php:29
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:29
+#: includes/common/template-tags.php:1466
+#: includes/common/template-tags.php:1477 includes/topics/functions.php:1223
+#: includes/topics/functions.php:1581
+#: templates/bbp-default/bbpress/form-reply.php:29
 msgid "Reply To: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1769
+#: includes/common/template-tags.php:1888
 msgid "Home"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1832
-#: bbp-theme-compat/bbpress/user-details.php:20
-#: bbp-themes/bbp-twentyten/bbpress/user-details.php:20
+#: includes/common/template-tags.php:1951
 msgid "(Edit)"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1836
-#: bbp-includes/bbp-common-template.php:1936
-#: bbp-includes/bbp-common-template.php:2153
-#: bbp-includes/bbp-theme-compatibility.php:543
-#: bbp-includes/bbp-theme-compatibility.php:553
-#: bbp-theme-compat/extras/taxonomy-topic-tag-edit.php:17
-#: bbp-theme-compat/extras/taxonomy-topic-tag.php:17
-#: bbp-themes/bbp-twentyten/taxonomy-topic-tag-edit.php:18
-#: bbp-themes/bbp-twentyten/taxonomy-topic-tag.php:18
+#: includes/common/template-tags.php:1955
+#: includes/common/template-tags.php:2065
+#: includes/common/template-tags.php:2282 includes/core/theme-compat.php:607
+#: templates/bbp-default/extras/taxonomy-topic-tag-edit.php:17
+#: templates/bbp-default/extras/taxonomy-topic-tag.php:17
 msgid "Topic Tag: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:1840
-#: bbp-includes/bbp-reply-template.php:1454
-#: bbp-includes/bbp-topic-template.php:2188 bbpress.php:481 bbpress.php:538
-#: bbpress.php:595
-msgid "Edit"
-msgstr ""
-
-#: bbp-includes/bbp-common-template.php:1855
+#: includes/common/template-tags.php:1976
 msgid "&rsaquo;"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2087
+#: includes/common/template-tags.php:2216
 msgid "Log Out"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2140
+#: includes/common/template-tags.php:2269
 msgid "Forum: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2144
+#: includes/common/template-tags.php:2273
 msgid "Topic: %s"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2162
+#: includes/common/template-tags.php:2291
 msgid "Your Profile"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2167
+#: includes/common/template-tags.php:2296
+#: templates/bbp-default/bbpress/user-details.php:29
 msgid "%s's Profile"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2175
+#: includes/common/template-tags.php:2304
 msgid "Edit Your Profile"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2180
+#: includes/common/template-tags.php:2309
 msgid "Edit %s's Profile"
 msgstr ""
 
-#: bbp-includes/bbp-common-template.php:2187
+#: includes/common/template-tags.php:2316
 msgid "View: %s"
 msgstr ""
 
-#: bbp-includes/bbp-core-update.php:168
-msgid "General"
-msgstr ""
-
-#: bbp-includes/bbp-core-update.php:169
-msgid "General chit-chat"
-msgstr ""
-
-#: bbp-includes/bbp-core-update.php:170
-msgid "Hello World!"
-msgstr ""
-
-#: bbp-includes/bbp-core-update.php:171
-msgid "I am the first topic in your new forums."
-msgstr ""
-
-#: bbp-includes/bbp-core-update.php:172
-msgid "Re: Hello World!"
-msgstr ""
-
-#: bbp-includes/bbp-core-update.php:173
-msgid "Oh, and this is what a reply looks like."
-msgstr ""
-
-#: bbp-includes/bbp-core-widgets.php:39
+#: includes/common/widgets.php:39
 msgid ""
 "A simple login form with optional links to sign-up and lost password pages."
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:42
+#: includes/common/widgets.php:42
 msgid "(bbPress) Login Widget"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:82 bbp-includes/bbp-core-widgets.php:103
-#: bbp-theme-compat/bbpress/form-user-login.php:14
-#: bbp-theme-compat/bbpress/form-user-login.php:35
-#: bbp-themes/bbp-twentyten/bbpress/form-user-login.php:14
-#: bbp-themes/bbp-twentyten/bbpress/form-user-login.php:35
+#: includes/common/widgets.php:82 includes/common/widgets.php:103
+#: templates/bbp-default/bbpress/form-user-login.php:14
+#: templates/bbp-default/bbpress/form-user-login.php:35
 msgid "Log In"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:85
-#: bbp-theme-compat/bbpress/form-user-edit.php:99
-#: bbp-theme-compat/bbpress/form-user-login.php:17
-#: bbp-theme-compat/bbpress/form-user-register.php:23
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:99
-#: bbp-themes/bbp-twentyten/bbpress/form-user-login.php:17
-#: bbp-themes/bbp-twentyten/bbpress/form-user-register.php:23
+#: includes/common/widgets.php:85
+#: templates/bbp-default/bbpress/form-user-edit.php:99
+#: templates/bbp-default/bbpress/form-user-login.php:17
+#: templates/bbp-default/bbpress/form-user-register.php:23
 msgid "Username"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:90
-#: bbp-theme-compat/bbpress/form-user-login.php:22
-#: bbp-themes/bbp-twentyten/bbpress/form-user-login.php:22
+#: includes/common/widgets.php:90
+#: templates/bbp-default/bbpress/form-user-login.php:22
 msgid "Password"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:96
+#: includes/common/widgets.php:96
 msgid "Remember Me"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:115
-#: bbp-theme-compat/bbpress/form-user-register.php:36
-#: bbp-themes/bbp-twentyten/bbpress/form-user-register.php:36
+#: includes/common/widgets.php:115
+#: templates/bbp-default/bbpress/form-user-register.php:36
 msgid "Register"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:121
-#: bbp-theme-compat/bbpress/form-user-lost-pass.php:14
-#: bbp-themes/bbp-twentyten/bbpress/form-user-lost-pass.php:14
+#: includes/common/widgets.php:121
+#: templates/bbp-default/bbpress/form-user-lost-pass.php:14
 msgid "Lost Password"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:182 bbp-includes/bbp-core-widgets.php:308
-#: bbp-includes/bbp-core-widgets.php:447 bbp-includes/bbp-core-widgets.php:663
-#: bbp-includes/bbp-core-widgets.php:848
+#: includes/common/widgets.php:182 includes/common/widgets.php:308
+#: includes/common/widgets.php:450 includes/common/widgets.php:668
+#: includes/common/widgets.php:856
 msgid "Title:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:187
+#: includes/common/widgets.php:187
 msgid "Register URI:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:192
+#: includes/common/widgets.php:192
 msgid "Lost Password URI:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:224
+#: includes/common/widgets.php:224
 msgid "A list of registered optional topic views."
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:227
+#: includes/common/widgets.php:227
 msgid "(bbPress) Topic Views List"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:341
+#: includes/common/widgets.php:341
 msgid "A list of forums with an option to set the parent."
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:344
+#: includes/common/widgets.php:344
 msgid "(bbPress) Forums List"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:453
+#: includes/common/widgets.php:456
 msgid "Parent Forum ID:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:459
+#: includes/common/widgets.php:462
 msgid "\"0\" to show only root - \"any\" to show all"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:490
+#: includes/common/widgets.php:493
 msgid "A list of recent topics, sorted by popularity or freshness."
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:493
+#: includes/common/widgets.php:496
 msgid "(bbPress) Recent Topics"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:607
+#: includes/common/widgets.php:609
 msgctxt "widgets"
 msgid "by %1$s"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:664
+#: includes/common/widgets.php:669
 msgid "Maximum topics to show:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:665 bbp-includes/bbp-core-widgets.php:850
+#: includes/common/widgets.php:670 includes/common/widgets.php:858
 msgid "Show post date:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:666
+#: includes/common/widgets.php:671
 msgid "Show topic author:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:669
+#: includes/common/widgets.php:674
 msgid "Order By:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:671
+#: includes/common/widgets.php:676
 msgid "Newest Topics"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:672
-#: bbp-theme-compat/extras/page-forum-statistics.php:100
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:99
+#: includes/common/widgets.php:677
+#: templates/bbp-default/extras/page-forum-statistics.php:100
 msgid "Popular Topics"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:673
+#: includes/common/widgets.php:678
 msgid "Topics With Recent Replies"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:705
+#: includes/common/widgets.php:710
 msgid "A list of the most recent replies."
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:708
+#: includes/common/widgets.php:713
 msgid "(bbPress) Recent Replies"
 msgstr ""
 
 #. translators: 1: reply author, 2: reply link, 3: reply timestamp
-#: bbp-includes/bbp-core-widgets.php:780
+#: includes/common/widgets.php:785
 msgctxt "widgets"
 msgid "%1$s on %2$s %3$s"
@@ -2509 +2949 @@
 
 #. translators: 1: reply link, 2: reply timestamp
-#: bbp-includes/bbp-core-widgets.php:786
+#: includes/common/widgets.php:791
 msgctxt "widgets"
 msgid "%1$s %2$s"
@@ -2515 +2955 @@
 
 #. translators: 1: reply author, 2: reply link
-#: bbp-includes/bbp-core-widgets.php:792
+#: includes/common/widgets.php:797
 msgctxt "widgets"
 msgid "%1$s on %2$s"
@@ -2521 +2961 @@
 
 #. translators: 1: reply link
-#: bbp-includes/bbp-core-widgets.php:798
+#: includes/common/widgets.php:803
 msgctxt "widgets"
 msgid "%1$s"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:849
+#: includes/common/widgets.php:857
 msgid "Maximum replies to show:"
 msgstr ""
 
-#: bbp-includes/bbp-core-widgets.php:851
+#: includes/common/widgets.php:859
 msgid "Show reply author:"
 msgstr ""
 
-#: bbp-includes/bbp-extend-akismet.php:304
+#: includes/core/capabilities.php:407
+msgid "Keymaster"
+msgstr ""
+
+#: includes/core/capabilities.php:413 includes/users/template-tags.php:450
+msgid "Moderator"
+msgstr ""
+
+#: includes/core/capabilities.php:419 includes/users/template-tags.php:454
+msgid "Participant"
+msgstr ""
+
+#: includes/core/capabilities.php:425
+msgid "Spectator"
+msgstr ""
+
+#: includes/core/capabilities.php:431
+msgid "Visitor"
+msgstr ""
+
+#: includes/core/capabilities.php:437
+msgid "Blocked"
+msgstr ""
+
+#: includes/core/capabilities.php:553 includes/core/capabilities.php:563
+msgid "Editable forum roles no longer exist."
+msgstr ""
+
+#: includes/core/update.php:164
+msgid "General"
+msgstr ""
+
+#: includes/core/update.php:165
+msgid "General chit-chat"
+msgstr ""
+
+#: includes/core/update.php:166
+msgid "Hello World!"
+msgstr ""
+
+#: includes/core/update.php:167
+msgid "I am the first topic in your new forums."
+msgstr ""
+
+#: includes/core/update.php:168
+msgid "Re: Hello World!"
+msgstr ""
+
+#: includes/core/update.php:169
+msgid "Oh, and this is what a reply looks like."
+msgstr ""
+
+#: includes/extend/akismet.php:304
 msgid "%1$s reported this %2$s as spam"
 msgstr ""
 
-#: bbp-includes/bbp-extend-akismet.php:311
+#: includes/extend/akismet.php:311
 msgid "%1$s reported this %2$s as not spam"
 msgstr ""
 
-#: bbp-includes/bbp-extend-akismet.php:453
+#: includes/extend/akismet.php:400
+msgid "No response"
+msgstr ""
+
+#: includes/extend/akismet.php:458
 msgid "Akismet caught this post as spam"
 msgstr ""
 
-#: bbp-includes/bbp-extend-akismet.php:457
-#: bbp-includes/bbp-extend-akismet.php:472
+#: includes/extend/akismet.php:462 includes/extend/akismet.php:477
 msgid "Post status was changed to %s"
 msgstr ""
 
-#: bbp-includes/bbp-extend-akismet.php:465
+#: includes/extend/akismet.php:470
 msgid "Akismet cleared this post"
 msgstr ""
 
-#: bbp-includes/bbp-extend-akismet.php:479
+#: includes/extend/akismet.php:484
 msgid ""
 "Akismet was unable to check this post (response: %s), will automatically "
@@ -2561 +3056 @@
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:298
+#: includes/extend/buddypress/activity.php:238
 msgid "New topic created"
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:299
+#: includes/extend/buddypress/activity.php:239
 msgid "New reply created"
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:570
+#: includes/extend/buddypress/activity.php:469
 msgid "%1$s started the topic %2$s in the forum %3$s"
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:660
+#: includes/extend/buddypress/activity.php:622
 msgid "%1$s replied to the topic %2$s in the forum %3$s"
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:868
-msgid "Search Forums..."
-msgstr ""
-
-#: bbp-includes/bbp-extend-buddypress.php:912
-#: bbp-includes/bbp-extend-buddypress.php:990
-msgid "Topics Started"
-msgstr ""
-
-#: bbp-includes/bbp-extend-buddypress.php:923
-#: bbp-includes/bbp-extend-buddypress.php:998
-msgid "Topics Replied To"
-msgstr ""
-
-#: bbp-includes/bbp-extend-buddypress.php:1006
-msgid "Favorite Topics"
-msgstr ""
-
-#: bbp-includes/bbp-extend-buddypress.php:1014
-msgid "Subscribed Topics"
-msgstr ""
-
-#: bbp-includes/bbp-extend-buddypress.php:1231
-msgid "Group Forums"
-msgstr ""
-
-#: bbp-includes/bbp-extend-buddypress.php:1233
+#: includes/extend/buddypress/group.php:130
+msgid "Enable Group Forum"
+msgstr ""
+
+#: includes/extend/buddypress/group.php:132
+#: includes/extend/buddypress/group.php:196
 msgid ""
 "Create a discussion forum to allow members of this group to communicate in a "
@@ -2609 +3083 @@
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:1236
+#: includes/extend/buddypress/group.php:135
+#: includes/extend/buddypress/group.php:199
 msgid "Yes. I want this group to have a forum."
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:1458
-#: bbp-includes/bbp-extend-buddypress.php:1470
+#: includes/extend/buddypress/group.php:138
+msgid "Saying no will not delete existing forum content."
+msgstr ""
+
+#: includes/extend/buddypress/group.php:140
+msgid "Save Settings"
+msgstr ""
+
+#: includes/extend/buddypress/group.php:194
+msgid "Group Forum"
+msgstr ""
+
+#: includes/extend/buddypress/group.php:455
+#: includes/extend/buddypress/group.php:464
 msgid "This group does not currently have any forums."
 msgstr ""
 
-#: bbp-includes/bbp-extend-buddypress.php:1669
-#: bbp-theme-compat/bbpress/form-topic.php:125
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:125 bbpress.php:546
-msgid "Forum:"
-msgstr ""
-
-#: bbp-includes/bbp-forum-functions.php:121
-#: bbp-includes/bbp-forum-functions.php:400
-#: bbp-includes/bbp-reply-functions.php:117
-#: bbp-includes/bbp-reply-functions.php:392
-#: bbp-includes/bbp-topic-functions.php:129
-#: bbp-includes/bbp-topic-functions.php:473
-#: bbp-includes/bbp-topic-functions.php:1051
-#: bbp-includes/bbp-topic-functions.php:1353
-#: bbp-includes/bbp-topic-functions.php:1686
-#: bbp-includes/bbp-topic-functions.php:1725
-#: bbp-includes/bbp-topic-functions.php:1782
-#: bbp-includes/bbp-user-functions.php:472
-#: bbp-includes/bbp-user-functions.php:792
-#: bbp-includes/bbp-user-functions.php:919
-#: bbp-includes/bbp-user-functions.php:925
+#: includes/extend/buddypress/loader.php:100
+msgid "Search Forums..."
+msgstr ""
+
+#: includes/extend/buddypress/loader.php:191
+#: includes/extend/buddypress/loader.php:267
+#: templates/bbp-default/bbpress/user-details.php:35
+msgid "Topics Started"
+msgstr ""
+
+#: includes/extend/buddypress/loader.php:202
+#: includes/extend/buddypress/loader.php:275
+#: templates/bbp-default/bbpress/user-details.php:41
+msgid "Replies Created"
+msgstr ""
+
+#: includes/extend/buddypress/loader.php:283
+msgid "Favorite Topics"
+msgstr ""
+
+#: includes/extend/buddypress/loader.php:291
+msgid "Subscribed Topics"
+msgstr ""
+
+#: includes/forums/functions.php:121 includes/forums/functions.php:400
+#: includes/replies/functions.php:117 includes/replies/functions.php:407
+#: includes/topics/functions.php:129 includes/topics/functions.php:481
+#: includes/topics/functions.php:1082 includes/topics/functions.php:1384
+#: includes/topics/functions.php:1735 includes/topics/functions.php:1774
+#: includes/topics/functions.php:1831 includes/users/functions.php:467
+#: includes/users/functions.php:787 includes/users/functions.php:914
+#: includes/users/functions.php:920
 msgid "<strong>ERROR</strong>: Are you sure you wanted to do that?"
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:134
+#: includes/forums/functions.php:134
 msgid ""
 "<strong>ERROR</strong>: You do not have permission to create new forums."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:157
-#: bbp-includes/bbp-forum-functions.php:459
+#: includes/forums/functions.php:157 includes/forums/functions.php:459
 msgid "<strong>ERROR</strong>: Your forum needs a title."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:169
-#: bbp-includes/bbp-forum-functions.php:471
+#: includes/forums/functions.php:169 includes/forums/functions.php:471
 msgid "<strong>ERROR</strong>: Your forum description cannot be empty."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:182
+#: includes/forums/functions.php:182
 msgid "<strong>ERROR</strong>: Your forum must have a parent."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:189
+#: includes/forums/functions.php:189
 msgid ""
 "<strong>ERROR</strong>: This forum is a category. No forums can be created "
@@ -2667 +3163 @@
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:194
-#: bbp-includes/bbp-forum-functions.php:435
+#: includes/forums/functions.php:194 includes/forums/functions.php:435
 msgid "<strong>ERROR</strong>: This forum has been closed to new forums."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:199
-#: bbp-includes/bbp-forum-functions.php:440
+#: includes/forums/functions.php:199 includes/forums/functions.php:440
 msgid ""
 "<strong>ERROR</strong>: This forum is private and you do not have the "
@@ -2679 +3173 @@
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:204
-#: bbp-includes/bbp-forum-functions.php:445
+#: includes/forums/functions.php:204 includes/forums/functions.php:445
 msgid ""
 "<strong>ERROR</strong>: This forum is hidden and you do not have the "
@@ -2686 +3179 @@
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:211
-#: bbp-includes/bbp-reply-functions.php:206
-#: bbp-includes/bbp-topic-functions.php:228
+#: includes/forums/functions.php:211 includes/replies/functions.php:206
+#: includes/topics/functions.php:228
 msgid "<strong>ERROR</strong>: Slow down; you move too fast."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:216
+#: includes/forums/functions.php:216
 msgid "<strong>ERROR</strong>: This forum already exists."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:221
+#: includes/forums/functions.php:221
 msgid "<strong>ERROR</strong>: Your forum cannot be created at this time."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:389
+#: includes/forums/functions.php:389
 msgid "<strong>ERROR</strong>: Forum ID not found."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:405
+#: includes/forums/functions.php:405
 msgid "<strong>ERROR</strong>: The forum you want to edit was not found."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:410
+#: includes/forums/functions.php:410
 msgid "<strong>ERROR</strong>: You do not have permission to edit that forum."
 msgstr ""
 
-#: bbp-includes/bbp-forum-functions.php:476
+#: includes/forums/functions.php:476
 msgid "<strong>ERROR</strong>: Your forum cannot be edited at this time."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1131
-#: bbp-includes/bbp-forum-template.php:1849
+#: includes/forums/template-tags.php:1121
+#: includes/forums/template-tags.php:1860
 msgid "%s topic"
 msgid_plural "%s topics"
@@ -2723 +3215 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-forum-template.php:1147
-#: bbp-includes/bbp-topic-template.php:1821
+#: includes/forums/template-tags.php:1137
+#: includes/topics/template-tags.php:1884
 msgid " (+ %d hidden)"
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1838
-#: bbp-includes/bbp-topic-template.php:1805
+#: includes/forums/template-tags.php:1849
+#: includes/topics/template-tags.php:1868
 msgid "%s reply"
 msgid_plural "%s replies"
@@ -2735 +3227 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-forum-template.php:1858
+#: includes/forums/template-tags.php:1869
 msgid ""
 "This category contains %1$s and %2$s, and was last updated by %3$s %4$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1860
+#: includes/forums/template-tags.php:1871
 msgid "This forum contains %1$s and %2$s, and was last updated by %3$s %4$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1866
+#: includes/forums/template-tags.php:1877
 msgid "This category contains %1$s, and was last updated by %2$s %3$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1868
+#: includes/forums/template-tags.php:1879
 msgid "This forum contains %1$s, and was last updated by %2$s %3$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1878
+#: includes/forums/template-tags.php:1889
 msgid "This category contains %1$s and %2$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1880
+#: includes/forums/template-tags.php:1891
 msgid "This forum contains %1$s and %2$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1888
+#: includes/forums/template-tags.php:1899
 msgid "This category contains %1$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1890
+#: includes/forums/template-tags.php:1901
 msgid "This forum contains %1$s."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:1894
+#: includes/forums/template-tags.php:1905
 msgid "This forum is empty."
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:2125
+#: includes/forums/template-tags.php:2136
 msgid "Category"
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:2162
+#: includes/forums/template-tags.php:2173
 msgctxt "Forum Status"
 msgid "Open"
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:2163
+#: includes/forums/template-tags.php:2174
 msgctxt "Forum Status"
 msgid "Closed"
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:2200
+#: includes/forums/template-tags.php:2211
 msgid "Public"
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:2201
-#: bbp-theme-compat/bbpress/feedback-no-access.php:13
-#: bbp-themes/bbp-twentyten/bbpress/feedback-no-access.php:13
+#: includes/forums/template-tags.php:2212
+#: templates/bbp-default/bbpress/feedback-no-access.php:13
 msgid "Private"
 msgstr ""
 
-#: bbp-includes/bbp-forum-template.php:2202
+#: includes/forums/template-tags.php:2213
 msgid "Hidden"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:143
+#: includes/replies/functions.php:143
 msgid "<strong>ERROR</strong>: You do not have permission to reply."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:157
+#: includes/replies/functions.php:157
 msgid "<strong>ERROR</strong>: Topic ID is missing."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:168
-#: bbp-includes/bbp-topic-functions.php:199
-#: bbp-includes/bbp-topic-functions.php:487
+#: includes/replies/functions.php:168 includes/topics/functions.php:199
+#: includes/topics/functions.php:495
 msgid "<strong>ERROR</strong>: Forum ID is missing."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:189
+#: includes/replies/functions.php:189
 msgid "<strong>ERROR</strong>: Your reply needs a title."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:201
-#: bbp-includes/bbp-reply-functions.php:473
+#: includes/replies/functions.php:201 includes/replies/functions.php:491
 msgid "<strong>ERROR</strong>: Your reply cannot be empty."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:211
+#: includes/replies/functions.php:211
 msgid ""
 "<strong>ERROR</strong>: Duplicate reply detected; it looks as though "
@@ -2829 +3318 @@
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:216
+#: includes/replies/functions.php:216
 msgid "<strong>ERROR</strong>: Your reply cannot be created at this time."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:270
-#: bbp-includes/bbp-reply-functions.php:526
+#: includes/replies/functions.php:285 includes/replies/functions.php:563
 msgid ""
 "<strong>ERROR</strong>: There was a problem adding the tags to the topic."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:381
+#: includes/replies/functions.php:396
 msgid "<strong>ERROR</strong>: Reply ID not found."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:398
+#: includes/replies/functions.php:413
 msgid "<strong>ERROR</strong>: The reply you want to edit was not found."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:409
+#: includes/replies/functions.php:424
 msgid "<strong>ERROR</strong>: You do not have permission to edit that reply."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:440
+#: includes/replies/functions.php:458
 msgid ""
 "<strong>ERROR</strong>: This forum is a category. No topics or replies can "
@@ -2857 +3345 @@
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:444
+#: includes/replies/functions.php:462
 msgid ""
 "<strong>ERROR</strong>: This forum has been closed to new topics and replies."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:448
+#: includes/replies/functions.php:466
 msgid ""
 "<strong>ERROR</strong>: This forum is private and you do not have the "
@@ -2868 +3356 @@
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:452
+#: includes/replies/functions.php:470
 msgid ""
 "<strong>ERROR</strong>: This forum is hidden and you do not have the "
@@ -2874 +3362 @@
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:478
+#: includes/replies/functions.php:496
 msgid "<strong>ERROR</strong>: Your reply cannot be edited at this time."
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1019
+#: includes/replies/functions.php:1062
 msgid "<strong>ERROR:</strong> You do not have the permission to do that!"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1032
+#: includes/replies/functions.php:1075
 msgid ""
 "<strong>ERROR</strong>: There was a problem unmarking the reply as spam!"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1032
+#: includes/replies/functions.php:1075
 msgid "<strong>ERROR</strong>: There was a problem marking the reply as spam!"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1051
+#: includes/replies/functions.php:1094
 msgid "<strong>ERROR</strong>: There was a problem trashing the reply!"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1059
+#: includes/replies/functions.php:1102
 msgid "<strong>ERROR</strong>: There was a problem untrashing the reply!"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1067
+#: includes/replies/functions.php:1110
 msgid "<strong>ERROR</strong>: There was a problem deleting the reply!"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1456
+#: includes/replies/functions.php:1499
 msgid "All Posts"
 msgstr ""
 
-#: bbp-includes/bbp-reply-functions.php:1498
-#: bbp-includes/bbp-topic-functions.php:3159
+#: includes/replies/functions.php:1541 includes/topics/functions.php:3233
 msgid "Replies: %s"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:576
+#: includes/replies/template-tags.php:545
+#: includes/topics/template-tags.php:688
+msgctxt "date at time"
+msgid "%1$s at %2$s"
+msgstr ""
+
+#: includes/replies/template-tags.php:636
 msgid "This reply was modified %1$s by %2$s. Reason: %3$s"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:578
+#: includes/replies/template-tags.php:638
 msgid "This reply was modified %1$s by %2$s."
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:859
-#: bbp-includes/bbp-topic-template.php:1171
-#: bbp-includes/bbp-user-template.php:164
+#: includes/replies/template-tags.php:923
+#: includes/topics/template-tags.php:1235 includes/users/template-tags.php:165
 msgid "Anonymous"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:960
-#: bbp-includes/bbp-topic-template.php:1276
-#: bbp-includes/bbp-user-template.php:1196
+#: includes/replies/template-tags.php:1024
+#: includes/topics/template-tags.php:1340
+#: includes/users/template-tags.php:1383
 msgid "View %s's profile"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:960
-#: bbp-includes/bbp-topic-template.php:1276
-#: bbp-includes/bbp-user-template.php:1196
+#: includes/replies/template-tags.php:1024
+#: includes/topics/template-tags.php:1340
+#: includes/users/template-tags.php:1383
 msgid "Visit %s's website"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:1576
-#: bbp-includes/bbp-topic-template.php:2311
-#: bbp-theme-compat/bbpress/form-topic-tag.php:88
-#: bbp-theme-compat/bbpress/form-topic-tag.php:101
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:89
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:102
+#: includes/replies/template-tags.php:1643
+#: includes/topics/template-tags.php:2388
+#: templates/bbp-default/bbpress/form-topic-tag.php:88
+#: templates/bbp-default/bbpress/form-topic-tag.php:101
 msgid "Delete"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:1595
-#: bbp-includes/bbp-topic-template.php:2330
+#: includes/replies/template-tags.php:1662
+#: includes/topics/template-tags.php:2407
 msgid "Are you sure you want to delete that permanently?"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:1646
-#: bbp-includes/bbp-topic-template.php:2567
+#: includes/replies/template-tags.php:1713
+#: includes/topics/template-tags.php:2644
 msgid "Unspam"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:1709
+#: includes/replies/template-tags.php:1776
 msgid "Split"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:1710
+#: includes/replies/template-tags.php:1777
 msgid "Split the topic from this reply"
 msgstr ""
 
-#: bbp-includes/bbp-reply-template.php:1817
+#: includes/replies/template-tags.php:1884
 msgid "Viewing %1$s reply"
 msgid_plural "Viewing %1$s replies"
@@ -2971 +3461 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-reply-template.php:1821
+#: includes/replies/template-tags.php:1888
 msgid "Viewing %2$s replies (of %4$s total)"
 msgid_plural "Viewing %1$s replies - %2$s through %3$s (of %4$s total)"
@@ -2977 +3467 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-reply-template.php:1829
+#: includes/replies/template-tags.php:1896
 msgid "Viewing %1$s post"
 msgid_plural "Viewing %1$s posts"
@@ -2983 +3473 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-reply-template.php:1833
+#: includes/replies/template-tags.php:1900
 msgid "Viewing %2$s post (of %4$s total)"
 msgid_plural "Viewing %1$s posts - %2$s through %3$s (of %4$s total)"
@@ -2989 +3479 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-topic-functions.php:157
+#: includes/topics/functions.php:157
 msgid ""
 "<strong>ERROR</strong>: You do not have permission to create new topics."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:181
-#: bbp-includes/bbp-topic-functions.php:527
+#: includes/topics/functions.php:181 includes/topics/functions.php:535
 msgid "<strong>ERROR</strong>: Your topic needs a title."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:193
-#: bbp-includes/bbp-topic-functions.php:539
+#: includes/topics/functions.php:193 includes/topics/functions.php:547
 msgid "<strong>ERROR</strong>: Your topic cannot be empty."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:210
+#: includes/topics/functions.php:210
 msgid ""
 "<strong>ERROR</strong>: This forum is a category. No topics can be created "
@@ -3010 +3498 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:214
-#: bbp-includes/bbp-topic-functions.php:506
+#: includes/topics/functions.php:214 includes/topics/functions.php:514
 msgid "<strong>ERROR</strong>: This forum has been closed to new topics."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:218
-#: bbp-includes/bbp-topic-functions.php:510
+#: includes/topics/functions.php:218 includes/topics/functions.php:518
 msgid ""
 "<strong>ERROR</strong>: This forum is private and you do not have the "
@@ -3022 +3508 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:222
-#: bbp-includes/bbp-topic-functions.php:514
+#: includes/topics/functions.php:222 includes/topics/functions.php:522
 msgid ""
 "<strong>ERROR</strong>: This forum is hidden and you do not have the "
@@ -3029 +3514 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:233
+#: includes/topics/functions.php:233
 msgid ""
 "<strong>ERROR</strong>: Duplicate topic detected; it looks as though "
@@ -3035 +3520 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:238
+#: includes/topics/functions.php:238
 msgid "<strong>ERROR</strong>: Your topic cannot be created at this time."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:438
-#: bbp-includes/bbp-topic-functions.php:1045
+#: includes/topics/functions.php:443 includes/topics/functions.php:1076
 msgid "<strong>ERROR</strong>: Topic ID not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:449
+#: includes/topics/functions.php:454
 msgid "<strong>ERROR</strong>: The topic you want to edit was not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:460
+#: includes/topics/functions.php:465
 msgid "<strong>ERROR</strong>: You do not have permission to edit that topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:502
+#: includes/topics/functions.php:510
 msgid ""
 "<strong>ERROR</strong>: This forum is a category. No topics can be created "
@@ -3058 +3542 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:544
+#: includes/topics/functions.php:552
 msgid "<strong>ERROR</strong>: Your topic cannot be edited at this time."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1056
+#: includes/topics/functions.php:1087
 msgid "<strong>ERROR</strong>: The topic you want to merge was not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1062
-#: bbp-includes/bbp-topic-functions.php:1359
+#: includes/topics/functions.php:1093 includes/topics/functions.php:1390
 msgid ""
 "<strong>ERROR</strong>: You do not have the permissions to edit the source "
@@ -3073 +3556 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1070
+#: includes/topics/functions.php:1101
 msgid "<strong>ERROR</strong>: Destination topic ID not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1076
+#: includes/topics/functions.php:1107
 msgid "<strong>ERROR</strong>: The topic you want to merge to was not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1080
+#: includes/topics/functions.php:1111
 msgid ""
 "<strong>ERROR</strong>: You do not have the permissions to edit the "
@@ -3087 +3570 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1332
+#: includes/topics/functions.php:1363
 msgid "<strong>ERROR</strong>: Reply ID to split the topic from not found!"
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1340
+#: includes/topics/functions.php:1371
 msgid "<strong>ERROR</strong>: The reply you want to split from was not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1349
+#: includes/topics/functions.php:1380
 msgid "<strong>ERROR</strong>: The topic you want to split was not found."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1367
+#: includes/topics/functions.php:1398
 msgid "<strong>ERROR</strong>: You need to choose a valid split option."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1380
+#: includes/topics/functions.php:1411
 msgid "<strong>ERROR</strong>: Destination topic ID not found!"
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1389
+#: includes/topics/functions.php:1420
 msgid "<strong>ERROR</strong>: The topic you want to split to was not found!"
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1393
+#: includes/topics/functions.php:1424
 msgid ""
 "<strong>ERROR</strong>: You do not have the permissions to edit the "
@@ -3117 +3600 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1432
+#: includes/topics/functions.php:1463
 msgid ""
 "<strong>ERROR</strong>: There was a problem converting the reply into the "
@@ -3123 +3606 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1437
+#: includes/topics/functions.php:1468
 msgid ""
 "<strong>ERROR</strong>: You do not have the permissions to create new "
@@ -3129 +3612 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1674
+#: includes/topics/functions.php:1723
 msgid ""
 "<strong>ERROR</strong>: The following problem(s) have been found while "
@@ -3135 +3618 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1692
-#: bbp-includes/bbp-topic-functions.php:1731
+#: includes/topics/functions.php:1741 includes/topics/functions.php:1780
 msgid ""
 "<strong>ERROR</strong>: You do not have the permissions to edit the topic "
@@ -3142 +3624 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1698
-#: bbp-includes/bbp-topic-functions.php:1737
+#: includes/topics/functions.php:1747 includes/topics/functions.php:1786
 msgid "<strong>ERROR</strong>: You need to enter a tag name."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1708
+#: includes/topics/functions.php:1757
 msgid ""
 "<strong>ERROR</strong>: The following problem(s) have been found while "
@@ -3153 +3634 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1747
-#: bbp-includes/bbp-topic-functions.php:1765
+#: includes/topics/functions.php:1796 includes/topics/functions.php:1814
 msgid ""
 "<strong>ERROR</strong>: The following problem(s) have been found while "
@@ -3160 +3640 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1756
+#: includes/topics/functions.php:1805
 msgid ""
 "<strong>ERROR</strong>: The tags which are being merged can not be the same."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1788
+#: includes/topics/functions.php:1837
 msgid ""
 "<strong>ERROR</strong>: You do not have the permissions to delete the topic "
@@ -3171 +3651 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1797
+#: includes/topics/functions.php:1846
 msgid ""
 "<strong>ERROR</strong>: The following problem(s) have been found while "
@@ -3177 +3657 @@
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1926
+#: includes/topics/functions.php:1975
 msgid "<strong>ERROR:</strong> You do not have the permission to do that."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1939
+#: includes/topics/functions.php:1988
 msgid "<strong>ERROR</strong>: There was a problem closing the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1939
+#: includes/topics/functions.php:1988
 msgid "<strong>ERROR</strong>: There was a problem opening the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1950
+#: includes/topics/functions.php:1999
 msgid "<strong>ERROR</strong>: There was a problem unsticking the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1950
+#: includes/topics/functions.php:1999
 msgid "<strong>ERROR</strong>: There was a problem sticking the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1960
+#: includes/topics/functions.php:2009
 msgid ""
 "<strong>ERROR</strong>: There was a problem unmarking the topic as spam."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1960
+#: includes/topics/functions.php:2009
 msgid "<strong>ERROR</strong>: There was a problem marking the topic as spam."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1979
+#: includes/topics/functions.php:2028
 msgid "<strong>ERROR</strong>: There was a problem trashing the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1987
+#: includes/topics/functions.php:2036
 msgid "<strong>ERROR</strong>: There was a problem untrashing the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-functions.php:1995
+#: includes/topics/functions.php:2044
 msgid "<strong>ERROR</strong>: There was a problem deleting the topic."
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:804
+#: includes/topics/template-tags.php:865
 msgid "This topic was modified %1$s by %2$s. Reason: %3$s"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:806
+#: includes/topics/template-tags.php:867
 msgid "This topic was modified %1$s by %2$s."
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:1987
+#: includes/topics/template-tags.php:2060
 msgid "Tagged:"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2379
+#: includes/topics/template-tags.php:2456
 msgctxt "Topic Status"
 msgid "Close"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2380
+#: includes/topics/template-tags.php:2457
 msgctxt "Topic Status"
 msgid "Open"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2510
-#: bbp-theme-compat/bbpress/form-topic-tag.php:59
-#: bbp-theme-compat/bbpress/form-topic-tag.php:73
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:59
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:73
+#: includes/topics/template-tags.php:2587
+#: templates/bbp-default/bbpress/form-topic-tag.php:59
+#: templates/bbp-default/bbpress/form-topic-tag.php:73
 msgid "Merge"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2622
+#: includes/topics/template-tags.php:2699
 msgid "Viewing %1$s topic"
 msgid_plural "Viewing %1$s topics"
@@ -3254 +3732 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-topic-template.php:2626
+#: includes/topics/template-tags.php:2703
 msgid "Viewing topic %2$s (of %4$s total)"
 msgid_plural "Viewing %1$s topics - %2$s through %3$s (of %4$s total)"
@@ -3260 +3738 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-topic-template.php:2686
+#: includes/topics/template-tags.php:2763
 msgid "This topic is marked as spam."
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2691
+#: includes/topics/template-tags.php:2768
 msgid "This topic is in the trash."
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2729
+#: includes/topics/template-tags.php:2806
 msgid "Normal"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2730
+#: includes/topics/template-tags.php:2807
 msgid "Sticky"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2731
+#: includes/topics/template-tags.php:2808
 msgid "Super Sticky"
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2852
+#: includes/topics/template-tags.php:2929
 msgid "%s voice"
 msgid_plural "%s voices"
@@ -3286 +3764 @@
 msgstr[1] ""
 
-#: bbp-includes/bbp-topic-template.php:2858
+#: includes/topics/template-tags.php:2935
 msgid "This topic contains %1$s, has %2$s, and was last updated by %3$s %4$s."
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2862
+#: includes/topics/template-tags.php:2939
 msgid "This topic contains %1$s and has %2$s."
 msgstr ""
 
-#: bbp-includes/bbp-topic-template.php:2866
+#: includes/topics/template-tags.php:2943
 msgid "This topic has no replies."
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:468
+#: includes/users/functions.php:463
 msgid ""
 "<strong>ERROR</strong>: No topic was found! Which topic are you marking/"
@@ -3304 +3782 @@
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:476
-#: bbp-includes/bbp-user-functions.php:796
+#: includes/users/functions.php:471 includes/users/functions.php:791
 msgid ""
 "<strong>ERROR</strong>: You don't have the permission to edit favorites of "
@@ -3311 +3788 @@
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:517
+#: includes/users/functions.php:512
 msgid ""
 "<strong>ERROR</strong>: There was a problem removing that topic from "
@@ -3317 +3794 @@
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:519
+#: includes/users/functions.php:514
 msgid "<strong>ERROR</strong>: There was a problem favoriting that topic!"
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:788
+#: includes/users/functions.php:783
 msgid ""
 "<strong>ERROR</strong>: No topic was found! Which topic are you subscribing/"
@@ -3327 +3804 @@
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:837
+#: includes/users/functions.php:832
 msgid ""
 "<strong>ERROR</strong>: There was a problem unsubscribing from that topic!"
 msgstr ""
 
-#: bbp-includes/bbp-user-functions.php:839
+#: includes/users/functions.php:834
 msgid "<strong>ERROR</strong>: There was a problem subscribing to that topic!"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:439
+#: includes/users/template-tags.php:438
 msgid "Key Master"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:451
+#: includes/users/template-tags.php:442
+msgid "Inactive"
+msgstr ""
+
+#: includes/users/template-tags.php:446
 msgid "Guest"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:456
-#: bbp-includes/bbp-user-template.php:484
+#: includes/users/template-tags.php:458
 msgid "Member"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:461
-msgid "Moderator"
-msgstr ""
-
-#: bbp-includes/bbp-user-template.php:526
+#: includes/users/template-tags.php:497
 msgid "Admin"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:670
-#: bbp-theme-compat/bbpress-functions.php:256
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:207
+#: includes/users/template-tags.php:674
+#: templates/bbp-default/bbpress-functions.php:256
 msgid "Add this topic to your favorites"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:671
+#: includes/users/template-tags.php:675
 msgid " (%?%)"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:677
+#: includes/users/template-tags.php:681
 msgid "This topic is one of your %favorites% ["
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:678
-#: bbp-theme-compat/bbpress-functions.php:255
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:206
+#: includes/users/template-tags.php:682
+#: templates/bbp-default/bbpress-functions.php:255
 msgid "&times;"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:679
+#: includes/users/template-tags.php:683
 msgid "]"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:788
-#: bbp-theme-compat/bbpress-functions.php:265
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:216
+#: includes/users/template-tags.php:825
+#: templates/bbp-default/bbpress-functions.php:265
 msgid "Subscribe"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:789
-#: bbp-theme-compat/bbpress-functions.php:266
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:217
+#: includes/users/template-tags.php:826
+#: templates/bbp-default/bbpress-functions.php:266
 msgid "Unsubscribe"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:855
+#: includes/users/template-tags.php:892
 msgid "User updated."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:880
+#: includes/users/template-tags.php:917
 msgid "You have super admin privileges."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:880
+#: includes/users/template-tags.php:917
 msgid "This user has super admin privileges."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:946
+#: includes/users/template-tags.php:982
 msgid "&mdash; No role for this site &mdash;"
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:994
+#: includes/users/template-tags.php:1180
 msgid "You are now logged out."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:998
+#: includes/users/template-tags.php:1184
 msgid "New user registration is currently not allowed."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:1007
+#: includes/users/template-tags.php:1193
 msgid "Check your e-mail for the confirmation link."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:1012
+#: includes/users/template-tags.php:1198
 msgid "Check your e-mail for your new password."
 msgstr ""
 
-#: bbp-includes/bbp-user-template.php:1017
+#: includes/users/template-tags.php:1203
 msgid "Registration complete. Please check your e-mail."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/content-single-topic-lead.php:38
-#: bbp-theme-compat/bbpress/loop-single-reply.php:16
-#: bbp-themes/bbp-twentyten/bbpress/content-single-topic-lead.php:45
-#: bbp-themes/bbp-twentyten/bbpress/loop-single-reply.php:15
-msgid "%1$s at %2$s"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/feedback-logged-in.php:13
-#: bbp-themes/bbp-twentyten/bbpress/feedback-logged-in.php:13
+#: templates/bbp-default/bbpress/feedback-logged-in.php:13
 msgid "You are already logged in."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/feedback-no-access.php:16
-#: bbp-themes/bbp-twentyten/bbpress/feedback-no-access.php:16
+#: templates/bbp-default/bbpress/feedback-no-access.php:16
 msgid "You do not have permission to view this forum."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/feedback-no-forums.php:13
-#: bbp-themes/bbp-twentyten/bbpress/feedback-no-forums.php:13
+#: templates/bbp-default/bbpress/feedback-no-forums.php:13
 msgid "Oh bother! No forums were found here!"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/feedback-no-replies.php:13
-#: bbp-themes/bbp-twentyten/bbpress/feedback-no-replies.php:13
+#: templates/bbp-default/bbpress/feedback-no-replies.php:13
 msgid "Oh bother! No replies were found here!"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/feedback-no-topics.php:13
-#: bbp-themes/bbp-twentyten/bbpress/feedback-no-topics.php:13
+#: templates/bbp-default/bbpress/feedback-no-topics.php:13
 msgid "Oh bother! No topics were found here!"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-anonymous.php:17
-#: bbp-themes/bbp-twentyten/bbpress/form-anonymous.php:17
+#: templates/bbp-default/bbpress/form-anonymous.php:17
 msgid "Your information:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-anonymous.php:22
-#: bbp-themes/bbp-twentyten/bbpress/form-anonymous.php:22
+#: templates/bbp-default/bbpress/form-anonymous.php:22
 msgid "Name (required):"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-anonymous.php:27
-#: bbp-themes/bbp-twentyten/bbpress/form-anonymous.php:27
+#: templates/bbp-default/bbpress/form-anonymous.php:27
 msgid "Mail (will not be published) (required):"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-anonymous.php:32
-#: bbp-themes/bbp-twentyten/bbpress/form-anonymous.php:32
-msgid "Website:"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-forum.php:35
-#: bbp-theme-compat/bbpress/form-topic.php:41
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:35
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:41
+#: templates/bbp-default/bbpress/form-forum.php:35
+#: templates/bbp-default/bbpress/form-topic.php:41
 msgid "Now Editing &ldquo;%s&rdquo;"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:37
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:37
+#: templates/bbp-default/bbpress/form-forum.php:37
 msgid "Create New Forum in &ldquo;%s&rdquo;"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:37
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:37 bbpress.php:480
-msgid "Create New Forum"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-forum.php:47
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:47
+#: templates/bbp-default/bbpress/form-forum.php:47
 msgid ""
 "This forum is closed to new content, however your account still allows you "
@@ -3505 +3948 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:55
-#: bbp-theme-compat/bbpress/form-reply.php:44
-#: bbp-theme-compat/bbpress/form-topic.php:61
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:55
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:44
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:61
+#: templates/bbp-default/bbpress/form-forum.php:55
+#: templates/bbp-default/bbpress/form-reply.php:44
+#: templates/bbp-default/bbpress/form-topic.php:61
 msgid "Your account has the ability to post unrestricted HTML content."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:67
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:67
+#: templates/bbp-default/bbpress/form-forum.php:67
 msgid "Forum Name (Maximum Length: %d):"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:78
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:78
+#: templates/bbp-default/bbpress/form-forum.php:78
 msgid "Forum Description:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:93
-#: bbp-theme-compat/bbpress/form-reply.php:75
-#: bbp-theme-compat/bbpress/form-topic.php:101
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:93
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:75
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:101
+#: templates/bbp-default/bbpress/form-forum.php:93
+#: templates/bbp-default/bbpress/form-reply.php:75
+#: templates/bbp-default/bbpress/form-topic.php:101
 msgid ""
 "You may use these <abbr title=\"HyperText Markup Language\">HTML</abbr> tags "
@@ -3535 +3970 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:102
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:102
+#: templates/bbp-default/bbpress/form-forum.php:102
 msgid "Forum Type:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:129
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:129 bbpress.php:489
-msgid "Parent Forum:"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-forum.php:149
-#: bbp-theme-compat/bbpress/form-reply.php:149
-#: bbp-theme-compat/bbpress/form-topic-merge.php:94
-#: bbp-theme-compat/bbpress/form-topic-split.php:98
-#: bbp-theme-compat/bbpress/form-topic.php:198
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:149
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:149
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:94
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:98
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:198
+#: templates/bbp-default/bbpress/form-forum.php:134
+msgid "(No Parent)"
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-forum.php:149
+#: templates/bbp-default/bbpress/form-reply.php:149
+#: templates/bbp-default/bbpress/form-topic-merge.php:94
+#: templates/bbp-default/bbpress/form-topic-split.php:98
+#: templates/bbp-default/bbpress/form-topic.php:198
 msgid "Submit"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:172
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:172
+#: templates/bbp-default/bbpress/form-forum.php:172
 msgid "The forum &#8216;%s&#8217; is closed to new content."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-forum.php:180
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:180
-msgid "You cannot create new forums at this time."
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-forum.php:180
-#: bbp-themes/bbp-twentyten/bbpress/form-forum.php:180
+#: templates/bbp-default/bbpress/form-forum.php:180
+msgid "You cannot create new forums."
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-forum.php:180
 msgid "You must be logged in to create new forums."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-protected.php:14
-#: bbp-themes/bbp-twentyten/bbpress/form-protected.php:14
+#: templates/bbp-default/bbpress/form-protected.php:14
 msgid "Protected"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:36
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:36
+#: templates/bbp-default/bbpress/form-reply.php:36
 msgid ""
 "This topic is marked as closed to new replies, however your posting "
@@ -3585 +4008 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:60
-#: bbp-theme-compat/bbpress/form-topic.php:86
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:60
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:86
+#: templates/bbp-default/bbpress/form-reply.php:60
+#: templates/bbp-default/bbpress/form-topic.php:86
 msgid "Reply:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:86
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:86
+#: templates/bbp-default/bbpress/form-reply.php:86
 msgid "Tags:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:104
-#: bbp-theme-compat/bbpress/form-topic.php:158
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:104
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:158
+#: templates/bbp-default/bbpress/form-reply.php:104
+#: templates/bbp-default/bbpress/form-topic.php:158
 msgid "Notify the author of follow-up replies via email"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:108
-#: bbp-theme-compat/bbpress/form-topic.php:162
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:108
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:162
+#: templates/bbp-default/bbpress/form-reply.php:108
+#: templates/bbp-default/bbpress/form-topic.php:162
 msgid "Notify me of follow-up replies via email"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:123
-#: bbp-theme-compat/bbpress/form-topic.php:176
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:123
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:176
+#: templates/bbp-default/bbpress/form-reply.php:123
+#: templates/bbp-default/bbpress/form-topic.php:176
 msgid "Revision"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:126
-#: bbp-theme-compat/bbpress/form-topic.php:179
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:126
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:179
+#: templates/bbp-default/bbpress/form-reply.php:126
+#: templates/bbp-default/bbpress/form-topic.php:179
 msgid "Keep a log of this edit:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:130
-#: bbp-theme-compat/bbpress/form-topic.php:183
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:130
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:183
+#: templates/bbp-default/bbpress/form-reply.php:130
+#: templates/bbp-default/bbpress/form-topic.php:183
 msgid "Optional reason for editing:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:172
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:172
+#: templates/bbp-default/bbpress/form-reply.php:172
 msgid "The topic &#8216;%s&#8217; is closed to new replies."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:180
-#: bbp-theme-compat/bbpress/form-topic.php:221
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:180
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:221
+#: templates/bbp-default/bbpress/form-reply.php:180
+#: templates/bbp-default/bbpress/form-topic.php:221
 msgid "The forum &#8216;%s&#8217; is closed to new topics and replies."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:188
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:188
+#: templates/bbp-default/bbpress/form-reply.php:188
 msgid "You cannot reply to this topic."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-reply.php:188
-#: bbp-themes/bbp-twentyten/bbpress/form-reply.php:188
+#: templates/bbp-default/bbpress/form-reply.php:188
 msgid "You must be logged in to reply to this topic."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:24
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:24
+#: templates/bbp-default/bbpress/form-topic-merge.php:24
 msgid "Merge topic \"%s\""
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:29
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:29
+#: templates/bbp-default/bbpress/form-topic-merge.php:29
 msgid ""
 "Select the topic to merge this one into. The destination topic will remain "
@@ -3666 +4069 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:30
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:30
+#: templates/bbp-default/bbpress/form-topic-merge.php:30
 msgid ""
 "To keep this topic as the lead, go to the other topic and use the merge tool "
@@ -3673 +4075 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:34
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:34
+#: templates/bbp-default/bbpress/form-topic-merge.php:34
 msgid ""
 "All replies within both topics will be merged chronologically. The order of "
@@ -3682 +4083 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:38
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:38
+#: templates/bbp-default/bbpress/form-topic-merge.php:38
 msgid "Destination"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:42
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:42
+#: templates/bbp-default/bbpress/form-topic-merge.php:42
 msgid "Merge with this topic:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:51
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:51
+#: templates/bbp-default/bbpress/form-topic-merge.php:51
 msgid "No topics were found to which the topic could be merged to!"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:57
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:57
+#: templates/bbp-default/bbpress/form-topic-merge.php:57
 msgid "There are no other topics in this forum to merge with."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:65
-#: bbp-theme-compat/bbpress/form-topic-split.php:69
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:65
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:69
+#: templates/bbp-default/bbpress/form-topic-merge.php:65
+#: templates/bbp-default/bbpress/form-topic-split.php:69
 msgid "Topic Extras"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:72
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:72
+#: templates/bbp-default/bbpress/form-topic-merge.php:72
 msgid "Merge topic subscribers"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:77
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:77
+#: templates/bbp-default/bbpress/form-topic-merge.php:77
 msgid "Merge topic favoriters"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:82
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:82
+#: templates/bbp-default/bbpress/form-topic-merge.php:82
 msgid "Merge topic tags"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:90
-#: bbp-theme-compat/bbpress/form-topic-split.php:94
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:90
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:94
+#: templates/bbp-default/bbpress/form-topic-merge.php:90
+#: templates/bbp-default/bbpress/form-topic-split.php:94
 msgid "<strong>WARNING:</strong> This process cannot be undone."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:107
-#: bbp-theme-compat/bbpress/form-topic-split.php:111
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:107
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:111
+#: templates/bbp-default/bbpress/form-topic-merge.php:107
+#: templates/bbp-default/bbpress/form-topic-split.php:111
 msgid "You do not have the permissions to edit this topic!"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-merge.php:107
-#: bbp-theme-compat/bbpress/form-topic-split.php:111
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-merge.php:107
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:111
+#: templates/bbp-default/bbpress/form-topic-merge.php:107
+#: templates/bbp-default/bbpress/form-topic-split.php:111
 msgid "You cannot edit this topic."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:24
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:24
+#: templates/bbp-default/bbpress/form-topic-split.php:24
 msgid "Split topic \"%s\""
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:29
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:29
+#: templates/bbp-default/bbpress/form-topic-split.php:29
 msgid ""
 "When you split a topic, you are slicing it in half starting with the reply "
@@ -3758 +4142 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:33
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:33
+#: templates/bbp-default/bbpress/form-topic-split.php:33
 msgid ""
 "If you use the existing topic option, replies within both topics will be "
@@ -3766 +4149 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:37
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:37
+#: templates/bbp-default/bbpress/form-topic-split.php:37
 msgid "Split Method"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:41
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:41
+#: templates/bbp-default/bbpress/form-topic-split.php:41
 msgid "New topic in <strong>%s</strong> titled:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:42
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:42
+#: templates/bbp-default/bbpress/form-topic-split.php:42
 msgid "Split: %s"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:49
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:49
+#: templates/bbp-default/bbpress/form-topic-split.php:49
 msgid "Use an existing topic in this forum:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:58
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:58
+#: templates/bbp-default/bbpress/form-topic-split.php:58
 msgid "No other topics found!"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:76
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:76
+#: templates/bbp-default/bbpress/form-topic-split.php:76
 msgid "Copy subscribers to the new topic"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:81
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:81
+#: templates/bbp-default/bbpress/form-topic-split.php:81
 msgid "Copy favoriters to the new topic"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-split.php:86
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-split.php:86
+#: templates/bbp-default/bbpress/form-topic-split.php:86
 msgid "Copy topic tags to the new topic"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:18
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:18
+#: templates/bbp-default/bbpress/form-topic-tag.php:18
 msgid "Manage Tag: \"%s\""
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:22
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:22
+#: templates/bbp-default/bbpress/form-topic-tag.php:22
 msgid "Rename"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:25
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:25
+#: templates/bbp-default/bbpress/form-topic-tag.php:25
 msgid "Leave the slug empty to have one automatically generated."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:29
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:29
+#: templates/bbp-default/bbpress/form-topic-tag.php:29
 msgid ""
 "Changing the slug affects its permalink. Any links to the old slug will stop "
@@ -3828 +4199 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:35
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:35
-msgid "Name:"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-topic-tag.php:40
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:40
+#: templates/bbp-default/bbpress/form-topic-tag.php:40
 msgid "Slug:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:45
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:45
+#: templates/bbp-default/bbpress/form-topic-tag.php:45
 msgid "Update"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:62
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:62
+#: templates/bbp-default/bbpress/form-topic-tag.php:62
 msgid "Merging tags together cannot be undone."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:68
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:68
+#: templates/bbp-default/bbpress/form-topic-tag.php:68
 msgid "Existing tag:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:73
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:74
+#: templates/bbp-default/bbpress/form-topic-tag.php:73
 msgid ""
 "Are you sure you want to merge the \"%s\" tag into the tag you specified?"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:91
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:92
+#: templates/bbp-default/bbpress/form-topic-tag.php:91
 msgid "This does not delete your topics. Only the tag itself is deleted."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:94
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:95
+#: templates/bbp-default/bbpress/form-topic-tag.php:94
 msgid "Deleting a tag cannot be undone."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:95
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:96
+#: templates/bbp-default/bbpress/form-topic-tag.php:95
 msgid "Any links to this tag will no longer function."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic-tag.php:101
-#: bbp-themes/bbp-twentyten/bbpress/form-topic-tag.php:103
+#: templates/bbp-default/bbpress/form-topic-tag.php:101
 msgid ""
 "Are you sure you want to delete the \"%s\" tag? This is permanent and cannot "
@@ -3881 +4238 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic.php:43
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:43
+#: templates/bbp-default/bbpress/form-topic.php:43
 msgid "Create New Topic in &ldquo;%s&rdquo;"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic.php:43
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:43 bbpress.php:537
-msgid "Create New Topic"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-topic.php:53
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:53
+#: templates/bbp-default/bbpress/form-topic.php:53
 msgid ""
 "This forum is marked as closed to new topics, however your posting "
@@ -3898 +4248 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic.php:75
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:75
+#: templates/bbp-default/bbpress/form-topic.php:75
 msgid "Topic Title (Maximum Length: %d):"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic.php:112
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:112
+#: templates/bbp-default/bbpress/form-topic.php:112
 msgid "Topic Tags:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic.php:139
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:139
+#: templates/bbp-default/bbpress/form-topic.php:139
 msgid "Topic Type:"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-topic.php:229
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:229
-msgid "You cannot create new topics at this time."
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-topic.php:229
-#: bbp-themes/bbp-twentyten/bbpress/form-topic.php:229
+#: templates/bbp-default/bbpress/form-topic.php:229
+msgid "You cannot create new topics."
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-topic.php:229
 msgid "You must be logged in to create new topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:24
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:24
+#: templates/bbp-default/bbpress/form-user-edit.php:24
 msgid "First Name"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:29
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:29
+#: templates/bbp-default/bbpress/form-user-edit.php:29
 msgid "Last Name"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:34
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:34
+#: templates/bbp-default/bbpress/form-user-edit.php:34
 msgid "Nickname"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:39
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:39
-msgid "Display name publicly as"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-user-edit.php:49
-#: bbp-theme-compat/bbpress/form-user-edit.php:52
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:49
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:52
+#: templates/bbp-default/bbpress/form-user-edit.php:39
+msgid "Display Name"
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-user-edit.php:49
+#: templates/bbp-default/bbpress/form-user-edit.php:52
 msgid "Contact Info"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:74
-#: bbp-theme-compat/bbpress/form-user-edit.php:77
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:74
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:77
+#: templates/bbp-default/bbpress/form-user-edit.php:74
+#: templates/bbp-default/bbpress/form-user-edit.php:77
 msgid "About Yourself"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:74
-#: bbp-theme-compat/bbpress/form-user-edit.php:77
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:74
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:77
+#: templates/bbp-default/bbpress/form-user-edit.php:74
+#: templates/bbp-default/bbpress/form-user-edit.php:77
 msgid "About the user"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:82
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:82
+#: templates/bbp-default/bbpress/form-user-edit.php:82
 msgid "Biographical Info"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:84
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:84
+#: templates/bbp-default/bbpress/form-user-edit.php:84
 msgid ""
 "Share a little biographical information to fill out your profile. This may "
@@ -3976 +4309 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:91
-#: bbp-theme-compat/bbpress/form-user-edit.php:94
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:91
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:94
+#: templates/bbp-default/bbpress/form-user-edit.php:91
+#: templates/bbp-default/bbpress/form-user-edit.php:94
 msgid "Account"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:101
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:101
+#: templates/bbp-default/bbpress/form-user-edit.php:101
 msgid "Usernames cannot be changed."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:117
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:117
+#: templates/bbp-default/bbpress/form-user-edit.php:117
 msgid ""
 "There is a pending email address change to <code>%1$s</code>. <a href=\"%2$s"
@@ -3995 +4324 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:126
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:126
+#: templates/bbp-default/bbpress/form-user-edit.php:126
 msgid "New Password"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:129
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:129
+#: templates/bbp-default/bbpress/form-user-edit.php:129
 msgid ""
 "If you would like to change the password type a new one. Otherwise leave "
@@ -4007 +4334 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:132
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:132
+#: templates/bbp-default/bbpress/form-user-edit.php:132
 msgid "Type your new password again."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:135
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:135
-msgid ""
-"Hint: The password should be at least seven characters long. To make it "
-"stronger, use upper and lower case letters, numbers and symbols like ! \" ? "
-"$ % ^ &amp; )."
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-user-edit.php:142
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:142
-msgid "Role:"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-user-edit.php:153
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:153
-msgid "Super Admin"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/form-user-edit.php:156
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:156
+#: templates/bbp-default/bbpress/form-user-edit.php:135
+msgid ""
+"Your password should be at least ten characters long. Use upper and lower "
+"case letters, numbers, and symbols to make it even stronger."
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-user-edit.php:145
+#: templates/bbp-default/bbpress/form-user-edit.php:148
+msgid "User Role"
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-user-edit.php:155
+msgid "Network Role"
+msgstr ""
+
+#: templates/bbp-default/bbpress/form-user-edit.php:158
 msgid "Grant this user super admin privileges for the Network."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:174
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:174
+#: templates/bbp-default/bbpress/form-user-edit.php:180
 msgid "Update Profile"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-edit.php:174
-#: bbp-themes/bbp-twentyten/bbpress/form-user-edit.php:174
+#: templates/bbp-default/bbpress/form-user-edit.php:180
 msgid "Update User"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-login.php:28
-#: bbp-themes/bbp-twentyten/bbpress/form-user-login.php:28
+#: templates/bbp-default/bbpress/form-user-login.php:28
 msgid "Keep me signed in"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-lost-pass.php:18
-#: bbp-themes/bbp-twentyten/bbpress/form-user-lost-pass.php:18
+#: templates/bbp-default/bbpress/form-user-lost-pass.php:18
 msgid "Username or Email"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-lost-pass.php:27
+#: templates/bbp-default/bbpress/form-user-lost-pass.php:27
 msgid "Reset My Password"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-register.php:14
-#: bbp-themes/bbp-twentyten/bbpress/form-user-register.php:14
+#: templates/bbp-default/bbpress/form-user-register.php:14
 msgid "Create an Account"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-register.php:17
-#: bbp-themes/bbp-twentyten/bbpress/form-user-register.php:17
+#: templates/bbp-default/bbpress/form-user-register.php:17
 msgid "Your username must be unique, and cannot be changed later."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/form-user-register.php:18
-#: bbp-themes/bbp-twentyten/bbpress/form-user-register.php:18
+#: templates/bbp-default/bbpress/form-user-register.php:18
 msgid ""
 "We use your email address to email you a secure password and verify your "
@@ -4076 +4391 @@
 msgstr ""
 
-#: bbp-theme-compat/bbpress/loop-single-topic.php:30
-#: bbp-themes/bbp-twentyten/bbpress/loop-single-topic.php:30
+#: templates/bbp-default/bbpress/form-user-roles.php:2
+msgid "Blog Role"
+msgstr ""
+
+#: templates/bbp-default/bbpress/loop-single-reply.php:21
+msgid "in reply to: "
+msgstr ""
+
+#: templates/bbp-default/bbpress/loop-single-topic.php:30
 msgid "Started by: %1$s"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/loop-single-topic.php:38
-#: bbp-themes/bbp-twentyten/bbpress/loop-single-topic.php:38
+#: templates/bbp-default/bbpress/loop-single-topic.php:38
 msgid "in: <a href=\"%1$s\">%2$s</a>"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-details.php:16
-#: bbp-themes/bbp-twentyten/bbpress/user-details.php:16
-msgid "Profile: %s"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/user-details.php:20
-#: bbp-themes/bbp-twentyten/bbpress/user-details.php:20
+#: templates/bbp-default/bbpress/user-details.php:29
+#: templates/bbp-default/bbpress/user-profile.php:15
+msgid "Profile"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-details.php:35
+msgid "%s's Topics Started"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-details.php:41
+msgid "%s's Replies Created"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-details.php:48
+msgid "%s's Favorites"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-details.php:58
+msgid "%s's Subscriptions"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-details.php:65
 msgid "Edit Profile of User %s"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-details.php:33
-#: bbp-themes/bbp-twentyten/bbpress/user-details.php:33
-msgid "About %s"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/user-favorites.php:17
-#: bbp-themes/bbp-twentyten/bbpress/user-favorites.php:17
+#: templates/bbp-default/bbpress/user-favorites.php:15
 msgid "Favorite Forum Topics"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-favorites.php:30
-#: bbp-themes/bbp-twentyten/bbpress/user-favorites.php:28
+#: templates/bbp-default/bbpress/user-favorites.php:28
 msgid "You currently have no favorite topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-favorites.php:30
-#: bbp-themes/bbp-twentyten/bbpress/user-favorites.php:28
+#: templates/bbp-default/bbpress/user-favorites.php:28
 msgid "This user has no favorite topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-subscriptions.php:21
-#: bbp-themes/bbp-twentyten/bbpress/user-subscriptions.php:21
+#: templates/bbp-default/bbpress/user-profile.php:24
+msgid "Forum Role: %s"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-profile.php:25
+msgid "Topics Started: %s"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-profile.php:26
+msgid "Replies Created: %s"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-replies-created.php:15
+msgid "Forum Replies Created"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-replies-created.php:28
+msgid "You have not replied to any topics."
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-replies-created.php:28
+msgid "This user has not replied to any topics."
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-subscriptions.php:19
 msgid "Subscribed Forum Topics"
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-subscriptions.php:34
-#: bbp-themes/bbp-twentyten/bbpress/user-subscriptions.php:32
+#: templates/bbp-default/bbpress/user-subscriptions.php:32
 msgid "You are not currently subscribed to any topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-subscriptions.php:34
-#: bbp-themes/bbp-twentyten/bbpress/user-subscriptions.php:32
+#: templates/bbp-default/bbpress/user-subscriptions.php:32
 msgid "This user is not currently subscribed to any topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-topics-created.php:17
-#: bbp-themes/bbp-twentyten/bbpress/user-topics-created.php:17
-msgid "Forum Topics Created"
-msgstr ""
-
-#: bbp-theme-compat/bbpress/user-topics-created.php:30
-#: bbp-themes/bbp-twentyten/bbpress/user-topics-created.php:28
+#: templates/bbp-default/bbpress/user-topics-created.php:15
+msgid "Forum Topics Started"
+msgstr ""
+
+#: templates/bbp-default/bbpress/user-topics-created.php:28
 msgid "You have not created any topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress/user-topics-created.php:30
-#: bbp-themes/bbp-twentyten/bbpress/user-topics-created.php:28
+#: templates/bbp-default/bbpress/user-topics-created.php:28
 msgid "This user has not created any topics."
 msgstr ""
 
-#: bbp-theme-compat/bbpress-functions.php:68 bbpress.php:376
-msgid "bbPress Default"
-msgstr ""
-
-#: bbp-theme-compat/bbpress-functions.php:251
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:202
+#: templates/bbp-default/bbpress-functions.php:251
 msgid "favorites"
 msgstr ""
 
-#: bbp-theme-compat/bbpress-functions.php:252
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:203
+#: templates/bbp-default/bbpress-functions.php:252
 msgid "?"
 msgstr ""
 
-#: bbp-theme-compat/bbpress-functions.php:253
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:204
+#: templates/bbp-default/bbpress-functions.php:253
 msgid "This topic is one of your %favLinkYes% [%favDel%]"
 msgstr ""
 
-#: bbp-theme-compat/bbpress-functions.php:254
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:205
+#: templates/bbp-default/bbpress-functions.php:254
 msgid "%favAdd% (%favLinkNo%)"
 msgstr ""
 
-#: bbp-theme-compat/extras/page-forum-statistics.php:26
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:27
+#: templates/bbp-default/extras/page-forum-statistics.php:26
 msgid "<p>Here are the statistics and popular topics of our forums.</p>"
 msgstr ""
 
-#: bbp-theme-compat/extras/page-forum-statistics.php:34
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:33
+#: templates/bbp-default/extras/page-forum-statistics.php:34
 msgid "Registered Users"
 msgstr ""
 
-#: bbp-theme-compat/extras/page-forum-statistics.php:61
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:60
+#: templates/bbp-default/extras/page-forum-statistics.php:61
 msgid "Empty Topic Tags"
 msgstr ""
 
-#: bbp-theme-compat/extras/page-forum-statistics.php:70
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:69
+#: templates/bbp-default/extras/page-forum-statistics.php:70
 msgid "Hidden Topics"
 msgstr ""
 
-#: bbp-theme-compat/extras/page-forum-statistics.php:81
-#: bbp-themes/bbp-twentyten/page-forum-statistics.php:80
+#: templates/bbp-default/extras/page-forum-statistics.php:81
 msgid "Hidden Replies"
 msgstr ""
 
-#: bbp-theme-compat/extras/page-topic-tags.php:22
-#: bbp-themes/bbp-twentyten/page-topic-tags.php:23
+#: templates/bbp-default/extras/page-topic-tags.php:22
 msgid ""
 "<p>This is a collection of tags that are currently popular on our forums.</p>"
-msgstr ""
-
-#: bbp-themes/bbp-twentyten/bbpress/form-user-lost-pass.php:27
-msgid "Reset my password"
-msgstr ""
-
-#: bbp-themes/bbp-twentyten/bbpress/loop-topics.php:21
-msgid "Remove"
-msgstr ""
-
-#: bbp-themes/bbp-twentyten/bbpress-functions.php:60 bbpress.php:386
-msgid "Twenty Ten (bbPress)"
-msgstr ""
-
-#: bbp-themes/bbp-twentyten/single-reply.php:50
-msgid "Posted on %1$s at %2$s"
-msgstr ""
-
-#: bbpress.php:130 bbpress.php:137
-msgid "Cheatin&#8217; huh?"
-msgstr ""
-
-#: bbpress.php:479 bbpress.php:483
-msgid "New Forum"
-msgstr ""
-
-#: bbpress.php:482
-msgid "Edit Forum"
-msgstr ""
-
-#: bbpress.php:484 bbpress.php:485
-msgid "View Forum"
-msgstr ""
-
-#: bbpress.php:486
-msgid "Search Forums"
-msgstr ""
-
-#: bbpress.php:487
-msgid "No forums found"
-msgstr ""
-
-#: bbpress.php:488
-msgid "No forums found in Trash"
-msgstr ""
-
-#: bbpress.php:512
-msgid "bbPress Forums"
-msgstr ""
-
-#: bbpress.php:536 bbpress.php:540
-msgid "New Topic"
-msgstr ""
-
-#: bbpress.php:539
-msgid "Edit Topic"
-msgstr ""
-
-#: bbpress.php:541 bbpress.php:542
-msgid "View Topic"
-msgstr ""
-
-#: bbpress.php:543
-msgid "Search Topics"
-msgstr ""
-
-#: bbpress.php:544
-msgid "No topics found"
-msgstr ""
-
-#: bbpress.php:545
-msgid "No topics found in Trash"
-msgstr ""
-
-#: bbpress.php:569
-msgid "bbPress Topics"
-msgstr ""
-
-#: bbpress.php:593 bbpress.php:597
-msgid "New Reply"
-msgstr ""
-
-#: bbpress.php:594
-msgid "Create New Reply"
-msgstr ""
-
-#: bbpress.php:596
-msgid "Edit Reply"
-msgstr ""
-
-#: bbpress.php:598 bbpress.php:599
-msgid "View Reply"
-msgstr ""
-
-#: bbpress.php:600
-msgid "Search Replies"
-msgstr ""
-
-#: bbpress.php:601
-msgid "No replies found"
-msgstr ""
-
-#: bbpress.php:602
-msgid "No replies found in Trash"
-msgstr ""
-
-#: bbpress.php:603
-msgid "Topic:"
-msgstr ""
-
-#: bbpress.php:626
-msgid "bbPress Replies"
-msgstr ""
-
-#: bbpress.php:661
-msgctxt "post"
-msgid "Closed"
-msgstr ""
-
-#: bbpress.php:662
-msgctxt "bbpress"
-msgid "Closed <span class=\"count\">(%s)</span>"
-msgid_plural "Closed <span class=\"count\">(%s)</span>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbpress.php:672
-msgctxt "post"
-msgid "Spam"
-msgstr ""
-
-#: bbpress.php:673
-msgctxt "bbpress"
-msgid "Spam <span class=\"count\">(%s)</span>"
-msgid_plural "Spam <span class=\"count\">(%s)</span>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbpress.php:685
-msgctxt "post"
-msgid "Orphan"
-msgstr ""
-
-#: bbpress.php:686
-msgctxt "bbpress"
-msgid "Orphan <span class=\"count\">(%s)</span>"
-msgid_plural "Orphans <span class=\"count\">(%s)</span>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbpress.php:698
-msgctxt "post"
-msgid "Hidden"
-msgstr ""
-
-#: bbpress.php:699
-msgctxt "bbpress"
-msgid "Hidden <span class=\"count\">(%s)</span>"
-msgid_plural "Hidden <span class=\"count\">(%s)</span>"
-msgstr[0] ""
-msgstr[1] ""
-
-#: bbpress.php:746
-msgid "Search Tags"
-msgstr ""
-
-#: bbpress.php:747
-msgid "Popular Tags"
-msgstr ""
-
-#: bbpress.php:748
-msgid "All Tags"
-msgstr ""
-
-#: bbpress.php:749
-msgid "Edit Tag"
-msgstr ""
-
-#: bbpress.php:750
-msgid "Update Tag"
-msgstr ""
-
-#: bbpress.php:751
-msgid "Add New Tag"
-msgstr ""
-
-#: bbpress.php:752
-msgid "New Tag Name"
-msgstr ""
-
-#: bbpress.php:753
-msgid "View Topic Tag"
-msgstr ""
-
-#: bbpress.php:791
-msgid "Topics with no replies"
 msgstr ""
 
@@ -4401 +4537 @@
 msgstr ""
 
-#. #-#-#-#-#  plugin.pot (bbPress 2.2-bleeding)  #-#-#-#-#
+#. #-#-#-#-#  plugin.pot (bbPress 2.2-rc2)  #-#-#-#-#
 #. Plugin URI of the plugin/theme
-#. #-#-#-#-#  plugin.pot (bbPress 2.2-bleeding)  #-#-#-#-#
+#. #-#-#-#-#  plugin.pot (bbPress 2.2-rc2)  #-#-#-#-#
 #. Author URI of the plugin/theme
 msgid "http://bbpress.org"