Merge remote-tracking branch 'origin/main' into main
This commit is contained in:
commit
dd0b0e4e2d
2 changed files with 18 additions and 11 deletions
|
@ -29,7 +29,7 @@
|
||||||
"buEmp": "The backup file is empty",
|
"buEmp": "The backup file is empty",
|
||||||
"buFol": "Backup folder",
|
"buFol": "Backup folder",
|
||||||
"buInc": "Malformed or corrupt backup file",
|
"buInc": "Malformed or corrupt backup file",
|
||||||
"buInfo": "Generates a ZIP file containing all your data that can be imported back",
|
"buInfo": "Generates a ZIP file containing your data that can be imported back",
|
||||||
"buMod": "The backup file was modified elsewhere",
|
"buMod": "The backup file was modified elsewhere",
|
||||||
"cat": "Category",
|
"cat": "Category",
|
||||||
"cBtn": "CANCEL",
|
"cBtn": "CANCEL",
|
||||||
|
@ -51,7 +51,7 @@
|
||||||
"Dark": "Dark",
|
"Dark": "Dark",
|
||||||
"db": "Database",
|
"db": "Database",
|
||||||
"dBtn": "DELETE",
|
"dBtn": "DELETE",
|
||||||
"delRecInfo": "You are about to permanently delete the recipe %s",
|
"delRecInfo": "You are about to permanently delete the recipe \"%s\"",
|
||||||
"delRecsInfo": "You are about to permanently delete %s",
|
"delRecsInfo": "You are about to permanently delete %s",
|
||||||
"Desserts": "Desserts",
|
"Desserts": "Desserts",
|
||||||
"detailed": "Detailed",
|
"detailed": "Detailed",
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
"Egyptian": "Egyptian",
|
"Egyptian": "Egyptian",
|
||||||
"English": "English",
|
"English": "English",
|
||||||
"EnRecipes": "EnRecipes",
|
"EnRecipes": "EnRecipes",
|
||||||
"expBu": "Export full backup",
|
"expBu": "Export backup",
|
||||||
"expip": "Export in progress",
|
"expip": "Export in progress",
|
||||||
"expSuc": "Export success",
|
"expSuc": "Export success",
|
||||||
"favourites": "Favourites",
|
"favourites": "Favourites",
|
||||||
|
@ -93,7 +93,7 @@
|
||||||
"hr": "hr",
|
"hr": "hr",
|
||||||
"impBu": "Import data",
|
"impBu": "Import data",
|
||||||
"impFail": "Import failed",
|
"impFail": "Import failed",
|
||||||
"impInfo": "Supports full backups exported by this app",
|
"impInfo": "Supports backups exported by this app",
|
||||||
"impip": "Import in progress",
|
"impip": "Import in progress",
|
||||||
"impSuc": "Import success",
|
"impSuc": "Import success",
|
||||||
"in": "in",
|
"in": "in",
|
||||||
|
@ -198,14 +198,14 @@
|
||||||
"restUL": "Reset unit list",
|
"restUL": "Reset unit list",
|
||||||
"restYUL": "Reset yield unit list",
|
"restYUL": "Reset yield unit list",
|
||||||
"Rice": "Rice",
|
"Rice": "Rice",
|
||||||
"rmCatInfo": "You are about to remove %s from the category list",
|
"rmCatInfo": "You are about to remove \"%s\" from the category list",
|
||||||
"rmCmb": "Combination removed",
|
"rmCmb": "Combination removed",
|
||||||
"rmCuiInfo": "You are about to remove %s from the cuisine list",
|
"rmCuiInfo": "You are about to remove \"%s\" from the cuisine list",
|
||||||
"rmIng": "Ingredient removed",
|
"rmIng": "Ingredient removed",
|
||||||
"rmIns": "Instruction removed",
|
"rmIns": "Instruction removed",
|
||||||
"rmN": "Note removed",
|
"rmN": "Note removed",
|
||||||
"rmUInfo": "You are about to remove %s from the unit list",
|
"rmUInfo": "You are about to remove \"%s\" from the unit list",
|
||||||
"rmYUInfo": "You are about to remove %s from the yield unit list",
|
"rmYUInfo": "You are about to remove \"%s\" from the yield unit list",
|
||||||
"Roll": "Roll",
|
"Roll": "Roll",
|
||||||
"rp": "Remove photo",
|
"rp": "Remove photo",
|
||||||
"rst": "RESTART",
|
"rst": "RESTART",
|
||||||
|
@ -280,7 +280,7 @@
|
||||||
"tmr": "Timer %s",
|
"tmr": "Timer %s",
|
||||||
"prstBtn": "PRESETS",
|
"prstBtn": "PRESETS",
|
||||||
"prsts": "Presets",
|
"prsts": "Presets",
|
||||||
"delPrst": "You are about to delete %s from the presets",
|
"delPrst": "You are about to delete \"%s\" from the presets",
|
||||||
"fwr": "for which recipe?",
|
"fwr": "for which recipe?",
|
||||||
"aTPrst": "Added to presets",
|
"aTPrst": "Added to presets",
|
||||||
"tmrSnd": "Timer sound",
|
"tmrSnd": "Timer sound",
|
||||||
|
@ -330,5 +330,11 @@
|
||||||
"sectRm": "Section removed",
|
"sectRm": "Section removed",
|
||||||
"mSystem": "Measurement system",
|
"mSystem": "Measurement system",
|
||||||
"mtrc": "Metric",
|
"mtrc": "Metric",
|
||||||
"imprl": "Imperial"
|
"imprl": "Imperial",
|
||||||
|
"expt": "EXPORT",
|
||||||
|
"impt": "IMPORT",
|
||||||
|
"pcrcs": "Recipes (%s)",
|
||||||
|
"pcmps": "Meal plans (%s)",
|
||||||
|
"pctps": "Timer presets (%s)",
|
||||||
|
"pclis": "Lists (cuisines, categories, yield units and units)"
|
||||||
}
|
}
|
|
@ -2,5 +2,6 @@
|
||||||
- Adding or removing items in the recipe editor is even more easier
|
- Adding or removing items in the recipe editor is even more easier
|
||||||
- Ingredient quantities are now shown in fractions
|
- Ingredient quantities are now shown in fractions
|
||||||
- Ingredient units are automatically converted during scaling
|
- Ingredient units are automatically converted during scaling
|
||||||
- Switch measuring system under interface setting
|
- Switch measurement system under interface setting
|
||||||
|
- Extended import and export
|
||||||
- Bug fixes and improvements
|
- Bug fixes and improvements
|
Loading…
Reference in a new issue