diff --git a/html/sites/all/modules/features/features.export.inc b/html/sites/all/modules/features/features.export.inc
index 7443503..532d4a1 100644
--- a/html/sites/all/modules/features/features.export.inc
+++ b/html/sites/all/modules/features/features.export.inc
@@ -512,13 +512,16 @@ function features_var_export($var, $prefix = '', $init = TRUE) {
  */
 function features_translatables_export($translatables, $indent = '') {
   $output = '';
-  $translatables = array_filter(array_unique($translatables));
+  $translatables = array_filter($translatables);
   if (!empty($translatables)) {
     $output .= "{$indent}// Translatables\n";
     $output .= "{$indent}// Included for use with string extractors like potx.\n";
-    sort($translatables);
     foreach ($translatables as $string) {
-      $output .= "{$indent}t(" . features_var_export($string) . ");\n";
+    	if(is_array($string)){
+    		$output .= "{$indent}t(" . features_var_export($string["value"]) . ",array(),array('context' => '".$string["context"]."'));\n";
+    	}else{
+    		$output .= "{$indent}t(" . features_var_export($string) . ");\n";
+    	}      
     }
   }
   return $output;
diff --git a/html/sites/all/modules/features/includes/features.field.inc b/html/sites/all/modules/features/includes/features.field.inc
index 96b22b4..f4cb999 100644
--- a/html/sites/all/modules/features/includes/features.field.inc
+++ b/html/sites/all/modules/features/includes/features.field.inc
@@ -113,10 +113,10 @@ function field_features_export_render($module, $data, $export = NULL) {
 
       // Add label and description to translatables array.
       if (!empty($field['field_instance']['label'])) {
-        $translatables[] = $field['field_instance']['label'];
+        array_push ( $translatables , array("value" => $field['field_instance']['label'], "context" => 'field:'.$field['field_config']['field_name'].':'.$field['field_instance']['bundle'].':label'));
       }
       if (!empty($field['field_instance']['description'])) {
-        $translatables[] = $field['field_instance']['description'];
+        array_push ( $translatables , array("value" => $field['field_instance']['description'], "context" => 'field:'.$field['field_config']['field_name'].':'.$field['field_instance']['bundle'].':description'));
       }
     }
   }