Merge remote-tracking branch 'origin/main' into main

This commit is contained in:
Hosted Weblate 2021-04-16 06:50:47 +02:00
commit 46a7cda03c
2 changed files with 2 additions and 3 deletions

View file

@ -433,7 +433,7 @@ export default {
changeYield() { changeYield() {
this.$showModal(PromptDialog, { this.$showModal(PromptDialog, {
props: { props: {
title: `${localize("req")} ${localize(this.recipe.yield.unit)}`, title: `${localize("req", localize(this.recipe.yield.unit))}`,
placeholder: Math.abs(parseFloat(this.yieldMultiplier)), placeholder: Math.abs(parseFloat(this.yieldMultiplier)),
action: "SET", action: "SET",
}, },

View file

@ -94,7 +94,6 @@
"buInfo": "Generates a ZIP file containing all your data that can be imported back", "buInfo": "Generates a ZIP file containing all your data that can be imported back",
"impBu": "Import data", "impBu": "Import data",
"impInfo": "Supports full backups exported by this app", "impInfo": "Supports full backups exported by this app",
"ver": "Version",
"joinTG": "Join the Telegram group", "joinTG": "Join the Telegram group",
"newRec": "New recipe", "newRec": "New recipe",
"editRec": "Edit recipe", "editRec": "Edit recipe",
@ -156,7 +155,7 @@
"rmCmb": "Combination removed", "rmCmb": "Combination removed",
"nwYiU": "New yield unit", "nwYiU": "New yield unit",
"nwCat": "New category", "nwCat": "New category",
"req": "Required", "req": "Required %s",
"recPic": "Recipe photo", "recPic": "Recipe photo",
"cPic": "Crop photo", "cPic": "Crop photo",
"breakfast": "Breakfast", "breakfast": "Breakfast",