From e7325c72565a92cc7ff6c6eabdbff885d9158f97 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Mon, 8 Dec 2014 22:50:44 +0100 Subject: [PATCH 01/12] moved resolution and configuration reports to a new plugin --- CHANGELOG.md | 2 + config/global.ini.php | 1 + core/Plugin/Segment.php | 2 +- core/Updates/2.10.0-b6.php | 43 ++++++++++++ core/Version.php | 2 +- .../templates/_dataTableViz_visitorLog.twig | 2 +- .../Live/templates/getLastVisitsStart.twig | 2 +- .../Live/templates/getSingleVisitSummary.twig | 2 +- plugins/Resolution/API.php | 49 +++++++++++++ plugins/Resolution/Archiver.php | 68 +++++++++++++++++++ .../Columns/Configuration.php | 4 +- .../Columns/Resolution.php | 8 +-- plugins/Resolution/Reports/Base.php | 32 +++++++++ .../Reports/GetConfiguration.php | 12 ++-- .../Reports/GetResolution.php | 10 +-- plugins/Resolution/Resolution.php | 35 ++++++++++ plugins/Resolution/Segment.php | 21 ++++++ plugins/Resolution/Visitor.php | 28 ++++++++ plugins/Resolution/functions.php | 29 ++++++++ plugins/Resolution/lang/en.json | 12 ++++ plugins/UserSettings/API.php | 13 ++-- plugins/UserSettings/Archiver.php | 24 ------- plugins/UserSettings/Controller.php | 4 +- plugins/UserSettings/UserSettings.php | 7 +- plugins/UserSettings/Visitor.php | 9 --- plugins/UserSettings/functions.php | 17 ----- plugins/UserSettings/lang/en.json | 9 +-- plugins/UserSettings/templates/index.twig | 4 +- .../DataTable/Filter/PivotByDimensionTest.php | 6 +- tests/PHPUnit/Unit/DeprecatedMethodsTest.php | 2 + 30 files changed, 365 insertions(+), 94 deletions(-) create mode 100644 core/Updates/2.10.0-b6.php create mode 100644 plugins/Resolution/API.php create mode 100644 plugins/Resolution/Archiver.php rename plugins/{UserSettings => Resolution}/Columns/Configuration.php (71%) rename plugins/{UserSettings => Resolution}/Columns/Resolution.php (83%) create mode 100644 plugins/Resolution/Reports/Base.php rename plugins/{UserSettings => Resolution}/Reports/GetConfiguration.php (58%) rename plugins/{UserSettings => Resolution}/Reports/GetResolution.php (65%) create mode 100644 plugins/Resolution/Resolution.php create mode 100644 plugins/Resolution/Segment.php create mode 100644 plugins/Resolution/Visitor.php create mode 100644 plugins/Resolution/functions.php create mode 100644 plugins/Resolution/lang/en.json diff --git a/CHANGELOG.md b/CHANGELOG.md index 690e2cf71e5..0c964218866 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -16,6 +16,8 @@ This is a changelog for Piwik platform developers. All changes for our HTTP API' * The API method `UserSettings.getOS` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getOsVersions` instead * The API method `UserSettings.getMobileVsDesktop` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getType` instead * The API method `UserSettings.getBrowserType` is deprecated and will be removed from May 1st 2015. Use `DevicesDetection.getBrowserEngines` instead +* The API method `UserSettings.getResolution` is deprecated and will be removed from May 1st 2015. Use `Resolution.getResolution` instead +* The API method `UserSettings.getConfiguration` is deprecated and will be removed from May 1st 2015. Use `Resolution.getConfiguration` instead * The API method `UserSettings.getWideScreen` has been removed ### Library updates diff --git a/config/global.ini.php b/config/global.ini.php index 2bab7b130d7..c0bb519538a 100644 --- a/config/global.ini.php +++ b/config/global.ini.php @@ -717,6 +717,7 @@ Plugins[] = Contents Plugins[] = TestRunner Plugins[] = BulkTracking +Plugins[] = Resolution [PluginsInstalled] PluginsInstalled[] = Login diff --git a/core/Plugin/Segment.php b/core/Plugin/Segment.php index 795d4da1579..f29f2080595 100644 --- a/core/Plugin/Segment.php +++ b/core/Plugin/Segment.php @@ -96,7 +96,7 @@ public function setCategory($category) /** * Set (overwrite) the segment display name. This name will be visible in the API and the UI. It should be a - * translation key such as 'Actions_ColumnEntryPageTitle' or 'UserSettings_ColumnResolution'. + * translation key such as 'Actions_ColumnEntryPageTitle' or 'Resolution_ColumnResolution'. * @param string $name * @api */ diff --git a/core/Updates/2.10.0-b6.php b/core/Updates/2.10.0-b6.php new file mode 100644 index 00000000000..aac4e8b7e4f --- /dev/null +++ b/core/Updates/2.10.0-b6.php @@ -0,0 +1,43 @@ +{% endif %} + title="{{ visitor.getColumn('operatingSystem') }}{% if visitor.getColumn('resolution') %}, {{ visitor.getColumn('resolution') }}{% endif %}"/>{% endif %} {% if visitor.getColumn('visitorTypeIcon') %} {% if visitor.getColumn('visitorTypeIcon') %} - 0 %}({{ visitor.visitDurationPretty|raw }}){% endif %} {% if visitor.countryFlag is defined %} {% endif %} {% if visitor.browserIcon is defined %} {% endif %} - {% if visitor.operatingSystemIcon is defined %} {% endif %} + {% if visitor.operatingSystemIcon is defined %} {% endif %}   {% if visitor.visitConverted %} diff --git a/plugins/Live/templates/getSingleVisitSummary.twig b/plugins/Live/templates/getSingleVisitSummary.twig index 77f1c8f2bb4..a515b0dff69 100644 --- a/plugins/Live/templates/getSingleVisitSummary.twig +++ b/plugins/Live/templates/getSingleVisitSummary.twig @@ -34,7 +34,7 @@ {% if visitData.operatingSystemIcon is defined %}{% endif %}{% if visitData.operatingSystem is defined %}{{ visitData.operatingSystem }}{% endif %} - {% if visitData.resolution is defined %}
  • {{ 'UserSettings_ColumnResolution'|translate }}{{ visitData.resolution }}
    • {% endif %} + {% if visitData.resolution is defined %}
  • {{ 'Resolution_ColumnResolution'|translate }}{{ visitData.resolution }}
    • {% endif %} {% if visitData.userId is not empty %}
  • {{ 'General_UserId'|translate }}{{ visitData.userId|raw }}
    • {% endif %} {% if visitReferralSummary is defined %} {%- set keywordNotDefined = 'General_NotDefined'|translate('General_ColumnKeyword'|translate) -%} diff --git a/plugins/Resolution/API.php b/plugins/Resolution/API.php new file mode 100644 index 00000000000..8fc33efddbb --- /dev/null +++ b/plugins/Resolution/API.php @@ -0,0 +1,49 @@ +getDataTable($name); + $dataTable->filter('Sort', array(Metrics::INDEX_NB_VISITS)); + $dataTable->queueFilter('ReplaceColumnNames'); + $dataTable->queueFilter('ReplaceSummaryRowLabel'); + return $dataTable; + } + + public function getResolution($idSite, $period, $date, $segment = false) + { + $dataTable = $this->getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment); + return $dataTable; + } + + public function getConfiguration($idSite, $period, $date, $segment = false) + { + $dataTable = $this->getDataTable(Archiver::CONFIGURATION_RECORD_NAME, $idSite, $period, $date, $segment); + $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getConfigurationLabel')); + return $dataTable; + } +} diff --git a/plugins/Resolution/Archiver.php b/plugins/Resolution/Archiver.php new file mode 100644 index 00000000000..f44d744c533 --- /dev/null +++ b/plugins/Resolution/Archiver.php @@ -0,0 +1,68 @@ +aggregateByResolution(); + $this->aggregateByConfiguration(); + } + + /** + * Period archiving: simply sums up daily archives + */ + public function aggregateMultipleReports() + { + $dataTableRecords = array( + self::RESOLUTION_RECORD_NAME, + self::CONFIGURATION_RECORD_NAME, + ); + $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows); + } + + protected function aggregateByConfiguration() + { + $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::CONFIGURATION_DIMENSION)->asDataTable(); + $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics); + } + + protected function aggregateByResolution() + { + $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable(); + $table->filter('ColumnCallbackDeleteRow', array('label', function ($value) { + return strlen($value) <= 5; + })); + $this->insertTable(self::RESOLUTION_RECORD_NAME, $table); + return $table; + } + + protected function insertTable($recordName, DataTable $table) + { + $report = $table->getSerialized($this->maximumRows, null, Metrics::INDEX_NB_VISITS); + return $this->getProcessor()->insertBlobRecord($recordName, $report); + } + +} + diff --git a/plugins/UserSettings/Columns/Configuration.php b/plugins/Resolution/Columns/Configuration.php similarity index 71% rename from plugins/UserSettings/Columns/Configuration.php rename to plugins/Resolution/Columns/Configuration.php index 7577c064953..69294574950 100644 --- a/plugins/UserSettings/Columns/Configuration.php +++ b/plugins/Resolution/Columns/Configuration.php @@ -6,7 +6,7 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Columns; +namespace Piwik\Plugins\Resolution\Columns; use Piwik\Columns\Dimension; use Piwik\Piwik; @@ -15,6 +15,6 @@ class Configuration extends Dimension { public function getName() { - return Piwik::translate('UserSettings_ColumnConfiguration'); + return Piwik::translate('Resolution_ColumnConfiguration'); } } \ No newline at end of file diff --git a/plugins/UserSettings/Columns/Resolution.php b/plugins/Resolution/Columns/Resolution.php similarity index 83% rename from plugins/UserSettings/Columns/Resolution.php rename to plugins/Resolution/Columns/Resolution.php index 35aaf4a23e5..3f1e3572793 100644 --- a/plugins/UserSettings/Columns/Resolution.php +++ b/plugins/Resolution/Columns/Resolution.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Columns; +namespace Piwik\Plugins\Resolution\Columns; use Piwik\Piwik; use Piwik\Plugin\Dimension\VisitDimension; -use Piwik\Plugins\UserSettings\Segment; +use Piwik\Plugins\Resolution\Segment; use Piwik\Tracker\Action; use Piwik\Tracker\Request; use Piwik\Tracker\Visitor; @@ -24,7 +24,7 @@ protected function configureSegments() { $segment = new Segment(); $segment->setSegment('resolution'); - $segment->setName('UserSettings_ColumnResolution'); + $segment->setName('Resolution_ColumnResolution'); $segment->setAcceptedValues('1280x1024, 800x600, etc.'); $this->addSegment($segment); } @@ -48,6 +48,6 @@ public function onNewVisit(Request $request, Visitor $visitor, $action) public function getName() { - return Piwik::translate('UserSettings_ColumnResolution'); + return Piwik::translate('Resolution_ColumnResolution'); } } \ No newline at end of file diff --git a/plugins/Resolution/Reports/Base.php b/plugins/Resolution/Reports/Base.php new file mode 100644 index 00000000000..4b0e9a5a42d --- /dev/null +++ b/plugins/Resolution/Reports/Base.php @@ -0,0 +1,32 @@ +category = 'UserSettings_VisitorSettings'; + } + + protected function getBasicResolutionDisplayProperties(ViewDataTable $view) + { + $view->config->show_search = false; + $view->config->show_exclude_low_population = false; + + $view->requestConfig->filter_limit = 5; + + if ($view->isViewDataTableId(Graph::ID)) { + $view->config->max_graph_elements = 5; + } + } +} diff --git a/plugins/UserSettings/Reports/GetConfiguration.php b/plugins/Resolution/Reports/GetConfiguration.php similarity index 58% rename from plugins/UserSettings/Reports/GetConfiguration.php rename to plugins/Resolution/Reports/GetConfiguration.php index 67b00f8b7d9..024efa844e5 100644 --- a/plugins/UserSettings/Reports/GetConfiguration.php +++ b/plugins/Resolution/Reports/GetConfiguration.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Reports; +namespace Piwik\Plugins\Resolution\Reports; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\Configuration; +use Piwik\Plugins\Resolution\Columns\Configuration; class GetConfiguration extends Base { @@ -18,15 +18,15 @@ protected function init() { parent::init(); $this->dimension = new Configuration(); - $this->name = Piwik::translate('UserSettings_WidgetGlobalVisitors'); - $this->documentation = Piwik::translate('UserSettings_WidgetGlobalVisitorsDocumentation', '
    '); + $this->name = Piwik::translate('Resolution_WidgetGlobalVisitors'); + $this->documentation = Piwik::translate('Resolution_WidgetGlobalVisitorsDocumentation', '
    '); $this->order = 7; - $this->widgetTitle = 'UserSettings_WidgetGlobalVisitors'; + $this->widgetTitle = 'Resolution_WidgetGlobalVisitors'; } public function configureView(ViewDataTable $view) { - $this->getBasicUserSettingsDisplayProperties($view); + $this->getBasicResolutionDisplayProperties($view); $view->config->addTranslation('label', $this->dimension->getName()); diff --git a/plugins/UserSettings/Reports/GetResolution.php b/plugins/Resolution/Reports/GetResolution.php similarity index 65% rename from plugins/UserSettings/Reports/GetResolution.php rename to plugins/Resolution/Reports/GetResolution.php index 2c8012a8d10..fbb78eb8788 100644 --- a/plugins/UserSettings/Reports/GetResolution.php +++ b/plugins/Resolution/Reports/GetResolution.php @@ -6,11 +6,11 @@ * @license http://www.gnu.org/licenses/gpl-3.0.html GPL v3 or later * */ -namespace Piwik\Plugins\UserSettings\Reports; +namespace Piwik\Plugins\Resolution\Reports; use Piwik\Piwik; use Piwik\Plugin\ViewDataTable; -use Piwik\Plugins\UserSettings\Columns\Resolution; +use Piwik\Plugins\Resolution\Columns\Resolution; class GetResolution extends Base { @@ -18,15 +18,15 @@ protected function init() { parent::init(); $this->dimension = new Resolution(); - $this->name = Piwik::translate('UserSettings_WidgetResolutions'); + $this->name = Piwik::translate('Resolution_WidgetResolutions'); $this->documentation = ''; // TODO $this->order = 0; - $this->widgetTitle = 'UserSettings_WidgetResolutions'; + $this->widgetTitle = 'Resolution_WidgetResolutions'; } public function configureView(ViewDataTable $view) { - $this->getBasicUserSettingsDisplayProperties($view); + $this->getBasicResolutionDisplayProperties($view); $view->config->addTranslation('label', $this->dimension->getName()); } diff --git a/plugins/Resolution/Resolution.php b/plugins/Resolution/Resolution.php new file mode 100644 index 00000000000..49b2d3a9a62 --- /dev/null +++ b/plugins/Resolution/Resolution.php @@ -0,0 +1,35 @@ + 'extendVisitorDetails', + ); + } + + public function extendVisitorDetails(&$visitor, $details) + { + $instance = new Visitor($details); + + $visitor['resolution'] = $instance->getResolution(); + } +} diff --git a/plugins/Resolution/Segment.php b/plugins/Resolution/Segment.php new file mode 100644 index 00000000000..e21a2973d72 --- /dev/null +++ b/plugins/Resolution/Segment.php @@ -0,0 +1,21 @@ +setCategory('General_Visit'); + } +} diff --git a/plugins/Resolution/Visitor.php b/plugins/Resolution/Visitor.php new file mode 100644 index 00000000000..47fd3308684 --- /dev/null +++ b/plugins/Resolution/Visitor.php @@ -0,0 +1,28 @@ +details = $details; + } + + function getResolution() + { + if (!array_key_exists('config_resolution', $this->details)) { + return null; + } + + return $this->details['config_resolution']; + } +} \ No newline at end of file diff --git a/plugins/Resolution/functions.php b/plugins/Resolution/functions.php new file mode 100644 index 00000000000..e71aaa907a2 --- /dev/null +++ b/plugins/Resolution/functions.php @@ -0,0 +1,29 @@ +getDataTable(Archiver::RESOLUTION_RECORD_NAME, $idSite, $period, $date, $segment); - return $dataTable; + return \Piwik\Plugins\Resolution\API::getInstance()->getResolution($idSite, $period, $date, $segment); } + /** + * @deprecated since 2.10.0 See {@link Piwik\Plugins\Resolution\API} for new implementation. + */ public function getConfiguration($idSite, $period, $date, $segment = false) { - $dataTable = $this->getDataTable(Archiver::CONFIGURATION_RECORD_NAME, $idSite, $period, $date, $segment); - $dataTable->queueFilter('ColumnCallbackReplace', array('label', __NAMESPACE__ . '\getConfigurationLabel')); - return $dataTable; + return \Piwik\Plugins\Resolution\API::getInstance()->getConfiguration($idSite, $period, $date, $segment); } protected function getDevicesDetectorApi() diff --git a/plugins/UserSettings/Archiver.php b/plugins/UserSettings/Archiver.php index 740e5d4d945..a9b67a135cd 100644 --- a/plugins/UserSettings/Archiver.php +++ b/plugins/UserSettings/Archiver.php @@ -26,12 +26,8 @@ class Archiver extends \Piwik\Plugin\Archiver { const LANGUAGE_RECORD_NAME = 'UserSettings_language'; const PLUGIN_RECORD_NAME = 'UserSettings_plugin'; - const RESOLUTION_RECORD_NAME = 'UserSettings_resolution'; - const CONFIGURATION_RECORD_NAME = 'UserSettings_configuration'; const LANGUAGE_DIMENSION = "log_visit.location_browser_lang"; - const RESOLUTION_DIMENSION = "log_visit.config_resolution"; - const CONFIGURATION_DIMENSION = "CONCAT(log_visit.config_os, ';', log_visit.config_browser_name, ';', log_visit.config_resolution)"; /** * Daily archive of User Settings report. Processes reports for Visits by Resolution, @@ -39,8 +35,6 @@ class Archiver extends \Piwik\Plugin\Archiver */ public function aggregateDayReport() { - $this->aggregateByConfiguration(); - $this->aggregateByResolution(); $this->aggregateByPlugin(); $this->aggregateByLanguage(); } @@ -51,30 +45,12 @@ public function aggregateDayReport() public function aggregateMultipleReports() { $dataTableRecords = array( - self::CONFIGURATION_RECORD_NAME, - self::RESOLUTION_RECORD_NAME, self::PLUGIN_RECORD_NAME, self::LANGUAGE_RECORD_NAME, ); $this->getProcessor()->aggregateDataTableRecords($dataTableRecords, $this->maximumRows); } - protected function aggregateByConfiguration() - { - $metrics = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::CONFIGURATION_DIMENSION)->asDataTable(); - $this->insertTable(self::CONFIGURATION_RECORD_NAME, $metrics); - } - - protected function aggregateByResolution() - { - $table = $this->getLogAggregator()->getMetricsFromVisitByDimension(self::RESOLUTION_DIMENSION)->asDataTable(); - $table->filter('ColumnCallbackDeleteRow', array('label', function ($value) { - return strlen($value) <= 5; - })); - $this->insertTable(self::RESOLUTION_RECORD_NAME, $table); - return $table; - } - protected function aggregateByPlugin() { $selects = array( diff --git a/plugins/UserSettings/Controller.php b/plugins/UserSettings/Controller.php index a6154b5f29f..8c64ede3da6 100644 --- a/plugins/UserSettings/Controller.php +++ b/plugins/UserSettings/Controller.php @@ -8,10 +8,10 @@ */ namespace Piwik\Plugins\UserSettings; -use Piwik\Plugins\UserSettings\Reports\GetConfiguration; +use Piwik\Plugins\Resolution\Reports\GetConfiguration; use Piwik\Plugins\UserSettings\Reports\GetLanguage; use Piwik\Plugins\UserSettings\Reports\GetPlugin; -use Piwik\Plugins\UserSettings\Reports\GetResolution; +use Piwik\Plugins\Resolution\Reports\GetResolution; use Piwik\View; /** diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index 81584705449..da1e625af0f 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -45,20 +45,23 @@ public function mapDeprecatedActions(&$module, &$action, &$parameters) 'getMobileVsDesktop' => 'getType', 'getOS' => 'getOsVersions', 'getOSFamily' => 'getOsFamilies', - 'getBrowserType' => 'getBrowserEngines' + 'getBrowserType' => 'getBrowserEngines', ); if ($module == 'UserSettings' && array_key_exists($action, $movedMethods)) { $module = 'DevicesDetection'; $action = $movedMethods[$action]; } + + if ($module == 'UserSettings' && $action == 'getResolution') { + $module = 'Resolution'; + } } public function extendVisitorDetails(&$visitor, $details) { $instance = new Visitor($details); - $visitor['resolution'] = $instance->getResolution(); $visitor['plugins'] = $instance->getPlugins(); $visitor['pluginsIcons'] = $instance->getPluginIcons(); } diff --git a/plugins/UserSettings/Visitor.php b/plugins/UserSettings/Visitor.php index 33f3528487b..e399cba3ac6 100644 --- a/plugins/UserSettings/Visitor.php +++ b/plugins/UserSettings/Visitor.php @@ -62,13 +62,4 @@ function getPluginIcons() return null; } - - function getResolution() - { - if (!array_key_exists('config_resolution', $this->details)) { - return null; - } - - return $this->details['config_resolution']; - } } \ No newline at end of file diff --git a/plugins/UserSettings/functions.php b/plugins/UserSettings/functions.php index eaab5557c7c..c50e84146eb 100644 --- a/plugins/UserSettings/functions.php +++ b/plugins/UserSettings/functions.php @@ -20,23 +20,6 @@ function getPluginsLogo($oldLabel) return 'plugins/UserSettings/images/plugins/' . $oldLabel . '.gif'; } -function getConfigurationLabel($str) -{ - if (strpos($str, ';') === false) { - return $str; - } - $values = explode(";", $str); - - $os = \Piwik\Plugins\DevicesDetection\getOsFullName($values[0]); - $name = $values[1]; - $browser = \Piwik\Plugins\DevicesDetection\getBrowserName($name); - if ($browser === false) { - $browser = Piwik::translate('General_Unknown'); - } - $resolution = $values[2]; - return $os . " / " . $browser . " / " . $resolution; -} - /** * Returns the given language code to translated language name * diff --git a/plugins/UserSettings/lang/en.json b/plugins/UserSettings/lang/en.json index c692af975cb..f5240dc9e25 100644 --- a/plugins/UserSettings/lang/en.json +++ b/plugins/UserSettings/lang/en.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Browser language", "BrowserWithNoPluginsEnabled": "%1$s with no plugins enabled", "BrowserWithPluginsEnabled": "%1$s with plugins %2$s enabled", - "ColumnConfiguration": "Configuration", - "ColumnResolution": "Resolution", - "Configurations": "Configurations", "Language_aa": "Afar", "Language_ab": "Abkhazian", "Language_ae": "Avestan", @@ -193,12 +190,8 @@ "LanguageCode": "Language code", "PluginDescription": "Reports various User Settings: Browser, Browser Family, Operating System, Plugins, Resolution, Global Settings.", "PluginDetectionDoesNotWorkInIE": "Note: Plugins detection doesn't work in Internet Explorer. This report is only based on non-IE browsers.", - "Resolutions": "Resolutions", "VisitorSettings": "Visitor Settings", - "WidgetGlobalVisitors": "Visitor Configuration", - "WidgetGlobalVisitorsDocumentation": "This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution.", "WidgetPlugins": "Browser Plugins", - "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content.", - "WidgetResolutions": "Screen Resolution" + "WidgetPluginsDocumentation": "This report shows which browser plugins your visitors had enabled. This information might be important for choosing the right way to deliver your content." } } \ No newline at end of file diff --git a/plugins/UserSettings/templates/index.twig b/plugins/UserSettings/templates/index.twig index abf96de9e10..1ee1cf32a1a 100644 --- a/plugins/UserSettings/templates/index.twig +++ b/plugins/UserSettings/templates/index.twig @@ -8,9 +8,9 @@
    -

    {{ 'UserSettings_Resolutions'|translate }}

    +

    {{ 'Resolution_Resolutions'|translate }}

    {{ dataTableResolution|raw }} -

    {{ 'UserSettings_Configurations'|translate }}

    +

    {{ 'Resolution_Configurations'|translate }}

    {{ dataTableConfiguration|raw }}
    diff --git a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php index f1faa99b88b..fd85b3a0101 100644 --- a/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php +++ b/tests/PHPUnit/Unit/DataTable/Filter/PivotByDimensionTest.php @@ -90,13 +90,13 @@ public function test_construction_ShouldFail_WhenDimensionIsNotSubtableAndSegmen /** * @expectedException Exception - * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'UserSettings.UserSettings_WidgetGlobalVisitors' + * @expectedExceptionMessage Unsupported pivot: No segment for dimension of report 'Resolution.Resolution_WidgetGlobalVisitors' */ public function test_construction_ShouldFail_WhenDimensionIsNotSubtableAndSegmentFetchingIsEnabledButThereIsNoSegment() { - $this->loadPlugins('Referrers', 'UserSettings'); + $this->loadPlugins('Referrers', 'Resolution'); - new PivotByDimension(new DataTable(), "UserSettings.GetConfiguration", "Referrers.Keyword", "nb_visits"); + new PivotByDimension(new DataTable(), "Resolution.GetConfiguration", "Referrers.Keyword", "nb_visits"); } /** diff --git a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php index 2150dc32bac..25b9f46ee14 100644 --- a/tests/PHPUnit/Unit/DeprecatedMethodsTest.php +++ b/tests/PHPUnit/Unit/DeprecatedMethodsTest.php @@ -62,6 +62,8 @@ public function test_version2_0_4() $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getOSFamily', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getBrowserType', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getMobileVsDesktop', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getResolution', $validTill); + $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\API', 'getConfiguration', $validTill); $this->assertDeprecatedMethodIsRemoved('Piwik\Plugins\UserSettings\UserSettings', 'mapDeprecatedActions', $validTill); $this->assertDeprecatedMethodIsRemovedInPiwik3('\Piwik\Menu\MenuAbstract', 'add'); From 1645f11889eee54fe611974e561992accb5d690c Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 9 Dec 2014 23:52:05 +0100 Subject: [PATCH 02/12] fixed some tests --- ...ITest__Live.getLastVisitsDetails_range.xml | 70 +++++++-------- ...mEvents__Live.getLastVisitsDetails_day.xml | 20 ++--- ...vents__Live.getLastVisitsDetails_month.xml | 20 ++--- ...tLogs__Live.getLastVisitsDetails_range.xml | 80 +++++++++--------- ...itAsc__Live.getLastVisitsDetails_month.xml | 14 +-- ...Visit__Live.getLastVisitsDetails_month.xml | 14 +-- ...Count__Live.getLastVisitsDetails_month.xml | 14 +-- ...tDesc__Live.getLastVisitsDetails_month.xml | 14 +-- ...eTest__Live.getLastVisitsDetails_month.xml | 20 ++--- ...Support__Live.getLastVisitsDetails_day.xml | 4 +- ...ecified__Live.getLastVisitsDetails_day.xml | 4 +- ...eDays__Live.getLastVisitsDetails_month.xml | 6 +- ...nesTest__Live.getLastVisitsDetails_day.xml | 2 +- ...ortMetadata__API.getReportMetadata_day.xml | 16 ++-- ...vExport__Live.getLastVisitsDetails_day.csv | Bin 7376 -> 7376 bytes ...Ordered__Live.getLastVisitsDetails_day.xml | 4 +- ...thItems__Live.getLastVisitsDetails_day.xml | 6 +- ...tadataAndNormalAPI__Live.getLastVisits.xml | 6 +- ...alAPI__Live.getLastVisitsDetails_range.xml | 6 +- ...taAndNormalAPI__Live.getVisitorProfile.xml | 4 +- 20 files changed, 162 insertions(+), 162 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml index 14943c61f29..5f5b0e174d5 100644 --- a/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_AutoSuggestAPITest__Live.getLastVisitsDetails_range.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -999,7 +999,6 @@ - 1024x768 flash, java @@ -1037,6 +1036,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1122,7 +1122,6 @@ - 1024x768 flash, java @@ -1160,6 +1159,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -1276,7 +1276,6 @@ - 1024x768 flash, java @@ -1314,6 +1313,7 @@ 12:34:06 12 10 + 1024x768 awesomeisp.com Awesomeisp http://www.awesomeisp.com/ @@ -1399,7 +1399,6 @@ - 1024x768 flash, java @@ -1437,6 +1436,7 @@ 12:34:06 12 11 + 1024x768 awesomeisp.com Awesomeisp http://www.awesomeisp.com/ @@ -1536,7 +1536,6 @@ - 1024x768 flash, java @@ -1574,6 +1573,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1673,7 +1673,6 @@ - 1024x768 flash, java @@ -1711,6 +1710,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1788,7 +1788,6 @@ - 1024x768 flash, java @@ -1826,6 +1825,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -1911,7 +1911,6 @@ - 1024x768 flash, java @@ -1949,6 +1948,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -2065,7 +2065,6 @@ - 1024x768 flash, java @@ -2103,6 +2102,7 @@ 12:34:06 12 10 + 1024x768 comcast.net Comcast http://www.comcast.net/ @@ -2219,7 +2219,6 @@ - 1024x768 flash, java @@ -2257,6 +2256,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2334,7 +2334,6 @@ - 1024x768 flash, java @@ -2372,6 +2371,7 @@ 12:34:06 12 11 + 1024x768 comcast.net Comcast http://www.comcast.net/ @@ -2457,7 +2457,6 @@ - 1024x768 flash, java @@ -2495,6 +2494,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -2594,7 +2594,6 @@ - 1024x768 flash, java @@ -2632,6 +2631,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2731,7 +2731,6 @@ - 1024x768 flash, java @@ -2769,6 +2768,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2868,7 +2868,6 @@ - 1024x768 flash, java @@ -2906,6 +2905,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -2997,7 +2997,6 @@ - 1024x768 flash, java @@ -3035,6 +3034,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -3120,7 +3120,6 @@ - 1024x768 flash, java @@ -3158,6 +3157,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3243,7 +3243,6 @@ - 1024x768 flash, java @@ -3281,6 +3280,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3366,7 +3366,6 @@ - 1024x768 flash, java @@ -3404,6 +3403,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3489,7 +3489,6 @@ - 1024x768 flash, java @@ -3527,6 +3526,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -3643,7 +3643,6 @@ - 1024x768 flash, java @@ -3681,6 +3680,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -3797,7 +3797,6 @@ - 1024x768 flash, java @@ -3835,6 +3834,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -3951,7 +3951,6 @@ - 1024x768 flash, java @@ -3989,6 +3988,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -4097,7 +4097,6 @@ - 1024x768 flash, java @@ -4135,6 +4134,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -4220,7 +4220,6 @@ - 1024x768 flash, java @@ -4258,6 +4257,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -4343,7 +4343,6 @@ - 1024x768 flash, java @@ -4381,6 +4380,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -4466,7 +4466,6 @@ - 1024x768 flash, java @@ -4504,6 +4503,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -4589,7 +4589,6 @@ - 1024x768 flash, java @@ -4627,6 +4626,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml index afa050d312e..52df0964ab3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_day.xml @@ -68,6 +68,7 @@ + 1024x768 Europe eur France @@ -79,7 +80,6 @@ France - 1024x768 flash, java @@ -168,6 +168,7 @@ + 1024x768 Europe eur France @@ -179,7 +180,6 @@ France - 1024x768 flash, java @@ -336,6 +336,7 @@ + 1024x768 Europe eur France @@ -347,7 +348,6 @@ France - 1024x768 flash, java @@ -436,6 +436,7 @@ + 1024x768 Europe eur France @@ -447,7 +448,6 @@ France - 1024x768 flash, java @@ -771,6 +771,7 @@ + 1024x768 Europe eur France @@ -782,7 +783,6 @@ France - 1024x768 flash, java @@ -871,6 +871,7 @@ + 1024x768 Europe eur France @@ -882,7 +883,6 @@ France - 1024x768 director @@ -967,6 +967,7 @@ + 1024x768 Europe eur France @@ -978,7 +979,6 @@ France - 1024x768 director @@ -1131,6 +1131,7 @@ + 1024x768 Europe eur France @@ -1142,7 +1143,6 @@ France - 1024x768 director @@ -1227,6 +1227,7 @@ + 1024x768 Europe eur France @@ -1238,7 +1239,6 @@ France - 1024x768 director @@ -1558,6 +1558,7 @@ + 1024x768 Europe eur France @@ -1569,7 +1570,6 @@ France - 1024x768 director diff --git a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml index afa050d312e..52df0964ab3 100644 --- a/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_CustomEvents__Live.getLastVisitsDetails_month.xml @@ -68,6 +68,7 @@ + 1024x768 Europe eur France @@ -79,7 +80,6 @@ France - 1024x768 flash, java @@ -168,6 +168,7 @@ + 1024x768 Europe eur France @@ -179,7 +180,6 @@ France - 1024x768 flash, java @@ -336,6 +336,7 @@ + 1024x768 Europe eur France @@ -347,7 +348,6 @@ France - 1024x768 flash, java @@ -436,6 +436,7 @@ + 1024x768 Europe eur France @@ -447,7 +448,6 @@ France - 1024x768 flash, java @@ -771,6 +771,7 @@ + 1024x768 Europe eur France @@ -782,7 +783,6 @@ France - 1024x768 flash, java @@ -871,6 +871,7 @@ + 1024x768 Europe eur France @@ -882,7 +883,6 @@ France - 1024x768 director @@ -967,6 +967,7 @@ + 1024x768 Europe eur France @@ -978,7 +979,6 @@ France - 1024x768 director @@ -1131,6 +1131,7 @@ + 1024x768 Europe eur France @@ -1142,7 +1143,6 @@ France - 1024x768 director @@ -1227,6 +1227,7 @@ + 1024x768 Europe eur France @@ -1238,7 +1239,6 @@ France - 1024x768 director @@ -1558,6 +1558,7 @@ + 1024x768 Europe eur France @@ -1569,7 +1570,6 @@ France - 1024x768 director diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index 5009922ea1a..1b6f100c5e0 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -84,6 +84,7 @@ http://blog.comperiosearch.com/blog/2014/02/05/dynamic-search-ranking-using-elasticsearch-neo4j-and-piwik/ + 1366x768 North America amn United States @@ -95,7 +96,6 @@ Raleigh, North Carolina, United States 35.771999 -78.639000 - 1366x768 pdf, flash, java @@ -220,6 +220,7 @@ http://piwik.org/what-is-piwik/ + 1536x864 North America amn United States @@ -231,7 +232,6 @@ Lake Forest, California, United States 33.645000 -117.679001 - 1536x864 17:33:27 @@ -331,6 +331,7 @@ http://demo.piwik.org/index.php?module=MultiSites&action=index&date=yesterday&period=day&idSite=32 + 1920x1200 Europe eur Germany @@ -342,7 +343,6 @@ Germany 51 9 - 1920x1200 pdf, flash, java, quicktime, silverlight @@ -475,6 +475,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 2880x1800 North America amn United States @@ -486,7 +487,6 @@ United States 38 -97 - 2880x1800 pdf, flash, java, quicktime @@ -588,6 +588,7 @@ http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw + 1920x1080 Europe eur Belgium @@ -599,7 +600,6 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - 1920x1080 pdf, flash, java, silverlight @@ -712,6 +712,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1360x768 North America amn United States @@ -723,7 +724,6 @@ San Francisco, California, United States 37.792000 -122.408997 - 1360x768 pdf, flash, java, quicktime, windowsmedia, silverlight @@ -843,6 +843,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 2560x1440 Asia asi Japan @@ -854,7 +855,6 @@ Nihon'odori, Kanagawa, Japan 35.450001 139.649994 - 2560x1440 pdf, java, quicktime @@ -963,6 +963,7 @@ http://berndjung.com/piwik/index.php?module=CoreHome&action=index&idSite=1&period=day&date=today + 360x640 Europe eur Germany @@ -974,7 +975,6 @@ Weilerswist, Nordrhein-Westfalen, Germany 50.766998 6.833000 - 360x640 flash @@ -1075,6 +1075,7 @@ http://forum.golem.de/kommentare/security/urteil-zu-tracking-nutzer-muessen-piwik-analyse-widersprechen-koennen/piwik-log-analytics/80715,3669355,3669355,read.html + 2560x1440 Europe eur Germany @@ -1086,7 +1087,6 @@ Mainz, Rheinland-Pfalz, Germany 50 8.271000 - 2560x1440 pdf, flash, java, quicktime, windowsmedia, silverlight @@ -1242,6 +1242,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1920x1080 Europe eur Russian Federation @@ -1253,7 +1254,6 @@ Moscow, Moscow City, Russian Federation 55.751999 37.616001 - 1920x1080 flash, java @@ -1358,6 +1358,7 @@ http://piwik.org/docs/installation/ + 1366x768 Europe eur Turkey @@ -1369,7 +1370,6 @@ Esentepe, Rize, Turkey 40.979000 40.415001 - 1366x768 pdf, flash, java, silverlight @@ -1482,6 +1482,7 @@ http://musicforeveryoneradio.be:2222/CMD_PLUGINS/installatron/index.raw + 1920x1080 Europe eur Belgium @@ -1493,7 +1494,6 @@ Maaseik, Limburg, Belgium 51.099998 5.800000 - 1920x1080 pdf, flash, java, silverlight @@ -1764,6 +1764,7 @@ + unknown Asia asi Japan @@ -1775,7 +1776,6 @@ Japan 36 138 - unknown 08:10:38 @@ -1878,6 +1878,7 @@ http://piwik.org/contribute% + 1024x768 Unknown unk Unknown @@ -1889,7 +1890,6 @@ Unknown - 1024x768 flash, java @@ -1993,6 +1993,7 @@ http://sn110w.snt110.mail.live.com/mail/InboxLight.aspx?n=184083971 + 1280x800 Unknown unk Unknown @@ -2004,7 +2005,6 @@ Unknown - 1280x800 pdf, flash, java, director, windowsmedia, gears @@ -2124,6 +2124,7 @@ + unknown Asia asi Japan @@ -2135,7 +2136,6 @@ Japan 36 138 - unknown 20:15:41 @@ -2247,6 +2247,7 @@ + unknown Asia asi Japan @@ -2258,7 +2259,6 @@ Japan 36 138 - unknown 19:12:40 @@ -2377,6 +2377,7 @@ + unknown Asia asi Japan @@ -2388,7 +2389,6 @@ Japan 36 138 - unknown 18:10:38 @@ -2483,6 +2483,7 @@ + unknown North America amn United States @@ -2494,7 +2495,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 17:48:08 @@ -2589,6 +2589,7 @@ + unknown North America amn United States @@ -2600,7 +2601,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 17:48:07 @@ -2685,6 +2685,7 @@ + unknown Oceania oce Australia @@ -2696,7 +2697,6 @@ Australia -27 133 - unknown 17:46:03 @@ -2791,6 +2791,7 @@ + unknown Asia asi Japan @@ -2802,7 +2803,6 @@ Japan 36 138 - unknown 16:11:30 @@ -2897,6 +2897,7 @@ + unknown Asia asi Japan @@ -2908,7 +2909,6 @@ Japan 36 138 - unknown 16:10:38 @@ -2999,6 +2999,7 @@ + unknown Unknown unk Unknown @@ -3010,7 +3011,6 @@ Unknown - unknown 15:31:05 @@ -3101,6 +3101,7 @@ + unknown Unknown unk Unknown @@ -3112,7 +3113,6 @@ Unknown - unknown 13:49:46 @@ -3203,6 +3203,7 @@ + unknown South America ams Brazil @@ -3214,7 +3215,6 @@ Brazil -10 -55 - unknown 20:22:08 @@ -3305,6 +3305,7 @@ + unknown South America ams Brazil @@ -3316,7 +3317,6 @@ Brazil -10 -55 - unknown 20:21:28 @@ -3407,6 +3407,7 @@ + unknown South America ams Brazil @@ -3418,7 +3419,6 @@ Brazil -10 -55 - unknown 20:21:03 @@ -3509,6 +3509,7 @@ + unknown Asia asi Japan @@ -3520,7 +3521,6 @@ Japan 36 138 - unknown 20:01:17 @@ -3611,6 +3611,7 @@ + unknown Asia asi Japan @@ -3622,7 +3623,6 @@ Japan 36 138 - unknown 19:59:50 @@ -3713,6 +3713,7 @@ + unknown Unknown unk Unknown @@ -3724,7 +3725,6 @@ Unknown - unknown 18:03:40 @@ -3815,6 +3815,7 @@ + unknown Unknown unk Unknown @@ -3826,7 +3827,6 @@ Unknown - unknown 21:00:42 @@ -3917,6 +3917,7 @@ + unknown Unknown unk Unknown @@ -3928,7 +3929,6 @@ Unknown - unknown 20:56:45 @@ -4019,6 +4019,7 @@ + unknown North America amn United States @@ -4030,7 +4031,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 13:49:48 @@ -4121,6 +4121,7 @@ + unknown North America amn United States @@ -4132,7 +4133,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 13:48:20 @@ -4223,6 +4223,7 @@ + unknown North America amn United States @@ -4234,7 +4235,6 @@ Ashburn, Virginia, United States 39.043999 -77.487999 - unknown 13:48:07 @@ -4325,6 +4325,7 @@ + unknown Asia asi Japan @@ -4336,7 +4337,6 @@ Japan 36 138 - unknown 08:12:03 @@ -4427,6 +4427,7 @@ + unknown Asia asi Japan @@ -4438,7 +4439,6 @@ Japan 36 138 - unknown 08:11:56 @@ -4529,6 +4529,7 @@ + unknown Asia asi Japan @@ -4540,7 +4541,6 @@ Japan 36 138 - unknown 08:11:30 @@ -4631,6 +4631,7 @@ + unknown Asia asi Japan @@ -4642,7 +4643,6 @@ Japan 36 138 - unknown 08:10:38 diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml index 84b93135bd6..4af83361f6c 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisitAsc__Live.getLastVisitsDetails_month.xml @@ -66,7 +66,6 @@ - 1024x768 flash, java @@ -102,6 +101,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -218,7 +218,6 @@ - 1024x768 flash, java @@ -254,6 +253,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -339,7 +339,6 @@ - 1024x768 flash, java @@ -375,6 +374,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -491,7 +491,6 @@ - 1024x768 flash, java @@ -527,6 +526,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -612,7 +612,6 @@ - 1024x768 flash, java @@ -648,6 +647,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -764,7 +764,6 @@ - 1024x768 flash, java @@ -800,6 +799,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -877,7 +877,6 @@ - 1024x768 flash, java @@ -913,6 +912,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml index 10c86992caa..18a864dbcdd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByIdVisit__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml index 29273fa92bd..bf87d092566 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortByVisitCount__Live.getLastVisitsDetails_month.xml @@ -97,7 +97,6 @@ - 1024x768 flash, java @@ -135,6 +134,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -220,7 +220,6 @@ - 1024x768 flash, java @@ -258,6 +257,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -374,7 +374,6 @@ - 1024x768 flash, java @@ -412,6 +411,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -511,7 +511,6 @@ - 1024x768 flash, java @@ -549,6 +548,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -634,7 +634,6 @@ - 1024x768 flash, java @@ -672,6 +671,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -757,7 +757,6 @@ - 1024x768 flash, java @@ -795,6 +794,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -870,7 +870,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -908,6 +907,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml index 10c86992caa..18a864dbcdd 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_Live.getLastVisitsDetails_sortDesc__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown diff --git a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml index 85ba4fcaa9e..855cc097558 100644 --- a/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest__Live.getLastVisitsDetails_month.xml @@ -56,7 +56,6 @@ http://google.com/?q=Wikileaks FTW http://google.com plugins/Referrers/images/searchEngines/google.com.png - 1024x768 flash, java @@ -94,6 +93,7 @@ 12:34:06 12 0 + 1024x768 Unknown Unknown @@ -202,7 +202,6 @@ - 1024x768 flash, java @@ -240,6 +239,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -325,7 +325,6 @@ - 1024x768 flash, java @@ -363,6 +362,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -462,7 +462,6 @@ - 1024x768 flash, java @@ -500,6 +499,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -585,7 +585,6 @@ - 1024x768 flash, java @@ -623,6 +622,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -739,7 +739,6 @@ - 1024x768 flash, java @@ -777,6 +776,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -862,7 +862,6 @@ - 1024x768 flash, java @@ -900,6 +899,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -999,7 +999,6 @@ - 1024x768 flash, java @@ -1037,6 +1036,7 @@ 12:34:06 12 10 + 1024x768 Unknown Unknown @@ -1122,7 +1122,6 @@ - 1024x768 flash, java @@ -1160,6 +1159,7 @@ 12:34:06 12 11 + 1024x768 Unknown Unknown @@ -1276,7 +1276,6 @@ - 1024x768 flash, java @@ -1314,6 +1313,7 @@ 12:34:06 12 10 + 1024x768 awesomeisp.com Awesomeisp http://www.awesomeisp.com/ diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml index 32e79a2c86c..664c8bf45f9 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_withCookieSupport__Live.getLastVisitsDetails_day.xml @@ -74,6 +74,7 @@ http://search.yahoo.com/search?p=purchase http://search.yahoo.com plugins/Referrers/images/searchEngines/search.yahoo.com.png + 1024x768 Europe eur France @@ -85,7 +86,6 @@ France - 1024x768 flash, java @@ -260,6 +260,7 @@ http://referrer.com/page.htm?param=valuewith some spaces + 1024x768 Europe eur France @@ -271,7 +272,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml index cff7c54d200..4baa370d704 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_NoKeywordSpecified__Live.getLastVisitsDetails_day.xml @@ -63,6 +63,7 @@ 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 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1024x768 Europe eur France @@ -74,7 +75,6 @@ France - 1024x768 flash, java @@ -168,6 +168,7 @@ http://piwik.org/faq/general/#faq_144 http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1024x768 Europe eur France @@ -179,7 +180,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml index 3847bac724a..3953a817fba 100644 --- a/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml +++ b/tests/PHPUnit/System/expected/test_OneVisitor_SeveralDays_ImportedInRandomOrderTest_shouldShowOneVisit_InEachOfThreeDays__Live.getLastVisitsDetails_month.xml @@ -68,6 +68,7 @@ + unknown Unknown unk Unknown @@ -79,7 +80,6 @@ Unknown - unknown 10:00:00 @@ -159,6 +159,7 @@ + unknown Unknown unk Unknown @@ -170,7 +171,6 @@ Unknown - unknown 11:00:00 @@ -250,6 +250,7 @@ + unknown Unknown unk Unknown @@ -261,7 +262,6 @@ Unknown - unknown 12:00:00 diff --git a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml index e4e40d6f848..d37012289bc 100644 --- a/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_TimezonesTest__Live.getLastVisitsDetails_day.xml @@ -63,6 +63,7 @@ + 1024x768 Europe eur France @@ -74,7 +75,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml index 90ebe565a75..525999bee14 100644 --- a/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml +++ b/tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getReportMetadata_day.xml @@ -192,7 +192,7 @@ Visitor Settings Screen Resolution - UserSettings + Resolution getResolution Resolution @@ -213,9 +213,9 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04 - UserSettings_getResolution + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getResolution&period=day&date=2008-12-06,2009-01-04 + Resolution_getResolution Visitor Settings @@ -240,7 +240,7 @@ Visitor Settings Visitor Configuration - UserSettings + Resolution getConfiguration Configuration This report shows the most common overall configurations that your visitors had. A configuration is the combination of an operating system, a browser type and a screen resolution. @@ -262,9 +262,9 @@ Bounce Rate Conversion Rate - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2009-01-04 - index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=UserSettings&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04 - UserSettings_getConfiguration + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2009-01-04 + index.php?module=API&method=ImageGraph.get&idSite=1&apiModule=Resolution&apiAction=getConfiguration&period=day&date=2008-12-06,2009-01-04 + Resolution_getConfiguration Visitor Settings diff --git a/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv b/tests/PHPUnit/System/expected/test_csvExport__Live.getLastVisitsDetails_day.csv index 74c05412efe173753065c333ec7aa19d9ecffe03..172e23b93df07e039866042b9c715f3ec0070931 100644 GIT binary patch delta 105 zcmca$dBJkSF1E=N*u^IAV!O6^8T%1denSQbtY9z#!O7mjQ#XGS=3(3{#c#rbLpBPR NHWtRsU!?9Z0suhQ9F+h7 delta 125 zcmca$dBJkSF1E=}*n}oOVml&S#E{BR%#hEJ!%)gl!jK7M diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml index 5f2a28ce3e5..6cdb55181ca 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_LiveEcommerceStatusOrdered__Live.getLastVisitsDetails_day.xml @@ -101,6 +101,7 @@ + 1024x768 Europe eur Poland @@ -112,7 +113,6 @@ Poland - 1024x768 flash, java @@ -310,6 +310,7 @@ + 1024x768 Europe eur Poland @@ -321,7 +322,6 @@ Poland - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml index d7897e50e1e..57a190c4a20 100755 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems__Live.getLastVisitsDetails_day.xml @@ -177,6 +177,7 @@ + 1024x768 Europe eur Poland @@ -188,7 +189,6 @@ Poland - 1024x768 flash, java @@ -505,6 +505,7 @@ + 1024x768 Europe eur Poland @@ -516,7 +517,6 @@ Poland - 1024x768 flash, java @@ -719,6 +719,7 @@ + 1024x768 Europe eur France @@ -730,7 +731,6 @@ France - 1024x768 flash, java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml index cecf0df2493..d1d3cb310d6 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisits.xml @@ -71,6 +71,7 @@ + 1111x222 Europe eur France @@ -82,7 +83,6 @@ France - 1111x222 flash, java @@ -184,6 +184,7 @@ + 1111x222 Europe eur France @@ -195,7 +196,6 @@ France - 1111x222 flash, java @@ -357,6 +357,7 @@ http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1111x222 Europe eur France @@ -368,7 +369,6 @@ France - 1111x222 flash, java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml index cecf0df2493..d1d3cb310d6 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getLastVisitsDetails_range.xml @@ -71,6 +71,7 @@ + 1111x222 Europe eur France @@ -82,7 +83,6 @@ France - 1111x222 flash, java @@ -184,6 +184,7 @@ + 1111x222 Europe eur France @@ -195,7 +196,6 @@ France - 1111x222 flash, java @@ -357,6 +357,7 @@ http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1111x222 Europe eur France @@ -368,7 +369,6 @@ France - 1111x222 flash, java diff --git a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml index 64217e52508..76c9807789f 100644 --- a/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml +++ b/tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__Live.getVisitorProfile.xml @@ -117,6 +117,7 @@ + 1111x222 Europe eur France @@ -128,7 +129,6 @@ France - 1111x222 flash, java @@ -231,6 +231,7 @@ + 1111x222 Europe eur France @@ -242,7 +243,6 @@ France - 1111x222 flash, java From 2015a125b0ce43cb2e5af8828186e91faef87975 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Tue, 9 Dec 2014 23:56:08 +0100 Subject: [PATCH 03/12] added new test files --- ...ogs__Resolution.getConfiguration_month.xml | 135 ++++++++++++++++++ ...rtLogs__Resolution.getResolution_month.xml | 36 +++++ ...isits__Resolution.getConfiguration_day.xml | 13 ++ ...woVisits__Resolution.getResolution_day.xml | 13 ++ ...sLast__Resolution.getConfiguration_day.xml | 10 ++ ...Last__Resolution.getConfiguration_week.xml | 10 ++ ...odIsLast__Resolution.getResolution_day.xml | 10 ++ ...dIsLast__Resolution.getResolution_week.xml | 10 ++ ...Visit__Resolution.getConfiguration_day.xml | 2 + ..._noVisit__Resolution.getResolution_day.xml | 2 + 10 files changed, 241 insertions(+) create mode 100644 tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml create mode 100644 tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml create mode 100644 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml create mode 100644 tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml create mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml create mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml create mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml create mode 100644 tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml create mode 100644 tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml create mode 100644 tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml new file mode 100644 index 00000000000..446d719865c --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -0,0 +1,135 @@ + + + + + 5 + 5 + 1 + 0 + 5 + 5 + 5 + 0 + + + + 5 + 8 + 3 + 305 + 3 + 4 + 5 + 0 + + + + 5 + 5 + 1 + 0 + 5 + 5 + 5 + 0 + + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + + + + 2 + 2 + 1 + 0 + 2 + 2 + 2 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 0 + 1 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml new file mode 100644 index 00000000000..659d5beea11 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -0,0 +1,36 @@ + + + + + 25 + 28 + 3 + 305 + 23 + 23 + 25 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + + + 1 + 1 + 1 + 0 + 1 + 1 + 1 + 0 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml new file mode 100644 index 00000000000..1a63f1933ae --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getConfiguration_day.xml @@ -0,0 +1,13 @@ + + + + + 1 + 2 + 8 + 7 + 1621 + 1 + 2 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml new file mode 100644 index 00000000000..ede209680da --- /dev/null +++ b/tests/PHPUnit/System/expected/test_OneVisitorTwoVisits__Resolution.getResolution_day.xml @@ -0,0 +1,13 @@ + + + + + 1 + 2 + 8 + 7 + 1621 + 1 + 2 + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml new file mode 100644 index 00000000000..106f23f16bb --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_day.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml new file mode 100644 index 00000000000..5cfb246edc1 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getConfiguration_week.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml new file mode 100644 index 00000000000..106f23f16bb --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_day.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml new file mode 100644 index 00000000000..5cfb246edc1 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit_PeriodIsLast__Resolution.getResolution_week.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getConfiguration_day.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file diff --git a/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml new file mode 100644 index 00000000000..c234bed59e9 --- /dev/null +++ b/tests/PHPUnit/System/expected/test_noVisit__Resolution.getResolution_day.xml @@ -0,0 +1,2 @@ + + \ No newline at end of file From effa1c3086bd62dc60a3b06864970aaacd3d04cd Mon Sep 17 00:00:00 2001 From: sgiehl Date: Wed, 10 Dec 2014 00:04:18 +0100 Subject: [PATCH 04/12] fixed tests --- .../expected/test_Contents__Live.getLastVisitsDetails_day.xml | 4 ++-- .../test_Contents__Live.getLastVisitsDetails_month.xml | 4 ++-- ...contentInteractionMatch__Live.getLastVisitsDetails_day.xml | 4 ++-- ...ents_contentTargetMatch__Live.getLastVisitsDetails_day.xml | 4 ++-- ...contentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml | 4 ++-- ...stomVariablesSystemTest__Live.getLastVisitsDetails_day.xml | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml index 413ee57f7c6..61ceb207173 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_day.xml @@ -66,6 +66,7 @@ + 1024x768 Europe eur France @@ -77,7 +78,6 @@ France - 1024x768 flash, java @@ -164,6 +164,7 @@ + 1024x768 Europe eur France @@ -175,7 +176,6 @@ France - 1024x768 director diff --git a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml index 413ee57f7c6..61ceb207173 100644 --- a/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml +++ b/plugins/Contents/tests/System/expected/test_Contents__Live.getLastVisitsDetails_month.xml @@ -66,6 +66,7 @@ + 1024x768 Europe eur France @@ -77,7 +78,6 @@ France - 1024x768 flash, java @@ -164,6 +164,7 @@ + 1024x768 Europe eur France @@ -175,7 +176,6 @@ France - 1024x768 director diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml index 413ee57f7c6..61ceb207173 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentInteractionMatch__Live.getLastVisitsDetails_day.xml @@ -66,6 +66,7 @@ + 1024x768 Europe eur France @@ -77,7 +78,6 @@ France - 1024x768 flash, java @@ -164,6 +164,7 @@ + 1024x768 Europe eur France @@ -175,7 +176,6 @@ France - 1024x768 director diff --git a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml index 413ee57f7c6..61ceb207173 100644 --- a/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_Contents_contentTargetMatch__Live.getLastVisitsDetails_day.xml @@ -66,6 +66,7 @@ + 1024x768 Europe eur France @@ -77,7 +78,6 @@ France - 1024x768 flash, java @@ -164,6 +164,7 @@ + 1024x768 Europe eur France @@ -175,7 +176,6 @@ France - 1024x768 director diff --git a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml index 413ee57f7c6..61ceb207173 100644 --- a/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml +++ b/plugins/Contents/tests/System/expected/test_ContentscontentNameOrPieceMatch__Live.getLastVisitsDetails_day.xml @@ -66,6 +66,7 @@ + 1024x768 Europe eur France @@ -77,7 +78,6 @@ France - 1024x768 flash, java @@ -164,6 +164,7 @@ + 1024x768 Europe eur France @@ -175,7 +176,6 @@ France - 1024x768 director diff --git a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml index d1b95ea9e0f..eedf7e3f014 100644 --- a/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml +++ b/plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__Live.getLastVisitsDetails_day.xml @@ -139,6 +139,7 @@ http://www.google.com/search?q=this+keyword+should+be+ranked http://google.com plugins/Referrers/images/searchEngines/google.com.png + 1024x768 Europe eur France @@ -150,7 +151,6 @@ France - 1024x768 flash, java From eb901aadc717c00ea563c7bba7946855ddd8e701 Mon Sep 17 00:00:00 2001 From: Stefan Giehl Date: Wed, 10 Dec 2014 13:09:49 +0100 Subject: [PATCH 05/12] fixed test --- ...isitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index 33678169edf..889cd60ec31 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -109,7 +109,7 @@ public function test_checkArchiveRecords_whenPeriodIsRange() $tests = array( // TODO Implement fix, then remove the +3 below 'archive_blob_2010_12' => ( ($expectedActionsBlobs+3) /*Actions*/ - + 4 /* UserSettings */ + + 2 /* UserSettings */ + 2 /* VisitTime */) * 3, /** @@ -182,4 +182,4 @@ protected function printDebugWhenTestFails($table) } -OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays(); \ No newline at end of file +OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTest::$fixture = new VisitsOverSeveralDays(); From 954df6d4efe919c2cd4e9df6d2930f5eefa937cb Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 12 Dec 2014 19:12:50 +0100 Subject: [PATCH 06/12] fixed tests --- ...y__ScheduledReports.generateReport_month.original.html | 8 ++++---- ...ly__ScheduledReports.generateReport_week.original.html | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html index 4ff46518174..b8846f762cf 100644 --- a/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html +++ b/tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html @@ -45,7 +45,7 @@

  • - + Screen Resolution
    • @@ -55,7 +55,7 @@

  • - + Visitor Configuration
    • @@ -1864,7 +1864,7 @@

    Back to top -

    +

    Screen Resolution

    @@ -2102,7 +2102,7 @@

    Back to top -

    +

    Visitor Configuration

    diff --git a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html index 7402ec0b433..e4b7038652d 100644 --- a/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html +++ b/tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html @@ -45,7 +45,7 @@

  • - + Screen Resolution
    • @@ -55,7 +55,7 @@

  • - + Visitor Configuration
    • @@ -1924,7 +1924,7 @@

    Back to top -

    +

    Screen Resolution

    @@ -2139,7 +2139,7 @@

    Back to top -

    +

    Visitor Configuration

    From 22688c5a4ce9408ccc99d35f171671d7ff86028e Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 12 Dec 2014 20:45:21 +0100 Subject: [PATCH 07/12] fixed tests --- ...ImportLogs__Live.getLastVisitsDetails_range.xml | 8 ++++---- ..._ImportLogs__Resolution.getResolution_month.xml | 14 +++++++------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml index fc1e81976f6..ff63b6a32a3 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Live.getLastVisitsDetails_range.xml @@ -1883,6 +1883,7 @@ + unknown Unknown unk Unknown @@ -1894,7 +1895,6 @@ Unknown - unknown 11:55:13 @@ -1986,6 +1986,7 @@ + unknown North America amn United States @@ -1997,7 +1998,6 @@ United States 38 -97 - unknown 17:30:00 @@ -2106,6 +2106,7 @@ + unknown North America amn United States @@ -2117,7 +2118,6 @@ United States 38 -97 - unknown 17:00:00 @@ -2209,6 +2209,7 @@ + unknown North America amn United States @@ -2220,7 +2221,6 @@ United States 38 -97 - unknown 17:00:00 diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml index 659d5beea11..378996fabca 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getResolution_month.xml @@ -2,14 +2,14 @@ - 25 - 28 + 29 + 34 3 - 305 - 23 - 23 - 25 - 0 + 550 + 25 + 27 + 28 + 2 From 719d52ba458c811e07209539211dae8015e5d30b Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 12 Dec 2014 22:05:20 +0100 Subject: [PATCH 08/12] fixed test --- ...ogs__Resolution.getConfiguration_month.xml | 38 +++++++++++++++---- 1 file changed, 30 insertions(+), 8 deletions(-) diff --git a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml index 446d719865c..75d278b51bb 100644 --- a/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml +++ b/tests/PHPUnit/System/expected/test_ImportLogs__Resolution.getConfiguration_month.xml @@ -33,6 +33,17 @@ 5 0 + + + 3 + 3 + 1 + 1 + 3 + 3 + 2 + 1 + 2 @@ -67,18 +78,18 @@ 0 - + 1 - 1 - 1 - 0 - 1 + 2 + 2 + 2 + 0 1 1 - 0 + 1 - + 1 1 1 @@ -89,7 +100,7 @@ 0 - + 1 1 1 @@ -110,6 +121,17 @@ 1 0 + + + 1 + 2 + 2 + 242 + 0 + 1 + 1 + 0 + 1 From 97653c51427f9c64eec717d2e7f79d2f366800e9 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 12 Dec 2014 23:05:47 +0100 Subject: [PATCH 09/12] small adjustments --- core/Updates/{2.10.0-b6.php => 2.10.0-b7.php} | 2 +- core/Version.php | 2 +- plugins/UserSettings/UserSettings.php | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) rename core/Updates/{2.10.0-b6.php => 2.10.0-b7.php} (96%) diff --git a/core/Updates/2.10.0-b6.php b/core/Updates/2.10.0-b7.php similarity index 96% rename from core/Updates/2.10.0-b6.php rename to core/Updates/2.10.0-b7.php index aac4e8b7e4f..a44117fc811 100644 --- a/core/Updates/2.10.0-b6.php +++ b/core/Updates/2.10.0-b7.php @@ -13,7 +13,7 @@ use Piwik\Updater; use Piwik\Updates; -class Updates_2_10_0_b6 extends Updates +class Updates_2_10_0_b7 extends Updates { static function getSql() diff --git a/core/Version.php b/core/Version.php index 6d2dea8e5a4..7b382341efa 100644 --- a/core/Version.php +++ b/core/Version.php @@ -20,5 +20,5 @@ final class Version * The current Piwik version. * @var string */ - const VERSION = '2.10.0-b6'; + const VERSION = '2.10.0-b7'; } diff --git a/plugins/UserSettings/UserSettings.php b/plugins/UserSettings/UserSettings.php index da1e625af0f..f72269dedf4 100644 --- a/plugins/UserSettings/UserSettings.php +++ b/plugins/UserSettings/UserSettings.php @@ -53,7 +53,7 @@ public function mapDeprecatedActions(&$module, &$action, &$parameters) $action = $movedMethods[$action]; } - if ($module == 'UserSettings' && $action == 'getResolution') { + if ($module == 'UserSettings' && ($action == 'getResolution' || $action == 'getConfiguration')) { $module = 'Resolution'; } } From b2e13df2c4836b480a684a4dc277146696586bbc Mon Sep 17 00:00:00 2001 From: sgiehl Date: Fri, 12 Dec 2014 23:11:15 +0100 Subject: [PATCH 10/12] synced language files --- plugins/Resolution/lang/am.json | 10 ++++++++++ plugins/Resolution/lang/ar.json | 10 ++++++++++ plugins/Resolution/lang/be.json | 11 +++++++++++ plugins/Resolution/lang/bg.json | 11 +++++++++++ plugins/Resolution/lang/ca.json | 11 +++++++++++ plugins/Resolution/lang/cs.json | 11 +++++++++++ plugins/Resolution/lang/da.json | 11 +++++++++++ plugins/Resolution/lang/de.json | 11 +++++++++++ plugins/Resolution/lang/el.json | 11 +++++++++++ plugins/Resolution/lang/es.json | 11 +++++++++++ plugins/Resolution/lang/et.json | 10 ++++++++++ plugins/Resolution/lang/eu.json | 10 ++++++++++ plugins/Resolution/lang/fa.json | 11 +++++++++++ plugins/Resolution/lang/fi.json | 11 +++++++++++ plugins/Resolution/lang/fr.json | 11 +++++++++++ plugins/Resolution/lang/gl.json | 8 ++++++++ plugins/Resolution/lang/he.json | 5 +++++ plugins/Resolution/lang/hi.json | 9 +++++++++ plugins/Resolution/lang/hr.json | 7 +++++++ plugins/Resolution/lang/hu.json | 10 ++++++++++ plugins/Resolution/lang/id.json | 11 +++++++++++ plugins/Resolution/lang/is.json | 10 ++++++++++ plugins/Resolution/lang/it.json | 11 +++++++++++ plugins/Resolution/lang/ja.json | 11 +++++++++++ plugins/Resolution/lang/ka.json | 10 ++++++++++ plugins/Resolution/lang/ko.json | 11 +++++++++++ plugins/Resolution/lang/lt.json | 10 ++++++++++ plugins/Resolution/lang/lv.json | 11 +++++++++++ plugins/Resolution/lang/nb.json | 10 ++++++++++ plugins/Resolution/lang/nl.json | 11 +++++++++++ plugins/Resolution/lang/nn.json | 10 ++++++++++ plugins/Resolution/lang/pl.json | 10 ++++++++++ plugins/Resolution/lang/pt-br.json | 11 +++++++++++ plugins/Resolution/lang/pt.json | 11 +++++++++++ plugins/Resolution/lang/ro.json | 11 +++++++++++ plugins/Resolution/lang/ru.json | 11 +++++++++++ plugins/Resolution/lang/sk.json | 10 ++++++++++ plugins/Resolution/lang/sl.json | 9 +++++++++ plugins/Resolution/lang/sq.json | 11 +++++++++++ plugins/Resolution/lang/sr.json | 11 +++++++++++ plugins/Resolution/lang/sv.json | 11 +++++++++++ plugins/Resolution/lang/te.json | 6 ++++++ plugins/Resolution/lang/th.json | 10 ++++++++++ plugins/Resolution/lang/tl.json | 11 +++++++++++ plugins/Resolution/lang/tr.json | 10 ++++++++++ plugins/Resolution/lang/uk.json | 10 ++++++++++ plugins/Resolution/lang/vi.json | 11 +++++++++++ plugins/Resolution/lang/zh-cn.json | 11 +++++++++++ plugins/Resolution/lang/zh-tw.json | 11 +++++++++++ plugins/UserSettings/lang/am.json | 8 +------- plugins/UserSettings/lang/ar.json | 8 +------- plugins/UserSettings/lang/be.json | 9 +-------- plugins/UserSettings/lang/bg.json | 9 +-------- plugins/UserSettings/lang/ca.json | 9 +-------- plugins/UserSettings/lang/cs.json | 9 +-------- plugins/UserSettings/lang/da.json | 9 +-------- plugins/UserSettings/lang/de.json | 9 +-------- plugins/UserSettings/lang/el.json | 9 +-------- plugins/UserSettings/lang/es.json | 9 +-------- plugins/UserSettings/lang/et.json | 8 +------- plugins/UserSettings/lang/eu.json | 8 +------- plugins/UserSettings/lang/fa.json | 9 +-------- plugins/UserSettings/lang/fi.json | 9 +-------- plugins/UserSettings/lang/fr.json | 9 +-------- plugins/UserSettings/lang/gl.json | 6 +----- plugins/UserSettings/lang/he.json | 3 +-- plugins/UserSettings/lang/hi.json | 7 +------ plugins/UserSettings/lang/hr.json | 3 --- plugins/UserSettings/lang/hu.json | 8 +------- plugins/UserSettings/lang/id.json | 9 +-------- plugins/UserSettings/lang/is.json | 8 +------- plugins/UserSettings/lang/it.json | 9 +-------- plugins/UserSettings/lang/ja.json | 9 +-------- plugins/UserSettings/lang/ka.json | 8 +------- plugins/UserSettings/lang/ko.json | 9 +-------- plugins/UserSettings/lang/lt.json | 8 +------- plugins/UserSettings/lang/lv.json | 9 +-------- plugins/UserSettings/lang/nb.json | 8 +------- plugins/UserSettings/lang/nl.json | 9 +-------- plugins/UserSettings/lang/nn.json | 8 +------- plugins/UserSettings/lang/pl.json | 8 +------- plugins/UserSettings/lang/pt-br.json | 9 +-------- plugins/UserSettings/lang/pt.json | 9 +-------- plugins/UserSettings/lang/ro.json | 9 +-------- plugins/UserSettings/lang/ru.json | 9 +-------- plugins/UserSettings/lang/sk.json | 8 +------- plugins/UserSettings/lang/sl.json | 7 +------ plugins/UserSettings/lang/sq.json | 9 +-------- plugins/UserSettings/lang/sr.json | 9 +-------- plugins/UserSettings/lang/sv.json | 9 +-------- plugins/UserSettings/lang/te.json | 2 -- plugins/UserSettings/lang/th.json | 8 +------- plugins/UserSettings/lang/tl.json | 9 +-------- plugins/UserSettings/lang/tr.json | 8 +------- plugins/UserSettings/lang/uk.json | 8 +------- plugins/UserSettings/lang/vi.json | 9 +-------- plugins/UserSettings/lang/zh-cn.json | 9 +-------- plugins/UserSettings/lang/zh-tw.json | 9 +-------- 98 files changed, 549 insertions(+), 353 deletions(-) create mode 100644 plugins/Resolution/lang/am.json create mode 100644 plugins/Resolution/lang/ar.json create mode 100644 plugins/Resolution/lang/be.json create mode 100644 plugins/Resolution/lang/bg.json create mode 100644 plugins/Resolution/lang/ca.json create mode 100644 plugins/Resolution/lang/cs.json create mode 100644 plugins/Resolution/lang/da.json create mode 100644 plugins/Resolution/lang/de.json create mode 100644 plugins/Resolution/lang/el.json create mode 100644 plugins/Resolution/lang/es.json create mode 100644 plugins/Resolution/lang/et.json create mode 100644 plugins/Resolution/lang/eu.json create mode 100644 plugins/Resolution/lang/fa.json create mode 100644 plugins/Resolution/lang/fi.json create mode 100644 plugins/Resolution/lang/fr.json create mode 100644 plugins/Resolution/lang/gl.json create mode 100644 plugins/Resolution/lang/he.json create mode 100644 plugins/Resolution/lang/hi.json create mode 100644 plugins/Resolution/lang/hr.json create mode 100644 plugins/Resolution/lang/hu.json create mode 100644 plugins/Resolution/lang/id.json create mode 100644 plugins/Resolution/lang/is.json create mode 100644 plugins/Resolution/lang/it.json create mode 100644 plugins/Resolution/lang/ja.json create mode 100644 plugins/Resolution/lang/ka.json create mode 100644 plugins/Resolution/lang/ko.json create mode 100644 plugins/Resolution/lang/lt.json create mode 100644 plugins/Resolution/lang/lv.json create mode 100644 plugins/Resolution/lang/nb.json create mode 100644 plugins/Resolution/lang/nl.json create mode 100644 plugins/Resolution/lang/nn.json create mode 100644 plugins/Resolution/lang/pl.json create mode 100644 plugins/Resolution/lang/pt-br.json create mode 100644 plugins/Resolution/lang/pt.json create mode 100644 plugins/Resolution/lang/ro.json create mode 100644 plugins/Resolution/lang/ru.json create mode 100644 plugins/Resolution/lang/sk.json create mode 100644 plugins/Resolution/lang/sl.json create mode 100644 plugins/Resolution/lang/sq.json create mode 100644 plugins/Resolution/lang/sr.json create mode 100644 plugins/Resolution/lang/sv.json create mode 100644 plugins/Resolution/lang/te.json create mode 100644 plugins/Resolution/lang/th.json create mode 100644 plugins/Resolution/lang/tl.json create mode 100644 plugins/Resolution/lang/tr.json create mode 100644 plugins/Resolution/lang/uk.json create mode 100644 plugins/Resolution/lang/vi.json create mode 100644 plugins/Resolution/lang/zh-cn.json create mode 100644 plugins/Resolution/lang/zh-tw.json diff --git a/plugins/Resolution/lang/am.json b/plugins/Resolution/lang/am.json new file mode 100644 index 00000000000..db863d489e9 --- /dev/null +++ b/plugins/Resolution/lang/am.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "ውቅረት", + "ColumnResolution": "ጥራት", + "Configurations": "ውቅረቶች", + "Resolutions": "ጥራቶች", + "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት", + "WidgetResolutions": "የማያ ጥራቶች" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ar.json b/plugins/Resolution/lang/ar.json new file mode 100644 index 00000000000..7d9bfebc013 --- /dev/null +++ b/plugins/Resolution/lang/ar.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "الإعداد", + "ColumnResolution": "الكثافة النقطية", + "Configurations": "الإعدادات", + "Resolutions": "الكثافات النقطية", + "WidgetGlobalVisitors": "الإعدادات العامة للزوار", + "WidgetResolutions": "كثافات الشاشة النقطية" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/be.json b/plugins/Resolution/lang/be.json new file mode 100644 index 00000000000..d62451282c8 --- /dev/null +++ b/plugins/Resolution/lang/be.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Канфігурацыя", + "ColumnResolution": "Дазвол", + "Configurations": "Па канфігурацыі", + "Resolutions": "Па дазволе манітораў", + "WidgetGlobalVisitors": "Глабальная канфігурацыя", + "WidgetGlobalVisitorsDocumentation": "Гэтая справаздача паказвае найбольш распаўсюджаныя агульныя канфігурацыі, якія мелі вашы наведвальнікі. Канфігурацыя - гэта спалучэнне аперацыйнай сістэмы, тыпу браўзэра і дазволу экрана.", + "WidgetResolutions": "Дазвол манітораў" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/bg.json b/plugins/Resolution/lang/bg.json new file mode 100644 index 00000000000..03e0d97f0b8 --- /dev/null +++ b/plugins/Resolution/lang/bg.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Обобщена конфигурация", + "ColumnResolution": "Разделителна способност на екрана", + "Configurations": "Конфигурации", + "Resolutions": "Разделителна способност", + "WidgetGlobalVisitors": "Конфигурация на гло", + "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цялостни конфигурации, които вашите посетители са имали. Конфигурация е комбинацията от операционна система, тип на браузера и резолюция на екрана.", + "WidgetResolutions": "Разделителна способност" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ca.json b/plugins/Resolution/lang/ca.json new file mode 100644 index 00000000000..bda670af656 --- /dev/null +++ b/plugins/Resolution/lang/ca.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuració", + "ColumnResolution": "Resolució", + "Configurations": "Configuracions", + "Resolutions": "Resolucions", + "WidgetGlobalVisitors": "Configuracions globals dels visitants", + "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.", + "WidgetResolutions": "Resolucions" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/cs.json b/plugins/Resolution/lang/cs.json new file mode 100644 index 00000000000..9173a432a8e --- /dev/null +++ b/plugins/Resolution/lang/cs.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigurace", + "ColumnResolution": "Rozlišení", + "Configurations": "Nastavení", + "Resolutions": "Rozlišení", + "WidgetGlobalVisitors": "Hlavní nastavení návštěvníků", + "WidgetGlobalVisitorsDocumentation": "Toto hlášení zobrazuje nejčastější konfigurace, které vaši návštěvníci měli. Konfigurace je kombinace operačního systému, prohlížeče a rozlišení.", + "WidgetResolutions": "Rozlišení obrazovky" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/da.json b/plugins/Resolution/lang/da.json new file mode 100644 index 00000000000..cab3e107312 --- /dev/null +++ b/plugins/Resolution/lang/da.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfiguration", + "ColumnResolution": "Opløsning", + "Configurations": "Indstillinger", + "Resolutions": "Opløsninger", + "WidgetGlobalVisitors": "Besøgendes konfiguration", + "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.", + "WidgetResolutions": "Skærmopløsninger" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/de.json b/plugins/Resolution/lang/de.json new file mode 100644 index 00000000000..3581dd953d3 --- /dev/null +++ b/plugins/Resolution/lang/de.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfiguration", + "ColumnResolution": "Auflösung", + "Configurations": "Konfigurationen", + "Resolutions": "Auflösungen", + "WidgetGlobalVisitors": "Globale Besucherkonfiguration", + "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.", + "WidgetResolutions": "Bildschirmauflösungen" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/el.json b/plugins/Resolution/lang/el.json new file mode 100644 index 00000000000..4eac9d0139f --- /dev/null +++ b/plugins/Resolution/lang/el.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Ρύθμιση", + "ColumnResolution": "Ανάλυση", + "Configurations": "Ρυθμίσεις", + "Resolutions": "Αναλύσεις οθόνης", + "WidgetGlobalVisitors": "Γενικές ρυθμίσεις χρηστών", + "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφορά δείχνει τις πιο συχνές καθολικές ρυθμίσεις που έχουν οι επισκέπτες σας. Μια ρύθμιση είναι ο συνδυασμός του λειτουργικού συστήματος, του τύπου φυλλομετρητή και της ανάλυσης οθόνης.", + "WidgetResolutions": "Αναλύσεις οθόνης" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/es.json b/plugins/Resolution/lang/es.json new file mode 100644 index 00000000000..dd606039e1d --- /dev/null +++ b/plugins/Resolution/lang/es.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuración", + "ColumnResolution": "Resoluciones", + "Configurations": "Configuración", + "Resolutions": "Resoluciones", + "WidgetGlobalVisitors": "Configuración global de visitantes", + "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.", + "WidgetResolutions": "Resoluciones de pantalla" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/et.json b/plugins/Resolution/lang/et.json new file mode 100644 index 00000000000..30eccef1b5d --- /dev/null +++ b/plugins/Resolution/lang/et.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfiguratsioon", + "ColumnResolution": "Resolutsioon", + "Configurations": "Konfiguratsioonid", + "Resolutions": "Ekraani resolutsioonid", + "WidgetGlobalVisitors": "Kohalike külastajate seaded", + "WidgetResolutions": "Ekraani resolutsioonid" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/eu.json b/plugins/Resolution/lang/eu.json new file mode 100644 index 00000000000..b1b820a1c23 --- /dev/null +++ b/plugins/Resolution/lang/eu.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigurazioa", + "ColumnResolution": "Bereizmena", + "Configurations": "Konfigurazioak", + "Resolutions": "Bereizmenak", + "WidgetGlobalVisitors": "Bisitarien konfigurazioa", + "WidgetResolutions": "Pantailaren bereizmenak" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/fa.json b/plugins/Resolution/lang/fa.json new file mode 100644 index 00000000000..cafca9deb70 --- /dev/null +++ b/plugins/Resolution/lang/fa.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "پیکربندی", + "ColumnResolution": "رزلوشن", + "Configurations": "پیکربندی", + "Resolutions": "رزلوشن", + "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی", + "WidgetGlobalVisitorsDocumentation": "این گزارش نشان می دهد پیکربندی کلی شایع ترین است که بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر و صفحه نمایش با وضوح است.", + "WidgetResolutions": "رزلوشن نمایشگر" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/fi.json b/plugins/Resolution/lang/fi.json new file mode 100644 index 00000000000..70b35a17f69 --- /dev/null +++ b/plugins/Resolution/lang/fi.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Asetukset", + "ColumnResolution": "Resoluutio", + "Configurations": "Asetukset", + "Resolutions": "Resoluutio", + "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset", + "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.", + "WidgetResolutions": "Näytön resoluutio" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/fr.json b/plugins/Resolution/lang/fr.json new file mode 100644 index 00000000000..fc933f2519a --- /dev/null +++ b/plugins/Resolution/lang/fr.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuration", + "ColumnResolution": "Résolution", + "Configurations": "Configurations", + "Resolutions": "Résolutions", + "WidgetGlobalVisitors": "Configuration globale des visiteurs", + "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.", + "WidgetResolutions": "Résolutions d'écran" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/gl.json b/plugins/Resolution/lang/gl.json new file mode 100644 index 00000000000..aaa796e7cab --- /dev/null +++ b/plugins/Resolution/lang/gl.json @@ -0,0 +1,8 @@ +{ + "Resolution": { + "Configurations": "Configuracións", + "Resolutions": "Resolucións", + "WidgetGlobalVisitors": "Configuración global de visitantes", + "WidgetResolutions": "Resolucións de pantalla" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/he.json b/plugins/Resolution/lang/he.json new file mode 100644 index 00000000000..bd836557877 --- /dev/null +++ b/plugins/Resolution/lang/he.json @@ -0,0 +1,5 @@ +{ + "Resolution": { + "WidgetResolutions": "רזולוציית מסך" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/hi.json b/plugins/Resolution/lang/hi.json new file mode 100644 index 00000000000..5918da9c01f --- /dev/null +++ b/plugins/Resolution/lang/hi.json @@ -0,0 +1,9 @@ +{ + "Resolution": { + "ColumnConfiguration": "विन्यास", + "ColumnResolution": "संकल्प", + "Configurations": "विन्यास", + "Resolutions": "संकल्प", + "WidgetGlobalVisitors": "आगंतुक विन्यास" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/hr.json b/plugins/Resolution/lang/hr.json new file mode 100644 index 00000000000..a1b2c845ef3 --- /dev/null +++ b/plugins/Resolution/lang/hr.json @@ -0,0 +1,7 @@ +{ + "Resolution": { + "ColumnConfiguration": "KOnfiguracija", + "ColumnResolution": "Rezolucija", + "Configurations": "Konfiguracija" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/hu.json b/plugins/Resolution/lang/hu.json new file mode 100644 index 00000000000..1be3f7ca3e1 --- /dev/null +++ b/plugins/Resolution/lang/hu.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfiguráció", + "ColumnResolution": "Felbontás", + "Configurations": "Konfigurációk", + "Resolutions": "Képernyőfelbontások", + "WidgetGlobalVisitors": "Globális látogatói beállítások", + "WidgetResolutions": "Képernyőfelbontások" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/id.json b/plugins/Resolution/lang/id.json new file mode 100644 index 00000000000..e2245673796 --- /dev/null +++ b/plugins/Resolution/lang/id.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Pengaturan", + "ColumnResolution": "Resolusi", + "Configurations": "Pengaturan", + "Resolutions": "Resolusi", + "WidgetGlobalVisitors": "Pengaturan pengunjung umum", + "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.", + "WidgetResolutions": "Resolusi layar" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/is.json b/plugins/Resolution/lang/is.json new file mode 100644 index 00000000000..d3b2411f153 --- /dev/null +++ b/plugins/Resolution/lang/is.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Uppsetning", + "ColumnResolution": "Skjáupplausn", + "Configurations": "Uppsetningar", + "Resolutions": "Skjáupplausnir", + "WidgetGlobalVisitors": "Altæk gestastilling", + "WidgetResolutions": "Skjáupplausnir" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/it.json b/plugins/Resolution/lang/it.json new file mode 100644 index 00000000000..d66edce2566 --- /dev/null +++ b/plugins/Resolution/lang/it.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configurazione", + "ColumnResolution": "Risoluzione", + "Configurations": "Configurazioni", + "Resolutions": "Risoluzioni", + "WidgetGlobalVisitors": "Riepilogo configurazione visitatori", + "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.", + "WidgetResolutions": "Risoluzione schermo" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ja.json b/plugins/Resolution/lang/ja.json new file mode 100644 index 00000000000..08594ca73d0 --- /dev/null +++ b/plugins/Resolution/lang/ja.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "環境設定", + "ColumnResolution": "解像度", + "Configurations": "環境設定", + "Resolutions": "解像度", + "WidgetGlobalVisitors": "ビジターの全般的な環境設定", + "WidgetGlobalVisitorsDocumentation": "ビジターの最も一般的な利用環境についてのリポートです。オペレーティングシステム、ブラウザの種類と画面の解像度の組合せで表示します。", + "WidgetResolutions": "画面解像度" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ka.json b/plugins/Resolution/lang/ka.json new file mode 100644 index 00000000000..4ef05cca972 --- /dev/null +++ b/plugins/Resolution/lang/ka.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "კონფიგურაცია", + "ColumnResolution": "რეზოლუცია", + "Configurations": "გონფიგურაციები", + "Resolutions": "რეზოლუციები", + "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია", + "WidgetResolutions": "ეკრანის რეზოლუვიები" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ko.json b/plugins/Resolution/lang/ko.json new file mode 100644 index 00000000000..d76113b7af8 --- /dev/null +++ b/plugins/Resolution/lang/ko.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "구성", + "ColumnResolution": "해상도", + "Configurations": "구성", + "Resolutions": "해상도", + "WidgetGlobalVisitors": "글로벌 방문자 구성", + "WidgetGlobalVisitorsDocumentation": "방문자의 가장 일반적인 사용 환경에 대한 보고서입니다. 운영 체제, 브라우저 종류와 화면 해상도의 조합으로 표시합니다.", + "WidgetResolutions": "스크린 해상도" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/lt.json b/plugins/Resolution/lang/lt.json new file mode 100644 index 00000000000..34d0e7299fe --- /dev/null +++ b/plugins/Resolution/lang/lt.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigūracija", + "ColumnResolution": "Ekrano raiška", + "Configurations": "Konfigūracijos", + "Resolutions": "Ekranų raiškos", + "WidgetGlobalVisitors": "Bendri lankytojų nustatymai", + "WidgetResolutions": "Ekrano raiška" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/lv.json b/plugins/Resolution/lang/lv.json new file mode 100644 index 00000000000..4183c8b7ce5 --- /dev/null +++ b/plugins/Resolution/lang/lv.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigurācija", + "ColumnResolution": "Ekrāna izšķirtspēja", + "Configurations": "Konfigurācijas", + "Resolutions": "Ekrāna izšķirtspējas", + "WidgetGlobalVisitors": "Globālā apmeklētāju konfigurācija", + "WidgetGlobalVisitorsDocumentation": "Šajā atskaitē redzamas visbiežāk izmantotās apmeklētāju konfigurācijas. Konfigurācija ir operētājsistēmas, pārlūka tipa un ekrāna izšķirtspējas kombinācija.", + "WidgetResolutions": "Ekrāna izšķirtspējas" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/nb.json b/plugins/Resolution/lang/nb.json new file mode 100644 index 00000000000..add66843bb9 --- /dev/null +++ b/plugins/Resolution/lang/nb.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigurasjon", + "ColumnResolution": "Oppløsning", + "Configurations": "Konfigurasjon", + "Resolutions": "Oppløsninger", + "WidgetGlobalVisitors": "Besøkendes konfigurasjon", + "WidgetResolutions": "Skjermoppløsninger" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/nl.json b/plugins/Resolution/lang/nl.json new file mode 100644 index 00000000000..d9724ada1a9 --- /dev/null +++ b/plugins/Resolution/lang/nl.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuratie", + "ColumnResolution": "Resolutie", + "Configurations": "Configuraties", + "Resolutions": "Schermresoluties", + "WidgetGlobalVisitors": "Algemene configuratie", + "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.", + "WidgetResolutions": "Schermresoluties" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/nn.json b/plugins/Resolution/lang/nn.json new file mode 100644 index 00000000000..0524f04c04c --- /dev/null +++ b/plugins/Resolution/lang/nn.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigurasjon", + "ColumnResolution": "Oppløysing", + "Configurations": "Konfigurasjonar", + "Resolutions": "Oppløysingar", + "WidgetGlobalVisitors": "Global vitjarkonfigurasjon", + "WidgetResolutions": "Skjermoppløysing" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/pl.json b/plugins/Resolution/lang/pl.json new file mode 100644 index 00000000000..00459e717b5 --- /dev/null +++ b/plugins/Resolution/lang/pl.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfiguracja", + "ColumnResolution": "Rozdzielczość", + "Configurations": "Konfiguracje", + "Resolutions": "Rozdzielczość", + "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających", + "WidgetResolutions": "Rozdzielczość ekranu" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/pt-br.json b/plugins/Resolution/lang/pt-br.json new file mode 100644 index 00000000000..aed2a71000a --- /dev/null +++ b/plugins/Resolution/lang/pt-br.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuração", + "ColumnResolution": "Resolução", + "Configurations": "Configurações", + "Resolutions": "Resoluções", + "WidgetGlobalVisitors": "Configuração Global de Visitante", + "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.", + "WidgetResolutions": "Resoluções de Tela" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/pt.json b/plugins/Resolution/lang/pt.json new file mode 100644 index 00000000000..1dd610e6790 --- /dev/null +++ b/plugins/Resolution/lang/pt.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuração", + "ColumnResolution": "Resolução", + "Configurations": "Configurações", + "Resolutions": "Resoluções", + "WidgetGlobalVisitors": "Configuração global dos visitantes", + "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.", + "WidgetResolutions": "Resoluções de Ecrã" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ro.json b/plugins/Resolution/lang/ro.json new file mode 100644 index 00000000000..0ffc306ee53 --- /dev/null +++ b/plugins/Resolution/lang/ro.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuraţia", + "ColumnResolution": "Rezoluţie ecran", + "Configurations": "Configurare", + "Resolutions": "Rezolutii", + "WidgetGlobalVisitors": "Configurare vizitatori globala", + "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.", + "WidgetResolutions": "Rezolutii ecran" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/ru.json b/plugins/Resolution/lang/ru.json new file mode 100644 index 00000000000..8581b68f31c --- /dev/null +++ b/plugins/Resolution/lang/ru.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Конфигурация", + "ColumnResolution": "Разрешение", + "Configurations": "По конфигурации", + "Resolutions": "По разрешению мониторов", + "WidgetGlobalVisitors": "Глобальная конфигурация", + "WidgetGlobalVisitorsDocumentation": "Этот отчет показывает общую информацию по наиболее популяоным конфигурациям системы ваших посетителей. Конфигурация - это комбинация операционной системы, браузера и разрешения экрана.", + "WidgetResolutions": "По разрешению мониторов" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/sk.json b/plugins/Resolution/lang/sk.json new file mode 100644 index 00000000000..e956c534396 --- /dev/null +++ b/plugins/Resolution/lang/sk.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigurácia", + "ColumnResolution": "Rozlíšenie", + "Configurations": "Konfigurácia", + "Resolutions": "Rozlíšenie", + "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov", + "WidgetResolutions": "Rozlíšenie obrazovky" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/sl.json b/plugins/Resolution/lang/sl.json new file mode 100644 index 00000000000..b2b1440a31a --- /dev/null +++ b/plugins/Resolution/lang/sl.json @@ -0,0 +1,9 @@ +{ + "Resolution": { + "ColumnConfiguration": "Nastavitev", + "ColumnResolution": "Resolucija", + "Configurations": "Nastavitve", + "Resolutions": "Resolucije", + "WidgetResolutions": "Resolucija zaslona" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/sq.json b/plugins/Resolution/lang/sq.json new file mode 100644 index 00000000000..15b9a9c3ab3 --- /dev/null +++ b/plugins/Resolution/lang/sq.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Formësim", + "ColumnResolution": "Qartësi", + "Configurations": "Formësime", + "Resolutions": "Qartësi", + "WidgetGlobalVisitors": "Formësime globale vizitorësh", + "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.", + "WidgetResolutions": "Qartësi ekrani" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/sr.json b/plugins/Resolution/lang/sr.json new file mode 100644 index 00000000000..56c82ccd4b0 --- /dev/null +++ b/plugins/Resolution/lang/sr.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Podešavanja", + "ColumnResolution": "Rezolucija", + "Configurations": "Podešavanja", + "Resolutions": "Rezolucije", + "WidgetGlobalVisitors": "Globalna podešavanja posetilaca", + "WidgetGlobalVisitorsDocumentation": "Ovaj izveštaj prikazuje najčešća podešavanja vaših posetilaca. Pod podešavanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.", + "WidgetResolutions": "Rezolucije ekrana" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/sv.json b/plugins/Resolution/lang/sv.json new file mode 100644 index 00000000000..232f7de8d34 --- /dev/null +++ b/plugins/Resolution/lang/sv.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfiguration", + "ColumnResolution": "Skärmupplösning", + "Configurations": "Konfiguration", + "Resolutions": "Skärmupplösning", + "WidgetGlobalVisitors": "Global besökarkonfiguration", + "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.", + "WidgetResolutions": "Skärmupplösning" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/te.json b/plugins/Resolution/lang/te.json new file mode 100644 index 00000000000..ee4af78da4b --- /dev/null +++ b/plugins/Resolution/lang/te.json @@ -0,0 +1,6 @@ +{ + "Resolution": { + "ColumnConfiguration": "స్వరూపణం", + "Configurations": "స్వరూపణలు" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/th.json b/plugins/Resolution/lang/th.json new file mode 100644 index 00000000000..dcdc1ca7d19 --- /dev/null +++ b/plugins/Resolution/lang/th.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "การตั้งค่า", + "ColumnResolution": "ความละเอียด", + "Configurations": "การกำหนดค่า", + "Resolutions": "ความละเอียด", + "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม", + "WidgetResolutions": "ความละเอียดจอภาพ" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/tl.json b/plugins/Resolution/lang/tl.json new file mode 100644 index 00000000000..5d126ac0f69 --- /dev/null +++ b/plugins/Resolution/lang/tl.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Configuration", + "ColumnResolution": "Resolusyon", + "Configurations": "Configurations", + "Resolutions": "Mga Resolution", + "WidgetGlobalVisitors": "Configuration ng bisita", + "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.", + "WidgetResolutions": "Screen Resolution" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/tr.json b/plugins/Resolution/lang/tr.json new file mode 100644 index 00000000000..91a8e73aa43 --- /dev/null +++ b/plugins/Resolution/lang/tr.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Konfigürasyon", + "ColumnResolution": "Çözünürlük", + "Configurations": "Konfigürasyonları", + "Resolutions": "Çözünürlükler", + "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu", + "WidgetResolutions": "Ekran çözünürlükleri" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/uk.json b/plugins/Resolution/lang/uk.json new file mode 100644 index 00000000000..546bbaec479 --- /dev/null +++ b/plugins/Resolution/lang/uk.json @@ -0,0 +1,10 @@ +{ + "Resolution": { + "ColumnConfiguration": "Конфігурація", + "ColumnResolution": "Роздільна здатність", + "Configurations": "Конфігурації", + "Resolutions": "Роздільні здатності", + "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів", + "WidgetResolutions": "Роздільні здатності" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/vi.json b/plugins/Resolution/lang/vi.json new file mode 100644 index 00000000000..600e5fe0ad6 --- /dev/null +++ b/plugins/Resolution/lang/vi.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "Cấu hình", + "ColumnResolution": "Độ phân giải", + "Configurations": "cấu hình", + "Resolutions": "Độ phân giải", + "WidgetGlobalVisitors": "Cấu hình khách truy cập", + "WidgetGlobalVisitorsDocumentation": "Báo cáo này cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cập của bạn đã có. Một cấu hình là sự kết hợp của một hệ điều hành, một loại trình duyệt và độ phân giải màn hình.", + "WidgetResolutions": "Độ phân giải màn hình" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/zh-cn.json b/plugins/Resolution/lang/zh-cn.json new file mode 100644 index 00000000000..ad8ae4895ec --- /dev/null +++ b/plugins/Resolution/lang/zh-cn.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "客户端配置", + "ColumnResolution": "分辨率", + "Configurations": "客户端配置", + "Resolutions": "分辨率", + "WidgetGlobalVisitors": "访客设置", + "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统配置。系统配置是操作系统、浏览器类型及显示器分辨率的组合。", + "WidgetResolutions": "画面分辨率" + } +} \ No newline at end of file diff --git a/plugins/Resolution/lang/zh-tw.json b/plugins/Resolution/lang/zh-tw.json new file mode 100644 index 00000000000..6247b35720f --- /dev/null +++ b/plugins/Resolution/lang/zh-tw.json @@ -0,0 +1,11 @@ +{ + "Resolution": { + "ColumnConfiguration": "客戶端配置", + "ColumnResolution": "解析度", + "Configurations": "客戶端配置", + "Resolutions": "解析度", + "WidgetGlobalVisitors": "全域訪客配置", + "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。", + "WidgetResolutions": "畫面解析度" + } +} \ No newline at end of file diff --git a/plugins/UserSettings/lang/am.json b/plugins/UserSettings/lang/am.json index 2897ffa6185..037b6c32494 100644 --- a/plugins/UserSettings/lang/am.json +++ b/plugins/UserSettings/lang/am.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "ውቅረት", - "ColumnResolution": "ጥራት", - "Configurations": "ውቅረቶች", "Language_aa": "አፋርኛ", "Language_ab": "አብሐዚኛ", "Language_af": "አፍሪካንስኛ", @@ -158,10 +155,7 @@ "Language_zh": "ቻይንኛ", "Language_zu": "ዙሉኛ", "LanguageCode": "የቋንቋ ኮድ", - "Resolutions": "ጥራቶች", "VisitorSettings": "የጎበኚዎች ቅንብሮች", - "WidgetGlobalVisitors": "የሁሉም ጎብኚዎች ውቅረት", - "WidgetPlugins": "የተሰኪዎች ዝርዝር", - "WidgetResolutions": "የማያ ጥራቶች" + "WidgetPlugins": "የተሰኪዎች ዝርዝር" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ar.json b/plugins/UserSettings/lang/ar.json index cd0a0568c2b..3613ab75dfc 100644 --- a/plugins/UserSettings/lang/ar.json +++ b/plugins/UserSettings/lang/ar.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "الإعداد", - "ColumnResolution": "الكثافة النقطية", - "Configurations": "الإعدادات", "Language_aa": "الأفارية", "Language_ab": "الأبخازية", "Language_ae": "الأفستية", @@ -189,10 +186,7 @@ "LanguageCode": "كود اللغة", "PluginDescription": "تقارير عن إعدادات المستخدمين المختلفة: المتصفح، عائلة المتصفح، نظام التشغيل، الإضافات البرمجية، كثافة الشاشة النقطية، الإعدادات العامة.", "PluginDetectionDoesNotWorkInIE": "ملاحظة: اكتشاف الإضافات البرمجية لا تعمل في متصفح إنترنت إكسبلورر. هذه الخاصية ترتكز للمتصفحات من العائلات الأخرى غير إنترنت إكسبلورر.", - "Resolutions": "الكثافات النقطية", "VisitorSettings": "إعدادات الزوار", - "WidgetGlobalVisitors": "الإعدادات العامة للزوار", - "WidgetPlugins": "قائمة الإضافات", - "WidgetResolutions": "كثافات الشاشة النقطية" + "WidgetPlugins": "قائمة الإضافات" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/be.json b/plugins/UserSettings/lang/be.json index 7e0d6090ae0..910b353116d 100644 --- a/plugins/UserSettings/lang/be.json +++ b/plugins/UserSettings/lang/be.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Канфігурацыя", - "ColumnResolution": "Дазвол", - "Configurations": "Па канфігурацыі", "Language_ab": "абхазская", "Language_af": "афрыкаанс", "Language_am": "амхарская", @@ -120,12 +117,8 @@ "LanguageCode": "Код мовы", "PluginDescription": "Справаздачы наладак карыстальнікаў: Браўзэр, Сямейства Браўзэр сям'і, Аперацыйная сістэма, Плагіны, Глабальныя параметры.", "PluginDetectionDoesNotWorkInIE": "Заўважце: Плагіны не вызначаюцца ў Internet Explorer. Гэта справаздача заснавана на не-IE браўзарах.", - "Resolutions": "Па дазволе манітораў", "VisitorSettings": "Налады карыстача", - "WidgetGlobalVisitors": "Глабальная канфігурацыя", - "WidgetGlobalVisitorsDocumentation": "Гэтая справаздача паказвае найбольш распаўсюджаныя агульныя канфігурацыі, якія мелі вашы наведвальнікі. Канфігурацыя - гэта спалучэнне аперацыйнай сістэмы, тыпу браўзэра і дазволу экрана.", "WidgetPlugins": "Спіс плагінаў", - "WidgetPluginsDocumentation": "Гэтая справаздача паказвае, якія плагіны были ўключаны ў браўзэраў Вашых наведвальнікаў. Гэтая інфармацыя можа мець важнае значэнне для выбару правільнага спосабу дастаўкі кантэнту.", - "WidgetResolutions": "Дазвол манітораў" + "WidgetPluginsDocumentation": "Гэтая справаздача паказвае, якія плагіны были ўключаны ў браўзэраў Вашых наведвальнікаў. Гэтая інфармацыя можа мець важнае значэнне для выбару правільнага спосабу дастаўкі кантэнту." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/bg.json b/plugins/UserSettings/lang/bg.json index 857681dd6f5..15b03d0a3f0 100644 --- a/plugins/UserSettings/lang/bg.json +++ b/plugins/UserSettings/lang/bg.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Език на браузъра", "BrowserWithNoPluginsEnabled": "%1$s без активни добавки", "BrowserWithPluginsEnabled": "%1$s с добавки %2$s активиран", - "ColumnConfiguration": "Обобщена конфигурация", - "ColumnResolution": "Разделителна способност на екрана", - "Configurations": "Конфигурации", "Language_aa": "афарски", "Language_ab": "абхазки", "Language_ae": "авестийски", @@ -193,12 +190,8 @@ "LanguageCode": "Код на езика", "PluginDescription": "Докладът за различните потребителски настройки: Браузър, Браузър Семейство, операционна система, модули, резолюция, Глобални настройки.", "PluginDetectionDoesNotWorkInIE": "Забележка: Засичането на добавки не работи при Internet Explorer. Този доклад е базиран само на браузъри, различни от IE.", - "Resolutions": "Разделителна способност", "VisitorSettings": "Настройки на посетителя", - "WidgetGlobalVisitors": "Конфигурация на гло", - "WidgetGlobalVisitorsDocumentation": "Този отчет показва повечето общопознати цялостни конфигурации, които вашите посетители са имали. Конфигурация е комбинацията от операционна система, тип на браузера и резолюция на екрана.", "WidgetPlugins": "Добавки", - "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра са използвали вашите посетители. Тази информация може да е важна, за да изберете правилния начин за доставяне на вашето съдържание.", - "WidgetResolutions": "Разделителна способност" + "WidgetPluginsDocumentation": "Този отчет показва каква добавка на браузъра са използвали вашите посетители. Тази информация може да е важна, за да изберете правилния начин за доставяне на вашето съдържание." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ca.json b/plugins/UserSettings/lang/ca.json index 9fedf7f751c..ceb19d3255b 100644 --- a/plugins/UserSettings/lang/ca.json +++ b/plugins/UserSettings/lang/ca.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Configuració", - "ColumnResolution": "Resolució", - "Configurations": "Configuracions", "Language_aa": "Afar", "Language_ab": "Abkhazian", "Language_ae": "Avestan", @@ -190,12 +187,8 @@ "LanguageCode": "Codi de l'idioma", "PluginDescription": "Informe sobre les preferències del usuari: Navegador, Família del navegador, Sistema Operatiu, Extensions, Resolució, Preferències Globals", "PluginDetectionDoesNotWorkInIE": "Nota: La detecció d'extensions no funciona amb Internet Explorer. L'informe es basa nomes amb navegadors diferents de l'Internet Explorer", - "Resolutions": "Resolucions", "VisitorSettings": "Configuració del visitant", - "WidgetGlobalVisitors": "Configuracions globals dels visitants", - "WidgetGlobalVisitorsDocumentation": "Aquest informe mostra les configuracions més comuns que tenen els vostres visitants. Una configuració es la combinació de Sistema Operatiu, tipus de navegador i resolució de pantalla.", "WidgetPlugins": "Llistat de connectors", - "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut.", - "WidgetResolutions": "Resolucions" + "WidgetPluginsDocumentation": "Aquest informe mostra quines extensions tenen els vostres visitants activades. Aquesta informació pot ser important per determinar la forma correcta de mostrar el contingut." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/cs.json b/plugins/UserSettings/lang/cs.json index 50fc9469658..4a78c685e10 100644 --- a/plugins/UserSettings/lang/cs.json +++ b/plugins/UserSettings/lang/cs.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Jazyk prohlížeče", "BrowserWithNoPluginsEnabled": "%1$s bez povolených zásuvných modulů", "BrowserWithPluginsEnabled": "%1$s s povolenými zásuvnými moduly %2$s", - "ColumnConfiguration": "Konfigurace", - "ColumnResolution": "Rozlišení", - "Configurations": "Nastavení", "Language_aa": "afarština", "Language_ab": "abcházština", "Language_ae": "avestánština", @@ -193,12 +190,8 @@ "LanguageCode": "Jazykový kód", "PluginDescription": "Zobrazí různá uživatelská nastavení: prohlížeč, rodinu prohlížečů, operační systém, zásuvné moduly, rozlišení, globální nastavení.", "PluginDetectionDoesNotWorkInIE": "Poznámka: Detekce zásuvných modulů nepracuje v prohlížeči Interet Explorer. Toto hlášení je založeno na ostatních prohlížečích", - "Resolutions": "Rozlišení", "VisitorSettings": "Nastavení návštěvníků", - "WidgetGlobalVisitors": "Hlavní nastavení návštěvníků", - "WidgetGlobalVisitorsDocumentation": "Toto hlášení zobrazuje nejčastější konfigurace, které vaši návštěvníci měli. Konfigurace je kombinace operačního systému, prohlížeče a rozlišení.", "WidgetPlugins": "Seznam zásuvných modulů", - "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah.", - "WidgetResolutions": "Rozlišení obrazovky" + "WidgetPluginsDocumentation": "Toto hlášení zobrazuje zásuvné moduly, které měli vaši návštěvníci povoleny. Tato informace může být důležitá při rozhodování o tom, jakým způsobem prezentovat obsah." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/da.json b/plugins/UserSettings/lang/da.json index a0316402251..e15b7576316 100644 --- a/plugins/UserSettings/lang/da.json +++ b/plugins/UserSettings/lang/da.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Browser sprog", "BrowserWithNoPluginsEnabled": "%1$s med ingen aktiverede udvidelsesmoduler", "BrowserWithPluginsEnabled": "%1$s med udvidelsesmoduler %2$s aktiveret", - "ColumnConfiguration": "Konfiguration", - "ColumnResolution": "Opløsning", - "Configurations": "Indstillinger", "Language_aa": "Afar", "Language_ab": "Abkhasisk", "Language_ae": "Avestisk", @@ -193,12 +190,8 @@ "LanguageCode": "Sprogkode", "PluginDescription": "Rapporter brugerindstillinger: browser, browsertype, operativsystem, udvidelsesmoduler, opløsning, globale indstillinger.", "PluginDetectionDoesNotWorkInIE": "Note: Udvidelsesmodul detektering virker ikke i Internet Explorer. Rapport viser kun ikke-IE browsere.", - "Resolutions": "Opløsninger", "VisitorSettings": "Besøgendes indstillinger", - "WidgetGlobalVisitors": "Besøgendes konfiguration", - "WidgetGlobalVisitorsDocumentation": "Rapporten viser de mest almindelige samlede konfigurationer, som de besøgende havde. En konfiguration er en kombination af et styresystem, en browsertype og en skærmopløsning.", "WidgetPlugins": "Udvidelsesmoduler", - "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på.", - "WidgetResolutions": "Skærmopløsninger" + "WidgetPluginsDocumentation": "Rapporten viser, hvilke browserudvidelser de besøgende havde aktiveret. Oplysningerne kan være vigtigt for at vælge den rigtige måde at levere indholdet på." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/de.json b/plugins/UserSettings/lang/de.json index 0b2cf46081b..465ae682d51 100644 --- a/plugins/UserSettings/lang/de.json +++ b/plugins/UserSettings/lang/de.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Browsersprache", "BrowserWithNoPluginsEnabled": "%1$s mit keinen aktivierten Plugins", "BrowserWithPluginsEnabled": "%1$s mit den Plugins %2$s aktiviert", - "ColumnConfiguration": "Konfiguration", - "ColumnResolution": "Auflösung", - "Configurations": "Konfigurationen", "Language_aa": "Afar", "Language_ab": "Abchasisch", "Language_ae": "Avestisch", @@ -193,12 +190,8 @@ "LanguageCode": "Sprach-Code", "PluginDescription": "Bericht über verschiedene Benutzereinstellungen: Browser, Browserfamilie, Betriebssystem, Plugins, Auflösung, Allgemeine Einstellungen.", "PluginDetectionDoesNotWorkInIE": "Hinweis: Die Erkennung von Plugins funktioniert nicht im Internet Explorer. Diese Statistik beruht nur auf Nicht-IE Browsern.", - "Resolutions": "Auflösungen", "VisitorSettings": "Besuchereinstellungen", - "WidgetGlobalVisitors": "Globale Besucherkonfiguration", - "WidgetGlobalVisitorsDocumentation": "Dieser Bericht zeigt Ihnen die häufigsten Gesamtkonfigurationen der Besucher. Eine Konfiguration ist die Kombination aus Betriebssystem, Browsertyp und Bildschirmauflösung.", "WidgetPlugins": "Liste der Plugins", - "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern.", - "WidgetResolutions": "Bildschirmauflösungen" + "WidgetPluginsDocumentation": "Dieser Bericht zeigt Ihnen, welche Plugins Ihre Besucher in Ihren Browser aktiviert haben. Diese Informationen kann Ihnen dabei helfen, die beste Art zu finden, Ihre Inhalte auszuliefern." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/el.json b/plugins/UserSettings/lang/el.json index 9b7f7395f68..3fff7c6576e 100644 --- a/plugins/UserSettings/lang/el.json +++ b/plugins/UserSettings/lang/el.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Γλώσσα φυλλομετρητή", "BrowserWithNoPluginsEnabled": "%1$s με ανενεργά πρόσθετα", "BrowserWithPluginsEnabled": "%1$s με %2$s πρόσθετα ενεργά", - "ColumnConfiguration": "Ρύθμιση", - "ColumnResolution": "Ανάλυση", - "Configurations": "Ρυθμίσεις", "Language_aa": "Αφαρικά", "Language_ab": "Αμπχαζικά", "Language_ae": "Αβεστανικά", @@ -193,12 +190,8 @@ "LanguageCode": "Κωδικός γλώσσας", "PluginDescription": "Αναφέρει διάφορες Ρυθμίσεις Χρήστη: Φυλλομετρητής, Ομάδα Φυλλομετρητών, Λειτουργικό Σύστημα, Πρόσθετα, Ανάλυση, Γενικές Ρυθμίσεις.", "PluginDetectionDoesNotWorkInIE": "Σημείωση: η ανίχνευση Προσθέτων δεν λειτουργεί στον Internet Explorer. Αυτή η αναφορά βασίζεται μόνο σε μη IE φυλλομετρητές.", - "Resolutions": "Αναλύσεις οθόνης", "VisitorSettings": "Ρυθμίσεις επισκέπτη", - "WidgetGlobalVisitors": "Γενικές ρυθμίσεις χρηστών", - "WidgetGlobalVisitorsDocumentation": "Αυτή η αναφορά δείχνει τις πιο συχνές καθολικές ρυθμίσεις που έχουν οι επισκέπτες σας. Μια ρύθμιση είναι ο συνδυασμός του λειτουργικού συστήματος, του τύπου φυλλομετρητή και της ανάλυσης οθόνης.", "WidgetPlugins": "Λίστα προσθέτων", - "WidgetPluginsDocumentation": "Αυτή η αναφορά δείχνει ποια πρόσθετα φυλλομετρητή έχουν ενεργά οι επισκέπτες σας. Αυτή η πληροφορία ίσως είναι σημαντική για την επιλογή του πιο σωστού τρόπου απόδοσης του περιεχομένου σας.", - "WidgetResolutions": "Αναλύσεις οθόνης" + "WidgetPluginsDocumentation": "Αυτή η αναφορά δείχνει ποια πρόσθετα φυλλομετρητή έχουν ενεργά οι επισκέπτες σας. Αυτή η πληροφορία ίσως είναι σημαντική για την επιλογή του πιο σωστού τρόπου απόδοσης του περιεχομένου σας." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/es.json b/plugins/UserSettings/lang/es.json index 5a9898f09ca..5b068ba608f 100644 --- a/plugins/UserSettings/lang/es.json +++ b/plugins/UserSettings/lang/es.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Idioma de Navegador", "BrowserWithNoPluginsEnabled": "%1$s sin complementos habilitados", "BrowserWithPluginsEnabled": "%1$s con los complementos %2$s habilitados", - "ColumnConfiguration": "Configuración", - "ColumnResolution": "Resoluciones", - "Configurations": "Configuración", "Language_aa": "Lejos", "Language_ab": "Abjasia", "Language_ae": "Avéstico", @@ -193,12 +190,8 @@ "LanguageCode": "Código de idioma", "PluginDescription": "Reporta varias configuraciones de usuario: Navegador, Familia del Navegador, Sistema Operativo, Plugins, Resolución, Configuración General.", "PluginDetectionDoesNotWorkInIE": "Nota: la detección de Plugins no funciona con Internet Explorer. Este reporte solo funciona con navegadores no-IE.", - "Resolutions": "Resoluciones", "VisitorSettings": "Configuración de visitantes", - "WidgetGlobalVisitors": "Configuración global de visitantes", - "WidgetGlobalVisitorsDocumentation": "Este informe muestra las más usuales configuraciones que poseen sus visitantes. Una configuración es una combinación de un sistema operativo, un tipo de navegador de internet y una resolución de pantalla.", "WidgetPlugins": "Lista de Plugins", - "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido.", - "WidgetResolutions": "Resoluciones de pantalla" + "WidgetPluginsDocumentation": "Este informe muestra que extensiones del navegador sus visitantes han habilitado. Esta información puede ser importante sea para elegir el método eficiente de enviar su contenido." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/et.json b/plugins/UserSettings/lang/et.json index 4905768aca1..f88b9cef5de 100644 --- a/plugins/UserSettings/lang/et.json +++ b/plugins/UserSettings/lang/et.json @@ -1,9 +1,6 @@ { "UserSettings": { "BrowserLanguage": "Veebisirvija keel", - "ColumnConfiguration": "Konfiguratsioon", - "ColumnResolution": "Resolutsioon", - "Configurations": "Konfiguratsioonid", "Language_aa": "afari", "Language_ab": "abhaasi", "Language_ae": "avesta", @@ -190,10 +187,7 @@ "Language_zu": "suulu", "LanguageCode": "Keele kood", "PluginDetectionDoesNotWorkInIE": "Märge: Lisatarkvara tuvastamine ei tööta Internet Exploreriga külastajatel. See raport kuvab andmeid mitte-IE veebisirvikute kohta.", - "Resolutions": "Ekraani resolutsioonid", "VisitorSettings": "Külastajate seaded", - "WidgetGlobalVisitors": "Kohalike külastajate seaded", - "WidgetPlugins": "Sirviku lisatarkvarad", - "WidgetResolutions": "Ekraani resolutsioonid" + "WidgetPlugins": "Sirviku lisatarkvarad" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/eu.json b/plugins/UserSettings/lang/eu.json index 902a023d2e5..ad33730e088 100644 --- a/plugins/UserSettings/lang/eu.json +++ b/plugins/UserSettings/lang/eu.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigurazioa", - "ColumnResolution": "Bereizmena", - "Configurations": "Konfigurazioak", "Language_ab": "abkhazera", "Language_af": "afrikaans", "Language_ak": "Akanera", @@ -149,10 +146,7 @@ "Language_zh": "txinera", "Language_zu": "zuluera", "LanguageCode": "Hizkuntza-kodea", - "Resolutions": "Bereizmenak", "VisitorSettings": "Bisitariaren ezarpenak", - "WidgetGlobalVisitors": "Bisitarien konfigurazioa", - "WidgetPlugins": "Pluginen zerrenda", - "WidgetResolutions": "Pantailaren bereizmenak" + "WidgetPlugins": "Pluginen zerrenda" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/fa.json b/plugins/UserSettings/lang/fa.json index eb38d32cb50..fac25a4b88b 100644 --- a/plugins/UserSettings/lang/fa.json +++ b/plugins/UserSettings/lang/fa.json @@ -2,9 +2,6 @@ "UserSettings": { "BrowserLanguage": "زبان مرورگر", "BrowserWithNoPluginsEnabled": "%1$s با هیچ پلاگین را فعال کنید", - "ColumnConfiguration": "پیکربندی", - "ColumnResolution": "رزلوشن", - "Configurations": "پیکربندی", "Language_aa": "آفاری", "Language_ab": "آبخازیایی", "Language_ae": "اوستایی", @@ -192,12 +189,8 @@ "LanguageCode": "کد زبان", "PluginDescription": "گزارش تنظیمات کاربر های مختلف: مرورگر، Family (خانواده) مرورگر، سیستم عامل، پلاگین، سایز تصویر، تنظیمات جهانی است.", "PluginDetectionDoesNotWorkInIE": "توجه: تشخیص پلاگین در مرورگر اینترنت اکسپلورر کار نمی کند. این گزارش تنها بر روی مرورگرهای غیر اینترنت اکسپلورر است.", - "Resolutions": "رزلوشن", "VisitorSettings": "تنظیمات بازدید کننده", - "WidgetGlobalVisitors": "پیکربندی بازدیدکنندگان جهانی", - "WidgetGlobalVisitorsDocumentation": "این گزارش نشان می دهد پیکربندی کلی شایع ترین است که بازدید کنندگان شما است. پیکربندی ترکیبی از سیستم عامل، نوع مرورگر و صفحه نمایش با وضوح است.", "WidgetPlugins": "لیست افزونه ها", - "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را.", - "WidgetResolutions": "رزلوشن نمایشگر" + "WidgetPluginsDocumentation": "این گزارش نشان می دهد که پلاگین مرورگر بازدید کننده خود را فعال کرده بود. این اطلاعات ممکن است مهم برای انتخاب راه درست برای ارائه محتوای خود را." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/fi.json b/plugins/UserSettings/lang/fi.json index f6bb711136e..938a7f51837 100644 --- a/plugins/UserSettings/lang/fi.json +++ b/plugins/UserSettings/lang/fi.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Selaimen kieli", "BrowserWithNoPluginsEnabled": "%1$s ilman liitännäisiä aktivoitu", "BrowserWithPluginsEnabled": "%1$s liitännäisillä %2$s on aktivoitu", - "ColumnConfiguration": "Asetukset", - "ColumnResolution": "Resoluutio", - "Configurations": "Asetukset", "Language_aa": "afar", "Language_ab": "abkhazian", "Language_ae": "avestan", @@ -193,12 +190,8 @@ "LanguageCode": "Kielikoodi", "PluginDescription": "Raportit käyttäjien asetuksista: selain, selaimen perhe, käyttöjärjestelmä, lisäosat, resoluutio, yleiset asetukset.", "PluginDetectionDoesNotWorkInIE": "Huom: lisäosien tunnistus ei toimi Internet Explorerissa. Tämä raportti perustuu vain ei-IE-selaimiin.", - "Resolutions": "Resoluutio", "VisitorSettings": "Kävijöiden asetukset", - "WidgetGlobalVisitors": "Kaikkien kävijöiden asetukset", - "WidgetGlobalVisitorsDocumentation": "Tämä raportti näyttää yleiskuvan eri käyttäjien asetuksista. Asetukset on yhdistelmä käyttöjärjestelmästä, selaimen tyypistä ja näytön resoluutiosta.", "WidgetPlugins": "Lista lisäosista", - "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille.", - "WidgetResolutions": "Näytön resoluutio" + "WidgetPluginsDocumentation": "Tämä raportti näyttää, mitä selainlisäosia vierailijoillasi oli käytössä. Tästä tiedosta voi olla hyötyä, kun joudut valitsemaan, miten tietoa esitetään ja välitetään vierailijoille." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/fr.json b/plugins/UserSettings/lang/fr.json index cb009e289c1..82ac789d107 100644 --- a/plugins/UserSettings/lang/fr.json +++ b/plugins/UserSettings/lang/fr.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Langage du navigateur", "BrowserWithNoPluginsEnabled": "%1$s avec aucun plugin activé", "BrowserWithPluginsEnabled": "%1$s avec les plugins %2$s activés", - "ColumnConfiguration": "Configuration", - "ColumnResolution": "Résolution", - "Configurations": "Configurations", "Language_aa": "Afar", "Language_ab": "Abkhaze", "Language_ae": "Avestique", @@ -193,12 +190,8 @@ "LanguageCode": "Code langue", "PluginDescription": "Effectue des rapports variés sur les paramètres utilisateurs: navigateur, famille du navigateur, système d'exploitation, plugins, résolution, paramètres généraux.", "PluginDetectionDoesNotWorkInIE": "Note : La détection des plugins ne fonctionne pas avec Internet Explorer. Ce rapport est basé sur les autres navigateurs.", - "Resolutions": "Résolutions", "VisitorSettings": "Paramètres visiteur", - "WidgetGlobalVisitors": "Configuration globale des visiteurs", - "WidgetGlobalVisitorsDocumentation": "Ce rapport montre les configurations globales les plus communes de vos visiteurs. Une configuration est la combinaison d'un système d'exploitation, d'un type de navigateur et d'une résolution d'écran.", "WidgetPlugins": "Liste de Plugins", - "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu.", - "WidgetResolutions": "Résolutions d'écran" + "WidgetPluginsDocumentation": "Ce rapport montre quels plugins du navigateur vos visiteurs ont activés. Cette information peut être importante pour choisir le bon moyen de délivrer le contenu." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/gl.json b/plugins/UserSettings/lang/gl.json index e461b383d8c..e18820cb79d 100644 --- a/plugins/UserSettings/lang/gl.json +++ b/plugins/UserSettings/lang/gl.json @@ -1,6 +1,5 @@ { "UserSettings": { - "Configurations": "Configuracións", "Language_ab": "abkhazo", "Language_af": "Afrikaans", "Language_ak": "Akán", @@ -148,9 +147,6 @@ "Language_zh": "Chinés", "Language_zu": "Zulú", "LanguageCode": "Código de idioma", - "Resolutions": "Resolucións", - "WidgetGlobalVisitors": "Configuración global de visitantes", - "WidgetPlugins": "Lista de plugins", - "WidgetResolutions": "Resolucións de pantalla" + "WidgetPlugins": "Lista de plugins" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/he.json b/plugins/UserSettings/lang/he.json index b6d08a31e71..5a31eaa865c 100644 --- a/plugins/UserSettings/lang/he.json +++ b/plugins/UserSettings/lang/he.json @@ -184,7 +184,6 @@ "Language_za": "ז'ואנג", "Language_zh": "סינית", "Language_zu": "זולו", - "LanguageCode": "קוד שפה", - "WidgetResolutions": "רזולוציית מסך" + "LanguageCode": "קוד שפה" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/hi.json b/plugins/UserSettings/lang/hi.json index d6963d29e52..e8b314eb2ec 100644 --- a/plugins/UserSettings/lang/hi.json +++ b/plugins/UserSettings/lang/hi.json @@ -3,9 +3,6 @@ "BrowserLanguage": "ब्राउज़र की भाषा", "BrowserWithNoPluginsEnabled": "%1$s के साथ प्लगइन सक्रिय नहीं", "BrowserWithPluginsEnabled": "प्लगिन %2$s से %1$s सक्षम", - "ColumnConfiguration": "विन्यास", - "ColumnResolution": "संकल्प", - "Configurations": "विन्यास", "Language_aa": "अफ़ार", "Language_ab": "अब्खाज़ियन्", "Language_ae": "अवेस्तन", @@ -193,8 +190,6 @@ "LanguageCode": "भाषा कोड", "PluginDescription": "विभिन्न उपयोगकर्ता सेटिंग्स की रिपोर्ट: ब्राउज़र, ब्राउज़र परिवार, आपरेटिंग सिस्टम, प्लगइन्स, संकल्प, वैश्विक सेटिंग्स.", "PluginDetectionDoesNotWorkInIE": "नोट: प्लगइन्स का पता लगाने इंटरनेट एक्सप्लोरर में काम नहीं करता है. यह रिपोर्ट केवल गैर आईई ब्राउज़रों पर आधारित है.", - "Resolutions": "संकल्प", - "VisitorSettings": "आगंतुक सेटिंग्स", - "WidgetGlobalVisitors": "आगंतुक विन्यास" + "VisitorSettings": "आगंतुक सेटिंग्स" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/hr.json b/plugins/UserSettings/lang/hr.json index 91cfd9bc1c9..533587f0292 100644 --- a/plugins/UserSettings/lang/hr.json +++ b/plugins/UserSettings/lang/hr.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "KOnfiguracija", - "ColumnResolution": "Rezolucija", - "Configurations": "Konfiguracija", "Language_aa": "afarski", "Language_ab": "abhaski", "Language_ae": "avestan", diff --git a/plugins/UserSettings/lang/hu.json b/plugins/UserSettings/lang/hu.json index 2bdabbf3c4f..d42c8f4cb31 100644 --- a/plugins/UserSettings/lang/hu.json +++ b/plugins/UserSettings/lang/hu.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfiguráció", - "ColumnResolution": "Felbontás", - "Configurations": "Konfigurációk", "Language_aa": "afar", "Language_ab": "abház", "Language_ae": "avesztán", @@ -190,10 +187,7 @@ "LanguageCode": "Nyelvi kód", "PluginDescription": "Jelentéseket készít a látogatóknál észlelt beállításokról és rendszerkörnyezetről mint például: böngésző típusa, böngészőcsaládok, operációs rendszer, böngésző bővítmények, képernyőfelbontás, globális beállítások.", "PluginDetectionDoesNotWorkInIE": "A böngészők bővítményeinek detektálása nem működik az Internet Exlporernél, így ez a jelentés csak a nem Internet Explorert használó látogatók adatait jeleníti meg.", - "Resolutions": "Képernyőfelbontások", "VisitorSettings": "Látogatók adatai", - "WidgetGlobalVisitors": "Globális látogatói beállítások", - "WidgetPlugins": "Bővítmények listája", - "WidgetResolutions": "Képernyőfelbontások" + "WidgetPlugins": "Bővítmények listája" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/id.json b/plugins/UserSettings/lang/id.json index 990dbd67b13..cd7d7677e61 100644 --- a/plugins/UserSettings/lang/id.json +++ b/plugins/UserSettings/lang/id.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Bahasa Peramban", "BrowserWithNoPluginsEnabled": "%1$s dengan tanpa pengaya diaktifkan", "BrowserWithPluginsEnabled": "%1$s dengan %2$s pengaya diaktifkan", - "ColumnConfiguration": "Pengaturan", - "ColumnResolution": "Resolusi", - "Configurations": "Pengaturan", "Language_aa": "Afar", "Language_ab": "Abkhaz", "Language_ae": "Avestan", @@ -193,12 +190,8 @@ "LanguageCode": "Kode Bahasa", "PluginDescription": "Laporan Pengaturan Pengguna: Peramban, Keluarga Peramban, Sistem Operasi, Pengaya, Resolusi Layar, Pengaturan Umum.", "PluginDetectionDoesNotWorkInIE": "Catatan: Pendeteksian pengaya tidak bekerja di Internet Explorer. Laporan ini hanya berdasarkan pada peramban bukan-IE.", - "Resolutions": "Resolusi", "VisitorSettings": "Pengaturan Pengunjung", - "WidgetGlobalVisitors": "Pengaturan pengunjung umum", - "WidgetGlobalVisitorsDocumentation": "Laporan ini menunjukkan pengaturan paling umum yang pengunjung miliki. Subuah pengaturan terdiri atas sistem operasi, jenis peramban, dan resolusi layar.", "WidgetPlugins": "Daftar Pengaya", - "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda.", - "WidgetResolutions": "Resolusi layar" + "WidgetPluginsDocumentation": "Laporan ini menunjukkan pengaya peramban yang diaktifkan oleh pengunjung. Informasi yang tersedia kemungkinan penting untuk memilih cara terbaik untuk menyampaikan konten Anda." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/is.json b/plugins/UserSettings/lang/is.json index ff81439a866..a962d9452ed 100644 --- a/plugins/UserSettings/lang/is.json +++ b/plugins/UserSettings/lang/is.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Uppsetning", - "ColumnResolution": "Skjáupplausn", - "Configurations": "Uppsetningar", "Language_aa": "afár", "Language_ab": "abkasíska", "Language_ae": "avestíska", @@ -190,10 +187,7 @@ "LanguageCode": "Kóði tungumáls", "PluginDescription": "Gefur skýrslu um ýmsar stillingar gesta:Vafra, Vafrafjölskyldu, Stýrikerfi, Íbætur, Skjáupplausn, altækar stillingar.", "PluginDetectionDoesNotWorkInIE": "Ath: uppgötvun á íbótum virkar ekki með Internet Explorer. Þessi skýrsla er aðeins unnin út frá öðrum vöfrum en IE.", - "Resolutions": "Skjáupplausnir", "VisitorSettings": "Stillingar gesta", - "WidgetGlobalVisitors": "Altæk gestastilling", - "WidgetPlugins": "Listi yfir íbætur", - "WidgetResolutions": "Skjáupplausnir" + "WidgetPlugins": "Listi yfir íbætur" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/it.json b/plugins/UserSettings/lang/it.json index 981f75a3061..0100bd07974 100644 --- a/plugins/UserSettings/lang/it.json +++ b/plugins/UserSettings/lang/it.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Lingua Browser", "BrowserWithNoPluginsEnabled": "%1$s con nessun plugin abilitato", "BrowserWithPluginsEnabled": "%1$s con plugin %2$s abilitati", - "ColumnConfiguration": "Configurazione", - "ColumnResolution": "Risoluzione", - "Configurations": "Configurazioni", "Language_aa": "afar", "Language_ab": "abkhazian", "Language_ae": "avestan", @@ -193,12 +190,8 @@ "LanguageCode": "Codice della lingua", "PluginDescription": "Mostra le varie impostazioni per gli utenti: Browser, Famiglia del Browser, Sistema Operativo, Plugin, Risoluzione, Impostazioni Globali.", "PluginDetectionDoesNotWorkInIE": "N.B.: Questo plugin non funziona su Internet Explorer. Questo report è basato solamente sugli utenti di altri browser.", - "Resolutions": "Risoluzioni", "VisitorSettings": "Impostazioni visitatori", - "WidgetGlobalVisitors": "Riepilogo configurazione visitatori", - "WidgetGlobalVisitorsDocumentation": "Questo report mostra le configurazioni globali più comuni che i visitatori avevano. Una configurazione è la combinazione di un sistema operativo, un tipo browser e una risoluzione di schermo.", "WidgetPlugins": "Lista dei Plugin", - "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti.", - "WidgetResolutions": "Risoluzione schermo" + "WidgetPluginsDocumentation": "Questo report mostra quali plugin del browser i visitatori avevano abilitato. Questa informazione potrebbe essere importante per la scelta del giusto modo di inviare i tuoi contenuti." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ja.json b/plugins/UserSettings/lang/ja.json index 7e409d6a05e..7d1b353ac1a 100644 --- a/plugins/UserSettings/lang/ja.json +++ b/plugins/UserSettings/lang/ja.json @@ -3,9 +3,6 @@ "BrowserLanguage": "ブラウザの言語", "BrowserWithNoPluginsEnabled": "%1$s のプラグインが有効ではありません", "BrowserWithPluginsEnabled": "%1$s のプラグイン %2$s は有効", - "ColumnConfiguration": "環境設定", - "ColumnResolution": "解像度", - "Configurations": "環境設定", "Language_aa": "アファル語", "Language_ab": "アブハズ語", "Language_ae": "アヴェスタ語", @@ -193,12 +190,8 @@ "LanguageCode": "言語コード", "PluginDescription": "各種ユーザー設定（ブラウザ、ブラウザファミリー、オペレーティングシステム、プラグイン、解像度、全般設定）をリポートします。", "PluginDetectionDoesNotWorkInIE": "注意： Internet Explorer ではプラグインの検出が動作しません。 このリポートは、非 IE ブラウザのみに基づきます。", - "Resolutions": "解像度", "VisitorSettings": "ビジターの環境", - "WidgetGlobalVisitors": "ビジターの全般的な環境設定", - "WidgetGlobalVisitorsDocumentation": "ビジターの最も一般的な利用環境についてのリポートです。オペレーティングシステム、ブラウザの種類と画面の解像度の組合せで表示します。", "WidgetPlugins": "プラグイン一覧", - "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。", - "WidgetResolutions": "画面解像度" + "WidgetPluginsDocumentation": "ビジターが利用しているブラウザのプラグインについてのリポートです。コンテンツの最適な表示方法を選択するために重要な情報です。" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ka.json b/plugins/UserSettings/lang/ka.json index 7dab7a6d230..66d3b0aa439 100644 --- a/plugins/UserSettings/lang/ka.json +++ b/plugins/UserSettings/lang/ka.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "კონფიგურაცია", - "ColumnResolution": "რეზოლუცია", - "Configurations": "გონფიგურაციები", "Language_aa": "აფარი", "Language_ab": "აფხაზური", "Language_ae": "ავესტა", @@ -163,10 +160,7 @@ "LanguageCode": "ენის კოდი", "PluginDescription": "იძლევა ანგარიშს მომხმარებლის სხვადასხვა პარამეტრებზე: ბრაუზერები, ბრაუზერის ოჯახი, ოპერაციული სისტემა, პლაგინები, რეზოლუცია, გლობალური პარამეტრები.", "PluginDetectionDoesNotWorkInIE": "შენიშვნა: პლაგინების ამოცნობა არ ხდება ინტერნეტ ექსპლორერში. ეს რეპორტი მუშაოაბს მხოლოდ არა–IE ბრაუზერებზე.", - "Resolutions": "რეზოლუციები", "VisitorSettings": "ვიზიტორის პარამეტრები", - "WidgetGlobalVisitors": "ვიზიტორების გლობალური კონფიგურაცია", - "WidgetPlugins": "პლაგინების სია", - "WidgetResolutions": "ეკრანის რეზოლუვიები" + "WidgetPlugins": "პლაგინების სია" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ko.json b/plugins/UserSettings/lang/ko.json index 25a2077b83a..e0ebf9c47b7 100644 --- a/plugins/UserSettings/lang/ko.json +++ b/plugins/UserSettings/lang/ko.json @@ -1,9 +1,6 @@ { "UserSettings": { "BrowserLanguage": "브라우저 언어", - "ColumnConfiguration": "구성", - "ColumnResolution": "해상도", - "Configurations": "구성", "Language_aa": "아파르어", "Language_ab": "압하스어", "Language_ae": "아베스타어", @@ -191,12 +188,8 @@ "LanguageCode": "언어 코드", "PluginDescription": "각종 사용자 설정 (브라우저, 브라우저 페밀리, 운영 시스템, 플러그인, 해상도, 일반 설정)를 보고합니다.", "PluginDetectionDoesNotWorkInIE": "참고: Internet Explorer에서는 플러그인 검색이 작동하지 않습니다. 이 보고서는 IE 브라우저가 아닌것에 기반합니다.", - "Resolutions": "해상도", "VisitorSettings": "방문자 설정", - "WidgetGlobalVisitors": "글로벌 방문자 구성", - "WidgetGlobalVisitorsDocumentation": "방문자의 가장 일반적인 사용 환경에 대한 보고서입니다. 운영 체제, 브라우저 종류와 화면 해상도의 조합으로 표시합니다.", "WidgetPlugins": "플러그인 목록", - "WidgetPluginsDocumentation": "방문자가 사용하는 브라우저의 플러그인에 대한 보고서입니다. 컨텐츠에 대한 최적의 표시 방법을 선택하는 데 중요한 정보입니다.", - "WidgetResolutions": "스크린 해상도" + "WidgetPluginsDocumentation": "방문자가 사용하는 브라우저의 플러그인에 대한 보고서입니다. 컨텐츠에 대한 최적의 표시 방법을 선택하는 데 중요한 정보입니다." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/lt.json b/plugins/UserSettings/lang/lt.json index 321b8e40671..84ab811625d 100644 --- a/plugins/UserSettings/lang/lt.json +++ b/plugins/UserSettings/lang/lt.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigūracija", - "ColumnResolution": "Ekrano raiška", - "Configurations": "Konfigūracijos", "Language_aa": "afarų", "Language_ab": "abchazų", "Language_ae": "avestų", @@ -190,10 +187,7 @@ "LanguageCode": "Kalbos kodas", "PluginDescription": "Parodo įvairius lankytojo nustatymus: naršyklę, naršyklės šeimą, operacinę sistemą, papildinius, ekrano raišką, skiriamąją gebą, globalius nustatymus.", "PluginDetectionDoesNotWorkInIE": "Pastaba: papildinio aptikimas neveikia Internet Explorer naršyklėje. Ši ataskaita bus sugeneruota tik kitose naršyklėse.", - "Resolutions": "Ekranų raiškos", "VisitorSettings": "Lankytojų nustatymai", - "WidgetGlobalVisitors": "Bendri lankytojų nustatymai", - "WidgetPlugins": "Papildinių sąrašas", - "WidgetResolutions": "Ekrano raiška" + "WidgetPlugins": "Papildinių sąrašas" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/lv.json b/plugins/UserSettings/lang/lv.json index 30db1141885..15f82b1f937 100644 --- a/plugins/UserSettings/lang/lv.json +++ b/plugins/UserSettings/lang/lv.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigurācija", - "ColumnResolution": "Ekrāna izšķirtspēja", - "Configurations": "Konfigurācijas", "Language_aa": "afāru", "Language_ab": "abhāzu", "Language_ae": "avesta", @@ -190,12 +187,8 @@ "LanguageCode": "Valodas kods", "PluginDescription": "Apskata dažādus lietotāju iestatījumus: pārlūku, pārlūku ģimeni, operētājsistēmu, spraudņus, ekrāna izšķirtspēju, globālos iestatījumus.", "PluginDetectionDoesNotWorkInIE": "Piezīme: spraudņu noteikšana nedarbojas Internet Explorer pārlūkā. Šī atskaite ir bāzēta tikai uz ne-IE pārlūkiem.", - "Resolutions": "Ekrāna izšķirtspējas", "VisitorSettings": "Apmeklētāju iestatījumi", - "WidgetGlobalVisitors": "Globālā apmeklētāju konfigurācija", - "WidgetGlobalVisitorsDocumentation": "Šajā atskaitē redzamas visbiežāk izmantotās apmeklētāju konfigurācijas. Konfigurācija ir operētājsistēmas, pārlūka tipa un ekrāna izšķirtspējas kombinācija.", "WidgetPlugins": "Spraudņu saraksts", - "WidgetPluginsDocumentation": "Šajā atskaitē ir redzami pārlūku spraudņi, kuri bija ieslēgti apmeklētāju pārlūkos. Šī informācija ir svarīga, lai izvēlētos vislabāko veidu kā piegādāt saturu apmeklētājiem.", - "WidgetResolutions": "Ekrāna izšķirtspējas" + "WidgetPluginsDocumentation": "Šajā atskaitē ir redzami pārlūku spraudņi, kuri bija ieslēgti apmeklētāju pārlūkos. Šī informācija ir svarīga, lai izvēlētos vislabāko veidu kā piegādāt saturu apmeklētājiem." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/nb.json b/plugins/UserSettings/lang/nb.json index 3950648d83e..9c25cc141e5 100644 --- a/plugins/UserSettings/lang/nb.json +++ b/plugins/UserSettings/lang/nb.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigurasjon", - "ColumnResolution": "Oppløsning", - "Configurations": "Konfigurasjon", "Language_aa": "afar", "Language_ab": "abkhasisk", "Language_ae": "avestisk", @@ -189,10 +186,7 @@ "Language_zu": "zulu", "LanguageCode": "Språkkode", "PluginDescription": "Rapporterer forskjellige brukerinnstillinger: Nettleser, nettleserfamilie, operativsystem, tillegg, oppløsning, globale innstillinger.", - "Resolutions": "Oppløsninger", "VisitorSettings": "Besøkendes innstillinger", - "WidgetGlobalVisitors": "Besøkendes konfigurasjon", - "WidgetPlugins": "Liste over tillegg", - "WidgetResolutions": "Skjermoppløsninger" + "WidgetPlugins": "Liste over tillegg" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/nl.json b/plugins/UserSettings/lang/nl.json index 1f90affe5ab..481c3f259ed 100644 --- a/plugins/UserSettings/lang/nl.json +++ b/plugins/UserSettings/lang/nl.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Browsertaal", "BrowserWithNoPluginsEnabled": "%1$s zonder plugins ingeschakeld", "BrowserWithPluginsEnabled": "%1$s met plugins %2$s ingeschakeld", - "ColumnConfiguration": "Configuratie", - "ColumnResolution": "Resolutie", - "Configurations": "Configuraties", "Language_aa": "Afar", "Language_ab": "Abchazisch", "Language_ae": "Avestisch", @@ -193,12 +190,8 @@ "LanguageCode": "Taal code", "PluginDescription": "Rapporteert verschillende gebruikers instellingen: Browser, Browser familie, Besturingssysteem, Plugins, Resolutie, Globale Instellingen.", "PluginDetectionDoesNotWorkInIE": "Opmerking: plugin detectie werkt niet in Internet Explorer. Het rapport is alleen gebaseerd op andere browsers dan IE", - "Resolutions": "Schermresoluties", "VisitorSettings": "Bezoekers Instellingen", - "WidgetGlobalVisitors": "Algemene configuratie", - "WidgetGlobalVisitorsDocumentation": "Dit rapport toont de meest voorkomende configuraties die uw bezoekers hadden. Een configuratie is de combinatie van een besturingssysteem, een browser type en een schermresolutie.", "WidgetPlugins": "Geïnstalleerde plugins", - "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden.", - "WidgetResolutions": "Schermresoluties" + "WidgetPluginsDocumentation": "Dit rapport laat zien welke browserplugins uw bezoekers haden geïnstalleerd. Deze informatie kan van belang zijn voor het kiezen van de juiste manier om uw content aan te bieden." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/nn.json b/plugins/UserSettings/lang/nn.json index aa24a3f364e..bbab7b45ce1 100644 --- a/plugins/UserSettings/lang/nn.json +++ b/plugins/UserSettings/lang/nn.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigurasjon", - "ColumnResolution": "Oppløysing", - "Configurations": "Konfigurasjonar", "Language_aa": "afar", "Language_ab": "abkhasisk", "Language_ae": "avestisk", @@ -190,10 +187,7 @@ "LanguageCode": "Språkkode", "PluginDescription": "Rapporter diverse vitjarinnstillingar: Nettlesar, Nettlesarfamilie, operativsystem, oppløysing og globale innstillingar.", "PluginDetectionDoesNotWorkInIE": "Merk: Registrering av innstikk virkar ikkje i Internet Explorer. Denne rapporten er berre basert på andre nettlesarar enn IE.", - "Resolutions": "Oppløysingar", "VisitorSettings": "Vitjarinnstillingar", - "WidgetGlobalVisitors": "Global vitjarkonfigurasjon", - "WidgetPlugins": "Liste over innstikk", - "WidgetResolutions": "Skjermoppløysing" + "WidgetPlugins": "Liste over innstikk" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/pl.json b/plugins/UserSettings/lang/pl.json index 69bc0e0122d..c8dce6a4bca 100644 --- a/plugins/UserSettings/lang/pl.json +++ b/plugins/UserSettings/lang/pl.json @@ -1,9 +1,6 @@ { "UserSettings": { "BrowserLanguage": "Język przeglądarki", - "ColumnConfiguration": "Konfiguracja", - "ColumnResolution": "Rozdzielczość", - "Configurations": "Konfiguracje", "Language_aa": "afar", "Language_ab": "abchaski", "Language_ae": "awestyjski", @@ -191,10 +188,7 @@ "LanguageCode": "Kod języka", "PluginDescription": "Raporty rozmaitych konfiguracji użytkownika: przeglądarki, rodziny przeglądarek, systemów operacyjnych, wtyczek, rozdzielczości, ogólnej konfiguracji.", "PluginDetectionDoesNotWorkInIE": "Uwaga: wykrywanie wtyczek nie działa w przypadku Internet Explorera. Raport ten pokaże tylko wyniki w oparciu o badanie innych przeglądarek, nie opartych na silniku IE.", - "Resolutions": "Rozdzielczość", "VisitorSettings": "Konfiguracje użytkownika", - "WidgetGlobalVisitors": "Ogólna konfiguracja odwiedzających", - "WidgetPlugins": "Lista wtyczek", - "WidgetResolutions": "Rozdzielczość ekranu" + "WidgetPlugins": "Lista wtyczek" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/pt-br.json b/plugins/UserSettings/lang/pt-br.json index 079ad711b43..3a4ea45b6d2 100644 --- a/plugins/UserSettings/lang/pt-br.json +++ b/plugins/UserSettings/lang/pt-br.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Idioma do navegador", "BrowserWithNoPluginsEnabled": "%1$s sem plugins ativados", "BrowserWithPluginsEnabled": "%1$s com os plugins %2$s ativados", - "ColumnConfiguration": "Configuração", - "ColumnResolution": "Resolução", - "Configurations": "Configurações", "Language_aa": "afar", "Language_ab": "abcázio", "Language_ae": "avéstico", @@ -193,12 +190,8 @@ "LanguageCode": "Código do Idioma", "PluginDescription": "Relatórios diversas configurações de usuário: navegador, navegador família, sistema operacional, plugins, resolução, configurações globais.", "PluginDetectionDoesNotWorkInIE": "Nota: a detecção de plugins não funciona no Internet Explorer. Esse relatório é baseado apenas em navegadores não IE.", - "Resolutions": "Resoluções", "VisitorSettings": "Configurações dos visitantes", - "WidgetGlobalVisitors": "Configuração Global de Visitante", - "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações mais comuns gerais que os visitantes tiveram. A configuração é a combinação de um sistema operacional, um tipo de navegador e uma resolução de tela.", "WidgetPlugins": "Lista de Plugins", - "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo.", - "WidgetResolutions": "Resoluções de Tela" + "WidgetPluginsDocumentation": "Este relatório mostra quais plugins de navegador seus visitantes tinham ativado. Esta informação pode ser importante para escolher o caminho certo para levar o seu conteúdo." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/pt.json b/plugins/UserSettings/lang/pt.json index a5017d4a16c..cadd238f27b 100644 --- a/plugins/UserSettings/lang/pt.json +++ b/plugins/UserSettings/lang/pt.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Configuração", - "ColumnResolution": "Resolução", - "Configurations": "Configurações", "Language_aa": "afar", "Language_ab": "abcázio", "Language_ae": "avéstico", @@ -190,12 +187,8 @@ "LanguageCode": "Código do idioma", "PluginDescription": "Relata várias Definições de Utilizador: Navegador, Família de Navegadores, Sistema Operativo, Plugins, Resolução, Definições Globais", "PluginDetectionDoesNotWorkInIE": "Nota: Detecção de plugins não funciona no Internet Explorer. Este relatório só se baseia em navegadores não-IE.", - "Resolutions": "Resoluções", "VisitorSettings": "Definições do Visitante", - "WidgetGlobalVisitors": "Configuração global dos visitantes", - "WidgetGlobalVisitorsDocumentation": "Este relatório mostra as configurações gerais mais comuns que os visitantes tiveram. Uma configuração é a combinação de um sistema operativo, um tipo de navegador e uma resolução de visualização.", "WidgetPlugins": "Lista de Plugins", - "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo.", - "WidgetResolutions": "Resoluções de Ecrã" + "WidgetPluginsDocumentation": "Este relatório mostra quais os plugin que o navegador dos seus visitantes tinham. Esta informação pode ser importante para a escolha do caminho certo para distribuir o seu conteúdo." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ro.json b/plugins/UserSettings/lang/ro.json index e39b81caffa..ce0a61ab5aa 100644 --- a/plugins/UserSettings/lang/ro.json +++ b/plugins/UserSettings/lang/ro.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Limba browser-ului", "BrowserWithNoPluginsEnabled": "%1$s fără plugin-uri activate", "BrowserWithPluginsEnabled": "%1$s cu plugin-uri %2$s activate", - "ColumnConfiguration": "Configuraţia", - "ColumnResolution": "Rezoluţie ecran", - "Configurations": "Configurare", "Language_aa": "Afar", "Language_ab": "abhază", "Language_ae": "avestană", @@ -193,12 +190,8 @@ "LanguageCode": "Cod limbă", "PluginDescription": "Rapoarte difera la setări utilizator: Browser, Browser de familie, sistemul de operare, plugins, Rezolutie, Global Setări.", "PluginDetectionDoesNotWorkInIE": "Notă: de detectare a plugin-uri nu funcționează în Internet Explorer. Acest raport se bazează doar pe browsere non-IE.", - "Resolutions": "Rezolutii", "VisitorSettings": "Setări vizitatori", - "WidgetGlobalVisitors": "Configurare vizitatori globala", - "WidgetGlobalVisitorsDocumentation": "Acest raport arată cele mai comune configurații generale,pe care vizitatorii le au avut. O configurație este combinația dintre un sistem de operare, un tip de browser și o rezoluție a ecranului.", "WidgetPlugins": "Lista pluginurilor", - "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut.", - "WidgetResolutions": "Rezolutii ecran" + "WidgetPluginsDocumentation": "Acest raport arată ce plugin-uri de browser-ul au activat vizitatorii. Aceste informație ar putea fi importanta pentru a alege modul corect de a livra conținut." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/ru.json b/plugins/UserSettings/lang/ru.json index a55776ea0c4..dc4738a5de5 100644 --- a/plugins/UserSettings/lang/ru.json +++ b/plugins/UserSettings/lang/ru.json @@ -1,9 +1,6 @@ { "UserSettings": { "BrowserLanguage": "Язык браузера", - "ColumnConfiguration": "Конфигурация", - "ColumnResolution": "Разрешение", - "Configurations": "По конфигурации", "Language_aa": "афар", "Language_ab": "абхазский", "Language_ae": "авестийский", @@ -191,12 +188,8 @@ "LanguageCode": "Код языка", "PluginDescription": "Ведет учет различных настроек пользователя: браузер, семейство браузера, операционная система, плагины, разрешение экрана, а также глобальные настройки.", "PluginDetectionDoesNotWorkInIE": "Учтите: Определение плагинов не работает в Internet Explorer. Этот отчет содержит информацию о не-IE браузерах.", - "Resolutions": "По разрешению мониторов", "VisitorSettings": "Настройки посетителей", - "WidgetGlobalVisitors": "Глобальная конфигурация", - "WidgetGlobalVisitorsDocumentation": "Этот отчет показывает общую информацию по наиболее популяоным конфигурациям системы ваших посетителей. Конфигурация - это комбинация операционной системы, браузера и разрешения экрана.", "WidgetPlugins": "Список плагинов", - "WidgetPluginsDocumentation": "Этот отчет показывается какие плагины посетители используют в своих браузерах. Эта информация может быть важна для того, чтобы посетители смогли видеть ваш контент должным образом.", - "WidgetResolutions": "По разрешению мониторов" + "WidgetPluginsDocumentation": "Этот отчет показывается какие плагины посетители используют в своих браузерах. Эта информация может быть важна для того, чтобы посетители смогли видеть ваш контент должным образом." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/sk.json b/plugins/UserSettings/lang/sk.json index 9874405ad0f..74a87bb041d 100644 --- a/plugins/UserSettings/lang/sk.json +++ b/plugins/UserSettings/lang/sk.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigurácia", - "ColumnResolution": "Rozlíšenie", - "Configurations": "Konfigurácia", "Language_aa": "afarčina", "Language_ab": "abcházština", "Language_ae": "avestčina", @@ -190,10 +187,7 @@ "LanguageCode": "Kód jazyka", "PluginDescription": "Rôzne reporty užívateľského nastavenia: Prehliadač, Rodina prehliadača, Operačný systém, Pluginy, Rozlíšenie, Globálne nastavenia.", "PluginDetectionDoesNotWorkInIE": "Poznámka: Plugin detekcia nefunguje v Internet Exploreri. Táto správa je založená len na non-IE prehliadačov.", - "Resolutions": "Rozlíšenie", "VisitorSettings": "Nastavenia návštevníkov", - "WidgetGlobalVisitors": "Globálne konfigurácie návštevníkov", - "WidgetPlugins": "Zoznam modulov", - "WidgetResolutions": "Rozlíšenie obrazovky" + "WidgetPlugins": "Zoznam modulov" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/sl.json b/plugins/UserSettings/lang/sl.json index 6a28d87223d..9f6607afd2e 100644 --- a/plugins/UserSettings/lang/sl.json +++ b/plugins/UserSettings/lang/sl.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Jezik brskalnika", "BrowserWithNoPluginsEnabled": "%1$s brez omogočenih vtičnikov", "BrowserWithPluginsEnabled": "%1$s z omogočenimi vtičniki %2$s", - "ColumnConfiguration": "Nastavitev", - "ColumnResolution": "Resolucija", - "Configurations": "Nastavitve", "Language_aa": "afarščina", "Language_ab": "abhaščina", "Language_ae": "avestijščina", @@ -191,9 +188,7 @@ "Language_zh": "kitajščina", "Language_zu": "zulujščina", "LanguageCode": "Šifra jezika", - "Resolutions": "Resolucije", "VisitorSettings": "Nastavitve obiskovalcev", - "WidgetPlugins": "Seznam Vtičnikov", - "WidgetResolutions": "Resolucija zaslona" + "WidgetPlugins": "Seznam Vtičnikov" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/sq.json b/plugins/UserSettings/lang/sq.json index 3920246e683..d7dc1795b57 100644 --- a/plugins/UserSettings/lang/sq.json +++ b/plugins/UserSettings/lang/sq.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Formësim", - "ColumnResolution": "Qartësi", - "Configurations": "Formësime", "Language_af": "Afrikanisht", "Language_am": "Amharike", "Language_ar": "Arabisht", @@ -107,12 +104,8 @@ "LanguageCode": "Kod Gjuhe", "PluginDescription": "Raporton Rregullime të ndryshme të Përdoruesit: Shfletues, Familje Shfletuesi, Sistem Operativ, Shtojca, Qartësi, Rregullime Globale.", "PluginDetectionDoesNotWorkInIE": "Shënim: Zbulimi i shtojcave nuk funksionon nën Internet Explorer. Ky raport mund të kihet vetëm nën shfletuesa jo-IE.", - "Resolutions": "Qartësi", "VisitorSettings": "Rregullimet për Vizitor", - "WidgetGlobalVisitors": "Formësime globale vizitorësh", - "WidgetGlobalVisitorsDocumentation": "Ky raport shfaq formësimet e përgjithshme më të rëndomta të përdorura nga vizitorët tuaj. Formësimi përmban të dhënat për sistemin operativ, llojin e shfletuesit dhe qartësinë e ekranit.", "WidgetPlugins": "Listë e Shtojcave", - "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj.", - "WidgetResolutions": "Qartësi ekrani" + "WidgetPluginsDocumentation": "Ky raport tregon se cilat shtojca shfletuesi kanë të aktivizuara vizitorët tuaj. Ky informacion mund të jetë i vlefshëm për zgjedhjen e mënyrës më të përshtatshme për ofrimin e lëndës suaj." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/sr.json b/plugins/UserSettings/lang/sr.json index 289c2da5516..5fcf4549b4a 100644 --- a/plugins/UserSettings/lang/sr.json +++ b/plugins/UserSettings/lang/sr.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Jezik brauzera", "BrowserWithNoPluginsEnabled": "%1$s sa isključenim dodacima", "BrowserWithPluginsEnabled": "%1$s sa uključenim dodacima %2$s", - "ColumnConfiguration": "Podešavanja", - "ColumnResolution": "Rezolucija", - "Configurations": "Podešavanja", "Language_aa": "Afar", "Language_ab": "Abhazijski", "Language_ae": "Avestan", @@ -193,12 +190,8 @@ "LanguageCode": "Kod jezika", "PluginDescription": "Izveštaj o različitim parametrima vezanim za posetioce: brauzeri, operativni sistemi, dodaci, ekranske rezolucije, globalna podešavanja.", "PluginDetectionDoesNotWorkInIE": "Pažnja: detekcija dodataka ne radi kod Internet Explorera. Ovaj izveštaj se odnosi samo na brauzere koji nisu Internet Exlorer", - "Resolutions": "Rezolucije", "VisitorSettings": "Parametri posetilaca", - "WidgetGlobalVisitors": "Globalna podešavanja posetilaca", - "WidgetGlobalVisitorsDocumentation": "Ovaj izveštaj prikazuje najčešća podešavanja vaših posetilaca. Pod podešavanjem podrazumevamo kombinaciju operativnog sistema, tipa brauzera i ekranske rezolucije.", "WidgetPlugins": "Lista dodataka", - "WidgetPluginsDocumentation": "Ovaj izveštaj prikazuje koje dodatke za brauzere vaši posetioci imaju uključene. Ova informacija može biti od značaja prilikom odabira pravog načina prikaza sadržaja na vašem sajtu.", - "WidgetResolutions": "Rezolucije ekrana" + "WidgetPluginsDocumentation": "Ovaj izveštaj prikazuje koje dodatke za brauzere vaši posetioci imaju uključene. Ova informacija može biti od značaja prilikom odabira pravog načina prikaza sadržaja na vašem sajtu." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/sv.json b/plugins/UserSettings/lang/sv.json index 558b7c7dfd8..9cb34b693bb 100644 --- a/plugins/UserSettings/lang/sv.json +++ b/plugins/UserSettings/lang/sv.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Webbläsarspråk", "BrowserWithNoPluginsEnabled": "%1$s med inga plugins är aktiverad", "BrowserWithPluginsEnabled": "%1$s med plugins %2$s är aktiverad", - "ColumnConfiguration": "Konfiguration", - "ColumnResolution": "Skärmupplösning", - "Configurations": "Konfiguration", "Language_aa": "Afar", "Language_ab": "Abchaziska", "Language_ae": "Avestiska", @@ -193,12 +190,8 @@ "LanguageCode": "Språkkod", "PluginDescription": "Rapporterar olika användarinställningar: Webbläsare, Webbläsarfamilj, operativsystem, Plugins, upplösning, Globala inställningar.", "PluginDetectionDoesNotWorkInIE": "Notering: Plugins upptäckt fungerar inte i Internet Explorer. Denna rapport är endast baserad på icke-IE webbläsare.", - "Resolutions": "Skärmupplösning", "VisitorSettings": "Besökarinställningar", - "WidgetGlobalVisitors": "Global besökarkonfiguration", - "WidgetGlobalVisitorsDocumentation": "Denna rapport visar de vanligaste övergripande konfigurationer som besökarna hade. En konfiguration är en kombination av ett operativsystem, en webbläsare och en skärmupplösning.", "WidgetPlugins": "Lista över plugins", - "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll.", - "WidgetResolutions": "Skärmupplösning" + "WidgetPluginsDocumentation": "Denna rapport visar vilka plugins i webbläsaren som besökarna hade aktiverat. Denna information kan vara viktig för att välja rätt sätt att leverera ditt innehåll." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/te.json b/plugins/UserSettings/lang/te.json index 9a69fd70c9a..f61fd26b874 100644 --- a/plugins/UserSettings/lang/te.json +++ b/plugins/UserSettings/lang/te.json @@ -1,7 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "స్వరూపణం", - "Configurations": "స్వరూపణలు", "Language_aa": "అఫార్", "Language_ab": "అబ్ఖాజియన్", "Language_ae": "అవేస్టాన్", diff --git a/plugins/UserSettings/lang/th.json b/plugins/UserSettings/lang/th.json index ee090e21654..76d152d3d3b 100644 --- a/plugins/UserSettings/lang/th.json +++ b/plugins/UserSettings/lang/th.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "การตั้งค่า", - "ColumnResolution": "ความละเอียด", - "Configurations": "การกำหนดค่า", "Language_aa": "อะฟาร์", "Language_ab": "อับคาซ", "Language_ae": "อเวสตะ", @@ -190,10 +187,7 @@ "LanguageCode": "รหัสภาษา", "PluginDescription": "รายงานการตั้งค่าผู้ใช้ต่างๆ: เบราว์เซอร์, ตระกูลเบราว์เซอร์,ระบบปฏิบัติการ, ปลั๊กอิน, การแก้ไขและการตั้งค่าส่วนกลาง", "PluginDetectionDoesNotWorkInIE": "หมายเหตุ: ตรวจสอบปลั๊กอินไม่ทำงานใน Internet Explorer รายงานนี้จะอิงตามเฉพาะเบราว์เซอร์ที่ไม่ใช่ IE", - "Resolutions": "ความละเอียด", "VisitorSettings": "การตั้งค่าของผู้เข้าชม", - "WidgetGlobalVisitors": "การตั้งค่าผู้เข้าชมโดยรวม", - "WidgetPlugins": "รายการปลั้กอิน", - "WidgetResolutions": "ความละเอียดจอภาพ" + "WidgetPlugins": "รายการปลั้กอิน" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/tl.json b/plugins/UserSettings/lang/tl.json index 19b42e9bf8e..e2166e7802f 100644 --- a/plugins/UserSettings/lang/tl.json +++ b/plugins/UserSettings/lang/tl.json @@ -3,9 +3,6 @@ "BrowserLanguage": "wika ng browser", "BrowserWithNoPluginsEnabled": "%1$s na may plugins na hindi pinapagana", "BrowserWithPluginsEnabled": "%1$s na may mga plugin %2$s na naka-enable", - "ColumnConfiguration": "Configuration", - "ColumnResolution": "Resolusyon", - "Configurations": "Configurations", "Language_aa": "Afar", "Language_ab": "Abkhazian", "Language_ae": "Avestan", @@ -192,12 +189,8 @@ "LanguageCode": "wika ng code", "PluginDescription": "Ulat para sa ibat-ibang mga Setting ng user: Browser Pamilya ng browser Operating System Plugins Resolution Pang-kalahatang settings.", "PluginDetectionDoesNotWorkInIE": "Tandaan: Ang pagtingin ng Plugin ay hindi gumagana sa Internet Explorer. Ang ulat na ito ay batay lamang sa mga browser na hindi-IE.", - "Resolutions": "Mga Resolution", "VisitorSettings": "Mga Setting ng bisita", - "WidgetGlobalVisitors": "Configuration ng bisita", - "WidgetGlobalVisitorsDocumentation": "Ang ulat na ito ay nagpapakita ng karaniwang pangkalahatang configuration na meron ang iyong bisita. Ang configuration ay binubuo ng operating system uri ng mga browser at screen resolution.", "WidgetPlugins": "Browser Plugins", - "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito.", - "WidgetResolutions": "Screen Resolution" + "WidgetPluginsDocumentation": "Ang ulat na ito ay ipinapakita kung anong browser plugis ang gumagana sa iyong bisita. Ang impormasyon na ito may maaring mahalaga sa pagpili kung paanu ihahatid ang nilalaman nito." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/tr.json b/plugins/UserSettings/lang/tr.json index c675a5e0226..0b47d7fc6c3 100644 --- a/plugins/UserSettings/lang/tr.json +++ b/plugins/UserSettings/lang/tr.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Konfigürasyon", - "ColumnResolution": "Çözünürlük", - "Configurations": "Konfigürasyonları", "Language_aa": "Afar", "Language_ab": "Abazca", "Language_ae": "Avestçe", @@ -190,10 +187,7 @@ "LanguageCode": "Dil kodu", "PluginDescription": "Çeşitli kullanıcı rapor ayalari: Tarayıcı, Tarayıcı Ailesi, İşletim Sistemi, Eklentiler, Çözünürlük, Genel Ayarlar.", "PluginDetectionDoesNotWorkInIE": "Not: Hedeflenen eklenti Internet Explorer çalışmamaktadir. Bu not\/rapor sadece IE içindir.", - "Resolutions": "Çözünürlükler", "VisitorSettings": "Ziyaretçi Ayarlari", - "WidgetGlobalVisitors": "Global ziyaretçi konfikasyonu", - "WidgetPlugins": "Eklenti Listesi", - "WidgetResolutions": "Ekran çözünürlükleri" + "WidgetPlugins": "Eklenti Listesi" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/uk.json b/plugins/UserSettings/lang/uk.json index 10ae7b655e6..d3aaf7c6675 100644 --- a/plugins/UserSettings/lang/uk.json +++ b/plugins/UserSettings/lang/uk.json @@ -1,8 +1,5 @@ { "UserSettings": { - "ColumnConfiguration": "Конфігурація", - "ColumnResolution": "Роздільна здатність", - "Configurations": "Конфігурації", "Language_aa": "афарська", "Language_ab": "абхазька", "Language_ae": "авестійська", @@ -190,10 +187,7 @@ "LanguageCode": "Код мови", "PluginDescription": "Повідомляє різні налаштуванян користовувача: веб-оглядач, родина веб-оглядача, операційна система, плагіни, роздільна здатність, глобальні налаштування.", "PluginDetectionDoesNotWorkInIE": "Примітка: Визначення плагінів не працює в Internet Explorer. Цей звіт базується лише на не-IE веб-оглядачах.", - "Resolutions": "Роздільні здатності", "VisitorSettings": "Налаштування відвідувача", - "WidgetGlobalVisitors": "Загальна конфігурація відвідувачів", - "WidgetPlugins": "Список плагінів", - "WidgetResolutions": "Роздільні здатності" + "WidgetPlugins": "Список плагінів" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/vi.json b/plugins/UserSettings/lang/vi.json index 07ba3d51f7a..01e6272fd58 100644 --- a/plugins/UserSettings/lang/vi.json +++ b/plugins/UserSettings/lang/vi.json @@ -3,9 +3,6 @@ "BrowserLanguage": "Ngôn ngữ trình duyệt", "BrowserWithNoPluginsEnabled": "%1$s không có plugin nào được kích hoạt", "BrowserWithPluginsEnabled": "%1$s với plugin %2$s đã kích hoạt", - "ColumnConfiguration": "Cấu hình", - "ColumnResolution": "Độ phân giải", - "Configurations": "cấu hình", "Language_aa": "Tiếng Afar", "Language_ab": "Tiếng Abkhazia", "Language_ae": "Tiếng Avestan", @@ -193,12 +190,8 @@ "LanguageCode": "Mã ngôn ngữ", "PluginDescription": "Cài đặt báo cáo người dùng khác nhau: trình duyệt, họ trình duyệt, Hệ điều hành, Plugin, Độ phân giải, Cài đặt tổng quát.", "PluginDetectionDoesNotWorkInIE": "Chú ý: Các Plugin phát hiện không làm việc trên Internet Explorer. Báo cáo này chỉ dựa trên trình duyệt không phải IE.", - "Resolutions": "Độ phân giải", "VisitorSettings": "Thiết lập khách truy cập", - "WidgetGlobalVisitors": "Cấu hình khách truy cập", - "WidgetGlobalVisitorsDocumentation": "Báo cáo này cho thấy các cấu hình tổng thể phổ biến nhất mà khách truy cập của bạn đã có. Một cấu hình là sự kết hợp của một hệ điều hành, một loại trình duyệt và độ phân giải màn hình.", "WidgetPlugins": "Các Plugin trình duyệt", - "WidgetPluginsDocumentation": "Báo cáo này cho thấy các plugin trình duyệt mà khách truy cập của bạn đã kích hoạt. Thông tin này có thể là quan trọng cho việc lựa chọn cách đúng để cung cấp nội dung của bạn.", - "WidgetResolutions": "Độ phân giải màn hình" + "WidgetPluginsDocumentation": "Báo cáo này cho thấy các plugin trình duyệt mà khách truy cập của bạn đã kích hoạt. Thông tin này có thể là quan trọng cho việc lựa chọn cách đúng để cung cấp nội dung của bạn." } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/zh-cn.json b/plugins/UserSettings/lang/zh-cn.json index d176b168865..09db56f7291 100644 --- a/plugins/UserSettings/lang/zh-cn.json +++ b/plugins/UserSettings/lang/zh-cn.json @@ -3,9 +3,6 @@ "BrowserLanguage": "浏览器语言", "BrowserWithNoPluginsEnabled": "%1$s 没有启用插件", "BrowserWithPluginsEnabled": "%1$s 启用插件%2$s", - "ColumnConfiguration": "客户端配置", - "ColumnResolution": "分辨率", - "Configurations": "客户端配置", "Language_aa": "阿法文", "Language_ab": "阿布哈西亚文", "Language_ae": "阿维斯塔文", @@ -193,12 +190,8 @@ "LanguageCode": "语言代码", "PluginDescription": "用户环境报表: 浏览器、浏览器种类、操作系统、插件、分辨率、全局参数。", "PluginDetectionDoesNotWorkInIE": "注意: 插件检查无法在 Internet Explorer 上运行。这个报表仅提供非 IE 浏览器。", - "Resolutions": "分辨率", "VisitorSettings": "访客设置", - "WidgetGlobalVisitors": "访客设置", - "WidgetGlobalVisitorsDocumentation": "本报表显示您的访客最常用的系统配置。系统配置是操作系统、浏览器类型及显示器分辨率的组合。", "WidgetPlugins": "浏览器插件清单", - "WidgetPluginsDocumentation": "本报表显示访客使用的浏览器插件，这可能对如何发布您的内容很重要。", - "WidgetResolutions": "画面分辨率" + "WidgetPluginsDocumentation": "本报表显示访客使用的浏览器插件，这可能对如何发布您的内容很重要。" } } \ No newline at end of file diff --git a/plugins/UserSettings/lang/zh-tw.json b/plugins/UserSettings/lang/zh-tw.json index 6b9019f6714..76e4bb92653 100644 --- a/plugins/UserSettings/lang/zh-tw.json +++ b/plugins/UserSettings/lang/zh-tw.json @@ -1,9 +1,6 @@ { "UserSettings": { "BrowserLanguage": "瀏覽器語系", - "ColumnConfiguration": "客戶端配置", - "ColumnResolution": "解析度", - "Configurations": "客戶端配置", "Language_aa": "阿法文", "Language_ab": "阿布哈西亚文", "Language_ae": "阿维斯塔文", @@ -191,11 +188,7 @@ "LanguageCode": "語系代碼", "PluginDescription": "各個用戶設定報表：瀏覽器、瀏覽器家族、作業系統、外掛、解析度、全域設定。", "PluginDetectionDoesNotWorkInIE": "注意：外掛偵測無法在 Internet Explorer 上運作。這個報告僅提供非 IE 瀏覽器。", - "Resolutions": "解析度", "VisitorSettings": "造訪者設定值", - "WidgetGlobalVisitors": "全域訪客配置", - "WidgetGlobalVisitorsDocumentation": "此報表列出貴站訪客最常見的設定配置。設定配置包含作業系統、瀏覽器、螢幕解析度等資訊。", - "WidgetPlugins": "瀏覽器外掛清單", - "WidgetResolutions": "畫面解析度" + "WidgetPlugins": "瀏覽器外掛清單" } } \ No newline at end of file From d1986d1e0018e6b7b30c002711211d21586fca51 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sat, 13 Dec 2014 19:44:14 +0100 Subject: [PATCH 11/12] improved test --- ...itorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php | 6 +++--- ...veralDays_DateRange__Resolution.getResolution_range.xml} | 0 2 files changed, 3 insertions(+), 3 deletions(-) rename tests/PHPUnit/System/expected/{test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml => test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml} (100%) diff --git a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php index 889cd60ec31..e01e2b9983b 100755 --- a/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php +++ b/tests/PHPUnit/System/OneVisitorOneWebsiteSeveralDaysDateRangeArchivingTestsTest.php @@ -43,7 +43,7 @@ public function getApiForTesting() $apiToCall = array('Actions.getPageUrls', 'VisitsSummary.get', - 'UserSettings.getResolution', + 'Resolution.getResolution', 'VisitFrequency.get', 'VisitTime.getVisitInformationPerServerTime'); @@ -109,14 +109,14 @@ public function test_checkArchiveRecords_whenPeriodIsRange() $tests = array( // TODO Implement fix, then remove the +3 below 'archive_blob_2010_12' => ( ($expectedActionsBlobs+3) /*Actions*/ - + 2 /* UserSettings */ + + 2 /* Resolution */ + 2 /* VisitTime */) * 3, /** * In Each "Period=range" Archive, we expect following non zero numeric entries: * 5 metrics + 1 flag // VisitsSummary * + 2 metrics + 1 flag // Actions - * + 1 flag // UserSettings + * + 1 flag // Resolution * + 1 flag // VisitTime * = 11 * diff --git a/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml b/tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml similarity index 100% rename from tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__UserSettings.getResolution_range.xml rename to tests/PHPUnit/System/expected/test_oneVisitor_oneWebsite_severalDays_DateRange__Resolution.getResolution_range.xml From 1e663037cbb52f7f82a1c080518fd71eb15404b6 Mon Sep 17 00:00:00 2001 From: sgiehl Date: Sat, 13 Dec 2014 19:51:08 +0100 Subject: [PATCH 12/12] activate plugin on update --- core/Updates/2.10.0-b7.php | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/core/Updates/2.10.0-b7.php b/core/Updates/2.10.0-b7.php index a44117fc811..21a5e7b1af1 100644 --- a/core/Updates/2.10.0-b7.php +++ b/core/Updates/2.10.0-b7.php @@ -38,6 +38,13 @@ static function getSql() static function update() { Updater::updateDatabase(__FILE__, self::getSql()); + + $pluginManager = \Piwik\Plugin\Manager::getInstance(); + + try { + $pluginManager->activatePlugin('Resolution'); + } catch(\Exception $e) { + } } }