From: Guillaume Pellerin Date: Mon, 24 Oct 2016 20:39:14 +0000 (+0200) Subject: Update locales X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=e3afd78cda831b662829ecba0923a8041ddae165;p=mezzo.git Update locales --- diff --git a/app/locale/fr/LC_MESSAGES/django.mo b/app/locale/fr/LC_MESSAGES/django.mo index 5eba9f48..4700d37f 100644 Binary files a/app/locale/fr/LC_MESSAGES/django.mo and b/app/locale/fr/LC_MESSAGES/django.mo differ diff --git a/app/locale/fr/LC_MESSAGES/django.po b/app/locale/fr/LC_MESSAGES/django.po index de304b5e..1d8a784d 100644 --- a/app/locale/fr/LC_MESSAGES/django.po +++ b/app/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2016-10-07 15:56+0200\n" +"POT-Creation-Date: 2016-10-24 22:38+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,256 +18,256 @@ msgstr "" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n > 1);\n" -#: local_settings.py:73 +#: local_settings.py:84 #, fuzzy #| msgid "pages" msgid "Pages" msgstr "Pages" -#: local_settings.py:75 templates/index.html:49 +#: local_settings.py:86 templates/index.html:49 +#: templates/media/playlist_detail.html:4 +#: templates/media/playlist_detail.html:21 +#: templates/media/playlist_list.html:6 templates/media/playlist_list.html:11 +#: templates/media/playlist_list.html:15 msgid "Media" msgstr "" -#: local_settings.py:79 +#: local_settings.py:89 msgid "Media Library" msgstr "" -#: local_settings.py:81 templates/agenda/event_list.html:8 +#: local_settings.py:91 templates/agenda/event_list.html:8 +#: templates/agenda/event_list.html:80 msgid "Events" msgstr "Événements" -#: local_settings.py:89 settings.py:49 templates/includes/sidebar.html:10 -#: templates/includes/sidebar.html:13 templates/index.html:29 -#: templates/magazine/topic/topic_detail.html:5 +#: local_settings.py:99 settings.py:49 templates/includes/sidebar.html:10 +#: templates/index.html:29 templates/magazine/topic/topic_detail.html:5 #: templates/magazine/topic/topic_detail.html:30 msgid "Magazine" msgstr "Magazine" -#: local_settings.py:91 templates/network/organization_list.html:4 -#: templates/network/organization_list.html:15 +#: local_settings.py:101 templates/network/organization_list.html:4 +#: templates/network/organization_list.html:18 #, fuzzy #| msgid "work" msgid "Network" msgstr "travail" -#: local_settings.py:99 +#: local_settings.py:109 #, fuzzy #| msgid "activity" msgid "Activity" msgstr "activité" -#: local_settings.py:109 +#: local_settings.py:119 msgid "Projects" msgstr "Projets" -#: local_settings.py:115 +#: local_settings.py:125 msgid "Shop" msgstr "" -#: local_settings.py:121 templates/job/job_offer_list.html:4 +#: local_settings.py:131 templates/job/job_offer_list.html:4 #: templates/job/job_offer_list.html:15 msgid "Jobs" msgstr "" -#: local_settings.py:122 +#: local_settings.py:132 msgid "Festival" msgstr "" -#: local_settings.py:123 +#: local_settings.py:133 msgid "Users" msgstr "" -#: local_settings.py:124 templates/admin/login.html:59 +#: local_settings.py:134 templates/admin/login.html:59 msgid "Site" msgstr "" -#: organization/agenda/models.py:14 organization/agenda/models.py:23 -#: organization/agenda/models.py:33 organization/agenda/models.py:43 -#: organization/agenda/models.py:53 organization/agenda/models.py:62 -#: organization/agenda/models.py:72 organization/agenda/models.py:82 -#: organization/agenda/models.py:105 +#: organization/agenda/models.py:15 organization/agenda/models.py:24 +#: organization/agenda/models.py:34 organization/agenda/models.py:44 +#: organization/agenda/models.py:54 organization/agenda/models.py:63 +#: organization/agenda/models.py:73 organization/agenda/models.py:96 msgid "event" msgstr "événement" -#: organization/agenda/models.py:17 organization/pages/models.py:21 +#: organization/agenda/models.py:18 organization/pages/models.py:24 msgid "block" msgstr "" -#: organization/agenda/models.py:18 organization/pages/models.py:22 +#: organization/agenda/models.py:19 organization/pages/models.py:25 msgid "blocks" msgstr "" -#: organization/agenda/models.py:26 organization/magazine/models.py:38 -#: organization/pages/models.py:31 +#: organization/agenda/models.py:27 organization/magazine/models.py:43 +#: organization/pages/models.py:34 msgid "image" msgstr "" -#: organization/agenda/models.py:27 organization/magazine/models.py:39 -#: organization/pages/models.py:32 +#: organization/agenda/models.py:28 organization/magazine/models.py:44 +#: organization/pages/models.py:35 #, fuzzy #| msgid "pages" msgid "images" msgstr "Pages" -#: organization/agenda/models.py:34 organization/agenda/models.py:37 -#: organization/magazine/models.py:22 organization/network/models.py:167 -#: organization/network/models.py:179 organization/network/models.py:190 +#: organization/agenda/models.py:35 organization/agenda/models.py:38 +#: organization/magazine/models.py:27 organization/network/models.py:149 +#: organization/network/models.py:161 organization/network/models.py:172 msgid "department" msgstr "département" -#: organization/agenda/models.py:38 +#: organization/agenda/models.py:39 #, fuzzy #| msgid "department" msgid "departments" msgstr "département" -#: organization/agenda/models.py:44 organization/agenda/models.py:47 -#: organization/network/models.py:244 organization/network/models.py:276 -#: organization/network/models.py:281 organization/network/models.py:286 -#: organization/network/models.py:291 organization/network/models.py:296 -#: organization/network/models.py:301 organization/network/models.py:405 +#: organization/agenda/models.py:45 organization/agenda/models.py:48 +#: organization/network/models.py:226 organization/network/models.py:258 +#: organization/network/models.py:263 organization/network/models.py:268 +#: organization/network/models.py:273 organization/network/models.py:278 +#: organization/network/models.py:382 msgid "person" msgstr "personne" -#: organization/agenda/models.py:48 +#: organization/agenda/models.py:49 msgid "persons" msgstr "personnes" -#: organization/agenda/models.py:56 organization/core/models.py:183 -#: organization/pages/models.py:61 organization/pages/models.py:76 +#: organization/agenda/models.py:57 organization/core/models.py:184 +#: organization/pages/models.py:54 organization/pages/models.py:69 #, fuzzy #| msgid "link type" msgid "link" msgstr "type de lien" -#: organization/agenda/models.py:57 organization/core/models.py:184 -#: organization/pages/models.py:62 +#: organization/agenda/models.py:58 organization/core/models.py:185 +#: organization/pages/models.py:55 #, fuzzy #| msgid "link type" msgid "links" msgstr "type de lien" -#: organization/agenda/models.py:65 organization/media/models.py:67 -#: organization/pages/models.py:41 -msgid "audio" -msgstr "" - -#: organization/agenda/models.py:66 organization/media/models.py:104 -#: organization/pages/models.py:42 -msgid "audios" -msgstr "" - -#: organization/agenda/models.py:75 organization/media/models.py:81 -#: organization/pages/models.py:51 -msgid "video" -msgstr "" +#: organization/agenda/models.py:66 organization/media/models.py:114 +#: organization/media/models.py:127 organization/media/models.py:138 +#: organization/media/models.py:141 organization/pages/models.py:44 +#, fuzzy +#| msgid "Playlist" +msgid "playlist" +msgstr "Playlist" -#: organization/agenda/models.py:76 organization/pages/models.py:52 -msgid "videos" -msgstr "vidéos" +#: organization/agenda/models.py:67 organization/media/models.py:115 +#: organization/media/models.py:142 organization/pages/models.py:45 +#, fuzzy +#| msgid "Playlist" +msgid "playlists" +msgstr "Playlist" -#: organization/agenda/models.py:85 +#: organization/agenda/models.py:76 msgid "period" msgstr "" -#: organization/agenda/models.py:86 +#: organization/agenda/models.py:77 msgid "periods" msgstr "" -#: organization/agenda/models.py:92 organization/agenda/models.py:107 +#: organization/agenda/models.py:83 organization/agenda/models.py:98 #, fuzzy #| msgid "link type" msgid "public type" msgstr "type de lien" -#: organization/agenda/models.py:93 +#: organization/agenda/models.py:84 #, fuzzy #| msgid "link type" msgid "public types" msgstr "type de lien" -#: organization/agenda/models.py:99 organization/network/models.py:381 -#: organization/network/models.py:438 +#: organization/agenda/models.py:90 organization/network/models.py:358 +#: organization/network/models.py:415 msgid "training level" msgstr "" -#: organization/agenda/models.py:100 +#: organization/agenda/models.py:91 msgid "training levels" msgstr "" -#: organization/agenda/models.py:106 templates/admin/login.html:42 -#: templates/agenda/includes/event_metainfo.html:49 -msgid "Language" +#: organization/agenda/models.py:97 +#, fuzzy +#| msgid "Language" +msgid "language" msgstr "Langue" -#: organization/agenda/models.py:108 +#: organization/agenda/models.py:99 msgid "level" msgstr "" -#: organization/agenda/models.py:111 +#: organization/agenda/models.py:102 msgid "training" msgstr "" -#: organization/agenda/models.py:112 +#: organization/agenda/models.py:103 msgid "trainings" msgstr "" -#: organization/core/models.py:13 +#: organization/core/models.py:15 organization/magazine/models.py:22 msgid "black" msgstr "" -#: organization/core/models.py:13 +#: organization/core/models.py:15 organization/magazine/models.py:21 msgid "yellow" msgstr "" -#: organization/core/models.py:13 +#: organization/core/models.py:15 msgid "red" msgstr "" -#: organization/core/models.py:14 organization/network/models.py:61 +#: organization/core/models.py:16 organization/network/models.py:60 msgid "left" msgstr "gauche" -#: organization/core/models.py:14 +#: organization/core/models.py:16 msgid "center" msgstr "centre" -#: organization/core/models.py:14 organization/network/models.py:61 +#: organization/core/models.py:16 organization/network/models.py:60 msgid "right" msgstr "droite" -#: organization/core/models.py:15 +#: organization/core/models.py:17 msgid "logo" msgstr "" -#: organization/core/models.py:15 +#: organization/core/models.py:17 msgid "slider" msgstr "" -#: organization/core/models.py:15 +#: organization/core/models.py:17 msgid "card" msgstr "" -#: organization/core/models.py:15 +#: organization/core/models.py:17 msgid "page - slider" msgstr "" -#: organization/core/models.py:15 +#: organization/core/models.py:17 #, fuzzy #| msgid "Featured" msgid "page - featured" msgstr "À la une" -#: organization/core/models.py:21 organization/core/models.py:31 -#: organization/core/models.py:49 +#: organization/core/models.py:23 msgid "description" msgstr "" -#: organization/core/models.py:30 organization/core/models.py:160 +#: organization/core/models.py:32 organization/core/models.py:160 msgid "name" msgstr "nom" -#: organization/core/models.py:48 organization/network/models.py:234 +#: organization/core/models.py:49 organization/core/models.py:179 +#: organization/network/models.py:216 msgid "title" msgstr "titre" @@ -285,7 +285,7 @@ msgstr "catégorie" msgid "background color" msgstr "" -#: organization/core/models.py:87 organization/pages/models.py:77 +#: organization/core/models.py:87 organization/pages/models.py:70 msgid "Image" msgstr "" @@ -295,7 +295,8 @@ msgstr "" msgid "credits" msgstr "crédits photo" -#: organization/core/models.py:89 organization/projects/models.py:21 +#: organization/core/models.py:89 organization/media/models.py:111 +#: organization/projects/models.py:21 #, fuzzy #| msgid "link type" msgid "type" @@ -313,18 +314,18 @@ msgstr "Commentaires" msgid "content type" msgstr "type d'organisation" -#: organization/core/models.py:132 organization/job/models.py:54 -#: organization/magazine/models.py:69 +#: organization/core/models.py:132 organization/job/models.py:55 +#: organization/magazine/models.py:70 #, fuzzy #| msgid "Related posts" msgid "related object" msgstr "Articles associés" -#: organization/core/models.py:145 +#: organization/core/models.py:145 organization/media/models.py:84 msgid "URL" msgstr "" -#: organization/core/models.py:161 +#: organization/core/models.py:161 organization/shop/models.py:59 msgid "slug" msgstr "" @@ -338,33 +339,59 @@ msgstr "" msgid "ordering" msgstr "" -#: organization/core/models.py:179 +#: organization/core/models.py:180 msgid "link type" msgstr "type de lien" -#: organization/core/models.py:192 organization/core/models.py:201 +#: organization/core/models.py:193 organization/core/models.py:202 msgid "begin date" msgstr "date de début" -#: organization/core/models.py:193 organization/core/models.py:202 +#: organization/core/models.py:194 organization/core/models.py:203 msgid "end date" msgstr "date de fin" -#: organization/core/views.py:47 +#: organization/core/models.py:236 +#, fuzzy +#| msgid "begin date" +msgid "creation date" +msgstr "date de début" + +#: organization/core/models.py:237 +msgid "last modification date" +msgstr "" + +#: organization/core/models.py:246 +msgid "address" +msgstr "adresse" + +#: organization/core/models.py:247 +msgid "postal code" +msgstr "code postal" + +#: organization/core/models.py:248 +msgid "city" +msgstr "" + +#: organization/core/models.py:249 +msgid "country" +msgstr "pays" + +#: organization/core/views.py:46 msgid "Everything" msgstr "Tout" -#: organization/festival/models.py:21 organization/job/models.py:10 -#: organization/network/models.py:236 +#: organization/festival/models.py:21 organization/job/models.py:11 +#: organization/network/models.py:218 msgid "first name" msgstr "" -#: organization/festival/models.py:22 organization/job/models.py:11 -#: organization/network/models.py:237 +#: organization/festival/models.py:22 organization/job/models.py:12 +#: organization/network/models.py:219 msgid "last name" msgstr "" -#: organization/festival/models.py:23 organization/network/models.py:240 +#: organization/festival/models.py:23 organization/network/models.py:222 msgid "biography" msgstr "biographie" @@ -372,65 +399,65 @@ msgstr "biographie" msgid "artist" msgstr "artiste" -#: organization/job/models.py:12 organization/network/models.py:238 +#: organization/job/models.py:13 organization/network/models.py:220 msgid "email" msgstr "" -#: organization/job/models.py:13 +#: organization/job/models.py:14 msgid "message" msgstr "" -#: organization/job/models.py:15 +#: organization/job/models.py:16 msgid "curriculum vitae" msgstr "" -#: organization/job/models.py:16 +#: organization/job/models.py:17 msgid "cover letter" msgstr "" -#: organization/job/models.py:17 organization/job/models.py:33 +#: organization/job/models.py:18 organization/job/models.py:34 msgid "job offer" msgstr "" -#: organization/job/models.py:20 +#: organization/job/models.py:21 msgid "job_reponse" msgstr "" -#: organization/job/models.py:21 +#: organization/job/models.py:22 msgid "job_reponses" msgstr "" -#: organization/job/models.py:26 +#: organization/job/models.py:27 msgid "Email to forward response" msgstr "" -#: organization/job/models.py:34 +#: organization/job/models.py:35 msgid "job offers" msgstr "" -#: organization/job/models.py:39 +#: organization/job/models.py:40 msgid "external text button" msgstr "" -#: organization/job/models.py:40 +#: organization/job/models.py:41 msgid "internal text button" msgstr "" -#: organization/job/models.py:41 organization/magazine/models.py:56 +#: organization/job/models.py:42 organization/magazine/models.py:57 msgid "external content" msgstr "" -#: organization/job/models.py:46 organization/magazine/models.py:61 +#: organization/job/models.py:47 organization/magazine/models.py:62 msgid "local content" msgstr "" -#: organization/job/models.py:65 organization/job/models.py:71 +#: organization/job/models.py:66 organization/job/models.py:72 msgid "candidacy" msgstr "" -#: organization/job/models.py:66 -msgid "Applications" -msgstr "Appel à candidature" +#: organization/job/models.py:67 +msgid "candidacies" +msgstr "" #: organization/job/views.py:53 msgid "Only .pdf, .odt, .doc, .docx files allowed." @@ -444,418 +471,431 @@ msgstr "" msgid "You have successfully submitted your application." msgstr "" -#: organization/magazine/models.py:23 +#: organization/magazine/models.py:20 +msgid "grey" +msgstr "" + +#: organization/magazine/models.py:28 #, fuzzy #| msgid "topic" msgid "topics" msgstr "rubrique" -#: organization/magazine/models.py:30 organization/magazine/models.py:35 -#: organization/magazine/models.py:45 organization/magazine/models.py:50 -#: organization/magazine/models.py:105 +#: organization/magazine/models.py:35 organization/magazine/models.py:40 +#: organization/magazine/models.py:50 organization/magazine/models.py:106 msgid "article" msgstr "article" -#: organization/magazine/models.py:55 +#: organization/magazine/models.py:55 organization/network/models.py:295 +#: organization/shop/models.py:20 +msgid "style" +msgstr "" + +#: organization/magazine/models.py:56 msgid "text button" msgstr "" -#: organization/magazine/models.py:80 +#: organization/magazine/models.py:81 msgid "brief" msgstr "brève" -#: organization/magazine/models.py:88 organization/projects/models.py:29 +#: organization/magazine/models.py:89 organization/projects/models.py:29 msgid "topic" msgstr "rubrique" -#: organization/magazine/models.py:93 +#: organization/magazine/models.py:94 msgid "Article" msgstr "Article" -#: organization/magazine/models.py:94 organization/network/models.py:307 -#: organization/network/models.py:329 +#: organization/magazine/models.py:95 organization/network/models.py:284 +#: organization/network/models.py:306 msgid "Person List Block" msgstr "" -#: organization/magazine/models.py:97 organization/network/models.py:310 -#: organization/network/models.py:321 organization/pages/models.py:110 +#: organization/magazine/models.py:98 organization/network/models.py:287 +#: organization/network/models.py:298 organization/pages/models.py:111 #, fuzzy #| msgid "Person" msgid "Person List" msgstr "Personne" -#: organization/media/models.py:22 -msgid "media id" +#: organization/media/models.py:20 templates/media/playlist_list.html:21 +msgid "audio" msgstr "" -#: organization/media/models.py:23 -msgid "open source URL" +#: organization/media/models.py:21 templates/media/playlist_list.html:26 +msgid "video" msgstr "" -#: organization/media/models.py:24 -msgid "closed source URL" +#: organization/media/models.py:27 +msgid "media id" msgstr "" -#: organization/media/models.py:25 +#: organization/media/models.py:28 msgid "poster" msgstr "" -#: organization/media/models.py:64 organization/media/models.py:78 +#: organization/media/models.py:29 msgid "category" msgstr "catégorie" -#: organization/media/models.py:91 +#: organization/media/models.py:82 organization/media/models.py:128 +#: organization/media/models.py:131 +msgid "media" +msgstr "" + +#: organization/media/models.py:83 +msgid "file" +msgstr "" + +#: organization/media/models.py:85 +#, fuzzy +#| msgid "link type" +msgid "mime type" +msgstr "type de lien" + +#: organization/media/models.py:101 #, fuzzy #| msgid "category" msgid "media category" msgstr "catégorie" -#: organization/media/models.py:92 +#: organization/media/models.py:102 #, fuzzy #| msgid "Categories" msgid "media categories" msgstr "Catégories" -#: organization/network/models.py:35 +#: organization/media/models.py:132 +msgid "medias" +msgstr "" + +#: organization/network/models.py:34 msgid "Mr" msgstr "Mr" -#: organization/network/models.py:36 +#: organization/network/models.py:35 msgid "Ms" msgstr "Mme" -#: organization/network/models.py:39 +#: organization/network/models.py:38 msgid "male" msgstr "homme" -#: organization/network/models.py:40 +#: organization/network/models.py:39 msgid "female" msgstr "femme" -#: organization/network/models.py:44 organization/shop/models.py:13 +#: organization/network/models.py:43 organization/shop/models.py:13 msgid "square" msgstr "" -#: organization/network/models.py:45 organization/shop/models.py:14 +#: organization/network/models.py:44 organization/shop/models.py:14 msgid "circle" msgstr "" -#: organization/network/models.py:49 +#: organization/network/models.py:48 msgid "Dr" msgstr "" -#: organization/network/models.py:50 +#: organization/network/models.py:49 msgid "Prof" msgstr "" -#: organization/network/models.py:51 +#: organization/network/models.py:50 msgid "Prof Dr" msgstr "" -#: organization/network/models.py:55 +#: organization/network/models.py:54 #, fuzzy #| msgid "articles" msgid "circles" msgstr "articles" -#: organization/network/models.py:56 +#: organization/network/models.py:55 msgid "squares" msgstr "" -#: organization/network/models.py:57 +#: organization/network/models.py:56 msgid "stripes" msgstr "" -#: organization/network/models.py:58 +#: organization/network/models.py:57 msgid "triangles" msgstr "" -#: organization/network/models.py:67 -msgid "address" -msgstr "adresse" - -#: organization/network/models.py:68 -msgid "postal code" -msgstr "code postal" - -#: organization/network/models.py:69 -msgid "city" -msgstr "" - -#: organization/network/models.py:70 -msgid "country" -msgstr "pays" - -#: organization/network/models.py:85 organization/network/models.py:157 +#: organization/network/models.py:69 organization/network/models.py:139 msgid "organization type" msgstr "type d'organisation" -#: organization/network/models.py:86 +#: organization/network/models.py:70 +msgid "initials" +msgstr "" + +#: organization/network/models.py:71 msgid "is on map" msgstr "" -#: organization/network/models.py:91 organization/network/models.py:130 -#: organization/network/models.py:135 organization/network/models.py:140 -#: organization/network/models.py:145 organization/network/models.py:150 -#: organization/network/models.py:164 organization/network/models.py:189 +#: organization/network/models.py:76 organization/network/models.py:115 +#: organization/network/models.py:120 organization/network/models.py:125 +#: organization/network/models.py:130 organization/network/models.py:146 +#: organization/network/models.py:171 msgid "organization" msgstr "organisation" -#: organization/network/models.py:180 +#: organization/network/models.py:136 +msgid "class css" +msgstr "" + +#: organization/network/models.py:162 msgid "background pattern" msgstr "" -#: organization/network/models.py:183 +#: organization/network/models.py:165 #, fuzzy #| msgid "department" msgid "department page" msgstr "département" -#: organization/network/models.py:191 +#: organization/network/models.py:173 msgid "code" msgstr "" -#: organization/network/models.py:192 +#: organization/network/models.py:174 msgid "is legacy" msgstr "" -#: organization/network/models.py:193 +#: organization/network/models.py:175 msgid "parent team" msgstr "" -#: organization/network/models.py:196 organization/network/models.py:224 -#: organization/network/models.py:418 +#: organization/network/models.py:178 organization/network/models.py:206 +#: organization/network/models.py:396 #, fuzzy #| msgid "teams" msgid "team" msgstr "équipes" -#: organization/network/models.py:227 +#: organization/network/models.py:209 #, fuzzy #| msgid "teams" msgid "team page" msgstr "équipes" -#: organization/network/models.py:233 +#: organization/network/models.py:215 msgid "user" msgstr "" -#: organization/network/models.py:235 +#: organization/network/models.py:217 msgid "gender" msgstr "genre" -#: organization/network/models.py:239 +#: organization/network/models.py:221 msgid "birthday" msgstr "déte de naissance" -#: organization/network/models.py:241 organization/network/models.py:451 +#: organization/network/models.py:223 organization/network/models.py:428 msgid "external ID" msgstr "" -#: organization/network/models.py:306 +#: organization/network/models.py:283 +#: templates/pages/includes/page_search.html:33 #, fuzzy #| msgid "pages" msgid "Page" msgstr "Pages" -#: organization/network/models.py:318 organization/shop/models.py:20 -msgid "style" -msgstr "" - -#: organization/network/models.py:330 +#: organization/network/models.py:307 msgid "Person" msgstr "Personne" -#: organization/network/models.py:333 +#: organization/network/models.py:310 msgid "Person autocomplete" msgstr "" -#: organization/network/models.py:339 +#: organization/network/models.py:316 #, fuzzy #| msgid "activity" msgid "activity status" msgstr "activité" -#: organization/network/models.py:345 +#: organization/network/models.py:322 #, fuzzy #| msgid "activity" msgid "activity grade" msgstr "activité" -#: organization/network/models.py:351 +#: organization/network/models.py:328 #, fuzzy #| msgid "activity" msgid "activity framework" msgstr "activité" -#: organization/network/models.py:357 +#: organization/network/models.py:334 #, fuzzy #| msgid "activity" msgid "activity function" msgstr "activité" -#: organization/network/models.py:363 +#: organization/network/models.py:340 msgid "budget code" msgstr "" -#: organization/network/models.py:369 +#: organization/network/models.py:346 msgid "record piece" msgstr "" -#: organization/network/models.py:375 organization/network/models.py:437 +#: organization/network/models.py:352 organization/network/models.py:414 #, fuzzy #| msgid "organization type" msgid "training type" msgstr "type d'organisation" -#: organization/network/models.py:387 organization/network/models.py:439 +#: organization/network/models.py:364 organization/network/models.py:416 msgid "training topic" msgstr "" -#: organization/network/models.py:393 organization/network/models.py:440 +#: organization/network/models.py:370 organization/network/models.py:417 msgid "training speciality" msgstr "" -#: organization/network/models.py:399 organization/network/models.py:417 +#: organization/network/models.py:376 organization/network/models.py:395 msgid "UMR" msgstr "" -#: organization/network/models.py:407 +#: organization/network/models.py:384 msgid "number of weeks" msgstr "" -#: organization/network/models.py:408 +#: organization/network/models.py:385 msgid "status" msgstr "" -#: organization/network/models.py:409 +#: organization/network/models.py:386 msgid "permanent" msgstr "" -#: organization/network/models.py:410 +#: organization/network/models.py:387 #, fuzzy #| msgid "work" msgid "framework" msgstr "travail" -#: organization/network/models.py:411 +#: organization/network/models.py:388 msgid "grade" msgstr "" -#: organization/network/models.py:412 +#: organization/network/models.py:389 #, fuzzy #| msgid "Action" msgid "function" msgstr "Action" -#: organization/network/models.py:414 +#: organization/network/models.py:391 msgid "employer" msgstr "" -#: organization/network/models.py:415 +#: organization/network/models.py:392 #, fuzzy #| msgid "organization" msgid "attachment organization" msgstr "organisation" -#: organization/network/models.py:416 +#: organization/network/models.py:393 msgid "second employer" msgstr "" -#: organization/network/models.py:419 +#: organization/network/models.py:394 +msgid "third employer" +msgstr "" + +#: organization/network/models.py:397 msgid "second team" msgstr "" -#: organization/network/models.py:420 +#: organization/network/models.py:398 msgid "second team text" msgstr "" -#: organization/network/models.py:422 organization/projects/models.py:32 -#: organization/projects/models.py:84 organization/projects/models.py:89 -#: organization/projects/models.py:94 organization/projects/models.py:99 -#: organization/projects/models.py:104 organization/projects/models.py:109 +#: organization/network/models.py:400 #, fuzzy #| msgid "Projects" -msgid "project" +msgid "projects" msgstr "Projets" -#: organization/network/models.py:423 +#: organization/network/models.py:401 msgid "R&D quota (float)" msgstr "" -#: organization/network/models.py:424 +#: organization/network/models.py:402 msgid "R&D quota (text)" msgstr "" -#: organization/network/models.py:425 +#: organization/network/models.py:403 #, fuzzy #| msgid "Program" msgid "R&D program" msgstr "Programme" -#: organization/network/models.py:428 +#: organization/network/models.py:406 msgid "doctoral school" msgstr "" -#: organization/network/models.py:429 -msgid "PhD director" -msgstr "" - -#: organization/network/models.py:430 -msgid "PhD officer 1" +#: organization/network/models.py:407 +msgid "PhD directors" msgstr "" -#: organization/network/models.py:431 -msgid "PhD officer 2" +#: organization/network/models.py:408 +msgid "PhD officers" msgstr "" -#: organization/network/models.py:432 +#: organization/network/models.py:409 msgid "PhD defense date" msgstr "" -#: organization/network/models.py:433 +#: organization/network/models.py:410 #, fuzzy #| msgid "title" msgid "PhD title" msgstr "titre" -#: organization/network/models.py:434 +#: organization/network/models.py:411 msgid "post-doctoral situation" msgstr "" -#: organization/network/models.py:435 +#: organization/network/models.py:412 msgid "HDR" msgstr "" -#: organization/network/models.py:441 +#: organization/network/models.py:418 msgid "Training title" msgstr "" -#: organization/network/models.py:445 +#: organization/network/models.py:422 #, fuzzy #| msgid "end date" msgid "add date" msgstr "date de fin" -#: organization/network/models.py:446 +#: organization/network/models.py:423 msgid "modification date" msgstr "" -#: organization/network/models.py:447 +#: organization/network/models.py:424 msgid "manual modification date" msgstr "" -#: organization/network/models.py:449 +#: organization/network/models.py:426 #, fuzzy #| msgid "Comments" msgid "comments" msgstr "Commentaires" -#: organization/network/models.py:454 +#: organization/network/models.py:431 msgid "activity" msgstr "activité" -#: organization/network/models.py:455 +#: organization/network/models.py:432 #, fuzzy #| msgid "activity" msgid "activities" @@ -1527,33 +1567,36 @@ msgstr "" msgid "Zimbabwean" msgstr "" -#: organization/pages/models.py:18 organization/pages/models.py:28 -#: organization/pages/models.py:38 organization/pages/models.py:48 -#: organization/pages/models.py:58 organization/pages/models.py:68 -#: organization/shop/models.py:43 +#: organization/pages/models.py:21 organization/pages/models.py:31 +#: organization/pages/models.py:41 organization/pages/models.py:51 +#: organization/pages/models.py:61 organization/shop/models.py:42 #, fuzzy #| msgid "pages" msgid "page" msgstr "pages" -#: organization/pages/models.py:80 +#: organization/pages/models.py:73 #, fuzzy #| msgid "link type" msgid "link image" msgstr "type de lien" -#: organization/pages/models.py:81 +#: organization/pages/models.py:74 #, fuzzy #| msgid "link type" msgid "link images" msgstr "type de lien" -#: organization/pages/models.py:87 organization/pages/models.py:95 -#: organization/pages/models.py:104 +#: organization/pages/models.py:80 organization/pages/models.py:88 +#: organization/pages/models.py:96 organization/pages/models.py:105 msgid "home" msgstr "" -#: organization/pages/models.py:105 +#: organization/pages/models.py:91 +msgid "Body" +msgstr "" + +#: organization/pages/models.py:106 msgid "homes" msgstr "" @@ -1599,6 +1642,14 @@ msgstr "organisations" msgid "website" msgstr "" +#: organization/projects/models.py:32 organization/projects/models.py:84 +#: organization/projects/models.py:89 organization/projects/models.py:94 +#: organization/projects/models.py:99 organization/projects/models.py:104 +#, fuzzy +#| msgid "Projects" +msgid "project" +msgstr "Projets" + #: organization/projects/models.py:44 msgid "in progress" msgstr "" @@ -1615,7 +1666,7 @@ msgstr "" msgid "parent topic" msgstr "" -#: organization/projects/models.py:58 organization/projects/models.py:114 +#: organization/projects/models.py:58 organization/projects/models.py:109 msgid "project topic" msgstr "" @@ -1631,25 +1682,25 @@ msgstr "Programme" msgid "program type" msgstr "Programme" -#: organization/projects/models.py:117 +#: organization/projects/models.py:112 #, fuzzy #| msgid "Print this page" msgid "project topic page" msgstr "Imprimer cette page" #: organization/shop/models.py:23 organization/shop/models.py:32 -#: organization/shop/models.py:44 organization/shop/models.py:47 +#: organization/shop/models.py:43 organization/shop/models.py:46 msgid "product list" msgstr "" -#: organization/shop/models.py:24 organization/shop/models.py:48 +#: organization/shop/models.py:24 organization/shop/models.py:47 #, fuzzy #| msgid "Artists" msgid "product lists" msgstr "Artistes" #: organization/shop/models.py:33 organization/shop/models.py:36 -#: organization/shop/models.py:53 +#: organization/shop/models.py:52 organization/shop/models.py:57 msgid "product" msgstr "" @@ -1657,6 +1708,22 @@ msgstr "" msgid "products" msgstr "" +#: organization/shop/models.py:58 +msgid "external id" +msgstr "" + +#: organization/shop/models.py:60 +msgid "url" +msgstr "" + +#: organization/shop/models.py:63 +msgid "prestashop product" +msgstr "" + +#: organization/shop/models.py:64 +msgid "prestashop products" +msgstr "" + #: settings.py:45 msgid "Action" msgstr "Action" @@ -1782,7 +1849,7 @@ msgstr "Action" msgid "None available" msgstr "" -#: templates/admin/index.html:15 templates/base.html:193 +#: templates/admin/index.html:15 templates/base.html:144 #: templates/index.html:5 templates/index.html:15 #: templates/pages/menus/breadcrumb.html:4 #: templates/pages/menus/breadcrumb.html:10 @@ -1810,6 +1877,11 @@ msgstr "" msgid "Password:" msgstr "" +#: templates/admin/login.html:42 +#: templates/agenda/includes/event_metainfo.html:25 +msgid "Language" +msgstr "Langue" + #: templates/admin/login.html:53 msgid "Interface:" msgstr "" @@ -1822,50 +1894,59 @@ msgstr "" msgid "Forgot password?" msgstr "" -#: templates/agenda/event_detail.html:50 templates/agenda/event_list.html:32 -#: templates/agenda/event_list.html:52 templates/agenda/event_list.html:69 +#: templates/agenda/event_detail.html:51 #, fuzzy #| msgid "gender" msgid "Agenda" msgstr "genre" -#: templates/agenda/event_detail.html:71 -msgid "Download" -msgstr "Télécharger" - -#: templates/agenda/event_detail.html:71 -msgid "the room program" -msgstr "le programme de salle" - -#: templates/agenda/event_detail.html:166 +#: templates/agenda/event_detail.html:124 msgid "Trainers" msgstr "" -#: templates/agenda/event_detail.html:168 +#: templates/agenda/event_detail.html:126 #, fuzzy #| msgid "Person" msgid "Persons" msgstr "Personne" -#: templates/agenda/event_list.html:36 templates/blog/blog_post_list.html:31 +#: templates/agenda/event_list.html:32 templates/agenda/event_list.html:75 +#: templates/agenda/event_list.html:116 templates/agenda/event_list.html:148 +msgid "Tournées" +msgstr "" + +#: templates/agenda/event_list.html:36 templates/agenda/event_list.html:56 +#: templates/agenda/event_list.html:120 templates/agenda/event_list.html:134 +#: templates/agenda/event_list.html:142 +msgid "Rendez-vous" +msgstr "" + +#: templates/agenda/event_list.html:40 templates/blog/blog_post_list.html:31 #: templates/magazine/article/article_list.html:31 msgid "Tag:" msgstr "Mot clé :" -#: templates/agenda/event_list.html:38 +#: templates/agenda/event_list.html:42 msgid "Location:" msgstr "Lieu :" -#: templates/agenda/event_list.html:47 templates/blog/blog_post_list.html:37 +#: templates/agenda/event_list.html:51 templates/blog/blog_post_list.html:37 #: templates/magazine/article/article_list.html:37 msgid "Author:" msgstr "Auteur :" -#: templates/agenda/event_list.html:77 +#: templates/agenda/event_list.html:78 templates/agenda/event_list.html:118 +#: templates/agenda/event_list.html:155 #, fuzzy -#| msgid "events" -msgid "All events" -msgstr "événements" +#| msgid "Archive" +msgid "Archives" +msgstr "Archive" + +#: templates/agenda/event_list.html:155 +#, fuzzy +#| msgid "Archive" +msgid "archive" +msgstr "Archive" #: templates/agenda/event_location_list.html:4 #: templates/agenda/event_location_list.html:22 @@ -1873,20 +1954,23 @@ msgstr "événements" msgid "Locations" msgstr "Lieux" +#: templates/agenda/includes/event_card.html:71 +#: templates/agenda/includes/event_metainfo.html:63 +#: templates/agenda/includes/event_metainfo_line.html:22 +#: templates/agenda/includes/event_metainfo_slider.html:24 +msgid "Reserve" +msgstr "Réserver" + #: templates/agenda/includes/event_date.html:30 -#: templates/agenda/includes/event_date.html:48 +#: templates/agenda/includes/event_date.html:50 +#: templates/agenda/includes/event_date.html:53 msgid "and" msgstr "" -#: templates/agenda/includes/event_date.html:42 -#: templates/agenda/includes/event_date.html:59 -#: templates/agenda/includes/event_date.html:63 -msgid "from" -msgstr "du" - -#: templates/agenda/includes/event_date.html:42 -#: templates/agenda/includes/event_date.html:59 -#: templates/agenda/includes/event_date.html:63 +#: templates/agenda/includes/event_date.html:44 +#: templates/agenda/includes/event_date.html:65 +#: templates/agenda/includes/event_date.html:69 +#: templates/agenda/includes/event_date_line.html:10 #: templates/job/inc/candidacy_card.html:19 msgid "to" msgstr "au" @@ -1903,30 +1987,20 @@ msgstr "Cliquer pour voir la carte interactive" msgid "Viewing events for the location" msgstr "Événements du lieu" -#: templates/agenda/includes/event_metainfo.html:27 -msgid "Prices" -msgstr "Prix" - -#: templates/agenda/includes/event_metainfo.html:37 -#: templates/agenda/includes/event_metainfo_line.html:22 -#: templates/agenda/includes/event_metainfo_slider.html:24 -#: templates/core/inc/generic_card.html:43 -msgid "Reserve" -msgstr "Réserver" - -#: templates/agenda/includes/event_metainfo.html:42 -msgid "Free entry. Limited seats available" -msgstr "Entrée libre, sans réservation, dans la limite des places disponibles" +#: templates/agenda/includes/event_metainfo.html:32 +msgid "Level" +msgstr "Niveau" -#: templates/agenda/includes/event_metainfo.html:52 +#: templates/agenda/includes/event_metainfo.html:38 +#: templates/core/inc/files.html:3 #, fuzzy -#| msgid "link type" -msgid "Public type" -msgstr "type de lien" +#| msgid "Download" +msgid "Downloads" +msgstr "Télécharger" -#: templates/agenda/includes/event_metainfo.html:55 -msgid "Level" -msgstr "Niveau" +#: templates/agenda/includes/event_metainfo.html:50 +msgid "Prices" +msgstr "Prix" #: templates/agenda/includes/filter_panel.html:6 msgid "Upcoming Events" @@ -1947,43 +2021,43 @@ msgstr "Archive" msgid "Tags" msgstr "Mots clés" -#: templates/base.html:171 +#: templates/base.html:130 #, fuzzy #| msgid "Share on Facebook" msgid "Follow us on Facebook" msgstr "Suivez nous sur Facebook" -#: templates/base.html:172 +#: templates/base.html:131 #, fuzzy #| msgid "Share on Twitter" msgid "Follow us on Twitter" msgstr "Suivez nous sur Twitter" -#: templates/base.html:173 +#: templates/base.html:132 msgid "Follow us on Instagram" msgstr "Suivez nous sur Instagram" -#: templates/base.html:174 +#: templates/base.html:133 msgid "Follow us on Youtube" msgstr "Suivez nous sur Youtube" -#: templates/base.html:175 +#: templates/base.html:134 msgid "Follow us on Vimeo" msgstr "Suivez-nous sur Vimeo" -#: templates/base.html:209 +#: templates/base.html:154 msgid "Opening times" msgstr "Horaires d'ouverture" -#: templates/base.html:219 +#: templates/base.html:161 msgid "Subway access" msgstr "Accès en transports" -#: templates/base.html:248 +#: templates/base.html:180 msgid "under the tutelage of" msgstr "sous la tutelle de" -#: templates/base.html:259 +#: templates/base.html:189 msgid "go to" msgstr "Aller vers" @@ -2007,8 +2081,7 @@ msgstr[1] "" #: templates/core/inc/related_content.html:8 #: templates/festival/artist_detail.html:27 #: templates/festival/video_detail.html:28 -#: templates/magazine/article/article_detail.html:104 -#: templates/pages/departmentpage.html:97 +#: templates/pages/departmentpage.html:77 msgid "Also discover" msgstr "À découvrir aussi" @@ -2054,18 +2127,6 @@ msgstr "" msgid "Atom" msgstr "" -#: templates/core/inc/files.html:3 -#, fuzzy -#| msgid "Download" -msgid "Downloads" -msgstr "Télécharger" - -#: templates/core/inc/generic_card.html:15 templates/home/inc/slider.html:20 -#: templates/magazine/article/article_detail.html:38 -#: templates/magazine/article/includes/article_card.html:14 -msgid "News" -msgstr "" - #: templates/core/inc/link.html:3 msgid "Linked websites" msgstr "" @@ -2184,6 +2245,7 @@ msgid "Play the video" msgstr "Jouer la vidéo" #: templates/festival/video_list.html:6 +#: templates/media/inc/playlist_shutter.html:13 msgid "Videos" msgstr "Vidéos" @@ -2234,6 +2296,12 @@ msgstr "" msgid "Rate" msgstr "" +#: templates/home/inc/slider.html:20 +#: templates/magazine/article/article_detail.html:38 +#: templates/magazine/article/includes/article_card.html:45 +msgid "News" +msgstr "" + #: templates/includes/calendar.html:3 msgid "Festival calendar" msgstr "Calendrier du festival" @@ -2266,7 +2334,7 @@ msgstr "Évenement précédent" msgid "Next page" msgstr "Évenement suivant" -#: templates/includes/search_form.html:12 +#: templates/includes/search_form.html:12 templates/search_results.html:27 msgid "Type something" msgstr "" @@ -2291,7 +2359,7 @@ msgstr "Imprimer cette page" msgid "Add to" msgstr "Ajouter à" -#: templates/includes/sidebar.html:13 templates/index.html:49 +#: templates/includes/sidebar.html:14 templates/index.html:49 msgid "Medias" msgstr "" @@ -2337,13 +2405,53 @@ msgstr "" msgid "Please come back later. There is no job offer at the moment." msgstr "" +#: templates/magazine/article/article_detail.html:102 +msgid "Go further" +msgstr "" + #: templates/magazine/brief/inc/brief_card.html:6 #, fuzzy #| msgid "brief" msgid "Brief !" msgstr "brève" -#: templates/network/inc/person/list_circle_style.html:63 +#: templates/media/audio/inc/audio_search.html:20 +#: templates/media/inc/playlist_search.html:49 +#: templates/media/video/inc/video_search.html:20 +msgid "read more" +msgstr "lire la suite" + +#: templates/media/inc/playlist_shutter.html:5 +msgid "Audios" +msgstr "" + +#: templates/media/inc/playlist_shutter.html:6 +msgid "View all the audio medias" +msgstr "" + +#: templates/media/inc/playlist_shutter.html:7 +msgid "See all audios >" +msgstr "" + +#: templates/media/inc/playlist_shutter.html:14 +msgid "View all the video medias" +msgstr "" + +#: templates/media/inc/playlist_shutter.html:15 +msgid "See all videos >" +msgstr "" + +#: templates/media/inc/playlist_shutter.html:37 +#, fuzzy +#| msgid "Play the video" +msgid "See the video" +msgstr "Jouer la vidéo" + +#: templates/media/inc/playlist_shutter.html:39 +msgid "Hear the sound" +msgstr "" + +#: templates/network/inc/person/person_card_circle.html:32 msgid "resume" msgstr "" @@ -2352,7 +2460,7 @@ msgid "Submit" msgstr "Soumettre" #: templates/pages/menus/current_tree_primary.html:11 -#: templates/pages/menus/current_tree_secondary.html:25 +#: templates/pages/menus/current_tree_secondary.html:31 msgid "Accueil" msgstr "" @@ -2370,7 +2478,10 @@ msgid "" "Sign up for our monthly newsletter to keep up to date with the institute's " "activities every month and be eligible to take advantage of special offers " "from our partners." -msgstr "Abonnez-vous à notre newsletter mensuelle pour être tenu au courant de l’actualité de l’Ircam chaque début de mois et bénéficiez des offres réservées à nos abonnés dans différents lieux partenaires de l’Institut." +msgstr "" +"Abonnez-vous à notre newsletter mensuelle pour être tenu au courant de " +"l’actualité de l’Ircam chaque début de mois et bénéficiez des offres " +"réservées à nos abonnés dans différents lieux partenaires de l’Institut." #: templates/pages/richtextpage.html:17 msgid "Related events" @@ -2380,59 +2491,63 @@ msgstr "Événements associés" msgid "Related posts" msgstr "Articles associés" -#: templates/pages/teampage.html:111 +#: templates/pages/teampage.html:92 +msgid "Research topics and related projects" +msgstr "" + +#: templates/pages/teampage.html:100 msgid "European and national projects" msgstr "" -#: templates/pages/teampage.html:119 +#: templates/pages/teampage.html:122 #, fuzzy #| msgid "Related posts" msgid "Products" msgstr "Articles associés" -#: templates/projects/project_detail.html:130 +#: templates/projects/project_detail.html:124 #, fuzzy #| msgid "Projects" msgid "Project details" msgstr "Projets" -#: templates/projects/project_detail.html:136 +#: templates/projects/project_detail.html:130 msgid "Program" msgstr "Programme" -#: templates/projects/project_detail.html:147 +#: templates/projects/project_detail.html:141 #, fuzzy #| msgid "Program" msgid "Program type" msgstr "Programme" -#: templates/projects/project_detail.html:157 +#: templates/projects/project_detail.html:151 msgid "Beginning" msgstr "" -#: templates/projects/project_detail.html:166 +#: templates/projects/project_detail.html:160 msgid "End" msgstr "" -#: templates/projects/project_detail.html:175 +#: templates/projects/project_detail.html:169 msgid "Status" msgstr "" -#: templates/projects/project_detail.html:185 +#: templates/projects/project_detail.html:179 msgid "Website" msgstr "" -#: templates/projects/project_detail.html:204 +#: templates/projects/project_detail.html:198 #, fuzzy #| msgid "artists" msgid "Participants" msgstr "artistes" -#: templates/projects/project_detail.html:212 +#: templates/projects/project_detail.html:206 msgid "Project lead team" msgstr "" -#: templates/projects/project_detail.html:219 +#: templates/projects/project_detail.html:213 #, fuzzy #| msgid "organization" msgid "Project lead organization" @@ -2443,32 +2558,19 @@ msgid "Partners" msgstr "" #: templates/search_results.html:5 templates/search_results.html:6 -#: templates/search_results.html:15 templates/search_results.html:22 +#: templates/search_results.html:15 msgid "Search Results" msgstr "Resultats de recherche" -#: templates/search_results.html:30 +#: templates/search_results.html:72 #, python-format msgid "" "\n" -" No results were found in %(search_type)s matching your query: " +" No results were found matching your query: " "%(query)s\n" -" " -msgstr "" - -#: templates/search_results.html:34 -#, python-format -msgid "" -"\n" -" Showing %(start)s to %(end)s of %(total)s results in " -"%(search_type)s matching your query: %(query)s\n" -" " +" " msgstr "" -#: templates/search_results.html:65 -msgid "read more" -msgstr "lire la suite" - #: templates/shop/billing_shipping.html:17 #, python-format msgid "" @@ -2772,6 +2874,35 @@ msgstr "" msgid "Recent Tweets" msgstr "Tweets récents" +#~ msgid "videos" +#~ msgstr "vidéos" + +#~ msgid "Applications" +#~ msgstr "Appel à candidature" + +#~ msgid "Download" +#~ msgstr "Télécharger" + +#~ msgid "the room program" +#~ msgstr "le programme de salle" + +#, fuzzy +#~| msgid "events" +#~ msgid "All events" +#~ msgstr "événements" + +#~ msgid "from" +#~ msgstr "du" + +#~ msgid "Free entry. Limited seats available" +#~ msgstr "" +#~ "Entrée libre, sans réservation, dans la limite des places disponibles" + +#, fuzzy +#~| msgid "link type" +#~ msgid "Public type" +#~ msgstr "type de lien" + #~ msgid "at" #~ msgstr "à" @@ -2824,9 +2955,6 @@ msgstr "Tweets récents" #~ msgid "blog posts" #~ msgstr "articles" -#~ msgid "Playlist" -#~ msgstr "Playlist" - #~ msgid "Subscribe to newsletter" #~ msgstr "Inscription à la newsletter" diff --git a/lib/mezzanine-agenda b/lib/mezzanine-agenda index 429ec9ae..dc90ff21 160000 --- a/lib/mezzanine-agenda +++ b/lib/mezzanine-agenda @@ -1 +1 @@ -Subproject commit 429ec9aec1be348537d2c5aec2326f7df1b0ba72 +Subproject commit dc90ff21dd9305517992dec6bd63c8f488e4f71e