diff options
author | Thomas Steur <thomas.steur@gmail.com> | 2016-08-29 07:01:46 +0300 |
---|---|---|
committer | Thomas Steur <thomas.steur@gmail.com> | 2016-08-29 07:01:46 +0300 |
commit | 4c9d1274408fb57d5e0b53dcda425dc4892c7b00 (patch) | |
tree | 78b0f24058d586cdd109de0387d43165e112003e /plugins/Events | |
parent | 0c9c30b731ccbacf47e154b9f7a590af49e3d799 (diff) | |
parent | 4b395d2385e0041973349c7575fc10378b85558e (diff) |
Merge branch 'master' into 3.0-m06
Conflicts:
.travis.yml
bower.json
core/Notification/Manager.php
core/Updates.php
core/Updates/2.16.2-b2.php
core/Version.php
libs/Zend/Validate/Hostname.php
libs/bower_components/jScrollPane/ajax.html
libs/bower_components/jScrollPane/anchors.html
libs/bower_components/jScrollPane/api.html
libs/bower_components/jScrollPane/arrow_hover.html
libs/bower_components/jScrollPane/arrow_positions.html
libs/bower_components/jScrollPane/arrows.html
libs/bower_components/jScrollPane/auto_reinitialise.html
libs/bower_components/jScrollPane/basic.html
libs/bower_components/jScrollPane/caps.html
libs/bower_components/jScrollPane/changelog.html
libs/bower_components/jScrollPane/destroy.html
libs/bower_components/jScrollPane/drag_size.html
libs/bower_components/jScrollPane/dynamic_content.html
libs/bower_components/jScrollPane/dynamic_height.html
libs/bower_components/jScrollPane/dynamic_width.html
libs/bower_components/jScrollPane/events.html
libs/bower_components/jScrollPane/faqs.html
libs/bower_components/jScrollPane/fixed_width.html
libs/bower_components/jScrollPane/focus.html
libs/bower_components/jScrollPane/fullpage_scroll.html
libs/bower_components/jScrollPane/iframe.html
libs/bower_components/jScrollPane/iframe2.html
libs/bower_components/jScrollPane/iframe_content1.html
libs/bower_components/jScrollPane/iframe_content2.html
libs/bower_components/jScrollPane/image.html
libs/bower_components/jScrollPane/image2.html
libs/bower_components/jScrollPane/index.html
libs/bower_components/jScrollPane/invisibles.html
libs/bower_components/jScrollPane/known_issues.html
libs/bower_components/jScrollPane/less_basic.html
libs/bower_components/jScrollPane/mwheel_intent.html
libs/bower_components/jScrollPane/override_animate.html
libs/bower_components/jScrollPane/runeimp.html
libs/bower_components/jScrollPane/runeimp2.html
libs/bower_components/jScrollPane/scroll_on_left.html
libs/bower_components/jScrollPane/scroll_to.html
libs/bower_components/jScrollPane/scroll_to_animate.html
libs/bower_components/jScrollPane/settings.html
libs/bower_components/jScrollPane/short.html
libs/bower_components/jquery/.bower.json
libs/bower_components/jquery/LICENSE.txt
libs/bower_components/jquery/dist/jquery.js
libs/bower_components/jquery/dist/jquery.min.js
libs/bower_components/jquery/dist/jquery.min.map
libs/bower_components/jquery/sizzle/dist/sizzle.js
libs/bower_components/jquery/src/ajax.js
libs/bower_components/jquery/src/ajax/jsonp.js
libs/bower_components/jquery/src/ajax/load.js
libs/bower_components/jquery/src/ajax/parseJSON.js
libs/bower_components/jquery/src/ajax/parseXML.js
libs/bower_components/jquery/src/ajax/script.js
libs/bower_components/jquery/src/ajax/xhr.js
libs/bower_components/jquery/src/attributes/attr.js
libs/bower_components/jquery/src/attributes/classes.js
libs/bower_components/jquery/src/attributes/prop.js
libs/bower_components/jquery/src/attributes/support.js
libs/bower_components/jquery/src/attributes/val.js
libs/bower_components/jquery/src/callbacks.js
libs/bower_components/jquery/src/core.js
libs/bower_components/jquery/src/core/access.js
libs/bower_components/jquery/src/core/init.js
libs/bower_components/jquery/src/core/parseHTML.js
libs/bower_components/jquery/src/core/ready.js
libs/bower_components/jquery/src/css.js
libs/bower_components/jquery/src/css/curCSS.js
libs/bower_components/jquery/src/css/hiddenVisibleSelectors.js
libs/bower_components/jquery/src/css/support.js
libs/bower_components/jquery/src/css/var/swap.js
libs/bower_components/jquery/src/data.js
libs/bower_components/jquery/src/data/accepts.js
libs/bower_components/jquery/src/deferred.js
libs/bower_components/jquery/src/deprecated.js
libs/bower_components/jquery/src/dimensions.js
libs/bower_components/jquery/src/effects.js
libs/bower_components/jquery/src/effects/Tween.js
libs/bower_components/jquery/src/event.js
libs/bower_components/jquery/src/event/support.js
libs/bower_components/jquery/src/manipulation.js
libs/bower_components/jquery/src/manipulation/support.js
libs/bower_components/jquery/src/offset.js
libs/bower_components/jquery/src/queue.js
libs/bower_components/jquery/src/serialize.js
libs/bower_components/jquery/src/traversing.js
libs/bower_components/jquery/src/traversing/findFilter.js
libs/bower_components/jquery/src/var/concat.js
libs/bower_components/jquery/src/var/indexOf.js
libs/bower_components/jquery/src/var/push.js
libs/bower_components/jquery/src/var/slice.js
libs/bower_components/jquery/src/wrap.js
plugins/API/ProcessedReport.php
plugins/AnonymousPiwikUsageMeasurement
plugins/CoreConsole/Commands/ManagePlugin.php
plugins/CoreHome/javascripts/dataTable.js
plugins/CoreHome/javascripts/manifest.json
plugins/CoreHome/templates/_topBar.twig
plugins/CoreUpdater/templates/updateSuccess.twig
plugins/CustomAlerts
plugins/CustomDimensions
plugins/DevicesDetection/Reports/GetBrowserVersions.php
plugins/DevicesDetection/Reports/GetBrowsers.php
plugins/ExamplePlugin/Updates/0.0.2.php
plugins/Feedback/templates/index.twig
plugins/LogViewer
plugins/Morpheus/stylesheets/general/_forms.less
plugins/Morpheus/templates/layout.twig
plugins/Morpheus/templates/user.twig
plugins/QueuedTracking
plugins/SegmentEditor/stylesheets/segmentation.less
plugins/SitesManager/tests/Integration/ApiTest.php
tests/PHPUnit/Integration/WidgetsListTest.php
tests/PHPUnit/System/expected/test_ManyVisitorsOneWebsiteTest_sortByProcessedMetric__API.getProcessedReport_day.xml
tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_hideColumns___API.getProcessedReport_day.xml
tests/PHPUnit/System/expected/test_OneVisitorTwoVisits_showColumns___API.getProcessedReport_day.xml
tests/PHPUnit/System/expected/test_TwoVisitors_twoWebsites_differentDays_scheduled_report_in_csv__ScheduledReports.generateReport_month.original.csv
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.getReportMetadata_day.xml
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_csv__ScheduledReports.generateReport_week.original.csv
tests/PHPUnit/System/expected/test_ecommerceOrderWithItems_scheduled_report_in_html_tables_only__ScheduledReports.generateReport_week.original.html
tests/UI/expected-ui-screenshots
tests/UI/specs/SegmentSelectorEditor_spec.js
Diffstat (limited to 'plugins/Events')
-rw-r--r-- | plugins/Events/lang/ar.json | 8 | ||||
-rw-r--r-- | plugins/Events/lang/da.json | 1 | ||||
-rw-r--r-- | plugins/Events/lang/it.json | 2 | ||||
-rw-r--r-- | plugins/Events/lang/uk.json | 32 |
4 files changed, 42 insertions, 1 deletions
diff --git a/plugins/Events/lang/ar.json b/plugins/Events/lang/ar.json new file mode 100644 index 0000000000..55b9583283 --- /dev/null +++ b/plugins/Events/lang/ar.json @@ -0,0 +1,8 @@ +{ + "Events": { + "Event": "حَدَث", + "TotalEventsDocumentation": "عدد الأحداث الإجمالي", + "TotalValueDocumentation": "مجموع قيم الأحداث", + "ViewEvents": "عرض الأحداث" + } +}
\ No newline at end of file diff --git a/plugins/Events/lang/da.json b/plugins/Events/lang/da.json index 6ba733e87c..fa44cc16f8 100644 --- a/plugins/Events/lang/da.json +++ b/plugins/Events/lang/da.json @@ -1,5 +1,6 @@ { "Events": { + "PluginDescription": "Spor begivenheder og få rapporter om dine besøgendes aktiviteter.", "AvgEventValue": "Genomsnitlig værdi for hændelsen er: %s", "AvgValue": "Gennemsnitsværdi", "AvgValueDocumentation": "Gennemsnittet af alle værdier for denne hændelse", diff --git a/plugins/Events/lang/it.json b/plugins/Events/lang/it.json index da44c8b0b3..8c47835461 100644 --- a/plugins/Events/lang/it.json +++ b/plugins/Events/lang/it.json @@ -15,7 +15,7 @@ "EventsWithValue": "Eventi con un valore", "EventsWithValueDocumentation": "Numero di eventi dove è stato impostato un valore Evento", "EventValue": "Valore Evento", - "EventValueTooltip": "Il valore totale Evento è la somma dei %1$s valori eventi %2$s tra un minimo di %3$s e un massimo di %4$s.", + "EventValueTooltip": "Il valore totale Evento è la somma dei %1$s valori degli eventi %2$s tra un minimo di %3$s e un massimo di %4$s.", "MaxValue": "Valore massimo", "MaxValueDocumentation": "Valore massimo per questo evento", "MinValue": "Valore minimo", diff --git a/plugins/Events/lang/uk.json b/plugins/Events/lang/uk.json new file mode 100644 index 0000000000..d6d23a28aa --- /dev/null +++ b/plugins/Events/lang/uk.json @@ -0,0 +1,32 @@ +{ + "Events": { + "PluginDescription": "Відстежуйте події і отримуйте звіти про активність своїх відвідувачів.", + "AvgEventValue": "Середнє значення події: %s", + "AvgValue": "Середнє значення", + "AvgValueDocumentation": "Середнє всіх значень для цієї події", + "Event": "Подія", + "EventAction": "Дія події", + "EventActions": "Дії подій", + "EventCategories": "Категорії подій", + "EventCategory": "Категорія події", + "EventName": "Назва події", + "EventNames": "Назви подій", + "Events": "Події", + "EventsWithValue": "Події зі значенням", + "EventsWithValueDocumentation": "Кількість подій, де було встановлено значення для Події", + "EventValue": "Значення події", + "EventValueTooltip": "Загальні значення подій дорівнюють сумі %1$s значенням (подій) %2$s між мінімумом %3$s і максимумом %4$s.", + "MaxValue": "Максимальне значення", + "MaxValueDocumentation": "Максимальна значення для цієї події", + "MinValue": "Мінімальне значення", + "MinValueDocumentation": "Мінімальне значення для цієї події", + "SecondaryDimension": "Вторичний вимір %s.", + "SwitchToSecondaryDimension": "Переключитися на %s", + "TopEvents": "Топ подій", + "TotalEvents": "Усього подій", + "TotalEventsDocumentation": "Загальна кількість подій", + "TotalValue": "Загальне значення", + "TotalValueDocumentation": "Сума значень подій", + "ViewEvents": "Перегляд подій" + } +}
\ No newline at end of file |