diff --git a/pod/locale/fr/LC_MESSAGES/django.po b/pod/locale/fr/LC_MESSAGES/django.po index 9c40829b58..3124da34ae 100644 --- a/pod/locale/fr/LC_MESSAGES/django.po +++ b/pod/locale/fr/LC_MESSAGES/django.po @@ -69,6 +69,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" @@ -261,6 +262,8 @@ msgstr "" >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-10-31 11:26+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -350,6 +353,8 @@ msgstr "" >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -453,12 +458,14 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-12 15:15+0000\n" >>>>>>> b04f50a6 ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +<<<<<<< HEAD >>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) >>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n" ======= +<<<<<<< HEAD "POT-Creation-Date: 2023-09-19 12:22+0000\n" ======= "POT-Creation-Date: 2023-09-21 12:16+0000\n" @@ -491,6 +498,15 @@ msgstr "" "Last-Translator: obado \n" "Language-Team: Pod Team cotech-esup-pod@esup-portail.org\n" >>>>>>> c35f7ee1 ([DONE] Bugfix of 3.4.0 (#983)) +======= +======= +"POT-Creation-Date: 2023-09-19 12:22+0000\n" +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +"PO-Revision-Date: \n" +"Last-Translator: ptitloup \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)) "Language: fr\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -3220,6 +3236,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "le temps depuis le lecteur\" pour renseigner automatiquement le champ " "\"Début\". Vous pouvez le faire également pour remplir le champ \"Fin\"." >>>>>>> 8eeb87fe (ajout) @@ -3251,7 +3268,14 @@ msgstr "" "le temps depuis le lecteur\" pour renseigner automatiquement le champ " "\"Début\". Vous pouvez le faire également pour remplir le champ \"Fin\"." >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +"le temps depuis le lecteur\" pour renseigner automatiquement le champ \"Début" +"\". Vous pouvez le faire également pour remplir le champ \"Fin\"." +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/enrichment/templates/enrichment/edit_enrichment.html msgid "You cannot overlap enrichments." @@ -3831,6 +3855,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : >>>>>> 1a6e4c6c ([DONE]Feature import_video add MAX_UPLOAD_SIZE_ON_IMPORT parameter (#911)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" ======= @@ -3960,6 +3987,8 @@ msgstr "" >>>>>>> 8627d601 ([DONE]Feature import_video add MAX_UPLOAD_SIZE_ON_IMPORT parameter (#911)) ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) "Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +======= +"Cette vidéo a été téléversée sur Pod ; son origine est %(type)s : %(url)s" +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/import_video/views.py pod/meeting/views.py msgid "Try changing the record type or address for this recording." @@ -4005,6 +4044,7 @@ msgid "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" ======= @@ -4027,6 +4067,10 @@ msgid "" "This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +"This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) msgstr "" <<<<<<< HEAD <<<<<<< HEAD @@ -7071,6 +7115,7 @@ msgstr "Options de récurrence" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> 5a94d8e5 ([DONE] Update : Playlist (corrections) (#923)) ======= ======= @@ -7080,6 +7125,8 @@ msgstr "Options de récurrence" ======= >>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923)) ======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +======= >>>>>>> ee58a741 ([DONE] Update : Playlist (#857)) ======= #: pod/meeting/forms.py pod/video/forms.py @@ -7089,7 +7136,23 @@ msgstr "Options de récurrence" ======= ======= >>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923)) +<<<<<<< HEAD >>>>>>> 8b3d52bd ([DONE] Update : Playlist (corrections) (#923)) +======= +======= +#: pod/meeting/forms.py pod/meeting/models.py +msgid "Start date must be less than recurring until date" +msgstr "La date de début doit être antérieure à la date de fin récurrente" + +#: pod/meeting/forms.py pod/meeting/templates/meeting/add_or_edit.html +msgid "" +"In case of weekly recurring, the day of the start date must be selected." +msgstr "" +"En cas de récurrence hebdomadaire, le jour de la date de début doit être " +"sélectionné." + +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) #: pod/meeting/forms.py pod/playlist/forms.py pod/video/forms.py msgid "Owner of the video cannot be an additional owner too" msgstr "" @@ -7097,6 +7160,7 @@ msgstr "" "même temps" >>>>>>> db188f15 ([DONE] Update : Playlist (#857)) +<<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD #: pod/meeting/forms.py pod/video/forms.py @@ -7104,6 +7168,8 @@ msgstr "" ======= >>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923)) ======= +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/meeting/forms.py pod/meeting/models.py msgid "Start date must be less than recurring until date" msgstr "La date de début doit être antérieure à la date de fin récurrente" @@ -7170,7 +7236,11 @@ msgstr "" "même temps" ======= +<<<<<<< HEAD >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/meeting/forms.py msgid "Voice bridge must be a 5-digit number in the range 10000 to 99999" msgstr "" @@ -7728,10 +7798,6 @@ msgstr "Impossible de trouver des informations sur la réunion" msgid "End the meeting" msgstr "Terminer la réunion" -#: pod/meeting/templates/meeting/recurring_options_modal_form.html -msgid "Frequency" -msgstr "Fréquence" - #: pod/meeting/templates/meeting/recurring_options_modal_form.html msgid "Repeat every" msgstr "Répéter tou(te)s les" @@ -7867,16 +7933,16 @@ msgid "" msgstr "" "\n" "

Bonjour,\n" -"

%(owner)s vous invite à une réunion récurrente " -"%(meeting_title)s.

\n" +"

%(owner)s vous invite à une réunion récurrente " +"%(meeting_title)s.

\n" "

Date de début : %(start_date_time)s

\n" "

Récurrent jusqu’à la date : %(end_date)s

\n" "

La réunion se tiendra tou(te)s les %(frequency)s %(recurrence)s \n" "

Voici le lien pour rejoindre la réunion :\n" " %(join_link)s

\n" -"

Vous avez besoin de ce mot de passe pour entrer : " -"%(password)s

\n" +"

Vous avez besoin de ce mot de passe pour entrer : " +"%(password)s

\n" "

Cordialement

\n" " " @@ -7902,8 +7968,8 @@ msgstr "" "

Date de fin : %(end_date)s

\n" "

Voici le lien pour rejoindre la réunion :\n" " %(join_link)s

\n" -"

Vous avez besoin de ce mot de passe pour entrer : " -"%(password)s

\n" +"

Vous avez besoin de ce mot de passe pour entrer : " +"%(password)s

\n" "

Cordialement

\n" " " @@ -11081,8 +11147,8 @@ msgstr "Prévisualisation d’enregistrement" #: pod/video/templates/videos/video-element.html msgid "" "To view this video please enable JavaScript, and consider upgrading to a web " -"browser that supports HTML5 video" +"browser that supports HTML5 video" msgstr "" "Pour visionner cette vidéo, veuillez activer JavaScript et envisager de " "passer à un navigateur Web qui >>>>>> 856119ca (ajout) ======= @@ -11197,6 +11264,11 @@ msgstr "" >>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +"l’ajouter, cliquez sur le lien ci dessous.

" +"%(link_url)s
Si le lien n’est pas actif, il faut le copier-coller " +"dans la barre d’adresse de votre navigateur.

Cordialement

" +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) #: pod/recorder/views.py msgid "New recording added." @@ -11544,8 +11616,8 @@ msgid "" "%(url)s

\n" msgstr "" "vous pouvez changer la date de suppression en éditant votre vidéo :

\n" -"

%(scheme)s:%(url)s

\n" +"

" +"%(scheme)s:%(url)s

\n" "\n" #: pod/video/management/commands/check_obsolete_videos.py @@ -12445,8 +12517,8 @@ msgid "" "This video is chaptered. Click the chapter button on the video player to view them." msgstr "" -"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre sur le lecteur vidéo pour les voir." +"Cette vidéo est chapitrée. Cliquez sur le bouton de chapitre sur le lecteur vidéo pour les voir." #: pod/video/templates/videos/video-all-info.html msgid "Other versions" diff --git a/pod/locale/fr/LC_MESSAGES/djangojs.po b/pod/locale/fr/LC_MESSAGES/djangojs.po index de780fa777..a6e7efe39d 100644 --- a/pod/locale/fr/LC_MESSAGES/djangojs.po +++ b/pod/locale/fr/LC_MESSAGES/djangojs.po @@ -72,6 +72,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= ======= @@ -273,6 +274,8 @@ msgstr "" >>>>>>> 030c65b5 ([DONE] Fix links (accessibility) (#931)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-11-07 10:52+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -360,6 +363,8 @@ msgstr "" >>>>>>> 93e943da ([DONE] Fix links (accessibility) (#931)) ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -454,8 +459,17 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-01 13:56+0000\n" >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +======= +"POT-Creation-Date: 2023-09-19 12:22+0000\n" +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "PO-Revision-Date: \n" "Last-Translator: obado \n" "Language-Team: \n" @@ -645,6 +659,7 @@ msgstr "Mettez en pause pour entrer le texte du segment entre %s et %s." <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 8fdf7f05 ([DONE] A11y for caption_maker (#982)) ======= @@ -655,6 +670,8 @@ msgstr "Mettez en pause pour entrer le texte du segment entre %s et %s." >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) msgid "A caption cannot has more than 80 characters." msgstr "Une légende / sous-titre ne peut comporter plus de 80 caractères." @@ -785,7 +802,12 @@ msgid "Caption / Subtitle" ======= ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) msgid "Caption" >>>>>>> 5c90037b ([DONE] Update : Displaying channels via AJAX (#910)) >>>>>>> b598d4c1 ([DONE] Update : Displaying channels via AJAX (#910)) @@ -1542,11 +1564,6 @@ msgstr "Chargement en cours…" msgid "Network response was not ok." msgstr "La réponse du réseau n'était pas correcte." -#: pod/podfile/static/podfile/js/filewidget.js -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" -msgstr "Chargement en cours…" - #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" msgstr "Changer d’image" @@ -1575,6 +1592,10 @@ msgstr "Retirer" msgid "Server error" msgstr "Erreur du serveur" +#: pod/podfile/static/podfile/js/filewidget.js +msgid "Add" +msgstr "Ajouter" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Are you sure you want to delete this folder?" msgstr "Êtes-vous sûr(e) de vouloir supprimer ce dossier ?" @@ -1727,6 +1748,7 @@ msgstr[1] "%(count)s chaînes" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) msgid "Channels" @@ -1740,6 +1762,8 @@ msgstr "Chaînes" >>>>>>> 43dd9c9b ([DONE] Update : Playlist (corrections) (#923)) ======= >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) msgid "Channel" msgstr "Chaîne" @@ -1854,6 +1878,7 @@ msgstr "vidéos" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9490b823 (Encoding ok) ======= @@ -1862,6 +1887,8 @@ msgstr "vidéos" >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/video/static/js/ajax-display-channels.js #, fuzzy #| msgid "videos" @@ -1880,6 +1907,7 @@ msgstr "vidéo" >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) ======= @@ -1923,10 +1951,18 @@ msgstr "Aucun chaîne trouvée" >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/video/static/js/change_video_owner.js msgid "No element found" msgstr "Aucun élément trouvé" +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +msgstr "Chargement en cours…" + #: pod/video/static/js/change_video_owner.js msgid "An error occurred during the change of owner" msgstr "Une erreur s’est produite lors du changement de propriétaire" @@ -1944,15 +1980,12 @@ msgid "Answers" msgstr "Réponses" #: pod/video/static/js/comment-script.js -msgid "Cancel" -msgstr "Annuler" +msgid "Delete" +msgstr "Supprimer" #: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "%s vote" -msgstr[1] "%s votes" +msgid "Cancel" +msgstr "Annuler" #: pod/video/static/js/comment-script.js msgid "Agree with the comment" @@ -1977,6 +2010,7 @@ msgstr "D’accord avec ce commentaire" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 9490b823 (Encoding ok) ======= @@ -1985,6 +2019,8 @@ msgstr "D’accord avec ce commentaire" >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #, fuzzy #| msgid "Remove this comment" msgid "Reply to comment" @@ -2048,6 +2084,7 @@ msgstr "Répondre" ======= >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) ======= @@ -2082,17 +2119,13 @@ msgstr "Répondre" >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) msgid "Remove this comment" msgstr "Supprimer ce commentaire" -#: pod/video/static/js/comment-script.js -msgid "Add a public comment" -msgstr "Ajouter un commentaire public" - -#: pod/video/static/js/comment-script.js -msgid "Send" -msgstr "Envoyer" - #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "Afficher les réponses" @@ -2105,6 +2138,13 @@ msgstr "Mauvaise réponse du serveur." msgid "Sorry, you're not allowed to vote by now." msgstr "Désolé, vous n’êtes pas autorisé à voter maintenant." +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "%s vote" +msgstr[1] "%s votes" + #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "Désolé, vous ne pouvez pas commenter cette vidéo maintenant." @@ -2125,47 +2165,38 @@ msgstr[0] "%s commentaire" msgstr[1] "%s commentaires" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "Ce contenu est protégé par mot de passe." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "Ce contenu est chapitré." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "Ce contenu est en brouillon." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Video content." msgstr "Contenu vidéo." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "Contenu audio." #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "Éditer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "Compléter la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "Chapitrer la vidéo" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "Supprimer la vidéo" @@ -2238,18 +2269,6 @@ msgstr "Désolé, aucune vidéo trouvée" msgid "Edit the category" msgstr "Éditer la catégorie" -#: pod/video/static/js/video_category.js -msgid "Delete the category" -msgstr "Supprimer la catégorie" - -#: pod/video/static/js/video_category.js -msgid "Success!" -msgstr "Succès !" - -#: pod/video/static/js/video_category.js -msgid "Error…" -msgstr "Erreur…" - #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr "Catégorie créée avec succès" @@ -2343,6 +2362,7 @@ msgstr "Titre court" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #~ msgid "Add a caption/subtitle after this one" #~ msgstr "Ajouter un(e) légende/sous-titre ci-dessous" @@ -2411,14 +2431,28 @@ msgstr "Répondre" #~ msgstr "Chaînes" >>>>>>> 15aacca9 ([DONE] Update : Playlist (corrections) (#923)) +======= +#~ msgid "Channels" +#~ msgstr "Chaînes" + +#~ msgid "video" +#~ msgstr "vidéo" + +#~ msgid "Reply to comment" +#~ msgstr "Répondre au commentaire" + +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #~ msgid "Reply" #~ msgstr "Répondre" #~ msgid "Add a public comment" #~ msgstr "Ajouter un commentaire public" +<<<<<<< HEAD ======= >>>>>>> 76710c3d ([DONE] Fix: Accessibility for the label for form fields (11.01) (#930)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #~ msgid "Send" #~ msgstr "Envoyer" @@ -2431,6 +2465,7 @@ msgstr "Répondre" #~ msgid "Error…" #~ msgstr "Erreur…" <<<<<<< HEAD +<<<<<<< HEAD >>>>>>> b598d4c1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= @@ -2440,6 +2475,9 @@ msgstr "Répondre" >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= + +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #~ msgid "Are you sure you want to delete this element?" #~ msgstr "Êtes-vous sûr(e) de vouloir supprimer cet élément ?" diff --git a/pod/locale/nl/LC_MESSAGES/django.po b/pod/locale/nl/LC_MESSAGES/django.po index 083a5e3620..3cc6e38ff4 100644 --- a/pod/locale/nl/LC_MESSAGES/django.po +++ b/pod/locale/nl/LC_MESSAGES/django.po @@ -75,6 +75,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= ======= @@ -284,6 +285,8 @@ msgstr "" >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-11-09 10:23+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -373,6 +376,8 @@ msgstr "" >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) ======= >>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -476,8 +481,17 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-12 15:15+0000\n" >>>>>>> b04f50a6 ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +<<<<<<< HEAD >>>>>>> f45acaee ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +<<<<<<< HEAD >>>>>>> 225adb2a ([DONE] RGAA 10.07 (Fix focus visibility) (#940)) +======= +======= +======= +"POT-Creation-Date: 2023-09-19 12:22+0000\n" +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "PO-Revision-Date: 2023-06-08 14:37+0200\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -3523,6 +3537,7 @@ msgid "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD "This video '%(name)s' was uploaded to Pod; its origin is Youtube: %(url)s" >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +"This video '%(name)s' was uploaded to Pod; its origin is Youtube : %(url)s" +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) msgstr "" #: pod/import_video/views.py @@ -6206,6 +6225,7 @@ msgid "Recurring options" >>>>>>> 9e3de4db ([DONE] Fix : accessibility issues (#913)) msgstr "" +<<<<<<< HEAD <<<<<<< HEAD #: pod/meeting/forms.py msgid "Recurring options" @@ -6238,6 +6258,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: pod/meeting/forms.py msgid "Recurring options" <<<<<<< HEAD @@ -6267,6 +6288,8 @@ msgstr "" ======= >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) ======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) +======= >>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) #: pod/meeting/forms.py pod/meeting/models.py msgid "Start date must be less than recurring until date" @@ -6785,10 +6808,6 @@ msgstr "" msgid "End the meeting" msgstr "" -#: pod/meeting/templates/meeting/recurring_options_modal_form.html -msgid "Frequency" -msgstr "" - #: pod/meeting/templates/meeting/recurring_options_modal_form.html msgid "Repeat every" msgstr "" @@ -9347,8 +9366,8 @@ msgstr "" #: pod/video/templates/videos/video-element.html msgid "" "To view this video please enable JavaScript, and consider upgrading to a web " -"browser that supports HTML5 video" +"browser that supports HTML5 video" msgstr "" #: pod/recorder/templates/recorder/link_record.html diff --git a/pod/locale/nl/LC_MESSAGES/djangojs.po b/pod/locale/nl/LC_MESSAGES/djangojs.po index 40a4dffa98..e9ea9414a0 100644 --- a/pod/locale/nl/LC_MESSAGES/djangojs.po +++ b/pod/locale/nl/LC_MESSAGES/djangojs.po @@ -67,6 +67,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" @@ -274,6 +275,8 @@ msgstr "" >>>>>>> 030c65b5 ([DONE] Fix links (accessibility) (#931)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-11-07 10:52+0000\n" ======= "POT-Creation-Date: 2023-07-13 16:48+0200\n" @@ -361,6 +364,8 @@ msgstr "" >>>>>>> 93e943da ([DONE] Fix links (accessibility) (#931)) ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) "POT-Creation-Date: 2023-08-30 12:33+0200\n" ======= "POT-Creation-Date: 2023-07-05 15:50+0200\n" @@ -455,8 +460,17 @@ msgstr "" ======= "POT-Creation-Date: 2023-09-01 13:56+0000\n" >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +<<<<<<< HEAD >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +======= +======= +"POT-Creation-Date: 2023-09-19 12:22+0000\n" +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) "PO-Revision-Date: 2023-02-08 15:22+0100\n" "Last-Translator: obado \n" "Language-Team: \n" @@ -615,6 +629,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD msgid "A caption cannot has more than 80 characters." msgstr "" @@ -657,6 +672,8 @@ msgid "Caption / Subtitle" >>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) msgid "Caption" >>>>>>> 5c90037b ([DONE] Update : Displaying channels via AJAX (#910)) msgstr "" @@ -1387,11 +1404,6 @@ msgstr "" msgid "Network response was not ok." msgstr "" -#: pod/podfile/static/podfile/js/filewidget.js -#: pod/video/static/js/change_video_owner.js -msgid "Loading…" -msgstr "" - #: pod/podfile/static/podfile/js/filewidget.js msgid "Change image" msgstr "" @@ -1420,6 +1432,10 @@ msgstr "" msgid "Server error" msgstr "" +#: pod/podfile/static/podfile/js/filewidget.js +msgid "Add" +msgstr "" + #: pod/podfile/static/podfile/js/filewidget.js msgid "Are you sure you want to delete this folder?" msgstr "" @@ -1554,6 +1570,7 @@ msgstr "" #: pod/video/static/js/ajax-display-channels.js <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD ======= >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) msgid "Channels" @@ -1565,6 +1582,8 @@ msgstr "" >>>>>>> 96067166 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) msgid "Channel" msgstr "" >>>>>>> 5c90037b ([DONE] Update : Displaying channels via AJAX (#910)) @@ -1613,6 +1632,7 @@ msgstr "" <<<<<<< HEAD <<<<<<< HEAD <<<<<<< HEAD +<<<<<<< HEAD #: pod/video/static/js/ajax-display-channels.js msgid "video" msgstr "" @@ -1625,6 +1645,8 @@ msgstr "" >>>>>>> 0fee55e1 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> fc313dc2 ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> ed6c9681 ([DONE] fix recuring date in edit meeting (#946)) #: pod/video/static/js/change_video_owner.js <<<<<<< HEAD msgid "No element found" @@ -1762,6 +1784,8 @@ msgid "Loading…" >>>>>>> 3a4a3085 ([DONE] Update : Displaying channels via AJAX (#910)) ======= >>>>>>> 792d863b ([DONE] A11y for 3.4.0 (#914)) +======= +>>>>>>> 85cd1f4c ([DONE] fix recuring date in edit meeting (#946)) #: pod/video/static/js/ajax-display-channels.js msgid "video" msgstr "" @@ -1801,6 +1825,14 @@ msgstr "" #: pod/video/static/js/change_video_owner.js msgid "No element found" >>>>>>> 83c6f9de ([DONE] A11y for 3.4.0 (#914)) +======= +#: pod/video/static/js/change_video_owner.js +msgid "No element found" +msgstr "" + +#: pod/video/static/js/change_video_owner.js +msgid "Loading…" +>>>>>>> c3c05541 ([DONE] fix recuring date in edit meeting (#946)) msgstr "" #: pod/video/static/js/change_video_owner.js @@ -1823,40 +1855,21 @@ msgid "Answers" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Cancel" -msgstr "" - -#: pod/video/static/js/comment-script.js -#, javascript-format -msgid "%s vote" -msgid_plural "%s votes" -msgstr[0] "" -msgstr[1] "" - -#: pod/video/static/js/comment-script.js -msgid "Agree with the comment" +msgid "Delete" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Reply to comment" +msgid "Cancel" msgstr "" #: pod/video/static/js/comment-script.js -msgid "Reply" +msgid "Agree with the comment" msgstr "" #: pod/video/static/js/comment-script.js msgid "Remove this comment" msgstr "" -#: pod/video/static/js/comment-script.js -msgid "Add a public comment" -msgstr "" - -#: pod/video/static/js/comment-script.js -msgid "Send" -msgstr "" - #: pod/video/static/js/comment-script.js msgid "Show answers" msgstr "" @@ -1869,6 +1882,13 @@ msgstr "" msgid "Sorry, you're not allowed to vote by now." msgstr "" +#: pod/video/static/js/comment-script.js +#, javascript-format +msgid "%s vote" +msgid_plural "%s votes" +msgstr[0] "" +msgstr[1] "" + #: pod/video/static/js/comment-script.js msgid "Sorry, you can't comment this video by now." msgstr "" @@ -1889,47 +1909,38 @@ msgstr[0] "" msgstr[1] "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is password protected." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is chaptered." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "This content is in draft." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Video content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Audio content." msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Edit the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Complete the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Chapter the video" msgstr "" #: pod/video/static/js/regroup_videos_by_theme.js -#: pod/video/static/js/video_category.js msgid "Delete the video" msgstr "" @@ -2037,18 +2048,6 @@ msgstr "" msgid "Edit the category" msgstr "" -#: pod/video/static/js/video_category.js -msgid "Delete the category" -msgstr "" - -#: pod/video/static/js/video_category.js -msgid "Success!" -msgstr "" - -#: pod/video/static/js/video_category.js -msgid "Error…" -msgstr "" - #: pod/video/static/js/video_category.js msgid "Category created successfully" msgstr ""