diff options
| author | Matthieu Aubry <mattab@users.noreply.github.com> | 2017-01-07 10:51:56 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-07 10:51:56 +0300 |
| commit | b10d03eff7722394c36ad6f3542a400e0e34f719 (patch) | |
| tree | 8f59d79deb109cb92abda427d3acdec129273fe8 | |
| parent | 50b866dae9caf2e216cf228bbc37b16d30beb4d0 (diff) | |
| parent | c60ae9f325e6782a3988560e4f59fde165ebdd19 (diff) | |
Merge pull request #11154 from piwik/3.x-dev3.0.1-b3
Piwik 3.0.1-b3
954 files changed, 3203 insertions, 1983 deletions
diff --git a/CHANGELOG.md b/CHANGELOG.md index f280b69f19..25883d76ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,11 @@ This is the Developer Changelog for Piwik platform developers. All changes in ou The Product Changelog at **[piwik.org/changelog](http://piwik.org/changelog)** lets you see more details about any Piwik release, such as the list of new guides and FAQs, security fixes, and links to all closed issues. +## Piwik 3.0.1 + +### New APIs +* Added new event `MultiSites.filterRowsForTotalsCalculation` to filter which sites will be included in the All Websites Dashboard totals calculation. + ## Piwik 3.0.0 ### New guide diff --git a/config/global.ini.php b/config/global.ini.php index 1b03d9a088..1c1e9a9df6 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -354,8 +354,8 @@ login_password_recovery_replyto_email_address = "no-reply@{DOMAIN}" ; name that appears as a Reply-to in the password recovery email login_password_recovery_replyto_email_name = "No-reply" -; By default when user logs out he is redirected to Piwik "homepage" usually the Login form. -; Uncomment the next line to set a URL to redirect the user to after he logs out of Piwik. +; By default when user logs out they are redirected to Piwik "homepage" usually the Login form. +; Uncomment the next line to set a URL to redirect the user to after they log out of Piwik. ; login_logout_url = http://... ; Set to 1 to disable the framebuster on standard Non-widgets pages (a click-jacking countermeasure). @@ -618,8 +618,8 @@ cookie_path = record_statistics = 1 ; length of a visit in seconds. If a visitor comes back on the website visit_standard_length seconds -; after his last page view, it will be recorded as a new visit. In case you are using the Piwik JavaScript tracker to -; calculate the visit count correctly, make sure to call the method "setSessionCookieTimeout" eg +; after their last page view, it will be recorded as a new visit. In case you are using the Piwik JavaScript tracker to +; calculate the visit count correctly, make sure to call the method "setSessionCookieTimeout" eg ; `_paq.push(['setSessionCookieTimeout', timeoutInSeconds=1800])` visit_standard_length = 1800 diff --git a/core/Access.php b/core/Access.php index c8b9bafea0..6f608214cb 100644 --- a/core/Access.php +++ b/core/Access.php @@ -24,7 +24,7 @@ use Piwik\Plugins\SitesManager\API as SitesManagerApi; * - **view access**: Users with this access level can view the resource, but cannot modify it. * - **admin access**: Users with this access level can view and modify the resource. * - **Super User access**: Only the Super User has this access level. It means the user can do - * whatever he/she wants. + * whatever they want. * * Super user access is required to set some configuration options. * All other options are specific to the user or to a website. diff --git a/core/CronArchive.php b/core/CronArchive.php index 9d3ce6e006..bac5aabcda 100644 --- a/core/CronArchive.php +++ b/core/CronArchive.php @@ -1609,7 +1609,7 @@ class CronArchive // If user selected one particular website ID $idSites = array($userPreferences[APIUsersManager::PREFERENCE_DEFAULT_REPORT]); } else { - // If user selected "All websites" or some other random value, we pre-process all websites that he has access to + // If user selected "All websites" or some other random value, we pre-process all websites that they have access to $idSites = APISitesManager::getInstance()->getSitesIdWithAtLeastViewAccess($userLogin); } diff --git a/core/Plugin/Report.php b/core/Plugin/Report.php index b51987c3ff..5ec96ae696 100644 --- a/core/Plugin/Report.php +++ b/core/Plugin/Report.php @@ -430,7 +430,7 @@ class Report /** * Returns an array of metric documentations and their corresponding translations. Eg - * `array('nb_visits' => 'If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after...')`. + * `array('nb_visits' => 'If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after...')`. * By default the given {@link $metrics} are used and their corresponding translations are looked up automatically. * If there is a metric documentation not found, you should add the default metric documentation translation for * this metric using the {@hook Metrics.getDefaultMetricDocumentationTranslations} event. If you want to overwrite diff --git a/core/Tracker.php b/core/Tracker.php index d64f1b7fa8..95bb12d7c1 100644 --- a/core/Tracker.php +++ b/core/Tracker.php @@ -23,7 +23,7 @@ use Piwik\Plugin\Manager as PluginManager; /** * Class used by the logging script piwik.php called by the javascript tag. - * Handles the visitor & his/her actions on the website, saves the data in the DB, + * Handles the visitor and their actions on the website, saves the data in the DB, * saves information in the cookie, etc. * * We try to include as little files as possible (no dependency on 3rd party modules). diff --git a/core/Version.php b/core/Version.php index a1ef6e4d87..38775dd33e 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,7 +20,7 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '3.0.1-b2'; + const VERSION = '3.0.1-b3'; public function isStableVersion($version) { diff --git a/lang/ar.json b/lang/ar.json index 38e265a8e4..7ecc0aec5e 100644 --- a/lang/ar.json +++ b/lang/ar.json @@ -82,6 +82,7 @@ "Date": "التاريخ", "DateRange": "فترة معينة:", "DateRangeFrom": "من", + "DateRangeFromTo": "من %1$s إلى %2$s", "DateRangeInPeriodList": "مدى التاريخ", "DateRangeTo": "إلى", "DaysHours": "%1$s أيام %2$s ساعات", @@ -148,7 +149,6 @@ "ExportAsImage": "تصدير كصورة", "ExportThisReport": "تصدير البيانات في هيئة ملفات أخرى", "Faq": "الأسئلة الشائعة", - "FileIntegrityWarningExplanation": "فشل فحص سلامة الملفات وتم تسجيل بعض الأخطاء. يحدث هذا غالباً نتيجة الرفع الناقص أو الخاطئ لبعض ملفات Piwik. يتوجب عليك إعادة رفع ملفات Piwik في وضع BINARY ثم إعادة تحديث هذه الصفحة حتى تنتهي هذه الأخطاء.", "First": "أول", "Flatten": "تسطيح", "ForExampleShort": "مثال:", diff --git a/lang/be.json b/lang/be.json index dd706b5f18..6c8e87f992 100644 --- a/lang/be.json +++ b/lang/be.json @@ -123,7 +123,6 @@ "Export": "Экспартаваць", "ExportAsImage": "Экспартаваць у малюнак", "ExportThisReport": "Экспартаваць гэты набор дадзеных у іншыя фарматы", - "FileIntegrityWarningExplanation": "Праверка цэласнасці файлаў не атрымалася і паведаміла аб некаторых памылках. Хутчэй за ўсё, гэта атрымалася з-за таго, што файлы Piwik не былі загружаныя належным чынам. Вам варта перазагрузіць ўсе файлы Piwik у бінарным рэжыме і абнавіць гэтую старонку, пакуль вы не ўбачыце, што паведамленні пра памылкі не паказваюцца.", "First": "Першы", "ForExampleShort": "напр.", "FromReferrer": "ад", diff --git a/lang/bg.json b/lang/bg.json index aaf0f55765..1e4744d23e 100644 --- a/lang/bg.json +++ b/lang/bg.json @@ -160,7 +160,6 @@ "ExportAsImage": "Запазване като изображение", "ExportThisReport": "Запази в други формати", "Faq": "Често задавани въпроси", - "FileIntegrityWarningExplanation": "Проверката за целостта на файла се провали и се докладват някои грешки. Това най-вероятно се дължи на частичен файл или не е качен някой от файловете на Piwik. Трябва да качите отново всички файлове на Piwik в BINARY форма и да обновите тази страница, докато тя спре да показва грешки.", "First": "Първи", "Flatten": "Изравнено", "ForExampleShort": "например", diff --git a/lang/bs.json b/lang/bs.json index 57b44b63a3..7e8323519c 100644 --- a/lang/bs.json +++ b/lang/bs.json @@ -129,7 +129,6 @@ "ExportAsImage": "Exportiraj kao sliku", "ExportThisReport": "Exportiraj skup podataka u drugim formatima", "Faq": "Pitanja", - "FileIntegrityWarningExplanation": "Provjera integracije fajlova je zaustavljena i reportirala neke greške. Ovo je najvjerovatnije zbog neuspješnog uploada svih fajlova. Trebali biste uploadati sve fajlove ponovo u BINARY modu i osvježiti stranicu.", "First": "Prvo", "ForExampleShort": "npr.", "FromReferrer": "iz", diff --git a/lang/ca.json b/lang/ca.json index 1b12668fca..3fb3c8729b 100644 --- a/lang/ca.json +++ b/lang/ca.json @@ -159,7 +159,6 @@ "ExportAsImage": "Exportar com a imatge", "ExportThisReport": "Guardar aquestes dades en altres formats", "Faq": "PMF", - "FileIntegrityWarningExplanation": "La verificació de la integritat dels fitxers ha fallat i ha trobat alguns errors. Això segurament és causa de una carrega parcial o incorrecta dels fitxers del Piwik. Haurieu de tornar a pujar tots els fitxers del Piwik en mode BINARY i refrescar aquesta pàgina fins que no mostri errors.", "First": "Primer", "ForExampleShort": "p.ex.", "Forums": "Fòrums", diff --git a/lang/cs.json b/lang/cs.json index 8b88e16ef6..ad995b7ea5 100644 --- a/lang/cs.json +++ b/lang/cs.json @@ -177,7 +177,6 @@ "ExportAsImage": "Exportovat obrázek", "ExportThisReport": "Exportovat data v jiných formátech", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Test integrity selhal a nahlásil nějaké chyby. To je kvůli částečně nebo špatně nahraným souborům Piwiku. Měli byste znovu nahrát všechny soubory Piwiku v módu BINARY.", "First": "První", "Flatten": "Zploštit", "ForExampleShort": "např.", @@ -289,7 +288,6 @@ "Password": "Heslo", "Period": "Období", "Piechart": "Koláčový graf", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s je společný projekt zajištěný členy %7$stýmem Piwiku%8$s, stejně jako mnoha dalšími přispěvateli z celého světa. <br\/> Pokud jste fanoušek Piwiku, můžete zjistit, %3$sjak se zapojit%4$s, nebo %5$spřispějte%6$s na vývoj Piwiku 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s je dostupný. Prosím, upozorněte %2$sadministrátora Piwiku%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Je k dispozici Piwik %1$s. %2$s Prosím aktualizujte jej!%3$s (viz %4$s změny%5$s).", "PleaseContactYourPiwikAdministrator": "Prosím, kontaktujte administrátora vašeho Pišiku.", diff --git a/lang/cy.json b/lang/cy.json index d3d03fa689..5086e3c93d 100644 --- a/lang/cy.json +++ b/lang/cy.json @@ -108,7 +108,6 @@ "Export": "Allforio", "ExportAsImage": "Allforio fel llun", "ExportThisReport": "Allforio'r set ddata hon mewn fformatau eraill", - "FileIntegrityWarningExplanation": "Mae rhai gwallau wedi eu darganfod wrth redeg gwiriad cywirdeb ar y ffeil. O ganlyniad mae'n debygol fod methiant rhannol neu llawn wedi digwydd wrth llwytho i fyny rhai o ffeiliau Piwik. Dylech ail lwytho holl ffeiliau Piwik eto yn y modd BINARY ac adnewyddu'r dudalen hon hyd nes ei fod yn dangos dim gwall.", "First": "Cyntaf", "ForExampleShort": "ee.", "FromReferrer": "oddiwrth", diff --git a/lang/da.json b/lang/da.json index 87e12c0313..db9ae03fb3 100644 --- a/lang/da.json +++ b/lang/da.json @@ -176,7 +176,6 @@ "ExportAsImage": "Eksporter som billede", "ExportThisReport": "Eksporter datasættet i andre formater", "Faq": "OSS", - "FileIntegrityWarningExplanation": "Fil integritetstjek mislykkedes og rapporterede nogle fejl. Det skyldes mest sandsynligt en delvis eller mislykket overførelse af nogle Piwik filer. Du bør overføre alle Piwik filer igen og opdatere denne side, indtil den ingen fejl viser.", "First": "Første", "Flatten": "Udjævn", "ForExampleShort": "fx.", @@ -287,7 +286,6 @@ "Password": "Adgangskode", "Period": "Periode", "Piechart": "Cirkeldiagram", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s er et samarbejdsprojekt af %7$sPiwik holdets%8$s medlemmer samt mange andre bidragydere i hele verden. <br\/> Hvis du er en fan af Piwik, kan du hjælpe med: at finde ud af %3$shvordan du hjælper Piwik%4$s eller %5$sdoner nu%6$s til at hjælpe med at finansiere Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s er tilængelig. Kontakt venligst %2$sPiwik administrator%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s er tilgængelig. %2$sOpdater nu!%3$s (se %4$sændringer%5$s).", "PleaseContactYourPiwikAdministrator": "Kontakt venligst din Piwik administrator.", diff --git a/lang/de.json b/lang/de.json index 64de243c0a..0f0fd57285 100644 --- a/lang/de.json +++ b/lang/de.json @@ -177,7 +177,6 @@ "ExportAsImage": "Als Bild exportieren", "ExportThisReport": "Diese Daten in einem anderen Format exportieren", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Die Integritätsprüfung ist fehlgeschlagen und hat Fehler ausgegeben. Dies geschieht häufig durch Fehler beim Hochladen der Piwik-Dateien. Laden Sie die Piwik-Dateien im BINARY-Modus erneut hoch und aktualisieren Sie diese Seite, bis keine Fehler mehr vorhanden sind.", "First": "Anfang", "Flatten": "Flach anzeigen", "ForExampleShort": "z.B.", @@ -289,7 +288,6 @@ "Password": "Passwort", "Period": "Zeitraum", "Piechart": "Kreisdiagramm", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$s Piwik %2$s ist ein gemeinschaftliches Projekt der %7$s Piwik Team%8$s Mitglieder, sowie viele andere, auf der Welt verteilte, Unterstützer. <br\/> Wenn Ihnen Piwik gefällt, können Sie helfen: Finden Sie heraus, %3$s wie Sie Piwik unterstützen können%4$s oder %5$s Spenden Sie jetzt%6$s und unterstützen Sie Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s ist verfügbar. Bitte benachrichtigen Sie den %2$sPiwik Administrator%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s ist verfügbar. %2$s Bitte aktualisieren Sie jetzt!%3$s (siehe %4$s Änderungen%5$s).", "PleaseContactYourPiwikAdministrator": "Bitte kontaktieren Sie Ihren Piwik Administrator.", diff --git a/lang/el.json b/lang/el.json index 455ac4372c..1e8a607f3a 100644 --- a/lang/el.json +++ b/lang/el.json @@ -161,6 +161,12 @@ "ExceptionLanguageFileNotFound": "Το αρχείο γλώσσας «%s» δεν βρέθηκε.", "ExceptionMethodNotFound": "Η μέθοδος '%1$s' δεν υπάρχει ή δεν είναι διαθέσιμη στη μονάδα '%2$s'.", "ExceptionMissingFile": "Απολεσθέν αρχείο: %s", + "ExceptionUnexpectedFile": "Βρέθηκαν αρχεία στην εγκατάσταση του Piwik σας που δεν αναμενόταν να υπάρχουν.", + "ExceptionUnexpectedFilePleaseDelete": "Παρακαλώ διαγράψτε τα παρακάτω αρχεία για αποφυγή λαθών.", + "ExceptionUnexpectedDirectory": "Βρέθηκαν κατάλογοι που δεν περίμενε το Piwik να βρει.", + "ExceptionUnexpectedDirectoryPleaseDelete": "Παρακαλώ διαγράψτε τους καταλόγους αυτούς για την αποφυγή λαθών.", + "ExceptionFileToDelete": "Αρχείο για διαγραφή: %s", + "ExceptionDirectoryToDelete": "Κατάλογοι για διαγραφή: %s", "ExceptionNonceMismatch": "Αδύνατη η πιστοποίηση τεκμηρίου ασφάλειας σε αυτή τη φόρμα.", "ExceptionPrivilege": "Δεν έχετε πρόσβαση σε αυτή την προέλευση καθώς απαιτεί πρόσβαση %s.", "ExceptionPrivilegeAccessWebsite": "Δεν έχετε πρόσβαση σε αυτή την προέλευση καθώς απαιτεί πρόσβαση %s για την ιστοσελίδα με ταυτότητα = %d.", @@ -177,7 +183,9 @@ "ExportAsImage": "Εξαγωγή ως εικόνα", "ExportThisReport": "Εξαγωγή δεδομένων σε άλλες μορφές", "Faq": "ΣΑΕ", - "FileIntegrityWarningExplanation": "Ο έλεγχος ακεραιότητας αρχείου απέτυχε και ανέφερε κάποια σφάλματα. Αυτό συμβαίνει πιθανόν λόγω μερικούς ή αποτυχημένης αποστολής ορισμένων αρχείων του Piwik. Πρέπει να τα αποστείλετε ξανά όλα και ανανεώστε αυτή τη σελίδα μέχρι να μην δείχνει σφάλματα.", + "FileIntegrityWarning": "Ο έλεγχος ακεραιότητας αρχείων απέτυχε και αναφέρει ορισμένα σφάλματα. Θα πρέπει να επιδιορθώσετε τα σφάλματα και να κάνετε ανανέωση της σελίδας μέχρι να μην εμφανίζεται κάποιο λάθος.", + "FileIntegrityWarningReupload": "Υπάρχουν σφάλματα παρακάτω λόγω μερικής ή αποτυχημένης απόπειρας ανεβάσματος των αρχείων του Piwik.", + "FileIntegrityWarningReuploadBis": "Δοκιμάστε να ανεβάστε πάλι όλα τα αρχεία του Piwik σε κατάσταση BINARY.", "First": "Πρώτο", "Flatten": "Ισοπέδωση", "ForExampleShort": "π.χ.", @@ -289,7 +297,7 @@ "Password": "Κωδικός", "Period": "Περίοδος", "Piechart": "Διάγραμμα πίτας", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "Τι %1$sPiwik%2$s αποτελεί μια συλλογική προσπάθεια που σας παρέχει η %7$sομάδα μελών του Piwik%8$s καθώς επίσης και άλλοι συνεργάτες ανά την υφήλιο.<br\/>Αν είστε οπαδός του Piwik, μπορείτε να βοηθήσετε: δείτε πως να %3$sσυμμετέχετε στο Piwik%4$s ή %5$sκάνετε μια δωρεά%6$s για να χρηματοδοτήσετε την ανάπτυξη του Piwik 3.0!", + "PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "Το %1$sPiwik%2$s αποτελεί μια συλλογική προσπάθεια που παρέχει η %7$sομάδα μελών του Piwik%8$s καθώς επίσης και άλλοι συνεργάτες ανά την υφήλιο.<br\/>Αν είστε οπαδός του Piwik, μπορείτε να βοηθήσετε: δείτε πως να %3$sσυμμετέχετε στο Piwik%4$s ή να %5$sκάνετε τώρα μια δωρεά%6$s για να χρηματοδοτήσετε την ανάπτυξη της επόμενης μεγάλης έκδοσης του Piwik!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "Το %1$s είναι διαθέσιμο. Παρακαλούμε ειδοποιήστε τον %2$sδιαχειριστή του Piwik σας%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Είναι διαθέσιμο το Piwik %1$s. %2$s Άμεση ενημέρωση τώρα!%3$s (δείτε τις %4$s αλλαγές%5$s).", "PleaseContactYourPiwikAdministrator": "Παρακαλούμε επικοινωνήστε με τον διαχειριστή του Piwik σας.", @@ -362,6 +370,8 @@ "TimeAgo": "πριν από %s", "TimeFormat": "Μορφή ώρας", "TimeOnPage": "Χρόνος στη σελίδα", + "ToDeleteAllDirectoriesRunThisCommand": "Για να διαγράψετε αυτούς τους καταλόγους με τη μία, εκτελέστε την εξής εντολή:", + "ToDeleteAllFilesRunThisCommand": "Για να διαγράψετε αυτά τα αρχεία με τη μία, εκτελέστε την εξής εντολή:", "Total": "Σύνολο", "TotalRatioTooltip": "Αυτό είναι το %1$s από όλες τις %2$s %3$s.", "TotalRevenue": "Συνολική Πρόσοδος", diff --git a/lang/en.json b/lang/en.json index b50080ec4c..7d9815d9bf 100644 --- a/lang/en.json +++ b/lang/en.json @@ -62,11 +62,11 @@ "ColumnNbActions": "Actions", "ColumnNbActionsDocumentation": "The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.", "ColumnNbUniqVisitors": "Unique visitors", - "ColumnNbUniqVisitorsDocumentation": "The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.", + "ColumnNbUniqVisitorsDocumentation": "The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.", "ColumnNbUsers": "Users", "ColumnNbUsersDocumentation": "The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').", "ColumnNbVisits": "Visits", - "ColumnNbVisitsDocumentation": "If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.", + "ColumnNbVisitsDocumentation": "If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.", "ColumnPageBounceRateDocumentation": "The percentage of visits that started on this page and left the website straight away.", "ColumnPageviews": "Pageviews", "ColumnPageviewsDocumentation": "The number of times this page was visited.", diff --git a/lang/es.json b/lang/es.json index 0eb2750668..bca83f31b3 100644 --- a/lang/es.json +++ b/lang/es.json @@ -177,7 +177,6 @@ "ExportAsImage": "Exportar como imagen", "ExportThisReport": "Exportar este conjunto de datos en otros formatos", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Falló la verificación de integridad y reportó algunos errores. Esto se debe generalmente a una carga parcial o falta de algunos de los archivos de Piwik. Debería volver a subir los archivos de Piwik en modo BINARIO y actualizar la página hasta que no muestre errores.", "First": "Primero", "Flatten": "Aplanar", "ForExampleShort": "ej.", @@ -289,7 +288,6 @@ "Password": "Contraseña", "Period": "Periodo", "Piechart": "Gráfica circular", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s es un proyecto de colaboración traído para ti por los miembros del %7$sequipo de Piwik%8$s así como muchos otros colaboradores alrededor del mundo. <br\/> Si eres un fan de Piwik, puedes ayudar: descubrir %3$sCómo participar en Piwik%4$s, o %5$sdona ahora%6$s para ayudar a financiar Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s está disponible. Por favor alerte al %2$s administrador Piwik%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s está disponible. %2$s ¡Por favor, actualice ahora!%3$s (ver %4$scambios%5$s).", "PleaseContactYourPiwikAdministrator": "Por favor contáctese con su administrador Piwik.", @@ -371,7 +369,7 @@ "TrackingScopeVisit": "Visita", "TransitionsRowActionTooltip": "Vea que hicieron los visitantes antes y después de observar esta página", "TransitionsRowActionTooltipTitle": "Transiciones abiertas", - "TranslatorName": "Marcos Alberto Sanmartín Pereira, David Ernesto Soto Vásquez, Fernando SFEIR, Darío Hereñu, David Álvarez Robert, Adrián Seldes, Héctor Nicolás Suero", + "TranslatorName": "Marcos Alberto Sanmartín Pereira, David Ernesto Soto Vásquez, Fernando SFEIR, Darío Hereñu, David Álvarez Robert, Adrián Seldes, Héctor Nicolás Suero, <a href=\"https:\/\/twitter.com\/evelascosilva\">Enrique Velasco<\/a>", "UniquePurchases": "Compras únicas", "Unknown": "Desconocido", "Upload": "Subir", diff --git a/lang/fa.json b/lang/fa.json index 145568afae..e5c508c275 100644 --- a/lang/fa.json +++ b/lang/fa.json @@ -155,7 +155,6 @@ "ExportAsImage": "عکس به عنوان خروجی", "ExportThisReport": "این مجموعه داده ها را در قالب های دیگری خروجی بده", "Faq": "سولات متدوال", - "FileIntegrityWarningExplanation": "تمامیت چک کردن فایل با شکست مواجه شد و برخی از اشتباهات را گزارش داد. این است که به احتمال زیاد به علت بخشی از ارسال و یا برخی از فایل های Piwik شکست خورد. شما باید reupload تمام فایل های Piwik در حالت باینری و تازه کردن این صفحه آن را نشان می دهد تا بدون خطا.", "First": "اولین", "Flatten": "پهن کردن", "ForExampleShort": "به عنوان مثال", diff --git a/lang/fi.json b/lang/fi.json index f79de3678c..14ad5ae7a3 100644 --- a/lang/fi.json +++ b/lang/fi.json @@ -170,7 +170,6 @@ "ExportAsImage": "Tallenna kuvaksi", "ExportThisReport": "Tallenna nämä tiedot eri muodossa", "Faq": "UKK", - "FileIntegrityWarningExplanation": "Tiedostojen eheystarkistus epäonnistui. Todennäköisesti osa Piwikin tiedostojen tallentamisesta epäonnistui. Tallenna kaikki tiedostot binääritilassa (BINARY mode) ja lataa tämä sivu uudelleen.", "First": "Ensimmäinen", "Flatten": "Puristettu", "ForExampleShort": "esim.", diff --git a/lang/fr.json b/lang/fr.json index 5ed66411cd..c8e6a60a72 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -161,6 +161,12 @@ "ExceptionLanguageFileNotFound": "Le fichier de langage '%s' n'a pas été trouvé.", "ExceptionMethodNotFound": "La méthode '%1$s' n'existe pas ou n'est pas disponible dans le module '%2$s'", "ExceptionMissingFile": "Fichier manquant : %s", + "ExceptionUnexpectedFile": "Des fichiers auxquels nous ne nous attendions pas ont été trouvé dans votre installation de Piwik.", + "ExceptionUnexpectedFilePleaseDelete": "Veuillez supprimer ces fichiers pour éviter d'avoir des erreurs.", + "ExceptionUnexpectedDirectory": "Certains répertoires auxquels nous ne nous attendions pas ont été trouvés dans votre installation de Piwik.", + "ExceptionUnexpectedDirectoryPleaseDelete": "Veuillez supprimer ces répertoires pour éviter d'obtenir des erreurs.", + "ExceptionFileToDelete": "Fichier à supprimer: %s", + "ExceptionDirectoryToDelete": "Répertoire à supprimer : %s", "ExceptionNonceMismatch": "Impossible de vérifier le code (token) de sécurité pour ce formulaire.", "ExceptionPrivilege": "Vous ne pouvez accéder à cette ressource, ceci requiert un accès de type %s.", "ExceptionPrivilegeAccessWebsite": "Vous ne pouvez pas accéder à cette ressource, ceci requiert un accès de type %s pour le site id = %d.", @@ -177,7 +183,9 @@ "ExportAsImage": "Exporter au format Image", "ExportThisReport": "Exporter ce jeu de données dans d'autres formats", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Le contrôle d'intégrité a échoué et a rapporté des erreurs. Cela est probablement dû à un envoi de fichier partiel ou en échec des fichiers de Piwik. Vous devriez envoyer de nouveau les fichiers de Piwik et rafraîchir cette page jusqu'à ce qu'elle n'affiche plus aucune erreur.", + "FileIntegrityWarning": "Le contrôle d'intégrité a échoué et a rapporté des erreurs. Vous devriez corriger cela et rafraîchir cette page jusqu'à ce qu'il n'y ait plus d'erreur.", + "FileIntegrityWarningReupload": "Les erreurs ci-dessous peuvent être dues à des téléversements de fichiers Piwik partiels ou échoués.", + "FileIntegrityWarningReuploadBis": "Essayez de renvoyer tous les fichiers Piwik en utilisant le mode BINAIRE.", "First": "Premier", "Flatten": "Aplatir", "ForExampleShort": "ex.", @@ -289,7 +297,7 @@ "Password": "Mot de passe", "Period": "Période", "Piechart": "Camembert", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s est un projet collaboratif réalisé pour vous par les membres de %7$sl'équipe Piwik%8$s ainsi que de nombreux autres contributeurs du monde entier.<br \/> Si vous êtes fan de Piwik, vous pouvez aider: trouvez %3$scomment participer à Piwik%4$s, ou %5$sdonnez maintenant%6$s pour aider à financer Piwik 3.0!", + "PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sPiwik%2$s est un projet collaboratif réalisé pour vous par les membres de %7$sl'équipe Piwik%8$s ainsi que de nombreux autres contributeurs du monde entier.<br \/> Si vous êtes fan de Piwik, vous pouvez aider: trouvez %3$scomment participer à Piwik%4$s, ou %5$sdonnez maintenant%6$s pour aider à financer la prochaine version de Piwik!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s est disponible. Veuillez informer %2$sl'administrateur Piwik%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s est maintenant disponible. %2$s Merci de mettre à jour!%3$s (voir %4$s les modifications%5$s).", "PleaseContactYourPiwikAdministrator": "Merci de contacter votre administrateur Piwik.", @@ -362,6 +370,8 @@ "TimeAgo": "il y a %s", "TimeFormat": "Format horaire", "TimeOnPage": "Temps sur la page", + "ToDeleteAllDirectoriesRunThisCommand": "Pour supprimer tous ces répertoires d'un coup, vous pouvez exécuter cette commande :", + "ToDeleteAllFilesRunThisCommand": "Pour supprimer tous ces répertoires d'un coup, vous pouvez exécuter cette commande :", "Total": "Total", "TotalRatioTooltip": "C'est %1$s de %2$s %3$s.", "TotalRevenue": "Total des recettes", @@ -399,7 +409,7 @@ "Warning": "Attention", "Warnings": "Avertissements", "WarningPhpVersionXIsTooOld": "La version de PHP que vous utilisez (%s) est en fin de support. Nous vous incitons vivement à upgrader vers une version plus récente. Votre version actuelle vous expose à des failles de sécurité et des bugs qui ont été corrigés dans les versions les plus récentes de PHP.", - "WarningPiwikWillStopSupportingPHPVersion": "Piwik ne prendra plus en charge PHP %1$s dans la prochaine version majeure. Mettez à jour votre PHP au minimum avec une version %2$s avant qu'il ne soit trop tard !", + "WarningPiwikWillStopSupportingPHPVersion": "Piwik ne prendra plus en charge PHP %1$s dans la prochaine version majeure. Mettez à jour votre PHP au minimum avec une version %2$s avant qu'il ne soit trop tard!", "YouMustUpgradePhpVersionToReceiveLatestPiwik": "Vous devez mettre à niveau votre version de PHP afin de recevoir la dernière mise à jour Piwik.", "PiwikCannotBeUpgradedBecausePhpIsTooOld": "Piwik ne peut pas être mis à jour à la dernière version majeure car votre version de PHP est trop ancienne.", "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "Merci de mettre à niveau votre version de PHP au minimum à PHP %s pour que vos statistiques Piwik restent sécurisées.", diff --git a/lang/he.json b/lang/he.json index dc5df5ded1..c6ab801a0b 100644 --- a/lang/he.json +++ b/lang/he.json @@ -164,7 +164,6 @@ "ExportAsImage": "לייצא כתמונה", "ExportThisReport": "לייצא מידע בפורמטים אחרים", "Faq": "שאלות ותשובות נפוצות", - "FileIntegrityWarningExplanation": "בדיקת תקינות קבצים נכשלה ודיווחה על מספר שגיאות. ייתכן וזה נגרם עקב העלאה חלקית או כושלת של קבצי המערכת. יש להעלות את הקבצים מחדש במצב BINARY ולרענן את העמוד עד שלא יוצגו שגיאות.", "First": "ראשון", "Flatten": "לשטח", "ForExampleShort": "לדוגמה", diff --git a/lang/hi.json b/lang/hi.json index aacd5c95d0..5afd069398 100644 --- a/lang/hi.json +++ b/lang/hi.json @@ -158,7 +158,6 @@ "ExportAsImage": "छवि के रूप में निर्यात", "ExportThisReport": "इस डाटा सेट का अन्य प्रारूपों में निर्यात", "Faq": "पूछे जाने वाले प्रश्न", - "FileIntegrityWarningExplanation": "फ़ाइल अखंडता की जाँच विफल रही है और कुछ त्रुटियों की सूचना दी. यह सबसे अधिक संभावना एक आंशिक के कारण है या Piwik फ़ाइलों में से कुछ का अपलोड विफल रहा है. तुम्हें बायनरी मोड में सभी Piwik फाइलें फिर से अपलोड करनी चाहिए", "First": "पहले", "Flatten": "समतल करना", "ForExampleShort": "उदा.", diff --git a/lang/hr.json b/lang/hr.json index a905e39b29..ecf418ad14 100644 --- a/lang/hr.json +++ b/lang/hr.json @@ -136,7 +136,6 @@ "ExportAsImage": "Izvezi kao sliku", "ExportThisReport": "Izvezi ovaj zbir podataka u drugim oblicima", "Faq": "ČPP", - "FileIntegrityWarningExplanation": "Provjera integriteta datoteke nije uspjela i prijavila je određene greške. Najvjerojatniji razlog je nepotpuno ili neuspjelo slanje nekih Piwik datoteka. Pošaljite nanovo sve Piwik datoteke na poslužitelj koristeći BINARY način slanja i osvježite ovu stranicu dok se greške ne otklone.", "First": "Početak", "ForExampleShort": "npr.", "FromReferrer": "od", diff --git a/lang/hu.json b/lang/hu.json index 65cf27dc83..3284d0b063 100644 --- a/lang/hu.json +++ b/lang/hu.json @@ -130,7 +130,6 @@ "Export": "Export", "ExportAsImage": "Exportálás képként", "ExportThisReport": "Adatok exportálása más formátumokba", - "FileIntegrityWarningExplanation": "A fájlintegritás-ellenőrzés sikertelen volt; néhány hibát jelentve. Ezt nagy valószínűséggel valamelyik Piwik fájl részleges vagy sikertelen feltöltése okozhatta. Kérjük, töltsd fel újra az összes Piwik fájlt BINARY módban és frissítsd ezt a weblapot addig, mindaddig, amíg itt hibaüzenetek jelennek meg.", "First": "Első", "ForExampleShort": "pl.", "FromReferrer": "tól", diff --git a/lang/id.json b/lang/id.json index 3c2d6aac25..a626397a0d 100644 --- a/lang/id.json +++ b/lang/id.json @@ -163,7 +163,6 @@ "ExportAsImage": "Ekspor sebagai Gambar", "ExportThisReport": "Ekspor dataset ini ke format lain", "Faq": "Pertanyaan yang Sering Diajukan", - "FileIntegrityWarningExplanation": "Pemeriksaan integritas berkas gagal dan melaporkan beberapa galat. Kemungkinan ada berkas Piwik yang gagal terunggah. Anda harus mengunggah ulang berkas Piwik dalam modus BINARY dan memuat ulang halaman ini hingga tak menampilkan galat.", "First": "Pertama", "ForExampleShort": "misalnya", "FromReferrer": "dari", diff --git a/lang/it.json b/lang/it.json index 244aa3a827..12f16e558e 100644 --- a/lang/it.json +++ b/lang/it.json @@ -176,7 +176,6 @@ "ExportAsImage": "Esporta come Immagine", "ExportThisReport": "Esporta questo dataset in altri formati", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Il controllo d'integrità dei file è fallito e ha riportato alcuni errori. Ciò è molto probabilmente dovuto al parziale o fallito upload di alcuni file di Piwik. Dovresti provare a rifare l'upload di tutti i file di Piwik in modalità BINARIA e aggiornare questa pagina fino a quando non mostrerà più errori.", "First": "Primo", "Flatten": "Piano", "ForExampleShort": "es.", @@ -288,7 +287,6 @@ "Password": "Password", "Period": "Periodo", "Piechart": "Diagramma a torta", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s è un progetto in collaborazione che ti viene fornito dai membri del %7$sPiwik team%8$s e da molti altri collaboratori di tutto il mondo. <br\/>Se sei un fan di Piwik, puoi aiutare anche tu: scopri %3$sCome partecipare a Piwik%4$s, o %5$sdona adesso%6$s per aiutare a finanziare Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s è disponibile. Avvisa l'%2$samministratore di Piwik%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "È disponibile la versione %1$s di Piwik. %2$sAggiorna ora!%3$s (%4$svedi le modifiche%5$s).", "PleaseContactYourPiwikAdministrator": "Si prega di contattare l'amministratore di Piwik.", diff --git a/lang/ja.json b/lang/ja.json index 72011a5809..1d93d770bf 100644 --- a/lang/ja.json +++ b/lang/ja.json @@ -176,7 +176,6 @@ "ExportAsImage": "画像としてエクスポートする", "ExportThisReport": "他のフォーマットでこのデータセットをエクスポートする", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "ファイルの整合性チェックに失敗し、いくつかのエラーが報告されました。これは、一部のPiwikファイルのアップロードの一部または全部が失敗したためです。すべてのPiwikファイルをバイナリモードで再アップロードし、エラーがなくなるまでこのページを更新する必要があります。", "First": "最初へ", "Flatten": "フラット化", "ForExampleShort": "例：", @@ -288,7 +287,6 @@ "Password": "パスワード", "Period": "期間", "Piechart": "円グラフ", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s は %7$sPiwikチーム%8$s メンバーだけでなく世界中の他の多くの貢献者によってあなたにもたらされた共同プロジェクトです。 <br\/>あなたがPiwikのファンなら、%3$sPiwikへの参加方法%4$s を見つけたり、Piwik 3.0に資金を援助するために %5$s今すぐ寄付%6$s することができます。", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s が利用可能です。ぜひ %2$sPiwik administrator%3$s に通知してください。", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s が利用可能です。 %2$s今すぐアップデートしてください！%3$s（%4$s変更点%5$sを参照）。", "PleaseContactYourPiwikAdministrator": "Piwik管理者に連絡してください。", diff --git a/lang/ka.json b/lang/ka.json index 8328f2f9a4..fe706d3266 100644 --- a/lang/ka.json +++ b/lang/ka.json @@ -83,7 +83,6 @@ "ExceptionUnreadableFileDisabledMethod": "კონფიგურაციის ფაილის {%1$s} წაკითხვა ვერ მოხერხდა. შესაძლოა თქვენმა ჰოსტმა გამორთო %2$s.", "ExportAsImage": "ექსპორტი სურათის ფორმატში", "ExportThisReport": "გააკეთეთ მონაცემთა ამ ნაკრების ექსპორტი სხვა ფორმატებში", - "FileIntegrityWarningExplanation": "ფაილის მთლიანობის შემოწმება ჩაიშალა და შეცდომების შესახებ გაიგზავნა რეპორტი. სავარაუდოდ, ამის მიზეზია Piwik ფაილების არასრულად ან უშედეგოდ ატვირთვა. ხელმეორედ უნდა ატვირთოთ Piwik–ის ყველა ფაილი BINARY რეჟიმში და განაახლოთ ეს გვერდი იქამდე, სანამ შეცდომის შეტყობინებები არ შეწყდება.", "ForExampleShort": "მაგ.", "GiveUsYourFeedback": "გამოგვეხმაურეთ!", "GoTo": "გადადი %s", diff --git a/lang/ko.json b/lang/ko.json index 67fc60c0d1..2d783ba3e7 100644 --- a/lang/ko.json +++ b/lang/ko.json @@ -166,7 +166,6 @@ "ExportAsImage": "이미지로 내보내기", "ExportThisReport": "다른 형식으로 데이터셋 내보내기", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "파일의 무결성 검사가 실패하고 몇 가지 오류가 보고되었습니다. 이것은 대부분의 경우, 파일이 불완전하거나 일부 Piwik 파일을 업로드에 실패했을 때 입니다. 모든 Piwik 파일을 바이너리 모드로 다시 업로드하여 오류가 나타나지 않을 때까지 페이지를 새로 고침할 필요가 있습니다.", "First": "처음", "ForExampleShort": "예:", "Forums": "포럼", diff --git a/lang/lt.json b/lang/lt.json index 853c48c7d9..3bc21e2fc5 100644 --- a/lang/lt.json +++ b/lang/lt.json @@ -111,7 +111,6 @@ "ExportAsImage": "Eksportuoti kaip paveikslėlį", "ExportThisReport": "Eksportuoti šį duomenų rinkinį kitu formatu", "Faq": "DUK", - "FileIntegrityWarningExplanation": "Failo vientisumo patikra nutraukta ir pateikiama klaidų ataskaita. Tikėtina, jog tai įtakoja nepilnas arba nutrauktas Piwik failų įkėlimas į serverį. Prašome pabandyti pakartotinai perkelti Piwik failus ir atnaujinti šį puslapį kol nebebus rodomi klaidų pranešimai.", "First": "Pirmas", "ForExampleShort": "pvz.", "FromReferrer": "nuo", diff --git a/lang/nb.json b/lang/nb.json index d2c46991e0..57cc59e8de 100644 --- a/lang/nb.json +++ b/lang/nb.json @@ -176,7 +176,6 @@ "ExportAsImage": "Eksporter som bilde", "ExportThisReport": "Eksporter dette datasettet i andre formater", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Integritetskontrollen av filer oppdaget noen feil. Dette skyldes mest sannsynlig feil under opplasting av Piwik sine filer. Du bør laste opp alle Piwik sine filer på nytt i BINARY-modus og oppfriske siden inntil ingen feil vises.", "First": "Først", "Flatten": "Gjør flat", "ForExampleShort": "f.eks.", @@ -287,7 +286,6 @@ "Password": "Passord", "Period": "Periode", "Piechart": "Kakediagram", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s er et samarbeidsprosjekt mellom %7$sPiwik-teamets%8$s medlemmer og mange andre bidragsytere over hele verden. <br\/>Hvis du liker Piwik, kan du hjelpe oss: finn ut %3$shvordan du deltar i Piwik%4$s, eller %5$sdoner nå%6$s for å støtte utviklingen av Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s er tilgjengelig. Vennligst gi beskjed til %2$sPiwik administrator%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s er tilgjengelig. %2$s Oppdater nå!%3$s (se %4$s endringer%5$s).", "PleaseContactYourPiwikAdministrator": "Vennligst kontakt din Piwik-administrator.", diff --git a/lang/nl.json b/lang/nl.json index ed2d06e1f8..3495df2953 100644 --- a/lang/nl.json +++ b/lang/nl.json @@ -172,7 +172,6 @@ "ExportAsImage": "Exporteer als afbeelding", "ExportThisReport": "Exporteer deze dataset naar andere formaten", "Faq": "Veelgestelde vragen", - "FileIntegrityWarningExplanation": "Bestand integriteit controle mislukt en er zijn fouten ontdekt. Dit komt waarschijnlijk door een gedeeltelijke of mislukte upload van enkele Piwik bestanden. We raden u aan alle Piwik bestanden opnieuw te uploaden en deze pagina te vernieuwen tot er geen fouten meer weergegeven worden.", "First": "Eerste", "Flatten": "Plat maken", "ForExampleShort": "bijv.", diff --git a/lang/nn.json b/lang/nn.json index 8b9b5415e8..4ace463f00 100644 --- a/lang/nn.json +++ b/lang/nn.json @@ -125,7 +125,6 @@ "ExportAsImage": "Eksporter som bilete", "ExportThisReport": "Eksporter dette datasettet til andre format", "Faq": "OSS", - "FileIntegrityWarningExplanation": "Sjekking av filintegritet feila og gav feilmeldingar. Dette skuldast truleg at nokre av filane til Piwik berre vart delvis eller feilaktig lasta opp. Du bør lasta opp Piwik på nytt i BINÆR-modus og oppfriska denne sida til feilmeldingane forsvinn.", "First": "Fyrste", "ForExampleShort": "t.d.", "FromReferrer": "frå", diff --git a/lang/pl.json b/lang/pl.json index 941ffdc925..73083f780c 100644 --- a/lang/pl.json +++ b/lang/pl.json @@ -155,7 +155,6 @@ "ExportAsImage": "Eksport jako obraz", "ExportThisReport": "Eksport danych w innych formatach", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Weryfikacja integralności plików nie powiodła się i odnotowano pewne błędy. Jest to spowodowane najczęściej brakiem lub częściowym przesłaniem plików należących do Piwik. Należy ponowić wgranie wszystkich plików Piwik w trybie BINARNYM i odświeżyć wyświetlanie tej strony do czasu aż znikną wyświetlane błędy.", "First": "Pierwszy", "Flatten": "Płaski", "ForExampleShort": "np.", diff --git a/lang/pt-br.json b/lang/pt-br.json index c365c747ab..e1b5ecbb84 100644 --- a/lang/pt-br.json +++ b/lang/pt-br.json @@ -176,7 +176,6 @@ "ExportAsImage": "Exportar como imagem", "ExportThisReport": "Exportar este conjunto de dados noutros formatos", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "A verificação de integridade do arquivo falhou e reportou alguns erros. Isso é mais provável devido a um carregamento parcial ou falho de algum arquivo Piwik. Você deve recarregar todos os arquivos Piwik em modo BINÁRIO e também recarregar a página até que nenhum erro seja exibido.", "First": "Primeiro", "Flatten": "Achatar", "ForExampleShort": "ex.", @@ -287,7 +286,6 @@ "Password": "Senha", "Period": "Período", "Piechart": "Gráfico circular", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s é um projeto colaborativo traduzido para você pelos membros da %7$sequipe do Piwik%8$s bem como muitos outros colaboradores ao redor do globo.<br\/> Se você é um fã do Piwik, pode ajudar: descubra %3$sComo participar no Piwik%4$s, ou %5$sdoe agora%6$s para ajudar a financiar o Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s está disponível. Por favor notifique o %2$sadministrator Piwik%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwiki %1$s está disponível. %2$s Por favor atualize agora!%3$s (veja %4$sas mudanças%5$s).", "PleaseContactYourPiwikAdministrator": "Por favor, contate o administrador do Piwik.", diff --git a/lang/pt.json b/lang/pt.json index 718ac21b98..284e5b2b33 100644 --- a/lang/pt.json +++ b/lang/pt.json @@ -138,7 +138,6 @@ "Export": "Exportar", "ExportAsImage": "Exportar como Imagem", "ExportThisReport": "Exportar estes dados noutros formatos", - "FileIntegrityWarningExplanation": "A verificação da integridade dos ficheiros falhou e reportou alguns erros. A causa mais provável é uma transferência dos ficheiros de Piwik incompleta ou com erros. Deve voltar a transferir todos os ficheiros de Piwik em modo BINÁRIO e actualizar a página até que não mostre erros.", "First": "Primeiro", "ForExampleShort": "ex.", "Forums": "Fóruns", diff --git a/lang/ro.json b/lang/ro.json index 622175566d..2180d10ab6 100644 --- a/lang/ro.json +++ b/lang/ro.json @@ -155,7 +155,6 @@ "ExportAsImage": "Exporta ca imagine", "ExportThisReport": "Exporta acest set de date in alt interval", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Verificare integritatii fisierelor a esuat si a raportat erori. Acest lucru s-a intamplat din cauza incarcarii partiale a unor fisiere Piwik. Ar trebui sa urcati din nou toate fisierele Piwik in mod BINARY si sa faceti refresh.", "First": "Prima", "Flatten": "Aplatiza", "ForExampleShort": "ex.", diff --git a/lang/ru.json b/lang/ru.json index a583234b07..4359ba12b0 100644 --- a/lang/ru.json +++ b/lang/ru.json @@ -176,7 +176,6 @@ "ExportAsImage": "Экспортировать как изображение", "ExportThisReport": "Экспортировать в другие форматы", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Проверка целостности файлов завершилась неудачей и возвратила ошибки. Это произошло, возможно, из-за того, что на сервер, при загрузке на него системы Piwik, часть файлов была загружена некорректно. Рекомендуется перезагрузить фсе файлы Piwik на сервер, обновить страницу, и убедиться, что уже не возникает ошибок.", "First": "Первый", "Flatten": "Сгладить", "ForExampleShort": "напр.,", @@ -205,6 +204,7 @@ "Language": "Язык", "LastDays": "Прошедшие %s дни (включая сегодня)", "LastDaysShort": "%s последних дней", + "LearnMore": "%1$s узнайте больше %2$s", "Live": "Прямой эфир", "Loading": "Загрузка...", "LoadingData": "Загрузка данных...", @@ -286,7 +286,6 @@ "Password": "Пароль", "Period": "Период", "Piechart": "Круговая диаграмма", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s является совместным проектом %7$sкоманды Piwik%8$s, а также многих других авторов по всему земному шару. <br\/> Если вы поклонник Piwik, вы можете помочь: выяснить, %3$sКак принять участие в Piwik%4$s или %5$sсделать пожертвование%6$s, чтобы помочь в финансировании Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "Доступен %1$s. Пожалуйста, сообщите %2$sадминистратору Piwik%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s доступен для скачивания. %2$s Пожалуйста, обновитесь!%3$s (см. %4$s изменения%5$s).", "PleaseContactYourPiwikAdministrator": "Пожалуйста, обратитесь к администратору Piwik.", diff --git a/lang/sk.json b/lang/sk.json index 7aec0271d1..d7db678316 100644 --- a/lang/sk.json +++ b/lang/sk.json @@ -172,7 +172,6 @@ "ExportAsImage": "Exportovať ako obrázok", "ExportThisReport": "Exportovať tento dátový súbor v iných formátoch", "Faq": "Často kladené otázky", - "FileIntegrityWarningExplanation": "Kontrola integrity súboru zlyhala a vykazuje nejaké chyby. To je najviac pravdepodobné kvôli čiastočnému nahratiu alebo sa nepodarilo nahrať niektoré zo súborov Piwik. Mali by ste znovu nahrať všetky súbory v binárnom móde a obnovte túto stránku, kým nebude vykazovať žiadne chyby.", "First": "Začiatok", "Flatten": "Urovnať", "ForExampleShort": "napr.", diff --git a/lang/sl.json b/lang/sl.json index 4c58993a46..f2c823797b 100644 --- a/lang/sl.json +++ b/lang/sl.json @@ -172,7 +172,6 @@ "ExportAsImage": "Izvozi kot Sliko", "ExportThisReport": "Izvozi to razpredelnico v drugih formatih", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Preverjanje integritete ni uspelo in je javilo neke napake. Vzrok za to so verjetno nekatere Piwik datoteke, ki so se delno ali narobe prenesle. Ponovno morate prenesti vse Piwik datoteke na strežnik v BINARY načinu in osvežiti to stran, tako da ne bo več vidne nobene napake.", "First": "Prvi", "Flatten": "Izravnaj", "ForExampleShort": "npr.", diff --git a/lang/sq.json b/lang/sq.json index 4f36ba82af..929823d98d 100644 --- a/lang/sq.json +++ b/lang/sq.json @@ -15,6 +15,7 @@ "API": "API", "Apply": "Zbatoje", "ArchivingInlineHelp": "Për sajte me trafik mesatar ose të shumtë këshillohet të çaktivizohet vënia në punë e arkivimit nga Piwik-u prej shfletuesit. Në vend të kësaj këshillojmë të rregulloni një akt cron që të përpunoni raporte Piwik-u çdo orë.", + "ArchivingTriggerDescription": "E këshilluar për instalime më të ngarkuara të Piwik-ut, lypset të %1$s rregulloni një akt cron-i%2$s që të përpunohen raportet automatikisht.", "AuthenticationMethodSmtp": "Metodë mirëfilltësimi për SMTP", "AverageOrderValue": "Vlerë Mesatare Porosie", "AveragePrice": "Çmim Mesatar", @@ -82,6 +83,7 @@ "ColumnViewedAfterSearchDocumentation": "Numri i herëve që kjo Faqe qe vizituar nga një vizitor, pasi kreu një kërkim mbi sajtin tuaj, dhe klikoi mbi këtë faqe te përfundimet e kërkimit.", "ColumnVisitDuration": "Kohëzgjatje Vizite (në sekonda)", "ColumnVisitsWithConversions": "Vizita me Shndërrime", + "ConfigFileIsNotWritable": "Kartela për formësimin e Piwik-ut %1$s nuk është e shkruajtshme, disa nga ndryshimet tuaja mund të mos ruhen dot. %2$s Ju lutemi, ndryshoni lejet mbi kartelën e formësimit për ta bërë të shkruajtshme.", "Continue": "Vazhdo", "ContinueToPiwik": "Vazhdoni te Piwik-u", "CurrentlyUsingUnsecureHttp": "Po e përdorni Piwik-un përmes HTTP-je jo të sigurt, çka mund të jetë e rrezikshme. Për shtim të sigurisë, këshillojmë ta rregulloni Piwik-un të përdorë SSL (HTTPS).", @@ -99,6 +101,7 @@ "Date": "Datë", "DateRange": "Interval datash:", "DateRangeFrom": "Prej", + "DateRangeFromTo": "Nga %1$s në %2$s", "DateRangeInPeriodList": "interval datash", "DateRangeTo": "Për", "DaysHours": "%1$s ditë %2$s orë", @@ -135,6 +138,7 @@ "ErrorRequest": "Hëm… pati një problem gjatë kërkesës. Ndoshta shërbyesi pati një problem të përkohshëm, ose ndoshta kërkuat një raport me shumë të dhëna. Ju lutemi, riprovoni. Nëse ky gabim përsëritet vazhdimisht, ju lutemi, %1$slidhuni me përgjegjësin e Piwik-ut tuaj%2$s për asistencë.", "EvolutionOverPeriod": "Zhvillime përgjatë periudhës", "EvolutionSummaryGeneric": "%1$s në %2$s krahasuar me %3$s te %4$s. Evolucion: %5$s", + "ExceptionContactSupportGeneric": "Nëse ky problem mbetet, ju lutemi, %1$slidhuni me përgjegjësin e Piwik-ut%2$s tuaj për asistencë.", "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Përdoruesi duhet të jetë ose Superpërdorues, ose vetë përdoruesi '%s'.", "ExceptionConfigurationFileNotFound": "S’u gjet kartela {%s} e formësimit.", "ExceptionConfigurationFileExistsButNotReadable": "Kartela e formësimit %s duket se ekziston, por Piwik-u s’e lexoi dot.", @@ -145,16 +149,31 @@ "ExceptionFileIntegrity": "Kontrolli i pacenueshmërisë dështoi: %s", "ExceptionFilesizeMismatch": "Mospërputhje madhësie kartelash: %1$s (pritej gjatësi: %2$s, u gjet: %3$s)", "ExceptionIncompatibleClientServerVersions": "Versioni i klientit tuaj për %1$s është %2$s çka është e papërputhshme me versionin e shërbyesit %3$s.", + "ExceptionInvalidAggregateReportsFormat": "Formati '%1$s' për raporte të grumbulluar s’është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.", "ExceptionInvalidArchiveTimeToLive": "Jetëgjatësia e arkivës për sot duhet të jetë një numër sekondash më i madh se zero", + "ExceptionInvalidDateFormat": "Formati i datës duhet të jetë: %1$s ose çfarëdo fjalëkyçi që funksioni %2$s e mbulon (për më tepër të dhëna, shihni %3$s)", + "ExceptionInvalidDateRange": "Data '%1$s' s’është interval i saktë datash. Ky do të duhej të kishte formatin vijues: %2$s.", + "ExceptionInvalidPeriod": "Nuk mbulohet periudha '%1$s'. Provoni më mirë ndonjë nga vijueset: %2$s", + "ExceptionInvalidRendererFormat": "Formati '%1$s' për vizatuesin s’është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.", + "ExceptionInvalidReportRendererFormat": "Formati '%1$s' për raportuesin s’është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.", + "ExceptionInvalidStaticGraphType": "Lloji '%1$s' për grafik statik s’është i vlefshëm. Provoni më mirë ndonjë nga vijuesit: %2$s.", "ExceptionInvalidToken": "Token-i s’është i vlefshëm.", "ExceptionLanguageFileNotFound": "S’u gjet kartela e gjuhës '%s'.", + "ExceptionMethodNotFound": "Metoda '%1$s' s’ekziston ose s’është e mundshme në modulin '%2$s'.", "ExceptionMissingFile": "Kartelë që mungon: %s", + "ExceptionUnexpectedFile": "Te Piwik-u juaj u gjetën kartela, por nuk prisnim të tilla.", + "ExceptionUnexpectedFilePleaseDelete": "Ju lutemi, fshijini këto kartela që të parandalohet gabime.", + "ExceptionUnexpectedDirectory": "U gjetën drejtori te Piwik-u juaj, por nuk prisnim të tillë.", + "ExceptionUnexpectedDirectoryPleaseDelete": "Ju lutemi, fshijini këto drejtori që të parandalohen gabime.", + "ExceptionFileToDelete": "Kartelë për t’u fshirë: %s", + "ExceptionDirectoryToDelete": "Drejtori që duhen fshirë: %s", "ExceptionNonceMismatch": "S’u verifikua dot token-i i sigurisë në këtë formular.", "ExceptionPrivilege": "S’mund të hyni në këtë burim, ngaqë lyp të drejta %s.", "ExceptionPrivilegeAccessWebsite": "S’mund të hyni në këtë burim, ngaqë lyp të drejta %s për id = %d të sajtit.", "ExceptionPrivilegeAtLeastOneWebsite": "S’mund të hyni në këtë burim, ngaqë lyp të drejta %s për të paktën një nga sajtet.", "ExceptionUnableToStartSession": "I pazoti të nisë sesion.", "ExceptionUndeletableFile": "I pazoti të fshijë %s", + "ExceptionUnreadableFileDisabledMethod": "S’u lexua dot kartela {%1$s} e formësimit. Streha juaj mund të ketë çaktivizuar %2$s.", "ExceptionReportNotFound": "Raporti i kërkuar s’ekziston.", "ExceptionWidgetNotFound": "Widget-i i kërkuar s’ekziston.", "ExceptionReportNotEnabled": "Raporti i kërkuar s’është i aktivizuar. Kjo zakonisht do të thotë se ose shtojca që përcakton raportin është e çaktivizuar, ose se s’keni leje të mjaftueshme të përdorni këtë raport.", @@ -164,7 +183,9 @@ "ExportAsImage": "Eksportoje si Figurë", "ExportThisReport": "Eksportojeni këtë grup të dhënash në formate të tjerë", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Kontrolli i pacenueshmërisë së kartelës dështoi dhe njoftoi për disa gabime. Kjo ka shumë të ngjarë të vijë për shkak të një ngarkimi të pjesshëm ose të pasuksesshëm të disa kartelave Piwik. Do të duhej të ringarkonit krejt kartelat e Piwik-ut në trajtë DYORE dhe të rifreskoni faqen derisa të mos tregojë më gabim.", + "FileIntegrityWarning": "Kontrolli i pacenueshmërisë së kartelës dështoi dhe dha disa gabime. Duhet ta ndreqni këtë problem dhe mandej të rifreskoni këtë faqe deri sa të mos shfaqë më gabime.", + "FileIntegrityWarningReupload": "Gabimet më poshtë mund të kenë ardhur nga një ngarkim i pjesshëm ose i dështuar kartelash Piwik-u.", + "FileIntegrityWarningReuploadBis": "Provoni të ringarkoni krejt kartelat e Piwik-ut në mënyrën DYORE.", "First": "I pari", "Flatten": "Sheshoje", "ForExampleShort": "p.sh.", @@ -262,6 +283,7 @@ "OptionalSmtpPort": "Opsionale. Parazgjedhjet janë 25 për të pafshehtëzuarat dhe TLS SMTP, dhe 465 për SSL SMTP.", "Options": "Mundësi", "Or": "ose", + "OrCancel": "ose %1$s Anulojeni %2$s", "Others": "Tjetër", "Outlink": "Lidhje për jashtë", "Outlinks": "Lidhje për jashtë", @@ -269,10 +291,13 @@ "OverlayRowActionTooltipTitle": "Hapni Përmbledhje Faqeje", "Overview": "Përmbledhje", "Pages": "Faqe", + "Pagination": "%1$s - %2$s of %3$s", + "PaginationWithoutTotal": "%1$s - %2$s", + "ParameterMustIntegerBetween": "Parametri %1$s duhet të jetë një numër i plotë nga %2$s në %3$s.", "Password": "Fjalëkalim", "Period": "Periudhë", "Piechart": "Qarkore", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s është një projekt bashkëpunimi i sjellë për ju nga anëtarët e %7$sekipit të Piwik-ut%8$s, si dhe nga mjaft kontribues anembanë globit. <br\/> Nëse jeni një dashamirës i Piwik-ut, mund të ndihmoni: shihni se si %3$sTë merrni pjesë në Piwik%4$s, ose %5$sdhuroni që tani%6$s që të ndihmoni në financimin e Piwik 3.0!", + "PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sPiwik%2$s është një projekt bashkëpunimi i sjellë për ju nga anëtarët e %7$sekipit të Piwik-ut%8$s, si dhe nga mjaft kontribues anembanë globit. <br\/> Nëse jeni një dashamirës i Piwik-ut, mund të ndihmoni: shihni se si %3$sTë merrni pjesë në Piwik%4$s, ose %5$sdhuroni që tani%6$s që të ndihmoni në financimin e hedhjes tjetër në qarkullim të Piwik-ut!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s është gati. Ju lutemi, njoftoni %2$spërgjegjësin e Piwik-ut%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Mund të kihet Piwik %1$s. %2$s Ju lutemi, përditësojeni tani!%3$s (shihni %4$s ndryshimet%5$s).", "PleaseContactYourPiwikAdministrator": "Ju lutemi, lidhuni me përgjegjësin e instalimit tuaj Piwik.", @@ -321,6 +346,7 @@ "Clear": "Pastroje", "SearchNoResults": "S’ka përfundime", "SeeAll": "shihini krejt", + "SeeTheOfficialDocumentationForMoreInformation": "Për më tepër të dhëna, shihni %1$sdokumentimin zyrtar%2$s.", "SeeThisFaq": "Shihni %1$skëtë FAQ%2$s.", "Segment": "Segment", "SelectYesIfYouWantToSendEmailsViaServer": "Përzgjidhni \"Po\", nëse doni të dërgoni, ose keni për të dërguar, email përmes një shërbyesi të emërtuar, në vend se përmes të një funksioni vendor poste", @@ -344,6 +370,8 @@ "TimeAgo": "%s më parë", "TimeFormat": "Format kohe", "TimeOnPage": "Koha në faqe", + "ToDeleteAllDirectoriesRunThisCommand": "Që të fshini krejt drejtoritë njëherësh, mund të përdorni këtë urdhër:", + "ToDeleteAllFilesRunThisCommand": "Që të fshini krejt kartelat njëherësh, mund të përdorni këtë urdhër:", "Total": "Gjithsej", "TotalRatioTooltip": "Kjo është %1$s e krejt %2$s %3$s.", "TotalRevenue": "Të ardhura Gjithsej", @@ -388,6 +416,7 @@ "WarningFileIntegrityNoManifest": "Kontrolli i pacenueshmërisë së kartelës s’u krye dot për shkak të mungesës së manifest.inc.php.", "WarningFileIntegrityNoManifestDeployingFromGit": "Nëse po kryeni instalim të Piwik-ut nga Git, ky mesazh është normal.", "WarningFileIntegrityNoMd5file": "Kontrolli i pacenueshmërisë së kartelës nuk u plotësua dot për shkak të mungesës së funksionit md5_file().", + "WarningPasswordStored": "%1$sKujdes:%2$s Ky fjalëkalim do të depozitohet te kartela e formësimit që është e dukshme karshi kujtdo që mund të mbërrijë deri te ajo.", "WarningDebugOnDemandEnabled": "Mënyra ndjekës %1$s është e aktivizuar. Për arsye sigurie, kjo do të duhej të aktivizohej vetëm për një kohë të shkurtër. Që ta çaktivizoni, caktojeni %2$s si %3$s te %4$s.", "Website": "Sajt", "Weekly": "Përjavë", diff --git a/lang/sr.json b/lang/sr.json index b298709e49..8b513a088a 100644 --- a/lang/sr.json +++ b/lang/sr.json @@ -176,7 +176,6 @@ "ExportAsImage": "Snimi kao sliku", "ExportThisReport": "Snimi ove podatke u neki drugi oblik", "Faq": "Pitanja i odgovori", - "FileIntegrityWarningExplanation": "Provera integriteta datoteka je neuspešna i prijavljene su greške. Ovo se najverovatnije desilo zbog toga što neke datoteke nisu uspešno prenesene na server. Trebalo bi da ponovo prenesete sve Piwik datoteke na server u binarnom modu i da ponovo učitate ovu stranu sve dok ne nestane poruka o greški.", "First": "Prva", "Flatten": "Ravno", "ForExampleShort": "npr.", @@ -287,7 +286,6 @@ "Password": "Lozinka", "Period": "Period", "Piechart": "Grafikon", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s je saradnički projekat %7$sPiwik tim%8$s članova kao i mnogih drugih učesnika širom sveta. <br\/> Ukoliko ste Piwik fan, možete da pomognete: pogledajte %3$sKako da učestvujete u Piwik-u%4$s, ili %5$sizvršite donaciju%6$s kako biste pomogli razvoju Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s je izašao. Obavestite %2$sPiwik administratora%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Objavljen je Piwik %1$s. %2$s Molimo Vas da izvršite nadogradnju!%3$s (pogledajte %4$spromene%5$s).", "PleaseContactYourPiwikAdministrator": "Molimo vas da kontaktirate vašeg Piwik administratora.", diff --git a/lang/sv.json b/lang/sv.json index 181cbb3cb5..8b1d517546 100644 --- a/lang/sv.json +++ b/lang/sv.json @@ -175,7 +175,6 @@ "ExportAsImage": "Exportera som bild", "ExportThisReport": "Exportera denna dataserien i andra format", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Kontrollen av filintegritet misslyckades och rapporterade några fel. Detta orsakades mest troligt p.g.a. att en misslyckad\/delvis uppladdning av Piwik's filer. Du bör ladda upp Piwik's filer på nytt i binärt läge och uppdatera sidan tills dess att inga felmeddelanden visas.", "First": "Först", "Flatten": "Tillplattad", "ForExampleShort": "t.ex.", diff --git a/lang/th.json b/lang/th.json index 2a4b53c3f6..0c99865cb4 100644 --- a/lang/th.json +++ b/lang/th.json @@ -140,7 +140,6 @@ "ExportAsImage": "ส่งออกเป็นรูปภาพ", "ExportThisReport": "ส่งออกรายงานในรูปแบบอื่น", "Faq": "คำถามที่พบบ่อย", - "FileIntegrityWarningExplanation": "แฟ้มการตรวจสอบความถูกต้องล้มเหลว และรายงานข้อผิดพลาดบางอย่าง นี่คือคุณจะมีโอกาสมากที่สุด เนื่องจากการอัพโหลดบางส่วน หรือมีความล้มเหลวของแฟ้มบางแฟ้มของ Piwik คุณควรจะทำการอัพโหลดไฟล์ Piwik ใหม่อีกครั้ง ซึ่งทั้งหมดในนี้จะต้องเป็นโหมด BINARY และควรจะรีเฟรชหน้านี้จนกว่ามันจะไม่แสดงข้อความแสดงข้อผิดพลาดนี้อีก", "First": "แรก", "ForExampleShort": "ต.ย.", "FromReferrer": "จาก", diff --git a/lang/tl.json b/lang/tl.json index a3d618b97a..4cb137da1f 100644 --- a/lang/tl.json +++ b/lang/tl.json @@ -126,6 +126,8 @@ "ErrorRequest": "Oops? nagkaroon ng problema habang isinasagawa ang iyong request. Marahil may isang pansamantalang isyu sa server o marahil na iyong nirerequest ang ulat ng mga kasamang maraming data. Mangyaring subukan ito mul. Kung ang error na ito ay patuloy pa rin ng paulit-ulit mangyarin %1$s kontakin ang iyong Piwik admnistrator %2$s para sa mga tulong.", "EvolutionOverPeriod": "Ebolusyon sa paglipas ng panahon", "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Ang user ay kailangang maging alinman sa Super User o user '%s' mismo.", + "ExceptionConfigurationFileNotFound": "Ang configuration file {%s} ay hindi nahanap o hindi mabasa.", + "ExceptionDatabaseVersion": "Ang iyong %1$s na bersyon ay %2$s ngunit nangangailangan ang Piwik ng hindi bababa sa %3$s.", "ExceptionFileIntegrity": "Nabigo ang integrity check: %s", "ExceptionIncompatibleClientServerVersions": "Ang iyong %1$s bersyon ng client ay %2$s kung saan ay hindi tugma sa bersyon ng server %3$s.", "ExceptionInvalidAggregateReportsFormat": "Ang pinagsama-samang mga hindi wastong format '%1$s'. Subukan ang alinman sa mga sumusunod sa halip: %2$s.", @@ -142,6 +144,7 @@ "ExceptionMissingFile": "Nawawalang file: %s", "ExceptionNonceMismatch": "Hindi ma-verify ang security token sa form na ito.", "ExceptionPrivilege": "Hindi mo maaaring i-access ang resource na ito dahil nangangailangan ito ng access ng %s.", + "ExceptionPrivilegeAccessWebsite": "Hindi mo maaaring i-access ang resources na ito dahil ito ay nangangailangan ng %s access para sa website id = %d.", "ExceptionPrivilegeAtLeastOneWebsite": "Hindi mo maaaring i-access ang resources na ito dahil ito ay nangangailangan ng %s access na hindi bababa sa isa.", "ExceptionUnableToStartSession": "Hindi masimulan ang session.", "ExceptionUndeletableFile": "Hindi matanggal ang %s", @@ -154,7 +157,6 @@ "ExportAsImage": "I-export bilang larawan", "ExportThisReport": "I-export ang dataset sa iba pang mga format.", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "Pag pagsusuri sa integridad ng file ay nabigo at may ilang ulat sa mga errors. Ito ay dahil sa hindi kumpleto o nabigong pag uupload ng ilang files sa Piwik. Na dapat mong i-upload uli ang lahat ng Piwik file sa BINARY mode at i-refresh ang pahinang ito hanggang hindi ito nagpapakita ng error.", "First": "Una", "Flatten": "Patagin", "ForExampleShort": "hal.", @@ -187,6 +189,7 @@ "Loading": "Nagloload...", "LoadingData": "Nilo-load ang data ...", "LoadingPopover": "Nilo-load ang %s ...", + "LoadingPopoverFor": "Nag lo-load %s para sa", "Locale": "tl_PH.UTF-8", "Logout": "Mag-sign out", "MainMetrics": "Pangunahing sukatan", @@ -278,6 +281,7 @@ "Remove": "Tanggalin", "Report": "Ulat", "ReportGeneratedFrom": "Ang ulat na ito ay binuo gamit ang data mula sa %s", + "ReportRatioTooltip": "Ang %1$s ay kumakatawan sa %2$s ng %3$s %4$s na may %5$s", "Reports": "Mga Ulat", "ReportsWillBeProcessedAtMostEveryHour": "Sa gayon ang mga ulat ay mapoproseso sa bawat oras.", "RequestTimedOut": "Ang kahilingan ng data sa %s ay nag-time out. Pakisubukang muli.", diff --git a/lang/tr.json b/lang/tr.json index 526bfdfb74..8d058ebada 100644 --- a/lang/tr.json +++ b/lang/tr.json @@ -129,7 +129,6 @@ "ExportAsImage": "Resim olarak dışa aktar", "ExportThisReport": "Bu veri setini diğer formatlarda ihraç et", "Faq": "SSS", - "FileIntegrityWarningExplanation": "Dosya bütünlük kontrolü başarısız oldu ve hatalar raporlandı. Bu durum genellikle Piwik dosyalarının yüklenmesinde oluşan hatalardan meydana gelmektedir. Sorunu çözmek için tüm Piwik dosyalarını sunucunuza tekrar yüklemeniz ve sayfayı yenilemeniz gerekmektedir.", "First": "İlk", "Flatten": "Düzleştir", "ForExampleShort": "Örneğin", diff --git a/lang/uk.json b/lang/uk.json index 05e1125dc1..0712e67344 100644 --- a/lang/uk.json +++ b/lang/uk.json @@ -176,7 +176,6 @@ "ExportAsImage": "Експортувати як зображення", "ExportThisReport": "Експортувати в інші формати", "Faq": "ЧаПИ", - "FileIntegrityWarningExplanation": "Перевірка цілісності файлів завершилася невдачею і повернула помилки. Це сталося, можливо, через те, що на сервер, при завантаженні на нього системи Piwik, частина файлів була завантажена некоректно. Рекомендується перезавантажити усі файли Piwik на сервер, оновити сторінку, і переконатися, що вже не виникає помилок.", "First": "Перший", "Flatten": "Згладити", "ForExampleShort": "напр.,", @@ -288,7 +287,6 @@ "Password": "Пароль", "Period": "Період", "Piechart": "Кругова діаграма", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$sPiwik%2$s це спільний проект що привів до вас %7$s команду Piwik %8$s , а також багато інших учасників по всьому світу. <br\/> Якщо ви є прихильником Piwik, Ви можете допомогти: дізнайтеся більше %3$sЯк взяти участь в Piwik%4$s, або %5$sпожертвуйте прямо зараз%6$s допомогаючи фонду Piwik 3.0!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "Доступний %1$s. Будь ласка повідомте %2$sадміністратору Piwik%3$s.", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s доступний для завантаження. %2$s Будь ласка, оновіться!%3$s (див. %4$s зміни%5$s).", "PleaseContactYourPiwikAdministrator": "Будь ласка, зверніться до адміністратора Piwik.", diff --git a/lang/vi.json b/lang/vi.json index e77147a6a0..c033da1198 100644 --- a/lang/vi.json +++ b/lang/vi.json @@ -163,7 +163,6 @@ "ExportAsImage": "Xuất ra dạng ảnh(Image)", "ExportThisReport": "Xuất dữ liệu này với các định dạng khác", "Faq": "Câu hỏi thường gặp (FAQ)", - "FileIntegrityWarningExplanation": "File không toàn vẹn và có một vài báo cáo lỗi. Đây là điều rất thường xảy ra khi bạn upload không thành công một hoặc một vài file của Piwik. Bạn có thể upload lại toàn bộ các file của Piwik ở chế độ nhị phân (BINARY mode) và refresh trang Piwik sau khi nó không ghi nhận lỗi nào.", "First": "Đầu tiên", "Flatten": "Làm phẳng", "ForExampleShort": "ví dụ.", diff --git a/lang/zh-cn.json b/lang/zh-cn.json index 6b9218c651..668fa97e1b 100644 --- a/lang/zh-cn.json +++ b/lang/zh-cn.json @@ -176,7 +176,6 @@ "ExportAsImage": "导出为图片", "ExportThisReport": "导出为其它格式", "Faq": "常问问题", - "FileIntegrityWarningExplanation": "文件完整性检查出错，并报告了一些问题。通常是因为上传了部分或错误的 Piwik 文件所致。您应该使用 BINARY 模式重新上传所有的 Piwik 文件然后刷新此页面直到不再显示错误。", "First": "第一", "Flatten": "拉平", "ForExampleShort": "例如", @@ -287,7 +286,6 @@ "Password": "密码", "Period": "统计时间", "Piechart": "圆饼图", - "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$s Piwik %2$s 是由 %7$s Piwik 团队 %8$s 的成员以及全球许多其他贡献者赞助商的合作项目。<br\/>如果你是 Piwik 的粉丝，你可以帮助我们：找到 %3$s 怎样参与 Piwik 项目 %4$s，或者 %5$s 捐赠 %6$s 以便维持 Piwik 3.0 的开发！", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s可用。请通知%2$sPiwik管理员%3$s。", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s 已经发布。 %2$s 请立即更新！%3$s (查看 %4$s 与%5$s 的差异)。", "PleaseContactYourPiwikAdministrator": "请联系您的 Piwik 管理员", diff --git a/lang/zh-tw.json b/lang/zh-tw.json index 63920d0442..81b6c72fab 100644 --- a/lang/zh-tw.json +++ b/lang/zh-tw.json @@ -2,64 +2,102 @@ "General": { "12HourClock": "12 小時制", "24HourClock": "24 小時制", + "AbandonedCarts": "棄用的購物車", "AboutPiwikX": "關於 Piwik %s", "Action": "操作", "Actions": "進站活動", "Add": "新增", - "AfterEntry": "在這裡之後輸入", + "AfterEntry": "進入這裡後", "All": "全部", "AllowPiwikArchivingToTriggerBrowser": "當從瀏覽器查看時彙整報表", - "AllWebsitesDashboard": "所有網站的控制台", + "AllWebsitesDashboard": "所有網站", "And": "和", "API": "API", + "Apply": "套用", "ArchivingInlineHelp": "對於中高流量的網站，建議停用 Piwik 瀏覽器觸發彙整。我們建議你設定工作排程（Cron job）以每小時處理 Piwik 報表代替。", "ArchivingTriggerDescription": "推薦大型的 Piwik 安裝，你需要%1$s設定工作排程（Cron job）%2$s來自動處理報表。", "AuthenticationMethodSmtp": "SMTP 驗證方法", + "AverageOrderValue": "訂單平均值", + "AveragePrice": "平均價格", + "AverageQuantity": "平均數量", "BackToPiwik": "返回 Piwik", + "Broken": "損壞", + "BrokenDownReportDocumentation": "它被分隔為多份報表，顯示於網頁下方的迷你圖。你可以點擊要顯示的報表來放大圖表。", "Cancel": "取消", + "CannotUnzipFile": "無法解壓縮檔案 %1$s：%2$s", "ChangePassword": "變更密碼", + "ChangeTagCloudView": "請注意，你可以以其他方式來顯示報表。使用報表下方的選項按鈕來變更。", "ChooseDate": "選擇日期，目前選擇的日期為：%s", "ChooseLanguage": "選擇語系", "ChoosePeriod": "選擇期間", "ClickHere": "點此查看更多資訊。", + "ClickToChangePeriod": "再點擊一次來變更期間。", "Close": "關閉", - "ColumnActionsPerVisit": "各個造訪的活動量", + "ClickToSearch": "點擊以搜尋", + "ColumnActionsPerVisit": "單次訪問的活動數", + "ColumnActionsPerVisitDocumentation": "訪問中的平均活動數（網頁瀏覽、站內搜尋或離開連結）", "ColumnAverageGenerationTime": "平均載入時間", + "ColumnAverageGenerationTimeDocumentation": "載入網頁的平均時間。這個數據包含伺服器產生網頁加上訪客從伺服器下載網頁的時間。較低的「平均載入時間」表示網頁載入速度較快！", "ColumnAverageTimeOnPage": "網頁平均停留時間", - "ColumnAvgTimeOnSite": "平均網站停留時間", + "ColumnAverageTimeOnPageDocumentation": "訪客停留在這個網頁上的平均時間（只有單個網頁，不是整個網站）。", + "ColumnAvgTimeOnSite": "網站平均停留時間", + "ColumnAvgTimeOnSiteDocumentation": "單次訪問平均停留時間。", "ColumnBounceRate": "跳出率", - "ColumnBounceRateDocumentation": "入站後，只看一頁而無任何互動便直接離站的訪次比例。", - "ColumnBounces": "跳出", + "ColumnBounceRateDocumentation": "只有瀏覽一個頁面就離開的訪客百分比。這表示訪客直接到達頁面離開。", + "ColumnBounces": "跳出數", + "ColumnBouncesDocumentation": "開始和結束於這個網頁的訪問數。這表示訪客只瀏覽了這個頁面就離站了。", "ColumnConversionRate": "轉換率", - "ColumnEntrances": "主要到達網頁", - "ColumnExitRate": "退出率", - "ColumnExitRateDocumentation": "檢視此頁面後便離站的訪次比例", - "ColumnExits": "主要離站網頁", - "ColumnExitsDocumentation": "檢視此頁面後便離站的訪次", + "ColumnConversionRateDocumentation": "觸發了目標轉換的訪問百分比。", + "ColumnDestinationPage": "到達網頁", + "ColumnEntrances": "到達網頁", + "ColumnEntrancesDocumentation": "從此網頁開始的訪問數。", + "ColumnExitRate": "離開率", + "ColumnExitRateDocumentation": "瀏覽此網頁後就離站的訪問百分比。", + "ColumnExits": "離開數", + "ColumnExitsDocumentation": "由此網頁離開的訪問數。", "ColumnGenerationTime": "載入時間", "ColumnKeyword": "關鍵字", "ColumnLabel": "標籤", - "ColumnMaxActions": "單次造訪的最大活動量", - "ColumnNbActions": "活動量", - "ColumnNbUniqVisitors": "獨立非重返訪客數", - "ColumnNbUniqVisitorsDocumentation": "前來訪問網站的不重複訪客數。即使單一訪客一天訪問數次，也僅計一回。", + "ColumnMaxActions": "單次訪問的最大活動數", + "ColumnNbActions": "活動數", + "ColumnNbActionsDocumentation": "訪客的活動數。活動可能是網頁瀏覽、站內搜尋、下載或離站連結。", + "ColumnNbUniqVisitors": "不重複訪客數", + "ColumnNbUniqVisitorsDocumentation": "訪問網站的不重複訪客數。即使單一訪客一天訪問數次，也只紀錄一次。", "ColumnNbUsers": "使用者", - "ColumnNbVisits": "訪客", - "ColumnPageviews": "瀏覽量", - "ColumnPageviewsDocumentation": "頁面被瀏覽次數", + "ColumnNbUsersDocumentation": "登入到你網站的使用者數。它是有設定了使用者 ID 的不重複使用者（來自追蹤程式碼的功能「setUserId」）。", + "ColumnNbVisits": "訪問數", + "ColumnNbVisitsDocumentation": "如果訪客首次來到你的網站，或是他瀏覽同一頁超過 30 分鐘，就會被紀錄為新訪問。", + "ColumnPageBounceRateDocumentation": "瀏覽開始於這個頁面並直接離開的訪問百分比。", + "ColumnPageviews": "瀏覽數", + "ColumnPageviewsDocumentation": "這個網頁被訪問的次數。", + "ColumnPercentageVisits": "%% 訪問數", "ColumnRevenue": "收益", - "ColumnSumVisitLength": "總計網站停留時間（以秒為單位）", - "ColumnUniquePageviews": "獨立非重返訪客瀏覽數", - "ColumnValuePerVisit": "每次造訪價值", - "ColumnVisitsWithConversions": "造訪轉換", - "ConfigFileIsNotWritable": "Piwik 設定檔 %1$s 無法寫入，你的變更將無法儲存。%2$s 請變更設定檔權限讓它可被寫入。", - "ContinueToPiwik": "繼續 Piwik", + "ColumnSumVisitLength": "訪客停留時間總計（秒）", + "ColumnTotalPageviews": "總瀏覽數", + "ColumnUniqueEntrances": "不重複到達數", + "ColumnUniqueExits": "不重複離開數", + "ColumnUniquePageviews": "不重複瀏覽數", + "ColumnUniquePageviewsDocumentation": "包含此頁的訪問數。如果同一次訪問中同一個頁面被瀏覽多次，只會被計算一次。", + "ColumnValuePerVisit": "每次訪問收益", + "ColumnViewedAfterSearch": "於搜尋結果中點擊", + "ColumnViewedAfterSearchDocumentation": "此頁面在訪客搜尋後，於搜尋結果內點擊訪問的次數。", + "ColumnVisitDuration": "停留時間（秒）", + "ColumnVisitsWithConversions": "產生轉換的訪問數", + "ConfigFileIsNotWritable": "Piwik 設定檔 %1$s 無法寫入，你的變更將無法保存。%2$s 請變更設定檔權限讓它可被寫入。", + "Continue": "繼續", + "ContinueToPiwik": "繼續前往 Piwik", + "CurrentlyUsingUnsecureHttp": "你目前透過不安全的 HTTP 使用 Piwik，可能有風險。我們建議你設定 SSL（HTTPS）來增進 Piwik 的安全性。", + "CreatedByUser": "由 %s 建立", "CurrentMonth": "本月", "CurrentWeek": "本週", "CurrentYear": "今年", "Daily": "每天", + "DailyReport": "每天", "DailyReports": "日報表", + "DailySum": "每日總和", "DashboardForASpecificWebsite": "特定網站展示板", + "DataForThisGraphHasBeenPurged": "這個圖表的資料已經超過 %s 個月並且已被清除。", + "DataForThisTagCloudHasBeenPurged": "這個標籤雲的資料已經超過 %s 個月並且已被清除。", "Date": "日期", "DateRange": "日期範圍：", "DateRangeFrom": "自", @@ -67,171 +105,336 @@ "DateRangeInPeriodList": "日期範圍", "DateRangeTo": "至", "DaysHours": "%1$s 天 %2$s 小時", + "DaysSinceFirstVisit": "和第一次訪問間隔", + "DaysSinceLastEcommerceOrder": "和上次下單間隔", + "DaysSinceLastVisit": "和上次訪問間隔", "Default": "預設", + "DefaultAppended": "（預設）", "Delete": "刪除", - "Description": "描述", + "Description": "說明", + "Desktop": "桌上型電腦", "Details": "詳情", + "Discount": "折扣", "DisplaySimpleTable": "顯示簡易表格", - "DisplayTableWithGoalMetrics": "顯示目標數據表", - "DisplayTableWithMoreMetrics": "顯示更多數據表", + "DisplayTableWithGoalMetrics": "顯示目標數據表格", + "DisplayTableWithMoreMetrics": "顯示訪客參與度數據表格", + "Documentation": "說明文件", + "Donate": "捐助", "Done": "完成", "Download": "下載", + "DownloadFail_FileExists": "檔案 %s 已存在！", + "DownloadFail_FileExistsContinue": "嘗試繼續下載 %s，但完整下載的檔案已存在！", + "DownloadFail_HttpRequestFail": "無法下載檔案！你正嘗試下載的來源網站可能發生了一些錯誤。你可以稍後重試或手動下載檔案。", "DownloadFullVersion": "%1$s下載%2$s完整版本！查看 %3$s", - "Downloads": "下載次數", + "DownloadPleaseRemoveExisting": "如果你想要覆蓋它，請先移除現有檔案。", + "Downloads": "下載數", + "EcommerceOrders": "電子商務訂單", + "EcommerceVisitStatusDesc": "訪問結束時查看電子商務狀態", + "EcommerceVisitStatusEg": "例如，要選擇有建立電子商務訂單的訪問，API 請求將包含 %s", "Edit": "編輯", "EncryptedSmtpTransport": "選擇你 SMTP 伺服器傳輸層的加密方式。", "Error": "錯誤", - "EvolutionOverPeriod": "此統計期的發展趨勢", - "ExceptionConfigurationFileNotFound": "設定檔 {%s} 找不到。", + "Errors": "錯誤", + "ErrorRequest": "糟糕...請求時發生錯誤。可能是伺服器暫時性問題，或是你請求的報表有太多資料。請重試。如果這個錯誤重複發生，請%1$s聯絡你的 Piwik 管理員%2$s來取得協助。", + "EvolutionOverPeriod": "這段期間的發展趨勢", + "EvolutionSummaryGeneric": "%2$s 的 %1$s 比對 %4$s 的 %3$s。發展趨勢：%5$s", + "ExceptionContactSupportGeneric": "如果你仍然有此問題請%1$s聯絡你的 Piwik 管理員%2$s來取得協助。", + "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "這個使用者必須是超級使用者或使用者「%s」自己。", + "ExceptionConfigurationFileNotFound": "設定檔 {%s} 找不到或無法讀取。", + "ExceptionConfigurationFileExistsButNotReadable": "設定檔 %s 看起來存在但 Piwik 無法讀取。", + "ExceptionConfigurationFilePleaseCheckReadableByUser": "請檢查 %1$s 可被使用者「%2$s」讀取。", "ExceptionDatabaseVersion": "你的 %1$s 版本為 %2$s ，但 Piwik 需求至少要 %3$s。", + "ExceptionDatabaseVersionNewerThanCodebase": "你的 Piwik 程式碼庫是舊版本 %1$s，而我們偵測到你的 Piwik 資料庫已經升級到新版本 %2$s。", + "ExceptionDatabaseVersionNewerThanCodebaseWait": "可能你的 Piwik 管理員正在完成升級程序。請幾分鐘後再重試。", "ExceptionFileIntegrity": "完整性檢查失敗：%s", "ExceptionFilesizeMismatch": "檔案大小不符：%1$s（預計大小：%2$s，已找到：%3$s）", "ExceptionIncompatibleClientServerVersions": "你的 %1$s 客戶端版本為 %2$s，與伺服器版本 %3$s 不相容。", - "ExceptionInvalidArchiveTimeToLive": "今日彙整時間必須是一個大於 0 秒的數字", + "ExceptionInvalidAggregateReportsFormat": "合併的報表格式「%1$s」無效。嘗試下列任一來替代：%2$s。", + "ExceptionInvalidArchiveTimeToLive": "今日彙整時間必須是大於 0 的秒數", "ExceptionInvalidDateFormat": "日期格式必須為：%1$s 或任何被 %2$s 函式支援的關鍵字（查看 %3$s 以取得更多資訊）", - "ExceptionInvalidDateRange": "「%1$s」不是一個正確的日期範圍。它應該擁有以下格式：%2$s。", + "ExceptionInvalidDateRange": "「%1$s」不是一個正確的日期範圍。它應該是以下格式：%2$s。", "ExceptionInvalidPeriod": "目前不支援「%1$s」。嘗試以下任一來取代：%2$s", "ExceptionInvalidRendererFormat": "「%1$s」格式無效。嘗試以下任一來取代：%2$s。", - "ExceptionInvalidToken": "符號不合法。", + "ExceptionInvalidReportRendererFormat": "報表格式「%1$s」無效。嘗試下列任一來替代：%2$s。", + "ExceptionInvalidStaticGraphType": "靜態圖表格式「%1$s」無效。嘗試下列任一來替代：%2$s。", + "ExceptionInvalidToken": "Token 無效。", "ExceptionLanguageFileNotFound": "找不到語系檔案「%s」。", "ExceptionMethodNotFound": "方法「%1$s」不存在或不適用於模組「%2$s」。", "ExceptionMissingFile": "檔案遺失：%s", - "ExceptionNonceMismatch": "無法驗證此表單的安全性。", - "ExceptionPrivilege": "你無法存取這個資源，必須要一個 %s 權限。", - "ExceptionPrivilegeAccessWebsite": "你無法存取這個資源，必須擁有網站 ID = %d 的 %s 權限。", - "ExceptionPrivilegeAtLeastOneWebsite": "你無法存取這個資源，必須至少要一個網站的 %s 權限。", + "ExceptionUnexpectedFile": "檔案已在你的 Piwik 中找到，但並不在我們預料中。", + "ExceptionUnexpectedFilePleaseDelete": "請刪除這些檔案來防止錯誤。", + "ExceptionUnexpectedDirectory": "資料夾已在你的 Piwik 中找到，但並不在我們預料中。", + "ExceptionUnexpectedDirectoryPleaseDelete": "請刪除這些資料夾來防止錯誤。", + "ExceptionFileToDelete": "要刪除的檔案：%s", + "ExceptionDirectoryToDelete": "要刪除的資料夾：%s", + "ExceptionNonceMismatch": "無法驗證此表單的安全性 Token。", + "ExceptionPrivilege": "你無法存取這個資源，它必須要有 %s 權限。", + "ExceptionPrivilegeAccessWebsite": "你無法存取這個資源，它必須要有網站 ID %d 的 %s 權限。", + "ExceptionPrivilegeAtLeastOneWebsite": "你無法存取這個資源，它必須至少要有一個網站的 %s 權限。", + "ExceptionUnableToStartSession": "無法開始執行。", "ExceptionUndeletableFile": "無法刪除 %s", - "ExceptionUnreadableFileDisabledMethod": "設定檔 {%1$s} 無法讀取。你的主機空間可能停用 %2$s。", + "ExceptionUnreadableFileDisabledMethod": "設定檔 {%1$s} 無法讀取。你的主機商可能停用了 %2$s。", + "ExceptionReportNotFound": "請求的報表不存在。", + "ExceptionWidgetNotFound": "請求的小工具不存在。", + "ExceptionReportNotEnabled": "請求的報表未啟用。這代表定義報表的外掛已停用或是你沒有足夠的權限來存取這個報表。", + "ExceptionWidgetNotEnabled": "請求的小工具未啟用。這代表定義小工具的外掛已停用或是你沒有足夠的權限來存取這個小工具。", + "ExpandDataTableFooter": "變更報表的顯示方式或設定", "Export": "匯出", "ExportAsImage": "匯出為圖片", "ExportThisReport": "將此資料集匯出為其他格式", "Faq": "FAQ", - "FileIntegrityWarningExplanation": "檔案完整性檢查錯誤且回報了一些問題。這大多是因為上傳了部分或錯誤的 Piwik 檔案所致。你應該使用 BINARY 模式重新上傳所有的 Piwik 檔案然後重新整理此頁面直到它沒有顯示任何錯誤。", + "FileIntegrityWarning": "檔案完整性檢查失敗並發現一些錯誤。你應該解決這個問題然後重新整理頁面直到沒有錯誤顯示。", + "FileIntegrityWarningReupload": "下面的錯誤可能是 Piwik 檔案上傳不完整或失敗而導致的。", + "FileIntegrityWarningReuploadBis": "試著使用二進制（BINARY）模式重新上傳全部的 Piwik 檔案。", + "First": "第一頁", + "Flatten": "平滑化", "ForExampleShort": "例如", + "Forums": "論壇", "FromReferrer": "來自", + "GeneralInformation": "基本資訊", "GeneralSettings": "一般設定", + "GetStarted": "開始使用", "GiveUsYourFeedback": "給我們意見回饋！", "Goal": "目標", "GoTo": "前往 %s", "GraphHelp": "更多關於 Piwik 顯示圖表的資訊", - "HelloUser": "您好， %s！", + "HelloUser": "%s，你好！", + "Help": "幫助", + "HelpTranslatePiwik": "或許你會想要%1$s幫助我們改進 Piwik 翻譯%2$s？", + "Hide": "隱藏", "HoursMinutes": "%1$s 小時 %2$s 分", "Id": "ID", - "IfArchivingIsFastYouCanSetupCronRunMoreOften": "假設在你的設定下存檔相當順暢，你可以設定並讓它的執行更頻繁。", + "IfArchivingIsFastYouCanSetupCronRunMoreOften": "假設在你的設定下彙整相當順暢，你可以設定工作排程讓它頻繁執行。", "InfoFor": "%s 的資訊", "Installed": "已安裝", - "InvalidResponse": "接收到的資料是無效的。", + "InvalidDateRange": "日期範圍無效，請重試", + "InvalidResponse": "接收到的資料無效。", "IP": "IP", "JsTrackingTag": "JavaScript 追蹤程式碼", "Language": "語系", "LastDays": "最近 %s 天（含今天）", - "LastDaysShort": "最近 %s 天內", + "LastDaysShort": "最近 %s 天", + "LearnMore": "%1$s了解更多%2$s", + "Live": "即時", "Loading": "載入中...", - "LoadingData": "載入資料中...", + "LoadingData": "資料載入中...", + "LoadingPopover": "%s 載入中...", + "LoadingPopoverFor": "讀取 %s 中：", "Locale": "zh_TW.UTF-8", "Logout": "登出", + "MainMetrics": "主要數據", + "Matches": "符合", "MediumToHighTrafficItIsRecommendedTo": "對於中高流量的網站，我們建議最多每隔半小時（%1$s 秒）或一小時（%2$s 秒）處理今日報表。", - "Metric": "指標", - "Metrics": "指標", - "MetricsToPlot": "圖形指標", - "MetricToPlot": "圖形指標", + "Metadata": "中繼資料", + "Metric": "數據", + "Metrics": "數據", + "MetricsToPlot": "圖形數據", + "MetricToPlot": "圖形數據", "MinutesSeconds": "%1$s 分 %2$s 秒", "Mobile": "行動裝置", "Monthly": "每月", + "MonthlyReport": "每月", "MonthlyReports": "月報表", + "More": "更多", + "MoreDetails": "更多詳情", + "MoreLowerCase": "更多", "MultiSitesSummary": "所有網站", - "Name": "姓名", + "Name": "名稱", + "NbActions": "活動數", + "NbInteractions": "互動數", + "NbSearches": "站內搜尋數", + "NeedMoreHelp": "需要更多幫助？", "Never": "從不", - "NewReportsWillBeProcessedByCron": "當 Piwik 存檔無法由瀏覽器觸發時，新的報表將以 crontab 處理。", + "NewReportsWillBeProcessedByCron": "當 Piwik 存檔不是由瀏覽器觸發時，新的報表將以工作排程處理。", "NewUpdatePiwikX": "新的更新：Piwik %s", "NewVisitor": "新訪客", + "NewVisits": "新訪客", "Next": "下一頁", "No": "否", - "NoDataForGraph": "此圖表無任何資料。", - "NoDataForTagCloud": "此標籤雲無任何資料。", + "NoDataForGraph": "此圖表無資料。", + "NoDataForTagCloud": "此標籤雲無資料。", "NotDefined": "%s 未定義", + "Note": "注意", "NotInstalled": "未安裝", "NotRecommended": "不推薦", "NotValid": "%s 無效", - "NVisits": "造訪次數 %s 次", + "NumberOfVisits": "訪問數", + "NUsers": "%s 位使用者", + "NVisits": "%s 訪問數", "Ok": "OK", - "OnlyEnterIfRequired": "只在你的 SMTP 伺服器需要使用者名稱時才需要輸入", - "OnlyEnterIfRequiredPassword": "只在你的 SMTP 伺服器需要密碼時才需要輸入", - "OnlyUsedIfUserPwdIsSet": "只在使用者名稱 \/ 密碼設定後才會生效，如果你不確定要使用何種方法，請詢問你的提供商。", - "OpenSourceWebAnalytics": "開放原始碼的網站流量分析軟體", + "OneAction": "1 活動數", + "OneVisit": "1 訪問數", + "OnlyEnterIfRequired": "只在你的 SMTP 伺服器需要使用者名稱時才輸入", + "OnlyEnterIfRequiredPassword": "只在你的 SMTP 伺服器需要密碼時才輸入", + "OnlyUsedIfUserPwdIsSet": "只在使用者名稱\/密碼設定後才會生效，如果你不確定要使用何種方法，請詢問你的供應商。", + "OpenSourceWebAnalytics": "免費分析平台", + "OperationAtLeast": "至少", + "OperationAtMost": "最多", + "OperationContains": "包含", + "OperationDoesNotContain": "不包含", + "OperationEquals": "等於", + "OperationGreaterThan": "大於", + "OperationIs": "是", + "OperationIsNot": "不是", + "OperationLessThan": "小於", + "OperationNotEquals": "不等於", + "OperationStartsWith": "開始於", + "OperationEndsWith": "結束於", "OptionalSmtpPort": "選填。預設值 25 為未加密或 TLS SMTP，SSL SMTP 為 465。", - "OrCancel": "或 %1$s 取消 %2$s", + "Options": "選項", + "Or": "或者", + "OrCancel": "或 %1$s取消%2$s", "Others": "其他", + "Outlink": "離開連結", "Outlinks": "離開連結", + "OverlayRowActionTooltip": "在你的網站上直接查看分析資料（在新分頁中開啟）", + "OverlayRowActionTooltipTitle": "開啟網頁覆蓋", "Overview": "總覽", - "Pages": "頁面", + "Pages": "網頁", + "Pagination": "%3$s 中的 %1$s - %2$s", + "PaginationWithoutTotal": "%1$s - %2$s", + "ParameterMustIntegerBetween": "參數 %1$s 必須是介於 %2$s 和 %3$s 之間的純數字。", "Password": "密碼", "Period": "期間", "Piechart": "圓餅圖", + "PiwikIsACollaborativeProjectYouCanContributeAndDonateNextRelease": "%1$sPiwik%2$s 是共同協作的專案，由 %7$sPiwik 團隊%8$s成員以及全世界其他貢獻者提供給你。<br\/>如果你是 Piwik 的粉絲，你可以協助：查看%3$s如何參與 Piwik%4$s 或是%5$s立即捐助%6$s以資助下一個更棒的 Piwik 版本開發。", + "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%1$s 可用。請通知 %2$sPiwik 管理員%3$s。", "PiwikXIsAvailablePleaseUpdateNow": "Piwik %1$s 已釋出。%2$s請立即更新！%3$s（查看%4$s更新內容%5$s）。", + "PleaseContactYourPiwikAdministrator": "請聯絡你的 Piwik 管理員。", "PleaseSpecifyValue": "請為「%s」設定一個值。", - "PleaseUpdatePiwik": "請更新您的 Piwik", + "PleaseUpdatePiwik": "請更新你的 Piwik", "Plugin": "外掛", "Plugins": "外掛", + "PoweredBy": "技術提供", "Previous": "上一頁", "PreviousDays": "最近 %s 天（不含今天）", + "PreviousDaysShort": "前 %s 天", + "Price": "價格", + "ProductConversionRate": "產品轉換率", + "ProductRevenue": "產品收益", + "Measurable": "可測量的", + "Measurables": "可測量的", + "PurchasedProducts": "已購買的產品數", + "Quantity": "數量", "RangeReports": "自訂日期範圍", + "ReadThisToLearnMore": "%1$s點此了解更多。%2$s", "Recommended": "推薦", + "RecordsToPlot": "圖形紀錄", "Refresh": "重新整理", "RefreshPage": "重新整理網頁", "RelatedReport": "相關報表", "RelatedReports": "相關報表", + "Remove": "移除", "Report": "報表", + "ReportGeneratedFrom": "這個報表使用 %s 產生資料。", + "ReportRatioTooltip": "「%1$s」代表 %5$s 中 %3$s %4$s 的 %2$s。", "Reports": "報表", "ReportsContainingTodayWillBeProcessedAtMostEvery": "每隔 X 秒自動彙整報表", "RearchiveTimeIntervalOnlyForTodayReports": "這個只影響今日的報表（或其他包含今日的日期範圍）", - "ReportsWillBeProcessedAtMostEveryHour": "因此，報告最多每隔一小時將處理一次。", - "RequestTimedOut": "%s 資料請求逾時，請再試一次。", - "Required": "%s 個請求", + "ReportsWillBeProcessedAtMostEveryHour": "因此，報告最多每隔一小時處理一次。", + "RequestTimedOut": "%s 資料請求逾時，請重試。", + "Required": "%s 必填", + "ReturningVisitor": "回訪者", + "ReturningVisitorAllVisits": "查看所有訪問", + "RowEvolutionRowActionTooltip": "查看這列的數據變化", + "RowEvolutionRowActionTooltipTitle": "開啟此列發展趨勢", + "Rows": "列", + "RowsToDisplay": "要顯示的列數", "Save": "保存", - "SaveImageOnYourComputer": "在圖片上點選滑鼠右鍵然後選擇「另存圖檔...」來將圖片儲存到你的電腦中。", + "SaveImageOnYourComputer": "在圖片上點擊滑鼠右鍵然後選擇「另存圖檔...」來將圖片儲存到你的電腦中。", "Search": "搜尋", - "SeeTheOfficialDocumentationForMoreInformation": "查看%1$s官方文件%2$s取得更多資訊", + "Clear": "清除", + "SearchNoResults": "沒有結果", + "SeeAll": "查看全部", + "SeeTheOfficialDocumentationForMoreInformation": "查看%1$s官方說明文件%2$s以取得更多資訊", + "SeeThisFaq": "查看 %1$sFAQ%2$s。", + "Segment": "區隔", "SelectYesIfYouWantToSendEmailsViaServer": "如果你想透過名稱伺服器來寄送電子郵件而不是本地 mail 功能的話請勾選", "Settings": "設定", - "SmallTrafficYouCanLeaveDefault": "對於低流量的網站，你可以使用預設的 %s 秒，然後即時存取所有報告。", + "Shipping": "運費", + "Show": "顯示", + "SingleWebsitesDashboard": "單一網站展示板", + "SmallTrafficYouCanLeaveDefault": "對於低流量的網站，你可以使用預設的 %s 秒，然後即時存取所有報表。", "SmtpEncryption": "SMTP 加密", "SmtpPassword": "SMTP 密碼", - "SmtpPort": "SMTP 通訊埠", - "SmtpServerAddress": "SMTP 伺服器位址", + "SmtpPort": "SMTP 端口", + "SmtpServerAddress": "SMTP 伺服器網址", "SmtpUsername": "SMTP 使用者名稱", + "Source": "來源", + "StatisticsAreNotRecorded": "Piwik 訪客追蹤目前已停用！要重新啟用追蹤在 config\/config.ini.php 檔案中設定 record_statistics = 1。", + "Subtotal": "小計", + "Summary": "摘要", "Table": "表格", "TagCloud": "標籤雲", + "Tax": "稅", + "TimeAgo": "%s 之前", "TimeFormat": "時間格式", "TimeOnPage": "停留時間", + "ToDeleteAllDirectoriesRunThisCommand": "要一次刪除這些資料夾，你可以執行這個指令：", + "ToDeleteAllFilesRunThisCommand": "要一次刪除這些檔案，你可以執行這個指令：", + "Total": "總計", + "TotalRatioTooltip": "這是全部 %2$s %3$s 的 %1$s。", + "TotalRevenue": "總收益", + "TotalVisitsPageviewsActionsRevenue": "（總計：%1$s 訪問數、%2$s 瀏覽數、%3$s 活動數、%4$s 收益）", "TrackingScopeAction": "操作", + "TrackingScopePage": "網頁", + "TrackingScopeVisit": "訪問", + "TransitionsRowActionTooltip": "查看訪客瀏覽此頁面前後做了什麼", + "TransitionsRowActionTooltipTitle": "開啟行為流程", "TranslatorName": "Pseric, Eros", + "UniquePurchases": "不重複購買數", "Unknown": "未知", + "Upload": "上傳", + "UsePlusMinusIconsDocumentation": "使用左邊的 +、- 圖示來導航。", + "UserId": "使用者 ID", "Username": "使用者名稱", - "UseSMTPServerForEmail": "使用 SMTP 伺服器來傳送 E-mail", + "UseSMTPServerForEmail": "使用 SMTP 伺服器來寄送 Email", "Value": "數值", "VBarGraph": "長條圖", "View": "檢視", - "VisitDuration": "平均訪問時間（以秒為單位）", + "ViewDocumentationFor": "查看 %1$s 的說明文件", + "Visit": "訪問", + "VisitConvertedGoal": "至少轉換一次目標的訪問", + "VisitConvertedGoalId": "轉換特定目標 ID 的訪問", + "VisitConvertedNGoals": "轉換 %s 個目標的訪問", + "VisitDuration": "平均訪問時間（秒）", "Visitor": "訪客", "VisitorID": "訪客 ID", "VisitorIP": "訪客 IP", "Visitors": "訪客", + "VisitsWith": "%s 的訪問", "VisitorSettings": "訪客設定", + "VisitType": "訪問類型", + "VisitTypeExample": "例如，選擇回訪者，包含那些過去曾經消費過的人，API 請求將包含 %s。", "Warning": "警告", + "Warnings": "警告", + "WarningPhpVersionXIsTooOld": "你正在使用的 PHP 版本 %s 已到達壽命盡頭（EOL）。強烈建議你升級到目前版本，持續使用舊版本可能會暴露在安全性漏洞和 Bug 下，而那些問題可能已經在近期的 PHP 版本中修復。", + "WarningPiwikWillStopSupportingPHPVersion": "Piwik 將在下次主要更新停止支援 PHP %1$s。請盡快將你的 PHP 版本至少升級到 %2$s。", + "YouMustUpgradePhpVersionToReceiveLatestPiwik": "你必須升級 PHP 版本以接收最新的 Piwik 更新。", + "PiwikCannotBeUpgradedBecausePhpIsTooOld": "Piwik 無法更新到最新的主要版本因為你的 PHP 版本過舊。", + "PleaseUpgradeYourPhpVersionSoYourPiwikDataStaysSecure": "請至少升級你的 PHP 版本至 %s 以確保你的 Piwik 分析資料是安全的。", "WarningFileIntegrityNoManifest": "缺少 manifest.inc.php 所以檔案完整性檢查無法執行。", - "WarningFileIntegrityNoMd5file": "缺少 md5_file() 函式所以檔案完整性檢查無法完成。", - "WarningPasswordStored": "%1$s警告：%2$s 此密碼將被儲存在設定檔中，而且每個能存取它的人都看得到。", + "WarningFileIntegrityNoManifestDeployingFromGit": "如果你從 Git 部署 Piwik，這個訊息可以忽略。", + "WarningFileIntegrityNoMd5file": "缺少 md5_file() 功能所以檔案完整性檢查無法完成。", + "WarningPasswordStored": "%1$s警告：%2$s此密碼將被儲存在設定檔中，而且每個能存取它的人都看得到。", + "WarningDebugOnDemandEnabled": "追蹤模式 %1$s 已啟用。為安全考量這個應該只能短暫啟用。要停用它將 %4$s 中的 %2$s 設定為 %3$s。", "Website": "網站", "Weekly": "每週", + "WeeklyReport": "每周", "WeeklyReports": "週報表", - "Widgets": "組件", + "WellDone": "做的好！", + "Widgets": "小工具", + "Widget": "小工具", + "XComparedToY": "%1$s 比對 %2$s", + "XFromY": "%1$s 來自 %2$s", + "YearlyReport": "每年", "YearlyReports": "年報表", "YearsDays": "%1$s 年 %2$s 天", "Yes": "是", "YouAreCurrentlyUsing": "你目前正在使用 Piwik %s。", - "YouMustBeLoggedIn": "您必須登入才能存取這個功能。", - "YourChangesHaveBeenSaved": "您的變更已保存。" + "YouAreViewingDemoShortMessage": "你正在瀏覽 Piwik 範例網站", + "YouMustBeLoggedIn": "你必須登入才能存取這個功能。", + "YourChangesHaveBeenSaved": "你的變更已保存。" }, "Mobile": { "AboutPiwikMobile": "關於 Piwik 行動版", @@ -239,30 +442,84 @@ "Account": "帳號", "Accounts": "帳號", "AddAccount": "新增帳號", - "AddPiwikDemo": "增加 Piwik 示範", + "AddPiwikDemo": "增加 Piwik 範例", "Advanced": "進階", "AnonymousAccess": "匿名存取", "AnonymousTracking": "匿名追蹤", - "ChooseHttpTimeout": "選擇HTTP多久之後超時", + "AskForAnonymousTrackingPermission": "當啟用時，Piwik 行動版會發送匿名使用資料至 piwik.org。這些資料將用來幫助 Piwik 行動版開發人員了解應用程式使用情況。會傳送的資料為：選單和設定的點擊、作業系統名稱和版本、在 Piwik 行動版中顯示的錯誤。我們不會追蹤你任何分析資料。這份匿名資料也不會被公開。你可以在設定中隨時啟用\/停用匿名追蹤。", + "ChooseHttpTimeout": "選擇 HTTP 逾時時間", + "ChooseMetric": "選擇數據", "ChooseReport": "選擇報表", + "ChooseSegment": "選擇區隔", + "ConfirmRemoveAccount": "你確定要移除這個帳號？", + "DefaultReportDate": "報表日期", + "EmailUs": "聯絡我們", "EnableGraphsLabel": "顯示圖表", - "LoadingReport": "載入 %s 中", - "MultiChartLabel": "顯示 sparklines", - "NetworkNotReachable": "網路無法訪問", + "EvolutionGraph": "歷史圖表", + "HelpUsToImprovePiwikMobile": "你要啟用 Piwik 行動版匿名追蹤嗎？", + "HowtoDeleteAnAccount": "長按以移除帳號。", + "HowtoDeleteAnAccountOniOS": "從右向左滑以刪除帳號", + "HowtoLoginAnonymous": "留空使用者名稱和密碼以匿名登入", + "HttpIsNotSecureWarning": "如果你使用「HTTP」，你的 Piwik 驗證 Token（token_auth）將以明碼傳送。因為這個緣故我們推薦使用 HTTPS 讓資料在網路中可以安全傳輸。你想要繼續嗎？", + "HttpTimeout": "HTTP 逾時", + "IncompatiblePiwikVersion": "你所使用的 Piwik 版本和 Piwik 行動版 2 不相容。更新你的 Piwik 並重試，或安裝 Piwik 行動版 1。", + "LastUpdated": "最後更新：%s", + "LoadingReport": "%s 載入中", + "LoginCredentials": "憑證", + "LoginToPiwikToChangeSettings": "登入到你的 Piwik 伺服器以建立或更新網站、使用者或變更像是「預設載入報表」的設定。", + "LoginUseHttps": "使用 HTTPS", + "MultiChartLabel": "顯示迷你圖", + "NavigationBack": "返回", + "NetworkError": "網路錯誤", + "NetworkErrorWithStatusCode": "發生錯誤「%1$s」。請求返回了狀態「%2$s」。網址為「%3$s」。請檢查你輸入的網址和伺服器上的錯誤紀錄檔以取得此錯誤的更多資訊及解決方案。", + "NetworkErrorWithStatusCodeShort": "網路錯誤 %s", + "NetworkNotReachable": "無法連接網路", + "NoAccountIsSelected": "你必須選擇一個帳號。如果你還沒有，就先新增帳號。", + "NoDataShort": "沒有資料", + "NoPiwikAccount": "沒有 Piwik 帳號？", "NoReportsShort": "沒有報表", - "NoVisitorsShort": "沒有任何訪問者", - "NoWebsiteFound": "沒有網站", - "NoWebsitesShort": "沒有任何網站", + "NoVisitorFound": "找不到訪客", + "NoVisitorsShort": "沒有訪客", + "NoWebsiteFound": "找不到網站", + "NoWebsitesShort": "沒有網站", + "PullDownToRefresh": "下拉以重整...", + "PossibleSslError": "可能是 SSL 證書錯誤", + "PossibleSslErrorExplanation": "發生錯誤，可能是無效或是自己簽發的憑證導致錯誤：「%s」。當你忽略 SSL 錯誤時可能就能登入，但安全性會降低。你可以隨時在設定中變更 SSL 驗證方式。", + "IgnoreSslError": "忽略 SSL 錯誤", + "RatingDontRemindMe": "不要提醒我", + "RatingNotNow": "稍後", + "RatingNow": "OK，我現在評分", + "RatingPleaseRateUs": "Piwik 行動版應用程式是免費軟體，如果你能花個一分鐘在 %1$s 幫我們評分，我們非常感激。如果你有建議、新功能或是 Bug 回報，請聯絡 %2$s", + "ReleaseToRefresh": "放開以重整...", "Reloading": "重新整理中...", - "SaveSuccessError": "請確認設定", - "YouAreOffline": "抱歉，您目前為離線狀態" + "RequestTimedOutShort": "網路逾時錯誤", + "RestrictedCompatibility": "相容性受限制", + "RestrictedCompatibilityExplanation": "你正在使用的 Piwik 版本 %s 不完整支援 Piwik 行動版 2。你可能會遇到一些 Bug。我們建議將 Piwik 更新到最新版本或是使用 Piwik 行動版 1。", + "SaveSuccessError": "Piwik 網址或帳號密碼錯誤。", + "SearchWebsite": "搜尋網站", + "ShowAll": "顯示全部", + "ShowLess": "顯示部分", + "StaticGraph": "總覽圖表", + "TopVisitedWebsites": "熱門訪問網站", + "TryIt": "試試看！", + "UseSearchBarHint": "只有前 %s 個網站會顯示。請使用搜尋功能來存取其他網站。", + "VerifyAccount": "驗證帳號中", + "ValidateSslCertificate": "有效的 SSL 憑證", + "VerifyLoginData": "確定你的使用者名稱和密碼配對正確。", + "YouAreOffline": "抱歉，你目前為離線狀態" }, "RowEvolution": { - "AvailableMetrics": "可用指標", + "AvailableMetrics": "可用數據", + "CompareDocumentation": "點擊下方連結來開啟彈出視窗和其他列比較紀錄。<br \/>使用 SHIFT+點擊來標記要比對的列，就不會開啟此彈出視窗。", "CompareRows": "比較紀錄", "ComparingRecords": "正在比較 %s 行", + "Documentation": "點擊數據來顯示大型發展趨勢圖表。使用 SHIFT+點擊來一次顯示多個數據。", "MetricBetweenText": "從 %1$s 到 %2$s", - "MetricChangeText": "在這段時間改變了 %s", - "PickAnotherRow": "選擇其他行來進行比較" + "MetricChangeText": "在這段期間改變了 %s", + "MetricMinMax": "這段期間 %1$s 介於 %2$s 和 %3$s 之間的範圍", + "MetricsFor": "%s 的數據", + "MultiRowEvolutionTitle": "多個列的發展趨勢", + "PickAnotherRow": "選擇其他行來進行比較", + "PickARow": "選擇一列來比較" } }
\ No newline at end of file diff --git a/misc/log-analytics b/misc/log-analytics -Subproject 8ec5986b2d4d21af9c9ddaa7c40225e1c8a3618 +Subproject fb91694c02db82595a10672cc9ad69e95ae12a7 diff --git a/plugins/API/lang/es.json b/plugins/API/lang/es.json index ced03941ee..7e9aeb197c 100644 --- a/plugins/API/lang/es.json +++ b/plugins/API/lang/es.json @@ -1,5 +1,6 @@ { "API": { + "ChangeTokenHint": "Si quieres cambiar este token, por favor ve hacia tu %1$s página de ajustes de usuario %2$s", "GenerateVisits": "Si no tiene los datos de hoy puede generar primero algunos datos mediante el complemento %1$s. Puede habilitar el complemento %2$s, a continuación, haga clic en el menú 'Generador de Visitas' en el área Administrativa de Piwik.", "KeepTokenSecret": "Este token_auth es tan secreto como su nombre de usuario y contraseña, %1$s no lo comparta %2$s!", "LoadedAPIs": "Se han cargado %s APIs exitosamente", diff --git a/plugins/API/lang/fr.json b/plugins/API/lang/fr.json index 12bb6606f9..f0fa87363a 100644 --- a/plugins/API/lang/fr.json +++ b/plugins/API/lang/fr.json @@ -11,6 +11,6 @@ "UserAuthentication": "Authentification de l'utilisateur", "UsingTokenAuth": "Si vous souhaitez %1$s récupérer des données depuis un script, un crontab, etc %2$s vous devez ajouter le paramètre %3$s aux appels d'URLs de l'API qui requièrent une authentification.", "Glossary": "Glossaire", - "LearnAboutCommonlyUsedTerms": "En savoir plus sur les termes les plus couramment utilisés composant principalement Piwik Analytics : %1$s et %2$s." + "LearnAboutCommonlyUsedTerms": "En savoir plus sur les termes les plus couramment utilisés composant principalement Piwik Analytics: %1$s et %2$s." } }
\ No newline at end of file diff --git a/plugins/API/lang/zh-tw.json b/plugins/API/lang/zh-tw.json index 7651f53f50..09b77b1eb7 100644 --- a/plugins/API/lang/zh-tw.json +++ b/plugins/API/lang/zh-tw.json @@ -1,13 +1,16 @@ { "API": { - "GenerateVisits": "如果你今天還沒有任何資料，你可以先使用 %1$s 外掛來產生一些數據。你可以啟用 %2$s 外掛，然後點擊在 Piwik 管理員區域裡的「產生訪客」選單。", + "ChangeTokenHint": "如果你要變更這個 Token，請到你的%1$s個人設定頁面%2$s。", + "GenerateVisits": "如果你今天還沒有任何資料，你可以先使用 %1$s 外掛來產生一些數據。你可以啟用 %2$s 外掛，然後在 Piwik 後台管理選單中點擊「訪客產生器」。", "KeepTokenSecret": "token_auth 如同你的帳號和密碼一樣重要，%1$s請不要公開它%2$s！", - "LoadedAPIs": "已成功載入 %s 個 APIs", - "MoreInformation": "取得更多關於 Piwik APIs 的資訊，請前往 %1$sPiwik API 指引%2$s 與 %3$s Piwik API 參考資料%4$s。", - "PluginDescription": "所有在Piwik內透過簡單的API所取得資料都是可用的，這個外掛是網站服務的入口點，因此，你可以透過下列網路分析的資料：xml、json、php、csv，諸如此類的方式來加以呼叫。", - "TopLinkTooltip": "透過API可以取得網站流量統計分析json與xml格式的數據。", + "LoadedAPIs": "已成功載入 %s 個 API", + "MoreInformation": "查看%1$sPiwik API 介紹%2$s和 %3$sPiwik API 參考資料%4$s以取得更多關於 Piwik API 的資訊。", + "PluginDescription": "Piwik 內的所有資料都能透過簡單的 API 來取得。這個外掛是網頁服務的進入點，你可以用來獲取 xml、json、php 或 csv 格式的網頁分析資料。", + "ReportingApiReference": "報表 API 參考資料", + "TopLinkTooltip": "透過簡單的 API 來取得 json、xml 等格式的網頁分析資料。", "UserAuthentication": "使用者驗證", - "UsingTokenAuth": "如果你想從程式碼、工作排程在 %1$s 請求資料。%2$s 你需要新增參數 %3$s 至 API 呼叫網址來進行驗證。", - "Glossary": "詞彙表" + "UsingTokenAuth": "如果你想%1$s經由程式碼或工作排程來請求資料。%2$s你需要新增參數 %3$s 至 API 呼叫網址來進行驗證。", + "Glossary": "詞彙表", + "LearnAboutCommonlyUsedTerms": "了解更多常用的術語來讓 Piwik 分析發揮最大化：%1$s 和 %2$s。" } }
\ No newline at end of file diff --git a/plugins/Actions/lang/fa.json b/plugins/Actions/lang/fa.json index 7e2750a89a..6eb45b4226 100644 --- a/plugins/Actions/lang/fa.json +++ b/plugins/Actions/lang/fa.json @@ -25,6 +25,7 @@ "ColumnUniqueClicksDocumentation": "تعداد بار مشاهده شده است که شامل یک کلیک بر روی این لینک. اگر یک لینک چند بار در طول یک دیدار کلیک شد، آن است که تنها یک بار شمارش است.", "ColumnUniqueDownloads": "دانلودهای منحصربفرد", "ColumnUniqueOutlinks": "لینک های خروجی منحصر به فرد", + "DownloadsReportDocumentation": "در این جا شما میتوانید گزارش فایل هایی را که بازدید کنندگان شما دانلود کرده اند را ببینید . %s به چه تعداد روی لینک دانلود کلیک شده است. اینکه ایا دانلود کامل انجام شده یا نصفه به پایان رسیده.", "EntryPageTitles": "ورود به عنوان های صفحه", "EntryPageTitlesReportDocumentation": "این گزارش شامل اطلاعاتی درباره عنوان صفحه های ورودی می باشد که در مدت مشخصی استفاده شده اند.", "ExitPageTitles": "خروج از عنوان های صفحه", diff --git a/plugins/Actions/lang/zh-tw.json b/plugins/Actions/lang/zh-tw.json index 3256a8c358..01f4e98d36 100644 --- a/plugins/Actions/lang/zh-tw.json +++ b/plugins/Actions/lang/zh-tw.json @@ -1,39 +1,69 @@ { "Actions": { - "ColumnClickedURL": "點擊的 URL 位址", - "ColumnClicks": "點擊次數", + "AvgGenerationTimeTooltip": "基於 %1$s 次點擊%2$s介於 %3$s 到 %4$s", + "ColumnClickedURL": "點擊的網址", + "ColumnActionURL": "活動網址", + "ColumnClicks": "點擊數", "ColumnClicksDocumentation": "此連結被點擊的次數。", - "ColumnDownloadURL": "下載的 URL 位址", + "ColumnDownloadURL": "下載連結（URL）", "ColumnEntryPageTitle": "到達網頁標題", - "ColumnEntryPageURL": "到達網頁 URL", + "ColumnEntryPageURL": "到達網頁網址", "ColumnExitPageTitle": "離站網頁標題", - "ColumnExitPageURL": "離站網頁 URL", + "ColumnExitPageURL": "離站網頁網址", "ColumnNoResultKeyword": "查無資料的關鍵字", - "ColumnPageName": "頁面名稱", + "ColumnPageName": "網頁名稱", "ColumnPagesPerSearch": "搜尋結果", - "ColumnPageURL": "頁面網址", + "ColumnPagesPerSearchDocumentation": "訪客在你的網站中搜尋，有些時候會點擊「下一頁」來查看更多結果。這是這個關鍵字的搜尋結果頁面瀏覽次數。", + "ColumnPageURL": "網頁網址", "ColumnSearchCategory": "搜索類別", - "ColumnSearches": "搜查", + "ColumnSearches": "搜尋數", + "ColumnSearchesDocumentation": "訪客在你網站搜尋引擎所搜尋的關鍵字次數。", + "ColumnSearchExits": "%% 搜尋離站數", + "ColumnSearchExitsDocumentation": "訪客在你網站搜尋引擎搜尋後即離開網站的百分比。", "ColumnSearchResultsCount": "搜尋結果筆數", - "ColumnUniqueClicks": "絕對不重複點擊次數", - "ColumnUniqueDownloads": "絕對不重複下載次數", - "EntryPagesReportDocumentation": "此報表包含指定時段內之到達網頁的相關資訊。所謂的到達網頁，是訪客進入網站時所訪問的第一個頁面。%s 到達網頁之 URL 以資料夾結構顯示。", + "ColumnSiteSearchKeywords": "不重複關鍵字數", + "ColumnUniqueClicks": "不重複點擊數", + "ColumnUniqueClicksDocumentation": "訪客點擊這個連結的次數。如果連結在同一次訪問中被點擊多次，只會計算成一次。", + "ColumnUniqueDownloads": "不重複下載數", + "ColumnUniqueOutlinks": "不重複離開連結數", + "ColumnIdPageview": "瀏覽數 ID", + "ColumnInteractionPosition": "互動位置", + "DownloadsReportDocumentation": "在這份報表你可以查看訪客已下載了哪個檔案。%sPiwik 是透過點擊下載連結來計算下載數，但不知道下載完成與否。", + "EntryPagesReportDocumentation": "此報表包含指定期間內之到達網頁的相關資訊。所謂的到達網頁，是訪客進入網站時所訪問的第一個網頁。%s 到達網頁之 URL 以資料夾結構顯示。", "EntryPageTitles": "到達網頁標題", - "EntryPageTitlesReportDocumentation": "此報告涵括指定時段內，到達網頁標題的相關資訊。", + "EntryPageTitlesReportDocumentation": "此報告包含指定期間內，到達網頁標題的相關資訊。", + "ExitPagesReportDocumentation": "這份報表包含指定期間內離開網頁的資訊。離開網頁是訪客離開網頁前最後留覽的頁面。%s離開網頁的網址以資料夾結構顯示。", "ExitPageTitles": "離站網頁標題", - "ExitPageTitlesReportDocumentation": "此報表涵括關於指定時段內離站網頁之標題等資訊", - "PageUrls": "網頁", + "ExitPageTitlesReportDocumentation": "此報表包含關於指定期間內離站網頁之標題等資訊", + "LearnMoreAboutSiteSearchLink": "查看更多關於訪客如何使用你的站內搜尋引擎。", + "OneSearch": "1 搜尋數", + "OutlinkDocumentation": "離開連結是將訪客帶出網站的連結（到其他域名）。", + "OutlinksReportDocumentation": "這份報表以分層列表顯示訪客所點擊的離開連結網址。", + "PagesReportDocumentation": "這份報表包含瀏覽過的網頁網址資訊。%s表格以分層顯示，網址以資料夾結構顯示。", + "PageTitlesReportDocumentation": "這份報表包含瀏覽過的網頁標題資訊。%1$s網頁標題是在 HTML 標籤 %2$s 中的內容，也是多數瀏覽器上顯示的標題內容。", + "PageUrls": "網頁網址", + "PluginDescription": "報告關於瀏覽數和網頁標題。讓你衡量你的站內搜尋引擎。自動追蹤外部網站連結點擊數和檔案下載數。", + "SiteSearchCategories1": "這份報表列出訪客在站內搜尋時所選擇的分類。", + "SiteSearchCategories2": "例如，電子商務網站通常會有「分類」選項，訪客就可以將他們的搜尋結果限制於所有產品或是特定分類。", + "SiteSearchFollowingPagesDoc": "當訪客在你的網站上搜尋時，他們會尋找特定的網頁、內容、產品或服務。這份報表列出站內搜尋最常被點擊的網頁連結。換句話說，是一個在你網站上最常被訪客搜尋並前往的網頁網址列表。", + "SiteSearchIntro": "追蹤訪客在你網站上的搜尋是一個了解訪客要尋找什麼的有效方法。它可以幫助你找到新內容的點子、淺在客戶可能會尋找的新電子商務產品，並增進訪客在你網站上的體驗。", + "SiteSearchKeyword": "關鍵字（站內搜尋）", + "SiteSearchKeywordsDocumentation": "這份報表列出訪客在站內搜尋時所使用的搜尋關鍵字。", + "SiteSearchKeywordsNoResultDocumentation": "這份報表列出沒有任何搜尋結果的關鍵字：或許搜尋演算法可以改進，或是訪客要尋找的東西還不存在於你的網站？", "SubmenuPagesEntry": "到達網頁", "SubmenuPagesExit": "離站網頁", "SubmenuPageTitles": "網頁標題", - "SubmenuSitesearch": "站內搜尋", + "SubmenuSitesearch": "搜尋網站", "WidgetEntryPageTitles": "到達網頁標題", "WidgetExitPageTitles": "離站網頁標題", "WidgetPagesEntry": "到達網頁", "WidgetPagesExit": "離站網頁", "WidgetPageTitles": "網頁標題", + "WidgetPageTitlesFollowingSearch": "從站內搜尋前往的網頁標題", + "WidgetPageUrlsFollowingSearch": "從站內搜尋前往的網頁", "WidgetSearchCategories": "搜尋分類", "WidgetSearchKeywords": "站內搜尋關鍵字", - "WidgetSearchNoResultKeywords": "查無資訊的關鍵字" + "WidgetSearchNoResultKeywords": "查無資料的關鍵字", + "ActionType": "活動類型" } }
\ No newline at end of file diff --git a/plugins/Annotations/lang/zh-tw.json b/plugins/Annotations/lang/zh-tw.json index 4274405724..2649ed0541 100644 --- a/plugins/Annotations/lang/zh-tw.json +++ b/plugins/Annotations/lang/zh-tw.json @@ -1,7 +1,22 @@ { "Annotations": { + "AddAnnotationsFor": "新增 %s 的註解...", + "AnnotationOnDate": "%1$s 的註解：%2$s", "Annotations": "註解", - "CreateNewAnnotation": "建立新註解", - "EnterAnnotationText": "輸入備註" + "ClickToDelete": "點擊刪除此註解。", + "ClickToEdit": "點擊編輯此註解。", + "ClickToEditOrAdd": "點擊以編輯或新增註解。", + "ClickToStarOrUnstar": "點擊以標示或撤銷此註解的星號", + "CreateNewAnnotation": "新增註解", + "EnterAnnotationText": "輸入你的筆記...", + "HideAnnotationsFor": "隱藏 %s 的註解...", + "IconDesc": "查看此日期範圍的筆記。", + "IconDescHideNotes": "隱藏此日期範圍的筆記。", + "InlineQuickHelp": "你可以建立註解來標記特殊事件（如部落格新文章或網頁重新設計），來保存你的資料分析或是任何你覺得重要的事。", + "LoginToAnnotate": "登入以建立註解。", + "NoAnnotations": "這個日期範圍內沒有註解。", + "PluginDescription": "讓你可以在不同日期加入筆記來標記你的網站修改處，保存你的分析數據資料以及和你的同事分享你的想法。透過註解，你可以確保未來能記得為什麼你的資料看起來會是這樣。", + "ViewAndAddAnnotations": "查看並新增 %s 的註解...", + "YouCannotModifyThisNote": "你無法編輯這個註解，因為你並沒有建立它，也沒有這個網站的管理權限。" } }
\ No newline at end of file diff --git a/plugins/Bandwidth b/plugins/Bandwidth -Subproject fe8483fd66e7a6ba9af0d8665629380a7f6775f +Subproject f2d852e7e8770c06ce66839517d4c3423c8c656 diff --git a/plugins/Contents/lang/zh-tw.json b/plugins/Contents/lang/zh-tw.json new file mode 100644 index 0000000000..e9496f622e --- /dev/null +++ b/plugins/Contents/lang/zh-tw.json @@ -0,0 +1,16 @@ +{ + "Contents": { + "PluginDescription": "追蹤內容和橫幅讓你衡量網頁中任何區塊內容（橫幅廣告、圖片、任何項目）的表現（瀏覽數、點擊數、CTR）。", + "Impressions": "曝光", + "ContentInteraction": "內容互動", + "ContentInteractions": "內容互動", + "InteractionRate": "互動率", + "ContentName": "內容名稱", + "ContentPiece": "內容區塊", + "ContentTarget": "內容目標", + "Contents": "內容", + "InteractionsMetricDocumentation": "內容區塊的互動次數（例如「點擊」橫幅或廣告）。", + "ImpressionsMetricDocumentation": "內容區塊（例如橫幅或廣告）的展示次數。", + "InteractionRateMetricDocumentation": "內容曝光及互動的比率。" + } +}
\ No newline at end of file diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index d912bf9433..f81dff22c3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -167,14 +167,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -198,7 +198,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index d912bf9433..f81dff22c3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -167,14 +167,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -198,7 +198,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index d912bf9433..f81dff22c3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -167,14 +167,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -198,7 +198,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index d912bf9433..f81dff22c3 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -167,14 +167,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -198,7 +198,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index d912bf9433..f81dff22c3 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -61,14 +61,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -92,11 +92,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -167,14 +167,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -198,7 +198,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/plugins/CoreAdminHome/lang/el.json b/plugins/CoreAdminHome/lang/el.json index 1467603956..4caa3e24c6 100644 --- a/plugins/CoreAdminHome/lang/el.json +++ b/plugins/CoreAdminHome/lang/el.json @@ -45,7 +45,7 @@ "JSTracking_VisitorCustomVarsDesc": "Για παράδειγμα, με όνομα της μεταβλητής \"Τύπος\" και τιμή \"Πελάτης\".", "JSTrackingIntro1": "Μπορείτε να παρακολουθείτε τους επισκέπτες στον ιστοτόπο σας με πολλούς διαφορετικούς τρόπους. Ο συνιστώμενος τρόπος είναι μέσω της JavaScript. Για να χρησιμοποιήσετε αυτή τη μέθοδο θα πρέπει να βεβαιωθείτε ότι κάθε σελίδα του ιστοτόπου σας έχει κάποιο κώδικα JavaScript, τον οποίο μπορείτε να δημιουργήσετε εδώ.", "JSTrackingIntro2": "Μόλις έχετε το JavaScript κώδικα παρακολούθησης για την ιστοσελίδα σας, αντιγράψετε και επικολλήστε τον σε όλες τις σελίδες που θέλετε να παρακολουθήσετε με το Piwik.", - "JSTrackingIntro3b": "Στους περισσότερους ιστοτόπους, ιστολόγια, CMS, κτλ. μπορείτε να χρησιμοποιήσετε ένα προ-κατασκευασμένο πρόσθετο που θα εκτελεί την τεχνική εργασία για εσάς. (Δείτε τη %1$sλίστα των πρόσθετων για ενσωμάτωση με το Piwik%2$s.) Αν δεν υπάρχει πρόσθετο μπορείτε να επεξεργαστείτε τα αρχεία προτύπου του ιστοτόπου σας και να προσθέσετε τον κώδικα στη σήμανση <\/head> που συχνά ορίζεται στο αρχείο 'header.php', 'header.tpl' ή παρόμοιο αρχείο προτύπου.", + "JSTrackingIntro3b": "Στους περισσότερους ιστοτόπους, ιστολόγια, CMS, κτλ. μπορείτε να χρησιμοποιήσετε ένα προ-κατασκευασμένο πρόσθετο που θα εκτελεί την τεχνική εργασία για εσάς. (Δείτε τη %1$sλίστα των πρόσθετων για ενσωμάτωση με το Piwik%2$s.) Αν δεν υπάρχει πρόσθετο μπορείτε να επεξεργαστείτε τα αρχεία προτύπου του ιστοτόπου σας και να προσθέσετε τον κώδικα στη σήμανση <\/head> που συχνά ορίζεται στο αρχείο 'header.php', 'header.tpl' ή παρόμοιο αρχείο προτύπου.", "JSTrackingIntro4": "Αν δεν θέλετε να χρησιμοποιήσετε JavaScript για να παρακολουθείτε τους επισκέπτες, %1$sΔημιουργήστε ένα σύνδεσμο παρακολούθησης εικόνας παρακάτω%2$s.", "JSTrackingIntro5": "Αν θέλετε να κάνετε περισσότερα από να παρακολουθείτε προβολές σελίδων, παρακαλώ ελέγξτε το %1$sΤεκμηρίωση Piwik για Παρακολούθηση με Javascript%2$s για να δείτε τη λίστα με τις διαθέσιμες λειτουργίες. Χρησιμοποιώντας αυτές τις λειτουργίες, μπορείτε να παρακολουθείτε τους στόχους, προσαρμοσμένες μεταβλητές, παραγγελίες ηλεκτρονικού εμπορίου, εγκαταλελειμμένα καλάθια αγορών και πολλά άλλα.", "LogoNotWriteableInstruction": "Για να χρησιμοποιήσετε το δικό σας λογότυπο αντί του προκαθορισμένου του Piwik, δώστε δικαίωμα εγγραφής σε αυτό τον κατάλογο: %1$s Το Piwik πρέπει να έχει δικαίωμα εγγραφής στα λογότυπά σας που είναι αποθηκευμένα στα αρχεία %2$s.", diff --git a/plugins/CoreAdminHome/lang/fa.json b/plugins/CoreAdminHome/lang/fa.json index 01c29c5740..9f3bf32299 100644 --- a/plugins/CoreAdminHome/lang/fa.json +++ b/plugins/CoreAdminHome/lang/fa.json @@ -18,11 +18,13 @@ "JSTracking_CampaignKwdParam": "کمپین پارامتر کلید واژه", "JSTracking_CampaignNameParam": "کمپین اسم کلید واژه", "JSTracking_CustomCampaignQueryParam": "از پارامتر اسمی مختلفی در کمپین اسم و کلید واژه های خود استفاده کنید .", + "JSTracking_CustomCampaignQueryParamDesc": "تذکر : %1$sپیویک اتوماتیک پارامتر گوگل انالتیک را در وبسایت شما پیدا کرد .%2$s", "JSTracking_EnableDoNotTrack": "فعال کردن ردیابی نکردن توسط استفاده کننده.", "JSTracking_EnableDoNotTrack_AlreadyEnabled": "تذکر: سرور شما قسمت ردیابی نکردن را فعال کرد , این مزیت هیچ اثری بر شما نمیگزارد.", "JSTracking_EnableDoNotTrackDesc": "ردیابی کردن درخواست شما ارسال نشد , اگر بازدید کنندگان شما این را دوست ندارند .", "JSTracking_GroupPageTitlesByDomain": "دامنه سایت شما در تیتر وبسایت قابل ردیابی است.", "JSTracking_MergeAliases": "در گزارش لینک های 'خروجی' , قسمت درباره ی لینک را نمایش نده.", + "JSTracking_MergeAliasesDesc": "پس از کلیک بر روی لینک ها با نام مستعار URL ها (به عنوان مثال%s) خواهد عنوان \"لینک خروجی\" شمارش نمی شود.", "JSTracking_MergeSubdomains": "ردیابی کنید تمام بازدید کنندگان لینک های زیر مجموعه سایت .", "JSTracking_PageCustomVars": "ردیابی متغییر های سفارشی یرای هر صفحه", "JSTracking_PageCustomVarsDesc": "برای مثال : با متغییر دسته بندی و متغییر کاغذ سفید", diff --git a/plugins/CoreAdminHome/lang/fr.json b/plugins/CoreAdminHome/lang/fr.json index 9ea3fb2855..1bac967a4f 100644 --- a/plugins/CoreAdminHome/lang/fr.json +++ b/plugins/CoreAdminHome/lang/fr.json @@ -45,7 +45,7 @@ "JSTracking_VisitorCustomVarsDesc": "Par exemple, avec une variable nommée \"type\" et la valeur \"client\".", "JSTrackingIntro1": "Vous pouvez suivre les visiteurs de votre site web de manières variées. La manière recommandée est celle via JavaScript. Pour utiliser cette méthode assurez vous simplement que chaque page web du site a un certain code JavaScript que vous pouvez générer ici.", "JSTrackingIntro2": "Une fois que vous avez le code de suivi JavaScript pour votre site web, copiez-collez le sur toutes les pages dont vous voulez effectuer le suivi avec Piwik.", - "JSTrackingIntro3b": "Sur la plupart des sites web, blogs, CMS etc., vous pouvez utiliser un composant déjà fait qui va gérer les aspects techniques pour vous. (Voir notre %1$slist de composants utilisés pour intégrer Piwik%2$s.) Si aucun composant n'existe vous pouvez modifier le modèle de votre site web et ajouter ce code avant le tag <\/head> qui est souvent définit dans 'header.php', 'header.tpl' ou un fichier similaire de modèle.", + "JSTrackingIntro3b": "Sur la plupart des sites web, blogs, CMS etc., vous pouvez utiliser un composant déjà fait qui va gérer les aspects techniques pour vous. (Voir notre %1$slist de composants utilisés pour intégrer Piwik%2$s.) Si aucun composant n'existe vous pouvez modifier le modèle de votre site web et ajouter ce code avant le tag <\/head> qui est souvent définit dans 'header.php', 'header.tpl' ou un fichier similaire de modèle.", "JSTrackingIntro4": "Si vous ne souhaitez pas utiliser JavaScript pour effectuer le suivi des visiteurs, %1$sgénérez un lien de suivi par image ci-dessous%2$s.", "JSTrackingIntro5": "Si vous voulez faire plus qu'effectuer le suivi des visites de pages, veuillez consulter %1$sla documentation de suivi par JavaScript%2$s pour connaitre la liste des fonctions disponibles. En utilisant ces fonctions vous pouvez effectuer le suivi des objectifs, variables personnalisées, commandes de e-commerce, chariots\/paniers abandonnés et plus encore.", "LogoNotWriteableInstruction": "Pour utiliser votre propre logo personnalisé à la place du logo par défaut de Piwik, attribuez des permissions en écriture sur ce répertoire : %1$s Piwik a besoin d'un accès en écriture aux fichiers pour stocker vos logos %2$s.", diff --git a/plugins/CoreAdminHome/lang/hu.json b/plugins/CoreAdminHome/lang/hu.json index e03f039c84..2bcf086183 100644 --- a/plugins/CoreAdminHome/lang/hu.json +++ b/plugins/CoreAdminHome/lang/hu.json @@ -18,6 +18,7 @@ "ImageTrackingIntro3": "Az összes lehetséges opciót %1$sKövetés API dokumentáció%2$s tartalmazza.", "ImageTrackingLink": "Kép Követési Link", "ImportingServerLogs": "Szervernaplók Importálása", + "ImportingServerLogsDesc": "A látogatók böngésző (JavaScript vagy kép) általi követése helyett lehetőség van a szervernaplók folyamatos importálására. További részletek: %1$sSzervernapló analízis%2$s.", "InvalidPluginsWarning": "A következő bővítmény nem kompatibilisek evvel: %1$s ezért nem lehet őket betölteni: %2$s.", "InvalidPluginsYouCanUninstall": "A bővítmények frissíthetők vagy törölhetők a %1$sBővítmények%2$s oldalon.", "JavaScriptTracking": "JavaScript Követés", diff --git a/plugins/CoreAdminHome/lang/sq.json b/plugins/CoreAdminHome/lang/sq.json index dbb41971ee..1239060e30 100644 --- a/plugins/CoreAdminHome/lang/sq.json +++ b/plugins/CoreAdminHome/lang/sq.json @@ -45,7 +45,7 @@ "JSTracking_VisitorCustomVarsDesc": "Për shembull, me emër ndryshoreje \"Lloj\" dhe vlerë \"Klient\".", "JSTrackingIntro1": "Vizitorët në sajtin tuaj mund t’i ndiqni në mjaft rrugë të ndryshme. Rruga e këshilluar për ta bërë është përmes JavaScript-it. Për të përdorur këtë metodë, duhet të garantoni që çdo faqe e sajtit tuaj të përmbajë një copëz kodi JavaScript, të cilin mund ta prodhoni nga këtu.", "JSTrackingIntro2": "Pasi të keni kodin JavaScript të ndjekjes për sajtin tuaj, kopjojeni dhe hidheni te krejt faqet që dëshironi të ndiqni me Piwik.", - "JSTrackingIntro3b": "Në shumicën e sajteve, blogjeve, CMS-ve, etj. mund të përdorni shtojca të gatshme që do të bënin për ju punën teknike. (Shihni %1$slistën tonë të shtojcave të përdorura për të integruar Piwik-un%2$s.) Nëse nuk ka shtojcë të tillë, mund të përpunoni gjedhet e sajtit tuaj dhe të shtoni këtë kod te etiketa <\/head>, e cila shpesh përkufizohet brenda një kartele gjedhe 'header.php', 'header.tpl' ose të ngjashme.", + "JSTrackingIntro3b": "Në shumicën e sajteve, blogjeve, CMS-ve, etj. mund të përdorni shtojca të gatshme që do të bënin për ju punën teknike. (Shihni %1$slistën tonë të shtojcave të përdorura për të integruar Piwik-un%2$s.) Nëse nuk ka shtojcë të tillë, mund të përpunoni gjedhet e sajtit tuaj dhe të shtoni këtë kod te etiketa <\/head>, e cila shpesh përkufizohet brenda një kartele gjedhe 'header.php', 'header.tpl' ose të ngjashme.", "JSTrackingIntro4": "Nëse s’doni të përdorni JavaScript-in për ndjekje vizitorësh, %1$sprodhoni më poshtë një lidhje ndjekjeje figurash%2$s.", "JSTrackingIntro5": "Nëse dëshironi të bëni më shumë se sa thjesht ndjekje parjesh të faqeve, ju lutemi, hidhini një sy %1$sdokumentimit të Ndjekjeve Piwik me Javascript%2$s për listën e plotë të funksioneve të mundshëm. Duke përdorur këto funksione mund të ndiqni objektiva, ndryshore vetjake, porosi e-tregtie, shporta të braktisura, etj.", "LogoNotWriteableInstruction": "Që të përdorni logon tuaj vetjake në vend të asaj parazgjedhje të Piwik-ut, jepni të drejta shkrimi mbi këtë drejtori: %1$s Piwik-u lyp hyrje shkrimi për logot tuaja të depozituara në kartelat %2$s.", diff --git a/plugins/CoreAdminHome/lang/zh-tw.json b/plugins/CoreAdminHome/lang/zh-tw.json index fe48c4cab2..023f16601d 100644 --- a/plugins/CoreAdminHome/lang/zh-tw.json +++ b/plugins/CoreAdminHome/lang/zh-tw.json @@ -11,33 +11,89 @@ "CustomLogoHelpText": "你可以自訂要顯示於使用者介面或報表信件中的 Piwik 標誌。", "DevelopmentProcess": "當我們的%1$s開發進度%2$s包含上千種自動化測試，Beta 測試員就扮演了實現 Piwik「無 Bug 政策」的關鍵角色。", "EmailServerSettings": "設定信件伺服器", + "ForBetaTestersOnly": "僅限 Beta 測試員", + "ImageTracking": "圖片追蹤", + "ImageTrackingIntro1": "當訪客禁用或無法使用 JavaScript 時，你可以使用圖片追蹤連結來追蹤訪客。", + "ImageTrackingIntro2": "在下方產生連結並將 HTML 代碼黏貼至網頁中。如果你要做為 JavaScript 追蹤失敗的備用方式，你可將它放置在 %1$s 標籤中。", + "ImageTrackingIntro3": "所有可以使用於圖片追蹤連結的參數列表，請查看%1$s追蹤 API 說明文件%2$s。", + "ImageTrackingLink": "圖片追蹤連結", + "ImportingServerLogs": "匯入伺服器紀錄檔", + "ImportingServerLogsDesc": "從瀏覽器（JavaScript 或圖片連結）追蹤訪客的替代方案是連續性的匯入伺服器紀錄檔。了解更多關於%1$s伺服器紀錄檔分析%2$s。", + "InvalidPluginsWarning": "以下外掛不相容於 %1$s 並且無法載入：%2$s。", + "InvalidPluginsYouCanUninstall": "你可以在%1$s外掛管理%2$s頁面更新或移除這些外掛。", "JavaScriptTracking": "JavaScript 追蹤程式碼", + "JSTracking_CampaignKwdParam": "活動關鍵字參數", + "JSTracking_CampaignNameParam": "活動名稱參數", + "JSTracking_CodeNoteBeforeClosingHead": "確定這段程式碼放在你網站上的每一個網頁。我們推薦將它貼在 %1$s 結束標籤前。", + "JSTracking_CustomCampaignQueryParam": "活動名稱及關鍵字使用自訂參數", + "JSTracking_CustomCampaignQueryParamDesc": "注意：%1$sPiwik 將自動偵測 Google Analytics 參數%2$s。", + "JSTracking_DisableCookies": "禁用所有追蹤 cookies", + "JSTracking_DisableCookiesDesc": "禁用所有第一方 cookies。這個網站現有的 Piwik cookies 將會在下一次網頁瀏覽時被偵測。", + "JSTracking_EnableDoNotTrack": "啟用客戶端不追蹤（Do Not Track）偵測", + "JSTracking_EnableDoNotTrack_AlreadyEnabled": "注意：伺服器端不追蹤（Do Not Track）支援已啟用，所以此選項不會有效果。", + "JSTracking_EnableDoNotTrackDesc": "訪客若開啟了不追蹤功能，追蹤請求將不會送出。", + "JSTracking_GroupPageTitlesByDomain": "追蹤時將網站域名放置到網頁標題開頭", + "JSTracking_GroupPageTitlesByDomainDesc1": "如果有人在 blog.%1$s 訪問了「關於」網頁，將會紀錄為「blog \/ 關於」。這是追蹤子域名流量總覽最簡單的方式。", + "JSTracking_MergeAliases": "在「離開連結」報表中隱藏已知的網站別名網頁點擊：", + "JSTracking_MergeAliasesDesc": "如果點擊了網站別名的連結（如 %s）將不會計算到離開連結中。", + "JSTracking_MergeSubdomains": "追蹤所有子域名的訪客：", + "JSTracking_MergeSubdomainsDesc": "如果一個訪客訪問了 %1$s 和 %2$s，他會被計算為不重複訪客。", + "JSTracking_PageCustomVars": "為每個頁面訪問追蹤自定變數", + "JSTracking_PageCustomVarsDesc": "例如變數名稱為「分類」，值為「白皮書」。", + "JSTracking_TrackNoScript": "追蹤已禁用 JavaScript 的訪客", + "JSTracking_VisitorCustomVars": "為此訪客追蹤自訂變數", + "JSTracking_VisitorCustomVarsDesc": "例如變數名稱為「類型」，值為「顧客」。", + "JSTrackingIntro1": "你可以透過多種不同的方式追蹤你的網站訪客。推薦使用 JavaScript 的追蹤方式。要使用此方法必須先確定你網站中的每一頁都有一樣的 JavaScript 程式碼，你可以在這裡產生。", + "JSTrackingIntro2": "當你有了網站的 JavaScript 追蹤程式碼，請複製並貼上到所有你想透過 Piwik 追蹤的頁面上。", + "JSTrackingIntro3b": "多數的網站、部落格、CMS 等等。你可以使用一個預製的外掛來幫你做技術性的工作。（查看%1$s用來整合 Piwik 的外掛列表%2$s。）如果沒有看到你想要的外掛，你可以直接編輯網站的模板，並將程式碼貼到 <\/head> 標籤之前，通常出現在「header.php」、「header.tpl」等類似的模板檔案中。", + "JSTrackingIntro4": "如果你不想透過 JavaScript 來追蹤訪客，%1$s在下方產生圖片追蹤連結%2$s。", + "JSTrackingIntro5": "如果你不只是想追蹤網頁訪問，可以查看%1$sPiwik Javascript 追蹤說明文件%2$s中的功能列表。可以透過這功能來追蹤目標、自訂變數、電子商務訂單、遺棄的購物車等等。", + "LogoNotWriteableInstruction": "要使用你的自訂標誌取代 Piwik 預設標誌，請給予此資料夾寫入權限：%1$s Piwik 需要寫入權限才能將你的標誌儲存為檔案 %2$s。", + "FileUploadDisabled": "PHP 配置中並未啟用上傳檔案。要上傳你的自訂標誌前請先設定 php.ini 中的 %s 後重新啟動伺服器。", + "LogoUploadFailed": "無法處理上傳的檔案。請檢查該檔案是否為有效格式。", "LogoUpload": "選擇標誌上傳", "FaviconUpload": "選擇圖示上傳", "LogoUploadHelp": "請選擇 %1$s 格式並且高度最小為 %2$s 像素的檔案。", "MenuDiagnostic": "診斷", "MenuGeneralSettings": "一般設定", "MenuSystem": "系統", + "MenuDevelopment": "開發", + "MenuMeasurables": "可測量的", "OptOutComplete": "已選擇退出追蹤。你在此網站的的訪問紀錄將不會被追蹤。", "OptOutCompleteBis": "注意：若你清除了瀏覽器的 cookies、刪除了退出追蹤的 cookie 或是你更換電腦或瀏覽器，你將需要重新執行選擇推出的動作。", + "OptOutDntFound": "你的瀏覽器已回報你不想被追蹤，因此你已經不會被追蹤。這是瀏覽器中的設定，所以你會一直不被追蹤直到你關閉了不追蹤（Do Not Track）功能。", "OptOutExplanation": "Piwik 致力於在提供網路中的隱私權。要讓你的訪客選擇推出 Piwik 追蹤，你可以在你的網頁中加入以下的 HTML 代碼，例如在隱私權政策網頁。", "OptOutExplanationBis": "這個程式碼將以頁框顯示，裡面有個連結可以在訪客的瀏覽器中設定 cookie 以退出 Piwik 追蹤。%1$s點擊這裡%2$s查看將於頁框中顯示的網頁內容。", "OptOutForYourVisitors": "讓你的訪客選擇退出 Piwik 追蹤", + "PiwikIsInstalledAt": "Piwik 安裝於", + "PersonalPluginSettings": "個人外掛設定", + "PluginSettingChangeNotAllowed": "你無法修改外掛「%2$s」中的設定「%1$s」", + "PluginSettingReadNotAllowed": "你無法讀取外掛「%2$s」中的設定「%1$s」", + "PluginSettings": "外掛設定", + "PluginSettingsIntro": "你可以在這裡修改下列第三方外掛的設定：", + "PluginSettingsValueNotAllowed": "外掛「%2$s」中欄位「%1$s」的值不允許", + "PluginSettingsSaveFailed": "外掛設定保存失敗", "PluginSettingsSaveSuccess": "外掛設定已更新。", "SettingsSaveSuccess": "設定已更新。", "SendPluginUpdateCommunication": "當外掛有更新可用時寄送信件", "SendPluginUpdateCommunicationHelp": "如果外掛有新版本可以用時，會發送信件給超級使用者。", "StableReleases": "如果 Piwik 在你的業務中是不可或缺的一環，我們推薦你使用最新穩定版本。如果你使用最新 Beta 版本並且發現了 Bug 或是有建議想提出，請%1$s見此網頁說明%2$s。", "LtsReleases": "LTS（長期支援）版本只會收到安全性和 Bug 修正更新。", + "SystemPluginSettings": "系統外掛設定", + "TrackAGoal": "追蹤目標", + "TrackingCode": "追蹤程式碼", + "TrustedHostConfirm": "你確定要變更受 Piwik 信任的域名？", "TrustedHostSettings": "受 Piwik 信任的域名", "UpdateSettings": "更新設定", "UseCustomLogo": "使用自訂標誌", "ValidPiwikHostname": "有效的 Piwik 域名", + "WithOptionalRevenue": "選填的收益", "YouAreOptedIn": "你目前正在被追蹤。", "YouAreOptedOut": "你已經選擇退出追蹤。", "YouMayOptOut": "你可以選擇不要有以電腦來設定的獨特追蹤 cookie 識別號碼來避免被此網站所收集的資料聚合和分析。", "YouMayOptOutBis": "要做出選擇，請取消勾選以下選項來接收一個選擇退出追蹤的 cookie。", "OptingYouOut": "正在設定退出追蹤，請稍後...", - "ProtocolNotDetectedCorrectly": "你目前正以 SSL 安全連線（https）查看 Piwik，但 Piwik 只從伺服器中偵測到非安全的連線。" + "ProtocolNotDetectedCorrectly": "你目前正以 SSL 安全連線（https）查看 Piwik，但 Piwik 只從伺服器中偵測到非安全的連線。", + "ProtocolNotDetectedCorrectlySolution": "要確保 Piwik 透過 HTTPS 安全請求並供應你內容，你可以編輯 %1$s 檔案中的 Proxy 設定或是在 %3$s 區塊下方增加 %2$s。%4$s了解更多%5$s" } }
\ No newline at end of file diff --git a/plugins/CoreHome/angularjs/common/services/piwik-api.js b/plugins/CoreHome/angularjs/common/services/piwik-api.js index ab546a7693..67f9756f4f 100644 --- a/plugins/CoreHome/angularjs/common/services/piwik-api.js +++ b/plugins/CoreHome/angularjs/common/services/piwik-api.js @@ -47,6 +47,10 @@ var hasBlockedContent = false; return getParams && getParams['module'] === 'API' && getParams['method']; } + function isWidgetizedRequest() { + return (broadcast.getValueFromUrl('module') == 'Widgetize'); + } + function reset () { getParams = {}; postParams = {}; @@ -176,7 +180,7 @@ var hasBlockedContent = false; * @private */ function getPostParams (params) { - if (isRequestToApiMethod()) { + if (isRequestToApiMethod() || isWidgetizedRequest()) { params.token_auth = piwik.token_auth; } diff --git a/plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.js b/plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.js index 0115b73715..f3d5317b7b 100644 --- a/plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.js +++ b/plugins/CoreHome/angularjs/widget-loader/widgetloader.directive.js @@ -96,6 +96,10 @@ url += '&showtitle=1'; } + if (broadcast.getValueFromUrl('module') == 'Widgetize' && broadcast.getValueFromUrl('token_auth')) { + url += '&token_auth=' + broadcast.getValueFromUrl('token_auth'); + } + url += '&random=' + parseInt(Math.random() * 10000); return '?' + url; diff --git a/plugins/CoreHome/lang/ar.json b/plugins/CoreHome/lang/ar.json index 1f1edb83d0..fde01bfbdf 100644 --- a/plugins/CoreHome/lang/ar.json +++ b/plugins/CoreHome/lang/ar.json @@ -27,7 +27,6 @@ "InjectedHostWarningIntro": "أنت الآن تصل إلى Piwik من %1$s ، إلا أن Piwik قد تم إعداده للعمل على هذا العنوان : %2$s .", "JavascriptDisabled": "يجب تفعيل برمجيات جافا في سبيل استخدام Piwik في الوضع القياسي.<br\/> ومع ذلك، يبدو أن برمجيات جافا إما معطلة أو غير مدعمة في متصفح ويب الخاص بك.<br\/>لاستخدام العرض القياسي، قم بتفعيل JavaScript من خلال تغيير إعدادات متصفحك، ثم %1$sحاول مرة أخرى%2$s.<br\/>", "MainNavigation": "التصفح الرئيس", - "MakeADifference": "اصنع فرقاً: %1$sتبرع الآن%2$s لتمويل بايويك 3.0!", "MakeOneTimeDonation": "بديلاً عن ذلك، قم بالتبرع مرة واحدة", "Menu": "القائمة", "NoPrivilegesAskPiwikAdmin": "لقد سجلت الدخول بصفتك '%1$s' ولكن يبدو أنه لا توجد أي صلاحيات لك في Piwik. %2$s اسأل مدير Piwik (انقر لمراسلته)%3$s gلمنحك صلاحيات \"المشاهدة\" لموقع ما.", diff --git a/plugins/CoreHome/lang/cs.json b/plugins/CoreHome/lang/cs.json index 9bc20f38ac..aa8e15b2ae 100644 --- a/plugins/CoreHome/lang/cs.json +++ b/plugins/CoreHome/lang/cs.json @@ -30,7 +30,6 @@ "InjectedHostWarningIntro": "Nyní přistupujete k Piwiku z %1$s, ale byl nakonfigurován, aby naslouchal na následující adrese: %2$s.", "JavascriptDisabled": "Musíte mít zapnutý JavaScript, jinak Piwik nezobrazíte.<br \/> Nebo jen není Váš prohlížeč mezi podporovanými.<br \/>Pro běžné zobrazení zapněte JavaScript ve svém prohlížeči, poté %1$szkuste znovu%2$s.<br \/>", "MainNavigation": "Hlavní navigace", - "MakeADifference": "Podpoř nás: %1$sPřispěj na vývoj%2$s nové verze Piwik 3.0!", "MakeOneTimeDonation": "Provést jednorázový dar.", "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "Jste přihlášen jako '%1$s' ale zdá se, že nemáte v Piwiku žádná práva. %2$s Zeptejte se Vašeho Piwik administrátora (klikem na email)%3$s aby Vám dal 'view' přístup na stránku.", diff --git a/plugins/CoreHome/lang/de.json b/plugins/CoreHome/lang/de.json index 8b2a807fa8..6117c68da3 100644 --- a/plugins/CoreHome/lang/de.json +++ b/plugins/CoreHome/lang/de.json @@ -30,7 +30,6 @@ "InjectedHostWarningIntro": "Sie betreten Piwik aktuell von %1$s, allerdings wurde Piwik so konfiguriert, dass es unter dieser Adresse läuft: %2$s.", "JavascriptDisabled": "JavaScript muss aktiviert sein, um die Standardansicht von Piwik zu benutzen.<br\/>Es scheint jedoch so, als wäre JavaScript bei Ihnen deaktiviert bzw. würde nicht von Ihrem Browser unterstützt.<br \/>Um die Standardansicht zu benutzen, aktivieren Sie JavaScript in Ihren Browseroptionen und %1$sversuchen Sie es erneut%2$s.<br \/>", "MainNavigation": "Hauptnavigation", - "MakeADifference": "Machen Sie den Unterschied: %1$sSpenden Sie jetzt%2$s um die Entwicklung von Piwik 3.0 möglich zu machen!", "MakeOneTimeDonation": "Stattdessen einmalig spenden.", "Menu": "Menü", "NoPrivilegesAskPiwikAdmin": "Sie sind angemeldet als '%1$s', aber es wurden keine Berechtigungen für diesen Benutzer in Piwik gesetzt. %2$s Bitte fragen Sie Ihren Piwik Administrator (klicken für E-Mail)%3$s um Zugriff auf die Webseite zu erhalten.", diff --git a/plugins/CoreHome/lang/el.json b/plugins/CoreHome/lang/el.json index d7984e25f0..07264db3dd 100644 --- a/plugins/CoreHome/lang/el.json +++ b/plugins/CoreHome/lang/el.json @@ -30,7 +30,6 @@ "InjectedHostWarningIntro": "Θα έχετε πρόσβαση τώρα στο Piwik από το %1$s, αλλά το Piwik έχει ρυθμιστεί να τρέχει σε αυτή τη διεύθυνση: %2$s.", "JavascriptDisabled": "Η JavaScript πρέπει να ενεργοποιηθεί για να χρησιμοποιήσετε το Piwik στη βασική του μορφή.<br \/>Ωστόσο, φαίνεται ότι η JavaScript είναι είτε απενεργοποιημένη ή δεν υποστηρίζεται από τον φυλλομετρητή σας.<br \/>Για τη χρήση της βασικής μορφής, ενεργοποιήστε τη JavaScript αλλάζοντας της ρυθμίσεις του φυλλομετρητή σας και %1$sδοκιμάστε ξανά%2$s.<br \/>", "MainNavigation": "Κεντρική πλοήγηση", - "MakeADifference": "Κάντε τη διαφορά: %1$sΚάντε δωρεά%2$s για να χρηματοδοτήσετε το Piwik 3.0!", "MakeOneTimeDonation": "Εναλλακτικά, κάντε μια εφάπαξ δωρεά.", "Menu": "Μενού", "NoPrivilegesAskPiwikAdmin": "Έχετε κάνει είσοδο ως '%1$s', αλλά φαίνεται ότι δεν σας έχει δοθεί κάποιο δικαίωμα από το Piwik. %2$s Ζητήστε από το διαχειριστή του Piwik σας (κλικ για αποστολή e-mail)%3$s να σας δώσει δικαίωμα 'ανάγνωσης' στον ιστοτόπο.", diff --git a/plugins/CoreHome/lang/es.json b/plugins/CoreHome/lang/es.json index a91017c547..5795d71e44 100644 --- a/plugins/CoreHome/lang/es.json +++ b/plugins/CoreHome/lang/es.json @@ -29,7 +29,6 @@ "InjectedHostWarningIntro": "Está accediendo a Piwik desde %1$s, pero Piwik ha sido configurado para ejecutarse en esta dirección: %2$s.", "JavascriptDisabled": "JavaScript debe estar habilitado para que pueda utilizar la vista estándar de Piwik .<br \/>Sin embargo, para ser que JavaScript está deshabilitado o no es respaldado por su navegador. <br \/>Para usar la vista estándar, habilite JavaScript cambiando las opciones de su navegador, luego%1$sintente nuevamente%2$s.<br \/>", "MainNavigation": "Menú de navegación", - "MakeADifference": "Haz la diferencia %1$sDonate now%2$s para fundar Piwik 3.0!", "MakeOneTimeDonation": "Entonces, haga una sola donación", "Menu": "Menú", "NoPrivilegesAskPiwikAdmin": "Ha iniciado sesión como '%1$s', pero parece que no posee ningún permiso configurado en Piwik. %2$s Consulta al administrador de su Piwik (clic para enviar correo electrónico)%3$s para que le otorgue acceso para 'ver' en el sitio de internet.", diff --git a/plugins/CoreHome/lang/fa.json b/plugins/CoreHome/lang/fa.json index 3124d1d1da..0d5ddc845f 100644 --- a/plugins/CoreHome/lang/fa.json +++ b/plugins/CoreHome/lang/fa.json @@ -5,13 +5,17 @@ "CheckPiwikOut": "پیویک را بررسی کنید!", "CloseWidgetDirections": "شما میتونید این ویجت را با کلیک بر روی ایکن 'X' در بالا ببندید.", "DataForThisReportHasBeenPurged": "داده های این گزارش از %s ماه قدیمی تر است و از سیستم پاک شده است.", + "DataTableExcludeAggregateRows": "مجموع ردیف ها نمایش داده شده است %s انها را پنهان کنید .", + "DataTableIncludeAggregateRows": "مجموع ردیف ها پنهان است %s انها را نمایش دهید .", "Default": "پیش فرض", "DonateCall1": "استفاده از پیویک هیچگاه هزینه ای برای شما نخواهد داشت ، اما این به این معنا نیست که ما هم برای تولید آن هزینه ای نمی کنیم.", "DonateCall2": "پیویک به حمایت همیشگی شما برای رشد و پیشرفت نیاز دارد.", "DonateFormInstructions": "با کلیک بر روی نوار لغزنده و انتخاب مقدار کنید، و سپس دکمه ی مشترک به کمک مالی را بزنید", + "ExcludeRowsWithLowPopulation": "تمام ردیف ها نمایش داده شده اند %s انها را ببندید", "ExternalHelp": "راهنما (در tab جدید)", "FlattenDataTable": "این گزارش سلسله مراتبی است %sآن را مسطح کن", "HowMuchIsPiwikWorth": "چقدر پیویک برای شما ارزش دارد؟", + "IncludeRowsWithLowPopulation": "ردیف ها با جمعیت کم نمایش داده نمیشوند %s نمایش تمام ردیف ها", "InjectedHostEmailBody": "درود، من امروز برای دسترسی به پیویک تلاش کردم و هشدار نام هاست نامشخص را دریافت کردم.", "InjectedHostEmailSubject": "دسترسی به پیویک توسط یک میزبان ناشناخته انجام شده است: %s", "MakeOneTimeDonation": "یک بار کمک مالی انجام دهید.", diff --git a/plugins/CoreHome/lang/fr.json b/plugins/CoreHome/lang/fr.json index 6a24759d53..b4ce3d389d 100644 --- a/plugins/CoreHome/lang/fr.json +++ b/plugins/CoreHome/lang/fr.json @@ -30,7 +30,6 @@ "InjectedHostWarningIntro": "Vous accédez maintenant à Piwik depuis %1$s, mais Piwik a été configuré pour s'exécuter à cette adresse : %2$s.", "JavascriptDisabled": "JavaScript doit être activé pour que vous puissiez utiliser Piwik de manière basique.<br \/>Cependant, il semble que JasvaScript ne soit pas supporté ou soit désactivé sur votre navigateur.<br \/>Pour utiliser l'interface basique, activez JavaScript en modifiant les options de votre navigateur, ensuite %1$sessayez encore%2$s.<br \/>", "MainNavigation": "Navigation principale", - "MakeADifference": "Faites une différence : %1$sFaites une don maintenant%2$s pour financer Piwik 3.0!", "MakeOneTimeDonation": "Faire un don unique à la place.", "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "Vous êtes connecté en tant que '%1$s' mais il semble que nous n'ayez aucune permission définie dans Piwik. %2$s Demandez à votre administrateur (cliquez pour envoyer un e-mail)%3$s de vous donner l'accès 'Consultation' à un site web.", diff --git a/plugins/CoreHome/lang/it.json b/plugins/CoreHome/lang/it.json index b74e0555ab..22ea450526 100644 --- a/plugins/CoreHome/lang/it.json +++ b/plugins/CoreHome/lang/it.json @@ -29,7 +29,6 @@ "InjectedHostWarningIntro": "Stai accedendo a Piwik da %1$s ma Piwik è stato configuraato per girare a questo indirizzo: %2$s.", "JavascriptDisabled": "JavaScript deve essere abilitato per poter utilizzare Piwik in visualizzazione standard.<br \/>Tuttavia, sembra che JavaScript sia disabilitato o non supportato dal tuo browser.<br \/> Per utilizzare la visualizzazione standard, attiva JavaScript modificando le opzioni del browser, quindi %1$sprova ancora%2$s.<br \/>", "MainNavigation": "Navigazione principale", - "MakeADifference": "Fai la differenza: %1$sDona adesso%2$s per finanziare Piwik 3.0!", "MakeOneTimeDonation": "Fa' una donazione unica.", "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "Ti sei registrato come '%1$s', ma a quanto pare non disponi di alcuna autorizzazione in Piwik. %2$sContatta l'amministratore Piwik (clicca per e-mail)%3$s per avere un accesso che ti consenta di 'vedere' un sito web.", diff --git a/plugins/CoreHome/lang/ko.json b/plugins/CoreHome/lang/ko.json index 7f051b33ce..f88883980c 100644 --- a/plugins/CoreHome/lang/ko.json +++ b/plugins/CoreHome/lang/ko.json @@ -27,7 +27,6 @@ "InjectedHostWarningIntro": "당신은 지금 %1$s에서 Piwik에 접근하고 있지만 Piwik은 다음 주소로 실행되도록 구성되어 있습니다: %2$s", "JavascriptDisabled": "Piwik의 표준보기를 이용하려면 JavaScript가가 활성화되어 있어야 합니다.<br \/>하지만, 당신의 브라우저는 활성화되어있지 않거나 지원되지 않는 것 같습니다.<br \/>표준보기를 이용하려면 브라우저 옵션을 변경하여 JavaScript를 활성화하고 <br \/> %1$s다시 시도하세요%2$s.<br \/>", "MainNavigation": "주요 네비게이션", - "MakeADifference": "개발 지원: Piwik 3.0에 %1$s기부해 주세요%2$s!", "MakeOneTimeDonation": "또는, 한 번만 기부합니다.", "Menu": "메뉴", "NoPrivilegesAskPiwikAdmin": "'%1$s'로 로그인되었지만 권한이 설정되어 있지 않습니다. %2$s Piwik 관리자(클릭 이메일) %3$s에 '보기'권한을 부여 받으세요.", diff --git a/plugins/CoreHome/lang/nb.json b/plugins/CoreHome/lang/nb.json index c66898d05b..b886a42fd6 100644 --- a/plugins/CoreHome/lang/nb.json +++ b/plugins/CoreHome/lang/nb.json @@ -28,7 +28,6 @@ "InjectedHostWarningIntro": "Du har tilgang til Piwik fra %1$s, men Piwik er konfigurert til å kjøre på adressen: %2$s", "JavascriptDisabled": "JavaScript må være aktivert for at du skal kunne bruke Piwik i standardvisning.<br \/>Det ser ut til at JavaScript enten er deaktivert eller ikke støttet av din nettleser.<br \/>For å bruke standardvisning, må du aktivere JavaScript i nettleserinnstillingene og deretter %1$sprøve igjen%2$s.<br \/>", "MainNavigation": "Hovednavigasjon", - "MakeADifference": "Gjør en forskjell: %1$sdoner nå%2$s for å bidra til Piwik 3.0!", "MakeOneTimeDonation": "Bidra med en engangsdonasjon i stedet.", "Menu": "Meny", "NoPrivilegesAskPiwikAdmin": "Du er logget inn som «%1$s», men det ser ut til at du ikke har noen rettigheter satt i Piwik. %2$s Be din Piwik-administrator (klikk for å sende e-post)%3$s å gi deg «vis»-tilgang til et nettsted.", diff --git a/plugins/CoreHome/lang/ru.json b/plugins/CoreHome/lang/ru.json index 4060f1ddf7..24675bef64 100644 --- a/plugins/CoreHome/lang/ru.json +++ b/plugins/CoreHome/lang/ru.json @@ -29,7 +29,6 @@ "InjectedHostWarningIntro": "Сейчас вы заходите в Piwik на %1$s, но Piwik был настроен на этом адресе: %2$s.", "JavascriptDisabled": "JavaScript должен быть разрешен для корректного стандартного отображения Piwik.<br \/>Если Вы читаете это сообщение, значит JavaScript запрещен, либо не поддерживается вашим браузером.<br \/>Для использования стандартного вида, разрешите JavaScript в настройках вашего браузера, потом %1$sпопробуйте обновить страницу%2$s.<br \/>", "MainNavigation": "Основная навигация", - "MakeADifference": "Внесите свой вклад: %1$sПожертвуйте сейчас%2$s для финансирования Piwik 3.0!", "MakeOneTimeDonation": "Сделать только пожертвование (без подписки).", "Menu": "Меню", "NoPrivilegesAskPiwikAdmin": "Вы авторизованы как '%1$s', но, кажется, для вас не установлены права в Piwik. %2$s Попросите вашего администратора (кликните, чтобы написать письмо)%3$s дать вам доступ на \"просмотр\" к статистике сайта.", diff --git a/plugins/CoreHome/lang/sq.json b/plugins/CoreHome/lang/sq.json index 2b931cb6e4..96e1990ee5 100644 --- a/plugins/CoreHome/lang/sq.json +++ b/plugins/CoreHome/lang/sq.json @@ -30,7 +30,6 @@ "InjectedHostWarningIntro": "Po hyni në Piwik që prej %1$s, por Piwik-u qe formësuar të xhirojë në këtë adresë: %2$s.", "JavascriptDisabled": "Që të mund të përdorni Piwik-un në parjen standarde duhet të aktivizohet JavaScript-i.<br \/>Por ja që duket se ose JavaScript-i është i çaktivizuar, ose nuk mbulohet nga shfletuesi juaj.<br \/>Që të përdorni parjen standarde, aktivizoni JavaScript-in duke ndryshuar mundësitë përkatëse te shfletuesi juaj, mandej %1$sriprovoni%2$s.<br \/>", "MainNavigation": "Lëvizja kryesore", - "MakeADifference": "Sillni një ndryshim: %1$sDhuroni tani%2$s që të financohet Piwik 3.0!", "MakeOneTimeDonation": "Ose bëni një dhurim njëherësh.", "Menu": "Menu", "NoPrivilegesAskPiwikAdmin": "Jeni i futur si '%1$s' por duket se s’keni leje të rregulluara për ju në Piwik. %2$s Kërkojini administratorit tuaj te Piwik (klikoni që t’i dërgoni email)%3$s që t’ju japë të drejta 'parjesh' te një sajt.", diff --git a/plugins/CoreHome/lang/sr.json b/plugins/CoreHome/lang/sr.json index dd8e1f2eaa..fd620f3956 100644 --- a/plugins/CoreHome/lang/sr.json +++ b/plugins/CoreHome/lang/sr.json @@ -27,7 +27,6 @@ "InjectedHostWarningIntro": "Sada pristupate Piwik-u sa %1$s, ali je Piwik podešen da radi sa ove adrese: %2$s.", "JavascriptDisabled": "JavaScript mora bidi uključen kako biste standardno koristili Piwik.<br \/>Izgleda da je JavaScript ili isključen ili nije podržan od strane vašeg brauzera.<br \/>Kako biste omogućili standardni prikaz, uključite JavaScript kroz podešavanja vašeg brauzera a onda %1$spokušajte ponovo%2$s.<br \/>", "MainNavigation": "Glavna navigacija", - "MakeADifference": "Budite drugačiji: %1$sDonirajte%2$s za Piwik 3.0!", "MakeOneTimeDonation": "Možete izvršiti i jednokratnu donaciju.", "Menu": "Meni", "NoPrivilegesAskPiwikAdmin": "Prijavljeni ste kao '%1$s' ali izgleda da nemate postavljena nikakva ovlašćenja. %2$s Tražite od Piwik administratora (kliknite za poruku)%3$s da vam dozvoli 'prikaz' na sajtu.", diff --git a/plugins/CoreHome/lang/uk.json b/plugins/CoreHome/lang/uk.json index 518cdd0e96..062015e246 100644 --- a/plugins/CoreHome/lang/uk.json +++ b/plugins/CoreHome/lang/uk.json @@ -29,7 +29,6 @@ "InjectedHostWarningIntro": "Зараз ви заходите в Piwik на %1$s, але Piwik був налаштований на цю адресу: %2$s.", "JavascriptDisabled": "JavaScript Вам необхідно включити для коректного стандартного відображення Piwik.<br \/>Якщо Ви читаєте це повідомлення, значить JavaScript заборонений, або не підтримується вашим браузером.<br \/>Для використання стандартного виду, активуйте JavaScript в налаштуваннях вашого браузера, потім %1$sспробуйте оновити сторінку%2$s.<br \/>", "MainNavigation": "Основна навігація", - "MakeADifference": "%1$sДопоможіть%2$s спонсоруючи Piwik 3.0!", "MakeOneTimeDonation": "Зробити тільки пожертвування (без передплати).", "Menu": "Меню", "NoPrivilegesAskPiwikAdmin": "Ви авторизовані як '%1$s', але, здається, для вас не встановлені права в Piwik. %2$s Попросіть вашого адміністратора (натисніть, щоб написати лист)%3$s надати вам доступ для \"перегляду\" до статистики сайту.", diff --git a/plugins/CoreHome/lang/zh-tw.json b/plugins/CoreHome/lang/zh-tw.json index 6458bcd148..c15ee2a332 100644 --- a/plugins/CoreHome/lang/zh-tw.json +++ b/plugins/CoreHome/lang/zh-tw.json @@ -1,14 +1,72 @@ { "CoreHome": { "CategoryNoData": "此分類下沒有資料。嘗試「包含所有人口」。", + "ChangeVisualization": "更換視圖", "CheckForUpdates": "檢查更新", - "ExternalHelp": "幫助（在新視窗中開啟）", + "CheckPiwikOut": "查看 Piwik！", + "ClickToEditX": "點擊以編輯 %s", + "ClickToSeeFullInformation": "點擊查看完整資訊", + "CloseSearch": "關閉搜尋", + "CloseWidgetDirections": "你可以點擊小工具上方的「X」來關閉它。", + "ChooseX": "選擇 %1$s", + "DataForThisReportHasBeenPurged": "這份報表中的資料已經超過 %s 個月因此已被清除。", + "DataTableExcludeAggregateRows": "合計列已顯示 %s 點擊隱藏", + "DataTableIncludeAggregateRows": "合計列已隱藏 %s 點擊顯示", + "DataTableHowToSearch": "按下 Enter 鍵或點擊搜尋圖示來搜尋", + "Default": "預設", + "DonateCall1": "使用 Piwik 永遠不花你任何一毛錢，但那不表示我們開發沒有花到錢。", + "DonateCall2": "Piwik 需要你的持續支持以成長茁壯。", + "DonateCall3": "如果你覺得 Piwik 在你的事業或是奮鬥史中擁有特別的意義，%1$s請考慮捐助%2$s或是%3$s購買高級功能%4$s。", + "DonateFormInstructions": "使用滑桿來選擇數量，接著點擊 Subscribe 來捐助。", + "ExcludeRowsWithLowPopulation": "已顯示所有列 %s 排除較低人數", + "ExternalHelp": "幫助（在新分頁中開啟）", + "FlattenDataTable": "報表目前已分層 %s 平面化顯示", + "HowMuchIsPiwikWorth": "Piwik 在你心目中的價值有多少？", + "IncludeRowsWithLowPopulation": "已隱藏較低人數列 %s 顯示全部", + "InjectedHostEmailBody": "嗨，今天我試著存取 Piwik 但是遇到了未知域名警告。", + "InjectedHostEmailSubject": "Piwik 被來自未知的域名訪問：%s", + "InjectedHostNonSuperUserWarning": "%1$s點擊這裡以安全的存取 Piwik%2$s 並移除這個警告。你也可能想要聯絡你的 Piwik 管理員並提醒他們這個問題（%3$s點此寄信%4$s）。", + "InjectedHostSuperUserWarning": "Piwik 可能設定錯誤（例如 Piwik 剛從其他伺服器或網址移動）。你可以%1$s點此新增 %2$s 為 Piwik 有效域名%3$s（如果你信任它），或是%4$s點此訪問 %5$s 來安全的存取 Piwik%6$s。", + "InjectedHostWarningIntro": "你現在正從 %1$s 訪問 Piwik，但 Piwik 設定中的網址已經變更為 %2$s。", "JavascriptDisabled": "使用 Piwik 的標準檢視時必須啟用 JavaScript。<br \/>然而，你的瀏覽器似乎已停用或不支援 JavaScript。<br \/>若要使用標準檢視，請變更你的瀏覽器選項並啟用 JavaScript，然後%1$s重試一次%2$s。<br \/>", - "PageOf": "%1$s 之於 %2$s", - "PeriodRange": "期間", - "ShowJSCode": "顯示 JavaScript 追蹤碼以供插入", + "MainNavigation": "主選單", + "MakeOneTimeDonation": "以單次捐助替代", + "Menu": "選單", + "NoPrivilegesAskPiwikAdmin": "你目前以「%1$s」登入，但你似乎在 Piwik 中沒有被授予任何權限。%2$s要求你的管理員（點擊以寄信）%3$s給你網站的「檢視」權限。", + "OnlyForSuperUserAccess": "這個小工具只顯示於擁有超級使用者權限使用者的預設展示板。", + "PageOf": "%1$s \/ %2$s", + "PeriodRange": "範圍", + "ReportGeneratedOn": "報表產生於 %s", + "ReportGeneratedXAgo": "報表產生於 %s 之前", + "SharePiwikLong": "嗨！我剛找到了一個免費的軟體：Piwik！\n\nPiwik 讓你在你的網站上免費追蹤訪客。你絕對要來試試看！", + "SharePiwikShort": "Piwik！免費網頁分析。擁有你的資料。", + "ShareThis": "分享這個", + "ShowJSCode": "顯示要插入的 JavaScript 程式碼", + "SkipToContent": "跳到內容", + "SubscribeAndBecomePiwikSupporter": "繼續到安全的信用卡付款網頁（Paypal）來成為 Piwik 的支持者！", + "SupportPiwik": "支持 Piwik！", + "TableNoData": "此表格中無資料。", "ThereIsNoDataForThisReport": "此報表無資料。", - "WebAnalyticsReports": "網站分析報告", + "UnFlattenDataTable": "報表目前已平面化 %s 分層顯示", + "ViewAllPiwikVideoTutorials": "查看 Piwik 所有的影片教學", + "WebAnalyticsReports": "網站分析報表", + "YouAreUsingTheLatestVersion": "你正在使用 Piwik 的最新版本！", + "ClickRowToExpandOrContract": "點擊此列來展開或收合子表。", + "UndoPivotBySubtable": "此報表已圖形化 %s 復原", + "NoSuchPage": "此頁面不存在", + "PivotBySubtable": "此報表尚未圖形化 %1$s 以 %2$s 圖形化", + "SystemSummaryWidget": "系統摘要", + "SystemSummaryNWebsites": "%d 個網站", + "SystemSummaryNSegments": "%d 個區隔", + "SystemSummaryNActivatedPlugins": "%d 個外掛已啟用", + "SystemSummaryPiwikVersion": "Piwik 版本", + "SystemSummaryMysqlVersion": "MySQL 版本", + "SystemSummaryPhpVersion": "PHP 版本", + "QuickAccessTitle": "搜尋 %s。使用方向鍵來切換搜尋結果。快捷鍵：按「F」以搜尋。", + "MenuEntries": "選單項目", + "Segments": "區隔", + "OneClickUpdateNotPossibleAsMultiServerEnvironment": "不支援一鍵更新因為你在數個伺服器上使用 Piwik。請從 %1$s 下載最新版本以繼續。", + "AdblockIsMaybeUsed": "假如你正在使用廣告封鎖外掛，請將它在此網站上關閉來確保 Piwik 可以正常運作。", "ChangeCurrentWebsite": "選擇一個網站，目前選擇的網站為：%s" } }
\ No newline at end of file diff --git a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less index ecb1b480f5..5c321005ad 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_dataTable.less +++ b/plugins/CoreHome/stylesheets/dataTable/_dataTable.less @@ -480,6 +480,8 @@ tr.level12 td.label { table.dataTable td.label img { margin-top: -3px; + max-width: 16px; + max-height: 16px; } tr td.label img.plusMinus { @@ -607,4 +609,4 @@ td.cellSubDataTable .loadingPiwik { } } } -}
\ No newline at end of file +} diff --git a/plugins/CoreHome/stylesheets/dataTable/_rowActions.less b/plugins/CoreHome/stylesheets/dataTable/_rowActions.less index c13b4c6493..9bd0475d21 100644 --- a/plugins/CoreHome/stylesheets/dataTable/_rowActions.less +++ b/plugins/CoreHome/stylesheets/dataTable/_rowActions.less @@ -36,5 +36,7 @@ table.dataTable .dataTableRowActions a img { padding: 0; border: 0; width: 20px; + max-width: 20px; height: 17px; -}
\ No newline at end of file + max-height: 17px; +} diff --git a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig index a12fe42b5b..2e3a4d1124 100644 --- a/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig +++ b/plugins/CoreHome/templates/ReportRenderer/_htmlReportBody.twig @@ -48,7 +48,7 @@ {% if columnId == 'label' %} {% if rowMetrics[columnId] is defined %} {% if rowMetadata.logo is defined %} - <img src='{{ currentPath }}{{ rowMetadata.logo }}'> + <img width="16px" height="16px" src='{{ currentPath }}{{ rowMetadata.logo }}'> {% endif %} {% if rowMetadata.url is defined %} diff --git a/plugins/CoreHome/templates/getPromoVideo.twig b/plugins/CoreHome/templates/getPromoVideo.twig index 0a0bd0fb63..e65a7c5677 100755 --- a/plugins/CoreHome/templates/getPromoVideo.twig +++ b/plugins/CoreHome/templates/getPromoVideo.twig @@ -17,12 +17,12 @@ {# facebook #} <a href="http://www.facebook.com/sharer.php?u={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> - <img src="plugins/Referrers/images/socials/facebook.com.png" /> + <img src="plugins/Referrers/images/socials/facebook.com.png" width="16px" height="16px" /> </a> {# twitter #} <a href="http://twitter.com/share?text={{ shareText|url_encode }}&url={{ promoVideoUrl|url_encode }}" rel="noreferrer" target="_blank"> - <img src="plugins/Referrers/images/socials/twitter.com.png" /> + <img src="plugins/Referrers/images/socials/twitter.com.png" width="16px" height="16px" /> </a> {# email #} diff --git a/plugins/CorePluginsAdmin/lang/zh-tw.json b/plugins/CorePluginsAdmin/lang/zh-tw.json index 7b42a9a07b..7f6151bba2 100644 --- a/plugins/CorePluginsAdmin/lang/zh-tw.json +++ b/plugins/CorePluginsAdmin/lang/zh-tw.json @@ -6,7 +6,7 @@ "Active": "已啟用", "Activity": "活動", "AlwaysActivatedPluginsList": "以下外掛永遠啟用而且不可被移除：%s", - "AuthorHomepage": "作者主頁", + "AuthorHomepage": "作者首頁", "Changelog": "更新紀錄", "ChangeSettingsPossible": "你可以變更此外掛的%1$s設定%2$s。", "CorePluginTooltip": "由 Piwik 所發佈的核心外掛沒有版本號。", @@ -22,13 +22,13 @@ "InfoThemeUpdateIsRecommended": "更新你的主題以享受最新版本。", "InstallNewPlugins": "安裝新外掛", "InstallNewThemes": "安裝新主題", - "LicenseHomepage": "憑證主頁", + "LicenseHomepage": "憑證首頁", "LikeThisPlugin": "喜歡這個外掛？", "ConsiderDonating": "考慮捐助", "CommunityContributedPlugin": "這是一個社區貢獻的外掛，免費提供給你。", "ConsiderDonatingCreatorOf": "請考慮捐助給 %s 的作者", "PluginsExtendPiwik": "外掛延伸並擴展了 Piwik 的功能。", - "OncePluginIsInstalledYouMayActivateHere": "當外掛安裝完成後，您可以在這裡啟用或停用它。", + "OncePluginIsInstalledYouMayActivateHere": "當外掛安裝完成後，你可以在這裡啟用或停用它。", "MenuPlatform": "平台", "MissingRequirementsNotice": "請將 %1$s %2$s 更新到新版本，必須要 %1$s %3$s。", "MissingRequirementsPleaseInstallNotice": "請安裝 %3$s 所需的 %1$s %2$s。", @@ -38,7 +38,7 @@ "Origin": "來源", "OriginCore": "核心", "OriginThirdParty": "第三方", - "PluginHomepage": "外掛主頁", + "PluginHomepage": "外掛首頁", "PluginNotCompatibleWith": "%1$s 個外掛和 %2$s 不相容。", "PluginNotWorkingAlternative": "如果你有在使用此外掛，或許可以在市集中發現新版本。如果沒有，可能要移除它。", "PluginRequirement": "%1$s 需要 %2$s。", diff --git a/plugins/CoreUpdater/lang/sv.json b/plugins/CoreUpdater/lang/sv.json index a954fba976..8c1c88af82 100644 --- a/plugins/CoreUpdater/lang/sv.json +++ b/plugins/CoreUpdater/lang/sv.json @@ -41,6 +41,7 @@ "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik databasen kommer att uppgraderas från version %1$s till den nya versionen %2$s.", "ReadyToGo": "Redo att köra?", "TheFollowingPluginsWillBeUpgradedX": "Följande plugins kommer att uppdateras: %s.", + "TheFollowingDimensionsWillBeUpgradedX": "Följande dimensioner kommer att uppdateras: %s.", "ThereIsNewPluginVersionAvailableForUpdate": "Vissa tillägg som du använder har uppdaterats i Butiken:", "ThereIsNewVersionAvailableForUpdate": "Det finns en ny version av Piwik tillgänglig för uppdatering", "TheUpgradeProcessMayFailExecuteCommand": "Om du har en stor Piwik databas, kanske uppdateringar tar för lång tid att köra i webbläsaren. I denna situation, kan du köra uppdateringar från din kommandorad: %s", diff --git a/plugins/CoreUpdater/lang/tl.json b/plugins/CoreUpdater/lang/tl.json index 725fe06b4e..62b47187bd 100644 --- a/plugins/CoreUpdater/lang/tl.json +++ b/plugins/CoreUpdater/lang/tl.json @@ -39,6 +39,7 @@ "TheFollowingDimensionsWillBeUpgradedX": "Ang sumusunod na dimensyon ay i-uupdate: %s", "ThereIsNewPluginVersionAvailableForUpdate": "Ang ilang mga plugin na iyong ginamit ay na-update sa Marketplace.", "ThereIsNewVersionAvailableForUpdate": "Mayroong bagong bersyon ng Piwik na available para sa pag-update", + "TheUpgradeProcessMayFailExecuteCommand": "Kung mayroon kang isang malaking Piwik database ang pag-uupdate ay maaring maging matagal sa browser. Sa ganitong sitwasyon maari kang gumamit ng command line upang makapag update: %s", "TheUpgradeProcessMayTakeAWhilePleaseBePatient": "Ang proseso ng pag-upgrade ng database ay maaaring matagalan kaya mangyaring maging mapagpasensya.", "UnpackingTheUpdate": "Pag-unpack sa update", "UpdateAutomatically": "Awtomatikong update", diff --git a/plugins/CoreUpdater/lang/zh-tw.json b/plugins/CoreUpdater/lang/zh-tw.json index b49ad2fdfc..e4aa286fd4 100644 --- a/plugins/CoreUpdater/lang/zh-tw.json +++ b/plugins/CoreUpdater/lang/zh-tw.json @@ -1,30 +1,30 @@ { "CoreUpdater": { "CheckingForPluginUpdates": "正在檢查外掛更新", - "ClickHereToViewSqlQueries": "點選這裡來查看並複製即將執行的 SQL 語法列表", - "CriticalErrorDuringTheUpgradeProcess": "在更新過程中發生嚴重的錯誤：", + "ClickHereToViewSqlQueries": "點擊這裡來查看並複製即將執行的 SQL 指令", + "CriticalErrorDuringTheUpgradeProcess": "在更新過程中發生嚴重錯誤：", "DatabaseUpgradeRequired": "資料庫需要升級", - "DisablingIncompatiblePlugins": "停用不兼容的插件：%s", + "DisablingIncompatiblePlugins": "停用不相容的插件：%s", "DownloadingUpdateFromX": "從 %s 下載更新中", "DownloadX": "下載 %s", "EmptyDatabaseError": "資料庫 %s 是空的。你可能要編輯或移除你的 Piwik 設定檔。", "ErrorDIYHelp": "如果你是進階使用者而且在升級資料庫時發生錯誤：", "ErrorDIYHelp_1": "辨識並修正問題來源（例如 memory_limit 或 max_execution_time）", - "ErrorDIYHelp_2": "執行剩下的在更新中失敗的查詢", + "ErrorDIYHelp_2": "執行剩下的在更新中失敗的指令", "ErrorDIYHelp_3": "手動更新你的 Piwik 資料庫內的「option」資料表，將 version_core 的值設定為更新失敗的版本。", - "ErrorDIYHelp_4": "重新執行更新程式（透過瀏覽器或指令列）來繼續剩餘的更新", - "ErrorDIYHelp_5": "回報問題（或解決辦法）以改善 Piwik", - "ErrorDuringPluginsUpdates": "外掛升級期間發生錯誤：", + "ErrorDIYHelp_4": "重新執行更新程式（透過瀏覽器或指令）來繼續剩餘的更新", + "ErrorDIYHelp_5": "回報問題（或解決方案）以改善 Piwik", + "ErrorDuringPluginsUpdates": "更新外掛時發生錯誤：", "ExceptionAlreadyLatestVersion": "你的 Piwik 版本 %s 是最新的。", "ExceptionArchiveEmpty": "空的檔案。", "ExceptionArchiveIncompatible": "不相容的檔案： %s", - "ExceptionArchiveIncomplete": "檔案是不完整的：遺失某些檔案（例如 %s）。", - "FeedbackRequest": "在這裡隨意分享你的創意或是建議給Piwik團隊：", - "HelpMessageContent": "請檢查 %1$s Piwik FAQ %2$s，其中已有更新過程中所發生的常見錯誤之解決辦法。%3$s 詢問你的系統管理員 - 他們應該可以協助你解決大部分關於伺服器或 MySQL 設定的問題。", - "HelpMessageIntroductionWhenError": "以上是核心錯誤訊息。它應該有助於解釋原因，但如果你需要進一步的說明請至：", - "HelpMessageIntroductionWhenWarning": "此次更新成功完成，但在過程中有發生一些問題。請閱讀以上說明的詳細內容。如需更進一步的說明：", + "ExceptionArchiveIncomplete": "檔案不完整：遺失某些檔案（例如 %s）。", + "FeedbackRequest": "在這裡隨意分享你的創意或是建議給 Piwik 團隊：", + "HelpMessageContent": "請檢查 %1$sPiwik FAQ%2$s，其中已有更新過程中所發生的常見錯誤之解決辦法。%3$s詢問你的系統管理員 - 他們應該可以協助你解決大部分關於伺服器或 MySQL 設定的問題。", + "HelpMessageIntroductionWhenError": "以上是核心錯誤訊息。它應該有助於解釋原因，但如果你需要進一步的說明請：", + "HelpMessageIntroductionWhenWarning": "更新成功完成，但在過程中有發生一些問題。請閱讀以上說明的詳細內容。如需更進一步的說明：", "HighTrafficPiwikServerEnableMaintenance": "如果你管理一個高流量的 Piwik 伺服器，我們建議%1$s暫時禁用訪客追踪功能，並把 Piwik 使用者界面設定為維護模式%2$s。", - "IncompatbilePluginsWillBeDisabledInfo": "注意：部分外掛和 Piwik %s 不相容。若那些外掛在市集上有更新時我們將會同步進行更新，否則我們將會在您升級時禁用。", + "IncompatbilePluginsWillBeDisabledInfo": "注意：部分外掛和 Piwik %s 不相容。若那些外掛在市集上有更新時我們將會同步進行更新，否則我們將會在你升級時禁用。", "InstallingTheLatestVersion": "正在安裝最新版本中", "LatestBetaRelease": "最新 Beta 版本", "LatestStableRelease": "最新穩定版本", @@ -37,16 +37,16 @@ "NeedHelpUpgrading": "升級 Piwik 時需要幫助？", "NeedHelpUpgradingText": "如果你在升級 Piwik 時需要幫助，Piwik 開發團隊會在這裡幫助你成功升級並給予完整說明、最佳做法以及後續的支援。%1$s現在聯絡 Piwik 專家們即可開始以安全的方式升級你的 Piwik。%2$s", "NoteForLargePiwikInstances": "大型 Piwik 網站重要注意事項", - "NotificationClickToUpdatePlugins": "現在點這裡去更新你的外掛：", - "NotificationClickToUpdateThemes": "現在點這裡去更新你的主題風格：", - "NotificationSubjectAvailableCoreUpdate": "新版本的Piwik %s 是可用的", - "NotificationSubjectAvailablePluginUpdate": "更新你可用的Piwik外掛插件", + "NotificationClickToUpdatePlugins": "點此立即更新外掛：", + "NotificationClickToUpdateThemes": "點此立即更新主題：", + "NotificationSubjectAvailableCoreUpdate": "新版本 Piwik %s 可用", + "NotificationSubjectAvailablePluginUpdate": "你的 Piwik 外掛有更新可用", "PiwikHasBeenSuccessfullyUpgraded": "Piwik 已成功更新！", "PiwikUpdatedSuccessfully": "Piwik 已成功更新！", "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwik 資料庫將從版本 %1$s 升級至新版本 %2$s 。", "ReadyToGo": "準備好了嗎？", "TheFollowingPluginsWillBeUpgradedX": "以下外掛將被更新：%s 。", - "TheFollowingDimensionsWillBeUpgradedX": "以下的尺寸將被更新：%s。", + "TheFollowingDimensionsWillBeUpgradedX": "以下維度將被更新：%s。", "ThereIsNewPluginVersionAvailableForUpdate": "有些你使用外掛在市集上已經有新版本：", "ThereIsNewVersionAvailableForUpdate": "已有新版的 Piwik 可以更新", "TheUpgradeProcessMayFailExecuteCommand": "如果你有較大型的 Piwik 資料庫，在瀏覽器上更新可能需要花費較長的時間。在這個情況下，你可以透過執行以下指令來更新：%s", @@ -54,29 +54,29 @@ "UnpackingTheUpdate": "正在解壓縮更新", "UpdateAutomatically": "自動更新", "UpdateHasBeenCancelledExplanation": "Piwik 一鍵更新已被取消。如果你無法修正以上的錯誤訊息，建議你手動更新 Piwik。%1$s請查看 %2$s更新文件%3$s 來開始吧！", - "UpdateTitle": "Piwik › 更新", + "UpdateTitle": "更新", "UpdatingPluginXToVersionY": "正在將外掛 %1$s 更新至版本 %2$s", "UpdateSuccessTitle": "Piwik 已成功更新！", "UpdateErrorTitle": "更新錯誤", - "ThankYouUpdatePiwik": "感謝您使用Piwik並保持更新！", - "PostUpdateMessage": "Piwik將永遠是免費下載並使用，但它需要你們繼續的支持成長及茁壯。", - "PostUpdateSupport": "如果你需要幫助使用Piwik，你可以從作者那邊獲得支持：", + "ThankYouUpdatePiwik": "感謝你使用 Piwik 並一直保持更新！", + "PostUpdateMessage": "Piwik 下載和使用將永遠免費，但它需要你們繼續支持以成長茁壯。", + "PostUpdateSupport": "如果你使用 Piwik 時需要幫助，你可以從作者那邊獲得支援：", "ServicesSupport": "服務＆支援", "CloudHosting": "雲端代管", "Updating": "更新中", - "UpdateUsingHttpsFailed": "在安全的HTTPS連線中下載最新的Piwik版本並沒有成功，因為下面的錯誤：", + "UpdateUsingHttpsFailed": "在安全的 HTTPS 連線中下載最新版本的 Piwik 並沒有成功，因為以下錯誤：", "UpdateUsingHttpsFailedHelp": "為什麼會失敗？下載最新 Piwik 版本（在安全的 HTTPS 連接之下）導致錯誤有很多種的原因，比如說，網路錯誤、網路速度較慢或是錯誤的系統配置。請注意，它也可能意味著你的服務器是 MITM 攻擊的目標，有人試圖用 Piwik 的惡意版本替換更新。", - "UpdateUsingHttpsFailedHelpWhatToDo": "它建議以重試並使用安全的HTTPS連接，因為它防止MITM攻擊下載。", - "UsingHttps": "使用安全的 HTTPS 連接（推薦）", - "UsingHttp": "使用非安全HTTP連接", + "UpdateUsingHttpsFailedHelpWhatToDo": "推薦重試並使用安全的 HTTPS 連線，因為它能預防 MITM 攻擊。", + "UsingHttps": "使用安全的 HTTPS 連線（推薦）", + "UsingHttp": "使用不安全的 HTTP 連線", "UpgradeComplete": "升級完成！", "UpgradePiwik": "升級 Piwik", "VerifyingUnpackedFiles": "正在驗證解壓縮後的檔案", "WarningMessages": "警告訊息：", "WeAutomaticallyDeactivatedTheFollowingPlugins": "我們自動停用了以下的外掛： %s", "YouCanUpgradeAutomaticallyOrDownloadPackage": "你可以自動更新至版本 %s ，或是下載壓縮檔並手動安裝它：", - "YouMustDownloadPackageOrFixPermissions": "Piwik 無法覆寫你當前的安裝。你可以直接修改目錄\/檔案權限，或是下載壓縮檔然後手動安裝 %s 版本：", + "YouMustDownloadPackageOrFixPermissions": "Piwik 無法覆寫你當前的安裝。你可以修改資料夾\/檔案權限，或是下載安裝包然後手動安裝版本 %s：", "YourDatabaseIsOutOfDate": "你的 Piwik 資料庫已經過期了，所以在繼續前必須先升級。", - "ViewVersionChangelog": "查看對於此版本的更新日誌：" + "ViewVersionChangelog": "查看此版本的更新紀錄：" } }
\ No newline at end of file diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject 8b0b11a887063354ab67e3366733ed5c19ab634 +Subproject d07f280155988915acb52fd03f2cd1b0639a2e7 diff --git a/plugins/CustomDimensions b/plugins/CustomDimensions -Subproject d74be369cc456fe9a7956dbb1e742588738d415 +Subproject 4e0fdd35cfece7be43b65191ff1f1ae71f0acb0 diff --git a/plugins/CustomPiwikJs/lang/zh-tw.json b/plugins/CustomPiwikJs/lang/zh-tw.json new file mode 100644 index 0000000000..8771e2974e --- /dev/null +++ b/plugins/CustomPiwikJs/lang/zh-tw.json @@ -0,0 +1,7 @@ +{ + "CustomPiwikJs": { + "DiagnosticPiwikJsWritable": "可寫的 JavaScript 追蹤（\/piwik.js）", + "DiagnosticPiwikJsNotWritable": "Piwik 的 JavaScript 追蹤檔案「\/piwik.js」不可寫入，這代表其他外掛無法擴展 JavaScript 追蹤。未來甚至有些核心功能會無法正常運作。", + "DiagnosticPiwikJsMakeWritable": "我們推薦讓 Piwik.js 可寫入，請執行此指令：%s" + } +}
\ No newline at end of file diff --git a/plugins/CustomVariables/lang/es.json b/plugins/CustomVariables/lang/es.json index fde28a873d..7952a1a1e7 100644 --- a/plugins/CustomVariables/lang/es.json +++ b/plugins/CustomVariables/lang/es.json @@ -7,6 +7,7 @@ "PluginDescription": "Variables Personalizadas (nombre, valor) son pares que se pueden asignar mediante la API de Javascript a los visitantes o cualquiera de sus acciones. Piwik luego informará el número de visitas, páginas, las conversiones para cada uno de estos nombres y valores personalizados. Vea las variables personalizadas detalladas para cada usuario y su acción en el registro de visitantes. <br \/> Requerida para utilizar la función de <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\"> Ecommerce Analytics <\/a>!", "ScopePage": "ámbito de la página", "ScopeVisit": "alcance de la visita", + "ManageDescription": "Esta visión general muestra todas las variantes personalizadas y su uso en los sitios '%s'. Los nombres dentro de cada espacio están clasificados por la frecuencia con que se utilizaron en su totalidad.", "ScopeX": "Ambito %s", "Index": "Indice", "Usages": "Usos", diff --git a/plugins/CustomVariables/lang/fr.json b/plugins/CustomVariables/lang/fr.json index 8f7dea60ee..bf785e9877 100644 --- a/plugins/CustomVariables/lang/fr.json +++ b/plugins/CustomVariables/lang/fr.json @@ -4,7 +4,7 @@ "ColumnCustomVariableValue": "Valeur de la variable personnalisée", "CustomVariables": "Variables personnalisées", "CustomVariablesReportDocumentation": "Ce rapport contient des informations à propos de vos Variables Personnalisées. Cliquez sur un nom de variable pour voir la répartition de la valeur. %1$s Pour plus d'informations à propos des variables personnalisées en général, lisez la %2$s documentation sur les variables personnalisées sur piwik.org%3$s", - "PluginDescription": "Les variables personnalisées sont des paires (nom, valeur) que vous pouvez assigner en utilisant l'API Javascript aux visiteurs ou n'importe quelle de leur action. Piwik rapportera ensuite le nombre de visites, pages, conversions pour chacune de ces noms et valeurs personnalisés. Voir les variables personnalisées détaillées pour chaque utilisateur et action dans le journal visiteur. <br \/>Nécessite d'utiliser la fonctionnalité <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Ecommerce Analytics<\/a> !", + "PluginDescription": "Les variables personnalisées sont des paires (nom, valeur) que vous pouvez assigner en utilisant l'API Javascript aux visiteurs ou n'importe quelle de leur action. Piwik rapportera ensuite le nombre de visites, pages, conversions pour chacune de ces noms et valeurs personnalisés. Voir les variables personnalisées détaillées pour chaque utilisateur et action dans le journal visiteur. <br \/>Nécessite d'utiliser la fonctionnalité <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">Ecommerce Analytics<\/a>!", "ScopePage": "Étendue page", "ScopeVisit": "Étendue visite", "ManageDescription": "Cette vue d'ensemble affiche tous les emplacements de variables personnalisées et leur utilisation pour le site web \"%s\". Les noms dans chacun des emplacements sont ordonnés par le nombre de fois qu'elles ont été utilisées au total.", diff --git a/plugins/CustomVariables/lang/zh-tw.json b/plugins/CustomVariables/lang/zh-tw.json index 1e43113e4b..726c0ae518 100644 --- a/plugins/CustomVariables/lang/zh-tw.json +++ b/plugins/CustomVariables/lang/zh-tw.json @@ -1,5 +1,24 @@ { "CustomVariables": { - "CustomVariables": "自訂變數" + "ColumnCustomVariableName": "自訂變數名稱", + "ColumnCustomVariableValue": "自訂變數值", + "CustomVariables": "自訂變數", + "CustomVariablesReportDocumentation": "這份報表包含你的自訂變數資訊。點擊變數名稱來查看分配的值。%1$s更多關於自訂變數的資訊請查看 %2$spiwik.org 上的自訂變數說明文件%3$s", + "PluginDescription": "自訂變數是透過 Javascript API 為訪客或他們的動作以 [名稱 => 值] 配對的。Piwik 接著會報告這些自訂名稱與值有多少訪問、頁面及轉換。在訪客紀錄中查看每位使用者和動作的自定變數詳情。<br \/>必須要使用 <a href=\"http:\/\/piwik.org\/docs\/ecommerce-analytics\/\">電子商務分析<\/a>功能！", + "ScopePage": "網頁範圍", + "ScopeVisit": "訪客範圍", + "ManageDescription": "這個總覽顯示「%s」的所有自訂變數和它們的用途。每個欄位中的名稱將以總使用次數來排序。", + "ScopeX": "%s 範圍", + "Index": "索引", + "Usages": "用途", + "Unused": "未使用", + "CreateNewSlot": "增加自訂變數可用的欄位", + "UsageDetails": "自從此網站建立後已有 %1$s 次訪問數和 %2$s 個活動。", + "CreatingCustomVariableTakesTime": "建立新的自訂變數欄位可能會花上較久的時間，取決於你的資料庫大小。因此這只可能透過指令列執行指令來達成。", + "CurrentAvailableCustomVariables": "目前每個網站最多可以建立 %s 個自訂變數。", + "ToCreateCustomVarExecute": "要建立新的自訂變數欄位請在 Piwik 安裝路徑執行以下指令：", + "SlotsReportIsGeneratedOverTime": "這份報表的資料將會被補充。可能會花上一到兩天來產生資料，並且花上數周才會有完整準確的報表。", + "MetricsAreOnlyAvailableForVisitScope": "注意：%1$s只有自訂變數的範圍有數據%2$s。", + "MetricsNotAvailableForPageScope": "自訂變數範圍 %1$s 中，欄位數據的值為 %2$s。" } }
\ No newline at end of file diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index 0660a4925d..5c5f0395b3 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -102,14 +102,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -165,11 +165,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/plugins/DBStats/lang/zh-tw.json b/plugins/DBStats/lang/zh-tw.json index 8a01279556..da69f49c8f 100644 --- a/plugins/DBStats/lang/zh-tw.json +++ b/plugins/DBStats/lang/zh-tw.json @@ -2,12 +2,20 @@ "DBStats": { "DatabaseUsage": "資料庫使用狀況", "DataSize": "資料大小", - "DBSize": "資料庫容量", + "DBSize": "資料庫大小", + "EstimatedSize": "預估大小", "IndexSize": "索引大小", - "LearnMore": "瞭解更多關於 Piwik 如何處理數據以及使 Piwik 在中高流量的網站上運作得宜，請查閱說明文件 %s。", - "MainDescription": "Piwik 儲存所有你的網站分析資料於 MySQL 資料庫中。目前， Piwik 資料表已經使用了 %s。", + "LearnMore": "要了解更多關於 Piwik 如何處理數據以及使 Piwik 在中高流量的網站上運作得宜，請查看說明文件 %s。", + "MainDescription": "Piwik 將你所有你的網站分析資料儲存於 MySQL 資料庫中。目前， Piwik 資料表已經使用了 %s。", + "MetricDataByYear": "年度數據資料表", + "MetricTables": "數據資料表", + "OtherTables": "其他資料表", + "PluginDescription": "提供 MySQL 資料庫詳細的使用情況報表。超級使用者可於診斷功能中查看。", + "ReportDataByYear": "年度報表資料表", + "ReportTables": "報表資料表", "RowCount": "資料列計數", - "Table": "表格", - "TotalSize": "總容量" + "Table": "資料表", + "TotalSize": "總大小", + "TrackerTables": "追蹤資料表" } }
\ No newline at end of file diff --git a/plugins/Dashboard/lang/zh-tw.json b/plugins/Dashboard/lang/zh-tw.json index 4374ed2264..460dd9be1d 100644 --- a/plugins/Dashboard/lang/zh-tw.json +++ b/plugins/Dashboard/lang/zh-tw.json @@ -1,37 +1,37 @@ { "Dashboard": { "AddAWidget": "新增小工具", - "AddPreviewedWidget": "將組件加入展示板", + "AddPreviewedWidget": "將小工具加入展示板", "ChangeDashboardLayout": "改變展示板版面", "CopyDashboardToUser": "將展示板複製給使用者", - "CreateNewDashboard": "建立新的展示板", + "CreateNewDashboard": "新增展示板", "Dashboard": "展示板", "DashboardCopied": "已成功將目前的展示板複製給選擇的使用者", - "DashboardEmptyNotification": "您的展示板沒有任何小工具。開始添加一些小工具，或是直接重置展示板，顯示預選的小工具。", + "DashboardEmptyNotification": "你的展示板還沒有任何小工具。開始添加一些小工具，或是直接重置展示板，使用預選的小工具。", "DashboardName": "展示板名稱：", "DashboardOf": "%s 的展示板", - "DefaultDashboard": "預設展示板 - 使用預選小工具以及欄位排版", - "DeleteWidgetConfirm": "您確定要從展示板中刪除此組件嗎？", + "DefaultDashboard": "預設展示板 - 使用預選小工具以及欄位版面", + "DeleteWidgetConfirm": "你確定要從展示板中刪除此小工具嗎？", "EmptyDashboard": "空白展示板 - 依你的喜好選擇小工具", - "LoadingWidget": "載入組件中，請稍候...", + "LoadingWidget": "小工具載入中，請稍候...", "ManageDashboard": "展示板管理", "Maximise": "最大化", "Minimise": "最小化", - "NotUndo": "您將無法還原此操作", - "PluginDescription": "您的網頁分析展示板。透過添加小工具來自定您的展示板，只需拖曳並放置即可改變展示板的欄位排版。每位使用者可以管理他們自己的展示板。", + "NotUndo": "你將無法還原此操作", + "PluginDescription": "你的網頁分析展示板。透過添加小工具來自定你的展示板，只需拖曳並放置即可改變展示板的欄位版面。每位使用者可以管理他們自己的展示板。", "RemoveDashboard": "移除展示板", - "RemoveDashboardConfirm": "您確定要移除展示板：%s？", + "RemoveDashboardConfirm": "你確定要移除展示板：%s？", "RemoveDefaultDashboardNotPossible": "無法移除預設展示板", "RenameDashboard": "重新命名展示板", "ResetDashboard": "重置展示板", - "ResetDashboardConfirm": "您確定要重置您的展示板，還原為預選小工具排版？", - "SelectDashboardLayout": "請選擇您新展示板的排版", - "SelectWidget": "請選取欲增加至展示板的組件", + "ResetDashboardConfirm": "你確定要重置你的展示板還原為預選小工具版面？", + "SelectDashboardLayout": "請選擇你新展示板的版面", + "SelectWidget": "選取欲增加至展示板的小工具", "SetAsDefaultWidgets": "設定為預選小工具", - "SetAsDefaultWidgetsConfirm": "您確定您要將目前選擇的小工具和展示板排版設定為預設的展示板模板？", - "SetAsDefaultWidgetsConfirmHelp": "這個小工具和展示板排版將於使用者建立的新展示板，或是使用 %s 功能時套用。", - "TopLinkTooltip": "查看 %s 專屬的網頁分析報表。", - "WidgetNotFound": "找不到組件", - "WidgetPreview": "組件預覽" + "SetAsDefaultWidgetsConfirm": "你確定要將目前選擇的小工具和展示板版面設定為預設的展示板模板？", + "SetAsDefaultWidgetsConfirmHelp": "這個小工具和展示板版面將於使用者建立的新展示板，或是使用 %s 功能時套用。", + "TopLinkTooltip": "查看 %s 的網頁分析報表。", + "WidgetNotFound": "找不到小工具", + "WidgetPreview": "小工具預覽" } }
\ No newline at end of file diff --git a/plugins/DevicePlugins/functions.php b/plugins/DevicePlugins/functions.php index 4cf77ab120..ad27e67b72 100644 --- a/plugins/DevicePlugins/functions.php +++ b/plugins/DevicePlugins/functions.php @@ -16,5 +16,5 @@ function getPluginsLogo($label) if ($label == Piwik::translate('General_Others')) { return false; } - return 'plugins/DevicePlugins/images/plugins/' . $label . '.gif'; + return 'plugins/DevicePlugins/images/plugins/' . $label . '.png'; } diff --git a/plugins/DevicePlugins/images/plugins/cookie.gif b/plugins/DevicePlugins/images/plugins/cookie.gif Binary files differdeleted file mode 100644 index b2dba70a34..0000000000 --- a/plugins/DevicePlugins/images/plugins/cookie.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/cookie.png b/plugins/DevicePlugins/images/plugins/cookie.png Binary files differnew file mode 100644 index 0000000000..6a2c66726b --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/cookie.png diff --git a/plugins/DevicePlugins/images/plugins/director.gif b/plugins/DevicePlugins/images/plugins/director.gif Binary files differdeleted file mode 100644 index aa77c91cdc..0000000000 --- a/plugins/DevicePlugins/images/plugins/director.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/director.png b/plugins/DevicePlugins/images/plugins/director.png Binary files differnew file mode 100644 index 0000000000..529b54402c --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/director.png diff --git a/plugins/DevicePlugins/images/plugins/flash.gif b/plugins/DevicePlugins/images/plugins/flash.gif Binary files differdeleted file mode 100644 index d96f58166e..0000000000 --- a/plugins/DevicePlugins/images/plugins/flash.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/flash.png b/plugins/DevicePlugins/images/plugins/flash.png Binary files differnew file mode 100644 index 0000000000..3c10ce920c --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/flash.png diff --git a/plugins/DevicePlugins/images/plugins/gears.gif b/plugins/DevicePlugins/images/plugins/gears.gif Binary files differdeleted file mode 100644 index 4767112184..0000000000 --- a/plugins/DevicePlugins/images/plugins/gears.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/gears.png b/plugins/DevicePlugins/images/plugins/gears.png Binary files differnew file mode 100644 index 0000000000..bcd3a408c0 --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/gears.png diff --git a/plugins/DevicePlugins/images/plugins/java.gif b/plugins/DevicePlugins/images/plugins/java.gif Binary files differdeleted file mode 100644 index 1606c5f2f7..0000000000 --- a/plugins/DevicePlugins/images/plugins/java.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/java.png b/plugins/DevicePlugins/images/plugins/java.png Binary files differnew file mode 100644 index 0000000000..ab07c395ed --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/java.png diff --git a/plugins/DevicePlugins/images/plugins/pdf.gif b/plugins/DevicePlugins/images/plugins/pdf.gif Binary files differdeleted file mode 100644 index 810f75d2bc..0000000000 --- a/plugins/DevicePlugins/images/plugins/pdf.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/pdf.png b/plugins/DevicePlugins/images/plugins/pdf.png Binary files differnew file mode 100644 index 0000000000..b3e5f6a5b0 --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/pdf.png diff --git a/plugins/DevicePlugins/images/plugins/quicktime.gif b/plugins/DevicePlugins/images/plugins/quicktime.gif Binary files differdeleted file mode 100644 index cefbbafbb6..0000000000 --- a/plugins/DevicePlugins/images/plugins/quicktime.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/quicktime.png b/plugins/DevicePlugins/images/plugins/quicktime.png Binary files differnew file mode 100644 index 0000000000..2b2b1f5a2b --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/quicktime.png diff --git a/plugins/DevicePlugins/images/plugins/realplayer.gif b/plugins/DevicePlugins/images/plugins/realplayer.gif Binary files differdeleted file mode 100644 index 2ed04565ab..0000000000 --- a/plugins/DevicePlugins/images/plugins/realplayer.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/realplayer.png b/plugins/DevicePlugins/images/plugins/realplayer.png Binary files differnew file mode 100644 index 0000000000..26b2695e35 --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/realplayer.png diff --git a/plugins/DevicePlugins/images/plugins/silverlight.gif b/plugins/DevicePlugins/images/plugins/silverlight.gif Binary files differdeleted file mode 100644 index 2a3a35cacb..0000000000 --- a/plugins/DevicePlugins/images/plugins/silverlight.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/silverlight.png b/plugins/DevicePlugins/images/plugins/silverlight.png Binary files differnew file mode 100644 index 0000000000..148279faf4 --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/silverlight.png diff --git a/plugins/DevicePlugins/images/plugins/windowsmedia.gif b/plugins/DevicePlugins/images/plugins/windowsmedia.gif Binary files differdeleted file mode 100644 index 92e72c9006..0000000000 --- a/plugins/DevicePlugins/images/plugins/windowsmedia.gif +++ /dev/null diff --git a/plugins/DevicePlugins/images/plugins/windowsmedia.png b/plugins/DevicePlugins/images/plugins/windowsmedia.png Binary files differnew file mode 100644 index 0000000000..b066b614a2 --- /dev/null +++ b/plugins/DevicePlugins/images/plugins/windowsmedia.png diff --git a/plugins/DevicePlugins/lang/fa.json b/plugins/DevicePlugins/lang/fa.json index 358132510f..a5e5513221 100644 --- a/plugins/DevicePlugins/lang/fa.json +++ b/plugins/DevicePlugins/lang/fa.json @@ -1,6 +1,7 @@ { "DevicePlugins": { "BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را فعال کنید", + "BrowserWithPluginsEnabled": "%1$s با پلاگین ها%2$s فعال کنید", "WidgetPlugins": "لیست افزونه ها", "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را." } diff --git a/plugins/DevicePlugins/lang/zh-tw.json b/plugins/DevicePlugins/lang/zh-tw.json index 315856a850..0624099c8b 100644 --- a/plugins/DevicePlugins/lang/zh-tw.json +++ b/plugins/DevicePlugins/lang/zh-tw.json @@ -1,6 +1,6 @@ { "DevicePlugins": { - "BrowserWithNoPluginsEnabled": "%1$s 無啟用任何外掛", + "BrowserWithNoPluginsEnabled": "%1$s 沒有啟用任何外掛", "BrowserWithPluginsEnabled": "%1$s 啟用外掛 %2$s", "PluginDescription": "顯示訪客的瀏覽器中所有啟用的外掛程式。", "PluginDetectionDoesNotWorkInIE": "注意：外掛偵測功能無法在比 Internet Explorer 11 舊的版本中運作。這份報表僅基於非 IE 瀏覽器或新版的 IE 來統計。", diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index e7ef1fe893..4f59edc8a9 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -80,7 +80,7 @@ function getBrowserName($label) */ function getBrowserLogo($short) { - $path = 'plugins/DevicesDetection/images/browsers/%s.gif'; + $path = 'plugins/DevicesDetection/images/browsers/%s.png'; // If name is given instead of short code, try to find matching shortcode if (strlen($short) > 2) { @@ -282,7 +282,7 @@ function _mapLegacyOsShortCodes($shortCode) */ function getOsLogo($short) { - $path = 'plugins/DevicesDetection/images/os/%s.gif'; + $path = 'plugins/DevicesDetection/images/os/%s.png'; $short = _mapLegacyOsShortCodes($short); diff --git a/plugins/DevicesDetection/images/browsers/36.gif b/plugins/DevicesDetection/images/browsers/36.gif Binary files differdeleted file mode 100644 index 1a0f246d20..0000000000 --- a/plugins/DevicesDetection/images/browsers/36.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/36.png b/plugins/DevicesDetection/images/browsers/36.png Binary files differnew file mode 100644 index 0000000000..7e388c8049 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/36.png diff --git a/plugins/DevicesDetection/images/browsers/3B.png b/plugins/DevicesDetection/images/browsers/3B.png Binary files differnew file mode 100644 index 0000000000..7e388c8049 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/3B.png diff --git a/plugins/DevicesDetection/images/browsers/AA.gif b/plugins/DevicesDetection/images/browsers/AA.gif Binary files differdeleted file mode 100644 index 9b78ba7292..0000000000 --- a/plugins/DevicesDetection/images/browsers/AA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AA.png b/plugins/DevicesDetection/images/browsers/AA.png Binary files differnew file mode 100644 index 0000000000..9e8e540307 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AA.png diff --git a/plugins/DevicesDetection/images/browsers/AB.gif b/plugins/DevicesDetection/images/browsers/AB.gif Binary files differdeleted file mode 100644 index 0e277b8e2d..0000000000 --- a/plugins/DevicesDetection/images/browsers/AB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AB.png b/plugins/DevicesDetection/images/browsers/AB.png Binary files differnew file mode 100644 index 0000000000..8ee185c4d0 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AB.png diff --git a/plugins/DevicesDetection/images/browsers/AG.gif b/plugins/DevicesDetection/images/browsers/AG.gif Binary files differdeleted file mode 100644 index 151b9a33c6..0000000000 --- a/plugins/DevicesDetection/images/browsers/AG.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AG.png b/plugins/DevicesDetection/images/browsers/AG.png Binary files differnew file mode 100644 index 0000000000..de9efe46cc --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AG.png diff --git a/plugins/DevicesDetection/images/browsers/AM.gif b/plugins/DevicesDetection/images/browsers/AM.gif Binary files differdeleted file mode 100644 index f38dd45077..0000000000 --- a/plugins/DevicesDetection/images/browsers/AM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AM.png b/plugins/DevicesDetection/images/browsers/AM.png Binary files differnew file mode 100644 index 0000000000..5faf598faf --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AM.png diff --git a/plugins/DevicesDetection/images/browsers/AN.gif b/plugins/DevicesDetection/images/browsers/AN.gif Binary files differdeleted file mode 100644 index bf0ade5551..0000000000 --- a/plugins/DevicesDetection/images/browsers/AN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AN.png b/plugins/DevicesDetection/images/browsers/AN.png Binary files differnew file mode 100644 index 0000000000..79c6385840 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AN.png diff --git a/plugins/DevicesDetection/images/browsers/AO.png b/plugins/DevicesDetection/images/browsers/AO.png Binary files differnew file mode 100644 index 0000000000..0456b1e10c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AO.png diff --git a/plugins/DevicesDetection/images/browsers/AR.gif b/plugins/DevicesDetection/images/browsers/AR.gif Binary files differdeleted file mode 100644 index 69c79b25a0..0000000000 --- a/plugins/DevicesDetection/images/browsers/AR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AR.png b/plugins/DevicesDetection/images/browsers/AR.png Binary files differnew file mode 100644 index 0000000000..6adb1db06c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AR.png diff --git a/plugins/DevicesDetection/images/browsers/AT.gif b/plugins/DevicesDetection/images/browsers/AT.gif Binary files differdeleted file mode 100644 index f1d9824afd..0000000000 --- a/plugins/DevicesDetection/images/browsers/AT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AT.png b/plugins/DevicesDetection/images/browsers/AT.png Binary files differnew file mode 100644 index 0000000000..03bcaca597 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AT.png diff --git a/plugins/DevicesDetection/images/browsers/AV.gif b/plugins/DevicesDetection/images/browsers/AV.gif Binary files differdeleted file mode 100644 index 2bee0af264..0000000000 --- a/plugins/DevicesDetection/images/browsers/AV.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AV.png b/plugins/DevicesDetection/images/browsers/AV.png Binary files differnew file mode 100644 index 0000000000..e024bad015 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AV.png diff --git a/plugins/DevicesDetection/images/browsers/AW.gif b/plugins/DevicesDetection/images/browsers/AW.gif Binary files differdeleted file mode 100644 index b7980bce3f..0000000000 --- a/plugins/DevicesDetection/images/browsers/AW.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/AW.png b/plugins/DevicesDetection/images/browsers/AW.png Binary files differnew file mode 100644 index 0000000000..0c437c160d --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/AW.png diff --git a/plugins/DevicesDetection/images/browsers/B2.gif b/plugins/DevicesDetection/images/browsers/B2.gif Binary files differdeleted file mode 100644 index dc732a8462..0000000000 --- a/plugins/DevicesDetection/images/browsers/B2.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BB.gif b/plugins/DevicesDetection/images/browsers/BB.gif Binary files differdeleted file mode 100644 index e8316ef586..0000000000 --- a/plugins/DevicesDetection/images/browsers/BB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BB.png b/plugins/DevicesDetection/images/browsers/BB.png Binary files differnew file mode 100644 index 0000000000..9febbfe9cf --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BB.png diff --git a/plugins/DevicesDetection/images/browsers/BD.gif b/plugins/DevicesDetection/images/browsers/BD.gif Binary files differdeleted file mode 100644 index 4f4e740562..0000000000 --- a/plugins/DevicesDetection/images/browsers/BD.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BD.png b/plugins/DevicesDetection/images/browsers/BD.png Binary files differnew file mode 100644 index 0000000000..9daf8f0bbd --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BD.png diff --git a/plugins/DevicesDetection/images/browsers/BE.gif b/plugins/DevicesDetection/images/browsers/BE.gif Binary files differdeleted file mode 100644 index 317112b4ca..0000000000 --- a/plugins/DevicesDetection/images/browsers/BE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BE.png b/plugins/DevicesDetection/images/browsers/BE.png Binary files differnew file mode 100644 index 0000000000..89fbce616b --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BE.png diff --git a/plugins/DevicesDetection/images/browsers/BJ.gif b/plugins/DevicesDetection/images/browsers/BJ.gif Binary files differdeleted file mode 100644 index 5324db57b9..0000000000 --- a/plugins/DevicesDetection/images/browsers/BJ.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BJ.png b/plugins/DevicesDetection/images/browsers/BJ.png Binary files differnew file mode 100644 index 0000000000..eeaf23a826 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BJ.png diff --git a/plugins/DevicesDetection/images/browsers/BK.png b/plugins/DevicesDetection/images/browsers/BK.png Binary files differnew file mode 100644 index 0000000000..46382173a9 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BK.png diff --git a/plugins/DevicesDetection/images/browsers/BL.png b/plugins/DevicesDetection/images/browsers/BL.png Binary files differnew file mode 100644 index 0000000000..7fb2cf73e7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BL.png diff --git a/plugins/DevicesDetection/images/browsers/BP.gif b/plugins/DevicesDetection/images/browsers/BP.gif Binary files differdeleted file mode 100644 index dc732a8462..0000000000 --- a/plugins/DevicesDetection/images/browsers/BP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BR.png b/plugins/DevicesDetection/images/browsers/BR.png Binary files differnew file mode 100644 index 0000000000..0cb1795957 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BR.png diff --git a/plugins/DevicesDetection/images/browsers/BS.gif b/plugins/DevicesDetection/images/browsers/BS.gif Binary files differdeleted file mode 100644 index 6a1d7bd1ed..0000000000 --- a/plugins/DevicesDetection/images/browsers/BS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BS.png b/plugins/DevicesDetection/images/browsers/BS.png Binary files differnew file mode 100644 index 0000000000..9daf8f0bbd --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BS.png diff --git a/plugins/DevicesDetection/images/browsers/BX.gif b/plugins/DevicesDetection/images/browsers/BX.gif Binary files differdeleted file mode 100644 index fde79bdaf3..0000000000 --- a/plugins/DevicesDetection/images/browsers/BX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/BX.png b/plugins/DevicesDetection/images/browsers/BX.png Binary files differnew file mode 100644 index 0000000000..54be00e9ef --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/BX.png diff --git a/plugins/DevicesDetection/images/browsers/CA.gif b/plugins/DevicesDetection/images/browsers/CA.gif Binary files differdeleted file mode 100644 index 3018ff3855..0000000000 --- a/plugins/DevicesDetection/images/browsers/CA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CA.png b/plugins/DevicesDetection/images/browsers/CA.png Binary files differnew file mode 100644 index 0000000000..ae2df04d2b --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CA.png diff --git a/plugins/DevicesDetection/images/browsers/CC.gif b/plugins/DevicesDetection/images/browsers/CC.gif Binary files differdeleted file mode 100644 index 36e362e891..0000000000 --- a/plugins/DevicesDetection/images/browsers/CC.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CC.png b/plugins/DevicesDetection/images/browsers/CC.png Binary files differnew file mode 100644 index 0000000000..c5ef24947b --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CC.png diff --git a/plugins/DevicesDetection/images/browsers/CD.gif b/plugins/DevicesDetection/images/browsers/CD.gif Binary files differdeleted file mode 100644 index dc98e39307..0000000000 --- a/plugins/DevicesDetection/images/browsers/CD.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CD.png b/plugins/DevicesDetection/images/browsers/CD.png Binary files differnew file mode 100644 index 0000000000..88aecb0c73 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CD.png diff --git a/plugins/DevicesDetection/images/browsers/CF.gif b/plugins/DevicesDetection/images/browsers/CF.gif Binary files differdeleted file mode 100644 index 793e0fad3b..0000000000 --- a/plugins/DevicesDetection/images/browsers/CF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CF.png b/plugins/DevicesDetection/images/browsers/CF.png Binary files differnew file mode 100644 index 0000000000..6bac5c24f7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CF.png diff --git a/plugins/DevicesDetection/images/browsers/CH.gif b/plugins/DevicesDetection/images/browsers/CH.gif Binary files differdeleted file mode 100644 index 793e0fad3b..0000000000 --- a/plugins/DevicesDetection/images/browsers/CH.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CH.png b/plugins/DevicesDetection/images/browsers/CH.png Binary files differnew file mode 100644 index 0000000000..6bac5c24f7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CH.png diff --git a/plugins/DevicesDetection/images/browsers/CI.png b/plugins/DevicesDetection/images/browsers/CI.png Binary files differnew file mode 100644 index 0000000000..6bac5c24f7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CI.png diff --git a/plugins/DevicesDetection/images/browsers/CK.gif b/plugins/DevicesDetection/images/browsers/CK.gif Binary files differdeleted file mode 100644 index 562a3406d0..0000000000 --- a/plugins/DevicesDetection/images/browsers/CK.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CK.png b/plugins/DevicesDetection/images/browsers/CK.png Binary files differnew file mode 100644 index 0000000000..78cd73f776 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CK.png diff --git a/plugins/DevicesDetection/images/browsers/CM.gif b/plugins/DevicesDetection/images/browsers/CM.gif Binary files differdeleted file mode 100644 index 793e0fad3b..0000000000 --- a/plugins/DevicesDetection/images/browsers/CM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CM.png b/plugins/DevicesDetection/images/browsers/CM.png Binary files differnew file mode 100644 index 0000000000..6bac5c24f7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CM.png diff --git a/plugins/DevicesDetection/images/browsers/CN.gif b/plugins/DevicesDetection/images/browsers/CN.gif Binary files differdeleted file mode 100644 index b3cdc7c202..0000000000 --- a/plugins/DevicesDetection/images/browsers/CN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CN.png b/plugins/DevicesDetection/images/browsers/CN.png Binary files differnew file mode 100644 index 0000000000..6e744e3cea --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CN.png diff --git a/plugins/DevicesDetection/images/browsers/CO.gif b/plugins/DevicesDetection/images/browsers/CO.gif Binary files differdeleted file mode 100644 index 98f684c6c0..0000000000 --- a/plugins/DevicesDetection/images/browsers/CO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CO.png b/plugins/DevicesDetection/images/browsers/CO.png Binary files differnew file mode 100644 index 0000000000..1e3b7035e3 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CO.png diff --git a/plugins/DevicesDetection/images/browsers/CP.gif b/plugins/DevicesDetection/images/browsers/CP.gif Binary files differdeleted file mode 100644 index cb0b2db808..0000000000 --- a/plugins/DevicesDetection/images/browsers/CP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CP.png b/plugins/DevicesDetection/images/browsers/CP.png Binary files differnew file mode 100644 index 0000000000..6e744e3cea --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CP.png diff --git a/plugins/DevicesDetection/images/browsers/CR.gif b/plugins/DevicesDetection/images/browsers/CR.gif Binary files differdeleted file mode 100644 index 7df03605da..0000000000 --- a/plugins/DevicesDetection/images/browsers/CR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CR.png b/plugins/DevicesDetection/images/browsers/CR.png Binary files differnew file mode 100644 index 0000000000..9edd343b85 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/CR.png diff --git a/plugins/DevicesDetection/images/browsers/CS.gif b/plugins/DevicesDetection/images/browsers/CS.gif Binary files differdeleted file mode 100644 index 10fb8f7bc1..0000000000 --- a/plugins/DevicesDetection/images/browsers/CS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/CX.gif b/plugins/DevicesDetection/images/browsers/CX.gif Binary files differdeleted file mode 100644 index b2e2d2066f..0000000000 --- a/plugins/DevicesDetection/images/browsers/CX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DE.gif b/plugins/DevicesDetection/images/browsers/DE.gif Binary files differdeleted file mode 100644 index e08326c3d7..0000000000 --- a/plugins/DevicesDetection/images/browsers/DE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DE.png b/plugins/DevicesDetection/images/browsers/DE.png Binary files differnew file mode 100644 index 0000000000..e5795948a4 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/DE.png diff --git a/plugins/DevicesDetection/images/browsers/DF.gif b/plugins/DevicesDetection/images/browsers/DF.gif Binary files differdeleted file mode 100644 index 56ce414c2f..0000000000 --- a/plugins/DevicesDetection/images/browsers/DF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DF.png b/plugins/DevicesDetection/images/browsers/DF.png Binary files differnew file mode 100644 index 0000000000..25fe4a23be --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/DF.png diff --git a/plugins/DevicesDetection/images/browsers/DI.gif b/plugins/DevicesDetection/images/browsers/DI.gif Binary files differdeleted file mode 100644 index 621d12fc0a..0000000000 --- a/plugins/DevicesDetection/images/browsers/DI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/DI.png b/plugins/DevicesDetection/images/browsers/DI.png Binary files differnew file mode 100644 index 0000000000..d81b1df934 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/DI.png diff --git a/plugins/DevicesDetection/images/browsers/EL.gif b/plugins/DevicesDetection/images/browsers/EL.gif Binary files differdeleted file mode 100644 index f5053e9e0e..0000000000 --- a/plugins/DevicesDetection/images/browsers/EL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/EL.png b/plugins/DevicesDetection/images/browsers/EL.png Binary files differnew file mode 100644 index 0000000000..a4e54b3aab --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/EL.png diff --git a/plugins/DevicesDetection/images/browsers/EP.gif b/plugins/DevicesDetection/images/browsers/EP.gif Binary files differdeleted file mode 100644 index 9759cd60ad..0000000000 --- a/plugins/DevicesDetection/images/browsers/EP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/EP.png b/plugins/DevicesDetection/images/browsers/EP.png Binary files differnew file mode 100644 index 0000000000..fc7bfd791b --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/EP.png diff --git a/plugins/DevicesDetection/images/browsers/ES.gif b/plugins/DevicesDetection/images/browsers/ES.gif Binary files differdeleted file mode 100644 index fad9cac483..0000000000 --- a/plugins/DevicesDetection/images/browsers/ES.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ES.png b/plugins/DevicesDetection/images/browsers/ES.png Binary files differnew file mode 100644 index 0000000000..cf318a8381 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/ES.png diff --git a/plugins/DevicesDetection/images/browsers/FB.gif b/plugins/DevicesDetection/images/browsers/FB.gif Binary files differdeleted file mode 100644 index e965479d41..0000000000 --- a/plugins/DevicesDetection/images/browsers/FB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FB.png b/plugins/DevicesDetection/images/browsers/FB.png Binary files differnew file mode 100644 index 0000000000..db8c135542 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FB.png diff --git a/plugins/DevicesDetection/images/browsers/FD.gif b/plugins/DevicesDetection/images/browsers/FD.gif Binary files differdeleted file mode 100644 index 2265625c6e..0000000000 --- a/plugins/DevicesDetection/images/browsers/FD.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FD.png b/plugins/DevicesDetection/images/browsers/FD.png Binary files differnew file mode 100644 index 0000000000..9c12a4f7e7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FD.png diff --git a/plugins/DevicesDetection/images/browsers/FE.gif b/plugins/DevicesDetection/images/browsers/FE.gif Binary files differdeleted file mode 100644 index 0613d71812..0000000000 --- a/plugins/DevicesDetection/images/browsers/FE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FE.png b/plugins/DevicesDetection/images/browsers/FE.png Binary files differnew file mode 100644 index 0000000000..192db90a2d --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FE.png diff --git a/plugins/DevicesDetection/images/browsers/FF.gif b/plugins/DevicesDetection/images/browsers/FF.gif Binary files differdeleted file mode 100644 index eb024c408a..0000000000 --- a/plugins/DevicesDetection/images/browsers/FF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FF.png b/plugins/DevicesDetection/images/browsers/FF.png Binary files differnew file mode 100644 index 0000000000..099d5689a9 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FF.png diff --git a/plugins/DevicesDetection/images/browsers/FL.gif b/plugins/DevicesDetection/images/browsers/FL.gif Binary files differdeleted file mode 100644 index ed58dab179..0000000000 --- a/plugins/DevicesDetection/images/browsers/FL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FL.png b/plugins/DevicesDetection/images/browsers/FL.png Binary files differnew file mode 100644 index 0000000000..81c58dad55 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FL.png diff --git a/plugins/DevicesDetection/images/browsers/FN.gif b/plugins/DevicesDetection/images/browsers/FN.gif Binary files differdeleted file mode 100644 index 183dced4d7..0000000000 --- a/plugins/DevicesDetection/images/browsers/FN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/FN.png b/plugins/DevicesDetection/images/browsers/FN.png Binary files differnew file mode 100644 index 0000000000..93ca6276e4 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FN.png diff --git a/plugins/DevicesDetection/images/browsers/FW.png b/plugins/DevicesDetection/images/browsers/FW.png Binary files differnew file mode 100644 index 0000000000..876481f867 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/FW.png diff --git a/plugins/DevicesDetection/images/browsers/GA.gif b/plugins/DevicesDetection/images/browsers/GA.gif Binary files differdeleted file mode 100644 index 71605dfaeb..0000000000 --- a/plugins/DevicesDetection/images/browsers/GA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/GA.png b/plugins/DevicesDetection/images/browsers/GA.png Binary files differnew file mode 100644 index 0000000000..5ef97f3d89 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/GA.png diff --git a/plugins/DevicesDetection/images/browsers/GE.gif b/plugins/DevicesDetection/images/browsers/GE.gif Binary files differdeleted file mode 100644 index 53e8f45f93..0000000000 --- a/plugins/DevicesDetection/images/browsers/GE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/GE.png b/plugins/DevicesDetection/images/browsers/GE.png Binary files differnew file mode 100644 index 0000000000..51fb7c4eda --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/GE.png diff --git a/plugins/DevicesDetection/images/browsers/HA.gif b/plugins/DevicesDetection/images/browsers/HA.gif Binary files differdeleted file mode 100644 index 3eb4ac609b..0000000000 --- a/plugins/DevicesDetection/images/browsers/HA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/HJ.gif b/plugins/DevicesDetection/images/browsers/HJ.gif Binary files differdeleted file mode 100644 index f599043733..0000000000 --- a/plugins/DevicesDetection/images/browsers/HJ.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/HJ.png b/plugins/DevicesDetection/images/browsers/HJ.png Binary files differnew file mode 100644 index 0000000000..025577be2b --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/HJ.png diff --git a/plugins/DevicesDetection/images/browsers/IA.gif b/plugins/DevicesDetection/images/browsers/IA.gif Binary files differdeleted file mode 100644 index 83aad8b1c6..0000000000 --- a/plugins/DevicesDetection/images/browsers/IA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IA.png b/plugins/DevicesDetection/images/browsers/IA.png Binary files differnew file mode 100644 index 0000000000..25dfd29003 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IA.png diff --git a/plugins/DevicesDetection/images/browsers/IB.gif b/plugins/DevicesDetection/images/browsers/IB.gif Binary files differdeleted file mode 100644 index ed3f7f7e07..0000000000 --- a/plugins/DevicesDetection/images/browsers/IB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IB.png b/plugins/DevicesDetection/images/browsers/IB.png Binary files differnew file mode 100644 index 0000000000..a803577ab7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IB.png diff --git a/plugins/DevicesDetection/images/browsers/IC.gif b/plugins/DevicesDetection/images/browsers/IC.gif Binary files differdeleted file mode 100644 index e3e1b69753..0000000000 --- a/plugins/DevicesDetection/images/browsers/IC.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IC.png b/plugins/DevicesDetection/images/browsers/IC.png Binary files differnew file mode 100644 index 0000000000..6d16304510 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IC.png diff --git a/plugins/DevicesDetection/images/browsers/ID.gif b/plugins/DevicesDetection/images/browsers/ID.gif Binary files differdeleted file mode 100644 index b6e614da48..0000000000 --- a/plugins/DevicesDetection/images/browsers/ID.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ID.png b/plugins/DevicesDetection/images/browsers/ID.png Binary files differnew file mode 100644 index 0000000000..f81132778c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/ID.png diff --git a/plugins/DevicesDetection/images/browsers/IE.gif b/plugins/DevicesDetection/images/browsers/IE.gif Binary files differdeleted file mode 100644 index 26f2f8fe30..0000000000 --- a/plugins/DevicesDetection/images/browsers/IE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IE.png b/plugins/DevicesDetection/images/browsers/IE.png Binary files differnew file mode 100644 index 0000000000..a0cfd5a91d --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IE.png diff --git a/plugins/DevicesDetection/images/browsers/IM.gif b/plugins/DevicesDetection/images/browsers/IM.gif Binary files differdeleted file mode 100644 index 26f2f8fe30..0000000000 --- a/plugins/DevicesDetection/images/browsers/IM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IM.png b/plugins/DevicesDetection/images/browsers/IM.png Binary files differnew file mode 100644 index 0000000000..7f579b7cfd --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IM.png diff --git a/plugins/DevicesDetection/images/browsers/IR.gif b/plugins/DevicesDetection/images/browsers/IR.gif Binary files differdeleted file mode 100644 index fd58198194..0000000000 --- a/plugins/DevicesDetection/images/browsers/IR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IR.png b/plugins/DevicesDetection/images/browsers/IR.png Binary files differnew file mode 100644 index 0000000000..97f591a8d9 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IR.png diff --git a/plugins/DevicesDetection/images/browsers/IV.png b/plugins/DevicesDetection/images/browsers/IV.png Binary files differnew file mode 100644 index 0000000000..3968d702ea --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IV.png diff --git a/plugins/DevicesDetection/images/browsers/IW.gif b/plugins/DevicesDetection/images/browsers/IW.gif Binary files differdeleted file mode 100644 index ef1b5c0711..0000000000 --- a/plugins/DevicesDetection/images/browsers/IW.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/IW.png b/plugins/DevicesDetection/images/browsers/IW.png Binary files differnew file mode 100644 index 0000000000..232cabc95f --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/IW.png diff --git a/plugins/DevicesDetection/images/browsers/JI.png b/plugins/DevicesDetection/images/browsers/JI.png Binary files differnew file mode 100644 index 0000000000..d0aea6052d --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/JI.png diff --git a/plugins/DevicesDetection/images/browsers/JS.png b/plugins/DevicesDetection/images/browsers/JS.png Binary files differnew file mode 100644 index 0000000000..0b04a90087 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/JS.png diff --git a/plugins/DevicesDetection/images/browsers/KI.gif b/plugins/DevicesDetection/images/browsers/KI.gif Binary files differdeleted file mode 100644 index 3be12eac66..0000000000 --- a/plugins/DevicesDetection/images/browsers/KI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KI.png b/plugins/DevicesDetection/images/browsers/KI.png Binary files differnew file mode 100644 index 0000000000..e23dbef9a1 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/KI.png diff --git a/plugins/DevicesDetection/images/browsers/KM.gif b/plugins/DevicesDetection/images/browsers/KM.gif Binary files differdeleted file mode 100644 index 100e5cbbf5..0000000000 --- a/plugins/DevicesDetection/images/browsers/KM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KM.png b/plugins/DevicesDetection/images/browsers/KM.png Binary files differnew file mode 100644 index 0000000000..ca26a7a776 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/KM.png diff --git a/plugins/DevicesDetection/images/browsers/KO.gif b/plugins/DevicesDetection/images/browsers/KO.gif Binary files differdeleted file mode 100644 index 359fd78ec4..0000000000 --- a/plugins/DevicesDetection/images/browsers/KO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KO.png b/plugins/DevicesDetection/images/browsers/KO.png Binary files differnew file mode 100644 index 0000000000..d3e75a66fb --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/KO.png diff --git a/plugins/DevicesDetection/images/browsers/KP.gif b/plugins/DevicesDetection/images/browsers/KP.gif Binary files differdeleted file mode 100644 index 6d54c7f116..0000000000 --- a/plugins/DevicesDetection/images/browsers/KP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KP.png b/plugins/DevicesDetection/images/browsers/KP.png Binary files differnew file mode 100644 index 0000000000..30a2ace214 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/KP.png diff --git a/plugins/DevicesDetection/images/browsers/KY.gif b/plugins/DevicesDetection/images/browsers/KY.gif Binary files differdeleted file mode 100644 index 9d14605aca..0000000000 --- a/plugins/DevicesDetection/images/browsers/KY.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KY.png b/plugins/DevicesDetection/images/browsers/KY.png Binary files differnew file mode 100644 index 0000000000..8bdc38e8ec --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/KY.png diff --git a/plugins/DevicesDetection/images/browsers/KZ.gif b/plugins/DevicesDetection/images/browsers/KZ.gif Binary files differdeleted file mode 100644 index 76ea10e03f..0000000000 --- a/plugins/DevicesDetection/images/browsers/KZ.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/KZ.png b/plugins/DevicesDetection/images/browsers/KZ.png Binary files differnew file mode 100644 index 0000000000..41af2edc16 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/KZ.png diff --git a/plugins/DevicesDetection/images/browsers/LB.gif b/plugins/DevicesDetection/images/browsers/LB.gif Binary files differdeleted file mode 100644 index 10379bdd5d..0000000000 --- a/plugins/DevicesDetection/images/browsers/LB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LB.png b/plugins/DevicesDetection/images/browsers/LB.png Binary files differnew file mode 100644 index 0000000000..2157f3c3ab --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/LB.png diff --git a/plugins/DevicesDetection/images/browsers/LG.gif b/plugins/DevicesDetection/images/browsers/LG.gif Binary files differdeleted file mode 100644 index ed8e5c0c22..0000000000 --- a/plugins/DevicesDetection/images/browsers/LG.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LG.png b/plugins/DevicesDetection/images/browsers/LG.png Binary files differnew file mode 100644 index 0000000000..fc2bf99a07 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/LG.png diff --git a/plugins/DevicesDetection/images/browsers/LI.gif b/plugins/DevicesDetection/images/browsers/LI.gif Binary files differdeleted file mode 100644 index 0dc31911be..0000000000 --- a/plugins/DevicesDetection/images/browsers/LI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LI.png b/plugins/DevicesDetection/images/browsers/LI.png Binary files differnew file mode 100644 index 0000000000..d678dc5596 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/LI.png diff --git a/plugins/DevicesDetection/images/browsers/LS.gif b/plugins/DevicesDetection/images/browsers/LS.gif Binary files differdeleted file mode 100644 index c5f58ad4f0..0000000000 --- a/plugins/DevicesDetection/images/browsers/LS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LS.png b/plugins/DevicesDetection/images/browsers/LS.png Binary files differnew file mode 100644 index 0000000000..b5e82bd54c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/LS.png diff --git a/plugins/DevicesDetection/images/browsers/LX.gif b/plugins/DevicesDetection/images/browsers/LX.gif Binary files differdeleted file mode 100644 index 0dc31911be..0000000000 --- a/plugins/DevicesDetection/images/browsers/LX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/LX.png b/plugins/DevicesDetection/images/browsers/LX.png Binary files differnew file mode 100644 index 0000000000..804614158e --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/LX.png diff --git a/plugins/DevicesDetection/images/browsers/MB.png b/plugins/DevicesDetection/images/browsers/MB.png Binary files differnew file mode 100644 index 0000000000..ff43e26ff7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MB.png diff --git a/plugins/DevicesDetection/images/browsers/MC.gif b/plugins/DevicesDetection/images/browsers/MC.gif Binary files differdeleted file mode 100644 index a359a22416..0000000000 --- a/plugins/DevicesDetection/images/browsers/MC.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MC.png b/plugins/DevicesDetection/images/browsers/MC.png Binary files differnew file mode 100644 index 0000000000..e7e73bc265 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MC.png diff --git a/plugins/DevicesDetection/images/browsers/ME.png b/plugins/DevicesDetection/images/browsers/ME.png Binary files differnew file mode 100644 index 0000000000..a867267343 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/ME.png diff --git a/plugins/DevicesDetection/images/browsers/MF.gif b/plugins/DevicesDetection/images/browsers/MF.gif Binary files differdeleted file mode 100644 index 4d0eef37a7..0000000000 --- a/plugins/DevicesDetection/images/browsers/MF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MF.png b/plugins/DevicesDetection/images/browsers/MF.png Binary files differnew file mode 100644 index 0000000000..b4ffe6d7a7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MF.png diff --git a/plugins/DevicesDetection/images/browsers/MI.gif b/plugins/DevicesDetection/images/browsers/MI.gif Binary files differdeleted file mode 100644 index ab797816ab..0000000000 --- a/plugins/DevicesDetection/images/browsers/MI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MI.png b/plugins/DevicesDetection/images/browsers/MI.png Binary files differnew file mode 100644 index 0000000000..a0d7ed1f9d --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MI.png diff --git a/plugins/DevicesDetection/images/browsers/MO.gif b/plugins/DevicesDetection/images/browsers/MO.gif Binary files differdeleted file mode 100644 index 21fad4d28c..0000000000 --- a/plugins/DevicesDetection/images/browsers/MO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MS.gif b/plugins/DevicesDetection/images/browsers/MS.gif Binary files differdeleted file mode 100644 index cb42ed6892..0000000000 --- a/plugins/DevicesDetection/images/browsers/MS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MS.png b/plugins/DevicesDetection/images/browsers/MS.png Binary files differnew file mode 100644 index 0000000000..3088f3fa1e --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MS.png diff --git a/plugins/DevicesDetection/images/browsers/MU.gif b/plugins/DevicesDetection/images/browsers/MU.gif Binary files differdeleted file mode 100644 index bdc98c5f0c..0000000000 --- a/plugins/DevicesDetection/images/browsers/MU.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MU.png b/plugins/DevicesDetection/images/browsers/MU.png Binary files differnew file mode 100644 index 0000000000..7e388c8049 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MU.png diff --git a/plugins/DevicesDetection/images/browsers/MX.gif b/plugins/DevicesDetection/images/browsers/MX.gif Binary files differdeleted file mode 100644 index b775666fa7..0000000000 --- a/plugins/DevicesDetection/images/browsers/MX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/MX.png b/plugins/DevicesDetection/images/browsers/MX.png Binary files differnew file mode 100644 index 0000000000..7b96c1ee62 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/MX.png diff --git a/plugins/DevicesDetection/images/browsers/NB.gif b/plugins/DevicesDetection/images/browsers/NB.gif Binary files differdeleted file mode 100644 index 3d87e9f4bc..0000000000 --- a/plugins/DevicesDetection/images/browsers/NB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NB.png b/plugins/DevicesDetection/images/browsers/NB.png Binary files differnew file mode 100644 index 0000000000..70e444f7d6 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NB.png diff --git a/plugins/DevicesDetection/images/browsers/NF.gif b/plugins/DevicesDetection/images/browsers/NF.gif Binary files differdeleted file mode 100644 index 8ad4aff666..0000000000 --- a/plugins/DevicesDetection/images/browsers/NF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NF.png b/plugins/DevicesDetection/images/browsers/NF.png Binary files differnew file mode 100644 index 0000000000..4e47798961 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NF.png diff --git a/plugins/DevicesDetection/images/browsers/NL.gif b/plugins/DevicesDetection/images/browsers/NL.gif Binary files differdeleted file mode 100644 index a319b89783..0000000000 --- a/plugins/DevicesDetection/images/browsers/NL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NL.png b/plugins/DevicesDetection/images/browsers/NL.png Binary files differnew file mode 100644 index 0000000000..1143e3ae50 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NL.png diff --git a/plugins/DevicesDetection/images/browsers/NO.png b/plugins/DevicesDetection/images/browsers/NO.png Binary files differnew file mode 100644 index 0000000000..70e444f7d6 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NO.png diff --git a/plugins/DevicesDetection/images/browsers/NP.gif b/plugins/DevicesDetection/images/browsers/NP.gif Binary files differdeleted file mode 100644 index c18d4d31f5..0000000000 --- a/plugins/DevicesDetection/images/browsers/NP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NP.png b/plugins/DevicesDetection/images/browsers/NP.png Binary files differnew file mode 100644 index 0000000000..8a5500d69f --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NP.png diff --git a/plugins/DevicesDetection/images/browsers/NS.gif b/plugins/DevicesDetection/images/browsers/NS.gif Binary files differdeleted file mode 100644 index 5c57cdb283..0000000000 --- a/plugins/DevicesDetection/images/browsers/NS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/NS.png b/plugins/DevicesDetection/images/browsers/NS.png Binary files differnew file mode 100644 index 0000000000..ba5048f1fb --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NS.png diff --git a/plugins/DevicesDetection/images/browsers/NV.png b/plugins/DevicesDetection/images/browsers/NV.png Binary files differnew file mode 100644 index 0000000000..70e444f7d6 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/NV.png diff --git a/plugins/DevicesDetection/images/browsers/OB.gif b/plugins/DevicesDetection/images/browsers/OB.gif Binary files differdeleted file mode 100644 index a9c1a6f413..0000000000 --- a/plugins/DevicesDetection/images/browsers/OB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OB.png b/plugins/DevicesDetection/images/browsers/OB.png Binary files differnew file mode 100644 index 0000000000..a7def9c056 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OB.png diff --git a/plugins/DevicesDetection/images/browsers/OE.gif b/plugins/DevicesDetection/images/browsers/OE.gif Binary files differdeleted file mode 100644 index f90d5445f3..0000000000 --- a/plugins/DevicesDetection/images/browsers/OE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OE.png b/plugins/DevicesDetection/images/browsers/OE.png Binary files differnew file mode 100644 index 0000000000..636f7a3260 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OE.png diff --git a/plugins/DevicesDetection/images/browsers/OF.gif b/plugins/DevicesDetection/images/browsers/OF.gif Binary files differdeleted file mode 100644 index 58319a5d99..0000000000 --- a/plugins/DevicesDetection/images/browsers/OF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OF.png b/plugins/DevicesDetection/images/browsers/OF.png Binary files differnew file mode 100644 index 0000000000..aaf5d7aa2c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OF.png diff --git a/plugins/DevicesDetection/images/browsers/OI.gif b/plugins/DevicesDetection/images/browsers/OI.gif Binary files differdeleted file mode 100644 index 1f5cb3ee3d..0000000000 --- a/plugins/DevicesDetection/images/browsers/OI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OI.png b/plugins/DevicesDetection/images/browsers/OI.png Binary files differnew file mode 100644 index 0000000000..ffc9db9f2f --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OI.png diff --git a/plugins/DevicesDetection/images/browsers/OM.png b/plugins/DevicesDetection/images/browsers/OM.png Binary files differnew file mode 100644 index 0000000000..9bf6af61bd --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OM.png diff --git a/plugins/DevicesDetection/images/browsers/ON.gif b/plugins/DevicesDetection/images/browsers/ON.gif Binary files differdeleted file mode 100644 index 55e2dedb3c..0000000000 --- a/plugins/DevicesDetection/images/browsers/ON.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/ON.png b/plugins/DevicesDetection/images/browsers/ON.png Binary files differnew file mode 100644 index 0000000000..e02682d853 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/ON.png diff --git a/plugins/DevicesDetection/images/browsers/OP.gif b/plugins/DevicesDetection/images/browsers/OP.gif Binary files differdeleted file mode 100644 index ec422377da..0000000000 --- a/plugins/DevicesDetection/images/browsers/OP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OP.png b/plugins/DevicesDetection/images/browsers/OP.png Binary files differnew file mode 100644 index 0000000000..9bf6af61bd --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OP.png diff --git a/plugins/DevicesDetection/images/browsers/OR.gif b/plugins/DevicesDetection/images/browsers/OR.gif Binary files differdeleted file mode 100644 index 5b18e64798..0000000000 --- a/plugins/DevicesDetection/images/browsers/OR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OR.png b/plugins/DevicesDetection/images/browsers/OR.png Binary files differnew file mode 100644 index 0000000000..51a86f5ddf --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OR.png diff --git a/plugins/DevicesDetection/images/browsers/OT.gif b/plugins/DevicesDetection/images/browsers/OT.gif Binary files differdeleted file mode 100644 index 068d88fa29..0000000000 --- a/plugins/DevicesDetection/images/browsers/OT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OT.png b/plugins/DevicesDetection/images/browsers/OT.png Binary files differnew file mode 100644 index 0000000000..66ca6c2725 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OT.png diff --git a/plugins/DevicesDetection/images/browsers/OV.gif b/plugins/DevicesDetection/images/browsers/OV.gif Binary files differdeleted file mode 100644 index e40a9bc71f..0000000000 --- a/plugins/DevicesDetection/images/browsers/OV.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OV.png b/plugins/DevicesDetection/images/browsers/OV.png Binary files differnew file mode 100644 index 0000000000..e3345e8fcb --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OV.png diff --git a/plugins/DevicesDetection/images/browsers/OW.gif b/plugins/DevicesDetection/images/browsers/OW.gif Binary files differdeleted file mode 100644 index 44067148ab..0000000000 --- a/plugins/DevicesDetection/images/browsers/OW.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/OW.png b/plugins/DevicesDetection/images/browsers/OW.png Binary files differnew file mode 100644 index 0000000000..f0454528f4 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/OW.png diff --git a/plugins/DevicesDetection/images/browsers/PA.png b/plugins/DevicesDetection/images/browsers/PA.png Binary files differnew file mode 100644 index 0000000000..3c051b50d5 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PA.png diff --git a/plugins/DevicesDetection/images/browsers/PL.gif b/plugins/DevicesDetection/images/browsers/PL.gif Binary files differdeleted file mode 100644 index f8b83f26ad..0000000000 --- a/plugins/DevicesDetection/images/browsers/PL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PL.png b/plugins/DevicesDetection/images/browsers/PL.png Binary files differnew file mode 100644 index 0000000000..3c051b50d5 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PL.png diff --git a/plugins/DevicesDetection/images/browsers/PM.gif b/plugins/DevicesDetection/images/browsers/PM.gif Binary files differdeleted file mode 100644 index 69ed94dbaf..0000000000 --- a/plugins/DevicesDetection/images/browsers/PM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PM.png b/plugins/DevicesDetection/images/browsers/PM.png Binary files differnew file mode 100644 index 0000000000..2fa25e484c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PM.png diff --git a/plugins/DevicesDetection/images/browsers/PO.gif b/plugins/DevicesDetection/images/browsers/PO.gif Binary files differdeleted file mode 100644 index 0747f55675..0000000000 --- a/plugins/DevicesDetection/images/browsers/PO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PO.png b/plugins/DevicesDetection/images/browsers/PO.png Binary files differnew file mode 100644 index 0000000000..47983b13c4 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PO.png diff --git a/plugins/DevicesDetection/images/browsers/PR.png b/plugins/DevicesDetection/images/browsers/PR.png Binary files differnew file mode 100644 index 0000000000..3c051b50d5 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PR.png diff --git a/plugins/DevicesDetection/images/browsers/PS.png b/plugins/DevicesDetection/images/browsers/PS.png Binary files differnew file mode 100644 index 0000000000..71e70e21b4 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PS.png diff --git a/plugins/DevicesDetection/images/browsers/PU.gif b/plugins/DevicesDetection/images/browsers/PU.gif Binary files differdeleted file mode 100644 index 6319ae15cc..0000000000 --- a/plugins/DevicesDetection/images/browsers/PU.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PU.png b/plugins/DevicesDetection/images/browsers/PU.png Binary files differnew file mode 100644 index 0000000000..a6e09599c5 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PU.png diff --git a/plugins/DevicesDetection/images/browsers/PW.gif b/plugins/DevicesDetection/images/browsers/PW.gif Binary files differdeleted file mode 100644 index 3aae87d27c..0000000000 --- a/plugins/DevicesDetection/images/browsers/PW.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PW.png b/plugins/DevicesDetection/images/browsers/PW.png Binary files differnew file mode 100644 index 0000000000..3c051b50d5 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PW.png diff --git a/plugins/DevicesDetection/images/browsers/PX.gif b/plugins/DevicesDetection/images/browsers/PX.gif Binary files differdeleted file mode 100644 index 386d46e122..0000000000 --- a/plugins/DevicesDetection/images/browsers/PX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/PX.png b/plugins/DevicesDetection/images/browsers/PX.png Binary files differnew file mode 100644 index 0000000000..db8c135542 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/PX.png diff --git a/plugins/DevicesDetection/images/browsers/QQ.gif b/plugins/DevicesDetection/images/browsers/QQ.gif Binary files differdeleted file mode 100644 index bf861f4d16..0000000000 --- a/plugins/DevicesDetection/images/browsers/QQ.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/QQ.png b/plugins/DevicesDetection/images/browsers/QQ.png Binary files differnew file mode 100644 index 0000000000..6fbca0d6d4 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/QQ.png diff --git a/plugins/DevicesDetection/images/browsers/RK.gif b/plugins/DevicesDetection/images/browsers/RK.gif Binary files differdeleted file mode 100644 index 72ee74a38d..0000000000 --- a/plugins/DevicesDetection/images/browsers/RK.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/RK.png b/plugins/DevicesDetection/images/browsers/RK.png Binary files differnew file mode 100644 index 0000000000..93a695ac0c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/RK.png diff --git a/plugins/DevicesDetection/images/browsers/RM.png b/plugins/DevicesDetection/images/browsers/RM.png Binary files differnew file mode 100644 index 0000000000..ebd15da1c7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/RM.png diff --git a/plugins/DevicesDetection/images/browsers/SA.gif b/plugins/DevicesDetection/images/browsers/SA.gif Binary files differdeleted file mode 100644 index fb4c89c348..0000000000 --- a/plugins/DevicesDetection/images/browsers/SA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SA.png b/plugins/DevicesDetection/images/browsers/SA.png Binary files differnew file mode 100644 index 0000000000..8316db4bd2 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SA.png diff --git a/plugins/DevicesDetection/images/browsers/SB.gif b/plugins/DevicesDetection/images/browsers/SB.gif Binary files differdeleted file mode 100644 index 61f13916ec..0000000000 --- a/plugins/DevicesDetection/images/browsers/SB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SB.png b/plugins/DevicesDetection/images/browsers/SB.png Binary files differnew file mode 100644 index 0000000000..4eda015f64 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SB.png diff --git a/plugins/DevicesDetection/images/browsers/SE.gif b/plugins/DevicesDetection/images/browsers/SE.gif Binary files differdeleted file mode 100644 index 8603442161..0000000000 --- a/plugins/DevicesDetection/images/browsers/SE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SE.png b/plugins/DevicesDetection/images/browsers/SE.png Binary files differnew file mode 100644 index 0000000000..7729eeb9b6 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SE.png diff --git a/plugins/DevicesDetection/images/browsers/SF.gif b/plugins/DevicesDetection/images/browsers/SF.gif Binary files differdeleted file mode 100644 index 4d0eef37a7..0000000000 --- a/plugins/DevicesDetection/images/browsers/SF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SF.png b/plugins/DevicesDetection/images/browsers/SF.png Binary files differnew file mode 100644 index 0000000000..b4ffe6d7a7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SF.png diff --git a/plugins/DevicesDetection/images/browsers/SH.gif b/plugins/DevicesDetection/images/browsers/SH.gif Binary files differdeleted file mode 100644 index 734c53cc43..0000000000 --- a/plugins/DevicesDetection/images/browsers/SH.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SH.png b/plugins/DevicesDetection/images/browsers/SH.png Binary files differnew file mode 100644 index 0000000000..cb07b1fac7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SH.png diff --git a/plugins/DevicesDetection/images/browsers/SK.png b/plugins/DevicesDetection/images/browsers/SK.png Binary files differnew file mode 100644 index 0000000000..a5f515114a --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SK.png diff --git a/plugins/DevicesDetection/images/browsers/SL.gif b/plugins/DevicesDetection/images/browsers/SL.gif Binary files differdeleted file mode 100644 index 890dd6d070..0000000000 --- a/plugins/DevicesDetection/images/browsers/SL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SL.png b/plugins/DevicesDetection/images/browsers/SL.png Binary files differnew file mode 100644 index 0000000000..7c412d489c --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SL.png diff --git a/plugins/DevicesDetection/images/browsers/SM.gif b/plugins/DevicesDetection/images/browsers/SM.gif Binary files differdeleted file mode 100644 index 83aad8b1c6..0000000000 --- a/plugins/DevicesDetection/images/browsers/SM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SM.png b/plugins/DevicesDetection/images/browsers/SM.png Binary files differnew file mode 100644 index 0000000000..80c63876d7 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SM.png diff --git a/plugins/DevicesDetection/images/browsers/SP.gif b/plugins/DevicesDetection/images/browsers/SP.gif Binary files differdeleted file mode 100644 index f404825e95..0000000000 --- a/plugins/DevicesDetection/images/browsers/SP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SP.png b/plugins/DevicesDetection/images/browsers/SP.png Binary files differnew file mode 100644 index 0000000000..93c6642781 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SP.png diff --git a/plugins/DevicesDetection/images/browsers/SR.gif b/plugins/DevicesDetection/images/browsers/SR.gif Binary files differdeleted file mode 100644 index 1082ff5c01..0000000000 --- a/plugins/DevicesDetection/images/browsers/SR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SS.gif b/plugins/DevicesDetection/images/browsers/SS.gif Binary files differdeleted file mode 100644 index 5ea7e91ba4..0000000000 --- a/plugins/DevicesDetection/images/browsers/SS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/SS.png b/plugins/DevicesDetection/images/browsers/SS.png Binary files differnew file mode 100644 index 0000000000..9fbbf6363a --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SS.png diff --git a/plugins/DevicesDetection/images/browsers/ST.png b/plugins/DevicesDetection/images/browsers/ST.png Binary files differnew file mode 100644 index 0000000000..825664192e --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/ST.png diff --git a/plugins/DevicesDetection/images/browsers/SX.png b/plugins/DevicesDetection/images/browsers/SX.png Binary files differnew file mode 100644 index 0000000000..d6e007c1c1 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/SX.png diff --git a/plugins/DevicesDetection/images/browsers/TB.gif b/plugins/DevicesDetection/images/browsers/TB.gif Binary files differdeleted file mode 100644 index 9c67b76c85..0000000000 --- a/plugins/DevicesDetection/images/browsers/TB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/TI.gif b/plugins/DevicesDetection/images/browsers/TI.gif Binary files differdeleted file mode 100644 index 220c1126e3..0000000000 --- a/plugins/DevicesDetection/images/browsers/TI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/TS.gif b/plugins/DevicesDetection/images/browsers/TS.gif Binary files differdeleted file mode 100644 index ca411126a3..0000000000 --- a/plugins/DevicesDetection/images/browsers/TS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/TS.png b/plugins/DevicesDetection/images/browsers/TS.png Binary files differnew file mode 100644 index 0000000000..ffe9d4cd0b --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/TS.png diff --git a/plugins/DevicesDetection/images/browsers/TZ.gif b/plugins/DevicesDetection/images/browsers/TZ.gif Binary files differdeleted file mode 100644 index ce4524f4f0..0000000000 --- a/plugins/DevicesDetection/images/browsers/TZ.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/TZ.png b/plugins/DevicesDetection/images/browsers/TZ.png Binary files differnew file mode 100644 index 0000000000..2bf8cb52f5 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/TZ.png diff --git a/plugins/DevicesDetection/images/browsers/UC.gif b/plugins/DevicesDetection/images/browsers/UC.gif Binary files differdeleted file mode 100644 index a2129a88fe..0000000000 --- a/plugins/DevicesDetection/images/browsers/UC.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/UC.png b/plugins/DevicesDetection/images/browsers/UC.png Binary files differnew file mode 100644 index 0000000000..041ce90d50 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/UC.png diff --git a/plugins/DevicesDetection/images/browsers/UN.gif b/plugins/DevicesDetection/images/browsers/UN.gif Binary files differdeleted file mode 100644 index 2c44083422..0000000000 --- a/plugins/DevicesDetection/images/browsers/UN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/UNK.gif b/plugins/DevicesDetection/images/browsers/UNK.gif Binary files differdeleted file mode 100644 index 2c44083422..0000000000 --- a/plugins/DevicesDetection/images/browsers/UNK.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/UNK.png b/plugins/DevicesDetection/images/browsers/UNK.png Binary files differnew file mode 100644 index 0000000000..6a63dcea00 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/UNK.png diff --git a/plugins/DevicesDetection/images/browsers/VI.gif b/plugins/DevicesDetection/images/browsers/VI.gif Binary files differdeleted file mode 100644 index 15d9d03fe7..0000000000 --- a/plugins/DevicesDetection/images/browsers/VI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/VI.png b/plugins/DevicesDetection/images/browsers/VI.png Binary files differnew file mode 100644 index 0000000000..acd2fc6286 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/VI.png diff --git a/plugins/DevicesDetection/images/browsers/WE.gif b/plugins/DevicesDetection/images/browsers/WE.gif Binary files differdeleted file mode 100644 index 3f2df63482..0000000000 --- a/plugins/DevicesDetection/images/browsers/WE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/WE.png b/plugins/DevicesDetection/images/browsers/WE.png Binary files differnew file mode 100644 index 0000000000..a14235ddae --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/WE.png diff --git a/plugins/DevicesDetection/images/browsers/WO.gif b/plugins/DevicesDetection/images/browsers/WO.gif Binary files differdeleted file mode 100644 index 6638abccb4..0000000000 --- a/plugins/DevicesDetection/images/browsers/WO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/WO.png b/plugins/DevicesDetection/images/browsers/WO.png Binary files differnew file mode 100644 index 0000000000..59b5f68ff3 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/WO.png diff --git a/plugins/DevicesDetection/images/browsers/WP.gif b/plugins/DevicesDetection/images/browsers/WP.gif Binary files differdeleted file mode 100644 index 92d9d20f75..0000000000 --- a/plugins/DevicesDetection/images/browsers/WP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/YA.gif b/plugins/DevicesDetection/images/browsers/YA.gif Binary files differdeleted file mode 100644 index 106121224d..0000000000 --- a/plugins/DevicesDetection/images/browsers/YA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/browsers/YA.png b/plugins/DevicesDetection/images/browsers/YA.png Binary files differnew file mode 100644 index 0000000000..ae0418c403 --- /dev/null +++ b/plugins/DevicesDetection/images/browsers/YA.png diff --git a/plugins/DevicesDetection/images/os/3DS.gif b/plugins/DevicesDetection/images/os/3DS.gif Binary files differdeleted file mode 100644 index 39e72e68f5..0000000000 --- a/plugins/DevicesDetection/images/os/3DS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AIX.gif b/plugins/DevicesDetection/images/os/AIX.gif Binary files differdeleted file mode 100644 index 1b8d966190..0000000000 --- a/plugins/DevicesDetection/images/os/AIX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AIX.png b/plugins/DevicesDetection/images/os/AIX.png Binary files differnew file mode 100644 index 0000000000..6c963cea5f --- /dev/null +++ b/plugins/DevicesDetection/images/os/AIX.png diff --git a/plugins/DevicesDetection/images/os/AMG.gif b/plugins/DevicesDetection/images/os/AMG.gif Binary files differdeleted file mode 100644 index 1b9e8a6397..0000000000 --- a/plugins/DevicesDetection/images/os/AMG.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AMG.png b/plugins/DevicesDetection/images/os/AMG.png Binary files differnew file mode 100644 index 0000000000..c0dd351093 --- /dev/null +++ b/plugins/DevicesDetection/images/os/AMG.png diff --git a/plugins/DevicesDetection/images/os/AMI.gif b/plugins/DevicesDetection/images/os/AMI.gif Binary files differdeleted file mode 100644 index 00242b215c..0000000000 --- a/plugins/DevicesDetection/images/os/AMI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AND.gif b/plugins/DevicesDetection/images/os/AND.gif Binary files differdeleted file mode 100644 index bf0ade5551..0000000000 --- a/plugins/DevicesDetection/images/os/AND.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/AND.png b/plugins/DevicesDetection/images/os/AND.png Binary files differnew file mode 100644 index 0000000000..79c6385840 --- /dev/null +++ b/plugins/DevicesDetection/images/os/AND.png diff --git a/plugins/DevicesDetection/images/os/ARL.gif b/plugins/DevicesDetection/images/os/ARL.gif Binary files differdeleted file mode 100644 index ac92b2de6b..0000000000 --- a/plugins/DevicesDetection/images/os/ARL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/ARL.png b/plugins/DevicesDetection/images/os/ARL.png Binary files differnew file mode 100644 index 0000000000..3556fffe6a --- /dev/null +++ b/plugins/DevicesDetection/images/os/ARL.png diff --git a/plugins/DevicesDetection/images/os/ATV.png b/plugins/DevicesDetection/images/os/ATV.png Binary files differnew file mode 100644 index 0000000000..d55f8d7390 --- /dev/null +++ b/plugins/DevicesDetection/images/os/ATV.png diff --git a/plugins/DevicesDetection/images/os/BBX.gif b/plugins/DevicesDetection/images/os/BBX.gif Binary files differdeleted file mode 100644 index 295e37eafa..0000000000 --- a/plugins/DevicesDetection/images/os/BBX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BEO.gif b/plugins/DevicesDetection/images/os/BEO.gif Binary files differdeleted file mode 100644 index e22c9437ed..0000000000 --- a/plugins/DevicesDetection/images/os/BEO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BEO.png b/plugins/DevicesDetection/images/os/BEO.png Binary files differnew file mode 100644 index 0000000000..fcce455b86 --- /dev/null +++ b/plugins/DevicesDetection/images/os/BEO.png diff --git a/plugins/DevicesDetection/images/os/BLB.gif b/plugins/DevicesDetection/images/os/BLB.gif Binary files differdeleted file mode 100644 index e8316ef586..0000000000 --- a/plugins/DevicesDetection/images/os/BLB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BLB.png b/plugins/DevicesDetection/images/os/BLB.png Binary files differnew file mode 100644 index 0000000000..9febbfe9cf --- /dev/null +++ b/plugins/DevicesDetection/images/os/BLB.png diff --git a/plugins/DevicesDetection/images/os/BMP.gif b/plugins/DevicesDetection/images/os/BMP.gif Binary files differdeleted file mode 100644 index acd9596119..0000000000 --- a/plugins/DevicesDetection/images/os/BMP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BSD.gif b/plugins/DevicesDetection/images/os/BSD.gif Binary files differdeleted file mode 100644 index daeeb84007..0000000000 --- a/plugins/DevicesDetection/images/os/BSD.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BSD.png b/plugins/DevicesDetection/images/os/BSD.png Binary files differnew file mode 100644 index 0000000000..ccf075485c --- /dev/null +++ b/plugins/DevicesDetection/images/os/BSD.png diff --git a/plugins/DevicesDetection/images/os/BTR.gif b/plugins/DevicesDetection/images/os/BTR.gif Binary files differdeleted file mode 100644 index bdba9fad3f..0000000000 --- a/plugins/DevicesDetection/images/os/BTR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/BTR.png b/plugins/DevicesDetection/images/os/BTR.png Binary files differnew file mode 100644 index 0000000000..00c51ee5d6 --- /dev/null +++ b/plugins/DevicesDetection/images/os/BTR.png diff --git a/plugins/DevicesDetection/images/os/CES.gif b/plugins/DevicesDetection/images/os/CES.gif Binary files differdeleted file mode 100644 index 028958c94a..0000000000 --- a/plugins/DevicesDetection/images/os/CES.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/CES.png b/plugins/DevicesDetection/images/os/CES.png Binary files differnew file mode 100644 index 0000000000..40145f6c56 --- /dev/null +++ b/plugins/DevicesDetection/images/os/CES.png diff --git a/plugins/DevicesDetection/images/os/COS.gif b/plugins/DevicesDetection/images/os/COS.gif Binary files differdeleted file mode 100644 index 793e0fad3b..0000000000 --- a/plugins/DevicesDetection/images/os/COS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/COS.png b/plugins/DevicesDetection/images/os/COS.png Binary files differnew file mode 100644 index 0000000000..6bac5c24f7 --- /dev/null +++ b/plugins/DevicesDetection/images/os/COS.png diff --git a/plugins/DevicesDetection/images/os/CYN.png b/plugins/DevicesDetection/images/os/CYN.png Binary files differnew file mode 100644 index 0000000000..da02d339b0 --- /dev/null +++ b/plugins/DevicesDetection/images/os/CYN.png diff --git a/plugins/DevicesDetection/images/os/DEB.png b/plugins/DevicesDetection/images/os/DEB.png Binary files differnew file mode 100644 index 0000000000..1e5a3b81a5 --- /dev/null +++ b/plugins/DevicesDetection/images/os/DEB.png diff --git a/plugins/DevicesDetection/images/os/DFB.gif b/plugins/DevicesDetection/images/os/DFB.gif Binary files differdeleted file mode 100644 index b869c133f4..0000000000 --- a/plugins/DevicesDetection/images/os/DFB.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/DFB.png b/plugins/DevicesDetection/images/os/DFB.png Binary files differnew file mode 100644 index 0000000000..2aaba1dbb9 --- /dev/null +++ b/plugins/DevicesDetection/images/os/DFB.png diff --git a/plugins/DevicesDetection/images/os/DSI.gif b/plugins/DevicesDetection/images/os/DSI.gif Binary files differdeleted file mode 100644 index c4030a8f77..0000000000 --- a/plugins/DevicesDetection/images/os/DSI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/FED.gif b/plugins/DevicesDetection/images/os/FED.gif Binary files differdeleted file mode 100644 index 2e49af9d7c..0000000000 --- a/plugins/DevicesDetection/images/os/FED.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/FED.png b/plugins/DevicesDetection/images/os/FED.png Binary files differnew file mode 100644 index 0000000000..4c22f14ce2 --- /dev/null +++ b/plugins/DevicesDetection/images/os/FED.png diff --git a/plugins/DevicesDetection/images/os/FOS.gif b/plugins/DevicesDetection/images/os/FOS.gif Binary files differdeleted file mode 100644 index eb024c408a..0000000000 --- a/plugins/DevicesDetection/images/os/FOS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/FOS.png b/plugins/DevicesDetection/images/os/FOS.png Binary files differnew file mode 100644 index 0000000000..099d5689a9 --- /dev/null +++ b/plugins/DevicesDetection/images/os/FOS.png diff --git a/plugins/DevicesDetection/images/os/GNT.gif b/plugins/DevicesDetection/images/os/GNT.gif Binary files differdeleted file mode 100644 index 47558caf9a..0000000000 --- a/plugins/DevicesDetection/images/os/GNT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/GNT.png b/plugins/DevicesDetection/images/os/GNT.png Binary files differnew file mode 100644 index 0000000000..48614998ca --- /dev/null +++ b/plugins/DevicesDetection/images/os/GNT.png diff --git a/plugins/DevicesDetection/images/os/GTV.gif b/plugins/DevicesDetection/images/os/GTV.gif Binary files differdeleted file mode 100644 index bdc4aefd88..0000000000 --- a/plugins/DevicesDetection/images/os/GTV.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/GTV.png b/plugins/DevicesDetection/images/os/GTV.png Binary files differnew file mode 100644 index 0000000000..ee3f559d26 --- /dev/null +++ b/plugins/DevicesDetection/images/os/GTV.png diff --git a/plugins/DevicesDetection/images/os/HAI.png b/plugins/DevicesDetection/images/os/HAI.png Binary files differnew file mode 100644 index 0000000000..a3906dd313 --- /dev/null +++ b/plugins/DevicesDetection/images/os/HAI.png diff --git a/plugins/DevicesDetection/images/os/HPX.gif b/plugins/DevicesDetection/images/os/HPX.gif Binary files differdeleted file mode 100644 index 96ee1c01c3..0000000000 --- a/plugins/DevicesDetection/images/os/HPX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/HPX.png b/plugins/DevicesDetection/images/os/HPX.png Binary files differnew file mode 100644 index 0000000000..828762a9c2 --- /dev/null +++ b/plugins/DevicesDetection/images/os/HPX.png diff --git a/plugins/DevicesDetection/images/os/IOS.gif b/plugins/DevicesDetection/images/os/IOS.gif Binary files differdeleted file mode 100644 index 17ef80cd53..0000000000 --- a/plugins/DevicesDetection/images/os/IOS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IOS.png b/plugins/DevicesDetection/images/os/IOS.png Binary files differnew file mode 100644 index 0000000000..9b276daad4 --- /dev/null +++ b/plugins/DevicesDetection/images/os/IOS.png diff --git a/plugins/DevicesDetection/images/os/IPA.gif b/plugins/DevicesDetection/images/os/IPA.gif Binary files differdeleted file mode 100644 index 24a37f246c..0000000000 --- a/plugins/DevicesDetection/images/os/IPA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IPD.gif b/plugins/DevicesDetection/images/os/IPD.gif Binary files differdeleted file mode 100644 index 117b6d2867..0000000000 --- a/plugins/DevicesDetection/images/os/IPD.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IPH.gif b/plugins/DevicesDetection/images/os/IPH.gif Binary files differdeleted file mode 100644 index 71ff7d7592..0000000000 --- a/plugins/DevicesDetection/images/os/IPH.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IRI.gif b/plugins/DevicesDetection/images/os/IRI.gif Binary files differdeleted file mode 100644 index 796d547e52..0000000000 --- a/plugins/DevicesDetection/images/os/IRI.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/IRI.png b/plugins/DevicesDetection/images/os/IRI.png Binary files differnew file mode 100644 index 0000000000..a69ce07e03 --- /dev/null +++ b/plugins/DevicesDetection/images/os/IRI.png diff --git a/plugins/DevicesDetection/images/os/KBT.gif b/plugins/DevicesDetection/images/os/KBT.gif Binary files differdeleted file mode 100644 index 28ba33292f..0000000000 --- a/plugins/DevicesDetection/images/os/KBT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/KBT.png b/plugins/DevicesDetection/images/os/KBT.png Binary files differnew file mode 100644 index 0000000000..50a88cdf61 --- /dev/null +++ b/plugins/DevicesDetection/images/os/KBT.png diff --git a/plugins/DevicesDetection/images/os/KNO.gif b/plugins/DevicesDetection/images/os/KNO.gif Binary files differdeleted file mode 100644 index 3433a71a5f..0000000000 --- a/plugins/DevicesDetection/images/os/KNO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/KNO.png b/plugins/DevicesDetection/images/os/KNO.png Binary files differnew file mode 100644 index 0000000000..5b980ee65f --- /dev/null +++ b/plugins/DevicesDetection/images/os/KNO.png diff --git a/plugins/DevicesDetection/images/os/LBT.gif b/plugins/DevicesDetection/images/os/LBT.gif Binary files differdeleted file mode 100644 index 47fad1402a..0000000000 --- a/plugins/DevicesDetection/images/os/LBT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/LBT.png b/plugins/DevicesDetection/images/os/LBT.png Binary files differnew file mode 100644 index 0000000000..b2d070163d --- /dev/null +++ b/plugins/DevicesDetection/images/os/LBT.png diff --git a/plugins/DevicesDetection/images/os/LIN.gif b/plugins/DevicesDetection/images/os/LIN.gif Binary files differdeleted file mode 100644 index c76dfce8ff..0000000000 --- a/plugins/DevicesDetection/images/os/LIN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/LIN.png b/plugins/DevicesDetection/images/os/LIN.png Binary files differnew file mode 100644 index 0000000000..9f9914dfb5 --- /dev/null +++ b/plugins/DevicesDetection/images/os/LIN.png diff --git a/plugins/DevicesDetection/images/os/MAC.gif b/plugins/DevicesDetection/images/os/MAC.gif Binary files differdeleted file mode 100644 index 1ef41d5c75..0000000000 --- a/plugins/DevicesDetection/images/os/MAC.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MAC.png b/plugins/DevicesDetection/images/os/MAC.png Binary files differnew file mode 100644 index 0000000000..f679d4e8ba --- /dev/null +++ b/plugins/DevicesDetection/images/os/MAC.png diff --git a/plugins/DevicesDetection/images/os/MAE.gif b/plugins/DevicesDetection/images/os/MAE.gif Binary files differdeleted file mode 100755 index 8573a0dc25..0000000000 --- a/plugins/DevicesDetection/images/os/MAE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MAE.png b/plugins/DevicesDetection/images/os/MAE.png Binary files differnew file mode 100644 index 0000000000..a8c99a72ba --- /dev/null +++ b/plugins/DevicesDetection/images/os/MAE.png diff --git a/plugins/DevicesDetection/images/os/MDR.gif b/plugins/DevicesDetection/images/os/MDR.gif Binary files differdeleted file mode 100644 index b4d8d5e348..0000000000 --- a/plugins/DevicesDetection/images/os/MDR.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MDR.png b/plugins/DevicesDetection/images/os/MDR.png Binary files differnew file mode 100644 index 0000000000..e5f5a01143 --- /dev/null +++ b/plugins/DevicesDetection/images/os/MDR.png diff --git a/plugins/DevicesDetection/images/os/MIN.gif b/plugins/DevicesDetection/images/os/MIN.gif Binary files differdeleted file mode 100644 index 71ce560b25..0000000000 --- a/plugins/DevicesDetection/images/os/MIN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/MIN.png b/plugins/DevicesDetection/images/os/MIN.png Binary files differnew file mode 100644 index 0000000000..02441696e8 --- /dev/null +++ b/plugins/DevicesDetection/images/os/MIN.png diff --git a/plugins/DevicesDetection/images/os/MOR.png b/plugins/DevicesDetection/images/os/MOR.png Binary files differnew file mode 100644 index 0000000000..d87c63c388 --- /dev/null +++ b/plugins/DevicesDetection/images/os/MOR.png diff --git a/plugins/DevicesDetection/images/os/NBS.gif b/plugins/DevicesDetection/images/os/NBS.gif Binary files differdeleted file mode 100644 index d282ad1a44..0000000000 --- a/plugins/DevicesDetection/images/os/NBS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/NBS.png b/plugins/DevicesDetection/images/os/NBS.png Binary files differnew file mode 100644 index 0000000000..85987a385e --- /dev/null +++ b/plugins/DevicesDetection/images/os/NBS.png diff --git a/plugins/DevicesDetection/images/os/NDS.gif b/plugins/DevicesDetection/images/os/NDS.gif Binary files differdeleted file mode 100644 index bca132aad7..0000000000 --- a/plugins/DevicesDetection/images/os/NDS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/NDS.png b/plugins/DevicesDetection/images/os/NDS.png Binary files differnew file mode 100644 index 0000000000..9045704a9d --- /dev/null +++ b/plugins/DevicesDetection/images/os/NDS.png diff --git a/plugins/DevicesDetection/images/os/OBS.gif b/plugins/DevicesDetection/images/os/OBS.gif Binary files differdeleted file mode 100644 index 993c8a4ebe..0000000000 --- a/plugins/DevicesDetection/images/os/OBS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/OBS.png b/plugins/DevicesDetection/images/os/OBS.png Binary files differnew file mode 100644 index 0000000000..8038d66344 --- /dev/null +++ b/plugins/DevicesDetection/images/os/OBS.png diff --git a/plugins/DevicesDetection/images/os/OS2.gif b/plugins/DevicesDetection/images/os/OS2.gif Binary files differdeleted file mode 100644 index ae96a6972c..0000000000 --- a/plugins/DevicesDetection/images/os/OS2.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/OS2.png b/plugins/DevicesDetection/images/os/OS2.png Binary files differnew file mode 100644 index 0000000000..ebf559a786 --- /dev/null +++ b/plugins/DevicesDetection/images/os/OS2.png diff --git a/plugins/DevicesDetection/images/os/POS.gif b/plugins/DevicesDetection/images/os/POS.gif Binary files differdeleted file mode 100644 index f03e0d15f4..0000000000 --- a/plugins/DevicesDetection/images/os/POS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/POS.png b/plugins/DevicesDetection/images/os/POS.png Binary files differnew file mode 100644 index 0000000000..3c051b50d5 --- /dev/null +++ b/plugins/DevicesDetection/images/os/POS.png diff --git a/plugins/DevicesDetection/images/os/PPY.gif b/plugins/DevicesDetection/images/os/PPY.gif Binary files differdeleted file mode 100644 index 20e8ef3291..0000000000 --- a/plugins/DevicesDetection/images/os/PPY.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/PS3.gif b/plugins/DevicesDetection/images/os/PS3.gif Binary files differdeleted file mode 100644 index f087c11cb8..0000000000 --- a/plugins/DevicesDetection/images/os/PS3.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/PS3.png b/plugins/DevicesDetection/images/os/PS3.png Binary files differnew file mode 100644 index 0000000000..a303c86f7e --- /dev/null +++ b/plugins/DevicesDetection/images/os/PS3.png diff --git a/plugins/DevicesDetection/images/os/PSP.gif b/plugins/DevicesDetection/images/os/PSP.gif Binary files differdeleted file mode 100644 index b6003b6498..0000000000 --- a/plugins/DevicesDetection/images/os/PSP.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/PSP.png b/plugins/DevicesDetection/images/os/PSP.png Binary files differnew file mode 100644 index 0000000000..2ad577284c --- /dev/null +++ b/plugins/DevicesDetection/images/os/PSP.png diff --git a/plugins/DevicesDetection/images/os/PSV.gif b/plugins/DevicesDetection/images/os/PSV.gif Binary files differdeleted file mode 100644 index 65b4c23871..0000000000 --- a/plugins/DevicesDetection/images/os/PSV.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/QNX.gif b/plugins/DevicesDetection/images/os/QNX.gif Binary files differdeleted file mode 100644 index 9a2a70f5c3..0000000000 --- a/plugins/DevicesDetection/images/os/QNX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/QNX.png b/plugins/DevicesDetection/images/os/QNX.png Binary files differnew file mode 100644 index 0000000000..9febbfe9cf --- /dev/null +++ b/plugins/DevicesDetection/images/os/QNX.png diff --git a/plugins/DevicesDetection/images/os/RHT.gif b/plugins/DevicesDetection/images/os/RHT.gif Binary files differdeleted file mode 100644 index 043947cecb..0000000000 --- a/plugins/DevicesDetection/images/os/RHT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/RHT.png b/plugins/DevicesDetection/images/os/RHT.png Binary files differnew file mode 100644 index 0000000000..fc0e410c21 --- /dev/null +++ b/plugins/DevicesDetection/images/os/RHT.png diff --git a/plugins/DevicesDetection/images/os/ROS.gif b/plugins/DevicesDetection/images/os/ROS.gif Binary files differdeleted file mode 100644 index a445b66182..0000000000 --- a/plugins/DevicesDetection/images/os/ROS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/ROS.png b/plugins/DevicesDetection/images/os/ROS.png Binary files differnew file mode 100644 index 0000000000..1d174fbb35 --- /dev/null +++ b/plugins/DevicesDetection/images/os/ROS.png diff --git a/plugins/DevicesDetection/images/os/SAB.png b/plugins/DevicesDetection/images/os/SAB.png Binary files differnew file mode 100644 index 0000000000..baa0d25467 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SAB.png diff --git a/plugins/DevicesDetection/images/os/SAF.gif b/plugins/DevicesDetection/images/os/SAF.gif Binary files differdeleted file mode 100644 index e5fe8a8f45..0000000000 --- a/plugins/DevicesDetection/images/os/SAF.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SAF.png b/plugins/DevicesDetection/images/os/SAF.png Binary files differnew file mode 100644 index 0000000000..ebfb367071 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SAF.png diff --git a/plugins/DevicesDetection/images/os/SBA.gif b/plugins/DevicesDetection/images/os/SBA.gif Binary files differdeleted file mode 100644 index 079ccc21d8..0000000000 --- a/plugins/DevicesDetection/images/os/SBA.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SBA.png b/plugins/DevicesDetection/images/os/SBA.png Binary files differnew file mode 100644 index 0000000000..3207fa7324 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SBA.png diff --git a/plugins/DevicesDetection/images/os/SLW.gif b/plugins/DevicesDetection/images/os/SLW.gif Binary files differdeleted file mode 100644 index cf6f2be297..0000000000 --- a/plugins/DevicesDetection/images/os/SLW.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SLW.png b/plugins/DevicesDetection/images/os/SLW.png Binary files differnew file mode 100644 index 0000000000..ab7b53f545 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SLW.png diff --git a/plugins/DevicesDetection/images/os/SMG.png b/plugins/DevicesDetection/images/os/SMG.png Binary files differnew file mode 100644 index 0000000000..d552a65991 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SMG.png diff --git a/plugins/DevicesDetection/images/os/SOS.gif b/plugins/DevicesDetection/images/os/SOS.gif Binary files differdeleted file mode 100644 index 34fc3248e4..0000000000 --- a/plugins/DevicesDetection/images/os/SOS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SOS.png b/plugins/DevicesDetection/images/os/SOS.png Binary files differnew file mode 100644 index 0000000000..f836bbf235 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SOS.png diff --git a/plugins/DevicesDetection/images/os/SSE.gif b/plugins/DevicesDetection/images/os/SSE.gif Binary files differdeleted file mode 100644 index 3253aa2a75..0000000000 --- a/plugins/DevicesDetection/images/os/SSE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SSE.png b/plugins/DevicesDetection/images/os/SSE.png Binary files differnew file mode 100644 index 0000000000..403b65f84e --- /dev/null +++ b/plugins/DevicesDetection/images/os/SSE.png diff --git a/plugins/DevicesDetection/images/os/SYL.gif b/plugins/DevicesDetection/images/os/SYL.gif Binary files differdeleted file mode 100644 index 27bd023afc..0000000000 --- a/plugins/DevicesDetection/images/os/SYL.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SYL.png b/plugins/DevicesDetection/images/os/SYL.png Binary files differnew file mode 100644 index 0000000000..cc1f3c31b4 --- /dev/null +++ b/plugins/DevicesDetection/images/os/SYL.png diff --git a/plugins/DevicesDetection/images/os/SYM.gif b/plugins/DevicesDetection/images/os/SYM.gif Binary files differdeleted file mode 100644 index cd174dba19..0000000000 --- a/plugins/DevicesDetection/images/os/SYM.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/SYM.png b/plugins/DevicesDetection/images/os/SYM.png Binary files differnew file mode 100644 index 0000000000..d110bb977d --- /dev/null +++ b/plugins/DevicesDetection/images/os/SYM.png diff --git a/plugins/DevicesDetection/images/os/T64.gif b/plugins/DevicesDetection/images/os/T64.gif Binary files differdeleted file mode 100644 index 50b64ba9ec..0000000000 --- a/plugins/DevicesDetection/images/os/T64.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/T64.png b/plugins/DevicesDetection/images/os/T64.png Binary files differnew file mode 100644 index 0000000000..11b965fe3d --- /dev/null +++ b/plugins/DevicesDetection/images/os/T64.png diff --git a/plugins/DevicesDetection/images/os/TDX.gif b/plugins/DevicesDetection/images/os/TDX.gif Binary files differdeleted file mode 100644 index c5bf5900fa..0000000000 --- a/plugins/DevicesDetection/images/os/TDX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/TDX.png b/plugins/DevicesDetection/images/os/TDX.png Binary files differnew file mode 100644 index 0000000000..22857fa2e7 --- /dev/null +++ b/plugins/DevicesDetection/images/os/TDX.png diff --git a/plugins/DevicesDetection/images/os/TIZ.gif b/plugins/DevicesDetection/images/os/TIZ.gif Binary files differdeleted file mode 100644 index 7563a5e31d..0000000000 --- a/plugins/DevicesDetection/images/os/TIZ.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/TIZ.png b/plugins/DevicesDetection/images/os/TIZ.png Binary files differnew file mode 100644 index 0000000000..2bf8cb52f5 --- /dev/null +++ b/plugins/DevicesDetection/images/os/TIZ.png diff --git a/plugins/DevicesDetection/images/os/UBT.gif b/plugins/DevicesDetection/images/os/UBT.gif Binary files differdeleted file mode 100644 index c4789e0456..0000000000 --- a/plugins/DevicesDetection/images/os/UBT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/UBT.png b/plugins/DevicesDetection/images/os/UBT.png Binary files differnew file mode 100644 index 0000000000..2e42276be5 --- /dev/null +++ b/plugins/DevicesDetection/images/os/UBT.png diff --git a/plugins/DevicesDetection/images/os/UNK.gif b/plugins/DevicesDetection/images/os/UNK.gif Binary files differdeleted file mode 100644 index 2c44083422..0000000000 --- a/plugins/DevicesDetection/images/os/UNK.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/UNK.png b/plugins/DevicesDetection/images/os/UNK.png Binary files differnew file mode 100644 index 0000000000..6a63dcea00 --- /dev/null +++ b/plugins/DevicesDetection/images/os/UNK.png diff --git a/plugins/DevicesDetection/images/os/VLN.png b/plugins/DevicesDetection/images/os/VLN.png Binary files differnew file mode 100644 index 0000000000..d4d681f553 --- /dev/null +++ b/plugins/DevicesDetection/images/os/VLN.png diff --git a/plugins/DevicesDetection/images/os/VMS.gif b/plugins/DevicesDetection/images/os/VMS.gif Binary files differdeleted file mode 100644 index 000d08a36f..0000000000 --- a/plugins/DevicesDetection/images/os/VMS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WCE.gif b/plugins/DevicesDetection/images/os/WCE.gif Binary files differdeleted file mode 100644 index db610368b9..0000000000 --- a/plugins/DevicesDetection/images/os/WCE.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WCE.png b/plugins/DevicesDetection/images/os/WCE.png Binary files differnew file mode 100644 index 0000000000..f631eb62d8 --- /dev/null +++ b/plugins/DevicesDetection/images/os/WCE.png diff --git a/plugins/DevicesDetection/images/os/WII.gif b/plugins/DevicesDetection/images/os/WII.gif Binary files differdeleted file mode 100644 index 7957a9106a..0000000000 --- a/plugins/DevicesDetection/images/os/WII.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WII.png b/plugins/DevicesDetection/images/os/WII.png Binary files differnew file mode 100644 index 0000000000..23624cccaa --- /dev/null +++ b/plugins/DevicesDetection/images/os/WII.png diff --git a/plugins/DevicesDetection/images/os/WIN.gif b/plugins/DevicesDetection/images/os/WIN.gif Binary files differdeleted file mode 100644 index 486f78064a..0000000000 --- a/plugins/DevicesDetection/images/os/WIN.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WIN.png b/plugins/DevicesDetection/images/os/WIN.png Binary files differnew file mode 100644 index 0000000000..f2d70c2a1f --- /dev/null +++ b/plugins/DevicesDetection/images/os/WIN.png diff --git a/plugins/DevicesDetection/images/os/WIU.gif b/plugins/DevicesDetection/images/os/WIU.gif Binary files differdeleted file mode 100644 index 6d7e64e162..0000000000 --- a/plugins/DevicesDetection/images/os/WIU.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WMO.gif b/plugins/DevicesDetection/images/os/WMO.gif Binary files differdeleted file mode 100755 index 773c4d48d1..0000000000 --- a/plugins/DevicesDetection/images/os/WMO.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WMO.png b/plugins/DevicesDetection/images/os/WMO.png Binary files differnew file mode 100644 index 0000000000..e65261dc97 --- /dev/null +++ b/plugins/DevicesDetection/images/os/WMO.png diff --git a/plugins/DevicesDetection/images/os/WOS.gif b/plugins/DevicesDetection/images/os/WOS.gif Binary files differdeleted file mode 100644 index 2717d08226..0000000000 --- a/plugins/DevicesDetection/images/os/WOS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WOS.png b/plugins/DevicesDetection/images/os/WOS.png Binary files differnew file mode 100644 index 0000000000..f48c457e3c --- /dev/null +++ b/plugins/DevicesDetection/images/os/WOS.png diff --git a/plugins/DevicesDetection/images/os/WPH.gif b/plugins/DevicesDetection/images/os/WPH.gif Binary files differdeleted file mode 100755 index 3ca9cebca0..0000000000 --- a/plugins/DevicesDetection/images/os/WPH.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/WPH.png b/plugins/DevicesDetection/images/os/WPH.png Binary files differnew file mode 100644 index 0000000000..cf7db3225c --- /dev/null +++ b/plugins/DevicesDetection/images/os/WPH.png diff --git a/plugins/DevicesDetection/images/os/WRT.gif b/plugins/DevicesDetection/images/os/WRT.gif Binary files differdeleted file mode 100644 index 76ffe21587..0000000000 --- a/plugins/DevicesDetection/images/os/WRT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/XBT.gif b/plugins/DevicesDetection/images/os/XBT.gif Binary files differdeleted file mode 100644 index a80d2291cc..0000000000 --- a/plugins/DevicesDetection/images/os/XBT.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/XBT.png b/plugins/DevicesDetection/images/os/XBT.png Binary files differnew file mode 100644 index 0000000000..a4ea2829f7 --- /dev/null +++ b/plugins/DevicesDetection/images/os/XBT.png diff --git a/plugins/DevicesDetection/images/os/XBX.gif b/plugins/DevicesDetection/images/os/XBX.gif Binary files differdeleted file mode 100644 index a9d567660e..0000000000 --- a/plugins/DevicesDetection/images/os/XBX.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/XBX.png b/plugins/DevicesDetection/images/os/XBX.png Binary files differnew file mode 100644 index 0000000000..8f1175eaa9 --- /dev/null +++ b/plugins/DevicesDetection/images/os/XBX.png diff --git a/plugins/DevicesDetection/images/os/YNS.gif b/plugins/DevicesDetection/images/os/YNS.gif Binary files differdeleted file mode 100644 index 15f4c78e8f..0000000000 --- a/plugins/DevicesDetection/images/os/YNS.gif +++ /dev/null diff --git a/plugins/DevicesDetection/images/os/YNS.png b/plugins/DevicesDetection/images/os/YNS.png Binary files differnew file mode 100644 index 0000000000..5d53645b95 --- /dev/null +++ b/plugins/DevicesDetection/images/os/YNS.png diff --git a/plugins/DevicesDetection/lang/zh-tw.json b/plugins/DevicesDetection/lang/zh-tw.json index 0f903c8a7e..907584ce81 100644 --- a/plugins/DevicesDetection/lang/zh-tw.json +++ b/plugins/DevicesDetection/lang/zh-tw.json @@ -37,7 +37,7 @@ "Tablet": "平板電腦", "Phablet": "平板手機", "TV": "電視", - "UserAgent": "User-Agent", + "UserAgent": "User Agent", "WidgetBrowsers": "訪客瀏覽器", "WidgetBrowsersDocumentation": "這份報表包含訪客所使用的瀏覽器資訊。每個瀏覽器的版本都會分開排列。" } diff --git a/plugins/DevicesDetection/templates/detection.twig b/plugins/DevicesDetection/templates/detection.twig index f5d5387b6f..4c3cee83fa 100644 --- a/plugins/DevicesDetection/templates/detection.twig +++ b/plugins/DevicesDetection/templates/detection.twig @@ -55,7 +55,7 @@ <tbody> <tr> <td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('os');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> - <td><img src="{{ os_logo }}" />{{ os_name }}</td> + <td><img height="16px" width="16px" src="{{ os_logo }}" />{{ os_name }}</td> </tr> <tr> <td>{{ 'CorePluginsAdmin_Version'|translate }}</td> @@ -63,7 +63,7 @@ </tr> <tr> <td>{{ 'DevicesDetection_OperatingSystemFamily'|translate }} <small>(<a href="javascript:showList('osfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> - <td><img src="{{ os_family_logo }}" />{{ os_family }}</td> + <td><img height="16px" width="16px" src="{{ os_family_logo }}" />{{ os_family }}</td> </tr> </tbody> </table> @@ -73,7 +73,7 @@ <tbody> <tr> <td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('browsers');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> - <td><img src="{{ browser_logo }}" />{{ browser_name }}</td> + <td><img height="16px" width="16px" src="{{ browser_logo }}" />{{ browser_name }}</td> </tr> <tr> <td>{{ 'CorePluginsAdmin_Version'|translate }}</td> @@ -81,7 +81,7 @@ </tr> <tr> <td>{{ 'DevicesDetection_BrowserFamily'|translate }} <small>(<a href="javascript:showList('browserfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> - <td><img src="{{ browser_family_logo }}" />{{ browser_family }}</td> + <td><img height="16px" width="16px" src="{{ browser_family_logo }}" />{{ browser_family }}</td> </tr> </tbody> </table> @@ -91,11 +91,11 @@ <tbody> <tr> <td>{{ 'DevicesDetection_dataTableLabelTypes'|translate }} <small>(<a href="javascript:showList('devicetypes');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> - <td><img src="{{ device_type_logo }}" />{{ device_type }}</td> + <td><img height="16px" width="16px" src="{{ device_type_logo }}" />{{ device_type }}</td> </tr> <tr> <td>{{ 'DevicesDetection_dataTableLabelBrands'|translate }} <small>(<a href="javascript:showList('brands');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> - <td><img src="{{ device_brand_logo }}" />{{ device_brand }}</td> + <td><img height="16px" width="16px" src="{{ device_brand_logo }}" />{{ device_brand }}</td> </tr> <tr> <td>{{ 'DevicesDetection_dataTableLabelModels'|translate }}</td> diff --git a/plugins/DevicesDetection/templates/list.twig b/plugins/DevicesDetection/templates/list.twig index d51fb732ff..0619030474 100644 --- a/plugins/DevicesDetection/templates/list.twig +++ b/plugins/DevicesDetection/templates/list.twig @@ -1,7 +1,7 @@ <table class="entityTable"> {% for name,image in itemList %} <tr> - <td><img src="{{ image }}" /> {{ name }}</td> + <td><img height="16px" width="16px" src="{{ image }}" /> {{ name }}</td> </tr> {% endfor %} </table> diff --git a/plugins/Diagnostics/lang/zh-tw.json b/plugins/Diagnostics/lang/zh-tw.json new file mode 100644 index 0000000000..3c1d6c13f6 --- /dev/null +++ b/plugins/Diagnostics/lang/zh-tw.json @@ -0,0 +1,8 @@ +{ + "Diagnostics": { + "ConfigFileTitle": "設定檔", + "ConfigFileIntroduction": "你可以在這裡查看 Piwik 的配置。如果你在負載平衡的環境中執行 Piwik，頁面可能會根據不同伺服器顯示不同的內容。不同背景顏色的列是和 %1$s 範例檔案中所指定的值不同的設定值。", + "HideUnchanged": "如果你只想看有變更過值的設定，你可以%1$s隱藏未修改的值%2$s。", + "Sections": "分區" + } +}
\ No newline at end of file diff --git a/plugins/Ecommerce/lang/zh-tw.json b/plugins/Ecommerce/lang/zh-tw.json new file mode 100644 index 0000000000..c1f1ea9081 --- /dev/null +++ b/plugins/Ecommerce/lang/zh-tw.json @@ -0,0 +1,8 @@ +{ + "Ecommerce": { + "PluginDescription": "電子商務讓你可以在使用者將產品增加到購物車，或是轉換電子商務銷售時追蹤。也追蹤產品、產品分類查看數以及棄用的購物車。", + "Sales": "銷售", + "SalesBy": "由 %s 銷售", + "SalesAdjective": "銷售 %s" + } +}
\ No newline at end of file diff --git a/plugins/Events/lang/zh-tw.json b/plugins/Events/lang/zh-tw.json index 404b57491d..ce6315daf5 100644 --- a/plugins/Events/lang/zh-tw.json +++ b/plugins/Events/lang/zh-tw.json @@ -1,6 +1,6 @@ { "Events": { - "PluginDescription": "透過事件追蹤來取得訪客活動紀錄報表。", + "PluginDescription": "透過追蹤事件來取得訪客活動紀錄報表。", "AvgEventValue": "事件平均值為：%s", "AvgValue": "平均值", "AvgValueDocumentation": "此事件所有值的加總平均", diff --git a/plugins/Feedback/lang/ru.json b/plugins/Feedback/lang/ru.json index 5fde100254..8f6d5d88cd 100644 --- a/plugins/Feedback/lang/ru.json +++ b/plugins/Feedback/lang/ru.json @@ -1,6 +1,7 @@ { "Feedback": { "DoYouHaveBugReportOrFeatureRequest": "У вас есть багрепорт, или предложение по улучшению функционала?", + "HowToCreateTicket": "Пожалуйста, ознакомьтесь с рекомендациями по написанию хорошего %1$sbug report%2$s или %3$sfeature request%4$s. После этого зарегистрируйтесь или войдите на %5$sнаш баг-трекер%6$s и создайте %7$sновую проблему%8$s.", "IWantTo": "Я хочу:", "LearnWaysToParticipate": "Изучить все способы, с помощью которых вы можете %1$s поучаствовать%2$s", "ManuallySendEmailTo": "Пожалуйста, отправьте ваше сообщение вручную на", diff --git a/plugins/Feedback/lang/zh-tw.json b/plugins/Feedback/lang/zh-tw.json index e06f9c8c75..c1999b20ab 100644 --- a/plugins/Feedback/lang/zh-tw.json +++ b/plugins/Feedback/lang/zh-tw.json @@ -1,11 +1,34 @@ { "Feedback": { "DoYouHaveBugReportOrFeatureRequest": "你想回報 Bug 或是建議新功能？", + "HowToCreateTicket": "請閱讀撰寫優質%1$s Bug 回報%2$s或%3$s功能請求%4$s的建議。接著註冊或登入到%5$s我們的問題追蹤區%6$s並建立%7$s新的問題%8$s。", "IWantTo": "我想要：", - "LearnWaysToParticipate": "瞭解所有你可以 %1$s 參與%2$s 的方法", + "LearnWaysToParticipate": "了解所有你可以%1$s參與%2$s的方法", "ManuallySendEmailTo": "請手動寄送你的訊息至", + "PluginDescription": "寄送你的回饋給 Piwik 團隊。分享你的點子和建議來讓 Piwik 成為全世界最佳的分析平台！", + "PrivacyClaim": "Piwik 尊重你的%1$s隱私權%2$s並讓你完整掌控你的資料。", + "RateFeatureLeaveMessageDislike": "我們很遺憾你不喜歡它！請讓我們知道我們該如何改進。", + "RateFeatureLeaveMessageLike": "我們很高興你喜歡它！請讓我們知道你最喜歡哪個部分或是有什麼功能請求。", + "RateFeatureSendFeedbackInformation": "你的 Piwik 平台將寄送一封信件（包含你的 Email ）給我們（Piwik 團隊），這樣如果你有任何問題我們才能和你取得聯繫。", + "RateFeatureThankYouTitle": "感謝你為「%s」評分！", + "RateFeatureTitle": "你喜歡「%s」功能嗎？請評分並留下回應", "SendFeedback": "送出意見", "ThankYou": "謝謝你協助我們使 Piwik 變得更好！", - "TopLinkTooltip": "請分享您的意見，或提出專業支援要求。" + "TopLinkTooltip": "請分享你的意見，或要求專業支援。", + "ViewAnswersToFAQ": "查看%1$s常見問題集%2$s的答案。", + "ViewUserGuides": "查看我們的%1$s使用者指南%2$s以了解如何設定 Piwik 及如何有效分你的資料。", + "CommunityHelp": "社區協助", + "ProfessionalHelp": "專業協助", + "ProfessionalServicesIntro": "我們的 Piwik 全球性網路專業顧問支援那些自己架設 Piwik 的客戶。", + "ProfessionalServicesOfferIntro": "你可以獲得哪些服務？", + "ProfessionalServicesReviewPiwikSetup": "Piwik 安裝的評價", + "ProfessionalServicesOptimizationMaintenance": "Piwik 優化及維護服務", + "ProfessionalServicesPhoneEmailSupport": "電話及 Email 支援", + "ProfessionalServicesTraining": "使用者、技術和開發人員訓練", + "ProfessionalServicesPremiumFeatures": "高級功能", + "ProfessionalServicesCustomDevelopment": "自訂服務開發", + "ProfessionalServicesAnalystConsulting": "分析諮詢服務", + "ContactUs": "聯絡我們", + "VisitTheForums": "訪問%1$s論壇%2$s從社區中的 Piwik 使用者中取得協助。" } }
\ No newline at end of file diff --git a/plugins/Goals/lang/zh-tw.json b/plugins/Goals/lang/zh-tw.json index b55dc20bb9..c318914f77 100644 --- a/plugins/Goals/lang/zh-tw.json +++ b/plugins/Goals/lang/zh-tw.json @@ -1,45 +1,108 @@ { "Goals": { + "AbandonedCart": "遺棄的購物車", "AddGoal": "新增目標", "AddNewGoal": "新增目標", "AddNewGoalOrEditExistingGoal": "%1$s新增目標%2$s或%3$s編輯%4$s現有目標", + "AllowGoalConvertedMoreThanOncePerVisit": "一次訪問允許轉換多個目標", + "AllowMultipleConversionsPerVisit": "允許多個轉換", "BestCountries": "你的最佳轉換國家為：", "BestKeywords": "你的最佳轉換關鍵字為：", - "BestReferrers": "你的最佳轉換網站推薦連結為：", - "CaseSensitive": "大小寫符合", + "BestReferrers": "你的最佳轉換參照連結為：", + "CaseSensitive": "符合大小寫", + "CancelAndReturnToGoals": "取消並%1$s返回目標列表%2$s", + "CategoryTextGeneral_Visitors": "使用者位置", + "CategoryTextReferrers_Referrers": "參造連結", + "CategoryTextVisitsSummary_VisitsSummary": "使用者屬性", "CategoryTextDevicesDetection_DevicesDetection": "裝置", + "CategoryTextGeneral_Visit": "參與度", "ClickOutlink": "點擊外部網站連結", + "SendEvent": "觸發了事件", + "ColumnAverageOrderRevenueDocumentation": "平均訂單價值（AOV）是電子商務訂單的總收益除以總訂單數。", + "ColumnAveragePriceDocumentation": "此 %s 的平均收益。", + "ColumnAverageQuantityDocumentation": "這個 %s 於電子商務訂單中賣出的平均數量。", + "ColumnConversionRateDocumentation": "觸發目標 %s 的訪問百分比。", + "ColumnConversionRateProductDocumentation": "%s 轉換率是包含此產品的訂單數除以產品網頁的訪問數。", "ColumnConversions": "轉換", - "Contains": "有 %s", + "ColumnConversionsDocumentation": "%s 的轉換數。", + "ColumnOrdersDocumentation": "至少包含一次 %s 的電子商務訂單總數。", + "ColumnPurchasedProductsDocumentation": "已購買的產品數是所有電子商務訂單中已賣出產品數量的總和。", + "ColumnQuantityDocumentation": "數量是 %s 產品的總銷售數。", + "ColumnRevenueDocumentation": "%s 所產生的總收益。", + "ColumnRevenuePerVisitDocumentation": "%s 產生的總收益除以訪問數。", + "ColumnVisits": "訪問總數，不管目標觸發與否。", + "ColumnVisitsProductDocumentation": "產品\/分類網頁的訪問數。這也常用來計算 %s 轉換率。如果產品\/分類的頁面有設定電子商務訪問追蹤，數據就會顯示在報表中。", + "Contains": "包含 %s", + "ConversionByTypeReportDocumentation": "這份報表提供左方分類中的目標表現詳細資訊（轉換數、轉換率和單次訪問收益）。%1$s 請點擊任一分類來查看報表。%2$s 更多資訊請閱讀%3$s追蹤目標說明文件%4$s。", "ConversionRate": "%s 轉換率", "Conversions": "%s 轉換數", + "ConversionsDescription": "轉換數", "ConversionsOverview": "轉換總覽", - "DefaultRevenue": "目標預設收益是", + "ConversionsOverviewBy": "訪問類型的轉換總覽", + "DaysToConv": "訪問天數轉換", + "Details": "目標詳情", + "DefaultGoalConvertedOncePerVisit": "一次訪問只轉換一個目標（預設）", + "DefaultRevenue": "目標預設收益", "DefaultRevenueHelp": "舉例來說，訪客送出聯絡表單可能平均價值為 $10。Piwik 將幫助你瞭解你訪客區隔的表現。", - "DeleteGoalConfirm": "你確定要刪除目標 %s ？", + "DeleteGoalConfirm": "你確定要刪除目標 %s？", + "DocumentationRevenueGeneratedByProductSales": "產品銷售數。不包含稅、運費和折扣。", "Download": "下載檔案", + "Ecommerce": "電子商務", + "EcommerceAndGoalsMenu": "電子商務及目標", + "EcommerceLog": "電子商務紀錄", + "EcommerceOrder": "電子商務訂單", + "EcommerceOverview": "電子商務總覽", + "EcommerceReports": "電子商務報表", "ExceptionInvalidMatchingString": "如果你選擇「精準符合」，相符的字串必須包含一個 URL 網址的開頭 %1$s。例如「%2$s」。", - "ExternalWebsiteUrl": "外部網站網址", + "ExternalWebsiteUrl": "外部網站連結", "Filename": "檔案名稱", + "GoalConversion": "電子商務轉換", + "GoalConversions": "電子商務轉換數", + "GoalConversionsBy": "此類型的訪問轉換了 %s 個目標", "GoalIsTriggered": "目標觸發", - "GoalIsTriggeredWhen": "目標觸發當", + "GoalIsTriggeredWhen": "觸發目標當", "GoalName": "目標名稱", "Goals": "目標", + "ManageGoals": "目標管理", "GoalsOverview": "目標總覽", + "GoalsOverviewDocumentation": "這是你目標轉換的總覽。一開始，圖表顯示所有轉換的總和。%s 圖表下方你可以看到每個目標的轉換報表。迷你圖可以點擊放大。", "GoalX": "目標 %s", - "IsExactly": "正是 %s", + "HelpOneConversionPerVisit": "如果達成目標的網頁在單次訪問被重新整理或是瀏覽多次，只會追蹤這次訪問中第一次頁面載入完成時的目標。", + "IsExactly": "完全符合 %s", + "LearnMoreAboutGoalTrackingDocumentation": "在使用者說明文件中了解更多關於%1$s在 Piwik 上追蹤目標%2$s。", + "LeftInCart": "%s 項遺留在購物車", "Manually": "手動", - "ManuallyTriggeredUsingJavascriptFunction": "手動觸發的目標是使用 JavaScript API trackGoal()", - "MatchesExpression": "表達式符合 %s", + "ManuallyTriggeredUsingJavascriptFunction": "使用 JavaScript API trackGoal() 來手動觸發目標", + "MatchesExpression": "符合正則表達式 %s", + "NewGoalIntro": "目標轉換追蹤是衡量並改善你業務目標最有效的方法之一。", "NewVisitorsConversionRateIs": "新訪客轉換率為 %s", - "Optional": "（選用）", - "Pattern": "模式", + "NoGoalsNeedAccess": "只有管理員或是擁有超級使用者權限的使用者可以管理網站中的目標。請向你的 Piwik 管理員要求幫你的網站建立目標。<br>追蹤目標是一個幫助你了解你的網站以及讓它性能最大化很棒的方法。", + "NoConversionsNoReportsMessage": "報表未顯示，因為所選的目標和期間沒有轉換資料。", + "NeedAccess": "只有管理員或是擁有超級使用者權限的使用者可以管理網站中的目標。", + "Optional": "（選填）", + "OverallConversionRate": "整體轉換率（含有完整目標的訪問）", + "OverallRevenue": "整體收益", + "PageTitle": "網頁標題", + "Pattern": "值或格式", + "PluginDescription": "建立目標並查看的目標轉換你詳細報表：隨時間的發展、單次訪問收益、單個參造連結\/關鍵字的轉換等等。", + "ProductCategory": "產品分類", + "ProductName": "產品名稱", + "Products": "產品", + "ProductSKU": "產品庫存量單位", "ReturningVisitorsConversionRateIs": "回訪訪客轉換率為 %s", + "SingleGoalOverviewDocumentation": "這是單一目標的轉換總覽。%s 圖表下的迷你圖可以點擊放大。", + "ThereIsNoGoalToManage": "網站 %s 還沒有目標可管理", "UpdateGoal": "更新目標", "URL": "網址", "ViewAndEditGoals": "檢視和編輯目標", - "VisitUrl": "訪問特定網址（頁面或頁面群組）", + "GoalsBy": "來自%s的目標", + "GoalsAdjective": "目標%s", + "VisitPageTitle": "訪問特定的網頁標題", + "VisitsUntilConv": "訪問次數轉換", + "VisitUrl": "訪問特定網址（網頁或網頁群組）", "WhenVisitors": "當訪客", - "WhereThe": "位於" + "WhereThe": "符合", + "WhereVisitedPageManuallyCallsJavascriptTrackerLearnMore": "所訪問的頁面必須包含呼叫 JavaScript 的「trackGoal」方法（%1$s了解更多%2$s）", + "YouCanEnableEcommerceReports": "你可以在 %2$s 頁面為這個網站啟用 %1$s。" } }
\ No newline at end of file diff --git a/plugins/ImageGraph/lang/zh-tw.json b/plugins/ImageGraph/lang/zh-tw.json new file mode 100644 index 0000000000..ff2ad82715 --- /dev/null +++ b/plugins/ImageGraph/lang/zh-tw.json @@ -0,0 +1,6 @@ +{ + "ImageGraph": { + "ColumnOrdinateMissing": "在這份報表中找不到欄位「%1$s」。嘗試下列任一：%2$s", + "PluginDescription": "從你任何資料報表產生優美的靜態 PNG 圖像檔案。" + } +}
\ No newline at end of file diff --git a/plugins/Insights/lang/zh-tw.json b/plugins/Insights/lang/zh-tw.json new file mode 100644 index 0000000000..a3c6902984 --- /dev/null +++ b/plugins/Insights/lang/zh-tw.json @@ -0,0 +1,35 @@ +{ + "Insights": { + "PluginDescription": "提供你的流量洞察。洞察讓你查看你資料中最重要的趨勢，可以透過展示板小工具或是報表中的圖示按鈕存取。", + "ControlComparedToDescription": "比較成長於", + "ControlFilterByDescription": "顯示全部、只有已存在資料、只有新資料或只有消失資料", + "DatePeriodCombinationNotSupported": "無法在這個期間範圍組合內建立洞察。", + "DayComparedToPreviousDay": "前一天", + "DayComparedToPreviousWeek": "上週的同一天", + "DayComparedToPreviousYear": "去年的同一天", + "Filter": "過濾", + "FilterIncreaserAndDecreaser": "增加或減少", + "FilterOnlyDecreaser": "只看減少", + "FilterOnlyDisappeared": "僅限消失資料", + "FilterOnlyIncreaser": "只看增加", + "FilterOnlyMovers": "僅限已存在資料", + "FilterOnlyNew": "僅限新資料", + "IgnoredChanges": "已忽略變更影響少於 %s 的訪問數。", + "MonthComparedToPreviousMonth": "前一月", + "MonthComparedToPreviousYear": "去年的同一個月", + "MoversAndShakersWidgetTitle": "已存在和有影響力資料", + "NoResultMatchesCriteria": "沒有符合規範的資料", + "OverviewWidgetTitle": "洞察總覽", + "TitleConsideredInsightsChanges": "此列至少增加或減少 %1$s 次訪問數（總訪問數 %3$s 中的 %2$s%%）。", + "TitleConsideredInsightsGrowth": "下面的資料比對 %2$s 至少成長了 %1$s%%。", + "TitleConsideredMoversAndShakersChanges": "已存在資料的衡量標準為當它們訪問數成長超過 %1$s%% 或訪問數降低少於 %2$s%%；新資料標準為訪問數增加超過 %3$s%%（%4$s）；消失資料標準為訪問數降低少於 %5$s%%（%6$s）。", + "TitleConsideredMoversAndShakersGrowth": "%1$s 比對 %4$s 從 %2$s 變更為 %3$s。基於這個結果，每列 %5$s%% 資料的進展是在預期的範圍內。", + "TitleRowChangeDetails": "「%1$s」的%6$s從%2$s（%3$s）變更為%4$s（%5$s）。", + "TitleRowDisappearedDetails": "「%1$s」比對 %4$s 減少了 %2$s，並且從%3$s中消失。", + "TitleRowMoverAndShaker": "此列的影響比平均值高。", + "TitleRowNewDetails": "「%1$s」比對 %3$s 增加了 %2$s，並且是新數據。", + "WeekComparedToPreviousWeek": "前一週", + "WidgetCategory": "洞察", + "YearComparedToPreviousYear": "前一年" + } +}
\ No newline at end of file diff --git a/plugins/Installation/lang/da.json b/plugins/Installation/lang/da.json index fc8ce6e1e8..72ce439988 100644 --- a/plugins/Installation/lang/da.json +++ b/plugins/Installation/lang/da.json @@ -25,6 +25,7 @@ "InstallationStatus": "Installationstatus", "InsufficientPrivilegesHelp": "Du kan tilføje disse rettigheder ved at bruge et værktøj som phpMyAdmin eller ved at udføre de rigtige SQL-forespørgsler. Hvis du ikke ved hvordan man gør, skal du bede din sysadmin til at tildele rettighederne.", "InsufficientPrivilegesMain": "Enten eksisterer databasen ikke (og kunne ikke oprettes) eller den angivne bruger har utilstrækkelige privilegier. Databasebrugeren skal have følgende privilegier: %s", + "InvalidStateError": "Fejl: Piwik er allerede installeret. %1$s Gå tilbage %2$s til Piwik%3$s.", "JsTagArchivingHelp1": "For mellemstore og højt trafikere hjemmesider, er der visse optimeringer, der bør gøres for at hjælpe Piwik til køre hurtigere (såsom %1$soprettelse af auto-arkivering%2$s).", "JSTracking_EndNote": "Bemærk: Efter installationen, kan du generere tilpasset sporingskode i %1$sSporingskode%2$s administrator delen.", "JSTracking_Intro": "For at spore hjemmeside trafik med Piwik skal du sørge for nogle ekstra kode til hver af hjemmesiderne.", diff --git a/plugins/Installation/lang/it.json b/plugins/Installation/lang/it.json index d3ff5ac9c9..b403eaab52 100644 --- a/plugins/Installation/lang/it.json +++ b/plugins/Installation/lang/it.json @@ -25,6 +25,7 @@ "InstallationStatus": "Stato dell'installazione", "InsufficientPrivilegesHelp": "È possibile aggiungere questi privilegi utilizzando uno strumento come phpMyAdmin o con l'esecuzione di opportune query SQL. Se non sai come fare queste cose, chiedi al tuo amministratore di sistema di concederti questi privilegi.", "InsufficientPrivilegesMain": "O il database non esiste (e non poteva essere creato), oppure l'utente specificato dispone di privilegi insufficienti. L'utente del database deve disporre dei seguenti privilegi: %s", + "InvalidStateError": "Errore: Piwik è già installato. %1$sTorna indietro%2$s a Piwik%3$s.", "JsTagArchivingHelp1": "Per i siti con un traffico medio-alto ci sono alcune ottimizzazioni che andrebbero fatte per aiutare Piwik a girare più velocemente (come %1$simpostare l'autoarchiviazione%2$s).", "JSTracking_EndNote": "Nota: dopo l'installazione, è possibile generare un codice personalizzato di tracking nella sezione di amministrazione%1$s Codice Tracking%2$s.", "JSTracking_Intro": "Per tracciare il tuo traffico web devi assicurarti che sia stato aggiunto a tutte le pagine del codice aggiuntivo.", diff --git a/plugins/Installation/lang/pl.json b/plugins/Installation/lang/pl.json index b1c63826db..f399e2c806 100644 --- a/plugins/Installation/lang/pl.json +++ b/plugins/Installation/lang/pl.json @@ -21,6 +21,7 @@ "HappyAnalysing": "Powodzenia!", "Installation": "Instalacja", "InstallationStatus": "Postęp instalacji", + "JsTagArchivingHelp1": "Dla stron o średnim i dużym ruchu można wykonać kilka optymalizacji, by pomóc Piwik'owi działać szybciej (na przykład %1$sustawienie automatycznej archiwizacji%2$s[en]).", "LargePiwikInstances": "Pomoc w przypadku dużych instalacji z Piwik", "Legend": "Legenda", "NfsFilesystemWarning": "Twój system używa systemu plików NFS", diff --git a/plugins/Installation/lang/zh-tw.json b/plugins/Installation/lang/zh-tw.json index 94dc608066..bfd4089358 100644 --- a/plugins/Installation/lang/zh-tw.json +++ b/plugins/Installation/lang/zh-tw.json @@ -1,70 +1,147 @@ { "Installation": { - "ConfigurationHelp": "你的 Piwik 設定檔看起來似乎損毀了。你可以移除 config\/config.ini.php 然後重新安裝，或是修正資料庫的連結設定。", - "ConfirmDeleteExistingTables": "你確定要從你的資料庫刪除資料表 %s 嗎？ 警告： 這些資料表刪除後將無法復原！", + "CollaborativeProject": "Piwik 是共同協作的專案，由全世界人們的愛所建立。", + "ConfigurationHelp": "你的 Piwik 設定檔似乎有錯誤。你可以移除 config\/config.ini.php 然後重新安裝，或是修正資料庫的連結設定。", + "ConfirmDeleteExistingTables": "你確定要從你的資料庫刪除資料表 %s 嗎？ 警告：這些資料表刪除後將無法復原！", "Congratulations": "恭喜你", - "CongratulationsHelp": "<p>恭喜！ 你的 Piwik 安裝已經完成。<\/p><p>請確認你的 JavaScript 追蹤碼已插入至你的網頁中，然後等候你的首位訪客吧！<\/p>", - "DatabaseCreation": "資料庫建立", + "CongratulationsHelp": "<p>恭喜！你的 Piwik 安裝已經完成。<\/p><p>請確認你的 JavaScript 追蹤碼已插入至你的網頁中，然後等候你的首位訪客吧！<\/p>", + "DatabaseAbilities": "資料庫能力", + "DatabaseCreation": "建立資料庫", "DatabaseErrorConnect": "連線至資料庫伺服器時發生錯誤", "DatabaseServerVersion": "資料庫伺服器版本", "DatabaseSetup": "資料庫設定", + "DatabaseSetupAdapter": "介面卡", "DatabaseSetupDatabaseName": "資料庫名稱", "DatabaseSetupLogin": "資料庫帳號", "DatabaseSetupServer": "資料庫伺服器", - "DatabaseSetupTablePrefix": "資料表前綴詞", + "DatabaseSetupTablePrefix": "資料表前綴", "Email": "Email", "Extension": "擴充", - "GoBackAndDefinePrefix": "返回並為 Piwik 資料表定義一個資料表前綴", + "Filesystem": "檔案系統", + "GetInvolved": "如果你喜歡你所見的，可以%1$s參與其中%2$s。", + "GoBackAndDefinePrefix": "返回並為 Piwik 資料表定義資料表前綴", + "HappyAnalysing": "分析快樂！", "Installation": "安裝", "InstallationStatus": "安裝狀態", - "LargePiwikInstances": "Piwik 給予大型網站的協助", + "InsufficientPrivilegesHelp": "你可以透過像是 phpMyAdmin 的工具或是執行 SQL 指令來新增這些權限。如果你不知道如何處理，請聯絡你的系統管理員提供這些權限給你。", + "InsufficientPrivilegesMain": "資料庫不存在（或是無法建立），或是特定使用者的權限不足。資料庫使用者必須有以下權限：%s", + "InvalidStateError": "錯誤：Piwik 已經安裝了。%1$s返回 %2$sPiwik%3$s。", + "JsTagArchivingHelp1": "對中高流量的網站來說這裡有一些優化方式幫助 Piwik 執行更快速（例如%1$s設定自動彙整%2$s）。", + "JSTracking_EndNote": "注意：安裝程序完成後，你可以在管理後台的%1$s追蹤程式碼%2$s中產生自訂追蹤程式碼。", + "JSTracking_Intro": "要使用 Piwik 追蹤你的網頁流量，你必須確定程式碼已加入你的網頁中。", + "LargePiwikInstances": "給予高流量網站的協助", "Legend": "說明", + "LoadDataInfileRecommended": "如果你的 Piwik 追蹤高流量網站（例如每個月 > 100,000 網頁瀏覽數），我們推薦你解決這個問題。", + "LoadDataInfileUnavailableHelp": "使用 %1$s 將大幅提升 Piwik 彙整速度。想這麼做請試著更新你的 PHP 和 MySQL 軟體，並確保資料庫使用者有 %2$s 權限。", + "NfsFilesystemWarning": "你的伺服器使用 NFS 檔案系統。", + "NfsFilesystemWarningSuffixAdmin": "這代表 Piwik 在執行到基於檔案的處理時將會非常慢。", + "NfsFilesystemWarningSuffixInstall": "在 NFS 中執行到基於檔案的處理時將會非常慢，因此 Piwik 將會使用資料庫處理。如果你同時有許多展示板使用者，你必須增加客戶端連線資料庫的最大值。", + "NoConfigFileFound": "你正嘗試存取 Piwik 頁面，但找不到 Piwik 設定檔案。", + "YouMayInstallPiwikNow": "你可以%1$s立即安裝 Piwik%2$s", + "IfPiwikInstalledBeforeTablesCanBeKept": "如果你之前安裝過 Piwik 而且資料庫中殘留一些資料表，別擔心，你可以重覆使用這些資料表並保存現有資料！", "Optional": "選擇性", + "Password": "密碼", "PasswordDoNotMatch": "密碼不相符", - "PercentDone": "%s %% 已完成", - "PleaseFixTheFollowingErrors": "請修復以下錯誤", + "PasswordRepeat": "密碼（重覆）", + "PercentDone": "已完成 %s %%", + "ProfessionalServicesAdTitle": "進階分析和服務", + "ProfessionalServicesfessionalServicesAdText": "我們的網路專家可以幫助你的機構解除 Piwik 最大的分析能力。", + "ProfessionalServicesfessionalDiscoverHow": "了解更多關於 Piwik 的%1$s附加產品和服務%2$s，以及如何增加你的轉換數及收益。", + "PleaseFixTheFollowingErrors": "請修正以下錯誤", + "DefaultSettings": "預設 Piwik 設定", + "DefaultSettingsHelp": "Piwik 使用預設設定。現在你可以自訂或是稍後前往管理中心設定。", "Requirements": "Piwik 需求", + "RestartWebServer": "變更此設定後，重新開啟你的伺服器", + "ReusingTables": "重覆使用資料表", + "PiwikOrgNewsletter": "寄送 Piwik 社區中主要的更新給我", + "ProfessionalServicesNewsletter": "寄送 Piwik %1$s專業服務和產品%2$s的資訊給我", + "SeeBelowForMoreInfo": "查看下方更多資訊", "SetupWebsite": "設定網站", "SetupWebsiteError": "增加網站時發生錯誤", + "SetupWebSiteName": "網站名稱", "SetupWebsiteSetupSuccess": "網站 %s 已成功建立！", + "SetupWebSiteURL": "網站網址", + "SiteSetup": "請先設定首個你想用 Piwik 來追蹤分析的網站：", + "SiteSetupFootnote": "注意：當 Piwik 安裝完成後，你將可以新增更多要追蹤的網站！", + "SuperUser": "超級使用者", + "SuperUserLogin": "超級使用者登入", + "SuperUserSetupError": "新增超級使用者時發生錯誤", + "SuperUserSetupSuccess": "已成功新增超級使用者！", "SystemCheck": "系統檢查", - "SystemCheckAutoUpdateHelp": "注意：Piwik 的一鍵更新功能必須要有 Piwik 目錄及內容的寫入權限。", - "SystemCheckCreateFunctionHelp": "Piwik 在callbacks上使用匿名函式。", - "SystemCheckDatabaseHelp": "Piwik 需要 mysqli 擴充元件或包含 PDO 及 pdo_mysql 擴充元件。", + "SystemCheckAutoUpdateHelp": "注意：Piwik 的一鍵更新功能必須要有 Piwik 資料夾及內容的寫入權限。", + "SystemCheckCreateFunctionHelp": "Piwik 的回傳使用匿名功能。", + "SystemCheckDatabaseExtensions": "MySQL 擴充功能", + "SystemCheckDatabaseHelp": "Piwik 需要 mysqli 或包含 PDO 及 pdo_mysql 的擴充功能。", "SystemCheckDebugBacktraceHelp": "呼叫 View::factory 將無法建立顯示。", "SystemCheckError": "發生錯誤 - 繼續前必須先修正", "SystemCheckEvalHelp": "必須為 HTML QuickForm 及 Smarty 模版系統。", - "SystemCheckExtensions": "其他需要的擴充元件", + "SystemCheckExtensions": "其他必要的擴充功能", "SystemCheckFileIntegrity": "檔案完整性", - "SystemCheckFunctions": "必須函式", - "SystemCheckGDHelp": "Sparklines（小圖）和圖片（Piwik 手機版和報表信件中）將無法運作。", - "SystemCheckGlobHelp": "這個內建的函式已被你的主機商停用。Piwik 將嘗試模擬這個功能，但可能會遇到更多安全限制。功能可能受到影響。", + "SystemCheckFunctions": "必要功能", + "SystemCheckFunctionHelp": "你必須啟用這個內建功能。", + "SystemCheckGDFreeType": "GD > 2.x + Freetype（圖形）", + "SystemCheckGDHelp": "迷你圖（小圖表）和圖片（Piwik 應用程式和報表信件中）將無法運作。", + "SystemCheckGlobHelp": "這個內建的功能已被你的主機商停用。Piwik 將嘗試模擬這個功能，但可能會遇到安全限制。功能可能受到影響。", + "SystemCheckGzcompressHelp": "你必須啟用 zlib 擴充功能和 gzcompress 功能。", + "SystemCheckGzuncompressHelp": "你必須啟用 zlib 擴充功能和 gzuncompress 功能。", "SystemCheckIconvHelp": "你需要設定及重建 PHP，然後啟用 iconv 支援，--with-iconv。", - "SystemCheckMailHelp": "意見回應及忘記密碼訊息若沒有 mail() 將無法寄送。", + "SystemCheckJsonHelp": "Piwik 要讀寫 JSON 檔案必須使用 php5-json 擴充功能。", + "SystemCheckMailHelp": "意見回饋及忘記密碼的訊息若沒有 mail() 將無法寄送。", + "SystemCheckMbstring": "mbstring", + "SystemCheckMbstringHelp": "處理多字節的使用者介面或 API 回應資料必須使用 mbstring 擴充功能。並請檢查 php.ini 中的 mbstring.func_overload 已設定為「0」。", "SystemCheckMemoryLimit": "記憶體限制", - "SystemCheckMemoryLimitHelp": "在一個高流量的網站，資料彙整歸檔過程可能超過目前所允許使用的記憶體量。<br \/>假如必要，試著變更在你的 php.ini 檔案裡的 memory_limit.", - "SystemCheckOpenURL": "開啟網址", + "SystemCheckMemoryLimitHelp": "在一個高流量的網站，資料彙整處理過程可能超過目前所允許使用的記憶體量。<br \/>如果必要，試著變更在你 php.ini 檔案裡的 memory_limit。", + "SystemCheckNoErrorsOrWarnings": "沒有錯誤或警告", + "SystemCheckViewFullSystemCheck": "查看完整的系統檢查報表", + "SystemCheckOpenURL": "網址開啟", "SystemCheckOpenURLHelp": "新聞信件訂閱、更新通知及一鍵安裝更新功能需要 curl 函式，allow_url_fopen=On，或啟用 fsockopen()。", - "SystemCheckParseIniFileHelp": "內建的函式在你的空間內已被停用。Piwik 將會嘗試模擬這些功能，但可能會造成更多安全性問題。追蹤的表現也會受到影響。", + "SystemCheckOtherExtensions": "其他擴充功能", + "SystemCheckOtherFunctions": "其他功能", + "SystemCheckPageSpeedDisabled": "已停用 PageSpeed", + "SystemCheckPageSpeedWarn": "我們建議停用伺服器 %s 中的 PageSpeed 模組：已知 PageSpeed 將導致 Piwik 發生多種問題。", + "SystemCheckPackHelp": "Piwik 必須使用 pack() 功能才能追蹤訪客。", + "SystemCheckParseIniFileHelp": "這個內建的功能已被你的主機商停用。Piwik 將嘗試模擬這個功能，但可能會遇到安全限制。追蹤性能也會受到影響。", "SystemCheckPdoAndMysqliHelp": "在 GNU\/Linux 伺服器上你可以使用以下選項編譯 PHP：在你的 php.ini 中 %1$s，加入以下幾行內容：%2$s", "SystemCheckPhp": "PHP 版本", "SystemCheckPhpPdoAndMysqli": "更多資訊：%1$sPHP PDO%2$s 和 %3$sMYSQLI%4$s。", "SystemCheckSplHelp": "你需要設定及重建 PHP，然後啟用 Standard PHP Library (SPL)（預設啟用）。", + "SystemCheckSettings": "必要的 PHP 設定（php.ini）", + "SystemCheckSummaryNoProblems": "好極了！Piwik 安裝過程中沒有問題！給自己掌聲鼓勵吧。", + "SystemCheckSummaryThereWereErrors": "啊噢！Piwik 在安裝過程中偵測到一些%1$s嚴重問題%2$s。%3$s這些問題必須立即被修正。%4$s", + "SystemCheckSummaryThereWereWarnings": "你的系統中有些問題。Piwik 可以運作，但你可能會遇到一些細小的問題。", "SystemCheckTimeLimitHelp": "在一個高流量的網站，執行資料彙整歸檔過程可能超過目前所允許使用的時間。<br \/>假如必要，試著變更在你的 php.ini 檔案裡的 max_execution_time。", + "SystemCheckTracker": "追蹤狀態", + "SystemCheckTrackerHelp": "以 GET 請求 piwik.php 失敗。嘗試將這個網站加入白名單，或關閉 mod_security（你可能要向你的主機商詢問）。更多錯誤資訊，查看你伺服器的錯誤記錄檔。", + "SystemCheckWarnDomHelp": "你必須啟用「dom」擴充功能（例如安裝「php-dom」和\/或「php-xml」功能）。", "SystemCheckWarning": "Piwik 能正常運作，但部份功能可能會失效", + "SystemCheckWarnJsonHelp": "你必須啟用「json」擴充功能（例如安裝「json」功能）以獲得最佳體驗。", + "SystemCheckWarnLibXmlHelp": "你必須啟用「libxml」擴充功能（例如安裝「php-libxml」功能），因為它是其他 PHP 核心擴充功能的必備功能。", + "SystemCheckWarnSimpleXMLHelp": "你必須啟用「SimpleXML」擴充功能（例如安裝「php-simplexml」和\/或「php-xml」功能）。", "SystemCheckWinPdoAndMysqliHelp": "在 Windows 伺服器上你可以在你的 php.ini 中新增以下幾行內容：%s", - "SystemCheckWriteDirs": "具寫入存取權限的目錄", - "SystemCheckWriteDirsHelp": "要在你的 Linux 系統修正這個錯誤，嘗試輸入以下指令", + "SystemCheckWriteDirs": "具寫入存取權限的資料夾", + "SystemCheckWriteDirsHelp": "要在你的 GNU\/Linux 系統修正這個錯誤，嘗試輸入以下指令", "SystemCheckZlibHelp": "你需要設定及重建 PHP，然後啟用 zlib 支援，--with-zlib。", - "Tables": "建立資料表中", + "SystemCheckCronArchiveProcess": "彙整工作排程", + "SystemCheckCronArchiveProcessCLI": "透過 CLI 管理程序", + "SystemCheckPhpSetting": "要預防一些嚴重問題，你必須變更 php.ini 檔案中的以下設定：%s", + "SystemCheckUpdateHttps": "透過 HTTPS 更新", + "SystemCheckUpdateHttpsNotSupported": "Piwik 使用 HTTPS 更新，它將會返回到不安全的 HTTP 更新。檢查 CURL 或是 allow_url_fopen 是否支援，以及必須安裝 PHP 擴充功能 openssl：http:\/\/piwik.org\/faq\/troubleshooting\/faq_177\/。", + "NotSupported": "不支援", + "Tables": "建立資料表", "TablesCreatedSuccess": "資料表已成功建立！", - "TablesDelete": "刪除已檢測到的資料表", - "TablesDeletedSuccess": "已存在的 Piwik 資料表已成功刪除", - "TablesFound": "以下的資料表在資料庫之中被找到", - "TablesReuse": "重複使用已存在的資料表", - "TablesWarningHelp": "選擇重複使用現存的資料表或者選擇全新安裝，以清除所有現存資料庫中的資料。", - "TablesWithSameNamesFound": "部份 %1$s 資料表在你的資料庫 %2$s 與 Piwik 正嘗試建立的資料表名稱重複", - "Welcome": "歡迎使用！", - "WelcomeHelp": "<p>Piwik 是一個能夠讓你輕而易舉就取得訪客資訊的開放原始碼網站分析軟體。<\/p><p>此安裝過程分為 %s 個簡易的步驟，需要大約 5 分鐘的時間。<\/p>" + "TablesDelete": "刪除已偵測到的資料表", + "TablesDeletedSuccess": "現有的 Piwik 資料表已成功刪除", + "TablesFound": "在資料庫中已找到以下的資料表", + "TablesReuse": "重覆使用現有的資料表", + "TablesUpdatedSuccess": "資料庫已經成功從 %1$s 更新至 %2$s！", + "TablesWarningHelp": "選擇重覆使用現有的資料表或者選擇全新安裝，以清除現有資料庫中所有資料。", + "TablesWithSameNamesFound": "部份%1$s資料庫中的資料表%2$s與 Piwik 正嘗試建立的資料表名稱重複", + "Timezone": "網站時區", + "WeHopeYouWillEnjoyPiwik": "我們希望你能享受使用 Piwik 如同我們享受開發它。", + "Welcome": "歡迎！", + "WelcomeHelp": "<p>Piwik 是一個輕鬆取得訪客資訊的免費網頁分析軟體。<\/p><p>此安裝過程分為 %s 個簡單步驟，需要大約 5 分鐘的時間。<\/p>", + "WelcomeToCommunity": "歡迎來到 Piwik 社區！", + "CannotConnectToDb": "無法連接資料庫", + "CannotConnectToDbResolvingExplanation": "這可能是暫時性的問題，試試%1$s重新整理頁面%2$s。如果問題持續發生請聯絡你的 Piwik 管理員。" } }
\ No newline at end of file diff --git a/plugins/LanguagesManager/lang/zh-tw.json b/plugins/LanguagesManager/lang/zh-tw.json index 5698c9b0ad..8d6d4aaa43 100644 --- a/plugins/LanguagesManager/lang/zh-tw.json +++ b/plugins/LanguagesManager/lang/zh-tw.json @@ -1,5 +1,6 @@ { "LanguagesManager": { - "AboutPiwikTranslations": "關於 Piwik 翻譯" + "AboutPiwikTranslations": "關於 Piwik 翻譯", + "TranslationSearch": "翻譯搜尋" } }
\ No newline at end of file diff --git a/plugins/Live/API.php b/plugins/Live/API.php index 39fa33f361..fa22b8034f 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -187,7 +187,7 @@ class API extends \Piwik\Plugin\API } /** - * Returns an array describing a visitor using her last visits (uses a maximum of 100). + * Returns an array describing a visitor using their last visits (uses a maximum of 100). * * @param int $idSite Site ID * @param bool|false|string $visitorId The ID of the visitor whose profile to retrieve. diff --git a/plugins/Live/Visitor.php b/plugins/Live/Visitor.php index f50e495537..de54b7d9b3 100644 --- a/plugins/Live/Visitor.php +++ b/plugins/Live/Visitor.php @@ -124,7 +124,7 @@ class Visitor implements VisitorInterface /** * Removes fields that are not meant to be displayed (md5 config hash) - * Or that the user should only access if he is Super User or admin (cookie, IP) + * Or that the user should only access if they are Super User or admin (cookie, IP) * * @param array $visitorDetails * @return array @@ -158,7 +158,7 @@ class Visitor implements VisitorInterface // ==> also update API/API.php getSuggestedValuesForSegment(), the $segmentsNeedActionsInfo array // flatten visit custom variables - if (!empty($visitorDetailsArray['customVariables']) + if (!empty($visitorDetailsArray['customVariables']) && is_array($visitorDetailsArray['customVariables'])) { foreach ($visitorDetailsArray['customVariables'] as $thisCustomVar) { $visitorDetailsArray = array_merge($visitorDetailsArray, $thisCustomVar); diff --git a/plugins/Live/lang/zh-tw.json b/plugins/Live/lang/zh-tw.json index 2d6f449860..c6e2cb49fd 100644 --- a/plugins/Live/lang/zh-tw.json +++ b/plugins/Live/lang/zh-tw.json @@ -1,35 +1,46 @@ { "Live": { - "AveragePageGenerationTime": "這個使用者平均花費 %1$s 載入網頁。", - "CalculatedOverNPageViews": "以這個訪客過去 %1$s 次頁面訪問來計算。", + "AbandonedCartSummary": "%1$s 個棄用的購物車%2$s 和 %3$s 項被棄用的項目%4$s，總價值 %5$s%6$s。", + "AveragePageGenerationTime": "這個訪客平均花費 %1$s 載入網頁。", + "CalculatedOverNPageViews": "以這個訪客過去 %1$s 次網頁瀏覽來計算。", "ClickToViewMoreAboutVisit": "點擊以查看這個訪問紀錄的詳細資訊", "ConvertedNGoals": "轉換了 %s 個目標", + "EcommerceSummaryConversions": "%1$s 個訂單%2$s總價值 %3$s%4$s，購買了 %5$s 個項目%6$s。", "FirstVisit": "首次訪問", "GoalType": "類型", "HideMap": "隱藏地圖", + "KeywordRankedOnSearchResultForThisVisitor": "這個訪客在 %3$s 搜尋結果頁中的關鍵字 %1$s 排名第 %2$s。", "LastHours": "最近 %s 小時", "LastMinutes": "最近 %s 分鐘", "LastVisit": "最後訪問", "LinkVisitorLog": "查看詳細的訪客記錄", "LoadMoreVisits": "載入更多訪客", - "MorePagesNotDisplayed": "更多此訪客的到達頁面未顯示", + "MorePagesNotDisplayed": "更多此訪客的到達網頁未顯示", "NbVisitor": "1 位訪客", "NbVisitors": "%s 位訪客", "NextVisitor": "下一位訪客", "NoMoreVisits": "這個訪客沒有更多訪問紀錄了。", + "PageRefreshed": "這個網頁的連續查看\/重新整理次數。", + "PluginDescription": "提供即時訪客紀錄並讓你在展示板小工具中即時查看你的訪客。這個外掛也能讓你查看任何訪客資料。", "PreviousVisitor": "上一位訪客", "RealTimeVisitorCount": "即時訪客數量", "Referrer_URL": "參造連結網址", "ShowMap": "顯示地圖", + "SimpleRealTimeWidget_Message": "%1$s 和 %2$s 在過去 %3$s", "ViewVisitorProfile": "查看訪客資料", - "VisitedPages": "到達頁面", + "VisitedPages": "到達網頁", "VisitorLog": "訪客記錄", + "VisitorLogDocumentation": "這個表格顯示所選擇的時間範圍中最新的訪問。你可以將滑鼠移過訪問日期查看訪客最後訪問為何時。%1$s如果日期範圍包含今日，你就可以即時查看訪客！%2$s這裡顯示的資料不論是否和多常使用彙整工作排程，永遠是即時的。", "VisitorProfile": "訪客資料", "VisitorsInRealTime": "即時訪客資訊", "VisitorsLastVisit": "此訪客曾於 %s 天前訪問過。", "VisitsFrom": "%1$s%2$s 次訪問%3$s 來自", - "VisitSummary": "共停留了 %1$s%2$s 在網站上%3$s，並訪問了 %4$s 個頁面%5$s在過去 %6$s 次%7$s次訪問。", - "VisitSummaryWithActionDetails": "共停留了 %1$s%2$s 在網站上%3$s，並執行了 %4$s 個動作%5$s（%6$s）在過去 %7$s 次%8$s次訪問。", + "VisitSummary": "共停留了 %1$s%2$s 在網站上%3$s，並訪問了 %4$s 個網頁%5$s在過去 %6$s 次%7$s次訪問。", + "VisitSummaryWithActionDetails": "共停留了 %1$s%2$s 在網站上%3$s，並執行了 %4$s 個活動%5$s（%6$s）在過去 %7$s 次%8$s次訪問。", + "RowActionTooltipDefault": "以此列建立區隔顯示訪客紀錄", + "RowActionTooltipWithDimension": "以此%s建立區隔顯示訪客紀錄", + "RowActionTooltipTitle": "開啟已區隔的訪客紀錄", + "SegmentedVisitorLogTitle": "訪客紀錄顯示 %1$s 為「%2$s」的訪問紀錄", "OnClickPause": "%s 已開始。點擊暫停。", "OnClickStart": "%s 已停止。點擊開始。" } diff --git a/plugins/Live/stylesheets/live.less b/plugins/Live/stylesheets/live.less index ff9d7f02fc..3e263416e4 100644 --- a/plugins/Live/stylesheets/live.less +++ b/plugins/Live/stylesheets/live.less @@ -292,6 +292,8 @@ a.visitor-log-visitor-profile-link { .visitorLogIcons .visitorLogIconWithDetails>img { margin: auto 5px auto 0; + width: 16px; + height: 16px; } .visitorLogIcons>span.visitorRank>img { diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index ef88ba439d..ac1ce17e06 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -20,8 +20,8 @@ <br /> {% if visitor.countryFlag is defined %} <img src="{{ visitor.countryFlag }}" title="{{ visitor.location|e('html_attr') }}, {{ 'Provider_ColumnProvider'|translate }} {% if visitor.providerName is defined %}{{ visitor.providerName }}{% endif %}"/>{% endif %} - {% if visitor.browserIcon is defined %} <img src="{{ visitor.browserIcon }}" title="{{ visitor.browser|e('html_attr') }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %} - {% if visitor.operatingSystemIcon is defined %} <img src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %} + {% if visitor.browserIcon is defined %} <img width="16px" height="16px" src="{{ visitor.browserIcon }}" title="{{ visitor.browser|e('html_attr') }}{% if visitor.plugins is defined %}, {{ 'General_Plugins'|translate }}: {{ visitor.plugins }}{% endif %}"/>{% endif %} + {% if visitor.operatingSystemIcon is defined %} <img width="16px" height="16px" src="{{ visitor.operatingSystemIcon }}" title="{{ visitor.operatingSystem }}{% if visitor.resolution is defined %}, {{ visitor.resolution }}{% endif %}"/>{% endif %} {% if visitor.visitConverted %} <span title="{{ 'General_VisitConvertedNGoals'|translate(visitor.goalConversions) }}" @@ -166,4 +166,4 @@ $('#visitsLive').on('click', '.visits-live-launch-visitor-profile', function (e) broadcast.propagateNewPopoverParameter('visitorProfile', $(this).attr('data-visitor-id')); return false; }); -</script>
\ No newline at end of file +</script> diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 7a24a6606f..9ec0960ba8 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -26,12 +26,12 @@ <li> {% if visitData.browserName is defined %} <div class="visitor-profile-browser" title="{% if visitData.plugins is not defined %}{{ visitData.browser }}{% elseif visitData.plugins %}{{ 'DevicePlugins_BrowserWithPluginsEnabled'|translate(visitData.browser, visitData.plugins) }}{% else %}{{ 'DevicePlugins_BrowserWithNoPluginsEnabled'|translate(visitData.browser) }}{% endif %}"> - {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span> + {% if visitData.browserIcon is defined %}<img src="{{ visitData.browserIcon }}" width="16px" height="16px"/>{% endif %}<span>{{ visitData.browserName|split(' ')[0] }}</span> </div> {% endif %} <div class="visitor-profile-os"> - {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %} + {% if visitData.operatingSystemIcon is defined %}<img src="{{ visitData.operatingSystemIcon }}" width="16px" height="16px"/>{% endif %}{% if visitData.operatingSystem is defined %}<span>{{ visitData.operatingSystem }}</span>{% endif %} </div> </li> {% if visitData.resolution is defined %}<li><span>{{ 'Resolution_ColumnResolution'|translate }}</span><strong>{{ visitData.resolution }}</strong></li>{% endif %} diff --git a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml index 53edd3b829..565400247a 100644 --- a/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test___Live.getVisitorProfile.xml @@ -117,14 +117,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -148,11 +148,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -219,14 +219,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -250,11 +250,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -321,14 +321,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -352,11 +352,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -423,14 +423,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -454,11 +454,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -525,14 +525,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -556,11 +556,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -627,14 +627,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -658,11 +658,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -729,14 +729,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -760,11 +760,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -831,14 +831,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -862,11 +862,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -933,14 +933,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -964,11 +964,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1035,14 +1035,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1066,11 +1066,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml index ef8519446f..cbf2389176 100644 --- a/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml +++ b/plugins/Live/tests/System/expected/test_higherLimit__Live.getVisitorProfile.xml @@ -117,14 +117,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -148,11 +148,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -219,14 +219,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -250,11 +250,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -321,14 +321,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -352,11 +352,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -423,14 +423,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -454,11 +454,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -525,14 +525,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -556,11 +556,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -627,14 +627,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -658,11 +658,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -729,14 +729,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -760,11 +760,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -831,14 +831,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -862,11 +862,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -933,14 +933,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -964,11 +964,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1035,14 +1035,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1066,11 +1066,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1137,14 +1137,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1168,11 +1168,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1239,14 +1239,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1270,11 +1270,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1341,14 +1341,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1372,11 +1372,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1443,14 +1443,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1474,11 +1474,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1545,14 +1545,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1576,11 +1576,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1647,14 +1647,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1678,11 +1678,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1749,14 +1749,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1780,11 +1780,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1851,14 +1851,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1882,11 +1882,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1953,14 +1953,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1984,11 +1984,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2055,14 +2055,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2086,11 +2086,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/plugins/LogViewer b/plugins/LogViewer -Subproject e02c1d9f4f6bc00221d18313932b42e73345bab +Subproject a6b0da9780343ceeaae427fd5457016f71a294c diff --git a/plugins/Login/PasswordResetter.php b/plugins/Login/PasswordResetter.php index a9190ed659..730004b634 100644 --- a/plugins/Login/PasswordResetter.php +++ b/plugins/Login/PasswordResetter.php @@ -26,7 +26,7 @@ use Piwik\Url; * * The process to reset a password is as follows: * - * 1. The user chooses to reset a password. He/she enters a new password + * 1. The user chooses to reset a password. They enter a new password * and submits it to Piwik. * 2. PasswordResetter will store the hash of the password in the Option table. * This is done by {@link initiatePasswordResetProcess()}. diff --git a/plugins/Login/lang/zh-tw.json b/plugins/Login/lang/zh-tw.json index 64c9f81f21..6f65c10f35 100644 --- a/plugins/Login/lang/zh-tw.json +++ b/plugins/Login/lang/zh-tw.json @@ -1,17 +1,26 @@ { "Login": { - "ContactAdmin": "可能原因：您的伺服主機可能已經停用了 mail() 函式。<br \/>請聯絡您的 Piwik 管理員。", + "ConfirmationLinkSent": "確認連結已經發送到你的信箱中。請前往信箱並點擊該連結來確認變更密碼的要求。", + "ContactAdmin": "可能原因：你的伺服器可能已經停用了 mail() 函式。<br \/>請聯絡你的 Piwik 管理員。", + "ExceptionInvalidSuperUserAccessAuthenticationMethod": "擁有超級使用者權限的使用者無法使用「%s'」機制驗證。", "ExceptionPasswordMD5HashExpected": "密碼參數會是 MD5 雜湊加密的密碼。", + "InvalidNonceOrHeadersOrReferrer": "表單安全性驗證失敗。請重新整理頁面並確定已啟用 cookies。如果你正在使用 Proxy 伺服器，你必須%1$s設定讓 Piwik 接受跳轉的 Proxy header%2$s。並檢查你的來源（Referrer）header 傳送正確。", + "InvalidNonceSSLMisconfigured": "當然，你可以%1$s強制 Piwik 使用安全連線%2$s：在你的設定檔案 %3$s 在 %5$s 下方設定 %4$s", "InvalidOrExpiredToken": "Token 不正確或已過期。", - "InvalidUsernameEmail": "無效的使用者名稱 和\/或 E-mail 位址", + "InvalidUsernameEmail": "使用者名稱或 Email 無效", "LogIn": "登入", - "LoginOrEmail": "登入帳號或 E-mail", + "LoginOrEmail": "使用者名稱或 Email", "LoginPasswordNotCorrect": "使用者名稱 & 密碼不正確。", - "LostYourPassword": "遺失了您的密碼嗎？", + "LostYourPassword": "密碼遺失了？", + "ChangeYourPassword": "變更你的密碼", + "MailPasswordChangeBody": "%1$s，你好：\n\n這裡有個來自 %2$s 的密碼變更要求。要確認這個密碼變更並使用新密碼登入，請點擊以下連結：\n\n%3$s\n\n注意：變更密碼後也會變更你的 API 驗證 Token，你可以在個人設定中查看新的 API 驗證 Token。\n\n如果你在其他應用程式或彙整中使用了你的 API 驗證 Token，請記得要更新它否則工作將會失敗。\n\n注意：此連結將於 24 小時候失效。\n\n感謝你使用 Piwik！", "MailTopicPasswordChange": "確認密碼變更", "NewPassword": "新密碼", "NewPasswordRepeat": "新密碼（重覆）", + "PasswordChanged": "你的密碼已變更。", "PasswordRepeat": "密碼（再次輸入）", - "PasswordsDoNotMatch": "密碼不相符。" + "PasswordsDoNotMatch": "密碼不相符。", + "PluginDescription": "提供使用者名稱與密碼驗證以及重設密碼功能。驗證方法可以透過使用市集中的其他登入外掛如 LoginLdap 來變更。", + "RememberMe": "記住我" } }
\ No newline at end of file diff --git a/plugins/Marketplace/lang/zh-tw.json b/plugins/Marketplace/lang/zh-tw.json index d6acf4aed8..9da6bfda08 100644 --- a/plugins/Marketplace/lang/zh-tw.json +++ b/plugins/Marketplace/lang/zh-tw.json @@ -1,19 +1,112 @@ { "Marketplace": { "ActivateLicenseKey": "啟用", + "ActionActivatePlugin": "啟用外掛", + "ActionActivateTheme": "啟用主題", + "ActionInstall": "安裝", + "AddToCart": "加到購物車", + "AllowedUploadFormats": "你可以在這個頁面上上傳 .zip 格式的外掛或主題。", + "Authors": "作者", "BackToMarketplace": "回到市集", "BrowseMarketplace": "瀏覽市集", + "ByXDevelopers": "來自 %s 位開發人員", + "CannotInstall": "無法安裝", + "CannotUpdate": "無法更新", + "ClickToCompletePurchase": "點擊完成購買。", + "CurrentNumPiwikUsers": "你的 Piwik 目前有 %1$s 位已註冊的使用者。", + "ConfirmRemoveLicense": "你確定要移除註冊碼嗎？你將無法再收到任何你已購買外掛的更新。", "Developer": "開發人員", + "DevelopersLearnHowToDevelopPlugins": "開發人員：了解如何透過%1$s開發外掛和主題%2$s來擴展和自訂 Piwik。", "Marketplace": "市集", + "PaidPlugins": "高級功能", + "FeaturedPlugin": "特色外掛", "InstallingNewPluginViaMarketplaceOrUpload": "你可以直接從市集中安裝%1$s或是直接%2$s上傳 .zip 格式%4$s的%3$s。", + "InstallingPlugin": "安裝 %s 中", + "InstallPurchasedPlugins": "安裝已購買的外掛", + "LastCommitTime": "（最後提交於 %s）", + "LastUpdated": "最後更新", + "License": "憑證", + "LicenseKey": "註冊碼", + "LicenseKeyActivatedSuccess": "註冊碼已啟用！", + "LicenseKeyDeletedSuccess": "註冊碼已刪除。", + "Exceeded": "超出限額", + "LicenseMissing": "遺失憑證", + "LicenseMissingDescription": "下列使用的外掛沒有憑證：%1$s。%2$s要解決這個問題請更新你的註冊碼、%3$s立即訂閱%4$s或是停用外掛。", + "PluginLicenseMissingDescription": "你無法下載這個外掛，因為沒有屬於此外掛的憑證。要解決這個問題請更新你的註冊碼、訂閱或是移除外掛。", + "LicenseExceeded": "憑證超出限額", + "LicenseExceededDescription": "下列外掛的憑證超出使用者授權限制因此不再有效：%1$s。%2$s你將無法下載這些外掛的更新。要解決這個問題請刪除一些使用者，或是%3$s立即升級訂閱項目%4$s。", + "PluginLicenseExceededDescription": "你無法下載這個外掛。此外掛的憑證超出使用者授權限制因此不再有效。要解決這個問題請刪除一些使用者，或是立即升級訂閱項目。", + "LicenseExpired": "憑證已過期", + "LicenseExpiredDescription": "下列使用外掛的憑證已過期：%1$s。%2$s你將不會再收到這些外掛的更新。要解決這個問題請%3$s立即更新訂閱%4$s，若是不會再使用到請停用外掛。", + "LicenseRenewsNextPaymentDate": "在下次付款日期更新", + "UpgradeSubscription": "升級訂閱項目", + "ViewSubscriptionsSummary": "%1$s查看你訂閱的外掛%2$s。", + "ViewSubscriptions": "查看訂閱項目", + "ExceptionLinceseKeyIsExpired": "此註冊碼已過期。", + "ExceptionLinceseKeyIsNotValid": "此註冊碼無效。", + "LicenseKeyIsValidShort": "註冊碼可用！", + "RemoveLicenseKey": "移除註冊碼", + "InstallAllPurchasedPlugins": "一次安裝所有已購買的外掛", + "InstallAllPurchasedPluginsAction": "安裝並啟用 %d 個已購買的外掛", + "InstallThesePlugins": "這將安裝並啟用以下外掛：", "AllPaidPluginsInstalledAndActivated": "所有付費外掛已成功安裝並啟用。", "OnlySomePaidPluginsInstalledAndActivated": "部分付費外掛並未成功安裝。", + "NewVersion": "新版本", "NotAllowedToBrowseMarketplacePlugins": "你可以瀏覽可安裝的外掛列表來自訂或擴展你的 Piwik。如果你想安裝這些請聯絡你的管理員。", + "NotAllowedToBrowseMarketplaceThemes": "你可以瀏覽能夠自訂 Piwik 平台外觀的主題列表。請聯絡你的管理員幫你安裝。", + "NoPluginsFound": "找不到外掛", + "NoThemesFound": "找不到主題", + "NoSubscriptionsFound": "找不到訂閱項目", + "NumDownloadsLatestVersion": "最新版本：%s 次下載", + "OverviewPluginSubscriptions": "你訂閱的外掛總覽", + "OverviewPluginSubscriptionsMissingLicense": "你還沒有設定註冊碼。如果你購買了外掛訂閱項目，前往%1$s市集%2$s並輸入你的註冊碼。", + "OverviewPluginSubscriptionsAllDetails": "登入以查看細節或變更訂閱項目。", + "OverviewPluginSubscriptionsMissingInfo": "可能是訂閱項目遺失，例如付費流程尚未通過。請幾小時後再試一次，或是聯絡 Piwik 團隊。", + "NoValidSubscriptionNoUpdates": "當訂閱過期後，你將無法再接收此外掛的任何更新。", + "PluginSubscriptionsList": "這是與你的註冊碼有關聯的訂閱項目列表。", + "PaidPluginsNoLicenseKeyIntro": "如果你已經購買了%1$s高級付費外掛%2$s，請在下方填入所收到的註冊碼。", + "PaidPluginsWithLicenseKeyIntro": "已設定有效的註冊碼。為了安全考量我們不會在這裡顯示註冊碼。如果你弄丟了你的註冊碼請聯絡 Piwik 團隊。", + "PaidPluginsNoLicenseKeyIntroNoSuperUserAccess": "假如你已在市集購買了%1$s高級付費外掛%2$s，請向擁有超級使用者權限的使用者新增註冊碼。", "PluginDescription": "從市集下載外掛和主題來擴展 Piwik 的功能。", "PluginKeywords": "關鍵字", + "PluginUpdateAvailable": "你在使用版本 %1$s，新版本 %2$s 已可更新。", + "PluginVersionInfo": "%1$s 來自 %2$s", + "PluginWebsite": "外掛首頁", + "PriceExclTax": "%1$s %2$s 不含稅。", + "PriceFromPerPeriod": "最低 %1$s \/ %2$s", + "Reviews": "評論", + "ShownPriceIsExclTax": "顯示的價格不含稅。", + "Screenshots": "截圖", + "SortByNewest": "最新", + "SortByAlpha": "字母順序", + "SortByLastUpdated": "最後更新", + "SortByPopular": "熱門度", "StepDownloadingPluginFromMarketplace": "正在從市集中下載外掛", "StepDownloadingThemeFromMarketplace": "正在從市集中下載主題", + "StepUnzippingPlugin": "解壓縮外掛中", + "StepUnzippingTheme": "解壓縮主題中", + "StepThemeSuccessfullyInstalled": "你已成功安裝主題 %1$s %2$s。", + "StepPluginSuccessfullyInstalled": "你已成功安裝外掛 %1$s %2$s。", + "StepPluginSuccessfullyUpdated": "你已成功更新外掛 %1$s %2$s。", + "StepReplaceExistingPlugin": "覆蓋現有外掛", + "StepReplaceExistingTheme": "覆蓋現有主題", + "StepThemeSuccessfullyUpdated": "你已成功更新主題 %1$s %2$s。", "SubscriptionType": "類型", - "TeaserExtendPiwikByUpload": "上傳 ZIP 檔案來擴展 Piwik" + "SubscriptionStartDate": "開始日期", + "SubscriptionEndDate": "結束日期", + "SubscriptionNextPaymentDate": "下次付款日期", + "SubscriptionInvalid": "此訂閱無效或已過期", + "SubscriptionExpiresSoon": "此訂閱即將過期", + "Support": "支援", + "TeaserExtendPiwikByUpload": "上傳 ZIP 檔案來擴展 Piwik", + "LicenseExceededPossibleCause": "憑證超出限額。可能是這裡的 Piwik 使用者安裝次數多過訂閱授權限制。", + "Updated": "已更新", + "UpdatingPlugin": "更新 %1$s 中", + "UploadZipFile": "上傳 ZIP 檔案", + "LicenseKeyExpiresSoon": "你的註冊碼即將過期，請聯絡 %1$s。", + "LicenseKeyIsExpired": "你的註冊碼已過期，請聯絡 %1$s。", + "MultiServerEnvironmentWarning": "你在多伺服器中使用 Piwik，因此無法直接安裝或更新外掛。外掛只能在單一伺服器中安裝。請手動下載外掛並部屬到所有伺服器中。", + "AutoUpdateDisabledWarning": "設定檔中的自動更新已禁用，因此你無法直接安裝或更新外掛。要啟用自動更新請設定 %2$s 中的 %1$s。", + "ViewRepositoryChangelog": "查看變更" } }
\ No newline at end of file diff --git a/plugins/MobileAppMeasurable/lang/zh-tw.json b/plugins/MobileAppMeasurable/lang/zh-tw.json new file mode 100644 index 0000000000..448634fb3b --- /dev/null +++ b/plugins/MobileAppMeasurable/lang/zh-tw.json @@ -0,0 +1,7 @@ +{ + "MobileAppMeasurable": { + "MobileApp": "行動應用程式", + "MobileApps": "行動應用程式", + "MobileAppDescription": "一個原生的 iOS、Android 或其他行動作業系統的行動應用程式。" + } +}
\ No newline at end of file diff --git a/plugins/MobileMessaging/lang/zh-tw.json b/plugins/MobileMessaging/lang/zh-tw.json new file mode 100644 index 0000000000..107aa22505 --- /dev/null +++ b/plugins/MobileMessaging/lang/zh-tw.json @@ -0,0 +1,45 @@ +{ + "MobileMessaging": { + "Exception_UnknownProvider": "未知的提供商名稱「%1$s」。試試下面的代替：%2$s。", + "MobileReport_AdditionalPhoneNumbers": "你可以增加更多電話號碼，前往", + "MobileReport_MobileMessagingSettingsLink": "手機簡訊設定頁面", + "MobileReport_NoPhoneNumbers": "請啟用至少一個電話號碼，前往", + "MultiSites_Must_Be_Activated": "要將網站數據產生簡訊，請先啟用 Piwik 中的 MultiSites 外掛。", + "PhoneNumbers": "電話號碼", + "PluginDescription": "建立和下載自訂簡訊報表，並令它們每日、每周或每月傳送至你的手機。", + "Settings_APIKey": "API 金鑰", + "Settings_CountryCode": "國家代碼", + "Settings_SelectCountry": "選擇國家", + "Settings_CredentialNotProvided": "在你建立和管理電話號碼錢，請先在上方將 Piwik 連接到你的簡訊帳號。", + "Settings_CredentialNotProvidedByAdmin": "在你建立和管理電話號碼錢，請先請求你的管理員將 Piwik 連接到你的簡訊帳號。", + "Settings_CredentialProvided": "你的 %s 簡訊 API 帳號配置正確！", + "Settings_DeleteAccountConfirm": "你確定要刪除這個簡訊帳號？", + "Settings_DelegatedSmsProviderOnlyAppliesToYou": "所配置的簡訊供應商只會由你自己使用。", + "Settings_DelegatedPhoneNumbersOnlyUsedByYou": "所配置的電話號碼只會由你自己看到及使用。", + "Settings_EnterActivationCode": "輸入啟用碼", + "Settings_InvalidActivationCode": "驗證碼輸入錯誤，請重試。", + "Settings_LetUsersManageAPICredential": "允許使用者管理自己的簡訊供應商", + "Settings_LetUsersManageAPICredential_No_Help": "所有使用者都可以收到簡訊報表而且會使用你帳號的額度。", + "Settings_LetUsersManageAPICredential_Yes_Help": "每位使用者將可以設定他們自己的簡訊 API 帳號而且不會使用到你的額度。", + "Settings_ManagePhoneNumbers": "管理電話號碼", + "Settings_PhoneActivated": "手機號碼已驗證！你現在可以透過簡訊接收你的統計資料了。", + "Settings_PhoneNumber": "電話號碼", + "Settings_PhoneNumbers_Add": "新增電話號碼", + "Settings_PhoneNumbers_CountryCode_Help": "如果你不知道手機號碼的國家代碼，在這裡尋找你的國家。", + "Settings_PhoneNumbers_Help": "在接收簡訊（文字訊息）報表之前，必須先在下方輸入電話號碼。", + "Settings_PhoneNumbers_HelpAdd": "當你點擊「新增」，一封含有驗證碼的簡訊將傳送到該電話中。接收到驗證碼的使用者必須登入 Piwik 並進入設定 > 手機簡訊。完成驗證碼輸入後，使用者即可於手機中接收文字報表。", + "Settings_PleaseSignUp": "要建立網站統計簡訊報表及在手機中接收簡訊，請先註冊簡訊 API，請在下方填入你的資訊。", + "Settings_SMSAPIAccount": "管理簡訊 API 帳號", + "Settings_SMSProvider": "簡訊提供商", + "Settings_SuperAdmin": "超級使用者設定", + "Settings_SuspiciousPhoneNumber": "如果你沒收到簡訊，你可以試著將開頭的 0 去除掉。例如 %s", + "Settings_UpdateOrDeleteAccount": "你也可以%1$s更新%2$s或%3$s刪除%4$s此帳號。", + "Settings_ValidatePhoneNumber": "驗證", + "Settings_VerificationCodeJustSent": "我們已經發送了一則驗證碼簡訊到此號碼中，請在上方輸入該驗證碼後點擊「驗證」。", + "SettingsMenu": "手機簡訊", + "SMS_Content_Too_Long": "[太長]", + "TopLinkTooltip": "從信箱或手機取得網頁分析報表。", + "TopMenu": "Email 和簡訊報表", + "VerificationText": "驗證碼為 %1$s。請將此驗證碼填入 Piwik > %2$s > %3$s 的表單中來完成手機驗證。" + } +}
\ No newline at end of file diff --git a/plugins/Morpheus/javascripts/ajaxHelper.js b/plugins/Morpheus/javascripts/ajaxHelper.js index 4cc1ac823e..e93c7a82e7 100644 --- a/plugins/Morpheus/javascripts/ajaxHelper.js +++ b/plugins/Morpheus/javascripts/ajaxHelper.js @@ -481,8 +481,12 @@ function ajaxHelper() { (this.postParams && this.postParams['module'] === 'API' && this.postParams['method']); }; + this._isWidgetizedRequest = function () { + return (broadcast.getValueFromUrl('module') == 'Widgetize'); + }; + this._getDefaultPostParams = function () { - if (this.withToken || this._isRequestToApiMethod()) { + if (this.withToken || this._isRequestToApiMethod() || this._isWidgetizedRequest()) { return { token_auth: piwik.token_auth }; diff --git a/plugins/Morpheus/stylesheets/main.less b/plugins/Morpheus/stylesheets/main.less index 8f2529d93f..7f709e8c1b 100644 --- a/plugins/Morpheus/stylesheets/main.less +++ b/plugins/Morpheus/stylesheets/main.less @@ -284,7 +284,7 @@ table.dataTable { // first column after label should have a bit less padding padding-left: 13px; } - + #thDIV { display: inline; position: relative; @@ -654,6 +654,7 @@ div.sparkline { margin-left: 0; img { margin-right: 5px; + vertical-align: middle; } } } @@ -747,4 +748,4 @@ tr:hover #token_auth { line-height: 20px; height: auto; padding-bottom: 20px; -}
\ No newline at end of file +} diff --git a/plugins/Morpheus/stylesheets/simple_structure.css b/plugins/Morpheus/stylesheets/simple_structure.css index fb5fccd13f..b55fed8ab7 100644 --- a/plugins/Morpheus/stylesheets/simple_structure.css +++ b/plugins/Morpheus/stylesheets/simple_structure.css @@ -16,7 +16,7 @@ body#simple { text-decoration: none; } #simple .box { - border-radius: 2px; + border-radius: 2px; border: solid 1px #ccc; max-width: 780px; margin: 30px auto 60px auto; @@ -76,6 +76,10 @@ body#simple { margin-top: 0; } +#simple .box .content blockquote { + word-wrap: break-word; +} + #simple .box .footer { background-color: #f0f0f0; padding: 15px; diff --git a/plugins/MultiSites/API.php b/plugins/MultiSites/API.php index 8e2ce0c1a3..2312ebfec3 100755 --- a/plugins/MultiSites/API.php +++ b/plugins/MultiSites/API.php @@ -440,7 +440,11 @@ class API extends \Piwik\Plugin\API $totals[$label] = 0; } - foreach ($dataTable->getRows() as $row) { + $rows = $dataTable->getRows(); + + $rows = $this->filterRowsForTotalsCalculation($rows); + + foreach ($rows as $row) { foreach ($apiMetrics as $totalMetadataName => $recordName) { $totals[$totalMetadataName] += $row->getColumn($recordName); } @@ -462,7 +466,10 @@ class API extends \Piwik\Plugin\API $total = 0; $metric = 'nb_visits'; - foreach ($pastTable->getRows() as $row) { + $rows = $pastTable->getRows(); + $rows = $this->filterRowsForTotalsCalculation($rows); + + foreach ($rows as $row) { $total += $row->getColumn($metric); } @@ -470,6 +477,34 @@ class API extends \Piwik\Plugin\API } } + /** + * @param Row[] $rows + * @return mixed + */ + private function filterRowsForTotalsCalculation($rows) + { + /** + * Triggered to filter / restrict which rows should be included in the MultiSites (All Websites Dashboard) + * totals calculation + * + * **Example** + * + * public function filterMultiSitesRows(&$rows) + * { + * foreach ($rows as $index => $row) { + * if ($row->getColumn('label') === 5) { + * unset($rows[$index]); // remove idSite 5 from totals + * } + * } + * } + * + * @param Row[] &$rows An array containing rows, one row for each site. The label columns equals the idSite. + */ + Piwik::postEvent('MultiSites.filterRowsForTotalsCalculation', array(&$rows)); + + return $rows; + } + private static function getTotalMetadataName($name) { return 'total_' . $name; diff --git a/plugins/MultiSites/lang/zh-tw.json b/plugins/MultiSites/lang/zh-tw.json index 1d7fa7b687..8364389732 100644 --- a/plugins/MultiSites/lang/zh-tw.json +++ b/plugins/MultiSites/lang/zh-tw.json @@ -1,5 +1,9 @@ { "MultiSites": { - "Evolution": "發展趨勢" + "Evolution": "發展趨勢", + "LoadingWebsites": "網站載入中", + "PluginDescription": "在這個方便的「所有網站」展示板中查看並比較你所有的網站和應用程式。", + "TopLinkTooltip": "比較你所有網站的網頁分析統計。", + "Pagination": "第 %1$s - %2$s 項，共 %3$s 項" } }
\ No newline at end of file diff --git a/plugins/Overlay/lang/fr.json b/plugins/Overlay/lang/fr.json index e099c43d87..dca3014bbc 100644 --- a/plugins/Overlay/lang/fr.json +++ b/plugins/Overlay/lang/fr.json @@ -13,7 +13,7 @@ "OneClick": "1 clic", "OpenFullScreen": "Ouvrir en plein écran", "Overlay": "Analyse des pages web", - "PluginDescription": "Visualisez vos données d'analyse comme une Superposition de votre site web. Voyez combien de fois vos utilisateurs ont cliqué sur chaque lien. Remarque : Nécessite que le composant Transitions soit activé.", + "PluginDescription": "Visualisez vos données d'analyse comme une Superposition de votre site web. Voyez combien de fois vos utilisateurs ont cliqué sur chaque lien. Remarque: Nécessite que le composant Transitions soit activé.", "RedirectUrlError": "Vous tentez d'ouvrir l'analyse des pages web pour l'URL \"%1$s\". %2$s Aucun des domaines configurés dans Piwik ne correspond à cette URL.", "RedirectUrlErrorAdmin": "Vous pouvez ajouter le domaine en tant qu'URL additionnelle %1$sdans les paramètres%2$s.", "RedirectUrlErrorUser": "Demandez à votre administrateur d'ajouter le domaine en tant qu'URL additionnelle." diff --git a/plugins/Overlay/lang/zh-tw.json b/plugins/Overlay/lang/zh-tw.json index 0f8d13b4fe..f43c87f846 100644 --- a/plugins/Overlay/lang/zh-tw.json +++ b/plugins/Overlay/lang/zh-tw.json @@ -1,5 +1,21 @@ { "Overlay": { - "Location": "位置" + "Clicks": "%s 次點擊", + "ClicksFromXLinks": "%1$s 次點擊來自 %2$s 個連結之一", + "Domain": "域名", + "ErrorNotLoading": "網頁覆蓋功能尚無法執行。", + "ErrorNotLoadingDetails": "可能是右邊讀取的頁面沒有 Piwik 追蹤程式碼。在這種情況下，試著在頁面報表內的不同頁面中執行頁面覆蓋。", + "ErrorNotLoadingDetailsSSL": "你正透過 https 使用 Piwik，最可能的原因是你的網站不支援 SSL。試著透過 http 使用 Piwik。", + "ErrorNotLoadingLink": "點擊這裡取得更多問題排除技巧", + "Link": "連結", + "Location": "位置", + "NoData": "此網頁在所選的期間中沒有任何資料。", + "OneClick": "1 次點擊", + "OpenFullScreen": "進入全螢幕模式（無側欄）", + "Overlay": "網頁覆蓋", + "PluginDescription": "在你的網站上以網頁覆蓋方式查看你的分析資料。查看你的訪客點擊了多少次連結。注意：需要啟用 Transitions 外掛。", + "RedirectUrlError": "你將要開啟網址「%1$s」的網頁覆蓋。%2$s該連結與 Piwik 所設定的域名不相符。", + "RedirectUrlErrorAdmin": "你可以在%1$s設定頁面%2$s中將域名新增為網站網址。", + "RedirectUrlErrorUser": "要求你的管理原將域名新增為網站網址。" } }
\ No newline at end of file diff --git a/plugins/PrivacyManager/lang/zh-tw.json b/plugins/PrivacyManager/lang/zh-tw.json index a268c181fb..f2569cd964 100644 --- a/plugins/PrivacyManager/lang/zh-tw.json +++ b/plugins/PrivacyManager/lang/zh-tw.json @@ -11,7 +11,7 @@ "DBPurged": "資料庫已清理。", "DeleteBothConfirm": "你將啟用紀錄刪除和報表刪除功能。這將永久刪除舊資料，你將無法再查看。確定要繼續嗎？", "DeleteDataDescription": "你可以設定讓 Piwik 定時刪除舊的訪客記錄和\/或處理過的報表讓你的資料庫保持輕量。", - "DeleteDataDescription2": "如果需要，預先處理過的報表將不會被刪除，只有訪問、頁面查看和轉換記錄資料會被刪除。或者將預先處理過的報表刪除，只留下紀錄資料。", + "DeleteDataDescription2": "如果需要，預先處理過的報表將不會被刪除，只有訪問、瀏覽和轉換記錄資料會被刪除。或者將預先處理過的報表刪除，只留下紀錄資料。", "DeleteDataInterval": "刪除舊資料每隔", "DeleteOldVisitorLogs": "刪除舊的訪客記錄", "DeleteOldArchivedReports": "刪除舊的彙整報表", @@ -41,7 +41,7 @@ "EstimatedSpaceSaved": "預估節省空間", "GeolocationAnonymizeIpNote": "注意：選擇 1 字節時地理位置將會顯示與實際位置大略相同的結果。選擇 2 字節或以上，地理位置可能會不準確。", "GetPurgeEstimate": "取得清理估計", - "KeepBasicMetrics": "保留基本數據（訪問、頁面查看、跳出率、目標轉換、電子商務轉換等等）", + "KeepBasicMetrics": "保留基本數據（訪問數、網頁瀏覽數、跳出率、目標轉換數、電子商務轉換數等等）", "KeepDataFor": "保留以下類型的全數資料", "KeepReportSegments": "以上保留的資料中，也一並保留區隔報表。", "LastDelete": "上次清理時間", @@ -55,7 +55,7 @@ "PurgingData": "清除資料中...", "RecommendedForPrivacy": "保護隱私時推薦", "ReportsDataSavedEstimate": "資料庫大小", - "SaveSettingsBeforePurge": "你已變更了資料刪除的設定。請在開始清理前先儲存設定。", + "SaveSettingsBeforePurge": "你已變更了資料刪除的設定。請在開始清理前先保存設定。", "SeeAlsoOurOfficialGuidePrivacy": "也看看我們的官方指南：%1$s網頁分析隱私%2$s", "Teaser": "在此頁面中你可以透過自訂 Piwik 使其隱私與現有法規相容，如%1$s訪客 IP 匿名化%2$s、%3$s自動從資料庫中移除舊的訪客記錄%4$s和%5$s為你的網站提供不被追蹤機制%6$s。", "TeaserHeadline": "隱私設定", diff --git a/plugins/Provider/lang/zh-tw.json b/plugins/Provider/lang/zh-tw.json index a4952b49c1..6178474bc0 100644 --- a/plugins/Provider/lang/zh-tw.json +++ b/plugins/Provider/lang/zh-tw.json @@ -1,6 +1,9 @@ { "Provider": { - "ColumnProvider": "供應商", - "WidgetProviders": "網際網路服務供應商" + "ColumnProvider": "網路供應商", + "PluginDescription": "報告訪客的網際網路服務供應商（ISP）。", + "ProviderReportDocumentation": "這份報表顯示你訪客常用的網路供應商。你可以點擊供應商名稱來查看詳情。%s如果 Piwik 無法判定訪客的供應商，則會以 IP 列出。", + "WidgetProviders": "網路供應商", + "ProviderReportFooter": "未知的供應商代表 IP 位址無法被查詢。" } }
\ No newline at end of file diff --git a/plugins/QueuedTracking b/plugins/QueuedTracking -Subproject c4905a42b008c3eb0d58f8c24e541625d482ef4 +Subproject 6fbf3bb0f4722183ff3117d2efb12380373de12 diff --git a/plugins/Referrers/images/searchEngines/abcsok.no.png b/plugins/Referrers/images/searchEngines/abcsok.no.png Binary files differindex 8f07635798..11ef049908 100644 --- a/plugins/Referrers/images/searchEngines/abcsok.no.png +++ b/plugins/Referrers/images/searchEngines/abcsok.no.png diff --git a/plugins/Referrers/images/searchEngines/alexa.com.png b/plugins/Referrers/images/searchEngines/alexa.com.png Binary files differindex 115a89f2ae..5460d51092 100644 --- a/plugins/Referrers/images/searchEngines/alexa.com.png +++ b/plugins/Referrers/images/searchEngines/alexa.com.png diff --git a/plugins/Referrers/images/searchEngines/all.by.png b/plugins/Referrers/images/searchEngines/all.by.png Binary files differindex 0740cef1a7..fedcc5b744 100644 --- a/plugins/Referrers/images/searchEngines/all.by.png +++ b/plugins/Referrers/images/searchEngines/all.by.png diff --git a/plugins/Referrers/images/searchEngines/apollo7.de.png b/plugins/Referrers/images/searchEngines/apollo7.de.png Binary files differindex 4f16ca9b8b..b012f6e4b2 100644 --- a/plugins/Referrers/images/searchEngines/apollo7.de.png +++ b/plugins/Referrers/images/searchEngines/apollo7.de.png diff --git a/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png b/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png Binary files differindex 9f752b02ca..f54bff2a0e 100644 --- a/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png +++ b/plugins/Referrers/images/searchEngines/ariadna.elmundo.es.png diff --git a/plugins/Referrers/images/searchEngines/arianna.libero.it.png b/plugins/Referrers/images/searchEngines/arianna.libero.it.png Binary files differindex 686672acf0..7122d9eb93 100644 --- a/plugins/Referrers/images/searchEngines/arianna.libero.it.png +++ b/plugins/Referrers/images/searchEngines/arianna.libero.it.png diff --git a/plugins/Referrers/images/searchEngines/ask.com.png b/plugins/Referrers/images/searchEngines/ask.com.png Binary files differindex 0a8883f84b..e701055521 100644 --- a/plugins/Referrers/images/searchEngines/ask.com.png +++ b/plugins/Referrers/images/searchEngines/ask.com.png diff --git a/plugins/Referrers/images/searchEngines/bing.com.png b/plugins/Referrers/images/searchEngines/bing.com.png Binary files differindex b25db7d9b7..9c91ad9879 100644 --- a/plugins/Referrers/images/searchEngines/bing.com.png +++ b/plugins/Referrers/images/searchEngines/bing.com.png diff --git a/plugins/Referrers/images/searchEngines/blekko.com.png b/plugins/Referrers/images/searchEngines/blekko.com.png Binary files differindex e97d841eac..41bbf477f9 100644 --- a/plugins/Referrers/images/searchEngines/blekko.com.png +++ b/plugins/Referrers/images/searchEngines/blekko.com.png diff --git a/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png b/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png Binary files differindex 5836b4d331..91b8a09e8f 100644 --- a/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png +++ b/plugins/Referrers/images/searchEngines/blogs.icerocket.com.png diff --git a/plugins/Referrers/images/searchEngines/busca.uol.com.br.png b/plugins/Referrers/images/searchEngines/busca.uol.com.br.png Binary files differindex d69e3ffec0..723ec39a92 100644 --- a/plugins/Referrers/images/searchEngines/busca.uol.com.br.png +++ b/plugins/Referrers/images/searchEngines/busca.uol.com.br.png diff --git a/plugins/Referrers/images/searchEngines/buscador.terra.es.png b/plugins/Referrers/images/searchEngines/buscador.terra.es.png Binary files differindex 4a39349642..5e1d55e60c 100644 --- a/plugins/Referrers/images/searchEngines/buscador.terra.es.png +++ b/plugins/Referrers/images/searchEngines/buscador.terra.es.png diff --git a/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png b/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png Binary files differindex c9c258a2f0..1445448503 100644 --- a/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png +++ b/plugins/Referrers/images/searchEngines/cgi.search.biglobe.ne.jp.png diff --git a/plugins/Referrers/images/searchEngines/cse.google.com.png b/plugins/Referrers/images/searchEngines/cse.google.com.png Binary files differnew file mode 100644 index 0000000000..e00a1ee0ed --- /dev/null +++ b/plugins/Referrers/images/searchEngines/cse.google.com.png diff --git a/plugins/Referrers/images/searchEngines/digg.com.png b/plugins/Referrers/images/searchEngines/digg.com.png Binary files differindex 9a68450df6..2a9a8870b6 100644 --- a/plugins/Referrers/images/searchEngines/digg.com.png +++ b/plugins/Referrers/images/searchEngines/digg.com.png diff --git a/plugins/Referrers/images/searchEngines/dir.gigablast.com.png b/plugins/Referrers/images/searchEngines/dir.gigablast.com.png Binary files differindex 56a15084a0..e108ead10f 100644 --- a/plugins/Referrers/images/searchEngines/dir.gigablast.com.png +++ b/plugins/Referrers/images/searchEngines/dir.gigablast.com.png diff --git a/plugins/Referrers/images/searchEngines/dmoz.org.png b/plugins/Referrers/images/searchEngines/dmoz.org.png Binary files differindex 92366084c4..9743170a61 100644 --- a/plugins/Referrers/images/searchEngines/dmoz.org.png +++ b/plugins/Referrers/images/searchEngines/dmoz.org.png diff --git a/plugins/Referrers/images/searchEngines/duckduckgo.com.png b/plugins/Referrers/images/searchEngines/duckduckgo.com.png Binary files differindex 50af3029f0..a7690935e2 100644 --- a/plugins/Referrers/images/searchEngines/duckduckgo.com.png +++ b/plugins/Referrers/images/searchEngines/duckduckgo.com.png diff --git a/plugins/Referrers/images/searchEngines/ecosia.org.png b/plugins/Referrers/images/searchEngines/ecosia.org.png Binary files differindex 29674eecf9..9fbb2330cc 100644 --- a/plugins/Referrers/images/searchEngines/ecosia.org.png +++ b/plugins/Referrers/images/searchEngines/ecosia.org.png diff --git a/plugins/Referrers/images/searchEngines/forestle.org.png b/plugins/Referrers/images/searchEngines/forestle.org.png Binary files differindex 6233749873..9fbb2330cc 100644 --- a/plugins/Referrers/images/searchEngines/forestle.org.png +++ b/plugins/Referrers/images/searchEngines/forestle.org.png diff --git a/plugins/Referrers/images/searchEngines/friendfeed.com.png b/plugins/Referrers/images/searchEngines/friendfeed.com.png Binary files differindex dac26c1d4f..75deab4280 100644 --- a/plugins/Referrers/images/searchEngines/friendfeed.com.png +++ b/plugins/Referrers/images/searchEngines/friendfeed.com.png diff --git a/plugins/Referrers/images/searchEngines/go.mail.ru.png b/plugins/Referrers/images/searchEngines/go.mail.ru.png Binary files differindex 42b90d0669..39213540f8 100644 --- a/plugins/Referrers/images/searchEngines/go.mail.ru.png +++ b/plugins/Referrers/images/searchEngines/go.mail.ru.png diff --git a/plugins/Referrers/images/searchEngines/google.com.png b/plugins/Referrers/images/searchEngines/google.com.png Binary files differindex 6745d4b002..e00a1ee0ed 100644 --- a/plugins/Referrers/images/searchEngines/google.com.png +++ b/plugins/Referrers/images/searchEngines/google.com.png diff --git a/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png b/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png Binary files differindex 1077fb3d89..cffaf98e76 100644 --- a/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png +++ b/plugins/Referrers/images/searchEngines/image.search.yahoo.co.jp.png diff --git a/plugins/Referrers/images/searchEngines/images.google.com.png b/plugins/Referrers/images/searchEngines/images.google.com.png Binary files differindex 6745d4b002..e00a1ee0ed 100644 --- a/plugins/Referrers/images/searchEngines/images.google.com.png +++ b/plugins/Referrers/images/searchEngines/images.google.com.png diff --git a/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png b/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png Binary files differindex dda8e8a489..1445448503 100644 --- a/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png +++ b/plugins/Referrers/images/searchEngines/images.search.biglobe.ne.jp.png diff --git a/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png b/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png Binary files differindex 7908ccaecd..f10ccebf21 100644 --- a/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png +++ b/plugins/Referrers/images/searchEngines/images.search.yahoo.com.png diff --git a/plugins/Referrers/images/searchEngines/images.yandex.ru.png b/plugins/Referrers/images/searchEngines/images.yandex.ru.png Binary files differindex b6cf192fb9..092f883398 100644 --- a/plugins/Referrers/images/searchEngines/images.yandex.ru.png +++ b/plugins/Referrers/images/searchEngines/images.yandex.ru.png diff --git a/plugins/Referrers/images/searchEngines/infospace.com.png b/plugins/Referrers/images/searchEngines/infospace.com.png Binary files differindex 0518db9760..1df903bc89 100644 --- a/plugins/Referrers/images/searchEngines/infospace.com.png +++ b/plugins/Referrers/images/searchEngines/infospace.com.png diff --git a/plugins/Referrers/images/searchEngines/ixquick.com.png b/plugins/Referrers/images/searchEngines/ixquick.com.png Binary files differindex 93a69e1b60..a2cb6dfbbe 100644 --- a/plugins/Referrers/images/searchEngines/ixquick.com.png +++ b/plugins/Referrers/images/searchEngines/ixquick.com.png diff --git a/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png b/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png Binary files differindex c329eda940..d8c80e708f 100644 --- a/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png +++ b/plugins/Referrers/images/searchEngines/jyxo.1188.cz.png diff --git a/plugins/Referrers/images/searchEngines/k9safesearch.com.png b/plugins/Referrers/images/searchEngines/k9safesearch.com.png Binary files differindex 09d9f70b5d..e607512dbb 100644 --- a/plugins/Referrers/images/searchEngines/k9safesearch.com.png +++ b/plugins/Referrers/images/searchEngines/k9safesearch.com.png diff --git a/plugins/Referrers/images/searchEngines/kvasir.no.png b/plugins/Referrers/images/searchEngines/kvasir.no.png Binary files differindex f1c56613bc..7d1f6faf1c 100644 --- a/plugins/Referrers/images/searchEngines/kvasir.no.png +++ b/plugins/Referrers/images/searchEngines/kvasir.no.png diff --git a/plugins/Referrers/images/searchEngines/m.sm.cn.png b/plugins/Referrers/images/searchEngines/m.sm.cn.png Binary files differindex 3f812440c5..0b8cebcd65 100644 --- a/plugins/Referrers/images/searchEngines/m.sm.cn.png +++ b/plugins/Referrers/images/searchEngines/m.sm.cn.png diff --git a/plugins/Referrers/images/searchEngines/maps.google.com.png b/plugins/Referrers/images/searchEngines/maps.google.com.png Binary files differindex 562aeffd54..548f2ae5c3 100644 --- a/plugins/Referrers/images/searchEngines/maps.google.com.png +++ b/plugins/Referrers/images/searchEngines/maps.google.com.png diff --git a/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png b/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png Binary files differindex be0939904b..c940ab6219 100644 --- a/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png +++ b/plugins/Referrers/images/searchEngines/meta.rrzn.uni-hannover.de.png diff --git a/plugins/Referrers/images/searchEngines/meta.ua.png b/plugins/Referrers/images/searchEngines/meta.ua.png Binary files differindex a98d7fef84..e84c2369bb 100644 --- a/plugins/Referrers/images/searchEngines/meta.ua.png +++ b/plugins/Referrers/images/searchEngines/meta.ua.png diff --git a/plugins/Referrers/images/searchEngines/metager2.de.png b/plugins/Referrers/images/searchEngines/metager2.de.png Binary files differindex 011683a0ee..2ff8f0e12f 100644 --- a/plugins/Referrers/images/searchEngines/metager2.de.png +++ b/plugins/Referrers/images/searchEngines/metager2.de.png diff --git a/plugins/Referrers/images/searchEngines/news.google.com.png b/plugins/Referrers/images/searchEngines/news.google.com.png Binary files differindex 6745d4b002..9b71e257ca 100644 --- a/plugins/Referrers/images/searchEngines/news.google.com.png +++ b/plugins/Referrers/images/searchEngines/news.google.com.png diff --git a/plugins/Referrers/images/searchEngines/nigma.ru.png b/plugins/Referrers/images/searchEngines/nigma.ru.png Binary files differindex 992fadd243..0eeec77847 100644 --- a/plugins/Referrers/images/searchEngines/nigma.ru.png +++ b/plugins/Referrers/images/searchEngines/nigma.ru.png diff --git a/plugins/Referrers/images/searchEngines/nova.rambler.ru.png b/plugins/Referrers/images/searchEngines/nova.rambler.ru.png Binary files differindex 3e16f1bb8f..f2ed20ec56 100644 --- a/plugins/Referrers/images/searchEngines/nova.rambler.ru.png +++ b/plugins/Referrers/images/searchEngines/nova.rambler.ru.png diff --git a/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png b/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png Binary files differindex 730ff3963d..04ec7a06df 100644 --- a/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png +++ b/plugins/Referrers/images/searchEngines/otsing.delfi.ee.png diff --git a/plugins/Referrers/images/searchEngines/plusnetwork.com.png b/plugins/Referrers/images/searchEngines/plusnetwork.com.png Binary files differindex e0bfb36603..5edf452e26 100644 --- a/plugins/Referrers/images/searchEngines/plusnetwork.com.png +++ b/plugins/Referrers/images/searchEngines/plusnetwork.com.png diff --git a/plugins/Referrers/images/searchEngines/poisk.ru.png b/plugins/Referrers/images/searchEngines/poisk.ru.png Binary files differindex 5887dcec6b..212ea95ed9 100644 --- a/plugins/Referrers/images/searchEngines/poisk.ru.png +++ b/plugins/Referrers/images/searchEngines/poisk.ru.png diff --git a/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png b/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png Binary files differindex 71c8be9af2..33029846f9 100644 --- a/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png +++ b/plugins/Referrers/images/searchEngines/rechercher.aliceadsl.fr.png diff --git a/plugins/Referrers/images/searchEngines/req.hit-parade.com.png b/plugins/Referrers/images/searchEngines/req.hit-parade.com.png Binary files differindex 85df9e051a..887a8503f6 100644 --- a/plugins/Referrers/images/searchEngines/req.hit-parade.com.png +++ b/plugins/Referrers/images/searchEngines/req.hit-parade.com.png diff --git a/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png b/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png Binary files differindex d2b3651960..c192ad9278 100644 --- a/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png +++ b/plugins/Referrers/images/searchEngines/ricerca.virgilio.it.png diff --git a/plugins/Referrers/images/searchEngines/rpmfind.net.png b/plugins/Referrers/images/searchEngines/rpmfind.net.png Binary files differindex 7d2de00d84..aaa1aa2ec0 100644 --- a/plugins/Referrers/images/searchEngines/rpmfind.net.png +++ b/plugins/Referrers/images/searchEngines/rpmfind.net.png diff --git a/plugins/Referrers/images/searchEngines/scholar.google.com.png b/plugins/Referrers/images/searchEngines/scholar.google.com.png Binary files differindex 6745d4b002..cc8a5523dc 100644 --- a/plugins/Referrers/images/searchEngines/scholar.google.com.png +++ b/plugins/Referrers/images/searchEngines/scholar.google.com.png diff --git a/plugins/Referrers/images/searchEngines/search.aol.com.png b/plugins/Referrers/images/searchEngines/search.aol.com.png Binary files differindex 0a65239f47..d6530cdf41 100644 --- a/plugins/Referrers/images/searchEngines/search.aol.com.png +++ b/plugins/Referrers/images/searchEngines/search.aol.com.png diff --git a/plugins/Referrers/images/searchEngines/search.babylon.com.png b/plugins/Referrers/images/searchEngines/search.babylon.com.png Binary files differindex 59a8034640..dd6cd9c028 100644 --- a/plugins/Referrers/images/searchEngines/search.babylon.com.png +++ b/plugins/Referrers/images/searchEngines/search.babylon.com.png diff --git a/plugins/Referrers/images/searchEngines/search.centrum.cz.png b/plugins/Referrers/images/searchEngines/search.centrum.cz.png Binary files differindex f7d29907b5..b827625dd6 100644 --- a/plugins/Referrers/images/searchEngines/search.centrum.cz.png +++ b/plugins/Referrers/images/searchEngines/search.centrum.cz.png diff --git a/plugins/Referrers/images/searchEngines/search.conduit.com.png b/plugins/Referrers/images/searchEngines/search.conduit.com.png Binary files differindex f0bc797498..bad0e8b59e 100644 --- a/plugins/Referrers/images/searchEngines/search.conduit.com.png +++ b/plugins/Referrers/images/searchEngines/search.conduit.com.png diff --git a/plugins/Referrers/images/searchEngines/search.daum.net.png b/plugins/Referrers/images/searchEngines/search.daum.net.png Binary files differindex 55e2aa3c00..e81728f616 100644 --- a/plugins/Referrers/images/searchEngines/search.daum.net.png +++ b/plugins/Referrers/images/searchEngines/search.daum.net.png diff --git a/plugins/Referrers/images/searchEngines/search.disconnect.me.png b/plugins/Referrers/images/searchEngines/search.disconnect.me.png Binary files differindex 54b0eac351..1e3f02102d 100644 --- a/plugins/Referrers/images/searchEngines/search.disconnect.me.png +++ b/plugins/Referrers/images/searchEngines/search.disconnect.me.png diff --git a/plugins/Referrers/images/searchEngines/search.earthlink.net.png b/plugins/Referrers/images/searchEngines/search.earthlink.net.png Binary files differindex 8cee1b2148..b2287f4e0c 100644 --- a/plugins/Referrers/images/searchEngines/search.earthlink.net.png +++ b/plugins/Referrers/images/searchEngines/search.earthlink.net.png diff --git a/plugins/Referrers/images/searchEngines/search.excite.it.png b/plugins/Referrers/images/searchEngines/search.excite.it.png Binary files differindex 369a480605..d84bbf4472 100644 --- a/plugins/Referrers/images/searchEngines/search.excite.it.png +++ b/plugins/Referrers/images/searchEngines/search.excite.it.png diff --git a/plugins/Referrers/images/searchEngines/search.fooooo.com.png b/plugins/Referrers/images/searchEngines/search.fooooo.com.png Binary files differindex a0d45d7ca3..e813cf9b10 100644 --- a/plugins/Referrers/images/searchEngines/search.fooooo.com.png +++ b/plugins/Referrers/images/searchEngines/search.fooooo.com.png diff --git a/plugins/Referrers/images/searchEngines/search.free.fr.png b/plugins/Referrers/images/searchEngines/search.free.fr.png Binary files differindex 9954781aca..d87e467fb7 100644 --- a/plugins/Referrers/images/searchEngines/search.free.fr.png +++ b/plugins/Referrers/images/searchEngines/search.free.fr.png diff --git a/plugins/Referrers/images/searchEngines/search.genieo.com.png b/plugins/Referrers/images/searchEngines/search.genieo.com.png Binary files differindex 104282c6c2..3c3b072ae3 100644 --- a/plugins/Referrers/images/searchEngines/search.genieo.com.png +++ b/plugins/Referrers/images/searchEngines/search.genieo.com.png diff --git a/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png b/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png Binary files differindex d64ce99dea..53a53c9e0c 100644 --- a/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png +++ b/plugins/Referrers/images/searchEngines/search.goo.ne.jp.png diff --git a/plugins/Referrers/images/searchEngines/search.imesh.com.png b/plugins/Referrers/images/searchEngines/search.imesh.com.png Binary files differindex 8d8f1a782e..22a83ffb9d 100644 --- a/plugins/Referrers/images/searchEngines/search.imesh.com.png +++ b/plugins/Referrers/images/searchEngines/search.imesh.com.png diff --git a/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png b/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png Binary files differindex 1266687f8f..6c0e90bbab 100644 --- a/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png +++ b/plugins/Referrers/images/searchEngines/search.ke.voila.fr.png diff --git a/plugins/Referrers/images/searchEngines/search.lookseek.com.png b/plugins/Referrers/images/searchEngines/search.lookseek.com.png Binary files differindex ac1ff37a17..aca4427af2 100644 --- a/plugins/Referrers/images/searchEngines/search.lookseek.com.png +++ b/plugins/Referrers/images/searchEngines/search.lookseek.com.png diff --git a/plugins/Referrers/images/searchEngines/search.lycos.com.png b/plugins/Referrers/images/searchEngines/search.lycos.com.png Binary files differindex f320407661..a2f9df710c 100644 --- a/plugins/Referrers/images/searchEngines/search.lycos.com.png +++ b/plugins/Referrers/images/searchEngines/search.lycos.com.png diff --git a/plugins/Referrers/images/searchEngines/search.naver.com.png b/plugins/Referrers/images/searchEngines/search.naver.com.png Binary files differindex 776ddf26e4..f59d1203c2 100644 --- a/plugins/Referrers/images/searchEngines/search.naver.com.png +++ b/plugins/Referrers/images/searchEngines/search.naver.com.png diff --git a/plugins/Referrers/images/searchEngines/search.nifty.com.png b/plugins/Referrers/images/searchEngines/search.nifty.com.png Binary files differindex 6e76348780..9798bd1aef 100644 --- a/plugins/Referrers/images/searchEngines/search.nifty.com.png +++ b/plugins/Referrers/images/searchEngines/search.nifty.com.png diff --git a/plugins/Referrers/images/searchEngines/search.peoplepc.com.png b/plugins/Referrers/images/searchEngines/search.peoplepc.com.png Binary files differindex 502014c50c..1c83e927d7 100644 --- a/plugins/Referrers/images/searchEngines/search.peoplepc.com.png +++ b/plugins/Referrers/images/searchEngines/search.peoplepc.com.png diff --git a/plugins/Referrers/images/searchEngines/search.qip.ru.png b/plugins/Referrers/images/searchEngines/search.qip.ru.png Binary files differindex d5f547ffca..fd5c55df2f 100644 --- a/plugins/Referrers/images/searchEngines/search.qip.ru.png +++ b/plugins/Referrers/images/searchEngines/search.qip.ru.png diff --git a/plugins/Referrers/images/searchEngines/search.rr.com.png b/plugins/Referrers/images/searchEngines/search.rr.com.png Binary files differindex 6b0a8faa1e..2edfb8175f 100644 --- a/plugins/Referrers/images/searchEngines/search.rr.com.png +++ b/plugins/Referrers/images/searchEngines/search.rr.com.png diff --git a/plugins/Referrers/images/searchEngines/search.seznam.cz.png b/plugins/Referrers/images/searchEngines/search.seznam.cz.png Binary files differindex 7764196ea7..ac1c662f33 100644 --- a/plugins/Referrers/images/searchEngines/search.seznam.cz.png +++ b/plugins/Referrers/images/searchEngines/search.seznam.cz.png diff --git a/plugins/Referrers/images/searchEngines/search.snap.do.png b/plugins/Referrers/images/searchEngines/search.snap.do.png Binary files differindex fc8131e8bc..49e73863d0 100644 --- a/plugins/Referrers/images/searchEngines/search.snap.do.png +++ b/plugins/Referrers/images/searchEngines/search.snap.do.png diff --git a/plugins/Referrers/images/searchEngines/search.softonic.com.png b/plugins/Referrers/images/searchEngines/search.softonic.com.png Binary files differindex 293b3e5065..795fbffce0 100644 --- a/plugins/Referrers/images/searchEngines/search.softonic.com.png +++ b/plugins/Referrers/images/searchEngines/search.softonic.com.png diff --git a/plugins/Referrers/images/searchEngines/search.tiscali.it.png b/plugins/Referrers/images/searchEngines/search.tiscali.it.png Binary files differindex f104522082..2763baa5fa 100644 --- a/plugins/Referrers/images/searchEngines/search.tiscali.it.png +++ b/plugins/Referrers/images/searchEngines/search.tiscali.it.png diff --git a/plugins/Referrers/images/searchEngines/search.winamp.com.png b/plugins/Referrers/images/searchEngines/search.winamp.com.png Binary files differindex d0c29c5981..0191d459d6 100644 --- a/plugins/Referrers/images/searchEngines/search.winamp.com.png +++ b/plugins/Referrers/images/searchEngines/search.winamp.com.png diff --git a/plugins/Referrers/images/searchEngines/search.www.ee.png b/plugins/Referrers/images/searchEngines/search.www.ee.png Binary files differindex ff3dac11be..9844bffc67 100644 --- a/plugins/Referrers/images/searchEngines/search.www.ee.png +++ b/plugins/Referrers/images/searchEngines/search.www.ee.png diff --git a/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png b/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png Binary files differindex 1077fb3d89..cffaf98e76 100644 --- a/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png +++ b/plugins/Referrers/images/searchEngines/search.yahoo.co.jp.png diff --git a/plugins/Referrers/images/searchEngines/search.yahoo.com.png b/plugins/Referrers/images/searchEngines/search.yahoo.com.png Binary files differindex 1077fb3d89..f10ccebf21 100644 --- a/plugins/Referrers/images/searchEngines/search.yahoo.com.png +++ b/plugins/Referrers/images/searchEngines/search.yahoo.com.png diff --git a/plugins/Referrers/images/searchEngines/search.yam.com.png b/plugins/Referrers/images/searchEngines/search.yam.com.png Binary files differindex 828e735e2d..c0a2a1fb45 100644 --- a/plugins/Referrers/images/searchEngines/search.yam.com.png +++ b/plugins/Referrers/images/searchEngines/search.yam.com.png diff --git a/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png b/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png Binary files differindex 6307949db7..93a1817ee5 100644 --- a/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png +++ b/plugins/Referrers/images/searchEngines/searchatlas.centrum.cz.png diff --git a/plugins/Referrers/images/searchEngines/searchlock.com.png b/plugins/Referrers/images/searchEngines/searchlock.com.png Binary files differindex 54f98183bc..aff0cd9a5a 100644 --- a/plugins/Referrers/images/searchEngines/searchlock.com.png +++ b/plugins/Referrers/images/searchEngines/searchlock.com.png diff --git a/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png b/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png Binary files differindex b805294346..4263e378d3 100644 --- a/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png +++ b/plugins/Referrers/images/searchEngines/searchservice.myspace.com.png diff --git a/plugins/Referrers/images/searchEngines/sm.aport.ru.png b/plugins/Referrers/images/searchEngines/sm.aport.ru.png Binary files differindex 92796e9fbc..e122927067 100644 --- a/plugins/Referrers/images/searchEngines/sm.aport.ru.png +++ b/plugins/Referrers/images/searchEngines/sm.aport.ru.png diff --git a/plugins/Referrers/images/searchEngines/smart.delfi.lv.png b/plugins/Referrers/images/searchEngines/smart.delfi.lv.png Binary files differindex 730ff3963d..14a0c70273 100644 --- a/plugins/Referrers/images/searchEngines/smart.delfi.lv.png +++ b/plugins/Referrers/images/searchEngines/smart.delfi.lv.png diff --git a/plugins/Referrers/images/searchEngines/so.360.cn.png b/plugins/Referrers/images/searchEngines/so.360.cn.png Binary files differindex 39ee2a3c3e..e77ed7ea79 100644 --- a/plugins/Referrers/images/searchEngines/so.360.cn.png +++ b/plugins/Referrers/images/searchEngines/so.360.cn.png diff --git a/plugins/Referrers/images/searchEngines/start.iplay.com.png b/plugins/Referrers/images/searchEngines/start.iplay.com.png Binary files differindex 47103d6e36..88e81f755f 100644 --- a/plugins/Referrers/images/searchEngines/start.iplay.com.png +++ b/plugins/Referrers/images/searchEngines/start.iplay.com.png diff --git a/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png b/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png Binary files differindex f46101995e..c1a30ca2c2 100644 --- a/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png +++ b/plugins/Referrers/images/searchEngines/startgoogle.startpagina.nl.png diff --git a/plugins/Referrers/images/searchEngines/startpage.com.png b/plugins/Referrers/images/searchEngines/startpage.com.png Binary files differindex 916df91599..a2cb6dfbbe 100644 --- a/plugins/Referrers/images/searchEngines/startpage.com.png +++ b/plugins/Referrers/images/searchEngines/startpage.com.png diff --git a/plugins/Referrers/images/searchEngines/suche.freenet.de.png b/plugins/Referrers/images/searchEngines/suche.freenet.de.png Binary files differindex c3c6f71fc4..92ffb51da4 100644 --- a/plugins/Referrers/images/searchEngines/suche.freenet.de.png +++ b/plugins/Referrers/images/searchEngines/suche.freenet.de.png diff --git a/plugins/Referrers/images/searchEngines/suche.t-online.de.png b/plugins/Referrers/images/searchEngines/suche.t-online.de.png Binary files differindex 37eba0451b..06b2b1fbf0 100644 --- a/plugins/Referrers/images/searchEngines/suche.t-online.de.png +++ b/plugins/Referrers/images/searchEngines/suche.t-online.de.png diff --git a/plugins/Referrers/images/searchEngines/suche.web.de.png b/plugins/Referrers/images/searchEngines/suche.web.de.png Binary files differindex 1cf156d412..5b8bf0962f 100644 --- a/plugins/Referrers/images/searchEngines/suche.web.de.png +++ b/plugins/Referrers/images/searchEngines/suche.web.de.png diff --git a/plugins/Referrers/images/searchEngines/surfcanyon.com.png b/plugins/Referrers/images/searchEngines/surfcanyon.com.png Binary files differindex baabfe5488..b798af3179 100644 --- a/plugins/Referrers/images/searchEngines/surfcanyon.com.png +++ b/plugins/Referrers/images/searchEngines/surfcanyon.com.png diff --git a/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png b/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png Binary files differindex 9df61e4c61..53f966f47a 100644 --- a/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png +++ b/plugins/Referrers/images/searchEngines/szukaj.onet.pl.png diff --git a/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png b/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png Binary files differindex 53a9a6be3a..2769a9745b 100644 --- a/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png +++ b/plugins/Referrers/images/searchEngines/szukaj.wp.pl.png diff --git a/plugins/Referrers/images/searchEngines/technorati.com.png b/plugins/Referrers/images/searchEngines/technorati.com.png Binary files differindex 5a5c74407d..68150bee2a 100644 --- a/plugins/Referrers/images/searchEngines/technorati.com.png +++ b/plugins/Referrers/images/searchEngines/technorati.com.png diff --git a/plugins/Referrers/images/searchEngines/translate.google.com.png b/plugins/Referrers/images/searchEngines/translate.google.com.png Binary files differindex 6745d4b002..d8b7a941e2 100644 --- a/plugins/Referrers/images/searchEngines/translate.google.com.png +++ b/plugins/Referrers/images/searchEngines/translate.google.com.png diff --git a/plugins/Referrers/images/searchEngines/videa.seznam.cz.png b/plugins/Referrers/images/searchEngines/videa.seznam.cz.png Binary files differindex 7764196ea7..ac1c662f33 100644 --- a/plugins/Referrers/images/searchEngines/videa.seznam.cz.png +++ b/plugins/Referrers/images/searchEngines/videa.seznam.cz.png diff --git a/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png b/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png Binary files differindex 1077fb3d89..cffaf98e76 100644 --- a/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png +++ b/plugins/Referrers/images/searchEngines/video.search.yahoo.co.jp.png diff --git a/plugins/Referrers/images/searchEngines/web.volny.cz.png b/plugins/Referrers/images/searchEngines/web.volny.cz.png Binary files differindex 8289c943a0..820951a6c6 100644 --- a/plugins/Referrers/images/searchEngines/web.volny.cz.png +++ b/plugins/Referrers/images/searchEngines/web.volny.cz.png diff --git a/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png b/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png Binary files differindex aa089090dc..1c8b17f4d7 100644 --- a/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png +++ b/plugins/Referrers/images/searchEngines/websearch.rakuten.co.jp.png diff --git a/plugins/Referrers/images/searchEngines/www.118700.se.png b/plugins/Referrers/images/searchEngines/www.118700.se.png Binary files differindex 2ee93f8d9e..67950640bf 100644 --- a/plugins/Referrers/images/searchEngines/www.118700.se.png +++ b/plugins/Referrers/images/searchEngines/www.118700.se.png diff --git a/plugins/Referrers/images/searchEngines/www.1881.no.png b/plugins/Referrers/images/searchEngines/www.1881.no.png Binary files differindex 7e1019f868..cc2f181c79 100644 --- a/plugins/Referrers/images/searchEngines/www.1881.no.png +++ b/plugins/Referrers/images/searchEngines/www.1881.no.png diff --git a/plugins/Referrers/images/searchEngines/www.abacho.de.png b/plugins/Referrers/images/searchEngines/www.abacho.de.png Binary files differindex fb35c78f12..d94eea3cea 100644 --- a/plugins/Referrers/images/searchEngines/www.abacho.de.png +++ b/plugins/Referrers/images/searchEngines/www.abacho.de.png diff --git a/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png b/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png Binary files differindex ba8931859f..1933cd967f 100644 --- a/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png +++ b/plugins/Referrers/images/searchEngines/www.allaverksamheter.se.png diff --git a/plugins/Referrers/images/searchEngines/www.allesklar.de.png b/plugins/Referrers/images/searchEngines/www.allesklar.de.png Binary files differindex d93f686f5e..992dc6d0f5 100644 --- a/plugins/Referrers/images/searchEngines/www.allesklar.de.png +++ b/plugins/Referrers/images/searchEngines/www.allesklar.de.png diff --git a/plugins/Referrers/images/searchEngines/www.alltheweb.com.png b/plugins/Referrers/images/searchEngines/www.alltheweb.com.png Binary files differindex 9b635649d2..f10ccebf21 100644 --- a/plugins/Referrers/images/searchEngines/www.alltheweb.com.png +++ b/plugins/Referrers/images/searchEngines/www.alltheweb.com.png diff --git a/plugins/Referrers/images/searchEngines/www.altavista.com.png b/plugins/Referrers/images/searchEngines/www.altavista.com.png Binary files differindex 6f26cbc780..f10ccebf21 100644 --- a/plugins/Referrers/images/searchEngines/www.altavista.com.png +++ b/plugins/Referrers/images/searchEngines/www.altavista.com.png diff --git a/plugins/Referrers/images/searchEngines/www.arcor.de.png b/plugins/Referrers/images/searchEngines/www.arcor.de.png Binary files differindex 7829fd1a28..97570702cf 100644 --- a/plugins/Referrers/images/searchEngines/www.arcor.de.png +++ b/plugins/Referrers/images/searchEngines/www.arcor.de.png diff --git a/plugins/Referrers/images/searchEngines/www.baidu.com.png b/plugins/Referrers/images/searchEngines/www.baidu.com.png Binary files differindex 3166471622..ab860ceab1 100644 --- a/plugins/Referrers/images/searchEngines/www.baidu.com.png +++ b/plugins/Referrers/images/searchEngines/www.baidu.com.png diff --git a/plugins/Referrers/images/searchEngines/www.charter.net.png b/plugins/Referrers/images/searchEngines/www.charter.net.png Binary files differindex 9dbbe861f9..09e15f1cb2 100644 --- a/plugins/Referrers/images/searchEngines/www.charter.net.png +++ b/plugins/Referrers/images/searchEngines/www.charter.net.png diff --git a/plugins/Referrers/images/searchEngines/www.crawler.com.png b/plugins/Referrers/images/searchEngines/www.crawler.com.png Binary files differindex 3e71d3ce83..e0396c182c 100644 --- a/plugins/Referrers/images/searchEngines/www.crawler.com.png +++ b/plugins/Referrers/images/searchEngines/www.crawler.com.png diff --git a/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png b/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png Binary files differindex 1050f39334..0a3f0c1363 100644 --- a/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png +++ b/plugins/Referrers/images/searchEngines/www.dasoertliche.de.png diff --git a/plugins/Referrers/images/searchEngines/www.eniro.se.png b/plugins/Referrers/images/searchEngines/www.eniro.se.png Binary files differindex b0b7b2985c..e1e8a1e970 100644 --- a/plugins/Referrers/images/searchEngines/www.eniro.se.png +++ b/plugins/Referrers/images/searchEngines/www.eniro.se.png diff --git a/plugins/Referrers/images/searchEngines/www.euroseek.com.png b/plugins/Referrers/images/searchEngines/www.euroseek.com.png Binary files differindex 4789b91046..13577a52cf 100644 --- a/plugins/Referrers/images/searchEngines/www.euroseek.com.png +++ b/plugins/Referrers/images/searchEngines/www.euroseek.com.png diff --git a/plugins/Referrers/images/searchEngines/www.everyclick.com.png b/plugins/Referrers/images/searchEngines/www.everyclick.com.png Binary files differindex 91345abc80..e2159ed1da 100644 --- a/plugins/Referrers/images/searchEngines/www.everyclick.com.png +++ b/plugins/Referrers/images/searchEngines/www.everyclick.com.png diff --git a/plugins/Referrers/images/searchEngines/www.exalead.fr.png b/plugins/Referrers/images/searchEngines/www.exalead.fr.png Binary files differindex b308c6eb0b..27418e0898 100644 --- a/plugins/Referrers/images/searchEngines/www.exalead.fr.png +++ b/plugins/Referrers/images/searchEngines/www.exalead.fr.png diff --git a/plugins/Referrers/images/searchEngines/www.facebook.com.png b/plugins/Referrers/images/searchEngines/www.facebook.com.png Binary files differindex 80561bd547..75deab4280 100644 --- a/plugins/Referrers/images/searchEngines/www.facebook.com.png +++ b/plugins/Referrers/images/searchEngines/www.facebook.com.png diff --git a/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png b/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png Binary files differindex cfa0fc35a0..7064b9436e 100644 --- a/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png +++ b/plugins/Referrers/images/searchEngines/www.fastbrowsersearch.com.png diff --git a/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png b/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png Binary files differindex 712dc11911..6769ce82b7 100644 --- a/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png +++ b/plugins/Referrers/images/searchEngines/www.findhurtig.dk.png diff --git a/plugins/Referrers/images/searchEngines/www.fireball.de.png b/plugins/Referrers/images/searchEngines/www.fireball.de.png Binary files differindex b2b94bc506..2a822fe275 100644 --- a/plugins/Referrers/images/searchEngines/www.fireball.de.png +++ b/plugins/Referrers/images/searchEngines/www.fireball.de.png diff --git a/plugins/Referrers/images/searchEngines/www.flix.de.png b/plugins/Referrers/images/searchEngines/www.flix.de.png Binary files differindex a99560bde3..2f15e7c3d7 100644 --- a/plugins/Referrers/images/searchEngines/www.flix.de.png +++ b/plugins/Referrers/images/searchEngines/www.flix.de.png diff --git a/plugins/Referrers/images/searchEngines/www.gigablast.com.png b/plugins/Referrers/images/searchEngines/www.gigablast.com.png Binary files differindex 56a15084a0..e108ead10f 100644 --- a/plugins/Referrers/images/searchEngines/www.gigablast.com.png +++ b/plugins/Referrers/images/searchEngines/www.gigablast.com.png diff --git a/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png b/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png Binary files differindex 4986298d76..574462ab0a 100644 --- a/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png +++ b/plugins/Referrers/images/searchEngines/www.gnadenmeer.de.png diff --git a/plugins/Referrers/images/searchEngines/www.google.interia.pl.png b/plugins/Referrers/images/searchEngines/www.google.interia.pl.png Binary files differindex 3e6babbe51..dccdb3899b 100644 --- a/plugins/Referrers/images/searchEngines/www.google.interia.pl.png +++ b/plugins/Referrers/images/searchEngines/www.google.interia.pl.png diff --git a/plugins/Referrers/images/searchEngines/www.goyellow.de.png b/plugins/Referrers/images/searchEngines/www.goyellow.de.png Binary files differindex 63acab128b..c3286a6340 100644 --- a/plugins/Referrers/images/searchEngines/www.goyellow.de.png +++ b/plugins/Referrers/images/searchEngines/www.goyellow.de.png diff --git a/plugins/Referrers/images/searchEngines/www.gulesider.no.png b/plugins/Referrers/images/searchEngines/www.gulesider.no.png Binary files differindex e02cf014f9..4979aaf397 100644 --- a/plugins/Referrers/images/searchEngines/www.gulesider.no.png +++ b/plugins/Referrers/images/searchEngines/www.gulesider.no.png diff --git a/plugins/Referrers/images/searchEngines/www.haosou.com.png b/plugins/Referrers/images/searchEngines/www.haosou.com.png Binary files differindex 367b89d120..e77ed7ea79 100644 --- a/plugins/Referrers/images/searchEngines/www.haosou.com.png +++ b/plugins/Referrers/images/searchEngines/www.haosou.com.png diff --git a/plugins/Referrers/images/searchEngines/www.highbeam.com.png b/plugins/Referrers/images/searchEngines/www.highbeam.com.png Binary files differindex badb1cfe38..2593553e11 100644 --- a/plugins/Referrers/images/searchEngines/www.highbeam.com.png +++ b/plugins/Referrers/images/searchEngines/www.highbeam.com.png diff --git a/plugins/Referrers/images/searchEngines/www.hotbot.com.png b/plugins/Referrers/images/searchEngines/www.hotbot.com.png Binary files differindex b2b94bc506..0c06c8b6e3 100644 --- a/plugins/Referrers/images/searchEngines/www.hotbot.com.png +++ b/plugins/Referrers/images/searchEngines/www.hotbot.com.png diff --git a/plugins/Referrers/images/searchEngines/www.icq.com.png b/plugins/Referrers/images/searchEngines/www.icq.com.png Binary files differindex 6a926e8264..d7c0f60f83 100644 --- a/plugins/Referrers/images/searchEngines/www.icq.com.png +++ b/plugins/Referrers/images/searchEngines/www.icq.com.png diff --git a/plugins/Referrers/images/searchEngines/www.ilse.nl.png b/plugins/Referrers/images/searchEngines/www.ilse.nl.png Binary files differindex e377b212ab..a878aada88 100644 --- a/plugins/Referrers/images/searchEngines/www.ilse.nl.png +++ b/plugins/Referrers/images/searchEngines/www.ilse.nl.png diff --git a/plugins/Referrers/images/searchEngines/www.isodelen.se.png b/plugins/Referrers/images/searchEngines/www.isodelen.se.png Binary files differindex e24529ad91..ecb033fe41 100644 --- a/plugins/Referrers/images/searchEngines/www.isodelen.se.png +++ b/plugins/Referrers/images/searchEngines/www.isodelen.se.png diff --git a/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png b/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png Binary files differindex 6996b1f4b7..264d7c34db 100644 --- a/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png +++ b/plugins/Referrers/images/searchEngines/www.jungle-spider.de.png diff --git a/plugins/Referrers/images/searchEngines/www.kataweb.it.png b/plugins/Referrers/images/searchEngines/www.kataweb.it.png Binary files differindex 16d5a90772..6be4418281 100644 --- a/plugins/Referrers/images/searchEngines/www.kataweb.it.png +++ b/plugins/Referrers/images/searchEngines/www.kataweb.it.png diff --git a/plugins/Referrers/images/searchEngines/www.kensaq.com.png b/plugins/Referrers/images/searchEngines/www.kensaq.com.png Binary files differindex ec2d5196ec..e701055521 100644 --- a/plugins/Referrers/images/searchEngines/www.kensaq.com.png +++ b/plugins/Referrers/images/searchEngines/www.kensaq.com.png diff --git a/plugins/Referrers/images/searchEngines/www.lookany.com.png b/plugins/Referrers/images/searchEngines/www.lookany.com.png Binary files differindex 13940a1186..ef58320f47 100644 --- a/plugins/Referrers/images/searchEngines/www.lookany.com.png +++ b/plugins/Referrers/images/searchEngines/www.lookany.com.png diff --git a/plugins/Referrers/images/searchEngines/www.mamma.com.png b/plugins/Referrers/images/searchEngines/www.mamma.com.png Binary files differindex 9f25b2a2b8..decfd3db4c 100644 --- a/plugins/Referrers/images/searchEngines/www.mamma.com.png +++ b/plugins/Referrers/images/searchEngines/www.mamma.com.png diff --git a/plugins/Referrers/images/searchEngines/www.meinestadt.de.png b/plugins/Referrers/images/searchEngines/www.meinestadt.de.png Binary files differindex 4e14ee5b6d..47c5727a83 100644 --- a/plugins/Referrers/images/searchEngines/www.meinestadt.de.png +++ b/plugins/Referrers/images/searchEngines/www.meinestadt.de.png diff --git a/plugins/Referrers/images/searchEngines/www.mysearch.com.png b/plugins/Referrers/images/searchEngines/www.mysearch.com.png Binary files differindex ab08d98e48..b15f86a984 100644 --- a/plugins/Referrers/images/searchEngines/www.mysearch.com.png +++ b/plugins/Referrers/images/searchEngines/www.mysearch.com.png diff --git a/plugins/Referrers/images/searchEngines/www.najdi.si.png b/plugins/Referrers/images/searchEngines/www.najdi.si.png Binary files differindex 2898171b50..4f983caa62 100644 --- a/plugins/Referrers/images/searchEngines/www.najdi.si.png +++ b/plugins/Referrers/images/searchEngines/www.najdi.si.png diff --git a/plugins/Referrers/images/searchEngines/www.neti.ee.png b/plugins/Referrers/images/searchEngines/www.neti.ee.png Binary files differindex 60691aedaf..9f27eb75ac 100644 --- a/plugins/Referrers/images/searchEngines/www.neti.ee.png +++ b/plugins/Referrers/images/searchEngines/www.neti.ee.png diff --git a/plugins/Referrers/images/searchEngines/www.only-search.com.png b/plugins/Referrers/images/searchEngines/www.only-search.com.png Binary files differindex 543c95d88e..883d5e2139 100644 --- a/plugins/Referrers/images/searchEngines/www.only-search.com.png +++ b/plugins/Referrers/images/searchEngines/www.only-search.com.png diff --git a/plugins/Referrers/images/searchEngines/www.paperball.de.png b/plugins/Referrers/images/searchEngines/www.paperball.de.png Binary files differindex b2b94bc506..1453206a62 100644 --- a/plugins/Referrers/images/searchEngines/www.paperball.de.png +++ b/plugins/Referrers/images/searchEngines/www.paperball.de.png diff --git a/plugins/Referrers/images/searchEngines/www.picsearch.com.png b/plugins/Referrers/images/searchEngines/www.picsearch.com.png Binary files differindex 268174e5f5..ed9865a9ef 100644 --- a/plugins/Referrers/images/searchEngines/www.picsearch.com.png +++ b/plugins/Referrers/images/searchEngines/www.picsearch.com.png diff --git a/plugins/Referrers/images/searchEngines/www.plazoo.com.png b/plugins/Referrers/images/searchEngines/www.plazoo.com.png Binary files differindex bfebffa349..d75fbbe0db 100644 --- a/plugins/Referrers/images/searchEngines/www.plazoo.com.png +++ b/plugins/Referrers/images/searchEngines/www.plazoo.com.png diff --git a/plugins/Referrers/images/searchEngines/www.qwant.com.png b/plugins/Referrers/images/searchEngines/www.qwant.com.png Binary files differindex 00946b0bcc..8462df98ff 100644 --- a/plugins/Referrers/images/searchEngines/www.qwant.com.png +++ b/plugins/Referrers/images/searchEngines/www.qwant.com.png diff --git a/plugins/Referrers/images/searchEngines/www.riksdelen.se.png b/plugins/Referrers/images/searchEngines/www.riksdelen.se.png Binary files differindex c41de9e417..356e66f146 100644 --- a/plugins/Referrers/images/searchEngines/www.riksdelen.se.png +++ b/plugins/Referrers/images/searchEngines/www.riksdelen.se.png diff --git a/plugins/Referrers/images/searchEngines/www.search.ch.png b/plugins/Referrers/images/searchEngines/www.search.ch.png Binary files differindex a37e8bec2d..73a3c508a2 100644 --- a/plugins/Referrers/images/searchEngines/www.search.ch.png +++ b/plugins/Referrers/images/searchEngines/www.search.ch.png diff --git a/plugins/Referrers/images/searchEngines/www.search.com.png b/plugins/Referrers/images/searchEngines/www.search.com.png Binary files differindex 5afc022944..04f1b4b185 100644 --- a/plugins/Referrers/images/searchEngines/www.search.com.png +++ b/plugins/Referrers/images/searchEngines/www.search.com.png diff --git a/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png b/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png Binary files differindex 04a7a0dfa1..d62d60144b 100644 --- a/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png +++ b/plugins/Referrers/images/searchEngines/www.searchcanvas.com.png diff --git a/plugins/Referrers/images/searchEngines/www.sharelook.fr.png b/plugins/Referrers/images/searchEngines/www.sharelook.fr.png Binary files differindex a4cb50bb36..ccb784855b 100644 --- a/plugins/Referrers/images/searchEngines/www.sharelook.fr.png +++ b/plugins/Referrers/images/searchEngines/www.sharelook.fr.png diff --git a/plugins/Referrers/images/searchEngines/www.skynet.be.png b/plugins/Referrers/images/searchEngines/www.skynet.be.png Binary files differindex 25bb673414..5f2a39ae11 100644 --- a/plugins/Referrers/images/searchEngines/www.skynet.be.png +++ b/plugins/Referrers/images/searchEngines/www.skynet.be.png diff --git a/plugins/Referrers/images/searchEngines/www.sm.de.png b/plugins/Referrers/images/searchEngines/www.sm.de.png Binary files differindex 45a01277b1..25dfc52512 100644 --- a/plugins/Referrers/images/searchEngines/www.sm.de.png +++ b/plugins/Referrers/images/searchEngines/www.sm.de.png diff --git a/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png b/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png Binary files differindex 6b071e50fd..64dad033fd 100644 --- a/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png +++ b/plugins/Referrers/images/searchEngines/www.so-net.ne.jp.png diff --git a/plugins/Referrers/images/searchEngines/www.sogou.com.png b/plugins/Referrers/images/searchEngines/www.sogou.com.png Binary files differindex 23af99bb2d..532ae870a3 100644 --- a/plugins/Referrers/images/searchEngines/www.sogou.com.png +++ b/plugins/Referrers/images/searchEngines/www.sogou.com.png diff --git a/plugins/Referrers/images/searchEngines/www.soso.com.png b/plugins/Referrers/images/searchEngines/www.soso.com.png Binary files differindex cd5019d3a7..532ae870a3 100644 --- a/plugins/Referrers/images/searchEngines/www.soso.com.png +++ b/plugins/Referrers/images/searchEngines/www.soso.com.png diff --git a/plugins/Referrers/images/searchEngines/www.sputnik.ru.png b/plugins/Referrers/images/searchEngines/www.sputnik.ru.png Binary files differindex ab1d308e1e..7e0561d59d 100644 --- a/plugins/Referrers/images/searchEngines/www.sputnik.ru.png +++ b/plugins/Referrers/images/searchEngines/www.sputnik.ru.png diff --git a/plugins/Referrers/images/searchEngines/www.startsiden.no.png b/plugins/Referrers/images/searchEngines/www.startsiden.no.png Binary files differindex f8c702acc1..f895c1da46 100644 --- a/plugins/Referrers/images/searchEngines/www.startsiden.no.png +++ b/plugins/Referrers/images/searchEngines/www.startsiden.no.png diff --git a/plugins/Referrers/images/searchEngines/www.suchnase.de.png b/plugins/Referrers/images/searchEngines/www.suchnase.de.png Binary files differindex 2922396a13..200c6d35f3 100644 --- a/plugins/Referrers/images/searchEngines/www.suchnase.de.png +++ b/plugins/Referrers/images/searchEngines/www.suchnase.de.png diff --git a/plugins/Referrers/images/searchEngines/www.talimba.com.png b/plugins/Referrers/images/searchEngines/www.talimba.com.png Binary files differindex 4403a249b1..bc48365f86 100644 --- a/plugins/Referrers/images/searchEngines/www.talimba.com.png +++ b/plugins/Referrers/images/searchEngines/www.talimba.com.png diff --git a/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png b/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png Binary files differindex 90162cd25d..810a2a641f 100644 --- a/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png +++ b/plugins/Referrers/images/searchEngines/www.talktalk.co.uk.png diff --git a/plugins/Referrers/images/searchEngines/www.teoma.com.png b/plugins/Referrers/images/searchEngines/www.teoma.com.png Binary files differindex 8307f5428c..07a49af0cb 100644 --- a/plugins/Referrers/images/searchEngines/www.teoma.com.png +++ b/plugins/Referrers/images/searchEngines/www.teoma.com.png diff --git a/plugins/Referrers/images/searchEngines/www.tixuma.de.png b/plugins/Referrers/images/searchEngines/www.tixuma.de.png Binary files differindex 5bc3b0d063..113efcd76c 100644 --- a/plugins/Referrers/images/searchEngines/www.tixuma.de.png +++ b/plugins/Referrers/images/searchEngines/www.tixuma.de.png diff --git a/plugins/Referrers/images/searchEngines/www.toppreise.ch.png b/plugins/Referrers/images/searchEngines/www.toppreise.ch.png Binary files differindex 5c7dffd666..5d83066717 100644 --- a/plugins/Referrers/images/searchEngines/www.toppreise.ch.png +++ b/plugins/Referrers/images/searchEngines/www.toppreise.ch.png diff --git a/plugins/Referrers/images/searchEngines/www.trovarapido.com.png b/plugins/Referrers/images/searchEngines/www.trovarapido.com.png Binary files differindex 178db0cb48..9580118266 100644 --- a/plugins/Referrers/images/searchEngines/www.trovarapido.com.png +++ b/plugins/Referrers/images/searchEngines/www.trovarapido.com.png diff --git a/plugins/Referrers/images/searchEngines/www.twingly.com.png b/plugins/Referrers/images/searchEngines/www.twingly.com.png Binary files differindex 90bb98e73d..975018ea2b 100644 --- a/plugins/Referrers/images/searchEngines/www.twingly.com.png +++ b/plugins/Referrers/images/searchEngines/www.twingly.com.png diff --git a/plugins/Referrers/images/searchEngines/www.url.org.png b/plugins/Referrers/images/searchEngines/www.url.org.png Binary files differindex bab829ef20..662ef9eeb3 100644 --- a/plugins/Referrers/images/searchEngines/www.url.org.png +++ b/plugins/Referrers/images/searchEngines/www.url.org.png diff --git a/plugins/Referrers/images/searchEngines/www.vinden.nl.png b/plugins/Referrers/images/searchEngines/www.vinden.nl.png Binary files differindex dbccde0feb..541e7f28d7 100644 --- a/plugins/Referrers/images/searchEngines/www.vinden.nl.png +++ b/plugins/Referrers/images/searchEngines/www.vinden.nl.png diff --git a/plugins/Referrers/images/searchEngines/www.web.nl.png b/plugins/Referrers/images/searchEngines/www.web.nl.png Binary files differindex 0740cef1a7..4e2255e804 100644 --- a/plugins/Referrers/images/searchEngines/www.web.nl.png +++ b/plugins/Referrers/images/searchEngines/www.web.nl.png diff --git a/plugins/Referrers/images/searchEngines/www.weborama.fr.png b/plugins/Referrers/images/searchEngines/www.weborama.fr.png Binary files differindex 096891a617..39a8ecbbe8 100644 --- a/plugins/Referrers/images/searchEngines/www.weborama.fr.png +++ b/plugins/Referrers/images/searchEngines/www.weborama.fr.png diff --git a/plugins/Referrers/images/searchEngines/www.websearch.com.png b/plugins/Referrers/images/searchEngines/www.websearch.com.png Binary files differindex a161533a0a..13ec51b003 100644 --- a/plugins/Referrers/images/searchEngines/www.websearch.com.png +++ b/plugins/Referrers/images/searchEngines/www.websearch.com.png diff --git a/plugins/Referrers/images/searchEngines/www.witch.de.png b/plugins/Referrers/images/searchEngines/www.witch.de.png Binary files differindex e44548ec3f..1f1766b6a4 100644 --- a/plugins/Referrers/images/searchEngines/www.witch.de.png +++ b/plugins/Referrers/images/searchEngines/www.witch.de.png diff --git a/plugins/Referrers/images/searchEngines/www.woopie.jp.png b/plugins/Referrers/images/searchEngines/www.woopie.jp.png Binary files differindex ef3b7ecd9e..bccf2539be 100644 --- a/plugins/Referrers/images/searchEngines/www.woopie.jp.png +++ b/plugins/Referrers/images/searchEngines/www.woopie.jp.png diff --git a/plugins/Referrers/images/searchEngines/www.x-recherche.com.png b/plugins/Referrers/images/searchEngines/www.x-recherche.com.png Binary files differindex 0e44c0d93d..29b2625cbb 100644 --- a/plugins/Referrers/images/searchEngines/www.x-recherche.com.png +++ b/plugins/Referrers/images/searchEngines/www.x-recherche.com.png diff --git a/plugins/Referrers/images/searchEngines/www.yasni.de.png b/plugins/Referrers/images/searchEngines/www.yasni.de.png Binary files differindex 9440cb8ebb..43536f6d9c 100644 --- a/plugins/Referrers/images/searchEngines/www.yasni.de.png +++ b/plugins/Referrers/images/searchEngines/www.yasni.de.png diff --git a/plugins/Referrers/images/searchEngines/www.yatedo.com.png b/plugins/Referrers/images/searchEngines/www.yatedo.com.png Binary files differindex b77082edbe..1eb86be92e 100644 --- a/plugins/Referrers/images/searchEngines/www.yatedo.com.png +++ b/plugins/Referrers/images/searchEngines/www.yatedo.com.png diff --git a/plugins/Referrers/images/searchEngines/www.yougoo.fr.png b/plugins/Referrers/images/searchEngines/www.yougoo.fr.png Binary files differindex 6e0e19c461..0129dec9bd 100644 --- a/plugins/Referrers/images/searchEngines/www.yougoo.fr.png +++ b/plugins/Referrers/images/searchEngines/www.yougoo.fr.png diff --git a/plugins/Referrers/images/searchEngines/www.zapmeta.com.png b/plugins/Referrers/images/searchEngines/www.zapmeta.com.png Binary files differindex ff98d107f8..f9d9cb431b 100644 --- a/plugins/Referrers/images/searchEngines/www.zapmeta.com.png +++ b/plugins/Referrers/images/searchEngines/www.zapmeta.com.png diff --git a/plugins/Referrers/images/searchEngines/www.zoeken.nl.png b/plugins/Referrers/images/searchEngines/www.zoeken.nl.png Binary files differindex b66c4e36bc..74fa24b55f 100644 --- a/plugins/Referrers/images/searchEngines/www.zoeken.nl.png +++ b/plugins/Referrers/images/searchEngines/www.zoeken.nl.png diff --git a/plugins/Referrers/images/searchEngines/www.zoznam.sk.png b/plugins/Referrers/images/searchEngines/www.zoznam.sk.png Binary files differindex c6e9963fe5..b9a66ed3fe 100644 --- a/plugins/Referrers/images/searchEngines/www.zoznam.sk.png +++ b/plugins/Referrers/images/searchEngines/www.zoznam.sk.png diff --git a/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png b/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png Binary files differindex 8912f991a4..2036085f88 100644 --- a/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png +++ b/plugins/Referrers/images/searchEngines/www1.dastelefonbuch.de.png diff --git a/plugins/Referrers/images/searchEngines/www2.inbox.com.png b/plugins/Referrers/images/searchEngines/www2.inbox.com.png Binary files differindex 254592427d..13b55a1892 100644 --- a/plugins/Referrers/images/searchEngines/www2.inbox.com.png +++ b/plugins/Referrers/images/searchEngines/www2.inbox.com.png diff --git a/plugins/Referrers/images/searchEngines/www3.zoek.nl.png b/plugins/Referrers/images/searchEngines/www3.zoek.nl.png Binary files differindex 7c5a5a11b7..0d58439ef6 100644 --- a/plugins/Referrers/images/searchEngines/www3.zoek.nl.png +++ b/plugins/Referrers/images/searchEngines/www3.zoek.nl.png diff --git a/plugins/Referrers/images/searchEngines/xx.png b/plugins/Referrers/images/searchEngines/xx.png Binary files differindex fe2401be73..6a63dcea00 100644 --- a/plugins/Referrers/images/searchEngines/xx.png +++ b/plugins/Referrers/images/searchEngines/xx.png diff --git a/plugins/Referrers/images/searchEngines/yandex.ru.png b/plugins/Referrers/images/searchEngines/yandex.ru.png Binary files differindex b6cf192fb9..820691dd5d 100644 --- a/plugins/Referrers/images/searchEngines/yandex.ru.png +++ b/plugins/Referrers/images/searchEngines/yandex.ru.png diff --git a/plugins/Referrers/images/searchEngines/yellowmap.de.png b/plugins/Referrers/images/searchEngines/yellowmap.de.png Binary files differindex 19e486fc98..5b33986484 100644 --- a/plugins/Referrers/images/searchEngines/yellowmap.de.png +++ b/plugins/Referrers/images/searchEngines/yellowmap.de.png diff --git a/plugins/Referrers/images/searchEngines/zoohoo.cz.png b/plugins/Referrers/images/searchEngines/zoohoo.cz.png Binary files differindex ce7993d311..e1077e28a5 100644 --- a/plugins/Referrers/images/searchEngines/zoohoo.cz.png +++ b/plugins/Referrers/images/searchEngines/zoohoo.cz.png diff --git a/plugins/Referrers/images/socials/badoo.com.png b/plugins/Referrers/images/socials/badoo.com.png Binary files differindex aea21cd1c5..fc3834784d 100644 --- a/plugins/Referrers/images/socials/badoo.com.png +++ b/plugins/Referrers/images/socials/badoo.com.png diff --git a/plugins/Referrers/images/socials/blackplanet.com.png b/plugins/Referrers/images/socials/blackplanet.com.png Binary files differindex 99387eae4e..6a33a3fc1f 100644 --- a/plugins/Referrers/images/socials/blackplanet.com.png +++ b/plugins/Referrers/images/socials/blackplanet.com.png diff --git a/plugins/Referrers/images/socials/buzznet.com.png b/plugins/Referrers/images/socials/buzznet.com.png Binary files differindex 837837a01c..2ef3bd39c6 100644 --- a/plugins/Referrers/images/socials/buzznet.com.png +++ b/plugins/Referrers/images/socials/buzznet.com.png diff --git a/plugins/Referrers/images/socials/classmates.com.png b/plugins/Referrers/images/socials/classmates.com.png Binary files differindex 3b03cb44df..34b54aa5d7 100644 --- a/plugins/Referrers/images/socials/classmates.com.png +++ b/plugins/Referrers/images/socials/classmates.com.png diff --git a/plugins/Referrers/images/socials/douban.com.png b/plugins/Referrers/images/socials/douban.com.png Binary files differindex 3e0b36a646..a4a95bb572 100644 --- a/plugins/Referrers/images/socials/douban.com.png +++ b/plugins/Referrers/images/socials/douban.com.png diff --git a/plugins/Referrers/images/socials/dribbble.com.png b/plugins/Referrers/images/socials/dribbble.com.png Binary files differindex d8fa99c706..8941880deb 100644 --- a/plugins/Referrers/images/socials/dribbble.com.png +++ b/plugins/Referrers/images/socials/dribbble.com.png diff --git a/plugins/Referrers/images/socials/facebook.com.png b/plugins/Referrers/images/socials/facebook.com.png Binary files differindex 5984d34da6..75deab4280 100644 --- a/plugins/Referrers/images/socials/facebook.com.png +++ b/plugins/Referrers/images/socials/facebook.com.png diff --git a/plugins/Referrers/images/socials/fb.me.png b/plugins/Referrers/images/socials/fb.me.png Binary files differnew file mode 100644 index 0000000000..0d901fdd5d --- /dev/null +++ b/plugins/Referrers/images/socials/fb.me.png diff --git a/plugins/Referrers/images/socials/flickr.com.png b/plugins/Referrers/images/socials/flickr.com.png Binary files differindex d1aa296e5c..82486f6d3d 100644 --- a/plugins/Referrers/images/socials/flickr.com.png +++ b/plugins/Referrers/images/socials/flickr.com.png diff --git a/plugins/Referrers/images/socials/flixster.com.png b/plugins/Referrers/images/socials/flixster.com.png Binary files differindex 94f96d3230..bd0d1cc9fb 100644 --- a/plugins/Referrers/images/socials/flixster.com.png +++ b/plugins/Referrers/images/socials/flixster.com.png diff --git a/plugins/Referrers/images/socials/fotolog.com.png b/plugins/Referrers/images/socials/fotolog.com.png Binary files differindex 03bb1dd8c4..82152207de 100644 --- a/plugins/Referrers/images/socials/fotolog.com.png +++ b/plugins/Referrers/images/socials/fotolog.com.png diff --git a/plugins/Referrers/images/socials/foursquare.com.png b/plugins/Referrers/images/socials/foursquare.com.png Binary files differindex 17d295088b..1924b1fb3a 100644 --- a/plugins/Referrers/images/socials/foursquare.com.png +++ b/plugins/Referrers/images/socials/foursquare.com.png diff --git a/plugins/Referrers/images/socials/gaiaonline.com.png b/plugins/Referrers/images/socials/gaiaonline.com.png Binary files differindex 720fb21f05..b734e6697c 100644 --- a/plugins/Referrers/images/socials/gaiaonline.com.png +++ b/plugins/Referrers/images/socials/gaiaonline.com.png diff --git a/plugins/Referrers/images/socials/geni.com.png b/plugins/Referrers/images/socials/geni.com.png Binary files differindex 89489a9a7b..cdf91122f8 100644 --- a/plugins/Referrers/images/socials/geni.com.png +++ b/plugins/Referrers/images/socials/geni.com.png diff --git a/plugins/Referrers/images/socials/github.com.png b/plugins/Referrers/images/socials/github.com.png Binary files differindex 3f7a5b4ac0..c9157c3655 100644 --- a/plugins/Referrers/images/socials/github.com.png +++ b/plugins/Referrers/images/socials/github.com.png diff --git a/plugins/Referrers/images/socials/gree.jp.png b/plugins/Referrers/images/socials/gree.jp.png Binary files differnew file mode 100644 index 0000000000..9a9d7ed3d8 --- /dev/null +++ b/plugins/Referrers/images/socials/gree.jp.png diff --git a/plugins/Referrers/images/socials/hi5.com.png b/plugins/Referrers/images/socials/hi5.com.png Binary files differindex ff369f74da..a3cfc5b748 100644 --- a/plugins/Referrers/images/socials/hi5.com.png +++ b/plugins/Referrers/images/socials/hi5.com.png diff --git a/plugins/Referrers/images/socials/identi.ca.png b/plugins/Referrers/images/socials/identi.ca.png Binary files differindex d31743c89c..d12393aef3 100644 --- a/plugins/Referrers/images/socials/identi.ca.png +++ b/plugins/Referrers/images/socials/identi.ca.png diff --git a/plugins/Referrers/images/socials/lang-8.com.png b/plugins/Referrers/images/socials/lang-8.com.png Binary files differnew file mode 100644 index 0000000000..6bce01de8d --- /dev/null +++ b/plugins/Referrers/images/socials/lang-8.com.png diff --git a/plugins/Referrers/images/socials/last.fm.png b/plugins/Referrers/images/socials/last.fm.png Binary files differindex 9362fd4eff..9a99899c1a 100644 --- a/plugins/Referrers/images/socials/last.fm.png +++ b/plugins/Referrers/images/socials/last.fm.png diff --git a/plugins/Referrers/images/socials/lastfm.com.br.png b/plugins/Referrers/images/socials/lastfm.com.br.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.com.br.png diff --git a/plugins/Referrers/images/socials/lastfm.com.tr.png b/plugins/Referrers/images/socials/lastfm.com.tr.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.com.tr.png diff --git a/plugins/Referrers/images/socials/lastfm.de.png b/plugins/Referrers/images/socials/lastfm.de.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.de.png diff --git a/plugins/Referrers/images/socials/lastfm.es.png b/plugins/Referrers/images/socials/lastfm.es.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.es.png diff --git a/plugins/Referrers/images/socials/lastfm.fr.png b/plugins/Referrers/images/socials/lastfm.fr.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.fr.png diff --git a/plugins/Referrers/images/socials/lastfm.it.png b/plugins/Referrers/images/socials/lastfm.it.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.it.png diff --git a/plugins/Referrers/images/socials/lastfm.jp.png b/plugins/Referrers/images/socials/lastfm.jp.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.jp.png diff --git a/plugins/Referrers/images/socials/lastfm.pl.png b/plugins/Referrers/images/socials/lastfm.pl.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.pl.png diff --git a/plugins/Referrers/images/socials/lastfm.ru.png b/plugins/Referrers/images/socials/lastfm.ru.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.ru.png diff --git a/plugins/Referrers/images/socials/lastfm.se.png b/plugins/Referrers/images/socials/lastfm.se.png Binary files differnew file mode 100644 index 0000000000..688b3bca56 --- /dev/null +++ b/plugins/Referrers/images/socials/lastfm.se.png diff --git a/plugins/Referrers/images/socials/linkedin.com.png b/plugins/Referrers/images/socials/linkedin.com.png Binary files differindex e6a5034b39..00dbff22af 100644 --- a/plugins/Referrers/images/socials/linkedin.com.png +++ b/plugins/Referrers/images/socials/linkedin.com.png diff --git a/plugins/Referrers/images/socials/livejournal.com.png b/plugins/Referrers/images/socials/livejournal.com.png Binary files differnew file mode 100644 index 0000000000..88f94a9154 --- /dev/null +++ b/plugins/Referrers/images/socials/livejournal.com.png diff --git a/plugins/Referrers/images/socials/livejournal.ru.png b/plugins/Referrers/images/socials/livejournal.ru.png Binary files differindex aab5626528..260109ad14 100644 --- a/plugins/Referrers/images/socials/livejournal.ru.png +++ b/plugins/Referrers/images/socials/livejournal.ru.png diff --git a/plugins/Referrers/images/socials/lnkd.in.png b/plugins/Referrers/images/socials/lnkd.in.png Binary files differnew file mode 100644 index 0000000000..d030e0ae02 --- /dev/null +++ b/plugins/Referrers/images/socials/lnkd.in.png diff --git a/plugins/Referrers/images/socials/login.live.com.png b/plugins/Referrers/images/socials/login.live.com.png Binary files differindex 7db0eafb2b..afbcd3583e 100644 --- a/plugins/Referrers/images/socials/login.live.com.png +++ b/plugins/Referrers/images/socials/login.live.com.png diff --git a/plugins/Referrers/images/socials/login.tagged.com.png b/plugins/Referrers/images/socials/login.tagged.com.png Binary files differindex d2a0eb4237..d965e720c8 100644 --- a/plugins/Referrers/images/socials/login.tagged.com.png +++ b/plugins/Referrers/images/socials/login.tagged.com.png diff --git a/plugins/Referrers/images/socials/meinvz.net.png b/plugins/Referrers/images/socials/meinvz.net.png Binary files differindex 167bbd5e20..ce19429fd5 100644 --- a/plugins/Referrers/images/socials/meinvz.net.png +++ b/plugins/Referrers/images/socials/meinvz.net.png diff --git a/plugins/Referrers/images/socials/mixi.jp.png b/plugins/Referrers/images/socials/mixi.jp.png Binary files differindex 69bd263d00..641d9f263c 100644 --- a/plugins/Referrers/images/socials/mixi.jp.png +++ b/plugins/Referrers/images/socials/mixi.jp.png diff --git a/plugins/Referrers/images/socials/moikrug.ru.png b/plugins/Referrers/images/socials/moikrug.ru.png Binary files differindex 5629a38af9..2478057caa 100644 --- a/plugins/Referrers/images/socials/moikrug.ru.png +++ b/plugins/Referrers/images/socials/moikrug.ru.png diff --git a/plugins/Referrers/images/socials/multiply.com.png b/plugins/Referrers/images/socials/multiply.com.png Binary files differindex 9606837896..8d4b21a0c5 100644 --- a/plugins/Referrers/images/socials/multiply.com.png +++ b/plugins/Referrers/images/socials/multiply.com.png diff --git a/plugins/Referrers/images/socials/my.mail.ru.png b/plugins/Referrers/images/socials/my.mail.ru.png Binary files differindex 8d9d249518..eb38c82d7c 100644 --- a/plugins/Referrers/images/socials/my.mail.ru.png +++ b/plugins/Referrers/images/socials/my.mail.ru.png diff --git a/plugins/Referrers/images/socials/myheritage.com.png b/plugins/Referrers/images/socials/myheritage.com.png Binary files differindex f55732a34c..6ec3716e36 100644 --- a/plugins/Referrers/images/socials/myheritage.com.png +++ b/plugins/Referrers/images/socials/myheritage.com.png diff --git a/plugins/Referrers/images/socials/myspace.com.png b/plugins/Referrers/images/socials/myspace.com.png Binary files differindex 274cd18012..4263e378d3 100644 --- a/plugins/Referrers/images/socials/myspace.com.png +++ b/plugins/Referrers/images/socials/myspace.com.png diff --git a/plugins/Referrers/images/socials/netlog.com.png b/plugins/Referrers/images/socials/netlog.com.png Binary files differindex 549b3d798c..c2ef3953c9 100644 --- a/plugins/Referrers/images/socials/netlog.com.png +++ b/plugins/Referrers/images/socials/netlog.com.png diff --git a/plugins/Referrers/images/socials/news.ycombinator.com.png b/plugins/Referrers/images/socials/news.ycombinator.com.png Binary files differindex f64ec3b0da..19169c8520 100644 --- a/plugins/Referrers/images/socials/news.ycombinator.com.png +++ b/plugins/Referrers/images/socials/news.ycombinator.com.png diff --git a/plugins/Referrers/images/socials/nk.pl.png b/plugins/Referrers/images/socials/nk.pl.png Binary files differindex 378fde1bf2..010cdf5533 100644 --- a/plugins/Referrers/images/socials/nk.pl.png +++ b/plugins/Referrers/images/socials/nk.pl.png diff --git a/plugins/Referrers/images/socials/odnoklassniki.ru.png b/plugins/Referrers/images/socials/odnoklassniki.ru.png Binary files differindex b20fbbbec1..e533c8fbf4 100644 --- a/plugins/Referrers/images/socials/odnoklassniki.ru.png +++ b/plugins/Referrers/images/socials/odnoklassniki.ru.png diff --git a/plugins/Referrers/images/socials/pinterest.com.png b/plugins/Referrers/images/socials/pinterest.com.png Binary files differindex d1f61b99eb..c6533c3f4c 100644 --- a/plugins/Referrers/images/socials/pinterest.com.png +++ b/plugins/Referrers/images/socials/pinterest.com.png diff --git a/plugins/Referrers/images/socials/plaxo.com.png b/plugins/Referrers/images/socials/plaxo.com.png Binary files differindex 9d1351e0e6..77ef030aca 100644 --- a/plugins/Referrers/images/socials/plaxo.com.png +++ b/plugins/Referrers/images/socials/plaxo.com.png diff --git a/plugins/Referrers/images/socials/plus.google.com.png b/plugins/Referrers/images/socials/plus.google.com.png Binary files differnew file mode 100644 index 0000000000..28aa24a5e8 --- /dev/null +++ b/plugins/Referrers/images/socials/plus.google.com.png diff --git a/plugins/Referrers/images/socials/reddit.com.png b/plugins/Referrers/images/socials/reddit.com.png Binary files differindex 234a096eba..e910f73c1a 100644 --- a/plugins/Referrers/images/socials/reddit.com.png +++ b/plugins/Referrers/images/socials/reddit.com.png diff --git a/plugins/Referrers/images/socials/renren.com.png b/plugins/Referrers/images/socials/renren.com.png Binary files differindex 05dae81d48..2be45a863a 100644 --- a/plugins/Referrers/images/socials/renren.com.png +++ b/plugins/Referrers/images/socials/renren.com.png diff --git a/plugins/Referrers/images/socials/skyrock.com.png b/plugins/Referrers/images/socials/skyrock.com.png Binary files differindex 9c6c336faa..c75eb7c4b8 100644 --- a/plugins/Referrers/images/socials/skyrock.com.png +++ b/plugins/Referrers/images/socials/skyrock.com.png diff --git a/plugins/Referrers/images/socials/sonico.com.png b/plugins/Referrers/images/socials/sonico.com.png Binary files differindex 74450ea939..c2ef3953c9 100644 --- a/plugins/Referrers/images/socials/sonico.com.png +++ b/plugins/Referrers/images/socials/sonico.com.png diff --git a/plugins/Referrers/images/socials/sourceforge.net.png b/plugins/Referrers/images/socials/sourceforge.net.png Binary files differindex 9e0a44c089..28910b26c4 100644 --- a/plugins/Referrers/images/socials/sourceforge.net.png +++ b/plugins/Referrers/images/socials/sourceforge.net.png diff --git a/plugins/Referrers/images/socials/stackoverflow.com.png b/plugins/Referrers/images/socials/stackoverflow.com.png Binary files differindex 7ae008ff52..2b8b3068f1 100644 --- a/plugins/Referrers/images/socials/stackoverflow.com.png +++ b/plugins/Referrers/images/socials/stackoverflow.com.png diff --git a/plugins/Referrers/images/socials/studivz.net.png b/plugins/Referrers/images/socials/studivz.net.png Binary files differindex 640e8d27db..ec38a6a00e 100644 --- a/plugins/Referrers/images/socials/studivz.net.png +++ b/plugins/Referrers/images/socials/studivz.net.png diff --git a/plugins/Referrers/images/socials/stumbleupon.com.png b/plugins/Referrers/images/socials/stumbleupon.com.png Binary files differindex a76f852646..3a5a8c440c 100644 --- a/plugins/Referrers/images/socials/stumbleupon.com.png +++ b/plugins/Referrers/images/socials/stumbleupon.com.png diff --git a/plugins/Referrers/images/socials/t.co.png b/plugins/Referrers/images/socials/t.co.png Binary files differnew file mode 100644 index 0000000000..2170f09918 --- /dev/null +++ b/plugins/Referrers/images/socials/t.co.png diff --git a/plugins/Referrers/images/socials/taringa.net.png b/plugins/Referrers/images/socials/taringa.net.png Binary files differindex edb1e20527..f3db083f71 100644 --- a/plugins/Referrers/images/socials/taringa.net.png +++ b/plugins/Referrers/images/socials/taringa.net.png diff --git a/plugins/Referrers/images/socials/tuenti.com.png b/plugins/Referrers/images/socials/tuenti.com.png Binary files differindex db0ad5254a..482e22d523 100644 --- a/plugins/Referrers/images/socials/tuenti.com.png +++ b/plugins/Referrers/images/socials/tuenti.com.png diff --git a/plugins/Referrers/images/socials/tumblr.com.png b/plugins/Referrers/images/socials/tumblr.com.png Binary files differindex 8bae05e917..0092f69263 100644 --- a/plugins/Referrers/images/socials/tumblr.com.png +++ b/plugins/Referrers/images/socials/tumblr.com.png diff --git a/plugins/Referrers/images/socials/twitter.com.png b/plugins/Referrers/images/socials/twitter.com.png Binary files differindex b90f3a05d2..da919d0a06 100644 --- a/plugins/Referrers/images/socials/twitter.com.png +++ b/plugins/Referrers/images/socials/twitter.com.png diff --git a/plugins/Referrers/images/socials/v2ex.com.png b/plugins/Referrers/images/socials/v2ex.com.png Binary files differnew file mode 100644 index 0000000000..40b8402fcc --- /dev/null +++ b/plugins/Referrers/images/socials/v2ex.com.png diff --git a/plugins/Referrers/images/socials/viadeo.com.png b/plugins/Referrers/images/socials/viadeo.com.png Binary files differindex 1d0ad9d0ad..e262533f18 100644 --- a/plugins/Referrers/images/socials/viadeo.com.png +++ b/plugins/Referrers/images/socials/viadeo.com.png diff --git a/plugins/Referrers/images/socials/vimeo.com.png b/plugins/Referrers/images/socials/vimeo.com.png Binary files differindex 4909f55931..8ea6e5b615 100644 --- a/plugins/Referrers/images/socials/vimeo.com.png +++ b/plugins/Referrers/images/socials/vimeo.com.png diff --git a/plugins/Referrers/images/socials/vk.com.png b/plugins/Referrers/images/socials/vk.com.png Binary files differindex 0ce476e6d6..3a2fa3724d 100644 --- a/plugins/Referrers/images/socials/vk.com.png +++ b/plugins/Referrers/images/socials/vk.com.png diff --git a/plugins/Referrers/images/socials/vkontakte.ru.png b/plugins/Referrers/images/socials/vkontakte.ru.png Binary files differindex e984ddbfb5..ab1148424e 100644 --- a/plugins/Referrers/images/socials/vkontakte.ru.png +++ b/plugins/Referrers/images/socials/vkontakte.ru.png diff --git a/plugins/Referrers/images/socials/vkrugudruzei.ru.png b/plugins/Referrers/images/socials/vkrugudruzei.ru.png Binary files differindex a320387c01..3ec8b21327 100644 --- a/plugins/Referrers/images/socials/vkrugudruzei.ru.png +++ b/plugins/Referrers/images/socials/vkrugudruzei.ru.png diff --git a/plugins/Referrers/images/socials/wayn.com.png b/plugins/Referrers/images/socials/wayn.com.png Binary files differindex 4932edc97f..710186906d 100644 --- a/plugins/Referrers/images/socials/wayn.com.png +++ b/plugins/Referrers/images/socials/wayn.com.png diff --git a/plugins/Referrers/images/socials/weeworld.com.png b/plugins/Referrers/images/socials/weeworld.com.png Binary files differindex 267dfb74c4..708284e2ad 100644 --- a/plugins/Referrers/images/socials/weeworld.com.png +++ b/plugins/Referrers/images/socials/weeworld.com.png diff --git a/plugins/Referrers/images/socials/weibo.com.png b/plugins/Referrers/images/socials/weibo.com.png Binary files differindex 3b25d6ae6c..c9fda88e7c 100644 --- a/plugins/Referrers/images/socials/weibo.com.png +++ b/plugins/Referrers/images/socials/weibo.com.png diff --git a/plugins/Referrers/images/socials/xanga.com.png b/plugins/Referrers/images/socials/xanga.com.png Binary files differindex cc0a26090f..948ace2280 100644 --- a/plugins/Referrers/images/socials/xanga.com.png +++ b/plugins/Referrers/images/socials/xanga.com.png diff --git a/plugins/Referrers/images/socials/xing.com.png b/plugins/Referrers/images/socials/xing.com.png Binary files differindex 1d6a8a4395..4375046788 100644 --- a/plugins/Referrers/images/socials/xing.com.png +++ b/plugins/Referrers/images/socials/xing.com.png diff --git a/plugins/Referrers/images/socials/xx.png b/plugins/Referrers/images/socials/xx.png Binary files differindex fe2401be73..6a63dcea00 100644 --- a/plugins/Referrers/images/socials/xx.png +++ b/plugins/Referrers/images/socials/xx.png diff --git a/plugins/Referrers/images/socials/youtu.be.png b/plugins/Referrers/images/socials/youtu.be.png Binary files differnew file mode 100644 index 0000000000..812fddfcce --- /dev/null +++ b/plugins/Referrers/images/socials/youtu.be.png diff --git a/plugins/Referrers/images/socials/youtube.com.png b/plugins/Referrers/images/socials/youtube.com.png Binary files differindex c5346b61a2..a49072ba3b 100644 --- a/plugins/Referrers/images/socials/youtube.com.png +++ b/plugins/Referrers/images/socials/youtube.com.png diff --git a/plugins/Referrers/lang/en.json b/plugins/Referrers/lang/en.json index 3c4885a52f..7cfcb99281 100644 --- a/plugins/Referrers/lang/en.json +++ b/plugins/Referrers/lang/en.json @@ -10,7 +10,7 @@ "ColumnWebsite": "Website", "ColumnWebsitePage": "Website Page", "DirectEntry": "Direct Entry", - "DirectEntryDocumentation": "A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.", + "DirectEntryDocumentation": "A visitor has entered the URL in their browser and started browsing on your website - they entered the website directly.", "Distinct": "Distinct Referrers by Referrer Type", "DistinctCampaigns": "distinct campaigns", "DistinctKeywords": "distinct keywords", @@ -52,4 +52,4 @@ "WidgetTopKeywordsForPages": "Top Keywords for Page URL", "XPercentOfVisits": "%s of visits" } -}
\ No newline at end of file +} diff --git a/plugins/Referrers/lang/fa.json b/plugins/Referrers/lang/fa.json index 8d697ea773..0a05f8a79f 100644 --- a/plugins/Referrers/lang/fa.json +++ b/plugins/Referrers/lang/fa.json @@ -31,7 +31,9 @@ "TypeReportDocumentation": "این جدول شامل اطلاعات مربوط به توزیع انواع معرف است.", "TypeSearchEngines": "%s از موتوهای جستجو", "TypeWebsites": "%s از وبسایت ها", + "UsingNDistinctUrls": "(با استفاده از URL های مجزا%s)", "ViewAllReferrers": "مشاهده تمام معرف ها", + "ViewReferrersBy": "مشاهده معرف ها با %s", "Websites": "وب سایت ها", "WidgetExternalWebsites": "فهرست وب سایت های خارجی", "WidgetGetAll": "همه معرف ها", diff --git a/plugins/Referrers/lang/zh-tw.json b/plugins/Referrers/lang/zh-tw.json index 7dcf98da66..2fcd0841d5 100644 --- a/plugins/Referrers/lang/zh-tw.json +++ b/plugins/Referrers/lang/zh-tw.json @@ -1,29 +1,55 @@ { "Referrers": { + "AllReferrersReportDocumentation": "這份報表顯示你所有的參照連結，列出所有你訪客找到你網站透過的參照連結網站、搜尋關鍵字和廣告活動。", "Campaigns": "廣告活動", + "CampaignsDocumentation": "訪客透過廣告活動前往你的網站。%1$s查看 %2$s 報表以取得更多細節。", + "CampaignsReportDocumentation": "這份報表顯示哪個廣告活動引導訪客到你的網站。%1$s更多關於廣告活動追蹤的資訊，請閱讀 %2$spiwik.org 上的廣告活動說明文件%3$s，", "ColumnCampaign": "廣告活動", "ColumnSearchEngine": "搜尋引擎", + "ColumnSocial": "社群網站", "ColumnWebsite": "網站", - "ColumnWebsitePage": "網站頁面", + "ColumnWebsitePage": "網站網頁", "DirectEntry": "直接流量", - "Distinct": "推薦連結網站類型的不同參照項目", - "DistinctCampaigns": "不同的廣告活動", - "DistinctKeywords": "不同的關鍵字", - "DistinctSearchEngines": "不同的搜尋引擎", - "DistinctWebsites": "不同的網站", + "DirectEntryDocumentation": "訪客在瀏覽器輸入網址並訪問你的網站，直接進入你的網站。", + "Distinct": "不同類型的參造連結", + "DistinctCampaigns": "不同廣告活動", + "DistinctKeywords": "不同關鍵字", + "DistinctSearchEngines": "不同搜尋引擎", + "DistinctWebsites": "不同網站", + "EvolutionDocumentation": "這是領導訪客到你網站的參照連結總覽。", + "EvolutionDocumentationMoreInfo": "查看更多關於不同參照連結類型的資訊，請見 %s 表格的說明文件。", "Keywords": "關鍵字", - "Referrers": "推薦連結網站", + "KeywordsReportDocumentation": "這份報表顯示當使用者被導入你的網站前是使用什麼關鍵字搜尋。%s點擊表格中的資料列以查看每個搜尋引擎搜尋時所使用的關鍵字。", + "PluginDescription": "報告參照連結資料：搜尋引擎、關鍵字、網站、廣告活動、社群媒體或是直接進入。", + "Referrer": "參照連結", + "ReferrerName": "參照連結名稱", + "Referrers": "參造連結", + "ReferrersOverview": "參照連結總覽", + "ReferrerTypes": "參照連結類型", "SearchEngines": "搜尋引擎", - "SubmenuSearchEngines": "搜尋引擎 & 關鍵字", - "SubmenuWebsites": "網站", - "Type": "推薦連結網站類型", + "SearchEnginesDocumentation": "訪客透過搜尋引擎導向你的網站。%1$s查看 %2$s 報表以取得更多細節。", + "SearchEnginesReportDocumentation": "這份報表顯示哪個搜尋引擎將使用者導入你的網站。%s點擊表格中的資料列即可查看使用者在搜尋引擎中使用什麼關鍵字搜尋。", + "SocialFooterMessage": "這是從左側網站報表中篩選出來的網站，你可以直接比較你來自的社群網站的參照連結。", + "Socials": "社群網站", + "SocialsReportDocumentation": "這份報表顯示哪個社群網站引導訪客到你的網站。<br \/>點擊表格中的資料列以查看訪客從哪個社群網站頁面訪問你的網站。", + "SubmenuSearchEngines": "搜尋引擎和關鍵字", + "SubmenuWebsites": "網站和社群", + "Type": "參造連結類型", "TypeCampaigns": "%s 個來自廣告活動", "TypeDirectEntries": "%s 個來自直接流量", + "TypeReportDocumentation": "這個表格包含參照連結類型分配的資訊。", "TypeSearchEngines": "%s 個來自搜尋引擎", "TypeWebsites": "%s 個來自網站", - "UsingNDistinctUrls": "（使用 %s 個不同的網址）", + "UsingNDistinctUrls": "（使用 %s 個不同網址）", + "ViewAllReferrers": "查看所有參照連結", + "ViewReferrersBy": "查看來自 %s 的參照連結", "Websites": "網站", - "WidgetExternalWebsites": "外部網站清單", - "WidgetSocials": "社交網站清單" + "WebsitesDocumentation": "訪客透過其他網站的連結導向你的網站。%1$s查看 %2$s 報表以取得更多細節。", + "WebsitesReportDocumentation": "在這個表格中你可以看到哪個網站引導訪客到你的網站。%s點擊表格中的資料列以查看哪個網站網址中的連結引導訪客到你的網站。", + "WidgetExternalWebsites": "參造連結網站", + "WidgetGetAll": "所有參照連結", + "WidgetSocials": "社群網站清單", + "WidgetTopKeywordsForPages": "網頁網址的熱門關鍵字", + "XPercentOfVisits": "佔整體訪問 %s" } }
\ No newline at end of file diff --git a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml index 52262c275a..2e94bc64cc 100644 --- a/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml +++ b/plugins/Referrers/tests/System/expected/test_Referrers_getReferrerType__API.getProcessedReport_day.xml @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <website>Piwik test</website> - <prettyDate>January 1 – March 10, 2010</prettyDate> + <prettyDate>January 1 – March 10, 2010</prettyDate> <metadata> <category>Referrers</category> <subcategory>All Referrers</subcategory> @@ -9,7 +9,7 @@ <module>Referrers</module> <action>getReferrerType</action> <dimension>Referrer Type</dimension> - <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> + <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in their browser and started browsing on your website - they entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -55,40 +55,40 @@ <revenue>Revenue</revenue> </columns> <reportData> - <result prettyDate="Friday, January 1, 2010"/> - <result prettyDate="Saturday, January 2, 2010"/> - <result prettyDate="Sunday, January 3, 2010"/> - <result prettyDate="Monday, January 4, 2010"/> - <result prettyDate="Tuesday, January 5, 2010"/> - <result prettyDate="Wednesday, January 6, 2010"/> - <result prettyDate="Thursday, January 7, 2010"/> - <result prettyDate="Friday, January 8, 2010"/> - <result prettyDate="Saturday, January 9, 2010"/> - <result prettyDate="Sunday, January 10, 2010"/> - <result prettyDate="Monday, January 11, 2010"/> - <result prettyDate="Tuesday, January 12, 2010"/> - <result prettyDate="Wednesday, January 13, 2010"/> - <result prettyDate="Thursday, January 14, 2010"/> - <result prettyDate="Friday, January 15, 2010"/> - <result prettyDate="Saturday, January 16, 2010"/> - <result prettyDate="Sunday, January 17, 2010"/> - <result prettyDate="Monday, January 18, 2010"/> - <result prettyDate="Tuesday, January 19, 2010"/> - <result prettyDate="Wednesday, January 20, 2010"/> - <result prettyDate="Thursday, January 21, 2010"/> - <result prettyDate="Friday, January 22, 2010"/> - <result prettyDate="Saturday, January 23, 2010"/> - <result prettyDate="Sunday, January 24, 2010"/> - <result prettyDate="Monday, January 25, 2010"/> - <result prettyDate="Tuesday, January 26, 2010"/> - <result prettyDate="Wednesday, January 27, 2010"/> - <result prettyDate="Thursday, January 28, 2010"/> - <result prettyDate="Friday, January 29, 2010"/> - <result prettyDate="Saturday, January 30, 2010"/> - <result prettyDate="Sunday, January 31, 2010"/> - <result prettyDate="Monday, February 1, 2010"/> - <result prettyDate="Tuesday, February 2, 2010"/> - <result prettyDate="Wednesday, February 3, 2010"/> + <result prettyDate="Friday, January 1, 2010" /> + <result prettyDate="Saturday, January 2, 2010" /> + <result prettyDate="Sunday, January 3, 2010" /> + <result prettyDate="Monday, January 4, 2010" /> + <result prettyDate="Tuesday, January 5, 2010" /> + <result prettyDate="Wednesday, January 6, 2010" /> + <result prettyDate="Thursday, January 7, 2010" /> + <result prettyDate="Friday, January 8, 2010" /> + <result prettyDate="Saturday, January 9, 2010" /> + <result prettyDate="Sunday, January 10, 2010" /> + <result prettyDate="Monday, January 11, 2010" /> + <result prettyDate="Tuesday, January 12, 2010" /> + <result prettyDate="Wednesday, January 13, 2010" /> + <result prettyDate="Thursday, January 14, 2010" /> + <result prettyDate="Friday, January 15, 2010" /> + <result prettyDate="Saturday, January 16, 2010" /> + <result prettyDate="Sunday, January 17, 2010" /> + <result prettyDate="Monday, January 18, 2010" /> + <result prettyDate="Tuesday, January 19, 2010" /> + <result prettyDate="Wednesday, January 20, 2010" /> + <result prettyDate="Thursday, January 21, 2010" /> + <result prettyDate="Friday, January 22, 2010" /> + <result prettyDate="Saturday, January 23, 2010" /> + <result prettyDate="Sunday, January 24, 2010" /> + <result prettyDate="Monday, January 25, 2010" /> + <result prettyDate="Tuesday, January 26, 2010" /> + <result prettyDate="Wednesday, January 27, 2010" /> + <result prettyDate="Thursday, January 28, 2010" /> + <result prettyDate="Friday, January 29, 2010" /> + <result prettyDate="Saturday, January 30, 2010" /> + <result prettyDate="Sunday, January 31, 2010" /> + <result prettyDate="Monday, February 1, 2010" /> + <result prettyDate="Tuesday, February 2, 2010" /> + <result prettyDate="Wednesday, February 3, 2010" /> <result prettyDate="Thursday, February 4, 2010"> <row> <label>Search Engines</label> @@ -833,46 +833,46 @@ <bounce_rate>100%</bounce_rate> </row> </result> - <result prettyDate="Sunday, March 7, 2010"/> - <result prettyDate="Monday, March 8, 2010"/> - <result prettyDate="Tuesday, March 9, 2010"/> - <result prettyDate="Wednesday, March 10, 2010"/> + <result prettyDate="Sunday, March 7, 2010" /> + <result prettyDate="Monday, March 8, 2010" /> + <result prettyDate="Tuesday, March 9, 2010" /> + <result prettyDate="Wednesday, March 10, 2010" /> </reportData> <reportMetadata> - <result prettyDate="Friday, January 1, 2010"/> - <result prettyDate="Saturday, January 2, 2010"/> - <result prettyDate="Sunday, January 3, 2010"/> - <result prettyDate="Monday, January 4, 2010"/> - <result prettyDate="Tuesday, January 5, 2010"/> - <result prettyDate="Wednesday, January 6, 2010"/> - <result prettyDate="Thursday, January 7, 2010"/> - <result prettyDate="Friday, January 8, 2010"/> - <result prettyDate="Saturday, January 9, 2010"/> - <result prettyDate="Sunday, January 10, 2010"/> - <result prettyDate="Monday, January 11, 2010"/> - <result prettyDate="Tuesday, January 12, 2010"/> - <result prettyDate="Wednesday, January 13, 2010"/> - <result prettyDate="Thursday, January 14, 2010"/> - <result prettyDate="Friday, January 15, 2010"/> - <result prettyDate="Saturday, January 16, 2010"/> - <result prettyDate="Sunday, January 17, 2010"/> - <result prettyDate="Monday, January 18, 2010"/> - <result prettyDate="Tuesday, January 19, 2010"/> - <result prettyDate="Wednesday, January 20, 2010"/> - <result prettyDate="Thursday, January 21, 2010"/> - <result prettyDate="Friday, January 22, 2010"/> - <result prettyDate="Saturday, January 23, 2010"/> - <result prettyDate="Sunday, January 24, 2010"/> - <result prettyDate="Monday, January 25, 2010"/> - <result prettyDate="Tuesday, January 26, 2010"/> - <result prettyDate="Wednesday, January 27, 2010"/> - <result prettyDate="Thursday, January 28, 2010"/> - <result prettyDate="Friday, January 29, 2010"/> - <result prettyDate="Saturday, January 30, 2010"/> - <result prettyDate="Sunday, January 31, 2010"/> - <result prettyDate="Monday, February 1, 2010"/> - <result prettyDate="Tuesday, February 2, 2010"/> - <result prettyDate="Wednesday, February 3, 2010"/> + <result prettyDate="Friday, January 1, 2010" /> + <result prettyDate="Saturday, January 2, 2010" /> + <result prettyDate="Sunday, January 3, 2010" /> + <result prettyDate="Monday, January 4, 2010" /> + <result prettyDate="Tuesday, January 5, 2010" /> + <result prettyDate="Wednesday, January 6, 2010" /> + <result prettyDate="Thursday, January 7, 2010" /> + <result prettyDate="Friday, January 8, 2010" /> + <result prettyDate="Saturday, January 9, 2010" /> + <result prettyDate="Sunday, January 10, 2010" /> + <result prettyDate="Monday, January 11, 2010" /> + <result prettyDate="Tuesday, January 12, 2010" /> + <result prettyDate="Wednesday, January 13, 2010" /> + <result prettyDate="Thursday, January 14, 2010" /> + <result prettyDate="Friday, January 15, 2010" /> + <result prettyDate="Saturday, January 16, 2010" /> + <result prettyDate="Sunday, January 17, 2010" /> + <result prettyDate="Monday, January 18, 2010" /> + <result prettyDate="Tuesday, January 19, 2010" /> + <result prettyDate="Wednesday, January 20, 2010" /> + <result prettyDate="Thursday, January 21, 2010" /> + <result prettyDate="Friday, January 22, 2010" /> + <result prettyDate="Saturday, January 23, 2010" /> + <result prettyDate="Sunday, January 24, 2010" /> + <result prettyDate="Monday, January 25, 2010" /> + <result prettyDate="Tuesday, January 26, 2010" /> + <result prettyDate="Wednesday, January 27, 2010" /> + <result prettyDate="Thursday, January 28, 2010" /> + <result prettyDate="Friday, January 29, 2010" /> + <result prettyDate="Saturday, January 30, 2010" /> + <result prettyDate="Sunday, January 31, 2010" /> + <result prettyDate="Monday, February 1, 2010" /> + <result prettyDate="Tuesday, February 2, 2010" /> + <result prettyDate="Wednesday, February 3, 2010" /> <result prettyDate="Thursday, February 4, 2010"> <row> <segment>referrerType==search</segment> diff --git a/plugins/Resolution/lang/zh-tw.json b/plugins/Resolution/lang/zh-tw.json index 99d5cfd5d9..057a8394a3 100644 --- a/plugins/Resolution/lang/zh-tw.json +++ b/plugins/Resolution/lang/zh-tw.json @@ -1,12 +1,12 @@ { "Resolution": { - "ColumnConfiguration": "客戶端配置", + "ColumnConfiguration": "裝置配置", "ColumnResolution": "解析度", - "Configurations": "客戶端配置", - "PluginDescription": "顯示你的訪客的螢幕解析度。", + "Configurations": "裝置配置", + "PluginDescription": "顯示訪客的螢幕解析度。", "Resolutions": "解析度", - "WidgetGlobalVisitors": "全域訪客配置", - "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。", - "WidgetResolutions": "畫面解析度" + "WidgetGlobalVisitors": "訪客裝置配置", + "WidgetGlobalVisitorsDocumentation": "此報表顯示訪客中最常見的裝置配置。裝置配置包含作業系統、瀏覽器以及螢幕解析度。", + "WidgetResolutions": "螢幕解析度" } }
\ No newline at end of file diff --git a/plugins/SEO/lang/zh-tw.json b/plugins/SEO/lang/zh-tw.json index 8768d188df..08e1a3a2be 100644 --- a/plugins/SEO/lang/zh-tw.json +++ b/plugins/SEO/lang/zh-tw.json @@ -1,9 +1,13 @@ { "SEO": { + "PluginDescription": "此外掛提取和顯示 SEO 數據：目前網站的 Alexa 排名、Google Pagerank、收錄的頁面數量和反向連結。", "AlexaRank": "Alexa 排名", - "DomainAge": "網域名稱年齡", - "Rank": "評比", - "SeoRankings": "SEO 評比", - "SEORankingsFor": "%s 的 SEO 評比" + "Bing_IndexedPages": "Bing 收錄頁面", + "Dmoz": "DMOZ 條目", + "DomainAge": "網域年齡", + "Google_IndexedPages": "Google 收錄頁面", + "Rank": "評級", + "SeoRankings": "SEO 評級", + "SEORankingsFor": "%s 的 SEO 評級" } }
\ No newline at end of file diff --git a/plugins/ScheduledReports/ScheduledReports.php b/plugins/ScheduledReports/ScheduledReports.php index b85bbb7621..60d7d4fa08 100644 --- a/plugins/ScheduledReports/ScheduledReports.php +++ b/plugins/ScheduledReports/ScheduledReports.php @@ -64,7 +64,7 @@ class ScheduledReports extends \Piwik\Plugin private static $managedReportFormats = array( ReportRenderer::HTML_FORMAT => 'plugins/Morpheus/images/html_icon.png', - ReportRenderer::PDF_FORMAT => 'plugins/DevicePlugins/images/plugins/pdf.gif', + ReportRenderer::PDF_FORMAT => 'plugins/DevicePlugins/images/plugins/pdf.png', ReportRenderer::CSV_FORMAT => 'plugins/Morpheus/images/export.png', ); diff --git a/plugins/ScheduledReports/lang/zh-tw.json b/plugins/ScheduledReports/lang/zh-tw.json index 7b06405f96..b317519616 100644 --- a/plugins/ScheduledReports/lang/zh-tw.json +++ b/plugins/ScheduledReports/lang/zh-tw.json @@ -3,14 +3,14 @@ "AggregateReportsFormat": "顯示選項", "AggregateReportsFormat_GraphsOnly": "只顯示圖表（不顯示表格）", "AggregateReportsFormat_TablesAndGraphs": "顯示報表中所有表格及圖表", - "AggregateReportsFormat_TablesOnly": "[預設] 顯示報表表格（僅關鍵指標有圖表）", + "AggregateReportsFormat_TablesOnly": "[預設] 顯示報表表格（僅關鍵數據有圖表）", "AlsoSendReportToTheseEmails": "也將報表寄到這些電子郵件（一行一個信箱）：", "AreYouSureDeleteReport": "你確定要刪除這份報表及排程？", "CancelAndReturnToReports": "取消並%1$s返回報表列表%2$s", "CreateAndScheduleReport": "建立並排程報表", "CreateReport": "建立報表", "CustomVisitorSegment": "自定訪客區隔：", - "DescriptionOnFirstPage": "報表描述將會顯示在報表的第一頁中。", + "DescriptionOnFirstPage": "報表說明將會顯示在報表的第一頁中。", "DisplayFormat_TablesOnly": "只顯示表格（不顯示圖表）", "EmailHello": "你好，", "EmailReports": "報表信件", @@ -21,7 +21,7 @@ "MonthlyScheduleHelp": "每月排程：報表將會在每月的第一天寄送。", "MustBeLoggedIn": "你必須登入以建立或排程自定報表。", "NoRecipients": "這份報表沒有收件人", - "Pagination": "%2$s 頁中的第 %1$s 頁", + "Pagination": "第 %1$s 頁，共 %2$s 頁", "PiwikReports": "Piwik 報表", "PleaseFindAttachedFile": "請從附件檔中確認你 %2$s 的 %1$s。", "SentFromX": "寄送自 %s。", @@ -30,7 +30,7 @@ "ReportFormat": "報表格式", "ReportHour": "於 %s 點寄送報表", "ReportHourWithUTC": "UTC 時間 %s 點", - "ReportIncludeNWebsites": "報表將包含所有至少含有 1 次訪問的網站中的主要指標（目前有 %s 個網站可用）。", + "ReportIncludeNWebsites": "報表將包含所有至少含有 1 次訪問網站中的主要數據（目前有 %s 個網站可用）。", "ReportSent": "報表已寄送", "ReportsIncluded": "包含數據", "ReportType": "寄送報表經由", diff --git a/plugins/SegmentEditor/lang/tl.json b/plugins/SegmentEditor/lang/tl.json index 7933c0fe3a..bf97457292 100644 --- a/plugins/SegmentEditor/lang/tl.json +++ b/plugins/SegmentEditor/lang/tl.json @@ -15,6 +15,7 @@ "SaveAndApply": "I-save at I-apply", "SegmentDisplayedThisWebsiteOnly": "ang website na ito lamang", "SegmentNotApplied": "Hindi nai-apply ang Segment '%s'", + "SegmentNotAppliedMessage": "Ikaw ay humihiling ng data para sa Custom Segment '%s' Ang kasalukuyang configuration ng Piwik ay pinipigilan ang real time processing na ulat para hindi maapektuhan ang performance nito", "ThisSegmentIsVisibleTo": "Ang segment na ito ay makikita sa:", "VisibleToAllUsers": "lahat ng mga user", "VisibleToMe": "ako", diff --git a/plugins/SegmentEditor/lang/zh-tw.json b/plugins/SegmentEditor/lang/zh-tw.json index 2f075dbb97..70009d187e 100644 --- a/plugins/SegmentEditor/lang/zh-tw.json +++ b/plugins/SegmentEditor/lang/zh-tw.json @@ -1,9 +1,41 @@ { "SegmentEditor": { + "PluginDescription": "使用區隔編輯器建立並重新使用自定訪客區隔。", + "AddANDorORCondition": "增加【%s】條件", "AddNewSegment": "新增區隔", + "AreYouSureDeleteSegment": "你確定要刪除這個區隔？", + "AutoArchivePreProcessed": "預先處理區隔的報表（較快，需要排程）", + "AutoArchiveRealTime": "即時處理區隔的報表", + "ChangingSegmentDefinitionConfirmationNotProcessedOnRequest": "你將要修改區隔的定義。你這個新區隔的分析報表將在重新處理後才能使用，可能會花上幾個小時報表資料才會顯示。確定要繼續嗎？", + "ChangingSegmentDefinitionConfirmationProcessedOnRequest": "你將要修改區隔的定義。你這個新區隔的分析報表將在下次請求時重新處理。可能會花上幾分鐘才會顯示。確定要繼續嗎？", "ChooseASegment": "選擇區隔", "CurrentlySelectedSegment": "目前選擇的區隔為：%s", - "DefaultAllVisits": "所有流量", - "SelectSegmentOfVisits": "選擇區隔：" + "DataAvailableAtLaterDate": "你區隔的分析報表稍後將可用。造成不便請見諒。", + "DefaultAllVisits": "所有訪問", + "DragDropCondition": "拖放條件", + "HideMessageInFuture": "未來隱藏此訊息", + "LoadingSegmentedDataMayTakeSomeTime": "處理區隔的訪客資料需要花上一些時間...", + "OperatorAND": "並且", + "OperatorOR": "或者", + "SaveAndApply": "保存並套用", + "SegmentDisplayedAllWebsites": "所有網站", + "SegmentDisplayedThisWebsiteOnly": "只有這個網站", + "SegmentIsDisplayedForWebsite": "也處理", + "SegmentNotApplied": "未套用區隔「%s」", + "SegmentNotAppliedMessage": "你正在請求自訂區隔「%s」的資料，它目前在 Piwik 的設置因性能因素不會即時處理報表。", + "SelectSegmentOfVisits": "選擇區隔：", + "ThisSegmentIsVisibleTo": "這個區隔分享給", + "VisibleToAllUsers": "所有使用者", + "VisibleToMe": "只有我", + "YouMayChangeSetting": "或者你可以在設定檔（%1$s）中改變此設定，或編輯這個區隔並選擇「%2$s」。", + "VisibleToSuperUser": "你可見因為你有超級使用者權限", + "SharedWithYou": "和你分享", + "YouMustBeLoggedInToCreateSegments": "你必須登入以建立或編輯訪客區隔。", + "YouDontHaveAccessToCreateSegments": "你沒有建立或編輯區隔的權限。", + "AddingSegmentForAllWebsitesDisabled": "為所有網站新增區隔已停用。", + "SegmentXIsAUnionOf": "%s 是這些區隔的聯合：", + "CustomSegment": "自訂區隔", + "SegmentOperatorIsNullOrEmpty": "是無效或空值", + "SegmentOperatorIsNotNullNorEmpty": "不是無效或空值" } }
\ No newline at end of file diff --git a/plugins/SitesManager/lang/tl.json b/plugins/SitesManager/lang/tl.json index c9e2419d0e..56a5568a86 100644 --- a/plugins/SitesManager/lang/tl.json +++ b/plugins/SitesManager/lang/tl.json @@ -36,6 +36,7 @@ "HelpExcludedIps": "Ipasok ang mga listahan ng IP isa bawat linya na gusto mong ibukod mula pagsusubay-bay ng Piwik. Maa-ari kang gumamit ng mga wildcard hal. %1$s o %2$s", "JsTrackingTagHelp": "Narito ang JavaScript Tracking code upang isama sa lahat ng iyong pahina", "KeepURLFragments": "Pag track sa mga fragments ng pahina ng URL", + "KeepURLFragmentsHelp": "Kung ang checkbox sa ibaba ay naka-uncheck Page URL fragments (lahat pagkatapos ng %1$s) ay aalisin kapag itoy nakita: %2$s ay susubaybayan bilang %3$s", "KeepURLFragmentsHelp2": "Maaari mo ring i-override ang setting na ito para sa indibidwal na mga website sa itaas.", "KeepURLFragmentsLong": "Panatilihin ang mga detalye ng Page URL kapag naghahanap ng mga Page URL", "ListOfIpsToBeExcludedOnAllWebsites": "Ang IP sa ibaba ay hindi isasama sa sinusubaybayan sa lahat ng mga website.", diff --git a/plugins/SitesManager/lang/zh-tw.json b/plugins/SitesManager/lang/zh-tw.json index b651e05ff2..c6b0322fb8 100644 --- a/plugins/SitesManager/lang/zh-tw.json +++ b/plugins/SitesManager/lang/zh-tw.json @@ -1,16 +1,23 @@ { "SitesManager": { "AddSite": "新增網站", - "AdvancedTimezoneSupportNotFound": "在你的 PHP 找不到進階時區支援功能（PHP>=5.2 支援）。你還是可以手動選擇 UTC。", - "AliasUrlHelp": "推薦，但不是必要的，定義一些你的訪客進入此網站時可能的網址，一行一個。網站的網址別名將不會顯示在推薦連結 > 網站報表裡。注意 Piwik 能兼顧包含及不包含「www」的網址。", + "AddMeasurable": "新增測量", + "AdvancedTimezoneSupportNotFound": "在你的 PHP 找不到進階時區支援（PHP>=5.2 支援）。你還是可以手動選擇 UTC 時區。", + "AliasUrlHelp": "推薦，但不是必要的，指定一些你的訪客進入此網站時可能的網址，一行一個。網站的網址別名將不會顯示在參造連結 > 網站報表裡。注意 Piwik 能兼顧包含及不包含「www」的網址。", "ChangingYourTimezoneWillOnlyAffectDataForward": "變更時區僅會影響往後的數據，不會溯及既往。", "ChooseCityInSameTimezoneAsYou": "選擇與你目前時區相同的城市。", "Currency": "貨幣", - "CurrencySymbolWillBeUsedForGoals": "貨幣符號旁將顯示目標收益。", + "CurrencySymbolWillBeUsedForGoals": "貨幣符號將顯示於目標收益旁。", "DefaultCurrencyForNewWebsites": "新網站預設貨幣", "DefaultTimezoneForNewWebsites": "新網站預設時區", "DeleteConfirm": "你確定要刪除網站 %s 嗎？", - "ExceptionDeleteSite": "不可能刪除這個網站，因為它是唯一註冊的網站。請先增加新的網站，然後在刪除它。", + "DisableSiteSearch": "不要追蹤站內搜尋", + "EcommerceHelp": "啟用後，「目標」報表將會有個「電子商務」區塊。", + "EnableEcommerce": "啟用電子商務", + "EnableSiteSearch": "站內搜尋追蹤已啟用", + "EnableSiteSpecificUserAgentExclude": "啟用特定 User Agent 排除。", + "EnableSiteSpecificUserAgentExclude_Help": "如果你需要在不同網站中排除不同 User Agent，請勾選，點擊保存並%1$s在上方加入User Agent %2$s。", + "ExceptionDeleteSite": "無法刪除此網站，因為它是唯一註冊的網站。請先增加新的網站後再刪除它。", "ExceptionEmptyName": "網站名稱不可為空。", "ExceptionInvalidCurrency": "貨幣「%1$s」無效。請輸入正確的貨幣符號（例如 %2$s）", "ExceptionInvalidIPFormat": "欲排除的 IP「%1$s」不符合有效的 IP 格式（例如 %2$s）。", @@ -19,28 +26,66 @@ "ExceptionNoUrl": "你必須至少為此網站指定一個 URL 網址。", "ExcludedIps": "排除 IP", "ExcludedParameters": "排除參數", + "ExcludedUserAgents": "排除 User Agent", + "GlobalExcludedUserAgentHelp1": "輸入要被 Piwik 排除追蹤的 User Agent 列表。", + "GlobalExcludedUserAgentHelp2": "你可以將此功能用來排除一些網路爬蟲。", "GlobalListExcludedIps": "全域排除的 IP 列表", "GlobalListExcludedQueryParameters": "全域排除的參數列表", + "GlobalListExcludedUserAgents": "全域 User Agent 排除列表", + "GlobalListExcludedUserAgents_Desc": "如果訪客的 User Agent 字串中包含任一你指定的字串，該訪客會被 Piwik 排除。", + "GlobalSettings": "全域設定", "GlobalWebsitesSettings": "全域網站設定", "HelpExcludedIps": "輸入 IP 列表，一行一個，使 Piwik 不追蹤特定 IP 位址。你也可以使用萬用字元，例如 %1$s 或 %2$s", - "JsTrackingTagHelp": "這是插入所有頁面的 JavaScript 追蹤原始碼", - "ListOfIpsToBeExcludedOnAllWebsites": "以下的 IP 位址將會被所有網站忽略。", - "ListOfQueryParametersToBeExcludedOnAllWebsites": "以下的網址查詢參數將會被所有網站忽略。", - "MainDescription": "你的網站分析報告需要網站！新增、更新、刪除網站，並顯示 JavaScript 追蹤程式碼以供插入在你的網頁之中。", + "JsTrackingTagHelp": "這是插入所有網頁的 JavaScript 追蹤程式碼", + "KeepURLFragments": "追蹤網頁 URL 片段", + "KeepURLFragmentsHelp": "如果未勾選下方核取方塊，網頁片段（所有在 %1$s 後面的）將會在追蹤時被移除：%2$s 將只會追蹤 %3$s", + "KeepURLFragmentsHelp2": "你也可以從個別的網站設定中覆蓋此設定。", + "KeepURLFragmentsLong": "追蹤網頁 URL 時保留網頁 URL 片段", + "ListOfIpsToBeExcludedOnAllWebsites": "以下的 IP 位址將會被所有網站排除。", + "ListOfQueryParametersToBeExcludedOnAllWebsites": "以下的網址查詢參數將會被所有網站排除。", + "ListOfQueryParametersToExclude": "輸入 URL 查詢參數列表，一行一個，將從網頁網址報表中被排除。支援正規表示式如 %s。", + "MainDescription": "你的網站分析報告需要網站！新增、更新或刪除網站，並顯示 JavaScript 追蹤程式碼插入在你的網頁之中。", + "MenuManage": "管理", + "NotAnEcommerceSite": "非電子商務網站", "NotFound": "找不到網站", "NoWebsites": "你沒有任何網站可以管理。", + "OnlyOneSiteAtTime": "你一次只能編輯一個網站。請先保存或取消你目前對網站 %s 的變更。", + "PiwikOffersEcommerceAnalytics": "Piwik 允許進階電子商務追蹤分析和報告。查看更多關於%1$s電子商務分析%2$s。", "PiwikWillAutomaticallyExcludeCommonSessionParameters": "Piwik 將會自動排除常見的 session 參數（%s）。", - "SelectACity": "選擇一個城市", + "PluginDescription": "網站管理讓你可以新增網站或編輯現有的網站。", + "SearchCategoryDesc": "Piwik 也可以為站內搜尋關鍵字追蹤搜尋分類。", + "SearchCategoryLabel": "分類參數", + "SearchCategoryParametersDesc": "你可以輸入以半形逗號區隔的搜尋分類查詢參數列表。", + "SearchKeywordLabel": "查詢參數", + "SearchKeywordParametersDesc": "輸入以半形逗號區隔的站內搜尋所有查詢參數關鍵字列表。", + "SearchParametersNote": "注意：查詢參數和和分類參數將只會使用於有啟用站內搜尋但是這些選項留空的網站。", + "SearchParametersNote2": "要讓新網站停用站內搜尋，請將這兩項留空。", + "SearchUseDefault": "使用%1$s預設的%2$s站內搜尋參數", + "SelectACity": "選擇城市", "SelectDefaultCurrency": "你可以為新的網站選擇預設的貨幣。", "SelectDefaultTimezone": "你可以為新的網站選擇預設的時區。", - "ShowTrackingTag": "顯示追蹤程式碼", + "ShowTrackingTag": "查看追蹤程式碼", "Sites": "網站", + "SiteSearchUse": "你可以使用 Piwik 來追蹤並報告訪客在你網站內的搜尋引擎中搜尋了什麼。", + "SiteWithoutDataTitle": "還沒有紀錄到資料", + "SiteWithoutDataDescription": "這個網站還沒有追蹤分析資料。", + "SiteWithoutDataSetupTracking": "請在你的網站中放置 %1$sJavaScript 追蹤程式碼%2$s。", + "SiteWithoutDataMessageDisappears": "此訊息將會在這個網站開始收集到追蹤資料時隱藏。", + "SiteWithoutDataSetupGoals": "同時，你也可能想要%1$s設定一些目標%2$s。", + "SuperUserAccessCan": "一個擁有超級使用者權限的使用者也可以為新網站%1$s指定全域設定%2$s。", "Timezone": "時區", + "TrackingSiteSearch": "追蹤站內搜尋", "TrackingTags": "%s 的追蹤程式碼", - "Urls": "URL 位址", + "Urls": "URL 網址", "Type": "類型", "UTCTimeIs": "UTC 時間是 %s。", + "OnlyMatchedUrlsAllowed": "只追蹤發生在以上 URL 上的訪問和活動。", + "OnlyMatchedUrlsAllowedHelp": "當啟用時，Piwik 只會在網站 URL 為你所設定之一時追蹤動作。這可以預防其他人在其他網站中濫用你的分析程式碼。", + "OnlyMatchedUrlsAllowedHelpExamples": "域名和路徑必須完全相符，不同的子域名必須分別列出。例如 URL 網址為「http:\/\/example.com\/path」和「http:\/\/good.example.com」，來自「http:\/\/example.com\/otherpath」和「http:\/\/bad.example.com」的追蹤請求將會被忽略。", "WebsitesManagement": "網站管理", + "XManagement": "管理 %s", + "ChooseMeasurableTypeHeadline": "你想要測量什麼？", + "YouCurrentlyHaveAccessToNWebsites": "你目前有權限存取 %s 個網站。", "YourCurrentIpAddressIs": "你目前的 IP 位址是 %s" } }
\ No newline at end of file diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject 18cc00ffc21916ebcd70e92b1b3416eecdab8b3 +Subproject 5168b3011904cfe379166ccdd1a8ab550f5c023 diff --git a/plugins/Transitions/lang/zh-tw.json b/plugins/Transitions/lang/zh-tw.json new file mode 100644 index 0000000000..9e73f1d78b --- /dev/null +++ b/plugins/Transitions/lang/zh-tw.json @@ -0,0 +1,31 @@ +{ + "Transitions": { + "BouncesInline": "%s 跳出", + "DirectEntries": "直接流量", + "ErrorBack": "返回上一個動作", + "ExitsInline": "%s 個離開數", + "NumPageviews": "%s 次瀏覽數", + "NumDownloads": "%s 次下載數", + "NumOutlinks": "%s 個離開連結", + "FromCampaigns": "來自廣告活動", + "FromPreviousPages": "來自站內網頁", + "FromPreviousPagesInline": "%s 來自站內網頁", + "FromPreviousSiteSearches": "來自站內搜尋", + "FromPreviousSiteSearchesInline": "%s 來自站內搜尋", + "FromSearchEngines": "來自搜尋引擎", + "FromWebsites": "來自網站", + "IncomingTraffic": "進站流量", + "LoopsInline": "%s 次頁面重整", + "NoDataForAction": "%s 中沒有資料", + "NoDataForActionDetails": "活動在所選的期間內沒有瀏覽數%s或是無效。", + "OutgoingTraffic": "離站流量", + "PluginDescription": "在行為流程報表中查看訪客在每個網頁網址中的上一步和下一步動作，可以點擊動作報表中的圖示來檢視。", + "ShareOfAllPageviews": "此網頁有 %1$s 個瀏覽數（%2$s 總瀏覽數）", + "ToFollowingPages": "進入站內頁面", + "ToFollowingPagesInline": "%s 進入站內頁面", + "ToFollowingSiteSearches": "站內搜尋", + "ToFollowingSiteSearchesInline": "%s 站內搜尋", + "XOfAllPageviews": "此網頁所有訪問中的 %s", + "XOutOfYVisits": "%2$s 中的 %1$s" + } +}
\ No newline at end of file diff --git a/plugins/UserCountry/lang/tl.json b/plugins/UserCountry/lang/tl.json index 972289b4fa..e8d66957f6 100644 --- a/plugins/UserCountry/lang/tl.json +++ b/plugins/UserCountry/lang/tl.json @@ -3,6 +3,7 @@ "AssumingNonApache": "Hindi mahanap ang apache_get_modules function sa pag-aakala na hindi Apache webserver.", "CannotFindGeoIPDatabaseInArchive": "Hindi mahanap ang file na %1$s sa %2$s!", "CannotFindGeoIPServerVar": "Ang %s variable ay hindi naka-set. Ang iyong server ay maaaring hindi naka-configure nang tama.", + "CannotFindPeclGeoIPDb": "Hindi mahanap ang bansa rehiyon o lungsod sa database para sa GeopIP PECL module. Tiyakin na ang iyong GeoIP database ay makikita sa %1$s at may pangalang %2$s o %3$s o di kaya ang PECL module ay hindi napansin ito.", "CannotListContent": "Hindi ma-ilista ang nilalaman para sa %1$s: %2$s.", "CannotLocalizeLocalIP": "Ang IP address %s ay isang lokal na address at hindi maaaring i-geolocated.", "CannotSetupGeoIPAutoUpdating": "Ito ay magmumukhang paglalagay ng iyong GeoIP databases sa labas ng Piwik(maari nating sabihin dahil walang databases sa misc subdirectory ngunit ang iyong GeoIP ay gumagana). Hindi maaaring awtomatikong i-update ang iyong mga Piwik GeoIP database kung ito ay nakalagay sa labas ng direktoryo Misc.", @@ -17,6 +18,7 @@ "country_o1": "Iba pang mga bansa", "CurrentLocationIntro": "Ayon sa provider ang iyong kasalukuyang lokasyon ay", "DefaultLocationProviderDesc1": "Ang default na lokasyon ng provider na humu-hula sa mga bansa ng bumibisita batay sa wika na ginagamit nila.", + "DefaultLocationProviderDesc2": "Ito ay hindi ganun ka tiyak kaya aming %1$snirerekomenda na mag install at gumamit ng %2$sGeoIP%3$s.%4$s", "DefaultLocationProviderExplanation": "Iyong ginagamit ang default location provider na nangangahulugan na ang Piwik ay huhulaan ang lokasyon ng iyong bisita base sa wika na kanilang ginagamit. %1$sRead this%2$s upang malaman panu e-setup na may tamang geolocation.", "DistinctCountries": "natatanging mga bansa %s", "DownloadingDb": "Downloading %s", @@ -74,10 +76,12 @@ "Organization": "Organisasyon", "OrgDatabase": "Organisasyon ng Database", "PeclGeoIPNoDBDir": "Ang PECL module ay naghahanap ng databases sa %1$s Pero ang directory na ito ay wala. Mangyaring gawin ito at e-dagdag ang GeopIP databases dito. Bukod dito maari kang magtakda ng %2$s sa tamang directory sa iyong php.ini file", + "PeclGeoLiteError": "Ang iyong GeoIP database sa %1$s ay may pangalang %2$s. Sa kasamaang palad ang PECL module ay hindi ito kinikila sa ganitong pangalan. Mangyarin ito ay baguhin sa %3$s", "PiwikNotManagingGeoIPDBs": "Ang Piwik ay kasalukuyang di namamahala ng anumang GeoIP database", "Region": "Rehiyon", "SetupAutomaticUpdatesOfGeoIP": "I-set-up ang awtomatikong update ng mga database ng GeoIP", "SubmenuLocations": "Mga Lokasyon", + "TestIPLocatorFailed": "Susubukan ng Piwik ang tignan ang lokasyon ng hindi nakikilalang IP address (%1$s) Ngunit ang iyong server ay may ibinalik na %2$s. Kung ang iyong provider ay tama ang pagkaka configure ito ay magbabalik ng %3$s", "ThisUrlIsNotAValidGeoIPDB": "Ang mga na download na file ay hindi tamang GeoIP database. Mang-yaring e-check muli ang URL o i-download muli ang file ng mano-mano.", "ToGeolocateOldVisits": "Upang makakuha ng data ng lokasyon para sa iyong lumang mga pagbisita gamitin ang script na inilarawan %1$shere%2$s.", "UnsupportedArchiveType": "Nakatagpo ng hindi suportadong klase ng archive %1$s", diff --git a/plugins/UserCountry/lang/zh-tw.json b/plugins/UserCountry/lang/zh-tw.json index 2e6112a5d9..a22da7350d 100644 --- a/plugins/UserCountry/lang/zh-tw.json +++ b/plugins/UserCountry/lang/zh-tw.json @@ -24,9 +24,12 @@ "DistinctCountries": "%s 個不同的國家", "DownloadingDb": "正在下載 %s", "DownloadNewDatabasesEvery": "更新資料庫每隔一", + "FatalErrorDuringDownload": "下載此檔案時發生嚴重錯誤。可能是你的網路在連線你下載的 GeoIP 資料庫或 Piwik 時出了問題。試著手動下載並安裝。", "FoundApacheModules": "Piwik 找到下列 Apache 模組", "FromDifferentCities": "不同城市", + "GeoIPCannotFindMbstringExtension": "找不到 %1$s 功能。請確定擴充功能 %2$s 已經安裝並載入。", "GeoIPDatabases": "GeoIP 資料庫", + "GeoIPDocumentationSuffix": "要查看此報表的數據，你必須先在管理後台中的地理位置設定 GeoIP 。商用的 %1$sMaxmind%2$s GeoIP 資料庫比免費的還來的精準。點擊%3$s這裡%4$s看看他們多準確。", "GeoIPImplHasAccessTo": "這個 GeoIP 執行時會存取以下類型的資料庫", "GeoIPIncorrectDatabaseFormat": "你的 GeoIP 資料庫看起來不是正確的格式。它可能損壞了。請確定你正在使用二進制版本並試著使用其他副本覆蓋。", "GeoIpLocationProviderDesc_Pecl1": "這個地理位置供應商使用 GeoIP 資料庫和 PECL 模組來精準而且有效率的判別訪客位置。", @@ -36,25 +39,60 @@ "GeoIpLocationProviderDesc_ServerBased1": "這個地理位置供應商使用安裝在你 HTTP 伺服器上的 GeoIP 模組。這個供應商快又精準，但是%1$s只適用於一般瀏覽器上的追蹤%2$s。", "GeoIpLocationProviderDesc_ServerBased2": "如果你需要匯入紀錄檔或是其他需要設定 IP 位址的事情，使用%1$sPECL GeoIP（推薦）%2$s或是%3$sPHP GeoIP%4$s執行。", "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "注意：IP 匿名化在此供應商所提供的位置中沒有任何效果。在 IP 匿名化開啟時，請先確定這並不違反法律政策。", + "GeoIpLocationProviderNotRecomnended": "地理位置已執行，但你不是使用推薦的供應商。", "GeoIPNoServerVars": "Piwik 找不到任何 GeoIP 的 %s 變數。", "GeoIPPeclCustomDirNotSet": "PHP ini 中的 %s 選項未設定。", "GeoIPServerVarsFound": "Piwik 偵測到下列 GeoIP 的 %s 變數", + "GeoIPUpdaterInstructions": "在下方輸入你的資料庫下載連結。如果你已經從 %3$sMaxMind%4$s 購買了資料庫，你可以在%1$s這裡%2$s找到這些連結。在存取過程發生問題時請聯絡%3$sMaxMind%4$s。", + "GeoIPUpdaterIntro": "Piwik 目前管理以下 GeoIP 資料庫的更新", + "GeoLiteCityLink": "如果你是使用 GeoLite City 資料庫，使用此連結：%1$s%2$s%3$s", "Geolocation": "地理位置", "GeolocationPageDesc": "你可以在此頁面中改變 Piwik 決定訪客位置的方式。", + "getCityDocumentation": "這份報表顯示你的訪客在瀏覽網站時所位於的城市。", + "getContinentDocumentation": "這份報表顯示你的訪客在瀏覽網站時所位於的洲別。", + "getCountryDocumentation": "這份報表顯示你的訪客在瀏覽網站時所位於的國家。", + "getRegionDocumentation": "這份報表顯示你的訪客在瀏覽網站時所位於的地區。", "HowToInstallApacheModule": "我該如何在 Apache 上安裝 GeoIP 模組？", "HowToInstallGeoIPDatabases": "我該如何取得 GeoIP 資料庫？", "HowToInstallGeoIpPecl": "我該如何安裝 GeoIP PECL 擴充功能？", "HowToInstallNginxModule": "我該如何在 Nginx 上安裝 GeoIP 模組？", "HowToSetupGeoIP": "如何安裝 GeoIP 達到精準地理位置", + "HowToSetupGeoIP_Step1": "從 %3$sMaxMind%4$s 中%1$s下載%2$s GeoLite City 資料庫。", + "HowToSetupGeoIP_Step2": "解壓縮此檔案然後複製解壓後的檔案，%1$s 放進 Piwik 內的 %2$smisc%3$s 資料夾（可以透過 FTP 或 SSH 來執行）。", + "HowToSetupGeoIP_Step3": "重新整理此頁。現在準備%3$s安裝%4$s%1$sGeoIP（PHP）%2$s 供應商。選擇它。", + "HowToSetupGeoIP_Step4": "你完成了！你已經成功在 Piwik 上設定 GeoIP，這代表你已經可以準確的看見你訪客的地區和城市等國家資訊。", + "HowToSetupGeoIPIntro": "看起來你沒有設定準確的地理位置。這是個實用的功能，沒有它你將無法看到準確且完整的訪客資訊。這裡是幾個你可以快速開始使用的方法：", "HttpServerModule": "HTTP 伺服器模組", - "ISPDatabase": "ISP 資料庫", + "InvalidGeoIPUpdatePeriod": "無效的 GeoIP 更新期間：%1$s。有效值為 %2$s。", + "IPurchasedGeoIPDBs": "我購買了%1$sMaxMind 的精準資料庫%2$s而且想要設定自動更新。", + "ISPDatabase": "網路服務供應商（ISP）資料庫", + "IWantToDownloadFreeGeoIP": "我要下載免費的 GeoIP 資料庫...", "Latitude": "緯度", "Location": "位置", - "LocationDatabase": "位置資料庫", + "LocationDatabase": "地理位置資料庫", + "LocationDatabaseHint": "地理位置資料庫可能是國家、地區或城市資料庫。", "LocationProvider": "地理位置供應商", "Longitude": "經度", + "NoDataForGeoIPReport1": "這份報表沒有任何數據因為沒有位置數據可用或是 IP 位址無法被定位。", + "NoDataForGeoIPReport2": "%1$s在這裡%2$s變更設定並使用%3$s城市等級資料庫%4$s來啟用精準地理位置。", + "Organization": "機構", + "OrgDatabase": "機構資料庫", + "PeclGeoIPNoDBDir": "PECL 模組正在尋找 %1$s 裡的資料庫，但這個資料夾不存在。請建立並將 GeoIP 資料庫放進去。或者可以在 php.ini 中將 %2$s 設定成正確的資料夾。", + "PeclGeoLiteError": "你在 %1$s 中的 GeoIP 資料庫命名為 %2$s。很遺憾的 PECL 模組並不能辨認這個名稱。請將它重新命名為 %3$s。", + "PiwikNotManagingGeoIPDBs": "Piwik 目前沒有管理任何 GeoIP 資料庫。", + "PluginDescription": "報告你訪客的位置：國家、地區、城市和地理坐標（經度\/緯度）。", "Region": "地區", - "SubmenuLocations": "所在地", + "SetupAutomaticUpdatesOfGeoIP": "設定 GeoIP 資料庫自動更新", + "SubmenuLocations": "地理位置", + "TestIPLocatorFailed": "Piwik 嘗試確認一個已知 IP 位址（%1$s）的位置，但你的伺服器回傳了 %2$s。如果這個供應商有設定正確，它應該會回傳 %3$s。", + "ThisUrlIsNotAValidGeoIPDB": "所下載的檔案不是正確的 GeoIP 資料庫。請重新檢查下載連結（URL）或手動下載檔案。", + "ToGeolocateOldVisits": "要取得舊的訪客紀錄中的地理位置資料，使用%1$s這裡%2$s所提供的程式碼。", + "UnsupportedArchiveType": "遇到不支援的壓縮檔類型 %1$s。", + "UpdaterHasNotBeenRun": "還沒有自動更新過。", + "UpdaterIsNotScheduledToRun": "未來沒有排程執行。", + "UpdaterScheduledForNextRun": "已排程在下次 core:archive 指令執行時執行。", + "UpdaterWasLastRun": "上次自動更新執行於 %s。", + "UpdaterWillRunNext": "下次自動更新將於 %s 執行。", "WidgetLocation": "訪客所在地點" }, "Intl": { diff --git a/plugins/UserCountryMap/javascripts/realtime-map.js b/plugins/UserCountryMap/javascripts/realtime-map.js index c116709ff7..105f12eae0 100644 --- a/plugins/UserCountryMap/javascripts/realtime-map.js +++ b/plugins/UserCountryMap/javascripts/realtime-map.js @@ -215,10 +215,10 @@ function visitTooltip(r) { var ds = new Date().getTime() / 1000 - r.lastActionTimestamp, ad = r.actionDetails, - ico = function (src) { return '<img src="' + src + '" alt="" class="icon" /> '; }; + ico = function (src, square) { return '<img' + (square ? ' width="16px" height="16px"' : '') + ' src="' + src + '" alt="" class="icon" /> '; }; return '<h3>' + (r.city ? r.city + ' / ' : '') + r.country + '</h3>' + // icons - ico(r.countryFlag) + ico(r.browserIcon) + ico(r.operatingSystemIcon) + '<br/>' + + ico(r.countryFlag) + ico(r.browserIcon, true) + ico(r.operatingSystemIcon, true) + '<br/>' + // User ID (r.userId ? _pk_translate('General_UserId') + ': ' + r.userId + '<br/>' : '') + // last action diff --git a/plugins/UserCountryMap/lang/zh-tw.json b/plugins/UserCountryMap/lang/zh-tw.json index 68d68eddad..b436d7d08b 100644 --- a/plugins/UserCountryMap/lang/zh-tw.json +++ b/plugins/UserCountryMap/lang/zh-tw.json @@ -1,8 +1,11 @@ { "UserCountryMap": { + "PluginDescription": "這個外掛提供訪客地圖和即時地圖外掛。注意：需要啟用 UserCountry 外掛。", + "AndNOthers": "和其他 %s 人", "Cities": "城市", "Countries": "國家", "DaysAgo": "%s 天前", + "GoalConversions": "%s 個目標轉換", "HoursAgo": "%s 小時前", "map": "地圖", "MinutesAgo": "%s 分前", diff --git a/plugins/UserId/lang/zh-tw.json b/plugins/UserId/lang/zh-tw.json index 35697dc6fd..0cf885f203 100644 --- a/plugins/UserId/lang/zh-tw.json +++ b/plugins/UserId/lang/zh-tw.json @@ -1,5 +1,7 @@ { "UserId": { - "UserReportTitle": "使用者" + "UserId": "使用者 ID", + "UserReportTitle": "使用者", + "PluginDescription": "顯示使用者報表" } }
\ No newline at end of file diff --git a/plugins/UserLanguage/lang/zh-tw.json b/plugins/UserLanguage/lang/zh-tw.json index 03c05f78e8..c54a46be95 100644 --- a/plugins/UserLanguage/lang/zh-tw.json +++ b/plugins/UserLanguage/lang/zh-tw.json @@ -1,7 +1,7 @@ { "UserLanguage": { - "BrowserLanguage": "瀏覽器語系", - "LanguageCode": "語系代碼", - "PluginDescription": "回報訪客使用的瀏覽器語系" + "BrowserLanguage": "瀏覽器語言", + "LanguageCode": "語言代碼", + "PluginDescription": "報告訪客所使用的瀏覽器語言" } }
\ No newline at end of file diff --git a/plugins/UsersManager/API.php b/plugins/UsersManager/API.php index ae9189e653..18e75e847b 100644 --- a/plugins/UsersManager/API.php +++ b/plugins/UsersManager/API.php @@ -83,7 +83,7 @@ class API extends \Piwik\Plugin\API throw new Exception('UsersManager_API must inherit API'); } self::$instance = $instance; - + } catch (Exception $e) { self::$instance = StaticContainer::get('Piwik\Plugins\UsersManager\API'); StaticContainer::getContainer()->set('UsersManager_API', self::$instance); @@ -270,7 +270,7 @@ class API extends \Piwik\Plugin\API } /** - * For each user, returns his access level for the given $idSite. + * For each user, returns their access level for the given $idSite. * If a user doesn't have any access to the $idSite ('noaccess'), * the user will not be in the returned array. * @@ -761,7 +761,7 @@ class API extends \Piwik\Plugin\API throw new Exception('Specify at least one website ID in &idSites='); } // it is possible to set user access on websites only for the websites admin - // basically an admin can give the view or the admin access to any user for the websites he manages + // basically an admin can give the view or the admin access to any user for the websites they manage Piwik::checkUserHasAdminAccess($idSites); $this->model->deleteUserAccess($userLogin, $idSites); diff --git a/plugins/UsersManager/lang/zh-tw.json b/plugins/UsersManager/lang/zh-tw.json index 0b3d9ce3a9..674fed0ab7 100644 --- a/plugins/UsersManager/lang/zh-tw.json +++ b/plugins/UsersManager/lang/zh-tw.json @@ -4,14 +4,14 @@ "Alias": "別名", "AllWebsites": "所有網站", "AnonymousUser": "匿名使用者", - "AnonymousUserHasViewAccess": "注意：這個 %1$s 使用者有 %2$s 訪問該網站。", + "AnonymousUserHasViewAccess": "注意：使用者 %1$s 有權限 %2$s 存取這個網站。", "AnonymousUserHasViewAccess2": "你的分析報表跟你的訪客資訊是可以公開查看的。", "ApplyToAllWebsites": "套用到所有網站", "ChangeAllConfirm": "你確定要給「%s」訪問所有網站的權限？", "ClickHereToDeleteTheCookie": "點擊這裡刪除 cookie 讓 Piwik 追蹤你的訪問紀錄", "ClickHereToSetTheCookieOnDomain": "點擊這裡設定 cookie 讓 Piwik 不會在 %s 中追蹤你的訪問紀錄", "ConfirmGrantSuperUserAccess": "你真的要授予「%s」超級使用者訪問權限？警告：該使用者將有權訪問所有的網站，並能夠執行管理任務。", - "ConfirmProhibitMySuperUserAccess": "%s，你真的要刪除自己的超級使用者訪問權限？你將失去所有的權限和訪問所有網站，並會從 Piwik 登出。", + "ConfirmProhibitMySuperUserAccess": "%s，你真的要刪除自己的超級使用者訪問權限？你將失去所有的權限和訪問所有網站，並會從 Piwik 中登出。", "ConfirmProhibitOtherUsersSuperUserAccess": "你真的要將「%s」的超級使用者權限移除？該使用者將會失去所有權限以及無法訪問所有網站。如果有需要，請記得稍後要重新給其訪問特定網站的權限。", "DeleteConfirm": "你確定要刪除使用者 %s 嗎？", "Email": "Email", @@ -29,9 +29,9 @@ "ExceptionLoginExists": "使用者名稱「%s」已經存在。", "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth 是以 MD5 加密的密碼（32 個字元字串）。在使用此方法前請先呼叫 md5() 函式。", "ExceptionRemoveSuperUserAccessOnlySuperUser": "無法刪除使用者「%s」的超級使用者權限。", - "ExceptionSuperUserAccess": "該使用者擁有超級使用者訪問權限，並且已有權限訪問和修改 Piwik 中的所有網站。您可以移除該使用者的超級使用者訪問權限，然後再試一次。", + "ExceptionSuperUserAccess": "該使用者擁有超級使用者訪問權限，並且已有權限訪問和修改 Piwik 中的所有網站。你可以移除該使用者的超級使用者訪問權限，然後再試一次。", "ExceptionUserDoesNotExist": "使用者「%s」不存在。", - "ExceptionYouMustGrantSuperUserAccessFirst": "必須有至少一個使用者與超級使用者能訪問。請先將超級使用者權限授予給另一個使用者。", + "ExceptionYouMustGrantSuperUserAccessFirst": "必須至少一個有使用者有超級使用者權限。請先將超級使用者權限授予給另一個使用者。", "ExceptionUserHasViewAccessAlready": "這個使用者已經有權限存取這個網站了。", "ExceptionNoValueForUsernameOrEmail": "請輸入使用者名稱或 Email。", "ExcludeVisitsViaCookie": "以 cookie 排除你的訪問紀錄", @@ -49,16 +49,16 @@ "MenuUserSettings": "使用者設定", "MenuPersonal": "個人", "PersonalSettings": "個人化設定", - "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "注意：您不能更改本區塊中的設定，因為你沒有任何匿名使用者可以訪問網站。", + "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "注意：你不能更改本區塊中的設定，因為你沒有任何可以訪問網站的匿名使用者。", "NoUsersExist": "還沒有任何使用者。", "PluginDescription": "使用者管理讓你可以新增、編輯現有使用者和給他們訪問或管理網站的權限。", "PrivAdmin": "管理員", - "PrivNone": "無存取權限", + "PrivNone": "不可存取", "PrivView": "檢視", "ReportDateToLoadByDefault": "預設載入日期", "ReportToLoadByDefault": "預設載入報表", "SuperUserAccessManagement": "管理超級使用者訪問權限", - "SuperUserAccessManagementGrantMore": "您可以在這裡授予超級使用者訪問其他 Piwik 使用者的權限。請小心使用此功能。", + "SuperUserAccessManagementGrantMore": "你可以在這裡授予超級使用者訪問其他 Piwik 使用者的權限。請小心使用此功能。", "SuperUserAccessManagementMainDescription": "超級使用者擁有最高權限。他們可以執行所有的管理任務，如添加新的網站進行監控，增加使用者，修改使用者權限，啟用和停用插件，甚至從市集安裝新的外掛。", "TheLoginScreen": "登入畫面", "ThereAreCurrentlyNRegisteredUsers": "目前有 %s 位使用者。", diff --git a/plugins/VisitFrequency/lang/zh-tw.json b/plugins/VisitFrequency/lang/zh-tw.json index 39cb4e6b91..fd6fafb98d 100644 --- a/plugins/VisitFrequency/lang/zh-tw.json +++ b/plugins/VisitFrequency/lang/zh-tw.json @@ -1,12 +1,26 @@ { "VisitFrequency": { - "ColumnActionsByReturningVisits": "重返造訪的活動數", - "ColumnAverageVisitDurationForReturningVisitors": "重返造訪的平均訪問時間（以秒為單位）", - "ColumnAvgActionsPerReturningVisit": "每個重返造訪的平均活動數", - "ColumnBounceRateForReturningVisits": "回訪客的跳出率", - "ColumnReturningVisits": "重返造訪", - "SubmenuFrequency": "造訪頻率", - "WidgetGraphReturning": "重返造訪圖表", - "WidgetOverview": "造訪頻率總覽" + "ColumnActionsByReturningVisits": "回訪活動數", + "ColumnAverageVisitDurationForReturningVisitors": "回訪平均時間（秒）", + "ColumnAvgActionsPerReturningVisit": "每次回訪平均活動數", + "ColumnBounceCountForReturningVisits": "回訪者跳出數", + "ColumnBounceRateForReturningVisits": "回訪者跳出率", + "ColumnMaxActionsInReturningVisit": "單次回訪最大活動數", + "ColumnNbReturningVisitsConverted": "轉換的回訪數", + "ColumnReturningVisits": "回訪數", + "ColumnSumVisitLengthReturning": "回訪者停留時間總計（秒）", + "ColumnUniqueReturningVisitors": "不重複回訪者數", + "ColumnReturningUsers": "回訪者", + "PluginDescription": "你的首次訪問訪客和回訪訪客的數據報表。", + "ReturnActions": "回訪者活動數", + "ReturnAverageVisitDuration": "回訪者平均停留時間", + "ReturnAvgActions": "每個回訪的活動數", + "ReturnBounceRate": "回訪者跳出數（只瀏覽一頁就離開）", + "ReturningVisitDocumentation": "回訪者（與新訪客相反）是之前至少訪問網站一次的訪客。", + "ReturningVisitsDocumentation": "這是回訪者的總覽。", + "ReturnVisits": "回訪數", + "SubmenuFrequency": "訪問頻率", + "WidgetGraphReturning": "最近回訪", + "WidgetOverview": "訪問頻率總覽" } }
\ No newline at end of file diff --git a/plugins/VisitTime/lang/zh-tw.json b/plugins/VisitTime/lang/zh-tw.json index 9fdf46d5a7..0151a93b6a 100644 --- a/plugins/VisitTime/lang/zh-tw.json +++ b/plugins/VisitTime/lang/zh-tw.json @@ -1,12 +1,18 @@ { "VisitTime": { - "ColumnLocalTime": "訪客端時段", - "ColumnServerTime": "伺服器時段", - "LocalTime": "依訪客端時段記錄的造訪次數", - "NHour": "%s 時", - "ServerTime": "依伺服器時段記錄的造訪次數", - "SubmenuTimes": "造訪時段", - "WidgetLocalTime": "依訪客端時段記錄的造訪次數", - "WidgetServerTime": "依伺服器時段記錄的造訪次數" + "ColumnLocalTime": "訪客端時間", + "ColumnServerTime": "伺服器時間", + "DayOfWeek": "星期幾", + "LocalTime": "依訪客端時間記錄的訪問次數", + "NHour": "%s 點", + "PluginDescription": "報告訪客訪問你的網站或應用程式時訪客端和伺服器時間。", + "ServerTime": "依伺服器時間記錄的訪問次數", + "SubmenuTimes": "訪問時段", + "VisitsByDayOfWeek": "以星期幾查看", + "WidgetByDayOfWeekDocumentation": "這個圖表顯示你網站每星期接收的訪問數。", + "WidgetLocalTime": "依訪客端時間記錄的訪問次數", + "WidgetLocalTimeDocumentation": "這個圖片顯示當訪客瀏覽時，%1$s訪客端的時間%2$s是幾點。", + "WidgetServerTime": "依伺服器時間記錄的訪問次數", + "WidgetServerTimeDocumentation": "這個圖片顯示當訪客瀏覽時，%1$s伺服器的時間%2$s是幾點。" } }
\ No newline at end of file diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 3cc7198c9ae509a22f020aef68071170aa3c9a6 +Subproject f24d71ae3e2d99690c1eda968c60a4a5e80af4d diff --git a/plugins/VisitorInterest/lang/zh-tw.json b/plugins/VisitorInterest/lang/zh-tw.json index ef1ec0b85e..eaa03d0704 100644 --- a/plugins/VisitorInterest/lang/zh-tw.json +++ b/plugins/VisitorInterest/lang/zh-tw.json @@ -2,14 +2,23 @@ "VisitorInterest": { "BetweenXYMinutes": "%1$s-%2$s 分", "BetweenXYSeconds": "%1$s-%2$s 秒", - "ColumnPagesPerVisit": "每次造訪瀏覽的頁面數", - "ColumnVisitDuration": "造訪停留時間", - "Engagement": "忠誠度", + "ColumnPagesPerVisit": "每次訪問瀏覽的網頁數", + "ColumnVisitDuration": "訪問停留時間", + "Engagement": "參與度", "NPages": "%s 頁", "OnePage": "1 頁", - "VisitsPerDuration": "各個造訪停留時間的造訪次數", - "VisitsPerNbOfPages": "各個瀏覽頁面數的造訪次數", - "WidgetLengths": "訪客停留時間", - "WidgetPages": "平均瀏覽頁數" + "PluginDescription": "報告訪客的黏著度：網頁瀏覽數、網站停留時間、訪問間隔時間等等。", + "VisitNum": "訪問次數", + "VisitsByDaysSinceLast": "訪問間隔時間", + "visitsByVisitCount": "訪問次數", + "VisitsPerDuration": "每次訪問的停留時間", + "VisitsPerNbOfPages": "每次訪問的網頁瀏覽數", + "WidgetLengths": "訪問停留時間", + "WidgetLengthsDocumentation": "在這個報表中你可以看到網站停留時間的統計結果。預設以標籤雲格式來顯示，較多次的時間會顯示較大字體。", + "WidgetPages": "每次訪問瀏覽網頁數", + "WidgetPagesDocumentation": "在這個報表中你可以看到網頁瀏覽數的統計結果。預設以標籤雲格式來顯示，較多次的時間會顯示較大字體。", + "WidgetVisitsByDaysSinceLast": "訪問間隔時間", + "WidgetVisitsByDaysSinceLastDocumentation": "在這個報表中你可以看到每次訪問與上次訪問間隔日期的統計列表。", + "WidgetVisitsByNumDocumentation": "在這個報表中你可以看到訪客到訪次數的統計列表。" } }
\ No newline at end of file diff --git a/plugins/VisitsSummary/lang/zh-tw.json b/plugins/VisitsSummary/lang/zh-tw.json index 37740be98b..be63ce2db8 100644 --- a/plugins/VisitsSummary/lang/zh-tw.json +++ b/plugins/VisitsSummary/lang/zh-tw.json @@ -1,12 +1,29 @@ { "VisitsSummary": { "AverageGenerationTime": "平均載入時間", - "GenerateQueries": "%s 個查詢已執行", - "GenerateTime": "頁面生成時間： %s 秒", - "NbActionsDescription": "%s 個活動（檢視網頁、下載和離開連結）", - "VisitsSummary": "訪客總覽", - "WidgetLastVisits": "最近造訪圖表", - "WidgetOverviewGraph": "圖表總覽", - "WidgetVisits": "造訪次數總覽" + "AverageVisitDuration": "平均停留時間", + "GenerateQueries": "已執行 %s 個查詢", + "GenerateTime": "%s 秒載入網頁", + "MaxNbActions": "單次訪問最大活動數", + "NbActionsDescription": "%s 個活動", + "NbActionsPerVisit": "單次訪問活動數（網頁瀏覽、離開連結和站內搜尋）", + "NbDownloadsDescription": "下載數", + "NbKeywordsDescription": "不重複關鍵字數", + "NbOutlinksDescription": "離開連結數", + "NbPageviewsDescription": "瀏覽數", + "NbSearchesDescription": "站內搜尋數", + "NbUniqueDownloadsDescription": "不重複下載數", + "NbUniqueOutlinksDescription": "不重複離開連結數", + "NbUniquePageviewsDescription": "不重複瀏覽數", + "NbUniqueVisitors": "不重複訪客", + "NbUsersDescription": "使用者", + "NbVisitsDescription": "訪問數", + "NbVisitsBounced": "跳出數（只瀏覽一頁就離開）", + "PluginDescription": "報表產生分析數據：訪問數、不重複訪客數、活動數和跳出率等等。", + "VisitsSummary": "訪客摘要", + "VisitsSummaryDocumentation": "這是訪問趨勢的總覽。", + "WidgetLastVisits": "最近訪問", + "WidgetOverviewGraph": "訪問總覽圖表", + "WidgetVisits": "訪問總覽" } }
\ No newline at end of file diff --git a/plugins/WebsiteMeasurable/lang/zh-tw.json b/plugins/WebsiteMeasurable/lang/zh-tw.json index abe9694ed8..32ef36cf4c 100644 --- a/plugins/WebsiteMeasurable/lang/zh-tw.json +++ b/plugins/WebsiteMeasurable/lang/zh-tw.json @@ -2,6 +2,6 @@ "WebsiteMeasurable": { "Website": "網站", "Websites": "網站", - "WebsiteDescription": "由不同網頁組成的網站通常來自單一網域。" + "WebsiteDescription": "由不同網頁所組成的網站通常來自單一網域。" } }
\ No newline at end of file diff --git a/plugins/Widgetize/lang/zh-tw.json b/plugins/Widgetize/lang/zh-tw.json index 5d6395ce58..55349a4d6b 100644 --- a/plugins/Widgetize/lang/zh-tw.json +++ b/plugins/Widgetize/lang/zh-tw.json @@ -1,6 +1,7 @@ { "Widgetize": { "OpenInNewWindow": "在新視窗開啟", - "TopLinkTooltip": "將 Piwik 報表匯出為組件，並於你的 APP 中以 iframe 嵌入展示板。" + "PluginDescription": "在你的網站或應用程式中以簡單的 HTML 嵌入程式碼顯示任何 Piwik 報表。", + "TopLinkTooltip": "將 Piwik 報表以小工具匯出，並於你的應用程式中以 iframe 嵌入展示板。" } }
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt index da3d334c0f..a4ec4deb32 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt @@ -10,95 +10,95 @@ try 'php archive.php --url=http://your.piwik/path' ------------------------------------------------------- -INFO [2016-12-26 22:26:34] --------------------------- -INFO [2016-12-26 22:26:34] INIT -INFO [2016-12-26 22:26:34] Running Piwik 3.0.0 as Super User -INFO [2016-12-26 22:26:34] --------------------------- -INFO [2016-12-26 22:26:34] NOTES -INFO [2016-12-26 22:26:34] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. -INFO [2016-12-26 22:26:34] See the doc at: http://piwik.org/docs/setup-auto-archiving/ -INFO [2016-12-26 22:26:34] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. -INFO [2016-12-26 22:26:34] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 -INFO [2016-12-26 22:26:34] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 -INFO [2016-12-26 22:26:34] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 -INFO [2016-12-26 22:26:34] --------------------------- -INFO [2016-12-26 22:26:34] START -INFO [2016-12-26 22:26:34] Starting Piwik reports archiving... -INFO [2016-12-26 22:26:34] Old report was invalidated for website id 1 -INFO [2016-12-26 22:26:34] Will pre-process for website id = 1, period = day, date = last52 -INFO [2016-12-26 22:26:34] - pre-processing all visits -INFO [2016-12-26 22:26:35] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:26:35] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:26:36] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:26:39] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.167s -INFO [2016-12-26 22:26:39] Will pre-process for website id = 1, period = week, date = last260 -INFO [2016-12-26 22:26:39] - pre-processing all visits -INFO [2016-12-26 22:26:39] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:26:39] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:27:34] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:04] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 84.873s -INFO [2016-12-26 22:28:04] Will pre-process for website id = 1, period = month, date = last52 -INFO [2016-12-26 22:28:04] - pre-processing all visits -INFO [2016-12-26 22:28:04] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:28:04] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:15] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:20] Archived website id = 1, period = month, 3 segments, 13 visits in last 52 months, 0 visits this month, Time elapsed: 16.383s -INFO [2016-12-26 22:28:20] Will pre-process for website id = 1, period = year, date = last7 -INFO [2016-12-26 22:28:20] - pre-processing all visits -INFO [2016-12-26 22:28:20] - pre-processing segment 1/3 browserCode==IE -INFO [2016-12-26 22:28:20] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:26] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 -INFO [2016-12-26 22:28:28] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 8.056s -INFO [2016-12-26 22:28:28] Archived website id = 1, 16 API requests, Time elapsed: 114.487s [1/3 done] -INFO [2016-12-26 22:28:28] Old report was invalidated for website id 2 -INFO [2016-12-26 22:28:28] Will pre-process for website id = 2, period = day, date = last52 -INFO [2016-12-26 22:28:28] - pre-processing all visits -INFO [2016-12-26 22:28:30] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.499s -INFO [2016-12-26 22:28:30] Will pre-process for website id = 2, period = week, date = last260 -INFO [2016-12-26 22:28:30] - pre-processing all visits -INFO [2016-12-26 22:28:50] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 20.592s -INFO [2016-12-26 22:28:50] Will pre-process for website id = 2, period = month, date = last52 -INFO [2016-12-26 22:28:50] - pre-processing all visits -INFO [2016-12-26 22:28:54] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 3.807s -INFO [2016-12-26 22:28:54] Will pre-process for website id = 2, period = year, date = last7 -INFO [2016-12-26 22:28:54] - pre-processing all visits -INFO [2016-12-26 22:28:56] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.512s -INFO [2016-12-26 22:28:56] Archived website id = 2, 4 API requests, Time elapsed: 27.413s [2/3 done] -INFO [2016-12-26 22:28:56] Old report was invalidated for website id 3 -INFO [2016-12-26 22:28:56] Will pre-process for website id = 3, period = day, date = last52 -INFO [2016-12-26 22:28:56] - pre-processing all visits -INFO [2016-12-26 22:28:57] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.609s -INFO [2016-12-26 22:28:57] Will pre-process for website id = 3, period = week, date = last260 -INFO [2016-12-26 22:28:57] - pre-processing all visits -INFO [2016-12-26 22:29:19] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 21.300s -INFO [2016-12-26 22:29:19] Will pre-process for website id = 3, period = month, date = last52 -INFO [2016-12-26 22:29:19] - pre-processing all visits -INFO [2016-12-26 22:29:23] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.174s -INFO [2016-12-26 22:29:23] Will pre-process for website id = 3, period = year, date = last7 -INFO [2016-12-26 22:29:23] - pre-processing all visits -INFO [2016-12-26 22:29:25] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.320s -INFO [2016-12-26 22:29:25] Archived website id = 3, 4 API requests, Time elapsed: 29.407s [3/3 done] -INFO [2016-12-26 22:29:25] Done archiving! -INFO [2016-12-26 22:29:25] --------------------------- -INFO [2016-12-26 22:29:25] SUMMARY -INFO [2016-12-26 22:29:25] Total visits for today across archived websites: 0 -INFO [2016-12-26 22:29:25] Archived today's reports for 3 websites -INFO [2016-12-26 22:29:25] Archived week/month/year for 3 websites -INFO [2016-12-26 22:29:25] Skipped 0 websites -INFO [2016-12-26 22:29:25] - 0 skipped because no new visit since the last script execution -INFO [2016-12-26 22:29:25] - 0 skipped because existing daily reports are less than 150 seconds old -INFO [2016-12-26 22:29:25] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old -INFO [2016-12-26 22:29:25] Total API requests: 24 -INFO [2016-12-26 22:29:25] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 171446 ms, no error -INFO [2016-12-26 22:29:25] Time elapsed: 171.446s -INFO [2016-12-26 22:29:25] --------------------------- -INFO [2016-12-26 22:29:25] SCHEDULED TASKS -INFO [2016-12-26 22:29:25] Starting Scheduled tasks... -INFO [2016-12-26 22:29:25] done -INFO [2016-12-26 22:29:25] ---------------------------
\ No newline at end of file +INFO [2017-01-07 07:08:27] --------------------------- +INFO [2017-01-07 07:08:27] INIT +INFO [2017-01-07 07:08:27] Running Piwik 3.0.1-b2 as Super User +INFO [2017-01-07 07:08:27] --------------------------- +INFO [2017-01-07 07:08:27] NOTES +INFO [2017-01-07 07:08:27] - If you execute this script at least once per hour (or more often) in a crontab, you may disable 'Browser trigger archiving' in Piwik UI > Settings > General Settings. +INFO [2017-01-07 07:08:27] See the doc at: http://piwik.org/docs/setup-auto-archiving/ +INFO [2017-01-07 07:08:27] - Reports for today will be processed at most every 150 seconds. You can change this value in Piwik UI > Settings > General Settings. +INFO [2017-01-07 07:08:27] - Reports for the current week/month/year will be refreshed at most every 3600 seconds. +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-09 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-10 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-11 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-08-15 for following websites ids: 1,2,3 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2012-09-30 for following websites ids: 1 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2014-03-12 for following websites ids: 1,3 +INFO [2017-01-07 07:08:27] - Will invalidate archived reports for 2014-03-13 for following websites ids: 1,3 +INFO [2017-01-07 07:08:27] - Will process 3 other websites because some old data reports have been invalidated (eg. using the Log Import script) , IDs: 1, 2, 3 +INFO [2017-01-07 07:08:27] --------------------------- +INFO [2017-01-07 07:08:27] START +INFO [2017-01-07 07:08:27] Starting Piwik reports archiving... +INFO [2017-01-07 07:08:27] Old report was invalidated for website id 1 +INFO [2017-01-07 07:08:27] Will pre-process for website id = 1, period = day, date = last52 +INFO [2017-01-07 07:08:27] - pre-processing all visits +INFO [2017-01-07 07:08:29] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:08:29] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:08:29] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:08:33] Archived website id = 1, period = day, 3 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 5.443s +INFO [2017-01-07 07:08:33] Will pre-process for website id = 1, period = week, date = last260 +INFO [2017-01-07 07:08:33] - pre-processing all visits +INFO [2017-01-07 07:08:33] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:08:33] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:09:31] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:02] Archived website id = 1, period = week, 3 segments, 41 visits in last 260 weeks, 0 visits this week, Time elapsed: 89.589s +INFO [2017-01-07 07:10:02] Will pre-process for website id = 1, period = month, date = last52 +INFO [2017-01-07 07:10:02] - pre-processing all visits +INFO [2017-01-07 07:10:02] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:10:02] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:13] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:19] Archived website id = 1, period = month, 3 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 16.506s +INFO [2017-01-07 07:10:19] Will pre-process for website id = 1, period = year, date = last7 +INFO [2017-01-07 07:10:19] - pre-processing all visits +INFO [2017-01-07 07:10:19] - pre-processing segment 1/3 browserCode==IE +INFO [2017-01-07 07:10:19] - pre-processing segment 2/3 visitCount<=5;visitorType!=non-existing-type;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:25] - pre-processing segment 3/3 visitCount<=5;visitorType!=re%2C%3Btest%20is%20encoded;daysSinceFirstVisit<=50 +INFO [2017-01-07 07:10:28] Archived website id = 1, period = year, 3 segments, 41 visits in last 7 years, 0 visits this year, Time elapsed: 9.642s +INFO [2017-01-07 07:10:28] Archived website id = 1, 16 API requests, Time elapsed: 121.189s [1/3 done] +INFO [2017-01-07 07:10:29] Old report was invalidated for website id 2 +INFO [2017-01-07 07:10:29] Will pre-process for website id = 2, period = day, date = last52 +INFO [2017-01-07 07:10:29] - pre-processing all visits +INFO [2017-01-07 07:10:30] Archived website id = 2, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.630s +INFO [2017-01-07 07:10:30] Will pre-process for website id = 2, period = week, date = last260 +INFO [2017-01-07 07:10:30] - pre-processing all visits +INFO [2017-01-07 07:10:52] Archived website id = 2, period = week, 0 segments, 1 visits in last 260 weeks, 0 visits this week, Time elapsed: 21.658s +INFO [2017-01-07 07:10:52] Will pre-process for website id = 2, period = month, date = last52 +INFO [2017-01-07 07:10:52] - pre-processing all visits +INFO [2017-01-07 07:10:56] Archived website id = 2, period = month, 0 segments, 0 visits in last 52 months, 0 visits this month, Time elapsed: 3.966s +INFO [2017-01-07 07:10:56] Will pre-process for website id = 2, period = year, date = last7 +INFO [2017-01-07 07:10:56] - pre-processing all visits +INFO [2017-01-07 07:10:57] Archived website id = 2, period = year, 0 segments, 1 visits in last 7 years, 0 visits this year, Time elapsed: 1.630s +INFO [2017-01-07 07:10:57] Archived website id = 2, 4 API requests, Time elapsed: 28.888s [2/3 done] +INFO [2017-01-07 07:10:57] Old report was invalidated for website id 3 +INFO [2017-01-07 07:10:57] Will pre-process for website id = 3, period = day, date = last52 +INFO [2017-01-07 07:10:57] - pre-processing all visits +INFO [2017-01-07 07:10:59] Archived website id = 3, period = day, 0 segments, 0 visits in last 52 days, 0 visits today, Time elapsed: 1.639s +INFO [2017-01-07 07:10:59] Will pre-process for website id = 3, period = week, date = last260 +INFO [2017-01-07 07:10:59] - pre-processing all visits +INFO [2017-01-07 07:11:22] Archived website id = 3, period = week, 0 segments, 15 visits in last 260 weeks, 0 visits this week, Time elapsed: 22.770s +INFO [2017-01-07 07:11:22] Will pre-process for website id = 3, period = month, date = last52 +INFO [2017-01-07 07:11:22] - pre-processing all visits +INFO [2017-01-07 07:11:26] Archived website id = 3, period = month, 0 segments, 12 visits in last 52 months, 0 visits this month, Time elapsed: 4.387s +INFO [2017-01-07 07:11:26] Will pre-process for website id = 3, period = year, date = last7 +INFO [2017-01-07 07:11:26] - pre-processing all visits +INFO [2017-01-07 07:11:29] Archived website id = 3, period = year, 0 segments, 15 visits in last 7 years, 0 visits this year, Time elapsed: 2.432s +INFO [2017-01-07 07:11:29] Archived website id = 3, 4 API requests, Time elapsed: 31.233s [3/3 done] +INFO [2017-01-07 07:11:29] Done archiving! +INFO [2017-01-07 07:11:29] --------------------------- +INFO [2017-01-07 07:11:29] SUMMARY +INFO [2017-01-07 07:11:29] Total visits for today across archived websites: 0 +INFO [2017-01-07 07:11:29] Archived today's reports for 3 websites +INFO [2017-01-07 07:11:29] Archived week/month/year for 3 websites +INFO [2017-01-07 07:11:29] Skipped 0 websites +INFO [2017-01-07 07:11:29] - 0 skipped because no new visit since the last script execution +INFO [2017-01-07 07:11:29] - 0 skipped because existing daily reports are less than 150 seconds old +INFO [2017-01-07 07:11:29] - 0 skipped because existing week/month/year periods reports are less than 3600 seconds old +INFO [2017-01-07 07:11:29] Total API requests: 24 +INFO [2017-01-07 07:11:29] done: 3/3 100%, 0 vtoday, 3 wtoday, 3 wperiods, 24 req, 181477 ms, no error +INFO [2017-01-07 07:11:29] Time elapsed: 181.477s +INFO [2017-01-07 07:11:29] --------------------------- +INFO [2017-01-07 07:11:29] SCHEDULED TASKS +INFO [2017-01-07 07:11:29] Starting Scheduled tasks... +INFO [2017-01-07 07:11:29] done +INFO [2017-01-07 07:11:29] ---------------------------
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml index b42228ab18..503f25c55f 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_day.xml @@ -74,14 +74,14 @@ <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -182,14 +182,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -290,14 +290,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -398,14 +398,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -506,14 +506,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -614,14 +614,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -722,14 +722,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -830,14 +830,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -938,14 +938,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml index 4a3badd91f..0c3a52fd22 100644 --- a/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml +++ b/tests/PHPUnit/System/expected/test_ArchiveCronTest_preArchivedSegment_noOptions__Live.getLastVisitsDetails_year.xml @@ -265,14 +265,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -381,14 +381,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -414,11 +414,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -502,14 +502,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -614,14 +614,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -745,14 +745,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -884,14 +884,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -996,14 +996,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1108,14 +1108,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -1209,14 +1209,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -1321,14 +1321,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 9079f5d43c..63364610cd 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1187,14 +1187,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1226,11 +1226,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1318,14 +1318,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1357,11 +1357,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1511,14 +1511,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1550,11 +1550,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1642,14 +1642,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1681,11 +1681,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1816,14 +1816,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1855,11 +1855,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1990,14 +1990,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2021,11 +2021,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2113,14 +2113,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2152,11 +2152,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2244,14 +2244,14 @@ <deviceModel>Xperia Tablet S</deviceModel> <operatingSystem>Android 4.1</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -2283,11 +2283,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2437,14 +2437,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -2476,11 +2476,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2630,14 +2630,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -2661,11 +2661,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2753,14 +2753,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -2792,11 +2792,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -2884,14 +2884,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 11.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -2923,11 +2923,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3058,14 +3058,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -3097,11 +3097,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3232,14 +3232,14 @@ <deviceModel>Desire</deviceModel> <operatingSystem>MildWild 8.0</operatingSystem> <operatingSystemName>MildWild</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>1</events> @@ -3271,11 +3271,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3406,14 +3406,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3437,11 +3437,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3572,14 +3572,14 @@ <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> <operatingSystemName>Ubuntu</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.png</operatingSystemIcon> <operatingSystemCode>UBT</operatingSystemCode> <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>1</events> @@ -3611,11 +3611,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3703,14 +3703,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -3742,11 +3742,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3834,14 +3834,14 @@ <deviceModel>Desire</deviceModel> <operatingSystem>MildWild 8.0</operatingSystem> <operatingSystemName>MildWild</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>MLD</operatingSystemCode> <operatingSystemVersion>8.0</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -3873,11 +3873,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3965,14 +3965,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -4004,11 +4004,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4096,14 +4096,14 @@ <deviceModel /> <operatingSystem>Ubuntu 9.04</operatingSystem> <operatingSystemName>Ubuntu</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UBT.png</operatingSystemIcon> <operatingSystemCode>UBT</operatingSystemCode> <operatingSystemVersion>9.04</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -4135,11 +4135,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4289,14 +4289,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -4328,11 +4328,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4482,14 +4482,14 @@ <deviceModel>Nexus 4</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 33.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>33.0</browserVersion> <events>1</events> @@ -4521,11 +4521,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4675,14 +4675,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -4706,11 +4706,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4860,14 +4860,14 @@ <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.png</browserIcon> <browserCode>QQ</browserCode> <browserVersion>5.0</browserVersion> <events>1</events> @@ -4899,11 +4899,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -4991,14 +4991,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -5030,11 +5030,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5122,14 +5122,14 @@ <deviceModel>Nexus 4</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 33.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -5161,11 +5161,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5253,14 +5253,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 32.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>32.0</browserVersion> <events>0</events> @@ -5292,11 +5292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -5384,14 +5384,14 @@ <deviceModel>GALAXY Note 3</deviceModel> <operatingSystem>Android 4.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>QQ Browser 5.0</browser> <browserName>QQ Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/QQ.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/QQ.png</browserIcon> <browserCode>QQ</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -5423,11 +5423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml index 5b6feb65e3..ec75eaf279 100644 --- a/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_BackwardsCompatibility1XTest__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WXP;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index cbcb34d9ba..6b6983c922 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -58,14 +58,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -93,11 +93,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -165,14 +165,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -200,11 +200,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -350,14 +350,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -385,11 +385,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -457,14 +457,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -492,11 +492,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -855,14 +855,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>14</events> @@ -890,11 +890,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -962,14 +962,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -997,7 +997,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1065,14 +1065,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1100,7 +1100,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1246,14 +1246,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1281,7 +1281,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1349,14 +1349,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1384,7 +1384,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -1692,14 +1692,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -1727,7 +1727,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index 6f28c2fa44..df0b8e12b6 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -58,14 +58,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -93,7 +93,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -161,14 +161,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -196,7 +196,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -342,14 +342,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -377,7 +377,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -445,14 +445,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -480,7 +480,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -788,14 +788,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>13</events> @@ -823,7 +823,7 @@ <plugins>director</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> </pluginsIcons> @@ -891,14 +891,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -926,11 +926,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -998,14 +998,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1033,11 +1033,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1183,14 +1183,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>6</events> @@ -1218,11 +1218,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1290,14 +1290,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1325,11 +1325,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1688,14 +1688,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>14</events> @@ -1723,11 +1723,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml index e2ab7a0e53..ede776e224 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicePlugins.getPlugin_month.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>6%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>1</nb_visits> <nb_visits_percentage>3%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml index 9ec764ffe6..9abb2c8121 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Internet Explorer</label> @@ -22,7 +22,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>RockMelt</label> @@ -34,7 +34,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> </row> <row> <label>Epiphany</label> @@ -46,7 +46,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> </row> <row> <label>Unknown</label> @@ -58,7 +58,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> <row> <label>Android Browser</label> @@ -70,7 +70,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> </row> <row> <label>Firefox</label> @@ -82,7 +82,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Chrome Mobile</label> @@ -94,6 +94,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index fb459cbb95..c0c93c6084 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==RM;browserVersion==0.9</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> </row> <row> <label>Epiphany 2.30</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==EP;browserVersion==2.30</segment> - <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Unknown</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==UNK;browserVersion==</segment> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> <row> <label>Chrome 37.0</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==37.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Android Browser</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==AN;browserVersion==</segment> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> </row> <row> <label>Chrome 19.0</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==19.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome 20.0</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==20.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Firefox 6.0</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Chrome 11.0</label> @@ -128,7 +128,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==11.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome 39.0</label> @@ -141,7 +141,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==39.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome 41.0</label> @@ -154,7 +154,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==CH;browserVersion==41.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> </row> <row> <label>Chrome Mobile 39.0</label> @@ -167,7 +167,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>browserCode==CM;browserVersion==39.0</segment> - <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> </row> <row> <label>Internet Explorer 5.0</label> @@ -180,7 +180,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==5.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Internet Explorer 6.0</label> @@ -193,7 +193,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Internet Explorer 8.0</label> @@ -206,7 +206,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==IE;browserVersion==8.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Unknown</label> @@ -219,6 +219,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>browserCode==UNK;browserVersion==1.0</segment> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml index cce03cafcc..69929893e9 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getBrowsers_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>10</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>2</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CH.png</logo> <segment>browserCode==CH</segment> </row> <row> @@ -23,7 +23,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> <segment>browserCode==IE</segment> </row> <row> @@ -36,7 +36,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CH.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/RM.png</logo> <segment>browserCode==RM</segment> </row> <row> @@ -49,7 +49,7 @@ <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/EP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/EP.png</logo> <segment>browserCode==EP</segment> </row> <row> @@ -62,7 +62,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> <segment>browserCode==UNK</segment> </row> <row> @@ -75,7 +75,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/AN.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/AN.png</logo> <segment>browserCode==AN</segment> </row> <row> @@ -88,7 +88,7 @@ <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> <row> @@ -101,7 +101,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/browsers/CM.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/CM.png</logo> <segment>browserCode==CM</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 9eee07e117..a605a1c734 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -10,7 +10,7 @@ <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>10</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Windows</label> @@ -22,7 +22,7 @@ <nb_visits_converted>11</nb_visits_converted> <sum_daily_nb_uniq_visitors>11</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> <row> <label>GNU/Linux</label> @@ -34,7 +34,7 @@ <nb_visits_converted>8</nb_visits_converted> <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android</label> @@ -46,7 +46,7 @@ <nb_visits_converted>3</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Unknown</label> @@ -58,7 +58,7 @@ <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>Bot</label> @@ -70,7 +70,7 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>iOS</label> @@ -82,6 +82,6 @@ <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> - <logo>plugins/DevicesDetection/images/os/IOS.gif</logo> + <logo>plugins/DevicesDetection/images/os/IOS.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index f20b32cd47..a648a6436a 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -11,7 +11,7 @@ <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Windows 7</label> @@ -24,7 +24,7 @@ <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==7</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> <row> <label>Mac 10.6</label> @@ -37,7 +37,7 @@ <sum_daily_nb_uniq_visitors>6</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.6</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Mac 10.10</label> @@ -50,7 +50,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.10</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Unknown</label> @@ -63,7 +63,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==UNK;operatingSystemVersion==UNK</segment> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>Windows XP</label> @@ -76,7 +76,7 @@ <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> <row> <label>Android 2.3</label> @@ -89,7 +89,7 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==AND;operatingSystemVersion==2.3</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Android 4.4</label> @@ -102,7 +102,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>1</sum_daily_nb_users> <segment>operatingSystemCode==AND;operatingSystemVersion==4.4</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Bot</label> @@ -115,7 +115,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==BOT;operatingSystemVersion==UNK</segment> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>iOS 7.1</label> @@ -128,7 +128,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==IOS;operatingSystemVersion==7.1</segment> - <logo>plugins/DevicesDetection/images/os/IOS.gif</logo> + <logo>plugins/DevicesDetection/images/os/IOS.png</logo> </row> <row> <label>Mac</label> @@ -141,7 +141,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Mac 10.8</label> @@ -154,7 +154,7 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==MAC;operatingSystemVersion==10.8</segment> - <logo>plugins/DevicesDetection/images/os/MAC.gif</logo> + <logo>plugins/DevicesDetection/images/os/MAC.png</logo> </row> <row> <label>Windows</label> @@ -167,6 +167,6 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <sum_daily_nb_users>0</sum_daily_nb_users> <segment>operatingSystemCode==WIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 4dccd588ec..c4a8368cd1 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -76,14 +76,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -111,15 +111,15 @@ <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -222,14 +222,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -338,14 +338,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -377,23 +377,23 @@ <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -496,14 +496,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -531,19 +531,19 @@ <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -616,14 +616,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -651,19 +651,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -749,14 +749,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -784,27 +784,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -888,14 +888,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -923,15 +923,15 @@ <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -1017,14 +1017,14 @@ <deviceModel /> <operatingSystem>Android</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1052,7 +1052,7 @@ <plugins>flash</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> </pluginsIcons> @@ -1138,14 +1138,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1173,27 +1173,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1319,14 +1319,14 @@ <deviceModel /> <operatingSystem>Windows 8</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1354,11 +1354,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1444,14 +1444,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1479,19 +1479,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1577,14 +1577,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1612,19 +1612,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1899,14 +1899,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -2011,14 +2011,14 @@ <deviceModel /> <operatingSystem>Mac</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 5.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -2140,14 +2140,14 @@ <deviceModel /> <operatingSystem>Windows</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -2260,14 +2260,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2424,14 +2424,14 @@ <deviceModel>GALAXY S5</deviceModel> <operatingSystem>Android 4.4</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>4.4</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome Mobile 39.0</browser> <browserName>Chrome Mobile</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CM.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CM.png</browserIcon> <browserCode>CM</browserCode> <browserVersion>39.0</browserVersion> <events>0</events> @@ -2540,14 +2540,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2681,14 +2681,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 37.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>37.0</browserVersion> <events>0</events> @@ -2799,14 +2799,14 @@ <deviceModel /> <operatingSystem>Mac 10.10</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.10</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 41.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>41.0</browserVersion> <events>0</events> @@ -2921,14 +2921,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -2956,11 +2956,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -3044,14 +3044,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -3079,27 +3079,27 @@ <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/gears.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/gears.png</pluginIcon> <pluginName>gears</pluginName> </row> </pluginsIcons> @@ -3185,14 +3185,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 39.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>39.0</browserVersion> <events>0</events> @@ -3297,14 +3297,14 @@ <deviceModel>iPhone</deviceModel> <operatingSystem>iOS 7.1</operatingSystem> <operatingSystemName>iOS</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/IOS.png</operatingSystemIcon> <operatingSystemCode>IOS</operatingSystemCode> <operatingSystemVersion>7.1</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion>1.0</browserVersion> <events>0</events> @@ -3398,14 +3398,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3498,14 +3498,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -3608,14 +3608,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3722,14 +3722,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3855,14 +3855,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -3996,14 +3996,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4110,14 +4110,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -4224,14 +4224,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -4327,14 +4327,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -4441,14 +4441,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -4555,14 +4555,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> @@ -4669,14 +4669,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -4779,14 +4779,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -4889,14 +4889,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 20.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>20.0</browserVersion> <events>0</events> @@ -4999,14 +4999,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5109,14 +5109,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5219,14 +5219,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5329,14 +5329,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5439,14 +5439,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -5549,14 +5549,14 @@ <deviceModel /> <operatingSystem>Mac 10.8</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.8</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -5659,14 +5659,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -5769,14 +5769,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 19.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>19.0</browserVersion> <events>0</events> @@ -5879,14 +5879,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -5989,14 +5989,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 9.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>9.0</browserVersion> <events>0</events> @@ -6099,14 +6099,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 6.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -6209,14 +6209,14 @@ <deviceModel /> <operatingSystem>GNU/Linux</operatingSystem> <operatingSystemName>GNU/Linux</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/LIN.png</operatingSystemIcon> <operatingSystemCode>LIN</operatingSystemCode> <operatingSystemVersion /> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Epiphany 2.30</browser> <browserName>Epiphany</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/EP.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/EP.png</browserIcon> <browserCode>EP</browserCode> <browserVersion>2.30</browserVersion> <events>0</events> @@ -6319,14 +6319,14 @@ <deviceModel>Vision</deviceModel> <operatingSystem>Android 2.3</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion>2.3</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Android Browser</browser> <browserName>Android Browser</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/AN.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/AN.png</browserIcon> <browserCode>AN</browserCode> <browserVersion /> <events>0</events> @@ -6429,14 +6429,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>RockMelt 0.9</browser> <browserName>RockMelt</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/RM.png</browserIcon> <browserCode>RM</browserCode> <browserVersion>0.9</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml index 1d24cb751b..99e290e529 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs_siteIdThree_TrackedUsingLogReplayWithFixedSiteId__Live.getLastVisitsDetails_range.xml @@ -65,14 +65,14 @@ <deviceModel /> <operatingSystem>Windows 8.1</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8.1</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -100,15 +100,15 @@ <plugins>pdf, flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -200,14 +200,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 8.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>8.0</browserVersion> <events>0</events> @@ -305,14 +305,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 34.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>34.0</browserVersion> <events>0</events> @@ -344,23 +344,23 @@ <plugins>pdf, flash, java, quicktime, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -452,14 +452,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -487,19 +487,19 @@ <plugins>pdf, flash, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -572,14 +572,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -607,19 +607,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -694,14 +694,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -729,27 +729,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -822,14 +822,14 @@ <deviceModel /> <operatingSystem>Mac 10.9</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.9</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 7.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -857,15 +857,15 @@ <plugins>pdf, java, quicktime</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> </pluginsIcons> @@ -940,14 +940,14 @@ <deviceModel /> <operatingSystem>Android</operatingSystem> <operatingSystemName>Android</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/AND.png</operatingSystemIcon> <operatingSystemCode>AND</operatingSystemCode> <operatingSystemVersion /> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -975,7 +975,7 @@ <plugins>flash</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> </pluginsIcons> @@ -1050,14 +1050,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1085,27 +1085,27 @@ <plugins>pdf, flash, java, quicktime, windowsmedia, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/quicktime.png</pluginIcon> <pluginName>quicktime</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1220,14 +1220,14 @@ <deviceModel /> <operatingSystem>Windows 8</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>8</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 27.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>27.0</browserVersion> <events>0</events> @@ -1255,11 +1255,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1334,14 +1334,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1369,19 +1369,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1456,14 +1456,14 @@ <deviceModel /> <operatingSystem>Windows 7</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>7</operatingSystemVersion> <browserFamily>Blink</browserFamily> <browserFamilyDescription>Blink (Chrome, Opera)</browserFamilyDescription> <browser>Chrome 33.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>33.0</browserVersion> <events>0</events> @@ -1491,19 +1491,19 @@ <plugins>pdf, flash, java, silverlight</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/silverlight.png</pluginIcon> <pluginName>silverlight</pluginName> </row> </pluginsIcons> @@ -1584,14 +1584,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 6.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>6.0</browserVersion> <events>0</events> @@ -1619,11 +1619,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1696,14 +1696,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Chrome 11.0</browser> <browserName>Chrome</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/CH.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/CH.png</browserIcon> <browserCode>CH</browserCode> <browserVersion>11.0</browserVersion> <events>0</events> @@ -1731,27 +1731,27 @@ <plugins>pdf, flash, java, director, windowsmedia, gears</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/pdf.png</pluginIcon> <pluginName>pdf</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/director.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/director.png</pluginIcon> <pluginName>director</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/windowsmedia.png</pluginIcon> <pluginName>windowsmedia</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/gears.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/gears.png</pluginIcon> <pluginName>gears</pluginName> </row> </pluginsIcons> @@ -1866,14 +1866,14 @@ <deviceModel /> <operatingSystem>Mac 10.6</operatingSystem> <operatingSystemName>Mac</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/MAC.png</operatingSystemIcon> <operatingSystemCode>MAC</operatingSystemCode> <operatingSystemVersion>10.6</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari 5.0</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion>5.0</browserVersion> <events>0</events> @@ -1901,11 +1901,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml index 75c89e1aa1..2a99405309 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_1__Live.getLastVisitsDetails_month.xml @@ -140,14 +140,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -179,11 +179,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -271,14 +271,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -310,11 +310,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -445,14 +445,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -484,11 +484,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml index 13e2249fbb..c4bbb582ee 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_offsetAndLimit_2__Live.getLastVisitsDetails_month.xml @@ -78,14 +78,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -117,11 +117,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -271,14 +271,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -310,11 +310,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -402,14 +402,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -441,11 +441,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml index 7bfd771393..9f8bfc5a7e 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortAsc__Live.getLastVisitsDetails_month.xml @@ -95,11 +95,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -107,11 +107,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -216,11 +216,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -228,11 +228,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -337,11 +337,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -349,11 +349,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -458,11 +458,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -470,11 +470,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -610,11 +610,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -622,11 +622,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -762,11 +762,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemCode>WIN</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browserName>Firefox 3.6</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <deviceType>Desktop</deviceType> @@ -774,11 +774,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -906,11 +906,11 @@ <referrerSearchEngineIcon /> <operatingSystem>Unknown</operatingSystem> <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Unknown</browserFamilyDescription> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <deviceType>Desktop</deviceType> @@ -918,11 +918,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/UserSettings/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/UserSettings/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/UserSettings/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 906ac14bbe..06e1bef9a1 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -74,14 +74,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -101,11 +101,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -236,14 +236,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -263,11 +263,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -364,14 +364,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -391,11 +391,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -526,14 +526,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -553,11 +553,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -654,14 +654,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -681,11 +681,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -816,14 +816,14 @@ <deviceModel /> <operatingSystem>Unknown</operatingSystem> <operatingSystemName>Unknown</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>UNK</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Unknown</browserFamilyDescription> <browser>Unknown</browser> <browserName>Unknown</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>1</events> @@ -843,11 +843,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -936,14 +936,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -963,11 +963,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 0861763ac1..ab5f5e2975 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index e3e0da7816..6c6531774e 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -108,14 +108,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -137,11 +137,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -238,14 +238,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -267,11 +267,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -402,14 +402,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -431,11 +431,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -548,14 +548,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -577,11 +577,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -678,14 +678,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -707,11 +707,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -808,14 +808,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -837,11 +837,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -928,14 +928,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -957,11 +957,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 0861763ac1..ab5f5e2975 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index a836236262..a9c90d5638 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -68,14 +68,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>WebKit</browserFamily> <browserFamilyDescription>WebKit (Safari, Chrome)</browserFamilyDescription> <browser>Safari</browser> <browserName>Safari</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/SF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/SF.png</browserIcon> <browserCode>SF</browserCode> <browserVersion /> <events>0</events> @@ -99,11 +99,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -253,14 +253,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -292,11 +292,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -384,14 +384,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -423,11 +423,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -558,14 +558,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -597,11 +597,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -689,14 +689,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -728,11 +728,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -882,14 +882,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -921,11 +921,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1013,14 +1013,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1052,11 +1052,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1187,14 +1187,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1226,11 +1226,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1318,14 +1318,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -1357,11 +1357,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -1511,14 +1511,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>1</events> @@ -1550,11 +1550,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml index c2998323f3..cee8ad2d77 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric_constantRowsCountShouldKeepEmptyRows__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml index 72728977e1..5fb88fd638 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml index d2b191ec2f..f9671f4619 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml index 3b81bc098d..2603420cd3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowserVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml index a5759e34ec..9d976b6ea3 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getBrowsers_day.xml @@ -9,7 +9,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml index 4b9b40aeea..07e1a01b33 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsFamilies_day.xml @@ -9,6 +9,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index 9707adaacf..3086cf37f6 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml @@ -10,6 +10,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml index 72728977e1..5fb88fd638 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicePlugins.getPlugin_day.xml @@ -4,60 +4,60 @@ <label>Cookie</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Java</label> <nb_visits>2</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/java.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/java.png</logo> </row> <row> <label>Director</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/director.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/director.png</logo> </row> <row> <label>Gears</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/gears.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/gears.png</logo> </row> <row> <label>Pdf</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/pdf.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/pdf.png</logo> </row> <row> <label>Quicktime</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/quicktime.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/quicktime.png</logo> </row> <row> <label>Realplayer</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/realplayer.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/realplayer.png</logo> </row> <row> <label>Silverlight</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/silverlight.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/silverlight.png</logo> </row> <row> <label>Windowsmedia</label> <nb_visits>0</nb_visits> <nb_visits_percentage>0%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/windowsmedia.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/windowsmedia.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml index da553644d5..5d97f32abd 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml index 10868debe6..4aadf7058b 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowserVersions_day.xml @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>browserCode==FF;browserVersion==3.6</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml index 0bb4fd3f0b..8a48a353ab 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getBrowsers_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <segment>browserCode==FF</segment> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml index 59b8d0aee1..7948d87923 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsFamilies_day.xml @@ -10,6 +10,6 @@ <sum_visit_length>1621</sum_visit_length> <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml index 205baa4d5b..1f8831dbca 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__DevicesDetection.getOsVersions_day.xml @@ -11,6 +11,6 @@ <bounce_count>1</bounce_count> <nb_visits_converted>2</nb_visits_converted> <segment>operatingSystemCode==WIN;operatingSystemVersion==XP</segment> - <logo>plugins/DevicesDetection/images/os/WIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/WIN.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 1c1b8ffd04..bc89424726 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -70,14 +70,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -101,11 +101,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -282,14 +282,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -313,11 +313,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml index 000a410083..a9110fd732 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_LongUrlsTruncated__DevicePlugins.getPlugin_day.xml @@ -4,13 +4,13 @@ <label>Cookie</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/cookie.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/cookie.png</logo> </row> <row> <label>Flash</label> <nb_visits>7</nb_visits> <nb_visits_percentage>100%</nb_visits_percentage> - <logo>plugins/DevicePlugins/images/plugins/flash.gif</logo> + <logo>plugins/DevicePlugins/images/plugins/flash.png</logo> </row> <row> <label>Autres</label> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 480d02e41e..875c59cbea 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -88,11 +88,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -172,14 +172,14 @@ <deviceModel /> <operatingSystem>Bot</operatingSystem> <operatingSystemName>Bot</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/UNK.png</operatingSystemIcon> <operatingSystemCode>BOT</operatingSystemCode> <operatingSystemVersion>UNK</operatingSystemVersion> <browserFamily /> <browserFamilyDescription>Inconnu</browserFamilyDescription> <browser>Inconnu</browser> <browserName>Inconnu</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/UNK.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/UNK.png</browserIcon> <browserCode>UNK</browserCode> <browserVersion /> <events>0</events> @@ -203,11 +203,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 2fc3bd1b69..40be69f616 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -62,14 +62,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -160,14 +160,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> @@ -258,14 +258,14 @@ <deviceModel /> <operatingSystem>Windows Vista</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>Vista</operatingSystemVersion> <browserFamily>Trident</browserFamily> <browserFamilyDescription>Trident (IE)</browserFamilyDescription> <browser>Internet Explorer 7.0</browser> <browserName>Internet Explorer</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/IE.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/IE.png</browserIcon> <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <events>0</events> diff --git a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml index ec4c9be19c..2f815adae7 100644 --- a/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml +++ b/tests/PHPUnit/System/expected/test_RowEvolution_processedRowLabel__API.getRowEvolution_day.xml @@ -49,7 +49,7 @@ <metrics> <nb_visits_0> <name>Firefox (Visits)</name> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> <min>0</min> <max>1</max> </nb_visits_0> @@ -58,7 +58,7 @@ </nb_visits_1> <nb_visits_2> <name>Opera (Visits)</name> - <logo>plugins/DevicesDetection/images/browsers/OP.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/OP.png</logo> <min>0</min> <max>1</max> <change>-100%</change> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml index af302cd2d0..b4bf45b285 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml index c7f2ba93a9..90304482e5 100644 --- a/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml +++ b/tests/PHPUnit/System/expected/test_SiteSearch_CustomVariables.getCustomVariables_firstSite_lastN__API.getProcessedReport_month.xml @@ -15,8 +15,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 483c51771c..d7ecc8aaf0 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -88,11 +88,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml index fc66b8a687..8c16c382ce 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Conversions_MultiSites.getAll_firstSite_lastN__API.getProcessedReport_day.xml @@ -18,7 +18,7 @@ <ecommerce_revenue>Product Revenue</ecommerce_revenue> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_pageviews>The number of times this page was visited.</nb_pageviews> </metricsDocumentation> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml index a3c09a7a76..394432870a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_Referrers.getWebsites_firstSite_lastN__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml index 78a7a0c724..d578ec8d9a 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitorInterest.getNumberOfVisitsByDaysSinceLast_firstSite_lastN__API.getProcessedReport_day.xml @@ -14,7 +14,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsByDaysSinceLast&period=range&date=2010-01-03,2010-01-09</imageGraphUrl> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml index 2eaea47bc6..cd964f981f 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_VisitsSummary.get_firstSite_lastN__API.getProcessedReport_day.xml @@ -15,8 +15,8 @@ <max_actions>Maximum actions in one visit</max_actions> </metrics> <metricsDocumentation> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html index 43663c9b48..c75df5d90e 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_month.original.html @@ -2004,7 +2004,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2017,7 +2017,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2030,7 +2030,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2043,7 +2043,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2056,7 +2056,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2069,7 +2069,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2082,7 +2082,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2095,7 +2095,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2108,7 +2108,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2121,7 +2121,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4759,7 +4759,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4784,7 +4784,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -4809,7 +4809,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5011,7 +5011,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5036,7 +5036,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5061,7 +5061,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera 9.63 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5129,7 +5129,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5154,7 +5154,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5222,7 +5222,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -5247,7 +5247,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://apache.piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index d2606623e3..0e6b621ee2 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -550,7 +550,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/unknown.gif'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -575,7 +575,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> Desktop </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -697,7 +697,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -842,7 +842,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -867,7 +867,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -929,7 +929,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -954,7 +954,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -979,7 +979,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1041,7 +1041,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1066,7 +1066,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1091,7 +1091,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/OP.png'> Opera 9.63 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1259,7 +1259,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/UNK.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1284,7 +1284,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1440,7 +1440,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1453,7 +1453,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1466,7 +1466,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1479,7 +1479,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1492,7 +1492,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1505,7 +1505,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1518,7 +1518,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1531,7 +1531,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1544,7 +1544,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1557,7 +1557,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1607,7 +1607,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1632,7 +1632,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> France </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1777,7 +1777,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1922,7 +1922,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml index b14c503cb3..20bb6ac8e4 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryMetrics.xml @@ -183,7 +183,7 @@ <row> <name>Unique visitors</name> <id>nb_uniq_visitors</id> - <documentation>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</documentation> + <documentation>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</documentation> </row> <row> <name>Users</name> @@ -193,6 +193,6 @@ <row> <name>Visits</name> <id>nb_visits</id> - <documentation>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</documentation> + <documentation>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</documentation> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml index 190aeeea80..b89ff58332 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getGlossaryReports.xml @@ -94,7 +94,7 @@ </row> <row> <name>Referrer Type (Referrers)</name> - <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> + <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in their browser and started browsing on your website - they entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> </row> <row> <name>Region (Visitors)</name> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml index 439a50b51d..7dfd04caa5 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getMetadata_day.xml @@ -14,8 +14,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml index 4fad658db9..286c0b87bf 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getProcessedReport_day.xml @@ -16,8 +16,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index b2f868a1e0..f76ad01380 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -16,7 +16,7 @@ <ecommerce_revenue>Product Revenue</ecommerce_revenue> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_pageviews>The number of times this page was visited.</nb_pageviews> </metricsDocumentation> @@ -49,7 +49,7 @@ <ecommerce_revenue>Product Revenue</ecommerce_revenue> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_pageviews>The number of times this page was visited.</nb_pageviews> </metricsDocumentation> @@ -80,8 +80,8 @@ <max_actions>Maximum actions in one visit</max_actions> </metrics> <metricsDocumentation> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <bounce_rate>The percentage of visits that only had a single pageview. This means, that the visitor left the website directly from the entrance page.</bounce_rate> @@ -111,7 +111,7 @@ <nb_visits_converted>Visits with Conversions</nb_visits_converted> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -143,8 +143,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -183,8 +183,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -222,8 +222,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -261,8 +261,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -300,8 +300,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -340,8 +340,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -381,8 +381,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -421,8 +421,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -462,8 +462,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -502,8 +502,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -543,8 +543,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -574,7 +574,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <processedMetrics> <nb_visits_percentage>% Visits</nb_visits_percentage> @@ -597,8 +597,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -635,8 +635,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -673,8 +673,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -711,8 +711,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -751,8 +751,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> @@ -789,8 +789,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -827,7 +827,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsPerVisitDuration&period=day&date=2009-01-04</imageGraphUrl> @@ -845,7 +845,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsPerPage&period=day&date=2009-01-04</imageGraphUrl> @@ -863,7 +863,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <processedMetrics> <nb_visits_percentage>% Visits</nb_visits_percentage> @@ -884,7 +884,7 @@ <nb_visits>Visits</nb_visits> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> </metricsDocumentation> <constantRowsCount>1</constantRowsCount> <imageGraphUrl>index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=VisitorInterest&apiAction=getNumberOfVisitsByDaysSinceLast&period=day&date=2009-01-04</imageGraphUrl> @@ -927,8 +927,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -968,8 +968,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1008,8 +1008,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1611,7 +1611,7 @@ <module>Referrers</module> <action>getReferrerType</action> <dimension>Referrer Type</dimension> - <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in his browser and started browsing on your website - he entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> + <documentation>This table contains information about the distribution of the referrer types.<br /><b>Direct Entry:</b> A visitor has entered the URL in their browser and started browsing on your website - they entered the website directly.<br /><b>Search Engines:</b> A visitor was referred to your website by a search engine. <br /> See the "Search Engines & Keywords" report for more details.<br /><b>Websites:</b> The visitor followed a link on another website that led to your site. <br /> See the "Websites & Social" report for more details.<br /><b>Campaigns:</b> Visitors that came to your website as the result of a campaign. <br /> See the "Campaigns" report for more details.</documentation> <metrics> <nb_visits>Visits</nb_visits> <nb_uniq_visitors>Unique visitors</nb_uniq_visitors> @@ -1619,8 +1619,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1660,8 +1660,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1693,8 +1693,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1734,8 +1734,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1775,8 +1775,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1816,8 +1816,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -1851,8 +1851,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2298,8 +2298,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2329,8 +2329,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2361,8 +2361,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2393,8 +2393,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> @@ -2451,8 +2451,8 @@ <nb_outlinks>The number of times this link was clicked.</nb_outlinks> <nb_uniq_outlinks>The number of visits that involved a click on this link. If a link was clicked multiple times during one visit, it is only counted once.</nb_uniq_outlinks> <nb_searches>The number of visits that searched for this keyword on your website's search engine.</nb_searches> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <avg_time_generation>The average time it took to generate the page. This metric includes the time it took the server to generate the web page, plus the time it took for the visitor to download the response from the server. A lower 'Avg. generation time' means a faster website for your visitors!</avg_time_generation> diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml index e6a02bc533..7b6386371b 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata_showRawMetrics__API.getProcessedReport_day.xml @@ -16,8 +16,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex d9d1b68bf4..62850e83c2 100644 --- a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 979634a932..0033c0f4a0 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -83,14 +83,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -126,11 +126,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -306,14 +306,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -349,11 +349,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml index 26e64dd585..6806c5300d 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_Metadata_VisitTime.getVisitInformationPerServerTime__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml index 67409015ee..4a63c7e22e 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__API.getProcessedReport_day.xml @@ -16,8 +16,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 391d44947e..a1632970fc 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -166,14 +166,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -209,11 +209,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -516,14 +516,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -559,11 +559,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -748,14 +748,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -787,11 +787,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index d53b33b873..b6a1196565 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -2041,7 +2041,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2054,7 +2054,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2067,7 +2067,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2080,7 +2080,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2093,7 +2093,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2106,7 +2106,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2119,7 +2119,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2132,7 +2132,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2145,7 +2145,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -2158,7 +2158,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6486,7 +6486,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6554,7 +6554,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6622,7 +6622,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -6690,7 +6690,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index bce9dd677d..0c89298696 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -711,7 +711,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/screens/normal.gif'> Desktop </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -833,7 +833,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/brand/Unknown.ico'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -955,7 +955,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows XP </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1017,7 +1017,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1079,7 +1079,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/browsers/FF.png'> Firefox 3.6 </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1201,7 +1201,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicesDetection/images/os/WIN.png'> Windows </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1311,7 +1311,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/cookie.png'> Cookie </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1324,7 +1324,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/flash.png'> Flash </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1337,7 +1337,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/java.png'> Java </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1350,7 +1350,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/director.png'> Director </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1363,7 +1363,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/gears.png'> Gears </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1376,7 +1376,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/pdf.png'> Pdf </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1389,7 +1389,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/quicktime.png'> Quicktime </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1402,7 +1402,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/realplayer.png'> Realplayer </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1415,7 +1415,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/silverlight.png'> Silverlight </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1428,7 +1428,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.gif'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/DevicePlugins/images/plugins/windowsmedia.png'> Windowsmedia </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1478,7 +1478,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/pl.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/pl.png'> Poland </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1503,7 +1503,7 @@ <tr style=";line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/fr.png'> France </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1625,7 +1625,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> @@ -1770,7 +1770,7 @@ <tr style="background-color: rgb(242,242,242);line-height: 22px;"> <td style="font-size: 13px; border-right: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> - <img src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> + <img width="16px" height="16px" src='http://example.com/piwik/tests/PHPUnit/proxy/plugins/UserCountry/images/flags/xx.png'> Unknown </td> <td style="font-size: 13px; border-left: 1px solid rgb(217,217,217); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml index c866fba5b5..f01ce588fb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__API.getProcessedReport_range.xml @@ -15,8 +15,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index 21e1b1d26c..d69417fefd 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 21e1b1d26c..d69417fefd 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 6a412c0910..fd338a4b66 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -110,14 +110,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -149,11 +149,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -231,14 +231,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -270,11 +270,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml index c866fba5b5..f01ce588fb 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__API.getProcessedReport_range.xml @@ -15,8 +15,8 @@ <nb_actions>Actions</nb_actions> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> <avg_time_on_site>The average duration of a visit.</avg_time_on_site> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml index 21e1b1d26c..d69417fefd 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisits.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml index 21e1b1d26c..d69417fefd 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getLastVisitsDetails_range.xml @@ -57,14 +57,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -96,11 +96,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -178,14 +178,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -217,11 +217,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -360,14 +360,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.6</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <events>0</events> @@ -403,11 +403,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml index 6a412c0910..fd338a4b66 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__Live.getVisitorProfile.xml @@ -110,14 +110,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -149,11 +149,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> @@ -231,14 +231,14 @@ <deviceModel /> <operatingSystem>Windows XP</operatingSystem> <operatingSystemName>Windows</operatingSystemName> - <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.gif</operatingSystemIcon> + <operatingSystemIcon>plugins/DevicesDetection/images/os/WIN.png</operatingSystemIcon> <operatingSystemCode>WIN</operatingSystemCode> <operatingSystemVersion>XP</operatingSystemVersion> <browserFamily>Gecko</browserFamily> <browserFamilyDescription>Gecko (Firefox)</browserFamilyDescription> <browser>Firefox 3.0</browser> <browserName>Firefox</browserName> - <browserIcon>plugins/DevicesDetection/images/browsers/FF.gif</browserIcon> + <browserIcon>plugins/DevicesDetection/images/browsers/FF.png</browserIcon> <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <events>0</events> @@ -270,11 +270,11 @@ <plugins>flash, java</plugins> <pluginsIcons> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/flash.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/flash.png</pluginIcon> <pluginName>flash</pluginName> </row> <row> - <pluginIcon>plugins/DevicePlugins/images/plugins/java.gif</pluginIcon> + <pluginIcon>plugins/DevicePlugins/images/plugins/java.png</pluginIcon> <pluginName>java</pluginName> </row> </pluginsIcons> diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml index 23bcf1329b..a8c967db5e 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml index 99b2ce1993..ae73047a6d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml index 18ee2e2d93..80480a92da 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getBrowserVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> <row> <label>Firefox 6.0</label> @@ -23,7 +23,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -36,6 +36,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml index 715dc2a6a6..a3444c4edf 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_flattened__DevicesDetection.getOsVersions_day.xml @@ -10,7 +10,7 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> <row> <label>GNU/Linux</label> @@ -23,7 +23,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -36,6 +36,6 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml index 23bcf1329b..a8c967db5e 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getBrowserVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==FF;browserVersion==6.0</segment> - <logo>plugins/DevicesDetection/images/browsers/FF.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/FF.png</logo> </row> <row> <label>Internet Explorer 9.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>browserCode==IE;browserVersion==9.0</segment> - <logo>plugins/DevicesDetection/images/browsers/IE.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/IE.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>45</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/browsers/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/browsers/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml index 99b2ce1993..ae73047a6d 100644 --- a/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__DevicesDetection.getOsVersions_day.xml @@ -11,7 +11,7 @@ <bounce_count>20</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==LIN;operatingSystemVersion==</segment> - <logo>plugins/DevicesDetection/images/os/LIN.gif</logo> + <logo>plugins/DevicesDetection/images/os/LIN.png</logo> </row> <row> <label>Android 4.0</label> @@ -24,7 +24,7 @@ <bounce_count>15</bounce_count> <nb_visits_converted>0</nb_visits_converted> <segment>operatingSystemCode==AND;operatingSystemVersion==4.0</segment> - <logo>plugins/DevicesDetection/images/os/AND.gif</logo> + <logo>plugins/DevicesDetection/images/os/AND.png</logo> </row> <row> <label>Others</label> @@ -36,6 +36,6 @@ <sum_visit_length>0</sum_visit_length> <bounce_count>40</bounce_count> <nb_visits_converted>0</nb_visits_converted> - <logo>plugins/DevicesDetection/images/os/UNK.gif</logo> + <logo>plugins/DevicesDetection/images/os/UNK.png</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml index 01be2a53b2..394b8fbe22 100644 --- a/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml +++ b/tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables__subtable__API.getProcessedReport_day.xml @@ -17,8 +17,8 @@ <nb_users>Users</nb_users> </metrics> <metricsDocumentation> - <nb_visits>If a visitor comes to your website for the first time or if he visits a page more than 30 minutes after his last page view, this will be recorded as a new visit.</nb_visits> - <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if he visits the website multiple times a day.</nb_uniq_visitors> + <nb_visits>If a visitor comes to your website for the first time or if they visit a page more than 30 minutes after their last page view, this will be recorded as a new visit.</nb_visits> + <nb_uniq_visitors>The number of unduplicated visitors coming to your website. Every user is only counted once, even if they visit the website multiple times a day.</nb_uniq_visitors> <nb_actions>The number of actions performed by your visitors. Actions can be page views, internal site searches, downloads or outlinks.</nb_actions> <nb_users>The number of users logged in your website. It is the number of unique active users that have a User ID set (via the Tracking code function 'setUserId').</nb_users> <nb_actions_per_visit>The average number of actions (page views, site searches, downloads or outlinks) that were performed during the visits.</nb_actions_per_visit> diff --git a/tests/UI/expected-screenshots/DashboardManager_removed.png b/tests/UI/expected-screenshots/DashboardManager_removed.png index 82a3f3a9d0..03ecd49885 100644 --- a/tests/UI/expected-screenshots/DashboardManager_removed.png +++ b/tests/UI/expected-screenshots/DashboardManager_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:c5d3e67e9beee26b4feb388c1a251349704a75040c9d3333fc33455d83fa3756 -size 365232 +oid sha256:c868db3c1ab399cde8d451bbfa93877c6344b79919a85ecb17359355f756f737 +size 366062 diff --git a/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png b/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png new file mode 100644 index 0000000000..065744e5ba --- /dev/null +++ b/tests/UI/expected-screenshots/Dashboard_invalid_token_auth.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:9e8135200b8d1c3efb7f298e770f053970918284b9fc9cdc2196bd4f199a77f9 +size 33186 diff --git a/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png new file mode 100644 index 0000000000..cdcd8f823a --- /dev/null +++ b/tests/UI/expected-screenshots/Dashboard_loaded_token_auth.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:28a153ddf467e2d9809e2e0847ba84ecaf2237ebe4cd30d3d20af83abed5cf7a +size 536038 diff --git a/tests/UI/expected-screenshots/Dashboard_removed.png b/tests/UI/expected-screenshots/Dashboard_removed.png index 7f8db17a75..6a9f9afe36 100644 --- a/tests/UI/expected-screenshots/Dashboard_removed.png +++ b/tests/UI/expected-screenshots/Dashboard_removed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:cf3579f0bf10409d7676749c0c224b52d774dd21d171359cbcd965ad42b3926c -size 534374 +oid sha256:9d3263337b7290ee7245de98f6e9536d3bc27a2bfa19f00f1b62a3f2b962027d +size 535736 diff --git a/tests/UI/expected-screenshots/Dashboard_reset.png b/tests/UI/expected-screenshots/Dashboard_reset.png index f8b28088b6..dcfa72ad40 100644 --- a/tests/UI/expected-screenshots/Dashboard_reset.png +++ b/tests/UI/expected-screenshots/Dashboard_reset.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5d698b9577a9020d0f100199a4047b8a8d579ddde6c7f3b29a9e9662e67923b0 -size 249226 +oid sha256:6be595803eb63fa3a0bb53355d3d62b91b4ec02dcf011d44c8ebca6cf35ccd38 +size 248766 diff --git a/tests/UI/expected-screenshots/Theme_home.png b/tests/UI/expected-screenshots/Theme_home.png index d964b4da35..564acb4490 100644 --- a/tests/UI/expected-screenshots/Theme_home.png +++ b/tests/UI/expected-screenshots/Theme_home.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:341405323fc6fad225a921e8c95cc105620e64091e39145d0c8d43065f2deb6b -size 534631 +oid sha256:ee0d04bc0231261ea1b390bf40d17daf9429f3a017728487207ffc8470eaebda +size 535185 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png index 5dfe3a8dd2..ec0eb3e373 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_admin_diagnostics_configfile.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:fbc4f5fa1270655681abd6bf54a1234c8b89cbcceb8bedc155dabbcccfaadb00 -size 3518656 +oid sha256:e400562e9704150961a78839273f5762e156501bc98ff97f2543bcc8cdf5a115 +size 3518855 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png index f3c20e75ca..6f056bd58e 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard1.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:d5ee54b34b3bbe7f5710d258a047d5edd5a97579fd4283fcd7aab54d167ae29b -size 482817 +oid sha256:9205eaf8408b1c05663745b4d891f57d64fc848ae2a8e94b79fd0f1f559e38ad +size 483981 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png index 2dee64bd38..bd3053d2b4 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard2.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8978656fc4b1fe831280c928ae2977181e92ac556be424924b6984ca307330bf -size 1445920 +oid sha256:d23210324f814e4787631183b01dd9686c9b6af70c21371b9ad88f6aecbd7c96 +size 1446402 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png index 5410dbf7c7..bb577a268a 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_dashboard3.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:f553b9822241920129e8d8abc38214622c71a562089269492a426f2018bf10ca -size 428163 +oid sha256:4fdde96d9eee84ebfe9a93d386eda2a5f653cd9c715ed1ab71d929a9d8e64c56 +size 428222 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png index 73416fdd8a..979d5fad28 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_ecommerce_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:546b7a167d59cdb602f602970830e9087a6b050c531f3fe2108c691051813ec3 -size 454125 +oid sha256:440c3cda5ca21a946f7097da2305659058c06e5c6fc8fe94cc24524ed706b11c +size 454813 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png index 9db129c064..2d7e97ef09 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_menu_apidisallowed.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:1debe699b6d91a94f0ac6fdf0efadeb97cd1894e92913a4b90b22ea4dad12d1d -size 490045 +oid sha256:5636ae6b17f8bd1e399802071537ee8bfc0558700094f84b2eb4b7ecc1c2e14b +size 491277 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png index 8f6f95669b..ace02fe4d0 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_metric_tooltip.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:173e08c12b8bbcaa7149edf562257e5b937390040b2b2f02836849b456b1e8cf -size 168281 +oid sha256:c133c0a47fe8139277d12e0fd82a5145d84a22d6bfeeff18b4cde7a0e8316b04 +size 168821 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png index 026f667432..e7f02027c3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_referrers_search_engines_keywords.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:b3c76e0a99232f10c5fcdec6a37e160c920d112da4a8148754d11d08527e2bc5 -size 71650 +oid sha256:66c69b9c0dda3f16b3085b947714776ef607351ba50814cd33d68c755ca1a74d +size 71814 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png new file mode 100644 index 0000000000..47ba6dc8b9 --- /dev/null +++ b/tests/UI/expected-screenshots/UIIntegrationTest_segmented_visitorlog.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:68cf789a0eed947e56a03bfd067d70d072d66644bc49ddc58843496bdd365d30 +size 780740 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png index ca41434bf6..a046862834 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitor_profile_popup.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:0253ae4ba6f52eff347aae583c087f94bccea196c7a6d524b6dca351d9be57b8 -size 221865 +oid sha256:bfc9933ebf389ff0b85aeacb98511a4aaa8009e12e2c92eec4a01b15685e44c1 +size 222126 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png index e9107bf20c..d8f28e8748 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_devices.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:8fa0770c2b182e72d2044f8d45011b8a75cea1a71c569a810a940dd1a4c6f922 -size 95201 +oid sha256:928758c9e4b5f75083aacca0c70f70e2b1f286dee73b6c35c38dd9a911bd2808 +size 95212 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png index ff42467040..08d17ef1a3 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_realtime_map.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:eb3ef27a3e3ae39417687002c9af7600824c75fdd51be475f6716319d03860fe -size 113419 +oid sha256:1abd2d5eb3aea1922c62bf0a3dc3e016fe3e7864635a4c3a8d275c93eb9487bd +size 113272 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png index 925c37186c..67baf4e5fd 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_software.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:6d4ce63cc11da168ad1a77cddec4bc10175a4a92ef96dc4d3cd5cf05029050bf -size 158363 +oid sha256:dc82f24936677a6b2fecec702b48589de7fd1965ed2f99a04c399029073ef90c +size 160119 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png index 67ce759ddb..7756cf29eb 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:47dc2dc22184f54095c4d89ee4e3133676636b1368ed10f30e5bbe4ffe4c9ad7 -size 667319 +oid sha256:52bf7d2f5536420640b1e3d45d040baca3835cab691d2a91be088aaf1c012749 +size 666433 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png index 5e629280c5..b63d197e05 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_visitors_with_site_search_visitorlog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:49edad1dc5ad5e109ad343f4c1fa8be7d0b7bebb490f3a2fb9ce0e2236decce7 -size 103120 +oid sha256:e95c8e54dfe8372dfa46ee724adf29abc645c0fb5bce3f2e0aeec69f63da1ae2 +size 103651 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png index 303123b61e..61f9ebb95b 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_ecommercelog.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:833935057e539a8a9fec1b61e4fabd092a3cfa977582edd2fcb42bba3496f366 -size 448928 +oid sha256:4d98d162ebe7c45299e44816a7328b1df558da58756f98b43d5e85d36d334e6a +size 449633 diff --git a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png index 90f6431983..677ecabc59 100644 --- a/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png +++ b/tests/UI/expected-screenshots/UIIntegrationTest_widgetize_visitor_log.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5660573355433bf53667dc27130532a61d956afc4b94ced14cdfea45b652a4e6 -size 648443 +oid sha256:eabf0873f5f2770dd11927951387468209f68b58abc3af7d990afd8d5be328eb +size 647372 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png index 2b0bddc02e..1a9dda3f85 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_11_flattened.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:2d82e24593699fc7c1ff4bf0ef0a6977663c62f269736fb6d96bc6dd4f676072 -size 46020 +oid sha256:b233e118fa6459b94faf6e31690f677181b2e5d830bbae56a8cb7329524cfb56 +size 46518 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png index fb947262e4..3e0d937536 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_12_aggregate_shown.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:44a3fbe7628cb93eeddafd3d4efb8a1d538c2c1ef40d74343c53311c37c182d2 -size 51194 +oid sha256:d62b387394e730e1b93285b55bcac93d2c5003d3fd6142ab4d56723e269572a0 +size 51239 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png index 0a2d202649..f05763b4c3 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_related_report_click.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:98a27a2c1de6866637b5f07a7c03a5adef8154e2a9b89ab2a01d99d42a40678a -size 38513 +oid sha256:1bcc1e41c968ea3f03e1977255a1470b3573f6d8c691f9f2fdd56b0313834eb5 +size 38625 diff --git a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png index 29423f8b32..8e8f5cf26f 100644 --- a/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png +++ b/tests/UI/expected-screenshots/ViewDataTableTest_subtables_loaded.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dd914e600c8f7644be2e05d3a14dc56f017b7a38de296f1301d8f0c0f2849fb9 -size 50052 +oid sha256:ac571db707145f557518a2a1c70461cc072d086a0ac3d5d7f2795124d1667901 +size 50019 diff --git a/tests/UI/specs/Dashboard_spec.js b/tests/UI/specs/Dashboard_spec.js index 0c4f28f080..f647bdab68 100644 --- a/tests/UI/specs/Dashboard_spec.js +++ b/tests/UI/specs/Dashboard_spec.js @@ -223,4 +223,24 @@ describe("Dashboard", function () { }, done); }); + it("should load correctly with token_auth", function (done) { + testEnvironment.testUseMockAuth = 0; + testEnvironment.save(); + + expect.screenshot("loaded_token_auth").to.be.capture(function (page) { + var tokenAuth = "9ad1de7f8b329ab919d854c556f860c1"; + page.load(url.replace("idDashboard=5", "idDashboard=1") + '&token_auth=' + tokenAuth, 5000); + }, done); + }); + + it("should fail to load with invalid token_auth", function (done) { + testEnvironment.testUseMockAuth = 0; + testEnvironment.save(); + + expect.screenshot("invalid_token_auth").to.be.capture(function (page) { + var tokenAuth = "anyInvalidToken"; + page.load(url.replace("idDashboard=5", "idDashboard=1") + '&token_auth=' + tokenAuth, 5000); + }, done); + }); + }); diff --git a/tests/UI/specs/UIIntegration_spec.js b/tests/UI/specs/UIIntegration_spec.js index 2519d08f3c..be9b70efb7 100644 --- a/tests/UI/specs/UIIntegration_spec.js +++ b/tests/UI/specs/UIIntegration_spec.js @@ -94,20 +94,19 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }, done); }); - // random failure here! the 'processed' screenshot displayed in UI test viewer is actually the next processed screenshot - //it('should load visitors > visitor log page correctly', function (done) { - // expect.screenshot("visitors_visitorlog").to.be.skippedOnAbort(); - // expect.screenshot("visitors_visitorlog").to.be.captureSelector('.pageWrap', function (page) { - // page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog"); - // }, done); - //}); - // - //it('should load visitors with site search > visitor log page correctly', function (done) { - // expect.screenshot("visitors_with_site_search_visitorlog").to.be.skippedOnAbort(); - // expect.screenshot("visitors_with_site_search_visitorlog").to.be.captureSelector('.pageWrap', function (page) { - // page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog&period=day&date=2012-01-11"); - // }, done); - //}); + it('should load visitors > visitor log page correctly', function (done) { + this.retries(3); + expect.screenshot("visitors_visitorlog").to.be.captureSelector('.pageWrap', function (page) { + page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog"); + }, done); + }); + + it('should load visitors with site search > visitor log page correctly', function (done) { + this.retries(3); + expect.screenshot("visitors_with_site_search_visitorlog").to.be.captureSelector('.pageWrap', function (page) { + page.load("?" + urlBase + "#?" + generalParams + "&category=General_Visitors&subcategory=Live_VisitorLog&period=day&date=2012-01-11"); + }, done); + }); it('should load the visitors > devices page correctly', function (done) { expect.screenshot("visitors_devices").to.be.captureSelector('.pageWrap', function (page) { @@ -367,12 +366,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? // widgetize it('should load the widgetized visitor log correctly', function (done) { + this.retries(3); expect.screenshot('widgetize_visitor_log').to.be.capture(function (page) { - expect.screenshot("widgetize_visitor_log").to.be.skippedOnAbort(); page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog"); page.evaluate(function () { $('.expandDataTableFooterDrawer').click(); - }); + }, 3000); }, done); }); @@ -380,11 +379,12 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? this.retries(3); expect.screenshot('widgetize_allwebsites').to.be.capture(function (page) { page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=MultiSites&actionToWidgetize=standalone"); + page.wait(1000); }, done); }); it('should widgetize the ecommerce log correctly', function (done) { - expect.screenshot("widgetize_ecommercelog").to.be.skippedOnAbort(); + this.retries(3); expect.screenshot('widgetize_ecommercelog').to.be.capture(function (page) { page.load("?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Ecommerce&actionToWidgetize=getEcommerceLog&filter_limit=-1"); }, done); @@ -411,7 +411,7 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? }); it('should load the ecommerce log page', function (done) { - expect.screenshot("ecommerce_log").to.be.skippedOnAbort(); + this.retries(3); expect.screenshot('ecommerce_log').to.be.captureSelector('.pageWrap', function (page) { page.load("?" + urlBase + "#?" + generalParams + "&category=Goals_Ecommerce&subcategory=Goals_EcommerceLog"); }, done); @@ -688,59 +688,53 @@ describe("UIIntegrationTest", function () { // TODO: Rename to Piwik? // extra segment tests it('should load the row evolution page correctly when a segment is selected', function (done) { - var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?module=CustomVariables&action=menuGetCustomVariables&idSite=1&period=year&date=2012-01-13"; - expect.page(url).contains('.ui-dialog > .ui-dialog-content > div.rowevolution:visible', 'segmented_rowevolution', function (page) { + this.retries(3); + expect.page().contains('.ui-dialog > .ui-dialog-content > div.rowevolution:visible', /*'segmented_rowevolution',*/ function (page) { + var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13"; + page.load(url, 1000); page.click('.segmentationTitle'); - page.click('.segname:contains(From Europe)'); + page.click('.segname:contains(From Europe)', 1000); page.mouseMove('table.dataTable tbody tr:first-child'); page.mouseMove('a.actionRowEvolution:visible'); // necessary to get popover to display page.click('a.actionRowEvolution:visible'); - page.wait(1000); + page.wait(2000); }, done); }); it('should load the segmented visitor log correctly when a segment is selected', function (done) { this.retries(3); - - expect.screenshot("segmented_visitorlog").to.be.skippedOnAbort(); - - var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13"; - expect.page(url).contains('.ui-dialog > .ui-dialog-content > div.dataTableVizVisitorLog:visible', 'segmented_visitorlog', function (page) { - page.wait(1000); - page.click('.segmentationTitle'); - page.wait(500); - page.click('.segname:contains(From Europe)'); - page.wait(500); + expect.screenshot('segmented_visitorlog').to.be.captureSelector('.ui-dialog > .ui-dialog-content > div.dataTableVizVisitorLog', function (page) { + var url = "?module=CoreHome&action=index&idSite=1&period=year&date=2012-01-13#?category=General_Visitors&subcategory=CustomVariables_CustomVariables&idSite=1&period=year&date=2012-01-13"; + page.load(url, 1000); + page.evaluate(function(){ + $('.segmentationTitle').click(); + $('.segname:contains(From Europe)').click(); + }, 5000); page.mouseMove('table.dataTable tbody tr:first-child'); - page.wait(500); - page.mouseMove('a.actionSegmentVisitorLog:visible'); // necessary to get popover to display - page.wait(500); - page.click('a.actionSegmentVisitorLog:visible'); - page.wait(1000); - + page.evaluate(function(){ + var visitorLogLinkSelector = 'table.dataTable tbody tr:first-child a.actionSegmentVisitorLog'; + $(visitorLogLinkSelector).click(); + }, 2000); }, done); }); it('should not apply current segmented when opening visitor log', function (done) { this.retries(3); - var url = "?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog&segment=visitCount==2&enableAnimation=0"; - delete testEnvironment.queryParamOverride.visitorId; testEnvironment.save(); expect.screenshot("visitor_profile_not_segmented").to.be.similar(0.002).to.capture(function (page) { - page.load(url); + var url = "?" + widgetizeParams + "&" + generalParams + "&moduleToWidgetize=Live&actionToWidgetize=getVisitorLog&segment=visitCount==2&enableAnimation=0"; + page.load(url, 1000); page.evaluate(function () { $('.visitor-log-visitor-profile-link').first().click(); - }); + }, 500); - page.wait(1000); + page.wait(2000); }, done); }); - - }); diff --git a/tests/lib/screenshot-testing/support/chai-extras.js b/tests/lib/screenshot-testing/support/chai-extras.js index 7494b8910a..ffa6eebb6a 100644 --- a/tests/lib/screenshot-testing/support/chai-extras.js +++ b/tests/lib/screenshot-testing/support/chai-extras.js @@ -188,6 +188,18 @@ function capture(screenName, compareAgainst, selector, pageSetupFn, comparisonTh console.log(getPageLogsString(pageRenderer.pageLogs, " ")); } + // remove from failure list if it failed in a try before + var failures = []; + for (var i = 0; i < app.diffViewerGenerator.failures.length; i++) { + if (app.diffViewerGenerator.failures[i].name == testInfo.name && + app.diffViewerGenerator.failures[i].baseDirectory == testInfo.baseDirectory) { + app.runner.failures--; + continue; + } + failures.push(app.diffViewerGenerator.failures[i]); + } + app.diffViewerGenerator.failures = failures; + done(); }; diff --git a/tests/lib/screenshot-testing/support/page-renderer.js b/tests/lib/screenshot-testing/support/page-renderer.js index fe83cffcbc..ab756e211a 100644 --- a/tests/lib/screenshot-testing/support/page-renderer.js +++ b/tests/lib/screenshot-testing/support/page-renderer.js @@ -361,7 +361,7 @@ PageRenderer.prototype.capture = function (outputPath, callback, selector) { self.abort(); callback(new Error("Screenshot load timeout. Details:\n" + timeoutDetails)); - }, 180 * 1000); + }, 240 * 1000); if (this.webpage === null) { this._recreateWebPage(); |
