Skip to content

Commit 421f718

Browse files
authored
Merge branch 'mealie-next' into fixes/ui-improvements
2 parents 6cec7f6 + 435b66c commit 421f718

40 files changed

+1125
-246
lines changed

frontend/lang/messages/af-ZA.json

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"cookbook-events": "Kookboek Gebeurtenisse",
7777
"tag-events": "Merker gebeurtenisse",
7878
"category-events": "Kategorie Gebeurtenisse",
79-
"when-a-new-user-joins-your-group": "Wanneer 'n nuwe gebruiker by jou groep aansluit"
79+
"when-a-new-user-joins-your-group": "Wanneer 'n nuwe gebruiker by jou groep aansluit",
80+
"recipe-events": "Recipe Events"
8081
},
8182
"general": {
8283
"cancel": "Kanselleer",
@@ -114,6 +115,8 @@
114115
"keyword": "Sleutelwoord",
115116
"link-copied": "Skakel gekopieer",
116117
"loading-events": "Besig om gebeurtenisse te laai",
118+
"loading-recipe": "Loading recipe...",
119+
"loading-ocr-data": "Loading OCR data...",
117120
"loading-recipes": "Besig om resepte te laai",
118121
"message": "Boodskap",
119122
"monday": "Maandag",
@@ -193,7 +196,8 @@
193196
"export-all": "Voer alles uit",
194197
"refresh": "Verfris",
195198
"upload-file": "Laai dokument op",
196-
"created-on-date": "Geskep op: {0}"
199+
"created-on-date": "Geskep op: {0}",
200+
"unsaved-changes": "You have unsaved changes. Do you want to save before leaving? Okay to save, Cancel to discard changes."
197201
},
198202
"group": {
199203
"are-you-sure-you-want-to-delete-the-group": "Is jy seker jy wil <b>{groupName}<b/> uitvee?",
@@ -208,6 +212,7 @@
208212
"group-id-with-value": "Groep-Id: {groupID}",
209213
"group-name": "Groep naam",
210214
"group-not-found": "Groep nie gevind nie",
215+
"group-token": "Group Token",
211216
"group-with-value": "Groep: {groupID}",
212217
"groups": "Groepe",
213218
"manage-groups": "Bestuur groepe",
@@ -243,6 +248,7 @@
243248
"general-preferences": "Algemene voorkeure",
244249
"group-recipe-preferences": "Groepresepvoorkeure",
245250
"report": "Rapporteer",
251+
"report-with-id": "Report ID: {id}",
246252
"group-management": "Groepbestuur",
247253
"admin-group-management": "Admin groepbestuur",
248254
"admin-group-management-text": "Veranderinge aan hierdie groep sal onmiddellik weerspieël word.",
@@ -507,6 +513,7 @@
507513
"message-key": "Boodskap sleutel",
508514
"parse": "Verwerk",
509515
"attach-images-hint": "Voeg prente by deur dit in die bewerker te sleep en los",
516+
"drop-image": "Drop image",
510517
"enable-ingredient-amounts-to-use-this-feature": "Skakel bestanddeelhoeveelhede aan om hierdie funksie te gebruik",
511518
"recipes-with-units-or-foods-defined-cannot-be-parsed": "Resepte met sekere eenhede of kosse kan nie verwerk word nie.",
512519
"parse-ingredients": "Verwerk bestanddele",
@@ -564,14 +571,17 @@
564571
"tag-filter": "Merker filter",
565572
"search-hint": "Druk '/'",
566573
"advanced": "Gevorderd",
567-
"auto-search": "Outomatiese soektog"
574+
"auto-search": "Outomatiese soektog",
575+
"no-results": "No results found"
568576
},
569577
"settings": {
570578
"add-a-new-theme": "Voeg 'n nuwe tema by",
571579
"admin-settings": "Admin verstellings",
572580
"backup": {
581+
"backup-created": "Backup created successfully",
573582
"backup-created-at-response-export_path": "Back-up gemaak op {path}",
574583
"backup-deleted": "Back-up verwyder",
584+
"restore-success": "Restore successful",
575585
"backup-tag": "Back-up merker",
576586
"create-heading": "Maak 'n back-up",
577587
"delete-backup": "Verwyder back-up",
@@ -680,11 +690,13 @@
680690
"configuration": "Konfigurasie",
681691
"docker-volume": "Docker Volume",
682692
"docker-volume-help": "Mealie vereis dat die frontend container en die backend dieselfde docker volume of stoorspasie deel. Dit verseker dat die frontend container toegang tot die prente en lêers op die skyf kan kry.",
683-
"volumes-are-misconfigured": "Volumes is verkeerd opgestel",
693+
"volumes-are-misconfigured": "Volumes are misconfigured.",
684694
"volumes-are-configured-correctly": "Volumes is korrek opgestel.",
685695
"status-unknown-try-running-a-validation": "Status onbekend. Probeer om 'n mate van validering te doen.",
686696
"validate": "Tjek",
687697
"email-configuration-status": "E-poskonfigurasiestatus",
698+
"email-configured": "Email Configured",
699+
"email-test-results": "Email Test Results",
688700
"ready": "Gereed",
689701
"not-ready": "Nie gereed nie - Gaan omgewingsveranderlikes na",
690702
"succeeded": "Geslaag",
@@ -819,6 +831,7 @@
819831
"password-updated": "Wagwoord opgedateer",
820832
"password": "Wagwoord",
821833
"password-strength": "Wagwoord is {strength}",
834+
"please-enter-password": "Please enter your new password.",
822835
"register": "Registreer",
823836
"reset-password": "Herstel wagwoord",
824837
"sign-in": "Meld aan",
@@ -839,6 +852,7 @@
839852
"username": "Gebruikersnaam",
840853
"users-header": "GEBRUIKERS",
841854
"users": "Gebruikers",
855+
"user-not-found": "User not found",
842856
"webhook-time": "Webhook tyd",
843857
"webhooks-enabled": "Webhooks aangeskakel",
844858
"you-are-not-allowed-to-create-a-user": "Jy is nie toegelaat om 'n gebruiker te skep nie",
@@ -861,6 +875,7 @@
861875
"user-management": "Gebruikersbestuur",
862876
"reset-locked-users": "Stel geblokkeerde gebruikers terug",
863877
"admin-user-creation": "Skep admin (hoof) gebruiker",
878+
"admin-user-management": "Admin User Management",
864879
"user-details": "Gebruikersbesonderhede",
865880
"user-name": "Gebruikersnaam",
866881
"authentication-method": "Verifikasie metode",
@@ -872,7 +887,10 @@
872887
"user-can-organize-group-data": "Gebruiker kan groepdata organiseer",
873888
"enable-advanced-features": "Aktiveer gevorderde funksies",
874889
"it-looks-like-this-is-your-first-time-logging-in": "It looks like this is your first time logging in.",
875-
"dont-want-to-see-this-anymore-be-sure-to-change-your-email": "Don't want to see this anymore? Be sure to change your email in your user settings!"
890+
"dont-want-to-see-this-anymore-be-sure-to-change-your-email": "Don't want to see this anymore? Be sure to change your email in your user settings!",
891+
"forgot-password": "Forgot Password",
892+
"forgot-password-text": "Please enter your email address and we will send you a link to reset your password.",
893+
"changes-reflected-immediately": "Changes to this user will be reflected immediately."
876894
},
877895
"language-dialog": {
878896
"translated": "vertaal",
@@ -974,6 +992,7 @@
974992
},
975993
"user-registration": {
976994
"user-registration": "Gebruiker registrasie",
995+
"registration-success": "Registration Success",
977996
"join-a-group": "Sluit aan by 'n groep",
978997
"create-a-new-group": "Skep 'n nuwe groep",
979998
"provide-registration-token-description": "Voer die registrasietoken in wat verband hou met die groep waarby jy wil aansluit. Jy moet hierdie token van 'n lid van die groep aanvra.",
@@ -1020,13 +1039,16 @@
10201039
},
10211040
"ocr-editor": {
10221041
"ocr-editor": "OCR-bewerker",
1042+
"toolbar": "Toolbar",
10231043
"selection-mode": "Seleksie modus",
10241044
"pan-and-zoom-picture": "Pan en zoem prent",
10251045
"split-text": "Verdeel teks",
10261046
"preserve-line-breaks": "Hou oorspronklike reëlbreuke",
10271047
"split-by-block": "Verdeel volgens teksblok",
10281048
"flatten": "Maak plat ongeag die oorspronklike formatering",
10291049
"help": {
1050+
"help": "Help",
1051+
"mouse-modes": "Mouse modes",
10301052
"selection-mode": "Seleksie modus (standaard)",
10311053
"selection-mode-desc": "Die seleksiemodus is die hoofmodus wat gebruik kan word om data in te voer:",
10321054
"selection-mode-steps": {

frontend/lang/messages/ar-SA.json

Lines changed: 27 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,8 @@
7676
"cookbook-events": "أحداث كتاب الطبخ",
7777
"tag-events": "أحداث الوسم",
7878
"category-events": "أحداث الفئة",
79-
"when-a-new-user-joins-your-group": "عندما ينضم مستخدم جديد إلى مجموعتك"
79+
"when-a-new-user-joins-your-group": "عندما ينضم مستخدم جديد إلى مجموعتك",
80+
"recipe-events": "Recipe Events"
8081
},
8182
"general": {
8283
"cancel": "إلغاء",
@@ -114,6 +115,8 @@
114115
"keyword": "كلمة مفتاحية",
115116
"link-copied": "تمّ نسْخ الرّابط",
116117
"loading-events": "جاري تحميل الأحداث",
118+
"loading-recipe": "Loading recipe...",
119+
"loading-ocr-data": "Loading OCR data...",
117120
"loading-recipes": "جار تحميل الوصفات",
118121
"message": "الرسائل النصية Sms",
119122
"monday": "الإثنين",
@@ -193,7 +196,8 @@
193196
"export-all": "تصدير الكل",
194197
"refresh": "تحديث",
195198
"upload-file": "تحميل الملف",
196-
"created-on-date": "تم الإنشاء في {0}"
199+
"created-on-date": "تم الإنشاء في {0}",
200+
"unsaved-changes": "You have unsaved changes. Do you want to save before leaving? Okay to save, Cancel to discard changes."
197201
},
198202
"group": {
199203
"are-you-sure-you-want-to-delete-the-group": "هل انت متأكد من رغبتك في حذف <b>{groupName}<b/>؟",
@@ -208,6 +212,7 @@
208212
"group-id-with-value": "رقم تعريف المجموعة: {groupID}",
209213
"group-name": "اسم المجموعة",
210214
"group-not-found": "لم يتم العثور على المجموعة",
215+
"group-token": "Group Token",
211216
"group-with-value": "المجموعة: {groupID}",
212217
"groups": "المجموعات",
213218
"manage-groups": "إدارة المجموعات",
@@ -243,6 +248,7 @@
243248
"general-preferences": "General Preferences",
244249
"group-recipe-preferences": "Group Recipe Preferences",
245250
"report": "Report",
251+
"report-with-id": "Report ID: {id}",
246252
"group-management": "Group Management",
247253
"admin-group-management": "Admin Group Management",
248254
"admin-group-management-text": "Changes to this group will be reflected immediately.",
@@ -507,6 +513,7 @@
507513
"message-key": "Message Key",
508514
"parse": "Parse",
509515
"attach-images-hint": "Attach images by dragging & dropping them into the editor",
516+
"drop-image": "Drop image",
510517
"enable-ingredient-amounts-to-use-this-feature": "Enable ingredient amounts to use this feature",
511518
"recipes-with-units-or-foods-defined-cannot-be-parsed": "Recipes with units or foods defined cannot be parsed.",
512519
"parse-ingredients": "Parse ingredients",
@@ -564,14 +571,17 @@
564571
"tag-filter": "Tag Filter",
565572
"search-hint": "Press '/'",
566573
"advanced": "Advanced",
567-
"auto-search": "Auto Search"
574+
"auto-search": "Auto Search",
575+
"no-results": "No results found"
568576
},
569577
"settings": {
570578
"add-a-new-theme": "Add a New Theme",
571579
"admin-settings": "Admin Settings",
572580
"backup": {
581+
"backup-created": "Backup created successfully",
573582
"backup-created-at-response-export_path": "Backup Created at {path}",
574583
"backup-deleted": "Backup deleted",
584+
"restore-success": "Restore successful",
575585
"backup-tag": "Backup Tag",
576586
"create-heading": "Create a Backup",
577587
"delete-backup": "Delete Backup",
@@ -680,11 +690,13 @@
680690
"configuration": "Configuration",
681691
"docker-volume": "Docker Volume",
682692
"docker-volume-help": "Mealie requires that the frontend container and the backend share the same docker volume or storage. This ensures that the frontend container can properly access the images and assets stored on disk.",
683-
"volumes-are-misconfigured": "Volumes are misconfigured",
693+
"volumes-are-misconfigured": "Volumes are misconfigured.",
684694
"volumes-are-configured-correctly": "Volumes are configured correctly.",
685695
"status-unknown-try-running-a-validation": "Status Unknown. Try running a validation.",
686696
"validate": "Validate",
687697
"email-configuration-status": "Email Configuration Status",
698+
"email-configured": "Email Configured",
699+
"email-test-results": "Email Test Results",
688700
"ready": "Ready",
689701
"not-ready": "Not Ready - Check Environmental Variables",
690702
"succeeded": "Succeeded",
@@ -819,6 +831,7 @@
819831
"password-updated": "Password updated",
820832
"password": "Password",
821833
"password-strength": "Password is {strength}",
834+
"please-enter-password": "Please enter your new password.",
822835
"register": "Register",
823836
"reset-password": "Reset Password",
824837
"sign-in": "Sign in",
@@ -839,6 +852,7 @@
839852
"username": "Username",
840853
"users-header": "USERS",
841854
"users": "Users",
855+
"user-not-found": "User not found",
842856
"webhook-time": "Webhook Time",
843857
"webhooks-enabled": "Webhooks Enabled",
844858
"you-are-not-allowed-to-create-a-user": "You are not allowed to create a user",
@@ -861,6 +875,7 @@
861875
"user-management": "User Management",
862876
"reset-locked-users": "Reset Locked Users",
863877
"admin-user-creation": "Admin User Creation",
878+
"admin-user-management": "Admin User Management",
864879
"user-details": "User Details",
865880
"user-name": "User Name",
866881
"authentication-method": "Authentication Method",
@@ -872,7 +887,10 @@
872887
"user-can-organize-group-data": "User can organize group data",
873888
"enable-advanced-features": "Enable advanced features",
874889
"it-looks-like-this-is-your-first-time-logging-in": "It looks like this is your first time logging in.",
875-
"dont-want-to-see-this-anymore-be-sure-to-change-your-email": "Don't want to see this anymore? Be sure to change your email in your user settings!"
890+
"dont-want-to-see-this-anymore-be-sure-to-change-your-email": "Don't want to see this anymore? Be sure to change your email in your user settings!",
891+
"forgot-password": "Forgot Password",
892+
"forgot-password-text": "Please enter your email address and we will send you a link to reset your password.",
893+
"changes-reflected-immediately": "Changes to this user will be reflected immediately."
876894
},
877895
"language-dialog": {
878896
"translated": "translated",
@@ -974,6 +992,7 @@
974992
},
975993
"user-registration": {
976994
"user-registration": "User Registration",
995+
"registration-success": "Registration Success",
977996
"join-a-group": "Join a Group",
978997
"create-a-new-group": "Create a New Group",
979998
"provide-registration-token-description": "Please provide the registration token associated with the group that you'd like to join. You'll need to obtain this from an existing group member.",
@@ -1020,13 +1039,16 @@
10201039
},
10211040
"ocr-editor": {
10221041
"ocr-editor": "Ocr editor",
1042+
"toolbar": "Toolbar",
10231043
"selection-mode": "Selection mode",
10241044
"pan-and-zoom-picture": "Pan and zoom picture",
10251045
"split-text": "Split text",
10261046
"preserve-line-breaks": "Preserve original line breaks",
10271047
"split-by-block": "Split by text block",
10281048
"flatten": "Flatten regardless of original formating",
10291049
"help": {
1050+
"help": "Help",
1051+
"mouse-modes": "Mouse modes",
10301052
"selection-mode": "Selection Mode (default)",
10311053
"selection-mode-desc": "The selection mode is the main mode that can be used to enter data:",
10321054
"selection-mode-steps": {

0 commit comments

Comments
 (0)