diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index 3124da34ae..88fe4b555e 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -70,6 +70,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -264,6 +265,8 @@ msgstr "" >>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) ======= >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-10-31 11:26+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -355,6 +358,8 @@ msgstr "" >>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) ======= >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -502,8 +507,11 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-19 12:22+0000\n" >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +======= +"POT-Creation-Date: 2023-09-21 12:16+0000\n" +>>>>>>> 1a2953ef ([DONE] Fix some bugs for 3.4.0 (#947)) "PO-Revision-Date: \n" -"Last-Translator: ptitloup \n" +"Last-Translator: AymericJak \n" "Language-Team: Pod Team pod@esup-portail.org\n" >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) @@ -1862,6 +1870,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video_encode_transcript/models.py ======= @@ -1885,6 +1894,8 @@ msgstr "" >>>>>>> 3ba3755b ([DONE] Update : Playlist (#857)) ======= >>>>>>> 15aacca9 ([DONE] Update : Playlist (corrections) (#923)) +======= +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) #: pod/video/templates/channel/channel.html #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video/templates/videos/videos.html pod/video_encode_transcript/models.py @@ -1930,6 +1941,8 @@ msgstr "" ======= ======= >>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923)) +======= +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video_encode_transcript/models.py ======= @@ -1945,8 +1958,19 @@ msgstr "" #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video_encode_transcript/models.py >>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923)) +<<<<<<< HEAD >>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923)) +<<<<<<< HEAD >>>>>>> 15aacca9 ([DONE] Update : Playlist (corrections) (#923)) +======= +======= +======= +#: pod/video/templates/channel/channel.html +#: pod/video/templates/videos/video_breadcrumbs.html +#: pod/video/templates/videos/videos.html pod/video_encode_transcript/models.py +>>>>>>> 1a2953ef ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) msgid "Video" msgstr "Vidéo" @@ -11826,6 +11850,10 @@ msgstr "" msgid "Date of event" msgstr "Date de l’évènement" +#: pod/video/models.py +msgid "The password is / will be encrypted." +msgstr "Le mot de passe est / sera encrypté." + #: pod/video/models.py msgid "Overview" msgstr "Vue d’ensemble" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index a6e7efe39d..7b75fa93cb 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -73,6 +73,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= ======= @@ -276,6 +277,8 @@ msgstr "" >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-11-07 10:52+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -365,6 +368,8 @@ msgstr "" >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -468,10 +473,19 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-19 12:22+0000\n" >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +<<<<<<< HEAD >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +<<<<<<< HEAD >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +======= +======= +"POT-Creation-Date: 2023-09-21 12:16+0000\n" +>>>>>>> 1a2953ef ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "PO-Revision-Date: \n" -"Last-Translator: obado \n" +"Last-Translator: AymericJak \n" "Language-Team: \n" "Language: fr\n" "MIME-Version: 1.0\n" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 3cc6e38ff4..45ac067283 100644 --- a/pod/locale/nl/LC_MESSAGES/django.po +++ b/pod/locale/nl/LC_MESSAGES/django.po @@ -76,6 +76,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= ======= @@ -287,6 +288,8 @@ msgstr "" >>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) ======= >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-11-09 10:23+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -378,6 +381,8 @@ msgstr "" >>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) ======= >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -490,8 +495,17 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-19 12:22+0000\n" >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +<<<<<<< HEAD >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +<<<<<<< HEAD >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +======= +======= +"POT-Creation-Date: 2023-09-21 12:16+0000\n" +>>>>>>> 1a2953ef ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -1762,6 +1776,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video_encode_transcript/models.py ======= @@ -1785,6 +1800,8 @@ msgstr "" >>>>>>> 3ba3755b ([DONE] Update : Playlist (#857)) ======= >>>>>>> 15aacca9 ([DONE] Update : Playlist (corrections) (#923)) +======= +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) #: pod/video/templates/channel/channel.html #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video/templates/videos/videos.html pod/video_encode_transcript/models.py @@ -1830,6 +1847,8 @@ msgstr "" ======= ======= >>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923)) +======= +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video_encode_transcript/models.py ======= @@ -1845,8 +1864,19 @@ msgstr "" #: pod/video/templates/videos/video_breadcrumbs.html #: pod/video_encode_transcript/models.py >>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923)) +<<<<<<< HEAD >>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923)) +<<<<<<< HEAD >>>>>>> 15aacca9 ([DONE] Update : Playlist (corrections) (#923)) +======= +======= +======= +#: pod/video/templates/channel/channel.html +#: pod/video/templates/videos/video_breadcrumbs.html +#: pod/video/templates/videos/videos.html pod/video_encode_transcript/models.py +>>>>>>> 1a2953ef ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) msgid "Video" msgstr "" @@ -9952,6 +9982,10 @@ msgstr "" msgid "Date of event" msgstr "" +#: pod/video/models.py +msgid "The password is / will be encrypted." +msgstr "" + #: pod/video/models.py msgid "Overview" msgstr "" diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index e9ea9414a0..fdd3a083f1 100644 --- a/pod/locale/nl/LC_MESSAGES/djangojs.po +++ b/pod/locale/nl/LC_MESSAGES/djangojs.po @@ -68,6 +68,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -277,6 +278,8 @@ msgstr "" >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-11-07 10:52+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -366,6 +369,8 @@ msgstr "" >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -469,8 +474,17 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-19 12:22+0000\n" >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +<<<<<<< HEAD >>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +<<<<<<< HEAD >>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= +======= +======= +"POT-Creation-Date: 2023-09-21 12:16+0000\n" +>>>>>>> 1a2953ef ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 8f679ad9 ([DONE] Fix some bugs for 3.4.0 (#947)) +>>>>>>> 670e60ff ([DONE] Fix some bugs for 3.4.0 (#947)) "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" diff --git a/pod/playlist/static/playlist/css/playlist.css b/pod/playlist/static/playlist/css/playlist.css index 41d309b56c..2d0564f6d3 100644 --- a/pod/playlist/static/playlist/css/playlist.css +++ b/pod/playlist/static/playlist/css/playlist.css @@ -177,6 +177,10 @@ a.player-element:hover { border: var(--bs-border-width) solid var(--color-alto) !important; } +a.player-element:not(.disabled).selected:hover { + background-color: #BEBEBE; +} + a.player-element.selected { background-color: #d1d1d1; }