Index: theme-settings.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/theme-settings.php,v
retrieving revision 1.6.2.6
diff -u -r1.6.2.6 theme-settings.php
--- theme-settings.php	11 Oct 2008 13:41:44 -0000	1.6.2.6
+++ theme-settings.php	19 Oct 2008 09:06:44 -0000
@@ -48,13 +48,13 @@
   );
   $form['dashboard']['rootcandy_dashboard_help'] = array(
     '#type' => 'select',
-    '#options' => array('left' => 'left','right' => 'right','content' => 'content'),
+    '#options' => array('left' => t('Left'),'right' => t('Right'),'content' => t('Content')),
     '#title' => t('Help box position'),
     '#default_value' => $settings['rootcandy_dashboard_help'],
   );
   $form['dashboard']['rootcandy_dashboard_messages'] = array(
     '#type' => 'select',
-    '#options' => array('left' => 'left','right' => 'right','content' => 'content'),
+    '#options' => array('left' => t('Left'),'right' => t('Right'),'content' => t('Content')),
     '#title' => t('Messages box position'),
     '#default_value' => $settings['rootcandy_dashboard_messages'],
   );
@@ -100,11 +100,11 @@
   foreach ($roles as $rid => $role) {
     $form['navigation']['nav-by-role']['rootcandy_navigation_source_'. $rid] = array(
       '#type' => 'select',
-      '#title' => t($role) . ' navigation',
+      '#title' => t('@role navigation', array('@role' => $role)),
       '#default_value' => $settings['rootcandy_navigation_source_'. $rid],
       '#options' => $primary_options,
       '#tree' => FALSE,
-      '#description' => t('Select what should be displayed as the navigation menu for role ') . t($role) .'.',
+      '#description' => t('Select what should be displayed as the navigation menu for role @role.', array('@role' => $role)),
     );
   }
 


Index: template.php
===================================================================
RCS file: /cvs/drupal-contrib/contributions/themes/rootcandy/template.php,v
retrieving revision 1.36.2.8
diff -u -r1.36.2.8 template.php
--- template.php	11 Oct 2008 10:28:43 -0000	1.36.2.8
+++ template.php	19 Oct 2008 14:25:04 -0000
@@ -5,7 +5,7 @@
   global $user;
   if ($user->uid) {
     $links[] = '<a href="'. url('user') .'" class="user-name">'. $user->name .'</a>';
-    $links[] = '<a href="'. url('logout') .'">Logout</a>';
+    $links[] = '<a href="'. url('logout') .'">'. t('Logout') .'</a>';
     $links = implode(' | ', $links);
   }
 
@@ -56,16 +56,16 @@
   }
   else {
     // build default menu
-    $menu_tree[] = array('href' => 'admin', 'title' => 'Dashboard');
-    $menu_tree[] = array('href' => 'admin/content', 'title' => 'Content');
+    $menu_tree[] = array('href' => 'admin', 'title' => t('Dashboard'));
+    $menu_tree[] = array('href' => 'admin/content', 'title' => t('Content'));
     if (variable_get('node_admin_theme', '0')) {
-      $menu_tree[] = array('href' => 'node/add', 'title' => 'Create content');
+      $menu_tree[] = array('href' => 'node/add', 'title' => t('Create content'));
     }
-    $menu_tree[] = array('href' => 'admin/build', 'title' => 'Building');
-    $menu_tree[] = array('href' => 'admin/settings', 'title' => 'Configuration');
-    $menu_tree[] = array('href' => 'admin/user', 'title' => 'Users');
-    $menu_tree[] = array('href' => 'admin/reports', 'title' => 'Reports');
-    $menu_tree[] = array('href' => 'admin/help', 'title' => 'Help');
+    $menu_tree[] = array('href' => 'admin/build', 'title' => t('Building'));
+    $menu_tree[] = array('href' => 'admin/settings', 'title' => t('Configuration'));
+    $menu_tree[] = array('href' => 'admin/user', 'title' => t('Users'));
+    $menu_tree[] = array('href' => 'admin/reports', 'title' => t('Reports'));
+    $menu_tree[] = array('href' => 'admin/help', 'title' => t('Help'));
   }
 
   if ($menu_tree) {