Merge remote branch 'remotes/osamak/master'

Conflicts:
	mediagoblin/templates/mediagoblin/user_pages/media.html

diff --cc mediagoblin/templates/mediagoblin/user_pages/media.html
index ddcf3ce9389df70ab89a55099e9024cb3d423c33,92894d0d3d6e6cd66234a52833abec0b49d13b9e..2acf7a3ded43e202b95a6b9e7ef13893d0c4c76b
--- 1/mediagoblin/templates/mediagoblin/user_pages/media.html
--- 2/mediagoblin/templates/mediagoblin/user_pages/media.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/media.html
@@@ -115,9 -117,10 +115,9 @@@
            </p>
            <p>
              <img src="{{ request.staticdirect('/images/icon_delete.png') }}"
-                  class="media_icon" />delete
+                  class="media_icon" />{% trans %}delete{% endtrans %}
            </p>
          {% endif %}
 -      </p>
  
        {% if media.tags %}
          {% include "mediagoblin/utils/tags.html" %}