Merge remote-tracking branch 'origin/4.2' into 4

2018-06-15 16:32:48 +12:00 · 2018-06-15 16:32:48 +12:00 · 9b239fd9a3
parent 86850eefb7 75dfeb2b47
commit 9b239fd9a3
2 changed files with 8 additions and 2 deletions
--- a/composer.json
+++ b/composer.json
@ -32,8 +32,7 @@
    },
    "extra": {
        "branch-alias": {
-            "4.x-dev": "4.2.x-dev",
-            "dev-master": "5.x-dev"
+            "4.x-dev": "4.3.x-dev"
        },
        "expose": [
            "javascript"
--- a/lang/sv.yml
+++ b/lang/sv.yml
@ -0,0 +1,7 @@
+sv:
+  SilverStripe\Reports\ReportAdmin:
+    MENUTITLE: Rapporter
+    ReportTitle: Titel
+  SilverStripe\Reports\SideReport:
+    OtherGroupTitle: Annat
+    REPEMPTY: 'Rapporten {title} är tom.'