Merge pull request #65 from bhubbard/master

A few copy changes.
ACCORD5 · Feb 24, 2012 · 0ac074e · 0ac074e
2 parents b423f99 + 76101d7
commit 0ac074e
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/admin/admin/ad_about.php b/admin/admin/ad_about.php
@@ -92,7 +92,7 @@ public function auto_run()
                         ". $this->trellis->skin->group_title( 'About Trellis Desk' ) ."
                         <div class='option1' style='font-weight: normal; margin-bottom: 8px;'><strong>Help is on the way.</strong>  Trellis Desk is a powerful and robust help desk solution for your business. Improve your company's service by allowing your customers to quickly and easily submit support tickets to your team. Trellis Desk sports a range of advanced features that enable your business to handle customer support more efficiently. Plus, it's completely free &mdash; you'll never have to pay any license fees to use Trellis Desk.<br /><br />Show your appreciation and support by helping out your Lead Trellis Desk Developer, DJ, with a <a href='http://www.djtarazona.com/index.php?page=donate' target='_blank'><strong>donation</strong></a>.</div>
                         ". $this->trellis->skin->group_title( 'Credits' ) ."
-                        <div class='option1' style='font-weight: normal;'>Thanks to everyone who has contributed to Trellis Desk.  We will have a full, up-to-date list of appropriate credits here soon.</div>
+                        <div class='option1' style='font-weight: normal;'>Thanks to everyone who has contributed to Trellis Desk.  We will have a full, up-to-date list on <a href='https://github.com/ACCORD5/TrellisDesk/contributors' target='_blank'>GitHub</a>.</div>
                         </div>";
 
         $this->trellis->skin->add_sidebar_general( 'Icon Usage', 'We tip our hats to Yusuke Kamiyamane (<a href="http://www.pinvoke.com" target="_blank">pinvoke.com</a>) for graciously giving away his Fugue iconset to the world. Also, much thanks to Mark James (<a href="http://www.famfamfam.com" target="_blank">famfamfam.com</a>) for sharing his Silk iconset. These icons help make Trellis Desk look pretty.' );

diff --git a/includes/classes/class_askin.php b/includes/classes/class_askin.php
@@ -73,7 +73,7 @@ function __construct(&$trellis)
         $this->add_sub_nav( 6,    1,    '{lang.menu_documentation}',         'http://docs.accord5.com/'                                            );
         $this->add_sub_nav( 6,    2,    '{lang.menu_p2p_support}',            'http://forums.accord5.com/index.php?showforum=22'                    );
         $this->add_sub_nav( 6,    3,    '{lang.menu_official_support}',        'http://customer.accord5.com/'                                        );
-        $this->add_sub_nav( 6,    4,    '{lang.menu_bug_tracker}',             'http://trac6.assembla.com/trellisdesk'                                );
+        $this->add_sub_nav( 6,    4,    '{lang.menu_bug_tracker}',             'https://github.com/ACCORD5/TrellisDesk/issues'                                );
 
         $this->add_popup_nav( 'ticket_control', 1, '{lang.menu_manage_tickets}',        'admin.php?section=manage&amp;page=tickets'        );
         $this->add_popup_nav( 'ticket_control', 2, '{lang.menu_manage_priorities}',        'admin.php?section=manage&amp;page=priorities'    );

diff --git a/languages/en/ad_lang_settings.php b/languages/en/ad_lang_settings.php
@@ -17,7 +17,7 @@
 'my_signature' => 'My Signature',
 'alert_settings_updated' => 'Your ACP Settings have been successfully updated.',
 'hey_you_title' => 'Hey... you! Yeah, you!',
-'hey_you_msg' => 'Since you\'re reading this paragraph right now, it\'s safe to say that you are a Trellis Desk user. And we want to hear what you, the user, thinks about our software! Please visit the <a href="http://trac.assembla.com/trellisdesk" target="_blank">ACCORD5 bug tracker</a> where you can report bugs or suggest any features you\'d like to see in future versions of Trellis Desk. Or, if you\'re not feeling that adventurous, just drop us a message at <a href="mailto:info@accord5.com">info@accord5.com</a>. We really want to hear what you think about Trellis Desk!',
+'hey_you_msg' => 'Since you\'re reading this paragraph right now, it\'s safe to say that you are a Trellis Desk user. And we want to hear what you, the user, thinks about our software! Please visit the <a href="https://github.com/ACCORD5/TrellisDesk/issues" target="_blank">ACCORD5 issue tracker</a> where you can report bugs or suggest any features you\'d like to see in future versions of Trellis Desk. Or, if you\'re not feeling that adventurous, just drop us a message at <a href="mailto:info@accord5.com">info@accord5.com</a>. We really want to hear what you think about Trellis Desk!',
 'email_notifications' => 'Email Notifications',
 'email_ticket' => 'Ticket Notifications',
 'email_user_approve' => 'New User Approval',

diff --git a/upgrade/index.php b/upgrade/index.php
@@ -473,7 +473,7 @@ function do_output($content, $step=0)
             <!-- GLOBAL: Copyright bar -->
             <div id='powerbar'>
                 <div class='righty' style='font-weight: normal'>Designed by ACCORD5 in California</div>
-                <div class='lefty'>Powered by Trellis Desk <% VERSION %>, &copy; <% YEAR %> <a href='http://www.accord5.com/'>ACCORD5</a></div>
+                <div class='lefty'>Powered by Trellis Desk <% VERSION %>, &copy; <% YEAR %> <a href='http://www.accord5.com/' target='_blank'>ACCORD5</a></div>
             </div>
 
         </div>