Merge branch 'master' into lint

Author: obulat

src/components/HelpSection.vue

@@ -179,18 +179,18 @@
                 <p v-html="this.$t('help.how-licenses-communicated.text')" />
                 <table class="table is-hoverable is-fullwidth help-section__table">
                     <tbody>
-                        <tr>
-                            <th>{{ $t('help.how-licenses-communicated.full-name') }}</th>
-                            <td>{{ $t('help.how-licenses-communicated.CC-BY-SA') }}</td>
-                        </tr>
-                        <tr>
-                            <th>{{ $t('help.how-licenses-communicated.short-name') }}</th>
-                            <td>CC BY-NC</td>
-                        </tr>
-                        <tr>
-                            <th>{{ $t('help.how-licenses-communicated.license-icons') }}</th>
-                            <td><LicenseIconography :icon-list="['', 'by', 'nc']" /></td>
-                        </tr>
+                    <tr>
+                        <th>{{$t('help.how-licenses-communicated.full-name')}}</th>
+                        <td>{{$t('help.how-licenses-communicated.CC-BY-NC')}}</td>
+                    </tr>
+                    <tr>
+                        <th>{{$t('help.how-licenses-communicated.short-name')}}</th>
+                        <td>CC BY-NC</td>
+                    </tr>
+                    <tr>
+                        <th>{{$t('help.how-licenses-communicated.license-icons')}}</th>
+                        <td><LicenseIconography :icon-list="['', 'by', 'nc']"/></td>
+                    </tr>
                     </tbody>
                 </table>
             </section>

src/locales/en.json

@@ -168,7 +168,7 @@
             "full-name": "Full Name",
             "short-name": "Short Name",
             "license-icons": "Icons",
-            "CC-BY-SA": "Creative Commons Attribution 4.0 International"
+            "CC-BY-NC": "Attribution-NonCommercial 4.0 International"
         },
         "considerations-before-licensing": {
             "heading": "Considerations Before Licensing",