Merge branch 'mealie-next' into fix/translation-issues-when-scraping

This commit is contained in:
Michael Genson
2024-02-04 13:20:44 -06:00
committed by GitHub
183 changed files with 4530 additions and 2172 deletions

View File

@@ -0,0 +1,35 @@
{
"generic": {
"server-error": "An unexpected error occurred"
},
"recipe": {
"unique-name-error": "Recipe names must be unique"
},
"mealplan": {
"no-recipes-match-your-rules": "No recipes match your rules"
},
"user": {
"user-updated": "User updated",
"password-updated": "Password updated",
"invalid-current-password": "Invalid current password",
"ldap-update-password-unavailable": "Unable to update password, user is controlled by LDAP"
},
"group": {
"report-deleted": "Report deleted."
},
"exceptions": {
"permission_denied": "You do not have permission to perform this action",
"no-entry-found": "The requested resource was not found",
"integrity-error": "Database integrity error",
"username-conflict-error": "This username is already taken",
"email-conflict-error": "This email is already in use"
},
"notifications": {
"generic-created": "{name} was created",
"generic-updated": "{name} was updated",
"generic-created-with-url": "{name} has been created, {url}",
"generic-updated-with-url": "{name} has been updated, {url}",
"generic-duplicated": "{name} has been duplicated",
"generic-deleted": "{name} has been deleted"
}
}

View File

@@ -6,16 +6,16 @@
"unique-name-error": "Ime recepta mora biti unikatno"
},
"mealplan": {
"no-recipes-match-your-rules": "No recipes match your rules"
"no-recipes-match-your-rules": "Noben recept ne ustreza vašim pogojem"
},
"user": {
"user-updated": "User updated",
"password-updated": "Password updated",
"invalid-current-password": "Invalid current password",
"ldap-update-password-unavailable": "Unable to update password, user is controlled by LDAP"
"user-updated": "Uporabnik posodobljen",
"password-updated": "Geslo posodobljeno",
"invalid-current-password": "Neveljavno trenutno geslo",
"ldap-update-password-unavailable": "Gesla ni mogoče posodobiti, uporabnik je nadzorovan preko LDAP"
},
"group": {
"report-deleted": "Report deleted."
"report-deleted": "Poročilo izbrisano."
},
"exceptions": {
"permission_denied": "Nimate dovoljenja za izvedbo zahtevanega dejanja",

View File

@@ -11,7 +11,7 @@
"user": {
"user-updated": "User updated",
"password-updated": "Password updated",
"invalid-current-password": "Invalid current password",
"invalid-current-password": "目前密碼無效",
"ldap-update-password-unavailable": "Unable to update password, user is controlled by LDAP"
},
"group": {
@@ -22,7 +22,7 @@
"no-entry-found": "The requested resource was not found",
"integrity-error": "Database integrity error",
"username-conflict-error": "This username is already taken",
"email-conflict-error": "This email is already in use"
"email-conflict-error": "該電子郵件已被使用"
},
"notifications": {
"generic-created": "{name} was created",