Merge branch 'master' into talmdal_dev

Conflicts:
	modules/gallery/controllers/albums.php
	modules/gallery/controllers/movies.php
	modules/gallery/controllers/photos.php

1 files changed, 1 insertions, 1 deletions

diff --git a/modules/gallery_unit_test/views/kohana_unit_test_cli.php b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
index 352671eb..3203ee44 100644
--- a/modules/gallery_unit_test/views/kohana_unit_test_cli.php
+++ b/modules/gallery_unit_test/views/kohana_unit_test_cli.php
@@ -44,7 +44,7 @@ foreach ($results as $class => $methods) {
                red_start(), color_end());
         echo "  ", $result->getMessage(), "\n";
         echo "  ", $result->getFile();
-        echo " ", "(" . Kohana::lang("unit_test.line") . " " . $result->getLine(), ")\n";
+        echo " ", "(line " . $result->getLine(), ")\n";
         if ($result->getDebug() !== null) {
           echo "  ", "(", gettype($result->getDebug()), ") ",
             var_export($result->getDebug(), true), "\n";