diff options
| author | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
|---|---|---|
| committer | Thomas Steur <thomas.steur@gmail.com> | 2015-12-10 00:50:07 +0300 |
| commit | ebced800c0184f5ce93663afab6b0337c3755cbb (patch) | |
| tree | fb26c2506d37586ff0d38fb902d63d17701bd883 /plugins/VisitFrequency | |
| parent | 3d26af780d8fe0e4f7c5824a88b95c4a0d0d25d7 (diff) | |
| parent | db36ca384809ea36457a465a3b6d1ecf951b0e26 (diff) | |
Merge master into "3.0"
Conflicts:
.travis.yml
CHANGELOG.md
core/Plugin/ControllerAdmin.php
core/Version.php
core/testMinimumPhpVersion.php
plugins/API/API.php
plugins/Actions/Reports/GetPageUrls.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreHome/CoreHome.php
plugins/CoreHome/templates/_menu.twig
plugins/CoreVisualizations/javascripts/jqplotEvolutionGraph.js
plugins/CustomVariables/tests/System/expected/test_CustomVariablesSystemTest__CustomVariables.getCustomVariables_day.xml
plugins/Goals/Controller.php
tests/PHPUnit/Fixtures/ManyVisitsWithGeoIP.php
tests/PHPUnit/Integration/Plugin/ManagerTest.php
tests/PHPUnit/System/expected/test_FlattenReports__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_month.original.html
tests/PHPUnit/System/expected/test_apiGetReportMetadata__API.getSegmentsMetadata.xml
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_periodIsRange_dateIsLastN_MetadataAndNormalAPI_pagesegment__CustomVariables.getCustomVariables_range.xml
tests/PHPUnit/System/expected/test_reportLimiting__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_reportLimiting_rankingQuery__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchALL_noGoalData__CustomVariables.getCustomVariables_week.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_day.xml
tests/PHPUnit/System/expected/test_twoVisitsWithCustomVariables_segmentMatchVisitorType__CustomVariables.getCustomVariables_week.xml
tests/UI/expected-ui-screenshots
tests/UI/specs/Overlay_spec.js
tests/UI/specs/UIIntegration_spec.js
Diffstat (limited to 'plugins/VisitFrequency')
| -rw-r--r-- | plugins/VisitFrequency/API.php | 1 | ||||
| -rw-r--r-- | plugins/VisitFrequency/lang/id.json | 2 | ||||
| -rw-r--r-- | plugins/VisitFrequency/lang/ko.json | 6 |
3 files changed, 6 insertions, 3 deletions
diff --git a/plugins/VisitFrequency/API.php b/plugins/VisitFrequency/API.php index a6f9971480..550212d9e3 100644 --- a/plugins/VisitFrequency/API.php +++ b/plugins/VisitFrequency/API.php @@ -45,7 +45,6 @@ class API extends \Piwik\Plugin\API 'segment' => $segment, 'columns' => implode(',', $columns), 'format' => 'original', - 'serialize' => 0, // tests set this to 1 'format_metrics' => 0 ); diff --git a/plugins/VisitFrequency/lang/id.json b/plugins/VisitFrequency/lang/id.json index 4149ae29fc..d44b555ef2 100644 --- a/plugins/VisitFrequency/lang/id.json +++ b/plugins/VisitFrequency/lang/id.json @@ -10,6 +10,8 @@ "ColumnReturningVisits": "Kunjungan Kembali", "ColumnSumVisitLengthReturning": "Jumlah waktu digunakan oleh pengunjung kembali (dalam detik)", "ColumnUniqueReturningVisitors": "Pengnjung kembali unik", + "ColumnReturningUsers": "Penguna kembali", + "PluginDescription": "Laporan matriks mengenai pengunjung baru dan pengunjung kembali.", "ReturnActions": "%s tindakan tiap kunjungan kembali", "ReturnAverageVisitDuration": "%s rerata waktu kunjungan pengunjung kembali", "ReturnAvgActions": "%s tindakan tiap kunjungan kembali", diff --git a/plugins/VisitFrequency/lang/ko.json b/plugins/VisitFrequency/lang/ko.json index 4192687557..7a5880db1c 100644 --- a/plugins/VisitFrequency/lang/ko.json +++ b/plugins/VisitFrequency/lang/ko.json @@ -10,6 +10,8 @@ "ColumnReturningVisits": "돌아온 방문 수", "ColumnSumVisitLengthReturning": "리피터의 총 머문 시간 (초)", "ColumnUniqueReturningVisitors": "고유한 돌아온 방문자", + "ColumnReturningUsers": "돌아온 사용자", + "PluginDescription": "처음 방문한 방문자와 다시 돌아온 방문자에 대한", "ReturnActions": "%s 돌아온 방문의 활동", "ReturnAverageVisitDuration": "%s 돌아온 방문자의 평균 방문 시간", "ReturnAvgActions": "%s 돌아온 방문당 활동", @@ -17,8 +19,8 @@ "ReturningVisitDocumentation": "돌아온 방문은 (신규 방문과는 대조적으로), 적어도 한 번은 이전에 웹 사이트를 방문한 사람에 의해 이루어집니다.", "ReturningVisitsDocumentation": "돌아온 방문 개요입니다.", "ReturnVisits": "%s 돌아온 방문", - "SubmenuFrequency": "프리퀸시", + "SubmenuFrequency": "빈도", "WidgetGraphReturning": "돌아온 방문 수 그래프", - "WidgetOverview": "프리퀸시 개요" + "WidgetOverview": "빈도 개요" } }
\ No newline at end of file |