From 6cff08f0739070e4bd2997a9ad3b12445c25ca66 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Tue, 7 Feb 2017 19:05:44 +0700
Subject: [PATCH 1/2] Removed localization from logs (Because it doesn't work)

---
 src/PHPCensor/Builder.php                    | 17 ++++-----
 src/PHPCensor/Helper/BaseCommandExecutor.php | 12 +++----
 src/PHPCensor/Languages/lang.da.php          | 34 ------------------
 src/PHPCensor/Languages/lang.de.php          | 34 ------------------
 src/PHPCensor/Languages/lang.el.php          | 34 ------------------
 src/PHPCensor/Languages/lang.en.php          | 36 --------------------
 src/PHPCensor/Languages/lang.es.php          | 35 -------------------
 src/PHPCensor/Languages/lang.fr.php          | 22 ------------
 src/PHPCensor/Languages/lang.it.php          | 34 ------------------
 src/PHPCensor/Languages/lang.nl.php          | 34 ------------------
 src/PHPCensor/Languages/lang.pl.php          | 34 ------------------
 src/PHPCensor/Languages/lang.pt-br.php       | 34 ------------------
 src/PHPCensor/Languages/lang.ru.php          | 35 -------------------
 src/PHPCensor/Languages/lang.uk.php          | 34 ------------------
 src/PHPCensor/Languages/lang.zh.php          | 34 ------------------
 src/PHPCensor/Plugin/Atoum.php               |  2 +-
 src/PHPCensor/Plugin/Behat.php               |  2 +-
 src/PHPCensor/Plugin/Campfire.php            |  2 +-
 src/PHPCensor/Plugin/Codeception.php         |  2 +-
 src/PHPCensor/Plugin/CopyBuild.php           |  2 +-
 src/PHPCensor/Plugin/Email.php               |  4 +--
 src/PHPCensor/Plugin/Env.php                 |  2 +-
 src/PHPCensor/Plugin/Git.php                 |  2 +-
 src/PHPCensor/Plugin/HipchatNotify.php       |  4 +--
 src/PHPCensor/Plugin/Irc.php                 |  2 +-
 src/PHPCensor/Plugin/Mysql.php               |  8 ++---
 src/PHPCensor/Plugin/Phar.php                |  2 +-
 src/PHPCensor/Plugin/Phing.php               |  4 +--
 src/PHPCensor/Plugin/PhpCodeSniffer.php      |  2 +-
 src/PHPCensor/Plugin/PhpCpd.php              |  2 +-
 src/PHPCensor/Plugin/PhpUnit.php             |  2 +-
 src/PHPCensor/Plugin/Util/Executor.php       | 18 ++++++----
 32 files changed, 48 insertions(+), 477 deletions(-)

diff --git a/src/PHPCensor/Builder.php b/src/PHPCensor/Builder.php
index 868b138e..9b05b935 100644
--- a/src/PHPCensor/Builder.php
+++ b/src/PHPCensor/Builder.php
@@ -132,7 +132,7 @@ class Builder implements LoggerAwareInterface
     public function setConfigArray($config)
     {
         if (is_null($config) || !is_array($config)) {
-            throw new \Exception(Lang::get('missing_app_yml'));
+            throw new \Exception('This project does not contain a .php-censor.yml (.phpci.yml|phpci.yml) file, or it is empty.');
         }
 
         $this->config = $config;
@@ -225,20 +225,20 @@ class Builder implements LoggerAwareInterface
             }
         } catch (\Exception $ex) {
             $this->build->setStatus(Build::STATUS_FAILED);
-            $this->buildLogger->logFailure(Lang::get('exception') . $ex->getMessage(), $ex);
+            $this->buildLogger->logFailure('Exception: ' . $ex->getMessage(), $ex);
         }
 
         if (Build::STATUS_FAILED === $this->build->getStatus()) {
-            $this->buildLogger->logFailure("\n" . Lang::get('build_failed'));
+            $this->buildLogger->logFailure("\nBUILD FAILED");
         } else {
-            $this->buildLogger->logSuccess("\n" . Lang::get('build_success'));
+            $this->buildLogger->logSuccess("\nBUILD SUCCESS");
         }
 
         try {
             // Complete stage plugins are always run
             $this->pluginExecutor->executePlugins($this->config, 'complete');
         } catch (\Exception $ex) {
-            $this->buildLogger->logFailure(Lang::get('exception') . $ex->getMessage());
+            $this->buildLogger->logFailure('Exception: ' . $ex->getMessage());
         }
 
         // Update the build in the database, ping any external services, etc.
@@ -248,7 +248,7 @@ class Builder implements LoggerAwareInterface
         $removeBuilds = (bool)Config::getInstance()->get('php-censor.build.remove_builds', true);
         if ($removeBuilds) {
             // Clean up:
-            $this->buildLogger->log("\n" . Lang::get('removing_build'));
+            $this->buildLogger->log("\nRemoving Build.");
             $this->build->removeBuildDirectory();
         }
 
@@ -320,7 +320,7 @@ class Builder implements LoggerAwareInterface
 
         // Create a working copy of the project:
         if (!$this->build->createWorkingCopy($this, $this->buildPath)) {
-            throw new \Exception(Lang::get('could_not_create_working'));
+            throw new \Exception('Could not create a working copy.');
         }
 
         // Does the project's .php-censor.yml request verbose mode?
@@ -333,7 +333,8 @@ class Builder implements LoggerAwareInterface
             $this->ignore = $this->config['build_settings']['ignore'];
         }
 
-        $this->buildLogger->logSuccess(Lang::get('working_copy_created', $this->buildPath));
+        $this->buildLogger->logSuccess(sprintf('Working copy created: %s', $this->buildPath));
+
         return true;
     }
 
diff --git a/src/PHPCensor/Helper/BaseCommandExecutor.php b/src/PHPCensor/Helper/BaseCommandExecutor.php
index 023707a6..d43736ec 100644
--- a/src/PHPCensor/Helper/BaseCommandExecutor.php
+++ b/src/PHPCensor/Helper/BaseCommandExecutor.php
@@ -192,29 +192,29 @@ abstract class BaseCommandExecutor implements CommandExecutorInterface
         }
 
         foreach ($binary as $bin) {
-            $this->logger->log(Lang::get('looking_for_binary', $bin), LogLevel::DEBUG);
+            $this->logger->logDebug(sprintf('Looking for binary: %s', $bin));
 
             if (is_dir($composerBin) && is_file($composerBin . DIRECTORY_SEPARATOR . $bin)) {
-                $this->logger->log(Lang::get('found_in_path', $composerBin, $bin), LogLevel::DEBUG);
+                $this->logger->logDebug(sprintf('Found in %s: %s', $composerBin, $bin));
 
                 return $composerBin . DIRECTORY_SEPARATOR . $bin;
             }
 
             if (is_file($this->rootDir . DIRECTORY_SEPARATOR . $bin)) {
-                $this->logger->log(Lang::get('found_in_path', 'root', $bin), LogLevel::DEBUG);
+                $this->logger->logDebug(sprintf('Found in %s: %s', 'root', $bin));
 
                 return $this->rootDir . DIRECTORY_SEPARATOR . $bin;
             }
 
             if (is_file($this->rootDir . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . $bin)) {
-                $this->logger->log(Lang::get('found_in_path', 'vendor/bin', $bin), LogLevel::DEBUG);
+                $this->logger->logDebug(sprintf('Found in %s: %s', 'vendor/bin', $bin));
 
                 return $this->rootDir . 'vendor' . DIRECTORY_SEPARATOR . 'bin' . DIRECTORY_SEPARATOR . $bin;
             }
 
             $findCmdResult = $this->findGlobalBinary($bin);
             if (is_file($findCmdResult)) {
-                $this->logger->log(Lang::get('found_in_path', '', $bin), LogLevel::DEBUG);
+                $this->logger->logDebug(sprintf('Found in %s: %s', '', $bin));
 
                 return $findCmdResult;
             }
@@ -224,7 +224,7 @@ abstract class BaseCommandExecutor implements CommandExecutorInterface
             return null;
         }
 
-        throw new Exception(Lang::get('could_not_find', implode('/', $binary)));
+        throw new Exception(sprintf('Could not find %s', implode('/', $binary)));
     }
 
     /**
diff --git a/src/PHPCensor/Languages/lang.da.php b/src/PHPCensor/Languages/lang.da.php
index 3741db89..648832cb 100644
--- a/src/PHPCensor/Languages/lang.da.php
+++ b/src/PHPCensor/Languages/lang.da.php
@@ -289,43 +289,9 @@ du kører composer update.',
     'not_installed' => 'PHP Censor lader til ikke at være installeret.',
     'install_instead' => 'Installér venligst PHP Censor via php-censor:install istedet.',
 
-    // Builder
-    'missing_app_yml' => 'Dette projekt har ingen .php-censor.yml (.phpci.yml|phpci.yml) fil, eller filen er tom.',
-    'build_success' => 'BUILD SUCCES',
-    'build_failed' => 'BUILD FEJLET',
-    'removing_build' => 'Fjerner Build',
-    'exception' => 'Undtagelse:',
-    'could_not_create_working' => 'Kunne ikke oprette en arbejds-kopi.',
-    'working_copy_created' => 'Arbejds-kopi oprettet: %s',
-    'looking_for_binary' => 'Leder efter kommando: %s',
-    'found_in_path' => 'Fundet i %s: %s',
-    'running_plugin' => 'KØRER PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: SUCCES',
-    'plugin_failed' => 'PLUGIN: FEJL',
-    'plugin_missing' => 'Plugin findes ikke: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Ingen tests udført.',
-    'could_not_find' => 'Kunne ikke finde %s',
-    'no_campfire_settings' => 'Ingen forbindelses-oplysninger angivet i Campfire plugin',
-    'failed_to_wipe' => 'Kunne ikke slette eksisterende mappe %s før kopi',
     'passing_build' => 'Succesfuldt Build',
     'failing_build' => 'Fejlet Build',
     'log_output' => 'Log-output:',
-    'n_emails_sent' => '%d emails afsendt.',
-    'n_emails_failed' => '%d emails kunne ikke afsendes.',
-    'unable_to_set_env' => 'Kunne ikke sætte environment-variabel',
-    'tag_created' => 'Tag oprettet af PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% bygget på %BUILD_URI%',
-    'hipchat_settings' => 'Angiv venligst rum og autoToken i hipchat_notify plugin',
-    'irc_settings' => 'Du skal som minimum indstille en server, et rum og et nicknavn.',
-    'invalid_command' => 'Ugyldig kommando',
-    'import_file_key' => 'Importen skal indeholde en \'file\' variabel',
-    'cannot_open_import' => 'Kunne ikke åbne SQL import-fil: %s',
-    'unable_to_execute' => 'Kunne ikke udføre instruktionerne i SQL-filen',
-    'phar_internal_error' => 'Phar Plugin Internal Error',
-    'build_file_missing' => 'Den angivne build-fil findes ikke.',
-    'property_file_missing' => 'Den angivne property-fil findes ikke',
-    'could_not_process_report' => 'Kunne ikke behandle rapporten, som dette værktøj genererede.',
     'shell_not_enabled' => 'Shell-plugin er ikke aktiveret. Aktivér det via config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.de.php b/src/PHPCensor/Languages/lang.de.php
index 49099c7c..0f905c5b 100644
--- a/src/PHPCensor/Languages/lang.de.php
+++ b/src/PHPCensor/Languages/lang.de.php
@@ -312,44 +312,10 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'not_installed' => 'PHP Censor scheint nicht installiert zu sein.',
     'install_instead' => 'Bitte installieren Sie PHP Censor stattdessen via php-censor:install.',
 
-    // Builder
-    'missing_app_yml' => 'Dieses Projekt beinhaltet keine .php-censor.yml (.phpci.yml|phpci.yml)-Datei, oder sie ist leer.',
-    'build_success' => 'BUILD ERFOLGREICH',
-    'build_failed' => 'BUILD FEHLGESCHLAGEN',
-    'removing_build' => 'Entferne Build.',
-    'exception' => 'Exception: ',
-    'could_not_create_working' => 'Konnte keine Arbeitskopie erstellen.',
-    'working_copy_created' => 'Arbeitskopie erstellt: %s',
-    'looking_for_binary' => 'Suche Binärdatei: %s',
-    'found_in_path' => 'Gefunden in %s: %s',
-    'running_plugin' => 'AUSGEFÜHRTES PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: ERFOLGREICH',
-    'plugin_failed' => 'PLUGIN: FEHLGECHLAGEN',
-    'plugin_missing' => 'Plugin existiert nicht: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Keine Tests wurden ausgeführt.',
-    'could_not_find' => '%s wurde nicht gefunden',
-    'no_campfire_settings' => 'Keine Verbindungsparameter für das Campfire plugin gefunden',
-    'failed_to_wipe' => 'Konnte Ordner %s nicht vor dem Kopieren leeren',
     'passing_build' => 'Durchlaufender Build',
     'failing_build' => 'Fehlschlagender Build',
     'log_output' => 'Protokollausgabe: ',
-    'n_emails_sent' => '%d Emails verschickt.',
-    'n_emails_failed' => 'Konnte %d Emails nicht verschicken.',
-    'unable_to_set_env' => 'Konnte Umgebungsvariable nicht setzen',
-    'tag_created' => 'Tag erstellt durch PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% gebuildet auf %BUILD_URI%',
-    'hipchat_settings' => 'Bitte definieren Sie Room und AuthToken für das hipchat_notify-Plugin',
-    'irc_settings' => 'Sie müssen einen Server, Room und Nick definieren.',
-    'invalid_command' => 'Ungültiges Kommando',
-    'import_file_key' => 'Import-Statements müssen einen \'file\'-Key enthalten',
-    'cannot_open_import' => 'Konnte SQL-Importdatei nicht öffnen: %s',
-    'unable_to_execute' => 'Konnte SQL-Datei nicht ausführen',
-    'phar_internal_error' => 'Phar Plugin Interner Fehler',
-    'build_file_missing' => 'Angegebene Builddatei existiert nicht.',
-    'property_file_missing' => 'Angegebene Eigenschaftsdatei existiert nicht.',
-    'could_not_process_report' => 'Konnte den von diesem Tool erstellten Bericht nicht verarbeiten.',
     'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.',
 
     // Error Levels:
diff --git a/src/PHPCensor/Languages/lang.el.php b/src/PHPCensor/Languages/lang.el.php
index cdf55580..1e180868 100644
--- a/src/PHPCensor/Languages/lang.el.php
+++ b/src/PHPCensor/Languages/lang.el.php
@@ -291,43 +291,9 @@ Services</a> του Bitbucket αποθετηρίου σας.',
     'not_installed' => 'Το PHP Censor δεν φένεται να είναι εγκατεστημένο',
     'install_instead' => 'Παρακαλούμε εγκαταστήστε το PHP Censor καλύτερα με το php-censor:install αντ \'αυτού.',
 
-    // Builder
-    'missing_app_yml' => 'Το έργο δεν περιέχει το αρχείο .php-censor.yml (.phpci.yml|phpci.yml) ή είναι άδειο.',
-    'build_success' => 'ΚΑΤΑΣΚΕΥΗ ΕΠΙΤΥΧΗΣ',
-    'build_failed' => 'ΚΑΤΑΣΚΕΥΗ ΑΠΕΤΥΧΕ',
-    'removing_build' => 'Γίνεται αφαίρεση κατασκευής',
-    'exception' => 'Εξαίρεση:',
-    'could_not_create_working' => 'Αδυναμία δημιουργίας αντίγραφου εργασίας.',
-    'working_copy_created' => 'Αντίγραφο εργασίας που δημιουργήθηκαν: %s',
-    'looking_for_binary' => 'Αναζήτηση για δυαδικό: %s',
-    'found_in_path' => 'Βρέθηκε στο %s: %s',
-    'running_plugin' => 'ΤΡΕΧΩΝ ΠΡΟΣΘΕΤΟ: %s',
-    'plugin_success' => 'ΠΡΟΣΘΕΤΟ: ΕΠΙΤΥΧΙΑ',
-    'plugin_failed' => 'ΠΡΟΣΘΕΤΟ: ΑΠΟΤΥΧΙΑ',
-    'plugin_missing' => 'Το πρόσθετο δεν υπάρχει: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Δεν έγιναν δοκιμές.',
-    'could_not_find' => 'Δεν ήταν δυνατή η εύρεση του %s',
-    'no_campfire_settings' => 'Δεν έχουν δωθεί παράμετροι της σύνδεσης για το πρόσθετο Campfire',
-    'failed_to_wipe' => 'Αποτυχία πλήρους διαγραφής του καταλόγου %s πριν την αντιγραφή',
     'passing_build' => 'Επιτυχημένη κατασκευή',
     'failing_build' => 'Αποτυχημένη κατασκευή',
     'log_output' => 'Σύνδεση εξόδου:',
-    'n_emails_sent' => 'Στάλθηκαν %d emails ',
-    'n_emails_failed' => 'Δεν στάλθηκαν %d emails ',
-    'unable_to_set_env' => 'Δεν είναι δυνατός ο ορισμος μεταβλητής περιβάλλοντος',
-    'tag_created' => 'Ετικέτα δημιουργήθηκε από PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% χτισμένο σε %BUILD_URI%',
-    'hipchat_settings' => 'Παρακαλώ ορίστε δωμάτιο και authToken για το πρόσθετο hipchat_notify',
-    'irc_settings' => 'Θα πρέπει να ρυθμίσετε ένα διακομιστή, το δωμάτιο και το ψευδώνυμο.',
-    'invalid_command' => 'Μη έγκυρη εντολή',
-    'import_file_key' => 'Η δήλωση εισαγωγής πρέπει να περιέχει ένα κλειδί "αρχείο"',
-    'cannot_open_import' => 'Δεν είναι δυνατό το άνοιγμα του SQL αρχείο εισαγωγής: %s ',
-    'unable_to_execute' => 'Δεν είναι δυνατή η εκτέλεση του αρχείου SQL',
-    'phar_internal_error' => 'Phar Πρόσθετο Εσωτερικό σφάλμα',
-    'build_file_missing' => 'Καθορισμένο αρχείο κατασκευής δεν υπάρχει.',
-    'property_file_missing' => 'Καθορισμένο αρχείο ιδιοκτησίας δεν υπάρχει.',
-    'could_not_process_report' => 'Δεν ήταν δυνατή η επεξεργασία της έκθεσης που δημιουργείται από αυτό το εργαλείο.',
     'shell_not_enabled' => 'Το πρόσθετο για το κέλυφος δεν είναι ενεργοποιημένο. Παρακαλούμε ενεργοποιήστε το μέσω του αρχείου config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index 37cb878a..335d0d52 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -196,7 +196,6 @@ PHP Censor',
     'phpcs_errors' => 'PHPCS errors',
     'phplint_errors' => 'Lint errors',
     'phpunit_errors' => 'PHPUnit errors',
-    'phpunit_fail_init' => 'Neither a configuration file nor a test directory found.',
     'phpcpd_warnings' => 'PHP Copy/Paste Detector warnings',
     'phpdoccheck_warnings' => 'Missing docblocks',
     'issues' => 'Issues',
@@ -347,45 +346,10 @@ PHP Censor',
                                 when PHP Censor is set to use a beanstalkd server that does not exist, 
                                 or your beanstalkd server has stopped.',
 
-    // Builder
-    'missing_app_yml' => 'This project does not contain a .php-censor.yml (.phpci.yml|phpci.yml) file, or it is empty.',
-    'build_success' => 'BUILD SUCCESS',
-    'build_failed' => 'BUILD FAILED',
-    'removing_build' => 'Removing Build.',
-    'exception' => 'Exception: ',
-    'could_not_create_working' => 'Could not create a working copy.',
-    'working_copy_created' => 'Working copy created: %s',
-    'looking_for_binary' => 'Looking for binary: %s',
-    'found_in_path' => 'Found in %s: %s',
-    'running_plugin' => 'RUNNING PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: SUCCESS',
-    'plugin_failed' => 'PLUGIN: FAILED',
-    'plugin_missing' => 'Plugin does not exist: %s',
-    'failed_allowed' => 'Allowed',
-
     // Build Plugins:
-    'no_tests_performed' => 'No tests have been performed.',
-    'could_not_find' => 'Could not find %s',
-    'no_campfire_settings' => 'No connection parameters given for Campfire plugin',
-    'failed_to_wipe' => 'Failed to wipe existing directory %s before copy',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'n_emails_sent' => '%d emails sent.',
-    'n_emails_failed' => '%d emails failed to send.',
-    'unable_to_set_env' => 'Unable to set environment variable',
-    'tag_created' => 'Tag created by PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% built at %BUILD_URI%',
-    'hipchat_settings' => 'Please define room and authToken for hipchat_notify plugin',
-    'irc_settings' => 'You must configure a server, room and nick.',
-    'invalid_command' => 'Invalid command',
-    'import_file_key' => 'Import statement must contain a \'file\' key',
-    'cannot_open_import' => 'Cannot open SQL import file: %s',
-    'unable_to_execute' => 'Unable to execute SQL file',
-    'phar_internal_error' => 'Phar Plugin Internal Error',
-    'build_file_missing' => 'Specified build file does not exist.',
-    'property_file_missing' => 'Specified property file does not exist.',
-    'could_not_process_report' => 'Could not process the report generated by this tool.',
     'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
 
diff --git a/src/PHPCensor/Languages/lang.es.php b/src/PHPCensor/Languages/lang.es.php
index c5824c0a..10c940f0 100644
--- a/src/PHPCensor/Languages/lang.es.php
+++ b/src/PHPCensor/Languages/lang.es.php
@@ -175,7 +175,6 @@ PHP Censor',
     'phpcs_errors' => 'PHPCS Errors',
     'phplint_errors' => 'Lint Errors',
     'phpunit_errors' => 'PHPUnit Errors',
-    'phpunit_fail_init' => 'No se encontro archivo o folder de pruevas.',
     'phpdoccheck_warnings' => 'Docblocks faltantes',
     'issues' => 'Incidencias',
 
@@ -286,43 +285,9 @@ PHP Censor',
     'not_installed' => 'PHP Censor no está instalado.',
     'install_instead' => 'Por favor, instala PHP Censor via php-censor:install.',
 
-    // Builder
-    'missing_app_yml' => 'Este proyecto no contiene el archivo .php-censor.yml (.phpci.yml|phpci.yml) o está vacío.',
-    'build_success' => 'BUILD EXITOSO',
-    'build_failed' => 'BUILD FALLIDO',
-    'removing_build' => 'Eliminando Build.',
-    'exception' => 'Excepción: ',
-    'could_not_create_working' => 'Imposible crear copia de trabajo.',
-    'working_copy_created' => 'Copia de trabajo creada: %s',
-    'looking_for_binary' => 'Buscando binario: %s',
-    'found_in_path' => 'Encontrado en %s: %s',
-    'running_plugin' => 'EJECUTANDO PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: EXITO',
-    'plugin_failed' => 'PLUGIN: FALLÓ',
-    'plugin_missing' => 'No existe el plugin: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'No se ejecutaron tests.',
-    'could_not_find' => 'No se encontró %s',
-    'no_campfire_settings' => 'No se especificaron parámetros de conexión para el plugin Campfire',
-    'failed_to_wipe' => 'Imposible eliminar directorio existente %s antes de copiarlo',
     'passing_build' => 'Build Exitoso',
     'failing_build' => 'Build Fallido',
     'log_output' => 'Log de Salida: ',
-    'n_emails_sent' => '%d emails enviados.',
-    'n_emails_failed' => '%d emails no pudieron ser enviados.',
-    'unable_to_set_env' => 'Imposible setear variable de entorno',
-    'tag_created' => 'Tag creado por PHP Censor: %s',
-    'x_built_at_x' => 'Build de %PROJECT_TITLE% en %BUILD_URI%',
-    'hipchat_settings' => 'Por favor, definir room y authToken para el plugin hipchat_notify',
-    'irc_settings' => 'Debes configurar un servidor, room y apodo.',
-    'invalid_command' => 'Comando inválido',
-    'import_file_key' => 'Sentencia de importación debe contener una llave \'file\'',
-    'cannot_open_import' => 'Imposible abrir archivo de importación SQL: %s',
-    'unable_to_execute' => 'Imposible ejecutar archivo SQL',
-    'phar_internal_error' => 'Error interno en plugin Phar',
-    'build_file_missing' => 'El archivo de build especificado no existe.',
-    'property_file_missing' => 'El archivo de propiedades especificado no existe.',
-    'could_not_process_report' => 'Imposible procesar el reporte generado por la herramienta.',
     'shell_not_enabled' => 'El plugin shell no está habilitado. Por favor, habilitalo desde config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.fr.php b/src/PHPCensor/Languages/lang.fr.php
index 1527014e..1be39d39 100644
--- a/src/PHPCensor/Languages/lang.fr.php
+++ b/src/PHPCensor/Languages/lang.fr.php
@@ -365,30 +365,8 @@ PHP Censor',
     'failed_allowed' => 'Autorisé',
     
     // Build Plugins:
-    'no_tests_performed' => 'Aucun test n\'a été exécuté.',
-    'could_not_find' => 'Impossible de trouver %s',
-    'no_campfire_settings' => 'Aucune information de connexion n\'a été fournie pour le plugin Campfire',
-    'failed_to_wipe' => 'Impossible de supprimer le dossier %s avant de copier',
-    'passing_build' => 'Build réussi',
-    'failing_build' => 'Build en echec',
     'log_output' => 'Sortie de log : ',
-    'n_emails_sent' => '%d emails envoyés.',
-    'n_emails_failed' => '%d emails dont l\'envoi a échoué.',
-    'unable_to_set_env' => 'Impossible d\'initialiser la variable d\'environnement',
-    'tag_created' => 'Tag créé par PHP Censor : %s',
-    'x_built_at_x' => '%PROJECT_TITLE% construit à %BUILD_URI%',
-    'hipchat_settings' => 'Merci de définir une "room" et un "authToken" pour le plugin hipchat_notify',
-    'irc_settings' => 'Vous devez configurer un serveur, une "room" et un "nick".',
-    'invalid_command' => 'Commande invalide',
-    'import_file_key' => 'La déclaration d\'import doit contenir un \'fichier\' clé',
-    'cannot_open_import' => 'Impossible d\'importer le ficher SQL : %s',
-    'unable_to_execute' => 'Impossible d\'exécuter le ficher SQL',
-    'phar_internal_error' => 'Erreur interne au plugin Phar',
-    'build_file_missing' => 'Le fichier de build spécifié n\'existe pas.',
-    'property_file_missing' => 'Le fichier de propriété spécifié n\'existe pas.',
-    'could_not_process_report' => 'Impossible de traiter le rapport généré par cet outil.',
     'shell_not_enabled' => 'Le plugn shell n\'est pas activé. Merci de l\'activer via le fichier config.yml.',
-
     
     // Error Levels:
     'critical' => 'Critique',
diff --git a/src/PHPCensor/Languages/lang.it.php b/src/PHPCensor/Languages/lang.it.php
index 34b0a065..ffb1f186 100644
--- a/src/PHPCensor/Languages/lang.it.php
+++ b/src/PHPCensor/Languages/lang.it.php
@@ -291,43 +291,9 @@ PHP Censor',
     'not_installed' => 'PHP Censor sembra non essere installato.',
     'install_instead' => 'Per favore installa PHP Censor tramite php-censor:install.',
 
-    // Builder
-    'missing_app_yml' => 'Questo progetto non contiene il file .php-censor.yml (.phpci.yml|phpci.yml), o il file è vuoto.',
-    'build_success' => 'BUILD PASSATA',
-    'build_failed' => 'BUILD FALLITA',
-    'removing_build' => 'Rimozione build.',
-    'exception' => 'Eccezione: ',
-    'could_not_create_working' => 'Non può essere creata una copia di lavoro.',
-    'working_copy_created' => 'Copia di lavoro creata: %s',
-    'looking_for_binary' => 'Ricerca per il binario: %s',
-    'found_in_path' => 'Trovato in %s: %s',
-    'running_plugin' => 'PLUGIN IN ESECUZIONE: %s',
-    'plugin_success' => 'PLUGIN: PASSATO',
-    'plugin_failed' => 'PLUGIN: FALLITO',
-    'plugin_missing' => 'Plugin non esistente: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Nessun test è stato eseguito.',
-    'could_not_find' => 'Non posso trovare %s',
-    'no_campfire_settings' => 'Nessun parametro di connessione trovato per il plugin Campfire.',
-    'failed_to_wipe' => 'Errore nel pulire la cartella %s prima di effettuare la copia',
     'passing_build' => 'Build passata',
     'failing_build' => 'Build fallita',
     'log_output' => 'Log: ',
-    'n_emails_sent' => '%d email inviate.',
-    'n_emails_failed' => '%d email da inviare fallite.',
-    'unable_to_set_env' => 'Errore nel settare la variabile di ambiente',
-    'tag_created' => 'Tag creato da PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% buildato in %BUILD_URI%',
-    'hipchat_settings' => 'Per favore definire la stanza e authToken per il plugin hipchat_notify',
-    'irc_settings' => 'Devi configurare server, stanza e nick.',
-    'invalid_command' => 'Comando non valido',
-    'import_file_key' => 'L\'import deve contenrere la chiave \'file\'',
-    'cannot_open_import' => 'Impossobile aprire il file SQL da importare: %s',
-    'unable_to_execute' => 'Impossibile eseguire il file SQL',
-    'phar_internal_error' => 'Errore interno del plugin Phar',
-    'build_file_missing' => 'Il file di build specificato non esiste.',
-    'property_file_missing' => 'Il file di proprietà specificato non esiste.',
-    'could_not_process_report' => 'Non è possibile processare il report generato da questo tool.',
     'shell_not_enabled' => 'Il plugin shell non è attivato. Per favore attivalo tramite config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.nl.php b/src/PHPCensor/Languages/lang.nl.php
index c21743be..26055285 100644
--- a/src/PHPCensor/Languages/lang.nl.php
+++ b/src/PHPCensor/Languages/lang.nl.php
@@ -291,43 +291,9 @@ keer je composer update uitvoert.',
     'not_installed' => 'PHP Censor lijkt niet geïnstalleerd te zijn.',
     'install_instead' => 'Gelieve PHP Censor via php-censor:install te installeren.',
 
-    // Builder
-    'missing_app_yml' => 'Dit project bevat geen .php-censor.yml (.phpci.yml|phpci.yml) bestand, of het is leeg.',
-    'build_success' => 'BUILD SUCCES',
-    'build_failed' => 'BUILD GEFAALD',
-    'removing_build' => 'Build wordt verwijderd.',
-    'exception' => 'Uitzondering:',
-    'could_not_create_working' => 'Kon geen werkende kopie maken.',
-    'working_copy_created' => 'Werkende kopie aangemaakt: %s',
-    'looking_for_binary' => 'Zoekend naar binary: %s',
-    'found_in_path' => 'Gevonden in %s: %s',
-    'running_plugin' => 'UITVOEREN PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: SUCCES',
-    'plugin_failed' => 'PLUGIN: GEFAALD',
-    'plugin_missing' => 'Plugin bestaat niet: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Er werden geen tests uitgevoerd.',
-    'could_not_find' => 'Kon %s niet vinden',
-    'no_campfire_settings' => 'Geen verbindingsparameters opgegeven voor Campfire plugin',
-    'failed_to_wipe' => 'Kon bestaande map %s niet wissen voor kopie',
     'passing_build' => 'Slagende build',
     'failing_build' => 'Falende build',
     'log_output' => 'Log output:',
-    'n_emails_sent' => '%d e-mails versuurd.',
-    'n_emails_failed' => '%d e-mails faalden te versturen.',
-    'unable_to_set_env' => 'Niet geslaagd om environment variable in te stellen',
-    'tag_created' => 'Tag aangemaakt door PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% built op %BUILD_URI%',
-    'hipchat_settings' => 'Gelieve kamer & authToken voor hipchat_notify plugin te definiëren',
-    'irc_settings' => 'Je dient server, kamer & nick op te geven.',
-    'invalid_command' => 'Ongeldig commando',
-    'import_file_key' => 'Import statement moet \'file\' key bevatten',
-    'cannot_open_import' => 'Het is niet mogelijk om het SQL bestand %s te openen',
-    'unable_to_execute' => 'Het is niet mogelijk om het SQL bestand uit te voeren',
-    'phar_internal_error' => 'Er is iets fout gegaan in de Phar Plugin',
-    'build_file_missing' => 'Opgegeven build bestand bestaat niet.',
-    'property_file_missing' => 'Opgegeven bestand bestaat niet',
-    'could_not_process_report' => 'Het is niet mogelijk om het gegenereerde rapport van deze tool te verwerken.',
     'shell_not_enabled' => 'De shell plugin is niet ingeschakeld, schakel deze a.u.b. in via het config.yml bestand.'
 ];
diff --git a/src/PHPCensor/Languages/lang.pl.php b/src/PHPCensor/Languages/lang.pl.php
index 081b9a08..75274398 100644
--- a/src/PHPCensor/Languages/lang.pl.php
+++ b/src/PHPCensor/Languages/lang.pl.php
@@ -292,43 +292,9 @@ wywołaniu polecenia composer update.',
     'not_installed' => 'Wygląda na to, że PHP Censor nie jest zainstalowane.',
     'install_instead' => 'Proszę zainstalować PHP Censor poprzez php-censor:install',
 
-    // Builder
-    'missing_app_yml' => 'Projekt nie zawiera pliku .php-censor.yml (.phpci.yml|phpci.yml) lub projekt jest pusty.',
-    'build_success' => 'BUDOWANIE ZAKOŃCZONE SUKCESEM',
-    'build_failed' => 'BUDOWANIE NIE POWIODŁO SIĘ',
-    'removing_build' => 'Usuwanie Budowania.',
-    'exception' => 'Wyjątek:',
-    'could_not_create_working' => 'Nie można utworzyć wersji roboczej.',
-    'working_copy_created' => 'Stworzono wersję roboczą: %s',
-    'looking_for_binary' => 'Szukam binarek: %s',
-    'found_in_path' => 'Znaleziono w %s: %s',
-    'running_plugin' => 'Uruchomiony Plugin: %s',
-    'plugin_success' => 'Plugin: Sukces',
-    'plugin_failed' => 'Plugin: Niepowodzenie',
-    'plugin_missing' => 'Plugin nie istnieje: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Nie przeprowadzono żadnych testów.',
-    'could_not_find' => 'Nie znaleziono %s',
-    'no_campfire_settings' => 'Nie zdefiniowano parametrów połączenia dla pluginu Campfire',
-    'failed_to_wipe' => 'Nie udało się wyczyścić istniejącego katalogu %s przed kopiowaniem',
     'passing_build' => 'Pomijanie Budowania',
     'failing_build' => 'Niepowodzenie Budowania',
     'log_output' => 'Log Wyjściowy:',
-    'n_emails_sent' => 'Wysłano %d emaili.',
-    'n_emails_failed' => 'Nie wysłano %d emaili.',
-    'unable_to_set_env' => 'Nie można ustawić zmiennej środowiskowej',
-    'tag_created' => 'Tag stworzony przez PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% zbudowano pod %BUILD_URI%',
-    'hipchat_settings' => 'Proszę podać pokój i authToken dla pluginu hipchat_notify.',
-    'irc_settings' => 'Musisz skonfigurować serwer, pokój i swoją nazwę.',
-    'invalid_command' => 'Nieprawidłowe polecenie',
-    'import_file_key' => 'Potwierdzenie importu musi zawierać klucz "plik"',
-    'cannot_open_import' => 'Nie można otworzyć importowanego pliku SQL: %s',
-    'unable_to_execute' => 'Nie można wykonać pliku SQL',
-    'phar_internal_error' => 'Wewnętrzny Błąd Pluginu Phar',
-    'build_file_missing' => 'Podany plik budowy nie istnieje.',
-    'property_file_missing' => 'Podany plik właściwości nie istnieje.',
-    'could_not_process_report' => 'Nie udało się przetworzyć raportu wygenerowanego przez to narzędzie.',
     'shell_not_enabled' => 'Plugin powłoki jest nieaktywny. Aktywuj go poprzez config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.pt-br.php b/src/PHPCensor/Languages/lang.pt-br.php
index 5d1e6b20..c777736d 100644
--- a/src/PHPCensor/Languages/lang.pt-br.php
+++ b/src/PHPCensor/Languages/lang.pt-br.php
@@ -313,44 +313,10 @@ PHP Censor',
     'not_installed' => 'PHP Censor does not appear to be installed.',
     'install_instead' => 'Please install PHP Censor via php-censor:install instead.',
 
-    // Builder
-    'missing_app_yml' => 'This project does not contain a .php-censor.yml (.phpci.yml|phpci.yml) file, or it is empty.',
-    'build_success' => 'BUILD SUCCESS',
-    'build_failed' => 'BUILD FAILED',
-    'removing_build' => 'Removing Build.',
-    'exception' => 'Exception: ',
-    'could_not_create_working' => 'Could not create a working copy.',
-    'working_copy_created' => 'Working copy created: %s',
-    'looking_for_binary' => 'Looking for binary: %s',
-    'found_in_path' => 'Found in %s: %s',
-    'running_plugin' => 'RUNNING PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: SUCCESS',
-    'plugin_failed' => 'PLUGIN: FAILED',
-    'plugin_missing' => 'Plugin does not exist: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'No tests have been performed.',
-    'could_not_find' => 'Could not find %s',
-    'no_campfire_settings' => 'No connection parameters given for Campfire plugin',
-    'failed_to_wipe' => 'Failed to wipe existing directory %s before copy',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'n_emails_sent' => '%d emails sent.',
-    'n_emails_failed' => '%d emails failed to send.',
-    'unable_to_set_env' => 'Unable to set environment variable',
-    'tag_created' => 'Tag created by PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% built at %BUILD_URI%',
-    'hipchat_settings' => 'Please define room and authToken for hipchat_notify plugin',
-    'irc_settings' => 'You must configure a server, room and nick.',
-    'invalid_command' => 'Invalid command',
-    'import_file_key' => 'Import statement must contain a \'file\' key',
-    'cannot_open_import' => 'Cannot open SQL import file: %s',
-    'unable_to_execute' => 'Unable to execute SQL file',
-    'phar_internal_error' => 'Phar Plugin Internal Error',
-    'build_file_missing' => 'Specified build file does not exist.',
-    'property_file_missing' => 'Specified property file does not exist.',
-    'could_not_process_report' => 'Could not process the report generated by this tool.',
     'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
     // Error Levels:
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index b5f63faf..b4c70566 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -331,45 +331,10 @@ PHP Censor',
     'not_installed' => 'PHP Censor не может быть установлен.',
     'install_instead' => 'Пожалуйста, установите PHP Censor с помощью команды php-censor:install.',
 
-    // Builder
-    'missing_app_yml' => 'Этот проект не содержит файла .php-censor.yml (.phpci.yml|phpci.yml), или файл пустой.',
-    'build_success' => 'СБОРКА УСПЕШНА',
-    'build_failed' => 'СБОРКА ПРОВАЛЕНА',
-    'removing_build' => 'Удаление сборки.',
-    'exception' => 'Исключение: ',
-    'could_not_create_working' => 'Не удалось создать рабочую копию.',
-    'working_copy_created' => 'Рабочая копия создана: %s',
-    'looking_for_binary' => 'Поиск пакета: %s',
-    'found_in_path' => 'Найден в %s: %s',
-    'running_plugin' => 'ЗАПУЩЕН ПЛАГИН: %s',
-    'plugin_success' => 'ПЛАГИН: УСПЕШНО',
-    'plugin_failed' => 'ПЛАГИН: ПРОВАЛ',
-    'plugin_missing' => 'Плагина не существует: %s',
-    'failed_allowed' => 'Разрешен',
-
     // Build Plugins:
-    'no_tests_performed' => 'Никакие тесты не были запущены.',
-    'could_not_find' => 'Не удается найти %s',
-    'no_campfire_settings' => 'Не переданы параметры подключения для плагина Campfire',
-    'failed_to_wipe' => 'Не удалось уничтожить существующую директорию %s перед копированием',
     'passing_build' => 'Успех сборки',
     'failing_build' => 'Провал сборки',
     'log_output' => 'Вывод лога: ',
-    'n_emails_sent' => 'Писем отправлено: %d.',
-    'n_emails_failed' => 'Писем не удалось отправить: %d.',
-    'unable_to_set_env' => 'Невозможно установить переменную окружения',
-    'tag_created' => 'Метка создана PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% собран: %BUILD_URI%',
-    'hipchat_settings' => 'Пожалуйста, укажите комнату и токен (authToken) для плагина hipchat_notify',
-    'irc_settings' => 'Вы должны задать сервер, комнату и ник.',
-    'invalid_command' => 'Некорректная команда',
-    'import_file_key' => 'Выражение импорта должно содержать ключ \'file\'',
-    'cannot_open_import' => 'Не удалось открыть файл SQL для импорта: %s',
-    'unable_to_execute' => 'Невозможно выполнить файл SQL',
-    'phar_internal_error' => 'Внутренняя ошибка плагина Phar',
-    'build_file_missing' => 'Указанного файла сборки не существует.',
-    'property_file_missing' => 'Указанного файла сборки не существует.',
-    'could_not_process_report' => 'Невозможно обработать отчет этой утилиты.',
     'shell_not_enabled' => 'Плагин shell не включен. Пожалуйста, включите его в файле config.yml.',
     
     // Error Levels:
diff --git a/src/PHPCensor/Languages/lang.uk.php b/src/PHPCensor/Languages/lang.uk.php
index b665e42e..ff83c1b9 100644
--- a/src/PHPCensor/Languages/lang.uk.php
+++ b/src/PHPCensor/Languages/lang.uk.php
@@ -291,43 +291,9 @@ PHP Censor',
     'not_installed' => 'Неможливо встановити PHP Censor.',
     'install_instead' => 'Будь ласка, встановіть PHP Censor через команду php-censor:install.',
 
-    // Builder
-    'missing_app_yml' => 'Цей проект не містить файл .php-censor.yml (.phpci.yml|phpci.yml) або він є порожнім.',
-    'build_success' => 'ЗБІРКА УСПІШНА',
-    'build_failed' => 'ЗБІРКА НЕВДАЛА',
-    'removing_build' => 'Видалення збірки.',
-    'exception' => 'Виключення:',
-    'could_not_create_working' => 'Не вдалося створити робочу копію.',
-    'working_copy_created' => 'Робоча копія створена: %s',
-    'looking_for_binary' => 'Пошук бінарного пакета: %s',
-    'found_in_path' => 'Знайдено у %s: %s',
-    'running_plugin' => 'ВИКОНУЄТЬСЯ ПЛАГІН: %s',
-    'plugin_success' => 'ПЛАГІН: УСПІШНО',
-    'plugin_failed' => 'ПЛАГІН: НЕВДАЛО',
-    'plugin_missing' => 'Плагін не існує: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'Жодних тестів не було запущено.',
-    'could_not_find' => 'Неможливо знайти %s',
-    'no_campfire_settings' => 'Не вказані параметри з’єднання для плагіна Campfire',
-    'failed_to_wipe' => 'Не вдалося знищити існуючу директорію %s перед копіюванням',
     'passing_build' => 'Успішно збірка',
     'failing_build' => 'Невдала збірка',
     'log_output' => 'Вивід лога:',
-    'n_emails_sent' => '%d листів відправлено.',
-    'n_emails_failed' => '%d листів не вдалося відправити.',
-    'unable_to_set_env' => 'Неможливо встановити змінну оточення',
-    'tag_created' => 'Тег, створений PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% зібрано у %BUILD_URI%',
-    'hipchat_settings' => 'Будь ласка, вкажіть кімнату та "authToken" параметр для плагіна hipchat_notify',
-    'irc_settings' => 'Ви повинні вказати сервер, кімнату та нік.',
-    'invalid_command' => 'Невірна команда',
-    'import_file_key' => 'Вираз імпорту повинен містити ключ \'file\'',
-    'cannot_open_import' => 'Неможливо відкрити файл імпорту SQL: %s',
-    'unable_to_execute' => 'Неможливо виконати файл SQL',
-    'phar_internal_error' => 'Внутрішня помилка плагіну Phar',
-    'build_file_missing' => 'Вказаний файл збірки не існує.',
-    'property_file_missing' => 'Вказаний файл властивості не існує.',
-    'could_not_process_report' => 'Неможливо обробити звіт, згенерований цією утилітою.',
     'shell_not_enabled' => 'Плагін shell не увімкнений. Будь ласка, увімкніть його через config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.zh.php b/src/PHPCensor/Languages/lang.zh.php
index caa6fcfe..2bbf93d5 100644
--- a/src/PHPCensor/Languages/lang.zh.php
+++ b/src/PHPCensor/Languages/lang.zh.php
@@ -306,44 +306,10 @@ PHP Censor',
     'not_installed' => 'PHP Censor does not appear to be installed.',
     'install_instead' => 'Please install PHP Censor via php-censor:install instead.',
 
-    // Builder
-    'missing_app_yml' => 'This project does not contain a .php-censor.yml (.phpci.yml|phpci.yml) file, or it is empty.',
-    'build_success' => 'BUILD SUCCESS',
-    'build_failed' => 'BUILD FAILED',
-    'removing_build' => 'Removing Build.',
-    'exception' => 'Exception: ',
-    'could_not_create_working' => 'Could not create a working copy.',
-    'working_copy_created' => 'Working copy created: %s',
-    'looking_for_binary' => 'Looking for binary: %s',
-    'found_in_path' => 'Found in %s: %s',
-    'running_plugin' => 'RUNNING PLUGIN: %s',
-    'plugin_success' => 'PLUGIN: SUCCESS',
-    'plugin_failed' => 'PLUGIN: FAILED',
-    'plugin_missing' => 'Plugin does not exist: %s',
-
     // Build Plugins:
-    'no_tests_performed' => 'No tests have been performed.',
-    'could_not_find' => 'Could not find %s',
-    'no_campfire_settings' => 'No connection parameters given for Campfire plugin',
-    'failed_to_wipe' => 'Failed to wipe existing directory %s before copy',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'n_emails_sent' => '%d emails sent.',
-    'n_emails_failed' => '%d emails failed to send.',
-    'unable_to_set_env' => 'Unable to set environment variable',
-    'tag_created' => 'Tag created by PHP Censor: %s',
-    'x_built_at_x' => '%PROJECT_TITLE% built at %BUILD_URI%',
-    'hipchat_settings' => 'Please define room and authToken for hipchat_notify plugin',
-    'irc_settings' => 'You must configure a server, room and nick.',
-    'invalid_command' => 'Invalid command',
-    'import_file_key' => 'Import statement must contain a \'file\' key',
-    'cannot_open_import' => 'Cannot open SQL import file: %s',
-    'unable_to_execute' => 'Unable to execute SQL file',
-    'phar_internal_error' => 'Phar Plugin Internal Error',
-    'build_file_missing' => 'Specified build file does not exist.',
-    'property_file_missing' => 'Specified property file does not exist.',
-    'could_not_process_report' => 'Could not process the report generated by this tool.',
     'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
     // Error Levels:
diff --git a/src/PHPCensor/Plugin/Atoum.php b/src/PHPCensor/Plugin/Atoum.php
index 5e5fd6e9..92056591 100644
--- a/src/PHPCensor/Plugin/Atoum.php
+++ b/src/PHPCensor/Plugin/Atoum.php
@@ -89,7 +89,7 @@ class Atoum extends Plugin
         }
         if (count($output) == 0) {
             $status = false;
-            $this->builder->log(Lang::get('no_tests_performed'));
+            $this->builder->log('No tests have been performed.');
         }
         
         return $status;
diff --git a/src/PHPCensor/Plugin/Behat.php b/src/PHPCensor/Plugin/Behat.php
index daf1fe10..dc0563b5 100644
--- a/src/PHPCensor/Plugin/Behat.php
+++ b/src/PHPCensor/Plugin/Behat.php
@@ -66,7 +66,7 @@ class Behat extends Plugin
         $behat = $this->executable;
 
         if (!$behat) {
-            $this->builder->logFailure(Lang::get('could_not_find', 'behat'));
+            $this->builder->logFailure(sprintf('Could not find %s', 'behat'));
 
             return false;
         }
diff --git a/src/PHPCensor/Plugin/Campfire.php b/src/PHPCensor/Plugin/Campfire.php
index dd978e79..d59441d7 100644
--- a/src/PHPCensor/Plugin/Campfire.php
+++ b/src/PHPCensor/Plugin/Campfire.php
@@ -59,7 +59,7 @@ class Campfire extends Plugin
             $this->authToken = $campfire['authToken'];
             $this->roomId    = $campfire['roomId'];
         } else {
-            throw new \Exception(Lang::get('no_campfire_settings'));
+            throw new \Exception('No connection parameters given for Campfire plugin');
         }
     }
 
diff --git a/src/PHPCensor/Plugin/Codeception.php b/src/PHPCensor/Plugin/Codeception.php
index ee9e6974..966273a4 100644
--- a/src/PHPCensor/Plugin/Codeception.php
+++ b/src/PHPCensor/Plugin/Codeception.php
@@ -127,7 +127,7 @@ class Codeception extends Plugin implements ZeroConfigPluginInterface
         $codeception = $this->builder->findBinary('codecept');
 
         if (!$codeception) {
-            $this->builder->logFailure(Lang::get('could_not_find', 'codecept'));
+            $this->builder->logFailure(sprintf('Could not find %s', 'codecept'));
 
             return false;
         }
diff --git a/src/PHPCensor/Plugin/CopyBuild.php b/src/PHPCensor/Plugin/CopyBuild.php
index 38afbe32..1766b006 100644
--- a/src/PHPCensor/Plugin/CopyBuild.php
+++ b/src/PHPCensor/Plugin/CopyBuild.php
@@ -81,7 +81,7 @@ class CopyBuild extends Plugin
             $success = $this->builder->executeCommand($cmd, $this->directory);
 
             if (!$success) {
-                throw new \Exception(Lang::get('failed_to_wipe', $this->directory));
+                throw new \Exception(sprintf('Failed to wipe existing directory %s before copy', $this->directory));
             }
         }
     }
diff --git a/src/PHPCensor/Plugin/Email.php b/src/PHPCensor/Plugin/Email.php
index f0d70d02..39e804ae 100644
--- a/src/PHPCensor/Plugin/Email.php
+++ b/src/PHPCensor/Plugin/Email.php
@@ -76,8 +76,8 @@ class Email extends Plugin
         );
 
         // This is a success if we've not failed to send anything.
-        $this->builder->log(Lang::get('n_emails_sent', (count($addresses) - $sendFailures)));
-        $this->builder->log(Lang::get('n_emails_failed', $sendFailures));
+        $this->builder->log(sprintf('%d emails sent.', (count($addresses) - $sendFailures)));
+        $this->builder->log(sprintf('%d emails failed to send.', $sendFailures));
 
         return ($sendFailures === 0);
     }
diff --git a/src/PHPCensor/Plugin/Env.php b/src/PHPCensor/Plugin/Env.php
index 995aefc7..b666b311 100644
--- a/src/PHPCensor/Plugin/Env.php
+++ b/src/PHPCensor/Plugin/Env.php
@@ -48,7 +48,7 @@ class Env extends Plugin
 
             if (!putenv($this->builder->interpolate($env_var))) {
                 $success = false;
-                $this->builder->logFailure(Lang::get('unable_to_set_env'));
+                $this->builder->logFailure('Unable to set environment variable');
             }
         }
         return $success;
diff --git a/src/PHPCensor/Plugin/Git.php b/src/PHPCensor/Plugin/Git.php
index 8156c6b0..72a1c858 100644
--- a/src/PHPCensor/Plugin/Git.php
+++ b/src/PHPCensor/Plugin/Git.php
@@ -109,7 +109,7 @@ class Git extends Plugin
     protected function runTagAction($options)
     {
         $tagName = date('Ymd-His');
-        $message = Lang::get('tag_created', date('Y-m-d H:i:s'));
+        $message = sprintf('Tag created by PHP Censor: %s', date('Y-m-d H:i:s'));
 
         if (array_key_exists('name', $options)) {
             $tagName = $this->builder->interpolate($options['name']);
diff --git a/src/PHPCensor/Plugin/HipchatNotify.php b/src/PHPCensor/Plugin/HipchatNotify.php
index ec644ecf..db3fb791 100644
--- a/src/PHPCensor/Plugin/HipchatNotify.php
+++ b/src/PHPCensor/Plugin/HipchatNotify.php
@@ -57,7 +57,7 @@ class HipchatNotify extends Plugin
             if (isset($options['message'])) {
                 $this->message = $options['message'];
             } else {
-                $this->message = Lang::get('x_built_at_x');
+                $this->message = '%PROJECT_TITLE% built at %BUILD_URI%';
             }
 
             if (isset($options['color'])) {
@@ -72,7 +72,7 @@ class HipchatNotify extends Plugin
                 $this->notify = false;
             }
         } else {
-            throw new \Exception(Lang::get('hipchat_settings'));
+            throw new \Exception('Please define room and authToken for hipchat_notify plugin.');
         }
     }
 
diff --git a/src/PHPCensor/Plugin/Irc.php b/src/PHPCensor/Plugin/Irc.php
index 9b64b853..a618bb06 100644
--- a/src/PHPCensor/Plugin/Irc.php
+++ b/src/PHPCensor/Plugin/Irc.php
@@ -66,7 +66,7 @@ class Irc extends Plugin
         $msg = $this->builder->interpolate($this->message);
 
         if (empty($this->server) || empty($this->room) || empty($this->nick)) {
-            $this->builder->logFailure(Lang::get('irc_settings'));
+            $this->builder->logFailure('You must configure a server, room and nick.');
         }
 
         if (empty($this->port)) {
diff --git a/src/PHPCensor/Plugin/Mysql.php b/src/PHPCensor/Plugin/Mysql.php
index 66a473cd..ff8b3681 100644
--- a/src/PHPCensor/Plugin/Mysql.php
+++ b/src/PHPCensor/Plugin/Mysql.php
@@ -99,7 +99,7 @@ class Mysql extends Plugin
                     // SQL file execution
                     $this->executeFile($query['import']);
                 } else {
-                    throw new \Exception(Lang::get('invalid_command'));
+                    throw new \Exception('Invalid command.');
                 }
             }
         } catch (\Exception $ex) {
@@ -117,19 +117,19 @@ class Mysql extends Plugin
     protected function executeFile($query)
     {
         if (!isset($query['file'])) {
-            throw new \Exception(Lang::get('import_file_key'));
+            throw new \Exception('Import statement must contain a \'file\' key');
         }
 
         $import_file = $this->builder->buildPath . $this->builder->interpolate($query['file']);
         if (!is_readable($import_file)) {
-            throw new \Exception(Lang::get('cannot_open_import', $import_file));
+            throw new \Exception(sprintf('Cannot open SQL import file: %s', $import_file));
         }
 
         $database = isset($query['database']) ? $this->builder->interpolate($query['database']) : null;
 
         $import_command = $this->getImportCommand($import_file, $database);
         if (!$this->builder->executeCommand($import_command)) {
-            throw new \Exception(Lang::get('unable_to_execute'));
+            throw new \Exception('Unable to execute SQL file');
         }
 
         return true;
diff --git a/src/PHPCensor/Plugin/Phar.php b/src/PHPCensor/Plugin/Phar.php
index af609810..790924aa 100644
--- a/src/PHPCensor/Plugin/Phar.php
+++ b/src/PHPCensor/Plugin/Phar.php
@@ -204,7 +204,7 @@ class Phar extends Plugin
 
             $success = true;
         } catch (\Exception $e) {
-            $this->builder->log(Lang::get('phar_internal_error'));
+            $this->builder->log('Phar Plugin Internal Error');
             $this->builder->log($e->getMessage());
         }
 
diff --git a/src/PHPCensor/Plugin/Phing.php b/src/PHPCensor/Plugin/Phing.php
index 0f7329ee..aab8c916 100644
--- a/src/PHPCensor/Plugin/Phing.php
+++ b/src/PHPCensor/Plugin/Phing.php
@@ -163,7 +163,7 @@ class Phing extends Plugin
     public function setBuildFile($buildFile)
     {
         if (!file_exists($this->getDirectory() . $buildFile)) {
-            throw new \Exception(Lang::get('build_file_missing'));
+            throw new \Exception('Specified build file does not exist.');
         }
 
         $this->buildFile = $buildFile;
@@ -239,7 +239,7 @@ class Phing extends Plugin
     public function setPropertyFile($propertyFile)
     {
         if (!file_exists($this->getDirectory() . DIRECTORY_SEPARATOR . $propertyFile)) {
-            throw new \Exception(Lang::get('property_file_missing'));
+            throw new \Exception('Specified property file does not exist.');
         }
 
         $this->propertyFile = $propertyFile;
diff --git a/src/PHPCensor/Plugin/PhpCodeSniffer.php b/src/PHPCensor/Plugin/PhpCodeSniffer.php
index 6c3b56e0..53699c42 100644
--- a/src/PHPCensor/Plugin/PhpCodeSniffer.php
+++ b/src/PHPCensor/Plugin/PhpCodeSniffer.php
@@ -211,7 +211,7 @@ class PhpCodeSniffer extends Plugin implements ZeroConfigPluginInterface
 
         if (!is_array($data)) {
             $this->builder->log($output);
-            throw new \Exception(PHPCensor\Helper\Lang::get('could_not_process_report'));
+            throw new \Exception('Could not process the report generated by PHP Code Sniffer.');
         }
 
         $errors = $data['totals']['errors'];
diff --git a/src/PHPCensor/Plugin/PhpCpd.php b/src/PHPCensor/Plugin/PhpCpd.php
index 84c0c00c..6ee762a7 100644
--- a/src/PHPCensor/Plugin/PhpCpd.php
+++ b/src/PHPCensor/Plugin/PhpCpd.php
@@ -136,7 +136,7 @@ class PhpCpd extends Plugin implements ZeroConfigPluginInterface
 
         if ($xml === false) {
             $this->builder->log($xmlString);
-            throw new \Exception(Lang::get('could_not_process_report'));
+            throw new \Exception('Could not process the report generated by PHPCpd.');
         }
 
         $warnings = 0;
diff --git a/src/PHPCensor/Plugin/PhpUnit.php b/src/PHPCensor/Plugin/PhpUnit.php
index 430662ed..8bbe6afa 100644
--- a/src/PHPCensor/Plugin/PhpUnit.php
+++ b/src/PHPCensor/Plugin/PhpUnit.php
@@ -85,7 +85,7 @@ class PhpUnit extends Plugin implements ZeroConfigPluginInterface
         $xmlConfigFiles = $this->options->getConfigFiles($this->build->getBuildPath());
         $directories    = $this->options->getDirectories();
         if (empty($xmlConfigFiles) && empty($directories)) {
-            $this->builder->logFailure(Lang::get('phpunit_fail_init'));
+            $this->builder->logFailure('Neither a configuration file nor a test directory found.');
             return false;
         }
 
diff --git a/src/PHPCensor/Plugin/Util/Executor.php b/src/PHPCensor/Plugin/Util/Executor.php
index 17721af7..c860a696 100644
--- a/src/PHPCensor/Plugin/Util/Executor.php
+++ b/src/PHPCensor/Plugin/Util/Executor.php
@@ -134,21 +134,25 @@ class Executor
         $success = true;
 
         foreach ($plugins as $plugin => $options) {
-            $this->logger->log("\n" . Lang::get('running_plugin', Lang::get($plugin)) . ' (' . Lang::get('stage') . ': ' . Lang::get('stage_' . $stage) . ')');
+            $this->logger->log("\n" . 
+                sprintf('RUNNING PLUGIN: %s', Lang::get($plugin)) . ' (' .
+                'Stage' . ': ' . 
+                Lang::get('stage_' . $stage) . ')'
+            );
 
             $this->setPluginStatus($stage, $plugin, Build::STATUS_RUNNING);
 
             // Try and execute it
             if ($this->executePlugin($plugin, $options)) {
                 // Execution was successful
-                $this->logger->logSuccess(Lang::get('plugin_success'));
+                $this->logger->logSuccess('PLUGIN: SUCCESS');
                 $this->setPluginStatus($stage, $plugin, Build::STATUS_SUCCESS);
             } else {
                 // Execution failed
                 $this->setPluginStatus($stage, $plugin, Build::STATUS_FAILED);
 
                 if ($stage === 'setup') {
-                    $this->logger->logFailure(Lang::get('plugin_failed'));
+                    $this->logger->logFailure('PLUGIN: FAILED');
                     // If we're in the "setup" stage, execution should not continue after
                     // a plugin has failed:
                     throw new Exception('Plugin failed: ' . $plugin);
@@ -156,10 +160,10 @@ class Executor
                     // If we're in the "test" stage and the plugin is not allowed to fail,
                     // then mark the build as failed:
                     if (empty($options['allow_failures']) && $stage === 'test') {
-                        $this->logger->logFailure(Lang::get('plugin_failed'));
+                        $this->logger->logFailure('PLUGIN: FAILED');
                         $success = false;
                     } else {
-                        $this->logger->logFailure(Lang::get('plugin_failed') . ' (' . Lang::get('failed_allowed') . ')');
+                        $this->logger->logFailure('PLUGIN: FAILED (ALLOWED)');
                     }
                 }
             }
@@ -185,7 +189,7 @@ class Executor
         }
 
         if (!class_exists($class)) {
-            $this->logger->logFailure(Lang::get('plugin_missing', $plugin));
+            $this->logger->logFailure(sprintf('Plugin does not exist: %s', $plugin));
 
             return false;
         }
@@ -196,7 +200,7 @@ class Executor
 
             return $obj->execute();
         } catch (\Exception $ex) {
-            $this->logger->logFailure(Lang::get('exception') . $ex->getMessage(), $ex);
+            $this->logger->logFailure('Exception: ' . $ex->getMessage(), $ex);
 
             return false;
         }

From ea5044bf9b1bde2f73ff8ecf430ad42259a80b75 Mon Sep 17 00:00:00 2001
From: Dmitry Khomutov <poisoncorpsee@gmail.com>
Date: Thu, 9 Feb 2017 22:15:30 +0700
Subject: [PATCH 2/2] Fixes

---
 src/PHPCensor/Languages/lang.da.php          | 1 -
 src/PHPCensor/Languages/lang.de.php          | 1 -
 src/PHPCensor/Languages/lang.el.php          | 1 -
 src/PHPCensor/Languages/lang.en.php          | 1 -
 src/PHPCensor/Languages/lang.es.php          | 1 -
 src/PHPCensor/Languages/lang.fr.php          | 5 +++--
 src/PHPCensor/Languages/lang.it.php          | 1 -
 src/PHPCensor/Languages/lang.nl.php          | 1 -
 src/PHPCensor/Languages/lang.pl.php          | 1 -
 src/PHPCensor/Languages/lang.pt-br.php       | 1 -
 src/PHPCensor/Languages/lang.ru.php          | 1 -
 src/PHPCensor/Languages/lang.uk.php          | 1 -
 src/PHPCensor/Languages/lang.zh.php          | 1 -
 src/PHPCensor/Plugin/Codeception.php         | 1 -
 src/PHPCensor/Plugin/Util/Executor.php       | 3 +--
 src/PHPCensor/Service/BuildService.php       | 2 +-
 tests/PHPCensor/Service/BuildServiceTest.php | 2 +-
 17 files changed, 6 insertions(+), 19 deletions(-)

diff --git a/src/PHPCensor/Languages/lang.da.php b/src/PHPCensor/Languages/lang.da.php
index 648832cb..16c9d79e 100644
--- a/src/PHPCensor/Languages/lang.da.php
+++ b/src/PHPCensor/Languages/lang.da.php
@@ -293,5 +293,4 @@ du kører composer update.',
     'passing_build' => 'Succesfuldt Build',
     'failing_build' => 'Fejlet Build',
     'log_output' => 'Log-output:',
-    'shell_not_enabled' => 'Shell-plugin er ikke aktiveret. Aktivér det via config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.de.php b/src/PHPCensor/Languages/lang.de.php
index 0f905c5b..0d0d58e6 100644
--- a/src/PHPCensor/Languages/lang.de.php
+++ b/src/PHPCensor/Languages/lang.de.php
@@ -316,7 +316,6 @@ generiert. Um es zu verwenden, fügen Sie einfach den folgenden Public Key im Ab
     'passing_build' => 'Durchlaufender Build',
     'failing_build' => 'Fehlschlagender Build',
     'log_output' => 'Protokollausgabe: ',
-    'shell_not_enabled' => 'Das Shell-Plugin ist nicht aktiviert. Bitte aktivieren Sie es via config.yml.',
 
     // Error Levels:
     'critical' => 'Kritisch',
diff --git a/src/PHPCensor/Languages/lang.el.php b/src/PHPCensor/Languages/lang.el.php
index 1e180868..a325e311 100644
--- a/src/PHPCensor/Languages/lang.el.php
+++ b/src/PHPCensor/Languages/lang.el.php
@@ -295,5 +295,4 @@ Services</a> του Bitbucket αποθετηρίου σας.',
     'passing_build' => 'Επιτυχημένη κατασκευή',
     'failing_build' => 'Αποτυχημένη κατασκευή',
     'log_output' => 'Σύνδεση εξόδου:',
-    'shell_not_enabled' => 'Το πρόσθετο για το κέλυφος δεν είναι ενεργοποιημένο. Παρακαλούμε ενεργοποιήστε το μέσω του αρχείου config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.en.php b/src/PHPCensor/Languages/lang.en.php
index 335d0d52..6da0e0ee 100644
--- a/src/PHPCensor/Languages/lang.en.php
+++ b/src/PHPCensor/Languages/lang.en.php
@@ -350,7 +350,6 @@ PHP Censor',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
 
     // Error Levels:
diff --git a/src/PHPCensor/Languages/lang.es.php b/src/PHPCensor/Languages/lang.es.php
index 10c940f0..fc90e175 100644
--- a/src/PHPCensor/Languages/lang.es.php
+++ b/src/PHPCensor/Languages/lang.es.php
@@ -289,5 +289,4 @@ PHP Censor',
     'passing_build' => 'Build Exitoso',
     'failing_build' => 'Build Fallido',
     'log_output' => 'Log de Salida: ',
-    'shell_not_enabled' => 'El plugin shell no está habilitado. Por favor, habilitalo desde config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.fr.php b/src/PHPCensor/Languages/lang.fr.php
index 1be39d39..bbd20421 100644
--- a/src/PHPCensor/Languages/lang.fr.php
+++ b/src/PHPCensor/Languages/lang.fr.php
@@ -365,8 +365,9 @@ PHP Censor',
     'failed_allowed' => 'Autorisé',
     
     // Build Plugins:
-    'log_output' => 'Sortie de log : ',
-    'shell_not_enabled' => 'Le plugn shell n\'est pas activé. Merci de l\'activer via le fichier config.yml.',
+    'passing_build' => 'Build réussi',
+    'failing_build' => 'Build en echec',
+    'log_output'    => 'Sortie de log : ',
     
     // Error Levels:
     'critical' => 'Critique',
diff --git a/src/PHPCensor/Languages/lang.it.php b/src/PHPCensor/Languages/lang.it.php
index ffb1f186..67568c43 100644
--- a/src/PHPCensor/Languages/lang.it.php
+++ b/src/PHPCensor/Languages/lang.it.php
@@ -295,5 +295,4 @@ PHP Censor',
     'passing_build' => 'Build passata',
     'failing_build' => 'Build fallita',
     'log_output' => 'Log: ',
-    'shell_not_enabled' => 'Il plugin shell non è attivato. Per favore attivalo tramite config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.nl.php b/src/PHPCensor/Languages/lang.nl.php
index 26055285..c18be985 100644
--- a/src/PHPCensor/Languages/lang.nl.php
+++ b/src/PHPCensor/Languages/lang.nl.php
@@ -295,5 +295,4 @@ keer je composer update uitvoert.',
     'passing_build' => 'Slagende build',
     'failing_build' => 'Falende build',
     'log_output' => 'Log output:',
-    'shell_not_enabled' => 'De shell plugin is niet ingeschakeld, schakel deze a.u.b. in via het config.yml bestand.'
 ];
diff --git a/src/PHPCensor/Languages/lang.pl.php b/src/PHPCensor/Languages/lang.pl.php
index 75274398..0dc21564 100644
--- a/src/PHPCensor/Languages/lang.pl.php
+++ b/src/PHPCensor/Languages/lang.pl.php
@@ -296,5 +296,4 @@ wywołaniu polecenia composer update.',
     'passing_build' => 'Pomijanie Budowania',
     'failing_build' => 'Niepowodzenie Budowania',
     'log_output' => 'Log Wyjściowy:',
-    'shell_not_enabled' => 'Plugin powłoki jest nieaktywny. Aktywuj go poprzez config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.pt-br.php b/src/PHPCensor/Languages/lang.pt-br.php
index c777736d..a5b98013 100644
--- a/src/PHPCensor/Languages/lang.pt-br.php
+++ b/src/PHPCensor/Languages/lang.pt-br.php
@@ -317,7 +317,6 @@ PHP Censor',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
     // Error Levels:
     'critical' => 'Critical',
diff --git a/src/PHPCensor/Languages/lang.ru.php b/src/PHPCensor/Languages/lang.ru.php
index b4c70566..50e3f34f 100644
--- a/src/PHPCensor/Languages/lang.ru.php
+++ b/src/PHPCensor/Languages/lang.ru.php
@@ -335,7 +335,6 @@ PHP Censor',
     'passing_build' => 'Успех сборки',
     'failing_build' => 'Провал сборки',
     'log_output' => 'Вывод лога: ',
-    'shell_not_enabled' => 'Плагин shell не включен. Пожалуйста, включите его в файле config.yml.',
     
     // Error Levels:
     'critical' => 'Критичный',
diff --git a/src/PHPCensor/Languages/lang.uk.php b/src/PHPCensor/Languages/lang.uk.php
index ff83c1b9..7767470d 100644
--- a/src/PHPCensor/Languages/lang.uk.php
+++ b/src/PHPCensor/Languages/lang.uk.php
@@ -295,5 +295,4 @@ PHP Censor',
     'passing_build' => 'Успішно збірка',
     'failing_build' => 'Невдала збірка',
     'log_output' => 'Вивід лога:',
-    'shell_not_enabled' => 'Плагін shell не увімкнений. Будь ласка, увімкніть його через config.yml.'
 ];
diff --git a/src/PHPCensor/Languages/lang.zh.php b/src/PHPCensor/Languages/lang.zh.php
index 2bbf93d5..de37f9db 100644
--- a/src/PHPCensor/Languages/lang.zh.php
+++ b/src/PHPCensor/Languages/lang.zh.php
@@ -310,7 +310,6 @@ PHP Censor',
     'passing_build' => 'Passing Build',
     'failing_build' => 'Failing Build',
     'log_output' => 'Log Output: ',
-    'shell_not_enabled' => 'The shell plugin is not enabled. Please enable it via config.yml.',
 
     // Error Levels:
     'critical' => 'Critical',
diff --git a/src/PHPCensor/Plugin/Codeception.php b/src/PHPCensor/Plugin/Codeception.php
index 966273a4..35121b1d 100644
--- a/src/PHPCensor/Plugin/Codeception.php
+++ b/src/PHPCensor/Plugin/Codeception.php
@@ -10,7 +10,6 @@
 namespace PHPCensor\Plugin;
 
 use PHPCensor\Builder;
-use PHPCensor\Helper\Lang;
 use PHPCensor\Model\Build;
 use PHPCensor\Plugin\Util\TestResultParsers\Codeception as Parser;
 use PHPCensor\Plugin;
diff --git a/src/PHPCensor/Plugin/Util/Executor.php b/src/PHPCensor/Plugin/Util/Executor.php
index c860a696..aa20a2ed 100644
--- a/src/PHPCensor/Plugin/Util/Executor.php
+++ b/src/PHPCensor/Plugin/Util/Executor.php
@@ -136,8 +136,7 @@ class Executor
         foreach ($plugins as $plugin => $options) {
             $this->logger->log("\n" . 
                 sprintf('RUNNING PLUGIN: %s', Lang::get($plugin)) . ' (' .
-                'Stage' . ': ' . 
-                Lang::get('stage_' . $stage) . ')'
+                'Stage' . ': ' . ucfirst($stage) . ')'
             );
 
             $this->setPluginStatus($stage, $plugin, Build::STATUS_RUNNING);
diff --git a/src/PHPCensor/Service/BuildService.php b/src/PHPCensor/Service/BuildService.php
index aaf5a85b..26017a16 100644
--- a/src/PHPCensor/Service/BuildService.php
+++ b/src/PHPCensor/Service/BuildService.php
@@ -69,7 +69,7 @@ class BuildService
             $build->setCommitId($commitId);
         } else {
             $build->setCommitId('Manual');
-            $build->setCommitMessage(Lang::get('manual_build'));
+            $build->setCommitMessage('Manual');
         }
 
         if (!is_null($branch)) {
diff --git a/tests/PHPCensor/Service/BuildServiceTest.php b/tests/PHPCensor/Service/BuildServiceTest.php
index 65df07d7..ba0f97ad 100644
--- a/tests/PHPCensor/Service/BuildServiceTest.php
+++ b/tests/PHPCensor/Service/BuildServiceTest.php
@@ -54,7 +54,7 @@ class BuildServiceTest extends \PHPUnit_Framework_TestCase
         $this->assertNull($returnValue->getStarted());
         $this->assertNull($returnValue->getFinished());
         $this->assertNull($returnValue->getLog());
-        $this->assertEquals(\PHPCensor\Helper\Lang::get('manual_build'), $returnValue->getCommitMessage());
+        $this->assertEquals('Manual', $returnValue->getCommitMessage());
         $this->assertNull($returnValue->getCommitterEmail());
         $this->assertNull($returnValue->getExtra());
         $this->assertEquals('master', $returnValue->getBranch());