From a7e301c99f19cfdfd32a16e2ea36cd355ea7f17c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= Date: Fri, 19 Jan 2018 13:48:32 +0100 Subject: [PATCH] translation fixes (#21275) --- corbo/forms.py | 4 +- corbo/locale/fr/LC_MESSAGES/django.po | 177 +++++++++++++++++++--------------- 2 files changed, 102 insertions(+), 79 deletions(-) diff --git a/corbo/forms.py b/corbo/forms.py index 7b1b336..831c540 100644 --- a/corbo/forms.py +++ b/corbo/forms.py @@ -62,7 +62,7 @@ class CategoryForm(forms.ModelForm): class SubscriptionsImportForm(forms.Form): - subscribers = forms.FileField(_('Subscribers'), + subscribers = forms.FileField(label=_('Subscribers'), help_text=_('utf-8 encoded, comma separated file with email addresses on first column')) def clean_subscribers(self, *args, **kwargs): @@ -80,7 +80,7 @@ class SubscriptionsImportForm(forms.Form): class SendTestEmailForm(forms.Form): - email = forms.EmailField() + email = forms.EmailField(label=_('Email')) class SendTestSMSForm(forms.Form): diff --git a/corbo/locale/fr/LC_MESSAGES/django.po b/corbo/locale/fr/LC_MESSAGES/django.po index 383aa06..47cab4d 100644 --- a/corbo/locale/fr/LC_MESSAGES/django.po +++ b/corbo/locale/fr/LC_MESSAGES/django.po @@ -1,18 +1,16 @@ -# SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER -# This file is distributed under the same license as the PACKAGE package. -# FIRST AUTHOR , YEAR. +# Corbo French Ttranslation +# Copyright (C) 2016-2018 Entr'ouvert +# This file is distributed under the same license as the Corbo package. +# Serghei Mihai , 2016. # -#, fuzzy msgid "" msgstr "" -"Project-Id-Version: PACKAGE VERSION\n" +"Project-Id-Version: corbo 0\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-04-07 16:35+0200\n" -"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" -"Last-Translator: FULL NAME \n" -"Language-Team: LANGUAGE \n" -"Language: \n" +"POT-Creation-Date: 2018-01-19 12:46+0000\n" +"PO-Revision-Date: 2018-01-19 15:01+0100\n" +"Last-Translator: Frederic Peters \n" +"Language: French\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" @@ -26,97 +24,106 @@ msgstr "Abonnés" msgid "" "utf-8 encoded, comma separated file with email addresses on first column" msgstr "" -"fichier csv encodé en utf-8, avec l'adresse courriel en premiere colonne" +"fichier CSV encodé en UTF-8, avec l'adresse courriel en première colonne" #: forms.py:77 #, python-format msgid "Invalid email address at line %d" msgstr "Adresse courriel invalide sur la ligne %d" -#: models.py:20 templates/corbo/email_settings_form.html:10 +#: forms.py:83 models.py:21 msgid "Email" msgstr "Courriel" -#: models.py:25 +#: forms.py:87 +msgid "Mobile number" +msgstr "Numéro de mobile" + +#: models.py:22 +msgid "SMS" +msgstr "SMS" + +#: models.py:27 msgid "Name" msgstr "Nom" -#: models.py:26 +#: models.py:28 msgid "Slug" msgstr "Identifiant unique" -#: models.py:27 +#: models.py:29 msgid "Feed URL" msgstr "Adresse du flux RSS" -#: models.py:28 +#: models.py:30 msgid "if defined, announces will be automatically created from rss items" msgstr "" -"si défini, les annonces seront automatiquement créées à partir des items rss" +"si défini, des annonces seront automatiquement créées à partir du contenu de " +"ce fil." -#: models.py:62 +#: models.py:64 msgid "category" -msgstr "categorie" +msgstr "catégorie" -#: models.py:63 +#: models.py:65 msgid "title" msgstr "titre" -#: models.py:64 +#: models.py:66 msgid "maximum 256 characters" msgstr "maximum 256 caractères" -#: models.py:66 +#: models.py:68 msgid "Content" msgstr "Contenu" -#: models.py:67 +#: models.py:69 msgid "Publication date" msgstr "Date de publication" -#: models.py:69 +#: models.py:71 msgid "Expiration date" msgstr "Date d'expiration" -#: models.py:71 +#: models.py:73 msgid "creation time" msgstr "date de création" -#: models.py:72 +#: models.py:74 msgid "modification time" msgstr "date de modification" -#: models.py:142 models.py:147 +#: models.py:144 models.py:149 msgid "announce" msgstr "annonce" -#: models.py:148 +#: models.py:150 msgid "Deliver time" -msgstr "Heure d'expedition" +msgstr "Heure d'expédition" -#: models.py:149 +#: models.py:151 msgid "Delivery count" -msgstr "Nombre d'expeditions" +msgstr "Nombre d'expéditions" -#: models.py:164 +#: models.py:182 msgid "sent" msgstr "envoyé" -#: models.py:169 +#: models.py:187 msgid "Category" -msgstr "Catégorie :" +msgstr "Catégorie" -#: models.py:170 +#: models.py:188 msgid "User identifier" msgstr "Identifiant de l'utilisateur" -#: models.py:171 +#: models.py:189 msgid "identifier" msgstr "identifiant" -#: models.py:172 +#: models.py:190 msgid "ex.: mailto, ..." -msgstr "" +msgstr "ex: mailto..." #: templates/corbo/announce.html:6 #, python-format @@ -139,7 +146,7 @@ msgid "" " " msgstr "" "\n" -"Etes-vous sûr de vouloir supprimer l'annonce \"%(title)s\" ?\n" +"Êtes-vous sûr de vouloir supprimer l'annonce « %(title)s » ?\n" " " #: templates/corbo/announce_confirm_delete.html:14 @@ -152,9 +159,9 @@ msgstr "Supprimer" #: templates/corbo/announce_form.html:29 #: templates/corbo/category_confirm_delete.html:16 #: templates/corbo/category_form.html:18 -#: templates/corbo/email_settings_form.html:20 +#: templates/corbo/email_test_announce_form.html:20 +#: templates/corbo/sms_test_announce_form.html:19 #: templates/corbo/subscriptions_import_form.html:20 -#: templates/corbo/test_email_send_form.html:20 msgid "Cancel" msgstr "Annuler" @@ -167,18 +174,17 @@ msgid "New Announce" msgstr "Nouvelle annonce" #: templates/corbo/announce_form.html:28 templates/corbo/category_form.html:17 -#: templates/corbo/email_settings_form.html:19 msgid "Save" -msgstr "Sauvegarder" +msgstr "Enregistrer" #: templates/corbo/announce_list.html:15 #: templates/corbo/subscriptions_import_form.html:10 msgid "Import subscriptions" -msgstr "Import d'abonnés" +msgstr "Importer des abonnés" #: templates/corbo/announce_list.html:19 templates/corbo/announce_view.html:13 msgid "Edit" -msgstr "Editer" +msgstr "Modifier" #: templates/corbo/announce_list.html:20 msgid "New announce" @@ -195,7 +201,7 @@ msgstr "" " Publiée le %(mtime)s\n" " " -#: templates/corbo/announce_list.html:73 +#: templates/corbo/announce_list.html:45 msgid "" "\n" " This category doesn't have any announces yet. Click on \"New announce\" " @@ -204,29 +210,34 @@ msgid "" " " msgstr "" "\n" -" Cette catégorie ne contient pas encore d'annonces. Cliquez sur le bouton " -"\"Nouvelle annonce\" dans le coin supériur droit de la page \n" +" Cette catégorie ne contient pas encore d'annonces. Cliquez sur le bouton " +"« Nouvelle annonce » dans le coin supérieur droit de la page \n" " pour en ajouter une première.\n" " " #: templates/corbo/announce_view.html:14 -#: templates/corbo/test_email_send_form.html:10 +#: templates/corbo/email_test_announce_form.html:10 msgid "Send test email" msgstr "Envoyer un courriel de test" -#: templates/corbo/announce_view.html:26 +#: templates/corbo/announce_view.html:16 +#: templates/corbo/sms_test_announce_form.html:10 +msgid "Send test SMS" +msgstr "Envoyer un SMS de test" + +#: templates/corbo/announce_view.html:29 msgid "Publication" msgstr "Publication" -#: templates/corbo/announce_view.html:31 +#: templates/corbo/announce_view.html:34 msgid "Expiration" msgstr "Expiration" -#: templates/corbo/announce_view.html:37 +#: templates/corbo/announce_view.html:40 msgid "Sent" msgstr "Envoyé" -#: templates/corbo/announce_view.html:38 +#: templates/corbo/announce_view.html:41 #, python-format msgid "" "\n" @@ -236,16 +247,17 @@ msgid_plural "" "\n" " to %(delivers)s destinations\n" " " -msgstr[0] "\n" +msgstr[0] "" +"\n" " à %(delivers)s destinataire\n" " " -msgstr[1] "\n" +msgstr[1] "" +"\n" " à %(delivers)s destinataires\n" " " #: templates/corbo/base.html:4 templates/corbo/base.html.py:9 -#: templates/corbo/base.html:33 templates/corbo/email_settings_form.html:6 -#: views.py:297 +#: templates/corbo/base.html:33 views.py:319 msgid "Announces" msgstr "Annonces" @@ -257,28 +269,33 @@ msgid "" " " msgstr "" "\n" -" Supprimer la categorie \"%(name)s\"?\n" +" Êtes-vous sûr de vouloir supprimer la catégorie « %(name)s » ?\n" " " #: templates/corbo/category_confirm_delete.html:13 msgid "All its announces of will be also deleted" -msgstr "Toutes ses annonces seront supprimées également" +msgstr "Toutes ses annonces seront également supprimées." #: templates/corbo/category_form.html:6 msgid "Edit Category" -msgstr "Modifier la categorie" +msgstr "Modifier la catégorie" #: templates/corbo/category_form.html:8 msgid "New Category" -msgstr "Nouvelle categorie" +msgstr "Nouvelle catégorie" + +#: templates/corbo/email_test_announce_form.html:19 +#: templates/corbo/sms_test_announce_form.html:18 +msgid "Send" +msgstr "Envoyer" #: templates/corbo/manage.html:5 msgid "Categories" -msgstr "Catégories :" +msgstr "Catégories" #: templates/corbo/manage.html:14 msgid "New category" -msgstr "Nouvelle categorie" +msgstr "Nouvelle catégorie" #: templates/corbo/manage.html:24 #, python-format @@ -318,7 +335,7 @@ msgstr[1] "" " %(subscriptions_number)s abonnements\n" " " -#: templates/corbo/manage.html:69 +#: templates/corbo/manage.html:43 msgid "" "\n" " There are no categories yet. Click on \"New category\" button in the top\n" @@ -326,9 +343,9 @@ msgid "" " " msgstr "" "\n" -"Aucune catégorie définie pour l'instant. Cliquez sur le bouton \"Nouvelle " -"catégorie\" \n" -"en haut à droite de la page pour en ajouter une.\n" +"Aucune catégorie n'est encore définie. Cliquez sur le bouton « Nouvelle " +"catégorie » \n" +"en haut à droite de la page pour en ajouter une première.\n" " " #: templates/corbo/subscription_confirm_delete.html:4 @@ -337,25 +354,23 @@ msgid "" "\n" "Unsubscription from %(category)s\n" msgstr "" +"\n" +"Désabonnement de %(category)s\n" #: templates/corbo/subscription_confirm_delete.html:11 msgid "Click on \"Unsubscribe\" to stop receiving emails to this address:" msgstr "" -"Cliquez sur \"Désabonner\" pour ne plus récevoir de courriel à cette " -"addresse :" +"Cliquez sur « Se désabonner » pour ne plus recevoir de courriel à cette " +"adresse :" #: templates/corbo/subscription_confirm_delete.html:15 msgid "Unsubscribe" -msgstr "Désabonner" +msgstr "Se désabonner" #: templates/corbo/subscriptions_import_form.html:19 msgid "Import" msgstr "Importer" -#: templates/corbo/test_email_send_form.html:19 -msgid "Send" -msgstr "Envoyer" - #: templates/corbo/unsubscription_done.html:5 msgid "Successfully unsubscription" msgstr "Désabonnement réussi" @@ -370,7 +385,7 @@ msgstr "Connexion" #: templates/registration/login.html:8 msgid "Please enter your credentials to authenticate" -msgstr "Merci de saisir vos identifiants pour vous connecter" +msgstr "Veuillez saisir vos identifiants pour vous connecter" #: templates/registration/login.html:10 msgid "Log in" @@ -383,6 +398,14 @@ msgid_plural "%(new)d subscribers added" msgstr[0] "%(new)d abonné ajouté" msgstr[1] "%(new)d abonnés ajoutés" -#: views.py:286 +#: views.py:295 msgid "Email successfully sent" msgstr "Courriel envoyé avec succès" + +#: views.py:310 +msgid "SMS successfully sent" +msgstr "SMS envoyé avec succès" + +#: views.py:312 +msgid "Error occured while sending SMS" +msgstr "Une erreur a eu lieu lors de l'envoi du SMS." -- 2.15.1