update changelog

diff --git a/CHANGELOG b/CHANGELOG
index 14c2483cf3a062cf087c710f0469cfe1bc864c2c..ded83bb5c7ae0113c596c499f1d115bb1b9dd272 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,24 @@
+telemeta (1.4-1) unstable; urgency=low
+
+For users:
+    
+ * add a Desk providing links to home and personal data
+ * add Fonds, Corpus and their related media to the models and to the search engine
+ * add some fancy drop down menus for main tabs
+ * add video media handling (WebM formats only and with the last TimeSide master branch)
+ * add playlist metadata editor
+ * fix some sad bugs for YouTube related URLs and previews
+ * cleanup admin page
+ * many bugfixes !
+
+For developers and maintainers:
+
+ * a new setting parameter: TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') or whatever
+ * before upgrading, you need to BACKUP and manually delete old wrong MediaCorpus and MediaCorpusRelated tables
+ * we now use South for data model migration (./manage.py migrate telemeta). Add it to your apps. See INSTALL.rst. Email me if any pb!
+
+-- Guillaume Pellerin <yomguy@parisson.com>  Fri, 10 Feb 2012 16:10:22 +0200
+
 telemeta (1.3-1) unstable; urgency=low
 
  * add related media objects to collections and items (mime type detection, image preview, URL only capable, YouTube URL detection and preview)

diff --git a/README.rst b/README.rst
index 5999dfe3a9bc48d940cd70765c604a52007c8835..002faad81836d956d032a11fe7eb152c89a8a5b0 100644 (file)
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,7 @@ Telemeta is a free and open source web audio archiving program which introduces
 Here are the main features of Telemeta:
 
     * Secure archiving, editing and publishing of audio files over internet.
-    * User friendly web frontend including workflows and high level search methods
+    * User friendly and full HTML web frontend including workflows and high level search methods
     * Smart dynamical and skinnable audio player (thanks to Timeside and SoundManager2)
     * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture
     * Multi-format support : FLAC, OGG, MP3, WAV and more
@@ -28,10 +28,29 @@ Installation, upgrade and usage
 See `INSTALL.rst <http://github.com/yomguy/Telemeta/blob/master/INSTALL.rst>`_ and `telemeta.org <http://telemeta.org>`_ for more informations.
 
 
-Changelog
-=========
+Changes
+========
+
+(from 1.3)
+
+For users:
+
+ * add a Desk providing links to home and personal data
+ * add Fonds, Corpus and their related media to the models and to the search engine
+ * add some fancy drop down menus for main tabs
+ * add video media handling (WebM formats only and with the last TimeSide master branch)
+ * add playlist metadata editor
+ * fix some sad bugs for YouTube related URLs and previews
+ * cleanup admin page
+ * many bugfixes !
+
+For developers and maintainers:
+
+ * a new setting parameter: TELEMETA_DOWNLOAD_FORMATS = ('wav', 'mp3', 'webm') or whatever
+ * before upgrading, you need to BACKUP and manually delete old wrong MediaCorpus and MediaCorpusRelated tables
+ * we now use South for data model migration (./manage.py migrate telemeta). Add it to your apps. See INSTALL.rst. Email me if any pb!
 
-See `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_
+Full changelog : see `CHANGELOG <http://github.com/yomguy/Telemeta/blob/master/CHANGELOG>`_
 
 
 Development

diff --git a/telemeta/htdocs/js/locale.js b/telemeta/htdocs/js/locale.js
index 8605dc01ed1bb56247dbf039f33fd68c50160c52..1488071a80a1e1b7f4a39aef58d46202bef9d81c 100644 (file)
--- a/telemeta/htdocs/js/locale.js
+++ b/telemeta/htdocs/js/locale.js
@@ -10,9 +10,9 @@ var localeStrings = {
     'author' : gettext('author'),
     'Paste HTML to embed player in website': gettext('Paste HTML to embed player in website'),
     'delete the item permanently?' : gettext('delete the item permanently?'),
-    'delete the collection permanently?' : gettext('delete the collection permanently?')
-    'delete the playlist permanently?' : gettext('delete the playlist permanently?')
-    'delete the resource from the playlist permanently?' : gettext('delete the resource from the playlist permanently?')
+    'delete the collection permanently?' : gettext('delete the collection permanently?'),
+    'delete the playlist permanently?' : gettext('delete the playlist permanently?'),
+    'delete the resource from the playlist permanently?' : gettext('delete the resource from the playlist permanently?'),
 };
 
 function gettrans(str){