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/VisitTime | |
| 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/VisitTime')
| -rw-r--r-- | plugins/VisitTime/lang/cs.json | 4 | ||||
| -rw-r--r-- | plugins/VisitTime/lang/ko.json | 1 |
2 files changed, 3 insertions, 2 deletions
diff --git a/plugins/VisitTime/lang/cs.json b/plugins/VisitTime/lang/cs.json index ab1e8150f7..c49f2bc6a6 100644 --- a/plugins/VisitTime/lang/cs.json +++ b/plugins/VisitTime/lang/cs.json @@ -6,13 +6,13 @@ "LocalTime": "Návštěvy podle lokálního času", "NHour": "%sh", "PluginDescription": "Hlásí místní a serverový čas, kdy vaši návštěvníci zobrazují stránky nebo aplikaci.", - "ServerTime": "Návštěvy podle serverového času", + "ServerTime": "Návštěvy podle času na serveru", "SubmenuTimes": "Časy", "VisitsByDayOfWeek": "Návštěvy podle dnů v týdnu", "WidgetByDayOfWeekDocumentation": "Tento graf zobrazuje, kolik návštěv obdržela vaše stránka každý den v týdnu.", "WidgetLocalTime": "Návštěvy podle lokálního času", "WidgetLocalTimeDocumentation": "Tento graf ukazuje čas v %s návštěvníkovo časové zóně %s během jěho návštěvy.", - "WidgetServerTime": "Návštěvy podle serverového času", + "WidgetServerTime": "Návštěvy podle času na serveru", "WidgetServerTimeDocumentation": "Tento graf ukazuje jaký čas byl na %s serveru časové zóny %s během návstěvy." } }
\ No newline at end of file diff --git a/plugins/VisitTime/lang/ko.json b/plugins/VisitTime/lang/ko.json index c83bd88aac..216933c951 100644 --- a/plugins/VisitTime/lang/ko.json +++ b/plugins/VisitTime/lang/ko.json @@ -5,6 +5,7 @@ "DayOfWeek": "요일", "LocalTime": "현지 시간 기준 방문 수", "NHour": "%s시", + "PluginDescription": "방문자가 웹사이트나 앱을 볼 때 현지 시간 및 서버 시간을 알려줍니다.", "ServerTime": "서버 시간 기준 방문 수", "SubmenuTimes": "방문시간", "VisitsByDayOfWeek": "요일별 방문수", |