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/Intl/lang/cs.json | |
| 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/Intl/lang/cs.json')
| -rw-r--r-- | plugins/Intl/lang/cs.json | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/plugins/Intl/lang/cs.json b/plugins/Intl/lang/cs.json index 813e0506ee..5d13f324a1 100644 --- a/plugins/Intl/lang/cs.json +++ b/plugins/Intl/lang/cs.json @@ -300,8 +300,8 @@ "Day_Short_StandAlone_6": "So", "Day_Short_StandAlone_7": "Ne", "EnglishLanguageName": "Czech", - "Format_DateTime_Long": "EEEE d. MMMM y H:mm:ss", - "Format_DateTime_Short": "d. M. y H:mm:ss", + "Format_DateTime_Long": "EEEE d. MMMM y {time}", + "Format_DateTime_Short": "d. M. y {time}", "Format_Date_Day_Month": "E d. M.", "Format_Date_Long": "EEEE d. MMMM y", "Format_Date_Short": "d. M. y", @@ -313,7 +313,9 @@ "Format_Interval_Short_Y": "d. M. y – d. M. y", "Format_Month_Long": "LLLL y", "Format_Month_Short": "LLLL y", - "Format_Time": "H:mm:ss", + "Format_Time": "{time}", + "Format_Time_12": "h:mm:ss a", + "Format_Time_24": "H:mm:ss", "Format_Year": "y", "Hours": "hodiny", "Language_aa": "Afarština", |