Merge branch 'devel' into greenkeeper/initial

1 files changed, 22 insertions, 0 deletions

diff --git a/i18n/de.i18n.json b/i18n/de.i18n.json
index ee508a2c..a823daf2 100644
--- a/i18n/de.i18n.json
+++ b/i18n/de.i18n.json
@@ -7,6 +7,7 @@
     "act-addComment": "hat __card__ kommentiert: __comment__",
     "act-createBoard": "hat __board__ erstellt",
     "act-createCard": "hat __card__ zu __list__ hinzugefügt",
+    "act-createCustomField": "created custom field __customField__",
     "act-createList": "hat __list__ zu __board__ hinzugefügt",
     "act-addBoardMember": "hat __member__ zu __board__ hinzugefügt",
     "act-archivedBoard": "__board__ in den Papierkorb verschoben",
@@ -30,6 +31,7 @@
     "activity-archived": "%s in den Papierkorb verschoben",
     "activity-attached": "hat %s an %s angehängt",
     "activity-created": "hat %s erstellt",
+    "activity-customfield-created": "created custom field %s",
     "activity-excluded": "hat %s von %s ausgeschlossen",
     "activity-imported": "hat %s in %s von %s importiert",
     "activity-imported-board": "hat %s von %s importiert",
@@ -111,6 +113,7 @@
     "card-due-on": "Fällig am",
     "card-spent": "Aufgewendete Zeit",
     "card-edit-attachments": "Anhänge ändern",
+    "card-edit-custom-fields": "Edit custom fields",
     "card-edit-labels": "Labels ändern",
     "card-edit-members": "Mitglieder ändern",
     "card-labels-title": "Labels für diese Karte ändern.",
@@ -118,6 +121,8 @@
     "card-start": "Start",
     "card-start-on": "Start am",
     "cardAttachmentsPopup-title": "Anhängen von",
+    "cardCustomField-datePopup-title": "Change date",
+    "cardCustomFieldsPopup-title": "Edit custom fields",
     "cardDeletePopup-title": "Karte löschen?",
     "cardDetailsActionsPopup-title": "Kartenaktionen",
     "cardLabelsPopup-title": "Labels",
@@ -167,11 +172,25 @@
     "createBoardPopup-title": "Board erstellen",
     "chooseBoardSourcePopup-title": "Board importieren",
     "createLabelPopup-title": "Label erstellen",
+    "createCustomField": "Create Field",
+    "createCustomFieldPopup-title": "Create Field",
     "current": "aktuell",
+    "custom-field-delete-pop": "There is no undo. This will remove this custom field from all cards and destroy its history.",
+    "custom-field-checkbox": "Checkbox",
+    "custom-field-date": "Datum",
+    "custom-field-dropdown": "Dropdown List",
+    "custom-field-dropdown-none": "(none)",
+    "custom-field-dropdown-options": "List Options",
+    "custom-field-dropdown-options-placeholder": "Press enter to add more options",
+    "custom-field-dropdown-unknown": "(unknown)",
+    "custom-field-number": "Number",
+    "custom-field-text": "Text",
+    "custom-fields": "Custom Fields",
     "date": "Datum",
     "decline": "Ablehnen",
     "default-avatar": "Standard Profilbild",
     "delete": "Löschen",
+    "deleteCustomFieldPopup-title": "Delete Custom Field?",
     "deleteLabelPopup-title": "Label löschen?",
     "description": "Beschreibung",
     "disambiguateMultiLabelPopup-title": "Labels vereinheitlichen",
@@ -186,6 +205,7 @@
     "soft-wip-limit": "Soft WIP-Limit",
     "editCardStartDatePopup-title": "Startdatum ändern",
     "editCardDueDatePopup-title": "Fälligkeitsdatum ändern",
+    "editCustomFieldPopup-title": "Edit Field",
     "editCardSpentTimePopup-title": "Aufgewendete Zeit ändern",
     "editLabelPopup-title": "Label ändern",
     "editNotificationPopup-title": "Benachrichtigung ändern",
@@ -366,6 +386,7 @@
     "title": "Titel",
     "tracking": "Folgen",
     "tracking-info": "Sie werden über alle Änderungen an Karten benachrichtigt, an denen Sie als Ersteller oder Mitglied beteiligt sind.",
+    "type": "Type",
     "unassign-member": "Mitglied entfernen",
     "unsaved-description": "Sie haben eine nicht gespeicherte Änderung.",
     "unwatch": "Beobachtung entfernen",
@@ -430,6 +451,7 @@
     "hours": "Stunden",
     "minutes": "Minuten",
     "seconds": "Sekunden",
+    "show-field-on-card": "Show this field on card",
     "yes": "Ja",
     "no": "Nein",
     "accounts": "Konten",