language update refs #3430

.gitignore

@@ -1,8 +1,12 @@
+bootstrap.php
 build
 crossdomain.xml
 documentation
 favicon.ico
 logs
+plugins/*.zip
+themes/logo-header.png
+themes/logo.png
 piwik-min.js
 robots.txt
 tmp
@@ -18,12 +22,25 @@ tmp/*
 *.db
 *.buildpath
 config/config.ini.php
+.DS_Store
+tests/PHPUnit/Integration/processed/
 js/yui*
 misc/*.dat
 tests/javascript/enable_sqlite
 tests/javascript/unittest.dbf
-tests/lib/geoip-files/GeoIP*
+tests/lib/geoip-files/*.dat*
 tests/lib/visualphpunit/app/resource/cache/
 tests/PHPUnit/Integration/processed/
 tests/PHPUnit/phpunit.xml
 tests/results/
+tests/lib/xhprof-0.9.2/extension/.libs
+tests/lib/xhprof-0.9.2/extension/Makefile
+tests/lib/xhprof-0.9.2/extension/Makefile.objects
+tests/lib/xhprof-0.9.2/extension/config.log
+tests/lib/xhprof-0.9.2/extension/config.nice
+tests/lib/xhprof-0.9.2/extension/config.status
+tests/lib/xhprof-0.9.2/extension/libtool
+tests/lib/xhprof-0.9.2/extension/modules
+tests/lib/xhprof-0.9.2/extension/xhprof.la
+tests/lib/xhprof-0.9.2/extension/xhprof.lo
+docs/

.travis.yml

@@ -1,35 +1,48 @@
 language: php
 
-# We want to test against 
+# We want to test against PHP 5.3/5.4/5.5
 php:
   - 5.5
   - 5.4
   - 5.3
 
+# Separate different test suites
 env:
   matrix:
     - TEST_SUITE=PluginTests
     - TEST_SUITE=CoreTests
     - TEST_SUITE=IntegrationTests
 
-script: phpunit --configuration phpunit.xml --testsuite $TEST_SUITE --coverage-text
+# Run PHP 5.4 for aa tests to generate
+# code coverage.
+matrix:
+  include:
+    - php: 5.4
+      env: 
+        - TEST_SUITE=
+        - secure: "RaRLGQuYhkPWNdkvNNMm0M4kukzwaaLXgQ9kIq3XALXuS1z31SnD27slFopH\nqIBmIYqevce9VKaytJSXrbjsWp8Yx3mheh4fDs4UP/ULhyJ8FgikGbZyU9DP\nsXUJbVMRXSab98Ga25EoV/d8dJoPLvRxMvtpmiT2XLEpwT8Bc2w="
+
+script: ./travis.sh
 
 before_script:
+  - echo `uname -a`
+  - echo `date`
+  - php -r "var_dump(gd_info());"
   - mysql -e 'create database piwik_test;'
-  - ./tests/travis.sh
+  - ./tests/travis/prepare.sh
   - ./tests/travis/setup_webserver.sh
   - cd tests/PHPUnit
 
-matrix:
-  allow_failures:
-    - php: 5.5
+after_success:
+  - cd $TRAVIS_BUILD_DIR
+  - ./tests/travis/generate_docs.sh
 
 notifications:
   irc:
     skip_join: true
     on_success: change
     channels:
-      - "irc.freenode.org#piwik"
+      - "irc.freenode.org#piwik-dev"
     template:
       - "%{repository} (%{commit}) : %{message} %{foo} "
       - "Build details: %{build_url}"

LEGALNOTICE

@@ -40,45 +40,33 @@ CREDITS
 
 	For detailed contribution history, refer to the source, tickets,
 	patches, and Git revision history, available at
-	http://dev.piwik.org/trac/.
+	http://dev.piwik.org/trac/
+	https://github.com/piwik/piwik
 
 
 SEPARATELY LICENSED COMPONENTS AND LIBRARIES
 
 	The following components/libraries are distributed in this package,
 	and subject to their respective licenses.
 
-	Name:  javascriptTag.tpl - tracking tag to embed in your web pages
-	Link:  http://dev.piwik.org/trac/browser/trunk/core/Tracker/javascriptTag.tpl
+	Name:  javascriptCode.tpl - tracking tag to embed in your web pages
+	Link:  https://github.com/piwik/piwik/blob/master/core/Tracker/javascriptTag.tpl
 	License:  Public Domain
 
 	Name:  jquery.truncate
-	Link:  http://dev.piwik.org/trac/browser/trunk/libs/jquery/truncate/
+	Link:  https://github.com/piwik/piwik/blob/master/libs/jquery/truncate/
 	License:  New BSD
 
 	Name:  piwik.js - JavaScript tracker
-	Link:  http://dev.piwik.org/trac/browser/trunk/js/piwik.js
+	Link:  https://github.com/piwik/piwik/blob/master/js/piwik.js
 	License:  New BSD
 
-	Name:  PiwikMap.swf - map renderer
-	Link:  http://dev.piwik.org/trac/browser/worldmap/trunk/mapRenderer
-	License:  LGPL
-	Notes:
-	- depends on as3corelib (http://code.google.com/p/as3corelib/); New BSD
-	- depends on Flex SDK; MPL 1.1 and Adobe Flex SDK license
-
-	Name:  PiwikMap - data builder/preprocessor
-	Link:  http://dev.piwik.org/trac/browser/worldmap/trunk/mapPreprocessor
-	License:  GPL
-	Notes:
-	- see also http://www.openflashmap.org/
-
-	Name:  PiwikTracker - server-side tracker (PHP and Java)
-	Link: http://dev.piwik.org/trac/browser/trunk/libs/PiwikTracker/
+	Name:  PiwikTracker - server-side tracker (PHP)
+	Link: https://github.com/piwik/piwik/blob/master/libs/PiwikTracker/
 	License:  New BSD
 
 	Name:  UserAgentParser
-	Link:  http://dev.piwik.org/trac/browser/trunk/libs/UserAgentParser/
+	Link:  https://github.com/piwik/piwik/blob/master/libs/UserAgentParser/
 	License:  New BSD
 
 
@@ -112,10 +100,14 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link:  http://plugins.jquery.com/project/ScrollTo
 	License:  Dual licensed: MIT or GPL
 
-	Name:  Tooltip
+	Name:  jquery Tooltip
 	Link:  http://bassistance.de/jquery-plugins/jquery-plugin-tooltip/
 	License:  Dual licensed: MIT or GPL
 
+	Name:  jquery placeholder
+	Link:  http://mths.be/placeholder
+	License:  Dual licensed: MIT or GPL
+
 	Name:  json2.js
 	Link:  http://json.org/
 	License:  Public domain
@@ -138,17 +130,13 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link:  http://www.diveintojavascript.com/projects/javascript-sprintf
 	License:  New BSD
 
-	Name:  swfObject
-	Link:  http://code.google.com/p/swfobject/
-	License:  MIT
-
 	Name:  upgrade.php
 	Link:  http://upgradephp.berlios.de/
 	License:  Public domain
 
-        Name:  Archive Tar
-        Link:  http://pear.php.net/package/Archive_Tar
-        License:  New BSD
+	Name:  Archive Tar
+	Link:  http://pear.php.net/package/Archive_Tar
+	License:  New BSD
 
 	Name:  Event Dispatcher (and Notification)
 	Link:  http://pear.php.net/package/Event_Dispatcher/
@@ -166,9 +154,9 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link:  http://www.phcomp.co.uk/tmp/Smarty.phps
 	License:  New BSD
 
-        Name:  MaxMindGeoIP
-        Link:  http://dev.maxmind.com/geoip/downloadable#PHP-7
-        License:  LGPL
+	Name:  MaxMindGeoIP
+	Link:  http://dev.maxmind.com/geoip/downloadable#PHP-7
+	License:  LGPL
 
 	Name:  PclZip
 	Link:  http://www.phpconcept.net/pclzip/
@@ -204,6 +192,26 @@ THIRD-PARTY COMPONENTS AND LIBRARIES
 	Link: http://www.pchart.net
 	License: GPL v3
 
+	Name: Chroma.js
+	Link: https://github.com/gka/chroma.js
+	License: GPL v3
+
+	Name: qTip2 - Pretty powerful tooltips
+	Link: http://craigsworks.com/projects/qtip2/
+	License: GPL
+
+	Name: Kartograph.js
+	Link: http://kartograph.org/
+	License: LGPL v3 or later
+
+	Name: Raphaël - JavaScript Vector Library
+	Link: http://raphaeljs.com/
+	License: MIT
+
+	Name: kmeans.js
+	Link: http://polymaps.org/ex/cluster.html
+	License: BSD
+
 THIRD-PARTY CONTENT
 
 	Name:  FamFamFam icons - Mark James

README.md

@@ -1,11 +1,11 @@
 # Piwik - piwik.org   
 
-## Description 
+## Description
 
 Piwik is the leading Free/Libre open source Web Analytics software.
 
-Piwik is a full featured PHP MySQL software program that you download and install on your own webserver. 
-At the end of the five minute installation process you will be given a JavaScript code. 
+Piwik is a full featured PHP MySQL software program that you download and install on your own webserver.
+At the end of the five minute installation process you will be given a JavaScript code.
 Simply copy and paste this tag on websites you wish to track and access your analytics reports in real time.
 
 Piwik aims to be a Free software alternative to Google Analytics, and is already used on more than 250,000 websites.
@@ -19,7 +19,7 @@ Or in short:
 
 ## License
 
-Piwik is released under the GPL v3 (or later) license, see misc/gpl-3.0.txt 
+Piwik is released under the GPL v3 (or later) license, see [misc/gpl-3.0.txt](misc/gpl-3.0.txt)
 
 ## Requirements