From e16c8f34113f7bc7f01a2ada4096816cb8fd8e2d Mon Sep 17 00:00:00 2001
From: James <james@sourcefabric-DX4840.(none)>
Date: Tue, 11 Oct 2011 17:29:49 -0400
Subject: [PATCH] CC-2945: Change "Storage Folder" to "Import Folder"

- fixed
---
 airtime_mvc/application/forms/WatchedDirPreferences.php       | 4 ++--
 .../views/scripts/form/preferences_watched_dirs.phtml         | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/airtime_mvc/application/forms/WatchedDirPreferences.php b/airtime_mvc/application/forms/WatchedDirPreferences.php
index 278a782d7..9e8021839 100644
--- a/airtime_mvc/application/forms/WatchedDirPreferences.php
+++ b/airtime_mvc/application/forms/WatchedDirPreferences.php
@@ -11,7 +11,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'storageFolder', array(
             'class'      => 'input_text',
-            'label'      => 'Airtime\'s Storage Folder:',
+            'label'      => 'Import Folder:',
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => '',
@@ -22,7 +22,7 @@ class Application_Form_WatchedDirPreferences extends Zend_Form_SubForm
 
         $this->addElement('text', 'watchedFolder', array(
             'class'      => 'input_text',
-            'label'      => 'Choose a Watched Folder:',
+            'label'      => 'Watched Folders:',
             'required'   => false,
             'filters'    => array('StringTrim'),
             'value' => '',
diff --git a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
index 001112d1a..f384eb752 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_watched_dirs.phtml
@@ -16,7 +16,7 @@
                 </ul>
             <?php endif; ?>
         </dd>
-        <dd class="block-display selected-item"><strong>Current Storage Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
+        <dd class="block-display selected-item"><strong>Current Import Folder:</strong><?php $stor = Application_Model_MusicDir::getStorDir(); echo $stor->getDirectory(); ?></dd>
 
         <dt id="watchedFolder-label" class="block-display">
             <label class="required" for="watchedFolder"><?php echo $this->element->getElement('watchedFolder')->getLabel() ?></label>