Merge remote-tracking branch 'origin/master'

html/js/other.html

@@ -11,9 +11,9 @@
     <td>{{ item.translation.subproject }}</td>
     <td class="translatetext"><a href="{{ item.get_absolute_url }}">{{ item.source|fmttranslation }}</a></td>
     <td class="translatetext"><a href="{{ item.get_absolute_url }}">{{ item.target|fmttranslationdiff:unit }}</a></td>
-    <td class="mergebutton">
+    <td>
     {% if perms.trans.save_translation %}
-    <a href="{{ unit.translation.get_translate_url}}?type={{ type }}&amp;pos={{ unit.position }}{{ search_url }}&amp;checksum={{ unit.checksum }}&amp;merge={{ item.id }}" class="mergebutton" title="{% trans "Use this translation for all subprojects" %}">{% trans "Use this translation" %}</a>
+    <a class="mergebutton" href="{{ unit.translation.get_translate_url}}?type={{ type }}&amp;pos={{ unit.position }}{{ search_url }}&amp;checksum={{ unit.checksum }}&amp;merge={{ item.id }}" class="mergebutton" title="{% trans "Use this translation for all subprojects" %}">{% trans "Use this translation" %}</a>
     {% endif %}
     </td>
     </tr>

media/css/style.css

@@ -82,7 +82,7 @@ td.suggestions table {
     width: 20px;
     height: 20px;
 }
-td.toolbar a, td.mergebutton a {
+td.toolbar a {
     height: 20px;
     font-size: 10px;
     font-weight: normal;

media/js/loader.js

@@ -212,7 +212,7 @@ $(function() {
             }
         },
         load: function (e, ui) {
-            $('.mergebutton').button({text: true, icons: { primary: "ui-icon-check" }});
+            $('a.mergebutton').button({text: true, icons: { primary: "ui-icon-check" }});
         }
     });
 });