fixed some english translations

cookbook/forms.py

@@ -37,7 +37,7 @@ class UserPreferenceForm(forms.ModelForm):
             'nav_color': _('Color of the top navigation bar. Not all colors work with all themes, just try them out!'),
             'default_unit': _('Default Unit to be used when inserting a new ingredient into a recipe.'),
             'use_fractions': _('Enables support for fractions in ingredient amounts (e.g. convert decimals to fractions automatically)'),
-            'plan_share': _('Default user to share newly created meal plan entries with.'),
+            'plan_share': _('Users with whom newly created meal plan/shopping list entries should be shared by default.'),
             'show_recent': _('Show recently viewed recipes on search page.'),
             'ingredient_decimals': _('Number of decimals to round ingredients.'),
             'comments': _('If you want to be able to create and see comments underneath recipes.'),

cookbook/helper/permission_helper.py

@@ -141,7 +141,7 @@ class OwnerRequiredMixin(object):
             return HttpResponseRedirect(reverse_lazy('login'))
         else:
             if not is_object_owner(request.user, self.get_object()):
-                messages.add_message(request, messages.ERROR, _('You cannot interact with this object as its not owned by you!'))
+                messages.add_message(request, messages.ERROR, _('You cannot interact with this object as it is not owned by you!'))
                 return HttpResponseRedirect(reverse('index'))
 
         return super(OwnerRequiredMixin, self).dispatch(request, *args, **kwargs)
@@ -155,7 +155,7 @@ class CustomIsOwner(permissions.BasePermission):
     verifies user has ownership over object
     (either user or created_by or user is request user)
     """
-    message = _('You cannot interact with this object as its not owned by you!')
+    message = _('You cannot interact with this object as it is not owned by you!')
 
     def has_permission(self, request, view):
         return request.user.is_authenticated
@@ -169,7 +169,7 @@ class CustomIsShared(permissions.BasePermission):  # TODO function duplicate/too
     Custom permission class for django rest framework views
     verifies user is shared for the object he is trying to access
     """
-    message = _('You cannot interact with this object as its not owned by you!')
+    message = _('You cannot interact with this object as it is not owned by you!')
 
     def has_permission(self, request, view):
         return request.user.is_authenticated

cookbook/helper/recipe_url_import.py

@@ -158,7 +158,7 @@ def find_recipe_json(ld_json, url):
     else:
         ld_json['recipeInstructions'] = ''
 
-    ld_json['recipeInstructions'] += '\n\n' + _('Imported from ') + url
+    ld_json['recipeInstructions'] += '\n\n' + _('Imported from') + ' ' + url
 
     if 'image' in ld_json:
         # check if list of images is returned, take first if so

cookbook/locale/ca/LC_MESSAGES/django.po

@@ -238,7 +238,7 @@ msgstr "No heu iniciat la sessió i, per tant, no podeu veure aquesta pàgina."
 
 #: .\cookbook\helper\permission_helper.py:127
 #: .\cookbook\helper\permission_helper.py:141 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "No podeu interactuar amb aquest objecte ja que no és propietat vostra!"
 
@@ -430,7 +430,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr "Ajuda de Markdown"
 
 #: .\cookbook\templates\base.html:144
@@ -826,7 +826,7 @@ msgid "Units"
 msgstr "Unitats"
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr "Segur que vols combinar aquestes dues unitats?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -835,12 +835,12 @@ msgid "Merge"
 msgstr "Combina"
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Segur que vols combinar aquests dos Ingredients?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr "Segur que vols esborrar el %(title)s:<b>%(object)s</b>"
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/de/LC_MESSAGES/django.po

@@ -238,7 +238,7 @@ msgstr "Du bist nicht angemeldet, daher kannst du diese Seite nicht sehen!"
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "Du kannst mit diesem Objekt nicht interagieren, da es dir nicht gehört!"
 
@@ -256,7 +256,7 @@ msgstr ""
 "Die angefragte Seite stellt keine bekannten Datenformate zur Verfügung."
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr "Importiert von"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -430,7 +430,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr "Markdown-Hilfe"
 
 #: .\cookbook\templates\base.html:144
@@ -867,7 +867,7 @@ msgid "Units"
 msgstr "Einheiten"
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr "Bist du sicher diese beiden Einheiten zusammengeführt werden sollen ?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -876,12 +876,12 @@ msgid "Merge"
 msgstr "Zusammenführen"
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Bist du sicher diese beiden Zutaten zusammengeführt werden sollen ?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr "Bist du sicher das %(title)s: <b>%(object)s</b> gelöscht werden soll "
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/en/LC_MESSAGES/django.po

@@ -214,7 +214,7 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -228,7 +228,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr ""
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -402,7 +402,7 @@ msgid "Admin"
 msgstr ""
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr ""
 
 #: .\cookbook\templates\base.html:144
@@ -830,7 +830,7 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -839,12 +839,12 @@ msgid "Merge"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/es/LC_MESSAGES/django.po

@@ -252,7 +252,7 @@ msgstr "¡No ha iniciado sesión y por lo tanto no puede ver esta página!"
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "¡No puede interactuar con este objeto ya que no es de su propiedad!"
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -270,7 +270,7 @@ msgstr ""
 "importar la receta."
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr "Importado desde"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -444,7 +444,7 @@ msgid "Admin"
 msgstr "Administrador"
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr "Ayuda de Markdown"
 
 #: .\cookbook\templates\base.html:144
@@ -881,7 +881,7 @@ msgid "Units"
 msgstr "Unidades"
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr "¿Estás seguro de que quieres combinar estas dos unidades?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -890,12 +890,12 @@ msgid "Merge"
 msgstr "Unir"
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "¿Estás seguro de que quieres combinar estos dos ingredientes?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr "¿Estás seguro de que quieres borrar el %(title)s: <b>%(object)s</b>?"
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/fr/LC_MESSAGES/django.po

@@ -249,7 +249,7 @@ msgstr "Vous n'êtes pas connecté et ne pouvez donc pas afficher cette page !"
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 "Vous ne pouvez pas interagir avec cet objet car vous ne le possédez pas!"
 
@@ -266,7 +266,7 @@ msgstr ""
 "la recette."
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr "Importé depuis"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -440,7 +440,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr "Aide Markdown"
 
 #: .\cookbook\templates\base.html:144
@@ -874,7 +874,7 @@ msgid "Units"
 msgstr "Unités"
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr "Êtes-vous sur de vouloir fusionner ces deux unités ?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -883,12 +883,12 @@ msgid "Merge"
 msgstr "Fusionner"
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Êtes-vous certain de vouloir fusionner ces deux ingrédients ?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr "Êtes-vous certain de vouloir supprimer %(title)s : <b>%(object)s</b>"
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/it/LC_MESSAGES/django.po

@@ -248,7 +248,7 @@ msgstr "Non sei loggato e quindi non puoi visualizzare questa pagina!"
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "Non puoi interagire con questo oggetto perché non è di tua proprietà!"
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -266,7 +266,7 @@ msgstr ""
 "dati riconosciuto."
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr "Importato da"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -440,7 +440,7 @@ msgid "Admin"
 msgstr "Amministratore"
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr "Aiuto Markdown"
 
 #: .\cookbook\templates\base.html:144
@@ -875,7 +875,7 @@ msgid "Units"
 msgstr "Unità di Misura"
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr "Sei sicuro di volere unire queste due unità di misura?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -884,12 +884,12 @@ msgid "Merge"
 msgstr "Unisci"
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Sei sicuro di volere unire questi due ingredienti?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr "Sei sicuro di volere eliminare %(title)s: <b>%(object)s</b>"
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/nl/LC_MESSAGES/django.po

@@ -237,7 +237,7 @@ msgstr "Je bent niet ingelogd en kan deze pagina daarom niet bekijken!"
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr "Je kunt dit object niet bewerken omdat je de eigenaar niet bent!"
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -255,7 +255,7 @@ msgstr ""
 "te importeren."
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr "Geïmporteerd van"
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -429,7 +429,7 @@ msgid "Admin"
 msgstr "Admin"
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr "Markdown hulp"
 
 #: .\cookbook\templates\base.html:144
@@ -868,7 +868,7 @@ msgid "Units"
 msgstr "Eenheden"
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr "Weet je zeker dat je deze twee eenheden wil samenvoegen?"
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -877,12 +877,12 @@ msgid "Merge"
 msgstr "Samenvoegen"
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr "Weet je zeker dat je deze twee ingrediënten wil samenvoegen?"
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr "Weet je zeker dat je %(title)s: <b>%(object)s</b> wil verwijderen?"
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/pt/LC_MESSAGES/django.po

@@ -214,7 +214,7 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -228,7 +228,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr ""
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -402,7 +402,7 @@ msgid "Admin"
 msgstr ""
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr ""
 
 #: .\cookbook\templates\base.html:144
@@ -830,7 +830,7 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -839,12 +839,12 @@ msgid "Merge"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/rn/LC_MESSAGES/django.po

@@ -214,7 +214,7 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -228,7 +228,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr ""
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -402,7 +402,7 @@ msgid "Admin"
 msgstr ""
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr ""
 
 #: .\cookbook\templates\base.html:144
@@ -830,7 +830,7 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -839,12 +839,12 @@ msgid "Merge"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/locale/tr/LC_MESSAGES/django.po

@@ -214,7 +214,7 @@ msgstr ""
 #: .\cookbook\helper\permission_helper.py:144
 #: .\cookbook\helper\permission_helper.py:158
 #: .\cookbook\helper\permission_helper.py:172 .\cookbook\views\delete.py:132
-msgid "You cannot interact with this object as its not owned by you!"
+msgid "You cannot interact with this object as it is not owned by you!"
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:36
@@ -228,7 +228,7 @@ msgid ""
 msgstr ""
 
 #: .\cookbook\helper\recipe_url_import.py:159
-msgid "Imported from "
+msgid "Imported from"
 msgstr ""
 
 #: .\cookbook\migrations\0047_auto_20200602_1133.py:12
@@ -402,7 +402,7 @@ msgid "Admin"
 msgstr ""
 
 #: .\cookbook\templates\base.html:142
-msgid "Markdown Help"
+msgid "Markdown Guide"
 msgstr ""
 
 #: .\cookbook\templates\base.html:144
@@ -830,7 +830,7 @@ msgid "Units"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:26
-msgid "Are you sure that you want to merge these two units ?"
+msgid "Are you sure that you want to merge these two units?"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:31
@@ -839,12 +839,12 @@ msgid "Merge"
 msgstr ""
 
 #: .\cookbook\templates\forms\ingredients.html:36
-msgid "Are you sure that you want to merge these two ingredients ?"
+msgid "Are you sure that you want to merge these two ingredients?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:18
 #, python-format
-msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b> "
+msgid "Are you sure you want to delete the %(title)s: <b>%(object)s</b>?"
 msgstr ""
 
 #: .\cookbook\templates\generic\delete_template.html:21

cookbook/templates/base.html

@@ -84,7 +84,7 @@
             <li class="nav-item dropdown {% if request.resolver_match.url_name in 'list_keyword,data_batch_edit' %}active{% endif %}">
                 <a class="nav-link dropdown-toggle" href="#" id="navbarDropdownMenuLink" data-toggle="dropdown"
                    aria-haspopup="true" aria-expanded="false">
-                    <i class="fas fa-tags"></i> {% trans 'Tags' %}
+                    <i class="fas fa-tags"></i> {% trans 'Keywords' %}
                 </a>
                 <div class="dropdown-menu" aria-labelledby="navbarDropdownMenuLink">
                     <a class="dropdown-item" href="{% url 'list_keyword' %}"><i
@@ -139,7 +139,7 @@
                         {% endif %}
                         <div class="dropdown-divider"></div>
                         <a class="dropdown-item" href="{% url 'docs_markdown' %}"><i
-                                class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Help' %}</a>
+                                class="fab fa-markdown fa-fw"></i> {% trans 'Markdown Guide' %}</a>
                         <a class="dropdown-item" href="https://github.com/vabene1111/recipes"><i
                                 class="fab fa-github fa-fw"></i> {% trans 'GitHub' %}</a>
                         <a class="dropdown-item" href="{% url 'docs_api' %}"><i

cookbook/templates/batch/monitor.html

@@ -11,9 +11,9 @@
     <div class="card border-info">
         <div class="card-body text-info">
             <p class="card-text">
-                {% trans 'On this Page you can manage all storage folder locations that should be monitored and synced' %}
+                {% trans 'On this Page you can manage all storage folder locations that should be monitored and synced.' %}
                 <br/>
-                {% trans 'The path must be in the following format' %} <code>/Folder/RecipesFolder</code>
+                {% trans 'The path must be in the following format' %}: <code>/Folder/RecipesFolder</code>
             </p>
             <form method="POST" class="post-form">{% csrf_token %}
                 {{ form|crispy }}

cookbook/templates/forms/ingredients.html

@@ -23,7 +23,7 @@
 
     <h4>{% trans 'Units' %}</h4>
     <form action="{% url 'edit_food' %}" method="post"
-          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units ?' %}')">
+          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two units?' %}')">
         {% csrf_token %}
         {{ units_form|crispy }}
         <button class="btn btn-danger" type="submit"
@@ -33,7 +33,7 @@
 
     <h4>{% trans 'Ingredients' %}</h4>
     <form action="{% url 'edit_food' %}" method="post"
-          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients ?' %}')">
+          onsubmit="return confirm('{% trans 'Are you sure that you want to merge these two ingredients?' %}')">
         {% csrf_token %}
         {{ food_form|crispy }}
         <button class="btn btn-danger" type="submit">

cookbook/views/delete.py

@@ -129,7 +129,7 @@ class RecipeBookEntryDelete(GroupRequiredMixin, DeleteView):
     def dispatch(self, request, *args, **kwargs):
         obj = self.get_object()
         if not (obj.book.created_by == request.user or request.user.is_superuser):
-            messages.add_message(request, messages.ERROR, _('You cannot interact with this object as its not owned by you!'))
+            messages.add_message(request, messages.ERROR, _('You cannot interact with this object as it is not owned by you!'))
             return HttpResponseRedirect(reverse('index'))
         return super(RecipeBookEntryDelete, self).dispatch(request, *args, **kwargs)