--- a/feeds.drush.inc
+++ b/feeds.drush.inc
@@ -8,7 +8,7 @@
 /**
  * Implements hook_drush_command().
  *
- * @See drush_parse_command() for a list of recognized keys.
+ * @see drush_parse_command() for a list of recognized keys.
  *
  * @return array
  *   An associative array describing your command(s).
@@ -17,65 +17,65 @@ function feeds_drush_command() {
   $items = array();
 
   $items['feeds-list-importers'] = array(
-    'description' => 'Displays the configs of all importers.',
+    'description' => dt('Displays the configs of all importers.'),
     'examples' => array(
       'drush feeds-list',
     ),
   );
 
   $items['feeds-list-feeds'] = array(
-    'description' => 'Displays all instances of all Feeds of a given importer (passed as arg).',
+    'description' => dt('Displays all instances of all Feeds of a given importer (passed as arg).'),
     'arguments' => array(
-      'importer' => 'The name of the Feeds importer whose instances will be listed. Optional.',
+      'importer' => dt('The name of the Feeds importer whose instances will be listed. Optional.'),
     ),
     'examples' => array(
-      'drush feeds-list-all' => 'List all instances of all feeds.',
-      'drush feeds-list-all rss_feed' => 'List all feed instances of the rss_feed importer.',
+      'drush feeds-list-feeds' => dt('List all instances of all feeds.'),
+      'drush feeds-list-feeds rss_feed' => dt('List all feed instances of the rss_feed importer.'),
     ),
     'options' => array(
-      'limit' => 'Only list [limit] feeds. Optional.',
+      'limit' => dt('Only list [limit] feeds. Optional.'),
     ),
   );
 
   $items['feeds-import'] = array(
-    'description' => 'Imports a feed.',
+    'description' => dt('Imports a feed.'),
     'arguments' => array(
-      'importer' => 'The name of the Feeds importer that will be refreshed. Mandatory.',
+      'importer' => dt('The name of the Feeds importer that will be refreshed. Mandatory.'),
     ),
     'options' => array(
-      'nid' => 'The nid of the Feeds importer that will be refreshed. Optional.',
-      'file' => 'The file to import. Optional.',
-      'url' => 'The URL to import. Optional.',
-      'stdin' => 'Read the file to import from stdin. Optional.',
+      'nid' => dt('The nid of the Feeds importer that will be imported. Optional.'),
+      'file' => dt('The file to import. Optional.'),
+      'url' => dt('The URL to import. Optional.'),
+      'stdin' => dt('Read the file to import from stdin. Optional.'),
     ),
     'examples' => array(
-      'drush feeds-import my_importer' => 'Import the feed my_importer.',
-      'drush feeds-import my_importer --nid=2' => 'Import my_importer associated with nid 2.',
+      'drush feeds-import my_importer' => dt('Import the feed my_importer.'),
+      'drush feeds-import my_importer --nid=2' => dt('Import my_importer associated with nid 2.'),
     ),
   );
 
   $items['feeds-import-all'] = array(
-    'description' => 'Import all instances of feeds of the given type.',
+    'description' => dt('Import all instances of feeds of the given type.'),
     'arguments' => array(
-      'importer' => 'The name of the Feeds importer that will be refreshed. Omitting the importer will cause all instances of all feeds to be imported.',
+      'importer' => dt('The name of the Feeds importer that will be refreshed. Omitting the importer will cause all instances of all feeds to be imported.'),
     ),
     'examples' => array(
-      'drush feeds-import-all' => 'Import all instances of all feeds.',
-      'drush feeds-import-all my_importer' => 'Import all instances of the importer my_importer.',
-      'drush feeds-import-all my_importer --limit 10' => 'Import 10 instances the feed my_importer.',
+      'drush feeds-import-all' => dt('Import all instances of all feeds.'),
+      'drush feeds-import-all my_importer' => dt('Import all instances of the importer my_importer.'),
+      'drush feeds-import-all my_importer --limit 10' => dt('Import 10 instances the feed my_importer.'),
     ),
     'options' => array(
-      'limit' => 'Only import [limit] Feeds importers. Optional.',
+      'limit' => dt('Only import [limit] Feeds importers. Optional.'),
     ),
   );
 
   $items['feeds-clear'] = array(
-    'description' => 'Clears a feed.',
+    'description' => dt('Clears a feed.'),
     'arguments' => array(
-      'importer' => 'The name of the Feeds importer that will be cleared. Mandatory.',
+      'importer' => dt('The name of the Feeds importer that will be cleared. Mandatory.'),
     ),
     'options' => array(
-      'nid' => 'The nid of the Feeds importer that will be clear. Optional.',
+      'nid' => dt('The nid of the Feeds importer that will be cleared. Optional.'),
     ),
     'examples' => array(
       'drush feeds-clear my_importer',
@@ -84,9 +84,9 @@ function feeds_drush_command() {
   );
 
   $items['feeds-enable'] = array(
-    'description' => 'Enables one or more Feeds importers.',
+    'description' => dt('Enables one or more Feeds importers.'),
     'arguments' => array(
-      'importers' => 'A space delimited list of Feeds importers. Mandatory.',
+      'importers' => dt('A space delimited list of Feeds importers. Mandatory.'),
     ),
     'examples' => array(
       'drush feeds-enable importer_1 importer_2',
@@ -94,9 +94,9 @@ function feeds_drush_command() {
   );
 
   $items['feeds-disable'] = array(
-    'description' => 'Disable one or more Feeds importers.',
+    'description' => dt('Disable one or more Feeds importers.'),
     'arguments' => array(
-      'importers' => 'A space delimited list of Feeds importers. Mandatory.',
+      'importers' => dt('A space delimited list of Feeds importers. Mandatory.'),
     ),
     'examples' => array(
       'drush feeds-disable importer_1 importer_2',
@@ -104,7 +104,7 @@ function feeds_drush_command() {
   );
 
   $items['feeds-delete'] = array(
-    'description' => 'Deletes one or more Feeds importers.',
+    'description' => dt('Deletes one or more Feeds importers.'),
     'arguments' => array(
       'importers' => 'A space delimited list of Feeds importers. Mandatory.',
     ),
@@ -114,9 +114,9 @@ function feeds_drush_command() {
   );
 
   $items['feeds-revert'] = array(
-    'description' => 'Reverts one or more Feeds importers.',
+    'description' => dt('Reverts one or more Feeds importers.'),
     'arguments' => array(
-      'importers' => 'A space delimited list of Feeds importers. Mandatory.',
+      'importers' => dt('A space delimited list of Feeds importers. Mandatory.'),
     ),
     'examples' => array(
       'drush feeds-revert importer_1 importer_2',
@@ -149,10 +149,10 @@ function drush_feeds_list_importers() {
     if ($importer->export_type == EXPORT_IN_CODE) {
       $state = dt('Default');
     }
-    else if ($importer->export_type == EXPORT_IN_DATABASE) {
+    elseif ($importer->export_type == EXPORT_IN_DATABASE) {
       $state = dt('Normal');
     }
-    else if ($importer->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
+    elseif ($importer->export_type == (EXPORT_IN_CODE | EXPORT_IN_DATABASE)) {
       $state = dt('Overridden');
     }