Merge branch 'master' into Develop

2020-05-23 08:50:24 +02:00
parent b3fdce36af 087c4c5929
commit ec3a3a73ef
36 changed files with 2029 additions and 2029 deletions
@@ -121,7 +121,7 @@
        </div>
        <div class="form-group">
          <input type="checkbox" name="edit_shelf_role" id="edit_shelf_role" {% if content.role_edit_shelfs() %}checked{% endif %}>
-          <label for="edit_shelf_role">{{_('Allow Editing Public Shelfs')}}</label>
+          <label for="edit_shelf_role">{{_('Allow Editing Public Shelves')}}</label>
        </div>
      {% endif %}
    {% endif %}