diff --git a/cookbook/forms.py b/cookbook/forms.py index fd2b9d0d..d83bd528 100644 --- a/cookbook/forms.py +++ b/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.'), diff --git a/cookbook/helper/permission_helper.py b/cookbook/helper/permission_helper.py index 54e5dd61..b26d5557 100644 --- a/cookbook/helper/permission_helper.py +++ b/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 diff --git a/cookbook/helper/recipe_url_import.py b/cookbook/helper/recipe_url_import.py index fe2d845b..e39aadbe 100644 --- a/cookbook/helper/recipe_url_import.py +++ b/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 diff --git a/cookbook/locale/ca/LC_MESSAGES/django.po b/cookbook/locale/ca/LC_MESSAGES/django.po index 4e6710ce..daaf009f 100644 --- a/cookbook/locale/ca/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "Segur que vols esborrar el %(title)s:%(object)s" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/de/LC_MESSAGES/django.po b/cookbook/locale/de/LC_MESSAGES/django.po index 86328f09..fc1d1c4a 100644 --- a/cookbook/locale/de/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "Bist du sicher das %(title)s: %(object)s gelöscht werden soll " #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/en/LC_MESSAGES/django.po b/cookbook/locale/en/LC_MESSAGES/django.po index dd85a3d8..a57b48a0 100644 --- a/cookbook/locale/en/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/es/LC_MESSAGES/django.mo b/cookbook/locale/es/LC_MESSAGES/django.mo new file mode 100644 index 00000000..50e881de Binary files /dev/null and b/cookbook/locale/es/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/es/LC_MESSAGES/django.po b/cookbook/locale/es/LC_MESSAGES/django.po index 1475ffc2..6206f0fc 100644 --- a/cookbook/locale/es/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "¿Estás seguro de que quieres borrar el %(title)s: %(object)s?" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/fr/LC_MESSAGES/django.po b/cookbook/locale/fr/LC_MESSAGES/django.po index 71491bc7..87dd8ec7 100644 --- a/cookbook/locale/fr/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "Êtes-vous certain de vouloir supprimer %(title)s : %(object)s" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/it/LC_MESSAGES/django.mo b/cookbook/locale/it/LC_MESSAGES/django.mo new file mode 100644 index 00000000..af065c35 Binary files /dev/null and b/cookbook/locale/it/LC_MESSAGES/django.mo differ diff --git a/cookbook/locale/it/LC_MESSAGES/django.po b/cookbook/locale/it/LC_MESSAGES/django.po index fbf7a05c..2cfa7c39 100644 --- a/cookbook/locale/it/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "Sei sicuro di volere eliminare %(title)s: %(object)s" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/nl/LC_MESSAGES/django.po b/cookbook/locale/nl/LC_MESSAGES/django.po index b51b8cb1..71cd0ec7 100644 --- a/cookbook/locale/nl/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "Weet je zeker dat je %(title)s: %(object)s wil verwijderen?" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/pt/LC_MESSAGES/django.po b/cookbook/locale/pt/LC_MESSAGES/django.po index dd85a3d8..a57b48a0 100644 --- a/cookbook/locale/pt/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/rn/LC_MESSAGES/django.po b/cookbook/locale/rn/LC_MESSAGES/django.po index 64faf728..2253a7ac 100644 --- a/cookbook/locale/rn/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/locale/tr/LC_MESSAGES/django.po b/cookbook/locale/tr/LC_MESSAGES/django.po index 03d57578..a0b7e2d8 100644 --- a/cookbook/locale/tr/LC_MESSAGES/django.po +++ b/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: %(object)s " +msgid "Are you sure you want to delete the %(title)s: %(object)s?" msgstr "" #: .\cookbook\templates\generic\delete_template.html:21 diff --git a/cookbook/templates/base.html b/cookbook/templates/base.html index 530e4287..f88c9b3b 100644 --- a/cookbook/templates/base.html +++ b/cookbook/templates/base.html @@ -84,7 +84,7 @@
- {% 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.' %}
- {% trans 'The path must be in the following format' %} /Folder/RecipesFolder
+ {% trans 'The path must be in the following format' %}: /Folder/RecipesFolder