Fix build

4 files changed, 261 insertions, 207 deletions

diff --git a/lang/bg.json b/lang/bg.json
index 4678c15742..e63e27a438 100644
--- a/lang/bg.json
+++ b/lang/bg.json
@@ -86,6 +86,7 @@
         "MoreInformation": "За повече информация за Piwik API-тата, моля погледнете %s Въведение в Piwik API%s и %s Piwik API Референт%s.",
         "PluginDescription": "Цялата информация от Piwik е достъпна чрез просто API. Тази добавка ви дава възможност да получите данни от Вашият Уеб Анализатор под формата на xml,json,php,cvs и др.",
         "QuickDocumentationTitle": "API бърза документация",
+        "TopLinkTooltip": "Информацията за уеб анализите може да бъде достъпена чрез прост приложно-програмен интерфейс в json, xml и др. формат.",
         "UserAuthentication": "Удостоверяване на потребителя",
         "UsingTokenAuth": "Ако искате да %s вмъкнете данните със скрипт, crontab, др. %s трябва да добавите параметър %s на API кода за повиквания на URL адреси, които изискват удостоверяване."
     },
@@ -113,6 +114,7 @@
         "JSTracking_CustomCampaignQueryParamDesc": "Забележка: %1$sPiwik автоматично ще засече Google Analytics параметрите.%2$s",
         "JSTracking_EnableDoNotTrack": "Активиране на режим за засичане на включена функция „Не проследявай“",
         "JSTracking_EnableDoNotTrackDesc": "Заявките за следене няма да бъдат изпратени, ако посетителите не желаят да бъде събирана информация за тях.",
+        "JSTracking_GroupPageTitlesByDomainDesc1": "В случай, че някой посети страница „За“ в блога, %1$s ще бъде записан\/о в 'Блог \/ За'. Това е най-лесният начин, за да се направи преглед на трафика по поддомейн.",
         "JSTracking_MergeAliases": "В доклада за „Изходните страници“ скрийте щракванията до познати адреси на",
         "JSTracking_MergeSubdomains": "Проследяване на посетителите във всички поддомейни на",
         "JSTracking_MergeSubdomainsDesc": "Ако един посетител разгледа %1$s и %2$s, това ще се брои като едно уникално посещение.",
@@ -973,6 +975,7 @@
         "PluginDescription": "Генерирайте красиви статични PNG графични изображения за всеки Piwik доклад."
     },
     "Installation": {
+        "CollaborativeProject": "Piwik е съвместен проект, изграден с много любов от хора от всички краища на света.",
         "CommunityNewsletter": "изпращай по пощата информация за нови добавки, функции и др.",
         "ConfigurationHelp": "Вашият Piwik конфигурационен файл изглежда не добре конфигуриран. Можете да премахнете config\/config.ini.php и да започнете инсталирането, или да поправите настройките за връзка към БД-то.",
         "ConfirmDeleteExistingTables": "Наистина ли искате да изтриете следните таблици: %s от базата от данни (БД)? ПРЕДУПРЕЖДЕНИЕ: ДАННИТЕ ОТ ТАЗИ ТАБЛИЦА НЕ МОГАТ ДА БЪДАТ ВЪЗСТАНОВЕНИ!!!",
@@ -994,6 +997,7 @@
         "ErrorInvalidState": "Грешка: възможно е да сте опитали да прескочите стъпка от инсталацията или е забранена поддръжката на бисквитките (cookies) или конфигурационният файл на Piwik вече съществува. %1$sПроверете дали са разрешени бисквитките (cookies)%2$s и се върнете %3$s на първата страница на инсталацията%4$s.",
         "Extension": "разширения",
         "Filesystem": "Файлова система",
+        "GetInvolved": "Ако харесвате това, което виждате, може да се %1$sвключите%2$s.",
         "GoBackAndDefinePrefix": "Върнете се за да зададете Prefix за Piwik таблиците в базата от данни (БД)",
         "HappyAnalysing": "Приятно анализиране!",
         "Installation": "Инсталация",
@@ -1085,8 +1089,10 @@
         "TablesWarningHelp": "Изберете дали да обновите данните в съществуващите таблици или да инсталирате Piwik на чисто.",
         "TablesWithSameNamesFound": "Някои %1$s таблици в базата от данни (БД) %2$s имат същите имена, както тези, които Piwik се опитва да създаде",
         "Timezone": "Уеб сайт времева зона",
+        "WeHopeYouWillEnjoyPiwik": "Надяваме се, че ще се радвате на работата с Piwik толкова, колкото ние се радваме при разработването на Piwik.",
         "Welcome": "Добре дошли!",
-        "WelcomeHelp": "<p>Piwik е анализатор (уеб брояч) с отворен код, който гъвкаво и лесно предоставя информация за посетителите на сайта ви.<\/p><p>Този процес е съкратен в %s лесни стъпки и не отнема повече от 5 минути.<\/p>"
+        "WelcomeHelp": "<p>Piwik е анализатор (уеб брояч) с отворен код, който гъвкаво и лесно предоставя информация за посетителите на сайта ви.<\/p><p>Този процес е съкратен в %s лесни стъпки и не отнема повече от 5 минути.<\/p>",
+        "WelcomeToCommunity": "Добре дошли в Piwik общността!"
     },
     "LanguagesManager": {
         "AboutPiwikTranslations": "За Piwik преводите",
@@ -1880,7 +1886,10 @@
         "ToGeolocateOldVisits": "За да получите информация за предишни посещения, използвайте скриптът описан %1$sтук%2$s.",
         "UnsupportedArchiveType": "Типът архив %1$s не се поддържа.",
         "UpdaterHasNotBeenRun": "Не е пускана до момента задача за обновяване.",
+        "UpdaterIsNotScheduledToRun": "Не е планирано да се изпълнява в бъдеще.",
+        "UpdaterScheduledForNextRun": "Ще бъде пуснато при следващото изпълнение на archive.php cron.",
         "UpdaterWasLastRun": "Задача за проверка за обновления е стартирана последно на %s.",
+        "UpdaterWillRunNext": "Следващото пускане е планирано за %s.",
         "WidgetLocation": "Местонахождение на посетителя"
     },
     "UserCountryMap": {
diff --git a/lang/et.json b/lang/et.json
index 8f08e7c2e3..a60c465f17 100644
--- a/lang/et.json
+++ b/lang/et.json
@@ -254,7 +254,7 @@
         "ColumnAvgTimeOnSiteDocumentation": "Kesmine külastuse aeg.",
         "ColumnBounceRate": "Põrkemäär",
         "ColumnBounces": "Põrked",
-        "ColumnConversionRate": "Muundamiskiirus",
+        "ColumnConversionRate": "Tulumäär",
         "ColumnDestinationPage": "Sihtkoha lehekülg",
         "ColumnEntrances": "Sisenemised",
         "ColumnExitRate": "Väljumiste määr",
@@ -273,7 +273,7 @@
         "ColumnUniqueEntrances": "Unikaalseid sisenemisi",
         "ColumnUniqueExits": "Unikaalseid väljumisi",
         "ColumnUniquePageviews": "Unikaalseid lehe vaatamisi",
-        "ColumnVisitsWithConversions": "Külastused muundamistega",
+        "ColumnVisitsWithConversions": "Külastused tulu tekitamisega",
         "Continue": "Jätka",
         "ContinueToPiwik": "Jätka Piwikuga",
         "CurrentMonth": "Praegune kuu",
@@ -329,7 +329,7 @@
         "First": "Esimene",
         "ForExampleShort": "n.",
         "Forums": "Foorumid",
-        "FromReferrer": "tuli:",
+        "FromReferrer": "tuli",
         "GeneralInformation": "Üldine info",
         "GeneralSettings": "Üldised seaded",
         "GetStarted": "Alusta kasutamist",
@@ -510,6 +510,9 @@
         "View": "Vaata",
         "ViewDocumentationFor": "Vaata %1$s dokumentatsiooni",
         "Visit": "Külastus",
+        "VisitConvertedGoal": "Külastusega täideti vähemalt 1 eesmärk",
+        "VisitConvertedGoalId": "Külastus tõi tulu spetsiifilise eesmärgi ID'ga",
+        "VisitConvertedNGoals": "Külastusega täideti %s eesmärki",
         "VisitDuration": "Keskmine külastuse kestvus (sek)",
         "Visitor": "Külastaja",
         "VisitorID": "Külastaja ID",
@@ -540,23 +543,41 @@
     "Goals": {
         "AddGoal": "Lisa eesmärk",
         "AddNewGoal": "Lisa uus eesmärk",
-        "ColumnConversions": "Muundamised",
+        "AllowGoalConvertedMoreThanOncePerVisit": "Luba külastajate muundamist rohkem kui ühe korra külastuse jooksul (võib mitu korda muutuda tulu toovaks kliendiks)",
+        "AllowMultipleConversionsPerVisit": "Luba mitu tulutoomist ühe külastuse jooksul",
+        "CaseSensitive": "Tähtede tõusutundlik võrdlus",
+        "ClickOutlink": "Klikivad välise lehe lingile",
+        "ColumnConversions": "Tulu tekitamised",
         "Contains": "sisaldab %s",
-        "ConversionRate": "%s muundamiskiirus",
-        "Conversions": "%s muundamist",
-        "ConversionsOverview": "Muundamiste ülevaade",
-        "DaysToConv": "Päevi muundamiseni",
+        "ConversionRate": "%s tulumäär",
+        "Conversions": "%s tulu tekitamist",
+        "ConversionsOverview": "Tulu tekitamiste ülevaade",
+        "DaysToConv": "Päevi tulu tekitamiseni",
+        "DefaultGoalConvertedOncePerVisit": "(vaikimisi) Eesmärgi jaoks saab klienti muudada ainult ühe korra külastuse jooksul (hetk kui külastajast saab tulutoov klient)",
+        "DefaultRevenue": "Eesmärgi vaikimisi kasum on",
+        "Download": "Laevad alla faili",
         "ExternalWebsiteUrl": "välise veebilehe URL",
         "Filename": "failinimi",
+        "GoalConversion": "Eesmärgi tulu",
+        "GoalConversions": "Eesmärgi tulud",
+        "GoalIsTriggered": "Eesmärk käivitub",
+        "GoalIsTriggeredWhen": "Eesmärk käivitub kui",
         "GoalName": "Eesmärgi nimi",
         "Goals": "Eesmärgid",
         "GoalsManagement": "Eesmärkide haldus",
         "GoalsOverview": "Eesmärkide ülevaade",
         "GoalX": "Eesmärk %s",
+        "IsExactly": "on täpselt %s",
         "Manually": "manuaalselt",
+        "MatchesExpression": "vastab reeglile %s",
+        "Optional": "(valikuline)",
         "PageTitle": "Lehe pealkiri",
         "URL": "URL",
-        "VisitsUntilConv": "Külastusi muundamiseni"
+        "VisitPageTitle": "Külastavad määratud pealkirjaga lehte",
+        "VisitsUntilConv": "Külastusi tulu tekitamiseni",
+        "VisitUrl": "Külastavad määratud URLi (leht või lehtede grupp)",
+        "WhenVisitors": "kui külastajad",
+        "WhereThe": "kus"
     },
     "Installation": {
         "Congratulations": "Õnnitleme",
@@ -565,6 +586,7 @@
         "Installation": "Installatsioon",
         "InstallationStatus": "Installatiooni olek",
         "NoConfigFound": "Piwiki konfguratsioonifaili ei leitud, kuid sa üritasid minna Piwiki lehele.<br \/><b>  » Võid <a href='index.php'>installeerida Piwiko<\/a><\/b><br \/><small>Kui Piwik on varem installeeritud ja sul on andmebaasis tabeleid, siis ei ole põhjust muretsemiseks saad taaskasutada ja säilitada olemasolevad andmed!<\/small>",
+        "Optional": "Valikuline",
         "PercentDone": "%s %% Tehtud",
         "SetupWebsite": "Seadista veebileht",
         "SetupWebsiteError": "Veebilehe lisamisel tekkis viga",
@@ -591,6 +613,7 @@
         "WelcomeHelp": "<p>Piwik on vabavaraline veebianalüüika tarkvara, mis teeb lihtsaks oma külastajate kohta andmete kogumise ja nende analüüsimise.<\/p><p>See protsess sisaldab %s sammu ja võtab aega u. 5 minutit.<\/p>"
     },
     "Live": {
+        "ConvertedNGoals": "Muutus tulutoovaks %s korral",
         "FirstVisit": "Esmane külastus",
         "GoalType": "Tüüp",
         "HideMap": "peida kaart",
@@ -613,7 +636,8 @@
         "VisitorLog": "Külastuste logi",
         "VisitorProfile": "Külastaja profiil",
         "VisitorsInRealTime": "Reaalajas külastused",
-        "VisitsFrom": "%1$s%2$s külastust %3$s pärineb"
+        "VisitsFrom": "%1$s%2$s külastust %3$s pärineb",
+        "VisitSummary": "Viibis veebilehel kokku %1$s%2$s ja %3$s, and %4$svaatas %5$s lehte %6$s külastuse jooksul.%7$s"
     },
     "Login": {
         "ContactAdmin": "Võimalik põhjus: sinu majutusel on mail() funktsioon välja lülitatud. <br \/>Palun kontakteeru administraatoriga.",
@@ -1057,6 +1081,7 @@
         "Cities": "Linnad",
         "Countries": "Riigid",
         "DaysAgo": "%s päeva tagasi",
+        "GoalConversions": "%s tulutoovaid eesmärke",
         "Hours": "tundi",
         "HoursAgo": "%s tundi tagasi",
         "map": "kaart",
@@ -1322,6 +1347,7 @@
         "ColumnAvgActionsPerReturningVisit": "Keskmine tegevuste arv korduvatel külastustel",
         "ColumnBounceCountForReturningVisits": "Korduvate külastuste põrke arv",
         "ColumnBounceRateForReturningVisits": "Korduvate külastuste põrkemäär",
+        "ColumnNbReturningVisitsConverted": "Tulutoovaid korduvaid külastusi",
         "ColumnReturningVisits": "Korduvad külastused",
         "ReturnActions": "%s tegevust korduval külastusel",
         "ReturnAverageVisitDuration": "%s keskmine külastuse kestvus korduvatel külastustel",
diff --git a/lang/nl.json b/lang/nl.json
index 3538519ef8..f78d39b23f 100644
--- a/lang/nl.json
+++ b/lang/nl.json
@@ -990,6 +990,7 @@
         "PluginDescription": "Genereer mooie PNG Grafieken voor elk Piwik rapport."
     },
     "Installation": {
+        "CollaborativeProject": "Piwik is een samenwerkingsproject, met liefde gebouwd door mensen van over de hele wereld.",
         "CommunityNewsletter": "stuur mij e-mails met community updates (nieuwe plugins, nieuwe features, enz.)",
         "ConfigurationHelp": "Uw Piwik configuratie bestand is waarschijnlijk niet correct geconfigureerd. U kunt ofwel config\/config.ini.php verwijderen en de installatie vervolgen of de toegangsgegevens voor de database corrigeren.",
         "ConfirmDeleteExistingTables": "Bent u zeker dat u de tabellen wilt verwijderen: %s uit uw datbase? WAARSCHUWING: DATA VAN DEZE TABELLEN KAN NIET WORDEN HERSTELD!",
@@ -1585,6 +1586,8 @@
     },
     "UserCountry": {
         "CannotFindGeoIPDatabaseInArchive": "Kan bestand %1$s niet vinden in tar archief %2$s!",
+        "CannotListContent": "Kon geen lijst maken van de inhoud voor %1$s: %2$s",
+        "CannotLocalizeLocalIP": "IP-adres %s is een lokaal adres en kan geen geolocatie op toegepast worden.",
         "CannotUnzipDatFile": "Kan dat bestand niet uitpakken in %1$s: %2$s",
         "City": "Stad",
         "CityAndCountry": "%1$s, %2$s",
@@ -1879,28 +1882,44 @@
         "FoundApacheModules": "Piwik vond de volgende Apache modules",
         "FromDifferentCities": "andere steden",
         "GeoIPDatabases": "GeoIP Databases",
+        "GeoIPImplHasAccessTo": "Deze GeoIP implementatie heeft toegang tot de volgende database types",
+        "GeoIPNoServerVars": "Piwik kan geen GeoIP %s variabelen vinden.",
         "GeoIPPeclCustomDirNotSet": "De %s PHP ini optie is niet ingesteld.",
+        "GeoIPServerVarsFound": "Piwik detecteert de volgende GeoIP %s variabelen",
+        "GeoLiteCityLink": "Als u de GeoLite City database gebruikt, gebruik dan deze link: %1$s%2$s%3$s.",
         "Geolocation": "Geolocatie",
         "GeolocationPageDesc": "Op deze pagina kunt u instellen hoe Piwik bezoeker locaties bepaald.",
+        "getCityDocumentation": "Dit rapport laat zien in welke stad uw bezoekers waren toen ze uw website bezochten.",
+        "getContinentDocumentation": "Dit rapport laat zien in welk continent uw bezoekers waren toen ze uw website bezochten.",
+        "getCountryDocumentation": "Dit rapport laat zien in welk land uw bezoekers waren toen ze uw website bezochten.",
+        "getRegionDocumentation": "Dit rapport laat zien in welke regio uw bezoekers waren toen ze uw website bezochten.",
         "HowToInstallApacheModule": "Hoe installeer ik de GeoIP module voor Apache?",
         "HowToInstallGeoIPDatabases": "Hoe krijg ik de GeoIP databases?",
         "HowToInstallGeoIpPecl": "Hoe installeer ik de GeoIP PECL extensie?",
         "HowToInstallNginxModule": "Hoe installeer ik de GeoIP module voor Nginx?",
         "HowToSetupGeoIP": "Hoe zet ik accurate geolocatie op met GeoIP",
+        "HowToSetupGeoIP_Step1": "%1$sDownload%2$s de GeoLite City database van %3$sMaxMind%4$s.",
+        "HowToSetupGeoIP_Step2": "Pak dit bestand uit en kopieer het resultaat, %1$s in de %2$smisc%3$s Piwik directory (u kunt dit doen met FTP of SSH).",
         "HowToSetupGeoIP_Step4": "Klaar! U heeft zojuist Piwik ingesteld om GeoIP te gebruiken. U kunt nu zien uit welke regio's en steden uw bezoekers komen i.c.m. zeer accurate informatie over het land van herkomst.",
+        "HttpServerModule": "HTTP Server Module",
+        "InvalidGeoIPUpdatePeriod": "Ongeldige periode voor de GeoIP updater: %1$s. Geldige waardes zijn %2$s.",
         "ISPDatabase": "ISP database",
         "IWantToDownloadFreeGeoIP": "Ik wil de gratis GeoIP database downloaden...",
         "Latitude": "Breedtegraad",
         "Location": "Locatie",
         "LocationDatabase": "Locatie database",
+        "LocationDatabaseHint": "Een locatie database is of een land of een regio of een stad database.",
         "LocationProvider": "Locatie Provider",
         "Longitude": "Lengtegraad",
         "Organization": "Organisatie",
+        "OrgDatabase": "Organisatie Database",
+        "PiwikNotManagingGeoIPDBs": "Piwik beheert momenteel geen GeoIP databases.",
         "PluginDescription": "Rapporteert het land van de bezoekers.",
         "Region": "Regio",
         "SetupAutomaticUpdatesOfGeoIP": "Stel automatische updates van GeoIP databases in",
         "SubmenuLocations": "Locaties",
         "ThisUrlIsNotAValidGeoIPDB": "Het gedownloade bestand is geen valide GeoIP database. Controleer de link a.u.b. opnieuw, of download het bestand handmatig.",
+        "ToGeolocateOldVisits": "Om locatie data voor oude bezoeken te krijgen, gebruik het %1$shier%2$s beschreven script.",
         "UpdaterHasNotBeenRun": "De updater is nog niet eerder uitgevoerd.",
         "UpdaterWasLastRun": "De updater is voor het laatst uitgevoerd op %s.",
         "WidgetLocation": "Bezoeker Locatie"
diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
index 4b3ecdcb69..397617f1ac 100644
--- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
+++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_year.xml
@@ -2,8 +2,8 @@
 <result>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>18</idVisit>
-		<visitIp>1.2.4.8</visitIp>
+		<idVisit>10</idVisit>
+		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -20,7 +20,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>30</goalPageId>
+				<goalPageId>16</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -31,7 +31,7 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>30</pageId>
+				<pageId>16</pageId>
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
@@ -41,7 +41,7 @@
 				<url />
 				<pageIdAction />
 				
-				<pageId>31</pageId>
+				<pageId>17</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
@@ -68,22 +68,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>32</pageId>
-				<eventCategory>Cat8</eventCategory>
-				<eventAction>Action8</eventAction>
-				<eventName>Name8</eventName>
-				<eventValue>353.678</eventValue>
+				<pageId>18</pageId>
+				<eventCategory>Cat4</eventCategory>
+				<eventAction>Action4</eventAction>
+				<eventName>Name4</eventName>
+				<eventValue>349.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 8</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -102,20 +102,20 @@
 		<daysSinceLastVisit>10</daysSinceLastVisit>
 		<daysSinceFirstVisit>100</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
 		<latitude />
 		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -157,8 +157,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>17</idVisit>
-		<visitIp>1.2.4.8</visitIp>
+		<idVisit>9</idVisit>
+		<visitIp>1.2.4.4</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -175,7 +175,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>29</goalPageId>
+				<goalPageId>15</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -186,15 +186,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>29</pageId>
+				<pageId>15</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 8</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 4</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 8</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -203,11 +203,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 8</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 8</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -226,20 +226,20 @@
 		<daysSinceLastVisit>11</daysSinceLastVisit>
 		<daysSinceFirstVisit>101</daysSinceFirstVisit>
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
-		<continent>Unknown</continent>
-		<continentCode>unk</continentCode>
-		<country>Unknown</country>
-		<countryCode>xx</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/xx.png</countryFlag>
-		<region />
-		<regionCode />
-		<city />
-		<location>Unknown</location>
+		<continent>Europe</continent>
+		<continentCode>eur</continentCode>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Kent</region>
+		<regionCode>G5</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
 		<latitude />
 		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<provider>awesomeisp.com</provider>
+		<providerName>Awesomeisp</providerName>
+		<providerUrl>http://www.awesomeisp.com/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -281,8 +281,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>16</idVisit>
-		<visitIp>1.2.4.7</visitIp>
+		<idVisit>8</idVisit>
+		<visitIp>1.2.4.3</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -299,7 +299,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>27</goalPageId>
+				<goalPageId>13</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -310,7 +310,7 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>27</pageId>
+				<pageId>13</pageId>
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
@@ -330,22 +330,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>28</pageId>
-				<eventCategory>Cat7</eventCategory>
-				<eventAction>Action7</eventAction>
-				<eventName>Name7</eventName>
-				<eventValue>352.678</eventValue>
+				<pageId>14</pageId>
+				<eventCategory>Cat3</eventCategory>
+				<eventAction>Action3</eventAction>
+				<eventName>Name3</eventName>
+				<eventValue>348.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 7</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 3</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -366,13 +366,13 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>London, City of</region>
+		<regionCode>H9</regionCode>
+		<city>London</city>
+		<location>London, London, City of, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -419,8 +419,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>15</idVisit>
-		<visitIp>1.2.4.7</visitIp>
+		<idVisit>7</idVisit>
+		<visitIp>1.2.4.3</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -437,7 +437,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>26</goalPageId>
+				<goalPageId>12</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -448,15 +448,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>26</pageId>
+				<pageId>12</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 7</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 3</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 7</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 3</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -465,11 +465,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 7</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 3</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 7</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 3</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -490,13 +490,13 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Macedonia, the Former Yugoslav Republic of</country>
-		<countryCode>mk</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/mk.png</countryFlag>
-		<region>Miravci</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Miravci, Macedonia, the Former Yugoslav Republic of</location>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>London, City of</region>
+		<regionCode>H9</regionCode>
+		<city>London</city>
+		<location>London, London, City of, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -543,8 +543,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>14</idVisit>
-		<visitIp>1.2.4.6</visitIp>
+		<idVisit>6</idVisit>
+		<visitIp>1.2.4.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -561,7 +561,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>23</goalPageId>
+				<goalPageId>9</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -572,7 +572,7 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>23</pageId>
+				<pageId>9</pageId>
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
@@ -582,7 +582,7 @@
 				<url />
 				<pageIdAction />
 				
-				<pageId>24</pageId>
+				<pageId>10</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
@@ -609,22 +609,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>25</pageId>
-				<eventCategory>Cat6</eventCategory>
-				<eventAction>Action6</eventAction>
-				<eventName>Name6</eventName>
-				<eventValue>351.678</eventValue>
+				<pageId>11</pageId>
+				<eventCategory>Cat2</eventCategory>
+				<eventAction>Action2</eventAction>
+				<eventName>Name2</eventName>
+				<eventValue>347.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 6</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 2</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -645,18 +645,18 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>124.456001</latitude>
+		<longitude>22.231001</longitude>
+		<provider>comcast.net</provider>
+		<providerName>Comcast</providerName>
+		<providerUrl>http://www.comcast.net/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -698,8 +698,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>13</idVisit>
-		<visitIp>1.2.4.6</visitIp>
+		<idVisit>5</idVisit>
+		<visitIp>1.2.4.2</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -716,7 +716,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>22</goalPageId>
+				<goalPageId>8</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -727,15 +727,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>22</pageId>
+				<pageId>8</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 6</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 2</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 6</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 2</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -744,11 +744,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 6</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 2</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 6</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 2</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -769,18 +769,18 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Hluboká nad Vltavou</city>
-		<location>Hluboká nad Vltavou, Saint Petersburg City, Russian Federation</location>
-		<latitude />
-		<longitude />
-		<provider>Unknown</provider>
-		<providerName>Unknown</providerName>
-		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Stratford-upon-Avon</city>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>124.456001</latitude>
+		<longitude>22.231001</longitude>
+		<provider>comcast.net</provider>
+		<providerName>Comcast</providerName>
+		<providerUrl>http://www.comcast.net/</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -822,8 +822,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>12</idVisit>
-		<visitIp>1.2.4.5</visitIp>
+		<idVisit>4</idVisit>
+		<visitIp>1.2.4.1</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -840,7 +840,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>20</goalPageId>
+				<goalPageId>6</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -851,7 +851,7 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>20</pageId>
+				<pageId>6</pageId>
 				<timeSpent>180</timeSpent>
 				<timeSpentPretty>3 min 0s</timeSpentPretty>
 				<icon />
@@ -871,22 +871,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>21</pageId>
-				<eventCategory>Cat5</eventCategory>
-				<eventAction>Action5</eventAction>
-				<eventName>Name5</eventName>
-				<eventValue>350.678</eventValue>
+				<pageId>7</pageId>
+				<eventCategory>Cat1</eventCategory>
+				<eventAction>Action1</eventAction>
+				<eventName>Name1</eventName>
+				<eventValue>346.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 5</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 1</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -907,13 +907,13 @@
 		<daysSinceLastEcommerceOrder>50</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Nuneaton and Bedworth</city>
+		<location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -960,8 +960,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>11</idVisit>
-		<visitIp>1.2.4.5</visitIp>
+		<idVisit>3</idVisit>
+		<visitIp>1.2.4.1</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -978,7 +978,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>19</goalPageId>
+				<goalPageId>5</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -989,15 +989,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>19</pageId>
+				<pageId>5</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 5</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 1</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 5</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 1</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -1006,11 +1006,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 5</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 1</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 5</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 1</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -1031,13 +1031,13 @@
 		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
-		<country>Russian Federation</country>
-		<countryCode>ru</countryCode>
-		<countryFlag>plugins/UserCountry/images/flags/ru.png</countryFlag>
-		<region>Saint Petersburg City</region>
-		<regionCode>66</regionCode>
-		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Saint Petersburg City, Russian Federation</location>
+		<country>United Kingdom</country>
+		<countryCode>gb</countryCode>
+		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
+		<city>Nuneaton and Bedworth</city>
+		<location>Nuneaton and Bedworth, Warwickshire, United Kingdom</location>
 		<latitude />
 		<longitude />
 		<provider>Unknown</provider>
@@ -1084,8 +1084,8 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>10</idVisit>
-		<visitIp>1.2.4.4</visitIp>
+		<idVisit>2</idVisit>
+		<visitIp>1.2.4.0</visitIp>
 		
 		<visitorType>returningCustomer</visitorType>
 		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
@@ -1102,7 +1102,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>16</goalPageId>
+				<goalPageId>2</goalPageId>
 				
 				<url>http://piwik.net/space/quest/iv</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -1113,7 +1113,7 @@
 				<pageTitle>Space Quest XII</pageTitle>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>16</pageId>
+				<pageId>2</pageId>
 				<timeSpent>360</timeSpent>
 				<timeSpentPretty>6 min 0s</timeSpentPretty>
 				<icon />
@@ -1123,7 +1123,7 @@
 				<url />
 				<pageIdAction />
 				
-				<pageId>17</pageId>
+				<pageId>3</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName4>Search Category</customVariablePageName4>
@@ -1150,22 +1150,22 @@
 				<url>http://piwik.net/space/quest/iv</url>
 				<pageIdAction>4</pageIdAction>
 				
-				<pageId>18</pageId>
-				<eventCategory>Cat4</eventCategory>
-				<eventAction>Action4</eventAction>
-				<eventName>Name4</eventName>
-				<eventValue>349.678</eventValue>
+				<pageId>4</pageId>
+				<eventCategory>Cat0</eventCategory>
+				<eventAction>Action0</eventAction>
+				<eventName>Name0</eventName>
+				<eventValue>345.678</eventValue>
 				<icon>plugins/Zeitgeist/images/event.png</icon>
 			</row>
 		</actionDetails>
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 0</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>2</goalConversions>
@@ -1189,15 +1189,15 @@
 		<country>United Kingdom</country>
 		<countryCode>gb</countryCode>
 		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
-		<latitude />
-		<longitude />
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>123.456001</latitude>
+		<longitude>21.320999</longitude>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />
@@ -1239,11 +1239,11 @@
 	</row>
 	<row>
 		<idSite>1</idSite>
-		<idVisit>9</idVisit>
-		<visitIp>1.2.4.4</visitIp>
+		<idVisit>1</idVisit>
+		<visitIp>1.2.4.0</visitIp>
 		
-		<visitorType>returningCustomer</visitorType>
-		<visitorTypeIcon>plugins/Live/images/returningVisitor.gif</visitorTypeIcon>
+		<visitorType>new</visitorType>
+		<visitorTypeIcon />
 		<visitConverted>1</visitConverted>
 		<visitConvertedIcon>plugins/Zeitgeist/images/goal.png</visitConvertedIcon>
 		<visitEcommerceStatus>none</visitEcommerceStatus>
@@ -1257,7 +1257,7 @@
 				<goalName>all</goalName>
 				<goalId>1</goalId>
 				<revenue>5</revenue>
-				<goalPageId>15</goalPageId>
+				<goalPageId>1</goalPageId>
 				
 				<url>http://piwik.net/grue/lair</url>
 				<icon>plugins/Zeitgeist/images/goal.png</icon>
@@ -1268,15 +1268,15 @@
 				<pageTitle>It&amp;#039;s &lt;script&gt; pitch black...</pageTitle>
 				<pageIdAction>2</pageIdAction>
 				
-				<pageId>15</pageId>
+				<pageId>1</pageId>
 				<customVariables>
 					<row>
 						<customVariablePageName2>Cvar 2 PAGE name</customVariablePageName2>
-						<customVariablePageValue2>Cvar2 PAGE value is 4</customVariablePageValue2>
+						<customVariablePageValue2>Cvar2 PAGE value is 0</customVariablePageValue2>
 					</row>
 					<row>
 						<customVariablePageName5>Cvar 5 PAGE name</customVariablePageName5>
-						<customVariablePageValue5>Cvar5 PAGE value is 4</customVariablePageValue5>
+						<customVariablePageValue5>Cvar5 PAGE value is 0</customVariablePageValue5>
 					</row>
 				</customVariables>
 				<icon />
@@ -1285,11 +1285,11 @@
 		<customVariables>
 			<row>
 				<customVariableName1>Cvar 1 name</customVariableName1>
-				<customVariableValue1>Cvar1 value is 4</customVariableValue1>
+				<customVariableValue1>Cvar1 value is 0</customVariableValue1>
 			</row>
 			<row>
 				<customVariableName5>Cvar 5 name</customVariableName5>
-				<customVariableValue5>Cvar5 value is 4</customVariableValue5>
+				<customVariableValue5>Cvar5 value is 0</customVariableValue5>
 			</row>
 		</customVariables>
 		<goalConversions>1</goalConversions>
@@ -1304,24 +1304,24 @@
 		
 		<visitDuration>0</visitDuration>
 		<visitDurationPretty>0s</visitDurationPretty>
-		<visitCount>5</visitCount>
-		<daysSinceLastVisit>11</daysSinceLastVisit>
-		<daysSinceFirstVisit>101</daysSinceFirstVisit>
-		<daysSinceLastEcommerceOrder>51</daysSinceLastEcommerceOrder>
+		<visitCount>1</visitCount>
+		<daysSinceLastVisit>0</daysSinceLastVisit>
+		<daysSinceFirstVisit>0</daysSinceFirstVisit>
+		<daysSinceLastEcommerceOrder>0</daysSinceLastEcommerceOrder>
 		<continent>Europe</continent>
 		<continentCode>eur</continentCode>
 		<country>United Kingdom</country>
 		<countryCode>gb</countryCode>
 		<countryFlag>plugins/UserCountry/images/flags/gb.png</countryFlag>
-		<region>Kent</region>
-		<regionCode>G5</regionCode>
+		<region>Warwickshire</region>
+		<regionCode>P3</regionCode>
 		<city>Stratford-upon-Avon</city>
-		<location>Stratford-upon-Avon, Kent, United Kingdom</location>
-		<latitude />
-		<longitude />
-		<provider>awesomeisp.com</provider>
-		<providerName>Awesomeisp</providerName>
-		<providerUrl>http://www.awesomeisp.com/</providerUrl>
+		<location>Stratford-upon-Avon, Warwickshire, United Kingdom</location>
+		<latitude>123.456001</latitude>
+		<longitude>21.320999</longitude>
+		<provider>Unknown</provider>
+		<providerName>Unknown</providerName>
+		<providerUrl>http://piwik.org/faq/general/#faq_52</providerUrl>
 		<referrerType>direct</referrerType>
 		<referrerTypeName>Direct Entry</referrerTypeName>
 		<referrerName />