From c0e35e89e920872059350c052f27c07413b81c90 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 1 Feb 2023 00:01:39 +0000 Subject: [PATCH 1/8] Bump pillow from 9.3.0 to 9.4.0 Bumps [pillow](https://github.com/python-pillow/Pillow) from 9.3.0 to 9.4.0. - [Release notes](https://github.com/python-pillow/Pillow/releases) - [Changelog](https://github.com/python-pillow/Pillow/blob/main/CHANGES.rst) - [Commits](https://github.com/python-pillow/Pillow/compare/9.3.0...9.4.0) --- updated-dependencies: - dependency-name: pillow dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index cc565492..e5d78d3e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,7 +14,7 @@ bleach-allowlist==1.0.3 gunicorn==20.1.0 lxml==4.9.2 Markdown==3.4.1 -Pillow==9.3.0 +Pillow==9.4.0 psycopg2-binary==2.9.5 python-dotenv==0.21.0 requests==2.28.1 From 961619c1566521cd7850f0c9c2d7c37e10891877 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 16 Feb 2023 17:11:41 +0000 Subject: [PATCH 2/8] Bump cryptography from 38.0.4 to 39.0.1 Bumps [cryptography](https://github.com/pyca/cryptography) from 38.0.4 to 39.0.1. - [Release notes](https://github.com/pyca/cryptography/releases) - [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst) - [Commits](https://github.com/pyca/cryptography/compare/38.0.4...39.0.1) --- updated-dependencies: - dependency-name: cryptography dependency-type: direct:production ... Signed-off-by: dependabot[bot] --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index f7900c3b..222386df 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Django==4.1.7 -cryptography==38.0.4 +cryptography==39.0.1 django-annoying==0.10.6 django-autocomplete-light==3.9.4 django-cleanup==6.0.0 From 7d0a9b11a0857df6c67cbf4f6d9ec171369c3618 Mon Sep 17 00:00:00 2001 From: Joachim Weber Date: Fri, 17 Feb 2023 09:54:04 +0000 Subject: [PATCH 3/8] Translated using Weblate (German) Currently translated at 100.0% (478 of 478 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/de/ --- vue/src/locales/de.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/vue/src/locales/de.json b/vue/src/locales/de.json index 62aa2587..e354344c 100644 --- a/vue/src/locales/de.json +++ b/vue/src/locales/de.json @@ -367,7 +367,7 @@ "desc": "Absteigend", "book_filter_help": "Schließt zusätzlich zu den manuell hinzugefügten Rezepten, alle Rezepte die dem Filter entsprechen ein.", "recipe_name": "Rezeptname", - "paste_ingredients_placeholder": "Zutatenliste hier einfügen", + "paste_ingredients_placeholder": "Zutatenliste hier einfügen...", "ingredient_list": "Zutatenliste", "filter": "Filter", "err_deleting_protected_resource": "Das zu löschende Objekt wird noch verwendet und kann nicht gelöscht werden.", @@ -478,5 +478,6 @@ "Combine_All_Steps": "Fasse alle Schritte in einem einzelnem Feld zusammen.", "reset_children_help": "Überschreibe alle Kinder mit den Werten der vererbten Felder. Die vererbten Felder der Kinder werden als vererbte Felder gesetzt, es sei denn, das Kind-Vererben-Feld ist gesetzt.", "Unpin": "Lösen", - "Amount": "Menge" + "Amount": "Menge", + "Original_Text": "Originaltext" } From 0f55f915866f587879fae4e7cbe5d203710cb727 Mon Sep 17 00:00:00 2001 From: Joachim Weber Date: Fri, 17 Feb 2023 09:38:14 +0000 Subject: [PATCH 4/8] Translated using Weblate (Portuguese (Brazil)) Currently translated at 36.1% (173 of 478 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/pt_BR/ --- vue/src/locales/pt_BR.json | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/vue/src/locales/pt_BR.json b/vue/src/locales/pt_BR.json index 84ed9351..cfe929d8 100644 --- a/vue/src/locales/pt_BR.json +++ b/vue/src/locales/pt_BR.json @@ -150,15 +150,15 @@ "delete_title": "Deletar {type}", "create_title": "Novo {type}", "edit_title": "", - "Name": "", - "Type": "", - "Description": "", - "Recipe": "", + "Name": "Nome", + "Type": "Tipo", + "Description": "Descrição", + "Recipe": "Receita", "tree_root": "", - "Icon": "", - "Unit": "", - "No_Results": "", - "New_Unit": "", + "Icon": "Ícone", + "Unit": "Unidade", + "No_Results": "Sem Resultados", + "New_Unit": "Nova Unidade", "Create_New_Shopping Category": "", "Create_New_Food": "", "Create_New_Keyword": "", @@ -394,5 +394,9 @@ "Use_Plural_Unit_Simple": "", "Use_Plural_Food_Always": "", "Use_Plural_Food_Simple": "", - "plural_usage_info": "" + "plural_usage_info": "", + "Amount": "Quantidade", + "Description_Replace": "Substituir Descrição", + "Decimals": "Decimais", + "Instruction_Replace": "Substituir Instrução" } From b4f90fbbb3a93eb1c73c83bfd075956417b9cca4 Mon Sep 17 00:00:00 2001 From: Joachim Weber Date: Fri, 17 Feb 2023 09:34:41 +0000 Subject: [PATCH 5/8] Translated using Weblate (Portuguese (Brazil)) Currently translated at 5.6% (32 of 562 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/pt_BR/ --- cookbook/locale/pt_BR/LC_MESSAGES/django.po | 36 ++++++++++----------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/cookbook/locale/pt_BR/LC_MESSAGES/django.po b/cookbook/locale/pt_BR/LC_MESSAGES/django.po index ceaf3f06..2c96227d 100644 --- a/cookbook/locale/pt_BR/LC_MESSAGES/django.po +++ b/cookbook/locale/pt_BR/LC_MESSAGES/django.po @@ -8,8 +8,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2022-02-11 08:52+0100\n" -"PO-Revision-Date: 2022-03-08 01:31+0000\n" -"Last-Translator: Felipe Castro \n" +"PO-Revision-Date: 2023-02-18 10:55+0000\n" +"Last-Translator: Joachim Weber \n" "Language-Team: Portuguese (Brazil) \n" "Language: pt_BR\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 4.10.1\n" +"X-Generator: Weblate 4.15\n" #: .\cookbook\filters.py:23 .\cookbook\templates\forms\ingredients.html:34 #: .\cookbook\templates\space.html:50 .\cookbook\templates\stats.html:28 @@ -158,7 +158,7 @@ msgstr "" #: .\cookbook\templates\url_import.html:195 #: .\cookbook\templates\url_import.html:585 .\cookbook\views\lists.py:97 msgid "Keywords" -msgstr "" +msgstr "Palavras-chave" #: .\cookbook\forms.py:131 msgid "Preparation time in minutes" @@ -513,7 +513,7 @@ msgstr "" #: .\cookbook\templates\url_import.html:231 #: .\cookbook\templates\url_import.html:462 msgid "Servings" -msgstr "" +msgstr "Porções" #: .\cookbook\integration\saffron.py:25 msgid "Waiting time" @@ -585,7 +585,7 @@ msgstr "" #: .\cookbook\models.py:302 .\cookbook\templates\base.html:90 msgid "Books" -msgstr "" +msgstr "Livros" #: .\cookbook\models.py:310 msgid "Small" @@ -598,7 +598,7 @@ msgstr "" #: .\cookbook\models.py:310 .\cookbook\templates\generic\new_template.html:6 #: .\cookbook\templates\generic\new_template.html:14 msgid "New" -msgstr "" +msgstr "Novo" #: .\cookbook\models.py:513 msgid " is part of a recipe step and cannot be deleted" @@ -677,7 +677,7 @@ msgstr "" #: .\cookbook\templates\shopping_list.html:37 #: .\cookbook\templates\space.html:109 msgid "Edit" -msgstr "" +msgstr "Editar" #: .\cookbook\tables.py:115 .\cookbook\tables.py:138 #: .\cookbook\templates\generic\delete_template.html:7 @@ -715,7 +715,7 @@ msgstr "" #: .\cookbook\templates\settings.html:17 #: .\cookbook\templates\socialaccount\connections.html:10 msgid "Settings" -msgstr "" +msgstr "Configurações" #: .\cookbook\templates\account\email.html:13 msgid "Email" @@ -937,7 +937,7 @@ msgstr "" #: .\cookbook\templates\account\signup.html:48 #: .\cookbook\templates\socialaccount\signup.html:39 msgid "and" -msgstr "" +msgstr "e" #: .\cookbook\templates\account\signup.html:52 #: .\cookbook\templates\socialaccount\signup.html:43 @@ -989,7 +989,7 @@ msgstr "" #: .\cookbook\templates\shopping_list.html:208 #: .\cookbook\templates\supermarket.html:7 msgid "Supermarket" -msgstr "" +msgstr "Supermercado" #: .\cookbook\templates\base.html:163 msgid "Supermarket Category" @@ -1027,7 +1027,7 @@ msgstr "" #: .\cookbook\templates\shopping_list.html:165 #: .\cookbook\templates\shopping_list.html:188 msgid "Create" -msgstr "" +msgstr "Criar" #: .\cookbook\templates\base.html:259 #: .\cookbook\templates\generic\list_template.html:14 @@ -1190,7 +1190,7 @@ msgstr "" #: .\cookbook\templates\generic\delete_template.html:26 msgid "Protected" -msgstr "" +msgstr "Protegido" #: .\cookbook\templates\generic\delete_template.html:41 msgid "Cascade" @@ -1268,7 +1268,7 @@ msgstr "" #: .\cookbook\templates\include\recipe_open_modal.html:18 msgid "Close" -msgstr "" +msgstr "Fechar" #: .\cookbook\templates\include\recipe_open_modal.html:32 msgid "Open Recipe" @@ -1821,7 +1821,7 @@ msgstr "" #: .\cookbook\templates\settings.html:162 msgid "or" -msgstr "" +msgstr "ou" #: .\cookbook\templates\settings.html:173 msgid "" @@ -2062,7 +2062,7 @@ msgstr "" #: .\cookbook\templates\space.html:120 msgid "user" -msgstr "" +msgstr "usuário" #: .\cookbook\templates\space.html:121 msgid "guest" @@ -2273,7 +2273,7 @@ msgstr "" #: .\cookbook\templates\url_import.html:214 msgid "Image" -msgstr "" +msgstr "Imagem" #: .\cookbook\templates\url_import.html:246 msgid "Prep Time" @@ -2359,7 +2359,7 @@ msgstr "" #: .\cookbook\templates\url_import.html:640 msgid "Information" -msgstr "" +msgstr "Informação" #: .\cookbook\templates\url_import.html:642 msgid "" From 9962c849ed87d7333a6d8ec6daf7ad63917793eb Mon Sep 17 00:00:00 2001 From: Oliver Cervera Date: Sun, 19 Feb 2023 12:14:22 +0000 Subject: [PATCH 6/8] Translated using Weblate (Italian) Currently translated at 97.4% (466 of 478 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/it/ --- vue/src/locales/it.json | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/vue/src/locales/it.json b/vue/src/locales/it.json index e350f6c5..eec150cf 100644 --- a/vue/src/locales/it.json +++ b/vue/src/locales/it.json @@ -74,7 +74,7 @@ "Edit": "Modifica", "Delete": "Elimina", "Open": "Apri", - "Ok": "Apri", + "Ok": "Ok", "Save": "Salva", "Step": "Step", "Search": "Cerca", @@ -462,5 +462,9 @@ "shopping_category_help": "I supermercati possono essere ordinati e filtrati per categoria di spesa seguendo la disposizione degli scaffali.", "food_recipe_help": "Collegando qui una ricetta, includerà la stessa in ogni altra ricetta che usa questo alimento", "warning_duplicate_filter": "Avviso: a causa di limitazioni tecniche, usare più filtri di ricerca della stessa combinazione (and/or/not) potrebbe portare a risultati inaspettati.", - "Warning_Delete_Supermarket_Category": "L'eliminazione di una categoria di supermercato comporta anche l'eliminazione di tutte le relazioni con gli alimenti. Sei sicuro?" + "Warning_Delete_Supermarket_Category": "L'eliminazione di una categoria di supermercato comporta anche l'eliminazione di tutte le relazioni con gli alimenti. Sei sicuro?", + "Original_Text": "Testo originale", + "search_rank": "Posizione di ricerca", + "make_now": "Fai ora", + "Amount": "Quantità" } From 817c4cb9d60028d324d141fd91d186bf79a554fa Mon Sep 17 00:00:00 2001 From: JFL Date: Thu, 23 Feb 2023 02:05:55 +0000 Subject: [PATCH 7/8] Translated using Weblate (French) Currently translated at 87.7% (423 of 482 strings) Translation: Tandoor/Recipes Backend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-backend/fr/ --- cookbook/locale/fr/LC_MESSAGES/django.po | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/cookbook/locale/fr/LC_MESSAGES/django.po b/cookbook/locale/fr/LC_MESSAGES/django.po index 811be924..9a234aff 100644 --- a/cookbook/locale/fr/LC_MESSAGES/django.po +++ b/cookbook/locale/fr/LC_MESSAGES/django.po @@ -14,8 +14,8 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2023-01-19 19:14+0100\n" -"PO-Revision-Date: 2023-02-09 13:55+0000\n" -"Last-Translator: Marion Kämpfer \n" +"PO-Revision-Date: 2023-02-24 02:55+0000\n" +"Last-Translator: JFL \n" "Language-Team: French \n" "Language: fr\n" @@ -718,10 +718,8 @@ msgid "Keyword Alias" msgstr "Mot-clé équivalent" #: .\cookbook\models.py:1231 -#, fuzzy -#| msgid "Description" msgid "Description Replace" -msgstr "Description" +msgstr "Remplacer la Description" #: .\cookbook\models.py:1231 #, fuzzy From 0ce7ea0b61f35bd21755437a7cedd7baaf0183d0 Mon Sep 17 00:00:00 2001 From: JFL Date: Thu, 23 Feb 2023 01:57:16 +0000 Subject: [PATCH 8/8] Translated using Weblate (French) Currently translated at 93.5% (447 of 478 strings) Translation: Tandoor/Recipes Frontend Translate-URL: http://translate.tandoor.dev/projects/tandoor/recipes-frontend/fr/ --- vue/src/locales/fr.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vue/src/locales/fr.json b/vue/src/locales/fr.json index 670cc629..906e7634 100644 --- a/vue/src/locales/fr.json +++ b/vue/src/locales/fr.json @@ -231,7 +231,7 @@ "Planner": "Planificateur", "Planner_Settings": "Paramètres du planificateur", "AddFoodToShopping": "Ajouter l’aliment {food} à votre liste de courses", - "DeleteShoppingConfirm": "Êtes-vous sûr(e) de vouloir supprimer tous les aliments {food} de votre liste de courses ?", + "DeleteShoppingConfirm": "Êtes-vous sûr(e) de vouloir supprimer tous les aliments {food} de votre liste de courses ?", "IgnoredFood": "Ignorer les courses est paramétré pour l’aliment {food}.", "Inherit": "Hériter", "InheritFields": "Hériter les valeurs des champs",