Skip to content

Commit

Permalink
Merge branch 'l10n_dev' into dev
Browse files Browse the repository at this point in the history
# Conflicts:
#	src/main/resources/langs/ru.json
  • Loading branch information
grishka committed Apr 22, 2023
2 parents 2b00d64 + 9810fa9 commit ea6eb83
Show file tree
Hide file tree
Showing 4 changed files with 182 additions and 5 deletions.
1 change: 0 additions & 1 deletion src/main/resources/langs/de.json
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@
"email": "E-Mail",
"username": "Benutzername",
"username_explain": "Kann Buchstaben, Zahlen, Punkte und Unterstriche enthalten.",
"created": "Erstellt",
"create_invitation": "Neue Einladung erstellen",
"no_invitations": "Es liegen keine Einladungen vor",
"err_reg_invalid_username": "Benutzername muss mit einem Buchstaben beginnen und darf nur Buchstaben, Zahlen, Punkte und Unterstriche enthalten.",
Expand Down
Loading

0 comments on commit ea6eb83

Please sign in to comment.