add new author

diff --git a/AUTHORS b/AUTHORS
index df08d054676b8bc0afe41b29e1bb673f8f75b681..9baceb3e09b5ab62b0108ffd72820a2d21f55645 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -1,3 +1,5 @@
 Guillaume Pellerin <yomguy@parisson.com>
 Olivier Guilyardi <olivier@samalyse.com>
 Riccardo Zaccarelli <riccardo.zaccarelli@gmail.com>
+Zaichao XIA <xiazaichao@gmail.com>
+

diff --git a/README.rst b/README.rst
index 7873d33f99077f484d153252a6b3cfe2778ad0b4..a1f9a80b15422f016dd1cf71d01ac4051d71d69b 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -50,7 +50,7 @@ News
 1.4.6
 +++++
 
- * Dratically improve collection zip packaqe streaming thanks to zipstream (check NEW dependencies)
+ * Drastically improve collection zip packaqe streaming thanks to zipstream (check NEW dependencies)
  * Compatible with TimeSide >= 0.5.2
  * Add URL field to item so that a external sound can be indexed and streamed
  * Add TIMESIDE_AUTO_ZOOM in settings to auto toggle the player in zooming mode
@@ -147,7 +147,7 @@ login: demo
 password: demo
 
 
-Serious Examples
+Serious Usecases
 =================
 
 * `Sound archives of the French Ethnomusicology Research Center (CREM) and the Musée de l'Homme <http://archives.crem-cnrs.fr>`_ :
@@ -181,7 +181,7 @@ http://telemeta.org/newticket
 
 You can also leave a ticket to request some new interesting features for the next versions.
 And even if Telemeta suits you, please give us some feedback !
- 
+
 
 Contact
 =======

diff --git a/telemeta/templates/telemeta/mediaitem_edit.html b/telemeta/templates/telemeta/mediaitem_edit.html
index 3441e6f26031bc5a9a77f38afc867dc46ced8da5..00c59f7237fa2bb73d47fed32247a3ecdc483fd3 100644 (file)
--- a/telemeta/templates/telemeta/mediaitem_edit.html
+++ b/telemeta/templates/telemeta/mediaitem_edit.html
@@ -57,6 +57,7 @@
       <td style="padding-top: 1em">{% trans "Performance" %}:</td>
       <td style="padding-top: 1em"><a href="{% url telemeta-item-performances_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "performance"%}</a></td>
     </tr>
+
     <tr>
       <td style="padding-top: 1em">{% trans "Related media" %}:</td>
       <td style="padding-top: 1em"><a href="{% url telemeta-item-related_edit item.public_id %}" class="component_icon button icon_edit">{% trans "Edit"%} {% trans "related media"%}</a></td>