Merge remote-tracking branch 'origin/QA_4_4' into QA_4_4

.scrutinizer.yml

@@ -5,8 +5,6 @@ imports:
 filter:
     excluded_paths: [libraries/php-gettext/*, libraries/tcpdf/*, libraries/bfShapeFiles/*, PMAStandard/*, libraries/phpseclib/*, libraries/plugins/auth/recaptchalib.php, libraries/plugins/auth/swekey/swekey.php, libraries/sql-formatter/*, js/jquery/*, js/jqplot/*, js/openlayers/*, js/codemirror/*, js/canvg/*, js/tracekit/*, js/OpenStreetMap.js, js/sprintf.js, test/libraries/php-gettext/*, test/libraries/sql-formatter/*]
 tools:
-    external_code_coverage:
-        timeout: 3600 # Timeout in seconds.
     php_code_sniffer:
         config:
             standard: "PMAStandard"

.travis.yml

@@ -50,7 +50,6 @@ script:
     fi
 
 after_script:
-  - if [ -f build/logs/clover.xml ] ; then php vendor/bin/ocular code-coverage:upload --format=php-clover build/logs/clover.xml || true ; fi
   - if [ -f vendor/bin/coveralls ] ; then php vendor/bin/coveralls -v || true ; fi
   - if [ -f php.log ] ; then cat php.log ; fi
 

composer.json

@@ -24,7 +24,6 @@
     "require-dev": {
         "satooshi/php-coveralls": ">=0.6",
         "phpunit/phpunit": "<4.2",
-        "phpunit/phpunit-selenium": ">=1.2",
-        "scrutinizer/ocular": ">=1.0.0"
+        "phpunit/phpunit-selenium": ">=1.2"
     }
 }

po/ro.po

@@ -697,8 +697,6 @@ msgid ""
 "Script timeout passed, if you want to finish import, please %sresubmit the "
 "same file%s and import will resume."
 msgstr ""
-"Durata maximă de execuție a scriptului a fost depășită, dacă doriți să "
-"terminați importul, retrimiteți același fișier și importul va continua."
 
 #: import.php:675
 msgid ""