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

3 files changed, 37 insertions, 15 deletions

diff --git a/plugins/Annotations/lang/de.json b/plugins/Annotations/lang/de.json
index a962c4de29..f3fd1e64e6 100644
--- a/plugins/Annotations/lang/de.json
+++ b/plugins/Annotations/lang/de.json
@@ -9,12 +9,12 @@
         "ClickToStarOrUnstar": "Klicken Sie um die Markierung dieser Anmerkung zu setzen oder zu entfernen.",
         "CreateNewAnnotation": "Neue Anmerkung anlegen...",
         "EnterAnnotationText": "Geben Sie Ihre Notiz ein...",
-        "HideAnnotationsFor": "Markierungen für %s verbergen...",
+        "HideAnnotationsFor": "Anmerkungen für %s verbergen...",
         "IconDesc": "Notizen für diesen Zeitraum anzeigen.",
         "IconDescHideNotes": "Notizen für diesen Zeitraum verbergen.",
-        "InlineQuickHelp": "Sie können Markierungen erstellen um spezielle Ereignisse (wie einen Blog-Eintrag, oder eine Neugestaltung der Website) zu markieren, Stichtage für die Datenanalyse zu speichern oder einfach alles zu speichern was Ihnen wichtig erscheint.",
+        "InlineQuickHelp": "Sie können Anmerkungen erstellen um spezielle Ereignisse (wie einen Blog-Eintrag, oder eine Neugestaltung der Website) zu markieren, Stichtage für die Datenanalyse zu speichern oder einfach alles zu speichern was Ihnen wichtig erscheint.",
         "LoginToAnnotate": "Sie müssen sich einloggen um eine Anmerkung hinzufügen zu können.",
-        "NoAnnotations": "Für diesen Zeitraum sind keine Notizen vorhanden.",
+        "NoAnnotations": "Für diesen Zeitraum sind keine Anmerkungen vorhanden.",
         "PluginDescription": "Erlaubt Ihnen Hinweise zu verschiedenen Tagen hinzuzufügen um Änderungen zu markieren die an der Website gemacht wurden, Analysen zu speichern die bezüglich Ihrer Daten gemacht wurden und um Ihre Gedanken mit Ihren Kollegen zu teilen. Durch das Hinzufügen von Hinweisen stellen Sie sicher, dass Sie sich daran erinnern warum die Daten so sind wie sie sind.",
         "ViewAndAddAnnotations": "Anmerkungen zu %s ansehen und hinzufügen...",
         "YouCannotModifyThisNote": "Sie können diese Anmerkung nicht ändern, da Sie sie weder erstellt haben noch administrativen Zugang für diese Seite besitzen."
diff --git a/plugins/Annotations/lang/tr.json b/plugins/Annotations/lang/tr.json
index dc3ba67ba7..9c29b5e23b 100644
--- a/plugins/Annotations/lang/tr.json
+++ b/plugins/Annotations/lang/tr.json
@@ -1,20 +1,20 @@
 {
     "Annotations": {
-        "AddAnnotationsFor": "%s için not ekle",
+        "AddAnnotationsFor": "%s için notlar ekle...",
         "AnnotationOnDate": "%1$s için not: %2$s",
         "Annotations": "Notlar",
-        "ClickToDelete": "Bu notu silmek için tıklayınız.",
-        "ClickToEdit": "Bu notu düzenlemek için tıklayınız.",
-        "ClickToEditOrAdd": "Yorum eklemek veya düzenlemek icin buraya tıklayın",
-        "ClickToStarOrUnstar": "Bu not işaretlemek veya işaretlemeyi kaldırmak için tıklayın",
-        "CreateNewAnnotation": "Yeni not ekle...",
-        "EnterAnnotationText": "Notunuzu giriniz...",
+        "ClickToDelete": "Bu notu silmek için tıklayın.",
+        "ClickToEdit": "Bu notu düzenlemek için tıklayın.",
+        "ClickToEditOrAdd": "Not eklemek ya da düzenlemek icin buraya tıklayın.",
+        "ClickToStarOrUnstar": "Bu nota işaret koymak ya da kaldırmak için tıklayın.",
+        "CreateNewAnnotation": "Not ekle...",
+        "EnterAnnotationText": "Notunuzu yazın...",
         "HideAnnotationsFor": "%s için notları gizle...",
-        "IconDesc": "Bu tarih aralığı için notları göster",
-        "IconDescHideNotes": "Bu tarih aralığı için notları gizle",
-        "InlineQuickHelp": "Önemli olduğunu düşündüğünüz yada veri analizleriniz için özel anonslar oluşturabilirsiniz (yeni yazılar yada site yenilenmesi gibi)",
-        "LoginToAnnotate": "Not eklemek için giriş yapmalısınız.",
-        "NoAnnotations": "Bu tarih aralığı için not yok.",
+        "IconDesc": "Bu tarih aralığındaki notları görüntüle.",
+        "IconDescHideNotes": "Bu tarih aralığındaki notları gizle",
+        "InlineQuickHelp": "Önemli etkinlikleri (yeni blog iletileri ya da web sitesi tasarım değişiklikleri gibi), veri incelemelerinizi ya da önemli olduğunu düşündüğünüz konuları kaydetmek için notlar oluşturabilirsiniz.",
+        "LoginToAnnotate": "Not eklemek için oturum açın.",
+        "NoAnnotations": "Bu tarih aralığında bir not yok.",
         "PluginDescription": "Websiteniz de yaptığınız değişiklikleri farklı günlerde belirtmek için not eklemeye izin verir, veriniz ile ilgili analizleri saklar ve bunları meslektaşlarınız ile birlikte paylaşmanıza izn verir. Neden o veriye baktığınızı hatırlamanızdan emin olmak için veriye dipnot koyar.",
         "ViewAndAddAnnotations": "%s için notları göster ve yeni not ekle...",
         "YouCannotModifyThisNote": "Bunu değiştiremezsiniz. Bunun için bu siteye yönetici erişiminiz olması gerekli."
diff --git a/plugins/Annotations/lang/uk.json b/plugins/Annotations/lang/uk.json
new file mode 100644
index 0000000000..5a6c97a553
--- /dev/null
+++ b/plugins/Annotations/lang/uk.json
@@ -0,0 +1,22 @@
+{
+    "Annotations": {
+        "AddAnnotationsFor": "Додати замітки для %s...",
+        "AnnotationOnDate": "Замітка на %1$s: %2$s",
+        "Annotations": "Замітки",
+        "ClickToDelete": "Видалити цю замітку.",
+        "ClickToEdit": "Редагувати замітку.",
+        "ClickToEditOrAdd": "Змінити або додати нові замітки.",
+        "ClickToStarOrUnstar": "Поставити або зняти позначку.",
+        "CreateNewAnnotation": "Створити замітку",
+        "EnterAnnotationText": "Введіть свою замітку",
+        "HideAnnotationsFor": "Приховати замітки для %s...",
+        "IconDesc": "Переглянути нотатки для даного діапазону дат.",
+        "IconDescHideNotes": "Приховати замітки для даного діапазону дат.",
+        "InlineQuickHelp": "Ви можете створювати нотатки для того, щоб відзначати важливі події в історії вашого сайту (такі як новий пост в блозі або редизайн).",
+        "LoginToAnnotate": "Увійдіть для створення заміток.",
+        "NoAnnotations": "Ні заміток в даному діапазоні дат.",
+        "PluginDescription": "Дозволяє прикріпити замітки до різних днів, щоб відзначити зміни, внесені в ваш сайт. Створюючи замітки, ви будете знати, чому відвідування змінилися саме так.",
+        "ViewAndAddAnnotations": "Переглянути та додати замітки для %s...",
+        "YouCannotModifyThisNote": "Ви не можете змінити цю замітку, так як ви не є її автором. Також у вас немає прав адміністратора."
+    }
+}
\ No newline at end of file