Changeset a329787

Timestamp:

10/27/11 13:36:52 (19 months ago)

Author:

yomguy <yomguy@…>

Branches:

master, crem, crem2, dev, diadems, forma, generic, instru_search, lam, nlivemulti, production, release/1.4.4, security, social, storage, test

Children:

57049ae

Parents:

3b897ce

git-author:

yomguy <yomguy@…> (10/27/11 13:36:52)

git-committer:

yomguy <yomguy@…> (10/27/11 13:36:52)

Message:

fix homes

Location:

telemeta/pages

Files:

• en/home.rst (modified) (1 diff)
• fr/home.rst (modified) (2 diffs)

telemeta/pages/en/home.rst

@@ -3 +3 @@
 ==============================================
 
-<<<<<<< HEAD
 The establishment of the `CREM <http://www.crem-cnrs.fr>`_’s audio archives is the result of a long history of scientific research on music. Since the birth of ethnomusicology (then "comparative musicology"), which coincided with the invention of the first recorders in the late nineteenth century, recording music materials and their classification and preservation are central in our knowledge of the musical Man. 
-=======
-`Telemeta <http://telemeta.org>`_ is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards.
->>>>>>> master
 
 .. image:: home_img.jpg

telemeta/pages/fr/home.rst

@@ -1 @@
-<<<<<<< HEAD
 ============================================
 Archives sonores du CNRS - Musée de l'Homme 
@@ -21 +20 @@
 
 |
-=======
-===================================================
-Telemeta : Web Audio Content Management System
-===================================================
-
-`Telemeta <http://telemeta.org>`_ is a web audio archiving program which introduces useful and secure methods to backup, index, transcode, analyse and publish any digitalized audio file with its metadata. It is dedicated to professionnals who wants to easily organize, backup and publish documented sound collections of audio files, CDs, digitalized vinyls and magnetic tapes over a strong database, in accordance with open web standards.
-
-Key features of Telemeta:
-    
- * Secure archiving, editing and publishing of audio files over internet.
- * User friendly web frontend including workflows and high level search methods
- * Smart dynamical and skinnable audio player (thanks to `TimeSide <http://code.google.com/p/timeside/>`_ and `SoundManager2 <http://www.schillmania.com/projects/soundmanager2/>`_)
- * "On the fly" analyzing, transcoding and metadata embedding based on an easy plugin architecture
- * Temporal and collaborative indexation with fast user marker management
- * Multi-format support : FLAC, OGG, MP3, WAV and more
- * User management with individual profiles and rights
- * Playlist management for users with CSV data export
- * Geo-Navigator for audio geolocalization
- * `DublinCore <http://dublincore.org/>`_ compatibility
- * `OAI-PMH <http://www.openarchives.org/pmh/>`_ data provider
- * RSS feeds generator
- * XML serialized backup
- * Strong SQL or Oracle backend
-
-The Telemeta data model is now based on *collection* and *item* elements. A *collection* is described by its metadata and is related to audio *items*. An *item* embeds audio files with its metadata. This model has been designed to fit the one of the French Centre of Ethnomusicology (`CREM <http://www.crem-cnrs.fr>`_) of the University of Paris Ouest - Nanterre but could be easily adapted or overrided to suit other data structures.
->>>>>>> master