Merge remote-tracking branch 'origin/master'

aleksis/core/templates/core/announcement/form.html

@@ -31,7 +31,7 @@
 
     <button type="submit" class="btn green waves-effect waves-light">
       <i class="material-icons left iconify" data-icon="mdi:content-save-outline"></i>
-      {% trans "Save und publish announcement" %}
+      {% trans "Save and publish announcement" %}
     </button>
   </form>
   {% include_js "select2-materialize" %}