# HG changeset patch # User raph # Date 1261465842 -3600 # Node ID 464b7678bdd21dab45c93ef6f4a84a27ed2407de # Parent db564b6ad6b59ec41342803e97ee025fa473c796# Parent 9f679d3f6ec4a4a73675b66c283c208e4b6a818d Merge with 9f679d3f6ec4a4a73675b66c283c208e4b6a818d diff -r db564b6ad6b5 -r 464b7678bdd2 src/cm/locale/en/LC_MESSAGES/djangojs.mo Binary file src/cm/locale/en/LC_MESSAGES/djangojs.mo has changed diff -r db564b6ad6b5 -r 464b7678bdd2 src/cm/locale/en/LC_MESSAGES/djangojs.po --- a/src/cm/locale/en/LC_MESSAGES/djangojs.po Tue Dec 22 08:09:25 2009 +0100 +++ b/src/cm/locale/en/LC_MESSAGES/djangojs.po Tue Dec 22 08:10:42 2009 +0100 @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 13:42+0100\n" +"POT-Creation-Date: 2009-12-14 17:55+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -73,6 +73,7 @@ #: media/js/client/c_dlg_intercept.js:48 media/js/client/c_dlg_intercept.js:50 #: media/js/client/c_dlg_intercept.js:52 media/js/client/c_sync.js:223 +#: media/js/site/text_edit.js:84 msgid "Warning" msgstr "" @@ -408,10 +409,12 @@ msgstr[1] "" #: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:721 +#: media/js/site/text_edit.js:78 msgid "No" msgstr "" #: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:722 +#: media/js/site/text_edit.js:79 msgid "Yes" msgstr "" @@ -531,3 +534,37 @@ #: media/js/site/f_text_view_frame.js:320 msgid "thread discussions" msgstr "" + +#: media/js/site/text_edit.js:26 +msgid "" +"%(nb_comments)s comment will be removed because the text it applies to has " +"been changed." +msgid_plural "" +"%(nb_comments)s comments will be removed because the text they apply to has " +"been changed." +msgstr[0] "" +msgstr[1] "" + +#: media/js/site/text_edit.js:30 media/js/site/text_edit.js.py:49 +#: media/js/site/text_edit.js:66 +msgid "Do you want to continue?" +msgstr "" + +#: media/js/site/text_edit.js:43 +msgid "" +"%(nb_comments)s comment will be lost because the text it applies to has been " +"changed." +msgid_plural "" +"%(nb_comments)s comments will be lost because the text they apply to has " +"been changed." +msgstr[0] "" +msgstr[1] "" + +#: media/js/site/text_edit.js:47 +msgid "(We suggest you create a new version)" +msgstr "" + +#: media/js/site/text_edit.js:64 +msgid "" +"Since you chose not to create a new version all comments will be deleted" +msgstr "" diff -r db564b6ad6b5 -r 464b7678bdd2 src/cm/locale/fr/LC_MESSAGES/djangojs.mo Binary file src/cm/locale/fr/LC_MESSAGES/djangojs.mo has changed diff -r db564b6ad6b5 -r 464b7678bdd2 src/cm/locale/fr/LC_MESSAGES/djangojs.po --- a/src/cm/locale/fr/LC_MESSAGES/djangojs.po Tue Dec 22 08:09:25 2009 +0100 +++ b/src/cm/locale/fr/LC_MESSAGES/djangojs.po Tue Dec 22 08:10:42 2009 +0100 @@ -8,9 +8,9 @@ msgstr "" "Project-Id-Version: djangojs\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2009-12-14 13:42+0100\n" -"PO-Revision-Date: 2009-12-14 13:52+0100\n" -"Last-Translator: dev \n" +"POT-Creation-Date: 2009-12-14 17:55+0100\n" +"PO-Revision-Date: 2009-12-14 17:55+0100\n" +"Last-Translator: renaud bernard \n" "Language-Team: \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" @@ -22,62 +22,49 @@ msgid "New comment" msgstr "Nouveau commentaire" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_reply_form.js:37 +#: media/js/client/c_client-min.js:1 media/js/client/c_reply_form.js:37 msgid "New reply" msgstr "Nouvelle réponse" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:4 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:4 msgid "Username:" msgstr "Nom d'utilisateur :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:5 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:5 msgid "E-mail address:" msgstr "Email :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:6 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:6 msgid "Title:" msgstr "Titre :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:7 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:7 msgid "Content:" msgstr "Contenu :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:8 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:8 msgid "Tag:" msgstr "Tag :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:11 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:11 msgid "Modify comment's scope:" msgstr "Modifier la portée du commentaire :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:13 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:13 msgid "Comment will apply to this selection:" msgstr "Le commentaire s'appliquera à cet extrait sélectionné dans le texte :" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:14 -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:395 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:395 msgid "Save" msgstr "Sauver" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_interface_forms.js:14 -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:100 +#: media/js/client/c_client-min.js:1 media/js/client/c_interface_forms.js:14 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:100 msgid "Cancel" msgstr "Annuler" -#: media/js/client/c_client-min.js:1 -#: media/js/client/c_icomment.js:25 +#: media/js/client/c_client-min.js:1 media/js/client/c_icomment.js:25 #: media/js/client/c_interface_forms.js:15 msgid "close" msgstr "fermer" @@ -86,10 +73,9 @@ msgid "New comment will be canceled, continue?" msgstr "L'ajout d'un nouveau commentaire va être annulé, continuer ?" -#: media/js/client/c_dlg_intercept.js:48 -#: media/js/client/c_dlg_intercept.js:50 -#: media/js/client/c_dlg_intercept.js:52 -#: media/js/client/c_sync.js:223 +#: media/js/client/c_dlg_intercept.js:48 media/js/client/c_dlg_intercept.js:50 +#: media/js/client/c_dlg_intercept.js:52 media/js/client/c_sync.js:223 +#: media/js/site/text_edit.js:84 msgid "Warning" msgstr "Avertissement" @@ -194,15 +180,18 @@ msgstr "plus aucun commentaire filtré" #: media/js/client/c_sync.js:129 -msgid "Do you want to subscribe to all replies notifications in discussions you participated in?" -msgstr "Voulez-vous vous abonner aux notifications portant sur les discussions auxquelles vous avez participé ?" +msgid "" +"Do you want to subscribe to all replies notifications in discussions you " +"participated in?" +msgstr "" +"Voulez-vous vous abonner aux notifications portant sur les discussions " +"auxquelles vous avez participé ?" #: media/js/client/c_sync.js:129 msgid "Follow up" msgstr "Suivi" -#: media/js/client/c_sync.js:201 -#: media/js/client/c_sync.js.py:208 +#: media/js/client/c_sync.js:201 media/js/client/c_sync.js.py:208 msgid "could not save comment" msgstr "impossible de sauver le commentaire" @@ -214,347 +203,279 @@ msgid "could not remove comment" msgstr "impossible de supprimer le commentaire" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_message.js:17 +#: media/js/client/f_client-min.js:1 media/js/client/f_message.js:17 msgid "loading..." msgstr "chargement..." -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:4 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:4 msgid "print from the browser" msgstr "imprimer depuis le navigateur" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:5 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:5 msgid "download html file (.html)" msgstr "télécharger un fichier html (.html)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:6 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:6 msgid "download markdown file (.mkd)" msgstr "télécharger un fichier markdown (.mkd)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:7 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:7 msgid "download portable object format file (.pdf)" msgstr "télécharger un fichier pdf (.pdf)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:8 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:8 msgid "download latex file (.tex)" msgstr "télécharger un fichier latex (.tex)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:9 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:9 msgid "download open document file (.odt)" msgstr "télécharger un fichier open document (.odt)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:12 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:12 msgid "Print text" msgstr "Impression du texte" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:13 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:13 msgid "Export text" msgstr "Export du texte" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:40 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:40 msgid "using markers only, no background colors" msgstr "en utilisant des marqueurs, pas de couleur de fond" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:41 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:41 msgid "using markers and background colors" msgstr "en utilisant des marqueurs et la couleur de fond" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:53 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:53 msgid "all (%(nb_comments)s)" msgstr "tous (%(nb_comments)s)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:54 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:54 msgid "current filtered ones (%(nb_comments)s)" msgstr "ceux actuellement filtrés (%(nb_comments)s)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:56 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:56 msgid "none (0)" msgstr "aucun (0)" -#: media/js/client/f_client-min.js:1 -#: media/js/client/f_printDialog.js:89 +#: media/js/client/f_client-min.js:1 media/js/client/f_printDialog.js:89 msgid "Go !" msgstr "Go !" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:43 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:43 msgid "click to show options" msgstr "cliquer pour cacher les options" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:44 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:44 msgid "click to hide options" msgstr "cliquer pour voir les options" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:76 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:76 msgid "Text" msgstr "Texte" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:80 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:80 msgid "Search" msgstr "Rechercher" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:85 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:85 #: media/js/site/f_text_view_frame.js:395 msgid "Reset" msgstr "Réinitialiser" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:86 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:86 msgid "Hide all Comments" msgstr "Cacher tous les commentaires" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:94 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:94 msgid "Authors" msgstr "Auteurs" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:102 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:102 msgid "States" msgstr "Etats" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:111 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:111 msgid "Dates" msgstr "Dates" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:119 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:119 msgid "Tags" msgstr "Tags" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:177 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:177 msgid "view previous comment" msgstr "voir le commentaire précédent" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:178 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:178 msgid "view next comment" msgstr "voir le commentaire suivant" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:179 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:179 msgid "view first comment" msgstr "voir le premier commentaire" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:180 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:180 msgid "view last next comment" msgstr "voir le dernier commentaire" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:181 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:181 msgid "view all comments" msgstr "voir tous les commentaires" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:182 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:182 msgid "toggle advance interface" msgstr "voir/cacher l'interface avancée" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:183 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:183 msgid "print document with/without comments" msgstr "imprimer le document (avec ou sans les commentaires)" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:184 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:184 msgid "export document with/without comments" msgstr "exporter le document (avec ou sans les commentaires)" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:187 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:187 msgid "add a comment" msgstr "ajouter un commentaire" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:203 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:203 msgid "filter:" msgstr "filtre :" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:208 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:208 msgid "browse by:" msgstr "parcourir par :" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:210 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:210 msgid "location" msgstr "emplacement" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:211 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:211 msgid "modification" msgstr "modification" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:354 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:354 msgid "Text style" msgstr "Style du texte" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:399 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:399 msgid "Animation duration" msgstr "Durée des animations" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:408 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:408 msgid "(0.001 to 1 second)" msgstr "(0.001 à 1 seconde)" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:434 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:434 msgid "preferences reset (will apply on next load)" msgstr "préférences réinitialisées (s'appliqueront au prochain chargement)" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:440 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:440 msgid "preferences saved (will apply on next load)" msgstr "préférences sauvées (s'appliqueront au prochain chargement)" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:544 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:544 msgid "filter reset" msgstr "filtre réinitialisé" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:554 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:554 msgid "filter applied" msgstr "filtre activé" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:560 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:560 msgid "discussion" msgid_plural "discussions" msgstr[0] "discussion" msgstr[1] "discussions" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:564 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:564 msgid "comment" msgid_plural "comments" msgstr[0] "commentaire" msgstr[1] "commentaires" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:567 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:567 msgid " reply" msgid_plural " replies" msgstr[0] " réponse" msgstr[1] " réponses" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:589 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:589 msgid "all" msgstr "tous" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:607 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:607 msgid "last 24 hours (%(nb_comments)s)" msgid_plural "last %(nb_days)s days (%(nb_comments)s)" msgstr[0] "dernières 24 heures (%(nb_comments)s)" msgstr[1] "derniers %(nb_days)s jours (%(nb_comments)s)" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:721 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:721 +#: media/js/site/text_edit.js:78 msgid "No" msgstr "Non" -#: media/js/client/f_client-min.js:1 -#: media/js/site/f_text_view_frame.js:722 +#: media/js/client/f_client-min.js:1 media/js/site/f_text_view_frame.js:722 +#: media/js/site/text_edit.js:79 msgid "Yes" msgstr "Oui" -#: media/js/markitup/sets.js:18 -#: media/js/markitup/sets.js.py:64 +#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.py:64 msgid "First Level Heading" msgstr "Titre de premier niveau" -#: media/js/markitup/sets.js:18 -#: media/js/markitup/sets.js.py:19 -#: media/js/markitup/sets.js:20 -#: media/js/markitup/sets.js.py:21 -#: media/js/markitup/sets.js:22 -#: media/js/markitup/sets.js.py:23 -#: media/js/markitup/sets.js:64 -#: media/js/markitup/sets.js.py:65 -#: media/js/markitup/sets.js:66 -#: media/js/markitup/sets.js.py:67 -#: media/js/markitup/sets.js:68 -#: media/js/markitup/sets.js.py:69 +#: media/js/markitup/sets.js:18 media/js/markitup/sets.js.py:19 +#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:21 +#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:23 +#: media/js/markitup/sets.js:64 media/js/markitup/sets.js.py:65 +#: media/js/markitup/sets.js:66 media/js/markitup/sets.js.py:67 +#: media/js/markitup/sets.js:68 media/js/markitup/sets.js.py:69 msgid "Your title here..." msgstr "Votre titre ici ..." -#: media/js/markitup/sets.js:19 -#: media/js/markitup/sets.js.py:65 +#: media/js/markitup/sets.js:19 media/js/markitup/sets.js.py:65 msgid "Second Level Heading" msgstr "Titre de second niveau" -#: media/js/markitup/sets.js:20 -#: media/js/markitup/sets.js.py:66 +#: media/js/markitup/sets.js:20 media/js/markitup/sets.js.py:66 msgid "Heading 3" msgstr "Titre 3" -#: media/js/markitup/sets.js:21 -#: media/js/markitup/sets.js.py:67 +#: media/js/markitup/sets.js:21 media/js/markitup/sets.js.py:67 msgid "Heading 4" msgstr "Titre 4" -#: media/js/markitup/sets.js:22 -#: media/js/markitup/sets.js.py:68 +#: media/js/markitup/sets.js:22 media/js/markitup/sets.js.py:68 msgid "Heading 5" msgstr "Titre 5" -#: media/js/markitup/sets.js:23 -#: media/js/markitup/sets.js.py:69 +#: media/js/markitup/sets.js:23 media/js/markitup/sets.js.py:69 msgid "Heading 6" msgstr "Titre 6" -#: media/js/markitup/sets.js:25 -#: media/js/markitup/sets.js.py:72 +#: media/js/markitup/sets.js:25 media/js/markitup/sets.js.py:72 msgid "Bold" msgstr "Gras" -#: media/js/markitup/sets.js:26 -#: media/js/markitup/sets.js.py:73 +#: media/js/markitup/sets.js:26 media/js/markitup/sets.js.py:73 msgid "Italic" msgstr "Italique" -#: media/js/markitup/sets.js:28 -#: media/js/markitup/sets.js.py:76 +#: media/js/markitup/sets.js:28 media/js/markitup/sets.js.py:76 msgid "Bulleted List" msgstr "Liste à puce" -#: media/js/markitup/sets.js:29 -#: media/js/markitup/sets.js.py:77 +#: media/js/markitup/sets.js:29 media/js/markitup/sets.js.py:77 msgid "Numeric List" msgstr "Liste numérotée" -#: media/js/markitup/sets.js:33 -#: media/js/markitup/sets.js.py:80 +#: media/js/markitup/sets.js:33 media/js/markitup/sets.js.py:80 msgid "Picture" msgstr "Image" -#: media/js/markitup/sets.js:34 -#: media/js/markitup/sets.js.py:81 +#: media/js/markitup/sets.js:34 media/js/markitup/sets.js.py:81 msgid "Link" msgstr "Lien" @@ -566,8 +487,7 @@ msgid "Code Block / Code" msgstr "Bloc de Code / Code" -#: media/js/markitup/sets.js:39 -#: media/js/markitup/sets.js.py:84 +#: media/js/markitup/sets.js:39 media/js/markitup/sets.js.py:84 msgid "Preview" msgstr "Prévisualiser" @@ -613,23 +533,56 @@ #: media/js/site/f_text_view_frame.js:317 msgid "unthread discussions" -msgstr "aligner les réponses aux commentaires sur la gauche pour rendre possible la lecture du texte" +msgstr "" +"aligner les réponses aux commentaires sur la gauche pour rendre possible la " +"lecture du texte" #: media/js/site/f_text_view_frame.js:320 msgid "thread discussions" -msgstr "décaler les réponses aux commentaires pour mettre en évidence le fil de la discussion" +msgstr "" +"décaler les réponses aux commentaires pour mettre en évidence le fil de la " +"discussion" + +#: media/js/site/text_edit.js:26 +msgid "" +"%(nb_comments)s comment will be removed because the text it applies to has " +"been changed." +msgid_plural "" +"%(nb_comments)s comments will be removed because the text they apply to has " +"been changed." +msgstr[0] "" +"%(nb_comments)s commentaire sera supprimé parce que le texte auquel il " +"s'applique a été modifié." +msgstr[1] "" +"%(nb_comments)s commentaires seront supprimés parce que le texte auquel ils " +"s'appliquent a été modifié." + +#: media/js/site/text_edit.js:30 media/js/site/text_edit.js.py:49 +#: media/js/site/text_edit.js:66 +msgid "Do you want to continue?" +msgstr "Voulez vous continuer ?" -#~ msgid "discussions" -#~ msgstr "discussions" -#~ msgid "comments" -#~ msgstr "commentaires" -#~ msgid "replies" -#~ msgstr "voir les réponses" -#~ msgid "Use padding to show discussion threads" -#~ msgstr "" -#~ "Décaler les réponses pour mettre en évidence le fil de la discussion" -#~ msgid "Heading 1" -#~ msgstr "Titre 1" -#~ msgid "Heading 2" -#~ msgstr "Titre 2" +#: media/js/site/text_edit.js:43 +msgid "" +"%(nb_comments)s comment will be lost because the text it applies to has been " +"changed." +msgid_plural "" +"%(nb_comments)s comments will be lost because the text they apply to has " +"been changed." +msgstr[0] "" +"%(nb_comments)s commentaire sera supprimé parce que le texte auquel il " +"s'applique a été modifié." +msgstr[1] "" +"%(nb_comments)s commentaires seront supprimés parce que le texte auquel ils " +"s'appliquent a été modifié." +#: media/js/site/text_edit.js:47 +msgid "(We suggest you create a new version)" +msgstr "(Nous vous suggérons de créer une nouvelle version)" + +#: media/js/site/text_edit.js:64 +msgid "" +"Since you chose not to create a new version all comments will be deleted" +msgstr "" +"Comme vous avez choisi de ne pas créer de nouvelle version, tous les " +"commentaires seront perdus" diff -r db564b6ad6b5 -r 464b7678bdd2 src/cm/media/js/site/text_edit.js --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/cm/media/js/site/text_edit.js Tue Dec 22 08:10:42 2009 +0100 @@ -0,0 +1,90 @@ +function check_save(){ + needToConfirm = false; + + var newVersion = $('#id_new_version').attr('checked') ; + var commentsKept = $('#id_keep_comments').attr('checked') ; + + var new_content = $('#id_content').val() + var new_format = $('#id_format').val() + + if (commentsKept) { + var pre_edit_url = tb_conf['pre_edit_url'] ; + + $.ajax({ + url: pre_edit_url, + type:'POST', + dataType:"json", + data: { "new_content": new_content, "new_format": new_format}, + success: function(obj){ + nb_removed = obj['nb_removed']; + if (newVersion) { + if (nb_removed == 0) { + $('#edit_form').submit(); + } + else { + var message = ngettext( + '%(nb_comments)s comment will be removed because the text it applies to has been changed.', + '%(nb_comments)s comments will be removed because the text they apply to has been changed.', + nb_removed) ; + message += '
' ; + message += gettext( 'Do you want to continue?') ; + message = interpolate(message,{'nb_comments':nb_removed}, true) ; + + $('#check_save_dialog').html(message) ; + $('#check_save_dialog').dialog('open') ; + } + } + else { + if (nb_removed == 0) { + $('#edit_form').submit(); + } + else { + var message = ngettext( + '%(nb_comments)s comment will be lost because the text it applies to has been changed.', + '%(nb_comments)s comments will be lost because the text they apply to has been changed.', + nb_removed) ; + message += '
' ; + message += gettext( '(We suggest you create a new version)') ; + message += '
' ; + message += gettext( 'Do you want to continue?') ; + message = interpolate(message,{'nb_comments':nb_removed}, true) ; + + $('#check_save_dialog').html(message) ; + $('#check_save_dialog').dialog('open') ; + } + } + }, + error: function(msg){ + alert("error: " + msg); + } + }); + } + else { + if (!newVersion) { + var message = gettext("Since you chose not to create a new version all comments will be deleted") ; + message += '
' ; + message += gettext( 'Do you want to continue?') ; + $('#check_save_dialog').html(message) ; + $('#check_save_dialog').dialog('open') ; + } + else { + $('#edit_form').submit(); + } + } +} + +$(function() { + var buttons = {}; + buttons[gettext('No')] = function() {$(this).dialog('close');} ; + buttons[gettext('Yes')] = function() {$(this).dialog('close');$('#edit_form').submit();} ; + + $('#check_save_dialog').dialog({ + bgiframe: true, + autoOpen: false, + title :gettext('Warning'), + modal: true, + buttons:buttons + }) ; + + $("#save").click(function() { check_save() ;}) ; +}) ; diff -r db564b6ad6b5 -r 464b7678bdd2 src/cm/templates/site/text_edit.html --- a/src/cm/templates/site/text_edit.html Tue Dec 22 08:09:25 2009 +0100 +++ b/src/cm/templates/site/text_edit.html Tue Dec 22 08:10:42 2009 +0100 @@ -3,84 +3,7 @@ {% load com %} {% block head %} - + {% endblock %} {% block main %}