From: Guillaume Pellerin Date: Mon, 22 Jul 2013 07:41:58 +0000 (+0200) Subject: locale X-Git-Tag: 1.3-TC~28^2~1 X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=efb667c9e214ed4af48d096c59704b830dc729cf;p=teleforma.git locale Merge branch 'crfpa' into tc202 Conflicts: teleforma/locale/fr/LC_MESSAGES/django.mo --- efb667c9e214ed4af48d096c59704b830dc729cf diff --cc INSTALL.rst index eed767d6,abb999b6..3d2db677 --- a/INSTALL.rst +++ b/INSTALL.rst @@@ -31,11 -31,11 +31,11 @@@ Install the system dependencie sudo aptitude install python python-dev python-pip python-xml python-mysqldb mysql-server \ python-ctypes python-setuptools python-support python-docutils \ - python-libxml2 python-lxml python-numpy \ + python-libxml2 python-lxml python-numpy python-yaml \ python-scipy python-imaging python-mutagen python-gobject python-gst0.10 \ - gobject-introspection python-psutil nginx \ + gobject-introspection python-psutil nginx apache2 libapache2-mod-wsgi \ gstreamer0.10-plugins-base gstreamer0.10-plugins-good \ - gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly + gstreamer0.10-plugins-bad gstreamer0.10-plugins-ugly webp sudo apt-get remove --purge pulseaudio diff --cc teleforma/locale/fr/LC_MESSAGES/django.mo index 6387b302,6b2cb7b0..d0fb41bc Binary files differ diff --cc teleforma/locale/fr/LC_MESSAGES/django.po index 5cc61b70,d592187f..123cd755 --- a/teleforma/locale/fr/LC_MESSAGES/django.po +++ b/teleforma/locale/fr/LC_MESSAGES/django.po @@@ -6,7 -6,7 +6,7 @@@ msgid " msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" - "POT-Creation-Date: 2013-07-19 15:59+0200\n" -"POT-Creation-Date: 2013-07-19 16:00+0200\n" ++"POT-Creation-Date: 2013-07-22 09:41+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: Guillaume Pellerin \n" "Language-Team: LANGUAGE \n" @@@ -21,8 -21,8 +21,8 @@@ msgid "user" msgstr "utilisateur" - #: models/ae.py:47 models/core.py:134 models/core.py:248 models/core.py:491 - #: models/core.py:534 models/core.py:576 models/crfpa.py:64 -#: models/ae.py:47 models/core.py:131 models/core.py:241 models/core.py:484 -#: models/core.py:527 models/core.py:569 models/crfpa.py:64 ++#: models/ae.py:47 models/core.py:134 models/core.py:248 models/core.py:494 ++#: models/core.py:537 models/core.py:579 models/crfpa.py:64 msgid "period" msgstr "période" @@@ -54,14 -50,14 +54,14 @@@ msgstr "Brouillon msgid "Public" msgstr "Publié" -#: models/core.py:91 models/core.py:103 models/core.py:123 models/core.py:135 -#: models/core.py:225 models/core.py:462 models/crfpa.py:47 models/crfpa.py:63 +#: models/core.py:91 models/core.py:103 models/core.py:123 models/core.py:138 - #: models/core.py:232 models/core.py:469 models/crfpa.py:47 models/crfpa.py:63 ++#: models/core.py:232 models/core.py:472 models/crfpa.py:47 models/crfpa.py:63 msgid "name" msgstr "nom" -#: models/core.py:92 models/core.py:104 models/core.py:124 models/core.py:136 -#: models/core.py:150 models/core.py:226 models/core.py:380 models/core.py:443 -#: models/core.py:463 models/crfpa.py:48 models/pro.py:124 +#: models/core.py:92 models/core.py:104 models/core.py:124 models/core.py:139 - #: models/core.py:154 models/core.py:233 models/core.py:387 models/core.py:450 - #: models/core.py:470 models/crfpa.py:48 models/pro.py:124 ++#: models/core.py:154 models/core.py:233 models/core.py:387 models/core.py:453 ++#: models/core.py:473 models/crfpa.py:48 models/pro.py:124 msgid "description" msgstr "description" @@@ -77,15 -73,15 +77,15 @@@ msgstr " msgid "department" msgstr "département" - #: models/core.py:146 models/core.py:251 models/core.py:488 models/core.py:574 -#: models/core.py:143 models/core.py:244 models/core.py:481 models/core.py:567 ++#: models/core.py:146 models/core.py:251 models/core.py:491 models/core.py:577 msgid "course type" msgstr "type de matière" - #: models/core.py:153 models/core.py:449 models/pro.py:46 models/pro.py:83 -#: models/core.py:149 models/core.py:442 models/pro.py:46 models/pro.py:83 ++#: models/core.py:153 models/core.py:452 models/pro.py:46 models/pro.py:83 msgid "title" msgstr "titre" - #: models/core.py:155 models/core.py:454 models/crfpa.py:62 -#: models/core.py:151 models/core.py:447 models/crfpa.py:62 ++#: models/core.py:155 models/core.py:457 models/crfpa.py:62 msgid "code" msgstr "cote" @@@ -93,11 -89,11 +93,11 @@@ msgid "tweeter title" msgstr "" - #: models/core.py:157 models/core.py:453 models/pro.py:68 -#: models/core.py:153 models/core.py:446 models/pro.py:68 ++#: models/core.py:157 models/core.py:456 models/pro.py:68 msgid "date modified" msgstr "date de modification" - #: models/core.py:158 models/core.py:471 -#: models/core.py:154 models/core.py:464 ++#: models/core.py:158 models/core.py:474 msgid "number" msgstr "" @@@ -113,12 -109,7 +113,12 @@@ msgstr "obligations msgid "magistral" msgstr "magistral" -#: models/core.py:192 models/core.py:243 models/core.py:479 models/core.py:565 +#: models/core.py:163 +#, fuzzy +msgid "types" +msgstr "type" + - #: models/core.py:199 models/core.py:250 models/core.py:486 models/core.py:572 ++#: models/core.py:199 models/core.py:250 models/core.py:489 models/core.py:575 #: models/pro.py:45 msgid "course" msgstr "matière" @@@ -151,11 -142,11 +151,11 @@@ msgstr "date de début msgid "end date" msgstr "date de fin" - #: models/core.py:261 models/core.py:500 models/core.py:537 models/core.py:581 -#: models/core.py:254 models/core.py:493 models/core.py:530 models/core.py:574 ++#: models/core.py:261 models/core.py:503 models/core.py:540 models/core.py:584 msgid "readers" msgstr "" - #: models/core.py:376 models/core.py:404 models/core.py:489 models/core.py:570 -#: models/core.py:369 models/core.py:397 models/core.py:482 models/core.py:563 ++#: models/core.py:376 models/core.py:404 models/core.py:492 models/core.py:573 msgid "conference" msgstr "conférence" @@@ -167,7 -158,7 +167,7 @@@ msgstr " msgid "port" msgstr "" - #: models/core.py:386 models/core.py:493 models/core.py:580 -#: models/core.py:379 models/core.py:486 models/core.py:573 ++#: models/core.py:386 models/core.py:496 models/core.py:583 msgid "type" msgstr "type" @@@ -191,47 -182,47 +191,47 @@@ msgstr "Type de flux msgid "streaming" msgstr "diffusion" - #: models/core.py:443 -#: models/core.py:436 ++#: models/core.py:446 msgid "live stream" msgstr "stream en direct" - #: models/core.py:451 -#: models/core.py:444 ++#: models/core.py:454 msgid "credits" msgstr "crédits" - #: models/core.py:452 models/pro.py:67 -#: models/core.py:445 models/pro.py:67 ++#: models/core.py:455 models/pro.py:67 msgid "date added" msgstr "date d'ajout" - #: models/core.py:455 -#: models/core.py:448 ++#: models/core.py:458 msgid "published" msgstr "publié" - #: models/core.py:456 -#: models/core.py:449 ++#: models/core.py:459 msgid "mime type" msgstr "Type mime" - #: models/core.py:457 models/pro.py:86 -#: models/core.py:450 models/pro.py:86 ++#: models/core.py:460 models/pro.py:86 msgid "weight" msgstr "" - #: models/core.py:478 -#: models/core.py:471 ++#: models/core.py:481 msgid "document type" msgstr "type de document" - #: models/core.py:495 models/crfpa.py:111 -#: models/core.py:488 models/crfpa.py:111 ++#: models/core.py:498 models/crfpa.py:111 msgid "iej" msgstr "iej" - #: models/core.py:497 -#: models/core.py:490 ++#: models/core.py:500 msgid "annal" msgstr "annale" - #: models/core.py:498 -#: models/core.py:491 ++#: models/core.py:501 msgid "year" msgstr "année" - #: models/core.py:499 models/core.py:536 -#: models/core.py:492 models/core.py:529 ++#: models/core.py:502 models/core.py:539 msgid "file" msgstr "fichier" @@@ -1193,7 -1184,7 +1193,7 @@@ msgstr " "Vous n'avez pas accès à cette ressource et avez été redirigé vers votre " "bureau." - #: views/core.py:480 -#: views/core.py:484 ++#: views/core.py:481 msgid "A new live conference has started : " msgstr "Une nouvelle conférence en direct a commencé : "