lfk/frontend
2
0
Fork 0
Code Issues 3 Pull Requests Actions Projects Releases Wiki Activity

Merge Minor into main #113

Manually merged
niggl merged 416 commits from dev into main 2021-03-26 16:34:56 +00:00
Conversation 1 Commits 416 Files Changed 98 +760 -760
2 changed files with 760 additions and 760 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit a1ab65a0e9 - Show all commits

4
src/locales/de.json
View File

@ -152,6 +152,7 @@
"email_address_or_username": "E-Mail-Adresse/ Benutzername", "email_address_or_username": "E-Mail-Adresse/ Benutzername",
"enabled": "aktiviert", "enabled": "aktiviert",
"english": "Englisch", "english": "Englisch",
"error-during-import": "Fehler beim Importieren",
"error_on_login": "😢Fehler beim Login", "error_on_login": "😢Fehler beim Login",
"erteilte": "Direkt erteilte", "erteilte": "Direkt erteilte",
"everything-concerning-your-profile": "Alles zu deinem Profil", "everything-concerning-your-profile": "Alles zu deinem Profil",
@ -376,6 +377,5 @@
"you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉", "you-can-now-use-your-new-password-to-log-in-to-your-account": "Du kannst dich jetzt mit deinem neuen Passwort anmelden! 🎉",
"you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen", "you-dont-have-any-scanstations-yet": "Es gibt noch keine Scannerstationen",
"you-have-to-provide-an-organization": "Du musst eine Organisation angeben", "you-have-to-provide-an-organization": "Du musst eine Organisation angeben",
"zip-postal-code": "Postleitzahl", "zip-postal-code": "Postleitzahl"
"error-during-import": "Fehler beim Importieren"
} }

4
src/locales/en.json
View File

@ -152,6 +152,7 @@
"email_address_or_username": "Email / username", "email_address_or_username": "Email / username",
"enabled": "enabled", "enabled": "enabled",
"english": "English", "english": "English",
"error-during-import": "Error during import",
"error_on_login": "Error on login", "error_on_login": "Error on login",
"erteilte": "Directly granted", "erteilte": "Directly granted",
"everything-concerning-your-profile": "Everything concerning your profile", "everything-concerning-your-profile": "Everything concerning your profile",
@ -376,6 +377,5 @@
"you-can-now-use-your-new-password-to-log-in-to-your-account": "You can now use your new password to log in to your account! 🎉", "you-can-now-use-your-new-password-to-log-in-to-your-account": "You can now use your new password to log in to your account! 🎉",
"you-dont-have-any-scanstations-yet": "You don't have any scanstations yet", "you-dont-have-any-scanstations-yet": "You don't have any scanstations yet",
"you-have-to-provide-an-organization": "You have to provide an organization", "you-have-to-provide-an-organization": "You have to provide an organization",
"zip-postal-code": "ZIP/ postal code", "zip-postal-code": "ZIP/ postal code"
"error-during-import": "Error during import"
} }