diff --git a/e107_handlers/e_marketplace.php b/e107_handlers/e_marketplace.php
index 0357234da..e4801e830 100644
--- a/e107_handlers/e_marketplace.php
+++ b/e107_handlers/e_marketplace.php
@@ -372,7 +372,7 @@ abstract class e_marketplace_adapter_abstract
 		$remotefile = $this->downloadUrl."?auth=".$this->getAuthKey()."&".$qry;
 
 		$localfile = md5($remotefile.time()).".zip";
-		$mes->addSuccess("Downloading..."); 
+		$mes->addSuccess(TPVLAN_81); 
 	
 		// FIXME call the service, check status first, then download (if status OK), else retireve the error break and show it
 		
@@ -394,7 +394,7 @@ abstract class e_marketplace_adapter_abstract
 		
 		if(!file_exists(e_TEMP.$localfile))
 		{
-			$mes->addError( "Automated download not possible. Please <a href='".$remotefile."'>Download Manually</a>"); 
+			$mes->addError($tp->lanVars(TPVLAN_83, array('x' => '<a href="' . $remotefile . '">'.TPVLAN_84.'</a>',)));
 			
 			if(E107_DEBUG_LEVEL > 0)
 			{
@@ -407,23 +407,16 @@ abstract class e_marketplace_adapter_abstract
 		
 		if($fl->unzipArchive($localfile,$type))
 		{
-			$mes->addSuccess("Download Complete!"); 
+			$mes->addSuccess(TPVLAN_82); 
 			return true; 
 		}
 		else 
 		{
-			$mes->addSuccess( "<a href='".$remotefile."'>Download Manually</a>"); // flush(); usleep(50000);
+			$mes->addSuccess( "<a href='".$remotefile."'>".TPVLAN_84."</a>");
 		}
 		
 		return false; 
 	}
-
-	
-	
-	
-	
-	
-	
 			
 		
 
@@ -510,7 +503,7 @@ class e_marketplace_adapter_wsdl extends e_marketplace_adapter_abstract
         }
         catch (Exception $e)
         {
-           e107::getMessage()->addError("Unable to connect. Please check firewall and/or internet connection.");
+           e107::getMessage()->addError(TPVLAN_90);
            e107::getMessage()->addDebug($e->getMessage());
         }