Index: views_slideshow_plugin_style_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/Attic/views_slideshow_plugin_style_slideshow.inc,v
retrieving revision 1.1.2.1.2.9.2.4
diff -u -p -r1.1.2.1.2.9.2.4 views_slideshow_plugin_style_slideshow.inc
--- views_slideshow_plugin_style_slideshow.inc	29 Sep 2010 03:07:49 -0000	1.1.2.1.2.9.2.4
+++ views_slideshow_plugin_style_slideshow.inc	30 Sep 2010 19:38:43 -0000
@@ -71,7 +71,7 @@ class views_slideshow_plugin_style_slide
 
         $form[$module] = array(
           '#type' => 'fieldset',
-          '#title' => t( $modules[$module] . ' options'),
+          '#title' => t('!module options', array('!module' => $modules[$module])),
           '#collapsible' => TRUE,
           '#attributes' => array('class' => $module),
         );
Index: contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views_slideshow/contrib/views_slideshow_cycle/Attic/views_slideshow_cycle.views_slideshow.inc,v
retrieving revision 1.1.2.13
diff -u -p -r1.1.2.13 views_slideshow_cycle.views_slideshow.inc
--- contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc	29 Sep 2010 03:07:49 -0000	1.1.2.13
+++ contrib/views_slideshow_cycle/views_slideshow_cycle.views_slideshow.inc	30 Sep 2010 19:38:43 -0000
@@ -549,57 +549,57 @@ function views_slideshow_cycle_views_sli
   // All the jquery cycle options according to
   // http://malsup.com/jquery/cycle/options.html
   $cycle_options = array(
-    'activePagerClass' => 'class name used for the active pager link',
-    'after' => 'transition callback (scope set to element that was shown):     function(currSlideElement, nextSlideElement, options, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'allowPagerClickBubble' => 'allows or prevents click event on pager anchors from bubbling',
-    'animIn' => 'properties that define how the slide animates in',
-    'animOut' => 'properties that define how the slide animates out',
-    'autostop' => 'true to end slideshow after X transitions (where X == slide count)',
-    'autostopCount' => 'number of transitions (optionally used with autostop to define X)',
-    'before' => 'transition callback (scope set to element to be shown):     function(currSlideElement, nextSlideElement, options, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'cleartype' => 'true if clearType corrections should be applied (for IE)',
-    'cleartypeNoBg' => 'set to true to disable extra cleartype fixing (leave false to force background color setting on slides)',
-    'containerResize' => 'resize container to fit largest slide',
-    'continuous' => 'true to start next transition immediately after current one completes',
-    'cssAfter' => 'properties that defined the state of the slide after transitioning out',
-    'cssBefore' => 'properties that define the initial state of the slide before transitioning in',
-    'delay' => 'additional delay (in ms) for first transition (hint: can be negative)',
-    'easing' => 'easing method for both in and out transitions',
-    'easingIn' => 'easing for "in" transition',
-    'easingOut' => 'easing for "out" transition',
-    'end' => 'callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'fastOnEvent' => 'force fast transitions when triggered manually (via pager or prev/next); value == time in ms',
-    'fit' => 'force slides to fit container',
-    'fx' => 'name of transition effect (or comma separated names, ex: fade,scrollUp,shuffle)',
-    'fxFn' => 'function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'height' => 'container height',
-    'manualTrump' => 'causes manual transition to stop an active transition instead of being ignored',
-    'next' => 'selector for element to use as click trigger for next slide',
-    'nowrap' => 'true to prevent slideshow from wrapping',
-    'pager' => 'selector for element to use as pager container',
-    'pagerAnchorBuilder' => 'callback fn for building anchor links:  function(index, DOMelement)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'pagerClick' => 'callback fn for pager clicks:    function(zeroBasedSlideIndex, slideElement)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'pagerEvent' => 'name of event which drives the pager navigation',
-    'pause' => 'true to enable "pause on hover"',
-    'pauseOnPagerHover' => 'true to pause when hovering over pager link',
-    'prev' => 'selector for element to use as click trigger for previous slide',
-    'prevNextClick' => 'callback fn for prev/next clicks:    function(isNext, zeroBasedSlideIndex, slideElement)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'prevNextEvent' => 'event which drives the manual transition to the previous or next slide',
-    'random' => 'true for random, false for sequence (not applicable to shuffle fx)',
-    'randomizeEffects' => 'valid when multiple effects are used; true to make the effect sequence random',
-    'requeueOnImageNotLoaded' => 'requeue the slideshow if any image slides are not yet loaded',
-    'requeueTimeout' => 'ms delay for requeue',
-    'rev' => 'causes animations to transition in reverse',
-    'shuffle' => 'coords for shuffle animation, ex: { top:15, left: 200 }',
-    'slideExpr' => 'expression for selecting slides (if something other than all children is required)',
-    'speed' => 'speed of the transition (any valid fx speed value)',
-    'speedIn' => 'speed of the "in" transition',
-    'speedOut' => 'speed of the "out" transition',
-    'startingSlide' => 'zero-based index of the first slide to be displayed',
-    'sync' => 'true if in/out transitions should occur simultaneously',
-    'timeout' => 'milliseconds between slide transitions (0 to disable auto advance)',
-    'timeoutFn' => 'callback for determining per-slide timeout value:  function(currSlideElement, nextSlideElement, options, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.',
-    'updateActivePagerLink' => 'callback fn invoked to update the active pager link (adds/removes activePagerClass style)',
+    'activePagerClass' => t('class name used for the active pager link'),
+    'after' => t('transition callback (scope set to element that was shown):     function(currSlideElement, nextSlideElement, options, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'allowPagerClickBubble' => t('allows or prevents click event on pager anchors from bubbling'),
+    'animIn' => t('properties that define how the slide animates in'),
+    'animOut' => t('properties that define how the slide animates out'),
+    'autostop' => t('true to end slideshow after X transitions (where X == slide count)'),
+    'autostopCount' => t('number of transitions (optionally used with autostop to define X)'),
+    'before' => t('transition callback (scope set to element to be shown):     function(currSlideElement, nextSlideElement, options, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'cleartype' => t('true if clearType corrections should be applied (for IE)'),
+    'cleartypeNoBg' => t('set to true to disable extra cleartype fixing (leave false to force background color setting on slides)'),
+    'containerResize' => t('resize container to fit largest slide'),
+    'continuous' => t('true to start next transition immediately after current one completes'),
+    'cssAfter' => t('properties that defined the state of the slide after transitioning out'),
+    'cssBefore' => t('properties that define the initial state of the slide before transitioning in'),
+    'delay' => t('additional delay (in ms) for first transition (hint: can be negative)'),
+    'easing' => t('easing method for both in and out transitions'),
+    'easingIn' => t('easing for "in" transition'),
+    'easingOut' => t('easing for "out" transition'),
+    'end' => t('callback invoked when the slideshow terminates (use with autostop or nowrap options): function(options)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'fastOnEvent' => t('force fast transitions when triggered manually (via pager or prev/next); value == time in ms'),
+    'fit' => t('force slides to fit container'),
+    'fx' => t('name of transition effect (or comma separated names, ex: fade,scrollUp,shuffle)'),
+    'fxFn' => t('function used to control the transition: function(currSlideElement, nextSlideElement, options, afterCalback, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'height' => t('container height'),
+    'manualTrump' => t('causes manual transition to stop an active transition instead of being ignored'),
+    'next' => t('selector for element to use as click trigger for next slide'),
+    'nowrap' => t('true to prevent slideshow from wrapping'),
+    'pager' => t('selector for element to use as pager container'),
+    'pagerAnchorBuilder' => t('callback fn for building anchor links:  function(index, DOMelement)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'pagerClick' => t('callback fn for pager clicks:    function(zeroBasedSlideIndex, slideElement)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'pagerEvent' => t('name of event which drives the pager navigation'),
+    'pause' => t('true to enable "pause on hover"'),
+    'pauseOnPagerHover' => t('true to pause when hovering over pager link'),
+    'prev' => t('selector for element to use as click trigger for previous slide'),
+    'prevNextClick' => t('callback fn for prev/next clicks:    function(isNext, zeroBasedSlideIndex, slideElement)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'prevNextEvent' => t('event which drives the manual transition to the previous or next slide'),
+    'random' => t('true for random, false for sequence (not applicable to shuffle fx)'),
+    'randomizeEffects' => t('valid when multiple effects are used; true to make the effect sequence random'),
+    'requeueOnImageNotLoaded' => t('requeue the slideshow if any image slides are not yet loaded'),
+    'requeueTimeout' => t('ms delay for requeue'),
+    'rev' => t('causes animations to transition in reverse'),
+    'shuffle' => t('coords for shuffle animation, ex: { top:15, left: 200 }'),
+    'slideExpr' => t('expression for selecting slides (if something other than all children is required)'),
+    'speed' => t('speed of the transition (any valid fx speed value)'),
+    'speedIn' => t('speed of the "in" transition'),
+    'speedOut' => t('speed of the "out" transition'),
+    'startingSlide' => t('zero-based index of the first slide to be displayed'),
+    'sync' => t('true if in/out transitions should occur simultaneously'),
+    'timeout' => t('milliseconds between slide transitions (0 to disable auto advance)'),
+    'timeoutFn' => t('callback for determining per-slide timeout value:  function(currSlideElement, nextSlideElement, options, forwardFlag)  Do not enter the function in this box.  Only enter what you would have entered within the function.'),
+    'updateActivePagerLink' => t('callback fn invoked to update the active pager link (adds/removes activePagerClass style)'),
   );
   
   foreach ($cycle_options as $name => $description) {
@@ -607,7 +607,7 @@ function views_slideshow_cycle_views_sli
     // fx
     $form['views_slideshow_cycle']['advanced_use_' . $lower_name] = array(
       '#type' => 'checkbox',
-      '#title' => t('Override ' . $name . ' setting'),
+      '#title' => t('Override !name setting', array('!name' => $name)),
       '#default_value' => $view->options['views_slideshow_cycle']['advanced_use_' . $lower_name],
       '#process' => array('views_process_dependency'),
       '#dependency' => array('edit-style-options-views-slideshow-cycle-cycle-options' => array(1)),
@@ -615,9 +615,9 @@ function views_slideshow_cycle_views_sli
     
     $form['views_slideshow_cycle']['advanced_' . $lower_name] = array(
       '#type' => 'textarea',
-      '#title' => t($lower_name),
+      '#title' => t('!lower_name', array('!lower_name' => $lower_name)),
       '#default_value' => $view->options['views_slideshow_cycle']['advanced_' . $lower_name],
-      '#description' => t($description),
+      '#description' => $description,  // Don't need to wrap in t() since it's done above.
       '#process' => array('views_process_dependency'),
       '#dependency_count' => 2,
       '#dependency' => array(