Merge remote-tracking branch 'origin/master' into report_and_dimension_refactoring

Conflicts:
	core/Updates/0.4.2.php
	core/Updates/0.6.3.php
	core/Updates/1.2-rc1.php
	core/Updates/1.9-b9.php
	core/Version.php
	tests/PHPUnit/Fixture.php
	tests/PHPUnit/Fixtures/UITestFixture.php
	tests/PHPUnit/Integration/Core/JsProxyTest.php

10 files changed, 2 insertions, 11 deletions

diff --git a/lang/cs.json b/lang/cs.json
index c8853a2bdb..2cc8872ca9 100644
--- a/lang/cs.json
+++ b/lang/cs.json
@@ -437,7 +437,6 @@
         "ContactThePiwikTeam": "Kontaktujte tým Piwiku",
         "DoYouHaveBugReportOrFeatureRequest": "Máte hlášení chyby, nebo námět na vylepšení?",
         "GetInTouch": "Jsme rádi za vaši zpětnou vazbu a vždy čteme všechny zprávy. Možná chcete nabídnout podnikatelskou příležitost, najmout Piwik konzultanta, podělit se o váš úspěch, nebo prostě pozdravit.",
-        "HowToCreateIssue": "Prosím, přečtěte si doporučení, jak psát dobré %1$shlášení chyby%2$s nebo %3$sžádost o vlastnost%4$s. Potom %5$sse zaregistrujte%6$s nebo %7$spřihlaste%8$s v našem systému sledování problémů a vytvořte %9$snový problém%10$s.",
         "IWantTo": "Chci:",
         "LearnWaysToParticipate": "Naučit způsoby jak %s spolupracovat %s",
         "ManuallySendEmailTo": "Prosím pošlete ručně zprávu",
diff --git a/lang/da.json b/lang/da.json
index 7770291eeb..72eadb045d 100644
--- a/lang/da.json
+++ b/lang/da.json
@@ -449,7 +449,6 @@
         "ContactThePiwikTeam": "Kontakt Piwik holdet",
         "DoYouHaveBugReportOrFeatureRequest": "Har du en fejlrapport eller en anmodning om en funktion?",
         "GetInTouch": "Vi værdsætter din feedback og læser altid alle meddelelser uanset om du har en forretningsidé, ønsker at finde en Piwik konsulent, fortæl os en succeshistorie eller blot sige hej!",
-        "HowToCreateIssue": "Læs anbefalingerne om at skrive en god %1$sfejlrapport%2$s eller %3$sfunktionsforslag%4$s. Derefter %5$sregister%6$s eller %7$slogind%8$s på vores emne tracker og opret en %9$snyt emne%10$s.",
         "IWantTo": "Jeg ønsker at:",
         "LearnWaysToParticipate": "Lær om alle de måder, du kan %s bidrage%s",
         "ManuallySendEmailTo": "Send din besked manuelt til",
diff --git a/lang/de.json b/lang/de.json
index 1ea591646a..482dee7270 100644
--- a/lang/de.json
+++ b/lang/de.json
@@ -446,7 +446,6 @@
         "ContactThePiwikTeam": "Kontaktieren Sie das Piwik Team!",
         "DoYouHaveBugReportOrFeatureRequest": "Möchten Sie einen Fehler melden oder haben Sie eine Idee für eine neue Funktion?",
         "GetInTouch": "Wir wissen Ihr Feedback zu schätzen und lesen alle Nachrichten. Vielleicht wollen Sie ja eine Geschäftsmöglichkeit teilen, einen Piwik-Berater buchen, uns eine Erfolgsgeschichte erzählen oder einfach nur Hallo sagen!",
-        "HowToCreateIssue": "Bitte lesen Sie die Empfehlungen, wie man einen guten %1$sFehlerbericht%2$s oder %3$sVorschlag für eine neue Funktion%4$s schreibt.Im Anschluss %5$sregistrieren%6$s Sie sich oder %7$smelden%8$s sich an unserem Issue Tracker an und erstellen eine %9$sneue Meldung%10$s.",
         "IWantTo": "Ich möchte:",
         "LearnWaysToParticipate": "Lernen Sie alle Möglichkeiten kennen, wie Sie %s uns unterstützen können%s",
         "ManuallySendEmailTo": "Senden Sie Ihre Nachricht manuell an",
diff --git a/lang/el.json b/lang/el.json
index 2fe13a93f9..12b2d2dd3a 100644
--- a/lang/el.json
+++ b/lang/el.json
@@ -448,7 +448,6 @@
         "ContactThePiwikTeam": "Επικοινωνήστε με την ομάδα του Piwik!",
         "DoYouHaveBugReportOrFeatureRequest": "Έχετε να αναφέρετε ένα πρόβλημα ή ένα αίτημα για χαρακτηριστικό;",
         "GetInTouch": "Ευχαριστούμε για τα σχόλιά σας και να ξέρετε ότι διαβάζουμε όλα τα μηνύματα. Μπορεί να θέλετε να μοιραστείτε μαζί μας μια επιχειρηματική ευκαιρία εργασίας, να μας πείτε την ιστορία επιτυχίας σας ή απλά να πείτε ένα Γεια!",
-        "HowToCreateIssue": "Παρακαλούμε διαβάστε τις προτάσεις για το πως να γράφετε μια καλή %1$sαναφορά σφάλματος%2$s ή ένα %3$sαίτημα για νέο χαρακτηριστικό%4$s. Στη συνέχεια, %5$sεγγραφείτε%6$s ή %7$sκάνετε είσοδο%8$s στην παρακολούθηση σφαλμάτων και δημιουργήστε ένα %9$sνέο αίτημα%10$s.",
         "IWantTo": "Θέλω να:",
         "LearnWaysToParticipate": "Μάθετε όλους του τρόπους που μπορείτε να %sσυμμετέχετε%s",
         "ManuallySendEmailTo": "Στείλτε χειροκίνητα το μήνυμά σας στον\/στην",
diff --git a/lang/en.json b/lang/en.json
index 3f9f4a6aed..b9699f9226 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -451,7 +451,7 @@
         "ContactThePiwikTeam": "Contact the Piwik team!",
         "DoYouHaveBugReportOrFeatureRequest": "Do you have a bug to report or a feature request?",
         "GetInTouch": "We appreciate your feedback and always read all messages. Maybe you would like to share a business opportunity, hire a Piwik consultant, tell us a success story or simply say Hello!",
-        "HowToCreateIssue": "Please read the recommendations on writing a good %1$sbug report%2$s or %3$sfeature request%4$s. Then %5$sregister%6$s or %7$slogin%8$s on our issue tracker and create a %9$snew issue%10$s.",
+        "HowToCreateTicket": "Please read the recommendations on writing a good %1$sbug report%2$s or %3$sfeature request%4$s. Then register or login on %5$sour issue tracker%6$s and create a %7$snew issue%8$s.",
         "IWantTo": "I want to:",
         "LearnWaysToParticipate": "Learn about all the ways you can %s participate%s",
         "ManuallySendEmailTo": "Please manually send your message to",
@@ -2021,7 +2021,7 @@
         "GeoIPServerVarsFound": "Piwik detects the following GeoIP %s variables",
         "GeoIPUpdaterInstructions": "Enter the download links for your databases below. If you've purchased databases from %3$sMaxMind%4$s, you can find these links %1$shere%2$s. Please contact %3$sMaxMind%4$s if you have trouble accessing them.",
         "GeoIPUpdaterIntro": "Piwik is currently managing updates for the following GeoIP databases",
-        "GeoLiteCityLink": "If you're using the GeoLite City database, use this link: %1$s%2$s%3$s.",
+        "GeoLiteCityLink": "If you're using the GeoLite City database, use this link: %1$s%2$s%3$s",
         "Geolocation": "Geolocation",
         "GeolocationPageDesc": "On this page you can change how Piwik determines visitor locations.",
         "getCityDocumentation": "This report shows the cities your visitors were in when they accessed your website.",
diff --git a/lang/es.json b/lang/es.json
index ed5b80b73f..f9d8c789cf 100644
--- a/lang/es.json
+++ b/lang/es.json
@@ -447,7 +447,6 @@
         "ContactThePiwikTeam": "Contacta al equipo de Piwik!",
         "DoYouHaveBugReportOrFeatureRequest": "Tienes un error que reportar o una nueva característica?",
         "GetInTouch": "Agradecemos tu feedback, nosotros leemos siempre todos los mensajes. Quizá te gustaría compartir una oportunidad comercial, contratar un consultor de Piwik, o contarnos sobre un éxito empresarial interesante o simplemente mandarnos un saludo!",
-        "HowToCreateIssue": "Por favor lee las recomendaciones para escribir un %1$sinforme de errores%2$s o una %3$ssolicitud de función%4$s correctamente. Luego debes %5$sregistrarte%6$s o %7$siniciar sesión%8$s en nuestro seguidor de incidentes para crear un %9$snuevo incidente%10$s.",
         "IWantTo": "Yo quiero:",
         "LearnWaysToParticipate": "Aprende sobre todas las formas de %sparticipar%s",
         "ManuallySendEmailTo": "Por favor envíe su mensaje manualmente a",
diff --git a/lang/fr.json b/lang/fr.json
index 1c689e60a2..160b09386a 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -449,7 +449,6 @@
         "ContactThePiwikTeam": "Contactez l’Équipe Piwik!",
         "DoYouHaveBugReportOrFeatureRequest": "Avez-vous un bug à rapporter ou une fonctionnalité à demander?",
         "GetInTouch": "Nous apprécions vos commentaires et lisons tous les messages. Peut-être voudriez vous nous informer d'une opportunité commerciale, employer un consultant, nous raconter un succès ou simplement dire bonjour!",
-        "HowToCreateIssue": "Merci de lire la documentation sur la bonne manière d'écrire un %1$srapport de bug%2$s ou %3$sune demande de nouvelle fonctionnalité%4$s. Ensuite, %5$senregistrez-vous%6$s ou %7$sconnectez-vous%8$s sur notre gestionnaire d'incidents puis créez un %9$snouveau ticket%10$s.",
         "IWantTo": "Je veux:",
         "LearnWaysToParticipate": "Renseignez vous sur les manières dont vous pouvez %s participer%s",
         "ManuallySendEmailTo": "Merci d'envoyer manuellement votre message à",
diff --git a/lang/it.json b/lang/it.json
index e9cdc1dcb7..fe98305035 100644
--- a/lang/it.json
+++ b/lang/it.json
@@ -449,7 +449,6 @@
         "ContactThePiwikTeam": "Contatta il team Piwik!",
         "DoYouHaveBugReportOrFeatureRequest": "Hai un bug da segnalare o una richiesta di funzionalità?",
         "GetInTouch": "Apprezziamo il tuo feedback e leggiamo sempre tutti i messaggi. Ma forse vorresti condividere qualche opportunità commerciale, ingaggiare un consulente di Piwik, raccontarci una storia di successi o semplicemente dirci Ciao!",
-        "HowToCreateIssue": "Si prega di leggere le raccomandazioni su come scrivere un buon %1$srapporto sui bugs%2$s o una %3$srichiesta di funzionalità%4$s. Quindi %5$sregistrati%6$s o %7$saccedi%8$s al nostro tracker dei problemi e crea un %9$snuovo problema%10$s.",
         "IWantTo": "Vorrei:",
         "LearnWaysToParticipate": "Impara tutti i modi attraverso i quali puoi %s partecipare %s",
         "ManuallySendEmailTo": "Perfavore invia manualmente il messaggio a",
diff --git a/lang/ro.json b/lang/ro.json
index 5d9626b458..4b4b0c6b8f 100644
--- a/lang/ro.json
+++ b/lang/ro.json
@@ -448,7 +448,6 @@
         "ContactThePiwikTeam": "Contactează echipa Piwik!",
         "DoYouHaveBugReportOrFeatureRequest": "Doreşti să raportezi o problemă sau să propui o înbunătăţire?",
         "GetInTouch": "Noi apreciem parerea dvs si citim intotdeauna toate mesajele. Poate ca doriti sa ne propuneti o oportunitate de afacere, sa angajati un consultant Piwik, sa ne spuneti o poveste de succes sau doar sa ne spuneti un simplu Salut!",
-        "HowToCreateIssue": "Va rugam cititi recomandarile pentru a scrie un bun %1$sbug report%2$s sau %3$sfeature request%4$s. Apoi %5$sinregistrati-va%6$s or %7$sautentificati-va%8$s pe pagina noastra unde urmarim problemele aparute si creati un %9$snou ticket%10$s.",
         "IWantTo": "Doresc să:",
         "LearnWaysToParticipate": "Invata despre toate modalitatile in care poti %s participa%s",
         "ManuallySendEmailTo": "Va rugam trimiteti manual mesajul dvs catre",
diff --git a/lang/sr.json b/lang/sr.json
index 5f8306ae63..424dd8f357 100644
--- a/lang/sr.json
+++ b/lang/sr.json
@@ -446,7 +446,6 @@
         "ContactThePiwikTeam": "Kontaktirajte Piwik tim!",
         "DoYouHaveBugReportOrFeatureRequest": "Da li želite da prijavite grešku u programu ili imate neku želju?",
         "GetInTouch": "Zahvaljujemo vam na interesovanju, mi uvek pročitamo sve poruke. Možda želite da podelite sa nama poslovnu ponudu, unajmite Piwik konsultanta, da nam ispričate uspešnu priču ili jednostavno da nas pozdravite!",
-        "HowToCreateIssue": "Molimo vas da prvo pročitate preporuke kako se piše dobar %1$sizveštaj o grešci%2$s ili %3$szahtev za novom funkcionalnošću%4$s. Zatim se %5$sregistrujte%6$s ili %7$sprijavite%8$s na naš sajt i otvorite %9$snovi tiket%10$s.",
         "IWantTo": "Želim da:",
         "LearnWaysToParticipate": "Pogledajte kako sve možete da %s uzmete učešće%s",
         "ManuallySendEmailTo": "Molimo vas da pošaljete poruku na",