diff options
166 files changed, 7982 insertions, 1841 deletions
diff --git a/config/global.ini.php b/config/global.ini.php index 654672ecff..c8049e52f3 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -197,11 +197,6 @@ hash_algorithm = whirlpool ; For clusters, use dbtable. session_save_handler = files -; by default, Piwik uses relative URLs, so you can login using http:// or https:// -; (the latter assumes you have a valid SSL certificate). -; If set to 1, Piwik redirects the login form to use a secure connection (i.e., https). -force_ssl_login = 0 - ; If set to 1, Piwik will automatically redirect all http:// requests to https:// ; If SSL / https is not correctly configured on the server, this will break Piwik ; If you set this to 1, and your SSL configuration breaks later on, you can always edit this back to 0 diff --git a/core/DataFiles/Currencies.php b/core/DataFiles/Currencies.php index 8915268024..f8b788ce6d 100644 --- a/core/DataFiles/Currencies.php +++ b/core/DataFiles/Currencies.php @@ -1,4 +1,4 @@ -<?php + <?php /** * Piwik - Open source web analytics * @@ -8,10 +8,9 @@ */ /** - * International currencies in circulation + * International currencies in circulation. * * @see http://en.wikipedia.org/wiki/List_of_circulating_currencies - * @see http://www.iso.org/iso/currency_codes_list-1.html */ if (!isset($GLOBALS['Piwik_CurrencyList'])) { $GLOBALS['Piwik_CurrencyList'] = array( @@ -73,7 +72,6 @@ if (!isset($GLOBALS['Piwik_CurrencyList'])) { 'XCD' => array('$', 'East Caribbean dollar'), 'EGP' => array('ج.م', 'Egyptian pound'), 'ERN' => array('Nfk', 'Eritrean nakfa'), - 'EEK' => array('kr', 'Estonian kroon'), 'ETB' => array('Br', 'Ethiopian birr'), // 'EUR' => array('€', 'Euro'), 'FKP' => array('£', 'Falkland Islands pound'), @@ -103,7 +101,6 @@ if (!isset($GLOBALS['Piwik_CurrencyList'])) { 'KWD' => array('د.ك', 'Kuwaiti dinar'), 'KGS' => array('лв', 'Kyrgyzstani som'), 'LAK' => array('₭', 'Lao kip'), - 'LVL' => array('Ls', 'Latvian lats'), 'LBP' => array('ل.ل', 'Lebanese pound'), 'LSL' => array('L', 'Lesotho loti'), 'LRD' => array('$', 'Liberian dollar'), diff --git a/core/FrontController.php b/core/FrontController.php index 5c6b2b15d6..bfde6328fb 100644 --- a/core/FrontController.php +++ b/core/FrontController.php @@ -273,8 +273,8 @@ class FrontController extends Singleton } $this->handleMaintenanceMode(); - $this->handleSSLRedirection(); $this->handleProfiler(); + $this->handleSSLRedirection(); $pluginsManager = \Piwik\Plugin\Manager::getInstance(); $pluginsToLoad = Config::getInstance()->Plugins['Plugins']; @@ -440,19 +440,22 @@ class FrontController extends Singleton protected function handleSSLRedirection() { - if (!Common::isPhpCliMode() - && Config::getInstance()->General['force_ssl'] == 1 - && !ProxyHttp::isHttps() - // Specifically disable for the opt out iframe - && !(Common::getRequestVar('module', '') == 'CoreAdminHome' - && Common::getRequestVar('action', '') == 'optOut') - ) { - $url = Url::getCurrentUrl(); - $url = str_replace("http://", "https://", $url); - Url::redirectToUrl($url); + // Specifically disable for the opt out iframe + if(Piwik::getModule() == 'CoreAdminHome' && Piwik::getAction() == 'optOut') { + return; } + if(Common::isPhpCliMode()) { + return; + } + // force_ssl=1 -> whole of Piwik must run in SSL + $isSSLForced = Config::getInstance()->General['force_ssl'] == 1; + if ($isSSLForced) { + Url::redirectToHttps(); + } + } + /** * Assign CLI parameters as if they were REQUEST or GET parameters. * You can trigger Piwik from the command line by diff --git a/core/Segment.php b/core/Segment.php index ef0b72f9b6..b0e7710449 100644 --- a/core/Segment.php +++ b/core/Segment.php @@ -316,8 +316,6 @@ class Segment // first table $sql .= $tableSql; } else { - $join = ""; - if ($actionsAvailable && $table == "log_conversion") { // have actions, need conversions => join on idlink_va $join = "log_conversion.idlink_va = log_link_visit_action.idlink_va " @@ -348,8 +346,10 @@ class Segment $join = "log_conversion_item.idvisit = log_visit.idvisit"; } elseif ($conversionItemAvailable && $table === 'log_link_visit_action') { $join = "log_conversion_item.idvisit = log_link_visit_action.idvisit"; + } elseif ($conversionItemAvailable && $table === 'log_conversion') { + $join = "log_conversion_item.idvisit = log_conversion.idvisit"; } else { - throw new Exception("Table '$table', can't be joined for segmentation"); + throw new Exception("Table '$table' can't be joined for segmentation"); } // the join sql the default way diff --git a/core/Url.php b/core/Url.php index 253b6707c8..9d51e9ee02 100644 --- a/core/Url.php +++ b/core/Url.php @@ -468,6 +468,19 @@ class Url } /** + * If the page is using HTTP, redirect to the same page over HTTPS + */ + static public function redirectToHttps() + { + if(ProxyHttp::isHttps()) { + return; + } + $url = self::getCurrentUrl(); + $url = str_replace("http://", "https://", $url); + self::redirectToUrl($url); + } + + /** * Returns the **HTTP_REFERER** `$_SERVER` variable, or `false` if not found. * * @return string|false diff --git a/core/View/RenderTokenParser.php b/core/View/RenderTokenParser.php index 73e7a7a9f2..ddb21b9371 100644 --- a/core/View/RenderTokenParser.php +++ b/core/View/RenderTokenParser.php @@ -40,7 +40,9 @@ class RenderTokenParser extends Twig_TokenParser $view = $parser->getExpressionParser()->parseExpression(); $variablesOverride = new Twig_Node_Expression_Array(array(), $token->getLine()); - if ($stream->nextIf(Twig_Token::NAME_TYPE, 'with')) { + if ($stream->test(Twig_Token::NAME_TYPE, 'with')) { + $stream->next(); + $variablesOverride->addElement($this->parser->getExpressionParser()->parseExpression()); } diff --git a/lang/bg.json b/lang/bg.json index 978ea5bbec..21a8c9f9a7 100644 --- a/lang/bg.json +++ b/lang/bg.json @@ -46,6 +46,7 @@ "SiteSearchIntro": "Проследявайки търсенията, които посетителите правят на вашия сайт, е един много ефективен начин да научите повече за това, което вашата аудитория търси. Това може да помогне за намиране на идеи за ново съдържание, нови продукти и търговия, които потенциалните клиенти могат да търсят, и като цяло да подобри впечатлението на потребителя от вашия сайт.", "SiteSearchKeyword": "Ключова дума (Търсене на сайта)", "SiteSearchKeywordsDocumentation": "Този отчет описва ключовите думи, които посетителите търсят през търсачката на сайта.", + "SiteSearchKeywordsNoResultDocumentation": "Този отчет съдържа „Търсене по ключови думи“, в който няма резултати от търсенето: може би алгоритъмът на търсачката може да се подобри, или може би вашите посетители търсят съдържание, което (все още) не е на вашия сайт?", "SubmenuPagesEntry": "Входни страници", "SubmenuPagesExit": "Изходни страници", "SubmenuPageTitles": "Заглавия на страници", @@ -76,6 +77,7 @@ "IconDescHideNotes": "Скриване на бележките за този период от време.", "LoginToAnnotate": "Влезте в профила си за да създадете анотация.", "NoAnnotations": "Няма анотации за този период от време.", + "PluginDescription": "Позволява да се прикрепят бележки към различни дни, за да бъдат отбелязани промените, направени във вашия сайт. Запазва анализите в зависимост от информацията, която е предоставена и споделя мнението ви с вашите колеги. Публикувайки данните ще имате възможност да запомните по какъв начин изглеждат те.", "ViewAndAddAnnotations": "Преглеждане и добавяне на коментари за %s…", "YouCannotModifyThisNote": "Вие не можете да променяте тази анотация, защото все още не сте я създали или нямате администраторски права за този сайт." }, @@ -275,6 +277,7 @@ "PluginNotCompatibleWith": "%1$s добавка не е съвместима с %2$s.", "PluginNotWorkingAlternative": "Ако сте използвали тази добавка, може би ще намерите по-нова версия в магазина за приложения. В случай, че няма по-нова версия, може би ще желаете да деинсталирате добавката.", "PluginsManagement": "Управление на добавките", + "PluginUpdateAvailable": "Използва се версия %s и е налична нова версия %s.", "PluginVersionInfo": "%1$s от %2$s", "PluginWebsite": "Сайт за добавки", "Screenshots": "Екранни снимки", @@ -585,6 +588,7 @@ "Error": "Грешка", "ErrorRequest": "Ооопс… възникна грешка! Опитайте отново.", "EvolutionOverPeriod": "Развитие за периода", + "EvolutionSummaryGeneric": "%1$s в %2$s сравнено с %3$s в %4$s. Нарастване: %5$s", "ExceptionConfigurationFileNotFound": "Конфигурационния файл {%s} не бе намерен.", "ExceptionDatabaseVersion": "Вашата %1$s версия е %2$s ,но Piwik изисква най-малко %3$s.", "ExceptionFileIntegrity": "Цялостната проверка неуспешна: %s", @@ -855,6 +859,7 @@ "VisitTypeExample": "Например, ако изберете всички посетители, които са се завърнали на сайта, включително тези, които са купили нещо при предишните посещения, API заявката ще съдържа %s", "Warning": "Предупреждение", "WarningFileIntegrityNoManifest": "Цялостната проверка на файла не може да бъде изпълнена поради липсата на manifest.inc.php.", + "WarningFileIntegrityNoManifestDeployingFromGit": "В случай, че Piwik се внедрява посредством Git, е нормално това съобщение да се появява.", "WarningFileIntegrityNoMd5file": "Цялостната проверка не може да бъде осъществена поради липсата на md5_file() функцията.", "WarningPasswordStored": "%sВнимание:%s Тази парола ще се съхранява в конфигурационния файл видими за всички, които я ползват.", "Website": "Уебсайт", @@ -1003,6 +1008,7 @@ "InstallationStatus": "Състояние на инсталацията", "InsufficientPrivilegesHelp": "Можете да добавите тези привилегии, като използвате инструмент, като например phpMyAdmin или като стартирате правилната SQL поръчка. Ако не знаете как се правят тези неща, попитайте вашият системен администратор да ви даде тези привилегии.", "JSTracking_EndNote": "Бележка: След инсталационният процес, можете да генерирате проследяващ код от администраторската секция %1$sПроследяващ код%2$s", + "JSTracking_Intro": "За да може да се осъществи проследяване на трафика посредством Piwik, е нужно да се добави допълнителен код във всяка от вашите страници.", "LargePiwikInstances": "Помощ за големи Piwik случаи", "Legend": "Легенда", "LoadDataInfileRecommended": "Ако Piwik събира статистика за сайтове с голям брой посещения (пример: > 100 000 страници на месец), препоръчваме да се опитате да оправите този проблем.", @@ -1029,6 +1035,7 @@ "SiteSetupFootnote": "Забележка: след като инсталацията на Piwik е приключила, ще имате възможност да добавите допълнителни сайтове, които да следите!", "SuperUser": "Супер потребител", "SuperUserLogin": "СУПЕР ПОТРЕБИТЕЛСКИ вход", + "SuperUserSetupError": "Възникна грешка при добавянето на привилигирован потребител", "SuperUserSetupSuccess": "Супер потребителят беше създаден успешно!", "SystemCheck": "Проверка на системата", "SystemCheckAutoUpdateHelp": "Забележка: Piwik One Click обновяване изисква разрешение за папката Piwik и нейното съдържание.", @@ -1168,6 +1175,7 @@ "DefaultReportDate": "Дата на отчета", "EmailUs": "Пишете ни", "EnableGraphsLabel": "Покажи графики", + "EvolutionGraph": "Графика показваща историята", "HelpUsToImprovePiwikMobile": "Желаете ли да активирате анонимното проследяване в Piwik Mobile?", "HowtoDeleteAnAccount": "Натиснете продължително, за да изтриете профил.", "HowtoDeleteAnAccountOniOS": "Плъзнете от ляво на дясно за да изтриете акаунта", @@ -1200,6 +1208,7 @@ "RestrictedCompatibility": "Ограничена съвместимост", "RestrictedCompatibilityExplanation": "Версията на Piwik %s, която използвате не се поддържа изцяло от Piwik Mobile 2. Възможно е да наблюдавате проблеми при работата с приложението. Препоръчваме Ви, или да обновите Piwik до последната версия, или да използвате Piwik Mobile 1.", "SaveSuccessError": "Моля, проверете настройките", + "SearchWebsite": "Търсене в сайтове", "ShowAll": "Покажи всички", "ShowLess": "Покажи по-малко", "TopVisitedWebsites": "Най-посещаваните сайтове", @@ -1232,6 +1241,7 @@ "Settings_SMSAPIAccount": "Управление на профила за SMS приложно-програмен интерфейс", "Settings_SMSProvider": "SMS провайдър", "Settings_SuperAdmin": "Настройки на супер потребителя", + "Settings_SuspiciousPhoneNumber": "Ако не получите текстовото съобщение, може да опитате без водещата нула. т.е. %s", "Settings_UpdateOrDeleteAccount": "%sОбновяване%s или %sизтриване%s на този профил.", "Settings_ValidatePhoneNumber": "Валидиране", "Settings_VerificationCodeJustSent": "Туко-що беше изпратено кратко съобщение (SMS) до този номер с код: моля, въведете този код в горното поле и натиснете „Потвърди“.", @@ -1294,6 +1304,7 @@ "DoNotTrack_SupportDNTPreference": "Поддръжка на \"Не проследявай\" настройки.", "EstimatedDBSizeAfterPurge": "Изчислен размер на базата данни след изтриване", "EstimatedSpaceSaved": "Изчислено спестено място", + "GetPurgeEstimate": "Изчисляване на времето за изтриване", "KeepBasicMetrics": "Запазване на основните данни (посещения, посещения на страници, степен на отпадане, цели, конверсия при електронна търговия и др.)", "KeepDataFor": "Запази всичките данни за:", "KeepReportSegments": "За да запазите горната информация, също запазете сегментите на отчета.", @@ -1504,6 +1515,7 @@ "ShowTrackingTag": "покажи кода за вмъкване", "Sites": "Сайтове", "SiteSearchUse": "Можете да използвате Piwik да следи и докладва това, което посетителите търсят, посредством търсачката на сайта.", + "SuperUserAccessCan": "Потребител с права „привилигирован потребител“ може да достъпва също %sзадаване на глобални настройки%s за новите сайтове.", "Timezone": "Часова зона", "TrackingTags": "Проследяване на етикети за %s", "Urls": "Адреси", @@ -1539,6 +1551,8 @@ "CannotFindGeoIPDatabaseInArchive": "Файл %1$s не може да бъде намерен в tar архив %2$s!", "CannotFindGeoIPServerVar": "Променливата %s не е зададена. Възможно е сървърът да не е настроен правилно.", "CannotListContent": "Съдържанието за %1$s: %2$s не може да бъде заредено", + "CannotLocalizeLocalIP": "IP адрес %s е вътрешен (частен) адрес и не може да бъде определено местоположението му.", + "CannotSetupGeoIPAutoUpdating": "Изглежда, че GeoIP базата от данни се съхранява извън Piwik (няма бази от данни в папката \"misc\", но GeoIP работи). Piwik не може автоматично да обнови GeoIP базата от данни, ако те се намират извън директория \"misc\".", "CannotUnzipDatFile": "Не може да се разархивира dat файл в %1$s: %2$s", "City": "Град", "CityAndCountry": "%1$s, %2$s", @@ -1836,6 +1850,7 @@ "FromDifferentCities": "различни градове", "GeoIPCannotFindMbstringExtension": "Не може да бъде намерена %1$s функция. Уверете се, че разширение %2$s е инсталирано и заредено.", "GeoIPDatabases": "GeoIP база данни", + "GeoIPImplHasAccessTo": "Тази реализация на GeoIP има достъп до следните типове бази данни", "GeoIpLocationProviderDesc_Pecl1": "Този доставчик използва GeoIP база данни и PECL модул, за да определи точно и ефективно местоположението на посетителите.", "GeoIpLocationProviderDesc_Pecl2": "Няма ограничения с този доставчик. Поради тази причина, това е вариантът, който е препоръчително да бъде използван.", "GeoIpLocationProviderDesc_Php1": "Този доставчик е най-лесен за инсталиране, тъй като не изисква сървърна конфигурация (идеален за споделен хостинг!). Той използва база данни GeoIP и MaxMind PHP API, за да определя точното местоположение на посетителите.", @@ -1855,12 +1870,15 @@ "HowToInstallGeoIPDatabases": "Как да взема GeoIP база данни?", "HowToInstallGeoIpPecl": "Как се инсталира GeoIP PECL разширение?", "HowToInstallNginxModule": "Как се инсталира GeoIP модул за Nginx?", + "HowToSetupGeoIP": "Как се настройва точно местоположение с GeoIP", "HowToSetupGeoIP_Step1": "%1$sСвалете%2$s GeoLite City базата данни от %3$sMaxMind%4$s.", "HowToSetupGeoIP_Step2": "Разархивирайте файла и копирайте резултата, %1$s в Piwik поддиректорията %2$sразни%3$s (можете да направите това посредством FTP или SSH).", "HowToSetupGeoIP_Step3": "Презареждане на този екран. Доставчикът на %1$sGeoIP (PHP)%2$s, ще бъде %3$sинсталиран%4$s. Избиране.", "HowToSetupGeoIP_Step4": "И сте готови! Вие току-що настроихте Piwik да използва GeoIP, което означава, че ще бъдете в състояние да видите регионите и градовете, от които посетителите достъпват вашия сайт, заедно с много точна информация за страната.", "HowToSetupGeoIPIntro": "Изглежда, че настройката, за определяне на местоположението, не е направена. Това е полезна функция и без нея няма да се вижда точна и пълна информация за местоположението на посетителите. Ето и начин, по който може бързо да започнете да го използвате:", "HttpServerModule": "HTTP сървърен модул", + "InvalidGeoIPUpdatePeriod": "Невалиден период за обновяването на GeoIP: %1$s. Валидните стойности са %2$s.", + "IPurchasedGeoIPDBs": "Купих още %1$sпрецизни бази данни от MaxMind%2$s и искам да настроя автоматични актуализации.", "ISPDatabase": "ISP база данни", "IWantToDownloadFreeGeoIP": "Искам да изтегля безплатната GeoIP база данни...", "Latitude": "Географска ширина", @@ -2159,6 +2177,7 @@ "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth очаква MD5-хеширана парола (32 символа дълъг низ). Моля, извикайте md5() функцията на паролата преди да извикате този метод.", "ExceptionRemoveSuperUserAccessOnlySuperUser": "Премахването на права на привилигирован потребител за потребител '%s' не е възможно.", "ExceptionUserDoesNotExist": "Потребителя '%s' не съществува.", + "ExceptionYouMustGrantSuperUserAccessFirst": "Трябва да съществува поне един привилигирован потребител. Моля, дайде нужните права на друг потребител.", "ExcludeVisitsViaCookie": "Изключете Вашите посещения с помощта на бисквитка", "ForAnonymousUsersReportDateToLoadByDefault": "За анонимни потребители, дата доклад да се зареди по подразбиране", "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Ако желаете да промените паролата си, въведете нова. В противен случай оставете полето празно.", @@ -2176,6 +2195,9 @@ "PrivView": "Преглед", "ReportDateToLoadByDefault": "Отчет от дата да се зареди по подразбиране", "ReportToLoadByDefault": "Доклад за зареждане по подразбиране", + "SuperUserAccessManagement": "Управление на достъпа на привилигированите потребители", + "SuperUserAccessManagementGrantMore": "Тук могат да се предоставят права „привилигирован потребител“ на потребителите. Тази функция трябва да се използва внимателно.", + "SuperUserAccessManagementMainDescription": "Привилигированите потребители имат пълни права. Те могат да извършват всички административни задачи, като например добавяне на нови уебсайтове за наблюдение, добавяне на потребители, промяна на потребителския достъп, активиране и деактивиране на добавки и дори инсталация на нови добавки от магазина.", "TheLoginScreen": "В екрана за вход", "ThereAreCurrentlyNRegisteredUsers": "Има %s регистрирани потребители.", "TypeYourPasswordAgain": "Вашата нова парола отново.", diff --git a/lang/da.json b/lang/da.json index 33f727dc5c..79f144cfb4 100644 --- a/lang/da.json +++ b/lang/da.json @@ -141,6 +141,7 @@ "LatestStableRelease": "Den seneste stabile udgave", "LogoNotWriteable": "For at anvende et brugerdefineret logo, kræver Piwik skrive adgang til logofilerne i skabelonmappen: %s", "LogoUpload": "Vælg et logo til overførelse", + "LogoUploadHelp": "Overfør en fil i %s formater med en højde på mindst %s pixels.", "MenuDiagnostic": "Diagnosticering", "MenuGeneralSettings": "Generelle indstillinger", "MenuManage": "Administrere", @@ -152,6 +153,7 @@ "PiwikIsInstalledAt": "Piwik er installeret på", "PluginDescription": "Piwik administration.", "PluginSettingChangeNotAllowed": "Du må ikke ændre værdien \"%s\" i udvidelse \"%s\"", + "PluginSettings": "Programudvidelses indstilinger", "PluginSettingsIntro": "Her kan du ændre indstillingerne for følgende 3. parts udvidelsesmoduler:", "PluginSettingsValueNotAllowed": "Værdien for feltet \"%s\" i udvidelsen \"%s\" er ikke tilladt", "StableReleases": "Hvis Piwik er en kritisk del af virksomheden, anbefaler vi at man bruger den nyeste stabile udgave. Hvis man bruger den nyeste beta, og finder en fejl eller har et forslag, %sse her%s.", @@ -227,32 +229,86 @@ "YouAreUsingTheLatestVersion": "Du bruger den seneste version af Piwik!" }, "CorePluginsAdmin": { + "ActionActivatePlugin": "Aktiver programudvidelse", + "ActionActivateTheme": "Aktiver tema", + "ActionInstall": "Installer", + "ActionUninstall": "Afinstaller", "Activate": "Aktiver", "Activated": "Aktiveret", "Active": "Aktiv", + "Activity": "Aktivitet", "AuthorHomepage": "Forfatter hjemmeside", + "Authors": "Forfattere", + "BackToExtendPiwik": "Tilbage til markedspladsen", + "BeCarefulUsingPlugins": "Programudvidelser, der ikke er forfattet af Piwik holdet skal anvendes med forsigtighed: vi har ikke kontrolleret dem.", + "BeCarefulUsingThemes": "Temaer, der ikke er forfattet af Piwik holdet skal anvendes med forsigtighed: vi har ikke kontrolleret dem.", + "ByDesigningOwnTheme": "ved %sdesign af dit eget tema%s", + "ByInstallingNewPluginFromMarketplace": "ved at %sinstallere en ny programudvidelse fra markedspladsen%s", + "ByWritingOwnPlugin": "ved at %sskrive din egen programudvidelse%s", + "ByXDevelopers": "af %s udviklere", + "Changelog": "Ændringslog", + "ChangeSettingsPossible": "Du kan ændre %sindstillinger%s for denne programudvidelse", "Deactivate": "Deaktiver", + "Developer": "Udvikler", + "DoMoreContactPiwikAdmins": "For at installere en ny programudvidelse eller et nyt tema, kontakt Piwik administratoren.", + "DownloadAndInstallPluginsFromMarketplace": "Du kan automatisk hente og installere nye programudvidelser fra %smarkedspladsen%s.", + "FeaturedPlugin": "Udvalgte programudvidelser", + "GetNewFunctionality": "Få ny funktionalitet", "Inactive": "Inaktiv", + "InfoPluginUpdateIsRecommended": "Opdater dine programudvidelser nu og drag fordel af de seneste forbedringer.", + "InfoThemeIsUsedByOtherUsersAsWell": "Bemærk: Den anden %1$s bruger der er registreret i denne Piwik bruger også temaet %2$s.", + "InfoThemeUpdateIsRecommended": "Opdater dine temaer for at nyde den nyeste version.", + "InstallingPlugin": "Installerer %s", "InstallNewPlugins": "Installer nye udvidelser", "InstallNewThemes": "Installer nye temaer", + "LastUpdated": "Sidst opdateret", "LicenseHomepage": "Licens hjemmeside", "MainDescription": "Udvidelsesmoduler udvider funktionaliteten i Piwik. Når et udvidelsesmodul er installeret, kan det aktiveres eller deaktiveres her.", + "Marketplace": "Markedsplads", + "MarketplaceSellPluginSubject": "Markedspladsen - Sælg programudvidelser", "MenuPlatform": "Platform", + "MissingRequirementsNotice": "Husk at opdatere %1$s %2$s til en nyere version, %1$s %3$s er påkrævet.", + "NotAllowedToBrowseMarketplacePlugins": "Du kan gennemse listen over programudvidelser, der kan installeres for at tilpasse eller udvide din Piwik platform. Kontakt din administrator, hvis du har brug for nogen af disse installeret.", + "NotAllowedToBrowseMarketplaceThemes": "Du kan gennemse listen over temaer, der kan installeres for at tilpasse udseendet af Piwik platformen. Kontakt din administrator for at få nogen af disse installeret.", + "NoThemesFound": "Ingen temaer fundet", "NoZipFileSelected": "Vælg venligst en ZIP-fil.", + "NumDownloadsLatestVersion": "Nyeste version: %s Overførsler", + "OrByUploadingAPlugin": "eller ved %soverføre en programudvidelse%s", "Origin": "Kilde", "OriginCore": "Kernen", "OriginThirdParty": "Tredjeparts", "PluginDescription": "Programudvidelses administration.", "PluginHomepage": "Udvidelsesmodul hjemmeside", + "PluginKeywords": "Nøgleord", "PluginNotCompatibleWith": "%1$s udvidelsesmodul er ikke kompatibelt med %2$s.", + "PluginNotWorkingAlternative": "Hvis du har brugt programudvidelsen,kan du måske finde en nyere version på markedspladen. Hvis ikke, kan du afinstallere den.", "PluginsManagement": "Udvidelsesmodul administration", + "PluginVersionInfo": "%1$s fra %2$s", + "PluginWebsite": "Programudvidelsens hjemmeside", + "Screenshots": "Skærmbilleder", + "SortByAlpha": "alpha", + "SortByNewest": "nyeste", + "SortByPopular": "populær", "Status": "Status", + "StepReplaceExistingTheme": "Erstatter eksisterende tema", + "StepUnzippingPlugin": "Udpakker programudvidelse", + "StepUnzippingTheme": "Udpakker tema", + "SuccessfullyActicated": "Du har aktiveret <strong>%s<\/strong>.", + "Support": "Support", + "TeaserExtendPiwik": "Udvid Piwik med programudvidelser og temaer", + "TeaserExtendPiwikByPlugin": "Udvid Piwik ved at installere en ny programudvidelse", + "TeaserExtendPiwikByTheme": "Ændre udseendet ved at installere et nyt tema", + "TeaserExtendPiwikByUpload": "Udvid Piwik ved at overføre en ZIP-fil", "Theme": "Tema", "Themes": "Temaer", "ThemesDescription": "Temaer kan ændre udseendet af Piwik brugergrænsefladen,og giver en helt ny visuel oplevelse af dine analytiske rapporter.", "ThemesManagement": "Håndtere temaer", "UninstallConfirm": "Du er ved at afinstallere et udvidelsesmodul %s. Udvidelsesmodulet vil blive fjernet helt fra dit system og vil ikke kunne genskabes. Er du sikker på du vil gøre det?", - "Version": "Version" + "Updated": "Opdateret", + "UpdatingPlugin": "Opdaterer %s", + "UploadZipFile": "Overfør ZIP-fil", + "Version": "Version", + "ViewRepositoryChangelog": "Se ændringerne" }, "CoreUpdater": { "ClickHereToViewSqlQueries": "Klik her for at se og kopiere listen over SQL-forespørgsler, der vil blive udført", @@ -353,6 +409,7 @@ "PluginDescription": "Ignorer besøg med X-Do-Not-Track eller DNT header." }, "Events": { + "Event": "Hændelse", "EventAction": "Hændelsesaktion", "EventCategory": "Hændelseskategori", "EventName": "Hændelsesnavn", @@ -531,6 +588,7 @@ "ErrorRequest": "Ups... problemer, prøv igen.", "EvolutionOverPeriod": "Udvikling i perioden", "EvolutionSummaryGeneric": "%1$s i %2$s sammenlignet med %3$s i %4$s. Udvikling: %5$s", + "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Brugeren skal være enten en superbruger eller brugeren '%s' selv.", "ExceptionConfigurationFileNotFound": "Konfigurationsfilen (%s) blev ikke fundet.", "ExceptionDatabaseVersion": "%1$s version er %2$s, men Piwik behøver mindst version %3$s.", "ExceptionFileIntegrity": "Integritetstjek mislykkedes: %s", @@ -629,6 +687,7 @@ "MonthlyReports": "Månedlige rapporter", "More": "Mer", "MoreDetails": "Flere detaljer", + "MoreLowerCase": "mere", "MultiSitesSummary": "Alle hjemmesider", "Name": "Navn", "NbActions": "Antal handlinger", @@ -713,6 +772,7 @@ "Remove": "Fjern", "Report": "Rapport", "ReportGeneratedFrom": "Denne rapport blev genereret med data fra %s.", + "ReportRatioTooltip": "'%1$s' repræsenterer %2$s af %3$s %4$s med %5$s.", "Reports": "Rapporter", "ReportsContainingTodayWillBeProcessedAtMostEvery": "Rapporter for i dag (eller ethvert andet datointerval herunder i dag) vil blive udført mindst hver", "ReportsWillBeProcessedAtMostEveryHour": "Rapporterne vil derfor blive behandlet højst hver time.", @@ -771,6 +831,7 @@ "TimeOnPage": "Tid på siden", "Today": "I dag", "Total": "Total", + "TotalRatioTooltip": "Dette er %1$s af alle %2$s %3$s.", "TotalRevenue": "Indtægter i alt", "TotalVisitsPageviewsRevenue": "(Total: %s besøgende, %s sidevisninger, %s indtjening)", "TransitionsRowActionTooltip": "See hvad besøgende gjorde før og efter de så denne side", @@ -894,6 +955,7 @@ "NewGoalYouWillBeAbleTo": "Du vil kunne se og analysere dine præstationer for hvert mål, og lære hvordan man kan øge konverteringer, konverteringsfrekvenser og indtægter pr besøg.", "NewVisitorsConversionRateIs": "Nye besøgendes konverteringsrate er %s", "NewWhatDoYouWantUsersToDo": "Hvad vil du have dine brugere til at gøre på din hjemmeside?", + "NoGoalsNeedAccess": "Kun en administrator eller en bruger med superbruger adgang kan tilføje mål for et bestemt websted. Spørg din Piwik administratore om at opstille et mål for dit websted. <br>Sporing mål er en fantastisk måde til at forstå og maksimere dit websteds effektivitet!", "Optional": "(valgfri)", "OverallConversionRate": "%s samlet konverteringsrate (besøg med et færdigt mål)", "OverallRevenue": "%s samlede indtægter", @@ -923,6 +985,7 @@ "PluginDescription": "Generere flotte statiske PNG diagrammer til Piwik rapporter." }, "Installation": { + "CollaborativeProject": "Piwik er et samarbejdsprojekt, bygget med kærlighed af folk fra hele verden.", "CommunityNewsletter": "send e-mail med opdateringer (nye udvidelsesmoduler, nye muligheder m.m.)", "ConfigurationHelp": "Piwik konfigurationsfil synes at være konfigureret forkert. Fjern enten config\/config.ini.php og genoptage installation eller ret database forbindelsesindstillinger.", "ConfirmDeleteExistingTables": "Bekræft sletning af tabellerne: %s fra databasen? ADVARSEL: DATA FRA DISSE TABELLER KAN IKKE GENSKABES!", @@ -944,6 +1007,7 @@ "ErrorInvalidState": "Fejl: Det lader til at du forsøger at springe et skridt af installationen over, eller cookies er slået fra, eller Piwik konfigurationsfil allerede er oprettet. %1$sSørg for, at cookies er aktiveret%2$s og gå tilbage %3$s til den første side i installationen %4$s.", "Extension": "udvidelse", "Filesystem": "Filsystem", + "GetInvolved": "Hvis du kan lide hvad du ser, kan du %1$sblive involveret%2$s.", "GoBackAndDefinePrefix": "Gå tilbage og opret præfiks for Piwik tabeller", "Installation": "Installation", "InstallationStatus": "Installationstatus", @@ -980,6 +1044,7 @@ "SiteSetupFootnote": "Bemærk: når Piwik installationen er færdig, vil du have mulighed for at tilføje flere hjemmesider som du vil spore!", "SuperUser": "Superbruger", "SuperUserLogin": "Superbruger navn", + "SuperUserSetupError": "Der opstod en fejl ved tilføjelse af superbruger", "SuperUserSetupSuccess": "Superbruger oprettet.", "SystemCheck": "Systemcheck", "SystemCheckAutoUpdateHelp": "Note: Piwik's ét klik opdatering kræver skrive-tilladelser til Piwik mappen og dens indhold.", @@ -991,6 +1056,7 @@ "SystemCheckExtensions": "Andre nødvendige udvidelser", "SystemCheckFileIntegrity": "Filintegritet", "SystemCheckFunctions": "Nødvendige funktioner", + "SystemCheckGDFreeType": "GD > 2.x + Freetype (grafik)", "SystemCheckGDHelp": "Mindre grafiske elementer (i Piwik Mobile app og e-mail-rapporter) vil ikke fungere som ønsket.", "SystemCheckGlobHelp": "Den indbyggede funktion er blevet deaktiveret på din vært. Piwik vil forsøge at efterligne funktionen, men kan støde yderligere sikkerhedsrestriktioner. Funktionaliteten kan blive påvirket.", "SystemCheckGzcompressHelp": "zlib udvidelsen og gzcompress funktionen skal aktiveres.", @@ -1039,8 +1105,10 @@ "TablesWarningHelp": "Vælg enten at genbruge de eksisterende tabeller eller vælg en ren installation for at slette alle eksisterende data.", "TablesWithSameNamesFound": "Nogle %1$s tabeller i databasen %2$s har samme navn, som dem Piwik prøver at oprette", "Timezone": "hjemmeside tidszone", + "WeHopeYouWillEnjoyPiwik": "Vi håber du vil nyde at bruge Piwik så meget, som vi nyder at lave det.", "Welcome": "Velkommen!", - "WelcomeHelp": "<p>Piwik er et Open Source statistik-program som gør det nemt at finde information om besøgende.<\/p><p> Processen er delt op i %s lette trin og vil tage ca. 5 minutter.<\/p>" + "WelcomeHelp": "<p>Piwik er et Open Source statistik-program som gør det nemt at finde information om besøgende.<\/p><p> Processen er delt op i %s lette trin og vil tage ca. 5 minutter.<\/p>", + "WelcomeToCommunity": "Velkommen til fællesskab om Piwik!" }, "LanguagesManager": { "AboutPiwikTranslations": "Om Piwik oversættelser", @@ -1087,6 +1155,7 @@ "Login": { "ConfirmationLinkSent": "Et bekræftelselink er blevet sendt til din indbakke. Tjek din e-mail og besøg dette link for at godkende ændringen af din adgangskode.", "ContactAdmin": "Mulig årsag: udbyderen har måske deaktiveret mail()-funktionen. <br \/>Kontakt Piwik administrator.", + "ExceptionInvalidSuperUserAccessAuthenticationMethod": "En bruger med superbruger adgang kan ikke godkendes ved hjælp af '%s' mekanisme.", "ExceptionPasswordMD5HashExpected": "Adgangskode parameteren forventes at være en MD5 hash af adgangskoden.", "InvalidNonceOrHeadersOrReferrer": "Formularsikkerhed fejlede. Genindlæs formularen og kontroller, at dine cookies er aktiveret. Hvis du bruger en proxyserver, skal du %s konfigurere Piwik til at acceptere proxyheaderen%s, der videresender hostheaderen. Kontroller også, at din Referer header er sendt korrekt", "InvalidOrExpiredToken": "Nøglen er forkert eller udløbet", @@ -1354,7 +1423,8 @@ "WidgetGetAll": "Alle henvisninger", "WidgetKeywords": "Søgeord", "WidgetSocials": "Liste af sociale netværk", - "WidgetTopKeywordsForPages": "Top søgeord til side URL" + "WidgetTopKeywordsForPages": "Top søgeord til side URL", + "XPercentOfVisits": "%s%% af besøg" }, "RowEvolution": { "AvailableMetrics": "Tilgængelige målinger", @@ -1364,6 +1434,7 @@ "Documentation": "Klik på målinger for at få vist udviklingen på en stor graf. Brug shift-klik for at vise flere målinger samtidigt.", "MetricBetweenText": "mellem %s og %s", "MetricChangeText": "%s over perioden", + "MetricMinMax": "%1$s varierede mellem %2$s og %3$s over perioden", "MetricsFor": "Målinger for %s", "MultiRowEvolutionTitle": "Udviklingen i flere rækker", "PickAnotherRow": "Vælg en anden række at sammenligne", @@ -1433,6 +1504,8 @@ "SegmentDisplayedAllWebsites": "alle websteder", "SegmentDisplayedThisWebsiteOnly": "kun dette websted", "SegmentIsDisplayedForWebsite": "og vises for", + "SegmentNotApplied": "Segment '%s' anvendes ikke", + "SegmentNotAppliedExplanation": "Du beder om data til brugerdefineret Segment '%s', den nuværende Piwik konfiguration forhindrer tidstro behandling af rapporter for dette segment. Spørg Piwik admin om at ændre indstillingen i konfigurationsfilen (%s). Du kan også redigere dette segment, og vælge '%s'.", "SelectSegmentOfVisitors": "Vælg et segment af besøgende:", "ThisSegmentIsVisibleTo": "Segmentet er synligt for:", "VisibleToAllUsers": "Alle brugere", @@ -1515,8 +1588,9 @@ "SelectDefaultCurrency": "Vælg standard valuta for nye hjemmesider.", "SelectDefaultTimezone": " Vælg standard tidszone for nye hjemmesider.", "ShowTrackingTag": "Vis sporingskode", - "Sites": "jemmesider", + "Sites": "Hjemmesider", "SiteSearchUse": "Du kan bruge Piwik til at spore og rapportere hvad besøgende søger efter i hjemmesidens interne søgemaskine.", + "SuperUserAccessCan": "En bruger med superbruger adgang kan også %s angive globale indstillinger %s for nye hjemmesider.", "Timezone": "Tidszone", "TrackingSiteSearch": "Sporing af intern webstedssøgning", "TrackingTags": "Sporingskode for %s", @@ -1868,6 +1942,7 @@ "GeoIpLocationProviderDesc_ServerBased1": "Lokasationstjenesten bruger det GeoIP-modul, der er installeret i din HTTP-server. Tjenesten er hurtig og præcis, men %1$skan kun bruges med normal browser tracking.%2$s", "GeoIpLocationProviderDesc_ServerBased2": "Hvis du skal importere logfiler eller gøre noget andet, der kræver indstilling af IP-adresser, skal du bruge %1$sPECL GeoIP implementering (anbefales)%2$s eller %3$sPHP GeoIP implementering%4$s.", "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Bemærk: IP anonymisering har ingen effekt på de lokationer som rapporteres af denne tjeneste. Før du bruger den på IP anonymisering, så vær sikker på, at det ikke strider mod de gældende regler for privatliv.", + "GeoIpLocationProviderNotRecomnended": "Geolocation virker, men du bruger ikke en af de anbefalede udbydere.", "GeoIPNoServerVars": "Piwik kan ikke finde nogen GeoIP %s variable.", "GeoIPPeclCustomDirNotSet": "%s PHP ini indstillingen er ikke sat.", "GeoIPServerVarsFound": "Piwik registrerer følgende GeoIP %s variabler", @@ -1917,6 +1992,7 @@ "ToGeolocateOldVisits": "For at få lokaliseringsdata for gamle besøg, brug scriptet beskrevet %1$sher%2$s.", "UnsupportedArchiveType": "Ikke understøttet arkivtype %1$s fundet.", "UpdaterHasNotBeenRun": "Opdateringsprogrammet har aldrig været kørt.", + "UpdaterIsNotScheduledToRun": "Det er ikke planlagt til at køre i fremtiden.", "UpdaterWasLastRun": "Opdateringen blev sidst blev kørt den %s.", "WidgetLocation": "Besøgendes lokation" }, @@ -2181,6 +2257,7 @@ "ExceptionAccessValues": "Parameteren skal have en af de følgende værdier: [ %s ]", "ExceptionAdminAnonymous": "Administrator-adgang kan ikke gives til 'anonyme'-bruger.", "ExceptionDeleteDoesNotExist": "Bruger '%s' eksisterer ikke, og kan derfor ikke slettes.", + "ExceptionDeleteOnlyUserWithSuperUserAccess": "Sletning af bruger '%s' er ikke mulig.", "ExceptionEditAnonymous": "Anonyme brugere kan ikke redigeres eller slettet. Anvendes af Piwik til at definere en bruger, som ikke er blevet logget på endnu. F. eks. kan du gøre statistikken offentlig ved at give 'se' adgang til 'anonym' bruger", "ExceptionEmailExists": "Bruger med e-mail '%s' findes allerede.", "ExceptionInvalidEmail": "E-mailadressen er ikke i gyldigt format.", @@ -2199,12 +2276,14 @@ "MenuUsers": "Brugere", "MenuUserSettings": "Bruger indstillinger", "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Bemærk: Indstillingerne kan ikke ændres i denne del, fordi der ikke er en hjemmeside, der kan tilgås af den anonyme bruger.", + "NoUsersExist": "Der er endnu ingen brugere.", "PluginDescription": "Brugere styring i Piwik: tilføje en ny bruger, redigere en eksisterende, opdatere tilladelserne. Alle handlinger er også tilgængelige via API.", "PrivAdmin": "Administration", "PrivNone": "Ingen adgang", "PrivView": "Vis", "ReportDateToLoadByDefault": "Standard rapport dato", "ReportToLoadByDefault": "Standard rapport", + "SuperUserAccessManagement": "Administr superbruger adgang", "TheLoginScreen": "Log på skærmbillede", "ThereAreCurrentlyNRegisteredUsers": "Der er i øjeblikket %s registrerede brugere.", "TypeYourPasswordAgain": "Gentag den nye adgangskode.", diff --git a/lang/de.json b/lang/de.json index 620fd958e2..02027d1387 100644 --- a/lang/de.json +++ b/lang/de.json @@ -311,7 +311,7 @@ "StepThemeSuccessfullyUpdated": "Sie haben erfolgreich das Theme %1$s %2$s aktualisiert.", "StepUnzippingPlugin": "Entpacke Plugin", "StepUnzippingTheme": "Entpacke Theme", - "SuccessfullyActicated": "Sie haben erfolgreich <strong>%s<\/strong> aktiviert.", + "SuccessfullyActicated": "Sie haben <strong>%s<\/strong> erfolgreich aktiviert.", "Support": "Support", "TeaserExtendPiwik": "Erweitere Piwik mit Plugins und Themes", "TeaserExtendPiwikByPlugin": "Erweitern Sie Piwik durch die Installation von Plugins", @@ -607,6 +607,7 @@ "ErrorRequest": "Einen Moment bitte. Wir laden die erforderlichen Daten. Bitte neu laden, falls längere Zeit keine Aktion ausgeführt wird.", "EvolutionOverPeriod": "Entwicklung über den Zeitraum", "EvolutionSummaryGeneric": "%1$s in %2$s verglichen mit %3$s in %4$s. Entwicklung: %5$s", + "ExceptionCheckUserHasSuperUserAccessOrIsTheUser": "Der Benutzer muss entweder ein Super-User sein oder der Benutzer '%s'.", "ExceptionConfigurationFileNotFound": "Die Konfigurationsdatei {%s} wurde nicht gefunden.", "ExceptionDatabaseVersion": "Ihre %1$s-Version ist %2$s, aber Piwik benötigt mindestens %3$s", "ExceptionFileIntegrity": "Integritätsprüfung fehlgeschlagen: %s", @@ -881,6 +882,7 @@ "VisitTypeExample": "Um beispielsweise alle wiederkehrenden Besucher abzufragen, die Bestellungen getätigt haben, muss der API Aufruf folgendes enthalten: %s", "Warning": "Warnung", "WarningFileIntegrityNoManifest": "Aufgrund der fehlenden Datei manifest.inc.php konnte die Integritätsprüfung nicht durchgeführt werden.", + "WarningFileIntegrityNoManifestDeployingFromGit": "Wenn Sie Piwik von Git deployen ist diese Nachricht normal.", "WarningFileIntegrityNoMd5file": "Durch die fehlende md5_file() Funktion konnte die Integritätsprüfung nicht durchgeführt werden.", "WarningPasswordStored": "%sWarnung:%s Dieses Passwort wird in der Konfigurationsdatei gespeichert und ist so für jeden sichtbar, der auf diese Datei Zugriff hat.", "Website": "Webseite", @@ -1060,6 +1062,7 @@ "SiteSetupFootnote": "Hinweis: Nachdem die Installation von Piwik fertiggestellt wurde ist es möglich weitere Webseiten hinzuzufügen!", "SuperUser": "Hauptadministrator", "SuperUserLogin": "Hauptadministrator Login", + "SuperUserSetupError": "Beim Hinzufügen des Super-Users ist ein Fehler aufgetreten.", "SuperUserSetupSuccess": "Hauptadministrator erfolgreich angelegt!", "SystemCheck": "Systemprüfung", "SystemCheckAutoUpdateHelp": "Hinweis: Piwik's Ein-Klick-Aktualisierung benötigt Schreibrechte für den Piwik-Ordner und dessen Inhalt.", @@ -1168,6 +1171,7 @@ "Login": { "ConfirmationLinkSent": "Ein Bestätigungslink wurde an deinen Posteingang verschickt. Überprüfe deine E-Mails und besuche diesen Link um die Passwortänderung zu bestätigen.", "ContactAdmin": "Möglicher Grund: Der Server könnte die mail()-Funktion deaktiviert haben.<br\/>Bitte sprechen Sie mit Ihrem Piwik-Administrator.", + "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Ein Benutzer mit Super-User Berechtigung kann nicht mit der Methode '%s' authentifiziert werden.", "ExceptionPasswordMD5HashExpected": "Der 'password'-Parameter wird als MD5-Hash des Passworts erwartet.", "InvalidNonceOrHeadersOrReferrer": "Sicherheitschecks fehlgeschlagen. Bitte laden Sie das Formular erneut und prüfen Sie, ob Ihr Browser Cookies zulässt. Wenn Sie einen Proxy Server verwenden, müssen Sie %sPiwik so einrichten, dass es Proxy Header akzeptiert%s.", "InvalidOrExpiredToken": "Der Token ist ungültig oder dessen Gültigkeitsdauer ist bereits abgelaufen.", @@ -2266,6 +2270,7 @@ "ExceptionAccessValues": "Der Parameter access muss einen der folgenden Werte enthalten: [ %s ]", "ExceptionAdminAnonymous": "Das 'admin'-Recht kann nicht an 'anonymous' Benutzer vergeben werden.", "ExceptionDeleteDoesNotExist": "Der Benutzer '%s' existiert nicht und kann daher auch nicht gelöscht werden.", + "ExceptionDeleteOnlyUserWithSuperUserAccess": "Das Löschen des Benutzers '%s' is nicht möglich.", "ExceptionEditAnonymous": "Der anonyme Benutzer kann nicht bearbeitet oder gelöscht werden. Er wird von Piwik benutzt, um einen Benutzer zu definieren, der sich noch nicht angemeldet hat. Zum Beispiel können Sie Ihre Statistiken öffentlich machen, indem Sie dem Benutzer 'anonymous' das Recht 'view' geben.", "ExceptionEmailExists": "Ein Benutzer mit der E-Mail-Adresse '%s' existiert bereits.", "ExceptionInvalidEmail": "Die E-Mail-Adresse hat ein ungültiges Format.", @@ -2273,6 +2278,7 @@ "ExceptionInvalidPassword": "Das Passwort muss zwischen %1$s und %2$s Zeichen lang sein.", "ExceptionLoginExists": "Der Benutzername '%s' existiert bereits.", "ExceptionPasswordMD5HashExpected": "UsersManager.getTokenAuth erwartet ein MD5-verschlüsseltes Passwort (32 Zeichen). Bitte wenden Sie die md5()-Funktion auf das Passwort an, bevor Sie diese Methode aufrufen.", + "ExceptionRemoveSuperUserAccessOnlySuperUser": "Es ist nicht möglich die Super-User Berechtigung von Benutzer '%s' zu entfernen.", "ExceptionUserDoesNotExist": "Der Benutzer '%s' existiert nicht.", "ExcludeVisitsViaCookie": "Ihre Besuche von der Erfassung via Cookie ausschließen", "ForAnonymousUsersReportDateToLoadByDefault": "Bericht, der für Gast-Besucher (\"anonymous\") standardmäßig geladen wird", @@ -2284,6 +2290,7 @@ "MenuUsers": "Benutzer", "MenuUserSettings": "Benutzereinstellungen", "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "Hinweis: Sie können die Einstellungen in diesem Bereich nicht ändern, weil Sie keine Webseite eingerichtet haben, die vom anonymen Benutzer angezeigt werden kann.", + "NoUsersExist": "Bisher keine Benutzer vorhanden.", "PluginDescription": "Benutzerverwaltung in Piwik: Einen neuen Benutzer hinzufügen, einen existierenden Benutzer bearbeiten, Berechtigungen ändern. Alle Aktionen sind auch über die API möglich.", "PrivAdmin": "Administrator", "PrivNone": "Kein Zugriff", @@ -2291,6 +2298,7 @@ "ReportDateToLoadByDefault": "Berichtsdatum, welches standardmäßig geladen wird", "ReportToLoadByDefault": "Bericht, der standardmäßig geladen wird", "SuperUserAccessManagement": "Super-User Berechtigung verwalten", + "SuperUserAccessManagementGrantMore": "Hier können Sie anderen Benutzern von Piwik Super-User Berechtigung geben. Bitte nutzen Sie diese Funktion mit Bedacht.", "TheLoginScreen": "den Loginbildschirm", "ThereAreCurrentlyNRegisteredUsers": "Es sind derzeit %s Benutzer registriert.", "TypeYourPasswordAgain": "Geben Sie Ihr Passwort nochmals ein.", diff --git a/lang/el.json b/lang/el.json index 86957e4bae..f01c213aa3 100644 --- a/lang/el.json +++ b/lang/el.json @@ -883,6 +883,7 @@ "VisitTypeExample": "Για παράδειγμα, για να επιλέξετε όλους τους επισκέπτες που έχουν επιστρέψει στην ιστοσελίδα και να περιλάβετε αυτούς που έχουν αγοράσει κάτι στις προηγούμενες επισκέψεις, το αίτημα API θα περιέχει %s", "Warning": "Προειδοποίηση", "WarningFileIntegrityNoManifest": "Ο έλεγχος ακεραιότητας αρχείου δεν μπορεί να πραγματοποιηθεί επειδή λείπει το αρχείο manifest.inc.php.", + "WarningFileIntegrityNoManifestDeployingFromGit": "Αν παίρνετε το Piwik από το Git, το μήνυμα αυτό είναι φυσιολογικό.", "WarningFileIntegrityNoMd5file": "Ο έλεγχος ακεραιότητας αρχείου δεν μπορεί να ολοκληρωθεί γιατί είναι ανενεργή η συνάρτηση md5_file().", "WarningPasswordStored": "%sΠροειδοποίηση:%s Αυτός ο κωδικός πρόσβασης θα αποθηκευτεί στο αρχείο ρυθμίσεων και θα είναι ορατός από οποιονδήποτε έχει πρόσβαση σε αυτό.", "Website": "Ιστοσελίδα", @@ -1447,7 +1448,8 @@ "WidgetGetAll": "Όλες οι Παραπομπές", "WidgetKeywords": "Λίστα λέξεων-κλειδιών", "WidgetSocials": "Λίστα κοινωνικών δικτύων", - "WidgetTopKeywordsForPages": "Δημοφιλέστερες Λέξεις-Κλειδιά για τη Διεύθυνση URL της σελίδας" + "WidgetTopKeywordsForPages": "Δημοφιλέστερες Λέξεις-Κλειδιά για τη Διεύθυνση URL της σελίδας", + "XPercentOfVisits": "%s%% των επισκέψεων" }, "RowEvolution": { "AvailableMetrics": "Διαθέσιμες μετρήσεις", @@ -1527,6 +1529,8 @@ "SegmentDisplayedAllWebsites": "όλους τους ιστοτόπους", "SegmentDisplayedThisWebsiteOnly": "μόνο αυτόν τον ιστοτόπο", "SegmentIsDisplayedForWebsite": "και εμφανίζεται για", + "SegmentNotApplied": "Το τμήμα '%s' δεν εφαρμόζεται", + "SegmentNotAppliedExplanation": "Ζητάτε δεδομένα από το Προσαρμοσμένο Τμήμα '%s', οι τρέχουσες ρυθμίσεις του Piwik αποτρέπουν την επεξεργασία σε πραγματικό χρόνο των αναφορών για το τμήμα αυτό. Παρακαλούμε ζητήστε από το διαχειριστή του Piwik να αλλάξει τη ρύθμιση στο αρχείο ρυθμίσεων (%s). Μπορείτε επίσης να τροποποιήσετε το Τμήμα αυτό και να επιλέξετε '%s'.", "SelectSegmentOfVisitors": "Επιλέξτε ένα τμήμα επισκεπτών:", "ThisSegmentIsVisibleTo": "Το τμήμα αυτό είναι ορατό σε:", "VisibleToAllUsers": "όλους τους χρήστες", @@ -1963,6 +1967,7 @@ "GeoIpLocationProviderDesc_ServerBased1": "Αυτός ο πάροχος χρησιμοποιεί τη λειτουργία τοποθεσιών GeoIP που έχει εγκατασταθεί στον HTTP εξυπηρετητή σας. Αυτός ο πάροχος είναι γρήγορος και ακριβής, αλλά %1$sμπορεί να χρησιμοποιηθεί μόνο με την κανονική παρακολούθηση του προγράμματος περιήγησης.%2$s", "GeoIpLocationProviderDesc_ServerBased2": "Αν έχετε να εισάγετε αρχεία καταγραφής ή να κάνετε κάτι άλλο που απαιτεί τον καθορισμό διευθύνσεων IP, χρησιμοποιήστε την %1$sPECL υλοποίηση του GeoIP (συνιστάται)%2$s ή την %3$sPHP υλοποίηση του GeoIP%4$s.", "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Σημείωση: Η ανωνυμοποίηση IP διευθύνσεων δεν έχει καμία επίδραση στις τοποθεσίες που αναφέρονται από αυτόν τον πάροχο. Πριν το χρησιμοποιήσετε μαζί με την ανωνυμοποίηση IP, βεβαιωθείτε ότι αυτό δεν παραβιάζει κανένα νόμο περί προσωπικών δεδομένων που ενδέχεται να ισχύει στη χώρα σας.", + "GeoIpLocationProviderNotRecomnended": "Η Γεωτοποθεσία δουλεύει, αλλά δεν χρησιμοποιείτε κάποιον από τους προτεινόμενους παρόχους.", "GeoIPNoServerVars": "Το Piwik δεν μπορεί να βρει καμιά μεταβλητή %s GeoIP.", "GeoIPPeclCustomDirNotSet": "Η ρύθμιση ini %s της PHP δεν έχει οριστεί.", "GeoIPServerVarsFound": "Το Piwik ανίχνευσε τις ακόλουθες μεταβλητές GeoIP %s", diff --git a/lang/et.json b/lang/et.json index 7e5a26efe5..886009aeff 100644 --- a/lang/et.json +++ b/lang/et.json @@ -2,7 +2,7 @@ "Actions": { "AvgGenerationTimeTooltip": "Keskmine, mis baseerub %s laadimisel %s, %s ja %s vahel.", "ColumnClickedURL": "Külastatud URL", - "ColumnClicks": "Külastusi", + "ColumnClicks": "Hiireklikke", "ColumnDownloadURL": "Allalaadimise URL", "ColumnEntryPageTitle": "Sisenetud lehe pealkiri", "ColumnEntryPageURL": "Sisenetud lehe URL", @@ -70,19 +70,25 @@ "ImageTrackingLink": "Infot koguva pildifaili link", "ImportingServerLogs": "Serveri logide importimine", "JavaScriptTracking": "JavaScriptiga info kogumine", + "JSTracking_CampaignKwdParam": "Kampaania märksõna parameeter", + "JSTracking_CampaignNameParam": "Kampaania nime parameeter", + "JSTracking_EnableDoNotTrack": "Aktiveeri kliendipoolne DoNotTrack tuvastamine", "LatestBetaRelease": "Kõige uuem beta versioon", "LatestStableRelease": "Kõige uuem stabiilne versioon", "LogoUpload": "Vali üleslaadimiseks Logo", "MenuDiagnostic": "Diagnostika", "MenuGeneralSettings": "Põhiseaded", "MenuManage": "Halda", + "OptOutForYourVisitors": "Piwiku külastajate väljaarvamine", "PiwikIsInstalledAt": "Piwik on paigaldatud", + "PluginDescription": "Piwiku haldusala.", "PluginSettings": "Lisatarkvara seaded", "TrackAGoal": "Kogu infot eesmärgi kohta", "TrackingCode": "Jälgimiskood", "TrustedHostSettings": "Usaldatud Piwiku server", "UseCustomLogo": "Kasuta enda logo", "ValidPiwikHostname": "Kehtiv Piwiku server (IP\/host)", + "WithOptionalRevenue": "koos valikulise tuluga", "YouAreOptedIn": "Sa oled valikus sees.", "YouAreOptedOut": "Sa oled valikust väljas." }, @@ -139,6 +145,7 @@ "AuthorHomepage": "Autori veebileht", "Authors": "Autorid", "BackToExtendPiwik": "Tagasi Marketisse", + "ByXDevelopers": "arendajate %s poolt", "Changelog": "Muudatuste logi", "Deactivate": "Lülita välja", "Developer": "Arendaja", @@ -158,6 +165,8 @@ "MarketplaceSellPluginSubject": "Market - müü lisatarkvara", "MenuPlatform": "Platvorm", "NoPluginsFound": "Lisatarkvara ei leitud", + "NoThemesFound": "Kujundusi ei leitud", + "NoZipFileSelected": "Palun vali ZIP fail.", "NumUpdatesAvailable": "%s uuendus(t) saadaval", "Origin": "Päritolu", "OriginCore": "Tuumik", @@ -193,7 +202,7 @@ "ClickHereToViewSqlQueries": "Vajuta siia, et näha ja kopeerida teostamisele minevad SQL päringud", "CreatingBackupOfConfigurationFile": "Loon seadete varukoopiat faili %s", "CriticalErrorDuringTheUpgradeProcess": "Kriitiline viga uuendamise protsessi ajal:", - "DatabaseUpgradeRequired": "Vajalik teostada andmebaasi uuendus", + "DatabaseUpgradeRequired": "Andmebaasi uuendus on vajalik", "DownloadingUpdateFromX": "Laen uuendust %s", "DownloadX": "Lae alla %s", "EmptyDatabaseError": "Andmebaas %s on tühi. Sa pead muutma või eemaldama Piwiku konfiguratsiooni faili.", @@ -201,10 +210,11 @@ "ExceptionArchiveEmpty": "Tühi arhiiv.", "HelpMessageContent": "Vaata %1$s Piwik KKK %2$s milles selgitadakse tavapäraste probleemide põhjuseid ja lahendusi. %3$s Kui sa ei leia lahendust, siis küsi oma süsteemi administraatoritelt abi- nad võivad aidata juhul, kui need vead on seotud serveri või MySQL seadetega.", "HelpMessageIntroductionWhenWarning": "Uuendamine edukalt lõpetatud, siiski esines protsessis vigu. Palun tutvu ülal vigade kirjeldustega. Saamaks rohkem abi:", + "HighTrafficPiwikServerEnableMaintenance": "Kui sa haldad suure liiklusega Piwiku serverit, soovitame korraks %slülitada Piwiku kasutajaliides hooldusrežiimi ja katkestada külastuste kohta info kogumine%s.", "InstallingTheLatestVersion": "Paigaldan uusimat versiooni", "MajorUpdateWarning1": "Tegemist on suure uuendusega! See võtab tavapärasest kauem aega.", "MajorUpdateWarning2": "Järgnev info on eriti oluline suure külastatavusega paigaldustele.", - "NoteForLargePiwikInstances": "Tähtsad märkused suure liiklusega Piwiku paigaldustele", + "NoteForLargePiwikInstances": "Oluline teave suure liiklusega Piwiku paigaldustele", "PiwikHasBeenSuccessfullyUpgraded": "Piwik edukalt uuendatud!", "PiwikUpdatedSuccessfully": "Piwik edukalt uuendatud!", "PiwikWillBeUpgradedFromVersionXToVersionY": "Piwiku andmebaas uuendatakse versioonilt %1$s uuele versioonile %2$s.", @@ -212,6 +222,7 @@ "ReadyToGo": "Valmis jätkamiseks?", "TheFollowingPluginsWillBeUpgradedX": "Valitud lisatarkvarad uuendatakse: %s.", "ThereIsNewVersionAvailableForUpdate": "Uus Piwiku versioon on saadaval", + "TheUpgradeProcessMayFailExecuteCommand": "Kui sul on suur Piwiku andmebaas, siis uuendused võivad veebisirvikus võtta liiga kaua aega. Sellisel juhul saad uuenduse teha käsurealt: %s", "TheUpgradeProcessMayTakeAWhilePleaseBePatient": "Andmebaasi uuendamise protsess võtab veidi aega, palun ole kannatlik.", "UnpackingTheUpdate": "Pakin uuendust lahti", "UpdateAutomatically": "Uuenda automaatselt", @@ -222,6 +233,7 @@ "WarningMessages": "Hoiatussõnumid:", "WeAutomaticallyDeactivatedTheFollowingPlugins": "Lülitame automaatselt välja järgnevad lisatarkvarad: %s", "YouCanUpgradeAutomaticallyOrDownloadPackage": "Sa võid uuendada versioonile %s automaatselt või laadida alla paki ja paigaldada käsitsi:", + "YouCouldManuallyExecuteSqlQueries": "Kui sa ei saa kasutada käsurea kaudu uuendamist ja Piwiku uuendus veebisirvikus ebaõnnestub, siis võid järgnevad SQL käsud otse andmebaasis käivitada.", "YourDatabaseIsOutOfDate": "Sinu Piwiku andmebaas on vananenud ja tuleb enne jätkamist uuendada." }, "CustomVariables": { @@ -241,6 +253,7 @@ "Dashboard": "Töölaud", "DashboardName": "Töölaua nimi:", "DashboardOf": "%s töölaud", + "DefaultDashboard": "Vaikimisi töölaud - kasutab vaikimisi vidinaid ja paigutust", "DeleteWidgetConfirm": "Oled sa kindel selle mooduli kustutamises oma töölaualt?", "EmptyDashboard": "Tühi töölaud - vali oma lemmik vidinad", "LoadingWidget": "Laen moodulit, palun oota...", @@ -271,7 +284,12 @@ "NbEvents": "Sündmuste arv" }, "Feedback": { - "CategoryHire": "Palka Piwiku konsultant" + "CategoryHire": "Palka Piwiku konsultant", + "IWantTo": "Ma tahan:", + "MyEmailAddress": "Minu e-posti aadress:", + "MyMessage": "Minu sõnum:", + "SendFeedback": "Saada tagasisidet", + "ThePiwikTeam": "Piwiku meeskond" }, "General": { "AbandonedCarts": "Hüljatud ostukorvid", @@ -319,13 +337,16 @@ "ColumnNbActions": "Tegevused", "ColumnNbUniqVisitors": "Unikaalsed külastajad", "ColumnNbVisits": "Külastused", - "ColumnPageviews": "Lehevaatamised", + "ColumnPageviews": "Lehevaatamisi", "ColumnPercentageVisits": "% Külastustest", "ColumnRevenue": "Tulu", "ColumnTotalPageviews": "Lehe vaatamisi kokku", "ColumnUniqueEntrances": "Unikaalseid sisenemisi", "ColumnUniqueExits": "Unikaalseid väljumisi", "ColumnUniquePageviews": "Unikaalseid lehe vaatamisi", + "ColumnValuePerVisit": "Tulu külastuse kohta", + "ColumnViewedAfterSearch": "Klikke otsingutulemustes", + "ColumnVisitDuration": "Külastuse kestvus (sekundites)", "ColumnVisitsWithConversions": "Külastused tulu tekitamisega", "Continue": "Jätka", "ContinueToPiwik": "Jätka Piwiku kasutamist", @@ -370,12 +391,13 @@ "Download": "Allalaadimine", "DownloadFail_FileExists": "Fail %s on juba olemas!", "Downloads": "Allalaadimised", - "EcommerceOrders": "E-poe tellimused", + "EcommerceOrders": "E-äri tellimused", "Edit": "Muuda", "EnglishLanguageName": "Estonian", "Error": "Viga", "ErrorRequest": "Oih… nõude esitamisel tekkis viga, palun proovi uuesti.", "EvolutionOverPeriod": "Perioodi areng", + "EvolutionSummaryGeneric": "%1$s %2$s jooksul võrreldes %3$s %4$s jooksul. Muutus ajas: %5$s", "ExceptionMissingFile": "Puuduv fail: %s", "ExceptionNonceMismatch": "Antud vormi turvakoodi verifitseerimine ebaõnnestus.", "Export": "Ekspordi", @@ -502,6 +524,7 @@ "Password": "Salasõna", "Period": "Periood", "Piechart": "Sektordiagramm", + "PiwikIsACollaborativeProjectYouCanContributeAndDonate": "%1$s Piwik %2$s on koostööprojekt. %3$s Kui sa oled Piwiku fänn, siis saad abiks olla: vaata %4$s Kuidas Piwiku arenduses kaasa lüüa%5$s, või%6$s %7$sanneta kohe%8$s et aidata Piwiku arengut rahastada!", "PiwikXIsAvailablePleaseNotifyPiwikAdmin": "%s on saadaval. Palun teavita lehe haldajat.", "PleaseSpecifyValue": "Palun täpsusta '%s' väärtust.", "PleaseUpdatePiwik": "Palun uuenda oma Piwikut", @@ -512,6 +535,7 @@ "PreviousDays": "Eelnevad %s päeva (va. täna)", "PreviousDaysShort": "Eelnevad %s päeva", "Price": "Hind", + "ProductConversionRate": "Toote tulutoovaks muutmise määr", "ProductRevenue": "Toote tulu", "PurchasedProducts": "Ostetud kaubad", "Quantity": "Kogus", @@ -530,7 +554,7 @@ "ReturningVisitor": "Korduv külastaja", "ReturningVisitorAllVisits": "Kuva kõik külastused", "RowEvolutionRowActionTooltip": "Vaata kuidas antud rea mõõdikud muutusid ajas", - "RowEvolutionRowActionTooltipTitle": "Ava rea evolutsioon", + "RowEvolutionRowActionTooltipTitle": "Ava rea muutus ajas", "Rows": "Ridu", "RowsToDisplay": "Ridu näitamiseks", "Save": "Salvesta", @@ -573,7 +597,7 @@ "TagCloud": "Sildipilv", "Tax": "Maksud", "TimeOnPage": "Aeg lehel", - "Today": "täna", + "Today": "Täna", "Total": "Kokku", "TotalRatioTooltip": "See on %1$s kõigist %2$s %3$s.", "TotalRevenue": "Kogutulu", @@ -617,7 +641,7 @@ "YearsDays": "%1$s aastat %2$s päeva", "YearShort": "a", "Yes": "Jah", - "Yesterday": "eile", + "Yesterday": "Eile", "YouAreCurrentlyUsing": "Kasutad hetkel Piwik versiooni %s.", "YouAreViewingDemoShortMessage": "Hetkel asud Piwiku demo keskkonnas", "YouMustBeLoggedIn": "Antud funktsionaalsusele ligipääsuks pead olema sisselogitud.", @@ -627,19 +651,32 @@ "AbandonedCart": "Hüljatud ostukorv", "AddGoal": "Lisa eesmärk", "AddNewGoal": "Lisa uus eesmärk", + "AddNewGoalOrEditExistingGoal": "%sLisa uus eesmärk%s või %sMuuda%s olemasolevaid eesmärke", "AllowGoalConvertedMoreThanOncePerVisit": "Luba külastajate muundamist rohkem kui ühe korra külastuse jooksul (võib mitu korda muutuda tulu toovaks kliendiks)", "AllowMultipleConversionsPerVisit": "Luba mitu tulutoomist ühe külastuse jooksul", + "BestCountries": "Sinu parimad tulutoovad riigid on:", + "BestKeywords": "Sinu parimad tulutoovad märksõnad on:", + "BestReferrers": "Sinu parimad tulutoovad veebilehtede suunajad on:", "CaseSensitive": "Tähtede tõusutundlik võrdlus", "ClickOutlink": "Klikivad välise lehe lingile", "ColumnConversions": "Tulu tekitamised", + "ColumnVisits": "Külastuste koguarv, hoolimata sellest, kas eesmärgini jõuti või ei.", "Contains": "sisaldab %s", "ConversionRate": "%s tulumäär", "Conversions": "%s tulu tekitamist", "ConversionsOverview": "Tulu tekitamiste ülevaade", + "ConversionsOverviewBy": "Tulu tekitamiste ülevaade külastuse tüübi järgi", + "CreateNewGOal": "Loo uus eesmärk", "DaysToConv": "Päevi tulu tekitamiseni", "DefaultGoalConvertedOncePerVisit": "(vaikimisi) Eesmärgi jaoks saab klienti muudada ainult ühe korra külastuse jooksul (hetk kui külastajast saab tulutoov klient)", "DefaultRevenue": "Eesmärgi vaikimisi kasum on", "Download": "Laevad alla faili", + "Ecommerce": "E-äri", + "EcommerceAndGoalsMenu": "E-äri ja eesmärgid", + "EcommerceLog": "E-äri logid", + "EcommerceOrder": "E-äri tellimus", + "EcommerceOverview": "E-äri ülevaade", + "EcommerceReports": "E-äri raportid", "ExternalWebsiteUrl": "välise veebilehe URL", "Filename": "failinimi", "GoalConversion": "Eesmärgi tulu", @@ -652,11 +689,22 @@ "GoalsOverview": "Eesmärkide ülevaade", "GoalX": "Eesmärk %s", "IsExactly": "on täpselt %s", + "LearnMoreAboutGoalTrackingDocumentation": "Loe rohkem %s Piwikus info kogumisest eesmärkide kohta%s kasutajajuhendis või loo uus eesmärk kohe!", "Manually": "manuaalselt", "MatchesExpression": "vastab reeglile %s", "Optional": "(valikuline)", + "OverallConversionRate": "%s üldine tulu tekitamise määr (täidetud eesmärgiga külastused)", + "OverallRevenue": "%s üldine tulu", "PageTitle": "Lehe pealkiri", + "Pattern": "Muster", + "ProductCategory": "Toote kategooria", + "ProductName": "Toote nimi", + "Products": "Tooted", + "ProductSKU": "Tootekood", + "UpdateGoal": "Uuenda eesmärki", "URL": "URL", + "ViewAndEditGoals": "Vaata ja muuda eesmärke", + "ViewGoalsBy": "Vaata eesmärke %s järgi", "VisitPageTitle": "Külastavad määratud pealkirjaga lehte", "VisitsUntilConv": "Külastusi tulu tekitamiseni", "VisitUrl": "Külastavad määratud URLi (leht või lehtede grupp)", @@ -694,11 +742,11 @@ "LoadDataInfileRecommended": "Kui sinu Piwiku server kogub andmeid kõrge külastatavusega veebilehtede kohta (näiteks rohkem kui 100 000 külastust kuus), siis soovitame antud probleemi kõrvaldada.", "NfsFilesystemWarning": "Sinu server kasutab NFS failisüsteemi", "NfsFilesystemWarningSuffixAdmin": "See tähendab, et Piwik on väga aeglane faili põhiste sessioonidega töötamisel.", - "NoConfigFound": "Piwiki konfguratsioonifaili ei leitud, kuid sa üritasid minna Piwiki lehele.<br \/><b> » Võid <a href='index.php'>installeerida Piwiko<\/a><\/b><br \/><small>Kui Piwik on varem installeeritud ja sul on andmebaasis tabeleid, siis ei ole põhjust muretsemiseks saad taaskasutada ja säilitada olemasolevad andmed!<\/small>", + "NoConfigFound": "Piwiku konfguratsioonifaili ei leitud, kuid sa üritasid minna Piwiku lehele.<br \/><b> » Võid <a href='index.php'>paigaldada Piwiku<\/a><\/b><br \/><small>Kui Piwik on varem installeeritud ja sul on andmebaasis tabeleid, siis ei ole põhjust muretsemiseks, sest saad taaskasutada ja säilitada olemasolevad andmed!<\/small>", "Optional": "Valikuline", - "Password": "parool", - "PasswordDoNotMatch": "paroolid ei kattu", - "PasswordRepeat": "parooli kordus", + "Password": "salasõna", + "PasswordDoNotMatch": "salasõnad ei kattu", + "PasswordRepeat": "salasõna kordus", "PercentDone": "%s %% Tehtud", "PleaseFixTheFollowingErrors": "Palun paranda järgnevad vead", "PluginDescription": "Piwiku paigaldusprotsess. Paigaldust tehakse tavaliselt ainult üks kord. Kui konfiguratsioonifail config\/config.ini.php kustutatakse, siis algab paigaldus uuesti.", @@ -711,7 +759,7 @@ "SetupWebSiteName": "veebilehe nimi", "SetupWebsiteSetupSuccess": "Veebileht %s loodi edukalt!", "SetupWebSiteURL": "veebilehe URL", - "SiteSetup": "Palun seadista esmane veebileht, mille kohta soovid andmeid koguda ja Piwikuga analüüsida:", + "SiteSetup": "Palun seadista esimene veebileht, mille kohta soovid andmeid koguda ja Piwikuga analüüsida:", "SiteSetupFootnote": "Märge: peale Piwiku paigalduse lõppu on võimalik lisada teisi veebilehti analüüsimiseks juurde!", "SuperUser": "Peakasutaja", "SuperUserLogin": "peakasutajana sisenemine", @@ -731,7 +779,7 @@ "SystemCheckGzcompressHelp": "Sa pead aktiveerima zlib laienduse ja gzcompress funktsiooni.", "SystemCheckGzuncompressHelp": "Sa pead aktiveerima zlib laienduse ja gzuncompress funktsiooni.", "SystemCheckIconvHelp": "Sa pead PHP seadistama ja uuesti laadima koos \"iconv\" toega, --with-iconv.", - "SystemCheckMailHelp": "Tagasiside ja kaotatud parooli sõnumeid ei saadeta ilma mail() funktsiooni toeta.", + "SystemCheckMailHelp": "Tagasiside ja kaotatud salasõna sõnumeid ei saadeta ilma mail() funktsiooni toeta.", "SystemCheckMbstring": "mbstring", "SystemCheckMbstringExtensionGeoIpHelp": "Samuti on see nõutud GeoIP integratsiooni tööle saamiseks.", "SystemCheckMbstringFuncOverloadHelp": "Sa peaksid sättima mbstring.func_overload väärtuseks \"0\".", @@ -767,9 +815,10 @@ "WelcomeToCommunity": "Tere tulemast Piwiku kommuuni!" }, "Live": { + "AveragePageGenerationTime": "Iga lehe laadimine võttis antud külastajal keskeltläbi %1$s.", "ClickToViewMoreAboutVisit": "Vali, et kuvada külastuse kohta rohkem infot", "ConvertedNGoals": "Muutus tulutoovaks %s korral", - "FirstVisit": "Esmane külastus", + "FirstVisit": "Esimene külastus", "GoalType": "Tüüp", "HideMap": "peida kaart", "LastHours": "Viimased %s tundi", @@ -794,18 +843,25 @@ "VisitorProfile": "Külastaja profiil", "VisitorsInRealTime": "Reaalajas külastused", "VisitsFrom": "%1$s%2$s külastust %3$s pärineb", - "VisitSummary": "Viibis kokku %1$s%2$s veebilehel%3$s, ja %4$svaatas %5$s lehte %6$s külastuse jooksul.%7$s" + "VisitSummary": "Viibis kokku %1$s%2$s veebilehel%3$s ja %4$svaatas %5$s lehte %6$s külastuse jooksul.%7$s" }, "Login": { "ContactAdmin": "Võimalik põhjus: sinu majutusel on mail() funktsioon välja lülitatud. <br \/>Palun kontakteeru administraatoriga.", + "InvalidOrExpiredToken": "Kontrollkood on kehtetu.", "InvalidUsernameEmail": "Vale kasutajanimi ja\/või e-maili address", "LogIn": "Sisene", "LoginOrEmail": "Kasutajanimi või E-mail", "LoginPasswordNotCorrect": "Kasutajanimi & salasõna olid valed", "LostYourPassword": "Kaotasid oma salasõna?", - "RememberMe": "Pea meeles" + "MailTopicPasswordChange": "Kinnita salasõna vahetust", + "PasswordChanged": "Sinu salasõna on vahetatud.", + "PasswordRepeat": "Salasõna (kordus)", + "PasswordsDoNotMatch": "Salasõnad ei kattu.", + "RememberMe": "Pea meeles", + "ResetPasswordInstructions": "Sisesta oma konto jaoks uus salasõna." }, "Mobile": { + "AboutPiwikMobile": "Rohkem infot Piwik mobiilis kohta", "AccessUrlLabel": "Piwiku paigalduse URL", "Account": "Konto", "Accounts": "Kontod", @@ -847,21 +903,39 @@ "VerifyAccount": "Konto kinnitamine" }, "MobileMessaging": { + "PhoneNumbers": "Telefoninumbrid", + "Settings_APIKey": "API võti", + "Settings_CredentialNotProvided": "Enne kui saad luua ja hallata telefoninumbreid, palun ühenda Piwik oma SMS kontoga ülal.", + "Settings_CredentialNotProvidedByAdmin": "Enne kui saad luua ja hallata telefoninumbreid, palu Piwiku haldajal luua ühendus SMS kontoga.", + "Settings_CredentialProvided": "Sinu %s SMS API konto on korrektselt seadistatud!", + "Settings_LetUsersManageAPICredential": "Luba kasutajatel muuta nende enda SMS API seadeid", + "Settings_ManagePhoneNumbers": "Halda telefoninumbreid", + "Settings_PhoneNumber": "Telefoninumber", + "Settings_PhoneNumbers_Add": "Lisa uus telefoninumber", + "Settings_SMSAPIAccount": "Halda SMS API kontot", + "Settings_SMSProvider": "SMS teenusepakkuja", "Settings_SuperAdmin": "Peakasutaja seaded", + "Settings_ValidatePhoneNumber": "Valideeri", "SettingsMenu": "Mobiilsed teenused", "TopMenu": "E-posti ja SMS raportid" }, + "MultiSites": { + "Evolution": "Muutus ajas" + }, "Overlay": { "Clicks": "%s klikki", + "ClicksFromXLinks": "%1$s klikki %2$s lingilt", "Domain": "Domeen", "Link": "Link", "Location": "Asukoht", "OneClick": "1 klikk", - "OpenFullScreen": "Ava täisekraani vaade (ilma külgribata)" + "OpenFullScreen": "Ava täisekraani vaade (ilma külgribata)", + "Overlay": "Lehe statistika kiht" }, "PrivacyManager": { "MenuPrivacySettings": "Privaatsus", "RecommendedForPrivacy": "(soovitatav privaatsuse jaoks)", + "ReportsDataSavedEstimate": "Andmebaasi suurus", "TeaserHeadline": "Privaatsusseaded" }, "Provider": { @@ -886,22 +960,22 @@ "SearchEngines": "Otsingumootorid", "SocialFooterMessage": "See on vasakul olevate veebilehtede alamraport, mis filtreerib muud viitajad välja, nii et saaksid võrrelda ainult sotsiaalvõrgustikke.", "Socials": "Sotsiaalvõrgustikud", - "SubmenuSearchEngines": "Otsimootorid & võtmesõnad", + "SubmenuSearchEngines": "Otsingumootorid ja võtmesõnad", "SubmenuWebsites": "Veebilehed", "Type": "Viitaja tüüp", "TypeCampaigns": "%s kampaaniatest", "TypeDirectEntries": "%s otse sisenemist", - "TypeSearchEngines": "%s otsimootoritest", + "TypeSearchEngines": "%s otsingumootoritest", "TypeWebsites": "%s veebilehtedelt", "ViewAllReferrers": "Vaata kõiki viitajaid", - "ViewReferrersBy": "Vaata kõiki viitajaid %s järgi", + "ViewReferrersBy": "Viitajate reastamise aluseks: %s", "Websites": "Veebilehed", "WidgetExternalWebsites": "Väliste viitajate nimekiri", "WidgetGetAll": "Kõik viitajad", "WidgetKeywords": "Võtmesõnade nimistu", "WidgetSocials": "Nimekiri sotsiaalvõrgustikest", "WidgetTopKeywordsForPages": "Lehe URL peamised võtmesõnad", - "XPercentOfVisits": "%s%% of visits" + "XPercentOfVisits": "%s%% külastustest" }, "RowEvolution": { "AvailableMetrics": "Saadaolevad mõõdikud", @@ -911,6 +985,7 @@ "MetricChangeText": "%s muutus perioodi jooksul", "MetricMinMax": "%1$s varieerus perioodil %2$s ja %3$s vahel", "MetricsFor": "%s mõõdikud", + "MultiRowEvolutionTitle": "Mitme rea muutus ajas", "PickAnotherRow": "Vali veel üks rida võrdluseks", "PickARow": "Vali rida, millega võrrelda" }, @@ -951,6 +1026,7 @@ "Currency": "vääring", "DeleteConfirm": "Oled sa kindel %s kustutamises?", "DisableSiteSearch": "Ära kogu andmeid lehe otsingust", + "EnableEcommerce": "E-äri aktiivne", "EnableSiteSearch": "Kogu andmeid lehe otsingust", "ExceptionDeleteSite": "Seda veebilehte ei ole võimalik kustutada, sest see on ainuke registreeritud leht selles andmebaasis. Lisa ennem uus leht ja siis kustuta see leht.", "ExceptionEmptyName": "Saidi nimi ei saa olla tühi.", @@ -962,7 +1038,10 @@ "GlobalListExcludedIps": "Globaalselt väljaarvatud IPd", "GlobalWebsitesSettings": "Globaalsed veebilehtede seaded", "MainDescription": "Sinu veebianalüütika vajab veebilehti, mida hallata! Lisa, uuenda, kustuta veebilehti, ja näita Javascript koodi mida lisada veebilehtedele.", + "NotAnEcommerceSite": "Ei ole e-äri lehekülg", "NoWebsites": "Sul pole veebilehti, mida administreerida.", + "PiwikOffersEcommerceAnalytics": "Piwik võimaldab detailsemat e-äri analüüsi ja raporteid. Loe rohkem %s e-äri analüüsist%s.", + "SelectACity": "Vali linn", "ShowTrackingTag": "Kuva jälgimiskood", "Sites": "Veebilehed", "Timezone": "Ajavöönd", @@ -1551,7 +1630,7 @@ "ExceptionLoginExists": "Kasutajanimi '%s' on kasutusel.", "ExceptionUserDoesNotExist": "Kasutaja '%s' puudub.", "ExcludeVisitsViaCookie": "Arva ennast külastajate hulgast välja kasutades küpsist", - "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Kui soovid parooli vahetada, siis sisesta siia uus. Vastasel korral jäta tühjaks.", + "IfYouWouldLikeToChangeThePasswordTypeANewOne": "Kui soovid salasõna vahetada, siis sisesta siia uus. Vastasel korral jäta tühjaks.", "MainDescription": "Otsusta millistel kasutajatel on ligipääs analüütikale. Saad seada õigused kõigile veebilehtedele korraga.", "ManageAccess": "Halda ligipääsu", "MenuAnonymousUserSettings": "Tundmatu kasutaja seaded", @@ -1566,7 +1645,7 @@ "ReportToLoadByDefault": "Vaikimisi laetav raport", "SuperUserAccessManagement": "Halda peakasutaja ligipääse", "ThereAreCurrentlyNRegisteredUsers": "Hetkel on %s registreeritud kasutajat.", - "TypeYourPasswordAgain": "Korda oma uut parooli.", + "TypeYourPasswordAgain": "Korda oma uut salasõna.", "User": "Kasutaja", "UsersManagement": "Kasutajate haldamine", "UsersManagementMainDescription": "Loo uusi kasutajakontosid või uuenda olemasolevaid. Saad seada nende õigused ülalpool.", @@ -1610,15 +1689,15 @@ "WidgetVisitsByDaysSinceLast": "Külastused viimase külastusaja järgi" }, "VisitsSummary": { - "AverageGenerationTime": "%s keskmine genereerimise aeg", + "AverageGenerationTime": "%s keskmine lehe genereerimise aeg", "AverageVisitDuration": "%s keskmine külastuse kestvus", "GenerateQueries": "%s katkestatud päringut", "GenerateTime": "Lehe genereerimiseks kulus %s sekundit", - "MaxNbActions": "%s maksmimum tegevuste arv ühel külastusel", + "MaxNbActions": "%s tegevust maksimaalselt ühel külastusel", "NbActionsDescription": "%s tegevust", "NbActionsPerVisit": "%s tegevust (lehe vaatamist, allalaadimist, väljuvat linki ja lehesisest otsingut) külastuse jooksul", "NbDownloadsDescription": "%s allalaadimist", - "NbKeywordsDescription": "%s unikaalseid võtmesõnu", + "NbKeywordsDescription": "%s unikaalset võtmesõna", "NbOutlinksDescription": "%s väljuvat linki", "NbPageviewsDescription": "%s lehevaatamist", "NbSearchesDescription": "%s otsingut kokku antud veebilehel", @@ -1628,6 +1707,7 @@ "NbUniqueVisitors": "%s unikaalset külastajat", "NbVisitsBounced": "%s külastajaid põrkas (lahkus peale ühe lehe kuvamist)", "VisitsSummary": "Külastuste kokkuvõte", + "VisitsSummaryDocumentation": "See on külastuste muutuse ajas ülevaade.", "WidgetLastVisits": "Viimaste külastuste graafik", "WidgetOverviewGraph": "Graafikutega ülevaade", "WidgetVisits": "Külastuste ülevaade" diff --git a/lang/fa.json b/lang/fa.json index ad738775c3..b74517c8de 100644 --- a/lang/fa.json +++ b/lang/fa.json @@ -19,7 +19,7 @@ "ColumnSearchesDocumentation": "جستجوی نوشتار ها", "ColumnSearchExits": "خروجی های جستجو", "ColumnSearchExitsDocumentation": "نوشتار خروجی", - "ColumnSearchResultsCount": "شمارگان نتایج جستجو", + "ColumnSearchResultsCount": "تعداد نتایج جستجو", "ColumnSiteSearchKeywords": "کلیدواژه های یکتا", "ColumnUniqueClicks": "کلیک های منحصر به فرد", "ColumnUniqueClicksDocumentation": "تعداد بار مشاهده شده است که شامل یک کلیک بر روی این لینک. اگر یک لینک چند بار در طول یک دیدار کلیک شد، آن است که تنها یک بار شمارش است.", @@ -215,6 +215,7 @@ "ByXDevelopers": "توسط %s برنامه نویس", "Changelog": "لاگ تغییرات", "ChangeSettingsPossible": "شما می توانید %ssettings%s را برای این پلاگین تغییر دهید.", + "CorePluginTooltip": "پلاگین های هسته با برنامه توزیع شده اند", "Deactivate": "غیر فعال کردن", "Developer": "توسعه دهنده ها", "DownloadAndInstallPluginsFromMarketplace": "شما می توانید به صورت اتوماتیک پلاگین های جدید را از %sMarketplace%s دانلود و نصب نمایید.", @@ -977,6 +978,7 @@ "SiteSetupFootnote": "توجه: بلافاصله بعد از اینکه نصب پیویک پایان یافت ، شما قادر خواهید بود که وبسایت های بیشتری را برای ردیابی اضافه کنید!", "SuperUser": "ابرکاربر", "SuperUserLogin": "ورود ابرکاربر به سیستم", + "SuperUserSetupError": "در هنگام افزودن کاربر فوق العاده خطایی رخ داد", "SuperUserSetupSuccess": "ابرکاربر را با موفقیت ایجاد شد!", "SystemCheck": "بررسی سیستم", "SystemCheckAutoUpdateHelp": "توجه: Piwik یک کلیک کنید به روز رسانی نیاز به نوشتن مجوز به پوشه Piwik و محتویات آن است.", @@ -1033,7 +1035,8 @@ "TablesWarningHelp": "یا برای استفاده مجدد از جداول پایگاه داده موجود انتخاب کنید و یا انتخاب یک نصب تمیز برای پاک کردن تمام اطلاعات موجود در پایگاه داده است.", "Timezone": "منطقه زمانی وب سایت", "Welcome": "خوش آمدید!", - "WelcomeHelp": "<p>پیویک یک نرم افزار آمار وب متن باز است که بدست آوردن اطلاعات بازدیدکنندگان وبسایت شما را آسان کرده است.<\/p><p>فرآیند نصب پیویک به %s مرحله ی آسان تقسیم شده است و فقط حدود 5 دقیقه زمان می برد.<\/p>" + "WelcomeHelp": "<p>پیویک یک نرم افزار آمار وب متن باز است که بدست آوردن اطلاعات بازدیدکنندگان وبسایت شما را آسان کرده است.<\/p><p>فرآیند نصب پیویک به %s مرحله ی آسان تقسیم شده است و فقط حدود 5 دقیقه زمان می برد.<\/p>", + "WelcomeToCommunity": "به انجمن برنامه خوش آمدید" }, "LanguagesManager": { "AboutPiwikTranslations": "درباره ترجمه های پیویک", @@ -1230,6 +1233,7 @@ "DeleteReportsOlderThan": "حذف گزارش های مسن تر از", "DeleteSchedulingSettings": "تنظیمات زمانبندی", "DoNotTrack_Disable": "پشتیبانی غیر فعال کردن پیگیری نشده", + "DoNotTrack_Enable": "فعال کردن گزینه پشتیبانی را پیگیری نکن", "DoNotTrack_Enabled": "شما به حریم شخصی کاربران تان احترام می گذارید , آفرین!", "EstimatedDBSizeAfterPurge": "اندازه پایگاه داده های تخمینی پس از پاکسازی", "EstimatedSpaceSaved": "فضای تخمینی ذخیره", @@ -2080,12 +2084,14 @@ "MenuUsers": "کاربران", "MenuUserSettings": "تنضیمات کاربران", "NoteNoAnonymousUserAccessSettingsWontBeUsed2": "توجه: شما نمی توانید تنظیمات این بخش را تغییر دهید , زیرا شما هیچ وبسایتی ندارید که بتوان با کاربر ناشناخته به آن دسترسی داشت .", + "NoUsersExist": "هنوز کاربری وجود ندارد", "PluginDescription": "مدیریت کاربران در Piwik: اضافه کردن یک کاربر جدید، یک موجود را ویرایش کنید، به روز رسانی مجوز. همه اقدامات نیز در دسترس هستند از طریق API.", "PrivAdmin": "مدیر", "PrivNone": "عدم دسترسی", "PrivView": "نمایش", "ReportDateToLoadByDefault": "تاریخ گزارش به طور پیش فرض باز", "ReportToLoadByDefault": "گزارش به طور پیش فرض باز", + "SuperUserAccessManagement": "مدیریت دسترسی کاربر فوق العاده", "TheLoginScreen": "نمایش ورودی", "ThereAreCurrentlyNRegisteredUsers": "هم اکنون %s کاربر عضو وجود دارد.", "TypeYourPasswordAgain": "پسورد جدیدتان را دوباره بنویسید.", diff --git a/lang/fr.json b/lang/fr.json index 8838eb4c75..237435bbe6 100644 --- a/lang/fr.json +++ b/lang/fr.json @@ -198,6 +198,7 @@ "MakeADifference": "Faites une différence : %1$sDonnez Maintenant%2$s pour financer Piwik 2.0!", "MakeOneTimeDonation": "Faire un don unique à la place.", "NoPrivilegesAskPiwikAdmin": "Vous êtes connecté en tant que '%s' mais il semble que nous n'ayez aucune permission définie dans Piwik. %s Demandez à votre administrateur (cliquez pour envoyer un e-mail)%s de vous donner l'accès 'Consultation' à un site web.", + "OnlyForSuperUserAccess": "Ce Gadget est uniquement affiché aux utilisateurs possédant un accès de type super utilisateur.", "PageOf": "%1$s de %2$s", "PeriodDay": "Jour", "PeriodDays": "jours", @@ -237,6 +238,7 @@ "Activated": "Activé", "Active": "Actif", "Activity": "Activité", + "AllowedUploadFormats": "Vous pouvez téléverser un composant additionnel ou un thème au format zip via cette page.", "AuthorHomepage": "Page de l'auteur", "Authors": "Auteurs", "BackToExtendPiwik": "Retour au Marché", @@ -469,6 +471,7 @@ "Actions": "Actions", "Add": "Ajouter", "AfterEntry": "après être entré ici", + "All": "Tous", "AllowPiwikArchivingToTriggerBrowser": "Autoriser l'archivage de Piwik à se déclencher lorsque les rapports sont visionnés depuis le navigateur", "AllWebsitesDashboard": "Tableau de bord de tous les sites", "And": "et", @@ -645,6 +648,7 @@ "GraphHelp": "Plus d'informations à propos de l'affichage des graphiques dans Piwik.", "HelloUser": "Bonjour, %s", "Help": "Aide", + "HelpTranslatePiwik": "Peut-être souhaiteriez vous %1$snous aider à améliorer les traduction de Piwik%2$s?", "Hide": "cacher", "HoursMinutes": "%1$s heures %2$s min", "Id": "Id", @@ -785,6 +789,7 @@ "Remove": "Supprimer", "Report": "Rapport", "ReportGeneratedFrom": "Ce rapport a été généré en utilisant des données de %s.", + "ReportRatioTooltip": "'%1$s' représente %2$s de %3$s %4$s avec %5$s.", "Reports": "Rapports", "ReportsContainingTodayWillBeProcessedAtMostEvery": "Rapports du jour (ou n'importe quelle autre plage de dates incluant aujourd'hui) seront calculés tout au plus chaque", "ReportsWillBeProcessedAtMostEveryHour": "Les rapports seront donc traités tout au plus chaque heure.", @@ -873,6 +878,7 @@ "VisitTypeExample": "Par exemple, pour sélectionner tous les visiteurs qui sont retournés sur le site web, en incluant ceux qui ont acheté quelque chose lors de leur dernière visite, la requête à l'API contiendrait %s", "Warning": "Attention", "WarningFileIntegrityNoManifest": "Le contrôle d'intégrité n'a pu être effectué car le fichier manifest.inc.php est manquant.", + "WarningFileIntegrityNoManifestDeployingFromGit": "Si vous déployez Piwik depuis Git, ce message est normal.", "WarningFileIntegrityNoMd5file": "Le contrôle d'intégrité n'a pu être effectué car la fonction md5_file() est manquante.", "WarningPasswordStored": "%sAttention:%s Ce mot de passe sera stocké dans le fichier de configuration et sera visible pour n'importe qui y ayant accès.", "Website": "Site", @@ -966,6 +972,7 @@ "NewGoalYouWillBeAbleTo": "Vous serez en capacité de visualiser et d'analyser votre performance, pour chaque Objectif, et d'apprendre comment augmenter vos conversions, taux de conversion et revenu par visite.", "NewVisitorsConversionRateIs": "Le taux de conversion des nouveaux visiteurs est %s", "NewWhatDoYouWantUsersToDo": "Que voulez vous que vos visiteurs accomplissent sur votre site web?", + "NoGoalsNeedAccess": "Uniquement un Administrateur ou un utilisateur avec un accès Super Utilisateur peut ajouter des Objectifs à un site donné. Veuillez demander à votre administrateur Piwik de mettre en place un Objectif pour votre site web. <br \/>Le suivit d'Objectifs est une bonne manière de mieux comprendre et de maximiser les performances de votre site web!", "Optional": "(optionnel)", "OverallConversionRate": "%s taux de conversion global (visites avec un objectif rempli)", "OverallRevenue": "%s revenu global", @@ -995,6 +1002,7 @@ "PluginDescription": "Génère de magnifiques graphiques en image PNG statique pour tous vos rapports Piwik." }, "Installation": { + "CollaborativeProject": "Piwik est un projet collaboratif, construit avec amour par des personnes du monde entier.", "CommunityNewsletter": "Envoyez-moi un courriel pour les nouveautés de la communauté (nouveaux plugins, nouvelles fonctionnalités, etc.)", "ConfigurationHelp": "Votre configuration de Piwik semble être erronée. Vous pouvez ou bien supprimer config\/config.inc.php et reprendre l'installation ou corriger les paramètres de connexion.", "ConfirmDeleteExistingTables": "Êtes vous sûr de vouloir supprimer les tables : %s de votre base de données? ATTENTION: LES DONNÉES SERONT DÉFINITIVEMENT PERDUES!", @@ -1016,6 +1024,7 @@ "ErrorInvalidState": "Erreur: il semble que vous essayez de sauter une étape du processus d'installation, ou vous avez désactivé les cookies, ou le fichier de configuration de Piwik est déjà créé. %1$sAssurez vous que les cookies sont bien activés%2$s et retournez %3$s à la première page d'installation %4$s.", "Extension": "extension", "Filesystem": "Système de fichiers", + "GetInvolved": "Si vous aimez ce que vous voyez, vous pouvez %1$svous impliquer%2$s.", "GoBackAndDefinePrefix": "Retournez à la page précédente et définissez le préfixe pour les tables Piwik", "HappyAnalysing": "Bonne analyse!", "Installation": "Installation", @@ -1053,6 +1062,7 @@ "SiteSetupFootnote": "Note : une fois que l'installation de Piwik est terminée, vous pourrez ajouter d'autres sites web à suivre!", "SuperUser": "Super Utilisateur", "SuperUserLogin": "login du super user", + "SuperUserSetupError": "Erreur lors de l'ajout du super utilisateur.", "SuperUserSetupSuccess": "Super Utilisateur créé avec succès!", "SystemCheck": "Vérification du système", "SystemCheckAutoUpdateHelp": "Note: La mise à jour de Piwik en un clic requiert une permission en écriture sur le dossier de Piwik et son contenu.", @@ -1064,6 +1074,7 @@ "SystemCheckExtensions": "Extensions requises", "SystemCheckFileIntegrity": "Intégrité du fichier", "SystemCheckFunctions": "Fonctions requises", + "SystemCheckGDFreeType": "GD > 2.x + Freetype (graphiques)", "SystemCheckGDHelp": "Les sparklines (petits graphiques) ne fonctionneront pas.", "SystemCheckGlobHelp": "Cette fonction native a été désactivée sur votre hôte. Piwik va tenter de l'émuler mais il pourra rencontrer des restrictions de sécurité. Les fonctionnalités pourront en être impactées.", "SystemCheckGzcompressHelp": "Vous devez activer l'extension zlib et la fonction gzcompress", @@ -1112,8 +1123,10 @@ "TablesWarningHelp": "Vous pouvez choisir de réutiliser les tables de la base de données existante ou sélectionner une nouvelle installation pour effacer toutes les données existantes dans la base de données.", "TablesWithSameNamesFound": "Environ %1$s tables dans votre base de données %2$s ont le même nom que celles que Piwik essaie de créer.", "Timezone": "fuseau horaire du site web", + "WeHopeYouWillEnjoyPiwik": "Nous espérons que vous allez aimer utiliser Piwik autant que nous aimons le concevoir.", "Welcome": "Bienvenue!", - "WelcomeHelp": "<p>Piwik est une application d'analyse du web Open Source qui vous permet d'obtenir facilement les informations que vous désirez sur vos visiteurs.<\/p>\t<p>Ce procédé est divisé en %s étapes faciles et vous prendra 5 minutes environ.<\/p>" + "WelcomeHelp": "<p>Piwik est une application d'analyse du web Open Source qui vous permet d'obtenir facilement les informations que vous désirez sur vos visiteurs.<\/p>\t<p>Ce procédé est divisé en %s étapes faciles et vous prendra 5 minutes environ.<\/p>", + "WelcomeToCommunity": "Bienvenue dans la communauté Piwik!" }, "LanguagesManager": { "AboutPiwikTranslations": "À propos des traductions de Piwik", @@ -1160,6 +1173,7 @@ "Login": { "ConfirmationLinkSent": "Un lien de confirmation a été envoyé à votre courriel. Vérifiez votre courriel et cliquez sur le lien pour autoriser votre demande de changement de mot de passe.", "ContactAdmin": "Raison possible : Votre hébergeur peut avoir désactivé la fonction mail(). <br \/> Veuillez contacter votre administrateur Piwik.", + "ExceptionInvalidSuperUserAccessAuthenticationMethod": "Un utilisateur avec un accès super utilisateur ne peut être authentifié en utilisant le mécanisme '%s'.", "ExceptionPasswordMD5HashExpected": "Le paramètre mot de passe doit être le hash MD5 du mot de passe.", "InvalidNonceOrHeadersOrReferrer": "La sécurité du formulaire a échoué. Veuillez recharger le formulaire et vérifier que vos cookies sont activés. Si vous utilisez un serveur proxy, vous devez %s configurer Piwik pour accepter les en-têtes du proxy %s qui relaient les en-têtes de l'hôte. Vérifiez aussi que l'en-tête de votre référant est correctement transmis.", "InvalidOrExpiredToken": "La clef est invalide ou a expiré", @@ -1360,6 +1374,7 @@ "RecommendedForPrivacy": "(recommandé pour le respect de la vie privée)", "ReportsDataSavedEstimate": "Taille de la base de données", "SaveSettingsBeforePurge": "Vous avez modifié les paramètres de suppression des données. Veuillez les sauvegarder avant de démmarrer une purge.", + "SeeAlsoOurOfficialGuidePrivacy": "Consultez aussi notre guide officiel: %sConfidentialité de l'analyse web%s", "Teaser": "Sur cette page, vous pouvez personnaliser Piwik pour que sa gestion de la vie privée respecte la législation en vigueur, en : %s rendant anonyme l'adresse IP du visiteur%s, %s supprime automatiquement les anciens logs de visiteurs de la base de données%s, et %s fournit un mécanisme d'exclusion pour votre site web%s.", "TeaserHeadline": "Paramètres de vie privée", "UseAnonymizedIpForVisitEnrichment": "Utiliser les adresses IP anonymisées pour enrichir les visites", @@ -1427,7 +1442,8 @@ "WidgetGetAll": "Tous les référents", "WidgetKeywords": "Liste des mots-clés", "WidgetSocials": "Liste des réseaux sociaux", - "WidgetTopKeywordsForPages": "Meilleurs mots clefs pour l'URL" + "WidgetTopKeywordsForPages": "Meilleurs mots clefs pour l'URL", + "XPercentOfVisits": "%s%% des visites" }, "RowEvolution": { "AvailableMetrics": "Métriques disponibles", @@ -1590,6 +1606,7 @@ "ShowTrackingTag": "Afficher le code", "Sites": "Sites", "SiteSearchUse": "Vous pouvez utiliser Piwik pour suivre et effectuer un rapport sur ce que vos visiteurs cherchent sur le moteur de recherche interne de votre site web.", + "SuperUserAccessCan": "Un utilisateur avec un accès super utilisateur peut aussi %sconfigurer les paramètres globaux%s pour les nouveaux sites web.", "Timezone": "Fuseau horaire", "TrackingSiteSearch": "Suivi de la recherche interne du site", "TrackingTags": "Tags de suivi pour %s", @@ -1635,6 +1652,7 @@ "CannotSetupGeoIPAutoUpdating": "Il apparait que vous stockez vos bases de données GeoIP en dehors de Piwik (nous nous basons sur le fait qu'il n'y a pas de bases de données dans le sous-répertoire misc, mais votre GeoIP fonctionne). Piwik ne peut pas mettre à jour automatiquement vos bases de donnés GeoIP si elles se trouvent en dehors du répertoire misc.", "CannotUnzipDatFile": "Impossible de dézipper le fichier dat dans %1$s: %2$s", "City": "Ville", + "CityAndCountry": "%1$s, %2$s", "Continent": "Continent", "continent_afr": "Afrique", "continent_amc": "Amérique Centrale", @@ -1940,6 +1958,7 @@ "GeoIpLocationProviderDesc_ServerBased1": "Ce fournisseur de localisation utilise le module GeoIP qui a été installé sur votre serveur HTTP. Ce fournisseur est rapide et précis, mais peut être %1$suniquement utilisé avec le suivi de navigateur classique.%2$s", "GeoIpLocationProviderDesc_ServerBased2": "Si vous devez importer des fichiers de logs ou bien autre chose qui requiert de définir des adresses IP, utilisez %1$sl'implémentation PECL GeoIP(recommandé)%2$s ou %3$sl'implémentation GeoIP PHP%4$s.", "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Note: L'anonymisation de l'adresse IP n'a aucun effet sur les localisations communiquées par ce fournisseur. Avant de l'utiliser avec l'anonymisation d'IP, assurez vous que cela ne transgresse aucune loi sur la vie privées à laquelle vous pourriez être assujetti.", + "GeoIpLocationProviderNotRecomnended": "La géolocalisation fonctionne, mais vous n'utilisez pas un des fournisseurs recommandés.", "GeoIPNoServerVars": "Piwik ne parvient à trouver aucune variable GeoIP %s.", "GeoIPPeclCustomDirNotSet": "L'option %s du PHP ini n'est pas définie.", "GeoIPServerVarsFound": "Piwik a détecté les variables de GeoIP suivantes %s", @@ -2250,6 +2269,8 @@ "ChangePasswordConfirm": "Modifier le mot de passe modifiera aussi la clef d'authentification des utilisateurs. Voulez-vous vraiment continuer?", "ClickHereToDeleteTheCookie": "Cliquez ici pour supprimer le cookie et pour que Piwik prenne en compte vos visites", "ClickHereToSetTheCookieOnDomain": "Cliquez ici pour mettre en place un cookie qui exclura vos visites sur ceux de vos sites web qui sont analysés par Piwik sur %s", + "ConfirmGrantSuperUserAccess": "Voulez vous vraiment donner un accès super utilisateur à '%s'? Attention : cet utilisateur va avoir accès à tous les sites web et sera capable d'effectuer des tâches administratives.", + "ConfirmProhibitMySuperUserAccess": "%s, voulez-vous vraiment supprimer votre accès super utilisateur? Vous allez perdre toutes les permissions et accès aux sites web et serez déconnecté(e) de Piwik.", "DeleteConfirm": "Êtes-vous sûr de vouloir supprimer l'utilisateur %s?", "Email": "Courriel", "EmailYourAdministrator": "%1$sEnvoyez un courriel à votre administrateur à propos de ce problème%2$s.", diff --git a/lang/he.json b/lang/he.json index f79a2b291d..4c117caf25 100644 --- a/lang/he.json +++ b/lang/he.json @@ -1,56 +1,68 @@ { "Actions": { + "AvgGenerationTimeTooltip": "ממוצע מבוסס על %s מופע(ים) %s בין %s ו-%s", "ColumnClickedURL": "כתובת שנלחצה", - "ColumnClicks": "קליקים", + "ColumnClicks": "לחיצות", "ColumnClicksDocumentation": "מספר הפעמים שקישור זה נלחץ", "ColumnDownloadURL": "הורדת כתובת", "ColumnEntryPageTitle": "כותרת עמוד כניסה", "ColumnEntryPageURL": "כתובת עמוד כניסה", "ColumnExitPageTitle": "כותרת עמוד יציאה", "ColumnExitPageURL": "כתובת עמוד יציאה", - "ColumnNoResultKeyword": "מילת\/ות מפתח ללא תוצאות חיפוש", - "ColumnPageName": "שם הדף", + "ColumnNoResultKeyword": "מילות מפתח ללא תוצאות חיפוש", + "ColumnPageName": "שם העמוד", "ColumnPagesPerSearch": "עמודי תוצאות חיפוש", - "ColumnPagesPerSearchDocumentation": "מבקרים באתר לפעמים הלחצו על \"המשך\" על מנת לראות תוצאות נוספות , זהו ממוצע הדפי התוצאות למילה המסוימת", - "ColumnPageURL": "כתובת הדף", - "ColumnSearchCategory": "חיפוש קטגוריה", + "ColumnPagesPerSearchDocumentation": "מבקרים יחפשו באתרך, ולפעמים ילחצו ״קדימה״ לצפייה בתוצאות נוספות. זהו ממוצע עמודי תוצאות החיפוש שנצפו למילת מפתח זו.", + "ColumnPageURL": "כתובת העמוד", + "ColumnSearchCategory": "קטגורית חיפוש", "ColumnSearches": "חיפושים", - "ColumnSearchesDocumentation": "מספר המבקרים שחיפשו את המילה הזאת במנוע החיפוש של האתר", + "ColumnSearchesDocumentation": "מספר הביקורים שחיפשו אחר מילת מפתח זו במנוע החיפוש של אתרך.", + "ColumnSearchExits": "% יציאות חיפוש", + "ColumnSearchExitsDocumentation": "אחוז הביקורים שעזבו את האתר אחרי חיפוש מילת מפתח זו במנוע החיפוש של אתרך.", "ColumnSearchResultsCount": "מספר תוצאות חיפוש", "ColumnSiteSearchKeywords": "מילות מפתח ייחודיות", - "ColumnUniqueClicks": "קליקים ייחודיים", - "ColumnUniqueClicksDocumentation": "מספר המבקרים שהמשותף הוא לחיצה על הקישור. אם הקישור נלחץ מספר פעמים תוך כדי הביקור, יספר כפעם אחת בלבד", - "ColumnUniqueDownloads": "הורדת יחודיים", + "ColumnUniqueClicks": "לחיצות ייחודיות", + "ColumnUniqueClicksDocumentation": "מספר הביקורים שכללו לחיצה על קישור זה. אם קישור נלחץ יותר מפעם אחת במהלך ביקור, הוא יספר פעם אחת בלבד.", + "ColumnUniqueDownloads": "הורדות ייחודיות", "ColumnUniqueOutlinks": "קישורים יוצאים ייחודיים", - "DownloadsReportDocumentation": "%s בדו\"ח זה, אתה יכול לראות איזה קבצים המבקרים הורידו מהאתר. ,מציין את מספר הפעמים כהורדה כאשר הקישור נלחץ,ללא קשר אם ההורדה הושלמה או הופסקה באמצע אינה יודעת זאת PIWIK", + "DownloadsReportDocumentation": "בדו״ח זה, ניתן לראות אילו קבצים מבקרים הורידו. %s מה ש-Piwik סופרת כהורדה זה לחיצה על קישור ההורדה. בין אם ההורדה הסתיימה או לא - את זה Piwik לא יודעת.", + "EntryPagesReportDocumentation": "דו״ח זה מכיל מידע על עמודי כניסה שהיו בשימוש במהלך התקופה המוגדרת. עמוד כניסה הוא העמוד הראשון שמשתמש צפה בו במהלך ביקורו. %s כתובות הכניסה מוצגות כמבנה תיקיות.", "EntryPageTitles": "כותרות עמוד כניסה", + "EntryPageTitlesReportDocumentation": "דו״ח זה מכיל מידע אודות הכותרות של עמודי כניסה שהיו בשימוש במהלך התקופה המוגדרת.", + "ExitPagesReportDocumentation": "דו״ח זה מכיל מידע אודות עמודי יציאה שהתקיימו במהלך התקופה המוגדרת. עמוד יציאה הוא העמוד האחרון שמשתמש צופה בו במהלך ביקורו. %s כתובות היציאה מוצגות כבמנה תיקיות.", "ExitPageTitles": "כותרות עמוד יציאה", - "LearnMoreAboutSiteSearchLink": "למד עוד אודות המעקב איך מבקרי האתר משתמשים במנוע החיפוש שלך", + "ExitPageTitlesReportDocumentation": "דו״ח זה מכיל מידע אודות כותרות של עמודי יציאה שהתקיימו במהלך התקופה המוגדרת.", + "LearnMoreAboutSiteSearchLink": "למידה אודות מעקב אחר אופן השימוש של משתמשיך במנוע החיפוש של אתרך.", "OneSearch": "חיפוש 1", + "OutlinkDocumentation": "קישור יוצא הוא קישור שמוביל את המשתמש מחוץ לאתרך (לדומיין אחר).", + "OutlinksReportDocumentation": "דו״ח זה מציג רשימה היררכית של כתובות שנלחצו על ידי משתמשי אתרך.", + "PagesReportDocumentation": "דו״ח זה מכיל מידע אודות כתובת עמודים שבוקרו. %s הטבלה מאורגנת באופן היררכי, הכתובות מוצגות כמבנה תיקיות.", + "PageTitlesReportDocumentation": "דו״ח זה מכיל מידע אודות כותרות העמודים שבוקרו. %s כותרת העמוד היא תגית HTML %s שרוב הדפדפנים מציגים בכותרת החלון שלהם.", "PageUrls": "כתובות עמוד", - "PluginDescription": "מדווח על מספר צפיות, קישורים יוצאים והורדות. מעקב אחרי קישורים יוצאים והורדות הינו אוטומטי.", - "SiteSearchCategories1": "זהו דו\"ח רשימה של הקטגוריות שהמבקרים בחרו כאשר הם חיפשו באתר שלך", + "PluginDescription": "דיווח אודות צפיות בעמודים, קישורים יוצאים והורדות. עקיבה אחר קישורים יוצאים והורדות מתבצעת אוטומטית! ניתן גם לעקוב אחר מנוע החיפוש הפנימי של אתרך.", + "SiteSearchCategories1": "דו״ח זה מציג רשימה של קטגוריות שמבקרים בחרו כאשר חיפשו באתרך.", + "SiteSearchCategories2": "לדוגמה, אתרי מסחר מקוונים מציגים בד״כ בחירת ״קטגוריה״ כדי שהמבקרים יוכלו לצמצם את תוצאות החיפוש למוצרים בקטגוריה מסויימת.", "SiteSearchKeyword": "מילת מפתח (חיפוש באתר)", - "SiteSearchKeywordsDocumentation": "זהו דו\"ח רשימה של מילות החיפוש שהמבקרים חיפשו במנוע החיפוש הפנימי", - "SubmenuPagesEntry": "דפי כניסה", - "SubmenuPagesExit": "דפי יציאה", - "SubmenuPageTitles": "כותרות הדפים", + "SiteSearchKeywordsDocumentation": "דו״ח זה מציג רשימה של מילות חיפוש שמבקרים חיפשו אחריהן במנוע החיפוש הפנימי של אתרך.", + "SubmenuPagesEntry": "עמודי כניסה", + "SubmenuPagesExit": "עמודי יציאה", + "SubmenuPageTitles": "כותרות עמוד", "SubmenuSitesearch": "חיפוש באתר", "WidgetEntryPageTitles": "כותרות עמוד כניסה", "WidgetExitPageTitles": "כותרות עמוד יציאה", "WidgetPagesEntry": "עמודי כניסה", "WidgetPagesExit": "עמודי יציאה", "WidgetPageTitles": "כותרות עמוד", - "WidgetSearchCategories": "חיפוש קטגוריות", + "WidgetSearchCategories": "קטגוריות חיפוש", "WidgetSearchKeywords": "מילות חיפוש באתר", "WidgetSearchNoResultKeywords": "מילות חיפוש ללא תוצאות" }, "Annotations": { "Annotations": "הערות הסבר", - "ClickToDelete": "חלצו כדי למחוק הערה זו", - "ClickToEdit": "לחצו כדי לערוך הערה זו.", - "ClickToEditOrAdd": "לחצו כדי לערוך או להוסיף הערה חדשה.", - "ClickToStarOrUnstar": "לחצו כדי לסמן או להוריד סימון מהערה זו.", + "ClickToDelete": "לחץ כדי למחוק הערה זו.", + "ClickToEdit": "לחץ כדי לערוך הערה זו.", + "ClickToEditOrAdd": "לחץ כדי לערוך או להוסיף הערה חדשה.", + "ClickToStarOrUnstar": "לחץ כדי לסמן או להוריד סימון מהערה זו.", "CreateNewAnnotation": "יצירת הערה חדשה..", "EnterAnnotationText": "הקלידו הערה...", "IconDesc": "הראה הערות לטווח תאריכים המבוקש", @@ -64,7 +76,7 @@ "LoadedAPIs": "%s APIים נטענו בהצלחה", "MoreInformation": "למידע נוסף עבור הAPIים של Piwik, מומלץ להציץ ב%sהיכרות עם הAPI של Piwik%s וגם ב%sהעמקה אודות הAPI של Piwik%s.", "PluginDescription": "כל המידע בPiwik חופשי לשימוש דרך APIים פשוטים. תוסף זה הוא נקודת הגישה לשירותי רשת, אליהם ניתן לגשת בכדי לקבל ניתוח על אתרך במספר פורמטים: xml, json, php, csv וכו'.", - "QuickDocumentationTitle": "מדריך מקוצר לAPI", + "QuickDocumentationTitle": "מדריך מקוצר ל-API", "UserAuthentication": "אימות משתמש", "UsingTokenAuth": "אם ברצונך %s לדרוש מידע מתוך סקריטפ, עבודה כרונית וכד' %s יש צורך להוסיף את הפרמטר %s לכל קריאת API מהURLים שדורשים אימות." }, @@ -72,35 +84,36 @@ "Administration": "ניהול", "BrandingSettings": "הגדרות מיתוג", "CheckReleaseGetVersion": "כאשר מתבצעת בדיקה לגרסה חדשה של פיווק, קבל תמיד", - "ClickHereToOptOut": "לחץ כאן לביטול", + "ClickHereToOptIn": "לחץ כאן להצטרפות.", + "ClickHereToOptOut": "לחץ כאן לביטול.", "EmailServerSettings": "הגדרות שרת אימייל", "ForBetaTestersOnly": "עבור גרסת ניסיון בלבד", "ImageTracking": "תמונת מעקב", "ImageTrackingIntro1": "כאשר המבקרים ביטלו את יישום הג'אווה או שלא בשימוש, אתה יכול להשתמש בתמונת קישור למעקב אחרי המבקרים", "ImageTrackingLink": "קישור מעקב כתמונה", "JavaScriptTracking": "מעקב בג'אווה-סקריפט", - "JSTracking_EnableDoNotTrack": "אפשר לזהות משתמש שמבקש שלא לעקוב אחריו", - "LatestBetaRelease": "גרסת נסיון אחרונה", - "LatestStableRelease": "גרסה יציבה המעודכנת ביותר", + "LatestBetaRelease": "גרסת נסיון עדכנית", + "LatestStableRelease": "גרסה יציבה עדכנית", "LogoUpload": "בחירת קובץ לוגו", "MenuDiagnostic": "אבחון", "MenuGeneralSettings": "הגדרות כלליות", "MenuManage": "ניהול", - "OptOutForYourVisitors": "התחמקות מPiwik עבור גולשים", - "PiwikIsInstalledAt": "פיוויק מותקן ב", + "OptOutForYourVisitors": "התחמקות מ-Piwik עבור גולשיך", + "PiwikIsInstalledAt": "Piwik מותקן ב", "PluginDescription": "אזור הניהול של Piwik.", "PluginSettings": "הגדרות תוסף", + "TrackAGoal": "עקיבה אחר יעד", "TrackingCode": "קוד מעקב", - "TrustedHostSettings": "מארח בטוח על ידי פיוויק", + "TrustedHostSettings": "מארח מהימן ע״י Piwik", "UseCustomLogo": "להשתמש בלוגו מותאם אישית" }, "CoreHome": { "CategoryNoData": "אין מידע בקטגוריה זו. נא לנסות \"לכלול את כלל האוכלוסייה\"", "CheckForUpdates": "בדוק עדכונים", "Default": "ברירת מחדל", - "DonateCall1": "תמיד השימוש בפיוויק לא יעלה לך דבר , אך זה לא אומר שלהכין אותו לא עולה לנו כסף", - "HowMuchIsPiwikWorth": "כמה הערך של פיוויק שווה לך", - "JavascriptDisabled": "בכדי לצפות בPiwik חובה להפעיל JavaScript.<br\/>בכל מקרה, נראה כי הJavaScript מנוטרל או לא נתמך על יד הדפדפן שלך.<br\/>בכדי לצפות בצורה סטנדרטית, יש להפעיל את הJavaScript על ידי שינוי הגדרות הדפדפן, ולאחר מכן %1$sלנסות שוב%2$s.<br\/>", + "DonateCall1": "תמיד השימוש ב-Piwik לא יעלה לך דבר, אך זה לא אומר שלהכין אותו לא עולה לנו כסף", + "HowMuchIsPiwikWorth": "כמה Piwik שווה עבורך?", + "JavascriptDisabled": "-בכדי לצפות בPiwik חובה להפעיל JavaScript.<br\/>בכל מקרה, נראה כי הJavaScript מנוטרל או לא נתמך על יד הדפדפן שלך.<br\/>בכדי לצפות בצורה סטנדרטית, יש להפעיל את הJavaScript על ידי שינוי הגדרות הדפדפן, ולאחר מכן %1$sלנסות שוב%2$s.<br\/>", "MakeOneTimeDonation": "במקום,בצע תרומה חד-פעמית", "PageOf": "%1$s מתוך %2$s", "PeriodDay": "יום", @@ -113,11 +126,11 @@ "PeriodYear": "שנה", "PeriodYears": "שנים", "PluginDescription": "מבנה דוחות הפעילות.", - "SharePiwikShort": ".פיוויק!ניתוח אינטרנט חינם ובקוד פתוח .על הנתונים שלך", + "SharePiwikShort": "Piwik! ניתוח רשת חינמי ופתוח. שליטה בנתונים של עצמך.", "ShowJSCode": "הצגת הJavaScript להטמעה", - "SupportPiwik": "!תמוך בפיוויק", + "SupportPiwik": "תמיכה ב-Piwik!", "ThereIsNoDataForThisReport": "אין מידע להצגה עבור הדוח", - "ViewAllPiwikVideoTutorials": "הראה את כל סרטי ההדרכה של פיוויק", + "ViewAllPiwikVideoTutorials": "צפייה בכל סרטי ההדרכה של Piwik", "WebAnalyticsReports": "דוחות פעילות" }, "CorePluginsAdmin": { @@ -141,7 +154,7 @@ "Theme": "ערכת עיצוב", "Themes": "ערכות עיצוב", "ThemesManagement": "ניהול ערכות עיצוב", - "Version": "גירסה" + "Version": "גרסה" }, "CoreUpdater": { "ClickHereToViewSqlQueries": "צפייה והעתקת השאילתות שירוצו", @@ -240,8 +253,8 @@ "ColumnActionsPerVisit": "פעולות בכל ביקור", "ColumnAverageTimeOnPage": "זמן ממוצע בעמוד", "ColumnAvgTimeOnSite": "משך שהייה ממוצע באתר", - "ColumnBounceRate": "שיעור קפיצה", - "ColumnBounces": "קפיצות", + "ColumnBounceRate": "שיעור נטישה", + "ColumnBounces": "נטישות", "ColumnConversionRate": "שעור המרה", "ColumnEntrances": "כניסות", "ColumnExitRate": "שיעור יציאה", @@ -454,7 +467,7 @@ "Today": "היום", "Total": "סך הכל", "TranslatorEmail": "nirlah@gmail.com", - "TranslatorName": "<a href=\"http:\/\/www.nirlah.com\">Nirlah<\/a> - Nir Lahad", + "TranslatorName": "<a href=\"http:\/\/www.nirlah.com\">Nirlah - Nir Lahad<\/a>", "Unknown": "לא ידוע", "Upload": "העלאה", "Username": "שם משתמש", @@ -530,6 +543,10 @@ "Accounts": "חשבונות", "AddAccount": "הוספת חשבון" }, + "Overlay": { + "Clicks": "%s לחיצות", + "OneClick": "לחיצה 1" + }, "PrivacyManager": { "AnonymizeIpInlineHelp": "הסתרת הספרות האחרונות של כתובת הIP של המבקרים בכדי להתיישר עם החוקים \/ תקנות המקומיים." }, @@ -559,6 +576,9 @@ "DefaultAllVisits": "כל הביקורים", "VisibleToAllUsers": "כל המשתמשים" }, + "SEO": { + "Rank": "דירוג" + }, "SitesManager": { "Currency": "מטבע", "Sites": "אתרים", @@ -566,6 +586,19 @@ }, "UserCountry": { "City": "עיר", + "CityAndCountry": "%1$s, %2$s", + "Continent": "יבשת", + "continent_afr": "אפריקה", + "continent_amc": "מרכז אמריקה", + "continent_amn": "צפון אמריקה", + "continent_ams": "דרום אמריקה", + "continent_ant": "אנטרטיקה", + "continent_asi": "אסיה", + "continent_eur": "אירופה", + "continent_oce": "אוקייניה", + "Country": "מדינה", + "country_a1": "מתווך אנונימי", + "country_a2": "ספק לוויני", "country_ac": "האי אסנשן", "country_ad": "אנדורה", "country_ae": "איחוד האמירויות הערביות", @@ -576,6 +609,7 @@ "country_am": "ארמניה", "country_an": "אנטילים הולנדיים", "country_ao": "אנגולה", + "country_ap": "אסיה\/האוקינוס השקט", "country_aq": "אנטארקטיקה", "country_ar": "ארגנטינה", "country_as": "סמואה האמריקנית", @@ -601,11 +635,13 @@ "country_br": "ברזיל", "country_bs": "איי בהאמה", "country_bt": "בהוטן", + "country_bu": "בורמה", "country_bv": "איי בובה", "country_bw": "בוטסוואנה", "country_by": "בלארוס", "country_bz": "בליז", "country_ca": "קנדה", + "country_cat": "קהילות דוברות קטלאנית", "country_cc": "איי קוקוס", "country_cd": "קונגו - קינשאסה", "country_cf": "הרפובליקה של מרכז אפריקה", @@ -641,12 +677,14 @@ "country_er": "אריתראה", "country_es": "ספרד", "country_et": "אתיופיה", + "country_eu": "האיחוד האירופי", "country_fi": "פינלנד", "country_fj": "פיג׳י", "country_fk": "איי פוקלנד", "country_fm": "מיקרונזיה", "country_fo": "איי פארו", "country_fr": "צרפת", + "country_fx": "צרפת, מטרופוליטן", "country_ga": "גאבון", "country_gb": "בריטניה", "country_gd": "גרנדה", @@ -742,8 +780,10 @@ "country_no": "נורווגיה", "country_np": "נפאל", "country_nr": "נאורו", + "country_nt": "אזור נטרלי", "country_nu": "ניווה", "country_nz": "ניו זילנד", + "country_o1": "מדינה אחרת", "country_om": "עומאן", "country_pa": "פנמה", "country_pe": "פרו", @@ -770,6 +810,7 @@ "country_sc": "איי סיישל", "country_sd": "סודן", "country_se": "שוודיה", + "country_sf": "פינלנד", "country_sg": "סינגפור", "country_sh": "סנט הלנה", "country_si": "סלובניה", @@ -782,6 +823,7 @@ "country_sr": "סורינם", "country_ss": "דרום סודן", "country_st": "סאו טומה ופרינסיפה", + "country_su": "ברית המועצות הישנה", "country_sv": "אל סלבדור", "country_sx": "סינט מארטן", "country_sy": "סוריה", @@ -792,12 +834,14 @@ "country_tf": "טריטוריות דרומיות של צרפת", "country_tg": "טוגו", "country_th": "תאילנד", + "country_ti": "טיבט", "country_tj": "טג׳יקיסטן", "country_tk": "טוקלאו", "country_tl": "מזרח טימור", "country_tm": "טורקמניסטן", "country_tn": "תוניסיה", "country_to": "טונגה", + "country_tp": "מזרח טימור", "country_tr": "טורקיה", "country_tt": "טרינידד וטובגו", "country_tv": "טובלו", @@ -805,7 +849,8 @@ "country_tz": "טנזניה", "country_ua": "אוקראינה", "country_ug": "אוגנדה", - "country_um": "איים קטנים שלחוף ארצות הברית", + "country_uk": "בריטניה", + "country_um": "איים קטנים שלחופי ארצות הברית", "country_us": "ארצות הברית", "country_uy": "אורוגוואי", "country_uz": "אוזבקיסטן", @@ -822,15 +867,26 @@ "country_yt": "מאיוט", "country_za": "דרום אפריקה", "country_zm": "זמביה", + "country_zr": "זאיר", "country_zw": "זימבאבווה", + "GeoIPDatabases": "מסד נתונים GeoIP", + "Geolocation": "מיקום גאוגרפי", "Location": "מיקום" }, "UserCountryMap": { + "Cities": "ערים", + "Countries": "מדינות", "Hours": "שעות", "map": "מפה", - "VisitorMap": "מפת מבקרים" + "Minutes": "דקות", + "MinutesAgo": "לפני %s דקות", + "VisitorMap": "מפת מבקרים", + "WorldWide": "כלל-עולמי" }, "UserSettings": { + "ColumnBrowser": "דפדפן", + "ColumnBrowserFamily": "משפחת דפדפן", + "ColumnBrowserVersion": "גרסת דפדפן", "Language_aa": "אפארית", "Language_ab": "אבחזית", "Language_ae": "אבסטן", @@ -1015,30 +1071,77 @@ "Language_za": "ז'ואנג", "Language_zh": "סינית", "Language_zu": "זולו", - "LanguageCode": "קוד שפה" + "LanguageCode": "קוד שפה", + "WidgetResolutions": "רזולוציית מסך" }, "UsersManager": { + "AllWebsites": "כל האתרים", "Email": "אימייל", "ManageAccess": "ניהול הרשאות", "MenuUsers": "משתמשים", + "MenuUserSettings": "הגדרות משתמש", "PrivNone": "אין הרשאות", "User": "משתמש", "UsersManagement": "ניהול משתמשים" }, + "VisitFrequency": { + "ColumnActionsByReturningVisits": "פעולות לפי ביקורים חוזרים", + "ColumnAverageVisitDurationForReturningVisitors": "משך ממוצע של ביקור חוזר (שניות)", + "ColumnAvgActionsPerReturningVisit": "ממוצע פעולות לביקור חוזר", + "ColumnMaxActionsInReturningVisit": "מקסימום פעולות בביקור חוזר אחד", + "ColumnNbReturningVisitsConverted": "מספר ביקורים חוזרים שהומרו", + "ColumnReturningVisits": "ביקורים חוזרים", + "ColumnSumVisitLengthReturning": "סך הזמן ע״י מבקרים חוזרים (שניות)", + "ColumnUniqueReturningVisitors": "מבקרים חוזרים ייחודיים", + "ReturnActions": "%s פעולות ע״י ביקורים חוזרים", + "ReturnAverageVisitDuration": "%s משך ביקור ממוצע למבקרים חוזרים", + "ReturnAvgActions": "%s פעולות לביקור חוזר", + "ReturningVisitsDocumentation": "זו סקירה של ביקורים חוזרים.", + "ReturnVisits": "%s ביקורים חוזרים", + "SubmenuFrequency": "תדירות", + "WidgetGraphReturning": "ביקורים חוזרים לאורך זמן", + "WidgetOverview": "סקירת תדירות" + }, "VisitorInterest": { - "Engagement": "מעורבות" + "BetweenXYMinutes": "%1$s-%2$s דקות", + "BetweenXYSeconds": "%1$s-%2$s שניות", + "ColumnPagesPerVisit": "עמודים לביקור", + "ColumnVisitDuration": "משך ביקור", + "Engagement": "מעורבות", + "NPages": "%s עמודים", + "OneMinute": "דקה 1", + "OnePage": "עמוד 1", + "PlusXMin": "%s דקות", + "VisitNum": "מספר ביקור", + "VisitsByDaysSinceLast": "ביקורים לפי ימים מאז ביקור אחרון", + "visitsByVisitCount": "ביקורים לפי מספר ביקור", + "VisitsPerDuration": "ביקורים למשך ביקור", + "VisitsPerNbOfPages": "ביקורים למספר עמודים", + "WidgetLengths": "משך ביקורים", + "WidgetPages": "עמודים לביקור", + "WidgetVisitsByDaysSinceLast": "ביקורים לפי ימים מאז ביקור אחרון" }, "VisitsSummary": { + "AverageGenerationTime": "%s זמן עלייה ממוצע", "AverageVisitDuration": "%s זמן ביקור ממוצע", "GenerateQueries": "%s שאילתות בוצעו", "GenerateTime": "%s שניות בכדי לחולל את העמוד", "MaxNbActions": "%s מספר פעולות מקסימלי בביקור אחד", "NbActionsDescription": "%s פעולות (צפייה בעמודים, הורדות וקישורים יוצאים)", "NbActionsPerVisit": "%s פעולות בביקור", + "NbDownloadsDescription": "%s הורדות", + "NbKeywordsDescription": "%s מילות מפתח ייחודיות", + "NbOutlinksDescription": "%s קישורים יוצאים", + "NbPageviewsDescription": "%s צפיות בעמודים", + "NbSearchesDescription": "%s חיפושים באתר סה״כ", + "NbUniqueDownloadsDescription": "%s הורדות ייחודיות", + "NbUniqueOutlinksDescription": "%s קישורים יוצאים ייחודיים", + "NbUniquePageviewsDescription": "%s ביקורי עמודים ייחודיים", "NbUniqueVisitors": "%s מבקרים יחודיים", - "NbVisitsBounced": "%s ביקורים קפצו (עזבו את האתר אחרי עמוד אחד)", - "PluginDescription": "מדווח על ניתוח המספרים הכללי: ביקורים, מבקרים יחודיים, מספר פעולות, שיעור קפיצה וכו'", + "NbVisitsBounced": "%s ביקורים ננטשו (עזבו את האתר אחרי עמוד אחד)", + "PluginDescription": "מדווח על ניתוח המספרים הכללי: ביקורים, מבקרים יחודיים, מספר פעולות, שיעור נטישה וכו'", "VisitsSummary": "תקציר ביקורים", + "VisitsSummaryDocumentation": "זו סקירה של התפתחות הביקור.", "WidgetLastVisits": "גרף ביקורים אחרונים", "WidgetOverviewGraph": "מבט כללי עם גרף", "WidgetVisits": "מבט כללי על ביקורים" @@ -1046,10 +1149,19 @@ "VisitTime": { "ColumnLocalTime": "זמן מקומי", "ColumnServerTime": "זמן שרת", - "SubmenuTimes": "זמנים" + "DayOfWeek": "יום בשבוע", + "LocalTime": "ביקורים לזמן מקומי", + "NHour": "שעה %s", + "ServerTime": "ביקורים לזמן שרת", + "SubmenuTimes": "זמנים", + "VisitsByDayOfWeek": "ביקורים לפי יום בשבוע", + "WidgetByDayOfWeekDocumentation": "גרף זה מציג את מספר הביקורים שאתרך קיבל בכל יום בשבוע.", + "WidgetLocalTime": "ביקורים לפי זמן מקומי", + "WidgetServerTime": "ביקורים לפי זמן שרת" }, "Widgetize": { "OpenInNewWindow": "פתיחה בחלון חדש", - "PluginDescription": "התוסף מקל מאוד על ייצוא יישומונים של Piwik מבלוג, אתר או בIgoogle וNetvibes!" + "PluginDescription": "התוסף מקל מאוד על ייצוא יישומונים של Piwik מבלוג, אתר או בIgoogle וNetvibes!", + "TopLinkTooltip": "ייצוא דוחות Piwik כוידג׳טים והטמעת לוח הבקרה באפליקציה שלך כ-iframe." } }
\ No newline at end of file diff --git a/lang/it.json b/lang/it.json index 8470bec9c9..e62d5d4d4c 100644 --- a/lang/it.json +++ b/lang/it.json @@ -104,7 +104,7 @@ "DevelopmentProcess": "Poichè il nostro %sprocesso di sviluppo%s include migliaia di test automatizzati, i Beta Testers giocano un ruolo chiave nel raggiungimento in Piwik della \"Politica no bug\".", "EmailServerSettings": "Impostazioni server e-mail", "ForBetaTestersOnly": "Solo per beta tester", - "ImageTracking": "rilevamento immagine", + "ImageTracking": "Rilevamento immagine", "ImageTrackingIntro1": "Quando un visitatore ha disattivato JavaScript o quando JavaScript non può essere utilizzato, è possibile utilizzare un collegamento di tracciamento immagine per tracciare i visitatori.", "ImageTrackingIntro2": "Genera il link qui sotto e copia-incolla il codice HTML generato nella pagina. Se si utilizza questo come ripiego per il tracciamento JavaScript, è possibile limitarlo a %1$s tags.", "ImageTrackingIntro3": "Per la lista completa delle opzioni che è possibile utilizzare con un link di tracciamento dell'immagine, vedi la%1$sDocumentazione API Tracciamento%2$s.", @@ -884,6 +884,7 @@ "VisitTypeExample": "Ad esempio, per selezionare tutti i visitatori che sono ritornati al sito Web, compresi quelli che hanno comprato qualcosa nella loro precedenti visite, la richiesta di API conterrebbe %s", "Warning": "Attenzione", "WarningFileIntegrityNoManifest": "Il controllo dell'integrità dei file non può essere eseguito per la mancanza del file manifest.inc.php", + "WarningFileIntegrityNoManifestDeployingFromGit": "Se stai sviluppando Piwik da Git, questo messaggio è normale.", "WarningFileIntegrityNoMd5file": "Il controllo dell'integrità dei file non può essere eseguito per la mancanza della funzione md5_file().", "WarningPasswordStored": "%sAttenzione:%s Questa password verrà salvata nel file di configurazione e sarà visibile a chiunque ne ha accesso.", "Website": "Sito:", @@ -1448,7 +1449,8 @@ "WidgetGetAll": "Tutti i Referenti", "WidgetKeywords": "Lista di parole chiave", "WidgetSocials": "Elenco dei social network", - "WidgetTopKeywordsForPages": "Top Keyword per URL Pagina" + "WidgetTopKeywordsForPages": "Top Keyword per URL Pagina", + "XPercentOfVisits": "%s%% di visite" }, "RowEvolution": { "AvailableMetrics": "Metriche disponibili", @@ -1528,6 +1530,8 @@ "SegmentDisplayedAllWebsites": "tutti i siti", "SegmentDisplayedThisWebsiteOnly": "solo questo sito", "SegmentIsDisplayedForWebsite": "e mostrato per", + "SegmentNotApplied": "Segmento '%s' non applicato", + "SegmentNotAppliedExplanation": "Stai richiedendo i dati per il Segmento Personalizzato '%s', l'attuale configurazione di Piwik impedisce l'elaborazione in tempo reale dei report per questo segmento. Chiedi al tuo amministratore di Piwik di cambiare le impostazioni nel file di configurazione (%s). Puoi anche modificare questo Segmento e scegliere '%s'.", "SelectSegmentOfVisitors": "Seleziona un segmento di visitatori:", "ThisSegmentIsVisibleTo": "Questo segmento è visibile a:", "VisibleToAllUsers": "tutti gli utenti", @@ -1964,6 +1968,7 @@ "GeoIpLocationProviderDesc_ServerBased1": "Questo individuatore di posizione utilizza il modulo GeoIP che è stato installato nel vostro server HTTP. Questo è veloce e preciso, ma %1$spuò essere utilizzato solo con il normale monitoraggio browser.%2$s", "GeoIpLocationProviderDesc_ServerBased2": "Se si devono importare i file di log o fare qualcos'altro che richiede l'impostazione degli indirizzi IP, utilizza l'%1$simplementazione PECL GeoIP (consigliata)%2$s oppure l'%3$simplementazione PHP GeoIP%4$s.", "GeoIpLocationProviderDesc_ServerBasedAnonWarn": "Nota: l'anonimizzazione IP non ha alcun effetto sui luoghi segnalati da questo fornitore. Prima di utilizzarlo con la trasformazione in forma anonima degli IP, assicurati che questo non violi alcuna legge sulla privacy a cui puoi essere soggetto.", + "GeoIpLocationProviderNotRecomnended": "La geolocalizzazione sta funzionando ma tu non stai utilizzando uno dei provider raccomandati.", "GeoIPNoServerVars": "Piwik non riesce a trovare alcuna delle variabili %s GeoIP.", "GeoIPPeclCustomDirNotSet": "L'opzione %s PHP ini non è impostata.", "GeoIPServerVarsFound": "Piwik rileva le seguenti %s variabili GeoIP.", diff --git a/lang/sv.json b/lang/sv.json index 983b47105a..f27490f66f 100644 --- a/lang/sv.json +++ b/lang/sv.json @@ -96,6 +96,7 @@ "CoreAdminHome": { "Administration": "Administration", "BrandingSettings": "Varumärkesinställningar", + "CheckReleaseGetVersion": "När du söker efter en ny version av Piwik, se alltid till att", "ClickHereToOptIn": "Klicka här för att gå med.", "ClickHereToOptOut": "Klicka här för att gå ur.", "CustomLogoFeedbackInfo": "Om du anpassar Piwik's logotyp, kanske du också är intresserad av att dölja %s länken i toppmenyn. För att göra detta kan du inaktivera pluginen Feedback på sidan %sHantera Plugins%s.", @@ -116,6 +117,7 @@ "JSTracking_MergeSubdomains": "Spåra besökare på alla underdomäner av", "JSTracking_PageCustomVars": "Spåra en anpassad variabel för varje sidvisning", "JSTracking_VisitorCustomVars": "Spåra anpassade variabler för denna besökare", + "JSTrackingIntro1": "Du kan spåra besöken till din sida på många olika sätt. Det sättet som vi rekommenderar är via JavaScript. För att använda den här metoden behöver du ge varje undersida på din hemsida en JavaScript kod. Du kan hämta den koden här:", "LatestBetaRelease": "Senaste betaversionen", "LatestStableRelease": "Senaste stabila versionen", "LogoNotWriteable": "För att kunna använda en anpassad logotyp för Piwik krävs skrivrättigheter till logotypfilerna i temakatalogen: %s", @@ -130,12 +132,14 @@ "OptOutForYourVisitors": "Exkludera spårning för dina besökare", "PiwikIsInstalledAt": "Piwik är installerat på", "PluginDescription": "Piwik's administrationsområde.", + "PluginSettings": "Plugin inställningar", "TrackAGoal": "Monitorera ett mål", "TrackingCode": "Spårningskod", "TrustedHostConfirm": "Är du säker på att du vill ändra Piwik's betrodda värdnamn?", "TrustedHostSettings": "Betrodd Piwik Värdnamn", "UseCustomLogo": "Använd en anpassad logotyp", "ValidPiwikHostname": "Giltig Piwik Värdnamn", + "WithOptionalRevenue": "Med alternativ avkastning", "YouAreOptedIn": "Du är just nu inkluderad.", "YouAreOptedOut": "Du är just nu exkluderad.", "YouMayOptOut": "Du kan välja att inte ha ett unikt identifieringsnummer i en cookie tilldelad till din dator för att undvika analys av uppgifter som samlats in på denna webbplats.", @@ -168,6 +172,7 @@ "MakeADifference": "Gör skillnad: %1$sDonera nu%2$s för att finansiera Piwik 2.0!", "MakeOneTimeDonation": "Donera en engångssumma istället.", "NoPrivilegesAskPiwikAdmin": "Du är inloggad som '%s' men det verkar som om du inte har några rättigheter satta i Piwik. %s Fråga din Piwik administratör (klicka för att e-posta)%s för att få läsrättighet till en webbplats.", + "OnlyForSuperUserAccess": "Den här widgeten visas bara för användare som har Superanvändare access.", "PageOf": "%1$s av %2$s", "PeriodDay": "Dag", "PeriodDays": "dagar", @@ -190,6 +195,7 @@ "ShortWeekFormat": "%dayFrom% %shortMonthFrom% - %dayTo% %shortMonthTo% %shortYearTo%", "ShowJSCode": "Visa JavaScript-koden för att inkludera.", "SupportPiwik": "Stödj Piwik!", + "TableNoData": "Det finns ingen data för den här tabellen-", "ThereIsNoDataForThisReport": "Det finns ingen data för denna rapport.", "UnFlattenDataTable": "Rapporten är plan %s Gör den hierarkisk", "ViewAllPiwikVideoTutorials": "Visa alla videokurser för Piwik", @@ -197,31 +203,59 @@ "YouAreUsingTheLatestVersion": "Du använder den senaste versionen av Piwik!" }, "CorePluginsAdmin": { + "ActionActivateTheme": "Aktivt tema", + "ActionUninstall": "Avinstallera", "Activate": "Aktivera", "Activated": "Aktiverad", "Active": "Aktiv", + "AllowedUploadFormats": "På den här sidan kan du ladda upp ett plugin eller ett tema via .zipformat.", "AuthorHomepage": "Författarens webbplats", + "BackToExtendPiwik": "Tillbaka till Annonssidan", + "BeCarefulUsingThemes": "Teman som inte gjorts av Piwik bör användas med försiktighet då vi inte utvärderar dessa.", "ByXDevelopers": "av %s utvecklare", "Deactivate": "Inaktivera", + "Developer": "Utvecklare", + "EnjoyAnotherLookAndFeelOfThemes": "Njut av ytterligare en se & känn", + "FeaturedPlugin": "Utvalda plugin", + "GetNewFunctionality": "Få ny funktionalitet", + "History": "Historik", "Inactive": "Inaktiverad", + "InfoPluginUpdateIsRecommended": "Uppdatera dina plugin så du kan ta del av de senaste förbättringarna.", + "InfoThemeUpdateIsRecommended": "Uppdatera dina teman för att kunna ta del av den senaste versionen.", + "InstallNewPlugins": "Installera nya plugin", "LastUpdated": "Senast uppdaterad", "LicenseHomepage": "Licens Hemsida", "MainDescription": "Plugins breddar och utökar funktionerna i Piwik. När en plugin är installerad kan du aktivera eller inaktivera den här.", + "Marketplace": "Annonsplats", "MenuPlatform": "Plattform", + "NoPluginsFound": "Inga plugin hittade", + "NoThemesFound": "Inga teman kunde hittas", + "OriginThirdParty": "Tredje-part", "PluginDescription": "administrationsgränssnitt för plugins.", "PluginHomepage": "Plugin Hemsida", + "PluginKeywords": "Nyckelord", + "PluginNotWorkingAlternative": "Om du använt det här pluginet, kanske du kan hitta en nyare version i vår butik. Om inte så kanske du vill avinstallera det.", "PluginsManagement": "Pluginhantering", + "PluginWebsite": "Plugin sida", "Screenshots": "Skärmbump", "SortByNewest": "nyaste", "SortByPopular": "populär", "Status": "Status", + "StepDownloadingPluginFromMarketplace": "Ladda ner plugin från butiken.", + "StepReplaceExistingPlugin": "Ersätter nuvarande plugin", "StepUnzippingPlugin": "Packar upp tilläggsprogrammet", "StepUnzippingTheme": "Packar upp temat", "Support": "Support", + "TeaserExtendPiwik": "Få ut mer av Piwik med plugin och teman", + "TeaserExtendPiwikByTheme": "Njut av en annan design och känsla genom att installera ett nytt tema", "Theme": "Tema", "Themes": "Teman", + "ThemesDescription": "Teman kan förändra utseendet på Piwiks gränssnitt, och erbjuda en helt ny visuell upplevelse där du kan ta del av dina analysrapporter.", "ThemesManagement": "Hantera teman", - "Version": "Version" + "Updated": "Uppdaterad", + "UploadZipFile": "Uppladdad ZIP file", + "Version": "Version", + "Websites": "Webbsidor" }, "CoreUpdater": { "ClickHereToViewSqlQueries": "Klicka här för att visa och kopiera listan över SQL-frågor som kommer att exekveras", @@ -321,6 +355,12 @@ "DoNotTrack": { "PluginDescription": "Ignorera besök med X-Do-Not-Track eller DNT-huvud." }, + "Events": { + "Event": "Händelse", + "EventCategory": "Händelsekategori", + "Events": "Händelser", + "NbEvents": "Antal Event" + }, "Feedback": { "CategoryHire": "Hyr in en Piwik konsult", "CategorySecurity": "Rapportera en säkerhetsbugg", @@ -385,6 +425,7 @@ "Close": "Stäng", "ColumnActionsPerVisit": "Händelser per besök", "ColumnActionsPerVisitDocumentation": "Det genomsnittliga antalet händelser (sidvisningar, webbplatssökningar, nedladdningar eller utlänkar) som utfördes under besöken.", + "ColumnAverageGenerationTimeDocumentation": "Den genomsnittliga tiden det tog att ladda sidan. Det här mätvärdet inkluderar tiden som det tar servern att ladda sidan, plus tiden det tar för servern att visa sidan för besökaren. En låg genomsnittstid här betyder att sidan är snabb!", "ColumnAverageTimeOnPage": "Genomsnittlig tid på sidan", "ColumnAverageTimeOnPageDocumentation": "Den genomsnittliga tid som besökaren tillbringade på denna sida (bara sidan, inte hela webbplatsen).", "ColumnAvgTimeOnSite": "Genomsnittlig tid på webbplatsen", @@ -517,6 +558,7 @@ "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.", "Forums": "Forum", "FromReferrer": "från", @@ -584,6 +626,7 @@ "MonthlyReports": "Månadsrapporter", "More": "Mer", "MoreDetails": "Mer detaljer", + "MoreLowerCase": "Mer", "MultiSitesSummary": "Alla webbplatser", "Name": "Namn", "NbActions": "Antal händelser", @@ -683,6 +726,7 @@ "Search": "Sök", "SearchNoResults": "Inget resultat", "Seconds": "%ss", + "SeeAll": "Se hela", "SeeTheOfficialDocumentationForMoreInformation": "Se den %sofficiella dokumentationen%s för mer information.", "SelectYesIfYouWantToSendEmailsViaServer": "Välj \"Ja\" om du vill eller måste skicka e-post via en namngiven server istället för den lokala e-postfunktionen.", "Settings": "Inställningar", @@ -758,6 +802,7 @@ "Weekly": "Veckovis", "WeeklyReport": "veckovis", "WeeklyReports": "Veckorapporter", + "WellDone": "Bra gjort!", "Widgets": "Widgets", "YearlyReport": "årsvis", "YearlyReports": "Årsrapporter", @@ -837,8 +882,10 @@ "Manually": "manuellt", "ManuallyTriggeredUsingJavascriptFunction": "Målet utlöses manuellt genom att använda JavaScript API trackGoal()", "MatchesExpression": "matchar uttrycket %s", + "NewGoalIntro": "Att ha mål för konvertering är ett av de mest effektiva sätten att förbättra din affärsverksamhets mål.", "NewVisitorsConversionRateIs": "Nya besökares omvandlingsgrad är %s", "NewWhatDoYouWantUsersToDo": "Vad vill du att dina användare gör på din hemsida?", + "NoGoalsNeedAccess": "Bara den som är Administratör eller har ett Superaccess konto kan lägga till mål för webbsidan. Fråga din Administratör om han eller hon kan sätta upp mål för din sida. Att ha mål är ett utmärkt sätt att få hjälp att förstå hur du maximerar din webbsidas resultat!", "Optional": "(frivilligt)", "OverallConversionRate": "%s total omvandlingsgrad (besök med ett uppnått mål)", "OverallRevenue": "%s totala intäkter", @@ -867,6 +914,7 @@ "PluginDescription": "Skapa fina statiska grafbilder i PNG-format för någon Piwik rapport." }, "Installation": { + "CollaborativeProject": "Piwik är ett projekt som arbetats fram av människor från hela världen, med samma mål och mycket kärlek!", "CommunityNewsletter": "maila mig angående community-uppdateringar (nya plugins, nya funktioner, etc.)", "ConfigurationHelp": "Din Piwik konfigurationsfil verkar vara felkonfigurerad. Du kan antingen ta bort config \/ config.ini.php och återuppta installationen, eller korrigera inställningarna för databasanslutningen.", "ConfirmDeleteExistingTables": "Är du säker på att du vill ta bort tabellerna: %s från din databas? Varning: Data från dessa tabeller kommer inte kunna återskapas!", @@ -892,6 +940,7 @@ "Installation": "Installation", "InstallationStatus": "Installationsstatus", "InsufficientPrivilegesHelp": "Du kan lägga till dessa behörigheter genom att använda ett verktyg som tex phpMyAdmin eller genom att köra rätt SQL-frågor. Om du inte vet hur man gör dessa saker, vänd dig till din systemadministratör för hjälp med dessa behörigheter.", + "JSTracking_Intro": "För att spåra din trafik med hjälp av Piwik behöver du lägga till extrakod på var och en av dina webbsidor.", "LargePiwikInstances": "Hjälp för stora Piwik-instanser", "Legend": "Legend", "LoadDataInfileRecommended": "Om din Piwikserver spårar webbplatser med hög trafik (t.ex. > 100.000 sidor per månad), så rekommenderar vi att du försöker åtgärda följande problem.", @@ -979,6 +1028,7 @@ "TablesWarningHelp": "Antingen väljer du att återanvända befintliga databastabeller eller en ren installation för att radera alla befintliga data i databasen.", "TablesWithSameNamesFound": "Några %1$s tabeller i databasen %2$s har samma namn som tabellerna Piwik försöker skapa", "Timezone": "webbplatsens tidszon", + "WeHopeYouWillEnjoyPiwik": "Vi hoppas att du kommer tycka om att använda Piwik lika mycket som vi tyckte om att skapa det!", "Welcome": "Välkommen!", "WelcomeHelp": "<p>Piwik är ett open source webbanalysprogram som gör det enkelt att få den information du vill ha från dina besökare.<\/p><p>Denna process är uppdelad i %s enkla steg och tar ca 5 minuter.<\/p>" }, @@ -987,21 +1037,28 @@ "PluginDescription": "Denna plugin kommer att visa en lista över tillgängliga språk för Piwik's gränssnitt. Det valda språket kommer att sparas i inställningarna för varje användare." }, "Live": { + "ClickToViewMoreAboutVisit": "Klicka för mer information om det här besöket", + "FirstVisit": "Första besöket", "GoalType": "Typ", "KeywordRankedOnSearchResultForThisVisitor": "Sökordet %1$s rankade %2$s på %3$s i sökresultatet för besökaren", "LastHours": "Senaste %s timmarna", "LastMinutes": "Senaste %s minuterna", + "LastVisit": "Sista besöket", "LinkVisitorLog": "Visa detaljerad besökslogg", "MorePagesNotDisplayed": "fler sidor av den här besökaren visas inte", "NbVisitor": "1 besökare", "NbVisitors": "%s besökare", + "NextVisitor": "Nästa besökare", "PageRefreshed": "Antal gånger denna sida har besökts \/ uppdateras i rad.", "PluginDescription": "Spionera på dina besökare i realtid!", + "PreviousVisitor": "Förgående besökare", "RealTimeVisitorCount": "Besöksräknare i realtid", "Referrer_URL": "Hänvisningsadress", "SimpleRealTimeWidget_Message": "%s och %s dom senaste %s.", + "ViewVisitorProfile": "Ny besöksprofil", "VisitorLog": "Besökslogg", "VisitorLogDocumentation": "Denna tabell visar de senaste besök inom det valda datumintervallet. %s Om datumet inkluderar idag kan du se dina besökare i realtid! %s data som visas här är alltid live, oavsett om och hur ofta du använder cron-jobb för arkivering.", + "VisitorProfile": "Besöksprofil", "VisitorsInRealTime": "Besökare i realtid", "VisitorsLastVisit": "Denna besökares senaste besök var %s dagar sedan." }, @@ -1049,6 +1106,7 @@ "HowtoLoginAnonymous": "Lämna användarnamn och lösenord tomt för anonym inloggning", "HttpIsNotSecureWarning": "Ditt Piwik tillståndsbevis (token_auth) skickas i klartext om du använder 'HTTP'. Av denna anledning rekommenderar vi HTTPS för säker transport av data över Internet. Vill du fortsätta?", "HttpTimeout": "HTTP Timeout", + "IncompatiblePiwikVersion": "Den version av Piwik du använder är inkompatibel med Piwik Mobil 2. Uppdatera din Piwik installation, eller installera Piwik Mobil 1 och försök igen.", "LastUpdated": "Senast uppdaterad: %s", "LoadingReport": "Laddar %s", "LoginCredentials": "Behörighet", @@ -1073,6 +1131,7 @@ "RatingPleaseRateUs": "Piwik Mobile är en gratis programvara, vi skulle uppskatta om du tog en minut till att betygsätta appen i %s. Om du har förslag på nya funktioner eller vill rapportera buggar, vänligen kontakta %s", "ReleaseToRefresh": "Släpp för att uppdatera...", "Reloading": "Laddar om...", + "RestrictedCompatibility": "Begränsad tillgänglighet", "SaveSuccessError": "Vänligen verifiera inställningar", "SearchWebsite": "Sök webbplatser", "ShowAll": "Visa alla", @@ -1087,17 +1146,24 @@ }, "MobileMessaging": { "PhoneNumbers": "Telefonnummer", + "PluginDescription": "Skapa och ladda ner ett anpassade SMS rapporter och få dem skickade till din mobil dagligen, en gång i veckan eller en gång i månaden.", "Settings_APIKey": "API-nyckel", "Settings_CountryCode": "Landskod", + "Settings_CredentialNotProvidedByAdmin": "Innan du kan skapa och hantera telefonnummer, var snäll och fråga din administratör om han eller hon kan koppla Piwik till ett SMS konto", "Settings_DeleteAccountConfirm": "Är du säker på att du vill radera detta SMS-konto?", "Settings_InvalidActivationCode": "Koden var inte giltig, var god försök igen.", "Settings_ManagePhoneNumbers": "Hantera telefonnummer", "Settings_PhoneActivated": "Telefonnumret är validerat! Du kan nu få SMS med din statistik.", "Settings_PhoneNumber": "Telefonnummer", "Settings_PhoneNumbers_Add": "Lägg till ett nytt telefonnummer", + "Settings_PhoneNumbers_CountryCode_Help": "Om du inte vet din telefons landskod, titta efter ditt land här", + "Settings_PhoneNumbers_HelpAdd": "När du klickar på \"Lägg till\", kommer ett SMS som innehåller en kod att skickas till din telefon. Efter det ska du logga in på Piwik, klicka på inställningar och efter det Mobil Meddelanden. När du skrivit in din kod, kommer du kunna ta emot rapporter direkt till din telefon.", + "Settings_SMSAPIAccount": "Hantera SMS API konton", "Settings_SuperAdmin": "Administratörsinställningar", "Settings_ValidatePhoneNumber": "Bekräfta", + "Settings_VerificationCodeJustSent": "Vi har precis skickat ett SMS till det här numret med en kod: var snäll och skriv in den här koden ovan och klicka på \"verifiera\"", "SMS_Content_Too_Long": "[för långt]", + "TopLinkTooltip": "Få Webb Analysrapporter levererade till din mail inkorg eller din mobiltelefon", "TopMenu": "E-post och SMS-rapporter" }, "MultiSites": { @@ -1285,6 +1351,7 @@ "ReportFormat": "Rapportformat", "ReportHour": "Skicka rapporten vid", "ReportIncludeNWebsites": "Rapporten kommer att innehålla viktiga mättal för alla webbplatser som har minst ett besök (från %s webbsidorna som för tillfället är tillgängliga).", + "ReportSent": "Rapport skickad", "ReportsIncluded": "Statistik ingår", "ReportType": "Skicka rapport via", "SendReportNow": "Skicka rapport nu", @@ -1308,6 +1375,7 @@ "SegmentDisplayedAllWebsites": "alla webbsidor", "SegmentDisplayedThisWebsiteOnly": "endast denna webbsida", "SelectSegmentOfVisitors": "Välj ett besökarsegment", + "ThisSegmentIsVisibleTo": "Det här segmentet är synligt för:", "VisibleToAllUsers": "alla användare", "VisibleToMe": "jag" }, @@ -1359,6 +1427,7 @@ "GlobalWebsitesSettings": "Globala inställningar för webbplatser", "HelpExcludedIps": "Ange listan över IP-adresser, en per rad, som du önskar exkludera från spårningen av Piwik. Du kan använda wildcard. t.ex. %1$s eller %2$s", "JsTrackingTagHelp": "Här är JavaScript-spårningskoden att inkludera på alla dina sidor", + "KeepURLFragmentsHelp2": "Du kan också hoppa över den här inställningen för en egna webbsidor ovan.", "ListOfIpsToBeExcludedOnAllWebsites": "IP-adresserna som är listade nedan kommer att bli exkluderade från spårning på samtliga webbplatser.", "ListOfQueryParametersToBeExcludedOnAllWebsites": "Webbadressernas parametrar nedan kommer att uteslutas från webbadresser på alla webbplatser.", "ListOfQueryParametersToExclude": "Ange listan med parametrar för webbadress, en per rad, för att exkludera från webbadressernas rapporter.", @@ -1720,6 +1789,7 @@ "DownloadNewDatabasesEvery": "Uppdatera databasen varje", "FatalErrorDuringDownload": "Ett allvarlig fel påträffades när filen hämtades. Något kan vara fel med din uppkoppling, med GeoIP-databsen du hämtade, eller med Piwik. Försök hämta och installera den manuellt.", "FoundApacheModules": "Piwik hittade följande Apache-moduler", + "FromDifferentCities": "Olika städer", "GeoIPCannotFindMbstringExtension": "Funktionen %1$s kunde inte hittas. Kontrollera att tillägget %2$s är installerat och laddat.", "GeoIPDatabases": "GeoIP-databaser", "GeoIPDocumentationSuffix": "För att se data i den här rapporten måste du ställa in GeoIP i inställningarna, under fliken Geolocation. Dom kommersiella versionerna av GeoIP-databaserna från %1$sMaxmind%2$s är mer exakta än dom som är gratis. Klicka %3$shär%4$s för att se hur exakta dom är.", diff --git a/lang/vi.json b/lang/vi.json index 6e29a3fe68..98aa8c908d 100644 --- a/lang/vi.json +++ b/lang/vi.json @@ -152,6 +152,7 @@ "PiwikIsInstalledAt": "Piwik được cài đặt tại", "PluginDescription": "vùng quản trị của Piwik.", "PluginSettingChangeNotAllowed": "Bạn không được phép thay đổi giá trị của các thiết lập \"%s\" trong plugin \"%s\"", + "PluginSettings": "Cài đặt tiện ích", "PluginSettingsIntro": "Ở đây bạn có thể thay đổi các thiết lập cho các plugin của bên thứ 3 như sau:", "PluginSettingsValueNotAllowed": "Giá trị của trường \"%s\" trong plugin \"%s\" không được chấp nhận", "StableReleases": "Nếu Piwik là một phần quan trọng của công việc của bạn, chúng tôi khuyên bạn nên sử dụng phiên bản ổn định mới nhất. Nếu bạn sử dụng phiên bản beta mới nhất và bạn tìm thấy một lỗi hoặc có một đề nghị, xin vui lòng %s xem tại đây %s.", @@ -227,23 +228,46 @@ "YouAreUsingTheLatestVersion": "Bạn đang sử dụng phiên bản mới nhất của Piwik!" }, "CorePluginsAdmin": { + "ActionActivatePlugin": "Kích hoạt tiện ích", + "ActionActivateTheme": "Kích hoạt giao diện", + "ActionInstall": "Cài đặt", + "ActionUninstall": "Gỡ cài đặt", "Activate": "Kích hoạt", "Activated": "Đã kích hoạt", "Active": "Kích hoạt", + "AllowedUploadFormats": "Bạn có thể tải tiện ích hoặc giao diện dưới định dạng .zip lên qua trang này", "AuthorHomepage": "Tác giả Trang chủ", + "Authors": "Tác giả", + "BeCarefulUsingPlugins": "Cẩn thận khi sử dụng các tiện ích không được tạo ra từ đội ngũ Piwik vì chúng tôi chưa kiểm tra chúng.", + "BeCarefulUsingThemes": "Cẩn thận khi sử dụng các giao diện không được tạo ra bởi đội ngũ Piwki vì chúng tôi chưa kiểm tra chúng.", + "Changelog": "Lịch sử thay đổi", "Deactivate": "Ngừng hoạt động", + "Developer": "Người phát triển", + "DoMoreContactPiwikAdmins": "Để cài thêm tiện ích hay giao diện mời, xin vui lòng liên lạc với quản lý Piwik của bạn.", + "DownloadAndInstallPluginsFromMarketplace": "Bạn có thể tải và cài đặt các Tiện ích mời từ %sMarketplace%s.", + "GetEarlyAccessForPaidPlugins": "Lưu ý: hiện nay, mọi tiện ích đều được cung cấp miễn phí; Chúng tôi sẽ thêm Tiện ích trả phí tại Marketplace trong thời gian tới ((%sliên hệ%s để được sử dụng sớm).", "Inactive": "Không hoạt động", + "InfoPluginUpdateIsRecommended": "Cập nhập tiện ích của bạn ngay để hưởng lợi từ những thay đổi mới nhất.", + "InfoThemeUpdateIsRecommended": "Cập nhập giao diện của bạn để tận hưởng phiên bản mới nhất.", + "InstallingPlugin": "Cài đặt %s", "InstallNewPlugins": "Cài đặt các plugin mới", "InstallNewThemes": "Cài đặt các theme mới", + "LastUpdated": "Lần cập nhật cuối", "LicenseHomepage": "Cấp giấy phép Trang chủ", "MainDescription": "Bổ sung mở rộng và mở rộng các chức năng của Piwik. Khi một plugin được cài đặt, bạn có thể kích hoạt hay ngừng kích hoạt nó tại đây.", "MenuPlatform": "Nền tảng", + "NoPluginsFound": "Tiện ích không tìm thấy", + "NoThemesFound": "Giao diện không tìm thấy", "NoZipFileSelected": "Hãy chọn một tập tin ZIP.", + "NumDownloadsLatestVersion": "Phiên bản mới nhất: %s lượt tải", + "OrByUploadingAPlugin": "hoặc %stải lên tiện ích%s", + "OrByUploadingATheme": "hoặc %stải lên giao diện%s", "Origin": "Nguồn gốc", "OriginCore": "Lõi", "OriginThirdParty": "Bên thứ ba", "PluginDescription": "Giao diện quản trị plugin.", "PluginHomepage": "Trang chủ Plugin.", + "PluginKeywords": "Từ khóa", "PluginNotCompatibleWith": "%1$s plugin là không tương thích với %2$s.", "PluginsManagement": "Quản lý các Plugin.", "Status": "Trạng thái", diff --git a/plugins/CustomAlerts b/plugins/CustomAlerts -Subproject e46d7a20937f2bb880a9e6478069a42e71b271c +Subproject 6372a3ab891d3c86553fdd080b302d1918bd5eb diff --git a/plugins/DBStats/lang/et.json b/plugins/DBStats/lang/et.json index 91b1246ac4..b043c14a50 100644 --- a/plugins/DBStats/lang/et.json +++ b/plugins/DBStats/lang/et.json @@ -5,7 +5,7 @@ "DBSize": "Andmebaasi suurus", "EstimatedSize": "Ennustatud maht", "IndexSize": "Indeksi maht", - "MainDescription": "Piwik salvestab kõik veebianalüütika andmed Mysql andmebaasi. Hetkel, Piwiki tabelid kasutavad %s.", + "MainDescription": "Piwik salvestab kõik veebianalüütika andmed MySQL andmebaasi. Piwiku tabelid kasutavad hetkel %s.", "MetricDataByYear": "Mõõttabelid aasta järgi", "MetricTables": "Mõõttabelid", "OtherTables": "Muud tabelid", diff --git a/plugins/DevicesDetection/API.php b/plugins/DevicesDetection/API.php index bf6e025afd..3426aed72e 100644 --- a/plugins/DevicesDetection/API.php +++ b/plugins/DevicesDetection/API.php @@ -50,9 +50,8 @@ class API extends \Piwik\Plugin\API public function getType($idSite, $period, $date, $segment = false) { $dataTable = $this->getDataTable('DevicesDetection_types', $idSite, $period, $date, $segment); - $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceTypeLabel')); - $dataTable->filter('ColumnCallbackReplace', array('label', 'ucfirst')); $dataTable->filter('ColumnCallbackAddMetadata', array('label', 'logo', __NAMESPACE__ . '\getDeviceTypeLogo')); + $dataTable->filter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getDeviceTypeLabel')); return $dataTable; } diff --git a/plugins/DevicesDetection/Controller.php b/plugins/DevicesDetection/Controller.php index 1d2f9e4d75..81dabfe2a3 100644 --- a/plugins/DevicesDetection/Controller.php +++ b/plugins/DevicesDetection/Controller.php @@ -116,12 +116,81 @@ class Controller extends \Piwik\Plugin\Controller $view->os_family = $parsedUA['os_family']; $view->os_family_logo = getOsFamilyLogoExtended($parsedUA['os_family']); $view->os_version = $parsedUA['os']['version']; - $view->device_type = $parsedUA['device']['type']; - $view->device_type_logo = getDeviceTypeLogo(ucfirst($view->device_type)); + $view->device_type = getDeviceTypeLabel($parsedUA['device']['type']); + $view->device_type_logo = getDeviceTypeLogo($parsedUA['device']['type']); $view->device_model = $parsedUA['device']['model']; $view->device_brand = getDeviceBrandLabel($parsedUA['device']['brand']); $view->device_brand_logo = getBrandLogo($view->device_brand); return $view->render(); } + + public function showList() + { + Piwik::checkUserHasSomeAdminAccess(); + + $view = new View('@DevicesDetection/list'); + + $type = Common::getRequestVar('type', 'brands', 'string'); + + $list = array(); + + switch ($type) { + case 'brands': + $availableBrands = UserAgentParserEnhanced::$deviceBrands; + + foreach ($availableBrands AS $short => $name) { + $list[$name] = getBrandLogo($name); + } + break; + + case 'browsers': + $availableBrowsers = UserAgentParserEnhanced::$browsers; + + foreach ($availableBrowsers AS $short => $name) { + $list[$name] = getBrowserLogoExtended($short); + } + break; + + case 'browserfamilies': + $availableBrowserFamilies = UserAgentParserEnhanced::$browserFamilies; + + foreach ($availableBrowserFamilies AS $name => $browsers) { + $list[$name] = getBrowserFamilyLogoExtended($name); + } + break; + + case 'os': + $availableOSs = UserAgentParserEnhanced::$osShorts; + + foreach ($availableOSs AS $name => $short) { + if ($name != 'Bot') { + $list[$name] = getOsLogoExtended($short); + } + } + break; + + case 'osfamilies': + $osFamilies = UserAgentParserEnhanced::$osFamilies; + + foreach ($osFamilies AS $name => $oss) { + if ($name != 'Bot') { + $list[$name] = getOsFamilyLogoExtended($name); + } + } + break; + + case 'devicetypes': + $deviceTypes = UserAgentParserEnhanced::$deviceTypes; + + foreach ($deviceTypes AS $name) { + $list[$name] = getDeviceTypeLogo($name); + } + break; + } + + $view->itemList = $list; + + return $view->render(); + } } diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php index d37e7b27b2..ceac6f4cb6 100644 --- a/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php +++ b/plugins/DevicesDetection/UserAgentParserEnhanced/UserAgentParserEnhanced.php @@ -12,13 +12,14 @@ require_once(PIWIK_INCLUDE_PATH . '/libs/spyc.php'); class UserAgentParserEnhanced { public static $deviceTypes = array( - 'desktop', - 'smartphone', - 'tablet', - 'feature phone', - 'console', - 'tv', - 'car browser' + 'desktop', // 0 + 'smartphone', // 1 + 'tablet', // 2 + 'feature phone', // 3 + 'console', // 4 + 'tv', // 5 + 'car browser', // 6 + 'smart display' // 7 ); public static $deviceBrands = array( @@ -27,22 +28,29 @@ class UserAgentParserEnhanced 'AL' => 'Alcatel', 'AO' => 'Amoi', 'AP' => 'Apple', + 'AR' => 'Archos', 'AU' => 'Asus', 'AV' => 'Avvio', 'AX' => 'Audiovox', 'BE' => 'Becker', 'BI' => 'Bird', 'BL' => 'Beetel', + 'BO' => 'BangOlufsen', 'BQ' => 'BenQ', 'BS' => 'BenQ-Siemens', + 'CA' => 'Cat', 'CK' => 'Cricket', 'CL' => 'Compal', + 'CN' => 'CnM', + 'CR' => 'CreNova', 'CT' => 'Capitel', + 'CU' => 'Cube', 'DE' => 'Denver', 'DB' => 'Dbtel', 'DC' => 'DoCoMo', 'DI' => 'Dicam', 'DL' => 'Dell', + 'DM' => 'DMM', 'DP' => 'Dopod', 'EC' => 'Ericsson', 'EI' => 'Ezio', @@ -50,6 +58,7 @@ class UserAgentParserEnhanced 'ET' => 'eTouch', 'EZ' => 'Ezze', 'FL' => 'Fly', + 'GD' => 'Gemini', 'GI' => 'Gionee', 'GO' => 'Google', 'GR' => 'Gradiente', @@ -58,24 +67,35 @@ class UserAgentParserEnhanced 'HP' => 'HP', 'HT' => 'HTC', 'HU' => 'Huawei', + 'HX' => 'Humax', + 'IA' => 'Ikea', 'IK' => 'iKoMo', 'IM' => 'i-mate', 'IN' => 'Innostream', 'IO' => 'i-mobile', 'IQ' => 'INQ', + 'IT' => 'Intek', + 'IV' => 'Inverto', + 'JI' => 'Jiayu', 'JO' => 'Jolla', 'KA' => 'Karbonn', 'KD' => 'KDDI', 'KN' => 'Kindle', 'KO' => 'Konka', 'KT' => 'K-Touch', + 'KH' => 'KT-Tech', 'KY' => 'Kyocera', 'LA' => 'Lanix', 'LC' => 'LCT', 'LE' => 'Lenovo', 'LG' => 'LG', + 'LO' => 'Loewe', 'LU' => 'LGUPlus', + 'MA' => 'Manta Multimedia', + 'MD' => 'Medion', + 'ME' => 'Metz', 'MI' => 'MicroMax', + 'MK' => 'MediaTek', 'MO' => 'Mio', 'MR' => 'Motorola', 'MS' => 'Microsoft', @@ -92,10 +112,13 @@ class UserAgentParserEnhanced 'OR' => 'Orange', 'OT' => 'O2', 'PA' => 'Panasonic', + 'PE' => 'PEAQ', 'PH' => 'Philips', + 'PL' => 'Polaroid', 'PM' => 'Palm', 'PO' => 'phoneOne', 'PT' => 'Pantech', + 'PP' => 'PolyPad', 'QT' => 'Qtek', 'RM' => 'RIM', 'RO' => 'Rover', @@ -109,35 +132,50 @@ class UserAgentParserEnhanced 'SN' => 'Sendo', 'SO' => 'Sony', 'SP' => 'Spice', + 'SU' => 'SuperSonic', + 'SV' => 'Selevision', 'SY' => 'Sanyo', + 'SM' => 'Symphony', + 'SR' => 'Smart', 'TA' => 'Tesla', 'TC' => 'TCL', 'TE' => 'Telit', 'TH' => 'TiPhone', 'TI' => 'TIANYU', + 'TL' => 'Telefunken', 'TM' => 'T-Mobile', + 'TN' => 'Thomson', 'TO' => 'Toplux', 'TS' => 'Toshiba', + 'TT' => 'TechnoTrend', + 'TX' => 'TechniSat', 'UT' => 'UTStarcom', 'VD' => 'Videocon', 'VE' => 'Vertu', 'VI' => 'Vitelcom', 'VK' => 'VK Mobile', + 'VS' => 'ViewSonic', + 'VT' => 'Vestel', 'VO' => 'Voxtel', + 'VW' => 'Videoweb', 'WB' => 'Web TV', 'WE' => 'WellcoM', 'WO' => 'Wonu', + 'XI' => 'Xiaomi', 'XX' => 'Unknown', + 'YU' => 'Yuandao', 'ZO' => 'Zonda', 'ZT' => 'ZTE', ); public static $osShorts = array( 'AIX' => 'AIX', 'Android' => 'AND', + 'AmigaOS' => 'AMG', 'Apple TV' => 'ATV', 'Arch Linux' => 'ARL', 'BackTrack' => 'BTR', 'Bada' => 'SBA', + 'BeOS' => 'BEO', 'BlackBerry OS' => 'BLB', 'BlackBerry Tablet OS' => 'QNX', 'Bot' => 'BOT', @@ -152,6 +190,7 @@ class UserAgentParserEnhanced 'Gentoo' => 'GNT', 'Google TV' => 'GTV', 'HP-UX' => 'HPX', + 'Haiku OS' => 'HAI', 'IRIX' => 'IRI', 'Knoppix' => 'KNO', 'Kubuntu' => 'KBT', @@ -167,8 +206,8 @@ class UserAgentParserEnhanced 'OS/2' => 'OS2', 'OSF1' => 'T64', 'OpenBSD' => 'OBS', - 'PlayStation' => 'PSP', - 'PlayStation 3' => 'PS3', + 'PlayStation Portable' => 'PSP', + 'PlayStation' => 'PS3', 'Presto' => 'PRS', 'Puppy' => 'PPY', 'Red Hat' => 'RHT', @@ -210,24 +249,25 @@ class UserAgentParserEnhanced 'palmOS' => 'POS', 'webOS' => 'WOS' ); - protected static $desktopOsArray = array('IBM', 'Linux', 'Mac', 'Unix', 'Windows'); + protected static $desktopOsArray = array('AmigaOS', 'IBM', 'Linux', 'Mac', 'Unix', 'Windows', 'BeOS'); public static $osFamilies = array( 'Android' => array('AND'), + 'AmigaOS' => array('AMG'), 'Apple TV' => array('ATV'), 'BlackBerry' => array('BLB'), 'Bot' => array('BOT'), 'Brew' => array('BMP'), + 'BeOS' => array('BEO', 'HAI'), 'Chrome OS' => array('COS'), 'Firefox OS' => array('FOS'), 'Gaming Console' => array('WII', 'PS3'), 'Google TV' => array('GTV'), 'IBM' => array('OS2'), 'iOS' => array('IOS'), - 'Linux' => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS'), + 'Linux' => array('LIN', 'ARL', 'DEB', 'KNO', 'MIN', 'UBT', 'KBT', 'XBT', 'LBT', 'FED', 'RHT', 'MDR', 'GNT', 'SLW', 'SSE', 'PPY', 'CES', 'BTR', 'YNS', 'PRS', 'SAF'), 'Mac' => array('MAC'), 'Mobile Gaming Console' => array('PSP', 'NDS', 'XBX'), 'Other Mobile' => array('WOS', 'POS', 'QNX', 'SBA', 'TIZ', 'SMG'), - 'Sailfish' => array('SAF'), 'Simulator' => array('TKT', 'WWP'), 'Symbian' => array('SYM', 'SYS', 'SY3', 'S60', 'S40'), 'Unix' => array('SOS', 'AIX', 'HPX', 'BSD', 'NBS', 'OBS', 'DFB', 'SYL', 'IRI', 'T64'), @@ -238,18 +278,20 @@ class UserAgentParserEnhanced public static $browserFamilies = array( 'Android Browser' => array('AN'), 'BlackBerry Browser' => array('BB'), - 'Chrome' => array('CH', 'CM', 'CI', 'CF', 'CR', 'RM'), + 'Chrome' => array('CH', 'CD', 'CM', 'CI', 'CF', 'CN', 'CR', 'CP', 'RM'), 'Firefox' => array('FF', 'FE', 'SX', 'FB', 'PX', 'MB'), 'Internet Explorer' => array('IE', 'IM'), 'Konqueror' => array('KO'), 'NetFront' => array('NF'), - 'Nokia Browser' => array('NB'), - 'Opera' => array('OP', 'OM', 'OI'), + 'Nokia Browser' => array('NB', 'NO', 'NV'), + 'Opera' => array('OP', 'OM', 'OI', 'ON'), 'Safari' => array('SF', 'MF'), 'Sailfish Browser' => array('SA') ); public static $browsers = array( + 'AA' => 'Avant Browser', 'AB' => 'ABrowse', + 'AG' => 'ANTGalio', 'AM' => 'Amaya', 'AN' => 'Android Browser', 'AR' => 'Arora', @@ -260,18 +302,22 @@ class UserAgentParserEnhanced 'BE' => 'Beonex', 'BX' => 'BrowseX', 'CA' => 'Camino', + 'CD' => 'Comodo Dragon', 'CF' => 'Chrome Frame', 'CH' => 'Chrome', 'CI' => 'Chrome Mobile iOS', 'CK' => 'Conkeror', 'CM' => 'Chrome Mobile', + 'CN' => 'CoolNovo', 'CO' => 'CometBird', + 'CP' => 'ChromePlus', 'CR' => 'Chromium', 'CS' => 'Cheshire', 'DF' => 'Dolphin', 'DI' => 'Dillo', 'EL' => 'Elinks', 'EP' => 'Epiphany', + 'ES' => 'Espial TV Browser', 'FB' => 'Firebird', 'FD' => 'Fluid', 'FE' => 'Fennec', @@ -281,8 +327,11 @@ class UserAgentParserEnhanced 'GA' => 'Galeon', 'GE' => 'Google Earth', 'HJ' => 'HotJava', + 'IA' => 'Iceape', 'IB' => 'IBrowse', 'IC' => 'iCab', + 'ID' => 'IceDragon', + 'IW' => 'Iceweasel', 'IE' => 'Internet Explorer', 'IM' => 'IE Mobile', 'IR' => 'Iron', @@ -294,37 +343,50 @@ class UserAgentParserEnhanced 'KZ' => 'Kazehakase', 'LG' => 'Lightning', 'LI' => 'Links', + 'LS' => 'Lunascape', 'LX' => 'Lynx', 'MB' => 'MicroB', 'MC' => 'NCSA Mosaic', + 'ME' => 'Mercury', 'MF' => 'Mobile Safari', 'MI' => 'Midori', 'MS' => 'Mobile Silk', 'MX' => 'Maxthon', 'NB' => 'Nokia Browser', + 'NO' => 'Nokia OSS Browser', + 'NV' => 'Nokia Ovi Browser', 'NF' => 'NetFront', 'NL' => 'NetFront Life', + 'NP' => 'NetPositive', 'NS' => 'Netscape', 'OB' => 'Obigo', 'OI' => 'Opera Mini', 'OM' => 'Opera Mobile', 'OP' => 'Opera', + 'ON' => 'Opera Next', 'OV' => 'Openwave Mobile Browser', 'OW' => 'OmniWeb', 'PL' => 'Palm Blazer', + 'PM' => 'Pale Moon', 'PR' => 'Palm Pre', + 'PW' => 'Palm WebPro', 'PX' => 'Phoenix', + 'PO' => 'Polaris', 'RK' => 'Rekonq', 'RM' => 'RockMelt', 'SA' => 'Sailfish Browser', 'SF' => 'Safari', + 'SL' => 'Sleipnir', 'SM' => 'SeaMonkey', 'SN' => 'Snowshoe', 'SX' => 'Swiftfox', + 'TB' => 'Thunderbird', 'TZ' => 'Tizen Browser', 'UC' => 'UC Browser', + 'WE' => 'WebPositive', 'WO' => 'wOSBrowser', - 'YA' => 'Yandex Browser' + 'YA' => 'Yandex Browser', + 'XI' => 'Xiino' ); const UNKNOWN = "UNK"; @@ -332,6 +394,7 @@ class UserAgentParserEnhanced protected static $osRegexesFile = 'oss.yml'; protected static $browserRegexesFile = 'browsers.yml'; protected static $mobileRegexesFile = 'mobiles.yml'; + protected static $televisionRegexesFile = 'televisions.yml'; protected $userAgent; protected $os = ''; protected $browser = ''; @@ -372,6 +435,15 @@ class UserAgentParserEnhanced return $regexMobile; } + protected function getTelevisionRegexes() + { + static $regexTvs = null; + if(empty($regexTvs)) { + $regexTvs = Spyc::YAMLLoad(dirname(__FILE__) . self::$regexesDir . self::$televisionRegexesFile); + } + return $regexTvs; + } + public function parse() { $this->parseOs(); @@ -380,11 +452,15 @@ class UserAgentParserEnhanced $this->parseBrowser(); - if ($this->isMobile()) { - $mobileDef = $this->getMobileRegexes(); - $this->parseBrand($mobileDef); - $this->parseModel($mobileDef); + if($this->isHbbTv()) { + $this->parseTelevision(); } else { + $this->parseMobile(); + } + + if (empty($this->device) && $this->isHbbTv()) { + $this->device = array_search('tv', self::$deviceTypes); + } else if (empty($this->device) && $this->isDesktop()) { $this->device = array_search('desktop', self::$deviceTypes); } if ($this->debug) { @@ -403,14 +479,18 @@ class UserAgentParserEnhanced if (!$matches) return; - if (in_array($osRegex['name'], self::$osShorts)) { - $short = self::$osShorts[$osRegex['name']]; - } else { - $short = 'UNK'; + $name = $this->buildOsName($osRegex['name'], $matches); + $short = 'UNK'; + + foreach (self::$osShorts AS $osName => $osShort) { + if (strtolower($name) == strtolower($osName)) { + $name = $osName; + $short = $osShort; + } } $this->os = array( - 'name' => $this->buildOsName($osRegex['name'], $matches), + 'name' => $name, 'short_name' => $short, 'version' => $this->buildOsVersion($osRegex['version'], $matches) ); @@ -431,22 +511,40 @@ class UserAgentParserEnhanced if (!$matches) return; - if (in_array($browserRegex['name'], self::$browsers)) { - $short = array_search($browserRegex['name'], self::$browsers); - } else { - $short = 'XX'; + $name = $this->buildBrowserName($browserRegex['name'], $matches); + $short = 'XX'; + + foreach (self::$browsers AS $browserShort => $browserName) { + if (strtolower($name) == strtolower($browserName)) { + $name = $browserName; + $short = $browserShort; + } } $this->browser = array( - 'name' => $this->buildBrowserName($browserRegex['name'], $matches), + 'name' => $name, 'short_name' => $short, 'version' => $this->buildBrowserVersion($browserRegex['version'], $matches) ); } - protected function parseBrand($mobileRegexes) + protected function parseMobile() + { + $mobileRegexes = $this->getMobileRegexes(); + $this->parseBrand($mobileRegexes); + $this->parseModel($mobileRegexes); + } + + protected function parseTelevision() { - foreach ($mobileRegexes as $brand => $mobileRegex) { + $televisionRegexes = $this->getTelevisionRegexes(); + $this->parseBrand($televisionRegexes); + $this->parseModel($televisionRegexes); + } + + protected function parseBrand($deviceRegexes) + { + foreach ($deviceRegexes as $brand => $mobileRegex) { $matches = $this->matchUserAgent($mobileRegex['regex']); if ($matches) break; @@ -471,12 +569,12 @@ class UserAgentParserEnhanced } } - protected function parseModel($mobileRegexes) + protected function parseModel($deviceRegexes) { - if (empty($this->brand) || !empty($this->model)) + if (empty($this->brand) || !empty($this->model) || empty($deviceRegexes[$this->fullName]['models'])) return; - foreach ($mobileRegexes[$this->fullName]['models'] as $modelRegex) { + foreach ($deviceRegexes[$this->fullName]['models'] as $modelRegex) { $matches = $this->matchUserAgent($modelRegex['regex']); if ($matches) break; @@ -495,7 +593,7 @@ class UserAgentParserEnhanced protected function matchUserAgent($regex) { - $regex = '/' . str_replace('/', '\/', $regex) . '/i'; + $regex = '/(?:^|[^A-Z_-])(?:' . str_replace('/', '\/', $regex) . ')/i'; if (preg_match($regex, $this->userAgent, $matches)) { return $matches; @@ -615,37 +713,18 @@ class UserAgentParserEnhanced public function isBot() { - $decodedFamily = ''; - if (in_array($this->getOs('name'), self::$osShorts)) { - $osShort = self::$osShorts[$this->getOs('name')]; - } else { - $osShort = ''; - } - foreach (self::$osFamilies as $family => $familyOs) { - if (in_array($osShort, $familyOs)) { - $decodedFamily = $family; - break; - } - } - - return $decodedFamily == 'Bot'; + return $this->getOsFamily($this->getOs('short_name')) == 'Bot'; } public function isSimulator() { - $decodedFamily = ''; - if (in_array($this->getOs('name'), self::$osShorts)) { - $osShort = self::$osShorts[$this->getOs('name')]; - } else { - $osShort = ''; - } - foreach (self::$osFamilies as $family => $familyOs) { - if (in_array($osShort, $familyOs)) { - $decodedFamily = $family; - break; - } - } - return $decodedFamily == 'Simulator'; + return $this->getOsFamily($this->getOs('short_name')) == 'Simulator'; + } + + public function isHbbTv() + { + $regex = 'HbbTV/([1-9]{1}(\.[0-9]{1}){1,2})'; + return $this->matchUserAgent($regex); } public function isMobile() diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml index 3000e9bdbf..0c5b443bc4 100644 --- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml +++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/browsers.yml @@ -9,422 +9,510 @@ ############### #SailfishBrowser -- regex: 'SailfishBrowser/(\d+\.\d+)' - name: Sailfish Browser +- regex: 'SailfishBrowser(?:/(\d+\.\d+))?' + name: 'Sailfish Browser' version: '$1' # SeaMonkey -- regex: '(Iceape|SeaMonkey|gnuzilla)/(\d+\.\d+)' - name: $1 +- regex: '(Iceape|SeaMonkey|gnuzilla)(?:/(\d+\.\d+))?' + name: '$1' version: '$2' # Camino -- regex: 'Camino/(\d+\.\d+)' - name: Camino +- regex: 'Camino(?:/(\d+\.\d+))?' + name: 'Camino' version: '$1' #Fennec (Firefox for mobile) -- regex: 'Fennec/(\d+\.\d+)' - name: Fennec +- regex: 'Fennec(?:/(\d+\.\d+))?' + name: 'Fennec' version: '$1' #MicroB - regex: 'Firefox.*Tablet browser (\d+\.\d+)' - name: MicroB + name: 'MicroB' version: '$1' - + +#Avant Browser +- regex: 'Avant Browser' + name: 'Avant Browser' + version: '' + +#Iceweasel +- regex: 'Iceweasel(?:/(\d+\.\d+))?' + name: 'Iceweasel' + version: '$1' + +#WebPositive +- regex: 'WebPositive' + name: 'WebPositive' + version: '' + +#Pale Moon +- regex: 'PaleMoon(?:/(\d+\.\d+))?' + name: 'Pale Moon' + version: '$1' + +#CometBird +- regex: 'CometBird(?:/(\d+\.\d+))?' + name: 'CometBird' + version: '$1' + +#IceDragon +- regex: 'IceDragon(?:/(\d+\.\d+))?' + name: 'IceDragon' + version: '$1' + +#Flock +- regex: 'Flock(?:/(\d+\.\d+))?' + name: 'Flock' + version: '$1' + +#Swiftfox +- regex: 'Firefox/(\d+\.\d+).*\(Swiftfox\)' + name: 'Swiftfox' + version: '$1' + #Firefox -- regex: 'Firefox/(\d+\.\d+)' - name: Firefox +- regex: 'Firefox(?:/(\d+\.\d+))?' + name: 'Firefox' version: '$1' - regex: '(BonEcho|GranParadiso|Lorentz|Minefield|Namoroka|Shiretoko)/(\d+\.\d+)' - name: Firefox '$1' - version: '$2' + name: 'Firefox' + version: '$1 ($2)' -#Flock -- regex: 'Flock/(\d+\.\d+)' - name: Flock +#ANTGalio +- regex: 'ANTGalio(?:/(\d+\.\d+))?' + name: 'ANTGalio' version: '$1' - + +#Espial TV Browser +- regex: '(?:Espial|Escape)(?:[/ ](\d+\.\d+))?' + name: 'Espial TV Browser' + version: '$1' + #RockMelt -- regex: 'RockMelt/(\d+\.\d+)' - name: RockMelt +- regex: 'RockMelt(?:/(\d+\.\d+))?' + name: 'RockMelt' version: '$1' #Netscape -- regex: '(?:Navigator|Netscape6)/(\d+\.\d+)' - name: Netscape +- regex: '(?:Navigator|Netscape6)(?:/(\d+\.\d+))?' + name: 'Netscape' version: '$1' #Opera - regex: '(?:Opera Tablet.*Version|Opera/.+Opera Mobi.+Version|Mobile.+OPR)/(\d+\.\d+)' - name: Opera Mobile + name: 'Opera Mobile' version: '$1' - regex: 'Opera Mini/(?:att/)?(\d+\.\d+)' - name: Opera Mini + name: 'Opera Mini' version: '$1' -- regex: '(?:Opera|OPR)[/ ](?:9.80.*Version/)?(\d+\.\d+)' - name: Opera +- regex: 'OPR[/ ](\d+\.\d+)' + name: 'Opera Next' + version: '$1' +- regex: '(?:Opera)[/ ](?:9.80.*Version/)?(\d+\.\d+)' + name: 'Opera' version: '$1' #wOSBrowser - regex: '(?:hpw|web)OS/(\d+\.\d+)' - name: wOSBrowser - version: '$1' - -#Swiftfox -- regex: 'Firefox/(\d+\.\d+).*\(Swiftfox\)' - name: Swiftfox + name: 'wOSBrowser' version: '$1' #Rekonq -- regex: 'rekonq' - name: Rekonq - version: '' - +- regex: 'rekonq(?:/(\d+\.\d+))?' + name: 'Rekonq' + version: '$1' + +#CoolNovo +- regex: 'CoolNovo(?:/(\d+\.\d+))?' + name: 'CoolNovo' + version: '$1' + +#Comodo Dragon +- regex: 'Comodo[ _]Dragon(?:/(\d+\.\d+))?' + name: 'Comodo Dragon' + version: '$1' + +#ChromePlus +- regex: 'ChromePlus(?:/(\d+\.\d+))?' + name: 'ChromePlus' + version: '$1' + #Conkeror -- regex: 'Conkeror/(\d+\.\d+)' - name: Conkeror +- regex: 'Conkeror(?:/(\d+\.\d+))?' + name: 'Conkeror' version: '$1' #Konqueror -- regex: 'Konqueror/(\d+\.\d+)' - name: Konqueror +- regex: 'Konqueror(?:/(\d+\.\d+))?' + name: 'Konqueror' version: '$1' #Baidu Browser -- regex: 'baidubrowser[/ ](\d+)' - name: Baidu Browser +- regex: 'baidubrowser(?:[/ ](\d+(?:\.?\d+)?))?' + name: 'Baidu Browser' version: '$1' #Yandex Browser -- regex: 'YaBrowser/(\d+)' - name: Yandex Browser +- regex: 'YaBrowser(?:/(\d+(?:\.?\d+)?))?' + name: 'Yandex Browser' version: '$1' #Midori -- regex: 'Midori/(\d+\.\d+)' - name: Midori +- regex: 'Midori(?:/(\d+\.\d+))?' + name: 'Midori' + version: '$1' + +#Mercury +- regex: 'Mercury(?:/(\d+\.\d+))?' + name: 'Mercury' + version: '$1' + +#Maxthon +- regex: 'Maxthon[ /](\d+\.\d+)' + name: 'Maxthon' + version: '$1' +- regex: '(?:Maxthon|MyIE2|Uzbl|Shiira)' + name: 'Maxthon' + version: '' + +#Iron +- regex: 'Iron(?:/(\d+\.\d+))?' + name: 'Iron' + version: '$1' + +#Epiphany +- regex: 'Epiphany(?:/(\d+\.\d+))?' + name: 'Epiphany' version: '$1' #Chrome -- regex: 'CrMo/(\d+\.\d+)' - name: Chrome Mobile +- regex: 'CrMo(?:/(\d+\.\d+))?' + name: 'Chrome Mobile' version: '$1' -- regex: 'CriOS/(\d+\.\d+)' - name: Chrome Mobile iOS +- regex: 'CriOS(?:/(\d+\.\d+))?' + name: 'Chrome Mobile iOS' version: '$1' -- regex: 'Chrome/(\d+\.\d+).*Mobile' - name: Chrome Mobile +- regex: 'Chrome(?:/(\d+\.\d+))?.*Mobile' + name: 'Chrome Mobile' version: '$1' -- regex: 'chromeframe/(\d+\.\d+)' - name: Chrome Frame +- regex: 'chromeframe(?:/(\d+\.\d+))?' + name: 'Chrome Frame' version: '$1' -- regex: 'Chrome/(\d+\.\d+)' - name: Chrome +- regex: 'Chrome(?:/(\d+\.\d+))?' + name: 'Chrome' version: '$1' -- regex: 'Chromium/(\d+\.\d+)' - name: Chromium +- regex: 'Chromium(?:/(\d+\.\d+))?' + name: 'Chromium' version: '$1' #UC Browser -- regex: 'UC[ ]?Browser[ /](\d+\.\d+)' - name: UC Browser +- regex: 'UC[ ]?Browser(?:[ /]?(\d+\.\d+))?' + name: 'UC Browser' version: '$1' -- regex: '(?:UC Browser|UCBrowser|UCWEB)(\d+\.\d+)' - name: UC Browser +- regex: 'UCWEB(?:[ /]?(\d+\.\d+))?' + name: 'UC Browser' version: '$1' - + #Tizen Browser -- regex: '(?:Tizen|SLP) Browser/(\d+\.\d+)' - name: Tizen Browser +- regex: '(?:Tizen|SLP) Browser(?:/(\d+\.\d+))?' + name: 'Tizen Browser' version: '$1' - -#Epiphany -- regex: 'Epiphany/(\d+\.\d+)' - name: Epiphany + +#Palm Blazer +- regex: 'Blazer(?:/(\d+\.\d+))?' + name: 'Palm Blazer' version: '$1' - +- regex: 'Pre/(\d+\.\d+)' + name: 'Palm Pre' + version: '$1' + +#Palm WebPro +- regex: 'WebPro(?:[ /](\d+\.\d+))?' + name: 'Palm WebPro' + version: '$1' + #Fireweb Navigator -- regex: 'Fireweb Navigator/(\d+\.\d+)' - name: Fireweb Navigator +- regex: 'Fireweb Navigator(?:/(\d+\.\d+))?' + name: 'Fireweb Navigator' version: '$1' #Jasmine -- regex: 'Jasmine[ /](\d+\.\d+)' - name: Jasmine +- regex: 'Jasmine(?:[ /](\d+\.\d+))?' + name: 'Jasmine' version: '$1' #Lynx -- regex: 'Lynx/(\d+\.\d+)' - name: Lynx +- regex: 'Lynx(?:/(\d+\.\d+))?' + name: 'Lynx' version: '$1' #NCSA Mosaic -- regex: 'NCSA_Mosaic/(\d+\.\d+)' - name: NCSA Mosaic +- regex: 'NCSA_Mosaic(?:/(\d+\.\d+))?' + name: 'NCSA Mosaic' version: '$1' #ABrowse -- regex: 'ABrowse (\d+\.\d+)' - name: ABrowse +- regex: 'ABrowse(?: (\d+\.\d+))?' + name: 'ABrowse' version: '$1' #Amaya -- regex: 'amaya/(\d+\.\d+)' - name: Amaya +- regex: 'amaya(?:/(\d+\.\d+))?' + name: 'Amaya' version: '$1' #Amiga Voyager -- regex: 'AmigaVoyager/(\d+\.\d+)' - name: Amiga Voyager +- regex: 'AmigaVoyager(?:/(\d+\.\d+))?' + name: 'Amiga Voyager' version: '$1' #Amiga Aweb -- regex: 'Amiga-Aweb/(\d+\.\d+)' - name: Amiga Aweb +- regex: 'Amiga-Aweb(?:/(\d+\.\d+))?' + name: 'Amiga Aweb' version: '$1' #Arora -- regex: 'Arora/(\d+\.\d+)' - name: Arora +- regex: 'Arora(?:/(\d+\.\d+))?' + name: 'Arora' version: '$1' #Beonex -- regex: 'Beonex/(\d+\.\d+)' - name: Beonex +- regex: 'Beonex(?:/(\d+\.\d+))?' + name: 'Beonex' version: '$1' #BlackBerry Browser -- regex: 'Black[bB]erry|PlayBook|BB10' - name: BlackBerry Browser +- regex: 'BlackBerry|PlayBook|BB10' + name: 'BlackBerry Browser' version: '' #BrowseX - regex: 'BrowseX \((\d+\.\d+)' - name: BrowseX + name: 'BrowseX' version: '$1' #Cheshire -- regex: 'Cheshire/(\d+\.\d+)' - name: Cheshire - version: '$1' - -#CometBird -- regex: 'CometBird/(\d+\.\d+)' - name: CometBird +- regex: 'Cheshire(?:/(\d+\.\d+))?' + name: 'Cheshire' version: '$1' #Dillo -- regex: 'Dillo/(\d+\.\d+)' - name: Dillo +- regex: 'Dillo(?:/(\d+\.\d+))?' + name: 'Dillo' version: '$1' #Dolphin -- regex: 'Dolfin/(\d+\.\d+)|dolphin' - name: Dolphin +- regex: 'Dolfin(?:/(\d+\.\d+))?|dolphin' + name: 'Dolphin' version: '$1' #Elinks -- regex: 'Elinks/(\d+\.\d+)' - name: Elinks +- regex: 'Elinks(?:/(\d+\.\d+))?' + name: 'Elinks' version: '$1' #Firebird -- regex: 'Firebird/(\d+\.\d+)' - name: Firebird +- regex: 'Firebird(?:/(\d+\.\d+))?' + name: 'Firebird' version: '$1' #Fluid -- regex: 'Fluid/(\d+\.\d+)' - name: Fluid +- regex: 'Fluid(?:/(\d+\.\d+))?' + name: 'Fluid' version: '$1' #Galeon -- regex: 'Galeon/(\d+\.\d+)' - name: Galeon +- regex: 'Galeon(?:/(\d+\.\d+))?' + name: 'Galeon' version: '$1' #Google Earth -- regex: 'Google Earth/(\d+\.\d+)' - name: Google Earth +- regex: 'Google Earth(?:/(\d+\.\d+))?' + name: 'Google Earth' version: '$1' #HotJava -- regex: 'HotJava/(\d+\.\d+)' - name: HotJava +- regex: 'HotJava(?:/(\d+\.\d+))?' + name: 'HotJava' version: '$1' #IBrowse -- regex: 'IBrowse[ /](\d+\.\d+)' - name: IBrowse +- regex: 'IBrowse(?:[ /](\d+\.\d+))?' + name: 'IBrowse' version: '$1' #iCab -- regex: 'iCab[ /](\d+\.\d+)' - name: iCab +- regex: 'iCab(?:[ /](\d+\.\d+))?' + name: 'iCab' version: '$1' - + +#Sleipnir +- regex: 'Sleipnir(?:[ /](\d+\.\d+))?' + name: 'Sleipnir' + version: '$1' + #Internet Explorer - regex: 'IEMobile[ /](\d+\.\d+)' - name: IE Mobile + name: 'IE Mobile' + version: '$1' +- regex: 'MSIE (\d+\.\d+).*XBLWP7' + name: 'IE Mobile' version: '$1' - regex: 'MSIE.*Trident/4.0' - name: Internet Explorer + name: 'Internet Explorer' version: 8.0 - regex: 'MSIE.*Trident/5.0' - name: Internet Explorer + name: 'Internet Explorer' version: 9.0 - regex: 'MSIE.*Trident/6.0' - name: Internet Explorer + name: 'Internet Explorer' version: 10.0 - regex: 'Trident/7.0' - name: Internet Explorer + name: 'Internet Explorer' version: 11.0 -- regex: 'MSIE (\d+\.\d+).*XBLWP7' - name: IE Mobile - version: '$1' - regex: 'MSIE (\d+\.\d+)' - name: Internet Explorer + name: 'Internet Explorer' version: '$1' - regex: 'IE[ /](\d+\.\d+)' - name: Internet Explorer + name: 'Internet Explorer' version: '$1' -#Iron -- regex: 'Iron/(\d+\.\d+)' - name: Iron - version: '$1' - #Kapiko -- regex: 'Kapiko/(\d+\.\d+)' - name: Kapiko +- regex: 'Kapiko(?:/(\d+\.\d+))?' + name: 'Kapiko' version: '$1' #Kazehakase -- regex: 'Kazehakase/(\d+\.\d+)' - name: Kazehakase +- regex: 'Kazehakase(?:/(\d+\.\d+))?' + name: 'Kazehakase' version: '$1' #Kindle Browser - regex: 'Kindle/(\d+\.\d+)' - name: Kindle Browser + name: 'Kindle Browser' version: '$1' #K-meleon -- regex: 'K-meleon/(\d+\.\d+)' - name: K-meleon +- regex: 'K-meleon(?:/(\d+\.\d+))?' + name: 'K-meleon' version: '$1' #Lightning -- regex: 'Lightning/(\d+\.\d+)' - name: Lightning +- regex: 'Lightning(?:/(\d+\.\d+))?' + name: 'Lightning' version: '$1' #Links -- regex: 'Links \((\d+\.\d+)' - name: Links +- regex: 'Links(?: \((\d+\.\d+))?' + name: 'Links' version: '$1' - -#Maxthon -- regex: 'Maxthon (\d+\.\d+)' - name: Maxthon + +#Lunascape +- regex: 'Lunascape(?:/(\d+\.\d+))?' + name: 'Lunascape' version: '$1' -- regex: '(?:Maxthon|MyIE2|Uzbl|Shiira)' - name: Maxthon - version: '' - + #Openwave Mobile Browser -- regex: 'UP.Browser/(\d+\.\d+)' - name: Openwave Mobile Browser +- regex: 'UP.Browser(?:/(\d+\.\d+))?' + name: 'Openwave Mobile Browser' version: '$1' #OmniWeb -- regex: 'OmniWeb/[v]?(\d+\.\d+)' - name: OmniWeb +- regex: 'OmniWeb(?:/[v]?(\d+\.\d+))?' + name: 'OmniWeb' version: '$1' #Phoenix -- regex: 'Phoenix/(\d+\.\d+)' - name: Phoenix +- regex: 'Phoenix(?:/(\d+\.\d+))?' + name: 'Phoenix' version: '$1' #Mobile Silk -- regex: 'Silk/(\d+\.\d+)' - name: Mobile Silk +- regex: 'Silk(?:/(\d+\.\d+))?' + name: 'Mobile Silk' version: '$1' #Nokia Browser -- regex: '(?:NokiaBrowser|BrowserNG)/(\d+\.\d+)' - name: Nokia Browser +- regex: '(?:NokiaBrowser|BrowserNG)(?:/(\d+\.\d+))?' + name: 'Nokia Browser' version: '$1' - regex: 'Series60/5\.0' - name: Nokia Browser + name: 'Nokia Browser' version: '7.0' - regex: 'Series60/(\d+\.\d+)' - name: Nokia OSS Browser + name: 'Nokia OSS Browser' version: '$1' - regex: 'S40OviBrowser/(\d+\.\d+)' - name: Nokia Ovi Browser + name: 'Nokia Ovi Browser' version: '$1' - regex: '^Nokia|Nokia[EN]?\d+' - name: Nokia Browser + name: 'Nokia Browser' version: '' #NetFront -- regex: 'NetFrontLifeBrowser/(\d+\.\d+)' - name: NetFront Life +- regex: 'NetFrontLifeBrowser(?:/(\d+\.\d+))?' + name: 'NetFront Life' version: '$1' -- regex: 'NetFront/(\d+\.\d+)' - name: NetFront +- regex: 'NetFront(?:/(\d+\.\d+))?' + name: 'NetFront' version: '$1' - regex: 'PLAYSTATION|NINTENDO 3|AppleWebKit.+ NX/\d+\.\d+\.\d+' - name: NetFront + name: 'NetFront' version: '' - + +#NetPositive +- regex: 'NetPositive(?:/(\d+\.\d+))?' + name: 'NetPositive' + version: '$1' + #Obigo -- regex: 'Obigo[ ]?(?:InternetBrowser|Browser)?[ /]([A-Za-z0-9]*)' - name: Obigo +- regex: 'Obigo[ ]?(?:InternetBrowser|Browser)?(?:[ /]([a-z0-9]*))?' + name: 'Obigo' version: '$1' - regex: 'Obigo|Teleca' - name: Obigo + name: 'Obigo' version: '' -#Palm Blazer -- regex: 'Blazer/(\d+\.\d+)' - name: Palm Blazer - version: '$1' -- regex: 'Pre/(\d+\.\d+)' - name: Palm Pre - version: '$1' - #Polaris -- regex: '(?:Polaris|Embider)/(\d+\.\d+)' - name: Polaris +- regex: '(?:Polaris|Embider)(?:/(\d+\.\d+))?' + name: 'Polaris' version: '$1' #Snowshoe -- regex: 'Snowshoe/(\d+\.\d+)' - name: Snowshoe +- regex: 'Snowshoe(?:/(\d+\.\d+))?' + name: 'Snowshoe' + version: '$1' + +#Thunderbird +- regex: 'Thunderbird(?:/(\d+\.\d+))?' + name: 'Thunderbird' + version: '$1' + +#Xiino +- regex: 'Xiino(?:/(\d+\.\d+))?' + name: 'Xiino' version: '$1' - #Android Browser +#Android Browser - regex: 'Android' - name: Android Browser + name: 'Android Browser' version: '' #Safari - regex: '(?:iPod|iPad|iPhone).+Version/(\d+\.\d+)' - name: Mobile Safari + name: 'Mobile Safari' version: '$1' - regex: 'Version/(\d+\.\d+).*Mobile.*Safari/' - name: Mobile Safari + name: 'Mobile Safari' version: '$1' - regex: '(?:iPod|iPhone|iPad)' - name: Mobile Safari + name: 'Mobile Safari' version: '' - regex: 'Version/(\d+\.\d+).*Safari/|Safari/\d+' - name: Safari + name: 'Safari' version: '$1' diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml index 624a6562dd..6420265c25 100644 --- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml +++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/mobiles.yml @@ -10,24 +10,28 @@ # HTC HTC: - regex: 'HTC|Sprint APA|ADR[A-Za-z0-9]+' + regex: 'HTC|Sprint APA|ADR[a-z0-9]+|Desire [a-z]+ Build|NexusHD2' device: 'smartphone' models: - - regex: 'HTC ([A-Za-z0-9]+) Build' + - regex: 'NexusHD2' # custom rom for hd2 + model: 'HD2' + - regex: 'HTC (.+) Build' model: '$1' - - regex: 'HTC ([A-Za-z0-9]+(?: [A-Za-z0-9]+)?)' + - regex: 'HTC ([a-z0-9]+(?: [a-z0-9]+)?)' model: '$1' - regex: 'USCCHTC(\d+)' model: '$1' - regex: 'Sprint APA(9292)' model: '$1 (Sprint)' - - regex: 'HTC_([A-Za-z0-9_]+)' + - regex: 'HTC_([a-z0-9_]+)' model: '$1' - - regex: 'HTC(?:[\-/ ])?([A-Za-z0-9]+)' + - regex: 'HTC(?:[\-/ ])?([a-z0-9]+)' model: '$1' - - regex: 'HTC;(?: )?([A-Za-z0-9 ]+)' + - regex: 'HTC;(?: )?([a-z0-9 ]+)' model: '$1' - - regex: '(ADR[A-Za-z0-9]+)' + - regex: '(Desire [a-z]+) Build' + model: '$1' + - regex: '(ADR[a-z0-9]+)' model: '$1' # Tesla Model S @@ -36,63 +40,56 @@ Tesla: device: 'car browser' model: 'Model S' -# Kindle -Kindle: - regex: 'KF(?:OT|TT|JWI|JWA) Build|Kindle|Silk/(\d+)\.(\d+)' - device: 'tablet' - models: - - regex: 'KFOT|Kindle Fire|Silk/(\d+)\.(\d+)' - model: 'Fire' - - regex: 'KFTT' - model: 'Fire HD' - - regex: 'KFJWI' - model: 'Fire HD 8.9" WiFi' - - regex: 'KFJWA' - model: 'Fire HD 8.9" 4G' - # NOKIA Nokia: - regex: 'Nokia|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-zA-Z0-9]+)$' + regex: 'Nokia|Lumia|Maemo RX|portalmmm/2\.0 N7|portalmmm/2\.0 NK|nok[0-9]+|Symbian.*\s([a-z0-9]+)$' device: 'smartphone' models: - regex: 'NokiaInternal|Nokia-WAP-Toolkit|Nokia-MIT-Browser|Nokia Mobile|Nokia Browser|Nokia/Series' model: '' - regex: 'Nokia(N[0-9]+)' model: '$1' - - regex: 'Nokia-([A-Za-z0-9]+)' + - regex: 'Nokia-([a-z0-9]+)' model: 'N$1' - - regex: 'NOKIA; ([A-Za-z0-9\- ]+)' + - regex: 'NOKIA; ([a-z0-9\- ]+)' model: '$1' - - regex: 'NOKIA[ ]?([A-Za-z0-9\-]+)' + - regex: 'NOKIA[ ]?([a-z0-9\-]+)' model: '$1' - - regex: 'NOKIA/([A-Za-z0-9 ]+)' + - regex: 'NOKIA/([a-z0-9 ]+)' model: '$1' - - regex: '(Lumia [A-Za-z0-9\-]+)' + - regex: '(Lumia [a-z0-9\-]+)' model: '$1' - - regex: 'Maemo RX-51 ([A-Za-z0-9]+)' + - regex: 'Maemo RX-51 ([a-z0-9]+)' model: '$1' - regex: 'Maemo RX-34' model: 'N800' - - regex: 'portalmmm/2\.0 (N7[37]|NK[A-Za-z0-9]+)' + - regex: 'portalmmm/2\.0 (N7[37]|NK[a-z0-9]+)' model: '$1' - regex: 'nok([0-9]+)' model: '$1' - - regex: 'Symbian.*\s([a-zA-Z0-9]+)$' + - regex: 'Symbian.*\s([a-z0-9]+)$' device: 'feature phone' model: '$1' - + +# CnM +CnM: + regex: 'CnM' + device: 'tablet' + models: + - regex: 'CnM[ \-](?:Touchpad|TP)[ \-]([0-9\.]+)' + model: 'Touchpad $1' + # RIM/BlackBerry RIM: regex: 'BB10;|BlackBerry|rim[0-9]+|PlayBook' device: 'smartphone' - models: - - regex: 'BB10; ([A-Za-z0-9\- ]+)\)' + - regex: 'BB10; ([a-z0-9\- ]+)\)' model: 'BlackBerry $1' - regex: 'PlayBook.+RIM Tablet OS' model: 'BlackBerry Playbook' device: 'tablet' - - regex: 'BlackBerry(?: )?([A-Za-z0-9]+)' + - regex: 'BlackBerry(?: )?([a-z0-9]+)' model: 'BlackBerry $1' - regex: 'rim([0-9]+)' model: 'BlackBerry $1' @@ -101,32 +98,42 @@ RIM: # PALM Palm: - regex: '(?:Pre|Pixi)/(\d+)\.(\d+)|Palm|Treo' + regex: '(?:Pre|Pixi)/(\d+)\.(\d+)|Palm|Treo|Xiino' device: 'smartphone' models: - regex: '((?:Pre|Pixi))/(\d+\.\d+)' model: '$1 $2' - - regex: 'Palm(?: )?([A-Za-z0-9]+)' + - regex: 'Palm(?:[ -])?((?!OS|Source)[a-z0-9]+)' model: '$1' - - regex: 'Treo([A-Za-z0-9]+)' + - regex: 'Treo([a-z0-9]+)' model: 'Treo $1' + - regex: 'Tungsten' + model: 'Tungsten' + - regex: 'Xiino' # Browser for Palm OS only + model: '' # HP HP: - regex: 'Touch[Pp]ad|hp-tablet|HP(?: )?iPAQ|webOS.*(P160U)' + regex: 'TouchPad|hp-tablet|HP(?: )?iPAQ|webOS.*(P160U)|HP Slate' device: 'smartphone' models: - - regex: 'Touch[Pp]ad/(\d+\.\d+)|hp-tablet' + - regex: 'HP Slate ?(.+) Build' + model: 'Slate $1' + device: 'tablet' + - regex: 'HP Slate ?([0-9]+)' + model: 'Slate $1' + device: 'tablet' + - regex: 'TouchPad/(\d+\.\d+)|hp-tablet' model: 'TouchPad' device: 'tablet' - - regex: 'HP(?: )?iPAQ(?: )?([A-Za-z0-9]+)' + - regex: 'HP(?: )?iPAQ(?: )?([a-z0-9]+)' model: 'iPAQ $1' - regex: 'webOS.*(P160U)' model: 'Veer' # TiPhone TiPhone: - regex: 'TiPhone(?: )?([A-Za-z0-9]+)' + regex: 'TiPhone ?([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -149,28 +156,35 @@ Apple: # Acer Acer: - regex: 'acer[\-_]([A-Za-z0-9]+)' + regex: 'acer[\-_]([a-z0-9]+)|a(101|110|200|210|211|500|501|510|511|700|701) Build' device: 'smartphone' - model: '$1' + models: + - regex: 'acer[\-_]([a-z0-9]+)' + model: '$1' + - regex: 'a(101|110|200|210|211|500|501|510|511|700|701) Build' + model: 'Icona Tab A$1' + device: 'tablet' # Airness Airness: - regex: 'AIRNESS-([A-Za-z0-9]+)' + regex: 'AIRNESS-([a-z0-9]+)' device: 'feature phone' model: '$1' # Alcatel Alcatel: - regex: 'Alcatel|Alc([A-Za-z0-9]+)' + regex: 'Alcatel|Alc([a-z0-9]+)' device: 'smartphone' models: - regex: 'Alcatel UP' model: '' - - regex: 'ALCATEL[ \-]([A-Za-z0-9\-]+)' + - regex: 'ALCATEL ([a-z0-9\- ]+) Build' + model: '$1' + - regex: 'ALCATEL[ \-]([a-z0-9\-]+)' model: '$1' - - regex: 'ALCATEL_([A-Za-z0-9_]+)' + - regex: 'ALCATEL_([a-z0-9_]+)' model: '$1' - - regex: 'Alc([A-Za-z0-9]+)' + - regex: 'Alc([a-z0-9]+)' model: '$1' # Amoi @@ -178,90 +192,125 @@ Amoi: regex: 'Amoi' device: 'smartphone' models: - - regex: 'Amoi[\- /](A-Za-z0-9]+)' - mobile: '$1' - - regex: 'Amoisonic-([A-Za-z0-9]+)' + - regex: 'Amoi[\- /](a-z0-9]+)' + model: '$1' + - regex: 'Amoisonic-([a-z0-9]+)' + model: '$1' + +# Archos +Archos: + regex: 'Archos' + device: 'tablet' + models: + - regex: 'GAMEPAD' + model: 'Gamepad' + device: 'console' + - regex: 'ARCHOS ([a-z0-9 ]+) Build' + model: '$1' + - regex: 'ARCHOS ([a-z0-9]+)' model: '$1' # Asus Asus: - regex: 'Asus' + regex: 'Asus|Transformer|PadFone' device: 'smartphone' models: - - regex: 'Asus(?:-|;)?([A-Za-z0-9]+)' + - regex: 'Asus(?:-|;)?([a-z0-9]+)' model: '$1' - - regex: 'ASUS (Transformer Pad TF300T)' + - regex: '(PadFone(?: [0-9]+)?)' + model: '$1' + - regex: '(Transformer (Pad |Prime )?TF[0-9a-z]+)' device: 'tablet' model: '$1' # Audiovox Audiovox: - regex: 'Audiovox|CDM|UTS(?:TARCOM)?\-|audio([A-Za-z0-9\-]+)' + regex: 'Audiovox|CDM|UTS(?:TARCOM)?\-|audio([a-z0-9\-]+)' device: 'smartphone' models: - - regex: 'Audiovox[_\-]([A-Za-z0-9\-]+)' + - regex: 'Audiovox[_\-]([a-z0-9\-]+)' model: '$1' - - regex: 'CDM(?:-)?([A-Za-z0-9]+)' + - regex: 'CDM(?:-)?([a-z0-9]+)' model: 'CDM-$1' - - regex: 'UTS(?:TARCOM)?-([A-Za-z0-9\-]+)' + - regex: 'UTS(?:TARCOM)?-([a-z0-9\-]+)' model: 'CDM-$1' - - regex: 'audio([A-Za-z0-9\-]+)' + - regex: 'audio([a-z0-9\-]+)' model: 'CDM-$1' # Avvio Avvio: - regex: 'Avvio[ _]([A-Za-z0-9\-]+)' + regex: 'Avvio[ _]([a-z0-9\-]+)' device: 'smartphone' model: '$1' # Bird Bird: - regex: 'BIRD[\-. _]([A-Za-z0-9]+)' + regex: 'BIRD[\-. _]([a-z0-9]+)' device: 'feature phone' model: '$1' # Becker Becker: - regex: 'Becker-([A-Za-z0-9]+)' + regex: 'Becker-([a-z0-9]+)' device: 'feature phone' model: '$1' # Beetel Beetel: - regex: 'Beetel ([A-Za-z0-9]+)' + regex: 'Beetel ([a-z0-9]+)' device: 'feature phone' model: '$1' # BenQ-Siemens BenQ-Siemens: - regex: 'BENQ-SIEMENS - ([A-Za-z0-9]+)' + regex: 'BENQ-SIEMENS - ([a-z0-9]+)' device: 'feature phone' model: '$1' # BenQ BenQ: - regex: 'BENQ(?:[ \-])?([A-Za-z0-9]+)' + regex: 'BENQ(?:[ \-])?([a-z0-9]+)' device: 'feature phone' model: '$1' # Capitel Capitel: - regex: 'Capitel-([A-Za-z0-9]+)' + regex: 'Capitel-([a-z0-9]+)' device: 'feature phone' model: '$1' +# Cat +Cat: + regex: 'Cat ?(tablet|stargate|nova)' + device: 'tablet' + models: + - regex: 'Cat ?(?:tablet)? ?(StarGate|Nova ?8?)' + model: '$1' + - regex: 'Cat ?tablet' + model: 'Nova' + # Compal Compal: - regex: 'Compal-([A-Za-z0-9]+)' + regex: 'Compal-([a-z0-9]+)' device: 'feature phone' model: '$1' # Cricket Cricket: - regex: 'Cricket-([A-Za-z0-9]+)' + regex: 'Cricket-([a-z0-9]+)' device: 'feature phone' model: '$1' +# Cube +Cube: + regex: 'Cube|(U[0-9]+GT(?:[0-9]|[\-_][a-z])|K8GT)' + device: 'tablet' + models: + - regex: '(U[0-9]+GT(?:[0-9]|[\-_][a-z]))' + model: '$1' + - regex: '(K8GT)' + model: '$1' + # Denver Electronics Denver: regex: '(TA[CDQ]-[0-9]+)' @@ -270,19 +319,19 @@ Denver: # Dell Dell: - regex: 'Dell ([A-Za-z0-9]+)' + regex: 'Dell;? ([a-z0-9 ]+)' device: 'smartphone' model: '$1' # Dbtel Dbtel: - regex: 'DBTEL(?:[\-/])?([A-Za-z0-9]+)' + regex: 'DBTEL(?:[\-/])?([a-z0-9]+)' device: 'feature phone' model: '$1' # Dicam Dicam: - regex: 'DICAM-([A-Za-z0-9]+)' + regex: 'DICAM-([a-z0-9]+)' device: 'feature phone' model: '$1' @@ -291,76 +340,88 @@ DoCoMo: regex: 'DoCoMo|\;FOMA|KGT/1\.0' device: 'feature phone' models: - - regex: 'DoCoMo/[12]\.0[/ ]([A-Za-z0-9]+)' + - regex: 'DoCoMo/[12]\.0[/ ]([a-z0-9]+)' model: '$1' - - regex: '([A-Za-z0-9]+)(?:_W)?\;FOMA' + - regex: '([a-z0-9]+)(?:_W)?\;FOMA' model: '$1' - - regex: 'KGT/1\.0 ([A-Za-z0-9]+)' + - regex: 'KGT/1\.0 ([a-z0-9]+)' model: '$1' # Dopod Dopod: - regex: 'Dopod(?: )?([A-Za-z0-9]+)' + regex: 'Dopod(?: )?([a-z0-9]+)' device: 'feature phone' model: '$1' # Ericy Ericy: - regex: 'Ericy-([A-Za-z0-9]+)' + regex: 'Ericy-([a-z0-9]+)' device: 'feature phone' model: '$1' # Sony Ericsson Sony Ericsson: - regex: 'Sony(?: )?Ericsson|portalmmm/2\.0 K' + regex: 'Sony(?: )?Ericsson|portalmmm/2\.0 K|(?:LT|SO|ST|SK)[0-9]+[a-z]*[0-9]* Build|MT[0-9]{2}[a-z]? Build' device: 'smartphone' models: - - regex: 'SonyEricsson([A-Za-z0-9]+)' + - regex: 'SonyEricsson([a-z0-9]+) Build' model: '$1' - - regex: 'Sony(?: )?Ericsson ([A-Za-z0-9\-]+)' + - regex: 'Sony(?: )?Ericsson ?([a-z0-9\-]+)' model: '$1' - - regex: 'portalmmm/2.0 K([A-Za-z0-9]+)' + - regex: '((?:LT|SO|ST|SK)[0-9]+[a-z]*[0-9]*) Build' + model: '$1' + - regex: '(MT[0-9]{2}[a-z]?) Build' + model: '$1' + - regex: 'portalmmm/2.0 K([a-z0-9]+)' model: 'K$1' # Ericsson Ericsson: - regex: 'Ericsson(?:/ )?([A-Za-z0-9]+)' + regex: 'Ericsson(?:/ )?([a-z0-9]+)' device: 'feature phone' model: '$1' # eTouch eTouch: - regex: 'eTouch(?: )?([A-Za-z0-9]+)' + regex: 'eTouch(?: )?([a-z0-9]+)' device: 'smartphone' model: '$1' # Ezze Ezze: - regex: 'EZZE-|EZ([A-Za-z0-9]+)' + regex: 'EZZE-|EZ([a-z0-9]+)' device: 'feature phone' models: - - regex: 'EZZE-([A-Za-z0-9]+)' + - regex: 'EZZE-([a-z0-9]+)' model: '$1' - - regex: 'EZ([A-Za-z0-9]+)' + - regex: 'EZ([a-z0-9]+)' model: 'EZ$1' # Ezio Ezio: - regex: 'EZIO-([A-Za-z0-9]+)' + regex: 'EZIO-([a-z0-9]+)' device: 'feature phone' model: '$1' +# Gemini +Gemini: + regex: '(GEM[0-9]+[a-z]*)' + device: 'tablet' + model: '$1' + # Gionee Gionee: - regex: 'GIONEE-([A-Za-z0-9]+)' + regex: 'GIONEE-([a-z0-9]+)' device: 'feature phone' model: '$1' # Google Google: - regex: 'Nexus|GoogleTV' + regex: 'Nexus|GoogleTV|Glass' device: 'smartphone' models: + - regex: 'Glass' + model: 'Glass' - regex: '(Galaxy Nexus)' model: '$1' - regex: '(Nexus (?:S|4|5|One))' @@ -377,9 +438,9 @@ Gradiente: regex: 'GRADIENTE' device: 'feature phone' models: - - regex: 'GRADIENTE-([A-Za-z0-9]+)' + - regex: 'GRADIENTE-([a-z0-9]+)' model: '$1' - - regex: 'GRADIENTE ([A-Za-z0-9\-]+)' + - regex: 'GRADIENTE ([a-z0-9\-]+)' model: '$1' # Grundig @@ -387,72 +448,90 @@ Grundig: regex: 'GRUNDIG|portalmmm/2\.0 G' device: 'tv' models: - - regex: 'GRUNDIG ([A-Za-z0-9]+)' + - regex: 'GRUNDIG ([a-z0-9]+)' model: '$1' - - regex: 'portalmmm/2\.0 G([A-Za-z0-9]+)' + - regex: 'portalmmm/2\.0 G([a-z0-9]+)' model: 'G$1' # Haier Haier: - regex: 'Haier[ -]([A-Za-z0-9\-]+)' + regex: 'Haier[ -]([a-z0-9\-]+)' device: 'feature phone' model: '$1' # Huawei Huawei: - regex: 'Huawei|vodafone([A-Za-z0-9]+)' + regex: 'Huawei|vodafone([a-z0-9]+)' device: 'smartphone' models: - - regex: 'Huawei(?:[\- /_]|/1\.0/)?([A-Za-z0-9]+)' + - regex: 'Huawei(?:[\- /_]|/1\.0/)?([a-z0-9]+)' model: '$1' - - regex: 'vodafone([A-Za-z0-9]+)' + - regex: 'Huawei; ([a-z0-9 -]+)' + model: '$1' + - regex: 'vodafone([a-z0-9]+)' model: 'Vodafone $1' # Innostream Innostream: - regex: 'INNO([A-Za-z0-9]+)' + regex: 'INNO([a-z0-9]+)' device: 'feature phone' model: 'INNO$1' # Inq INQ: - regex: 'INQ/([A-Za-z0-9\-]+)' + regex: 'INQ/([a-z0-9\-]+)' device: 'feature phone' model: '$1' # i-mate i-mate: - regex: 'i-mate ([A-Za-z0-9]+)' + regex: 'i-mate ([a-z0-9]+)' device: 'feature phone' model: '$1' # i-mobile i-mobile: - regex: 'i-mobile(?: )?([A-Za-z0-9]+)' + regex: 'i-mobile(?: )?([a-z0-9]+)' device: 'feature phone' - model: '$1' + models: + - regex: 'i-mobile(?: )?([a-z0-9\- ]+) Build' + model: '$1' + - regex: 'i-mobile(?: )?([a-z0-9]+)' + model: '$1' # ikomo iKoMo: - regex: 'iKoMo ([A-Za-z0-9]+)' + regex: 'iKoMo ([a-z0-9]+)' device: 'feature phone' model: '$1' +#Jiayu +Jiayu: + regex: '(JY-[a-z0-9]+) Build' + device: 'smartphone' + model: '$1' + # Jolla Jolla: regex: 'Jolla' device: 'smartphone' model: '' +# KT-Tech +KT-Tech: + regex: '(KM-[a-z0-9]+|EV-[a-z0-9]+)' + device: 'smartphone' + model: '$1' + # kddi KDDI: - regex: 'kddi-([A-Za-z0-9]+)' + regex: 'kddi-([a-z0-9]+)' device: 'feature phone' model: '$1' #k-touch K-Touch: - regex: 'K-Touch[ _]([A-Za-z0-9]+)' + regex: 'K-Touch[ _]([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -461,30 +540,35 @@ Kyocera: regex: 'Kyocera|KWC-|QC-' device: 'smartphone' models: - - regex: 'Kyocera-KZ-([A-Za-z0-9]+)' + - regex: 'Kyocera-KZ-([a-z0-9]+)' model: 'KZ $1' - - regex: 'Kyocera(?:[\-/])?([A-Za-z0-9]+)' + - regex: 'Kyocera(?:[\-/])?([a-z0-9]+)' model: '$1' - - regex: '(?:KWC|QC)-([A-Za-z0-9]+)' + - regex: '(?:KWC|QC)-([a-z0-9]+)' model: '$1' # lanix Lanix: - regex: 'LANIX-([A-Za-z0-9]+)' + regex: 'LANIX-([a-z0-9]+)' device: 'feature phone' model: '$1' # lct LCT: - regex: 'LCT_([A-Za-z0-9]+)' + regex: 'LCT_([a-z0-9]+)' device: 'feature phone' model: '$1' # lenovo Lenovo: - regex: 'Lenovo[\-_]([A-Za-z0-9]+)' + regex: 'Lenovo|IdeaTab' device: 'smartphone' - model: '$1' + models: + - regex: 'Lenovo[ \-_]([a-z0-9]+)' + model: '$1' + - regex: 'IdeaTab[ \-_]?([a-z0-9]+)' + model: 'IdeaTab $1' + device: 'tablet' # lguplus LGUPlus: @@ -497,37 +581,44 @@ LG: regex: 'LG|portalmmm/2\.0 (?:KE|KG|KP|L3)|VX[0-9]+' device: 'smartphone' models: - - regex: 'LGE_DLNA_SDK' + - regex: 'LGE_DLNA_SDK|NetCast' device: 'tv' model: 'NetCast' - - regex: 'LGE(?: |-LG| LG-AX|-)([A-Za-z0-9]+)' + - regex: 'LGE(?: |-LG| LG-AX|-)([a-z0-9]+)' model: '$1' - - regex: 'LGE;([A-Za-z0-9\-]+)' + - regex: 'LGE;([a-z0-9\-]+)' model: '$1' - - regex: 'LG(?:/|-LG| |-)?([A-Za-z0-9]+)' + - regex: 'LG(?:/|-LG| |-)?([a-z0-9]+)' model: '$1' - - regex: 'LG; ([A-Za-z0-9 ]+)' + - regex: 'LG; ([a-z0-9 ]+)' model: '$1' - - regex: 'portalmmm/2.0 ((?:KE|KG|KP|L3)[A-Za-z0-9]+)' + - regex: 'portalmmm/2.0 ((?:KE|KG|KP|L3)[a-z0-9]+)' model: '$1' - regex: '(VX[0-9]+)' model: '$1' # microsoft Microsoft: - regex: 'Xbox|KIN\.(?:One|Two)' + regex: 'Xbox|KIN\.(One|Two)' device: 'console' - model: 'Xbox 360' + models: + - regex: 'Xbox One' + model: 'Xbox One' + - regex: 'Xbox' + model: 'Xbox 360' + - regex: 'KIN\.(One|Two)' + device: 'feature phone' + model: 'Kin $1' # Konka Konka: - regex: 'KONKA_([A-Za-z0-9]+)' + regex: 'KONKA_([a-z0-9]+)' device: 'feature phone' model: '$1' # Karbonn Karbonn: - regex: 'Karbonn_([A-Za-z0-9]+)' + regex: 'Karbonn_([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -536,22 +627,29 @@ Sagem: regex: 'SAGEM|portalmmm/2.0 (?:SG|my)' device: 'smartphone' models: - - regex: 'SAGEM ([A-Za-z0-9]+)' + - regex: 'SAGEM ([a-z0-9]+)' model: '$1' - - regex: 'SAGEM-([A-Za-z0-9\-]+)' + - regex: 'SAGEM-([a-z0-9\-]+)' model: '$1' - - regex: 'portalmmm/2.0 ((?:SG|my)[A-Za-z0-9]+)' + - regex: 'portalmmm/2.0 ((?:SG|my)[a-z0-9]+)' model: '$1' +# Manta Multimedia +Manta Multimedia: + regex: '(MID[0-9]+[a-z]*)' + device: 'tablet' + model: '$1' + + # micromax MicroMax: - regex: 'MicroMax(?:[ \-])?([A-Za-z0-9]+)' + regex: 'MicroMax(?:[ \-\_])?([a-z0-9]+)' device: 'smartphone' model: '$1' # mio Mio: - regex: 'MIO(?:/)?([A-Za-z0-9]+)' + regex: 'MIO(?:/)?([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -560,34 +658,44 @@ Mitsubishi: regex: 'MITSU|portalmmm/[12]\.0 M' device: 'feature phone' models: - - regex: 'MITSU/[A-Za-z0-9.]+ \(([A-Za-z0-9]+)\)' + - regex: 'MITSU/[a-z0-9.]+ \(([a-z0-9]+)\)' model: '$1' - - regex: 'MITSU[ \-]?([A-Za-z0-9]+)' + - regex: 'MITSU[ \-]?([a-z0-9]+)' model: '$1' - - regex: 'portalmmm/[12]\.0 (M[A-Za-z0-9]+)' + - regex: 'portalmmm/[12]\.0 (M[a-z0-9]+)' model: '$1' # motorola Motorola: - regex: 'MOT|(?<!AN)DROID (?:Build|([A-Za-z0-9]+))|portalmmm/2.0 (?:E378i|L6|L7|v3)' + regex: 'MOT|(?<!AN)DROID ?(?:Build|([a-z0-9]+))|portalmmm/2.0 (?:E378i|L6|L7|v3)|XOOM 2|(?:XT|MZ|MB|ME)[0-9]{3}(?:\(Defy\))? Build' device: 'smartphone' models: - - regex: 'Motorola[ \-]([A-Za-z0-9]+)' + - regex: 'Motorola[ \-]([a-z0-9]+)' model: '$1' - - regex: 'MOTORAZR[ \-]([A-Za-z0-9]+)' + - regex: 'MOTORAZR[ \-]([a-z0-9]+)' model: 'RAZR $1' - - regex: 'MOTORIZR[ \-]([A-Za-z0-9]+)' + - regex: 'MOTORIZR[ \-]([a-z0-9]+)' model: 'RIZR $1' - - regex: 'MOT[O]?[\-]?([A-Za-z0-9.]+)' + - regex: 'MOT[O]?[\-]?([a-z0-9.]+)' model: '$1' - - regex: '(?<!AN)DROID (?:Build|([A-Za-z0-9]+))' + - regex: '(?<!AN)DROID ?([a-z0-9 ]*) Build' model: 'DROID $1' - - regex: 'portalmmm/2.0 ((?:E378i|L6|L7|V3)[A-Za-z0-9]+)' + - regex: '(?<!AN)DROID ?([a-z0-9]+)' + model: 'DROID $1' + - regex: 'portalmmm/2.0 ((?:E378i|L6|L7|V3)[a-z0-9]+)' + model: '$1' + - regex: 'XOOM 2' + device: 'tablet' + model: 'MZ607' + - regex: '(MZ[0-9]{3}) Build' + device: 'tablet' + model: '$1' + - regex: '((?:ME|MB|XT)[0-9]{3}(?:\(Defy\))?) Build' model: '$1' # myphone MyPhone: - regex: 'MyPhone([A-Za-z0-9]+)' + regex: 'MyPhone([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -596,16 +704,16 @@ NEC: regex: 'NEC|KGT/2\.0|portalmmm/1\.0 (?:DB|N)|(?:portalmmm|o2imode)/2.0[ ,]N' device: 'smartphone' models: - - regex: '(?:NEC-|KGT/2\.0 )([A-Za-z0-9]+)' + - regex: '(?:NEC-|KGT/2\.0 )([a-z0-9]+)' model: '$1' - - regex: 'portalmmm/1\.0 ((?:DB|N)[A-Za-z0-9]+)' + - regex: 'portalmmm/1\.0 ((?:DB|N)[a-z0-9]+)' model: '$1' - - regex: '(?:portalmmm|o2imode)/2\.0[ ,](N[A-Za-z0-9]+)' + - regex: '(?:portalmmm|o2imode)/2\.0[ ,](N[a-z0-9]+)' model: '$1' # newgen Newgen: - regex: 'NEWGEN\-([A-Za-z0-9]+)' + regex: 'NEWGEN\-([a-z0-9]+)' device: 'feature phone' model: '$1' @@ -617,18 +725,18 @@ Nintendo: # ngm NGM: - regex: 'NGM_([A-Za-z0-9]+)' + regex: 'NGM_([a-z0-9]+)' device: 'smartphone' model: '$1' # nexian Nexian: - regex: 'Nexian' + regex: 'S?Nexian' device: 'smartphone' models: - - regex: 'Nexian[ ]?([A-Za-z0-9\-]+)' + - regex: 'S?Nexian[ ]?([a-z0-9\-]+)' model: '$1' - - regex: 'Nexian-([A-Za-z0-9]+)' + - regex: 'S?Nexian-([a-z0-9]+)' model: '$1' # o2 @@ -636,34 +744,34 @@ O2: regex: 'Xda|O2[ \-]|COCOON' device: 'smartphone' models: - - regex: '(Xda[ _][A-Za-z0-9_]+)' - models: '$1' + - regex: '(Xda[ _][a-z0-9_]+)' + model: '$1' - regex: '(COCOON)' - models: '$1' - - regex: 'O2 ([A-Za-z0-9 ]+)' - models: '$1' - - regex: 'O2-([A-Za-z0-9]+)' - models: '$1' + model: '$1' + - regex: 'O2 ([a-z0-9 ]+)' + model: '$1' + - regex: 'O2-([a-z0-9]+)' + model: '$1' # onda Onda: regex: 'Onda' device: 'smartphone' models: - regex: '([A-Za-z0-9]+)[ _]Onda' + regex: '([a-z0-9]+)[ _]Onda' model: '$1' - regex: 'Onda ([A-Za-z0-9]+)' + regex: 'Onda ([a-z0-9]+)' model: '$1' # oppo OPPO: - regex: 'OPPO[ ]?([A-Za-z0-9]+)' + regex: 'OPPO[ ]?([a-z0-9]+)' device: 'smartphone' model: '$1' # orange Orange: - regex: 'SPV[ \-]?([A-Za-z0-9]+)' + regex: 'SPV[ \-]?([a-z0-9]+)' device: 'smartphone' model: 'SPV $1' @@ -675,9 +783,9 @@ Panasonic: - regex: 'Panasonic MIL DLNA' device: 'tv' model: 'Viera Cast' - - regex: 'Panasonic[ \-]?([A-Za-z0-9]+)' + - regex: 'Panasonic[ \-]?([a-z0-9]+)' model: '$1' - - regex: 'portalmmm/2.0 (P[A-Za-z0-9]+)' + - regex: 'portalmmm/2.0 (P[a-z0-9]+)' model: '$1' # philips @@ -685,16 +793,16 @@ Philips: regex: 'Philips' device: 'smartphone' models: - - regex: 'Philips-FISIO ([A-Za-z0-9]+)' + - regex: 'Philips-FISIO ([a-z0-9]+)' model: 'Fisio $1' - - regex: 'Philips[ ]?([A-Za-z0-9]+)' + - regex: 'Philips[ ]?([a-z0-9]+)' model: '$1' - - regex: 'Philips-([A-Za-z0-9\-@]+)' + - regex: 'Philips-([a-z0-9\-@]+)' model: '$1' # phoneOne phoneOne: - regex: 'phoneOne[ \-]?([A-Za-z0-9]+)' + regex: 'phoneOne[ \-]?([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -709,67 +817,97 @@ Siemens: regex: 'SIEMENS|SIE-|portalmmm/2\.0 SI|S55|SL45i' device: 'smartphone' models: - - regex: 'SIEMENS[ \-]([A-Za-z0-9]+)' + - regex: 'SIEMENS[ \-]([a-z0-9]+)' model: '$1' - - regex: 'SIE(?:MENS )?[\-]?([A-Za-z0-9]+)' + - regex: 'SIE(?:MENS )?[\-]?([a-z0-9]+)' model: '$1' - regex: '(S55|SL45i)' model: '$1' - - regex: 'portalmmm/2.0 (SI[A-Za-z0-9]+)' + - regex: 'portalmmm/2.0 (SI[a-z0-9]+)' model: '$1' # Samsung Samsung: - regex: 'SAMSUNG|S(?:CH|GH|PH|EC|AM)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]' + regex: 'SAMSUNG|S(?:CH|GH|PH|EC|AM|HV|HW)-|SMART-TV|GT-|Galaxy|(?:portalmmm|o2imode)/2\.0 [SZ]|sam[rua]' device: 'smartphone' models: - - regex: '(GT-(P|N8|N5)[0-9]+[A-Z]?)' + - regex: '(GT-(P|N8|N5)[0-9]+[a-z]?)' device: 'tablet' model: '$1' - - regex: 'SAMSUNG[\-;][ ]?([A-Za-z0-9]+[\-_][A-Za-z0-9]+)' + - regex: 'SAMSUNG[\-][ ]?([a-z0-9]+[\-_][a-z0-9]+)' + model: '$1' + - regex: 'SAMSUNG;[ ]?([a-z0-9]+[\-_][a-z0-9]+)' model: '$1' - - regex: 'SAMSUNG[ _/]?([A-Za-z0-9\-]+)' + - regex: 'SAMSUNG[ _/]?([a-z0-9\-]+)' model: '$1' - - regex: 'SAMSUNG;[ ]?([A-Za-z0-9 ]+)' + - regex: 'SAMSUNG;[ ]?([a-z0-9 ]+)' model: '$1' - - regex: '((?:SCH|SGH|SPH|GT)-[A-Za-z0-9]+)' + - regex: '((?:SCH|SGH|SPH|SHV|SHW|GT)-[a-z0-9]+)' model: '$1' - - regex: 'SEC-([A-Za-z0-9]+)' + - regex: 'SEC-([a-z0-9]+)' model: '$1' - - regex: 'SAM-([A-Za-z0-9]+)' + - regex: 'SAM-([a-z0-9]+)' model: 'SCH-$1' - regex: 'SMART-TV' device: 'tv' model: 'Smart TV' - - regex: '(Galaxy [A-Za-z0-9]+)' + - regex: '(Galaxy [a-z0-9]+)' model: '$1' - - regex: '(?:portalmmm|o2imode)/2\.0 ([SZ][A-Za-z0-9]+)' + - regex: '(?:portalmmm|o2imode)/2\.0 ([SZ][a-z0-9]+)' model: '$1' - regex: 'sam([rua][0-9]+)' model: 'SCH-$1' +# SuperSonic +SuperSonic: + regex: '(SC-[0-9]+[a-z]+)' + device: 'tablet' + model: '$1' + # pantech Pantech: - regex: 'Pantech|P[GTN]-|TX[T]?[0-9]+' + regex: 'Pantech|P[GN]-|PT-[a-z0-9]{3,}|TX[T]?[0-9]+|IM-[a-z0-9]+' device: 'smartphone' models: - - regex: 'Pantech[ \-]?([A-Za-z0-9]+)' + - regex: 'Pantech[ \-]?([a-z0-9]+)' model: '$1' - - regex: 'Pantech_([A-Za-z0-9\-]+)' + - regex: 'Pantech_([a-z0-9\-]+)' model: '$1' - - regex: '(P[GTN]-[A-Za-z0-9]+)' + - regex: '(P[GTN]-[a-z0-9]+)' model: '$1' - regex: '(TX[T]?[0-9]+)' model: '$1' + - regex: '(IM-[a-z0-9]+)' + model: '$1' + +#Polaroid +Polaroid: + regex: 'Polaroid|(?:PMID|MIDC)[0-9a-z]+ Build' + device: 'tablet' + models: + - regex: '((?:PMID|MIDC)[0-9a-z]+) Build' + model: '$1' + - regex: 'Polaroid' + model: '' + +# PolyPad +PolyPad: + regex: 'POLY ?PAD' + device: 'tablet' + models: + - regex: 'POLY ?PAD[_ \.]([a-z0-9]+) Build' + model: '$1' + - regex: 'POLY ?PAD[_\.]([a-z0-9]+)' + model: '$1' # Sanyo Sanyo: regex: 'Sanyo|MobilePhone ' device: 'smartphone' models: - - regex: 'SANYO[ \-_]([A-Za-z0-9\-]+)' + - regex: 'SANYO[ \-_]([a-z0-9\-]+)' model: '$1' - - regex: 'MobilePhone ([A-Za-z0-9\-]+)' + - regex: 'MobilePhone ([a-z0-9\-]+)' model: '$1' # Sega @@ -780,7 +918,7 @@ Sega: # Sendo Sendo: - regex: 'Sendo([A-Za-z0-9]+)' + regex: 'Sendo([a-z0-9]+)' device: 'feature phone' model: '$1' @@ -789,22 +927,24 @@ Spice: regex: 'Spice' device: 'smartphone' models: - - regex: 'Spice ([A-Za-z0-9\-]+)' + - regex: 'Spice ([a-z0-9\-]+)' model: '$1' - - regex: 'Spice-([A-Za-z0-9]+)' + - regex: 'Spice-([a-z0-9]+)' model: '$1' # Sharp Sharp: - regex: 'SHARP|SBM' + regex: 'SHARP|SBM|SH-[0-9]+[a-z]? Build|AQUOS' device: 'smartphone' models: - - regex: 'SHARP-AQUOS' + - regex: 'SHARP-AQUOS|AQUOSBrowser' device: 'tv' model: 'Aquos Net Plus' - - regex: 'SHARP[ \-]([A-Za-z0-9\-]+)' + - regex: 'SHARP[ \-]([a-z0-9\-]+)' + model: '$1' + - regex: '(?:SHARP|SBM)([a-z0-9]+)' model: '$1' - - regex: '(?:SHARP|SBM)([A-Za-z0-9]+)' + - regex: '(SH-[0-9]+[a-z]?) Build' model: '$1' # Softbank @@ -812,39 +952,69 @@ Softbank: regex: 'Softbank|J-PHONE' device: 'smartphone' models: - - regex: 'Softbank/[12]\.0/([A-Za-z0-9]+)' + - regex: 'Softbank/[12]\.0/([a-z0-9]+)' model: '$1' - - regex: '([A-Za-z0-9]+);Softbank;' + - regex: '([a-z0-9]+);Softbank;' model: '$1' - - regex: 'J-PHONE/[0-9]\.[0-9]/([A-Za-z0-9\-]+)' + - regex: 'J-PHONE/[0-9]\.[0-9]/([a-z0-9\-]+)' model: '$1' # Sony Sony: regex: 'Sony|PlayStation' device: 'smartphone' - models: - - regex: 'Sony[ ]?([A-Za-z0-9\-]+)' + models: + - regex: 'Sony[ ]?([a-z0-9\-]+)' model: '$1' - regex: '(PlayStation (?:3|4|Portable|Vita))' device: 'console' model: '$1' +# Kindle +Kindle: + regex: 'KF(?:OT|TT|JWI|JWA) Build|Kindle|Silk/(\d+)\.(\d+)' + device: 'tablet' + models: + - regex: 'KFTT Build' + model: 'Fire HD' + - regex: 'KFJWI Build' + model: 'Fire HD 8.9" WiFi' + - regex: 'KFJWA Build' + model: 'Fire HD 8.9" 4G' + - regex: 'KFSOWI Build' + model: 'Fire HD 7" WiFi' + - regex: 'KFTHWI Build' + model: 'Fire HDX 7" WiFi' + - regex: 'KFTHWA Build' + model: 'Fire HDX 7" 4G' + - regex: 'KFAPWI Build' + model: 'Fire HDX 8.9" WiFi' + - regex: 'KFAPWA Build' + model: 'Fire HDX 8.9" 4G' + - regex: 'KFOT|Kindle Fire|Silk/(\d+)\.(\d+)' + model: 'Fire' + +# Symphony +Symphony: + regex: 'SYMPHONY[ \_]([a-z0-9]+)' + device: 'smartphone' + model: '$1' + # Qtek Qtek: - regex: 'Qtek[ _]?([A-Za-z0-9]+)' + regex: 'Qtek[ _]?([a-z0-9]+)' device: 'smartphone' model: '$1' # T-Mobile T-Mobile: - regex: 'T-Mobile[ _]([A-Za-z0-9 ]+)' + regex: 'T-Mobile[ _]([a-z0-9 ]+)' device: 'smartphone' model: '$1' # Tcl TCL: - regex: 'TCL-([A-Za-z0-9]+)' + regex: 'TCL-([a-z0-9]+)' device: 'smartphone' model: '$1' @@ -853,9 +1023,9 @@ Telit: regex: 'Telit' device: 'feature phone' models: - - regex: 'Telit_Mobile_Terminals-([A-Za-z0-9]+)' + - regex: 'Telit_Mobile_Terminals-([a-z0-9]+)' model: '$1' - - regex: 'Telit[\-_]?([A-Za-z0-9]+)' + - regex: 'Telit[\-_]?([a-z0-9]+)' model: '$1' # Tianyu @@ -863,74 +1033,92 @@ TIANYU: regex: 'TIANYU' device: 'feature phone' models: - - regex: 'TIANYU ([A-Za-z0-9]+)' + - regex: 'TIANYU ([a-z0-9]+)' model: '$1' - - regex: 'TIANYU-KTOUCH/([A-Za-z0-9]+)' + - regex: 'TIANYU-KTOUCH/([a-z0-9]+)' model: '$1' # Toplux Toplux: - regex: 'Toplux ([A-Za-z0-9]+)' + regex: 'Toplux ([a-z0-9]+)' device: 'feature phone' model: '$1' # UTStarcom UTStarcom: - regex: 'utstar([A-Za-z0-9]+)' + regex: 'utstar([a-z0-9]+)' device: 'feature phone' model: '$1' +# ViewSonic +ViewSonic: + regex: '(VSD[0-9]+) Build' + device: 'smart display' + model: '$1' + # Vitelcom Vitelcom: regex: 'Vitelcom|portalmmm/[12].0 TSM' device: 'feature phone' models: - - regex: 'TSM-([A-Za-z0-9]+)' + - regex: 'TSM-([a-z0-9]+)' model: '$1' - - regex: 'TSM([A-Za-z0-9\-]+)' + - regex: 'TSM([a-z0-9\-]+)' model: '$1' - - regex: 'portalmmm/[12].0 (TSM[A-Za-z0-9 ]+)' + - regex: 'portalmmm/[12].0 (TSM[a-z0-9 ]+)' model: '$1' # VK Mobile VK Mobile: - regex: 'VK[\-]?([A-Za-z0-9 ]+)' + regex: 'VK[\-]?([a-z0-9 ]+)' device: 'feature phone' model: '$1' # Vertu Vertu: - regex: 'Vertu[ ]?([A-Za-z0-9]+)' + regex: 'Vertu[ ]?([a-z0-9]+)' device: 'feature phone' model: '$1' # Videocon Videocon: - regex: 'Videocon_([A-Za-z0-9]+)' + regex: 'Videocon[_ ]([a-z0-9]+)' device: 'smartphone' model: '$1' # Voxtel Voxtel: - regex: 'Voxtel_([A-Za-z0-9]+)' + regex: 'Voxtel_([a-z0-9]+)' device: 'feature phone' model: '$1' # Wellcom WellcoM: - regex: 'WELLCOM[ _\-/]([A-Za-z0-9]+)' + regex: 'WELLCOM[ _\-/]([a-z0-9]+)' device: 'smartphone' model: '$1' # Wonu Wonu: - regex: 'Wonu ([A-Za-z0-9]+)' + regex: 'Wonu ([a-z0-9]+)' device: 'feature phone' model: '$1' +#Xiaomi +Xiaomi: + regex: '(MI [a-z0-9]+|MI-One[ _]Plus) Build' + device: 'smartphone' + model: '$1' + +#Yuandao +Yuandao: + regex: 'N101[ _]DUAL(?:[ _]CORE)?(?:[ _]?2|\|\|)?(?:[ _]V11)? Build' + device: 'tablet' + model: 'N101' + # Zonda Zonda: - regex: '(ZM(?:CK|EM|TFTV|TN)[A-Za-z0-9]+)' + regex: '(ZM(?:CK|EM|TFTV|TN)[a-z0-9]+)' device: 'feature phone' model: '$1' @@ -939,9 +1127,9 @@ Toshiba: regex: 'Toshiba|portalmmm/[12].0 TS' device: 'smartphone' models: - - regex: 'Toshiba[ /_\-]?([A-Za-z0-9 ]+)' + - regex: 'Toshiba[ /_\-]?([a-z0-9 ]+)' model: '$1' - - regex: 'portalmmm/[12].0 (TS[A-Za-z0-9 ]+)' + - regex: 'portalmmm/[12].0 (TS[a-z0-9 ]+)' model: '$1' # Fly @@ -949,16 +1137,16 @@ Fly: regex: 'Fly|MERIDIAN-' device: 'smartphone' models: - - regex: 'Fly[ _\-]?([A-Za-z0-9]+)' + - regex: 'Fly[ _\-]?([a-z0-9]+)' model: '$1' - - regex: 'MERIDIAN-([A-Za-z0-9]+)' + - regex: 'MERIDIAN-([a-z0-9]+)' model: '$1' -# WebTV -WebTV: +# Web TV +Web TV: regex: 'WebTV/(\d+\.\d+)' device: 'tv' - model: '$1' + model: '' # ZTE ZTE: @@ -967,11 +1155,13 @@ ZTE: models: - regex: '(Z331)' model: '$1' - - regex: 'ZTE-(?:G |G-)?([A-Za-z0-9 _]+)' + - regex: 'ZTE[\- ]([a-z0-9\- ]+) Build' model: '$1' - - regex: 'ZTE ([A-Za-z0-9]+)' + - regex: 'ZTE-(?:G |G-)?([a-z0-9 _]+)' model: '$1' - + - regex: 'ZTE ([a-z0-9]+)' + model: '$1' + # Symbian to Nokia ?? # Change name from Nokia to other to not change above Nokia element #Nokia: diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml index ce81e54849..8f47834d59 100644 --- a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml +++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/oss.yml @@ -9,6 +9,24 @@ ############### ########## +# Bot +########## +- regex: '(nuhk|Sosospider|CareerBot|SputnikBot|SensikaBot|UptimeRobot|SeznamBot|AhrefsBot|Ezooms|Googlebot|Exabot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves/Teoma|ia_archiver|ScoutJet|Gulper Web Bot|EmailWolf|grub-client|Download Demon|SearchExpress|Microsoft URL Control|bot|borg|yahoo|slurp|msnbot|msrbot|openbot|archiver|netresearch|transcoder|crawler|lycos|scooter|altavista|teoma|gigabot|baiduspider|blitzbot|oegp|charlotte|furlbot|http%20client|polybot|htdig|ichiro|mogimogi|larbin|pompos|scrubby|searchsight|seekbot|semanticdiscovery|snappy|speedy|spider|voila|vortex|zao|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinksYottaaMonitor|BrowserMob|HttpMonitor|YandexBot|Slurp|BingPreview|PagePeeker|ThumbShotsBot|WebThumb|URL2PNG|ZooShot|GomezA|Catchpoint bot|Willow Internet Crawler|Google SketchUp|Read%20Later|Minimo|Pingdom.com|facebookexternalhit|Twitterbot|RackspaceBot)' + name: 'Bot' + version: '' + + + +########## +# Simulators +########## +- regex: '(Talkatone|WinWAP)' + name: '$1' + version: '' + + + +########## # Tizen ########## - regex: 'Tizen' @@ -39,7 +57,18 @@ version: '' - +########## +# AmigaOS +########## +- regex: 'AmigaOS[ ]?(\d+\.\d+)' + name: 'AmigaOS' + version: '$1' + +- regex: 'AmigaOS|AmigaVoyager|Amiga-AWeb' + name: 'AmigaOS' + version: '' + + ########## # Linux ########## @@ -48,17 +77,12 @@ version: '$2' -- regex: '((?:Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs))' +- regex: '(Arch Linux|Debian|Knoppix|Mint|Ubuntu|Kubuntu|Xubuntu|Lubuntu|Fedora|Red Hat|Mandriva|Gentoo|Slackware|SUSE|Puppy|CentOS|BackTrack|YunOs)(?: Linux)?(?:[ /\-](\d+\.\d+))?' name: '$1' - version: '' - - -- regex: 'Linux[;\)] |Linux (?:x86_64|zbov|i686)' - name: 'Linux' - version: '' - - + version: '$2' +# generic linux match -> end of file + ########## # Windows Mobile ########## @@ -85,7 +109,24 @@ name: 'Windows RT' version: '' - + + +########## +# webOS +########## +- regex: '(?:webOS|Palm webOS)(?:/(\d+\.\d+))?' + name: 'webOS' + version: '$1' + +- regex: '(?:PalmOS|Palm OS)(?:[/ ](\d+\.\d+))?|Palm' + name: 'palmOS' + version: '$1' + +- regex: 'Xiino(?:.*v\. (\d+\.\d+))?' # palmOS only browser + name: 'palmOS' + version: '$1' + + ########## # Windows @@ -156,7 +197,6 @@ ########## - regex: 'Mac OS X (\d+[_.]\d+)' name: 'Mac' - version: '$1' - regex: 'Darwin|Macintosh|Mac_PowerPC|PPC|Mac PowerPC' @@ -168,9 +208,8 @@ ########## # iOS ########## -- regex: '(?:CPU OS|iPhone OS) (\d+_\d+)' +- regex: '(?:CPU OS|iPhone OS)[ _](\d+(?:_\d+)?)' name: 'iOS' - version: '$1' - regex: '(?:iPhone|iPad|iPod)(?:.*Mac OS X.*Version/(\d+\.\d+)|; Opera)' @@ -180,20 +219,6 @@ ########## -# webOS -########## -- regex: '(?:webOS|Palm webOS)(?:/(\d+\.\d+))?' - name: 'webOS' - version: '$1' - - -- regex: '(?:PalmOS|Palm OS)(?:/(\d+\.\d+))?' - name: 'PalmOS' - version: '' - - - -########## # ChromeOS ########## - regex: 'CrOS [a-z0-9_]+ (\d+\.\d+)' @@ -220,16 +245,43 @@ version: '' -- regex: 'Black[Bb]erry' +- regex: 'BlackBerry' name: 'BlackBerry OS' version: '' - - - + + +########## +# Haiku OS +########## +- regex: 'Haiku' + name: 'Haiku OS' + version: '' + + +########## +# BeOS +########## +- regex: 'BeOS' + name: 'BeOS' + version: '' + + + + ########## # Symbian ########## -- regex: 'Symbian[Oo][Ss]/(\d+\.\d+)' +- regex: '(?:Series ?60|SymbOS|S60)(?:[ /]?(\d+\.\d+|V\d+))?' + name: 'Symbian OS Series 60' + version: '$1' + + +- regex: 'Series40' + name: 'Symbian OS Series 40' + version: '' + + +- regex: 'SymbianOS/(\d+\.\d+)' name: 'Symbian OS' version: '$1' @@ -249,22 +301,12 @@ version: '^3' -- regex: '(?:Series 60|SymbOS|S60)(?:[ /]?(\d+\.\d+|V\d+))?' - name: 'Symbian OS Series 60' - version: '$1' - - -- regex: 'Series40' - name: 'Symbian OS Series 40' - version: '' - - - regex: 'MeeGo|WeTab' name: 'MeeGo' version: '' -- regex: 'Symbian [Oo][Ss]|SymbOS' +- regex: 'Symbian OS|SymbOS' name: 'Symbian OS' version: '' @@ -287,20 +329,28 @@ ########## # Bada ########## -- regex: 'bada' +- regex: 'bada(?:[ /](\d+\.\d+))' name: 'Bada' - version: '' - + version: '$1' +- regex: 'bada' + name: 'Bada' + version: '' + + ########## # Brew ########## -- regex: '(?:Brew MP|BREW|BMP)(?:[ /](\d+\.\d+))?' +- regex: '(?:Brew MP|BREW|BMP)(?:[ /](\d+\.\d+))' name: 'Brew' version: '$1' - - + + +- regex: 'Brew MP|BREW|BMP' + name: 'Brew' + version: '' + ########## # Web TV @@ -310,7 +360,7 @@ version: '$1' -- regex: 'AppleTV/(\d+\.\d+)' +- regex: 'AppleTV(?:/?(\d+\.\d+))?' name: 'Apple TV' version: '$1' @@ -324,9 +374,9 @@ ########## # Unix ########## -- regex: 'SunOS' +- regex: '(?:SunOS|Solaris)(?:[/ ](\d+\.\d+))?' name: 'Solaris' - version: '' + version: '$1' - regex: 'AIX' @@ -364,9 +414,9 @@ version: '' -- regex: 'IRIX' +- regex: 'IRIX(?: (\d+\.\d+))' name: 'IRIX' - version: '' + version: '$1' - regex: 'OSF1' @@ -403,7 +453,7 @@ - regex: 'PlayStation ((?:Portable|Vita))' - name: 'PlayStation' + name: 'PlayStation Portable' version: '$1' @@ -415,22 +465,13 @@ name: 'OS/2' version: '' - - -########## -# Simulators -########## -- regex: '(Talkatone|WinWAP)' - name: '$1' - version: '' - - - -########## -# Bot -########## -- regex: '(nuhk|Googlebot|Yammybot|Openbot|Slurp|MSNBot|Ask Jeeves/Teoma|ia_archiver|ScoutJet|Gulper Web Bot|EmailWolf|grub-client|Download Demon|OmniWeb|SearchExpress|Microsoft URL Control|bot|borg|yahoo|slurp|msnbot|msrbot|openbot|archiver|netresearch|transcoder|crawler|lycos|scooter|altavista|teoma|gigabot|baiduspider|blitzbot|oegp|charlotte|furlbot|http%20client|polybot|htdig|ichiro|mogimogi|larbin|pompos|scrubby|searchsight|seekbot|semanticdiscovery|silk|snappy|speedy|spider|voila|vortex|voyager|zao|zeal|fast-webcrawler|converacrawler|dataparksearch|findlinksYottaaMonitor|BrowserMob|HttpMonitor|YandexBot|Slurp|BingPreview|PagePeeker|ThumbShotsBot|WebThumb|URL2PNG|ZooShot|GomezA|Catchpoint bot|Willow Internet Crawler|Google SketchUp|Read%20Later|Minimo|Pingdom.com|facebookexternalhit|Twitterbot|RackspaceBot)' - name: 'Bot ' + + +########### +# Linux (Generic) +########### +- regex: 'Linux[^a-z]' + name: 'Linux' version: '' - - + + diff --git a/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/televisions.yml b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/televisions.yml new file mode 100644 index 0000000000..e55645927b --- /dev/null +++ b/plugins/DevicesDetection/UserAgentParserEnhanced/regexes/televisions.yml @@ -0,0 +1,243 @@ +############### +# Piwik - Open source web analytics +# +# @link http://piwik.org +# @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later +# +# @category Piwik_Plugins +# @package DevicesDetection +# +# ATTENTION: This file may only include tv user agents that contain 'HbbTV/([1-9]{1}(\.[0-9]{1}){1,2})' +# +############### + +# BangOlufsen +BangOlufsen: + regex: 'Bangolufsen' + device: 'tv' + model: 'BeoVision' + +# CreNova +CreNova: + regex: 'CreNova' + device: 'tv' + model: 'CNV001' + +# DMM +DMM: + regex: 'DMM' + device: 'tv' + models: 'Dreambox' + +# Grundig +Grundig: + regex: '(OWB|Grundig|Arcelik)' + device: 'tv' + model: '' + +# Humax +Humax: + regex: 'Humax' + device: 'tv' + models: + - regex: '(HD-FOX C|HD (FOX\+|NANO)|iCord (HD\+|MINI|Cable)|(CX|IR)HD-5100(C|S)|HM9503HD)' + model: '$1' + - regex: 'HMS1000S' + model: 'HMS-1000S' + +# IKEA +Ikea: + regex: 'Ikea' + device: 'tv' + models: + - regex: '(LF1V[0-9]{3})' + model: '$1' + +# Intek +Intek: + regex: 'Intek' + device: 'tv' + models: + - regex: '(Vantage|VT-100|VT-1)' + model: '$1' + +# Inverto +Inverto: + regex: 'Inverto' + device: 'tv' + models: + - regex: '(Volksbox Web Edition|Volksbox Essential|Volksbox II|Volksbox)' + model: '$1' + +# LG +LG: + regex: 'LGE' + device: 'tv' + models: + - regex: '(NetCast [0-9]{1}.[0-9]{1}|GLOBAL_PLAT3)' + model: '$1' + +# Loewe +Loewe: + regex: 'Loewe' + device: 'tv' + models: + - regex: '([A-Z]{2}[0-9]{3})' + model: '$1' + +# MediaTek +MediaTek: + regex: 'MTK' + device: 'tv' + models: + - regex: '(MT[0-9]{4})' + model: '$1' + +# Medion +Medion: + regex: 'Medion' + device: 'tv' + models: + - regex: '(MB[0-9]{2})' + model: '$1' + +# Metz +Metz: + regex: 'Metz' + device: 'tv' + model: '' + +# Panasonic +Panasonic: + regex: 'Panasonic' + device: 'tv' + models: + - regex: '(VIERA [0-9]{1,4})|(DIGA [A-Z]{1}[0-9]{4})' + model: '$1' + - regex: 'DIGA Webkit ([A-Z]{1}[0-9]{4})' + model: 'DIGA $1' + +# PEAQ +PEAQ: + regex: 'PEAQ' + device: 'tv' + models: + - regex: '(LF1V[0-9]{3})' + model: '$1' + +# Philips +Philips: + regex: 'Philips' + device: 'tv' + models: + - regex: '(NETTV/[0-9\.]{5})' + model: '$1' + +# Samsung +Samsung: + regex: 'Samsung|Maple_2011' + device: 'tv' + models: + - regex: '(SmartTV2013|SmartTV2012)' + model: '$1' + - regex: 'Maple_2011' + model: 'SmartTV2011' + +# Selevision +Selevision: + regex: 'Selevision' + device: 'tv' + models: + - regex: '(EMC1000i)' + model: '$1' + +# Sharp +Sharp: + regex: 'Sharp' + device: 'tv' + models: + - regex: '(LE[0-9]{3}[A-Z]{0,3})' + model: '$1' + +# Smart +Smart: + regex: 'Smart' + device: 'tv' + models: + - regex: '([A-Z]{2}[0-9]{2}|ZAPPIX)' + model: '$1' + +# Sony +Sony: + regex: 'Sony' + device: 'tv' + models: + - regex: '(KDL[0-9]{2}[A-Z]{1,2}[0-9]{3})' + model: '$1' + +# TechniSat +TechniSat: + regex: 'TechniSat' + device: 'tv' + models: + - regex: '((DigiCorder|MultyVision|Digit) (ISIO S|ISIO C|ISIO))' + model: '$1' + +# TechnoTrend +TechnoTrend: + regex: 'TechnoTrend' + device: 'tv' + models: + - regex: '([A-Z]{1}-[0-9]{3})' + model: '$1' + +# Telefunken +Telefunken: + regex: 'Telefunken' + device: 'tv' + models: + - regex: '(MB[0-9]{2})' + model: '$1' +# TCL +TCL: + regex: 'TCL' + device: 'tv' + models: + - regex: '(LF1V[0-9]{3})' + model: '$1' + +# Thomson +Thomson: + regex: 'THOMSON|THOM' + device: 'tv' + models: + - regex: '(LF1V[0-9]{3})' + model: '$1' + +# Toshiba +Toshiba: + regex: 'Toshiba' + device: 'tv' + models: + - regex: '(([0-9]{2}|DTV_)[A-Z]{2}[0-9]{1,3})' + model: '$1' + +# Vestel +Vestel: + regex: 'Vestel' + device: 'tv' + models: + - regex: '(MB[0-9]{2})' + model: '$1' + +# Videoweb +Videoweb: + regex: 'videoweb|compatible;' + device: 'tv' + models: + - regex: '(videowebtv)' + model: 'VideoWeb TV' + - regex: '(tv2n)' + model: '$1' + - regex: 'ANTGalio/3.0' + model: '600S' diff --git a/plugins/DevicesDetection/functions.php b/plugins/DevicesDetection/functions.php index 18d1d85331..37b5ec3ea2 100644 --- a/plugins/DevicesDetection/functions.php +++ b/plugins/DevicesDetection/functions.php @@ -36,11 +36,9 @@ function getBrowserFamilyFullNameExtended($label) function getBrowserFamilyLogoExtended($label) { if (array_key_exists($label, UserAgentParserEnhanced::$browserFamilies)) { - $path = 'plugins/UserSettings/images/browsers/' . UserAgentParserEnhanced::$browserFamilies[$label][0] . '.gif'; - } else { - $path = 'plugins/UserSettings/images/browsers/UNK.gif'; + return getBrowserLogoExtended(UserAgentParserEnhanced::$browserFamilies[$label][0]); } - return $path; + return getBrowserLogoExtended($label); } function getBrowserNameExtended($label) @@ -54,14 +52,40 @@ function getBrowserNameExtended($label) } } -function getBrowserLogoExtended($label) +/** + * Returns the path to the logo for the given browser + * + * First try to find a logo for the given short code + * If none can be found try to find a logo for the browser family + * Return unkown logo otherwise + * + * @param string $short Shortcode or name of browser + * + * @return string path to image + */ +function getBrowserLogoExtended($short) { - $short = substr($label, 0, 2); + $path = 'plugins/UserSettings/images/browsers/%s.gif'; - $familyName = getBrowserFamilyFullNameExtended($short); - $path = getBrowserFamilyLogoExtended($familyName); + // If name is given instead of short code, try to find matching shortcode + if (strlen($short) > 2) { - return $path; + if (in_array($short, UserAgentParserEnhanced::$browsers)) { + $flippedBrowsers = array_flip(UserAgentParserEnhanced::$browsers); + $short = $flippedBrowsers[$short]; + } else { + $short = substr($short, 0, 2); + } + } + + $family = getBrowserFamilyFullNameExtended($short); + + if (array_key_exists($short, UserAgentParserEnhanced::$browsers) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) { + return sprintf($path, $short); + } elseif (array_key_exists($family, UserAgentParserEnhanced::$browserFamilies) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, UserAgentParserEnhanced::$browserFamilies[$family][0]))) { + return sprintf($path, UserAgentParserEnhanced::$browserFamilies[$family][0]); + } + return sprintf($path, 'UNK'); } function getDeviceBrandLabel($label) @@ -75,8 +99,20 @@ function getDeviceBrandLabel($label) function getDeviceTypeLabel($label) { - if (isset(UserAgentParserEnhanced::$deviceTypes[$label])) { - return UserAgentParserEnhanced::$deviceTypes[$label]; + $translations = array( + 'desktop' => 'General_Desktop', + 'smartphone' => 'DevicesDetection_Smartphone', + 'tablet' => 'DevicesDetection_Tablet', + 'feature phone' => 'DevicesDetection_FeaturePhone', + 'console' => 'DevicesDetection_Console', + 'tv' => 'DevicesDetection_TV', + 'car browser' => 'DevicesDetection_CarBbrowser', + 'smart display' => 'DevicesDetection_SmartDisplay' + ); + if (isset(UserAgentParserEnhanced::$deviceTypes[$label]) && isset($translations[UserAgentParserEnhanced::$deviceTypes[$label]])) { + return Piwik::translate($translations[UserAgentParserEnhanced::$deviceTypes[$label]]); + } else if (isset($translations[$label])) { + return Piwik::translate($translations[$label]); } else { return Piwik::translate('General_Unknown'); } @@ -84,13 +120,20 @@ function getDeviceTypeLabel($label) function getDeviceTypeLogo($label) { + if (is_numeric($label) && isset(UserAgentParserEnhanced::$deviceTypes[$label])) { + $label = UserAgentParserEnhanced::$deviceTypes[$label]; + } + + $label = strtolower($label); + $deviceTypeLogos = Array( - "Desktop" => "normal.gif", - "Smartphone" => "smartphone.png", - "Tablet" => "tablet.png", - "Tv" => "tv.png", - "Feature phone" => "mobile.gif", - "Console" => "console.gif"); + "desktop" => "normal.gif", + "smartphone" => "smartphone.png", + "tablet" => "tablet.png", + "tv" => "tv.png", + "feature phone" => "mobile.gif", + "console" => "console.gif", + "car browser" => "carbrowser.png"); if (!array_key_exists($label, $deviceTypeLogos) || $label == "Unknown") { $label = 'unknown.gif'; @@ -121,11 +164,9 @@ function getOSFamilyFullNameExtended($label) function getOsFamilyLogoExtended($label) { if (array_key_exists($label, UserAgentParserEnhanced::$osFamilies)) { - $path = 'plugins/UserSettings/images/os/' . UserAgentParserEnhanced::$osFamilies[$label][0] . ".gif"; - } else { - $path = 'plugins/UserSettings/images/os/UNK.gif'; + return getOsLogoExtended(UserAgentParserEnhanced::$osFamilies[$label][0]); } - return $path; + return getOsLogoExtended($label); } function getOsFullNameExtended($label) @@ -141,11 +182,37 @@ function getOsFullNameExtended($label) return Piwik::translate('General_Unknown'); } - -function getOsLogoExtended($label) +/** + * Returns the path to the logo for the given OS + * + * First try to find a logo for the given short code + * If none can be found try to find a logo for the os family + * Return unkown logo otherwise + * + * @param string $short Shortcode or name of OS + * + * @return string path to image + */ +function getOsLogoExtended($short) { - $short = substr($label, 0, 3); - $familyName = getOsFamilyFullNameExtended($short); - $path = getOsFamilyLogoExtended($familyName); - return $path; + $path = 'plugins/UserSettings/images/os/%s.gif'; + + // If name is given instead of short code, try to find matching shortcode + if (strlen($short) > 3) { + + if (array_key_exists($short, UserAgentParserEnhanced::$osShorts)) { + $short = UserAgentParserEnhanced::$osShorts[$short]; + } else { + $short = substr($short, 0, 3); + } + } + + $family = getOsFamilyFullNameExtended($short); + + if (in_array($short, UserAgentParserEnhanced::$osShorts) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, $short))) { + return sprintf($path, $short); + } elseif (array_key_exists($family, UserAgentParserEnhanced::$osFamilies) && file_exists(PIWIK_INCLUDE_PATH.'/'.sprintf($path, UserAgentParserEnhanced::$osFamilies[$family][0]))) { + return sprintf($path, UserAgentParserEnhanced::$osFamilies[$family][0]); + } + return sprintf($path, 'UNK'); } diff --git a/plugins/DevicesDetection/images/brand/Archos.ico b/plugins/DevicesDetection/images/brand/Archos.ico Binary files differnew file mode 100644 index 0000000000..a397830f7b --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Archos.ico diff --git a/plugins/DevicesDetection/images/brand/BangOlufsen.ico b/plugins/DevicesDetection/images/brand/BangOlufsen.ico Binary files differnew file mode 100644 index 0000000000..c3260f449d --- /dev/null +++ b/plugins/DevicesDetection/images/brand/BangOlufsen.ico diff --git a/plugins/DevicesDetection/images/brand/Cat.ico b/plugins/DevicesDetection/images/brand/Cat.ico Binary files differnew file mode 100644 index 0000000000..a6b262f172 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Cat.ico diff --git a/plugins/DevicesDetection/images/brand/CnM.ico b/plugins/DevicesDetection/images/brand/CnM.ico Binary files differnew file mode 100644 index 0000000000..dae12ed0fc --- /dev/null +++ b/plugins/DevicesDetection/images/brand/CnM.ico diff --git a/plugins/DevicesDetection/images/brand/CreNova.ico b/plugins/DevicesDetection/images/brand/CreNova.ico Binary files differnew file mode 100644 index 0000000000..282b466ec6 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/CreNova.ico diff --git a/plugins/DevicesDetection/images/brand/DMM.ico b/plugins/DevicesDetection/images/brand/DMM.ico Binary files differnew file mode 100644 index 0000000000..07d2fd3e09 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/DMM.ico diff --git a/plugins/DevicesDetection/images/brand/Gemini.ico b/plugins/DevicesDetection/images/brand/Gemini.ico Binary files differnew file mode 100644 index 0000000000..deeb01e570 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Gemini.ico diff --git a/plugins/DevicesDetection/images/brand/Grundig.ico b/plugins/DevicesDetection/images/brand/Grundig.ico Binary files differindex 6b6b5885cc..0a0351a95a 100644 --- a/plugins/DevicesDetection/images/brand/Grundig.ico +++ b/plugins/DevicesDetection/images/brand/Grundig.ico diff --git a/plugins/DevicesDetection/images/brand/Humax.ico b/plugins/DevicesDetection/images/brand/Humax.ico Binary files differnew file mode 100644 index 0000000000..cdb27bf41d --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Humax.ico diff --git a/plugins/DevicesDetection/images/brand/Ikea.ico b/plugins/DevicesDetection/images/brand/Ikea.ico Binary files differnew file mode 100644 index 0000000000..d9c160a039 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Ikea.ico diff --git a/plugins/DevicesDetection/images/brand/Intek.ico b/plugins/DevicesDetection/images/brand/Intek.ico Binary files differnew file mode 100644 index 0000000000..b0d505a3e9 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Intek.ico diff --git a/plugins/DevicesDetection/images/brand/Inverto.ico b/plugins/DevicesDetection/images/brand/Inverto.ico Binary files differnew file mode 100644 index 0000000000..88729a4ed6 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Inverto.ico diff --git a/plugins/DevicesDetection/images/brand/Loewe.ico b/plugins/DevicesDetection/images/brand/Loewe.ico Binary files differnew file mode 100644 index 0000000000..aabc403d55 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Loewe.ico diff --git a/plugins/DevicesDetection/images/brand/Manta_Multimedia.ico b/plugins/DevicesDetection/images/brand/Manta_Multimedia.ico Binary files differnew file mode 100644 index 0000000000..05c79869d3 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Manta_Multimedia.ico diff --git a/plugins/DevicesDetection/images/brand/MediaTek.ico b/plugins/DevicesDetection/images/brand/MediaTek.ico Binary files differnew file mode 100644 index 0000000000..0901a828de --- /dev/null +++ b/plugins/DevicesDetection/images/brand/MediaTek.ico diff --git a/plugins/DevicesDetection/images/brand/Medion.ico b/plugins/DevicesDetection/images/brand/Medion.ico Binary files differnew file mode 100644 index 0000000000..7873a80802 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Medion.ico diff --git a/plugins/DevicesDetection/images/brand/Metz.ico b/plugins/DevicesDetection/images/brand/Metz.ico Binary files differnew file mode 100644 index 0000000000..5801781743 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Metz.ico diff --git a/plugins/DevicesDetection/images/brand/Nexian.ico b/plugins/DevicesDetection/images/brand/Nexian.ico Binary files differnew file mode 100644 index 0000000000..fba9dd7dba --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Nexian.ico diff --git a/plugins/DevicesDetection/images/brand/PEAQ.ico b/plugins/DevicesDetection/images/brand/PEAQ.ico Binary files differnew file mode 100644 index 0000000000..0626e7a93e --- /dev/null +++ b/plugins/DevicesDetection/images/brand/PEAQ.ico diff --git a/plugins/DevicesDetection/images/brand/Panasonic.ico b/plugins/DevicesDetection/images/brand/Panasonic.ico Binary files differindex abdd939b80..6480c23af7 100644 --- a/plugins/DevicesDetection/images/brand/Panasonic.ico +++ b/plugins/DevicesDetection/images/brand/Panasonic.ico diff --git a/plugins/DevicesDetection/images/brand/Philips.ico b/plugins/DevicesDetection/images/brand/Philips.ico Binary files differindex 9408fd735e..6f952a104b 100644 --- a/plugins/DevicesDetection/images/brand/Philips.ico +++ b/plugins/DevicesDetection/images/brand/Philips.ico diff --git a/plugins/DevicesDetection/images/brand/PolyPad.ico b/plugins/DevicesDetection/images/brand/PolyPad.ico Binary files differnew file mode 100644 index 0000000000..d6ef005892 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/PolyPad.ico diff --git a/plugins/DevicesDetection/images/brand/Sagem.ico b/plugins/DevicesDetection/images/brand/Sagem.ico Binary files differnew file mode 100644 index 0000000000..1f2f11d894 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Sagem.ico diff --git a/plugins/DevicesDetection/images/brand/Samsung.ico b/plugins/DevicesDetection/images/brand/Samsung.ico Binary files differindex 73fe65fa2f..ddef8460a2 100644 --- a/plugins/DevicesDetection/images/brand/Samsung.ico +++ b/plugins/DevicesDetection/images/brand/Samsung.ico diff --git a/plugins/DevicesDetection/images/brand/Selevision.ico b/plugins/DevicesDetection/images/brand/Selevision.ico Binary files differnew file mode 100644 index 0000000000..7f54997696 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Selevision.ico diff --git a/plugins/DevicesDetection/images/brand/Smart.ico b/plugins/DevicesDetection/images/brand/Smart.ico Binary files differnew file mode 100644 index 0000000000..9e3d779c63 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Smart.ico diff --git a/plugins/DevicesDetection/images/brand/Sony.ico b/plugins/DevicesDetection/images/brand/Sony.ico Binary files differindex 35b80322c0..8d9dbf3796 100644 --- a/plugins/DevicesDetection/images/brand/Sony.ico +++ b/plugins/DevicesDetection/images/brand/Sony.ico diff --git a/plugins/DevicesDetection/images/brand/TCL.ico b/plugins/DevicesDetection/images/brand/TCL.ico Binary files differnew file mode 100644 index 0000000000..a66cd3e924 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/TCL.ico diff --git a/plugins/DevicesDetection/images/brand/TechniSat.ico b/plugins/DevicesDetection/images/brand/TechniSat.ico Binary files differnew file mode 100644 index 0000000000..f29d4e26ee --- /dev/null +++ b/plugins/DevicesDetection/images/brand/TechniSat.ico diff --git a/plugins/DevicesDetection/images/brand/TechnoTrend.ico b/plugins/DevicesDetection/images/brand/TechnoTrend.ico Binary files differnew file mode 100644 index 0000000000..9ef288505f --- /dev/null +++ b/plugins/DevicesDetection/images/brand/TechnoTrend.ico diff --git a/plugins/DevicesDetection/images/brand/Telefunken.ico b/plugins/DevicesDetection/images/brand/Telefunken.ico Binary files differnew file mode 100644 index 0000000000..9656092a10 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Telefunken.ico diff --git a/plugins/DevicesDetection/images/brand/Thomson.ico b/plugins/DevicesDetection/images/brand/Thomson.ico Binary files differnew file mode 100644 index 0000000000..89c5133956 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Thomson.ico diff --git a/plugins/DevicesDetection/images/brand/Vestel.ico b/plugins/DevicesDetection/images/brand/Vestel.ico Binary files differnew file mode 100644 index 0000000000..74466e4d31 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Vestel.ico diff --git a/plugins/DevicesDetection/images/brand/Videoweb.ico b/plugins/DevicesDetection/images/brand/Videoweb.ico Binary files differnew file mode 100644 index 0000000000..8892f58f13 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/Videoweb.ico diff --git a/plugins/DevicesDetection/images/brand/ViewSonic.ico b/plugins/DevicesDetection/images/brand/ViewSonic.ico Binary files differnew file mode 100644 index 0000000000..0a57879b00 --- /dev/null +++ b/plugins/DevicesDetection/images/brand/ViewSonic.ico diff --git a/plugins/DevicesDetection/images/screens/carbrowser.png b/plugins/DevicesDetection/images/screens/carbrowser.png Binary files differnew file mode 100644 index 0000000000..4200115cc8 --- /dev/null +++ b/plugins/DevicesDetection/images/screens/carbrowser.png diff --git a/plugins/DevicesDetection/lang/bg.json b/plugins/DevicesDetection/lang/bg.json index 6c7af79c16..c59cabef51 100644 --- a/plugins/DevicesDetection/lang/bg.json +++ b/plugins/DevicesDetection/lang/bg.json @@ -1,6 +1,8 @@ { "DevicesDetection": { "BrowserVersions": "Версии на браузъра", + "CarBrowser": "Браузър, който се използва в кола", + "Console": "Конзола", "dataTableLabelBrands": "Марка", "dataTableLabelBrowserFamily": "Вид браузър", "dataTableLabelModels": "Модел", @@ -15,6 +17,9 @@ "OperatingSystemFamilies": "Вид операционна система", "OperatingSystemVersions": "Версия на операционната система", "PluginDescription": "Тази добавка предоставя допълнителна информация относно мобилните устройства: марка (производител), модел (версия на устройството), подобрен механизъм за установяване на типа устройство (телевизор, конзола, смартфон, компютър и др.) и т.н. Тази добавка добавя нов отчет „Посетители > Устройства“.", - "submenu": "Устройства" + "Smartphone": "Смартфон", + "submenu": "Устройства", + "Tablet": "Таблет", + "TV": "ТВ" } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/da.json b/plugins/DevicesDetection/lang/da.json new file mode 100644 index 0000000000..85b3fe6f4d --- /dev/null +++ b/plugins/DevicesDetection/lang/da.json @@ -0,0 +1,27 @@ +{ + "DevicesDetection": { + "BrowserVersions": "Browser-versioner", + "CarBrowser": "Bil browser", + "Console": "Konsol", + "dataTableLabelBrands": "Mærke", + "dataTableLabelBrowserFamily": "Browser familie", + "dataTableLabelModels": "Model", + "dataTableLabelSystemVersion": "Operativsystem-version", + "dataTableLabelTypes": "Type", + "Device": "Enhed", + "DeviceBrand": "Enhedsmærke", + "DeviceDetection": "Detektering af enheder", + "DeviceModel": "Enhedsmodel", + "DevicesDetection": "Besøgendes enheder", + "DeviceType": "Enhedstypen", + "FeaturePhone": "Telefonfunktioner", + "OperatingSystemFamilies": "Operativsystem familier", + "OperatingSystemVersions": "Operativsystem-versioner", + "SmartDisplay": "Smart skærm", + "Smartphone": "Smartphone", + "submenu": "Enheder", + "Tablet": "Tablet", + "TV": "TV", + "UserAgent": "Brugeragent" + } +}
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/de.json b/plugins/DevicesDetection/lang/de.json index c9e4e8d0ef..871387bed9 100644 --- a/plugins/DevicesDetection/lang/de.json +++ b/plugins/DevicesDetection/lang/de.json @@ -1,6 +1,7 @@ { "DevicesDetection": { "BrowserVersions": "Browser Versionen", + "Console": "Konsole", "dataTableLabelBrands": "Marke", "dataTableLabelBrowserFamily": "Browser Familie", "dataTableLabelModels": "Modell", @@ -12,10 +13,15 @@ "DeviceModel": "Gerätemodell", "DevicesDetection": "Geräte der Besucher", "DeviceType": "Gerätetyp", + "FeaturePhone": "Feature-Phone", "OperatingSystemFamilies": "Betriebssystem Familie", "OperatingSystemVersions": "Betriebssystem Familien", "PluginDescription": "Dieses Plugin stellt erweiterte Informationen über mobile Geräte, wie Marke (Hersteller), Modell (Geräteversion), bessere Gerätetyperkennung (TV, Konsolen, Smartphones, Desktop, etc) und mehr bereit. Dieses Plugin fügt einen neuen Bericht unter 'Besucher > Geräte' hinzu.", + "SmartDisplay": "Smart Display", + "Smartphone": "Smartphone", "submenu": "Geräte", + "Tablet": "Tablet", + "TV": "TV", "UserAgent": "User-Agent" } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/el.json b/plugins/DevicesDetection/lang/el.json index 0de7da4e1b..6652b6881f 100644 --- a/plugins/DevicesDetection/lang/el.json +++ b/plugins/DevicesDetection/lang/el.json @@ -1,6 +1,8 @@ { "DevicesDetection": { "BrowserVersions": "Εκδόσεις προγραμμάτων περιήγησης", + "CarBrowser": "Πρόγραμμα περιήγησης αυτοκινήτου", + "Console": "Κονσόλα", "dataTableLabelBrands": "Μάρκα", "dataTableLabelBrowserFamily": "Οικογένεια προγράμματος περιήγησης", "dataTableLabelModels": "Μοντέλο", @@ -12,10 +14,15 @@ "DeviceModel": "Μοντέλο συσκευής", "DevicesDetection": "Συσκευές επισκεπτών", "DeviceType": "Τύπος συσκευής", + "FeaturePhone": "Τηλέφωνο", "OperatingSystemFamilies": "Οικογένειες Λειτουργικών Συστημάτων", "OperatingSystemVersions": "Εκδόσεις Λειτουργικών Συστημάτων", "PluginDescription": "Το πρόσθετο παρέχει εκτεταμένες πληροφορίες σχετικά με φορητές συσκευές, όπως Μάρκα (κατασκευαστής), Μοντέλο (έκδοση συσκευής), καλύτερο εντοπισμό τύπου συσκευής (τηλεόραση, κονσόλες, έξυπνα τηλέφωνα, επιτραπέζιοι υπολογιστές, κτλ.) και πολλά άλλα. Το πρόσθετο προσθέτει μια νέα αναφορά στους 'Επισκέπτες > Συσκευές'.", + "SmartDisplay": "Έξυπνη οθόνη", + "Smartphone": "Έξυπνο κινητό", "submenu": "Συσκευές", + "Tablet": "Ταμπλέτα", + "TV": "Τηλεόραση", "UserAgent": "Πρόγραμμα πελάτη χρήστη" } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/en.json b/plugins/DevicesDetection/lang/en.json index ce823b3a0d..d364dfb21c 100644 --- a/plugins/DevicesDetection/lang/en.json +++ b/plugins/DevicesDetection/lang/en.json @@ -16,6 +16,13 @@ "DeviceModel": "Device model", "DeviceDetection": "Device detection", "Device": "Device", - "UserAgent": "User-Agent" + "UserAgent": "User-Agent", + "Smartphone": "Smartphone", + "CarBrowser": "Car browser", + "Tablet": "Tablet", + "SmartDisplay": "Smart display", + "FeaturePhone": "Feature phone", + "TV": "Tv", + "Console": "Console" } } diff --git a/plugins/DevicesDetection/lang/et.json b/plugins/DevicesDetection/lang/et.json index 59f4c55a53..ebf1ec97b1 100644 --- a/plugins/DevicesDetection/lang/et.json +++ b/plugins/DevicesDetection/lang/et.json @@ -1,6 +1,8 @@ { "DevicesDetection": { "BrowserVersions": "Brauseri versioonid", + "CarBrowser": "Sõiduki sirvik", + "Console": "Konsool", "dataTableLabelBrands": "Bränd", "dataTableLabelBrowserFamily": "Sirvija tüüp", "dataTableLabelModels": "Mudel", @@ -12,10 +14,15 @@ "DeviceModel": "Seadme mudel", "DevicesDetection": "Külastajate seadmed", "DeviceType": "Seadme tüüp", + "FeaturePhone": "Tark telefon", "OperatingSystemFamilies": "Operatsioonisüsteemide tüübid", "OperatingSystemVersions": "Operatsioonisüsteemide versioonid", "PluginDescription": "Antud plugin annab mobiilsete seadmete kohta detailsemat infot, nagu bränd (tootja), mudel (seadme versioon), täpsema seadmete tuvastuse (tv, konsool, nutitelefon, tahvelarvuti jne). See plugin lisab uue raporti 'Külastajad > Seadmed' alla.", + "SmartDisplay": "Nutikas kuvar", + "Smartphone": "Nutitelefon", "submenu": "Seadmed", + "Tablet": "Tahvelarvuti", + "TV": "Televiisor", "UserAgent": "Veebisirvija tüüp" } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/fa.json b/plugins/DevicesDetection/lang/fa.json new file mode 100644 index 0000000000..887fb1185d --- /dev/null +++ b/plugins/DevicesDetection/lang/fa.json @@ -0,0 +1,27 @@ +{ + "DevicesDetection": { + "BrowserVersions": "نسخه مرورگر", + "CarBrowser": "مرورگر خودرو", + "Console": "کنسول", + "dataTableLabelBrands": "مارک", + "dataTableLabelBrowserFamily": "خانواده مرورگر", + "dataTableLabelModels": "مدل", + "dataTableLabelSystemVersion": "نسخه سیستم عامل", + "dataTableLabelTypes": "نوع", + "Device": "وسیله", + "DeviceBrand": "مارک وسیله", + "DeviceDetection": "تشخیص وسیله", + "DeviceModel": "مدل وسیله", + "DevicesDetection": "وسایل بازدیده کنندگان", + "DeviceType": "نوع وسیله", + "FeaturePhone": "گوشی", + "OperatingSystemFamilies": "خانواده سیستم عامل", + "OperatingSystemVersions": "نسخه سیستم عامل", + "SmartDisplay": "صفحه نمایش هوشمند", + "Smartphone": "تلفن هوشمند", + "submenu": "وسایل", + "Tablet": "تبلت", + "TV": "تلویزیون", + "UserAgent": "کاربر-نمایندگی" + } +}
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/fr.json b/plugins/DevicesDetection/lang/fr.json index d324a2c4f0..59b47cf50f 100644 --- a/plugins/DevicesDetection/lang/fr.json +++ b/plugins/DevicesDetection/lang/fr.json @@ -1,10 +1,26 @@ { "DevicesDetection": { "BrowserVersions": "Versions du Navigateur", + "CarBrowser": "Navigateur de voiture", + "Console": "Console", "dataTableLabelBrands": "Marque", "dataTableLabelBrowserFamily": "Famille de navigateurs", "dataTableLabelModels": "Modèle", + "dataTableLabelSystemVersion": "Version du système d'exploitation", "dataTableLabelTypes": "Type", - "submenu": "Périphériques" + "Device": "Périphèrique", + "DeviceBrand": "Marque du périphérique", + "DeviceDetection": "Détection du périphérique", + "DeviceModel": "Modèle du périphérique", + "DevicesDetection": "Périphériques du visiteur", + "DeviceType": "Type du périphérique", + "OperatingSystemFamilies": "Familles de système d'exploitation", + "OperatingSystemVersions": "Versions de système d'exploitation", + "SmartDisplay": "Affichage intelligent", + "Smartphone": "Téléphone intelligent (smartphone)", + "submenu": "Périphériques", + "Tablet": "Tabelette", + "TV": "TV", + "UserAgent": "Agent Utilisateur (User-Agent)" } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/it.json b/plugins/DevicesDetection/lang/it.json index a8825da79e..1ef9d07fe8 100644 --- a/plugins/DevicesDetection/lang/it.json +++ b/plugins/DevicesDetection/lang/it.json @@ -1,6 +1,8 @@ { "DevicesDetection": { "BrowserVersions": "Versioni browser", + "CarBrowser": "Browser in auto", + "Console": "Console", "dataTableLabelBrands": "Marca", "dataTableLabelBrowserFamily": "Famiglia browser", "dataTableLabelModels": "Modello", @@ -12,10 +14,15 @@ "DeviceModel": "Modello dispositivo", "DevicesDetection": "Dispositivi visitatore", "DeviceType": "Tipo dispositivo", + "FeaturePhone": "Feature phone", "OperatingSystemFamilies": "Famiglie Sistema Operativo", "OperatingSystemVersions": "Versioni Sistema Operativo", "PluginDescription": "Questo plugin fornisce informazioni estese sui dispositivi mobili, come Marca (costruttore), Modello (versione dispositivo), una migliore individuazione del dispositivo (tv, console, smartphone, desktop, ecc) e altro. Questo plugin aggiunge un nuovo report in 'Visitatori > Dispositivi'.", + "SmartDisplay": "Smart display", + "Smartphone": "Smartphone", "submenu": "Dispositivi", + "Tablet": "Tablet", + "TV": "Apparecchio TV", "UserAgent": "User-Agent" } }
\ No newline at end of file diff --git a/plugins/DevicesDetection/lang/sv.json b/plugins/DevicesDetection/lang/sv.json new file mode 100644 index 0000000000..9378856f76 --- /dev/null +++ b/plugins/DevicesDetection/lang/sv.json @@ -0,0 +1,15 @@ +{ + "DevicesDetection": { + "BrowserVersions": "Version av webbläsare", + "dataTableLabelBrands": "Märke", + "dataTableLabelModels": "Modell", + "dataTableLabelTypes": "Sort", + "DeviceBrand": "Typ av utrustning", + "DevicesDetection": "Besöksutrustning", + "FeaturePhone": "Telefonmodell", + "OperatingSystemVersions": "Nuvarande System version", + "SmartDisplay": "Smart skärm", + "submenu": "Utrustning", + "TV": "TV" + } +}
\ No newline at end of file diff --git a/plugins/DevicesDetection/templates/detection.twig b/plugins/DevicesDetection/templates/detection.twig index 9930ff0dc9..ccc99c5fcc 100644 --- a/plugins/DevicesDetection/templates/detection.twig +++ b/plugins/DevicesDetection/templates/detection.twig @@ -1,6 +1,29 @@ {% extends 'admin.twig' %} {% block content %} + + <script type="text/javascript"> + + function showList(type) { + var ajaxHandler = new ajaxHelper(); + ajaxHandler.addParams({ + module: 'DevicesDetection', + action: 'showList', + type: type + }, 'GET'); + ajaxHandler.setFormat('html'); + ajaxHandler.setCallback(function(response){ + $('.itemList').html(response).dialog({ + modal: true, + width: '50%', + maxHeight: 400 + }); + }); + ajaxHandler.send(true); + } + + </script> + <style type="text/css"> textarea { @@ -24,7 +47,7 @@ <h2>{{ 'UserSettings_ColumnOperatingSystem'|translate }}</h2> <table class="dataTable detection"> <tr> - <td>{{ 'General_Name'|translate }}</td> + <td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('os');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> <td><img src="{{ os_logo }}" />{{ os_name }}</td> </tr> <tr> @@ -32,7 +55,7 @@ <td>{{ os_version }}</td> </tr> <tr> - <td>{{ 'UserSettings_OperatingSystemFamily'|translate }}</td> + <td>{{ 'UserSettings_OperatingSystemFamily'|translate }} <small>(<a href="javascript:showList('osfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> <td><img src="{{ os_family_logo }}" />{{ os_family }}</td> </tr> </table> @@ -40,7 +63,7 @@ <h2>{{ 'UserSettings_ColumnBrowser'|translate }}</h2> <table class="dataTable detection"> <tr> - <td>{{ 'General_Name'|translate }}</td> + <td>{{ 'General_Name'|translate }} <small>(<a href="javascript:showList('browsers');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> <td><img src="{{ browser_logo }}" />{{ browser_name }}</td> </tr> <tr> @@ -48,7 +71,7 @@ <td>{{ browser_version }}</td> </tr> <tr> - <td>{{ 'UserSettings_ColumnBrowserFamily'|translate }}</td> + <td>{{ 'UserSettings_ColumnBrowserFamily'|translate }} <small>(<a href="javascript:showList('browserfamilies');">{{ 'Mobile_ShowAll'|translate }}</a>)</small></td> <td><img src="{{ browser_family_logo }}" />{{ browser_family }}</td> </tr> </table> @@ -56,11 +79,11 @@ <h2>{{ 'DevicesDetection_Device'|translate }}</h2> <table class="dataTable detection"> <tr> - <td>{{ 'DevicesDetection_dataTableLabelTypes'|translate }}</td> + <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> </tr> <tr> - <td>{{ 'DevicesDetection_dataTableLabelBrands'|translate }}</td> + <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> </tr> <tr> @@ -69,4 +92,6 @@ </tr> </table> + <div style="display: none;" class="itemList"></div> + {% endblock %} diff --git a/plugins/DevicesDetection/templates/list.twig b/plugins/DevicesDetection/templates/list.twig new file mode 100644 index 0000000000..1fa57d844d --- /dev/null +++ b/plugins/DevicesDetection/templates/list.twig @@ -0,0 +1,7 @@ +<table class="dataTable"> + {% for name,image in itemList %} + <tr> + <td><img src="{{ image }}" /> {{ name }}</td> + </tr> + {% endfor %} +</table> diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php index ec66a2aec3..63d5d5b100 100644 --- a/plugins/Goals/API.php +++ b/plugins/Goals/API.php @@ -212,7 +212,7 @@ class API extends \Piwik\Plugin\API $dataTable->filter('Sort', array(Metrics::INDEX_ECOMMERCE_ITEM_REVENUE)); - $this->enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date); + $this->enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date, $segment); // First rename the avg_price_viewed column $renameColumn = array(self::AVG_PRICE_VIEWED => 'avg_price'); @@ -255,9 +255,9 @@ class API extends \Piwik\Plugin\API } } - protected function enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $idSubtable) + protected function enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $segment, $idSubtable) { - $ecommerceViews = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment = false, $_leavePriceViewedColumn = true); + $ecommerceViews = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariablesValuesFromNameId($idSite, $period, $date, $idSubtable, $segment, $_leavePriceViewedColumn = true); // For Product names and SKU reports, and for Category report // Use the Price (tracked on page views) @@ -513,11 +513,12 @@ class API extends \Piwik\Plugin\API * @param $idSite * @param $period * @param $date + * @param $segment */ - protected function enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date) + protected function enrichItemsTableWithViewMetrics($dataTable, $recordName, $idSite, $period, $date, $segment) { // Enrich the datatable with Product/Categories views, and conversion rates - $customVariables = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariables($idSite, $period, $date, $segment = false, $expanded = false, + $customVariables = \Piwik\Plugins\CustomVariables\API::getInstance()->getCustomVariables($idSite, $period, $date, $segment, $expanded = false, $_leavePiwikCoreVariables = true); $mapping = array( 'Goals_ItemsSku' => '_pks', @@ -548,7 +549,7 @@ class API extends \Piwik\Plugin\API $row = $customVariableTableForDate->getRowFromLabel($customVarNameToLookFor); if ($row) { $idSubtable = $row->getIdSubDataTable(); - $this->enrichItemsDataTableWithItemsViewMetrics($dataTableForDate, $idSite, $period, $dateRewrite, $idSubtable); + $this->enrichItemsDataTableWithItemsViewMetrics($dataTableForDate, $idSite, $period, $dateRewrite, $segment, $idSubtable); } $dataTable->addTable($dataTableForDate, $key); } @@ -558,7 +559,7 @@ class API extends \Piwik\Plugin\API $row = $customVariables->getRowFromLabel($customVarNameToLookFor); if ($row) { $idSubtable = $row->getIdSubDataTable(); - $this->enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $idSubtable); + $this->enrichItemsDataTableWithItemsViewMetrics($dataTable, $idSite, $period, $date, $segment, $idSubtable); } $this->renameNotDefinedRow($dataTable, $notDefinedStringPretty); } diff --git a/plugins/Login/Controller.php b/plugins/Login/Controller.php index 41e9dfa551..8c0e8d3f9b 100644 --- a/plugins/Login/Controller.php +++ b/plugins/Login/Controller.php @@ -72,8 +72,6 @@ class Controller extends \Piwik\Plugin\Controller */ function login($messageNoAccess = null, $infoMessage = false) { - self::checkForceSslLogin(); - $form = new FormLogin(); if ($form->validate()) { $nonce = $form->getSubmitValue('form_nonce'); @@ -113,8 +111,6 @@ class Controller extends \Piwik\Plugin\Controller $view->linkTitle = Piwik::getRandomTitle(); - $view->forceSslLogin = Config::getInstance()->General['force_ssl_login']; - // crsf token: don't trust the submitted value; generate/fetch it from session data $view->nonce = Nonce::getNonce('Login.login'); } @@ -127,8 +123,6 @@ class Controller extends \Piwik\Plugin\Controller */ function logme() { - self::checkForceSslLogin(); - $password = Common::getRequestVar('password', null, 'string'); if (strlen($password) != 32) { throw new Exception(Piwik::translate('Login_ExceptionPasswordMD5HashExpected')); @@ -160,12 +154,16 @@ class Controller extends \Piwik\Plugin\Controller * @param string $urlToRedirect URL to redirect to, if successfully authenticated * @return string failure message if unable to authenticate */ - protected function authenticateAndRedirect($login, $md5Password, $rememberMe, $urlToRedirect = 'index.php') + protected function authenticateAndRedirect($login, $md5Password, $rememberMe, $urlToRedirect = false) { Nonce::discardNonce('Login.login'); \Piwik\Registry::get('auth')->initSession($login, $md5Password, $rememberMe); - + + if(empty($urlToRedirect)) { + $urlToRedirect = Url::getCurrentUrlWithoutQueryString(); + } + Url::redirectToUrl($urlToRedirect); } @@ -184,8 +182,6 @@ class Controller extends \Piwik\Plugin\Controller */ function resetPassword() { - self::checkForceSslLogin(); - $infoMessage = null; $formErrors = null; @@ -463,24 +459,4 @@ class Controller extends \Piwik\Plugin\Controller Url::redirectToUrl($logoutUrl); } } - - /** - * Check force_ssl_login and redirect if connection isn't secure and not using a reverse proxy - * - * @param none - * @return void - */ - protected function checkForceSslLogin() - { - $forceSslLogin = Config::getInstance()->General['force_ssl_login']; - if ($forceSslLogin - && !ProxyHttp::isHttps() - ) { - $url = 'https://' - . Url::getCurrentHost() - . Url::getCurrentScriptName() - . Url::getCurrentQueryString(); - Url::redirectToUrl($url); - } - } } diff --git a/plugins/Login/Login.php b/plugins/Login/Login.php index 5d3561f5cc..4f36ab7822 100644 --- a/plugins/Login/Login.php +++ b/plugins/Login/Login.php @@ -11,6 +11,7 @@ namespace Piwik\Plugins\Login; use Exception; use Piwik\Config; use Piwik\Cookie; +use Piwik\FrontController; use Piwik\Option; use Piwik\Piwik; use Piwik\Plugins\UsersManager\UsersManager; @@ -42,8 +43,7 @@ class Login extends \Piwik\Plugin { $exceptionMessage = $exception->getMessage(); - $controller = new Controller(); - echo $controller->login($exceptionMessage, '' /* $exception->getTraceAsString() */); + echo FrontController::getInstance()->dispatch('Login', 'login', array($exceptionMessage)); } /** diff --git a/plugins/Login/templates/login.twig b/plugins/Login/templates/login.twig index 64e35ddb83..860990af32 100644 --- a/plugins/Login/templates/login.twig +++ b/plugins/Login/templates/login.twig @@ -25,16 +25,6 @@ <script type="text/javascript" src="plugins/CoreHome/javascripts/require.js"></script> <script type="text/javascript" src="plugins/CoreHome/javascripts/notification.js"></script> <script type="text/javascript" src="plugins/CoreHome/javascripts/notification_parser.js"></script> - {% if (forceSslLogin is defined and forceSslLogin) %} - <script type="text/javascript"> - if (window.location.protocol !== 'https:') { - var url = window.location.toString(); - url = url.replace(/^http:/, 'https:'); - window.location.replace(url); - } - </script> - - {% endif %} <script type="text/javascript"> $(function () { $('#form_login').focus(); diff --git a/plugins/Morpheus/stylesheets/theme.less b/plugins/Morpheus/stylesheets/theme.less index 79f3e39b24..ddb1f46acd 100644 --- a/plugins/Morpheus/stylesheets/theme.less +++ b/plugins/Morpheus/stylesheets/theme.less @@ -445,6 +445,7 @@ table.dataTable { td { background-color: #fff !important; } + &.active-plugin td, &:hover td { background-color: @silver-95 !important; } diff --git a/plugins/SecurityInfo b/plugins/SecurityInfo -Subproject 2d1f5e5a70ddcf5e7a88514c07b9e0ef501051e +Subproject c5054955644b2895b30b92033124891e44717fb diff --git a/plugins/SegmentEditor/API.php b/plugins/SegmentEditor/API.php index e750852604..c1d4ee72f1 100644 --- a/plugins/SegmentEditor/API.php +++ b/plugins/SegmentEditor/API.php @@ -272,6 +272,11 @@ class API extends \Piwik\Plugin\API } else { Piwik::checkUserHasSomeViewAccess(); } + + if ($returnOnlyAutoArchived) { + Piwik::checkUserHasSuperUserAccess(); + } + $bind = array(); // Build basic segment filtering @@ -281,18 +286,17 @@ class API extends \Piwik\Plugin\API $bind[] = $idSite; } - $bind[] = Piwik::getCurrentUserLogin(); - - $extraWhere = ''; if ($returnOnlyAutoArchived) { $extraWhere = ' AND auto_archive = 1'; + } else { + $extraWhere = ' AND (enable_all_users = 1 OR login = ?)'; + $bind[] = Piwik::getCurrentUserLogin(); } // Query $sql = "SELECT * " . " FROM " . Common::prefixTable("segment") . " WHERE ($whereIdSite enable_only_idsite = 0) - AND (enable_all_users = 1 OR login = ?) AND deleted = 0 $extraWhere ORDER BY name ASC"; diff --git a/plugins/SegmentEditor/SegmentEditor.php b/plugins/SegmentEditor/SegmentEditor.php index 3a8d644b1c..3fa2c46464 100644 --- a/plugins/SegmentEditor/SegmentEditor.php +++ b/plugins/SegmentEditor/SegmentEditor.php @@ -54,7 +54,7 @@ class SegmentEditor extends \Piwik\Plugin public function getKnownSegmentsToArchiveAllSites(&$segments) { - $segmentsToAutoArchive = API::getInstance()->getAll($idSite = false, $returnAutoArchived = true); + $segmentsToAutoArchive = API::getInstance()->getAll($idSite = false, $returnOnlyAutoArchived = true); foreach ($segmentsToAutoArchive as $segment) { $segments[] = $segment['definition']; } @@ -62,7 +62,7 @@ class SegmentEditor extends \Piwik\Plugin public function getKnownSegmentsToArchiveForSite(&$segments, $idSite) { - $segmentToAutoArchive = API::getInstance()->getAll($idSite, $returnAutoArchived = true); + $segmentToAutoArchive = API::getInstance()->getAll($idSite, $returnOnlyAutoArchived = true); foreach ($segmentToAutoArchive as $segmentInfo) { $segments[] = $segmentInfo['definition']; diff --git a/plugins/SitesManager/API.php b/plugins/SitesManager/API.php index 3e17f85f62..386734e1f8 100644 --- a/plugins/SitesManager/API.php +++ b/plugins/SitesManager/API.php @@ -560,6 +560,13 @@ class API extends \Piwik\Plugin\API Access::getInstance()->reloadAccess(); $this->postUpdateWebsite($idSite); + /** + * Triggered after a site has been added. + * + * @param int $idSite The ID of the site that was added. + */ + Piwik::postEvent('SitesManager.addSite.end', array($idSite)); + return (int)$idSite; } diff --git a/plugins/TasksTimetable b/plugins/TasksTimetable -Subproject 2646ac6b7856fc46e20a0213a5467cd6cd7c731 +Subproject 0f03d07bd3f1b2533b634804b66005bf5c6ce8d diff --git a/plugins/UserSettings/images/browsers/AA.gif b/plugins/UserSettings/images/browsers/AA.gif Binary files differnew file mode 100644 index 0000000000..9b78ba7292 --- /dev/null +++ b/plugins/UserSettings/images/browsers/AA.gif diff --git a/plugins/UserSettings/images/browsers/AG.gif b/plugins/UserSettings/images/browsers/AG.gif Binary files differnew file mode 100644 index 0000000000..151b9a33c6 --- /dev/null +++ b/plugins/UserSettings/images/browsers/AG.gif diff --git a/plugins/UserSettings/images/browsers/BD.gif b/plugins/UserSettings/images/browsers/BD.gif Binary files differnew file mode 100644 index 0000000000..4f4e740562 --- /dev/null +++ b/plugins/UserSettings/images/browsers/BD.gif diff --git a/plugins/UserSettings/images/browsers/CD.gif b/plugins/UserSettings/images/browsers/CD.gif Binary files differnew file mode 100644 index 0000000000..dc98e39307 --- /dev/null +++ b/plugins/UserSettings/images/browsers/CD.gif diff --git a/plugins/UserSettings/images/browsers/CK.gif b/plugins/UserSettings/images/browsers/CK.gif Binary files differnew file mode 100644 index 0000000000..562a3406d0 --- /dev/null +++ b/plugins/UserSettings/images/browsers/CK.gif diff --git a/plugins/UserSettings/images/browsers/CN.gif b/plugins/UserSettings/images/browsers/CN.gif Binary files differnew file mode 100644 index 0000000000..b3cdc7c202 --- /dev/null +++ b/plugins/UserSettings/images/browsers/CN.gif diff --git a/plugins/UserSettings/images/browsers/CP.gif b/plugins/UserSettings/images/browsers/CP.gif Binary files differnew file mode 100644 index 0000000000..cb0b2db808 --- /dev/null +++ b/plugins/UserSettings/images/browsers/CP.gif diff --git a/plugins/UserSettings/images/browsers/ES.gif b/plugins/UserSettings/images/browsers/ES.gif Binary files differnew file mode 100644 index 0000000000..fad9cac483 --- /dev/null +++ b/plugins/UserSettings/images/browsers/ES.gif diff --git a/plugins/UserSettings/images/browsers/FN.gif b/plugins/UserSettings/images/browsers/FN.gif Binary files differnew file mode 100644 index 0000000000..183dced4d7 --- /dev/null +++ b/plugins/UserSettings/images/browsers/FN.gif diff --git a/plugins/UserSettings/images/browsers/IA.gif b/plugins/UserSettings/images/browsers/IA.gif Binary files differnew file mode 100644 index 0000000000..83aad8b1c6 --- /dev/null +++ b/plugins/UserSettings/images/browsers/IA.gif diff --git a/plugins/UserSettings/images/browsers/ID.gif b/plugins/UserSettings/images/browsers/ID.gif Binary files differnew file mode 100644 index 0000000000..b6e614da48 --- /dev/null +++ b/plugins/UserSettings/images/browsers/ID.gif diff --git a/plugins/UserSettings/images/browsers/IW.gif b/plugins/UserSettings/images/browsers/IW.gif Binary files differnew file mode 100644 index 0000000000..ef1b5c0711 --- /dev/null +++ b/plugins/UserSettings/images/browsers/IW.gif diff --git a/plugins/UserSettings/images/browsers/KI.gif b/plugins/UserSettings/images/browsers/KI.gif Binary files differnew file mode 100644 index 0000000000..3be12eac66 --- /dev/null +++ b/plugins/UserSettings/images/browsers/KI.gif diff --git a/plugins/UserSettings/images/browsers/LS.gif b/plugins/UserSettings/images/browsers/LS.gif Binary files differnew file mode 100644 index 0000000000..c5f58ad4f0 --- /dev/null +++ b/plugins/UserSettings/images/browsers/LS.gif diff --git a/plugins/UserSettings/images/browsers/MS.gif b/plugins/UserSettings/images/browsers/MS.gif Binary files differnew file mode 100644 index 0000000000..cb42ed6892 --- /dev/null +++ b/plugins/UserSettings/images/browsers/MS.gif diff --git a/plugins/UserSettings/images/browsers/MX.gif b/plugins/UserSettings/images/browsers/MX.gif Binary files differnew file mode 100644 index 0000000000..b775666fa7 --- /dev/null +++ b/plugins/UserSettings/images/browsers/MX.gif diff --git a/plugins/UserSettings/images/browsers/NL.gif b/plugins/UserSettings/images/browsers/NL.gif Binary files differnew file mode 100644 index 0000000000..a319b89783 --- /dev/null +++ b/plugins/UserSettings/images/browsers/NL.gif diff --git a/plugins/UserSettings/images/browsers/NP.gif b/plugins/UserSettings/images/browsers/NP.gif Binary files differnew file mode 100644 index 0000000000..c18d4d31f5 --- /dev/null +++ b/plugins/UserSettings/images/browsers/NP.gif diff --git a/plugins/UserSettings/images/browsers/OB.gif b/plugins/UserSettings/images/browsers/OB.gif Binary files differnew file mode 100644 index 0000000000..a9c1a6f413 --- /dev/null +++ b/plugins/UserSettings/images/browsers/OB.gif diff --git a/plugins/UserSettings/images/browsers/ON.gif b/plugins/UserSettings/images/browsers/ON.gif Binary files differnew file mode 100644 index 0000000000..55e2dedb3c --- /dev/null +++ b/plugins/UserSettings/images/browsers/ON.gif diff --git a/plugins/UserSettings/images/browsers/OV.gif b/plugins/UserSettings/images/browsers/OV.gif Binary files differnew file mode 100644 index 0000000000..e40a9bc71f --- /dev/null +++ b/plugins/UserSettings/images/browsers/OV.gif diff --git a/plugins/UserSettings/images/browsers/PL.gif b/plugins/UserSettings/images/browsers/PL.gif Binary files differnew file mode 100644 index 0000000000..f8b83f26ad --- /dev/null +++ b/plugins/UserSettings/images/browsers/PL.gif diff --git a/plugins/UserSettings/images/browsers/PM.gif b/plugins/UserSettings/images/browsers/PM.gif Binary files differnew file mode 100644 index 0000000000..69ed94dbaf --- /dev/null +++ b/plugins/UserSettings/images/browsers/PM.gif diff --git a/plugins/UserSettings/images/browsers/PO.gif b/plugins/UserSettings/images/browsers/PO.gif Binary files differnew file mode 100644 index 0000000000..0747f55675 --- /dev/null +++ b/plugins/UserSettings/images/browsers/PO.gif diff --git a/plugins/UserSettings/images/browsers/PW.gif b/plugins/UserSettings/images/browsers/PW.gif Binary files differnew file mode 100644 index 0000000000..3aae87d27c --- /dev/null +++ b/plugins/UserSettings/images/browsers/PW.gif diff --git a/plugins/UserSettings/images/browsers/SL.gif b/plugins/UserSettings/images/browsers/SL.gif Binary files differnew file mode 100644 index 0000000000..890dd6d070 --- /dev/null +++ b/plugins/UserSettings/images/browsers/SL.gif diff --git a/plugins/UserSettings/images/browsers/TB.gif b/plugins/UserSettings/images/browsers/TB.gif Binary files differindex d4dc60b25b..9c67b76c85 100644 --- a/plugins/UserSettings/images/browsers/TB.gif +++ b/plugins/UserSettings/images/browsers/TB.gif diff --git a/plugins/UserSettings/images/browsers/TZ.gif b/plugins/UserSettings/images/browsers/TZ.gif Binary files differnew file mode 100644 index 0000000000..ce4524f4f0 --- /dev/null +++ b/plugins/UserSettings/images/browsers/TZ.gif diff --git a/plugins/UserSettings/images/browsers/UC.gif b/plugins/UserSettings/images/browsers/UC.gif Binary files differnew file mode 100644 index 0000000000..a2129a88fe --- /dev/null +++ b/plugins/UserSettings/images/browsers/UC.gif diff --git a/plugins/UserSettings/images/browsers/WE.gif b/plugins/UserSettings/images/browsers/WE.gif Binary files differnew file mode 100644 index 0000000000..3f2df63482 --- /dev/null +++ b/plugins/UserSettings/images/browsers/WE.gif diff --git a/plugins/UserSettings/images/browsers/YA.gif b/plugins/UserSettings/images/browsers/YA.gif Binary files differnew file mode 100644 index 0000000000..106121224d --- /dev/null +++ b/plugins/UserSettings/images/browsers/YA.gif diff --git a/plugins/UserSettings/images/os/AMG.gif b/plugins/UserSettings/images/os/AMG.gif Binary files differnew file mode 100644 index 0000000000..1b9e8a6397 --- /dev/null +++ b/plugins/UserSettings/images/os/AMG.gif diff --git a/plugins/VisitorGenerator b/plugins/VisitorGenerator -Subproject 6cd5e94ca5cca57ed5132b9f929d7a952e41041 +Subproject 14a14c66d15d5d2563aadd4a57697e5492ba36c diff --git a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml index 4f033cff8a..31c4a41c8e 100644 --- a/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml +++ b/tests/PHPUnit/Fixtures/userAgentParserEnhancedFixtures.yml @@ -1,5 +1,5 @@ - - user_agent: Mozilla/5.0 (X11; Intel Mac OS X) AppleWebKit/538.1 (KHTML, like Gecko) Safari/538.1 Debian/unstable (3.8.2-5) Epiphany/3.8.2 + user_agent: Mozilla/5.0 (X11; Intel Mac OS X) AppleWebKit/538.1 (KHTML, like Gecko) Safari/538.1 debian/unstable (3.8.2-5) Epiphany/3.8.2 os: name: Debian short_name: DEB @@ -85,8 +85,8 @@ short_name: WI8 version: 8 browser: - name: Opera - short_name: OP + name: Opera Next + short_name: ON version: 15.0 device: type: desktop @@ -118,7 +118,7 @@ version: 8 browser: name: SeaMonkey - short_name: XX + short_name: SM version: 2.17 device: type: desktop @@ -921,9 +921,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A510 os_family: Android browser_family: Android Browser - @@ -1049,9 +1049,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: KH + model: KM-E100 os_family: Android browser_family: Android Browser - @@ -1129,9 +1129,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E250K os_family: Android browser_family: Android Browser - @@ -1145,9 +1145,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E210S os_family: Android browser_family: Android Browser - @@ -1273,9 +1273,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT890 os_family: Android browser_family: Android Browser - @@ -1290,8 +1290,8 @@ version: device: type: smartphone - brand: GO - model: + brand: HT + model: HD2 os_family: Android browser_family: Android Browser - @@ -1305,9 +1305,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A511 os_family: Android browser_family: Android Browser - @@ -1433,9 +1433,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: YU + model: N101 os_family: Android browser_family: Android Browser - @@ -1449,9 +1449,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: LE + model: P770 os_family: Android browser_family: Android Browser - @@ -1497,9 +1497,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: PP + model: 8208HD os_family: Android browser_family: Android Browser - @@ -1545,9 +1545,9 @@ short_name: AN version: device: - type: smartphone + type: tablet brand: AU - model: + model: Transformer Pad TF700T os_family: Android browser_family: Android Browser - @@ -1561,9 +1561,9 @@ short_name: AN version: device: - type: smartphone + type: tablet brand: AU - model: + model: Transformer Pad TF700T os_family: Android browser_family: Android Browser - @@ -1625,9 +1625,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E250K os_family: Android browser_family: Android Browser - @@ -1737,9 +1737,9 @@ short_name: AN version: device: - type: smartphone + type: tablet brand: AU - model: + model: Transformer Pad TF700T os_family: Android browser_family: Android Browser - @@ -1801,9 +1801,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MA + model: MID801 os_family: Android browser_family: Android Browser - @@ -1961,9 +1961,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: MB526 os_family: Android browser_family: Android Browser - @@ -1993,12 +1993,76 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: PL + model: MIDC410 os_family: Android browser_family: Android Browser -- +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.3; en-sg; MIDC010PR001 Build/IML74K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: PL + model: MIDC010PR001 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; de-de; MIDC409 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: PL + model: MIDC409 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; it-it; MIDC801 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: PL + model: MIDC801 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-gb; PMID4311 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: PL + model: PMID4311 + os_family: Android + browser_family: Android Browser +- user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-ch; GT-N7100 Build/JRO03C) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 os: name: Android @@ -2057,9 +2121,9 @@ short_name: AN version: device: - type: smartphone - brand: SA - model: GT-H + type: tablet + brand: CU + model: U30GT-H os_family: Android browser_family: Android Browser - @@ -2091,7 +2155,7 @@ device: type: smartphone brand: MR - model: DROID RAZR + model: DROID RAZR HD os_family: Android browser_family: Android Browser - @@ -2201,9 +2265,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ601 os_family: Android browser_family: Android Browser - @@ -2217,9 +2281,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: MB886 os_family: Android browser_family: Android Browser - @@ -2329,9 +2393,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A701 os_family: Android browser_family: Android Browser - @@ -2507,7 +2571,7 @@ device: type: smartphone brand: HT - model: One X + model: One X+ os_family: Android browser_family: Android Browser - @@ -2571,7 +2635,7 @@ device: type: smartphone brand: HT - model: One X + model: One X+ os_family: Android browser_family: Android Browser - @@ -2601,9 +2665,9 @@ short_name: AN version: device: - type: smartphone - brand: LG - model: en + type: + brand: + model: os_family: Android browser_family: Android Browser - @@ -2649,9 +2713,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E210K os_family: Android browser_family: Android Browser - @@ -2665,9 +2729,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: AU + model: PadFone 2 os_family: Android browser_family: Android Browser - @@ -2697,9 +2761,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: XI + model: MI 1S os_family: Android browser_family: Android Browser - @@ -2713,12 +2777,28 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: PT + model: IM-A840S os_family: Android browser_family: Android Browser -- +- + user_agent: Mozilla/5.0 (Linux; U; Android 2.3.3; ko-kr; IM-T100K Build/GINGERBREAD) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 NAVER(inapp; search; 200; 3.7.0) + os: + name: Android + short_name: AND + version: 2.3 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: PT + model: IM-T100K + os_family: Android + browser_family: Android Browser +- user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; zh-tw; HTC_One_S Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 os: name: Android @@ -2793,9 +2873,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26w os_family: Android browser_family: Android Browser - @@ -2809,9 +2889,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -2825,9 +2905,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT910 os_family: Android browser_family: Android Browser - @@ -2841,9 +2921,9 @@ short_name: AN version: device: - type: smartphone - brand: SA - model: GT-H + type: tablet + brand: CU + model: U30GT-H os_family: Android browser_family: Android Browser - @@ -2857,9 +2937,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST23i os_family: Android browser_family: Android Browser - @@ -2873,9 +2953,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHW-M440S os_family: Android browser_family: Android Browser - @@ -2889,9 +2969,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E210S os_family: Android browser_family: Android Browser - @@ -2937,9 +3017,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ601 os_family: Android browser_family: Android Browser - @@ -2953,9 +3033,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: MB526 os_family: Android browser_family: Android Browser - @@ -2969,9 +3049,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT28h os_family: Android browser_family: Android Browser - @@ -2985,9 +3065,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT18i os_family: Android browser_family: Android Browser - @@ -3049,12 +3129,28 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: JI + model: JY-G2 os_family: Android browser_family: Android Browser -- +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.2.1; it-it; JY-G4 Build/JOP40D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: 4.2 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: JI + model: JY-G4 + os_family: Android + browser_family: Android Browser +- user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; HTC One XL Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 os: name: Android @@ -3130,8 +3226,8 @@ version: device: type: smartphone - brand: LG - model: 5 + brand: SA + model: GT-I9300 os_family: Android browser_family: Android Browser - @@ -3145,9 +3241,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: HT + model: Desire S os_family: Android browser_family: Android Browser - @@ -3193,9 +3289,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST23i os_family: Android browser_family: Android Browser - @@ -3209,9 +3305,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: MT27i os_family: Android browser_family: Android Browser - @@ -3241,9 +3337,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E210K os_family: Android browser_family: Android Browser - @@ -3289,9 +3385,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26a os_family: Android browser_family: Android Browser - @@ -3305,9 +3401,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26a os_family: Android browser_family: Android Browser - @@ -3337,9 +3433,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT22i os_family: Android browser_family: Android Browser - @@ -3529,9 +3625,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: AU + model: PadFone os_family: Android browser_family: Android Browser - @@ -3705,9 +3801,9 @@ short_name: AN version: device: - type: smartphone - brand: PT - model: pt-pt + type: + brand: + model: os_family: Android browser_family: Android Browser - @@ -3721,9 +3817,9 @@ short_name: AN version: device: - type: smartphone - brand: PT - model: pt-pt + type: + brand: + model: os_family: Android browser_family: Android Browser - @@ -3738,8 +3834,8 @@ version: device: type: smartphone - brand: PT - model: pt-pt + brand: SE + model: ST25i os_family: Android browser_family: Android Browser - @@ -3753,9 +3849,9 @@ short_name: AN version: device: - type: smartphone - brand: PT - model: pt-pt + type: + brand: + model: os_family: Android browser_family: Android Browser - @@ -3769,9 +3865,9 @@ short_name: AN version: device: - type: smartphone - brand: PT - model: pt-br + type: + brand: + model: os_family: Android browser_family: Android Browser - @@ -3786,11 +3882,27 @@ version: device: type: smartphone - brand: PT - model: pt-br + brand: SE + model: SK17i os_family: Android browser_family: Android Browser -- +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-jm; SK17a Build/4.1.B.0.431) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: SE + model: SK17a + os_family: Android + browser_family: Android Browser +- user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; pl-pl; ST21i Build/11.0.A.0.16) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 os: name: Android @@ -3801,9 +3913,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST21i os_family: Android browser_family: Android Browser - @@ -3929,9 +4041,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: SK17i os_family: Android browser_family: Android Browser - @@ -3961,9 +4073,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E140L os_family: Android browser_family: Android Browser - @@ -3977,9 +4089,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: SU + model: SC-06D os_family: Android browser_family: Android Browser - @@ -4073,9 +4185,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SH + model: SH-07D os_family: Android browser_family: Android Browser - @@ -4153,9 +4265,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26i os_family: Android browser_family: Android Browser - @@ -4187,7 +4299,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 993D os_family: Android browser_family: Android Browser - @@ -4201,9 +4313,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT22i os_family: Android browser_family: Android Browser - @@ -4217,9 +4329,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST15i os_family: Android browser_family: Android Browser - @@ -4233,9 +4345,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT22i os_family: Android browser_family: Android Browser - @@ -4267,7 +4379,7 @@ device: type: feature phone brand: IO - model: i + model: i-note WiFi 9 os_family: Android browser_family: Android Browser - @@ -4297,9 +4409,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26i os_family: Android browser_family: Android Browser - @@ -4313,9 +4425,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST21i2 os_family: Android browser_family: Android Browser - @@ -4329,9 +4441,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -4347,7 +4459,7 @@ device: type: smartphone brand: ZT - model: Blade + model: Blade III os_family: Android browser_family: Android Browser - @@ -4361,9 +4473,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26i os_family: Android browser_family: Android Browser - @@ -4377,9 +4489,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST25i os_family: Android browser_family: Android Browser - @@ -4409,9 +4521,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST18i os_family: Android browser_family: Android Browser - @@ -4441,9 +4553,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT30p os_family: Android browser_family: Android Browser - @@ -4601,9 +4713,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST21i2 os_family: Android browser_family: Android Browser - @@ -4633,9 +4745,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: LE + model: IdeaTab S2109A os_family: Android browser_family: Android Browser - @@ -4665,9 +4777,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT910 os_family: Android browser_family: Android Browser - @@ -4713,9 +4825,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: SU + model: SC-91MID os_family: Android browser_family: Android Browser - @@ -4745,9 +4857,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: AU + model: PadFone os_family: Android browser_family: Android Browser - @@ -4761,9 +4873,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: MB860 os_family: Android browser_family: Android Browser - @@ -4777,9 +4889,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: SK17i os_family: Android browser_family: Android Browser - @@ -5001,9 +5113,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: LE + model: IdeaTab A2109A os_family: Android browser_family: Android Browser - @@ -5049,9 +5161,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST25a os_family: Android browser_family: Android Browser - @@ -5065,9 +5177,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: MT25i os_family: Android browser_family: Android Browser - @@ -5161,9 +5273,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: VD + model: A30 os_family: Android browser_family: Android Browser - @@ -5289,9 +5401,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SM + model: W90 os_family: Android browser_family: Android Browser - @@ -5499,7 +5611,7 @@ device: type: smartphone brand: MI - model: Micromax + model: A101 os_family: Android browser_family: Android Browser - @@ -5529,9 +5641,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT28i os_family: Android browser_family: Android Browser - @@ -5545,9 +5657,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26w os_family: Android browser_family: Android Browser - @@ -5561,9 +5673,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -5657,9 +5769,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: PT + model: IM-A850L os_family: Android browser_family: Android Browser - @@ -5673,9 +5785,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: PT + model: IM-A850K os_family: Android browser_family: Android Browser - @@ -5769,9 +5881,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: DROID 4 4G os_family: Android browser_family: Android Browser - @@ -5819,7 +5931,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 997D os_family: Android browser_family: Android Browser - @@ -5849,9 +5961,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26i os_family: Android browser_family: Android Browser - @@ -5865,9 +5977,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -5881,9 +5993,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST23i os_family: Android browser_family: Android Browser - @@ -5945,9 +6057,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST26i os_family: Android browser_family: Android Browser - @@ -5961,9 +6073,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST21i os_family: Android browser_family: Android Browser - @@ -5977,9 +6089,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -6009,9 +6121,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT18i os_family: Android browser_family: Android Browser - @@ -6025,9 +6137,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT890 os_family: Android browser_family: Android Browser - @@ -6073,9 +6185,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26ii os_family: Android browser_family: Android Browser - @@ -6089,9 +6201,9 @@ short_name: AN version: device: - type: smartphone - brand: HP - model: + type: tablet + brand: CN + model: Touchpad 9.7 os_family: Android browser_family: Android Browser - @@ -6105,9 +6217,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 101G9 os_family: Android browser_family: Android Browser - @@ -6169,9 +6281,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT885 os_family: Android browser_family: Android Browser - @@ -6313,9 +6425,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT18i os_family: Android browser_family: Android Browser - @@ -6361,9 +6473,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST23i os_family: Android browser_family: Android Browser - @@ -6457,9 +6569,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST23i os_family: Android browser_family: Android Browser - @@ -6473,9 +6585,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -6537,9 +6649,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ601 os_family: Android browser_family: Android Browser - @@ -6553,9 +6665,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26w os_family: Android browser_family: Android Browser - @@ -6569,9 +6681,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26ii os_family: Android browser_family: Android Browser - @@ -6649,9 +6761,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: ME171 os_family: Android browser_family: Android Browser - @@ -6681,9 +6793,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A501 os_family: Android browser_family: Android Browser - @@ -6825,9 +6937,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer TF101G os_family: Android browser_family: Android Browser - @@ -6875,7 +6987,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715e os_family: Android browser_family: Android Browser - @@ -6889,9 +7001,9 @@ short_name: AN version: device: - type: smartphone - brand: AL - model: ore + type: tablet + brand: PP + model: 7208HD os_family: Android browser_family: Android Browser - @@ -7017,9 +7129,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: LE + model: S880 os_family: Android browser_family: Android Browser - @@ -7035,7 +7147,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio os_family: Android browser_family: Android Browser - @@ -7129,9 +7241,9 @@ short_name: AN version: device: - type: smartphone - brand: PT - model: pt-pt + type: tablet + brand: AU + model: Transformer TF101G os_family: Android browser_family: Android Browser - @@ -7179,7 +7291,7 @@ device: type: smartphone brand: HT - model: Sensation XL + model: Sensation XL with Beats Audio X315e os_family: Android browser_family: Android Browser - @@ -7209,9 +7321,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 101G9 os_family: Android browser_family: Android Browser - @@ -7225,9 +7337,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer TF101 os_family: Android browser_family: Android Browser - @@ -7323,7 +7435,7 @@ device: type: tablet brand: AU - model: Transformer Pad TF300T + model: Transformer Pad TF300TG os_family: Android browser_family: Android Browser - @@ -7339,7 +7451,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715e os_family: Android browser_family: Android Browser - @@ -7433,9 +7545,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer TF101 os_family: Android browser_family: Android Browser - @@ -7579,7 +7691,7 @@ device: type: tablet brand: AU - model: Transformer Pad TF300T + model: Transformer Pad TF300TG os_family: Android browser_family: Android Browser - @@ -7705,9 +7817,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer Prime TF201 os_family: Android browser_family: Android Browser - @@ -7801,9 +7913,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer TF101G os_family: Android browser_family: Android Browser - @@ -7849,9 +7961,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E110S os_family: Android browser_family: Android Browser - @@ -7945,9 +8057,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MA + model: MID8048 os_family: Android browser_family: Android Browser - @@ -8155,7 +8267,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715e os_family: Android browser_family: Android Browser - @@ -8187,7 +8299,7 @@ device: type: smartphone brand: HT - model: EVO 3D + model: EVO 3D X515m os_family: Android browser_family: Android Browser - @@ -8219,7 +8331,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715e os_family: Android browser_family: Android Browser - @@ -8267,7 +8379,7 @@ device: type: smartphone brand: HT - model: Sensation XL + model: Sensation XL with Beats Audio X315e os_family: Android browser_family: Android Browser - @@ -8315,7 +8427,7 @@ device: type: smartphone brand: HT - model: EVO 3D + model: EVO 3D X515m os_family: Android browser_family: Android Browser - @@ -8331,7 +8443,7 @@ device: type: smartphone brand: HT - model: Sensation XL + model: Sensation XL with Beats Audio X315e os_family: Android browser_family: Android Browser - @@ -8395,7 +8507,7 @@ device: type: smartphone brand: HT - model: EVO 3D + model: EVO 3D GSM os_family: Android browser_family: Android Browser - @@ -8427,7 +8539,7 @@ device: type: smartphone brand: HT - model: Sensation XL + model: Sensation XL with Beats Audio X315e os_family: Android browser_family: Android Browser - @@ -8443,7 +8555,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715e os_family: Android browser_family: Android Browser - @@ -8459,7 +8571,7 @@ device: type: smartphone brand: HT - model: Sensation XL + model: Sensation XL with Beats Audio X315e os_family: Android browser_family: Android Browser - @@ -8491,7 +8603,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715a os_family: Android browser_family: Android Browser - @@ -8521,9 +8633,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 101G9 os_family: Android browser_family: Android Browser - @@ -8539,7 +8651,7 @@ device: type: smartphone brand: HT - model: Sensation XE + model: Sensation XE with Beats Audio Z715e os_family: Android browser_family: Android Browser - @@ -8585,9 +8697,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer TF101G os_family: Android browser_family: Android Browser - @@ -8602,8 +8714,8 @@ version: device: type: smartphone - brand: GO - model: + brand: HT + model: HD2 os_family: Android browser_family: Android Browser - @@ -8681,9 +8793,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 97 CARBON os_family: Android browser_family: Android Browser - @@ -8809,9 +8921,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHW-M380S os_family: Android browser_family: Android Browser - @@ -8857,9 +8969,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ604 os_family: Android browser_family: Android Browser - @@ -8889,9 +9001,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ601 os_family: Android browser_family: Android Browser - @@ -8921,9 +9033,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A501 os_family: Android browser_family: Android Browser - @@ -8985,9 +9097,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ607 os_family: Android browser_family: Android Browser - @@ -9001,9 +9113,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ617 os_family: Android browser_family: Android Browser - @@ -9017,9 +9129,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A500 os_family: Android browser_family: Android Browser - @@ -9033,9 +9145,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A500 os_family: Android browser_family: Android Browser - @@ -9049,9 +9161,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 80G9 os_family: Android browser_family: Android Browser - @@ -9065,9 +9177,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 101G9 os_family: Android browser_family: Android Browser - @@ -9081,9 +9193,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AU + model: Transformer TF101 os_family: Android browser_family: Android Browser - @@ -9113,9 +9225,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AR + model: 80G9 os_family: Android browser_family: Android Browser - @@ -9273,9 +9385,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ601 os_family: Android browser_family: Android Browser - @@ -9305,9 +9417,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: AC + model: Icona Tab A501 os_family: Android browser_family: Android Browser - @@ -9321,9 +9433,9 @@ short_name: AN version: device: - type: - brand: - model: + type: tablet + brand: MR + model: MZ601 os_family: Android browser_family: Android Browser - @@ -9369,9 +9481,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST27i os_family: Android browser_family: Android Browser - @@ -9385,9 +9497,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT22i os_family: Android browser_family: Android Browser - @@ -9401,9 +9513,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST25i os_family: Android browser_family: Android Browser - @@ -9449,9 +9561,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: ME525(Defy) os_family: Android browser_family: Android Browser - @@ -9465,9 +9577,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: HT + model: Desire HD os_family: Android browser_family: Android Browser - @@ -9529,9 +9641,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: MB860 os_family: Android browser_family: Android Browser - @@ -9545,9 +9657,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST27a os_family: Android browser_family: Android Browser - @@ -9593,9 +9705,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT615 os_family: Android browser_family: Android Browser - @@ -9673,9 +9785,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT615 os_family: Android browser_family: Android Browser - @@ -9737,9 +9849,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT535 os_family: Android browser_family: Android Browser - @@ -9769,9 +9881,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST25a os_family: Android browser_family: Android Browser - @@ -9785,9 +9897,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST27i os_family: Android browser_family: Android Browser - @@ -9817,9 +9929,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT535 os_family: Android browser_family: Android Browser - @@ -9961,9 +10073,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT22i os_family: Android browser_family: Android Browser - @@ -9977,9 +10089,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT22i os_family: Android browser_family: Android Browser - @@ -9993,9 +10105,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: LT26i os_family: Android browser_family: Android Browser - @@ -10025,9 +10137,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: ST25a os_family: Android browser_family: Android Browser - @@ -10041,9 +10153,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SE + model: MT27i os_family: Android browser_family: Android Browser - @@ -10153,9 +10265,9 @@ short_name: AN version: device: - type: smartphone - brand: MR - model: DROID + type: + brand: + model: os_family: Android browser_family: Android Browser - @@ -10169,9 +10281,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHV-E160L os_family: Android browser_family: Android Browser - @@ -10313,9 +10425,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHW-M110S os_family: Android browser_family: Android Browser - @@ -10411,7 +10523,7 @@ device: type: feature phone brand: IO - model: i + model: i-STYLE 4 os_family: Android browser_family: Android Browser - @@ -10603,7 +10715,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 991D os_family: Android browser_family: Android Browser - @@ -10713,9 +10825,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: SA + model: SHW-M130L os_family: Android browser_family: Android Browser - @@ -10889,9 +11001,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT860 os_family: Android browser_family: Android Browser - @@ -10905,9 +11017,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT303 os_family: Android browser_family: Android Browser - @@ -11035,7 +11147,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 991 os_family: Android browser_family: Android Browser - @@ -11145,9 +11257,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: MB860 os_family: Android browser_family: Android Browser - @@ -11195,7 +11307,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 985 os_family: Android browser_family: Android Browser - @@ -11211,7 +11323,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 918A os_family: Android browser_family: Android Browser - @@ -11227,7 +11339,7 @@ device: type: smartphone brand: AL - model: ONE + model: ONE TOUCH 918 os_family: Android browser_family: Android Browser - @@ -11241,9 +11353,9 @@ short_name: AN version: device: - type: - brand: - model: + type: smartphone + brand: MR + model: XT910 os_family: Android browser_family: Android Browser - @@ -11474,7 +11586,7 @@ user_agent: Mozilla/5.0 (PlayStation 4 1.52) AppleWebKit/536.26 (KHTML, like Gecko) os: name: PlayStation - short_name: PSP + short_name: PS3 version: 4 browser: name: NetFront @@ -11484,7 +11596,7 @@ type: console brand: SO model: PlayStation 4 - os_family: Mobile Gaming Console + os_family: Gaming Console browser_family: NetFront - user_agent: Mozilla/5.0 (Linux; Android 4.0.3; HTC EVO 3D X515m Build/IML74K) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.63 Mobile Safari/537.36 OPR/15.0.1162.61541 @@ -11499,7 +11611,7 @@ device: type: smartphone brand: HT - model: EVO 3D + model: EVO 3D X515m os_family: Android browser_family: Opera - @@ -11509,8 +11621,2968 @@ short_name: WI8 version: 8 browser: + name: Opera Next + short_name: ON + version: 18.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Opera +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 6.12; es-US; KIN.Two 1.0) + os: + name: Windows CE + short_name: WCE + version: + browser: + name: IE Mobile + short_name: IM + version: 6.12 + device: + type: feature phone + brand: MS + model: Kin Two + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; Xbox) + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Internet Explorer + short_name: IE + version: 9.0 + device: + type: console + brand: MS + model: Xbox 360 + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; Trident/6.0; Xbox; Xbox One) + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: Internet Explorer + short_name: IE + version: 10.0 + device: + type: console + brand: MS + model: Xbox One + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Nintendo WiiU) AppleWebKit/534.52 (KHTML, like Gecko) NX/2.1.0.8.21 NintendoBrowser/1.0.0.7494.US + os: + name: Nintendo + short_name: WII + version: Wii + browser: + name: NetFront + short_name: NF + version: + device: + type: console + brand: NI + model: WiiU + os_family: Gaming Console + browser_family: NetFront +- + user_agent: Mozilla/5.0 (Nintendo 3DS; U; ; en) Version/1.7498.EU + os: + name: Nintendo Mobile + short_name: NDS + version: 3DS + browser: + name: NetFront + short_name: NF + version: + device: + type: console + brand: NI + model: 3DS + os_family: Mobile Gaming Console + browser_family: NetFront +- + user_agent: Mozilla/4.0 (PlayStation Portable); 2.00) + os: + name: PlayStation Portable + short_name: PSP + version: Portable + browser: + name: NetFront + short_name: NF + version: + device: + type: console + brand: SO + model: PlayStation Portable + os_family: Mobile Gaming Console + browser_family: NetFront +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US) AppleWebKit/534.13 (KHTML, like Gecko) Chrome/9.0.597.98 Safari/534.13 ChromePlus/1.6.0.0 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: ChromePlus + short_name: CP + version: 1.6 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.7 (KHTML, like Gecko) Chrome/16.0.912.63 Safari/535.7 CoolNovo/1.6.5.28 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: CoolNovo + short_name: CN + version: 1.6 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S8500/S8500XXJF4; U; Bada/1.0; fr-fr) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.0 Mobile WVGA SMM-MMS/1.2.0 OPN-B + os: + name: Bada + short_name: SBA + version: 1.0 + browser: + name: Dolphin + short_name: DF + version: 2.0 + device: + type: smartphone + brand: SA + model: GT-S8500 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.2.2; HP Slate7 Extreme Build/JDQ39) AppleWebKit/537.22 (KHTML, like Gecko) Chrome/25.0.1364.169 Safari/537.22 + os: + name: Android + short_name: AND + version: 4.2 + browser: + name: Chrome + short_name: CH + version: 25.0 + device: + type: tablet + brand: HP + model: Slate 7 Extreme + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.2.2; en-us; HP Slate 8 Pro Build/JDQ39) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.2 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: HP + model: Slate 8 Pro + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 2.3.1; en-us; Cat StarGate Build/GRH78) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 + os: + name: Android + short_name: AND + version: 2.3 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: CA + model: StarGate + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; de-de; Cat Tablet StarGate 2 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: CA + model: StarGate + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; fr-ch; Cat Tablet Android 4.0.4 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: CA + model: Nova + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 2.3.3; en-us ; CAT NOVA Build/GRI40) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1/UCBrowser/8.3.0.143/145/352 + os: + name: Android + short_name: AND + version: 2.3 + browser: + name: UC Browser + short_name: UC + version: 8.3 + device: + type: tablet + brand: CA + model: NOVA + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 2.3.3; De-de; CatNova8 Build/GRI40) AppleWebKit/533.16 (KHTML, Like Gecko) Version/4.0 Mobile Safari/533.1 + os: + name: Android + short_name: AND + version: 2.3 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: CA + model: Nova8 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 4.0.4; SH-10D Build/S4040) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.90 Mobile Safari/537.36 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Chrome Mobile + short_name: CM + version: 27.0 + device: + type: smartphone + brand: SH + model: SH-10D + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; de-de; VSD220 Build/IMM76D.UI23ED12_VSC) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smart display + brand: VS + model: VSD220 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; pl-pl; GEM10313S Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.1 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: GD + model: GEM10313S + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (X11; u; Linux; C) AppleWebKit /533.3 (Khtml, like Gheko) QtCarBrowser Safari/533.3 + os: + name: Linux + short_name: LIN + version: + browser: + name: Safari + short_name: SF + version: + device: + type: car browser + brand: TA + model: Model S + os_family: Linux + browser_family: Safari +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.3pre) Gecko/20100403 Lorentz/3.6.3plugin2pre (.NET CLR 4.0.20506) + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Firefox + short_name: FF + version: Lorentz (3.6) + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1b5pre) Gecko/20090424 Shiretoko/3.5b5pre + os: + name: Linux + short_name: LIN + version: + browser: + name: Firefox + short_name: FF + version: Shiretoko (3.5) + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/535.11 (KHTML, like Gecko) Comodo_Dragon/17.1.0.0 Chrome/17.0.963.38 Safari/535.11 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Comodo Dragon + short_name: CD + version: 17.1 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; KFJWI Build/IMM76D) AppleWebKit/535.19 (KHTML, like Gecko) Silk/2.2 Mobile Safari/535.19 Silk-Accelerated=true + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Mobile Silk + short_name: MS + version: 2.2 + device: + type: tablet + brand: KN + model: Fire HD 8.9" WiFi + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; Android 4.0.4; KFJWA Build/IMM76D) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.42 Safari/537.36 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: tablet + brand: KN + model: Fire HD 8.9" 4G + os_family: Android + browser_family: Chrome +- + user_agent: AmigaVoyager/3.2 (AmigaOS/MC680x0) + os: + name: AmigaOS + short_name: AMG + version: + browser: + name: Amiga Voyager + short_name: AV + version: 3.2 + device: + type: desktop + brand: + model: + os_family: AmigaOS + browser_family: Unknown +- + user_agent: Mozilla/5.0 (AmigaOS; U; AmigaOS 1.3; en-US; rv:1.8.1.21) Gecko/20090303 SeaMonkey/1.1.15 + os: + name: AmigaOS + short_name: AMG + version: 1.3 + browser: + name: SeaMonkey + short_name: SM + version: 1.1 + device: + type: desktop + brand: + model: + os_family: AmigaOS + browser_family: Unknown +- + user_agent: Mozilla/6.0 (Macintosh; U; Amiga-AWeb) Safari 3.1 + os: + name: AmigaOS + short_name: AMG + version: + browser: + name: Amiga Aweb + short_name: AW + version: + device: + type: desktop + brand: + model: + os_family: AmigaOS + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Unknown; Linux armv7l) AppleWebKit/537.1+ (KHTML, like Gecko) Safari/537.1+ HbbTV/1.1.1 ( ;LGE ;NetCast 4.0 ;03.10.81 ;1.0M ;) + os: + name: Linux + short_name: LIN + version: + browser: + name: Safari + short_name: SF + version: + device: + type: tv + brand: LG + model: NetCast 4.0 + os_family: Linux + browser_family: Safari +- + user_agent: Mozilla/5.0 (DirectFB; Linux armv7l) AppleWebKit/534.26+ (KHTML, like Gecko) Version/5.0 Safari/534.26+ HbbTV/1.1.1 ( ;LGE ;NetCast 3.0 ;1.0 ;1.0M ;) + os: + name: Linux + short_name: LIN + version: + browser: + name: Safari + short_name: SF + version: 5.0 + device: + type: tv + brand: LG + model: NetCast 3.0 + os_family: Linux + browser_family: Safari +- + user_agent: Mozilla/5.0 (DirectFB; U; Linux 7630; en) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ HbbTV/1.1.1 ( ;LGE ;GLOBAL_PLAT3 ;BR.8.97.067.B ;1.0.0.1 ;) + os: + name: Linux + short_name: LIN + version: + browser: + name: Safari + short_name: SF + version: + device: + type: tv + brand: LG + model: GLOBAL PLAT3 + os_family: Linux + browser_family: Safari +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (; BANGOLUFSEN; A3; ; ; ) CE-HTML/1.0 NETTV/1.0; en) Presto/2.10.287 Version/12.00 A3/1.0.2.28805 (BANGOLUFSEN, A3, wireless) + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: BO + model: BeoVision + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (; BANGOLUFSEN; A3; ; ; ) CE-HTML/1.0 NETTV/1.0; en) Presto/2.10.287 Version/12.00 A3/1.0.2.28884 (BANGOLUFSEN, A3, wired) + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: BO + model: BeoVision + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (+PVR+DL; BANGOLUFSEN; A3; ; ; ) CE-HTML/1.0 NETTV/1.0; en) Presto/2.10.287 Version/12.00 A3/1.0.3.30552 (BANGOLUFSEN, A3, wired) + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: BO + model: BeoVision + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (+PVR+DL; BANGOLUFSEN; A3; ; ; ) CE-HTML/1.0 NETTV/1.0; en) Presto/2.10.287 Version/12.00 A3/1.0.3.30552 (BANGOLUFSEN, A3, wireless) + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: BO + model: BeoVision + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; ; en; CreNova Build) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 HbbTV/1.1.1 (;CreNova;CNV001;1.0;1.0; FXM-U2FsdGVkX1/VHpIx4++T5dr9nrGwg2lrTv3h0bv5wA819tf9ZWJf5kbW8psLCFgl-END; en) Presto/2.9.167 Ve + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 4.0 + device: + type: tv + brand: CR + model: CNV001 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; CNV001; en;) HbbTV/1.1.1 (;CreNova;CNV001;1.0;1.0; FXM-U2FsdGVkX1/Oiw1OD4kjnYIMtRrxMWUbzbPMsylGXvFEN7YI7l5UInvIDEkFxQa5-END; en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: CR + model: CNV001 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux 7325b0; U; HbbTV/1.1.1 (; Humax; HD NANO; 1.00.16; 1.0; ); ce-html/1.0; en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: HX + model: HD NANO + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux 7325b0; U; HbbTV/1.1.1 (; Humax; IRHD-5100S; 1.01.26; 1.0; ); ce-html/1.0; en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: HX + model: IRHD-5100S + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux 7335b0-smp; U; HbbTV/1.1.1 (; Humax; iCord MINI; 0.90.02; 1.0; ); ce-html/1.0; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: HX + model: iCord MINI + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux 7405b0-smp; U; HbbTV/1.1.1 (; Humax; CXHD-5100C; 1.00.23; 1.0; ); ce-html/1.0; en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: HX + model: CXHD-5100C + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Humax; hms1000s; 1.0.0; 1.0.0; ); ce-html/1.0; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: HX + model: HMS-1000S + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Humax; iCord HD+; 1.0.0; 1.0.0; ); ce-html/1.0; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: HX + model: iCord HD+ + os_family: Linux + browser_family: Opera +- + user_agent: HbbTV/1.1.1 (+PVR;Humax;HD FOX+;1.00.12;1.0)CE-HTML/1.0 ANTGalio/3.1.1.23.04.09 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: ANTGalio + short_name: AG + version: 3.1 + device: + type: tv + brand: HX + model: HD FOX+ + os_family: Unknown + browser_family: Unknown +- + user_agent: HbbTV/1.1.1 (+PVR;Humax;iCord Cable;1.01.09;1.0)CE-HTML/1.0 ANTGalio/3.1.1.23.04.09 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: ANTGalio + short_name: AG + version: 3.1 + device: + type: tv + brand: HX + model: iCord Cable + os_family: Unknown + browser_family: Unknown +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (; INTEK; Vantage Full HD Model;;;) hdplusSmartTV/1.0 (NETRANGEMMH;) Bee/3.2 CE-HTML/1.0; FXM-U2FsdGVkX19WaYSyGq70V2qt2C4bR92ULIOEtQrDKma1eRx3WQlWfuTO6eCHMYQm-END; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: IT + model: Vantage + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (; INTEK; VT-100 HD+;;;) hdplusSmartTV/1.0 (NETRANGEMMH;) Bee/3.2 CE-HTML/1.0; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: IT + model: VT-100 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (; INTEK; VT-100 HD+;;;) hdplusSmartTV/1.0 (NETRANGEMMH;) Bee/3.2 CE-HTML/1.0; FXM-U2FsdGVkX1+9IFast5+XgFhStntZ2aPC75KXhmr7DTyTjVYcbAaLpfmxnMmKiXRe-END; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: IT + model: VT-100 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (+PVR; Loewe; SL150; LOH/3.10;;) CE-HTML/1.0 Config(L:slv,CC:DEU); en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: LO + model: SL150 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.2.1 (+PVR; Loewe; SL220; LOH/4.00;;) CE-HTML/1.0 Config(L:deu,CC:CHE) NETRANGEMMH; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: LO + model: SL220 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4 ; U; HBBTV/1.0 (; LOH/1.00; -----;;;) CE-HTML/1.0 Config(L:de,CC:AT); en) Presto/2.5.21 Version/10.30 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 10.30 + device: + type: tv + brand: + model: + os_family: Linux + browser_family: Opera +- + user_agent: LOEWE/TV HBBTV/1.0 CE-HTML/1.0 SL150/14.16.0 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: LO + model: SL150 + os_family: Unknown + browser_family: Unknown +- + user_agent: LOEWE/TV HbbTV/1.1.1 (+PVR; Loewe; SL121; LOH;;) CE-HTML/1.0 SL121/16.16.0 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: LO + model: SL121 + os_family: Unknown + browser_family: Unknown +- + user_agent: LOEWE/TV HbbTV/1.1.1 CE-HTML/1.0 SL121/16.16.0 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: LO + model: SL121 + os_family: Unknown + browser_family: Unknown +- + user_agent: LOEWE/TV HbbTV/1.2.1 (+PVR; Loewe; SL220; LOH/4.00;;) CE-HTML/1.0 SL220/ + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: LO + model: SL220 + os_family: Unknown + browser_family: Unknown +- + user_agent: Opera/10.60 (Linux sh4 ; U; HBBTV/1.0 (; LOH/2.01; -----;;;) CE-HTML/1.0 Config(Hotel,L:de,CC:DE); en) Presto/2.6.33 Version/10.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 10.60 + device: + type: tv + brand: + model: + os_family: Linux + browser_family: Opera +- + user_agent: HbbTV/1.2.1 (;MTK;MT5396;;;) ANTGalio/3.3.0.26.02.devel + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: ANTGalio + short_name: AG + version: 3.3 + device: + type: tv + brand: MK + model: MT5396 + os_family: Unknown + browser_family: Unknown +- + user_agent: HbbTV/1.1.1 (;MTK;MT5396;;;) ANTGalio/3.2.0.C341.06 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: ANTGalio + short_name: AG + version: 3.2 + device: + type: tv + brand: MK + model: MT5396 + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/5.0 (DirectFB; U; Linux armv6l; c) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ HbbTV/1.1.1 (;Metz;MMS;;;) + os: + name: Linux + short_name: LIN + version: + browser: + name: Safari + short_name: SF + version: + device: + type: tv + brand: ME + model: + os_family: Linux + browser_family: Safari +- + user_agent: HbbTV/1.1.1 (;Panasonic;VIERA 2011;1.805;0071-7702 2000-0000;) + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: PA + model: VIERA 2011 + os_family: Unknown + browser_family: Unknown +- + user_agent: HbbTV/1.1.1 (;Panasonic;VIERA 2012;1.210;0071-3403 2000-0000;) + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: PA + model: VIERA 2012 + os_family: Unknown + browser_family: Unknown +- + user_agent: HbbTV/1.2.1 (;Panasonic;VIERA 2013;3.838;1101-0003 0004-0000;) + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: PA + model: VIERA 2013 + os_family: Unknown + browser_family: Unknown +- + user_agent: Opera/9.80 (Linux mn10300; U; HbbTV/1.1.1 (+PVR; Panasonic; DIGA M9031; 3.030; ; ); en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: PA + model: + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv6l; U; NETRANGEMMH;HbbTV/1.1.1;CE-HTML/1.0;IKEA LF1V358; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: IA + model: LF1V358 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv6l; U; NETRANGEMMH;HbbTV/1.1.1;CE-HTML/1.0;PEAQ LF1V350; en) Presto/2.8.115 Version/11.10 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.10 + device: + type: tv + brand: PE + model: LF1V350 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv6l; U; NETRANGEMMH;HbbTV/1.1.1;CE-HTML/1.0;TCL LF1V349; en) Presto/2.8.115 Version/11.10 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.10 + device: + type: tv + brand: TC + model: LF1V349 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv6l; U; NETRANGEMMH;HbbTV/1.1.1;CE-HTML/1.0;THOM LF1V375; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: TN + model: LF1V375 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv6l; U; NETRANGEMMH;HbbTV/1.1.1;CE-HTML/1.0;THOMSON LF1V017; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: TN + model: LF1V017 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; NETRANGEMMH;HbbTV/1.1.1;CE-HTML/1.0;TCL LF1V042; en) Presto/2.10.287 Version/12.00 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: TC + model: LF1V042 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/4.0.1; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: PH + model: NETTV/4.0.1 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (; Philips; ; ; ; ) CE-HTML/1.0 NETTV/4.0.1; en) Presto/2.10.250 Version/11.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.60 + device: + type: tv + brand: PH + model: NETTV/4.0.1 + os_family: Linux + browser_family: Opera +- + user_agent: HbbTV/1.1.1 (;;;;;) Maple_2011 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SA + model: SmartTV2011 + os_family: Unknown + browser_family: Unknown +- + user_agent: HbbTV/1.1.1 (;Samsung;SmartTV2012;;;) WebKit + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SA + model: SmartTV2012 + os_family: Unknown + browser_family: Unknown +- + user_agent: HbbTV/1.1.1 (;Samsung;SmartTV2013;BPH-F8509EUB-1003.2;;) WebKit + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SA + model: SmartTV2013 + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; selevision; Selevision EMC1000i; 1.0; 1.0;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SV + model: EMC1000i + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; selevision; Selevision EMC1000i; 1.0; 1.0;) hdplusinteraktiv/1.0 (NETRANGEMMH;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SV + model: EMC1000i + os_family: Unknown + browser_family: Unknown +- + user_agent: Opera/9.80 (Linux sh4; HbbTV/1.2.1 (;Sharp;LE752;v0.1.18.1;;) CE-HTML/1.0 Config(L:eng,CC:DEU) NETRANGEMMH) Presto/2.12.362 Version/12.10 + os: + name: Linux + short_name: LIN + version: + browser: name: Opera short_name: OP + version: 12.10 + device: + type: tv + brand: SH + model: LE752 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; HbbTV/1.2.1 (;Sharp;LE652;v0.1.43.5;;) CE-HTML/1.0 Config(L:deu,CC:DEU) NETRANGEMMH) Presto/2.12.362 Version/12.10 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.10 + device: + type: tv + brand: SH + model: LE652 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; NETRANGEMMH; Sharp; HbbTV/1.1.1; CE-HTML/1.0; LE542E; FT; LC:deu; CC:che;; en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: SH + model: LE542E + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; HbbTV/1.1.1 ( ; Sharp; LE737; 690.1; 1.32;); en) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: SH + model: LE737 + os_family: Linux + browser_family: Opera +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; inverto; IDL-6750N Volksbox II; 1.0; 1.0;) hdplusinteraktiv/1.0 (NETRANGEMMH;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: IV + model: Volksbox II + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; inverto; IDL-6651N Volksbox Web Edition; 1.0; 1.0;) hdplusinteraktiv/1.0 (NETRANGEMMH;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: IV + model: Volksbox Web Edition + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; inverto; IDL-6640N Volksbox Essential; 1.0; 1.0;) hdplusinteraktiv/1.0 (NETRANGEMMH;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: IV + model: Volksbox Essential + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; smart; CX10; 1.0; 1.0;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SR + model: CX10 + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; smart; VX10; 1.0; 1.0;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SR + model: VX10 + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (;;;) AppleWebKit/534.6 HbbTV/1.1.1 (+DL+PVR; smart; ZAPPIX HD+; 1.0; 1.0;) CE-HTML/1.0' + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SR + model: ZAPPIX + os_family: Unknown + browser_family: Unknown +- + user_agent: 'Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Sony; KDL55NX725; PKG4.012EUA; 2011;);; en) Presto/2.7.61 Version/11.00' + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.00 + device: + type: tv + brand: SO + model: KDL55NX725 + os_family: Linux + browser_family: Opera +- + user_agent: 'Opera/9.80 (Linux armv7l; HbbTV/1.1.1 (; Sony; KDL42W805A; PKG3.105EUA; 2013;); ) Presto/2.12.362 Version/12.11' + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.11 + device: + type: tv + brand: SO + model: KDL42W805 + os_family: Linux + browser_family: Opera +- + user_agent: 'Opera/9.80 (Linux armv7l; U; HbbTV/1.1.1 (; Sony; KDL40HX758; PKG1.212EUA; 2013;);; en) Presto/2.10.287 Version/12.00' + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: SO + model: KDL40HX758 + os_family: Linux + browser_family: Opera +- + user_agent: 'Opera/9.80 (Linux armv7l; U; HbbTV/1.1.1 (; Sony; KDL46EX650; PKG0.002EUA; 2013;);; en) Presto/2.10.287 Version/12.00' + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: SO + model: KDL46EX650 + os_family: Linux + browser_family: Opera +- + user_agent: 'Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Sony; KDL32CX525; PKG4.008EUA; 2011;);; en) Presto/2.7.61 Version/11.00' + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.00 + device: + type: tv + brand: SO + model: KDL32CX525 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat Digit ISIO C; de) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: TX + model: Digit ISIO C + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat Digit ISIO S; de) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: TX + model: Digit ISIO S + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat DigiCorder ISIO C; de) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: TX + model: DigiCorder ISIO C + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux sh4; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat DigiCorder ISIO S; de) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: TX + model: DigiCorder ISIO S + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux i686; U; HbbTV/1.1.1 (;;;;;); CE-HTML; TechniSat MultyVision ISIO; de) Presto/2.9.167 Version/11.50 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.50 + device: + type: tv + brand: TX + model: MultyVision ISIO + os_family: Linux + browser_family: Opera +- + user_agent: HbbTV/1.1.1 (+DL;TechnoTrend Goerler;S-855;3.1.8.24.04.20.devel;;) CE-HTML/1.0 hdplusinteraktiv/1.0 (NETRANGEMMH;) + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: TT + model: S-855 + os_family: Unknown + browser_family: Unknown +- + user_agent: Opera/9.80 (Linux armv7l ; U; HbbTV/1.1.1 (; TOSHIBA; 55WL863; 19.5.61.15; 3; ) ; ToshibaTP/1.3.0 (+VIDEO_X_MS_ASF+VIDEO_MP4+AUDIO_MPEG+AUDIO_MP4+DRM+3D) ; de) Presto/2.6.33 Version/10.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 10.60 + device: + type: tv + brand: TS + model: 55WL863 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv7l ; U; HbbTV/1.1.1 (; TOSHIBA; 55ZL1; 19.7.61.14; 3; ) ; ToshibaTP/1.3.0 (+VIDEO_MP4+AUDIO_MPEG+AUDIO_MP4) ; de) Presto/2.6.33 Version/10.60 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 10.60 + device: + type: tv + brand: TS + model: 55ZL1 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Vestel; MB95; 1.0; 1.0; ); en) Presto/2.10.287 Version/12.00 HbbTV/1.1.1 (; CUS:TELEFUNKEN; MB95; 2.1.4; 1.0;) CE-HTML/1.0 NETRANGEMMH iplayerV3 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: TL + model: MB95 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Vestel; MB95; 1.0; 1.0; ); en) Presto/2.10.287 Version/12.00 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: VT + model: MB95 + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux armv7l; U; HbbTV/1.1.1 (;tv2n;videoweb;1.0.0;1.0;); en) Presto/2.8.115 Version/11.10 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 11.10 + device: + type: tv + brand: VW + model: tv2n + os_family: Linux + browser_family: Opera +- + user_agent: Opera/9.80 (Linux mips; U; HbbTV/1.1.1 (; Opera Software; videowebtv; ; ; ); en) Presto/2.10.287 Version/12.00 + os: + name: Linux + short_name: LIN + version: + browser: + name: Opera + short_name: OP + version: 12.00 + device: + type: tv + brand: VW + model: VideoWeb TV + os_family: Linux + browser_family: Opera +- + user_agent: HbbTV/1.1.1 (;;;;) Mozilla/5.0 (compatible; ANTGalio/3.0.2.1.22.43.08; Linux2.6.18-7.1/7405d0-smp) + os: + name: Linux + short_name: LIN + version: + browser: + name: ANTGalio + short_name: AG + version: 3.0 + device: + type: tv + brand: VW + model: 600S + os_family: Linux + browser_family: Unknown +- + user_agent: DLNADOC/1.50 SHARP-AQUOS-DMP/2.0W + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SH + model: Aquos Net Plus + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/5.0 (DTV) AppleWebKit/531.2+ (KHTML, like Gecko) Espial/6.1.5 AQUOSBrowser/2.0 (US01DTV;V;0001;0001) + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Espial TV Browser + short_name: ES + version: 6.1 + device: + type: tv + brand: SH + model: Aquos Net Plus + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/5.0 (DirectFB; U; Linux mips; en) AppleWebKit/531.2+ (KHTML, like Gecko) Safari/531.2+ LG Browser/4.0.10(+SCREEN+TUNER; LGE; 42LE5500-SA; 04.02.02; 0x00000001;); LG NetCast.TV-2010 + os: + name: Linux + short_name: LIN + version: + browser: + name: Safari + short_name: SF + version: + device: + type: tv + brand: LG + model: NetCast + os_family: Linux + browser_family: Safari +- + user_agent: Mozilla/5.0 (SmartHub; SMART-TV; U; Linux/SmartTV; Maple2012) + os: + name: Linux + short_name: LIN + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: SA + model: Smart TV + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/3.01 (compatible;) + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; AOL 9.0; Windows NT 5.0; AVPersonalSerial 0000000000000000000000000000000000000000; .NET CLR 2.0.50727) + os: + name: Windows 2000 + short_name: W2K + version: 2000 + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; TOB 6.07; Windows NT 5.1; .NET CLR 1.1.4322) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; Win 9x 4.90; .NET CLR 1.1.4322) + os: + name: Windows ME + short_name: WME + version: ME + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; .NET CLR 2.0.50727; 3P_UVRMDE 1.0.23.2) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; GTB6.3; .NET CLR 1.1.4322; .NET CLR 2.0.50727) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; .NET CLR 1.1.4322; AskTB5.4) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; Avant Browser; InfoPath.1) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Avant Browser + short_name: AA + version: + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1; SIMBAR={81EF9ABE-357A-484a-A97A-37904552D43B}; .NET CLR 2.0.50727)' + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: 'Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.2; SLCC1; .NET CLR 1.1.4325)' + os: + name: Windows Server 2003 + short_name: WS3 + version: Server 2003 + browser: + name: Internet Explorer + short_name: IE + version: 6.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 7.0; AOL 9.0; Windows NT 6.0; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.0.30618; .NET CLR 3.5.30729) + os: + name: Windows Vista + short_name: WVI + version: Vista + browser: + name: Internet Explorer + short_name: IE + version: 7.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; .NET CLR 2.0.50727; .NET CLR 3.0.04506.30; .NET CLR 3.0.04506.648) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 7.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: 'Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 5.1; i-NavFourF; TuneUp HTML Client Embedded Web Browser from: http://bsalsa.com/; .NET CLR 1.1.4322; .NET CLR 2.0.50727; .NET CLR 3.0.4506.2152; .NET CLR 3.5.30729)' + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 7.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows NT 6.0; GTB6; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30618; .NET CLR 1.1.4322) + os: + name: Windows Vista + short_name: WVI + version: Vista + browser: + name: Internet Explorer + short_name: IE + version: 7.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; (R1 1.3)) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Internet Explorer + short_name: IE + version: 8.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.0; Trident/4.0; GTB6.3; Mozilla/4.0 (compatible; MSIE 6.0; Windows NT 5.1; SV1) ; SLCC1; .NET CLR 2.0.50727; Media Center PC 5.0; .NET CLR 3.5.30729; .NET CLR 3.0.30729; OfficeLiveConnector.1.4; OfficeLivePatch.1.3) + os: + name: Windows Vista + short_name: WVI + version: Vista + browser: + name: Internet Explorer + short_name: IE + version: 8.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 6.1; Trident/4.0; SLCC2; .NET CLR 2.0.50727; .NET CLR 3.5.30729; .NET CLR 3.0.30729; Media Center PC 6.0; OfficeLiveConnector.1.4; OfficeLivePatch.1.3) + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Internet Explorer + short_name: IE + version: 8.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (compatible; Exabot/3.0; +http://www.exabot.com/go/robot) + os: + name: Bot + short_name: BOT + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Bot + browser_family: Unknown +- + user_agent: Mozilla/5.0 (iPhone; U; CPU iPhone OS 3_1_2 like Mac OS X; de-de) AppleWebKit/528.18 (KHTML, like Gecko) Version/4.0 Mobile/7D11 Safari/528.16 + os: + name: iOS + short_name: IOS + version: 3.1 + browser: + name: Mobile Safari + short_name: MF + version: 4.0 + device: + type: smartphone + brand: AP + model: iPhone + os_family: iOS + browser_family: Safari +- + user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; de; rv:1.9.1.6) Gecko/20091201 Firefox/3.5.6 + os: + name: Mac + short_name: MAC + version: 10.6 + browser: + name: Firefox + short_name: FF + version: 3.5 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10_5_8; de-de) AppleWebKit/531.21.8 (KHTML, like Gecko) Version/4.0.4 Safari/531.21.10 + os: + name: Mac + short_name: MAC + version: 10.5 + browser: + name: Safari + short_name: SF + version: 4.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Safari +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; de; rv:1.8.1.20) Gecko/20081217 Firefox/2.0.0.20 + os: + name: Windows 2000 + short_name: W2K + version: 2000 + browser: + name: Firefox + short_name: FF + version: 2.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.0; de; rv:1.9.1.6) Gecko/20091201 (WEB.DE/1.5) Firefox/3.5.6 (.NET CLR 3.5.30729) + os: + name: Windows Vista + short_name: WVI + version: Vista + browser: + name: Firefox + short_name: FF + version: 3.5 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; de; rv:1.9.0.15) Gecko/2009102815 Iceweasel/3.0.6 (Debian-3.0.6-3) + os: + name: Debian + short_name: DEB + version: 3.0 + browser: + name: Iceweasel + short_name: IW + version: 3.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; de; rv:1.9.1.6) Gecko/20091215 Ubuntu/9.10 (karmic) Firefox/3.5.6 + os: + name: Ubuntu + short_name: UBT + version: 9.10 + browser: + name: Firefox + short_name: FF + version: 3.5 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.11) Gecko GranParadiso/3.0.11 + os: + name: Linux + short_name: LIN + version: + browser: + name: Firefox + short_name: FF + version: GranParadiso (3.0) + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Opera/9.27 (Windows NT 5.1; U; de) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Opera + short_name: OP + version: 9.27 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Opera +- + user_agent: Opera/9.80 (Windows NT 5.1; U; de) Presto/2.2.15 Version/10.10 + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Opera + short_name: OP + version: 10.10 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Opera +- + user_agent: SimilarPages/Nutch-1.0-dev (SimilarPages Nutch Crawler; http://www.similarpages.com; info at similarpages dot com) + os: + name: Bot + short_name: BOT + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Bot + browser_family: Unknown +- + user_agent: Sosospider+(+http://help.soso.com/webspider.htm) + os: + name: Bot + short_name: BOT + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Bot + browser_family: Unknown +- + user_agent: Mozilla/5.0 (BeOS; U; Haiku BePC; en-US; rv:1.8.1.21pre) Gecko/20090218 BonEcho/2.0.0.21pre + os: + name: Haiku OS + short_name: HAI + version: + browser: + name: Firefox + short_name: FF + version: BonEcho (2.0) + device: + type: desktop + brand: + model: + os_family: BeOS + browser_family: Firefox +- + user_agent: Mozilla/5.0 (compatible; U; Webpositive/533.4; Haiku) AppleWebkit/533.4 (KHTML, like gecko) Chrome/5.0.375.55 Safari/533.4 + os: + name: Haiku OS + short_name: HAI + version: + browser: + name: WebPositive + short_name: WE + version: + device: + type: desktop + brand: + model: + os_family: BeOS + browser_family: Unknown +- + user_agent: COCOON/R01 Browser/Obigo/Q05A Profile/MIDP-2.0 Configuration/CLDC-1.1 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Obigo + short_name: OB + version: Q05A + device: + type: smartphone + brand: OT + model: COCOON + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 7.6) o2 Xda comet + os: + name: Windows CE + short_name: WCE + version: + browser: + name: IE Mobile + short_name: IM + version: 7.6 + device: + type: smartphone + brand: OT + model: Xda comet + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: BenQ-CF61/1.00/WAP2.0/MIDP2.0/CLDC1.0 UP.Browser/6.3.0.4.c.1.102 (GUI) MMP/2.0 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Openwave Mobile Browser + short_name: OV + version: 6.3 + device: + type: feature phone + brand: BQ + model: CF61 + os_family: Unknown + browser_family: Unknown +- + user_agent: Cricket-A310/1.0 UP.Browser/6.3.0.7 (GUI) MMP/2.0 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Openwave Mobile Browser + short_name: OV + version: 6.3 + device: + type: feature phone + brand: CK + model: A310 + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 7.0; Windows Phone OS 7.0; Trident/3.1; IEMobile/7.0; DELL; Venue Pro) + os: + name: Windows Phone + short_name: WPH + version: 7.0 + browser: + name: IE Mobile + short_name: IM + version: 7.0 + device: + type: smartphone + brand: DL + model: Venue Pro + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: 'Xiino/1.0.9E [en] (v. 4.1; 153x130; g4)' + os: + name: palmOS + short_name: POS + version: 4.1 + browser: + name: Xiino + short_name: XI + version: 1.0 + device: + type: smartphone + brand: PM + model: + os_family: Other Mobile + browser_family: Unknown +- + user_agent: CorePlayer/1.0 (Palm OS 5.4.9; ARM Intel PXA27x; en) CorePlayer/1.3.2_6909 + os: + name: palmOS + short_name: POS + version: 5.4 + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: smartphone + brand: PM + model: + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/5.0 (webOS/1.4.5; U; ru-RU) AppleWebKit/532.2 (KHTML, like Gecko) Version/1.0 Safari/532.2 Pixi/1.0 + os: + name: webOS + short_name: WOS + version: 1.4 + browser: + name: wOSBrowser + short_name: WO + version: 1.4 + device: + type: smartphone + brand: PM + model: Pixi 1.0 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/Palm-TunX; Blazer/4.3) 16;320x448 + os: + name: palmOS + short_name: POS + version: + browser: + name: Palm Blazer + short_name: PL + version: 4.3 + device: + type: smartphone + brand: PM + model: TunX + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/4.76 (compatible; MSIE 6.0; U; Windows 95; PalmSource; PalmOS; WebPro; Tungsten Proxyless 1.1 320x320x16) + os: + name: palmOS + short_name: POS + version: + browser: + name: Palm WebPro + short_name: PW + version: + device: + type: smartphone + brand: PM + model: Tungsten + os_family: Other Mobile + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 [en] (PalmOS; U; WebPro/3.5; Palm-Zi72)' + os: + name: palmOS + short_name: POS + version: + browser: + name: Palm WebPro + short_name: PW + version: 3.5 + device: + type: smartphone + brand: PM + model: Zi72 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/Palm-Zir4; Blazer/4.0) 16;320x320 + os: + name: palmOS + short_name: POS + version: + browser: + name: Palm Blazer + short_name: PL + version: 4.0 + device: + type: smartphone + brand: PM + model: Zir4 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 8.12; MSIEMobile 6.0) 320X320 Palm Treo850e + os: + name: Windows CE + short_name: WCE + version: + browser: + name: IE Mobile + short_name: IM + version: 8.12 + device: + type: smartphone + brand: PM + model: Treo850e + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (webOS/1.0; U; en-US) AppleWebKit/525.27.1 (KHTML, like Gecko) Version/1.0 Safari/525.27.1 Pre/1.0 + os: + name: webOS + short_name: WOS + version: 1.0 + browser: + name: wOSBrowser + short_name: WO + version: 1.0 + device: + type: smartphone + brand: PM + model: Pre 1.0 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/5.0 (SAMSUNG; SAMSUNG-GT-S8500/S8500XXJF4; U; Bada/1.0; fr-fr) AppleWebKit/533.1 (KHTML, like Gecko) Dolfin/2.0 Mobile WVGA SMM-MMS/1.2.0 OPN-B + os: + name: Bada + short_name: SBA + version: 1.0 + browser: + name: Dolphin + short_name: DF + version: 2.0 + device: + type: smartphone + brand: SA + model: GT-S8500 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; en-us; Glass 1 Build/IMM76L; XE7) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: GO + model: Glass + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; Android 4.1.1; ARCHOS GAMEPAD Build/JRO03H) AppleWebKit/535.19 (KHTML, like Gecko) Chrome/18.0.1025.166 Safari/535.19 + os: + name: Android + short_name: AND + version: 4.1 + browser: + name: Chrome + short_name: CH + version: 18.0 + device: + type: console + brand: AR + model: Gamepad + os_family: Android + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.73.11 (KHTML, like Gecko) Version/7.0.1 Safari/537.73.11 + os: + name: Mac + short_name: MAC + version: 10.9 + browser: + name: Safari + short_name: SF + version: 7.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Safari +- + user_agent: Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: Ubuntu + short_name: UBT + version: + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; Linux i686; rv:17.0) Gecko/20130330 Thunderbird/17.0.5 + os: + name: Linux + short_name: LIN + version: + browser: + name: Thunderbird + short_name: TB + version: 17.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.9; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: Mac + short_name: MAC + version: 10.9 + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows NT 6.3; WOW64; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36 + os: + name: Mac + short_name: MAC + version: 10.9 + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Chrome +- + user_agent: Mozilla/5.0 (compatible; Ezooms/1.0; help@moz.com) + os: + name: Bot + short_name: BOT + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Bot + browser_family: Unknown +- + user_agent: Mozilla/5.0 (compatible; Googlebot/2.1; +http://www.google.com/bot.html) + os: + name: Bot + short_name: BOT + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Bot + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64; Trident/7.0; rv:11.0) like Gecko + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Internet Explorer + short_name: IE + version: 11.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Windows NT 6.3; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/32.0.1700.76 Safari/537.36 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: Chrome + short_name: CH + version: 32.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53 + os: + name: iOS + short_name: IOS + version: 7.0 + browser: + name: Mobile Safari + short_name: MF + version: 7.0 + device: + type: smartphone + brand: AP + model: iPhone + os_family: iOS + browser_family: Safari +- + user_agent: Mozilla/5.0 (iPad; CPU OS 7_0_4 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) Version/7.0 Mobile/11B554a Safari/9537.53 + os: + name: iOS + short_name: IOS + version: 7.0 + browser: + name: Mobile Safari + short_name: MF + version: 7.0 + device: + type: tablet + brand: AP + model: iPad + os_family: iOS + browser_family: Safari +- + user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0) + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Internet Explorer + short_name: IE + version: 9.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Ubuntu Chromium/31.0.1650.63 Chrome/31.0.1650.63 Safari/537.36 + os: + name: Ubuntu + short_name: UBT + version: + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Chrome +- + user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.7; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: Mac + short_name: MAC + version: 10.7 + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36 + os: + name: Mac + short_name: MAC + version: 10.8 + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Chrome +- + user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20131030 Firefox/17.0 Iceweasel/17.0.10 + os: + name: Linux + short_name: LIN + version: + browser: + name: Iceweasel + short_name: IW + version: 17.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (iPhone; CPU iPhone OS 6_0 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Version/6.0 Mobile/10A5376e Safari/8536.25 (compatible; Googlebot-Mobile/2.1; +http://www.google.com/bot.html) + os: + name: Bot + short_name: BOT + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: + brand: + model: + os_family: Bot + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Android; Mobile; rv:26.0) Gecko/26.0 Firefox/26.0 + os: + name: Android + short_name: AND + version: + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: + brand: + model: + os_family: Android + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Android; Tablet; rv:26.0) Gecko/26.0 Firefox/26.0 + os: + name: Android + short_name: AND + version: + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: + brand: + model: + os_family: Android + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36 Squider/0.01 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Chrome + short_name: CH + version: 27.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Safari/9537.73.11 CFNetwork/673.0.3 Darwin/13.0.0 (x86_64) (MacBookAir6%2C2) + os: + name: Mac + short_name: MAC + version: + browser: + name: Safari + short_name: SF + version: + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Safari +- + user_agent: Opera/9.80 (Android; Opera Mini/7.5.33361/34.818; U; en) Presto/2.8.119 Version/11.10 + os: + name: Android + short_name: AND + version: + browser: + name: Opera Mini + short_name: OI + version: 7.5 + device: + type: + brand: + model: + os_family: Android + browser_family: Opera +- + user_agent: Mozilla/5.0 (Windows NT 6.1; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.57 Safari/537.36 OPR/18.0.1284.49 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Opera Next + short_name: ON version: 18.0 device: type: desktop @@ -11518,3 +14590,1907 @@ model: os_family: Windows browser_family: Opera +- + user_agent: Mozilla/5.0 (Windows NT 6.2; WOW64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/28.0.1500.95 YaBrowser/13.10.1500.9323 Safari/537.36 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: Yandex Browser + short_name: YA + version: 13.10 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (PlayBook; U; RIM Tablet OS 2.1.0; en-US) AppleWebKit/536.2+ (KHTML, like Gecko) Version/7.2.1.0 Safari/536.2+ + os: + name: BlackBerry Tablet OS + short_name: QNX + version: 2.1 + browser: + name: BlackBerry Browser + short_name: BB + version: + device: + type: tablet + brand: RM + model: BlackBerry Playbook + os_family: Other Mobile + browser_family: BlackBerry Browser +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; ru; rv:1.9.0.14) Gecko/2009090216 Ubuntu/9.04 (jaunty) Firefox/3.0.14 + os: + name: Ubuntu + short_name: UBT + version: 9.04 + browser: + name: Firefox + short_name: FF + version: 3.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: UCWEB/8.8 (iPhone; CPU OS_6; en-US)AppleWebKit/534.1 U3/3.0.0 Mobile + os: + name: iOS + short_name: IOS + version: 6 + browser: + name: UC Browser + short_name: UC + version: 8.8 + device: + type: smartphone + brand: AP + model: iPhone + os_family: iOS + browser_family: Unknown +- + user_agent: Mozilla/5.0 (iPad; CPU OS 6_0_1 like Mac OS X) AppleWebKit/536.26 (KHTML, like Gecko) Mercury/8.1 Mobile/10A523 Safari/8536.25 + os: + name: iOS + short_name: IOS + version: 6.0 + browser: + name: Mercury + short_name: ME + version: 8.1 + device: + type: tablet + brand: AP + model: iPad + os_family: iOS + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:25.0) Gecko/20100101 Firefox/25.0 + os: + name: FreeBSD + short_name: BSD + version: + browser: + name: Firefox + short_name: FF + version: 25.0 + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Firefox +- + user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; NOKIA; Lumia 520) + os: + name: Windows Phone + short_name: WPH + version: 8.0 + browser: + name: IE Mobile + short_name: IM + version: 10.0 + device: + type: smartphone + brand: NK + model: Lumia 520 + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/27.0.1453.110 Safari/537.36 CoolNovo/2.0.9.20 + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: CoolNovo + short_name: CN + version: 2.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:29.0) Gecko/20100101 Firefox/29.0 SeaMonkey/2.26a1 Lightning/3.1a1 + os: + name: Linux + short_name: LIN + version: + browser: + name: SeaMonkey + short_name: SM + version: 2.26 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux x86_64) KHTML/4.8.5 (like Gecko) Mageia Konqueror/4.8 + os: + name: Linux + short_name: LIN + version: + browser: + name: Konqueror + short_name: KO + version: 4.8 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Konqueror +- + user_agent: Mozilla/5.0 (Windows NT 5.1) AppleWebKit/537.31 (KHTML, like Gecko) Chrome/26.0.1410.43 BIDUBrowser/2.x Safari/537.31 + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Chrome + short_name: CH + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; it-IT; rv:1.9.0.2) Gecko/2008092313 Ubuntu/9.25 (jaunty) Firefox/3.8 + os: + name: Ubuntu + short_name: UBT + version: 9.25 + browser: + name: Firefox + short_name: FF + version: 3.8 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10_8_5) AppleWebKit/537.22 (KHTML, like Gecko) Maxthon/4.1.2.2000 Chrome/25.0.1364.99 Safari/537.22 + os: + name: Mac + short_name: MAC + version: 10.8 + browser: + name: Maxthon + short_name: MX + version: 4.1 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.63 Safari/537.36 SUSE/31.0.1650.63 + os: + name: SUSE + short_name: SSE + version: 31.0 + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Chrome +- + user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HTC; Windows Phone 8X by HTC) + os: + name: Windows Phone + short_name: WPH + version: 8.0 + browser: + name: IE Mobile + short_name: IM + version: 10.0 + device: + type: smartphone + brand: HT + model: Windows Phone 8X by HTC + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 8.0; Windows NT 5.1; Trident/4.0; Maxthon/4.2.0.4000) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Maxthon + short_name: MX + version: 4.2 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/537.36 (KHTML, like Gecko) Iron/26.0.1450.0 Chrome/26.0.1450.0 Safari/537.36 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Iron + short_name: IR + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows NT 6.2; Win64; x64; rv:24.0) Gecko/20140129 Firefox/24.0 PaleMoon/24.3.1 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: Pale Moon + short_name: PM + version: 24.3 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1; en-US) AppleWebKit/9537.73.11 (KHTML, like Gecko) Version/7.0 Safari/537.71 OmniWeb/v624.0' + os: + name: Mac + short_name: MAC + version: 10.9 + browser: + name: OmniWeb + short_name: OW + version: 624.0 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux) AppleWebKit/535.22 (KHTML, like Gecko) Chrome/18.0.1025.133 Safari/535.22 Midori/0.5 + os: + name: Linux + short_name: LIN + version: + browser: + name: Midori + short_name: MI + version: 0.5 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:25.0) Gecko/20100101 Firefox/25.0 IceDragon/25.0.0.1 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: IceDragon + short_name: ID + version: 25.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/5.0 (Macintosh; U; Intel Mac OS X; en-US) AppleWebKit/532.1 (KHTML, like Gecko) Arora/0.10.1 (Git: 1329 e5385f3) Safari/532.1' + os: + name: Mac + short_name: MAC + version: + browser: + name: Arora + short_name: AR + version: 0.10 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Unknown +- + user_agent: Mozilla/5.0 (compatible; Konqueror/4.3; Linux) KHTML/4.3.4 (like Gecko) Red Hat Enterprise Linux/4.3.4-19.el6 + os: + name: Red Hat + short_name: RHT + version: + browser: + name: Konqueror + short_name: KO + version: 4.3 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Konqueror +- + user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X; de-de) AppleWebKit/535+ (KHTML, like Gecko) Version/5.0 Safari/535.22+ Midori/0.4 + os: + name: Mac + short_name: MAC + version: + browser: + name: Midori + short_name: MI + version: 0.4 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Unknown +- + user_agent: Nokia210/2.0 (04.12) Profile/MIDP-2.1 Configuration/CLDC-1.1 UCWEB/2.0 (Java; U; MIDP-2.0; en-US; Nokia210) U2/1.0.0 UCBrowser/9.3.0.326 U2/1.0.0 Mobile + os: + name: Symbian + short_name: SYM + version: + browser: + name: UC Browser + short_name: UC + version: 9.3 + device: + type: smartphone + brand: NK + model: 210 + os_family: Symbian + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux x86_64; en; rv:2.0) Gecko/20100101 Firefox/4.0 Opera 11.64 + os: + name: Linux + short_name: LIN + version: + browser: + name: Firefox + short_name: FF + version: 4.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.2; zh-cn; MI 1S Build/JZO54K) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 XiaoMi/MiuiBrowser/1.0 + os: + name: Android + short_name: AND + version: 4.1 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: XI + model: MI 1S + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-fr; MI 2 Build/JRO03L) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 XiaoMi/MiuiBrowser/1.0 + os: + name: Android + short_name: AND + version: 4.1 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: XI + model: MI 2 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 2.3.5; zh-cn; MI-ONE_Plus Build/GINGERBREAD; 480*854) AppleWebKit/528.5+ (KHTML, like Gecko) Version/3.1.2 Mobile Safari/525.20.1/UCWEB7.9.3.103/139/800 + os: + name: Android + short_name: AND + version: 2.3 + browser: + name: UC Browser + short_name: UC + version: 7.9 + device: + type: smartphone + brand: XI + model: MI-ONE Plus + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; MI-ONE Plus Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) FlyFlow/2.2 Version/4.0 Mobile Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: XI + model: MI-ONE Plus + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.1; Trident/6.0; Sleipnir/2.9.18) + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Sleipnir + short_name: SL + version: 2.9 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Series40; Nokia306/03.63; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.9.0.0.22 + os: + name: Symbian OS Series 40 + short_name: S40 + version: + browser: + name: Nokia Ovi Browser + short_name: NV + version: 3.9 + device: + type: smartphone + brand: NK + model: 306 + os_family: Symbian + browser_family: Nokia Browser +- + user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows Phone OS 7.5; Trident/5.0; IEMobile/9.0; HTC; Radar C110e) + os: + name: Windows Phone + short_name: WPH + version: 7.5 + browser: + name: IE Mobile + short_name: IM + version: 9.0 + device: + type: smartphone + brand: HT + model: Radar C110e + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/535.22+ (KHTML, like Gecko) Chromium/17.0.963.56 Chrome/17.0.963.56 Safari/535.22+ Debian/7.0 (3.4.2-2.1) Epiphany/3.4.2 + os: + name: Debian + short_name: DEB + version: 7.0 + browser: + name: Epiphany + short_name: EP + version: 3.4 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; zh-cn; ZTE U817 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Mobile Safari/534.30 baidubrowser/4.0.7.10 (Baidu; P1 4.0.4) + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Baidu Browser + short_name: BD + version: 4.0 + device: + type: smartphone + brand: ZT + model: U817 + os_family: Android + browser_family: Unknown +- + user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows Phone 8.0; Trident/6.0; IEMobile/10.0; ARM; Touch; HUAWEI; W2-U00) + os: + name: Windows Phone + short_name: WPH + version: 8.0 + browser: + name: IE Mobile + short_name: IM + version: 10.0 + device: + type: smartphone + brand: HU + model: W2-U00 + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:10.0.12) Gecko/20130823 Firefox/10.0.11esrpre Iceape/2.7.12 + os: + name: Linux + short_name: LIN + version: + browser: + name: Iceape + short_name: IA + version: 2.7 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.1.24pre) Gecko/20100228 K-Meleon/1.5.4 + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: K-meleon + short_name: KM + version: 1.5 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; en-US; rv:1.9.2.13) Gecko/20110504 Namoroka/3.6.13 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Firefox + short_name: FF + version: Namoroka (3.6) + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; Arch Linux i686; rv:2.0) Gecko/20110321 Firefox/4.0 + os: + name: Arch Linux + short_name: ARL + version: + browser: + name: Firefox + short_name: FF + version: 4.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; es-ES; rv:2.0) Gecko/20100101 Linux Mint 16/Petra Firefox/25.0.1. + os: + name: Mint + short_name: MIN + version: + browser: + name: Firefox + short_name: FF + version: 25.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.452) Gecko/20041027 Mnenhy/0.6.0.104 + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux x86_64) KHTML/4.11.4 (like Gecko) Konqueror/4.11 Fedora/4.11.4-1.fc19 + os: + name: Fedora + short_name: FED + version: 4.11 + browser: + name: Konqueror + short_name: KO + version: 4.11 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Konqueror +- + user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.7) Gecko/2009031915 Gentoo Firefox/3.0.7 + os: + name: Gentoo + short_name: GNT + version: + browser: + name: Firefox + short_name: FF + version: 3.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: ELinks/0.12~pre6-1ubuntu1 (textmode; Ubuntu; Linux 3.11.0-13-generic i686; 100x25-2) + os: + name: Ubuntu + short_name: UBT + version: + browser: + name: Elinks + short_name: EL + version: 0.12 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.2 x64; en-US; rv:1.9a1) Gecko/20061007 Minefield/3.0a1 + os: + name: Windows Server 2003 + short_name: WS3 + version: Server 2003 + browser: + name: Firefox + short_name: FF + version: Minefield (3.0) + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; zh-TW; rv:1.9.1b4pre) Gecko/20090308 Shiretoko/3.1b4pre (.NET CLR 3.5.30729) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Firefox + short_name: FF + version: Shiretoko (3.1) + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.9.0.2pre) Gecko/2008071405 GranParadiso/3.0.2pre + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Firefox + short_name: FF + version: GranParadiso (3.0) + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows; N; Windows NT 5.2; ru-RU) AppleWebKit/529 (KHTML, like Gecko, Safari/529.0) Lunascape/4.9.9.94 + os: + name: Windows Server 2003 + short_name: WS3 + version: Server 2003 + browser: + name: Lunascape + short_name: LS + version: 4.9 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.1.8) Gecko/20100215 Solaris/10.1 (GNU) Superswan/3.5.8 (Byte/me) + os: + name: Solaris + short_name: SOS + version: 10.1 + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Unknown +- + user_agent: 'Mozilla/4.79 [en] (X11; U; SunOS 5.10 i86pc)' + os: + name: Solaris + short_name: SOS + version: 5.10 + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; U; Linux i686 (x86_64); en-US; rv:1.9.0.6) Gecko/2009020414 CentOS/3.0.6-1.el5.centos Firefox/3.0.6 + os: + name: CentOS + short_name: CES + version: 3.0 + browser: + name: Firefox + short_name: FF + version: 3.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1.8) Gecko/20071019 Fedora/2.0.0.8-1.fc7 Firefox/2.0.0.8 + os: + name: Fedora + short_name: FED + version: 2.0 + browser: + name: Firefox + short_name: FF + version: 2.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Maemo; Linux; U; Jolla; Sailfish; Mobile; rv:26.0) Gecko/26.0 Firefox/26.0 SailfishBrowser/1.0 like Safari/538.1 + os: + name: Sailfish OS + short_name: SAF + version: + browser: + name: Sailfish Browser + short_name: SA + version: 1.0 + device: + type: smartphone + brand: JO + model: + os_family: Linux + browser_family: Sailfish Browser +- + user_agent: Mozilla/5.0 (compatible; IBrowse 3.0; AmigaOS4.0) + os: + name: AmigaOS + short_name: AMG + version: 4.0 + browser: + name: IBrowse + short_name: IB + version: 3.0 + device: + type: desktop + brand: + model: + os_family: AmigaOS + browser_family: Unknown +- + user_agent: IBrowse/2.4 (AmigaOS 3.9; 68K) + os: + name: AmigaOS + short_name: AMG + version: 3.9 + browser: + name: IBrowse + short_name: IB + version: 2.4 + device: + type: desktop + brand: + model: + os_family: AmigaOS + browser_family: Unknown +- + user_agent: Mozilla/5.0 (compatible; Konqueror/3.5; Linux) KHTML/3.5.5 (like Gecko) (Kubuntu) + os: + name: Kubuntu + short_name: KBT + version: + browser: + name: Konqueror + short_name: KO + version: 3.5 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Konqueror +- + user_agent: Mozilla/5.0 (X11; U; Linux x86_64; en-US; rv:1.9.0.1) Gecko/2008072820 Kubuntu/8.04 (hardy) Firefox/3.0.1 + os: + name: Kubuntu + short_name: KBT + version: 8.04 + browser: + name: Firefox + short_name: FF + version: 3.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.2.17) Gecko/20110429 Mandriva Linux/1.9.2.17-0.1mdv2010.0 (2010.0) Firefox/3.6.17 + os: + name: Mandriva + short_name: MDR + version: 1.9 + browser: + name: Firefox + short_name: FF + version: 3.6 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.1.2) Gecko/20090729 Slackware/13.0 Firefox/3.5.2 + os: + name: Slackware + short_name: SLW + version: 13.0 + browser: + name: Firefox + short_name: FF + version: 3.5 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Opera/9.80 (Windows NT 6.1; WOW64) Presto/2.12.388 Version/12.16 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Opera + short_name: OP + version: 12.16 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Opera +- + user_agent: Mozilla/5.0 (Linux; U; Android 2.3 YunOs 1.0.0.3; zh-cn; K-Touch W658 Build/AliyunOs-2012) AppleWebKit/533.1 (KHTML, like Gecko) Version/4.0 Mobile Safari/533.1 + os: + name: Android + short_name: AND + version: 2.3 + browser: + name: Android Browser + short_name: AN + version: + device: + type: smartphone + brand: KT + model: W658 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; Trident/5.0; XBLWP7; ZuneWP7) + os: + name: Windows Phone + short_name: WPH + version: + browser: + name: IE Mobile + short_name: IM + version: 9.0 + device: + type: + brand: + model: + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Opera/9.80 (Windows Mobile; WCE; Opera Mobi/WMD-50433; U; en) Presto/2.4.13 Version/10.00 + os: + name: Windows Mobile + short_name: WMO + version: + browser: + name: Opera Mobile + short_name: OM + version: 10.00 + device: + type: + brand: + model: + os_family: Windows Mobile + browser_family: Opera +- + user_agent: Mozilla/5.0 (compatible; MSIE 10.0; Windows NT 6.2; ARM; Trident/6.0; Touch; MALNJS) + os: + name: Windows RT + short_name: WRT + version: + browser: + name: Internet Explorer + short_name: IE + version: 10.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (compatible; Konqueror/3.4; CYGWIN_NT-5.1) KHTML/3.4.89 (like Gecko) + os: + name: Windows XP + short_name: WXP + version: XP + browser: + name: Konqueror + short_name: KO + version: 3.4 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Konqueror +- + user_agent: Mozilla/5.0 (X11; CrOS x86_64 4731.101.0) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/31.0.1650.67 Safari/537.36 + os: + name: Chrome OS + short_name: COS + version: 4731.101 + browser: + name: Chrome + short_name: CH + version: 31.0 + device: + type: + brand: + model: + os_family: Chrome OS + browser_family: Chrome +- + user_agent: Mozilla/3.0 (compatible; NetPositive/2.2.1; BeOS) + os: + name: BeOS + short_name: BEO + version: + browser: + name: NetPositive + short_name: NP + version: 2.2 + device: + type: desktop + brand: + model: + os_family: BeOS + browser_family: Unknown +- + user_agent: SonyEricssonU1i/R1CA; Mozilla/5.0 (SymbianOS/9.4; U; Series60/5.0 Profile/MIDP-2.1 Configuration/CLDC-1.1) AppleWebKit/525 (KHTML, like Gecko) Version/3.0 Safari/525 + os: + name: Symbian OS Series 60 + short_name: S60 + version: 5.0 + browser: + name: Nokia Browser + short_name: NB + version: 7.0 + device: + type: smartphone + brand: SE + model: U1i + os_family: Symbian + browser_family: Nokia Browser +- + user_agent: Mozilla/5.0 (Series40; Nokia306/03.63; Profile/MIDP-2.1 Configuration/CLDC-1.1) Gecko/20100401 S40OviBrowser/3.9.0.0.22 + os: + name: Symbian OS Series 40 + short_name: S40 + version: + browser: + name: Nokia Ovi Browser + short_name: NV + version: 3.9 + device: + type: smartphone + brand: NK + model: 306 + os_family: Symbian + browser_family: Nokia Browser +- + user_agent: Mozilla/5.0 (Symbian/3; Series60/5.2 NokiaN8-00/014.002; Profile/MIDP-2.1 Configuration/CLDC-1.1; en-us) AppleWebKit/525 (KHTML, like Gecko) Version/3.0 BrowserNG/7.2.6.4 3gpp-gba + os: + name: Symbian OS Series 60 + short_name: S60 + version: 5.2 + browser: + name: Nokia Browser + short_name: NB + version: 7.2 + device: + type: smartphone + brand: NK + model: N8 + os_family: Symbian + browser_family: Nokia Browser +- + user_agent: Mozilla/5.0 (MeeGo; NokiaN9) AppleWebKit/534.13 (KHTML, like Gecko) NokiaBrowser/8.5.0 Mobile Safari/534.13 + os: + name: MeeGo + short_name: SMG + version: + browser: + name: Nokia Browser + short_name: NB + version: 8.5 + device: + type: smartphone + brand: NK + model: N9 + os_family: Other Mobile + browser_family: Nokia Browser +- + user_agent: Mozilla/5.0 (Android; Tablet; rv:20.0) Gecko/20.0 Firefox/20.0 + os: + name: Android + short_name: AND + version: + browser: + name: Firefox + short_name: FF + version: 20.0 + device: + type: + brand: + model: + os_family: Android + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Android; Mobile; rv:22.0) Gecko/22.0 Firefox/22.0 + os: + name: Android + short_name: AND + version: + browser: + name: Firefox + short_name: FF + version: 22.0 + device: + type: + brand: + model: + os_family: Android + browser_family: Firefox +- + user_agent: 'BREW-Applet/0x20068888 (BREW/3.1.5.20; DeviceId: 90086; Lang: zhcn) ucweb-squid' + os: + name: Brew + short_name: BMP + version: 3.1 + browser: + name: UC Browser + short_name: UC + version: + device: + type: + brand: + model: + os_family: Brew + browser_family: Unknown +- + user_agent: NetFront/4.2 (BMP 1.0.4; U; en-us; LG; NetFront/4.2/AMB) Boost LG272 MMP/2.0 Profile/MIDP-2.1 Configuration/CLDC-1.1 + os: + name: Brew + short_name: BMP + version: 1.0 + browser: + name: NetFront + short_name: NF + version: 4.2 + device: + type: smartphone + brand: LG + model: 272 + os_family: Brew + browser_family: NetFront +- + user_agent: Mozilla/5.0 (X11; Linux i686) AppleWebKit/534.24 (KHTML, like Gecko) Chrome/11.0.696.77 Large Screen Safari/534.24 GoogleTV/092754 + os: + name: Google TV + short_name: GTV + version: + browser: + name: Chrome + short_name: CH + version: 11.0 + device: + type: tv + brand: GO + model: GoogleTV + os_family: Google TV + browser_family: Chrome +- + user_agent: XBMC/PRE-11.0 Git:20110623-62171b3 (iOS; 11.0.0 AppleTV2,1; http://www.xbmc.org) + os: + name: Apple TV + short_name: ATV + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: tv + brand: AP + model: Apple TV + os_family: Apple TV + browser_family: Unknown +- + user_agent: Mozilla/3.0 WebTV/1.2 (compatible; MSIE 2.0) + os: + name: WebTV + short_name: WTV + version: 1.2 + browser: + name: Internet Explorer + short_name: IE + version: 2.0 + device: + type: tv + brand: WB + model: + os_family: WebTV + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (X11; U; NetBSD amd64; fr-FR; rv:1.8.0.7) Gecko/20061102 Firefox/1.5.0.7 + os: + name: NetBSD + short_name: NBS + version: + browser: + name: Firefox + short_name: FF + version: 1.5 + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; OpenBSD amd64; rv:26.0) Gecko/20100101 Firefox/26.0 + os: + name: OpenBSD + short_name: OBS + version: + browser: + name: Firefox + short_name: FF + version: 26.0 + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Firefox +- + user_agent: Mozilla/5.0 (compatible; U; ABrowse 0.6; Syllable) AppleWebKit/420+ (KHTML, like Gecko) + os: + name: Syllable + short_name: SYL + version: + browser: + name: ABrowse + short_name: AB + version: 0.6 + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Unknown +- + user_agent: 'Mozilla/4.04 [en] (X11; I; IRIX 5.3 IP22)' + os: + name: IRIX + short_name: IRI + version: 5.3 + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Unknown +- + user_agent: 'Mozilla/4.75C-ja [ja] (X11; U; OSF1 V5.1 alpha)' + os: + name: OSF1 + short_name: T64 + version: + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Unknown +- + user_agent: Opera/9.30 (Nintendo Wii; U; ; 3642; en) + os: + name: Nintendo + short_name: WII + version: Wii + browser: + name: Opera + short_name: OP + version: 9.30 + device: + type: console + brand: NI + model: Wii + os_family: Gaming Console + browser_family: Opera +- + user_agent: Mozilla/5.0 (PlayStation Vita 3.01) AppleWebKit/536.26 (KHTML, like Gecko) Silk/3.2 + os: + name: PlayStation Portable + short_name: PSP + version: Vita + browser: + name: Mobile Silk + short_name: MS + version: 3.2 + device: + type: console + brand: SO + model: PlayStation Vita + os_family: Mobile Gaming Console + browser_family: Unknown +- + user_agent: Mozilla/5.0 (OS/2; Warp 4.5; rv:10.0.12) Gecko/20100101 Firefox/10.0.12 + os: + name: OS/2 + short_name: OS2 + version: + browser: + name: Firefox + short_name: FF + version: 10.0 + device: + type: desktop + brand: + model: + os_family: IBM + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Macintosh; U; Intel Mac OS X 10.6; en; rv:1.9.2.28) Gecko/20120308 Camino/2.1.2 (like Firefox/3.6.28) + os: + name: Mac + short_name: MAC + version: 10.6 + browser: + name: Camino + short_name: CA + version: 2.1 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Android; Linux armv7l; rv:10.0) Gecko/20120118 Firefox/10.0 Fennec/10.0 + os: + name: Android + short_name: AND + version: + browser: + name: Fennec + short_name: FE + version: 10.0 + device: + type: + brand: + model: + os_family: Android + browser_family: Firefox +- + user_agent: Mozilla/5.0 (Windows; U; Windows NT 6.1; pl; rv:1.9.0.16) Gecko/2010021013 Firefox/3.0.16 Flock/2.5.6 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Flock + short_name: FL + version: 2.5 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows NT 6.1) AppleWebKit/535.7 (KHTML, like Gecko) RockMelt/0.16.91.483 Chrome/16.0.912.77 Safari/535.7 + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: RockMelt + short_name: RM + version: 0.16 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/5.0 (X11; U; Linux 2.4.2-2 i586; en-US; m18) Gecko/20010131 Netscape6/6.01 + os: + name: Linux + short_name: LIN + version: + browser: + name: Netscape + short_name: NS + version: 6.01 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.8.1) Gecko/20061024 Firefox/2.0 (Swiftfox) + os: + name: Linux + short_name: LIN + version: + browser: + name: Swiftfox + short_name: SX + version: 2.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.21 (KHTML, like Gecko) rekonq/2.3.2 Safari/537.21 + os: + name: Linux + short_name: LIN + version: + browser: + name: Rekonq + short_name: RK + version: 2.3 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; Linux x86_64; rv:25.0) Gecko/20100101 conkeror/1.0pre + os: + name: Linux + short_name: LIN + version: + browser: + name: Conkeror + short_name: CK + version: 1.0 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (iPad; CPU OS 7_0 like Mac OS X) AppleWebKit/537.51.1 (KHTML, like Gecko) CriOS/32.0.1700.20 Mobile/11A465 Safari/9537.53 + os: + name: iOS + short_name: IOS + version: 7.0 + browser: + name: Chrome Mobile iOS + short_name: CI + version: 32.0 + device: + type: tablet + brand: AP + model: iPad + os_family: iOS + browser_family: Chrome +- + user_agent: Mozilla/5.0 (compatible; MSIE 9.0; Windows NT 6.1; WOW64; Trident/5.0; chromeframe/19.0.1084.52) + os: + name: Windows 7 + short_name: WI7 + version: 7 + browser: + name: Chrome Frame + short_name: CF + version: 19.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Chrome +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows 98; PalmSource/Palm-D050; Blazer/4.3) 16;320x320 + os: + name: palmOS + short_name: POS + version: + browser: + name: Palm Blazer + short_name: PL + version: 4.3 + device: + type: smartphone + brand: PM + model: D050 + os_family: Other Mobile + browser_family: Unknown +- + user_agent: SAMSUNG-GT-S5230/S523MXEIL2 SHP/VPP/R5 Jasmine/1.0 Nextreaming SMM-MMS/1.2.0 profile/MIDP-2.1 configuration/CLDC-1.1 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Jasmine + short_name: JS + version: 1.0 + device: + type: smartphone + brand: SA + model: GT-S5230 + os_family: Unknown + browser_family: Unknown +- + user_agent: Lynx/2.8.8pre.3 libwww-FM/2.14 SSL-MM/1.4.1 OpenSSL/1.0.1e + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Lynx + short_name: LX + version: 2.8 + device: + type: + brand: + model: + os_family: Unknown + browser_family: Unknown +- + user_agent: NCSA_Mosaic/2.7b5 (X11;Linux 2.6.7 i686) libwww/2.12 modified + os: + name: Linux + short_name: LIN + version: + browser: + name: NCSA Mosaic + short_name: MC + version: 2.7 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: amaya/9.51 libwww/5.4.0 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Amaya + short_name: AM + version: 9.51 + device: + type: + brand: + model: + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows; U; Win9x; en; Stable) Gecko/20020911 Beonex/0.8.1-stable + os: + name: Windows + short_name: WIN + version: + browser: + name: Beonex + short_name: BE + version: 0.8 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: 'Mozilla/4.61 [en] (X11; U; ) - BrowseX (2.0.0 Windows)' + os: + name: Windows + short_name: WIN + version: + browser: + name: BrowseX + short_name: BX + version: 2.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows NT 6.2; WOW64; rv:11.0) Gecko/20100101 Firefox/11.0 CometBird/11.0 + os: + name: Windows 8 + short_name: WI8 + version: 8 + browser: + name: CometBird + short_name: CO + version: 11.0 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Unknown +- + user_agent: Dillo/0.8.5-i18n-misc + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Dillo + short_name: DI + version: 0.8 + device: + type: + brand: + model: + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Windows; U; Win95; en-US; rv:1.5) Gecko/20031007 Firebird/0.7 + os: + name: Windows 95 + short_name: W95 + version: 95 + browser: + name: Firebird + short_name: FB + version: 0.7 + device: + type: desktop + brand: + model: + os_family: Windows + browser_family: Firefox +- + user_agent: Mozilla/5.0 (X11; U; FreeBSD i386; en-US; rv:1.7.12) Gecko/20051105 Galeon/1.3.21 + os: + name: FreeBSD + short_name: BSD + version: + browser: + name: Galeon + short_name: GA + version: 1.3 + device: + type: desktop + brand: + model: + os_family: Unix + browser_family: Unknown +- + user_agent: Mozilla/5.0 (Macintosh; U; PPC Mac OS X 10_5_8; en-us) AppleWebKit/533.19.4 (KHTML, like Gecko) iCab/4.8 Safari/533.16 + os: + name: Mac + short_name: MAC + version: 10.5 + browser: + name: iCab + short_name: IC + version: 4.8 + device: + type: desktop + brand: + model: + os_family: Mac + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.9.0.8) Gecko Fedora/1.9.0.8-1.fc10 Kazehakase/0.5.6 + os: + name: Fedora + short_name: FED + version: 1.9 + browser: + name: Kazehakase + short_name: KZ + version: 0.5 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Links (2.1pre23; Linux 3.5.0 i686; 237x63) + os: + name: Linux + short_name: LIN + version: + browser: + name: Links + short_name: LI + version: 2.1 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Unknown +- + user_agent: Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.2b) Gecko/20021029 Phoenix/0.4 + os: + name: Linux + short_name: LIN + version: + browser: + name: Phoenix + short_name: PX + version: 0.4 + device: + type: desktop + brand: + model: + os_family: Linux + browser_family: Firefox +- + user_agent: HUAWEI-M636/001.00 WAP/OBIGO/Q05A + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: Obigo + short_name: OB + version: Q05A + device: + type: smartphone + brand: HU + model: M636 + os_family: Unknown + browser_family: Unknown +- + user_agent: Tiphone T67/1.0 Browser/wap2.0 Sync/SyncClient1.1 Profile/MIDP-2.0 Configuration/CLDC-1.1 + os: + name: UNK + short_name: UNK + version: UNK + browser: + name: UNK + short_name: UNK + version: UNK + device: + type: smartphone + brand: TH + model: T67 + os_family: Unknown + browser_family: Unknown +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.O; windows CE; IEMobile 8.12; MSIEMobile 6.0) acer_S200 + os: + name: Windows CE + short_name: WCE + version: + browser: + name: IE Mobile + short_name: IM + version: 8.12 + device: + type: smartphone + brand: AC + model: S200 + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/4.0 (compatible; MSIE 6.0; Windows CE; IEMobile 8.12; MSIEMobile 6.0) Acer_P400 1.023h.00 + os: + name: Windows CE + short_name: WCE + version: + browser: + name: IE Mobile + short_name: IM + version: 8.12 + device: + type: smartphone + brand: AC + model: P400 + os_family: Windows Mobile + browser_family: Internet Explorer +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.0.4; ar-eg; A210 Build/IMM76D) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.0 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: AC + model: Icona Tab A210 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 4.1.1; fr-ca; A700 Build/JRO03H) AppleWebKit/534.30 (KHTML, like Gecko) Version/4.0 Safari/534.30 + os: + name: Android + short_name: AND + version: 4.1 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: AC + model: Icona Tab A700 + os_family: Android + browser_family: Android Browser +- + user_agent: Mozilla/5.0 (Linux; U; Android 3.2.1; th-th; A101 Build/HTK55D) AppleWebKit/534.13 (KHTML, like Gecko) Version/4.0 Safari/534.13 + os: + name: Android + short_name: AND + version: 3.2 + browser: + name: Android Browser + short_name: AN + version: + device: + type: tablet + brand: AC + model: Icona Tab A101 + os_family: Android + browser_family: Android Browser diff --git a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php index 012849f422..2229f8f787 100755 --- a/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php +++ b/tests/PHPUnit/Integration/EcommerceOrderWithItemsTest.php @@ -55,6 +55,7 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase ); // Normal standard goal + $apiWithSegments_visitConvertedGoal = $apiWithSegments + array('Goals.get', 'VisitsSummary.get'); return array_merge(array( // Segment: This will match the first visit of the fixture only @@ -181,6 +182,23 @@ class Test_Piwik_Integration_EcommerceOrderWithItems extends IntegrationTestCase 'periods' => array('week'), 'segment' => 'visitorType==returningCustomer', 'testSuffix' => '_SegmentReturningCustomers')), + // test segment visitConvertedGoalId with Ecommerce APIs + array($apiWithSegments_visitConvertedGoal, + array( + 'idSite' => $idSite, + 'date' => $dateTime, + 'periods' => array('day'), + 'segment' => 'visitConvertedGoalId==1;visitConvertedGoalId!=2', + 'testSuffix' => '_SegmentVisitHasConvertedGoal')), + + array($apiWithSegments_visitConvertedGoal, + array( + 'idSite' => $idSite, + 'date' => $dateTime, + 'periods' => array('day'), + 'segment' => 'visitConvertedGoalId==666', + 'testSuffix' => '_SegmentNoVisit_HaveConvertedNonExistingGoal')), + // test segment pageTitle array('VisitsSummary.get', array('idSite' => $idSite, 'date' => $dateTime, 'periods' => array('day'), 'segment' => 'pageTitle==incredible title!', diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 1e6d277342..02cf281992 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -86,7 +86,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -241,7 +241,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -365,7 +365,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -503,7 +503,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -627,7 +627,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -782,7 +782,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -906,7 +906,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1044,7 +1044,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1168,7 +1168,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1323,7 +1323,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1447,7 +1447,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1585,7 +1585,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1723,7 +1723,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1847,7 +1847,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1971,7 +1971,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2126,7 +2126,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2281,7 +2281,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2405,7 +2405,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2529,7 +2529,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2667,7 +2667,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2805,7 +2805,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -2943,7 +2943,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3081,7 +3081,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3205,7 +3205,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3329,7 +3329,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3453,7 +3453,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3577,7 +3577,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3732,7 +3732,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -3887,7 +3887,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4042,7 +4042,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4197,7 +4197,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4321,7 +4321,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4445,7 +4445,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4569,7 +4569,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -4693,7 +4693,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> diff --git a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml index 023c423ace..77680004e3 100644 --- a/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml +++ b/tests/PHPUnit/Integration/expected/test_AutoSuggestAPITest_deviceType__API.getSuggestedValuesForSegment.xml @@ -1,4 +1,4 @@ <?xml version="1.0" encoding="utf-8" ?> <result> - <row>desktop</row> -</result>
\ No newline at end of file + <row>Desktop</row> +</result> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index d908655737..f2f70d3518 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -136,7 +136,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -462,7 +462,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -618,7 +618,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -940,7 +940,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -956,4 +956,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index d908655737..f2f70d3518 100644 --- a/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -136,7 +136,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -462,7 +462,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -618,7 +618,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -940,7 +940,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>director</plugins> @@ -956,4 +956,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml index 5285329934..445c00fe4a 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getBrowserVersions_month.xml @@ -9,7 +9,7 @@ <bounce_count>5</bounce_count> <nb_visits_converted>5</nb_visits_converted> <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/browsers/UNK.gif</logo> + <logo>plugins/UserSettings/images/browsers/EP.gif</logo> </row> <row> <label>Internet Explorer 9.0</label> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml index 9c860ec825..b9768f857f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsFamilies_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Linux</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</nb_visits_converted> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> @@ -34,17 +34,6 @@ <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> - </row> - <row> <label>Android</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -55,4 +44,26 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> + <row> + <label>Bot</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> + </row> + <row> + <label>Unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml index f0f2c3f196..088b8ed0af 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__DevicesDetection.getOsVersions_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Linux</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</nb_visits_converted> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> @@ -20,7 +20,7 @@ <bounce_count>7</bounce_count> <nb_visits_converted>7</nb_visits_converted> <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/WI8.gif</logo> + <logo>plugins/UserSettings/images/os/WI7.gif</logo> </row> <row> <label>Mac 10.6</label> @@ -45,26 +45,26 @@ <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> - <label>Unknown</label> + <label>Windows XP</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> <row> - <label>Windows XP</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Bot</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/WI8.gif</logo> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> <row> <label>Mac 10.8</label> @@ -84,7 +84,7 @@ <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml index aceff791de..e02a1136d9 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getConfiguration_month.xml @@ -1,6 +1,16 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> + <label>Linux / Epiphany / unknown</label> + <nb_visits>5</nb_visits> + <nb_actions>5</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>5</bounce_count> + <nb_visits_converted>5</nb_visits_converted> + <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> + </row> + <row> <label>Mac OS / RockMelt / unknown</label> <nb_visits>5</nb_visits> <nb_actions>8</nb_actions> @@ -21,16 +31,6 @@ <sum_daily_nb_uniq_visitors>5</sum_daily_nb_uniq_visitors> </row> <row> - <label>Linux / Epiphany / unknown</label> - <nb_visits>4</nb_visits> - <nb_actions>4</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>4</bounce_count> - <nb_visits_converted>4</nb_visits_converted> - <sum_daily_nb_uniq_visitors>4</sum_daily_nb_uniq_visitors> - </row> - <row> <label>Android / Android Browser / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -51,24 +51,24 @@ <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>Unknown / Unknown / unknown</label> + <label>Windows 7 / Chrome / unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <nb_visits_converted>2</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> </row> <row> - <label>Windows 7 / Chrome / unknown</label> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> + <label>Bot / Unknown / unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> <label>Linux / Chrome / unknown</label> @@ -91,13 +91,13 @@ <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> - <label>Unknown / Epiphany / unknown</label> + <label>Unknown / Unknown / unknown</label> <nb_visits>1</nb_visits> <nb_actions>1</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>1</bounce_count> - <nb_visits_converted>1</nb_visits_converted> + <nb_visits_converted>0</nb_visits_converted> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> </row> <row> diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml index c6f19aed29..ba10c9516f 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getMobileVsDesktop_month.xml @@ -2,35 +2,35 @@ <result> <row> <label>Desktop</label> - <nb_visits>22</nb_visits> - <nb_actions>25</nb_actions> + <nb_visits>23</nb_visits> + <nb_actions>26</nb_actions> <max_actions>3</max_actions> <sum_visit_length>305</sum_visit_length> - <bounce_count>20</bounce_count> - <nb_visits_converted>21</nb_visits_converted> - <sum_daily_nb_uniq_visitors>22</sum_daily_nb_uniq_visitors> + <bounce_count>21</bounce_count> + <nb_visits_converted>22</nb_visits_converted> + <sum_daily_nb_uniq_visitors>23</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/screens/normal.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> + <label>Mobile</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/screens/mobile.gif</logo> </row> <row> - <label>Mobile</label> + <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/screens/mobile.gif</logo> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml index 66c8dbd1d4..17ff53a386 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOSFamily_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Linux</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</nb_visits_converted> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/LIN.gif</logo> </row> <row> @@ -34,25 +34,25 @@ <logo>plugins/UserSettings/images/os/MAC.gif</logo> </row> <row> - <label>Unknown</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> + <label>Android</label> + <nb_visits>2</nb_visits> + <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> + <bounce_count>2</bounce_count> <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/os/AND.gif</logo> </row> <row> - <label>Android</label> + <label>Unknown</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> <bounce_count>2</bounce_count> - <nb_visits_converted>2</nb_visits_converted> + <nb_visits_converted>1</nb_visits_converted> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/AND.gif</logo> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml index d51312b003..108d617d79 100644 --- a/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ImportLogs__UserSettings.getOS_month.xml @@ -2,13 +2,13 @@ <result> <row> <label>Linux</label> - <nb_visits>7</nb_visits> - <nb_actions>7</nb_actions> + <nb_visits>8</nb_visits> + <nb_actions>8</nb_actions> <max_actions>1</max_actions> <sum_visit_length>0</sum_visit_length> - <bounce_count>7</bounce_count> - <nb_visits_converted>7</nb_visits_converted> - <sum_daily_nb_uniq_visitors>7</sum_daily_nb_uniq_visitors> + <bounce_count>8</bounce_count> + <nb_visits_converted>8</nb_visits_converted> + <sum_daily_nb_uniq_visitors>8</sum_daily_nb_uniq_visitors> <logo>plugins/UserSettings/images/os/LIN.gif</logo> <shortLabel>Linux</shortLabel> </row> @@ -37,18 +37,6 @@ <shortLabel>Mac OS</shortLabel> </row> <row> - <label>Unknown</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <max_actions>1</max_actions> - <sum_visit_length>0</sum_visit_length> - <bounce_count>3</bounce_count> - <nb_visits_converted>2</nb_visits_converted> - <sum_daily_nb_uniq_visitors>3</sum_daily_nb_uniq_visitors> - <logo>plugins/UserSettings/images/os/UNK.gif</logo> - <shortLabel>Unknown</shortLabel> - </row> - <row> <label>Android</label> <nb_visits>2</nb_visits> <nb_actions>2</nb_actions> @@ -72,4 +60,28 @@ <logo>plugins/UserSettings/images/os/WXP.gif</logo> <shortLabel>Win XP</shortLabel> </row> + <row> + <label>Bot</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>1</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <shortLabel>BOT</shortLabel> + </row> + <row> + <label>Unknown</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <max_actions>1</max_actions> + <sum_visit_length>0</sum_visit_length> + <bounce_count>1</bounce_count> + <nb_visits_converted>0</nb_visits_converted> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <logo>plugins/UserSettings/images/os/UNK.gif</logo> + <shortLabel>Unknown</shortLabel> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 01e588217f..64c82e2958 100644 --- a/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -86,7 +86,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -241,7 +241,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -365,7 +365,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -503,7 +503,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -627,7 +627,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -782,7 +782,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -906,7 +906,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1044,7 +1044,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1168,7 +1168,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1323,7 +1323,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -1343,4 +1343,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml index ba7a99fbc6..4e417535ae 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits__DevicesDetection.getOsVersions_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/UserSettings/images/os/WI8.gif</logo> + <logo>plugins/UserSettings/images/os/WXP.gif</logo> </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 52f254bd9a..d744f666ae 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -87,7 +87,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -274,7 +274,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -294,4 +294,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index 7774406a90..916b19b275 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -65,9 +65,9 @@ <referrerUrl>http://www.google.com.vn/search?q=%3C%3E%26%5C%22the+pdo+extension+is+required+for+this+adapter+but+the+extension+is+not+loaded</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Inconnu</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> + <operatingSystem>Bot</operatingSystem> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemShortName>BOT</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Inconnu</browserFamilyDescription> @@ -76,7 +76,7 @@ <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Bureau</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -171,9 +171,9 @@ <referrerUrl>http://piwik.org/faq/general/#faq_144</referrerUrl> <referrerSearchEngineUrl>http://google.com</referrerSearchEngineUrl> <referrerSearchEngineIcon>plugins/Referrers/images/searchEngines/google.com.png</referrerSearchEngineIcon> - <operatingSystem>Inconnu</operatingSystem> - <operatingSystemCode>UNK</operatingSystemCode> - <operatingSystemShortName>Unknown</operatingSystemShortName> + <operatingSystem>Bot</operatingSystem> + <operatingSystemCode>BOT</operatingSystemCode> + <operatingSystemShortName>BOT</operatingSystemShortName> <operatingSystemIcon>plugins/UserSettings/images/os/UNK.gif</operatingSystemIcon> <browserFamily>unknown</browserFamily> <browserFamilyDescription>Inconnu</browserFamilyDescription> @@ -182,7 +182,7 @@ <browserCode>UNK</browserCode> <browserVersion>UNK</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Bureau</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> diff --git a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 0d5ad46378..fdd53bda99 100644 --- a/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/Integration/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -75,7 +75,7 @@ <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> @@ -161,7 +161,7 @@ <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> @@ -247,7 +247,7 @@ <browserCode>IE</browserCode> <browserVersion>7.0</browserVersion> <screenType>unknown</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>unknown</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/unknown.gif</screenTypeIcon> <plugins /> @@ -258,4 +258,4 @@ <serverDatePrettyFirstAction>Fri 5 Apr</serverDatePrettyFirstAction> <serverTimePrettyFirstAction>12:00:00</serverTimePrettyFirstAction> </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index 50eca34747..78efa09423 100644 --- a/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -76,7 +76,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -96,4 +96,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index d3072a9be6..528b0ef2ba 100644 --- a/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/Integration/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -3908,7 +3908,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI8.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml index 713b99e0ae..5e297a6f76 100644 --- a/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml +++ b/tests/PHPUnit/Integration/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml @@ -126,7 +126,7 @@ <category>Visit</category> <name>Device type</name> <segment>deviceType</segment> - <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser</acceptedValues> + <acceptedValues>desktop, smartphone, tablet, feature phone, console, tv, car browser, smart display</acceptedValues> </row> <row> <type>dimension</type> diff --git a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv Binary files differindex 6ee56983f5..6af19fd92d 100644 --- a/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv +++ b/tests/PHPUnit/Integration/expected/test_csvExport__Live.getLastVisitsDetails_day.csv diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index a3abdedd7a..6fe4f4e297 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -114,7 +114,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -324,7 +324,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -344,4 +344,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml index b19e7a1adf..02187588c4 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_day.xml @@ -3,27 +3,9 @@ <row> <label>Electronics & Cameras</label> <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <avg_price>814.37</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Product Category not defined</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <avg_price>710.4</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Category TWO LEFT in cart</label> - <nb_uniq_visitors>1</nb_uniq_visitors> <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <avg_price>0</avg_price> + <nb_actions>3</nb_actions> + <avg_price>888.56</avg_price> <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> @@ -63,4 +45,13 @@ <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> + <row> + <label>Product Category not defined</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <avg_price>888</avg_price> + <avg_quantity>0</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml index 8e6ff0cef1..19944203ad 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsCategory_week.xml @@ -1,29 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>Product Category not defined</label> - <nb_visits>4</nb_visits> - <nb_actions>7</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>1376.4</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> <label>Electronics & Cameras</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>814.37</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Category TWO LEFT in cart</label> - <nb_visits>3</nb_visits> + <nb_visits>2</nb_visits> <nb_actions>3</nb_actions> <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> + <avg_price>888.56</avg_price> <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> @@ -63,4 +45,13 @@ <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> + <row> + <label>Product Category not defined</label> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_price>888</avg_price> + <avg_quantity>0</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> </result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml index 693feff49a..bf093d7b73 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_day.xml @@ -3,27 +3,9 @@ <row> <label>PRODUCT name</label> <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>5</nb_actions> - <avg_price>832.78</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT THREE LEFT in cart</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> + <nb_visits>1</nb_visits> <nb_actions>4</nb_actions> - <avg_price>666</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT TWO LEFT in cart</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <avg_price>0</avg_price> + <avg_price>888.37</avg_price> <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml index c29832aa42..1adac8c4ec 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsName_week.xml @@ -1,29 +1,11 @@ <?xml version="1.0" encoding="utf-8" ?> <result> <row> - <label>PRODUCT THREE LEFT in cart</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>1332</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> <label>PRODUCT name</label> - <nb_visits>2</nb_visits> - <nb_actions>5</nb_actions> + <nb_visits>1</nb_visits> + <nb_actions>4</nb_actions> <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>832.78</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT TWO LEFT in cart</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> + <avg_price>888.37</avg_price> <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml index 96d90c4713..db5fcd88f4 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_day.xml @@ -3,18 +3,9 @@ <row> <label>SKU VERY nice indeed</label> <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>8</nb_actions> - <avg_price>697.71</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>SKU IN ABANDONED CART TWO</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <avg_price>0</avg_price> + <nb_visits>1</nb_visits> + <nb_actions>3</nb_actions> + <avg_price>777</avg_price> <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml index 5b98174499..6a14444a59 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentCountryIsFr__Goals.getItemsSku_week.xml @@ -2,19 +2,10 @@ <result> <row> <label>SKU VERY nice indeed</label> - <nb_visits>4</nb_visits> - <nb_actions>10</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>1363.71</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>SKU IN ABANDONED CART TWO</label> - <nb_visits>3</nb_visits> + <nb_visits>1</nb_visits> <nb_actions>3</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> + <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> + <avg_price>777</avg_price> <avg_quantity>0</avg_quantity> <conversion_rate>0%</conversion_rate> </row> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml index b19e7a1adf..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_day.xml @@ -1,66 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Electronics & Cameras</label> - <nb_uniq_visitors>2</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <avg_price>814.37</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Product Category not defined</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>5</nb_actions> - <avg_price>710.4</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Category TWO LEFT in cart</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 1</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 2</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 4</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 5</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml index 8e6ff0cef1..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsCategory_week.xml @@ -1,66 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>Product Category not defined</label> - <nb_visits>4</nb_visits> - <nb_actions>7</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>1376.4</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Electronics & Cameras</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>814.37</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Category TWO LEFT in cart</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 1</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 2</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 4</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>Multiple Category 5</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml index 693feff49a..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_day.xml @@ -1,30 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>PRODUCT name</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>5</nb_actions> - <avg_price>832.78</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT THREE LEFT in cart</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>4</nb_actions> - <avg_price>666</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT TWO LEFT in cart</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml index c29832aa42..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsName_week.xml @@ -1,30 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>PRODUCT THREE LEFT in cart</label> - <nb_visits>3</nb_visits> - <nb_actions>6</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>1332</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT name</label> - <nb_visits>2</nb_visits> - <nb_actions>5</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>832.78</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>PRODUCT TWO LEFT in cart</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml index 96d90c4713..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_day.xml @@ -1,30 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>SKU VERY nice indeed</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>3</nb_visits> - <nb_actions>8</nb_actions> - <avg_price>697.71</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>SKU IN ABANDONED CART TWO</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>2</nb_visits> - <nb_actions>2</nb_actions> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>SKU2</label> - <nb_uniq_visitors>1</nb_uniq_visitors> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <avg_price>1111.11</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml index 5b98174499..c234bed59e 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentPageUrlContains__Goals.getItemsSku_week.xml @@ -1,30 +1,2 @@ <?xml version="1.0" encoding="utf-8" ?> -<result> - <row> - <label>SKU VERY nice indeed</label> - <nb_visits>4</nb_visits> - <nb_actions>10</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>1363.71</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>SKU IN ABANDONED CART TWO</label> - <nb_visits>3</nb_visits> - <nb_actions>3</nb_actions> - <sum_daily_nb_uniq_visitors>2</sum_daily_nb_uniq_visitors> - <avg_price>0</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> - <row> - <label>SKU2</label> - <nb_visits>1</nb_visits> - <nb_actions>1</nb_actions> - <sum_daily_nb_uniq_visitors>1</sum_daily_nb_uniq_visitors> - <avg_price>1111.11</avg_price> - <avg_quantity>0</avg_quantity> - <conversion_rate>0%</conversion_rate> - </row> -</result>
\ No newline at end of file +<result />
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml new file mode 100644 index 0000000000..bd9266c196 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsCategory_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>Electronics & Cameras</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <avg_price>1111.11</avg_price> + <avg_quantity>0</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml new file mode 100644 index 0000000000..96520f00d8 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsName_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>PRODUCT name</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <avg_price>1111.11</avg_price> + <avg_quantity>0</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml new file mode 100644 index 0000000000..aedefc8bf5 --- /dev/null +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_SegmentVisitHasConvertedGoal__Goals.getItemsSku_day.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8" ?> +<result> + <row> + <label>SKU2</label> + <nb_uniq_visitors>1</nb_uniq_visitors> + <nb_visits>1</nb_visits> + <nb_actions>1</nb_actions> + <avg_price>1111.11</avg_price> + <avg_quantity>0</avg_quantity> + <conversion_rate>0%</conversion_rate> + </row> +</result>
\ No newline at end of file diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index 1f6609d5e4..019ec60ef1 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -190,7 +190,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -519,7 +519,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -734,7 +734,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>normal</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1024x768</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/normal.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -754,4 +754,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html index cf39a5cbaa..a048e738bc 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_row_evolution_graph__ScheduledReports.generateReport_week.original.html @@ -4,7 +4,7 @@ </head> <body style="color: rgb(68,68,68);"> -<a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> +<a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Piwik test diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html index 126dd823ab..c199020d86 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_and_graph__ScheduledReports.generateReport_week.original.html @@ -4,7 +4,7 @@ </head> <body style="color: rgb(68,68,68);"> -<a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Zeitgeist/images/logo-header.png'/></a> +<a id="reportTop" target="_blank" href=""><img title="Go to Piwik" border="0" alt="Piwik" src='plugins/Morpheus/images/logo-header.png'/></a> <h1 style="color: rgb(126,115,99); font-size: 11pt;"> Website Piwik test @@ -6132,7 +6132,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI8.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index acc2e095b2..c96af7bccf 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -5868,7 +5868,7 @@ <tr style=""> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> - <img src='plugins/UserSettings/images/os/WI8.gif'> + <img src='plugins/UserSettings/images/os/WXP.gif'> Windows XP </td> <td style="font-size: 11pt; border-bottom: 1px solid rgb(231,231,231); padding: 5px 0 5px 5px;"> diff --git a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf Binary files differindex ee814b9979..10942ff2df 100644 --- a/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf +++ b/tests/PHPUnit/Integration/expected/test_ecommerceOrderWithItems_scheduled_report_in_pdf_tables_only__ScheduledReports.generateReport_week.original.pdf diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index 77a88accc5..73567f781a 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -84,7 +84,7 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -198,7 +198,7 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -372,7 +372,7 @@ <browserCode>FF</browserCode> <browserVersion>3.6</browserVersion> <screenType>dual</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -392,4 +392,4 @@ </row> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 405875f649..eb65fd1da6 100644 --- a/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/Integration/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -127,7 +127,7 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -242,7 +242,7 @@ <browserCode>FF</browserCode> <browserVersion>3.0</browserVersion> <screenType>dual</screenType> - <deviceType>desktop</deviceType> + <deviceType>Desktop</deviceType> <resolution>1111x222</resolution> <screenTypeIcon>plugins/UserSettings/images/screens/dual.gif</screenTypeIcon> <plugins>flash, java</plugins> @@ -266,4 +266,4 @@ </lastVisits> -</result>
\ No newline at end of file +</result> diff --git a/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php b/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php index 0fbf135867..d85f652856 100644 --- a/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php +++ b/tests/PHPUnit/Plugins/UserAgentParserEnhancedTest.php @@ -35,5 +35,26 @@ class UserAgentParserEnhancedTest extends PHPUnit_Framework_TestCase $this->assertTrue(true); } + /** + * @group Plugins + * @dataProvider getAllOs + */ + public function testOSInGroup($os) + { + + foreach (UserAgentParserEnhanced::$osFamilies as $family => $labels) { + if (in_array($os, $labels)) { + return true; + } + } + + $this->fail('Operating System not in a group'); + } + public function getAllOs() + { + $allOs = array_values(UserAgentParserEnhanced::$osShorts); + $allOs = array_map(function($os){ return array($os); }, $allOs); + return $allOs; + } } diff --git a/tests/PHPUnit/UI b/tests/PHPUnit/UI -Subproject 2f77dbed33894538a6b20ac56e0bca770d73b88 +Subproject 8a817aa5c08fb9fd1ae71b3767f5c541c029a19 diff --git a/tests/README.screenshots.md b/tests/README.screenshots.md index 24a989ae71..45224a2661 100644 --- a/tests/README.screenshots.md +++ b/tests/README.screenshots.md @@ -1,9 +1,35 @@ # Screenshots UI tests Piwik contains UI tests that work by taking a screenshot of a URL and comparing it with -an expected screenshot. If the screenshots do not match, there is a bug somewhere. +an expected screenshot. If any screenshots do not match, the build will fail. +These screenshots are taken after each commit to our git repository. +This powerful tool, which we call continuous User Interface tests, enables Piwik to remain stable and innovate faster. + Learn more below! + +## Using screenshots tests + +As a Piwik developer, you may make changes to Piwik User interface. +When you change some CSS or visuals, it may make the Travis UI Test go from green to red. +We have tried to make fixing the build easy, please read below how to fix the screenshot build: + +**As a Piwik developer, how do I fix UI tests build?** + + * If the piwik-ui-tests travis build has failed, go to travis: [https://travis-ci.org/piwik/piwik-ui-tests](https://travis-ci.org/piwik/piwik-ui-tests) + * Click on the latest failed build. + * In the output for this build, you will find a message such as: + http://builds-artifacts.piwik.org/ui-tests.master/1617.1/screenshot-diffs/diffviewer.html + * Visit this URL. It lists all screenshots which have changed in your commit. + * Check that the changes are desired. Sometimes we introduce regression without realising, and screenshot tests can help us spot such regressions. + * If the change is not wanted, revert or fix your commit. + * If the change is wanted, then you can set the new screenshots as the expected screenshot. + To do so, in the diffviewer.html page click on the "Processed" link for this screenshot. + Then "Save this file as" and save it in the piwik/tests/PHPUnit/UI/expected-ui-screenshots/ directory. + * Push the changes (to your code and/or to the expected-ui-screenshots directory. + * Wait for next UI Tests build [on travis](https://travis-ci.org/piwik/piwik-ui-tests). Hopefully, the build should be green! + + +## Setup screenshots tests on your dev box -## Requirements These tests are in another repository but are included in Piwik as a submodule. To get the tests, run the following commands: $ git submodule init |
