Merge branch 'master' into 3.0-m06

Conflicts:
	.travis.yml
	bower.json
	core/Notification/Manager.php
	core/Updates.php
	core/Updates/2.16.2-b2.php
	core/Version.php
	libs/Zend/Validate/Hostname.php
	libs/bower_components/jScrollPane/ajax.html
	libs/bower_components/jScrollPane/anchors.html
	libs/bower_components/jScrollPane/api.html
	libs/bower_components/jScrollPane/arrow_hover.html
	libs/bower_components/jScrollPane/arrow_positions.html
	libs/bower_components/jScrollPane/arrows.html
	libs/bower_components/jScrollPane/auto_reinitialise.html
	libs/bower_components/jScrollPane/basic.html
	libs/bower_components/jScrollPane/caps.html
	libs/bower_components/jScrollPane/changelog.html
	libs/bower_components/jScrollPane/destroy.html
	libs/bower_components/jScrollPane/drag_size.html
	libs/bower_components/jScrollPane/dynamic_content.html
	libs/bower_components/jScrollPane/dynamic_height.html
	libs/bower_components/jScrollPane/dynamic_width.html
	libs/bower_components/jScrollPane/events.html
	libs/bower_components/jScrollPane/faqs.html
	libs/bower_components/jScrollPane/fixed_width.html
	libs/bower_components/jScrollPane/focus.html
	libs/bower_components/jScrollPane/fullpage_scroll.html
	libs/bower_components/jScrollPane/iframe.html
	libs/bower_components/jScrollPane/iframe2.html
	libs/bower_components/jScrollPane/iframe_content1.html
	libs/bower_components/jScrollPane/iframe_content2.html
	libs/bower_components/jScrollPane/image.html
	libs/bower_components/jScrollPane/image2.html
	libs/bower_components/jScrollPane/index.html
	libs/bower_components/jScrollPane/invisibles.html
	libs/bower_components/jScrollPane/known_issues.html
	libs/bower_components/jScrollPane/less_basic.html
	libs/bower_components/jScrollPane/mwheel_intent.html
	libs/bower_components/jScrollPane/override_animate.html
	libs/bower_components/jScrollPane/runeimp.html
	libs/bower_components/jScrollPane/runeimp2.html
	libs/bower_components/jScrollPane/scroll_on_left.html
	libs/bower_components/jScrollPane/scroll_to.html
	libs/bower_components/jScrollPane/scroll_to_animate.html
	libs/bower_components/jScrollPane/settings.html
	libs/bower_components/jScrollPane/short.html
	libs/bower_components/jquery/.bower.json
	libs/bower_components/jquery/LICENSE.txt
	libs/bower_components/jquery/dist/jquery.js
	libs/bower_components/jquery/dist/jquery.min.js
	libs/bower_components/jquery/dist/jquery.min.map
	libs/bower_components/jquery/sizzle/dist/sizzle.js
	libs/bower_components/jquery/src/ajax.js
	libs/bower_components/jquery/src/ajax/jsonp.js
	libs/bower_components/jquery/src/ajax/load.js
	libs/bower_components/jquery/src/ajax/parseJSON.js
	libs/bower_components/jquery/src/ajax/parseXML.js
	libs/bower_components/jquery/src/ajax/script.js
	libs/bower_components/jquery/src/ajax/xhr.js
	libs/bower_components/jquery/src/attributes/attr.js
	libs/bower_components/jquery/src/attributes/classes.js
	libs/bower_components/jquery/src/attributes/prop.js
	libs/bower_components/jquery/src/attributes/support.js
	libs/bower_components/jquery/src/attributes/val.js
	libs/bower_components/jquery/src/callbacks.js
	libs/bower_components/jquery/src/core.js
	libs/bower_components/jquery/src/core/access.js
	libs/bower_components/jquery/src/core/init.js
	libs/bower_components/jquery/src/core/parseHTML.js
	libs/bower_components/jquery/src/core/ready.js
	libs/bower_components/jquery/src/css.js
	libs/bower_components/jquery/src/css/curCSS.js
	libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
	libs/bower_components/jquery/src/css/support.js
	libs/bower_components/jquery/src/css/var/swap.js
	libs/bower_components/jquery/src/data.js
	libs/bower_components/jquery/src/data/accepts.js
	libs/bower_components/jquery/src/deferred.js
	libs/bower_components/jquery/src/deprecated.js
	libs/bower_components/jquery/src/dimensions.js
	libs/bower_components/jquery/src/effects.js
	libs/bower_components/jquery/src/effects/Tween.js
	libs/bower_components/jquery/src/event.js
	libs/bower_components/jquery/src/event/support.js
	libs/bower_components/jquery/src/manipulation.js
	libs/bower_components/jquery/src/manipulation/support.js
	libs/bower_components/jquery/src/offset.js
	libs/bower_components/jquery/src/queue.js
	libs/bower_components/jquery/src/serialize.js
	libs/bower_components/jquery/src/traversing.js
	libs/bower_components/jquery/src/traversing/findFilter.js
	libs/bower_components/jquery/src/var/concat.js
	libs/bower_components/jquery/src/var/indexOf.js
	libs/bower_components/jquery/src/var/push.js
	libs/bower_components/jquery/src/var/slice.js
	libs/bower_components/jquery/src/wrap.js
	plugins/API/ProcessedReport.php
	plugins/AnonymousPiwikUsageMeasurement
	plugins/CoreConsole/Commands/ManagePlugin.php
	plugins/CoreHome/javascripts/dataTable.js
	plugins/CoreHome/javascripts/manifest.json
	plugins/CoreHome/templates/_topBar.twig
	plugins/CoreUpdater/templates/updateSuccess.twig
	plugins/CustomAlerts
	plugins/CustomDimensions
	plugins/DevicesDetection/Reports/GetBrowserVersions.php
	plugins/DevicesDetection/Reports/GetBrowsers.php
	plugins/ExamplePlugin/Updates/0.0.2.php
	plugins/Feedback/templates/index.twig
	plugins/LogViewer
	plugins/Morpheus/stylesheets/general/_forms.less
	plugins/Morpheus/templates/layout.twig
	plugins/Morpheus/templates/user.twig
	plugins/QueuedTracking
	plugins/SegmentEditor/stylesheets/segmentation.less
	plugins/SitesManager/tests/Integration/ApiTest.php
	tests/PHPUnit/Integration/WidgetsListTest.php
	tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
	tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
	tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
	tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
	tests/UI/expected-ui-screenshots
	tests/UI/specs/SegmentSelectorEditor_spec.js

5 files changed, 21 insertions, 13 deletions

diff --git a/plugins/LanguagesManager/Commands/FetchTranslations.php b/plugins/LanguagesManager/Commands/FetchTranslations.php
index 79f83da36d..ce24dc3a97 100644
--- a/plugins/LanguagesManager/Commands/FetchTranslations.php
+++ b/plugins/LanguagesManager/Commands/FetchTranslations.php
@@ -13,7 +13,7 @@ use Piwik\Container\StaticContainer;
 use Piwik\Exception\AuthenticationFailedException;
 use Piwik\Plugins\LanguagesManager\API as LanguagesManagerApi;
 use Piwik\Translation\Transifex\API;
-use Symfony\Component\Console\Helper\ProgressHelper;
+use Symfony\Component\Console\Helper\ProgressBar;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\OutputInterface;
@@ -38,6 +38,8 @@ class FetchTranslations extends TranslationBase
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $output->setDecorated(true);
+
         $username = $input->getOption('username');
         $password = $input->getOption('password');
         $plugin = $input->getOption('plugin');
@@ -81,10 +83,10 @@ class FetchTranslations extends TranslationBase
             $languages = $languageCodes;
         }
 
-        /** @var ProgressHelper $progress */
-        $progress = $this->getHelperSet()->get('progress');
+        /** @var ProgressBar $progress */
+        $progress = new ProgressBar($output, count($languages));
 
-        $progress->start($output, count($languages));
+        $progress->start();
 
         $statistics = $transifexApi->getStatistics($resource);
 
@@ -108,6 +110,7 @@ class FetchTranslations extends TranslationBase
         }
 
         $progress->finish();
+        $output->writeln('');
     }
 
     public static function getDownloadPath()
diff --git a/plugins/LanguagesManager/Commands/Update.php b/plugins/LanguagesManager/Commands/Update.php
index b4f9eea4af..375614c5db 100644
--- a/plugins/LanguagesManager/Commands/Update.php
+++ b/plugins/LanguagesManager/Commands/Update.php
@@ -11,12 +11,12 @@ namespace Piwik\Plugins\LanguagesManager\Commands;
 
 use Piwik\Plugins\LanguagesManager\API;
 use Symfony\Component\Console\Helper\DialogHelper;
-use Symfony\Component\Console\Helper\ProgressHelper;
 use Symfony\Component\Console\Input\ArrayInput;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Input\InputOption;
 use Symfony\Component\Console\Output\NullOutput;
 use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\Console\Helper\ProgressBar;
 
 /**
  */
@@ -34,6 +34,8 @@ class Update extends TranslationBase
 
     protected function execute(InputInterface $input, OutputInterface $output)
     {
+        $output->setDecorated(true);
+
         $start = microtime(true);
 
         /** @var DialogHelper $dialog */
@@ -76,10 +78,10 @@ class Update extends TranslationBase
 
             $output->writeln("Starting to import new language files");
 
-            /** @var ProgressHelper $progress */
-            $progress = $this->getHelperSet()->get('progress');
+            /** @var ProgressBar $progress */
+            $progress = new ProgressBar($output, count($files));
 
-            $progress->start($output, count($files));
+            $progress->start();
 
             foreach ($files as $filename) {
 
@@ -119,6 +121,7 @@ class Update extends TranslationBase
             }
 
             $progress->finish();
+            $output->writeln('');
         }
 
         $output->writeln("Finished in " . round(microtime(true)-$start, 3) . "s");
@@ -140,7 +143,7 @@ class Update extends TranslationBase
         preg_match_all('/plugins\/([a-zA-z]+) /', $submodules, $matches);
         $submodulePlugins = $matches[1];
 
-        // ignore complete new plugins aswell
+        // ignore complete new plugins as well
         $changes = shell_exec('git status');
         preg_match_all('/plugins\/([a-zA-z]+)\/\n/', $changes, $matches);
         $newPlugins = $matches[1];
@@ -177,7 +180,7 @@ class Update extends TranslationBase
         if ($input->getOption('force')) {
             $arguments['--lastupdate'] = 1;
         } else {
-            $lastModDate = strtotime('2015-01-04 00:00:00'); // date of inital transifex setup
+            $lastModDate = strtotime('2015-01-04 00:00:00'); // date of initial transifex setup
             try {
                 // try to find the language file (of given plugin) with the newest modification date in git log
                 $path = ($plugin ? 'plugins/' . $plugin . '/' : '') . 'lang';
diff --git a/plugins/LanguagesManager/Model.php b/plugins/LanguagesManager/Model.php
index fad84238cd..071863b3cd 100644
--- a/plugins/LanguagesManager/Model.php
+++ b/plugins/LanguagesManager/Model.php
@@ -58,7 +58,7 @@ class Model
     }
 
     /**
-     * Returns whether the given user has choosen to use 12 hour clock
+     * Returns whether the given user has chosen to use 12 hour clock
      *
      * @param $userLogin
      * @return bool
diff --git a/plugins/LanguagesManager/lang/sq.json b/plugins/LanguagesManager/lang/sq.json
index 44f1ff8f52..79312c1c0b 100644
--- a/plugins/LanguagesManager/lang/sq.json
+++ b/plugins/LanguagesManager/lang/sq.json
@@ -1,5 +1,6 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Mbi përkthimet e Piwik-ut"
+        "AboutPiwikTranslations": "Mbi përkthimet e Piwik-ut",
+        "TranslationSearch": "Kërkim Përkthimi"
     }
 }
\ No newline at end of file
diff --git a/plugins/LanguagesManager/lang/uk.json b/plugins/LanguagesManager/lang/uk.json
index 63f18a97ce..e37be17d69 100644
--- a/plugins/LanguagesManager/lang/uk.json
+++ b/plugins/LanguagesManager/lang/uk.json
@@ -1,5 +1,6 @@
 {
     "LanguagesManager": {
-        "AboutPiwikTranslations": "Про переклади Piwik"
+        "AboutPiwikTranslations": "Про переклади Piwik",
+        "TranslationSearch": "Пошук перекладу"
     }
 }
\ No newline at end of file