Skip to content

Commit ac12243

Browse files
committed
Merge branch '4.2' into 4
2 parents dba2432 + 20af57b commit ac12243

6 files changed

Lines changed: 2227 additions & 2127 deletions

File tree

client/dist/js/bundle.js

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/dist/styles/bundle.css

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

client/lang/nl.js

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ if (typeof(ss) === 'undefined' || typeof(ss.i18n) === 'undefined') {
2424
"LinkField.LINK_MODIFIED_LABEL": "Aangepast",
2525
"LinkField.LINK_MODIFIED_TITLE": "Link heeft niet-gepubliceerde wijzigingen",
2626
"LinkField.SAVE_RECORD_FIRST": "Links kunnen worden toegevoegd na het opslaan",
27+
"LinkField.SAVE_RECORD_FIRST_SINGLE": "Sla eerst op, voordat er een link toegevoegd kan worden",
2728
"LinkField.SAVE_SUCCESS": "Opgeslagen link",
2829
"LinkField.SORT_ERROR": "Links sorteren mislukt",
2930
"LinkField.SORT_SUCCESS": "Linkvolgorde opgeslagen"

client/lang/src/nl.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
"LinkField.LINK_MODIFIED_LABEL": "Aangepast",
1818
"LinkField.LINK_MODIFIED_TITLE": "Link heeft niet-gepubliceerde wijzigingen",
1919
"LinkField.SAVE_RECORD_FIRST": "Links kunnen worden toegevoegd na het opslaan",
20+
"LinkField.SAVE_RECORD_FIRST_SINGLE": "Sla eerst op, voordat er een link toegevoegd kan worden",
2021
"LinkField.SAVE_SUCCESS": "Opgeslagen link",
2122
"LinkField.SORT_ERROR": "Links sorteren mislukt",
2223
"LinkField.SORT_SUCCESS": "Linkvolgorde opgeslagen"

lang/nl.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ nl:
2626
one: 'Een externe link'
2727
other: '{count} externele links'
2828
SINGULARNAME: 'Externe link'
29-
db_ExternalUrl: 'Externe link'
29+
db_ExternalUrl: 'Externe URL'
3030
SilverStripe\LinkField\Models\FileLink:
3131
CANNOT_VIEW_FILE: 'Kan bestand niet bekijken'
3232
FILE_DOES_NOT_EXIST: 'Bestand bestaat niet '

0 commit comments

Comments
 (0)