From: yomguy Date: Tue, 18 Dec 2012 09:57:38 +0000 (+0100) Subject: Merge branch 'master' into lam X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=eb09396081981a3593ceadded9f11b89d78197f5;p=telemeta.git Merge branch 'master' into lam Conflicts: telemeta/locale/de/LC_MESSAGES/django.mo telemeta/locale/de/LC_MESSAGES/django.po telemeta/locale/de/LC_MESSAGES/djangojs.mo telemeta/locale/de/LC_MESSAGES/djangojs.po telemeta/locale/fr/LC_MESSAGES/django.mo telemeta/locale/fr/LC_MESSAGES/django.po telemeta/locale/fr/LC_MESSAGES/djangojs.mo telemeta/locale/fr/LC_MESSAGES/djangojs.po --- eb09396081981a3593ceadded9f11b89d78197f5 diff --cc telemeta/locale/de/LC_MESSAGES/django.mo index b2588cf7,d39f041f..3e1dd4ec Binary files differ diff --cc telemeta/locale/de/LC_MESSAGES/django.po index d14a0967,66c2704d..c0024d18 --- a/telemeta/locale/de/LC_MESSAGES/django.po +++ b/telemeta/locale/de/LC_MESSAGES/django.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-28 17:11+0200\n" -"POT-Creation-Date: 2012-11-19 17:53+0100\n" ++"POT-Creation-Date: 2012-12-18 10:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@@ -26,7 -26,7 +26,7 @@@ msgstr " msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "" - #: models/enum.py:41 models/enum.py:139 models/media.py:502 -#: models/enum.py:41 models/enum.py:139 models/media.py:510 ++#: models/enum.py:41 models/enum.py:139 models/media.py:513 #: models/system.py:103 msgid "value" msgstr "" @@@ -71,7 -71,7 +71,7 @@@ msgstr " msgid "generic style" msgstr "" - #: models/enum.py:127 models/media.py:473 -#: models/enum.py:127 models/media.py:481 ++#: models/enum.py:127 models/media.py:484 msgid "keyword" msgstr "" @@@ -89,7 -89,7 +89,7 @@@ msgstr " #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 #: models/language.py:54 models/location.py:51 models/location.py:158 - #: models/media.py:501 -#: models/media.py:509 ++#: models/media.py:512 msgid "name" msgstr "" @@@ -129,9 -129,9 +129,9 @@@ msgstr " msgid "topic" msgstr "" - #: models/format.py:58 models/media.py:403 models/media.py:462 - #: models/media.py:472 models/media.py:483 models/media.py:499 - #: models/media.py:520 models/media.py:566 models/media.py:587 -#: models/format.py:58 models/media.py:411 models/media.py:470 -#: models/media.py:480 models/media.py:491 models/media.py:507 -#: models/media.py:528 models/media.py:574 models/media.py:595 ++#: models/format.py:58 models/media.py:414 models/media.py:473 ++#: models/media.py:483 models/media.py:494 models/media.py:510 ++#: models/media.py:531 models/media.py:577 models/media.py:598 msgid "item" msgstr "" @@@ -301,14 -317,14 +317,14 @@@ msgstr " msgid "public access" msgstr "" - #: models/media.py:95 models/media.py:125 models/media.py:174 - #: models/media.py:316 models/media.py:521 models/media.py:537 - #: models/media.py:569 + #: models/media.py:96 models/media.py:126 models/media.py:175 -#: models/media.py:317 models/media.py:529 models/media.py:545 -#: models/media.py:577 ++#: models/media.py:317 models/media.py:532 models/media.py:548 ++#: models/media.py:580 msgid "title" msgstr "" - #: models/media.py:96 models/media.py:127 models/media.py:538 - #: models/media.py:571 -#: models/media.py:97 models/media.py:128 models/media.py:546 -#: models/media.py:579 ++#: models/media.py:97 models/media.py:128 models/media.py:549 ++#: models/media.py:582 msgid "description" msgstr "" @@@ -320,12 -336,12 +336,12 @@@ msgstr " msgid "reference" msgstr "" - #: models/media.py:126 models/media.py:570 models/media.py:589 -#: models/media.py:127 models/media.py:578 models/media.py:597 ++#: models/media.py:127 models/media.py:581 models/media.py:600 #: models/system.py:115 msgid "date" msgstr "" - #: models/media.py:128 models/media.py:588 -#: models/media.py:129 models/media.py:596 ++#: models/media.py:129 models/media.py:599 msgid "mime_type" msgstr "" @@@ -349,11 -365,11 +365,11 @@@ msgstr " msgid "depositor / contributor" msgstr "" - #: models/media.py:179 models/media.py:671 -#: models/media.py:180 models/media.py:679 ++#: models/media.py:180 models/media.py:682 msgid "recording year (from)" msgstr "" - #: models/media.py:180 models/media.py:672 -#: models/media.py:181 models/media.py:680 ++#: models/media.py:181 models/media.py:683 msgid "recording year (until)" msgstr "" @@@ -449,7 -465,7 +465,7 @@@ msgstr " msgid "populations / social groups" msgstr "" - #: models/media.py:288 models/media.py:429 -#: models/media.py:289 models/media.py:437 ++#: models/media.py:289 models/media.py:440 msgid "computed duration" msgstr "" @@@ -557,104 -573,104 +573,104 @@@ msgstr " msgid "copy of" msgstr "" - #: models/media.py:384 templates/telemeta/mediaitem_edit.html:47 - msgid "keywords" - msgstr "" + #: models/media.py:372 + msgid "mime type" -msgstr "" ++msgstr "type mime" - #: models/media.py:397 - msgid "none" - msgstr "" + #: models/media.py:386 templates/telemeta/mediaitem_edit.html:47 + msgid "keywords" -msgstr "" ++msgstr "mots clés" - #: models/media.py:456 -#: models/media.py:464 ++#: models/media.py:467 msgid "instruments" msgstr "" - #: models/media.py:466 models/media.py:467 -#: models/media.py:474 models/media.py:475 ++#: models/media.py:477 models/media.py:478 msgid "item related media" msgstr "" - #: models/media.py:485 -#: models/media.py:493 ++#: models/media.py:496 msgid "composition" msgstr "" - #: models/media.py:487 -#: models/media.py:495 ++#: models/media.py:498 msgid "vernacular name" msgstr "" - #: models/media.py:488 -#: models/media.py:496 ++#: models/media.py:499 msgid "number" msgstr "" - #: models/media.py:489 -#: models/media.py:497 ++#: models/media.py:500 msgid "interprets" msgstr "" - #: models/media.py:500 -#: models/media.py:508 ++#: models/media.py:511 msgid "id" msgstr "" - #: models/media.py:503 -#: models/media.py:511 ++#: models/media.py:514 msgid "unit" msgstr "" - #: models/media.py:522 -#: models/media.py:530 ++#: models/media.py:533 msgid "start" msgstr "" - #: models/media.py:523 -#: models/media.py:531 ++#: models/media.py:534 msgid "end" msgstr "" - #: models/media.py:527 -#: models/media.py:535 ++#: models/media.py:538 msgid "item part" msgstr "" - #: models/media.py:535 models/media.py:552 models/media.py:567 -#: models/media.py:543 models/media.py:560 models/media.py:575 ++#: models/media.py:546 models/media.py:563 models/media.py:578 msgid "public_id" msgstr "" - #: models/media.py:553 -#: models/media.py:561 ++#: models/media.py:564 msgid "playlist" msgstr "" - #: models/media.py:554 -#: models/media.py:562 ++#: models/media.py:565 msgid "resource_type" msgstr "" - #: models/media.py:555 -#: models/media.py:563 ++#: models/media.py:566 msgid "resource_id" msgstr "" - #: models/media.py:568 models/system.py:55 -#: models/media.py:576 models/system.py:55 ++#: models/media.py:579 models/system.py:55 msgid "time" msgstr "" - #: models/media.py:572 -#: models/media.py:580 ++#: models/media.py:583 msgid "author" msgstr "" - #: models/media.py:590 -#: models/media.py:598 ++#: models/media.py:601 msgid "transcoded" msgstr "" - #: models/media.py:670 -#: models/media.py:678 ++#: models/media.py:681 msgid "collections" msgstr "" - #: models/media.py:682 models/media.py:683 models/media.py:693 - #: models/media.py:710 -#: models/media.py:690 models/media.py:691 models/media.py:701 -#: models/media.py:718 ++#: models/media.py:693 models/media.py:694 models/media.py:704 ++#: models/media.py:721 msgid "corpus" msgstr "" - #: models/media.py:703 models/media.py:704 models/media.py:721 -#: models/media.py:711 models/media.py:712 models/media.py:729 ++#: models/media.py:714 models/media.py:715 models/media.py:732 msgid "fonds" msgstr "" - #: models/media.py:714 models/media.py:715 -#: models/media.py:722 models/media.py:723 ++#: models/media.py:725 models/media.py:726 msgid "corpus related media" msgstr "" - #: models/media.py:725 models/media.py:726 -#: models/media.py:733 models/media.py:734 ++#: models/media.py:736 models/media.py:737 msgid "fonds related media" msgstr "" diff --cc telemeta/locale/de/LC_MESSAGES/djangojs.mo index 855a16b7,d39f041f..c67975d9 Binary files differ diff --cc telemeta/locale/de/LC_MESSAGES/djangojs.po index 9cfde70c,00bdcc29..e4df19f3 --- a/telemeta/locale/de/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/de/LC_MESSAGES/djangojs.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-28 17:12+0200\n" -"POT-Creation-Date: 2012-11-19 17:53+0100\n" ++"POT-Creation-Date: 2012-12-18 10:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" diff --cc telemeta/locale/fr/LC_MESSAGES/django.mo index 2f9dec37,086a066d..1485853a Binary files differ diff --cc telemeta/locale/fr/LC_MESSAGES/django.po index f5b2e395,0c9ab0f1..faa90f46 --- a/telemeta/locale/fr/LC_MESSAGES/django.po +++ b/telemeta/locale/fr/LC_MESSAGES/django.po @@@ -8,10 -10,10 +10,10 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-28 17:11+0200\n" -"POT-Creation-Date: 2012-11-19 17:53+0100\n" ++"POT-Creation-Date: 2012-12-18 10:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" - "Last-Translator: Olivier Guilyardi \n" - "Language-Team: LANGUAGE \n" + "Last-Translator: Guillaume Pellerin \n" + "Language-Team: LANGUAGE \n" "Language: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@@ -25,7 -27,7 +27,7 @@@ msgstr "Durée msgid "Enter a valid duration in HH:MM[:ss] format." msgstr "Entrez une durée valide au format HH:MM[:ss]" - #: models/enum.py:41 models/enum.py:139 models/media.py:502 -#: models/enum.py:41 models/enum.py:139 models/media.py:510 ++#: models/enum.py:41 models/enum.py:139 models/media.py:513 #: models/system.py:103 msgid "value" msgstr "valeur" @@@ -70,7 -72,7 +72,7 @@@ msgstr "style vernaculaire msgid "generic style" msgstr "style générique" - #: models/enum.py:127 models/media.py:473 -#: models/enum.py:127 models/media.py:481 ++#: models/enum.py:127 models/media.py:484 msgid "keyword" msgstr "Mot-clé" @@@ -88,7 -90,7 +90,7 @@@ msgstr "population / groupe social #: models/enum.py:158 models/instrument.py:43 models/instrument.py:53 #: models/language.py:54 models/location.py:51 models/location.py:158 - #: models/media.py:501 -#: models/media.py:509 ++#: models/media.py:512 msgid "name" msgstr "nom" @@@ -128,9 -130,9 +130,9 @@@ msgstr "droits msgid "topic" msgstr "discipline" - #: models/format.py:58 models/media.py:403 models/media.py:462 - #: models/media.py:472 models/media.py:483 models/media.py:499 - #: models/media.py:520 models/media.py:566 models/media.py:587 -#: models/format.py:58 models/media.py:411 models/media.py:470 -#: models/media.py:480 models/media.py:491 models/media.py:507 -#: models/media.py:528 models/media.py:574 models/media.py:595 ++#: models/format.py:58 models/media.py:414 models/media.py:473 ++#: models/media.py:483 models/media.py:494 models/media.py:510 ++#: models/media.py:531 models/media.py:577 models/media.py:598 msgid "item" msgstr "item" @@@ -300,14 -318,14 +318,14 @@@ msgstr "Données privées msgid "public access" msgstr "accès public" - #: models/media.py:95 models/media.py:125 models/media.py:174 - #: models/media.py:316 models/media.py:521 models/media.py:537 - #: models/media.py:569 + #: models/media.py:96 models/media.py:126 models/media.py:175 -#: models/media.py:317 models/media.py:529 models/media.py:545 -#: models/media.py:577 ++#: models/media.py:317 models/media.py:532 models/media.py:548 ++#: models/media.py:580 msgid "title" msgstr "titre" - #: models/media.py:96 models/media.py:127 models/media.py:538 - #: models/media.py:571 -#: models/media.py:97 models/media.py:128 models/media.py:546 -#: models/media.py:579 ++#: models/media.py:97 models/media.py:128 models/media.py:549 ++#: models/media.py:582 msgid "description" msgstr "description" @@@ -319,12 -337,12 +337,12 @@@ msgstr "cote msgid "reference" msgstr "référence" - #: models/media.py:126 models/media.py:570 models/media.py:589 -#: models/media.py:127 models/media.py:578 models/media.py:597 ++#: models/media.py:127 models/media.py:581 models/media.py:600 #: models/system.py:115 msgid "date" msgstr "" - #: models/media.py:128 models/media.py:588 -#: models/media.py:129 models/media.py:596 ++#: models/media.py:129 models/media.py:599 msgid "mime_type" msgstr "type mime" @@@ -348,11 -366,11 +366,11 @@@ msgstr "titre original / traduction msgid "depositor / contributor" msgstr "déposant / contributeur" - #: models/media.py:179 models/media.py:671 -#: models/media.py:180 models/media.py:679 ++#: models/media.py:180 models/media.py:682 msgid "recording year (from)" msgstr "année d'enregistrement (depuis)" - #: models/media.py:180 models/media.py:672 -#: models/media.py:181 models/media.py:680 ++#: models/media.py:181 models/media.py:683 msgid "recording year (until)" msgstr "année d'enregistrement (jusqu'à)" @@@ -448,7 -466,7 +466,7 @@@ msgstr "états / nations msgid "populations / social groups" msgstr "populations / groupes sociaux" - #: models/media.py:288 models/media.py:429 -#: models/media.py:289 models/media.py:437 ++#: models/media.py:289 models/media.py:440 msgid "computed duration" msgstr "durée calculée" @@@ -468,11 -486,11 +486,11 @@@ msgstr "date d'enregistrement (depuis) msgid "recording date (until)" msgstr "date d'enregistrement (jusqu'à)" - #: models/media.py:323 + #: models/media.py:324 msgid "scientist" -msgstr "reponsable scientifique" +msgstr "responsable scientifique" - #: models/media.py:325 + #: models/media.py:326 msgid "summary" msgstr "résumé" @@@ -556,104 -574,105 +574,104 @@@ msgstr "références éditées msgid "copy of" msgstr "copie de" - #: models/media.py:384 templates/telemeta/mediaitem_edit.html:47 + #: models/media.py:372 -#, fuzzy + msgid "mime type" + msgstr "type mime" + + #: models/media.py:386 templates/telemeta/mediaitem_edit.html:47 msgid "keywords" msgstr "mots-clés" - #: models/media.py:397 - msgid "none" - msgstr "" - - #: models/media.py:456 -#: models/media.py:464 ++#: models/media.py:467 msgid "instruments" msgstr "instruments" - #: models/media.py:466 models/media.py:467 -#: models/media.py:474 models/media.py:475 ++#: models/media.py:477 models/media.py:478 msgid "item related media" msgstr "média associés à l'item" - #: models/media.py:485 -#: models/media.py:493 ++#: models/media.py:496 msgid "composition" msgstr "Voix / Instruments" - #: models/media.py:487 -#: models/media.py:495 ++#: models/media.py:498 msgid "vernacular name" msgstr "nom vernaculaire" - #: models/media.py:488 -#: models/media.py:496 ++#: models/media.py:499 msgid "number" msgstr "nombre" - #: models/media.py:489 -#: models/media.py:497 ++#: models/media.py:500 msgid "interprets" msgstr "interprètes" - #: models/media.py:500 -#: models/media.py:508 ++#: models/media.py:511 msgid "id" msgstr "" - #: models/media.py:503 -#: models/media.py:511 ++#: models/media.py:514 msgid "unit" msgstr "unité" - #: models/media.py:522 -#: models/media.py:530 ++#: models/media.py:533 msgid "start" msgstr "début" - #: models/media.py:523 -#: models/media.py:531 ++#: models/media.py:534 msgid "end" msgstr "fin" - #: models/media.py:527 -#: models/media.py:535 ++#: models/media.py:538 msgid "item part" msgstr "partie" - #: models/media.py:535 models/media.py:552 models/media.py:567 -#: models/media.py:543 models/media.py:560 models/media.py:575 ++#: models/media.py:546 models/media.py:563 models/media.py:578 msgid "public_id" msgstr "public_id" - #: models/media.py:553 -#: models/media.py:561 ++#: models/media.py:564 msgid "playlist" msgstr "liste de lecture" - #: models/media.py:554 -#: models/media.py:562 ++#: models/media.py:565 msgid "resource_type" msgstr "type de ressource" - #: models/media.py:555 -#: models/media.py:563 ++#: models/media.py:566 msgid "resource_id" msgstr "ressource" - #: models/media.py:568 models/system.py:55 -#: models/media.py:576 models/system.py:55 ++#: models/media.py:579 models/system.py:55 msgid "time" msgstr "heure" - #: models/media.py:572 -#: models/media.py:580 ++#: models/media.py:583 msgid "author" msgstr "auteur" - #: models/media.py:590 -#: models/media.py:598 ++#: models/media.py:601 msgid "transcoded" msgstr "" - #: models/media.py:670 -#: models/media.py:678 ++#: models/media.py:681 msgid "collections" msgstr "collections" - #: models/media.py:682 models/media.py:683 models/media.py:693 - #: models/media.py:710 -#: models/media.py:690 models/media.py:691 models/media.py:701 -#: models/media.py:718 ++#: models/media.py:693 models/media.py:694 models/media.py:704 ++#: models/media.py:721 msgid "corpus" msgstr "corpus" - #: models/media.py:703 models/media.py:704 models/media.py:721 -#: models/media.py:711 models/media.py:712 models/media.py:729 ++#: models/media.py:714 models/media.py:715 models/media.py:732 msgid "fonds" msgstr "fonds" - #: models/media.py:714 models/media.py:715 -#: models/media.py:722 models/media.py:723 ++#: models/media.py:725 models/media.py:726 msgid "corpus related media" msgstr "média associés" - #: models/media.py:725 models/media.py:726 -#: models/media.py:733 models/media.py:734 ++#: models/media.py:736 models/media.py:737 msgid "fonds related media" msgstr "média associés" @@@ -812,14 -834,14 +833,12 @@@ msgid "Delete msgstr "Supprimer" #: templates/postman/base_folder.html:50 templates/postman/view.html:26 --#, fuzzy msgid "Archive" --msgstr "Archives" ++msgstr "Archive" #: templates/postman/base_folder.html:51 --#, fuzzy msgid "Undelete" --msgstr "supprimé" ++msgstr "Récupérer" #: templates/postman/base_folder.html:57 msgid "No messages." @@@ -1487,23 -1524,26 +1521,23 @@@ msgstr "Date d'enregistrement msgid "Location" msgstr "Lieu" - #: templates/telemeta/mediaitem_detail.html:218 + #: templates/telemeta/mediaitem_detail.html:217 -#, fuzzy msgid "Interprets" - msgstr "Interprètes" + msgstr "interprètes" - #: templates/telemeta/mediaitem_detail.html:226 + #: templates/telemeta/mediaitem_detail.html:225 msgid "Remarks" msgstr "Remarques" - #: templates/telemeta/mediaitem_detail.html:248 + #: templates/telemeta/mediaitem_detail.html:247 -#, fuzzy msgid "Organization" - msgstr "Organisation" + msgstr "organisation" - #: templates/telemeta/mediaitem_detail.html:252 + #: templates/telemeta/mediaitem_detail.html:251 -#, fuzzy msgid "Rights" - msgstr "Droits" + msgstr "droits" - #: templates/telemeta/mediaitem_detail.html:278 + #: templates/telemeta/mediaitem_detail.html:277 msgid "Published references" msgstr "Références éditées" @@@ -1522,15 -1562,8 +1556,8 @@@ msgstr "Formation #: templates/telemeta/mediaitem_edit.html:51 msgid "performance" -msgstr "composition" +msgstr "formation" - #: templates/telemeta/mediaitem_edit.html:54 - #: templates/telemeta/inc/collection_related.html:6 - #: templates/telemeta/inc/mediaitem_related.html:6 - #: templates/telemeta/inc/resource_related.html:6 - msgid "Related media" - msgstr "Média associés" - #: templates/telemeta/mediaitem_keywords_edit.html:24 msgid "Keyword" msgstr "Mot-clé" diff --cc telemeta/locale/fr/LC_MESSAGES/djangojs.mo index f48ffa7e,771e4a0f..f29cf98f Binary files differ diff --cc telemeta/locale/fr/LC_MESSAGES/djangojs.po index b4c98ec6,2f207a17..cee764ee --- a/telemeta/locale/fr/LC_MESSAGES/djangojs.po +++ b/telemeta/locale/fr/LC_MESSAGES/djangojs.po @@@ -8,7 -8,7 +8,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2012-09-28 17:12+0200\n" -"POT-Creation-Date: 2012-11-19 17:53+0100\n" ++"POT-Creation-Date: 2012-12-18 10:57+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n"