Skip to content

Commit

Permalink
#101 - manual merge
Browse files Browse the repository at this point in the history
  • Loading branch information
estruyf committed Oct 26, 2018
1 parent c5530e1 commit b4785b1
Show file tree
Hide file tree
Showing 4 changed files with 59 additions and 0 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.JSON
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@
"new": [],
"enhancements": [
"Dutch localization added [#100](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/100)",
"German localization added [#101](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/101)",
"French localization added [#102](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/102)",
"`PeoplePicker`: Move defaultSelectedUsers from ComponentWillMount to ComponentDidUpdate Lifecycle [#135](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/135)",
"`PeoplePicker`: Initialize with users from a list item [#138](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/138)",
Expand Down
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**Enhancements**

- Dutch localization added [#100](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/100)
- German localization added [#101](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/101)
- French localization added [#102](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/102)
- `PeoplePicker`: Move defaultSelectedUsers from ComponentWillMount to ComponentDidUpdate Lifecycle [#135](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/135)
- `PeoplePicker`: Initialize with users from a list item [#138](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/138)
Expand Down
1 change: 1 addition & 0 deletions docs/documentation/docs/about/release-notes.md
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
**Enhancements**

- Dutch localization added [#100](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/100)
- German localization added [#101](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/101)
- French localization added [#102](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/102)
- `PeoplePicker`: Move defaultSelectedUsers from ComponentWillMount to ComponentDidUpdate Lifecycle [#135](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/135)
- `PeoplePicker`: Initialize with users from a list item [#138](https://github.com/SharePoint/sp-dev-fx-controls-react/issues/138)
Expand Down
56 changes: 56 additions & 0 deletions src/loc/de-de.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,56 @@
declare var define: any;

define([], () => {
return {
'SiteBreadcrumbLabel': 'Website Brotkrume',

'ListViewGroupEmptyLabel': 'Leer',

'WebPartTitlePlaceholder': 'Webpart Titel',
'WebPartTitleLabel': 'Titel hinzufügen',

"DateTime": {
"L_RelativeDateTime_AFewSecondsFuture": "In wenigen Sekunden",
"L_RelativeDateTime_AFewSeconds": "Vor wenigen Sekunden",
"L_RelativeDateTime_AboutAMinuteFuture": "In ungefähr einer Minute",
"L_RelativeDateTime_AboutAMinute": "Vor ungefähr einer Minute",
"L_RelativeDateTime_XMinutesFuture": "In {0} Minute||In {0} Minuten",
"L_RelativeDateTime_XMinutes": "Vor {0} Minute||Vor {0} Minuten",
"L_RelativeDateTime_XMinutesFutureIntervals": "1||2-",
"L_RelativeDateTime_XMinutesIntervals": "1||2-",
"L_RelativeDateTime_AboutAnHourFuture": "In ungefähr einer Stunde",
"L_RelativeDateTime_AboutAnHour": "Vor ungefähr einer Stunde",
"L_RelativeDateTime_Tomorrow": "Morgen",
"L_RelativeDateTime_Yesterday": "Gestern",
"L_RelativeDateTime_TomorrowAndTime": "Morgen um {0}",
"L_RelativeDateTime_YesterdayAndTime": "Gestern um {0}",
"L_RelativeDateTime_XHoursFuture": "In {0} Stunde||In {0} Stunden",
"L_RelativeDateTime_XHours": "Vor {0} Stunde||Vor {0} Stunden",
"L_RelativeDateTime_XHoursFutureIntervals": "1||2-",
"L_RelativeDateTime_XHoursIntervals": "1||2-",
"L_RelativeDateTime_DayAndTime": "{0} at {1}",
"L_RelativeDateTime_XDaysFuture": "{0} Tag ab jetzt||{0} Tage ab jetzt",
"L_RelativeDateTime_XDays": "Vor {0} Tag||Vor {0} Tagen",
"L_RelativeDateTime_XDaysFutureIntervals": "1||2-",
"L_RelativeDateTime_XDaysIntervals": "1||2-",
"L_RelativeDateTime_Today": "Heute"
},
"SendEmailTo": "Email senden an {0}",
"StartChatWith": "Chat starten mit {0}",
"Contact": "Kontakt",
"UpdateProfile": "Aktualisiere Dein Profil",

"TaxonomyPickerNoTerms": "Ausdruckssatz enthält keine Ausdrücke",
"TaxonomyPickerExpandTitle": "Ausdruckssatz erweitern",
"TaxonomyPickerMenuTermSet": "Ausdruckssatz Menü",
"TaxonomyPickerInLabel": "in",
"TaxonomyPickerTermSetLabel": "Ausdruckssatz",

peoplePickerComponentTooltipMessage: "People Picker",
peoplePickerComponentErrorMessage: "Benutzerauswahl ist ein Pflichtfeld",
peoplePickerComponentTitleText: "Benutzer auswählen",
peoplePickerSuggestionsHeaderText: 'Vorgeschlagene Benutzer',
peoplePickerNoResultsFoundText: 'Kein Ergebnis gefunden',
peoplePickerLoadingText: 'Laden'
};
});

0 comments on commit b4785b1

Please sign in to comment.