Mercurial > kallithea
changeset 6784:5f022e8ff9e2
i18n: updated translation for French
Currently translated at 100.0% (1135 of 1135 strings)
| author | Étienne Gilli <etienne.gilli@gmail.com> |
|---|---|
| date | Wed, 26 Jul 2017 06:42:40 +0000 |
| parents | 880e2f07651b |
| children | 0add693c626b |
| files | kallithea/i18n/fr/LC_MESSAGES/kallithea.po |
| diffstat | 1 files changed, 2465 insertions(+), 3479 deletions(-) [+] |
line wrap: on
line diff
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Thu Jul 27 14:26:14 2017 +0200 +++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po Wed Jul 26 06:42:40 2017 +0000 @@ -8,7 +8,7 @@ "Project-Id-Version: Kallithea 0.3\n" "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n" "POT-Creation-Date: 2017-07-27 13:13+0200\n" -"PO-Revision-Date: 2016-03-21 13:00+0000\n" +"PO-Revision-Date: 2017-07-26 06:43+0000\n" "Last-Translator: Étienne Gilli <etienne.gilli@gmail.com>\n" "Language-Team: French " "<https://hosted.weblate.org/projects/kallithea/kallithea/fr/>\n" @@ -17,104 +17,83 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=n > 1;\n" -"X-Generator: Weblate 2.6-dev\n" - -#: kallithea/controllers/changelog.py:86 -#: kallithea/controllers/pullrequests.py:256 kallithea/lib/base.py:613 +"X-Generator: Weblate 2.16-dev\n" + +#: kallithea/controllers/changelog.py:85 +#: kallithea/controllers/pullrequests.py:240 kallithea/lib/base.py:515 msgid "There are no changesets yet" msgstr "Il n’y a aucun changement pour le moment" #: kallithea/controllers/changelog.py:164 -#: kallithea/controllers/admin/permissions.py:62 -#: kallithea/controllers/admin/permissions.py:66 -#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/controllers/admin/permissions.py:61 +#: kallithea/controllers/admin/permissions.py:65 +#: kallithea/controllers/admin/permissions.py:69 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:88 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:7 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:104 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:7 #: kallithea/templates/base/perms_summary.html:14 -#: kallithea/tests/data/templates/base/perms_summary.html.py:57 msgid "None" msgstr "Aucun" -#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:194 +#: kallithea/controllers/changelog.py:167 kallithea/controllers/files.py:198 msgid "(closed)" msgstr "(fermé)" -#: kallithea/controllers/changeset.py:85 +#: kallithea/controllers/changeset.py:88 msgid "Show whitespace" msgstr "Afficher les espaces et tabulations" -#: kallithea/controllers/changeset.py:92 kallithea/controllers/changeset.py:99 -#: kallithea/templates/files/diff_2way.html:53 +#: kallithea/controllers/changeset.py:95 kallithea/controllers/changeset.py:102 +#: kallithea/templates/files/diff_2way.html:55 msgid "Ignore whitespace" msgstr "Ignorer les espaces et tabulations" -#: kallithea/controllers/changeset.py:165 +#: kallithea/controllers/changeset.py:168 #, python-format msgid "Increase diff context to %(num)s lines" msgstr "Augmenter le contexte du diff à %(num)s lignes" -#: kallithea/controllers/changeset.py:230 kallithea/controllers/files.py:98 -#: kallithea/controllers/files.py:118 kallithea/controllers/files.py:726 +#: kallithea/controllers/changeset.py:233 kallithea/controllers/files.py:97 +#: kallithea/controllers/files.py:117 kallithea/controllers/files.py:744 msgid "Such revision does not exist for this repository" msgstr "Une telle révision n'existe pas pour ce dépôt" -#: kallithea/controllers/compare.py:67 -#, fuzzy, python-format -#| msgid "Go to tip of repository" -msgid "Could not find other repository %s" -msgstr "Aller au sommet (tip) du dépôt" - -#: kallithea/controllers/compare.py:73 -#, fuzzy -#| msgid "Cannot compare repositories without using common ancestor" -msgid "Cannot compare repositories of different types" -msgstr "Impossible de comparer des dépôts sans utiliser un ancêtre commun" - -#: kallithea/controllers/compare.py:240 -msgid "Cannot show empty diff" -msgstr "" - -#: kallithea/controllers/compare.py:242 -msgid "No ancestor found for merge diff" -msgstr "" - -#: kallithea/controllers/compare.py:246 -msgid "Multiple merge ancestors found for merge compare" -msgstr "" - -#: kallithea/controllers/compare.py:262 +#: kallithea/controllers/compare.py:161 kallithea/templates/base/root.html:41 +msgid "Select changeset" +msgstr "Sélectionner le changeset" + +#: kallithea/controllers/compare.py:261 msgid "Cannot compare repositories without using common ancestor" msgstr "Impossible de comparer des dépôts sans utiliser un ancêtre commun" -#: kallithea/controllers/error.py:70 +#: kallithea/controllers/error.py:71 msgid "No response" msgstr "Pas de réponse" -#: kallithea/controllers/error.py:71 +#: kallithea/controllers/error.py:72 msgid "Unknown error" msgstr "Erreur inconnue" -#: kallithea/controllers/error.py:84 +#: kallithea/controllers/error.py:100 msgid "The request could not be understood by the server due to malformed syntax." msgstr "" "Le serveur n’a pas pu interpréter la requête à cause d’une erreur de " "syntaxe." -#: kallithea/controllers/error.py:87 +#: kallithea/controllers/error.py:103 msgid "Unauthorized access to resource" msgstr "Accès interdit à cette ressource" -#: kallithea/controllers/error.py:89 +#: kallithea/controllers/error.py:105 msgid "You don't have permission to view this page" msgstr "Vous n’avez pas la permission de voir cette page" -#: kallithea/controllers/error.py:91 +#: kallithea/controllers/error.py:107 msgid "The resource could not be found" msgstr "Ressource introuvable" -#: kallithea/controllers/error.py:93 +#: kallithea/controllers/error.py:109 msgid "" "The server encountered an unexpected condition which prevented it from " "fulfilling the request." @@ -122,399 +101,379 @@ "La requête n’a pu être traitée en raison d’une erreur survenue sur le " "serveur." -#: kallithea/controllers/feed.py:80 -#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/controllers/feed.py:55 +#, python-format +msgid "Changes on %s repository" +msgstr "Changements sur le dépôt %s" + +#: kallithea/controllers/feed.py:56 +#, python-format +msgid "%s %s feed" +msgstr "Flux %s de %s" + +#: kallithea/controllers/feed.py:87 +#: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:81 -#: kallithea/templates/compare/compare_diff.html:95 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 -#: kallithea/templates/pullrequests/pullrequest_show.html:348 -#: kallithea/tests/data/templates/changeset/changeset.html.py:332 -#: kallithea/tests/data/templates/changeset/changeset.html.py:347 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:180 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:195 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:420 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:447 +#: kallithea/templates/compare/compare_diff.html:84 +#: kallithea/templates/compare/compare_diff.html:93 +#: kallithea/templates/pullrequests/pullrequest_show.html:350 +#: kallithea/templates/pullrequests/pullrequest_show.html:372 msgid "Changeset was too big and was cut off..." msgstr "Cet ensemble de changements était trop important et a été découpé…" -#: kallithea/controllers/feed.py:84 +#: kallithea/controllers/feed.py:91 #, python-format msgid "%s committed on %s" msgstr "%s a commité, le %s" -#: kallithea/controllers/feed.py:116 kallithea/controllers/feed.py:148 -#, python-format -msgid "%s %s feed" -msgstr "Flux %s de %s" - -#: kallithea/controllers/feed.py:118 kallithea/controllers/feed.py:150 -#, python-format -msgid "Changes on %s repository" -msgstr "Changements sur le dépôt %s" +#: kallithea/controllers/files.py:92 +msgid "Click here to add new file" +msgstr "Ajouter un nouveau fichier" #: kallithea/controllers/files.py:93 -msgid "Click here to add new file" -msgstr "Ajouter un nouveau fichier" - -#: kallithea/controllers/files.py:94 #, python-format msgid "There are no files yet. %s" msgstr "Il n'y a actuellement pas de fichiers. %s" -#: kallithea/controllers/files.py:191 +#: kallithea/controllers/files.py:195 #, python-format msgid "%s at %s" msgstr "%s à %s" -#: kallithea/controllers/files.py:297 kallithea/controllers/files.py:357 -#: kallithea/controllers/files.py:424 +#: kallithea/controllers/files.py:307 kallithea/controllers/files.py:367 +#: kallithea/controllers/files.py:434 #, python-format msgid "This repository has been locked by %s on %s" msgstr "Ce dépôt a été verrouillé par %s sur %s" -#: kallithea/controllers/files.py:309 +#: kallithea/controllers/files.py:319 msgid "You can only delete files with revision being a valid branch" msgstr "" -"Vous ne pouvez supprimer que les fichiers dont la révision est une " -"branche valide" - -#: kallithea/controllers/files.py:320 +"Vous ne pouvez supprimer les fichiers que si la révision est une branche " +"valide" + +#: kallithea/controllers/files.py:330 #, python-format msgid "Deleted file %s via Kallithea" msgstr "Le fichier %s a été supprimé via Kallithea" -#: kallithea/controllers/files.py:342 +#: kallithea/controllers/files.py:352 #, python-format msgid "Successfully deleted file %s" msgstr "Suppression du fichier %s effectuée avec succès" -#: kallithea/controllers/files.py:346 kallithea/controllers/files.py:412 -#: kallithea/controllers/files.py:493 +#: kallithea/controllers/files.py:356 kallithea/controllers/files.py:422 +#: kallithea/controllers/files.py:503 msgid "Error occurred during commit" msgstr "Une erreur est survenue durant le commit" -#: kallithea/controllers/files.py:369 +#: kallithea/controllers/files.py:379 msgid "You can only edit files with revision being a valid branch" msgstr "" -"Vous ne pouvez modifier que les fichiers dont la révision est une branche" -" valide" - -#: kallithea/controllers/files.py:383 +"Vous ne pouvez modifier les fichiers que si la révision est une branche " +"valide" + +#: kallithea/controllers/files.py:393 #, python-format msgid "Edited file %s via Kallithea" msgstr "%s édité via Kallithea" -#: kallithea/controllers/files.py:399 +#: kallithea/controllers/files.py:409 msgid "No changes" msgstr "Aucun changement" -#: kallithea/controllers/files.py:408 kallithea/controllers/files.py:482 +#: kallithea/controllers/files.py:418 kallithea/controllers/files.py:492 #, python-format msgid "Successfully committed to %s" msgstr "Commit réalisé avec succès sur %s" -#: kallithea/controllers/files.py:435 +#: kallithea/controllers/files.py:445 msgid "Added file via Kallithea" msgstr "%s ajouté par Kallithea" -#: kallithea/controllers/files.py:456 +#: kallithea/controllers/files.py:466 msgid "No content" msgstr "Aucun contenu" -#: kallithea/controllers/files.py:460 +#: kallithea/controllers/files.py:470 msgid "No filename" msgstr "Aucun nom de fichier" -#: kallithea/controllers/files.py:485 +#: kallithea/controllers/files.py:495 msgid "Location must be relative path and must not contain .. in path" msgstr "" "Le chemin doit être un chemin relatif et ne doit pas contenir .. dans le " "chemin" -#: kallithea/controllers/files.py:517 +#: kallithea/controllers/files.py:528 msgid "Downloads disabled" msgstr "Les téléchargements sont désactivés" -#: kallithea/controllers/files.py:528 +#: kallithea/controllers/files.py:539 #, python-format msgid "Unknown revision %s" msgstr "Révision %s inconnue" -#: kallithea/controllers/files.py:530 +#: kallithea/controllers/files.py:541 msgid "Empty repository" msgstr "Dépôt vide" -#: kallithea/controllers/files.py:532 +#: kallithea/controllers/files.py:543 msgid "Unknown archive type" msgstr "Type d’archive inconnu" -#: kallithea/controllers/files.py:755 +#: kallithea/controllers/files.py:773 #: kallithea/templates/changeset/changeset_range.html:9 -#: kallithea/templates/email_templates/pull_request.html:49 -#: kallithea/templates/pullrequests/pullrequest.html:84 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:242 -#: kallithea/tests/data/templates/email_templates/pull_request.html.py:92 -#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:88 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:152 +#: kallithea/templates/email_templates/pull_request.html:15 +#: kallithea/templates/pullrequests/pullrequest.html:97 msgid "Changesets" msgstr "Changesets" -#: kallithea/controllers/files.py:756 kallithea/controllers/pullrequests.py:186 -#: kallithea/model/scm.py:705 +#: kallithea/controllers/files.py:774 kallithea/controllers/pullrequests.py:175 +#: kallithea/model/scm.py:716 kallithea/templates/switch_to_list.html:3 +#: kallithea/templates/branches/branches.html:10 msgid "Branches" msgstr "Branches" -#: kallithea/controllers/files.py:757 kallithea/controllers/pullrequests.py:187 -#: kallithea/model/scm.py:716 +#: kallithea/controllers/files.py:775 kallithea/controllers/pullrequests.py:176 +#: kallithea/model/scm.py:727 kallithea/templates/switch_to_list.html:25 +#: kallithea/templates/tags/tags.html:10 msgid "Tags" msgstr "Tags" -#: kallithea/controllers/forks.py:176 +#: kallithea/controllers/forks.py:186 #, python-format msgid "An error occurred during repository forking %s" msgstr "Une erreur est survenue durant le fork du dépôt %s" -#: kallithea/controllers/home.py:77 +#: kallithea/controllers/home.py:84 msgid "Groups" msgstr "Groupes" -#: kallithea/controllers/home.py:87 kallithea/templates/index.html:5 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:90 +#: kallithea/controllers/home.py:94 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:106 #: kallithea/templates/admin/repos/repo_add.html:12 #: kallithea/templates/admin/repos/repo_add.html:16 #: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/users/user_edit_advanced.html:6 -#: kallithea/templates/base/base.html:56 kallithea/templates/base/base.html:73 -#: kallithea/templates/base/base.html:452 -#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:119 -#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:125 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:138 -#: kallithea/tests/data/templates/base/base.html.py:122 -#: kallithea/tests/data/templates/base/base.html.py:243 -#: kallithea/tests/data/templates/base/base.html.py:325 -#: kallithea/tests/data/templates/base/base.html.py:654 -#: kallithea/tests/data/templates/base/base.html.py:690 +#: kallithea/templates/base/base.html:60 kallithea/templates/base/base.html:77 +#: kallithea/templates/base/base.html:124 +#: kallithea/templates/base/base.html:479 +#: kallithea/templates/base/base.html:653 msgid "Repositories" msgstr "Dépôts" -#: kallithea/controllers/home.py:120 +#: kallithea/controllers/home.py:139 #: kallithea/templates/files/files_add.html:32 #: kallithea/templates/files/files_delete.html:23 #: kallithea/templates/files/files_edit.html:32 -#: kallithea/tests/data/templates/files/files_add.html.py:219 msgid "Branch" msgstr "Branche" -#: kallithea/controllers/home.py:126 +#: kallithea/controllers/home.py:145 kallithea/templates/switch_to_list.html:16 msgid "Closed Branches" msgstr "Branches fermées" -#: kallithea/controllers/home.py:132 +#: kallithea/controllers/home.py:151 msgid "Tag" msgstr "Étiquette" -#: kallithea/controllers/home.py:138 +#: kallithea/controllers/home.py:157 msgid "Bookmark" msgstr "Signet" -#: kallithea/controllers/journal.py:113 kallithea/controllers/journal.py:155 +#: kallithea/controllers/journal.py:111 kallithea/controllers/journal.py:153 #: kallithea/templates/journal/public_journal.html:4 #: kallithea/templates/journal/public_journal.html:21 msgid "Public Journal" msgstr "Journal public" -#: kallithea/controllers/journal.py:117 kallithea/controllers/journal.py:159 -#: kallithea/templates/base/base.html:295 -#: kallithea/templates/journal/journal.html:5 -#: kallithea/templates/journal/journal.html:13 -#: kallithea/tests/data/templates/base/base.html.py:498 -#: kallithea/tests/data/templates/journal/journal.html.py:124 -#: kallithea/tests/data/templates/journal/journal.html.py:228 +#: kallithea/controllers/journal.py:115 kallithea/controllers/journal.py:157 +#: kallithea/templates/base/base.html:306 +#: kallithea/templates/journal/journal.html:4 +#: kallithea/templates/journal/journal.html:12 msgid "Journal" msgstr "Historique" -#: kallithea/controllers/login.py:142 kallithea/controllers/login.py:188 +#: kallithea/controllers/login.py:144 kallithea/controllers/login.py:190 msgid "Bad captcha" msgstr "Mauvais captcha" -#: kallithea/controllers/login.py:148 -#, python-format +#: kallithea/controllers/login.py:150 msgid "You have successfully registered with %s" msgstr "Vous vous êtes inscrits avec succès à %s" -#: kallithea/controllers/login.py:193 +#: kallithea/controllers/login.py:195 msgid "A password reset confirmation code has been sent" msgstr "Un lien de confirmation de réinitialisation de mot de passe a été envoyé" -#: kallithea/controllers/login.py:242 +#: kallithea/controllers/login.py:244 msgid "Invalid password reset token" msgstr "Clé de réinitialisation de mot de passe invalide" -#: kallithea/controllers/login.py:247 -#: kallithea/controllers/admin/my_account.py:157 +#: kallithea/controllers/login.py:249 +#: kallithea/controllers/admin/my_account.py:167 msgid "Successfully updated password" msgstr "Mot de passe mis à jour avec succès" -#: kallithea/controllers/pullrequests.py:73 -#, python-format -msgid "Invalid reviewer \"%s\" specified" -msgstr "Reviewer spécifié \"%s\" non valide" - -#: kallithea/controllers/pullrequests.py:135 +#: kallithea/controllers/pullrequests.py:123 #, python-format msgid "%s (closed)" msgstr "%s (fermé)" -#: kallithea/controllers/pullrequests.py:162 +#: kallithea/controllers/pullrequests.py:151 #: kallithea/templates/changeset/changeset.html:12 -#: kallithea/tests/data/templates/changeset/changeset.html.py:408 -#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:97 -#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:91 +#: kallithea/templates/email_templates/changeset_comment.html:17 msgid "Changeset" msgstr "Changements" -#: kallithea/controllers/pullrequests.py:183 +#: kallithea/controllers/pullrequests.py:172 msgid "Special" msgstr "Spécial" -#: kallithea/controllers/pullrequests.py:184 +#: kallithea/controllers/pullrequests.py:173 msgid "Peer branches" msgstr "Branches appairées" -#: kallithea/controllers/pullrequests.py:185 kallithea/model/scm.py:711 +#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:722 +#: kallithea/templates/switch_to_list.html:38 +#: kallithea/templates/bookmarks/bookmarks.html:10 msgid "Bookmarks" msgstr "Signets" -#: kallithea/controllers/pullrequests.py:326 +#: kallithea/controllers/pullrequests.py:312 #, python-format msgid "Error creating pull request: %s" msgstr "Erreur de création de la demande de pull : %s" -#: kallithea/controllers/pullrequests.py:353 -#: kallithea/controllers/pullrequests.py:376 +#: kallithea/controllers/pullrequests.py:358 +#: kallithea/controllers/pullrequests.py:505 +msgid "No description" +msgstr "Aucune description" + +#: kallithea/controllers/pullrequests.py:365 +msgid "Successfully opened new pull request" +msgstr "La requête de pull a été ouverte avec succès" + +#: kallithea/controllers/pullrequests.py:368 +#: kallithea/controllers/pullrequests.py:455 +#: kallithea/controllers/pullrequests.py:512 +#, python-format +msgid "Invalid reviewer \"%s\" specified" +msgstr "Reviewer spécifié \"%s\" non valide" + +#: kallithea/controllers/pullrequests.py:371 +#: kallithea/controllers/pullrequests.py:458 msgid "Error occurred while creating pull request" msgstr "Une erreur est survenue durant la création de la pull request" -#: kallithea/controllers/pullrequests.py:358 -msgid "Successfully opened new pull request" -msgstr "La requête de pull a été ouverte avec succès" - -#: kallithea/controllers/pullrequests.py:381 -#, fuzzy -#| msgid "Pull request update created" -msgid "New pull request iteration created" -msgstr "Mise à jour de la pull request créée" +#: kallithea/controllers/pullrequests.py:403 +msgid "Missing changesets since the previous pull request:" +msgstr "Changeset manquant depuis la précédente pull request :" #: kallithea/controllers/pullrequests.py:410 #, python-format -msgid "Meanwhile, the following reviewers have been added: %s" +msgid "New changesets on %s %s since the previous pull request:" +msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :" + +#: kallithea/controllers/pullrequests.py:417 +msgid "Ancestor didn't change - show diff since previous version:" msgstr "" - -#: kallithea/controllers/pullrequests.py:414 -#, python-format -msgid "Meanwhile, the following reviewers have been removed: %s" +"L'ancêtre n'a pas changé - montrer les différences avec la version " +"précédente :" + +#: kallithea/controllers/pullrequests.py:424 +#, python-format +msgid "" +"This pull request is based on another %s revision and there is no simple " +"diff." msgstr "" - -#: kallithea/controllers/pullrequests.py:430 -#: kallithea/model/pull_request.py:234 -msgid "No description" -msgstr "Aucune description" - -#: kallithea/controllers/pullrequests.py:439 +"Cette demande de pull est basée sur une autre révision %s et il n'y a pas" +" de diff simple." + +#: kallithea/controllers/pullrequests.py:426 +#, python-format +msgid "No changes found on %s %s since previous version." +msgstr "Aucun changement constaté sur %s %s depuis la version précédente." + +#: kallithea/controllers/pullrequests.py:464 +#, python-format +msgid "Closed, replaced by %s ." +msgstr "Fermé, remplacé par %s." + +#: kallithea/controllers/pullrequests.py:472 +msgid "Pull request update created" +msgstr "Mise à jour de la pull request créée" + +#: kallithea/controllers/pullrequests.py:516 msgid "Pull request updated" msgstr "Pull request mise à jour" -#: kallithea/controllers/pullrequests.py:453 +#: kallithea/controllers/pullrequests.py:531 msgid "Successfully deleted pull request" msgstr "La requête de pull a été supprimée avec succès" -#: kallithea/controllers/pullrequests.py:491 -#, fuzzy, python-format -#| msgid "Changeset for %s %s not found in %s" -msgid "Revision %s not found in %s" -msgstr "Ensemble de changements non trouvé" - -#: kallithea/controllers/pullrequests.py:518 -#, fuzzy, python-format -#| msgid "No changesets found for updating this pull request." -msgid "Error: changesets not found when displaying pull request from %s." -msgstr "Pas de changeset trouvé pour ce pull request." - -#: kallithea/controllers/pullrequests.py:532 +#: kallithea/controllers/pullrequests.py:597 #, python-format msgid "This pull request has already been merged to %s." msgstr "Cette pull request a déjà été fusionnée à %s." -#: kallithea/controllers/pullrequests.py:534 +#: kallithea/controllers/pullrequests.py:599 msgid "This pull request has been closed and can not be updated." msgstr "Cette pull request a été fermée et ne peut pas être mise à jour." -#: kallithea/controllers/pullrequests.py:552 -#, fuzzy, python-format -#| msgid "The following changes are available on %s:" -msgid "The following additional changes are available on %s:" +#: kallithea/controllers/pullrequests.py:617 +#, python-format +msgid "The following changes are available on %s:" msgstr "Les modifications suivantes sont disponibles sur %s :" -#: kallithea/controllers/pullrequests.py:556 -#, fuzzy -#| msgid "No changesets found for updating this pull request." -msgid "No additional changesets found for iterating on this pull request." +#: kallithea/controllers/pullrequests.py:621 +msgid "No changesets found for updating this pull request." msgstr "Pas de changeset trouvé pour ce pull request." -#: kallithea/controllers/pullrequests.py:564 +#: kallithea/controllers/pullrequests.py:629 #, python-format msgid "Note: Branch %s has another head: %s." msgstr "Note: La branche %s a une autre tête: %s." -#: kallithea/controllers/pullrequests.py:571 -#, fuzzy -#| msgid "Git pull requests don't support updates yet." -msgid "Git pull requests don't support iterating yet." +#: kallithea/controllers/pullrequests.py:635 +msgid "Git pull requests don't support updates yet." msgstr "Le smises à jour des Git pull requests ne sont pas encore supportées." -#: kallithea/controllers/pullrequests.py:573 -#, fuzzy, python-format -#| msgid "No changesets found for updating this pull request." -msgid "Error: some changesets not found when displaying pull request from %s." -msgstr "Pas de changeset trouvé pour ce pull request." - -#: kallithea/controllers/pullrequests.py:598 -msgid "The diff can't be shown - the PR revisions could not be found." -msgstr "" - -#: kallithea/controllers/pullrequests.py:665 +#: kallithea/controllers/pullrequests.py:727 msgid "No permission to change pull request status" msgstr "Permission manquante pour changer le statut du pull request" -#: kallithea/controllers/pullrequests.py:676 +#: kallithea/controllers/pullrequests.py:738 #, python-format msgid "Successfully deleted pull request %s" msgstr "La requête de pull %s a été supprimée avec succès" -#: kallithea/controllers/search.py:134 +#: kallithea/controllers/pullrequests.py:748 +msgid "Closing." +msgstr "Fermeture." + +#: kallithea/controllers/search.py:135 msgid "Invalid search query. Try quoting it." msgstr "Requête invalide. Essayer de la mettre entre guillemets." -#: kallithea/controllers/search.py:139 +#: kallithea/controllers/search.py:140 msgid "There is no index to search in. Please run whoosh indexer" msgstr "" "L’index de recherche n’est pas présent. Veuillez exécuter l’indexeur de " "code Whoosh" -#: kallithea/controllers/search.py:143 +#: kallithea/controllers/search.py:144 msgid "An error occurred during search operation." msgstr "Une erreur est survenue pendant la recherche." -#: kallithea/controllers/summary.py:173 -#: kallithea/templates/summary/summary.html:360 -#: kallithea/tests/data/templates/summary/summary.html.py:293 +#: kallithea/controllers/summary.py:181 +#: kallithea/templates/summary/summary.html:384 msgid "No data ready yet" msgstr "Aucune donnée actuellement disponible" -#: kallithea/controllers/summary.py:176 -#: kallithea/templates/summary/summary.html:88 -#: kallithea/tests/data/templates/summary/summary.html.py:161 +#: kallithea/controllers/summary.py:184 +#: kallithea/templates/summary/summary.html:98 msgid "Statistics are disabled for this repository" msgstr "La mise à jour des statistiques est désactivée pour ce dépôt" @@ -528,157 +487,153 @@ "une erreur est survenue pendant la mise à jour des réglages " "d'authentification" -#: kallithea/controllers/admin/defaults.py:75 +#: kallithea/controllers/admin/defaults.py:97 msgid "Default settings updated successfully" msgstr "Mise à jour des réglages par défaut effectuée avec succès" -#: kallithea/controllers/admin/defaults.py:90 +#: kallithea/controllers/admin/defaults.py:112 msgid "Error occurred during update of defaults" msgstr "Une erreur est survenue durant la mise à jour des réglages par défaut" #: kallithea/controllers/admin/gists.py:58 -#: kallithea/controllers/admin/my_account.py:232 -#: kallithea/controllers/admin/users.py:250 +#: kallithea/controllers/admin/my_account.py:243 +#: kallithea/controllers/admin/users.py:284 msgid "Forever" msgstr "Pour toujours" #: kallithea/controllers/admin/gists.py:59 -#: kallithea/controllers/admin/my_account.py:233 -#: kallithea/controllers/admin/users.py:251 +#: kallithea/controllers/admin/my_account.py:244 +#: kallithea/controllers/admin/users.py:285 msgid "5 minutes" msgstr "5 minute" #: kallithea/controllers/admin/gists.py:60 -#: kallithea/controllers/admin/my_account.py:234 -#: kallithea/controllers/admin/users.py:252 +#: kallithea/controllers/admin/my_account.py:245 +#: kallithea/controllers/admin/users.py:286 msgid "1 hour" msgstr "1 heure" #: kallithea/controllers/admin/gists.py:61 -#: kallithea/controllers/admin/my_account.py:235 -#: kallithea/controllers/admin/users.py:253 +#: kallithea/controllers/admin/my_account.py:246 +#: kallithea/controllers/admin/users.py:287 msgid "1 day" msgstr "1 jour" #: kallithea/controllers/admin/gists.py:62 -#: kallithea/controllers/admin/my_account.py:236 -#: kallithea/controllers/admin/users.py:254 +#: kallithea/controllers/admin/my_account.py:247 +#: kallithea/controllers/admin/users.py:288 msgid "1 month" msgstr "1 mois" #: kallithea/controllers/admin/gists.py:66 -#: kallithea/controllers/admin/my_account.py:238 -#: kallithea/controllers/admin/users.py:256 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:65 -#: kallithea/templates/admin/users/user_edit_api_keys.html:65 +#: kallithea/controllers/admin/my_account.py:249 +#: kallithea/controllers/admin/users.py:290 msgid "Lifetime" msgstr "Toujours" -#: kallithea/controllers/admin/gists.py:141 +#: kallithea/controllers/admin/gists.py:145 msgid "Error occurred during gist creation" msgstr "Une erreur est survenue lors de la création du gist" -#: kallithea/controllers/admin/gists.py:159 +#: kallithea/controllers/admin/gists.py:183 #, python-format msgid "Deleted gist %s" msgstr "Gist %s supprimé" -#: kallithea/controllers/admin/gists.py:200 +#: kallithea/controllers/admin/gists.py:232 msgid "Unmodified" msgstr "Non modifié" -#: kallithea/controllers/admin/gists.py:229 +#: kallithea/controllers/admin/gists.py:261 msgid "Successfully updated gist content" msgstr "Le contenu du gist a été mis à jour avec succès" -#: kallithea/controllers/admin/gists.py:234 +#: kallithea/controllers/admin/gists.py:266 msgid "Successfully updated gist data" msgstr "Les données du gist on été mises à jour avec succès" -#: kallithea/controllers/admin/gists.py:237 +#: kallithea/controllers/admin/gists.py:269 #, python-format msgid "Error occurred during update of gist %s" msgstr "Une erreur est survenue durant la mise à jour du gist %s" -#: kallithea/controllers/admin/my_account.py:69 kallithea/model/user.py:214 -#: kallithea/model/user.py:235 +#: kallithea/controllers/admin/my_account.py:70 kallithea/model/user.py:215 +#: kallithea/model/user.py:237 msgid "You can't edit this user since it's crucial for entire application" msgstr "" "Vous ne pouvez pas éditer cet utilisateur ; il est nécessaire pour le bon" " fonctionnement de l’application" -#: kallithea/controllers/admin/my_account.py:119 +#: kallithea/controllers/admin/my_account.py:129 msgid "Your account was updated successfully" msgstr "Votre compte a été mis à jour avec succès" -#: kallithea/controllers/admin/my_account.py:134 -#: kallithea/controllers/admin/users.py:183 +#: kallithea/controllers/admin/my_account.py:144 +#: kallithea/controllers/admin/users.py:201 #, python-format msgid "Error occurred during update of user %s" msgstr "Une erreur est survenue durant la mise à jour de l'utilisateur %s" -#: kallithea/controllers/admin/my_account.py:168 +#: kallithea/controllers/admin/my_account.py:178 msgid "Error occurred during update of user password" msgstr "" "Une erreur est survenue durant la mise à jour du mot de passe de " "l'utilisateur" -#: kallithea/controllers/admin/my_account.py:209 -#: kallithea/controllers/admin/users.py:371 +#: kallithea/controllers/admin/my_account.py:220 +#: kallithea/controllers/admin/users.py:414 #, python-format msgid "Added email %s to user" msgstr "L’e-mail « %s » a été ajouté à l’utilisateur" -#: kallithea/controllers/admin/my_account.py:215 -#: kallithea/controllers/admin/users.py:377 +#: kallithea/controllers/admin/my_account.py:226 +#: kallithea/controllers/admin/users.py:420 msgid "An error occurred during email saving" msgstr "Une erreur est survenue durant l’enregistrement de l’e-mail" -#: kallithea/controllers/admin/my_account.py:224 -#: kallithea/controllers/admin/users.py:387 +#: kallithea/controllers/admin/my_account.py:235 +#: kallithea/controllers/admin/users.py:432 msgid "Removed email from user" msgstr "L’e-mail a été enlevé de l’utilisateur" -#: kallithea/controllers/admin/my_account.py:248 -#: kallithea/controllers/admin/users.py:273 +#: kallithea/controllers/admin/my_account.py:259 +#: kallithea/controllers/admin/users.py:307 msgid "API key successfully created" msgstr "Clé d'API créée avec succès" -#: kallithea/controllers/admin/my_account.py:257 -#: kallithea/controllers/admin/users.py:283 +#: kallithea/controllers/admin/my_account.py:271 +#: kallithea/controllers/admin/users.py:320 msgid "API key successfully reset" msgstr "Clé d'API remise à zéro avec succès" -#: kallithea/controllers/admin/my_account.py:261 -#: kallithea/controllers/admin/users.py:287 +#: kallithea/controllers/admin/my_account.py:275 +#: kallithea/controllers/admin/users.py:324 msgid "API key successfully deleted" msgstr "Clé d'API supprimée avec succès" +#: kallithea/controllers/admin/permissions.py:62 +#: kallithea/controllers/admin/permissions.py:66 +#: kallithea/controllers/admin/permissions.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 +#: kallithea/templates/base/perms_summary.html:15 +msgid "Read" +msgstr "Lire" + #: kallithea/controllers/admin/permissions.py:63 #: kallithea/controllers/admin/permissions.py:67 #: kallithea/controllers/admin/permissions.py:71 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:8 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:8 -#: kallithea/templates/base/perms_summary.html:15 -#: kallithea/tests/data/templates/base/perms_summary.html.py:63 -msgid "Read" -msgstr "Lire" +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 +#: kallithea/templates/base/perms_summary.html:16 +msgid "Write" +msgstr "Écrire" #: kallithea/controllers/admin/permissions.py:64 #: kallithea/controllers/admin/permissions.py:68 #: kallithea/controllers/admin/permissions.py:72 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:9 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:9 -#: kallithea/templates/base/perms_summary.html:16 -#: kallithea/tests/data/templates/base/perms_summary.html.py:69 -msgid "Write" -msgstr "Écrire" - -#: kallithea/controllers/admin/permissions.py:65 -#: kallithea/controllers/admin/permissions.py:69 -#: kallithea/controllers/admin/permissions.py:73 #: kallithea/templates/admin/auth/auth_settings.html:9 #: kallithea/templates/admin/defaults/defaults.html:9 #: kallithea/templates/admin/permissions/permissions.html:9 @@ -686,296 +641,279 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit.html:9 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:47 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 #: kallithea/templates/admin/repos/repo_add.html:10 #: kallithea/templates/admin/repos/repo_add.html:14 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:10 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 +#: kallithea/templates/admin/repos/repos.html:9 #: kallithea/templates/admin/settings/settings.html:9 #: kallithea/templates/admin/user_groups/user_group_add.html:8 #: kallithea/templates/admin/user_groups/user_group_edit.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:10 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:47 -#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:10 #: kallithea/templates/admin/users/user_add.html:8 #: kallithea/templates/admin/users/user_edit.html:9 -#: kallithea/templates/admin/users/user_edit_profile.html:81 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/admin/users/users.html:43 -#: kallithea/templates/base/base.html:325 -#: kallithea/templates/base/base.html:326 -#: kallithea/templates/base/base.html:332 -#: kallithea/templates/base/base.html:333 +#: kallithea/templates/admin/users/user_edit_profile.html:105 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/admin/users/users.html:55 +#: kallithea/templates/base/base.html:336 +#: kallithea/templates/base/base.html:337 +#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:344 #: kallithea/templates/base/perms_summary.html:17 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:226 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:160 -#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:142 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:153 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:140 -#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:117 -#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:123 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:172 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:162 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:144 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:163 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:168 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:98 -#: kallithea/tests/data/templates/admin/users/users.html.py:119 -#: kallithea/tests/data/templates/admin/users/users.html.py:143 -#: kallithea/tests/data/templates/base/base.html.py:550 -#: kallithea/tests/data/templates/base/base.html.py:554 -#: kallithea/tests/data/templates/base/base.html.py:562 -#: kallithea/tests/data/templates/base/base.html.py:564 -#: kallithea/tests/data/templates/base/perms_summary.html.py:75 msgid "Admin" msgstr "Administration" -#: kallithea/controllers/admin/permissions.py:76 +#: kallithea/controllers/admin/permissions.py:75 +#: kallithea/controllers/admin/permissions.py:86 +#: kallithea/controllers/admin/permissions.py:91 +#: kallithea/controllers/admin/permissions.py:94 +#: kallithea/controllers/admin/permissions.py:97 +#: kallithea/controllers/admin/permissions.py:100 +#: kallithea/templates/admin/auth/auth_settings.html:40 +msgid "Disabled" +msgstr "Interdite" + +#: kallithea/controllers/admin/permissions.py:77 +msgid "Allowed with manual account activation" +msgstr "Autorisé avec activation de compte manuelle" + +#: kallithea/controllers/admin/permissions.py:79 +msgid "Allowed with automatic account activation" +msgstr "Autorisé avec activation de compte automatique" + +#: kallithea/controllers/admin/permissions.py:82 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1439 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1485 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1542 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1564 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1603 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1655 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1682 kallithea/model/db.py:1705 +msgid "Manual activation of external account" +msgstr "Activation manuelle du compte externe" + +#: kallithea/controllers/admin/permissions.py:83 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1440 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1486 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1565 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1604 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1656 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1683 kallithea/model/db.py:1706 +msgid "Automatic activation of external account" +msgstr "Activation automatique du compte externe" + #: kallithea/controllers/admin/permissions.py:87 -#: kallithea/controllers/admin/permissions.py:92 +#: kallithea/controllers/admin/permissions.py:90 #: kallithea/controllers/admin/permissions.py:95 #: kallithea/controllers/admin/permissions.py:98 #: kallithea/controllers/admin/permissions.py:101 -#: kallithea/templates/admin/auth/auth_settings.html:42 -#: kallithea/templates/base/root.html:43 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 -#: kallithea/tests/data/templates/base/root.html.py:121 -msgid "Disabled" -msgstr "Interdite" - -#: kallithea/controllers/admin/permissions.py:78 -msgid "Allowed with manual account activation" -msgstr "Autorisé avec activation de compte manuelle" - -#: kallithea/controllers/admin/permissions.py:80 -msgid "Allowed with automatic account activation" -msgstr "Autorisé avec activation de compte automatique" - -#: kallithea/controllers/admin/permissions.py:83 kallithea/model/db.py:1751 -msgid "Manual activation of external account" -msgstr "Activation manuelle du compte externe" - -#: kallithea/controllers/admin/permissions.py:84 kallithea/model/db.py:1752 -msgid "Automatic activation of external account" -msgstr "Activation automatique du compte externe" - -#: kallithea/controllers/admin/permissions.py:88 -#: kallithea/controllers/admin/permissions.py:91 -#: kallithea/controllers/admin/permissions.py:96 -#: kallithea/controllers/admin/permissions.py:99 -#: kallithea/controllers/admin/permissions.py:102 -#: kallithea/templates/admin/auth/auth_settings.html:42 -#: kallithea/templates/base/root.html:42 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:130 -#: kallithea/tests/data/templates/base/root.html.py:119 +#: kallithea/templates/admin/auth/auth_settings.html:40 msgid "Enabled" msgstr "Autorisée" -#: kallithea/controllers/admin/permissions.py:125 +#: kallithea/controllers/admin/permissions.py:124 msgid "Global permissions updated successfully" msgstr "Permissions globales mises à jour avec succès" -#: kallithea/controllers/admin/permissions.py:140 +#: kallithea/controllers/admin/permissions.py:139 msgid "Error occurred during update of permissions" msgstr "Une erreur est survenue durant la mise à jour des permissions" -#: kallithea/controllers/admin/repo_groups.py:180 +#: kallithea/controllers/admin/repo_groups.py:187 #, python-format msgid "Error occurred during creation of repository group %s" msgstr "Une erreur est survenue durant la création du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:185 +#: kallithea/controllers/admin/repo_groups.py:192 #, python-format msgid "Created repository group %s" msgstr "Groupe de dépôts %s créé" -#: kallithea/controllers/admin/repo_groups.py:232 +#: kallithea/controllers/admin/repo_groups.py:249 #, python-format msgid "Updated repository group %s" msgstr "Groupe de dépôts %s mis à jour" -#: kallithea/controllers/admin/repo_groups.py:248 +#: kallithea/controllers/admin/repo_groups.py:265 #, python-format msgid "Error occurred during update of repository group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:258 +#: kallithea/controllers/admin/repo_groups.py:283 #, python-format msgid "This group contains %s repositories and cannot be deleted" msgstr "Ce groupe contient %s dépôts et ne peut être supprimé" -#: kallithea/controllers/admin/repo_groups.py:265 +#: kallithea/controllers/admin/repo_groups.py:290 #, python-format msgid "This group contains %s subgroups and cannot be deleted" msgstr "Ce groupe contient %s sous-groupes et ne peut pas être supprimé" -#: kallithea/controllers/admin/repo_groups.py:271 +#: kallithea/controllers/admin/repo_groups.py:296 #, python-format msgid "Removed repository group %s" msgstr "Groupe de dépôts %s supprimé" -#: kallithea/controllers/admin/repo_groups.py:276 +#: kallithea/controllers/admin/repo_groups.py:301 #, python-format msgid "Error occurred during deletion of repository group %s" msgstr "Une erreur est survenue durant la suppression du groupe de dépôts %s" -#: kallithea/controllers/admin/repo_groups.py:361 -#: kallithea/controllers/admin/repo_groups.py:391 -#: kallithea/controllers/admin/user_groups.py:305 +#: kallithea/controllers/admin/repo_groups.py:404 +#: kallithea/controllers/admin/repo_groups.py:439 +#: kallithea/controllers/admin/user_groups.py:340 msgid "Cannot revoke permission for yourself as admin" msgstr "Impossible de révoquer votre permission d'administrateur" -#: kallithea/controllers/admin/repo_groups.py:376 +#: kallithea/controllers/admin/repo_groups.py:419 msgid "Repository group permissions updated" msgstr "Permissions du groupe de dépôts mises à jour" -#: kallithea/controllers/admin/repo_groups.py:408 -#: kallithea/controllers/admin/repos.py:362 -#: kallithea/controllers/admin/user_groups.py:317 +#: kallithea/controllers/admin/repo_groups.py:456 +#: kallithea/controllers/admin/repos.py:397 +#: kallithea/controllers/admin/user_groups.py:352 msgid "An error occurred during revoking of permission" msgstr "Une erreur est survenue durant la révocation de la permission" -#: kallithea/controllers/admin/repos.py:138 +#: kallithea/controllers/admin/repos.py:151 #, python-format msgid "Error creating repository %s" msgstr "Erreur de création du dépôt %s" -#: kallithea/controllers/admin/repos.py:198 +#: kallithea/controllers/admin/repos.py:212 #, python-format msgid "Created repository %s from %s" msgstr "Dépôt %s créé depuis %s" -#: kallithea/controllers/admin/repos.py:207 +#: kallithea/controllers/admin/repos.py:221 #, python-format msgid "Forked repository %s as %s" msgstr "dépôt %s forké en tant que %s" -#: kallithea/controllers/admin/repos.py:210 +#: kallithea/controllers/admin/repos.py:224 #, python-format msgid "Created repository %s" msgstr "Dépôt %s créé" -#: kallithea/controllers/admin/repos.py:239 +#: kallithea/controllers/admin/repos.py:261 #, python-format msgid "Repository %s updated successfully" msgstr "Dépôt %s mis à jour avec succès" -#: kallithea/controllers/admin/repos.py:260 +#: kallithea/controllers/admin/repos.py:282 #, python-format msgid "Error occurred during update of repository %s" msgstr "Une erreur est survenue durant la mise à jour du dépôt %s" -#: kallithea/controllers/admin/repos.py:278 +#: kallithea/controllers/admin/repos.py:309 #, python-format msgid "Detached %s forks" msgstr "%s forks détachés" -#: kallithea/controllers/admin/repos.py:281 +#: kallithea/controllers/admin/repos.py:312 #, python-format msgid "Deleted %s forks" msgstr "%s forks supprimés" -#: kallithea/controllers/admin/repos.py:286 +#: kallithea/controllers/admin/repos.py:317 #, python-format msgid "Deleted repository %s" msgstr "Dépôt %s supprimé" -#: kallithea/controllers/admin/repos.py:289 +#: kallithea/controllers/admin/repos.py:320 #, python-format msgid "Cannot delete repository %s which still has forks" msgstr "Impossible de supprimer le dépôt %s : des forks y sont attachés" -#: kallithea/controllers/admin/repos.py:294 +#: kallithea/controllers/admin/repos.py:325 #, python-format msgid "An error occurred during deletion of %s" msgstr "Erreur pendant la suppression de %s" -#: kallithea/controllers/admin/repos.py:338 +#: kallithea/controllers/admin/repos.py:373 msgid "Repository permissions updated" msgstr "Permissions du dépôt mises à jour" -#: kallithea/controllers/admin/repos.py:391 -#, python-format -msgid "Field validation error: %s" -msgstr "" - -#: kallithea/controllers/admin/repos.py:394 -#, fuzzy, python-format -#| msgid "An error occurred during creation of field" -msgid "An error occurred during creation of field: %r" +#: kallithea/controllers/admin/repos.py:429 +msgid "An error occurred during creation of field" msgstr "Une erreur est survenue durant la création du champ" -#: kallithea/controllers/admin/repos.py:405 +#: kallithea/controllers/admin/repos.py:443 msgid "An error occurred during removal of field" msgstr "Une erreur est survenue durant la suppression du champ" -#: kallithea/controllers/admin/repos.py:419 +#: kallithea/controllers/admin/repos.py:459 msgid "-- Not a fork --" msgstr "-- Pas un fork --" -#: kallithea/controllers/admin/repos.py:450 +#: kallithea/controllers/admin/repos.py:490 msgid "Updated repository visibility in public journal" msgstr "La visibilité du dépôt dans le journal public a été mise à jour" -#: kallithea/controllers/admin/repos.py:454 +#: kallithea/controllers/admin/repos.py:494 msgid "An error occurred during setting this repository in public journal" msgstr "" "Une erreur est survenue durant la configuration du journal public pour ce" " dépôt" -#: kallithea/controllers/admin/repos.py:471 +#: kallithea/controllers/admin/repos.py:511 msgid "Nothing" msgstr "[Aucun dépôt]" -#: kallithea/controllers/admin/repos.py:473 +#: kallithea/controllers/admin/repos.py:513 #, python-format msgid "Marked repository %s as fork of %s" msgstr "Le dépôt %s a été marké comme fork de %s" -#: kallithea/controllers/admin/repos.py:480 +#: kallithea/controllers/admin/repos.py:520 msgid "An error occurred during this operation" msgstr "Une erreur est survenue durant cette opération" -#: kallithea/controllers/admin/repos.py:496 -#: kallithea/controllers/admin/repos.py:517 +#: kallithea/controllers/admin/repos.py:536 +#: kallithea/controllers/admin/repos.py:563 msgid "Repository has been locked" msgstr "Ce dépôt a été verrouillé" -#: kallithea/controllers/admin/repos.py:499 -#: kallithea/controllers/admin/repos.py:514 +#: kallithea/controllers/admin/repos.py:539 +#: kallithea/controllers/admin/repos.py:560 msgid "Repository has been unlocked" msgstr "Ce dépôt a été déverrouillé" -#: kallithea/controllers/admin/repos.py:502 -#: kallithea/controllers/admin/repos.py:521 +#: kallithea/controllers/admin/repos.py:542 +#: kallithea/controllers/admin/repos.py:567 msgid "An error occurred during unlocking" msgstr "Une erreur est survenue durant le déverrouillage" -#: kallithea/controllers/admin/repos.py:533 +#: kallithea/controllers/admin/repos.py:581 msgid "Cache invalidation successful" msgstr "Invalidation du cache réalisée avec succès" -#: kallithea/controllers/admin/repos.py:537 +#: kallithea/controllers/admin/repos.py:585 msgid "An error occurred during cache invalidation" msgstr "Une erreur est survenue durant l’invalidation du cache" -#: kallithea/controllers/admin/repos.py:550 +#: kallithea/controllers/admin/repos.py:600 msgid "Pulled from remote location" msgstr "Les changements distants ont été récupérés" -#: kallithea/controllers/admin/repos.py:553 +#: kallithea/controllers/admin/repos.py:603 msgid "An error occurred during pull from remote location" msgstr "Une erreur est survenue durant le pull depuis la source distante" -#: kallithea/controllers/admin/repos.py:584 +#: kallithea/controllers/admin/repos.py:636 msgid "An error occurred during deletion of repository stats" msgstr "Une erreur est survenue durant la suppression des statistiques du dépôt" -#: kallithea/controllers/admin/settings.py:135 +#: kallithea/controllers/admin/settings.py:141 msgid "Updated VCS settings" msgstr "Réglages des gestionnaires de versions mis à jour" -#: kallithea/controllers/admin/settings.py:139 -#: kallithea/model/validators.py:426 +#: kallithea/controllers/admin/settings.py:145 msgid "" "Unable to activate hgsubversion support. The \"hgsubversion\" library is " "missing" @@ -983,354 +921,340 @@ "Impossible d'activer la prise en charge de hgsubversion. La bibliothèque " "« hgsubversion » est manquante" -#: kallithea/controllers/admin/settings.py:145 -#: kallithea/controllers/admin/settings.py:234 +#: kallithea/controllers/admin/settings.py:151 +#: kallithea/controllers/admin/settings.py:248 msgid "Error occurred while updating application settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "l'application" -#: kallithea/controllers/admin/settings.py:174 +#: kallithea/controllers/admin/settings.py:187 #, python-format msgid "Repositories successfully rescanned. Added: %s. Removed: %s." msgstr "Dépôts ré-analysés avec succès. Ajouté : %s. Supprimé : %s." -#: kallithea/controllers/admin/settings.py:189 -#, fuzzy, python-format -msgid "Invalidated %s repositories" -msgstr "Invalider le cache pour tous les dépôts" - -#: kallithea/controllers/admin/settings.py:230 +#: kallithea/controllers/admin/settings.py:244 msgid "Updated application settings" msgstr "Réglages mis à jour" -#: kallithea/controllers/admin/settings.py:283 +#: kallithea/controllers/admin/settings.py:301 msgid "Updated visualisation settings" msgstr "Réglages d’affichage mis à jour" -#: kallithea/controllers/admin/settings.py:288 +#: kallithea/controllers/admin/settings.py:306 msgid "Error occurred during updating visualisation settings" msgstr "" "Une erreur est survenue durant la mise à jour des réglages de " "visualisation" -#: kallithea/controllers/admin/settings.py:312 +#: kallithea/controllers/admin/settings.py:332 msgid "Please enter email address" msgstr "Veuillez entrer votre adresse e-mail" -#: kallithea/controllers/admin/settings.py:327 +#: kallithea/controllers/admin/settings.py:347 msgid "Send email task created" msgstr "Tâche d'envoi d'e-mail créée" -#: kallithea/controllers/admin/settings.py:356 +#: kallithea/controllers/admin/settings.py:378 msgid "Added new hook" msgstr "Le nouveau hook a été ajouté" -#: kallithea/controllers/admin/settings.py:370 +#: kallithea/controllers/admin/settings.py:392 msgid "Updated hooks" msgstr "Hooks mis à jour" -#: kallithea/controllers/admin/settings.py:374 +#: kallithea/controllers/admin/settings.py:396 msgid "Error occurred during hook creation" msgstr "Une erreur est survenue durant la création du hook" -#: kallithea/controllers/admin/settings.py:398 +#: kallithea/controllers/admin/settings.py:422 msgid "Whoosh reindex task scheduled" msgstr "La tâche de réindexation Whoosh a été planifiée" -#: kallithea/controllers/admin/user_groups.py:145 +#: kallithea/controllers/admin/user_groups.py:150 #, python-format msgid "Created user group %s" msgstr "Groupe d'utilisateurs %s créé" -#: kallithea/controllers/admin/user_groups.py:158 +#: kallithea/controllers/admin/user_groups.py:163 #, python-format msgid "Error occurred during creation of user group %s" msgstr "Une erreur est survenue durant la création du groupe d'utilisateurs %s" -#: kallithea/controllers/admin/user_groups.py:186 +#: kallithea/controllers/admin/user_groups.py:201 #, python-format msgid "Updated user group %s" msgstr "Groupe d'utilisateurs %s mis à jour" -#: kallithea/controllers/admin/user_groups.py:208 +#: kallithea/controllers/admin/user_groups.py:224 #, python-format msgid "Error occurred during update of user group %s" msgstr "Une erreur est survenue durant la mise à jour du groupe d'utilisateurs %s" -#: kallithea/controllers/admin/user_groups.py:219 +#: kallithea/controllers/admin/user_groups.py:242 msgid "Successfully deleted user group" msgstr "Groupe d'utilisateurs supprimé avec succès" -#: kallithea/controllers/admin/user_groups.py:224 +#: kallithea/controllers/admin/user_groups.py:247 msgid "An error occurred during deletion of user group" msgstr "Une erreur est survenue durant la suppression du groupe d'utilisateurs" -#: kallithea/controllers/admin/user_groups.py:284 +#: kallithea/controllers/admin/user_groups.py:314 msgid "Target group cannot be the same" msgstr "Le groupe cible ne peut pas être le même" -#: kallithea/controllers/admin/user_groups.py:290 +#: kallithea/controllers/admin/user_groups.py:320 msgid "User group permissions updated" msgstr "Permissions du groupe d'utilisateurs mises à jour" -#: kallithea/controllers/admin/user_groups.py:401 -#: kallithea/controllers/admin/users.py:342 +#: kallithea/controllers/admin/user_groups.py:440 +#: kallithea/controllers/admin/users.py:383 msgid "Updated permissions" msgstr "Permissions mises à jour" -#: kallithea/controllers/admin/user_groups.py:405 -#: kallithea/controllers/admin/users.py:346 +#: kallithea/controllers/admin/user_groups.py:444 +#: kallithea/controllers/admin/users.py:387 msgid "An error occurred during permissions saving" msgstr "Une erreur est survenue durant l’enregistrement des permissions" -#: kallithea/controllers/admin/users.py:125 +#: kallithea/controllers/admin/users.py:133 #, python-format msgid "Created user %s" msgstr "Utilisateur %s créé" -#: kallithea/controllers/admin/users.py:140 +#: kallithea/controllers/admin/users.py:148 #, python-format msgid "Error occurred during creation of user %s" msgstr "Une erreur est survenue durant la création de l'utilisateur %s" -#: kallithea/controllers/admin/users.py:164 +#: kallithea/controllers/admin/users.py:181 msgid "User updated successfully" msgstr "L’utilisateur a été mis à jour avec succès" -#: kallithea/controllers/admin/users.py:192 +#: kallithea/controllers/admin/users.py:217 msgid "Successfully deleted user" msgstr "Utilisateur supprimé avec succès" -#: kallithea/controllers/admin/users.py:197 +#: kallithea/controllers/admin/users.py:222 msgid "An error occurred during deletion of user" msgstr "Une erreur est survenue durant la suppression de l’utilisateur" -#: kallithea/controllers/admin/users.py:205 +#: kallithea/controllers/admin/users.py:235 msgid "The default user cannot be edited" msgstr "L'utilisateur par défaut ne peut pas être modifié" -#: kallithea/controllers/admin/users.py:414 +#: kallithea/controllers/admin/users.py:462 #, python-format msgid "Added IP address %s to user whitelist" msgstr "L'adresse IP %s a été ajoutée à la liste blanche" -#: kallithea/controllers/admin/users.py:420 +#: kallithea/controllers/admin/users.py:468 msgid "An error occurred while adding IP address" msgstr "Une erreur est survenue durant la sauvegarde d'IP" -#: kallithea/controllers/admin/users.py:432 +#: kallithea/controllers/admin/users.py:482 msgid "Removed IP address from user whitelist" msgstr "L'adresse IP a été supprimée de la liste blanche" -#: kallithea/lib/auth.py:777 +#: kallithea/lib/auth.py:737 #, python-format msgid "IP %s not allowed" msgstr "IP %s non autorisée" -#: kallithea/lib/auth.py:829 -msgid "You need to be a registered user to perform this action" -msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action" - -#: kallithea/lib/auth.py:857 -msgid "You need to be signed in to view this page" -msgstr "Vous devez être connecté pour visualiser cette page" - -#: kallithea/lib/base.py:449 +#: kallithea/lib/auth.py:750 msgid "Invalid API key" msgstr "Clé d'API invalide" -#: kallithea/lib/base.py:508 +#: kallithea/lib/auth.py:768 msgid "CSRF token leak has been detected - all form tokens have been expired" msgstr "" -"Une fuite de jeton CSRF a été détectée - tous les jetons de formulaire " -"ont été marqués « expirés »" - -#: kallithea/lib/base.py:591 +"Une fuite de jeton CSRF a été détectée - tous les jetons de formulaire sont " +"considérés comme expirés" + +#: kallithea/lib/auth.py:813 +msgid "You need to be a registered user to perform this action" +msgstr "Vous devez être un utilisateur enregistré pour effectuer cette action" + +#: kallithea/lib/auth.py:843 +msgid "You need to be signed in to view this page" +msgstr "Vous devez être connecté pour visualiser cette page" + +#: kallithea/lib/base.py:493 msgid "Repository not found in the filesystem" msgstr "Dépôt non trouvé sur le système de fichiers" -#: kallithea/lib/base.py:617 -#, fuzzy, python-format -msgid "Changeset for %s %s not found in %s" +#: kallithea/lib/base.py:519 kallithea/lib/helpers.py:623 +msgid "Changeset not found" msgstr "Ensemble de changements non trouvé" -#: kallithea/lib/diffs.py:68 +#: kallithea/lib/diffs.py:66 msgid "Binary file" msgstr "Fichier binaire" -#: kallithea/lib/diffs.py:89 +#: kallithea/lib/diffs.py:82 msgid "Changeset was too big and was cut off, use diff menu to display this diff" msgstr "" "Cet ensemble de changements était trop gros pour être affiché et a été " "découpé, utilisez le menu « diff » pour afficher les différences" -#: kallithea/lib/diffs.py:99 +#: kallithea/lib/diffs.py:92 msgid "No changes detected" msgstr "Aucun changement détecté" -#: kallithea/lib/helpers.py:600 +#: kallithea/lib/helpers.py:610 #, python-format msgid "Deleted branch: %s" msgstr "Branche supprimée : %s" -#: kallithea/lib/helpers.py:602 +#: kallithea/lib/helpers.py:612 #, python-format msgid "Created tag: %s" msgstr "Étiquette créée : %s" -#: kallithea/lib/helpers.py:613 -#, fuzzy, python-format -msgid "Changeset %s not found" -msgstr "Ensemble de changements non trouvé" - -#: kallithea/lib/helpers.py:662 +#: kallithea/lib/helpers.py:672 #, python-format msgid "Show all combined changesets %s->%s" msgstr "Afficher les changements combinés %s->%s" -#: kallithea/lib/helpers.py:668 +#: kallithea/lib/helpers.py:678 msgid "Compare view" msgstr "Vue de comparaison" -#: kallithea/lib/helpers.py:687 +#: kallithea/lib/helpers.py:697 msgid "and" msgstr "et" -#: kallithea/lib/helpers.py:688 +#: kallithea/lib/helpers.py:698 #, python-format msgid "%s more" msgstr "%s de plus" -#: kallithea/lib/helpers.py:689 kallithea/templates/changelog/changelog.html:41 -#: kallithea/tests/data/templates/changelog/changelog.html.py:132 +#: kallithea/lib/helpers.py:699 kallithea/templates/changelog/changelog.html:44 msgid "revisions" msgstr "révisions" -#: kallithea/lib/helpers.py:713 +#: kallithea/lib/helpers.py:723 #, python-format msgid "Fork name %s" msgstr "Nom du fork %s" -#: kallithea/lib/helpers.py:734 +#: kallithea/lib/helpers.py:743 #, python-format msgid "Pull request %s" msgstr "Requête de pull %s" -#: kallithea/lib/helpers.py:744 +#: kallithea/lib/helpers.py:753 msgid "[deleted] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:746 kallithea/lib/helpers.py:758 +#: kallithea/lib/helpers.py:755 kallithea/lib/helpers.py:767 msgid "[created] repository" msgstr "[a créé] le dépôt" -#: kallithea/lib/helpers.py:748 +#: kallithea/lib/helpers.py:757 msgid "[created] repository as fork" msgstr "[a créé] le dépôt en tant que fork" -#: kallithea/lib/helpers.py:750 kallithea/lib/helpers.py:760 +#: kallithea/lib/helpers.py:759 kallithea/lib/helpers.py:769 msgid "[forked] repository" msgstr "[a forké] le dépôt" -#: kallithea/lib/helpers.py:752 kallithea/lib/helpers.py:762 +#: kallithea/lib/helpers.py:761 kallithea/lib/helpers.py:771 msgid "[updated] repository" msgstr "[a mis à jour] le dépôt" -#: kallithea/lib/helpers.py:754 +#: kallithea/lib/helpers.py:763 msgid "[downloaded] archive from repository" msgstr "[téléchargée] archive depuis le dépôt" -#: kallithea/lib/helpers.py:756 +#: kallithea/lib/helpers.py:765 msgid "[delete] repository" msgstr "[a supprimé] le dépôt" -#: kallithea/lib/helpers.py:764 +#: kallithea/lib/helpers.py:773 msgid "[created] user" msgstr "[a créé] l’utilisateur" -#: kallithea/lib/helpers.py:766 +#: kallithea/lib/helpers.py:775 msgid "[updated] user" msgstr "[a mis à jour] l’utilisateur" -#: kallithea/lib/helpers.py:768 +#: kallithea/lib/helpers.py:777 msgid "[created] user group" msgstr "[créé] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:770 +#: kallithea/lib/helpers.py:779 msgid "[updated] user group" msgstr "[mis à jour] groupe d'utilisateurs" -#: kallithea/lib/helpers.py:772 +#: kallithea/lib/helpers.py:781 msgid "[commented] on revision in repository" msgstr "[a commenté] une révision du dépôt" -#: kallithea/lib/helpers.py:774 +#: kallithea/lib/helpers.py:783 msgid "[commented] on pull request for" msgstr "[a commenté] la requête de pull pour" -#: kallithea/lib/helpers.py:776 +#: kallithea/lib/helpers.py:785 msgid "[closed] pull request for" msgstr "[a fermé] la requête de pull de" -#: kallithea/lib/helpers.py:778 +#: kallithea/lib/helpers.py:787 msgid "[pushed] into" msgstr "[a pushé] dans" -#: kallithea/lib/helpers.py:780 +#: kallithea/lib/helpers.py:789 msgid "[committed via Kallithea] into repository" msgstr "[a commité via Kallithea] dans le dépôt" -#: kallithea/lib/helpers.py:782 +#: kallithea/lib/helpers.py:791 msgid "[pulled from remote] into repository" msgstr "[a pullé depuis un site distant] dans le dépôt" -#: kallithea/lib/helpers.py:784 +#: kallithea/lib/helpers.py:793 msgid "[pulled] from" msgstr "[a pullé] depuis" -#: kallithea/lib/helpers.py:786 +#: kallithea/lib/helpers.py:795 msgid "[started following] repository" msgstr "[suit maintenant] le dépôt" -#: kallithea/lib/helpers.py:788 +#: kallithea/lib/helpers.py:797 msgid "[stopped following] repository" msgstr "[ne suit plus] le dépôt" -#: kallithea/lib/helpers.py:913 +#: kallithea/lib/helpers.py:1124 #, python-format msgid " and %s more" msgstr " et %s de plus" -#: kallithea/lib/helpers.py:917 -#: kallithea/templates/compare/compare_diff.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:310 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:165 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:405 +#: kallithea/lib/helpers.py:1128 +#: kallithea/templates/compare/compare_diff.html:71 +#: kallithea/templates/pullrequests/pullrequest_show.html:337 msgid "No files" msgstr "Aucun fichier" -#: kallithea/lib/helpers.py:942 +#: kallithea/lib/helpers.py:1194 msgid "new file" msgstr "nouveau fichier" -#: kallithea/lib/helpers.py:945 +#: kallithea/lib/helpers.py:1197 msgid "mod" msgstr "mod" -#: kallithea/lib/helpers.py:948 +#: kallithea/lib/helpers.py:1200 msgid "del" msgstr "suppr." -#: kallithea/lib/helpers.py:951 +#: kallithea/lib/helpers.py:1203 msgid "rename" msgstr "renommer" -#: kallithea/lib/helpers.py:956 +#: kallithea/lib/helpers.py:1208 msgid "chmod" msgstr "chmod" -#: kallithea/lib/helpers.py:1230 +#: kallithea/lib/helpers.py:1469 #, python-format msgid "" "%s repository is not mapped to db perhaps it was created or renamed from " @@ -1341,423 +1265,760 @@ "probablement été créé ou renommé manuellement. Veuillez relancer " "l’application pour rescanner les dépôts" -#: kallithea/lib/utils2.py:387 +#: kallithea/lib/utils2.py:434 #, python-format msgid "%d year" msgid_plural "%d years" msgstr[0] "%d an" msgstr[1] "%d ans" -#: kallithea/lib/utils2.py:388 +#: kallithea/lib/utils2.py:435 #, python-format msgid "%d month" msgid_plural "%d months" msgstr[0] "%d mois" msgstr[1] "%d mois" -#: kallithea/lib/utils2.py:389 +#: kallithea/lib/utils2.py:436 #, python-format msgid "%d day" msgid_plural "%d days" msgstr[0] "%d jour" msgstr[1] "%d jours" -#: kallithea/lib/utils2.py:390 +#: kallithea/lib/utils2.py:437 #, python-format msgid "%d hour" msgid_plural "%d hours" msgstr[0] "%d heure" msgstr[1] "%d heures" -#: kallithea/lib/utils2.py:391 +#: kallithea/lib/utils2.py:438 #, python-format msgid "%d minute" msgid_plural "%d minutes" msgstr[0] "%d minute" msgstr[1] "%d minutes" -#: kallithea/lib/utils2.py:392 +#: kallithea/lib/utils2.py:439 #, python-format msgid "%d second" msgid_plural "%d seconds" msgstr[0] "%d seconde" msgstr[1] "%d secondes" -#: kallithea/lib/utils2.py:408 +#: kallithea/lib/utils2.py:455 #, python-format msgid "in %s" msgstr "dans %s" -#: kallithea/lib/utils2.py:410 +#: kallithea/lib/utils2.py:457 #, python-format msgid "%s ago" msgstr "Il y a %s" -#: kallithea/lib/utils2.py:412 +#: kallithea/lib/utils2.py:459 #, python-format msgid "in %s and %s" msgstr "dans %s et %s" -#: kallithea/lib/utils2.py:415 +#: kallithea/lib/utils2.py:462 #, python-format msgid "%s and %s ago" msgstr "Il y a %s et %s" -#: kallithea/lib/utils2.py:418 +#: kallithea/lib/utils2.py:465 msgid "just now" msgstr "à l’instant" -#: kallithea/model/comment.py:68 -#, python-format -msgid "on line %s" -msgstr "à la ligne %s" - -#: kallithea/model/comment.py:221 kallithea/model/pull_request.py:117 -msgid "[Mention]" -msgstr "[Mention]" - -#: kallithea/model/db.py:1574 -msgid "top level" -msgstr "niveau supérieur" - -#: kallithea/model/db.py:1715 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1163 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1303 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1388 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1408 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1454 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1511 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1572 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1622 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1649 +msgid "Repository no access" +msgstr "Aucun accès au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1164 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1183 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1304 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1389 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1409 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1455 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1512 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1573 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1650 +msgid "Repository read access" +msgstr "Accès en lecture au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1165 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1184 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1305 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1390 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1410 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1456 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1513 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1574 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1651 +msgid "Repository write access" +msgstr "Accès en écriture au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1166 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1185 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1306 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1391 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1411 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1457 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1514 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1515 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1575 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1652 +msgid "Repository admin access" +msgstr "Accès administrateur au dépôt" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1168 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1187 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1308 +msgid "Repository Group no access" +msgstr "Aucun accès au groupe de dépôts" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1169 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1188 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1309 +msgid "Repository Group read access" +msgstr "Accès en lecture au groupe de dépôts" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1170 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1189 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1310 +msgid "Repository Group write access" +msgstr "Accès en écriture au groupe de dépôts" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1171 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1190 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1311 +msgid "Repository Group admin access" +msgstr "Accès administrateur au groupe de dépôts" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1173 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1192 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1313 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1398 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1406 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1452 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1509 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1510 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1570 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1620 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1647 kallithea/model/db.py:1669 msgid "Kallithea Administrator" msgstr "Administrateur Kallithea" -#: kallithea/model/db.py:1717 -msgid "Default user has no access to new repositories" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" - -#: kallithea/model/db.py:1718 -msgid "Default user has read access to new repositories" -msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" - -#: kallithea/model/db.py:1719 -msgid "Default user has write access to new repositories" -msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" - -#: kallithea/model/db.py:1720 -msgid "Default user has admin access to new repositories" -msgstr "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" - -#: kallithea/model/db.py:1722 -msgid "Default user has no access to new repository groups" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" - -#: kallithea/model/db.py:1723 -msgid "Default user has read access to new repository groups" -msgstr "" -"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de" -" dépôts" - -#: kallithea/model/db.py:1724 -msgid "Default user has write access to new repository groups" -msgstr "" -"L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " -"dépôts" - -#: kallithea/model/db.py:1725 -msgid "Default user has admin access to new repository groups" -msgstr "" -"L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " -"dépôts" - -#: kallithea/model/db.py:1727 -msgid "Default user has no access to new user groups" -msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" - -#: kallithea/model/db.py:1728 -msgid "Default user has read access to new user groups" -msgstr "" -"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1729 -msgid "Default user has write access to new user groups" -msgstr "" -"L'utilisateur par défaut a accès en écriture aux nouveaux groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1730 -msgid "Default user has admin access to new user groups" -msgstr "" -"L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1732 -msgid "Only admins can create repository groups" -msgstr "Seul un administrateur peut créer un groupe de dépôts" - -#: kallithea/model/db.py:1733 -msgid "Non-admins can create repository groups" -msgstr "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" - -#: kallithea/model/db.py:1735 -msgid "Only admins can create user groups" -msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" - -#: kallithea/model/db.py:1736 -msgid "Non-admins can create user groups" -msgstr "" -"Les utilisateurs non-administrateurs peuvent créer des groupes " -"d'utilisateurs" - -#: kallithea/model/db.py:1738 -msgid "Only admins can create top level repositories" -msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" - -#: kallithea/model/db.py:1739 -msgid "Non-admins can create top level repositories" -msgstr "" -"Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " -"supérieur" - -#: kallithea/model/db.py:1741 +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1174 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1193 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1314 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1399 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1429 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1475 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1532 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1554 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1593 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1643 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1670 +msgid "Repository creation disabled" +msgstr "Création de dépôt désactivée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1175 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1194 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1315 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1400 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1430 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1476 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1533 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1534 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1555 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1594 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1644 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1671 +msgid "Repository creation enabled" +msgstr "Création de dépôt activée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1176 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1195 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1316 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1401 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1432 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1478 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1535 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1557 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1596 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1648 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1675 +msgid "Repository forking disabled" +msgstr "Fork de dépôt désactivé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1177 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1196 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1317 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1402 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1433 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1479 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1536 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1537 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1558 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1597 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1649 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1676 +msgid "Repository forking enabled" +msgstr "Fork de dépôt activé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1178 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1197 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1318 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1403 +msgid "Register disabled" +msgstr "Enregistrement désactivé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1179 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1198 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1319 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1404 +msgid "Register new user with Kallithea with manual activation" +msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1182 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1201 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1322 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1407 +msgid "Register new user with Kallithea with auto activation" +msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1623 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1650 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1763 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1838 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1934 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1980 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2040 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2062 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2101 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2154 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2200 +msgid "Not Reviewed" +msgstr "Pas encore relue" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1624 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1764 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1839 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1935 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1981 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2041 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2063 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2102 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2155 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2201 kallithea/model/db.py:2237 +msgid "Approved" +msgstr "Approuvée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1625 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1765 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1840 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1936 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1982 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2042 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2043 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2064 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2103 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2156 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2202 kallithea/model/db.py:2238 +msgid "Rejected" +msgstr "Rejetée" + +#: kallithea/lib/dbmigrate/schema/db_1_4_0.py:1626 +#: kallithea/lib/dbmigrate/schema/db_1_5_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_1_5_2.py:1766 +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1841 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1937 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1983 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:2043 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:2044 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:2065 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:2104 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:2157 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:2203 +msgid "Under Review" +msgstr "En cours de relecture" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1252 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1270 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1300 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1357 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1358 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1379 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1471 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1498 kallithea/model/db.py:1518 +msgid "top level" +msgstr "niveau supérieur" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1393 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1413 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1459 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1516 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1577 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1627 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1654 +msgid "Repository group no access" +msgstr "Groupe de dépôts, pas d'accès" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1394 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1414 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1460 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1517 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1578 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1628 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1655 +msgid "Repository group read access" +msgstr "Groupe de dépôts, accès en lecture" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1395 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1415 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1461 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1518 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1519 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1579 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1629 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1656 +msgid "Repository group write access" +msgstr "Groupe de dépôts, accès en écriture" + +#: kallithea/lib/dbmigrate/schema/db_1_6_0.py:1396 +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1416 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1462 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1519 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1520 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1541 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1580 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1630 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1657 +msgid "Repository group admin access" +msgstr "Groupe de dépôts, accès d'administration" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1418 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1464 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1521 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1543 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1582 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1632 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1659 +msgid "User group no access" +msgstr "Groupe d'utilisateurs, pas d'accès" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1419 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1465 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1522 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1544 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1583 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1633 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1660 +msgid "User group read access" +msgstr "Groupe d'utilisateurs, accès en lecture" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1420 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1466 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1523 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1524 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1545 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1584 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1634 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1661 +msgid "User group write access" +msgstr "Groupe d'utilisateurs, accès en écriture" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1421 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1467 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1524 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1525 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1546 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1585 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1635 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1662 +msgid "User group admin access" +msgstr "Groupe d'utilisateurs, accès d'administration" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1423 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1469 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1526 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1548 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1587 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1637 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1664 +msgid "Repository Group creation disabled" +msgstr "Création de groupes de dépôts désactivée" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1424 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1470 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1527 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1528 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1549 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1588 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1638 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1665 +msgid "Repository Group creation enabled" +msgstr "Création de groupes de dépôts activée" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1426 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1472 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1529 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1551 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1590 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1640 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1667 +msgid "User Group creation disabled" +msgstr "Création de groupes d'utilisateurs désactivée" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1427 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1473 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1530 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1531 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1552 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1591 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1641 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1668 +msgid "User Group creation enabled" +msgstr "Création de groupes d'utilisateurs activée" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1435 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1481 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1538 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1560 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1599 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1651 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1678 kallithea/model/db.py:1701 +msgid "Registration disabled" +msgstr "Enregistrement désactivé" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1436 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1482 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1539 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1561 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1600 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1652 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1679 +msgid "User Registration with manual account activation" +msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" + +#: kallithea/lib/dbmigrate/schema/db_1_7_0.py:1437 +#: kallithea/lib/dbmigrate/schema/db_1_8_0.py:1483 +#: kallithea/lib/dbmigrate/schema/db_2_0_0.py:1540 +#: kallithea/lib/dbmigrate/schema/db_2_0_1.py:1541 +#: kallithea/lib/dbmigrate/schema/db_2_0_2.py:1562 +#: kallithea/lib/dbmigrate/schema/db_2_1_0.py:1601 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1653 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1680 +msgid "User Registration with automatic account activation" +msgstr "Enregistrement des utilisateurs avec activation de compte automatique" + +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1645 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1672 kallithea/model/db.py:1695 msgid "Repository creation enabled with write permission to a repository group" msgstr "" "Création de dépôts activée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/model/db.py:1742 +#: kallithea/lib/dbmigrate/schema/db_2_2_0.py:1646 +#: kallithea/lib/dbmigrate/schema/db_2_2_3.py:1673 kallithea/model/db.py:1696 msgid "Repository creation disabled with write permission to a repository group" msgstr "" "Création de dépôts désactivée avec l'accès en écriture vers un groupe de " "dépôts" -#: kallithea/model/db.py:1744 +#: kallithea/model/comment.py:72 +#, python-format +msgid "on line %s" +msgstr "à la ligne %s" + +#: kallithea/model/comment.py:217 kallithea/model/pull_request.py:170 +msgid "[Mention]" +msgstr "[Mention]" + +#: kallithea/model/db.py:1671 +msgid "Default user has no access to new repositories" +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux dépôts" + +#: kallithea/model/db.py:1672 +msgid "Default user has read access to new repositories" +msgstr "L'utilisateur par défaut a un accès en lecture aux nouveaux dépôts" + +#: kallithea/model/db.py:1673 +msgid "Default user has write access to new repositories" +msgstr "L'utilisateur par défaut a un accès en écriture aux nouveaux dépôts" + +#: kallithea/model/db.py:1674 +msgid "Default user has admin access to new repositories" +msgstr "L'utilisateur par défaut a un accès administrateur aux nouveaux dépôts" + +#: kallithea/model/db.py:1676 +msgid "Default user has no access to new repository groups" +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes de dépôts" + +#: kallithea/model/db.py:1677 +msgid "Default user has read access to new repository groups" +msgstr "" +"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes de" +" dépôts" + +#: kallithea/model/db.py:1678 +msgid "Default user has write access to new repository groups" +msgstr "" +"L'utilisateur par défaut a accès en écriture aux nouveaux groupes de " +"dépôts" + +#: kallithea/model/db.py:1679 +msgid "Default user has admin access to new repository groups" +msgstr "" +"L'utilisateur par défaut a accès administrateur aux nouveaux groupes de " +"dépôts" + +#: kallithea/model/db.py:1681 +msgid "Default user has no access to new user groups" +msgstr "L'utilisateur par défaut n'a pas accès aux nouveaux groupes d'utilisateurs" + +#: kallithea/model/db.py:1682 +msgid "Default user has read access to new user groups" +msgstr "" +"L'utilisateur par défaut a accès en lecture seule aux nouveaux groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1683 +msgid "Default user has write access to new user groups" +msgstr "" +"L'utilisateur par défaut a accès en écriture aux nouveaux groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1684 +msgid "Default user has admin access to new user groups" +msgstr "" +"L'utilisateur par défaut a un accès administrateur aux nouveaux groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1686 +msgid "Only admins can create repository groups" +msgstr "Seul un administrateur peut créer un groupe de dépôts" + +#: kallithea/model/db.py:1687 +msgid "Non-admins can create repository groups" +msgstr "Les utilisateurs non-administrateurs peuvent créer des groupes de dépôts" + +#: kallithea/model/db.py:1689 +msgid "Only admins can create user groups" +msgstr "Seul un administrateur peut créer des groupes d'utilisateurs" + +#: kallithea/model/db.py:1690 +msgid "Non-admins can create user groups" +msgstr "" +"Les utilisateurs non-administrateurs peuvent créer des groupes " +"d'utilisateurs" + +#: kallithea/model/db.py:1692 +msgid "Only admins can create top level repositories" +msgstr "Seul un administrateur peut créer des dépôts de niveau supérieur" + +#: kallithea/model/db.py:1693 +msgid "Non-admins can create top level repositories" +msgstr "" +"Les utilisateurs non-administrateurs peuvent créer des dépôts de niveau " +"supérieur" + +#: kallithea/model/db.py:1698 msgid "Only admins can fork repositories" msgstr "Seul un administrateur peut faire un fork de dépôt" -#: kallithea/model/db.py:1745 +#: kallithea/model/db.py:1699 msgid "Non-admins can fork repositories" msgstr "Les utilisateurs non-administrateurs peuvent faire un fork de dépôt" -#: kallithea/model/db.py:1747 -msgid "Registration disabled" -msgstr "Enregistrement désactivé" - -#: kallithea/model/db.py:1748 +#: kallithea/model/db.py:1702 msgid "User registration with manual account activation" msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" -#: kallithea/model/db.py:1749 +#: kallithea/model/db.py:1703 msgid "User registration with automatic account activation" msgstr "Enregistrement des utilisateurs avec activation de compte automatique" -#: kallithea/model/db.py:2276 +#: kallithea/model/db.py:2236 msgid "Not reviewed" msgstr "Pas encore relue" -#: kallithea/model/db.py:2277 +#: kallithea/model/db.py:2239 msgid "Under review" msgstr "En cours de relecture" -#: kallithea/model/db.py:2278 -#, fuzzy -#| msgid "Approved" -msgid "Not approved" -msgstr "Approuvée" - -#: kallithea/model/db.py:2279 -msgid "Approved" -msgstr "Approuvée" +#: kallithea/model/forms.py:57 +msgid "Please enter a login" +msgstr "Veuillez entrer un identifiant" #: kallithea/model/forms.py:58 -msgid "Please enter a login" -msgstr "Veuillez entrer un identifiant" - -#: kallithea/model/forms.py:59 #, python-format msgid "Enter a value %(min)i characters long or more" msgstr "Entrez une valeur d’au moins %(min)i caractères de long" -#: kallithea/model/forms.py:67 +#: kallithea/model/forms.py:66 msgid "Please enter a password" msgstr "Veuillez entrer un mot de passe" -#: kallithea/model/forms.py:68 +#: kallithea/model/forms.py:67 #, python-format msgid "Enter %(min)i characters or more" msgstr "Entrez au moins %(min)i caractères" -#: kallithea/model/forms.py:167 +#: kallithea/model/forms.py:165 msgid "Name must not contain only digits" msgstr "Le nom ne doit pas contenir seulement des chiffres" -#: kallithea/model/notification.py:240 +#: kallithea/model/notification.py:254 #, python-format msgid "%(user)s commented on changeset %(age)s" msgstr "%(user)s a commenté sur le changeset %(age)s" -#: kallithea/model/notification.py:241 +#: kallithea/model/notification.py:255 #, python-format msgid "%(user)s sent message %(age)s" msgstr "%(user)s a envoyé un message %(age)s" -#: kallithea/model/notification.py:242 +#: kallithea/model/notification.py:256 #, python-format msgid "%(user)s mentioned you %(age)s" msgstr "%(user)s vous a mentionné %(age)s" -#: kallithea/model/notification.py:243 +#: kallithea/model/notification.py:257 #, python-format msgid "%(user)s registered in Kallithea %(age)s" msgstr "%(user)s s'est enregistré sur Kallithea %(age)s" -#: kallithea/model/notification.py:244 +#: kallithea/model/notification.py:258 #, python-format msgid "%(user)s opened new pull request %(age)s" msgstr "%(user)s a ouvert une nouvelle demande de pull %(age)s" -#: kallithea/model/notification.py:245 +#: kallithea/model/notification.py:259 #, python-format msgid "%(user)s commented on pull request %(age)s" msgstr "%(user)s a commenté la demande de pull %(age)s" -#: kallithea/model/notification.py:252 +#: kallithea/model/notification.py:266 #, python-format msgid "%(user)s commented on changeset at %(when)s" msgstr "%(user)s a commenté sur le changeset à %(when)s" -#: kallithea/model/notification.py:253 +#: kallithea/model/notification.py:267 #, python-format msgid "%(user)s sent message at %(when)s" msgstr "%(user)s a envoyé un message à %(when)s" -#: kallithea/model/notification.py:254 +#: kallithea/model/notification.py:268 #, python-format msgid "%(user)s mentioned you at %(when)s" msgstr "%(user)s vous a mentionné à %(when)s" -#: kallithea/model/notification.py:255 +#: kallithea/model/notification.py:269 #, python-format msgid "%(user)s registered in Kallithea at %(when)s" msgstr "%(user)s s'est enregistré sur Kallithea à %(when)s" -#: kallithea/model/notification.py:256 +#: kallithea/model/notification.py:270 #, python-format msgid "%(user)s opened new pull request at %(when)s" msgstr "%(user)s a ouvert une nouvelle demande de pull à %(when)s" -#: kallithea/model/notification.py:257 +#: kallithea/model/notification.py:271 #, python-format msgid "%(user)s commented on pull request at %(when)s" msgstr "%(user)s a commenté la demande de pull à %(when)s" -#: kallithea/model/notification.py:288 -#, fuzzy, python-format -#| msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" -msgid "" -"[Comment] %(repo_name)s changeset %(short_id)s \"%(message_short)s\" on " -"%(branch)s" +#: kallithea/model/notification.py:302 +#, python-format +msgid "[Comment] %(repo_name)s changeset %(short_id)s on %(branch)s" msgstr "[Commentaire] Changeset %(short_id)s de %(repo_name)s dans %(branch)s" -#: kallithea/model/notification.py:291 +#: kallithea/model/notification.py:305 #, python-format msgid "New user %(new_username)s registered" msgstr "Nouvel utilisateur %(new_username)s enregistré" -#: kallithea/model/notification.py:293 -#, python-format -msgid "" -"[Review] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " -"%(pr_source_branch)s by %(pr_owner_username)s" +#: kallithea/model/notification.py:307 +#, python-format +msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" - -#: kallithea/model/notification.py:294 -#, python-format -msgid "" -"[Comment] %(repo_name)s PR %(pr_nice_id)s \"%(pr_title_short)s\" from " -"%(pr_source_branch)s by %(pr_owner_username)s" +"[Ajouté] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " +"%(repo_name)s" + +#: kallithea/model/notification.py:308 +#, python-format +msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" msgstr "" - -#: kallithea/model/notification.py:307 +"[Commentaire] Demande de pull %(pr_nice_id)s à partir de %(ref)s pour " +"%(repo_name)s" + +#: kallithea/model/notification.py:321 msgid "Closing" msgstr "Fermeture" -#: kallithea/model/pull_request.py:76 +#: kallithea/model/pull_request.py:137 #, python-format msgid "%(user)s wants you to review pull request %(pr_nice_id)s: %(pr_title)s" msgstr "" "%(user)s veut que vous regardiez la demande de pull %(pr_nice_id)s : " "%(pr_title)s" -#: kallithea/model/pull_request.py:211 -#, fuzzy, python-format -#| msgid "Error creating pull request: %s" -msgid "Cannot create empty pull request" -msgstr "Erreur de création de la demande de pull : %s" - -#: kallithea/model/pull_request.py:219 -#, python-format -msgid "" -"Cannot create pull request - criss cross merge detected, please merge a " -"later %s revision to %s" -msgstr "" - -#: kallithea/model/pull_request.py:247 kallithea/model/pull_request.py:382 -#, fuzzy -#| msgid "Confirm to delete this pull request" -msgid "You are not authorized to create the pull request" -msgstr "Veuillez confirmer la suppression de cette requête de pull" - -#: kallithea/model/pull_request.py:341 -#, fuzzy -#| msgid "Missing changesets since the previous pull request:" -msgid "Missing changesets since the previous iteration:" -msgstr "Changeset manquant depuis la précédente pull request :" - -#: kallithea/model/pull_request.py:348 -#, fuzzy, python-format -#| msgid "New changesets on %s %s since the previous pull request:" -msgid "New changesets on %s %s since the previous iteration:" -msgstr "Nouveau changeset sur %s %s depuis la précédente pull request :" - -#: kallithea/model/pull_request.py:355 -#, fuzzy -#| msgid "Ancestor didn't change - show diff since previous version:" -msgid "Ancestor didn't change - diff since previous iteration:" -msgstr "" -"L'ancêtre n'a pas changé - montrer les différences avec la version " -"précédente :" - -#: kallithea/model/pull_request.py:362 -#, fuzzy, python-format -#| msgid "" "This pull request is based on another %s revision and there is no -#| simple " "diff." -msgid "" -"This iteration is based on another %s revision and there is no simple " -"diff." -msgstr "" -"Cette demande de pull est basée sur une autre révision %s et il n'y a pas" -" de diff simple." - -#: kallithea/model/pull_request.py:364 -#, fuzzy, python-format -#| msgid "No changes found on %s %s since previous version." -msgid "No changes found on %s %s since previous iteration." -msgstr "Aucun changement constaté sur %s %s depuis la version précédente." - -#: kallithea/model/pull_request.py:390 -#, python-format -msgid "Closed, next iteration: %s ." -msgstr "" - -#: kallithea/model/scm.py:697 +#: kallithea/model/scm.py:708 msgid "latest tip" msgstr "Dernier sommet" -#: kallithea/model/user.py:189 +#: kallithea/model/user.py:192 msgid "New user registration" msgstr "Nouveau enregistrement d'utilisateur" -#: kallithea/model/user.py:253 +#: kallithea/model/user.py:256 msgid "You can't remove this user since it is crucial for the entire application" msgstr "" "Vous ne pouvez pas supprimer cet utilisateur ; il est nécessaire pour le " "bon fonctionnement de l’application" -#: kallithea/model/user.py:258 +#: kallithea/model/user.py:261 #, python-format msgid "" "User \"%s\" still owns %s repositories and cannot be removed. Switch " @@ -1766,7 +2027,7 @@ "L’utilisateur \"%s\" possède %s dépôts et ne peut être supprimé. Changez " "les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:263 +#: kallithea/model/user.py:266 #, python-format msgid "" "User \"%s\" still owns %s repository groups and cannot be removed. Switch" @@ -1775,7 +2036,7 @@ "L’utilisateur \"%s\" possède %s groupes de dépôt et ne peut être " "supprimé. Changez les propriétaires ou supprimez ces dépôts : %s" -#: kallithea/model/user.py:270 +#: kallithea/model/user.py:273 #, python-format msgid "" "User \"%s\" still owns %s user groups and cannot be removed. Switch " @@ -1785,15 +2046,15 @@ "être supprimé. Changez les propriétaires de ces groupes d'utilisateurs ou" " supprimez-les : %s" -#: kallithea/model/user.py:364 +#: kallithea/model/user.py:368 msgid "Password reset link" msgstr "Lien de remise à zéro du mot de passe" -#: kallithea/model/user.py:413 +#: kallithea/model/user.py:418 msgid "Password reset notification" msgstr "Notification de réinitialisation du mot de passe" -#: kallithea/model/user.py:414 +#: kallithea/model/user.py:419 #, python-format msgid "" "The password to your account %s has been changed using password reset " @@ -1802,21 +2063,21 @@ "Le mot de passe de votre compte %s a été changé via le formulaire de " "réinitialisation du mot de passe." -#: kallithea/model/validators.py:54 kallithea/model/validators.py:55 +#: kallithea/model/validators.py:77 kallithea/model/validators.py:78 msgid "Value cannot be an empty list" msgstr "Cette valeur ne peut être une liste vide" -#: kallithea/model/validators.py:73 +#: kallithea/model/validators.py:96 #, python-format msgid "Username \"%(username)s\" already exists" msgstr "Le nom d’utilisateur « %(username)s » existe déjà" -#: kallithea/model/validators.py:75 +#: kallithea/model/validators.py:98 #, python-format msgid "Username \"%(username)s\" cannot be used" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:77 +#: kallithea/model/validators.py:100 msgid "" "Username may only contain alphanumeric characters underscores, periods or" " dashes and must begin with an alphanumeric character or underscore" @@ -1825,25 +2086,25 @@ " des underscores (_), points, traits d'union et doit commencer avec un " "caractère alphanumérique ou un underscore" -#: kallithea/model/validators.py:104 +#: kallithea/model/validators.py:127 msgid "The input is not valid" msgstr "L'entrée n'est pas valide" -#: kallithea/model/validators.py:111 +#: kallithea/model/validators.py:134 #, python-format msgid "Username %(username)s is not valid" msgstr "Le nom d’utilisateur « %(username)s » n’est pas valide" -#: kallithea/model/validators.py:131 +#: kallithea/model/validators.py:154 msgid "Invalid user group name" msgstr "Nom de groupe d'utilisateurs invalide" -#: kallithea/model/validators.py:132 +#: kallithea/model/validators.py:155 #, python-format msgid "User group \"%(usergroup)s\" already exists" msgstr "Le groupe d'utilisateurs « %(usergroup)s » existe déjà" -#: kallithea/model/validators.py:134 +#: kallithea/model/validators.py:157 msgid "" "user group name may only contain alphanumeric characters underscores, " "periods or dashes and must begin with alphanumeric character" @@ -1852,65 +2113,65 @@ "alphanumériques, des tirets, des points, des traits d'union et doit " "commencer avec un caractère alphanumérique" -#: kallithea/model/validators.py:174 +#: kallithea/model/validators.py:197 msgid "Cannot assign this group as parent" msgstr "Impossible d’assigner ce groupe en tant que parent" -#: kallithea/model/validators.py:175 +#: kallithea/model/validators.py:198 #, python-format msgid "Group \"%(group_name)s\" already exists" msgstr "Le groupe « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:177 +#: kallithea/model/validators.py:200 #, python-format msgid "Repository with name \"%(group_name)s\" already exists" msgstr "Un dépôt portant le nom « %(group_name)s » existe déjà" -#: kallithea/model/validators.py:233 +#: kallithea/model/validators.py:258 msgid "Invalid characters (non-ascii) in password" msgstr "Caractères incorrects (non-ASCII) dans le mot de passe" -#: kallithea/model/validators.py:248 +#: kallithea/model/validators.py:273 msgid "Invalid old password" msgstr "Ancien mot de passe invalide" -#: kallithea/model/validators.py:264 +#: kallithea/model/validators.py:289 msgid "Passwords do not match" msgstr "Les mots de passe ne correspondent pas" -#: kallithea/model/validators.py:279 +#: kallithea/model/validators.py:304 msgid "Invalid username or password" msgstr "Nom d'utilisateur ou mot de passe invalide" -#: kallithea/model/validators.py:310 +#: kallithea/model/validators.py:335 msgid "Token mismatch" msgstr "Jeton d’authentification incorrect" -#: kallithea/model/validators.py:326 +#: kallithea/model/validators.py:351 #, python-format msgid "Repository name %(repo)s is not allowed" msgstr "Le nom de dépôt « %(repo)s » n’est pas autorisé" -#: kallithea/model/validators.py:328 +#: kallithea/model/validators.py:353 #, python-format msgid "Repository named %(repo)s already exists" msgstr "Un dépôt portant le nom « %(repo)s » existe déjà" -#: kallithea/model/validators.py:329 +#: kallithea/model/validators.py:354 #, python-format msgid "Repository \"%(repo)s\" already exists in group \"%(group)s\"" msgstr "Le dépôt « %(repo)s » existe déjà dans le groupe « %(group)s »" -#: kallithea/model/validators.py:331 +#: kallithea/model/validators.py:356 #, python-format msgid "Repository group with name \"%(repo)s\" already exists" msgstr "Un groupe de dépôts avec le nom « %(repo)s » existe déjà" -#: kallithea/model/validators.py:449 +#: kallithea/model/validators.py:470 msgid "Invalid repository URL" msgstr "URL de dépôt invalide" -#: kallithea/model/validators.py:450 +#: kallithea/model/validators.py:471 msgid "" "Invalid repository URL. It must be a valid http, https, ssh, svn+http or " "svn+https URL" @@ -1918,40 +2179,40 @@ "URL de dépôt invalide. Ce doit être une URL valide de type http, https, " "ssh, svn+http ou svn+https" -#: kallithea/model/validators.py:475 +#: kallithea/model/validators.py:496 msgid "Fork has to be the same type as parent" msgstr "Le fork doit être du même type que le parent" -#: kallithea/model/validators.py:490 +#: kallithea/model/validators.py:511 msgid "You don't have permissions to create repository in this group" msgstr "Vous n’avez pas la permission de créer un dépôt dans ce" -#: kallithea/model/validators.py:492 +#: kallithea/model/validators.py:513 msgid "no permission to create repository in root location" msgstr "pas de permission de créer un dépôt dans la racine" -#: kallithea/model/validators.py:542 +#: kallithea/model/validators.py:563 msgid "You don't have permissions to create a group in this location" msgstr "Vous n'avez pas les permissions pour créer un groupe dans cet endroit" -#: kallithea/model/validators.py:582 +#: kallithea/model/validators.py:604 msgid "This username or user group name is not valid" msgstr "Ce nom d'utilisateur ou nom de groupe d'utilisateurs n'est pas valide" -#: kallithea/model/validators.py:675 +#: kallithea/model/validators.py:697 msgid "This is not a valid path" msgstr "Ceci n’est pas un chemin valide" -#: kallithea/model/validators.py:692 +#: kallithea/model/validators.py:714 msgid "This email address is already in use" msgstr "Cette adresse e-mail est déjà enregistrée" -#: kallithea/model/validators.py:712 +#: kallithea/model/validators.py:734 #, python-format msgid "Email address \"%(email)s\" not found" msgstr "L’adresse e-mail « %(email)s » n’existe pas" -#: kallithea/model/validators.py:749 +#: kallithea/model/validators.py:771 msgid "" "The LDAP Login attribute of the CN must be specified - this is the name " "of the attribute that is equivalent to \"username\"" @@ -1959,272 +2220,285 @@ "L’attribut Login du CN doit être spécifié. Cet attribut correspond au nom" " d’utilisateur" -#: kallithea/model/validators.py:761 +#: kallithea/model/validators.py:783 msgid "Please enter a valid IPv4 or IPv6 address" msgstr "Veuillez entrer une adresse IPv4 ou IPv6 valide" -#: kallithea/model/validators.py:762 +#: kallithea/model/validators.py:784 #, python-format msgid "The network size (bits) must be within the range of 0-32 (not %(bits)r)" msgstr "La taille du réseau (bits) doit être entre 0 et 32 (et non %(bits)r)" -#: kallithea/model/validators.py:795 +#: kallithea/model/validators.py:817 msgid "Key name can only consist of letters, underscore, dash or numbers" msgstr "" "Le nom de la clé ne peut consister que de letters, de traits d'union, de " "tirets ou de nombres" -#: kallithea/model/validators.py:809 +#: kallithea/model/validators.py:831 msgid "Filename cannot be inside a directory" msgstr "Le nom du fichier ne peut être à l'intérieur d'un répertoire" -#: kallithea/model/validators.py:825 +#: kallithea/model/validators.py:847 #, python-format msgid "Plugins %(loaded)s and %(next_to_load)s both export the same name" msgstr "" "Les greffons %(loaded)s et %(next_to_load)s exportent tous les deux vers " "le même nom" -#: kallithea/templates/about.html:4 kallithea/templates/about.html:16 +#: kallithea/templates/about.html:4 kallithea/templates/about.html:17 msgid "About" msgstr "À propos" +#: kallithea/templates/index.html:5 +msgid "Dashboard" +msgstr "Tableau de bord" + +#: kallithea/templates/index_base.html:6 +#: kallithea/templates/admin/my_account/my_account_repos.html:3 +#: kallithea/templates/admin/my_account/my_account_watched.html:3 +#: kallithea/templates/admin/repo_groups/repo_groups.html:9 +#: kallithea/templates/admin/repos/repos.html:9 +#: kallithea/templates/admin/user_groups/user_groups.html:9 +#: kallithea/templates/admin/users/users.html:9 +#: kallithea/templates/bookmarks/bookmarks.html:9 +#: kallithea/templates/branches/branches.html:9 +#: kallithea/templates/journal/journal.html:9 +#: kallithea/templates/journal/journal.html:48 +#: kallithea/templates/journal/journal.html:49 +#: kallithea/templates/tags/tags.html:9 +msgid "quick filter..." +msgstr "Filtre rapide…" + +#: kallithea/templates/index_base.html:6 +msgid "repositories" +msgstr "Dépôts" + +#: kallithea/templates/index_base.html:20 #: kallithea/templates/index_base.html:25 -#: kallithea/templates/index_base.html:30 #: kallithea/templates/admin/repos/repo_add.html:5 #: kallithea/templates/admin/repos/repo_add.html:19 -#: kallithea/templates/admin/repos/repos.html:23 -#: kallithea/tests/data/templates/index_base.html.py:66 -#: kallithea/tests/data/templates/index_base.html.py:78 -#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:128 -#: kallithea/tests/data/templates/admin/repos/repo_add.html.py:146 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:107 +#: kallithea/templates/admin/repos/repos.html:22 msgid "Add Repository" msgstr "Ajouter un dépôt" +#: kallithea/templates/index_base.html:22 #: kallithea/templates/index_base.html:27 -#: kallithea/templates/index_base.html:32 #: kallithea/templates/admin/repo_groups/repo_group_add.html:5 #: kallithea/templates/admin/repo_groups/repo_group_add.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:25 -#: kallithea/tests/data/templates/index_base.html.py:72 -#: kallithea/tests/data/templates/index_base.html.py:84 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:157 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:175 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:107 +#: kallithea/templates/admin/repo_groups/repo_groups.html:26 msgid "Add Repository Group" msgstr "Ajouter un groupe de dépôts" -#: kallithea/templates/index_base.html:37 -#: kallithea/tests/data/templates/index_base.html.py:90 +#: kallithea/templates/index_base.html:32 msgid "You have admin right to this group, and can edit it" msgstr "Vous avez les droits d'administration sur ce groupe, et pouvez l'éditer" -#: kallithea/templates/index_base.html:37 -#: kallithea/tests/data/templates/index_base.html.py:92 +#: kallithea/templates/index_base.html:32 msgid "Edit Repository Group" msgstr "Modifier le groupe de dépôts" -#: kallithea/templates/index_base.html:47 -#, fuzzy -#| msgid "Repository group" -msgid "Repository Group" -msgstr "Groupe de dépôt" - -#: kallithea/templates/index_base.html:48 -#: kallithea/templates/index_base.html:90 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:59 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:35 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:12 -#: kallithea/templates/admin/repo_groups/repo_groups.html:40 -#: kallithea/templates/admin/repos/repo_add_base.html:21 -#: kallithea/templates/admin/repos/repo_edit_settings.html:52 -#: kallithea/templates/admin/repos/repos.html:39 -#: kallithea/templates/admin/user_groups/user_group_add.html:33 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:10 -#: kallithea/templates/admin/user_groups/user_groups.html:39 -#: kallithea/templates/admin/users/user_edit_api_keys.html:59 -#: kallithea/templates/admin/users/user_edit_api_keys.html:61 -#: kallithea/templates/email_templates/pull_request.html:36 -#: kallithea/templates/forks/fork.html:34 -#: kallithea/templates/pullrequests/pullrequest.html:33 +#: kallithea/templates/index_base.html:45 +msgid "Group Name" +msgstr "Nom du groupe" + +#: kallithea/templates/index_base.html:46 +#: kallithea/templates/index_base.html:127 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:64 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:17 +#: kallithea/templates/admin/repo_groups/repo_groups.html:47 +#: kallithea/templates/admin/repos/repo_add_base.html:28 +#: kallithea/templates/admin/repos/repo_edit_settings.html:65 +#: kallithea/templates/admin/repos/repos.html:48 +#: kallithea/templates/admin/user_groups/user_group_add.html:40 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:15 +#: kallithea/templates/admin/user_groups/user_groups.html:47 +#: kallithea/templates/admin/users/user_edit_api_keys.html:64 +#: kallithea/templates/email_templates/changeset_comment.html:18 +#: kallithea/templates/email_templates/pull_request.html:12 +#: kallithea/templates/forks/fork.html:38 +#: kallithea/templates/pullrequests/pullrequest.html:40 #: kallithea/templates/pullrequests/pullrequest_show.html:38 -#: kallithea/templates/pullrequests/pullrequest_show.html:58 -#: kallithea/templates/summary/summary.html:78 -#: kallithea/tests/data/templates/index_base.html.py:100 -#: kallithea/tests/data/templates/index_base.html.py:130 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:106 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:117 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:114 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:54 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:114 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:114 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:106 -#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:101 -#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:95 -#: kallithea/tests/data/templates/email_templates/pull_request.html.py:88 -#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:84 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:119 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:153 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:168 -#: kallithea/tests/data/templates/summary/summary.html.py:147 +#: kallithea/templates/pullrequests/pullrequest_show.html:63 +#: kallithea/templates/summary/summary.html:85 msgid "Description" msgstr "Description" -#: kallithea/templates/index_base.html:85 -#: kallithea/templates/admin/admin_log.html:7 -#: kallithea/templates/admin/permissions/permissions_globals.html:13 -#: kallithea/tests/data/templates/admin/admin_log.html.py:43 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:45 -msgid "Repository" -msgstr "Dépôt" - -#: kallithea/templates/index_base.html:92 -#: kallithea/tests/data/templates/index_base.html.py:132 +#: kallithea/templates/index_base.html:125 +#: kallithea/templates/admin/my_account/my_account_repos.html:46 +#: kallithea/templates/admin/my_account/my_account_watched.html:46 +#: kallithea/templates/admin/repo_groups/repo_groups.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repos.html:47 +#: kallithea/templates/admin/user_groups/user_groups.html:46 +#: kallithea/templates/base/perms_summary.html:53 +#: kallithea/templates/bookmarks/bookmarks.html:49 +#: kallithea/templates/bookmarks/bookmarks_data.html:7 +#: kallithea/templates/branches/branches.html:49 +#: kallithea/templates/branches/branches_data.html:7 +#: kallithea/templates/files/files_browser.html:60 +#: kallithea/templates/journal/journal.html:187 +#: kallithea/templates/journal/journal.html:278 +#: kallithea/templates/tags/tags.html:49 +#: kallithea/templates/tags/tags_data.html:7 +msgid "Name" +msgstr "Nom" + +#: kallithea/templates/index_base.html:128 msgid "Last Change" msgstr "Dernière modification" -#: kallithea/templates/index_base.html:94 -#: kallithea/templates/admin/my_account/my_account_repos.html:15 -#: kallithea/templates/admin/my_account/my_account_watched.html:15 -#: kallithea/templates/admin/repos/repos.html:41 -#: kallithea/tests/data/templates/index_base.html.py:134 -#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:36 -#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:36 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:116 +#: kallithea/templates/index_base.html:130 +#: kallithea/templates/admin/my_account/my_account_repos.html:48 +#: kallithea/templates/admin/my_account/my_account_watched.html:48 +#: kallithea/templates/admin/repos/repos.html:49 +#: kallithea/templates/journal/journal.html:189 +#: kallithea/templates/journal/journal.html:280 msgid "Tip" msgstr "Sommet" -#: kallithea/templates/index_base.html:95 +#: kallithea/templates/index_base.html:132 #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:10 -#: kallithea/templates/admin/repo_groups/repo_groups.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:42 -#: kallithea/templates/admin/repos/repos.html:42 +#: kallithea/templates/admin/repo_groups/repo_groups.html:49 +#: kallithea/templates/admin/repos/repo_edit_settings.html:53 +#: kallithea/templates/admin/repos/repos.html:50 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:8 -#: kallithea/templates/admin/user_groups/user_groups.html:42 +#: kallithea/templates/admin/user_groups/user_groups.html:50 #: kallithea/templates/pullrequests/pullrequest_data.html:16 -#: kallithea/templates/pullrequests/pullrequest_show.html:135 -#: kallithea/templates/pullrequests/pullrequest_show.html:228 -#: kallithea/templates/summary/summary.html:123 -#: kallithea/tests/data/templates/index_base.html.py:136 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:118 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:118 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:120 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:249 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:327 -#: kallithea/tests/data/templates/summary/summary.html.py:199 +#: kallithea/templates/pullrequests/pullrequest_show.html:156 +#: kallithea/templates/pullrequests/pullrequest_show.html:244 +#: kallithea/templates/summary/summary.html:134 msgid "Owner" msgstr "Propriétaire" -#: kallithea/templates/login.html:5 kallithea/templates/login.html:14 -#: kallithea/templates/base/base.html:393 -#: kallithea/tests/data/templates/login.html.py:64 -#: kallithea/tests/data/templates/login.html.py:106 -#: kallithea/tests/data/templates/base/base.html.py:626 +#: kallithea/templates/index_base.html:140 +#: kallithea/templates/admin/my_account/my_account_repos.html:57 +#: kallithea/templates/admin/my_account/my_account_watched.html:57 +#: kallithea/templates/base/root.html:43 +#: kallithea/templates/bookmarks/bookmarks.html:79 +#: kallithea/templates/branches/branches.html:79 +#: kallithea/templates/journal/journal.html:198 +#: kallithea/templates/journal/journal.html:289 +#: kallithea/templates/tags/tags.html:79 +msgid "Click to sort ascending" +msgstr "Tri ascendant" + +#: kallithea/templates/index_base.html:141 +#: kallithea/templates/admin/my_account/my_account_repos.html:58 +#: kallithea/templates/admin/my_account/my_account_watched.html:58 +#: kallithea/templates/base/root.html:44 +#: kallithea/templates/bookmarks/bookmarks.html:80 +#: kallithea/templates/branches/branches.html:80 +#: kallithea/templates/journal/journal.html:199 +#: kallithea/templates/journal/journal.html:290 +#: kallithea/templates/tags/tags.html:80 +msgid "Click to sort descending" +msgstr "Tri descendant" + +#: kallithea/templates/index_base.html:142 +msgid "No repositories found." +msgstr "Pas de dépôts trouvés." + +#: kallithea/templates/index_base.html:143 +#: kallithea/templates/admin/my_account/my_account_repos.html:60 +#: kallithea/templates/admin/my_account/my_account_watched.html:60 +#: kallithea/templates/base/root.html:46 +#: kallithea/templates/bookmarks/bookmarks.html:82 +#: kallithea/templates/branches/branches.html:82 +#: kallithea/templates/journal/journal.html:201 +#: kallithea/templates/journal/journal.html:292 +#: kallithea/templates/tags/tags.html:82 +msgid "Data error." +msgstr "Erreur d’intégrité des données." + +#: kallithea/templates/index_base.html:144 +#: kallithea/templates/admin/my_account/my_account_repos.html:61 +#: kallithea/templates/admin/my_account/my_account_watched.html:61 +#: kallithea/templates/base/root.html:47 +#: kallithea/templates/bookmarks/bookmarks.html:83 +#: kallithea/templates/branches/branches.html:83 +#: kallithea/templates/journal/journal.html:202 +#: kallithea/templates/journal/journal.html:293 +#: kallithea/templates/tags/tags.html:83 +msgid "Loading..." +msgstr "Chargement…" + +#: kallithea/templates/login.html:5 kallithea/templates/login.html:15 +#: kallithea/templates/base/base.html:414 msgid "Log In" msgstr "Connexion" -#: kallithea/templates/login.html:12 -#: kallithea/tests/data/templates/login.html.py:60 +#: kallithea/templates/login.html:13 #, python-format msgid "Log In to %s" msgstr "Se connecter à %s" -#: kallithea/templates/login.html:23 kallithea/templates/register.html:22 +#: kallithea/templates/login.html:26 kallithea/templates/register.html:24 #: kallithea/templates/admin/admin_log.html:5 -#: kallithea/templates/admin/my_account/my_account_profile.html:18 -#: kallithea/templates/admin/users/user_add.html:27 -#: kallithea/templates/admin/users/user_edit_profile.html:18 -#: kallithea/templates/admin/users/users.html:37 -#: kallithea/templates/base/base.html:377 -#: kallithea/templates/email_templates/registration.html:11 -#: kallithea/templates/pullrequests/pullrequest_show.html:142 -#: kallithea/tests/data/templates/login.html.py:69 -#: kallithea/tests/data/templates/register.html.py:69 -#: kallithea/tests/data/templates/admin/admin_log.html.py:39 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:60 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:109 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:62 -#: kallithea/tests/data/templates/admin/users/users.html.py:109 -#: kallithea/tests/data/templates/base/base.html.py:611 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:259 +#: kallithea/templates/admin/my_account/my_account_profile.html:25 +#: kallithea/templates/admin/users/user_add.html:32 +#: kallithea/templates/admin/users/user_edit_profile.html:24 +#: kallithea/templates/admin/users/users.html:50 +#: kallithea/templates/base/base.html:390 +#: kallithea/templates/pullrequests/pullrequest_show.html:166 msgid "Username" msgstr "Nom d’utilisateur" -#: kallithea/templates/login.html:29 kallithea/templates/register.html:29 -#: kallithea/templates/admin/my_account/my_account.html:27 -#: kallithea/templates/admin/users/user_add.html:34 -#: kallithea/templates/base/base.html:381 -#: kallithea/tests/data/templates/login.html.py:73 -#: kallithea/tests/data/templates/register.html.py:73 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:128 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:113 -#: kallithea/tests/data/templates/base/base.html.py:615 +#: kallithea/templates/login.html:33 kallithea/templates/register.html:33 +#: kallithea/templates/admin/my_account/my_account.html:37 +#: kallithea/templates/admin/users/user_add.html:41 +#: kallithea/templates/base/base.html:399 msgid "Password" msgstr "Mot de passe" -#: kallithea/templates/login.html:39 -msgid "Stay logged in after browser restart" -msgstr "" - -#: kallithea/templates/login.html:46 -#: kallithea/tests/data/templates/login.html.py:79 +#: kallithea/templates/login.html:44 +msgid "Remember me" +msgstr "Se souvenir de moi" + +#: kallithea/templates/login.html:53 msgid "Forgot your password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/login.html:49 -#: kallithea/tests/data/templates/login.html.py:83 -#: kallithea/tests/data/templates/base/base.html.py:623 +#: kallithea/templates/login.html:56 kallithea/templates/base/base.html:410 msgid "Don't have an account ?" msgstr "Vous n’avez pas de compte ?" -#: kallithea/templates/login.html:52 -#: kallithea/tests/data/templates/login.html.py:86 +#: kallithea/templates/login.html:59 msgid "Sign In" msgstr "Connexion" #: kallithea/templates/password_reset.html:5 -#: kallithea/tests/data/templates/password_reset.html.py:110 msgid "Password Reset" msgstr "Remettre le mot de passe à zéro" #: kallithea/templates/password_reset.html:12 -#: kallithea/templates/password_reset_confirmation.html:13 -#: kallithea/tests/data/templates/password_reset.html.py:60 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:56 +#: kallithea/templates/password_reset_confirmation.html:12 #, python-format msgid "Reset Your Password to %s" msgstr "Réinitialiser votre mot de passe à %s" #: kallithea/templates/password_reset.html:14 #: kallithea/templates/password_reset_confirmation.html:5 -#: kallithea/templates/password_reset_confirmation.html:15 -#: kallithea/tests/data/templates/password_reset.html.py:64 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:60 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:105 +#: kallithea/templates/password_reset_confirmation.html:14 msgid "Reset Your Password" msgstr "Réinitialiser votre mot de passe" -#: kallithea/templates/password_reset.html:21 -#: kallithea/tests/data/templates/password_reset.html.py:69 +#: kallithea/templates/password_reset.html:25 msgid "Email Address" msgstr "Adresse e-mail" -#: kallithea/templates/password_reset.html:29 -#: kallithea/templates/register.html:65 -#: kallithea/tests/data/templates/password_reset.html.py:75 -#: kallithea/tests/data/templates/register.html.py:95 +#: kallithea/templates/password_reset.html:35 +#: kallithea/templates/register.html:79 msgid "Captcha" msgstr "Captcha" -#: kallithea/templates/password_reset.html:39 -#: kallithea/tests/data/templates/password_reset.html.py:80 +#: kallithea/templates/password_reset.html:46 msgid "Send Password Reset Email" msgstr "Envoyer l'E-mail de réinitialisation du mot de passe" -#: kallithea/templates/password_reset.html:44 -#: kallithea/tests/data/templates/password_reset.html.py:82 +#: kallithea/templates/password_reset.html:47 msgid "" "A password reset link will be sent to the specified email address if it " "is registered in the system." @@ -2232,16 +2506,14 @@ "Un lien de réinitialisation du mot de passe sera envoyé à l'adresse " "e-mail indiquée si elle est enregistrée dans le système." -#: kallithea/templates/password_reset_confirmation.html:20 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:65 +#: kallithea/templates/password_reset_confirmation.html:19 #, python-format msgid "You are about to set a new password for the email address %s." msgstr "" "Vous êtes sur le point de changer le mot de passe pour l'adresse e-mail " "%s." -#: kallithea/templates/password_reset_confirmation.html:21 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:67 +#: kallithea/templates/password_reset_confirmation.html:20 msgid "" "Note that you must use the same browser session for this as the one used " "to request the password reset." @@ -2249,123 +2521,102 @@ "Vous devez utiliser la même session de navigateur pour cette opération " "que celle utilisée pour la demande de réinitialisation de mot de passe." -#: kallithea/templates/password_reset_confirmation.html:26 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:73 +#: kallithea/templates/password_reset_confirmation.html:30 msgid "Code you received in the email" msgstr "Le code que vous avez reçu dans l'e-mail" -#: kallithea/templates/password_reset_confirmation.html:33 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:77 +#: kallithea/templates/password_reset_confirmation.html:39 msgid "New Password" msgstr "Nouveau mot de passe" -#: kallithea/templates/password_reset_confirmation.html:40 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:81 +#: kallithea/templates/password_reset_confirmation.html:48 msgid "Confirm New Password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/password_reset_confirmation.html:49 -#: kallithea/tests/data/templates/password_reset_confirmation.html.py:85 +#: kallithea/templates/password_reset_confirmation.html:56 msgid "Confirm" msgstr "Confirmation" -#: kallithea/templates/register.html:5 kallithea/templates/register.html:15 -#: kallithea/templates/register.html:75 -#: kallithea/tests/data/templates/register.html.py:64 -#: kallithea/tests/data/templates/register.html.py:100 -#: kallithea/tests/data/templates/register.html.py:137 +#: kallithea/templates/register.html:5 kallithea/templates/register.html:14 +#: kallithea/templates/register.html:90 msgid "Sign Up" msgstr "Inscription" -#: kallithea/templates/register.html:13 -#: kallithea/tests/data/templates/register.html.py:60 +#: kallithea/templates/register.html:12 #, python-format msgid "Sign Up to %s" msgstr "S'inscrire sur %s" -#: kallithea/templates/register.html:36 -#: kallithea/tests/data/templates/register.html.py:77 +#: kallithea/templates/register.html:42 msgid "Re-enter password" msgstr "Confirmation" -#: kallithea/templates/register.html:43 -#: kallithea/templates/admin/my_account/my_account_profile.html:25 -#: kallithea/templates/admin/users/user_add.html:48 -#: kallithea/templates/admin/users/user_edit_profile.html:60 -#: kallithea/templates/admin/users/users.html:38 -#: kallithea/tests/data/templates/register.html.py:81 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:64 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:121 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:86 -#: kallithea/tests/data/templates/admin/users/users.html.py:111 +#: kallithea/templates/register.html:51 +#: kallithea/templates/admin/my_account/my_account_profile.html:34 +#: kallithea/templates/admin/users/user_add.html:59 +#: kallithea/templates/admin/users/user_edit_profile.html:78 +#: kallithea/templates/admin/users/users.html:51 msgid "First Name" msgstr "Prénom" -#: kallithea/templates/register.html:50 -#: kallithea/templates/admin/my_account/my_account_profile.html:32 -#: kallithea/templates/admin/users/user_add.html:55 -#: kallithea/templates/admin/users/user_edit_profile.html:67 -#: kallithea/templates/admin/users/users.html:39 -#: kallithea/tests/data/templates/register.html.py:85 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:68 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:125 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:90 -#: kallithea/tests/data/templates/admin/users/users.html.py:113 +#: kallithea/templates/register.html:60 +#: kallithea/templates/admin/my_account/my_account_profile.html:43 +#: kallithea/templates/admin/users/user_add.html:68 +#: kallithea/templates/admin/users/user_edit_profile.html:87 +#: kallithea/templates/admin/users/users.html:52 msgid "Last Name" msgstr "Nom" -#: kallithea/templates/register.html:57 -#: kallithea/templates/admin/my_account/my_account_profile.html:39 +#: kallithea/templates/register.html:69 +#: kallithea/templates/admin/my_account/my_account_profile.html:52 #: kallithea/templates/admin/settings/settings.html:31 -#: kallithea/templates/admin/users/user_add.html:62 -#: kallithea/templates/admin/users/user_edit_profile.html:25 -#: kallithea/templates/email_templates/registration.html:33 -#: kallithea/tests/data/templates/register.html.py:89 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:72 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:132 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:129 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:66 +#: kallithea/templates/admin/users/user_add.html:77 +#: kallithea/templates/admin/users/user_edit_profile.html:33 msgid "Email" msgstr "E-mail" -#: kallithea/templates/register.html:77 -#: kallithea/tests/data/templates/register.html.py:104 +#: kallithea/templates/register.html:92 msgid "Registered accounts are ready to use and need no further action." msgstr "" "Les comptes enregistrés sont prêts à être utilisés, et ne nécessitent " "aucune autre action." -#: kallithea/templates/register.html:79 -#: kallithea/tests/data/templates/register.html.py:108 +#: kallithea/templates/register.html:94 msgid "Please wait for an administrator to activate your account." msgstr "Merci d'attendre qu'un administrateur active votre compte." +#: kallithea/templates/switch_to_list.html:10 +#: kallithea/templates/branches/branches_data.html:69 +msgid "There are no branches yet" +msgstr "Aucune branche n’a été créée pour le moment" + +#: kallithea/templates/switch_to_list.html:32 +#: kallithea/templates/tags/tags_data.html:44 +msgid "There are no tags yet" +msgstr "Aucun tag n’a été créé pour le moment" + +#: kallithea/templates/switch_to_list.html:45 +#: kallithea/templates/bookmarks/bookmarks_data.html:43 +msgid "There are no bookmarks yet" +msgstr "Aucun signet n’a été créé" + #: kallithea/templates/admin/admin.html:5 #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/base/base.html:55 -#: kallithea/tests/data/templates/admin/admin.html.py:133 -#: kallithea/tests/data/templates/admin/admin.html.py:155 -#: kallithea/tests/data/templates/base/base.html.py:239 +#: kallithea/templates/base/base.html:59 msgid "Admin Journal" msgstr "Historique d’administration" #: kallithea/templates/admin/admin.html:10 -#: kallithea/templates/journal/journal.html:10 -#: kallithea/tests/data/templates/admin/admin.html.py:127 msgid "journal filter..." msgstr "filtre du journal…" #: kallithea/templates/admin/admin.html:12 -#: kallithea/templates/journal/journal.html:12 -#: kallithea/tests/data/templates/admin/admin.html.py:131 -#: kallithea/tests/data/templates/journal/journal.html.py:122 +#: kallithea/templates/journal/journal.html:11 msgid "Filter" msgstr "Filtre" #: kallithea/templates/admin/admin.html:13 -#: kallithea/templates/journal/journal.html:13 -#: kallithea/tests/data/templates/admin/admin.html.py:135 -#: kallithea/tests/data/templates/journal/journal.html.py:126 +#: kallithea/templates/journal/journal.html:12 #, python-format msgid "%s Entry" msgid_plural "%s Entries" @@ -2373,60 +2624,59 @@ msgstr[1] "%s entrées" #: kallithea/templates/admin/admin_log.html:6 -#: kallithea/templates/admin/my_account/my_account_repos.html:16 -#: kallithea/templates/admin/repo_groups/repo_groups.html:43 -#: kallithea/templates/admin/repos/repo_edit_fields.html:9 -#: kallithea/templates/admin/repos/repos.html:44 -#: kallithea/templates/admin/user_groups/user_groups.html:43 -#: kallithea/templates/admin/users/users.html:45 -#: kallithea/tests/data/templates/admin/admin_log.html.py:41 -#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:38 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:120 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:122 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:122 -#: kallithea/tests/data/templates/admin/users/users.html.py:123 +#: kallithea/templates/admin/my_account/my_account_repos.html:50 +#: kallithea/templates/admin/my_account/my_account_watched.html:50 +#: kallithea/templates/admin/repo_groups/repo_groups.html:50 +#: kallithea/templates/admin/repos/repo_edit_fields.html:8 +#: kallithea/templates/admin/repos/repos.html:52 +#: kallithea/templates/admin/user_groups/user_groups.html:51 +#: kallithea/templates/admin/users/users.html:57 +#: kallithea/templates/journal/journal.html:191 +#: kallithea/templates/journal/journal.html:282 msgid "Action" msgstr "Action" +#: kallithea/templates/admin/admin_log.html:7 +#: kallithea/templates/admin/permissions/permissions_globals.html:18 +msgid "Repository" +msgstr "Dépôt" + #: kallithea/templates/admin/admin_log.html:8 -#: kallithea/tests/data/templates/admin/admin_log.html.py:45 +#: kallithea/templates/bookmarks/bookmarks.html:51 +#: kallithea/templates/bookmarks/bookmarks_data.html:9 +#: kallithea/templates/branches/branches.html:51 +#: kallithea/templates/branches/branches_data.html:9 +#: kallithea/templates/tags/tags.html:51 +#: kallithea/templates/tags/tags_data.html:9 msgid "Date" msgstr "Date" #: kallithea/templates/admin/admin_log.html:9 -#: kallithea/tests/data/templates/admin/admin_log.html.py:47 msgid "From IP" msgstr "Depuis l’adresse IP" -#: kallithea/templates/admin/admin_log.html:61 -#: kallithea/tests/data/templates/admin/admin_log.html.py:84 +#: kallithea/templates/admin/admin_log.html:63 msgid "No actions yet" msgstr "Aucune action n’a été enregistrée pour le moment" #: kallithea/templates/admin/auth/auth_settings.html:5 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:246 msgid "Authentication Settings" msgstr "Réglages d'authentification" #: kallithea/templates/admin/auth/auth_settings.html:11 -#: kallithea/templates/base/base.html:61 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:228 -#: kallithea/tests/data/templates/base/base.html.py:263 +#: kallithea/templates/base/base.html:65 msgid "Authentication" msgstr "Authentification" -#: kallithea/templates/admin/auth/auth_settings.html:27 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:114 +#: kallithea/templates/admin/auth/auth_settings.html:28 msgid "Authentication Plugins" msgstr "Greffons d'authentification" -#: kallithea/templates/admin/auth/auth_settings.html:29 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:116 +#: kallithea/templates/admin/auth/auth_settings.html:31 msgid "Enabled Plugins" msgstr "Greffons activés" -#: kallithea/templates/admin/auth/auth_settings.html:32 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:120 +#: kallithea/templates/admin/auth/auth_settings.html:33 msgid "" "Comma-separated list of plugins; Kallithea will try user authentication " "in plugin order" @@ -2435,78 +2685,57 @@ "est aussi celui dans lequel Kallithea va essayer d'authentifier un " "utilisateur" -#: kallithea/templates/admin/auth/auth_settings.html:36 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:122 +#: kallithea/templates/admin/auth/auth_settings.html:34 msgid "Available built-in plugins" msgstr "Greffons inclus disponibles" -#: kallithea/templates/admin/auth/auth_settings.html:53 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:140 +#: kallithea/templates/admin/auth/auth_settings.html:51 msgid "Plugin" msgstr "Greffon" #: kallithea/templates/admin/auth/auth_settings.html:101 -#: kallithea/templates/admin/defaults/defaults.html:67 -#: kallithea/templates/admin/my_account/my_account_password.html:30 -#: kallithea/templates/admin/my_account/my_account_profile.html:47 -#: kallithea/templates/admin/permissions/permissions_globals.html:94 -#: kallithea/templates/admin/repo_groups/repo_group_add.html:58 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:98 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:35 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:84 -#: kallithea/templates/admin/repos/repo_edit_settings.html:104 -#: kallithea/templates/admin/settings/settings_hooks.html:46 -#: kallithea/templates/admin/user_groups/user_group_add.html:48 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:88 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:46 -#: kallithea/templates/admin/users/user_add.html:80 -#: kallithea/templates/admin/users/user_edit_profile.html:89 -#: kallithea/templates/base/default_perms_box.html:56 -#: kallithea/tests/data/templates/admin/auth/auth_settings.html.py:204 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:137 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:76 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:115 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:131 -#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:82 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:141 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:102 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:72 +#: kallithea/templates/admin/defaults/defaults.html:82 +#: kallithea/templates/admin/my_account/my_account_password.html:36 +#: kallithea/templates/admin/my_account/my_account_profile.html:60 +#: kallithea/templates/admin/permissions/permissions_globals.html:112 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:69 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:114 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:42 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:101 +#: kallithea/templates/admin/repos/repo_edit_settings.html:127 +#: kallithea/templates/admin/settings/settings_hooks.html:53 +#: kallithea/templates/admin/user_groups/user_group_add.html:57 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:104 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:60 +#: kallithea/templates/admin/users/user_add.html:96 +#: kallithea/templates/admin/users/user_edit_profile.html:113 +#: kallithea/templates/base/default_perms_box.html:64 msgid "Save" msgstr "Enregistrer" #: kallithea/templates/admin/defaults/defaults.html:5 #: kallithea/templates/admin/defaults/defaults.html:11 -#: kallithea/templates/base/base.html:62 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:162 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:180 -#: kallithea/tests/data/templates/base/base.html.py:267 +#: kallithea/templates/base/base.html:66 msgid "Repository Defaults" msgstr "Réglages par défaut du dépôt" -#: kallithea/templates/admin/defaults/defaults.html:27 -#: kallithea/templates/admin/repos/repo_add_base.html:42 -#: kallithea/templates/admin/repos/repo_edit_fields.html:8 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:109 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:72 +#: kallithea/templates/admin/defaults/defaults.html:33 +#: kallithea/templates/admin/repos/repo_add_base.html:55 +#: kallithea/templates/admin/repos/repo_edit_fields.html:7 msgid "Type" msgstr "Type" -#: kallithea/templates/admin/defaults/defaults.html:34 -#: kallithea/templates/admin/repos/repo_add_base.html:56 -#: kallithea/templates/admin/repos/repo_edit_settings.html:60 -#: kallithea/templates/data_table/_dt_elements.html:18 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:113 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:84 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:443 +#: kallithea/templates/admin/defaults/defaults.html:42 +#: kallithea/templates/admin/repos/repo_add_base.html:73 +#: kallithea/templates/admin/repos/repo_edit_settings.html:75 +#: kallithea/templates/data_table/_dt_elements.html:72 msgid "Private repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/defaults/defaults.html:37 -#: kallithea/templates/admin/repos/repo_add_base.html:59 -#: kallithea/templates/admin/repos/repo_edit_settings.html:63 -#: kallithea/templates/forks/fork.html:61 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:117 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:88 +#: kallithea/templates/admin/defaults/defaults.html:46 +#: kallithea/templates/admin/repos/repo_add_base.html:77 +#: kallithea/templates/admin/repos/repo_edit_settings.html:79 +#: kallithea/templates/forks/fork.html:72 msgid "" "Private repositories are only visible to people explicitly added as " "collaborators." @@ -2514,40 +2743,34 @@ "Les dépôts privés sont visibles seulement par les utilisateurs ajoutés " "comme collaborateurs." -#: kallithea/templates/admin/defaults/defaults.html:42 -#: kallithea/templates/admin/repos/repo_edit_settings.html:67 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:119 +#: kallithea/templates/admin/defaults/defaults.html:53 +#: kallithea/templates/admin/repos/repo_edit_settings.html:84 msgid "Enable statistics" msgstr "Activer les statistiques" -#: kallithea/templates/admin/defaults/defaults.html:45 -#: kallithea/templates/admin/repos/repo_edit_settings.html:70 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:123 +#: kallithea/templates/admin/defaults/defaults.html:57 +#: kallithea/templates/admin/repos/repo_edit_settings.html:88 msgid "Enable statistics window on summary page." msgstr "Afficher les statistiques sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:50 -#: kallithea/templates/admin/repos/repo_edit_settings.html:74 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:125 +#: kallithea/templates/admin/defaults/defaults.html:63 +#: kallithea/templates/admin/repos/repo_edit_settings.html:93 msgid "Enable downloads" msgstr "Activer les téléchargements" -#: kallithea/templates/admin/defaults/defaults.html:53 -#: kallithea/templates/admin/repos/repo_edit_settings.html:77 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:129 +#: kallithea/templates/admin/defaults/defaults.html:67 +#: kallithea/templates/admin/repos/repo_edit_settings.html:97 msgid "Enable download menu on summary page." msgstr "Afficher le menu de téléchargements sur la page du dépôt." -#: kallithea/templates/admin/defaults/defaults.html:58 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 -#: kallithea/templates/admin/repos/repo_edit_settings.html:81 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:131 +#: kallithea/templates/admin/defaults/defaults.html:73 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:34 +#: kallithea/templates/admin/repos/repo_edit_settings.html:102 msgid "Enable locking" msgstr "Activer le verrouillage" -#: kallithea/templates/admin/defaults/defaults.html:61 -#: kallithea/templates/admin/repos/repo_edit_settings.html:84 -#: kallithea/tests/data/templates/admin/defaults/defaults.html.py:135 +#: kallithea/templates/admin/defaults/defaults.html:77 +#: kallithea/templates/admin/repos/repo_edit_settings.html:106 msgid "Enable lock-by-pulling on repository." msgstr "Activer le verrouillage lors d’un pull sur le dépôt." @@ -2556,7 +2779,7 @@ msgid "Edit Gist" msgstr "Modifier le gist" -#: kallithea/templates/admin/gists/edit.html:35 +#: kallithea/templates/admin/gists/edit.html:36 #, python-format msgid "" "Gist was update since you started editing. Copy your changes and click " @@ -2565,464 +2788,309 @@ "Le gist a été mis à jour depuis que vous avez commencé à éditer. Copier " "vos changements et cliquez %(here)s pour charger la nouvelle version." -#: kallithea/templates/admin/gists/edit.html:51 -#: kallithea/templates/admin/gists/new.html:35 -#: kallithea/tests/data/templates/admin/gists/new.html.py:203 +#: kallithea/templates/admin/gists/edit.html:55 +#: kallithea/templates/admin/gists/new.html:39 msgid "Gist description ..." msgstr "Description du gist…" -#: kallithea/templates/admin/gists/edit.html:54 -#: kallithea/templates/admin/gists/new.html:38 -#: kallithea/tests/data/templates/admin/gists/new.html.py:205 +#: kallithea/templates/admin/gists/edit.html:57 +#: kallithea/templates/admin/gists/new.html:41 msgid "Gist lifetime" msgstr "Durée de vie du gist" -#: kallithea/templates/admin/gists/edit.html:59 #: kallithea/templates/admin/gists/edit.html:61 -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/admin/gists/index.html:56 -#: kallithea/templates/admin/gists/show.html:45 +#: kallithea/templates/admin/gists/edit.html:63 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/index.html:59 #: kallithea/templates/admin/gists/show.html:47 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:31 -#: kallithea/templates/admin/users/user_edit_api_keys.html:7 -#: kallithea/templates/admin/users/user_edit_api_keys.html:26 -#: kallithea/templates/admin/users/user_edit_api_keys.html:31 -#: kallithea/tests/data/templates/admin/gists/index.html.py:137 -#: kallithea/tests/data/templates/admin/gists/index.html.py:143 -#: kallithea/tests/data/templates/admin/gists/show.html.py:131 -#: kallithea/tests/data/templates/admin/gists/show.html.py:137 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:42 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:69 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:82 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:42 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:69 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:82 +#: kallithea/templates/admin/gists/show.html:49 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:32 +#: kallithea/templates/admin/users/user_edit_api_keys.html:8 +#: kallithea/templates/admin/users/user_edit_api_keys.html:27 +#: kallithea/templates/admin/users/user_edit_api_keys.html:32 msgid "Expires" msgstr "Expire le" -#: kallithea/templates/admin/gists/edit.html:59 -#: kallithea/templates/admin/gists/index.html:54 -#: kallithea/templates/admin/gists/show.html:45 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:7 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:26 -#: kallithea/templates/admin/users/user_edit_api_keys.html:7 -#: kallithea/templates/admin/users/user_edit_api_keys.html:26 -#: kallithea/tests/data/templates/admin/gists/index.html.py:139 -#: kallithea/tests/data/templates/admin/gists/show.html.py:133 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:44 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:71 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:44 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:71 +#: kallithea/templates/admin/gists/edit.html:61 +#: kallithea/templates/admin/gists/index.html:57 +#: kallithea/templates/admin/gists/show.html:47 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:8 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:27 +#: kallithea/templates/admin/users/user_edit_api_keys.html:8 +#: kallithea/templates/admin/users/user_edit_api_keys.html:27 msgid "Never" msgstr "Jamais" -#: kallithea/templates/admin/gists/edit.html:145 +#: kallithea/templates/admin/gists/edit.html:146 msgid "Update Gist" msgstr "Mettre à jour le gist" -#: kallithea/templates/admin/gists/edit.html:146 -#: kallithea/templates/changeset/changeset_file_comment.html:103 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:189 +#: kallithea/templates/admin/gists/edit.html:147 +#: kallithea/templates/changeset/changeset_file_comment.html:105 msgid "Cancel" msgstr "Annuler" #: kallithea/templates/admin/gists/index.html:6 #: kallithea/templates/admin/gists/index.html:16 -#: kallithea/tests/data/templates/admin/gists/index.html.py:178 -#: kallithea/tests/data/templates/admin/gists/index.html.py:213 #, python-format msgid "Private Gists for User %s" msgstr "Gists privés de l'utilisateur %s" #: kallithea/templates/admin/gists/index.html:8 #: kallithea/templates/admin/gists/index.html:18 -#: kallithea/tests/data/templates/admin/gists/index.html.py:182 -#: kallithea/tests/data/templates/admin/gists/index.html.py:217 #, python-format msgid "Public Gists for User %s" msgstr "Gists publiques de l'utilisateur %s" #: kallithea/templates/admin/gists/index.html:10 #: kallithea/templates/admin/gists/index.html:20 -#: kallithea/tests/data/templates/admin/gists/index.html.py:186 -#: kallithea/tests/data/templates/admin/gists/index.html.py:221 msgid "Public Gists" msgstr "Gists publics" #: kallithea/templates/admin/gists/index.html:37 #: kallithea/templates/admin/gists/show.html:25 -#: kallithea/templates/base/base.html:310 -#: kallithea/tests/data/templates/admin/gists/index.html.py:115 -#: kallithea/tests/data/templates/admin/gists/show.html.py:115 -#: kallithea/tests/data/templates/base/base.html.py:521 +#: kallithea/templates/base/base.html:321 msgid "Create New Gist" msgstr "Créer un nouveau gist" -#: kallithea/templates/admin/gists/index.html:51 -#: kallithea/templates/data_table/_dt_elements.html:88 -#: kallithea/tests/data/templates/admin/gists/index.html.py:131 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:148 +#: kallithea/templates/admin/gists/index.html:54 +#: kallithea/templates/data_table/_dt_elements.html:141 msgid "Created" msgstr "Créé" -#: kallithea/templates/admin/gists/index.html:66 -#: kallithea/tests/data/templates/admin/gists/index.html.py:155 +#: kallithea/templates/admin/gists/index.html:74 msgid "There are no gists yet" msgstr "Il n'y a actuellement pas de gists" #: kallithea/templates/admin/gists/new.html:5 #: kallithea/templates/admin/gists/new.html:18 -#: kallithea/tests/data/templates/admin/gists/new.html.py:127 -#: kallithea/tests/data/templates/admin/gists/new.html.py:143 msgid "New Gist" msgstr "Nouveau gist" -#: kallithea/templates/admin/gists/new.html:45 -#, fuzzy -#| msgid "name this file..." -msgid "Name this gist ..." +#: kallithea/templates/admin/gists/new.html:47 +msgid "name this file..." msgstr "nommez ce fichier…" -#: kallithea/templates/admin/gists/new.html:53 -#: kallithea/tests/data/templates/admin/gists/new.html.py:211 +#: kallithea/templates/admin/gists/new.html:56 msgid "Create Private Gist" msgstr "Créer un gist privé" -#: kallithea/templates/admin/gists/new.html:54 -#: kallithea/tests/data/templates/admin/gists/new.html.py:213 +#: kallithea/templates/admin/gists/new.html:57 msgid "Create Public Gist" msgstr "Créer un gist public" -#: kallithea/templates/admin/gists/new.html:55 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 -#: kallithea/templates/admin/my_account/my_account_api_keys.html:73 -#: kallithea/templates/admin/my_account/my_account_emails.html:47 -#: kallithea/templates/admin/my_account/my_account_password.html:31 -#: kallithea/templates/admin/my_account/my_account_profile.html:48 -#: kallithea/templates/admin/permissions/permissions_globals.html:95 -#: kallithea/templates/admin/permissions/permissions_ips.html:34 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:99 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:36 -#: kallithea/templates/admin/repos/repo_edit_fields.html:54 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:85 -#: kallithea/templates/admin/repos/repo_edit_settings.html:105 -#: kallithea/templates/admin/settings/settings_global.html:50 -#: kallithea/templates/admin/settings/settings_vcs.html:78 -#: kallithea/templates/admin/settings/settings_visual.html:116 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:89 -#: kallithea/templates/admin/users/user_edit_api_keys.html:14 -#: kallithea/templates/admin/users/user_edit_api_keys.html:73 -#: kallithea/templates/admin/users/user_edit_emails.html:47 -#: kallithea/templates/admin/users/user_edit_ips.html:45 -#: kallithea/templates/admin/users/user_edit_profile.html:90 -#: kallithea/templates/base/default_perms_box.html:57 -#: kallithea/templates/files/files_add.html:69 -#: kallithea/templates/files/files_delete.html:41 -#: kallithea/templates/files/files_edit.html:72 -#: kallithea/templates/pullrequests/pullrequest.html:78 -#: kallithea/tests/data/templates/admin/gists/new.html.py:215 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:54 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:112 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:79 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:78 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:117 -#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:71 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:70 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:95 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:109 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:54 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:112 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:77 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:104 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:74 -#: kallithea/tests/data/templates/files/files_add.html.py:249 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:150 +#: kallithea/templates/admin/gists/new.html:58 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:15 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:70 +#: kallithea/templates/admin/my_account/my_account_emails.html:46 +#: kallithea/templates/admin/my_account/my_account_password.html:37 +#: kallithea/templates/admin/my_account/my_account_profile.html:61 +#: kallithea/templates/admin/permissions/permissions_globals.html:113 +#: kallithea/templates/admin/permissions/permissions_ips.html:39 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:115 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:43 +#: kallithea/templates/admin/repos/repo_edit_fields.html:59 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:102 +#: kallithea/templates/admin/repos/repo_edit_settings.html:128 +#: kallithea/templates/admin/settings/settings_global.html:57 +#: kallithea/templates/admin/settings/settings_vcs.html:81 +#: kallithea/templates/admin/settings/settings_visual.html:117 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:105 +#: kallithea/templates/admin/users/user_edit_api_keys.html:15 +#: kallithea/templates/admin/users/user_edit_api_keys.html:70 +#: kallithea/templates/admin/users/user_edit_emails.html:46 +#: kallithea/templates/admin/users/user_edit_ips.html:50 +#: kallithea/templates/admin/users/user_edit_profile.html:114 +#: kallithea/templates/base/default_perms_box.html:65 +#: kallithea/templates/files/files_add.html:65 +#: kallithea/templates/files/files_delete.html:44 +#: kallithea/templates/files/files_edit.html:68 +#: kallithea/templates/pullrequests/pullrequest.html:89 msgid "Reset" msgstr "Réinitialiser" #: kallithea/templates/admin/gists/show.html:5 #: kallithea/templates/admin/gists/show.html:9 -#: kallithea/tests/data/templates/admin/gists/show.html.py:201 -#: kallithea/tests/data/templates/admin/gists/show.html.py:229 msgid "Gist" msgstr "Gist" #: kallithea/templates/admin/gists/show.html:10 -#: kallithea/tests/data/templates/admin/gists/show.html.py:205 -#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:91 -#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:87 -#: kallithea/tests/data/templates/email_templates/pull_request.html.py:82 -#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:80 -#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:83 -#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:81 +#: kallithea/templates/email_templates/changeset_comment.html:15 +#: kallithea/templates/email_templates/pull_request.html:10 +#: kallithea/templates/email_templates/pull_request_comment.html:15 msgid "URL" msgstr "URL" -#: kallithea/templates/admin/gists/show.html:35 -#: kallithea/tests/data/templates/admin/gists/show.html.py:120 +#: kallithea/templates/admin/gists/show.html:37 msgid "Public Gist" msgstr "Gist public" -#: kallithea/templates/admin/gists/show.html:37 -#: kallithea/tests/data/templates/admin/gists/show.html.py:124 +#: kallithea/templates/admin/gists/show.html:39 msgid "Private Gist" msgstr "Gist privé" -#: kallithea/templates/admin/gists/show.html:54 -#: kallithea/templates/admin/my_account/my_account_emails.html:23 -#: kallithea/templates/admin/notifications/notifications_data.html:14 -#: kallithea/templates/admin/notifications/show_notification.html:30 -#: kallithea/templates/admin/permissions/permissions_ips.html:11 -#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 -#: kallithea/templates/admin/repos/repo_edit_fields.html:19 -#: kallithea/templates/admin/settings/settings_hooks.html:30 -#: kallithea/templates/admin/users/user_edit_emails.html:23 -#: kallithea/templates/admin/users/user_edit_ips.html:21 -#: kallithea/templates/changeset/changeset_file_comment.html:29 -#: kallithea/templates/changeset/changeset_file_comment.html:93 -#: kallithea/templates/data_table/_dt_elements.html:76 -#: kallithea/templates/data_table/_dt_elements.html:104 -#: kallithea/templates/data_table/_dt_elements.html:119 -#: kallithea/templates/data_table/_dt_elements.html:134 -#: kallithea/templates/files/files_source.html:35 -#: kallithea/templates/files/files_source.html:38 -#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/admin/gists/show.html:56 +#: kallithea/templates/admin/my_account/my_account_emails.html:19 +#: kallithea/templates/admin/permissions/permissions_ips.html:12 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:75 +#: kallithea/templates/admin/repos/repo_edit_fields.html:18 +#: kallithea/templates/admin/settings/settings_hooks.html:36 +#: kallithea/templates/admin/users/user_edit_emails.html:19 +#: kallithea/templates/admin/users/user_edit_ips.html:22 +#: kallithea/templates/changeset/changeset_file_comment.html:31 +#: kallithea/templates/changeset/changeset_file_comment.html:95 +#: kallithea/templates/data_table/_dt_elements.html:129 +#: kallithea/templates/data_table/_dt_elements.html:157 +#: kallithea/templates/data_table/_dt_elements.html:173 +#: kallithea/templates/data_table/_dt_elements.html:189 +#: kallithea/templates/files/files_source.html:39 +#: kallithea/templates/files/files_source.html:42 +#: kallithea/templates/files/files_source.html:45 #: kallithea/templates/pullrequests/pullrequest_data.html:20 -#: kallithea/tests/data/templates/admin/gists/show.html.py:146 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:61 -#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:51 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:100 -#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:75 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:59 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:100 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:182 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:123 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:272 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:331 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:396 -#: kallithea/tests/data/templates/files/files_source.html.py:82 -#: kallithea/tests/data/templates/files/files_source.html.py:88 -#: kallithea/tests/data/templates/files/files_source.html.py:94 msgid "Delete" msgstr "Supprimer" -#: kallithea/templates/admin/gists/show.html:54 -#: kallithea/tests/data/templates/admin/gists/show.html.py:146 +#: kallithea/templates/admin/gists/show.html:56 msgid "Confirm to delete this Gist" msgstr "Confirmer la supprisson de ce gist" -#: kallithea/templates/admin/gists/show.html:61 -#: kallithea/templates/base/perms_summary.html:44 +#: kallithea/templates/admin/gists/show.html:63 +#: kallithea/templates/base/perms_summary.html:43 +#: kallithea/templates/base/perms_summary.html:79 #: kallithea/templates/base/perms_summary.html:81 -#: kallithea/templates/base/perms_summary.html:83 -#: kallithea/templates/data_table/_dt_elements.html:69 -#: kallithea/templates/data_table/_dt_elements.html:70 -#: kallithea/templates/data_table/_dt_elements.html:97 -#: kallithea/templates/data_table/_dt_elements.html:98 -#: kallithea/templates/data_table/_dt_elements.html:112 -#: kallithea/templates/data_table/_dt_elements.html:113 -#: kallithea/templates/data_table/_dt_elements.html:127 -#: kallithea/templates/data_table/_dt_elements.html:128 -#: kallithea/templates/files/diff_2way.html:54 -#: kallithea/templates/files/files_source.html:37 -#: kallithea/templates/files/files_source.html:40 +#: kallithea/templates/data_table/_dt_elements.html:122 +#: kallithea/templates/data_table/_dt_elements.html:123 +#: kallithea/templates/data_table/_dt_elements.html:150 +#: kallithea/templates/data_table/_dt_elements.html:151 +#: kallithea/templates/data_table/_dt_elements.html:165 +#: kallithea/templates/data_table/_dt_elements.html:167 +#: kallithea/templates/data_table/_dt_elements.html:181 +#: kallithea/templates/data_table/_dt_elements.html:183 +#: kallithea/templates/files/diff_2way.html:56 +#: kallithea/templates/files/files_source.html:41 +#: kallithea/templates/files/files_source.html:44 #: kallithea/templates/pullrequests/pullrequest_show.html:41 -#: kallithea/tests/data/templates/admin/gists/show.html.py:153 -#: kallithea/tests/data/templates/base/perms_summary.html.py:105 -#: kallithea/tests/data/templates/base/perms_summary.html.py:154 -#: kallithea/tests/data/templates/base/perms_summary.html.py:160 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:117 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:119 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:266 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:268 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:325 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:327 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:390 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:392 -#: kallithea/tests/data/templates/files/files_source.html.py:86 -#: kallithea/tests/data/templates/files/files_source.html.py:92 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:157 msgid "Edit" msgstr "Modifier" -#: kallithea/templates/admin/gists/show.html:63 -#: kallithea/templates/files/files_edit.html:52 -#: kallithea/templates/files/files_source.html:30 -#: kallithea/tests/data/templates/admin/gists/show.html.py:156 -#: kallithea/tests/data/templates/files/files_source.html.py:73 +#: kallithea/templates/admin/gists/show.html:65 +#: kallithea/templates/files/files_edit.html:49 +#: kallithea/templates/files/files_source.html:34 msgid "Show as Raw" msgstr "Montrer en brut" -#: kallithea/templates/admin/gists/show.html:69 -#: kallithea/tests/data/templates/admin/gists/show.html.py:164 +#: kallithea/templates/admin/gists/show.html:73 msgid "created" msgstr "créé" -#: kallithea/templates/admin/gists/show.html:82 -#: kallithea/tests/data/templates/admin/gists/show.html.py:178 +#: kallithea/templates/admin/gists/show.html:86 msgid "Show as raw" msgstr "Montrer en brut" #: kallithea/templates/admin/my_account/my_account.html:5 #: kallithea/templates/admin/my_account/my_account.html:9 -#: kallithea/templates/base/base.html:404 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:170 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:192 -#: kallithea/tests/data/templates/base/base.html.py:644 +#: kallithea/templates/base/base.html:431 msgid "My Account" msgstr "Mon compte" -#: kallithea/templates/admin/my_account/my_account.html:25 +#: kallithea/templates/admin/my_account/my_account.html:35 #: kallithea/templates/admin/users/user_edit.html:29 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:116 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:112 msgid "Profile" msgstr "Profil" -#: kallithea/templates/admin/my_account/my_account.html:26 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:122 +#: kallithea/templates/admin/my_account/my_account.html:36 msgid "Email Addresses" msgstr "Adresses e-mail" -#: kallithea/templates/admin/my_account/my_account.html:28 +#: kallithea/templates/admin/my_account/my_account.html:38 #: kallithea/templates/admin/users/user_edit.html:31 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:134 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:124 msgid "API Keys" msgstr "Clés de l'API" -#: kallithea/templates/admin/my_account/my_account.html:29 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:140 +#: kallithea/templates/admin/my_account/my_account.html:39 msgid "Owned Repositories" msgstr "Dépôts possédés" -#: kallithea/templates/admin/my_account/my_account.html:30 -#: kallithea/templates/journal/journal.html:33 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:146 -#: kallithea/tests/data/templates/journal/journal.html.py:196 +#: kallithea/templates/admin/my_account/my_account.html:40 +#: kallithea/templates/journal/journal.html:53 msgid "Watched Repositories" msgstr "Dépôts surveillés" -#: kallithea/templates/admin/my_account/my_account.html:31 +#: kallithea/templates/admin/my_account/my_account.html:41 #: kallithea/templates/admin/permissions/permissions.html:30 #: kallithea/templates/admin/user_groups/user_group_edit.html:32 #: kallithea/templates/admin/users/user_edit.html:34 -#: kallithea/tests/data/templates/admin/my_account/my_account.html.py:152 -#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:120 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:130 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:142 msgid "Show Permissions" msgstr "Afficher les permissions" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:5 -#: kallithea/templates/admin/users/user_edit_api_keys.html:5 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:40 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:40 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:6 +#: kallithea/templates/admin/users/user_edit_api_keys.html:6 msgid "Built-in" msgstr "Inclus" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:13 -#: kallithea/templates/admin/users/user_edit_api_keys.html:13 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:52 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:52 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:14 +#: kallithea/templates/admin/users/user_edit_api_keys.html:14 #, python-format msgid "Confirm to reset this API key: %s" msgstr "Confirmer la remise à zéro de cette clé d'API : %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:29 -#: kallithea/templates/admin/users/user_edit_api_keys.html:29 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:76 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:76 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:30 +#: kallithea/templates/admin/users/user_edit_api_keys.html:30 msgid "Expired" msgstr "a expiré" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:39 -#: kallithea/templates/admin/users/user_edit_api_keys.html:39 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:91 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:91 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:40 +#: kallithea/templates/admin/users/user_edit_api_keys.html:40 #, python-format msgid "Confirm to remove this API key: %s" msgstr "Confirmer la suppression de cette clé d'API : %s" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:41 -#: kallithea/templates/admin/users/user_edit_api_keys.html:41 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:93 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:93 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:42 +#: kallithea/templates/admin/users/user_edit_api_keys.html:42 msgid "Remove" msgstr "Supprimer" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:48 -#: kallithea/templates/admin/users/user_edit_api_keys.html:48 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:99 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:99 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:49 +#: kallithea/templates/admin/users/user_edit_api_keys.html:49 msgid "No additional API keys specified" msgstr "Pas de clés d'API supplémentaires spécifiées" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:56 -#: kallithea/templates/admin/users/user_edit_api_keys.html:56 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:104 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:104 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:61 +#: kallithea/templates/admin/users/user_edit_api_keys.html:61 msgid "New API key" msgstr "Nouvelle clé d'API" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:72 -#: kallithea/templates/admin/my_account/my_account_emails.html:46 -#: kallithea/templates/admin/permissions/permissions_ips.html:33 -#: kallithea/templates/admin/repos/repo_add_base.html:64 -#: kallithea/templates/admin/repos/repo_edit_fields.html:53 -#: kallithea/templates/admin/users/user_edit_api_keys.html:72 -#: kallithea/templates/admin/users/user_edit_emails.html:46 -#: kallithea/templates/admin/users/user_edit_ips.html:44 -#: kallithea/tests/data/templates/admin/my_account/my_account_api_keys.html.py:110 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:77 -#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:69 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:90 -#: kallithea/tests/data/templates/admin/users/user_edit_api_keys.html.py:110 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:75 +#: kallithea/templates/admin/my_account/my_account_api_keys.html:69 +#: kallithea/templates/admin/my_account/my_account_emails.html:45 +#: kallithea/templates/admin/permissions/permissions_ips.html:38 +#: kallithea/templates/admin/repos/repo_add_base.html:81 +#: kallithea/templates/admin/repos/repo_edit_fields.html:58 +#: kallithea/templates/admin/users/user_edit_api_keys.html:69 +#: kallithea/templates/admin/users/user_edit_emails.html:45 +#: kallithea/templates/admin/users/user_edit_ips.html:49 msgid "Add" msgstr "Ajouter" -#: kallithea/templates/admin/my_account/my_account_api_keys.html:81 -#, python-format -msgid "" -"\n" -"API keys are used to let scripts or services access %s using your\n" -"account, as if you had provided the script or service with your actual\n" -"password.\n" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_api_keys.html:86 -msgid "" -"\n" -"Like passwords, API keys should therefore never be shared with others,\n" -"nor passed to untrusted scripts or services. If such sharing should\n" -"happen anyway, reset the API key on this page to prevent further use.\n" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_emails.html:9 -#: kallithea/templates/admin/users/user_edit_emails.html:9 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:45 +#: kallithea/templates/admin/my_account/my_account_emails.html:7 +#: kallithea/templates/admin/users/user_edit_emails.html:7 msgid "Primary" msgstr "Primaire" -#: kallithea/templates/admin/my_account/my_account_emails.html:24 -#: kallithea/templates/admin/users/user_edit_emails.html:24 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:62 +#: kallithea/templates/admin/my_account/my_account_emails.html:20 +#: kallithea/templates/admin/users/user_edit_emails.html:20 #, python-format msgid "Confirm to delete this email: %s" msgstr "Veuillez confirmer la suppression de l’e-mail : %s" -#: kallithea/templates/admin/my_account/my_account_emails.html:30 -#: kallithea/templates/admin/users/user_edit_emails.html:30 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:68 +#: kallithea/templates/admin/my_account/my_account_emails.html:26 +#: kallithea/templates/admin/users/user_edit_emails.html:26 msgid "No additional emails specified." msgstr "Pas d'adresse email supplémentaires spécifiées." -#: kallithea/templates/admin/my_account/my_account_emails.html:39 -#: kallithea/templates/admin/users/user_edit_emails.html:39 -#: kallithea/tests/data/templates/admin/my_account/my_account_emails.html.py:73 +#: kallithea/templates/admin/my_account/my_account_emails.html:38 +#: kallithea/templates/admin/users/user_edit_emails.html:38 msgid "New email address" msgstr "Nouvelle adrese" @@ -3030,165 +3098,123 @@ msgid "Change Your Account Password" msgstr "Changer le mot de passe de votre compte" -#: kallithea/templates/admin/my_account/my_account_password.html:8 +#: kallithea/templates/admin/my_account/my_account_password.html:10 msgid "Current password" msgstr "Mot de passe actuel" -#: kallithea/templates/admin/my_account/my_account_password.html:15 -#: kallithea/templates/admin/users/user_edit_profile.html:46 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:78 +#: kallithea/templates/admin/my_account/my_account_password.html:19 +#: kallithea/templates/admin/users/user_edit_profile.html:60 msgid "New password" msgstr "Nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_password.html:22 +#: kallithea/templates/admin/my_account/my_account_password.html:28 msgid "Confirm new password" msgstr "Confirmer le nouveau mot de passe" -#: kallithea/templates/admin/my_account/my_account_password.html:39 +#: kallithea/templates/admin/my_account/my_account_password.html:45 #, python-format msgid "This account is managed with %s and the password cannot be changed here" msgstr "Ce compte est géré avec %s et le mot de passe ne peut pas être changé ici" -#: kallithea/templates/admin/my_account/my_account_perms.html:3 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:55 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:57 +#: kallithea/templates/admin/my_account/my_account_profile.html:11 +msgid "Change your avatar at" +msgstr "Vous pouvez changer votre avatar sur" + +#: kallithea/templates/admin/my_account/my_account_profile.html:12 +#: kallithea/templates/admin/users/user_edit_profile.html:9 +msgid "Using" +msgstr "en utilisant l’adresse" + +#: kallithea/templates/admin/my_account/my_account_profile.html:14 +#: kallithea/templates/admin/users/user_edit_profile.html:11 +msgid "Avatars are disabled" +msgstr "Les avatars sont désactivés" + +#: kallithea/templates/admin/my_account/my_account_profile.html:15 +msgid "Missing email, please update your user email address." +msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." + +#: kallithea/templates/admin/my_account/my_account_profile.html:16 +#: kallithea/templates/admin/users/user_edit_profile.html:15 msgid "Current IP" msgstr "Adresse IP actuelle" -#: kallithea/templates/admin/my_account/my_account_profile.html:4 -#: kallithea/templates/admin/users/user_edit_profile.html:4 -msgid "Gravatar" -msgstr "" - -#: kallithea/templates/admin/my_account/my_account_profile.html:10 -#: kallithea/templates/admin/users/user_edit_profile.html:10 -#, fuzzy, python-format -#| msgid "Change avatar at" -msgid "Change %s avatar at" -msgstr "Changer l'avatar sur" - -#: kallithea/templates/admin/my_account/my_account_profile.html:12 -#: kallithea/templates/admin/users/user_edit_profile.html:12 -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:51 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:51 -msgid "Avatars are disabled" -msgstr "Les avatars sont désactivés" - #: kallithea/templates/admin/my_account/my_account_repos.html:1 -#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:30 msgid "Repositories You Own" msgstr "Dépôts dont vous êtes le propriétaire" -#: kallithea/templates/admin/my_account/my_account_repos.html:13 -#: kallithea/templates/admin/my_account/my_account_watched.html:13 -#: kallithea/templates/admin/repo_groups/repo_groups.html:39 -#: kallithea/templates/admin/repos/repo_add_base.html:6 -#: kallithea/templates/admin/repos/repo_edit_settings.html:4 -#: kallithea/templates/admin/repos/repos.html:38 -#: kallithea/templates/admin/user_groups/user_groups.html:38 -#: kallithea/templates/base/perms_summary.html:54 -#: kallithea/templates/files/files_browser.html:62 -#: kallithea/tests/data/templates/index_base.html.py:128 -#: kallithea/tests/data/templates/admin/my_account/my_account_repos.html.py:34 -#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:34 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:112 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:44 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:112 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:112 -#: kallithea/tests/data/templates/base/perms_summary.html.py:111 -#: kallithea/tests/data/templates/files/files_browser.html.py:76 -msgid "Name" -msgstr "Nom" +#: kallithea/templates/admin/my_account/my_account_repos.html:59 +#: kallithea/templates/admin/my_account/my_account_watched.html:59 +#: kallithea/templates/base/root.html:45 +#: kallithea/templates/bookmarks/bookmarks.html:81 +#: kallithea/templates/branches/branches.html:81 +#: kallithea/templates/journal/journal.html:200 +#: kallithea/templates/journal/journal.html:291 +#: kallithea/templates/tags/tags.html:81 +msgid "No records found." +msgstr "Aucun élément n’a été trouvé." #: kallithea/templates/admin/my_account/my_account_watched.html:1 -#: kallithea/tests/data/templates/admin/my_account/my_account_watched.html.py:30 msgid "Repositories You are Watching" msgstr "Dépôts que vous surveillez" #: kallithea/templates/admin/notifications/notifications.html:5 #: kallithea/templates/admin/notifications/notifications.html:9 -#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:154 -#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:176 msgid "My Notifications" msgstr "Mes notifications" #: kallithea/templates/admin/notifications/notifications.html:24 -#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:117 msgid "All" msgstr "Tous" #: kallithea/templates/admin/notifications/notifications.html:25 -#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:121 msgid "Comments" msgstr "Commentaires" #: kallithea/templates/admin/notifications/notifications.html:26 -#: kallithea/templates/base/base.html:175 -#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:125 -#: kallithea/tests/data/templates/base/base.html.py:432 +#: kallithea/templates/base/base.html:180 msgid "Pull Requests" msgstr "Demandes de pull" -#: kallithea/templates/admin/notifications/notifications.html:29 -#: kallithea/tests/data/templates/admin/notifications/notifications.html.py:129 +#: kallithea/templates/admin/notifications/notifications.html:30 msgid "Mark All Read" msgstr "Tout marquer comme lu" -#: kallithea/templates/admin/notifications/notifications_data.html:12 -#, fuzzy -#| msgid "Mark All Read" -msgid "Mark as read" -msgstr "Tout marquer comme lu" - -#: kallithea/templates/admin/notifications/notifications_data.html:21 -#: kallithea/tests/data/templates/admin/notifications/notifications_data.html.py:76 +#: kallithea/templates/admin/notifications/notifications_data.html:40 msgid "No notifications here yet" msgstr "Aucune notification pour le moment" #: kallithea/templates/admin/notifications/show_notification.html:5 #: kallithea/templates/admin/notifications/show_notification.html:11 -#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:146 -#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:168 msgid "Show Notification" msgstr "Montrer Notification" #: kallithea/templates/admin/notifications/show_notification.html:9 -#: kallithea/templates/base/base.html:403 -#: kallithea/tests/data/templates/admin/notifications/show_notification.html.py:144 -#: kallithea/tests/data/templates/base/base.html.py:640 +#: kallithea/templates/base/base.html:430 msgid "Notifications" msgstr "Notifications" #: kallithea/templates/admin/permissions/permissions.html:5 #: kallithea/templates/admin/permissions/permissions.html:11 -#: kallithea/templates/base/base.html:60 -#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:144 -#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:162 -#: kallithea/tests/data/templates/base/base.html.py:259 +#: kallithea/templates/base/base.html:64 msgid "Default Permissions" msgstr "Permissions par défaut" #: kallithea/templates/admin/permissions/permissions.html:28 #: kallithea/templates/admin/settings/settings.html:29 -#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:108 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:120 msgid "Global" msgstr "Global" #: kallithea/templates/admin/permissions/permissions.html:29 #: kallithea/templates/admin/users/user_edit.html:32 -#: kallithea/tests/data/templates/admin/permissions/permissions.html.py:114 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:130 msgid "IP Whitelist" msgstr "Liste blanche d'adresses IP" -#: kallithea/templates/admin/permissions/permissions_globals.html:4 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:39 +#: kallithea/templates/admin/permissions/permissions_globals.html:7 msgid "Anonymous access" msgstr "Accès anonyme" -#: kallithea/templates/admin/permissions/permissions_globals.html:9 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:43 +#: kallithea/templates/admin/permissions/permissions_globals.html:13 #, python-format msgid "" "Allow access to Kallithea without needing to log in. Anonymous users use " @@ -3197,8 +3223,7 @@ "Autoriser l'accès à Kallithea sans le besoin de se connecter. Les " "utilisateurs anonymes ont les permissions de l'utilisateur %s." -#: kallithea/templates/admin/permissions/permissions_globals.html:18 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:51 +#: kallithea/templates/admin/permissions/permissions_globals.html:25 msgid "" "All default permissions on each repository will be reset to chosen " "permission, note that all custom default permission on repositories will " @@ -3208,29 +3233,23 @@ "réinitialisées aux valeurs choisies. Notez que toutes les permissions par" " défaut personnalisées sur les dépôts seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:19 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:53 +#: kallithea/templates/admin/permissions/permissions_globals.html:26 msgid "Apply to all existing repositories" msgstr "Appliquer à tous les dépôts existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:23 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:55 +#: kallithea/templates/admin/permissions/permissions_globals.html:27 msgid "Permissions for the Default user on new repositories." msgstr "Permissions pour l'utilisateur par défaut sur les nouveaux dépôts." -#: kallithea/templates/admin/permissions/permissions_globals.html:26 -#: kallithea/templates/admin/repos/repo_add_base.html:28 -#: kallithea/templates/admin/repos/repo_edit_settings.html:28 -#: kallithea/templates/data_table/_dt_elements.html:147 -#: kallithea/templates/forks/fork.html:42 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:57 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:60 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:297 +#: kallithea/templates/admin/permissions/permissions_globals.html:32 +#: kallithea/templates/admin/repos/repo_add_base.html:37 +#: kallithea/templates/admin/repos/repo_edit_settings.html:35 +#: kallithea/templates/data_table/_dt_elements.html:202 +#: kallithea/templates/forks/fork.html:48 msgid "Repository group" msgstr "Groupe de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:31 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:63 +#: kallithea/templates/admin/permissions/permissions_globals.html:39 msgid "" "All default permissions on each repository group will be reset to chosen " "permission, note that all custom default permission on repository groups " @@ -3240,27 +3259,22 @@ "réinitialisées aux valeurs choisies. Notez que toutes les permissions par" " défaut personnalisées sur les groupes de dépôts seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:32 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:65 +#: kallithea/templates/admin/permissions/permissions_globals.html:40 msgid "Apply to all existing repository groups" msgstr "Appliquer à tous les groupes de dépôts existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:36 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:67 +#: kallithea/templates/admin/permissions/permissions_globals.html:41 msgid "Permissions for the Default user on new repository groups." msgstr "" "Permissions pour l'utilisateur par défaut sur les nouveaux groupes de " "dépôts." -#: kallithea/templates/admin/permissions/permissions_globals.html:39 -#: kallithea/templates/data_table/_dt_elements.html:154 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:69 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:206 +#: kallithea/templates/admin/permissions/permissions_globals.html:46 +#: kallithea/templates/data_table/_dt_elements.html:209 msgid "User group" msgstr "Groupe d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:44 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:75 +#: kallithea/templates/admin/permissions/permissions_globals.html:53 msgid "" "All default permissions on each user group will be reset to chosen " "permission, note that all custom default permission on user groups will " @@ -3271,32 +3285,27 @@ "permissions par défaut personnalisées sur les groupes d'utilisateurs " "seront perdues" -#: kallithea/templates/admin/permissions/permissions_globals.html:45 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:77 +#: kallithea/templates/admin/permissions/permissions_globals.html:54 msgid "Apply to all existing user groups" msgstr "Appliquer à tous les groupes d'utilisateurs existants" -#: kallithea/templates/admin/permissions/permissions_globals.html:49 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:79 +#: kallithea/templates/admin/permissions/permissions_globals.html:55 msgid "Permissions for the Default user on new user groups." msgstr "" "Permissions pour l'utilisateur par défaut sur les nouveaux groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:52 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:81 +#: kallithea/templates/admin/permissions/permissions_globals.html:60 msgid "Top level repository creation" msgstr "Création de dépôt de niveau supérieur" -#: kallithea/templates/admin/permissions/permissions_globals.html:55 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:85 +#: kallithea/templates/admin/permissions/permissions_globals.html:64 msgid "Enable this to allow non-admins to create repositories at the top level." msgstr "" "Activer pour autoriser les non-administrateurs à créer des dépôts au " "niveau supérieur." -#: kallithea/templates/admin/permissions/permissions_globals.html:56 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:87 +#: kallithea/templates/admin/permissions/permissions_globals.html:65 msgid "" "Note: This will also give all users API access to create repositories " "everywhere. That might change in future versions." @@ -3305,13 +3314,11 @@ "pour créer des dépôts partout. Ce comportement peut changer dans des " "versions futures." -#: kallithea/templates/admin/permissions/permissions_globals.html:60 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:89 +#: kallithea/templates/admin/permissions/permissions_globals.html:70 msgid "Repository creation with group write access" msgstr "Création de dépôts avec l'accès en écriture du groupe" -#: kallithea/templates/admin/permissions/permissions_globals.html:63 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:93 +#: kallithea/templates/admin/permissions/permissions_globals.html:74 msgid "" "With this, write permission to a repository group allows creating " "repositories inside that group. Without this, group write permissions " @@ -3321,97 +3328,75 @@ "créer des dépôts dans ce groupe. Sans ceci, le droit d'écriture pour les " "groupes n'a pas d'impact." -#: kallithea/templates/admin/permissions/permissions_globals.html:67 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:95 +#: kallithea/templates/admin/permissions/permissions_globals.html:79 msgid "User group creation" msgstr "Création de groupes d'utilisateurs" -#: kallithea/templates/admin/permissions/permissions_globals.html:70 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:99 +#: kallithea/templates/admin/permissions/permissions_globals.html:83 msgid "Enable this to allow non-admins to create user groups." msgstr "" "Activer pour autoriser les non-administrateurs à créer des groupes " "d'utilisateurs." -#: kallithea/templates/admin/permissions/permissions_globals.html:74 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:101 +#: kallithea/templates/admin/permissions/permissions_globals.html:88 msgid "Repository forking" msgstr "Fork de dépôt" -#: kallithea/templates/admin/permissions/permissions_globals.html:77 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:105 +#: kallithea/templates/admin/permissions/permissions_globals.html:92 msgid "Enable this to allow non-admins to fork repositories." msgstr "Activer pour autoriser les non-administrateurs à faire des fork de dépôt." -#: kallithea/templates/admin/permissions/permissions_globals.html:81 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:107 +#: kallithea/templates/admin/permissions/permissions_globals.html:97 msgid "Registration" msgstr "Enregistrement" -#: kallithea/templates/admin/permissions/permissions_globals.html:87 -#: kallithea/tests/data/templates/admin/permissions/permissions_globals.html.py:111 +#: kallithea/templates/admin/permissions/permissions_globals.html:105 msgid "External auth account activation" msgstr "Activation de l'authentification externe" -#: kallithea/templates/admin/permissions/permissions_ips.html:12 -#: kallithea/templates/admin/users/user_edit_ips.html:22 -#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:52 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:60 +#: kallithea/templates/admin/permissions/permissions_ips.html:13 +#: kallithea/templates/admin/users/user_edit_ips.html:23 #, python-format msgid "Confirm to delete this IP address: %s" msgstr "Confirmer la suppression de cette adresse IP : %s" -#: kallithea/templates/admin/permissions/permissions_ips.html:18 -#: kallithea/templates/admin/users/user_edit_ips.html:29 -#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:58 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:66 +#: kallithea/templates/admin/permissions/permissions_ips.html:19 +#: kallithea/templates/admin/users/user_edit_ips.html:30 msgid "All IP addresses are allowed." msgstr "Toutes les adresses IP sont autorisées." -#: kallithea/templates/admin/permissions/permissions_ips.html:25 -#: kallithea/templates/admin/users/user_edit_ips.html:37 -#: kallithea/tests/data/templates/admin/permissions/permissions_ips.html.py:63 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:71 +#: kallithea/templates/admin/permissions/permissions_ips.html:30 +#: kallithea/templates/admin/users/user_edit_ips.html:42 msgid "New IP address" msgstr "Nouvelle adresse IP" #: kallithea/templates/admin/repo_groups/repo_group_add.html:11 #: kallithea/templates/admin/repo_groups/repo_group_edit.html:11 -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:89 -#: kallithea/templates/admin/repo_groups/repo_groups.html:9 -#: kallithea/templates/base/base.html:57 kallithea/templates/base/base.html:76 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:155 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:142 -#: kallithea/tests/data/templates/base/base.html.py:247 -#: kallithea/tests/data/templates/base/base.html.py:696 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:105 +#: kallithea/templates/admin/repo_groups/repo_groups.html:10 +#: kallithea/templates/base/base.html:61 kallithea/templates/base/base.html:80 msgid "Repository Groups" msgstr "Groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:28 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:5 -#: kallithea/templates/admin/user_groups/user_group_add.html:27 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:4 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:113 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:33 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:8 +#: kallithea/templates/admin/user_groups/user_group_add.html:32 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:7 msgid "Group name" msgstr "Nom de groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:42 -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:19 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:121 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:51 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:26 msgid "Group parent" msgstr "Parent du groupe" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:49 -#: kallithea/templates/admin/repos/repo_add_base.html:35 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:125 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:66 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:60 +#: kallithea/templates/admin/repos/repo_add_base.html:46 msgid "Copy parent group permissions" msgstr "Copier les permissions du groupe parent" -#: kallithea/templates/admin/repo_groups/repo_group_add.html:52 -#: kallithea/templates/admin/repos/repo_add_base.html:38 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_add.html.py:129 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:70 +#: kallithea/templates/admin/repo_groups/repo_group_add.html:64 +#: kallithea/templates/admin/repos/repo_add_base.html:50 msgid "Copy permission set from parent repository group." msgstr "Copier les permissions à partir du groupe de dépôts parent." @@ -3420,42 +3405,31 @@ msgid "%s Repository Group Settings" msgstr "Options du groupe de dépôts %s" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:21 msgid "Add Child Group" msgstr "Ajouter un groupe enfant" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:36 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:40 #: kallithea/templates/admin/repos/repo_edit.html:12 -#: kallithea/templates/admin/repos/repo_edit.html:25 +#: kallithea/templates/admin/repos/repo_edit.html:40 #: kallithea/templates/admin/settings/settings.html:11 #: kallithea/templates/admin/user_groups/user_group_edit.html:29 -#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:143 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:116 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:170 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:174 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:112 -#: kallithea/tests/data/templates/base/base.html.py:271 -#: kallithea/tests/data/templates/base/base.html.py:377 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:91 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:95 +#: kallithea/templates/base/base.html:67 kallithea/templates/base/base.html:148 +#: kallithea/templates/data_table/_dt_elements.html:45 +#: kallithea/templates/data_table/_dt_elements.html:49 msgid "Settings" msgstr "Options" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:37 -#: kallithea/templates/admin/repos/repo_edit.html:31 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:41 +#: kallithea/templates/admin/repos/repo_edit.html:46 #: kallithea/templates/admin/user_groups/user_group_edit.html:30 #: kallithea/templates/admin/users/user_edit.html:33 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:128 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:118 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:136 msgid "Advanced" msgstr "Avancé" -#: kallithea/templates/admin/repo_groups/repo_group_edit.html:38 -#: kallithea/templates/admin/repos/repo_edit.html:28 +#: kallithea/templates/admin/repo_groups/repo_group_edit.html:42 +#: kallithea/templates/admin/repos/repo_edit.html:43 #: kallithea/templates/admin/user_groups/user_group_edit.html:31 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:122 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:124 msgid "Permissions" msgstr "Permissions" @@ -3479,14 +3453,12 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:9 #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:7 #: kallithea/templates/admin/users/user_edit_advanced.html:8 -#: kallithea/templates/pullrequests/pullrequest_show.html:129 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:245 +#: kallithea/templates/pullrequests/pullrequest_show.html:148 msgid "Created on" msgstr "Créé le" #: kallithea/templates/admin/repo_groups/repo_group_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:135 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:332 +#: kallithea/templates/data_table/_dt_elements.html:190 #, python-format msgid "Confirm to delete this group: %s with %s repository" msgid_plural "Confirm to delete this group: %s with %s repositories" @@ -3497,38 +3469,16 @@ msgid "Delete this repository group" msgstr "Supprimer ce groupe de dépôts" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:7 -msgid "Not visible" -msgstr "" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:8 -#, fuzzy -#| msgid "disabled" -msgid "Visible" -msgstr "désactivé" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:9 -#, fuzzy -#| msgid "Add Repository" -msgid "Add repos" -msgstr "Ajouter un dépôt" - -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:10 -#, fuzzy -#| msgid "Add user group" -msgid "Add/Edit groups" -msgstr "Ajouter un groupe d'utilisateurs" - #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:11 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:11 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:12 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:11 msgid "User/User Group" msgstr "Utilisateur/groupe d'utilisateurs" #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:28 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:45 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:23 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:36 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:24 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:37 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:28 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:45 msgid "Default" @@ -3536,28 +3486,28 @@ #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:34 #: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:71 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:42 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:67 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:43 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:68 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:34 #: kallithea/templates/admin/user_groups/user_group_edit_perms.html:71 msgid "Revoke" msgstr "Révoquer" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:81 -#: kallithea/templates/admin/repos/repo_edit_permissions.html:77 -#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:81 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:97 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:94 +#: kallithea/templates/admin/user_groups/user_group_edit_perms.html:97 msgid "Add new" msgstr "Ajouter un nouveau" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:87 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:103 msgid "Apply to children" msgstr "Appliquer aux enfants" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:91 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:107 msgid "Both" msgstr "Les deux" -#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:92 +#: kallithea/templates/admin/repo_groups/repo_group_edit_perms.html:108 msgid "" "Set or revoke permission to all children of that group, including non-" "private repositories and other groups if selected." @@ -3565,7 +3515,7 @@ "Ajouter ou révoquer la permission pour tous les enfants de ce groupe, y " "compris les dépôts non-privés et les autres groupes si sélectionné." -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:29 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:38 msgid "" "Enable lock-by-pulling on group. This option will be applied to all other" " groups and repositories inside" @@ -3573,47 +3523,40 @@ "Activer le verrou lors d’un pull sur le groupe. Cette option sera " "appliquée à tous les sous-groupes et dépôts de ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 msgid "Remove this group" msgstr "Supprimer ce groupe" -#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:46 +#: kallithea/templates/admin/repo_groups/repo_group_edit_settings.html:53 msgid "Confirm to delete this group" msgstr "Confirmer la suppression de ce groupe" #: kallithea/templates/admin/repo_groups/repo_group_show.html:4 -#, fuzzy, python-format -#| msgid "Repository Group: %s" -msgid "Repository group %s" -msgstr "Groupe de dépôts : %s" +#, python-format +msgid "%s Repository group dashboard" +msgstr "Tableau de bord du groupe de dépôts %s" #: kallithea/templates/admin/repo_groups/repo_group_show.html:9 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:101 msgid "Home" msgstr "Accueil" #: kallithea/templates/admin/repo_groups/repo_group_show.html:13 -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:110 msgid "with" msgstr "comprenant" #: kallithea/templates/admin/repo_groups/repo_groups.html:5 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:160 msgid "Repository Groups Administration" msgstr "Administration des groupes de dépôts" -#: kallithea/templates/admin/repo_groups/repo_groups.html:41 -#: kallithea/tests/data/templates/admin/repo_groups/repo_groups.html.py:116 +#: kallithea/templates/admin/repo_groups/repo_groups.html:48 msgid "Number of Top-level Repositories" msgstr "Nombre de dépôts de niveau supérieur" -#: kallithea/templates/admin/repos/repo_add_base.html:12 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:48 +#: kallithea/templates/admin/repos/repo_add_base.html:17 msgid "Clone remote repository" msgstr "Cloner le dépôt distant" -#: kallithea/templates/admin/repos/repo_add_base.html:16 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:52 +#: kallithea/templates/admin/repos/repo_add_base.html:22 msgid "" "Optional: URL of a remote repository. If set, the repository will be " "created as a clone from this URL." @@ -3621,36 +3564,31 @@ "Optionnel : URL d'un dépôt distant. Si renseigné, le dépôt sera créé " "comme un clone à partir de cette URL." -#: kallithea/templates/admin/repos/repo_add_base.html:24 -#: kallithea/templates/admin/repos/repo_edit_settings.html:55 -#: kallithea/templates/forks/fork.html:37 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:58 +#: kallithea/templates/admin/repos/repo_add_base.html:32 +#: kallithea/templates/admin/repos/repo_edit_settings.html:69 +#: kallithea/templates/forks/fork.html:42 msgid "Keep it short and to the point. Use a README file for longer descriptions." msgstr "" "Gardez cette description précise et concise. Utilisez un fichier README " "pour des descriptions plus détaillées." -#: kallithea/templates/admin/repos/repo_add_base.html:31 -#: kallithea/templates/admin/repos/repo_edit_settings.html:31 -#: kallithea/templates/forks/fork.html:45 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:64 +#: kallithea/templates/admin/repos/repo_add_base.html:41 +#: kallithea/templates/admin/repos/repo_edit_settings.html:39 +#: kallithea/templates/forks/fork.html:52 msgid "Optionally select a group to put this repository into." msgstr "Sélectionnez un groupe (optionel) dans lequel sera placé le dépôt." -#: kallithea/templates/admin/repos/repo_add_base.html:45 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:76 +#: kallithea/templates/admin/repos/repo_add_base.html:59 msgid "Type of repository to create." msgstr "Type de dépôt à créer." -#: kallithea/templates/admin/repos/repo_add_base.html:49 -#: kallithea/templates/admin/repos/repo_edit_settings.html:35 -#: kallithea/templates/forks/fork.html:50 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:78 +#: kallithea/templates/admin/repos/repo_add_base.html:64 +#: kallithea/templates/admin/repos/repo_edit_settings.html:44 +#: kallithea/templates/forks/fork.html:58 msgid "Landing revision" msgstr "Révision d’arrivée" -#: kallithea/templates/admin/repos/repo_add_base.html:52 -#: kallithea/tests/data/templates/admin/repos/repo_add_base.html.py:82 +#: kallithea/templates/admin/repos/repo_add_base.html:68 msgid "" "Default revision for files page, downloads, full text search index and " "readme generation" @@ -3686,69 +3624,56 @@ "journaux du serveur Kallithea, ou contactez votre administrateur." #: kallithea/templates/admin/repos/repo_edit.html:8 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:192 #, python-format msgid "%s Repository Settings" msgstr "Réglages du dépôt %s" -#: kallithea/templates/admin/repos/repo_edit.html:34 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:134 +#: kallithea/templates/admin/repos/repo_edit.html:49 msgid "Extra Fields" msgstr "Champs supplémentaires" -#: kallithea/templates/admin/repos/repo_edit.html:37 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:140 +#: kallithea/templates/admin/repos/repo_edit.html:52 msgid "Caches" msgstr "Caches" -#: kallithea/templates/admin/repos/repo_edit.html:40 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:146 +#: kallithea/templates/admin/repos/repo_edit.html:55 msgid "Remote" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit.html:43 +#: kallithea/templates/admin/repos/repo_edit.html:58 #: kallithea/templates/summary/statistics.html:8 -#: kallithea/templates/summary/summary.html:160 -#: kallithea/templates/summary/summary.html:161 -#: kallithea/tests/data/templates/admin/repos/repo_edit.html.py:152 -#: kallithea/tests/data/templates/summary/statistics.html.py:217 -#: kallithea/tests/data/templates/summary/summary.html.py:245 -#: kallithea/tests/data/templates/summary/summary.html.py:249 +#: kallithea/templates/summary/summary.html:171 +#: kallithea/templates/summary/summary.html:172 msgid "Statistics" msgstr "Statistiques" #: kallithea/templates/admin/repos/repo_edit_advanced.html:1 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:42 msgid "Parent" msgstr "Parent" #: kallithea/templates/admin/repos/repo_edit_advanced.html:5 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:48 +#: kallithea/templates/admin/repos/repo_edit_fork.html:5 msgid "Set" msgstr "Appliquer" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:7 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:50 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:8 +#: kallithea/templates/admin/repos/repo_edit_fork.html:9 msgid "Manually set this repository as a fork of another from the list." msgstr "Marquer manuellement ce dépôt comme fork d’un autre dépôt de la liste." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:20 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:54 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:22 msgid "Public Journal Visibility" msgstr "Visibilité du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:27 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:60 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:29 msgid "Remove from public journal" msgstr "Supprimer du journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:32 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:64 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:34 msgid "Add to Public Journal" msgstr "Ajouter au journal public" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:37 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:67 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:40 msgid "" "All actions done in this repository will be visible to everyone in the " "public journal." @@ -3756,44 +3681,36 @@ "Les actions réalisées sur ce dépôt seront visibles à tous depuis le " "journal public." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:42 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:71 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:46 msgid "Change Locking" msgstr "Changer le verrouillage" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:48 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:79 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 msgid "Confirm to unlock repository." msgstr "Veuillez confirmer le déverrouillage de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:50 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:81 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:54 msgid "Unlock Repository" msgstr "Déverrouiller le dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:52 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:83 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 #, python-format msgid "Locked by %s on %s" msgstr "Verrouillé par %s sur %s" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:56 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:89 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 msgid "Confirm to lock repository." msgstr "Veuillez confirmer le verrouillage de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:58 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:91 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:62 msgid "Lock Repository" msgstr "Verrouiller le dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:60 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:93 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:64 msgid "Repository is not locked" msgstr "Ce dépôt n’est pas verrouillé" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:63 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:96 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:68 msgid "" "Force locking on the repository. Works only when anonymous access is " "disabled. Triggering a pull locks the repository. The user who is " @@ -3805,39 +3722,32 @@ "L'utilisateur qui fait le pull verrouille le dépôt ; seul l'utilisateur " "qui a fait le pull et a verrouillé peut déverrouiller en faisant un push." -#: kallithea/templates/admin/repos/repo_edit_advanced.html:72 -#: kallithea/templates/data_table/_dt_elements.html:77 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:104 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:273 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:79 +#: kallithea/templates/data_table/_dt_elements.html:130 #, python-format msgid "Confirm to delete this repository: %s" msgstr "Voulez-vous vraiment supprimer le dépôt %s ?" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:74 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:106 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:81 msgid "Delete this Repository" msgstr "Supprimer ce dépôt" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:77 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:110 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 #, python-format msgid "This repository has %s fork" msgid_plural "This repository has %s forks" msgstr[0] "Ce dépôt a %s fork" msgstr[1] "Ce dépôt a %s forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:80 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:112 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:85 msgid "Detach forks" msgstr "Détacher les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:84 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:114 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:86 msgid "Delete forks" msgstr "Supprimer les forks" -#: kallithea/templates/admin/repos/repo_edit_advanced.html:88 -#: kallithea/tests/data/templates/admin/repos/repo_edit_advanced.html.py:117 +#: kallithea/templates/admin/repos/repo_edit_advanced.html:90 msgid "" "The deleted repository will be moved away and hidden until the " "administrator expires it. The administrator can both permanently delete " @@ -3851,7 +3761,7 @@ msgid "Invalidate Repository Cache" msgstr "Invalider le cache du dépôt" -#: kallithea/templates/admin/repos/repo_edit_caches.html:6 +#: kallithea/templates/admin/repos/repo_edit_caches.html:7 msgid "" "Manually invalidate cache for this repository. On first access, the " "repository will be cached again." @@ -3859,105 +3769,95 @@ "Invalider manuellement le cache de ce dépôt. Au prochain accès sur ce " "dépôt, il sera à nouveau mis en cache." -#: kallithea/templates/admin/repos/repo_edit_caches.html:9 +#: kallithea/templates/admin/repos/repo_edit_caches.html:12 msgid "List of Cached Values" msgstr "Liste des valeurs en cache" -#: kallithea/templates/admin/repos/repo_edit_caches.html:12 +#: kallithea/templates/admin/repos/repo_edit_caches.html:15 msgid "Prefix" msgstr "Préfixe" -#: kallithea/templates/admin/repos/repo_edit_caches.html:13 -#: kallithea/templates/admin/repos/repo_edit_fields.html:7 +#: kallithea/templates/admin/repos/repo_edit_caches.html:16 +#: kallithea/templates/admin/repos/repo_edit_fields.html:6 msgid "Key" msgstr "Clé" -#: kallithea/templates/admin/repos/repo_edit_caches.html:14 -#: kallithea/templates/admin/user_groups/user_group_add.html:40 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:17 -#: kallithea/templates/admin/user_groups/user_groups.html:41 -#: kallithea/templates/admin/users/user_add.html:69 -#: kallithea/templates/admin/users/user_edit_profile.html:74 -#: kallithea/templates/admin/users/users.html:42 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:118 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:133 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:94 -#: kallithea/tests/data/templates/admin/users/users.html.py:117 +#: kallithea/templates/admin/repos/repo_edit_caches.html:17 +#: kallithea/templates/admin/user_groups/user_group_add.html:49 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:24 +#: kallithea/templates/admin/user_groups/user_groups.html:49 +#: kallithea/templates/admin/users/user_add.html:86 +#: kallithea/templates/admin/users/user_edit_profile.html:96 +#: kallithea/templates/admin/users/users.html:54 msgid "Active" msgstr "Actif" -#: kallithea/templates/admin/repos/repo_edit_fields.html:6 +#: kallithea/templates/admin/repos/repo_edit_fields.html:5 msgid "Label" msgstr "Libellé" -#: kallithea/templates/admin/repos/repo_edit_fields.html:20 +#: kallithea/templates/admin/repos/repo_edit_fields.html:19 #, python-format msgid "Confirm to delete this field: %s" msgstr "Voulez-vous vraiment supprimer ce champ : %s ?" -#: kallithea/templates/admin/repos/repo_edit_fields.html:31 +#: kallithea/templates/admin/repos/repo_edit_fields.html:33 msgid "New field key" msgstr "Clé du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:38 +#: kallithea/templates/admin/repos/repo_edit_fields.html:41 msgid "New field label" msgstr "Libellé du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:40 +#: kallithea/templates/admin/repos/repo_edit_fields.html:44 msgid "Enter short label" msgstr "Saisir un libellé court" -#: kallithea/templates/admin/repos/repo_edit_fields.html:45 +#: kallithea/templates/admin/repos/repo_edit_fields.html:50 msgid "New field description" msgstr "Description du nouveau champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:47 +#: kallithea/templates/admin/repos/repo_edit_fields.html:53 msgid "Enter description of a field" msgstr "Saisir la description du champ" -#: kallithea/templates/admin/repos/repo_edit_fields.html:61 +#: kallithea/templates/admin/repos/repo_edit_fields.html:66 msgid "Extra fields are disabled." msgstr "Les champs supplémentaires sont désactivés." -#: kallithea/templates/admin/repos/repo_edit_permissions.html:20 +#: kallithea/templates/admin/repos/repo_edit_permissions.html:21 msgid "Private Repository" msgstr "Dépôt privé" -#: kallithea/templates/admin/repos/repo_edit_remote.html:4 -#, fuzzy -#| msgid "[forked] repository" -msgid "Fork of repository" -msgstr "[a forké] le dépôt" - -#: kallithea/templates/admin/repos/repo_edit_remote.html:7 +#: kallithea/templates/admin/repos/repo_edit_remote.html:3 msgid "Remote repository URL" msgstr "URL du dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_remote.html:15 +#: kallithea/templates/admin/repos/repo_edit_remote.html:9 msgid "Pull Changes from Remote Repository" msgstr "Récupérer les modifications depuis le dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_remote.html:17 +#: kallithea/templates/admin/repos/repo_edit_remote.html:11 msgid "Confirm to pull changes from remote repository." msgstr "Voulez-vous vraiment récupérer les changements depuis le dépôt distant ?" -#: kallithea/templates/admin/repos/repo_edit_remote.html:23 +#: kallithea/templates/admin/repos/repo_edit_remote.html:17 msgid "This repository does not have a remote repository URL." msgstr "Ce dépôt n'a pas d'URL de dépôt distant." -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repo_edit_settings.html:11 msgid "Permanent Repository ID" msgstr "ID permanent du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:7 +#: kallithea/templates/admin/repos/repo_edit_settings.html:11 msgid "What is that?" msgstr "Qu'est-ce que c'est ?" -#: kallithea/templates/admin/repos/repo_edit_settings.html:9 +#: kallithea/templates/admin/repos/repo_edit_settings.html:13 msgid "URL by id" msgstr "URL par id" -#: kallithea/templates/admin/repos/repo_edit_settings.html:10 +#: kallithea/templates/admin/repos/repo_edit_settings.html:14 msgid "" "In case this repository is renamed or moved into another group the " "repository URL changes.\n" @@ -3974,15 +3874,15 @@ "d'intégration continue, ou dans tous les cas où vous devez saisir l'URL " "« en dur » dans un service tiers." -#: kallithea/templates/admin/repos/repo_edit_settings.html:16 +#: kallithea/templates/admin/repos/repo_edit_settings.html:21 msgid "Remote repository" msgstr "Dépôt distant" -#: kallithea/templates/admin/repos/repo_edit_settings.html:19 +#: kallithea/templates/admin/repos/repo_edit_settings.html:25 msgid "Repository URL" msgstr "URL du dépôt" -#: kallithea/templates/admin/repos/repo_edit_settings.html:23 +#: kallithea/templates/admin/repos/repo_edit_settings.html:29 msgid "" "Optional: URL of a remote repository. If set, the repository can be " "pulled from this URL." @@ -3990,21 +3890,21 @@ "Optionel : URL d'un dépôt distant. Si renseigné, le dépôt sera pullé à " "partir de cette URL." -#: kallithea/templates/admin/repos/repo_edit_settings.html:38 +#: kallithea/templates/admin/repos/repo_edit_settings.html:48 msgid "Default revision for files page, downloads, whoosh and readme" msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " "recherche et de documentation" -#: kallithea/templates/admin/repos/repo_edit_settings.html:46 +#: kallithea/templates/admin/repos/repo_edit_settings.html:58 msgid "Change owner of this repository." msgstr "Changer le propriétaire de ce dépôt." -#: kallithea/templates/admin/repos/repo_edit_statistics.html:5 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 msgid "Processed commits" msgstr "Commits traités" -#: kallithea/templates/admin/repos/repo_edit_statistics.html:6 +#: kallithea/templates/admin/repos/repo_edit_statistics.html:7 msgid "Processed progress" msgstr "Avancement" @@ -4017,110 +3917,87 @@ msgstr "Souhaitez-vous vraiment réinitialiser les statistiques de ce dépôt ?" #: kallithea/templates/admin/repos/repos.html:5 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:156 msgid "Repositories Administration" msgstr "Administration des dépôts" -#: kallithea/templates/admin/repos/repos.html:43 -#: kallithea/tests/data/templates/admin/repos/repos.html.py:120 +#: kallithea/templates/admin/repos/repos.html:51 msgid "State" msgstr "État" #: kallithea/templates/admin/settings/settings.html:5 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:192 msgid "Settings Administration" msgstr "Administration des options" #: kallithea/templates/admin/settings/settings.html:27 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:108 msgid "VCS" msgstr "VCS" #: kallithea/templates/admin/settings/settings.html:28 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:114 msgid "Remap and Rescan" msgstr "Mapper et scanner" #: kallithea/templates/admin/settings/settings.html:30 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:126 msgid "Visual" msgstr "Visuel" #: kallithea/templates/admin/settings/settings.html:32 -#: kallithea/templates/admin/settings/settings_vcs.html:4 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:138 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:47 +#: kallithea/templates/admin/settings/settings_vcs.html:19 msgid "Hooks" msgstr "Hooks" #: kallithea/templates/admin/settings/settings.html:33 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:144 msgid "Full Text Search" msgstr "Recherche dans le texte complet" #: kallithea/templates/admin/settings/settings.html:34 -#: kallithea/tests/data/templates/admin/settings/settings.html.py:150 msgid "System Info" msgstr "Informations sytème" -#: kallithea/templates/admin/settings/settings_email.html:4 -#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:35 +#: kallithea/templates/admin/settings/settings_email.html:7 msgid "Send test email to" msgstr "Envoyer un courriel de test à" -#: kallithea/templates/admin/settings/settings_email.html:12 -#: kallithea/tests/data/templates/admin/settings/settings_email.html.py:39 +#: kallithea/templates/admin/settings/settings_email.html:15 msgid "Send" msgstr "Envoyer" -#: kallithea/templates/admin/settings/settings_global.html:4 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:35 +#: kallithea/templates/admin/settings/settings_global.html:8 msgid "Site branding" msgstr "Nom du site" -#: kallithea/templates/admin/settings/settings_global.html:7 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:39 +#: kallithea/templates/admin/settings/settings_global.html:12 msgid "Set a custom title for your Kallithea Service." msgstr "Mettez un title personnalisé pour votre service Kallithea." -#: kallithea/templates/admin/settings/settings_global.html:12 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:41 +#: kallithea/templates/admin/settings/settings_global.html:18 msgid "HTTP authentication realm" msgstr "Domaine d'authentification HTTP (realm)" -#: kallithea/templates/admin/settings/settings_global.html:19 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:45 -msgid "HTML/JavaScript/CSS customization block" -msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:22 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:49 +#: kallithea/templates/admin/settings/settings_global.html:27 +msgid "Analytics HTML block" +msgstr "Bloc HTML pour l'analytique" + +#: kallithea/templates/admin/settings/settings_global.html:31 msgid "" -"HTML (possibly with JavaScript and/or CSS) that " -"will be added to the bottom of every page. This " -"can be used for web analytics systems like Google" -" Analytics or Piwik, but also to perform " -"instance-specific customizations like adding a " -"project banner at the top of every page." +"HTML with JavaScript for web analytics systems like Google Analytics or " +"Piwik. This will be added at the bottom of every page." msgstr "" - -#: kallithea/templates/admin/settings/settings_global.html:32 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:56 +"HTML avec du JavaScript pour les systèmes d'analyse Web comme Google " +"Analytics ou Piwik. Ceci sera ajouté en bas de chaque page." + +#: kallithea/templates/admin/settings/settings_global.html:37 msgid "ReCaptcha public key" msgstr "Clé publique ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:35 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:60 +#: kallithea/templates/admin/settings/settings_global.html:41 msgid "Public key for reCaptcha system." msgstr "Clé publique pour le système reCaptcha." -#: kallithea/templates/admin/settings/settings_global.html:40 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:62 +#: kallithea/templates/admin/settings/settings_global.html:47 msgid "ReCaptcha private key" msgstr "Clé privée ReCaptcha" -#: kallithea/templates/admin/settings/settings_global.html:43 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:66 +#: kallithea/templates/admin/settings/settings_global.html:51 msgid "" "Private key for reCaptcha system. Setting this value will enable captcha " "on registration." @@ -4128,22 +4005,17 @@ "Clé privée pour le système reCaptcha. Définir cette valeur activera le " "captcha à l'enregistrement." -#: kallithea/templates/admin/settings/settings_global.html:49 -#: kallithea/templates/admin/settings/settings_vcs.html:77 -#: kallithea/templates/admin/settings/settings_visual.html:115 -#: kallithea/tests/data/templates/admin/settings/settings_global.html.py:68 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:93 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:107 +#: kallithea/templates/admin/settings/settings_global.html:56 +#: kallithea/templates/admin/settings/settings_vcs.html:80 +#: kallithea/templates/admin/settings/settings_visual.html:116 msgid "Save Settings" msgstr "Enregistrer les options" -#: kallithea/templates/admin/settings/settings_hooks.html:3 -#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:38 +#: kallithea/templates/admin/settings/settings_hooks.html:1 msgid "Built-in Mercurial Hooks (Read-Only)" msgstr "Hooks Mercurial intégrés (lecture seule)" -#: kallithea/templates/admin/settings/settings_hooks.html:11 -#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:49 +#: kallithea/templates/admin/settings/settings_hooks.html:15 msgid "" "Hooks can be used to trigger actions on certain events such as push / " "pull. They can trigger Python functions or external applications." @@ -4153,28 +4025,22 @@ "fonctions Python ou des applications externes." #: kallithea/templates/admin/settings/settings_hooks.html:19 -#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:53 msgid "Custom Hooks" msgstr "Hooks personnalisés" -#: kallithea/templates/admin/settings/settings_hooks.html:60 -#: kallithea/tests/data/templates/admin/settings/settings_hooks.html.py:89 +#: kallithea/templates/admin/settings/settings_hooks.html:67 msgid "Failed to remove hook" msgstr "Erreur lors de la suppression du hook" -#: kallithea/templates/admin/settings/settings_mapping.html:4 -#, fuzzy -#| msgid "Rescan option" -msgid "Rescan options" +#: kallithea/templates/admin/settings/settings_mapping.html:6 +msgid "Rescan option" msgstr "Option de scan" -#: kallithea/templates/admin/settings/settings_mapping.html:9 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:39 +#: kallithea/templates/admin/settings/settings_mapping.html:11 msgid "Delete records of missing repositories" msgstr "Supprimer les enregistrements de dépôts manquants" -#: kallithea/templates/admin/settings/settings_mapping.html:12 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:41 +#: kallithea/templates/admin/settings/settings_mapping.html:13 msgid "" "Check this option to remove all comments, pull requests and other records" " related to repositories that no longer exist in the filesystem." @@ -4184,22 +4050,18 @@ "le système de fichiers." #: kallithea/templates/admin/settings/settings_mapping.html:17 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:45 msgid "Invalidate cache for all repositories" msgstr "Invalider le cache pour tous les dépôts" -#: kallithea/templates/admin/settings/settings_mapping.html:20 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:47 +#: kallithea/templates/admin/settings/settings_mapping.html:19 msgid "Check this to reload data and clear cache keys for all repositories." msgstr "Cocher pour recharger les données et vider le cache pour tous les dépôts." -#: kallithea/templates/admin/settings/settings_mapping.html:25 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:51 +#: kallithea/templates/admin/settings/settings_mapping.html:23 msgid "Install Git hooks" msgstr "Installer des hooks Git" -#: kallithea/templates/admin/settings/settings_mapping.html:28 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:53 +#: kallithea/templates/admin/settings/settings_mapping.html:25 msgid "" "Verify if Kallithea's Git hooks are installed for each repository. " "Current hooks will be updated to the latest version." @@ -4207,13 +4069,11 @@ "Vérifier si les hooks Git de Kallithea sont installés pour chaque dépôt. " "Les hooks actuels seront mis à jour vers la dernière version." -#: kallithea/templates/admin/settings/settings_mapping.html:32 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:57 +#: kallithea/templates/admin/settings/settings_mapping.html:28 msgid "Overwrite existing Git hooks" msgstr "Écraser les hooks Git existants" -#: kallithea/templates/admin/settings/settings_mapping.html:35 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:59 +#: kallithea/templates/admin/settings/settings_mapping.html:30 msgid "" "If installing Git hooks, overwrite any existing hooks, even if they do " "not seem to come from Kallithea. WARNING: This operation will destroy any" @@ -4223,23 +4083,19 @@ "même s'ils ne semblent pas provenir de Kallithea. ATTENTION : cette " "opération détruira tous les hooks Git que vous avez déployés à la main !" -#: kallithea/templates/admin/settings/settings_mapping.html:41 -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:61 +#: kallithea/templates/admin/settings/settings_mapping.html:35 msgid "Rescan Repositories" msgstr "Relancer le scan des dépôts" -#: kallithea/templates/admin/settings/settings_search.html:4 -#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:35 +#: kallithea/templates/admin/settings/settings_search.html:7 msgid "Index build option" msgstr "Option de construction de l'index" -#: kallithea/templates/admin/settings/settings_search.html:9 -#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:39 +#: kallithea/templates/admin/settings/settings_search.html:12 msgid "Build from scratch" msgstr "Construire ex nihilo" -#: kallithea/templates/admin/settings/settings_search.html:12 -#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:41 +#: kallithea/templates/admin/settings/settings_search.html:15 msgid "" "This option completely reindexeses all of the repositories for proper " "fulltext search capabilities." @@ -4247,103 +4103,100 @@ "Cette option ré-indexe complètement tous les dépôts pour pouvoir faire " "des recherches dans le texte complet." -#: kallithea/templates/admin/settings/settings_search.html:18 -#: kallithea/tests/data/templates/admin/settings/settings_search.html.py:43 +#: kallithea/templates/admin/settings/settings_search.html:21 msgid "Reindex" msgstr "Mettre à jour l’index" -#: kallithea/templates/admin/settings/settings_system.html:2 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:49 -msgid "Checking for updates..." -msgstr "Vérification des mises à jour…" - -#: kallithea/templates/admin/settings/settings_system.html:7 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "Kallithea version" msgstr "Version de Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:7 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:36 +#: kallithea/templates/admin/settings/settings_system.html:4 msgid "Check for updates" msgstr "Vérifier les mises à jour" -#: kallithea/templates/admin/settings/settings_system.html:8 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:37 +#: kallithea/templates/admin/settings/settings_system.html:5 msgid "Kallithea configuration file" msgstr "Fichier de configuration de Kallithea" -#: kallithea/templates/admin/settings/settings_system.html:9 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:38 +#: kallithea/templates/admin/settings/settings_system.html:6 msgid "Python version" msgstr "Version de Python" -#: kallithea/templates/admin/settings/settings_system.html:10 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:39 +#: kallithea/templates/admin/settings/settings_system.html:7 msgid "Platform" msgstr "Plateforme" -#: kallithea/templates/admin/settings/settings_system.html:11 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:40 +#: kallithea/templates/admin/settings/settings_system.html:8 msgid "Git version" msgstr "Version de Git" -#: kallithea/templates/admin/settings/settings_system.html:12 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:41 +#: kallithea/templates/admin/settings/settings_system.html:9 msgid "Git path" msgstr "Chemin de Git" -#: kallithea/templates/admin/settings/settings_system.html:13 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +#: kallithea/templates/admin/settings/settings_system.html:10 msgid "Upgrade info endpoint" msgstr "Point d'accès aux informations de mise à jour" -#: kallithea/templates/admin/settings/settings_system.html:13 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:42 +#: kallithea/templates/admin/settings/settings_system.html:10 msgid "Note: please make sure this server can access this URL" msgstr "Note : vérifiez que le serveur peut accéder cette URL" +#: kallithea/templates/admin/settings/settings_system.html:15 +msgid "Checking for updates..." +msgstr "Vérification des mises à jour…" + #: kallithea/templates/admin/settings/settings_system.html:23 -#: kallithea/tests/data/templates/admin/settings/settings_system.html.py:60 msgid "Python Packages" msgstr "Paquets Python" -#: kallithea/templates/admin/settings/settings_vcs.html:9 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:51 +#: kallithea/templates/admin/settings/settings_vcs.html:6 +msgid "Web" +msgstr "Web" + +#: kallithea/templates/admin/settings/settings_vcs.html:11 +msgid "Require SSL for vcs operations" +msgstr "Nécessiter SSL pour les opérations de VCS" + +#: kallithea/templates/admin/settings/settings_vcs.html:13 +msgid "" +"Activate to require SSL both pushing and pulling. If SSL certificate is " +"missing, it will return an HTTP Error 406: Not Acceptable." +msgstr "" +"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" +" pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP " +"406: Not Acceptable » sera renvoyée." + +#: kallithea/templates/admin/settings/settings_vcs.html:24 msgid "Show repository size after push" msgstr "Afficher la taille du dépôt après un push" -#: kallithea/templates/admin/settings/settings_vcs.html:15 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:55 +#: kallithea/templates/admin/settings/settings_vcs.html:28 msgid "Log user push commands" msgstr "Journaliser les commandes de push" -#: kallithea/templates/admin/settings/settings_vcs.html:21 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:59 +#: kallithea/templates/admin/settings/settings_vcs.html:32 msgid "Log user pull commands" msgstr "Journaliser les commandes de pull" -#: kallithea/templates/admin/settings/settings_vcs.html:27 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:63 +#: kallithea/templates/admin/settings/settings_vcs.html:36 msgid "Update repository after push (hg update)" msgstr "Mettre à jour les dépôts après un push (hg update)" -#: kallithea/templates/admin/settings/settings_vcs.html:33 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:65 +#: kallithea/templates/admin/settings/settings_vcs.html:42 msgid "Mercurial extensions" msgstr "Extensions Mercurial" -#: kallithea/templates/admin/settings/settings_vcs.html:38 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:69 +#: kallithea/templates/admin/settings/settings_vcs.html:47 msgid "Enable largefiles extension" msgstr "Activer l'extension largefiles" -#: kallithea/templates/admin/settings/settings_vcs.html:44 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:73 +#: kallithea/templates/admin/settings/settings_vcs.html:51 msgid "Enable hgsubversion extension" msgstr "Activer l'extension hgsubversion" -#: kallithea/templates/admin/settings/settings_vcs.html:47 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:75 +#: kallithea/templates/admin/settings/settings_vcs.html:53 msgid "" "Requires hgsubversion library to be installed. Enables cloning of remote " "Subversion repositories while converting them to Mercurial." @@ -4351,13 +4204,11 @@ "La bibliothèque hgsubversion doit être installée. Elle permet de cloner " "des dépôts SVN distants et de les migrer vers Mercurial." -#: kallithea/templates/admin/settings/settings_vcs.html:59 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:80 +#: kallithea/templates/admin/settings/settings_vcs.html:64 msgid "Location of repositories" msgstr "Emplacement des dépôts" -#: kallithea/templates/admin/settings/settings_vcs.html:64 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:84 +#: kallithea/templates/admin/settings/settings_vcs.html:69 msgid "" "Click to unlock. You must restart Kallithea in order to make this setting" " take effect." @@ -4365,8 +4216,7 @@ "Cliquez pour déverrouiller. Vous devez redémarrer Kallithea pour ce que " "réglage prenne effet." -#: kallithea/templates/admin/settings/settings_vcs.html:68 -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:86 +#: kallithea/templates/admin/settings/settings_vcs.html:72 msgid "" "Filesystem location where repositories are stored. After changing this " "value, a restart and rescan of the repository folder are both required." @@ -4375,39 +4225,33 @@ "modification de cette valeur nécessite un re-démarrage et un nouveau " "scan." -#: kallithea/templates/admin/settings/settings_visual.html:4 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:35 +#: kallithea/templates/admin/settings/settings_visual.html:8 msgid "General" msgstr "Général" -#: kallithea/templates/admin/settings/settings_visual.html:9 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:39 +#: kallithea/templates/admin/settings/settings_visual.html:13 msgid "Use repository extra fields" msgstr "Activer les champs supplémentaires sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:12 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:41 +#: kallithea/templates/admin/settings/settings_visual.html:15 msgid "Allows storing additional customized fields per repository." msgstr "" "Permet d'enregistrer des champs personnalisés additionnels pour chaque " "dépôt." -#: kallithea/templates/admin/settings/settings_visual.html:17 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:45 +#: kallithea/templates/admin/settings/settings_visual.html:18 msgid "Show Kallithea version" msgstr "Afficher la version de Kallithea" #: kallithea/templates/admin/settings/settings_visual.html:20 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:47 msgid "Shows or hides a version number of Kallithea displayed in the footer." msgstr "Afficher ou cacher le numéro de version de Kallithea dans le pied de page." -#: kallithea/templates/admin/settings/settings_visual.html:25 -msgid "Show user Gravatars" -msgstr "" - -#: kallithea/templates/admin/settings/settings_visual.html:29 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:55 +#: kallithea/templates/admin/settings/settings_visual.html:24 +msgid "Use Gravatars in Kallithea" +msgstr "Utiliser Gravatar sur Kallithea" + +#: kallithea/templates/admin/settings/settings_visual.html:30 msgid "" "Gravatar URL allows you to use another avatar server application.\n" " The following " @@ -4439,38 +4283,22 @@ " {netloc} " "emplacement réseau/hôte du serveur Kallithea en cours d'utilisation." -#: kallithea/templates/admin/settings/settings_visual.html:40 -#: kallithea/templates/summary/summary.html:62 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:63 -#: kallithea/tests/data/templates/summary/summary.html.py:133 -msgid "Clone URL" -msgstr "URL de clone" - -#: kallithea/templates/admin/settings/settings_visual.html:43 -#, fuzzy -#| msgid "" "Schema of clone URL construction eg. -#| '{scheme}://{user}@{netloc}/{repo}'." "\n" " -#| The following " "variables are available:\n" " -#| {scheme} 'http' " "or 'https' sent from running Kallithea server,\n" " -#| {user} current " "user username,\n" " -#| {netloc} network " "location/server host of running Kallithea server,\n" " -#| {repo} full " "repository name,\n" " -#| {repoid} ID of " "repository, can be used to contruct clone-by-id" +#: kallithea/templates/admin/settings/settings_visual.html:42 msgid "" "Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." "\n" -" The following " +" The following " "variables are available:\n" -" {scheme} 'http' or " -"'https' sent from running Kallithea server,\n" -" {user} current user" -" username,\n" -" {netloc} network " +" {scheme} 'http' " +"or 'https' sent from running Kallithea server,\n" +" {user} current " +"user username,\n" +" {netloc} network " "location/server host of running Kallithea server,\n" -" {repo} full " +" {repo} full " "repository name,\n" -" {repoid} ID of " -"repository, can be used to construct clone-by-id" +" {repoid} ID of " +"repository, can be used to contruct clone-by-id" msgstr "" "Modèle de construction d'URL de clone. Par exemple : " "'{scheme}://{user}@{netloc}/{repo}'.\n" @@ -4488,31 +4316,23 @@ " {repoid} ID du" " dépôt, peut être utilisé pour cloner par ID." -#: kallithea/templates/admin/settings/settings_visual.html:54 -#, fuzzy -#| msgid "Repository Size" -msgid "Repository page size" -msgstr "Taille du dépôt" - -#: kallithea/templates/admin/settings/settings_visual.html:57 -#, fuzzy -#| msgid "" "Number of items displayed in the admin pages grids before -#| pagination is " "shown." +#: kallithea/templates/admin/settings/settings_visual.html:55 +msgid "Dashboard items" +msgstr "Élements du tableau de bord" + +#: kallithea/templates/admin/settings/settings_visual.html:59 msgid "" -"Number of items displayed in the repository pages before pagination is " -"shown." +"Number of items displayed in the main page dashboard before pagination is" +" shown." msgstr "" -"Nombre d'éléments affichés dans les grilles des pages admin avant " -"d'afficher la pagination." - -#: kallithea/templates/admin/settings/settings_visual.html:62 -#, fuzzy -#| msgid "Admin pages items" -msgid "Admin page size" -msgstr "Élements des pages admin" +"Nombre d'éléments affichés dans la page principale du tableau de bord " +"avant d'afficher la pagination." #: kallithea/templates/admin/settings/settings_visual.html:65 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:85 +msgid "Admin pages items" +msgstr "Élements des pages admin" + +#: kallithea/templates/admin/settings/settings_visual.html:69 msgid "" "Number of items displayed in the admin pages grids before pagination is " "shown." @@ -4520,33 +4340,31 @@ "Nombre d'éléments affichés dans les grilles des pages admin avant " "d'afficher la pagination." -#: kallithea/templates/admin/settings/settings_visual.html:70 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:87 +#: kallithea/templates/admin/settings/settings_visual.html:75 msgid "Icons" msgstr "Icônes" -#: kallithea/templates/admin/settings/settings_visual.html:75 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:91 +#: kallithea/templates/admin/settings/settings_visual.html:80 msgid "Show public repository icon on repositories" msgstr "Afficher l’icône de dépôt public sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:81 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:95 +#: kallithea/templates/admin/settings/settings_visual.html:84 msgid "Show private repository icon on repositories" msgstr "Afficher l’icône de dépôt privé sur les dépôts" -#: kallithea/templates/admin/settings/settings_visual.html:84 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:97 +#: kallithea/templates/admin/settings/settings_visual.html:86 msgid "Show public/private icons next to repository names." msgstr "Afficher l’icône « public/privé » à côté du nom des dépôts." -#: kallithea/templates/admin/settings/settings_visual.html:89 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:99 +#: kallithea/templates/admin/settings/settings_visual.html:92 msgid "Meta Tagging" msgstr "Meta-tagging" -#: kallithea/templates/admin/settings/settings_visual.html:94 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:105 +#: kallithea/templates/admin/settings/settings_visual.html:97 +msgid "Stylify recognised meta tags:" +msgstr "Styliser les méta-tags reconnus :" + +#: kallithea/templates/admin/settings/settings_visual.html:111 msgid "" "Parses meta tags from the repository description field and turns them " "into colored tags." @@ -4554,45 +4372,33 @@ "Analyser les méta-tags dans le champ de description du dépôt et les " "transformer en tags colorés." -#: kallithea/templates/admin/settings/settings_visual.html:98 -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:103 -msgid "Stylify recognised meta tags:" -msgstr "Styliser les méta-tags reconnus :" - #: kallithea/templates/admin/user_groups/user_group_add.html:5 msgid "Add user group" msgstr "Ajouter un groupe d'utilisateurs" #: kallithea/templates/admin/user_groups/user_group_add.html:10 #: kallithea/templates/admin/user_groups/user_group_edit.html:11 -#: kallithea/templates/admin/user_groups/user_groups.html:9 -#: kallithea/templates/base/base.html:59 kallithea/templates/base/base.html:79 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:164 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:146 -#: kallithea/tests/data/templates/base/base.html.py:255 -#: kallithea/tests/data/templates/base/base.html.py:702 +#: kallithea/templates/admin/user_groups/user_groups.html:10 +#: kallithea/templates/base/base.html:63 kallithea/templates/base/base.html:83 msgid "User Groups" msgstr "Groupes d'utilisateurs" #: kallithea/templates/admin/user_groups/user_group_add.html:12 -#: kallithea/templates/admin/user_groups/user_groups.html:24 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:107 +#: kallithea/templates/admin/user_groups/user_groups.html:25 msgid "Add User Group" msgstr "Ajouter un groupe d'utilisateurs" -#: kallithea/templates/admin/user_groups/user_group_add.html:36 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:13 +#: kallithea/templates/admin/user_groups/user_group_add.html:44 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:19 msgid "Short, optional description for this user group." msgstr "Description courte pour ce groupe d'utilisateur (optionnel)." #: kallithea/templates/admin/user_groups/user_group_edit.html:5 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:188 #, python-format msgid "%s user group settings" msgstr "Réglages du groupe d'utilisateurs %s" #: kallithea/templates/admin/user_groups/user_group_edit.html:33 -#: kallithea/tests/data/templates/admin/user_groups/user_group_edit.html.py:136 msgid "Show Members" msgstr "Afficher les membres" @@ -4602,15 +4408,13 @@ msgstr "Groupe d'utilisateurs : %s" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:6 -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:23 -#: kallithea/templates/admin/user_groups/user_groups.html:40 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:116 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:32 +#: kallithea/templates/admin/user_groups/user_groups.html:48 msgid "Members" msgstr "Membres" #: kallithea/templates/admin/user_groups/user_group_edit_advanced.html:19 -#: kallithea/templates/data_table/_dt_elements.html:120 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:124 +#: kallithea/templates/data_table/_dt_elements.html:174 #, python-format msgid "Confirm to delete this user group: %s" msgstr "Voulez-vous vraiment supprimer ce groupe utilisateur : %s ?" @@ -4619,59 +4423,48 @@ msgid "Delete this user group" msgstr "Supprimer ce groupe d'utilisateurs" -#: kallithea/templates/admin/user_groups/user_group_edit_members.html:11 +#: kallithea/templates/admin/user_groups/user_group_edit_members.html:17 msgid "No members yet" msgstr "Aucun membre pour l'instant" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:26 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:40 msgid "Chosen group members" msgstr "Membres de groupe sélectionnés" -#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:39 +#: kallithea/templates/admin/user_groups/user_group_edit_settings.html:49 msgid "Available members" msgstr "Membres disponibles" #: kallithea/templates/admin/user_groups/user_groups.html:5 -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:164 msgid "User Groups Administration" msgstr "Administration des groupes d'utilisateurs" #: kallithea/templates/admin/users/user_add.html:5 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:185 msgid "Add user" msgstr "Ajouter un utilisateur" #: kallithea/templates/admin/users/user_add.html:10 #: kallithea/templates/admin/users/user_edit.html:11 -#: kallithea/templates/admin/users/users.html:9 -#: kallithea/templates/base/base.html:58 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:165 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:170 -#: kallithea/tests/data/templates/admin/users/users.html.py:145 -#: kallithea/tests/data/templates/base/base.html.py:251 +#: kallithea/templates/admin/users/users.html:10 +#: kallithea/templates/base/base.html:62 msgid "Users" msgstr "Utilisateurs" #: kallithea/templates/admin/users/user_add.html:12 -#: kallithea/templates/admin/users/users.html:23 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:167 -#: kallithea/tests/data/templates/admin/users/users.html.py:105 +#: kallithea/templates/admin/users/users.html:24 msgid "Add User" msgstr "Ajouter un utilisateur" -#: kallithea/templates/admin/users/user_add.html:41 -#: kallithea/tests/data/templates/admin/users/user_add.html.py:117 +#: kallithea/templates/admin/users/user_add.html:50 msgid "Password confirmation" msgstr "Confirmation" #: kallithea/templates/admin/users/user_edit.html:5 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:194 #, python-format msgid "%s user settings" msgstr "Réglages de l'utilisateur %s" #: kallithea/templates/admin/users/user_edit.html:30 -#: kallithea/tests/data/templates/admin/users/user_edit.html.py:118 msgid "Emails" msgstr "E-mails" @@ -4681,14 +4474,12 @@ msgstr "Utilisateur : %s" #: kallithea/templates/admin/users/user_edit_advanced.html:7 -#: kallithea/templates/admin/users/user_edit_profile.html:32 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:70 +#: kallithea/templates/admin/users/user_edit_profile.html:42 msgid "Source of Record" msgstr "Source de l'enregistrement" #: kallithea/templates/admin/users/user_edit_advanced.html:9 -#: kallithea/templates/admin/users/users.html:41 -#: kallithea/tests/data/templates/admin/users/users.html.py:115 +#: kallithea/templates/admin/users/users.html:53 msgid "Last Login" msgstr "Dernière connexion" @@ -4697,8 +4488,7 @@ msgstr "Membre des groupes d'utilisateurs" #: kallithea/templates/admin/users/user_edit_advanced.html:21 -#: kallithea/templates/data_table/_dt_elements.html:105 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:397 +#: kallithea/templates/data_table/_dt_elements.html:158 #, python-format msgid "Confirm to delete this user: %s" msgstr "Voulez-vous vraiment supprimer l’utilisateur « %s » ?" @@ -4707,254 +4497,218 @@ msgid "Delete this user" msgstr "Supprimer cet utilisateur" -#: kallithea/templates/admin/users/user_edit_ips.html:7 -#: kallithea/tests/data/templates/admin/users/user_edit_ips.html.py:45 +#: kallithea/templates/admin/users/user_edit_ips.html:8 #, python-format msgid "Inherited from %s" msgstr "Hérité de %s" -#: kallithea/templates/admin/users/user_edit_profile.html:39 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:74 +#: kallithea/templates/admin/users/user_edit_profile.html:8 +msgid "Change avatar at" +msgstr "Changer l'avatar sur" + +#: kallithea/templates/admin/users/user_edit_profile.html:12 +msgid "Missing email, please update this user email address." +msgstr "" +"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " +"utilisateur." + +#: kallithea/templates/admin/users/user_edit_profile.html:51 msgid "Name in Source of Record" msgstr "Nom dans la source de l'enregistrement" -#: kallithea/templates/admin/users/user_edit_profile.html:53 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:82 +#: kallithea/templates/admin/users/user_edit_profile.html:69 msgid "New password confirmation" msgstr "Confirmation du nouveau mot de passe" #: kallithea/templates/admin/users/users.html:5 -#: kallithea/tests/data/templates/admin/users/users.html.py:163 msgid "Users Administration" msgstr "Administration des utilisateurs" -#: kallithea/templates/admin/users/users.html:44 -#: kallithea/tests/data/templates/admin/users/users.html.py:121 +#: kallithea/templates/admin/users/users.html:56 msgid "Auth Type" msgstr "Type d'authentification" -#: kallithea/templates/base/base.html:16 -#: kallithea/tests/data/templates/base/base.html.py:59 +#: kallithea/templates/base/base.html:18 #, python-format msgid "Server instance: %s" msgstr "Instance de serveur : %s" -#: kallithea/templates/base/base.html:28 -#: kallithea/tests/data/templates/base/base.html.py:78 +#: kallithea/templates/base/base.html:30 msgid "Support" msgstr "Support" -#: kallithea/templates/base/base.html:86 -#: kallithea/tests/data/templates/base/base.html.py:213 +#: kallithea/templates/base/base.html:90 msgid "Mercurial repository" msgstr "Dépôt Mercurial" -#: kallithea/templates/base/base.html:89 -#: kallithea/tests/data/templates/base/base.html.py:217 +#: kallithea/templates/base/base.html:93 msgid "Git repository" msgstr "Dépôt Git" -#: kallithea/templates/base/base.html:114 -#: kallithea/tests/data/templates/base/base.html.py:322 +#: kallithea/templates/base/base.html:119 msgid "Create Fork" msgstr "Créer un fork" -#: kallithea/templates/base/base.html:125 +#: kallithea/templates/base/base.html:130 +#: kallithea/templates/data_table/_dt_elements.html:13 +#: kallithea/templates/data_table/_dt_elements.html:17 #: kallithea/templates/summary/summary.html:8 -#: kallithea/tests/data/templates/base/base.html.py:333 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:67 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:71 -#: kallithea/tests/data/templates/summary/summary.html.py:357 msgid "Summary" msgstr "Résumé" -#: kallithea/templates/base/base.html:127 -#: kallithea/templates/base/base.html:129 +#: kallithea/templates/base/base.html:132 +#: kallithea/templates/base/base.html:134 #: kallithea/templates/changelog/changelog.html:14 -#: kallithea/tests/data/templates/base/base.html.py:341 -#: kallithea/tests/data/templates/base/base.html.py:349 -#: kallithea/tests/data/templates/changelog/changelog.html.py:321 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:73 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:77 +#: kallithea/templates/data_table/_dt_elements.html:21 +#: kallithea/templates/data_table/_dt_elements.html:25 msgid "Changelog" msgstr "Historique" -#: kallithea/templates/base/base.html:131 +#: kallithea/templates/base/base.html:136 +#: kallithea/templates/data_table/_dt_elements.html:29 +#: kallithea/templates/data_table/_dt_elements.html:33 #: kallithea/templates/files/files.html:11 -#: kallithea/tests/data/templates/base/base.html.py:356 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:79 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:83 -#: kallithea/tests/data/templates/files/files.html.py:184 msgid "Files" msgstr "Fichiers" -#: kallithea/templates/base/base.html:137 -#: kallithea/templates/base/base.html:139 -#: kallithea/tests/data/templates/base/base.html.py:366 -#: kallithea/tests/data/templates/base/base.html.py:370 +#: kallithea/templates/base/base.html:142 +#: kallithea/templates/base/base.html:144 msgid "Options" msgstr "Options" -#: kallithea/templates/base/base.html:147 -#: kallithea/templates/forks/forks_data.html:18 -#: kallithea/tests/data/templates/base/base.html.py:383 -#: kallithea/tests/data/templates/forks/forks_data.html.py:59 +#: kallithea/templates/base/base.html:152 +#: kallithea/templates/forks/forks_data.html:21 msgid "Compare Fork" msgstr "Comparer le fork" -#: kallithea/templates/base/base.html:149 -#: kallithea/tests/data/templates/base/base.html.py:388 +#: kallithea/templates/base/base.html:154 +#: kallithea/templates/bookmarks/bookmarks.html:56 +#: kallithea/templates/bookmarks/bookmarks_data.html:13 +#: kallithea/templates/branches/branches.html:56 +#: kallithea/templates/branches/branches_data.html:13 +#: kallithea/templates/tags/tags.html:56 +#: kallithea/templates/tags/tags_data.html:13 msgid "Compare" msgstr "Comparer" -#: kallithea/templates/base/base.html:151 -#: kallithea/templates/base/base.html:320 +#: kallithea/templates/base/base.html:156 +#: kallithea/templates/base/base.html:331 #: kallithea/templates/search/search.html:14 -#: kallithea/templates/search/search.html:67 -#: kallithea/tests/data/templates/base/base.html.py:392 -#: kallithea/tests/data/templates/base/base.html.py:544 -#: kallithea/tests/data/templates/search/search.html.py:134 -#: kallithea/tests/data/templates/search/search.html.py:185 +#: kallithea/templates/search/search.html:54 msgid "Search" msgstr "Rechercher" -#: kallithea/templates/base/base.html:155 -#: kallithea/tests/data/templates/base/base.html.py:399 +#: kallithea/templates/base/base.html:160 msgid "Unlock" msgstr "Déverrouiller" -#: kallithea/templates/base/base.html:157 -#: kallithea/tests/data/templates/base/base.html.py:405 +#: kallithea/templates/base/base.html:162 msgid "Lock" msgstr "Verrouiller" -#: kallithea/templates/base/base.html:165 -#: kallithea/tests/data/templates/base/base.html.py:413 +#: kallithea/templates/base/base.html:170 msgid "Follow" msgstr "Suivre" -#: kallithea/templates/base/base.html:166 -#: kallithea/tests/data/templates/base/base.html.py:415 +#: kallithea/templates/base/base.html:171 msgid "Unfollow" msgstr "Arrêter de suivre" -#: kallithea/templates/base/base.html:169 kallithea/templates/forks/fork.html:9 -#: kallithea/tests/data/templates/base/base.html.py:419 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:85 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:89 +#: kallithea/templates/base/base.html:174 +#: kallithea/templates/data_table/_dt_elements.html:37 +#: kallithea/templates/data_table/_dt_elements.html:41 +#: kallithea/templates/forks/fork.html:9 msgid "Fork" msgstr "Fork" -#: kallithea/templates/base/base.html:170 -#: kallithea/templates/pullrequests/pullrequest.html:77 -#: kallithea/tests/data/templates/base/base.html.py:423 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:148 +#: kallithea/templates/base/base.html:175 +#: kallithea/templates/pullrequests/pullrequest.html:88 msgid "Create Pull Request" msgstr "Créer une requête de pull" -#: kallithea/templates/base/base.html:175 -#: kallithea/tests/data/templates/base/base.html.py:430 +#: kallithea/templates/base/base.html:180 #, python-format msgid "Show Pull Requests for %s" msgstr "Afficher les requêtes de pull pour %s" -#: kallithea/templates/base/base.html:188 -#: kallithea/tests/data/templates/base/base.html.py:439 +#: kallithea/templates/base/base.html:193 msgid "Switch To" msgstr "Basculer vers" -#: kallithea/templates/base/base.html:198 -#: kallithea/templates/base/base.html:458 -#: kallithea/tests/data/templates/base/base.html.py:441 -#: kallithea/tests/data/templates/base/base.html.py:656 +#: kallithea/templates/base/base.html:203 +#: kallithea/templates/base/base.html:485 msgid "No matches found" msgstr "Aucune correspondance trouvée" -#: kallithea/templates/base/base.html:294 -#: kallithea/tests/data/templates/base/base.html.py:494 +#: kallithea/templates/base/base.html:305 msgid "Show recent activity" msgstr "Afficher l'activité récente" -#: kallithea/templates/base/base.html:300 -#: kallithea/templates/base/base.html:301 -#: kallithea/tests/data/templates/base/base.html.py:504 -#: kallithea/tests/data/templates/base/base.html.py:508 +#: kallithea/templates/base/base.html:311 +#: kallithea/templates/base/base.html:312 msgid "Public journal" msgstr "Journal public" -#: kallithea/templates/base/base.html:306 -#: kallithea/tests/data/templates/base/base.html.py:513 +#: kallithea/templates/base/base.html:317 msgid "Show public gists" msgstr "Afficher les gists publics" -#: kallithea/templates/base/base.html:307 -#: kallithea/tests/data/templates/base/base.html.py:517 +#: kallithea/templates/base/base.html:318 msgid "Gists" msgstr "Gists" -#: kallithea/templates/base/base.html:311 -#: kallithea/tests/data/templates/base/base.html.py:525 +#: kallithea/templates/base/base.html:322 msgid "All Public Gists" msgstr "Tous les Gists publics" -#: kallithea/templates/base/base.html:313 -#: kallithea/tests/data/templates/base/base.html.py:531 +#: kallithea/templates/base/base.html:324 msgid "My Public Gists" msgstr "Mes Gists publics" -#: kallithea/templates/base/base.html:314 -#: kallithea/tests/data/templates/base/base.html.py:535 +#: kallithea/templates/base/base.html:325 msgid "My Private Gists" msgstr "Mes Gist privés" -#: kallithea/templates/base/base.html:319 -#: kallithea/tests/data/templates/base/base.html.py:540 +#: kallithea/templates/base/base.html:330 msgid "Search in repositories" msgstr "Recherche dans les dépôts" -#: kallithea/templates/base/base.html:342 -#: kallithea/templates/base/base.html:343 +#: kallithea/templates/base/base.html:353 +#: kallithea/templates/base/base.html:354 #: kallithea/templates/pullrequests/pullrequest_show_my.html:6 #: kallithea/templates/pullrequests/pullrequest_show_my.html:10 -#: kallithea/tests/data/templates/base/base.html.py:573 -#: kallithea/tests/data/templates/base/base.html.py:577 msgid "My Pull Requests" msgstr "Mes requêtes de pull" -#: kallithea/templates/base/base.html:367 -#: kallithea/tests/data/templates/base/base.html.py:602 +#: kallithea/templates/base/base.html:377 msgid "Not Logged In" msgstr "Non connecté" -#: kallithea/templates/base/base.html:375 -#: kallithea/tests/data/templates/base/base.html.py:607 +#: kallithea/templates/base/base.html:384 msgid "Login to Your Account" msgstr "Connexion à votre compte" -#: kallithea/templates/base/base.html:385 -#, fuzzy -#| msgid "Forgot password ?" -msgid "Forgot password?" +#: kallithea/templates/base/base.html:407 +msgid "Forgot password ?" msgstr "Mot de passe oublié ?" -#: kallithea/templates/base/base.html:389 -#, fuzzy -#| msgid "Don't have an account ?" -msgid "Don't have an account?" -msgstr "Vous n’avez pas de compte ?" - -#: kallithea/templates/base/base.html:407 -#: kallithea/tests/data/templates/base/base.html.py:648 +#: kallithea/templates/base/base.html:434 msgid "Log Out" msgstr "Se déconnecter" -#: kallithea/templates/base/default_perms_box.html:11 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:47 +#: kallithea/templates/base/base.html:615 +msgid "Keyboard shortcuts" +msgstr "Raccourcis clavier" + +#: kallithea/templates/base/base.html:624 +msgid "Site-wide shortcuts" +msgstr "Raccourcis globaux" + +#: kallithea/templates/base/default_perms_box.html:14 msgid "Inherit defaults" msgstr "Hériter des réglages par défaut" -#: kallithea/templates/base/default_perms_box.html:15 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:51 +#: kallithea/templates/base/default_perms_box.html:19 #, python-format msgid "" "Select to inherit global settings, IP whitelist and permissions from the " @@ -4963,248 +4717,223 @@ "Sélectionner pour hériter des réglages généraux, de la liste blanche d'IP" " et des permissions depuis les %s." -#: kallithea/templates/base/default_perms_box.html:23 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:54 +#: kallithea/templates/base/default_perms_box.html:28 msgid "Create repositories" msgstr "Création de dépôts" -#: kallithea/templates/base/default_perms_box.html:27 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:58 +#: kallithea/templates/base/default_perms_box.html:33 msgid "Select this option to allow repository creation for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à créer des " "dépôts" -#: kallithea/templates/base/default_perms_box.html:33 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:60 +#: kallithea/templates/base/default_perms_box.html:40 msgid "Create user groups" msgstr "Créer des groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:37 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:64 +#: kallithea/templates/base/default_perms_box.html:45 msgid "Select this option to allow user group creation for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à créer des " "groupes d'utilisateurs" -#: kallithea/templates/base/default_perms_box.html:43 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:66 +#: kallithea/templates/base/default_perms_box.html:52 msgid "Fork repositories" msgstr "Forker les dépôts" -#: kallithea/templates/base/default_perms_box.html:47 -#: kallithea/tests/data/templates/base/default_perms_box.html.py:70 +#: kallithea/templates/base/default_perms_box.html:57 msgid "Select this option to allow repository forking for this user" msgstr "" "Sélectionner cette option pour autoriser cet utilisateur à forker des " "dépôts" #: kallithea/templates/base/perms_summary.html:13 -#: kallithea/templates/changelog/changelog.html:39 -#: kallithea/tests/data/templates/base/perms_summary.html.py:51 -#: kallithea/tests/data/templates/changelog/changelog.html.py:128 +#: kallithea/templates/changelog/changelog.html:42 msgid "Show" msgstr "Afficher" #: kallithea/templates/base/perms_summary.html:22 -#: kallithea/tests/data/templates/base/perms_summary.html.py:80 msgid "No permissions defined yet" msgstr "Aucune permission définie pour l'instant" #: kallithea/templates/base/perms_summary.html:30 -#: kallithea/templates/base/perms_summary.html:55 -#: kallithea/tests/data/templates/base/perms_summary.html.py:90 -#: kallithea/tests/data/templates/base/perms_summary.html.py:113 +#: kallithea/templates/base/perms_summary.html:54 msgid "Permission" msgstr "Permission" #: kallithea/templates/base/perms_summary.html:32 -#: kallithea/templates/base/perms_summary.html:57 -#: kallithea/tests/data/templates/base/perms_summary.html.py:94 -#: kallithea/tests/data/templates/base/perms_summary.html.py:117 +#: kallithea/templates/base/perms_summary.html:56 msgid "Edit Permission" msgstr "Éditer" -#: kallithea/templates/base/perms_summary.html:92 -#: kallithea/tests/data/templates/base/perms_summary.html.py:169 +#: kallithea/templates/base/perms_summary.html:90 msgid "No permission defined" msgstr "Aucune permission définie" -#: kallithea/templates/base/root.html:25 -#: kallithea/tests/data/templates/base/root.html.py:85 +#: kallithea/templates/base/root.html:22 msgid "Add Another Comment" msgstr "Ajouter un autre commentaire" -#: kallithea/templates/base/root.html:26 -#: kallithea/tests/data/templates/base/root.html.py:87 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:242 +#: kallithea/templates/base/root.html:23 +#: kallithea/templates/data_table/_dt_elements.html:214 msgid "Stop following this repository" msgstr "Arrêter de suivre ce dépôt" +#: kallithea/templates/base/root.html:24 +msgid "Start following this repository" +msgstr "Suivre ce dépôt" + +#: kallithea/templates/base/root.html:25 +msgid "Group" +msgstr "Groupe" + +#: kallithea/templates/base/root.html:26 +msgid "members" +msgstr "Membres" + #: kallithea/templates/base/root.html:27 -#: kallithea/tests/data/templates/base/root.html.py:89 -msgid "Start following this repository" -msgstr "Suivre ce dépôt" +msgid "Loading ..." +msgstr "Chargement..." #: kallithea/templates/base/root.html:28 -#: kallithea/tests/data/templates/base/root.html.py:91 -msgid "Group" -msgstr "Groupe" +msgid "loading ..." +msgstr "chargement..." #: kallithea/templates/base/root.html:29 -#: kallithea/tests/data/templates/base/root.html.py:93 -msgid "members" -msgstr "Membres" +msgid "Search truncated" +msgstr "Recherche tronquée" #: kallithea/templates/base/root.html:30 -#: kallithea/tests/data/templates/base/root.html.py:95 -msgid "Loading ..." -msgstr "Chargement..." +msgid "No matching files" +msgstr "Aucun fichier correspondant" #: kallithea/templates/base/root.html:31 -#: kallithea/tests/data/templates/base/root.html.py:97 -msgid "loading ..." -msgstr "chargement..." +msgid "Open New Pull Request from {0}" +msgstr "Ouvrir une nouvelle requête de pull à partir de {0}" #: kallithea/templates/base/root.html:32 -#: kallithea/tests/data/templates/base/root.html.py:99 -msgid "Search truncated" -msgstr "Recherche tronquée" +msgid "Open New Pull Request for {0} → {1}" +msgstr "Ouvrir une nouvelle requête de pull pour {0} → {1}" #: kallithea/templates/base/root.html:33 -#: kallithea/tests/data/templates/base/root.html.py:101 -msgid "No matching files" -msgstr "Aucun fichier correspondant" +msgid "Show Selected Changesets {0} → {1}" +msgstr "Afficher les changesets sélectionnés {0} → {1}" #: kallithea/templates/base/root.html:34 -#: kallithea/tests/data/templates/base/root.html.py:103 -msgid "Open New Pull Request from {0}" -msgstr "Ouvrir une nouvelle requête de pull à partir de {0}" +msgid "Selection Link" +msgstr "Lien vers la sélection" #: kallithea/templates/base/root.html:35 -#: kallithea/tests/data/templates/base/root.html.py:105 -msgid "Open New Pull Request for {0} → {1}" -msgstr "Ouvrir une nouvelle requête de pull pour {0} → {1}" +#: kallithea/templates/changeset/diff_block.html:8 +#: kallithea/templates/changeset/diff_block.html:21 +msgid "Collapse Diff" +msgstr "Replier le Diff" #: kallithea/templates/base/root.html:36 -#: kallithea/tests/data/templates/base/root.html.py:107 -msgid "Show Selected Changesets {0} → {1}" -msgstr "Afficher les changesets sélectionnés {0} → {1}" +msgid "Expand Diff" +msgstr "Déplier le Diff" #: kallithea/templates/base/root.html:37 -#: kallithea/tests/data/templates/base/root.html.py:109 -msgid "Selection Link" -msgstr "Lien vers la sélection" +msgid "Failed to revoke permission" +msgstr "Échec de la révocation de permission" #: kallithea/templates/base/root.html:38 -#: kallithea/templates/changeset/diff_block.html:7 -#: kallithea/tests/data/templates/base/root.html.py:111 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:55 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:230 -msgid "Collapse Diff" -msgstr "Replier le Diff" - -#: kallithea/templates/base/root.html:39 -#: kallithea/tests/data/templates/base/root.html.py:113 -msgid "Expand Diff" -msgstr "Déplier le Diff" - -#: kallithea/templates/base/root.html:40 -#: kallithea/tests/data/templates/base/root.html.py:115 -msgid "Failed to revoke permission" -msgstr "Échec de la révocation de permission" - -#: kallithea/templates/base/root.html:41 -#: kallithea/tests/data/templates/base/root.html.py:117 msgid "Confirm to revoke permission for {0}: {1} ?" msgstr "Voulez-vous vraiment révoquer la permission pour {0} : {1} ?" -#: kallithea/templates/base/root.html:44 -#: kallithea/templates/compare/compare_diff.html:108 -#: kallithea/tests/data/templates/base/root.html.py:123 -msgid "Select changeset" -msgstr "Sélectionner le changeset" - -#: kallithea/templates/base/root.html:45 -#: kallithea/tests/data/templates/base/root.html.py:125 +#: kallithea/templates/base/root.html:39 +msgid "enabled" +msgstr "activé" + +#: kallithea/templates/base/root.html:40 +msgid "disabled" +msgstr "désactivé" + +#: kallithea/templates/base/root.html:42 msgid "Specify changeset" msgstr "Sélectionner le changeset" -#: kallithea/templates/base/root.html:46 -#: kallithea/tests/data/templates/base/root.html.py:127 -msgid "Click to sort ascending" -msgstr "Tri ascendant" - -#: kallithea/templates/base/root.html:47 -#: kallithea/tests/data/templates/base/root.html.py:129 -msgid "Click to sort descending" -msgstr "Tri descendant" - -#: kallithea/templates/base/root.html:48 -#: kallithea/tests/data/templates/base/root.html.py:131 -msgid "No records found." -msgstr "Aucun élément n’a été trouvé." - -#: kallithea/templates/base/root.html:49 -#: kallithea/tests/data/templates/base/root.html.py:133 -msgid "Data error." -msgstr "Erreur d’intégrité des données." - -#: kallithea/templates/base/root.html:50 -#: kallithea/tests/data/templates/base/root.html.py:135 -msgid "Loading..." -msgstr "Chargement…" +#: kallithea/templates/bookmarks/bookmarks.html:5 +#, python-format +msgid "%s Bookmarks" +msgstr "Signets de %s" + +#: kallithea/templates/bookmarks/bookmarks.html:26 +msgid "Compare Bookmarks" +msgstr "Comparer les marque-pages" + +#: kallithea/templates/bookmarks/bookmarks.html:53 +#: kallithea/templates/bookmarks/bookmarks_data.html:10 +#: kallithea/templates/branches/branches.html:53 +#: kallithea/templates/branches/branches_data.html:10 +#: kallithea/templates/changelog/changelog_summary_data.html:10 +#: kallithea/templates/tags/tags.html:53 +#: kallithea/templates/tags/tags_data.html:10 +msgid "Author" +msgstr "Auteur" + +#: kallithea/templates/bookmarks/bookmarks.html:54 +#: kallithea/templates/bookmarks/bookmarks_data.html:12 +#: kallithea/templates/branches/branches.html:54 +#: kallithea/templates/branches/branches_data.html:12 +#: kallithea/templates/changelog/changelog_summary_data.html:7 +#: kallithea/templates/files/files_browser.html:32 +#: kallithea/templates/pullrequests/pullrequest.html:62 +#: kallithea/templates/pullrequests/pullrequest.html:78 +#: kallithea/templates/tags/tags.html:54 +#: kallithea/templates/tags/tags_data.html:12 +msgid "Revision" +msgstr "Révision" + +#: kallithea/templates/branches/branches.html:5 +#, python-format +msgid "%s Branches" +msgstr "Branches de %s" + +#: kallithea/templates/branches/branches.html:26 +msgid "Compare Branches" +msgstr "Comparer les branches" #: kallithea/templates/changelog/changelog.html:6 -#: kallithea/tests/data/templates/changelog/changelog.html.py:354 #, python-format msgid "%s Changelog" msgstr "Historique de %s" #: kallithea/templates/changelog/changelog.html:21 -#: kallithea/tests/data/templates/changelog/changelog.html.py:332 #, python-format msgid "showing %d out of %d revision" msgid_plural "showing %d out of %d revisions" msgstr[0] "Affichage de %d révision sur %d" msgstr[1] "Affichage de %d révisions sur %d" -#: kallithea/templates/changelog/changelog.html:45 -#: kallithea/tests/data/templates/changelog/changelog.html.py:141 +#: kallithea/templates/changelog/changelog.html:49 msgid "Clear selection" msgstr "Vider la sélection" -#: kallithea/templates/changelog/changelog.html:52 -#: kallithea/tests/data/templates/changelog/changelog.html.py:147 +#: kallithea/templates/changelog/changelog.html:55 msgid "Go to tip of repository" msgstr "Aller au sommet (tip) du dépôt" -#: kallithea/templates/changelog/changelog.html:57 -#: kallithea/templates/forks/forks_data.html:16 -#: kallithea/tests/data/templates/changelog/changelog.html.py:151 -#: kallithea/tests/data/templates/forks/forks_data.html.py:55 +#: kallithea/templates/changelog/changelog.html:60 +#: kallithea/templates/forks/forks_data.html:19 #, python-format msgid "Compare fork with %s" msgstr "Comparer le fork avec %s" -#: kallithea/templates/changelog/changelog.html:59 -#: kallithea/tests/data/templates/changelog/changelog.html.py:155 +#: kallithea/templates/changelog/changelog.html:62 #, python-format msgid "Compare fork with parent repository (%s)" msgstr "Comparer le fork avec le dépôt parent (%s)" -#: kallithea/templates/changelog/changelog.html:63 +#: kallithea/templates/changelog/changelog.html:66 #: kallithea/templates/files/files.html:29 -#: kallithea/tests/data/templates/changelog/changelog.html.py:158 -#: kallithea/tests/data/templates/files/files.html.py:117 msgid "Branch filter:" msgstr "Filtre de branche :" -#: kallithea/templates/changelog/changelog.html:86 -#: kallithea/templates/changelog/changelog_summary_data.html:18 -#: kallithea/tests/data/templates/changelog/changelog.html.py:183 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:61 -#, python-format +#: kallithea/templates/changelog/changelog.html:92 +#: kallithea/templates/changelog/changelog_summary_data.html:20 +#, python-format +#| msgid "" "Changeset status: %s\n" "Click to open associated pull request %s" msgid "" "Changeset status: %s by %s\n" "Click to open associated pull request %s" @@ -5212,388 +4941,286 @@ "Statut du changeset : %s par %s\n" "Cliquer pour ouvrir la requête de pull %s associée" -#: kallithea/templates/changelog/changelog.html:90 -#: kallithea/templates/changelog/changelog_summary_data.html:22 -#: kallithea/tests/data/templates/changelog/changelog.html.py:191 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:69 -#, python-format +#: kallithea/templates/changelog/changelog.html:96 +#: kallithea/templates/changelog/changelog_summary_data.html:24 +#, python-format +#| msgid "Changeset status: %s" msgid "Changeset status: %s by %s" msgstr "Statut de changeset : %s par %s" -#: kallithea/templates/changelog/changelog.html:107 -#: kallithea/templates/compare/compare_cs.html:76 -#: kallithea/tests/data/templates/changelog/changelog.html.py:217 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:116 +#: kallithea/templates/changelog/changelog.html:116 +#: kallithea/templates/compare/compare_cs.html:63 msgid "Expand commit message" msgstr "Développer le message de commit" -#: kallithea/templates/changelog/changelog.html:116 -#: kallithea/templates/compare/compare_cs.html:41 -#: kallithea/tests/data/templates/changelog/changelog.html.py:225 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:71 +#: kallithea/templates/changelog/changelog.html:125 +#: kallithea/templates/compare/compare_cs.html:30 msgid "Changeset has comments" msgstr "Le changeset a des commentaires" -#: kallithea/templates/changelog/changelog.html:151 -#: kallithea/templates/changelog/changelog_summary_data.html:53 -#: kallithea/templates/changeset/changeset.html:78 -#: kallithea/templates/changeset/changeset_range.html:84 -#: kallithea/tests/data/templates/changelog/changelog.html.py:234 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:103 -#: kallithea/tests/data/templates/changeset/changeset.html.py:216 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:200 +#: kallithea/templates/changelog/changelog.html:135 +#: kallithea/templates/changelog/changelog_summary_data.html:57 +#: kallithea/templates/changeset/changeset.html:94 +#: kallithea/templates/changeset/changeset_range.html:92 #, python-format msgid "Bookmark %s" msgstr "Marque-page %s" -#: kallithea/templates/changelog/changelog.html:157 -#: kallithea/templates/changelog/changelog_summary_data.html:59 -#: kallithea/templates/changeset/changeset.html:85 -#: kallithea/templates/changeset/changeset_range.html:90 -#: kallithea/templates/compare/compare_cs.html:82 -#: kallithea/templates/pullrequests/pullrequest_show.html:177 -#: kallithea/tests/data/templates/changelog/changelog.html.py:240 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:109 -#: kallithea/tests/data/templates/changeset/changeset.html.py:223 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:206 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:120 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:295 +#: kallithea/templates/changelog/changelog.html:141 +#: kallithea/templates/changelog/changelog_summary_data.html:63 +#: kallithea/templates/changeset/changeset.html:101 +#: kallithea/templates/changeset/changeset_range.html:98 +#: kallithea/templates/compare/compare_cs.html:69 +#: kallithea/templates/pullrequests/pullrequest_show.html:203 #, python-format msgid "Tag %s" msgstr "Tag %s" -#: kallithea/templates/changelog/changelog.html:162 -#: kallithea/templates/changelog/changelog_summary_data.html:64 -#: kallithea/templates/changeset/changeset.html:90 -#: kallithea/templates/changeset/changeset_range.html:94 -#: kallithea/tests/data/templates/changelog/changelog.html.py:246 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:115 -#: kallithea/tests/data/templates/changeset/changeset.html.py:230 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:212 +#: kallithea/templates/changelog/changelog.html:146 +#: kallithea/templates/changelog/changelog_summary_data.html:68 +#: kallithea/templates/changeset/changeset.html:106 +#: kallithea/templates/changeset/changeset_range.html:102 #, python-format msgid "Branch %s" msgstr "Branche %s" -#: kallithea/templates/changelog/changelog.html:326 -#: kallithea/tests/data/templates/changelog/changelog.html.py:289 +#: kallithea/templates/changelog/changelog.html:311 msgid "There are no changes yet" msgstr "Il n’y a aucun changement pour le moment" #: kallithea/templates/changelog/changelog_details.html:4 -#: kallithea/templates/changeset/changeset.html:98 -#: kallithea/tests/data/templates/changeset/changeset.html.py:187 +#: kallithea/templates/changeset/changeset.html:77 msgid "Removed" msgstr "Supprimé" #: kallithea/templates/changelog/changelog_details.html:5 -#: kallithea/templates/changeset/changeset.html:99 -#: kallithea/tests/data/templates/changeset/changeset.html.py:191 +#: kallithea/templates/changeset/changeset.html:78 msgid "Changed" msgstr "Modifié" #: kallithea/templates/changelog/changelog_details.html:6 -#: kallithea/templates/changeset/changeset.html:100 -#: kallithea/templates/changeset/diff_block.html:38 -#: kallithea/tests/data/templates/changeset/changeset.html.py:195 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:110 +#: kallithea/templates/changeset/changeset.html:79 +#: kallithea/templates/changeset/diff_block.html:47 msgid "Added" msgstr "Ajouté" #: kallithea/templates/changelog/changelog_details.html:8 #: kallithea/templates/changelog/changelog_details.html:9 #: kallithea/templates/changelog/changelog_details.html:10 -#: kallithea/templates/changeset/changeset.html:102 -#: kallithea/templates/changeset/changeset.html:103 -#: kallithea/templates/changeset/changeset.html:104 -#: kallithea/tests/data/templates/changeset/changeset.html.py:201 -#: kallithea/tests/data/templates/changeset/changeset.html.py:203 -#: kallithea/tests/data/templates/changeset/changeset.html.py:205 +#: kallithea/templates/changeset/changeset.html:81 +#: kallithea/templates/changeset/changeset.html:82 +#: kallithea/templates/changeset/changeset.html:83 #, python-format msgid "Affected %s files" msgstr "%s fichiers affectés" -#: kallithea/templates/changelog/changelog_summary_data.html:7 -#: kallithea/templates/files/files_browser.html:32 -#: kallithea/templates/pullrequests/pullrequest.html:52 -#: kallithea/templates/pullrequests/pullrequest.html:68 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:43 -#: kallithea/tests/data/templates/files/files_browser.html.py:52 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:134 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:146 -msgid "Revision" -msgstr "Révision" - #: kallithea/templates/changelog/changelog_summary_data.html:8 -#: kallithea/templates/files/files_add.html:64 -#: kallithea/templates/files/files_delete.html:34 -#: kallithea/templates/files/files_edit.html:67 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:45 -#: kallithea/tests/data/templates/files/files_add.html.py:243 +#: kallithea/templates/files/files_add.html:60 +#: kallithea/templates/files/files_delete.html:39 +#: kallithea/templates/files/files_edit.html:63 msgid "Commit Message" msgstr "Message de commit" #: kallithea/templates/changelog/changelog_summary_data.html:9 #: kallithea/templates/pullrequests/pullrequest_data.html:17 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:47 msgid "Age" msgstr "Âge" -#: kallithea/templates/changelog/changelog_summary_data.html:10 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:49 -msgid "Author" -msgstr "Auteur" - #: kallithea/templates/changelog/changelog_summary_data.html:11 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:51 msgid "Refs" msgstr "Refs" -#: kallithea/templates/changelog/changelog_summary_data.html:79 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:127 +#: kallithea/templates/changelog/changelog_summary_data.html:84 msgid "Add or upload files directly via Kallithea" msgstr "Ajouter ou téléverser des fichiers directement via Kallithea" -#: kallithea/templates/changelog/changelog_summary_data.html:82 +#: kallithea/templates/changelog/changelog_summary_data.html:87 #: kallithea/templates/files/files_add.html:21 #: kallithea/templates/files/files_ypjax.html:9 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:131 -#: kallithea/tests/data/templates/files/files_add.html.py:159 -#: kallithea/tests/data/templates/files/files_ypjax.html.py:46 msgid "Add New File" msgstr "Ajouter un nouveau fichier" -#: kallithea/templates/changelog/changelog_summary_data.html:88 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:134 +#: kallithea/templates/changelog/changelog_summary_data.html:93 msgid "Push new repository" msgstr "Pusher le nouveau dépôt" -#: kallithea/templates/changelog/changelog_summary_data.html:96 -#: kallithea/tests/data/templates/changelog/changelog_summary_data.html.py:148 +#: kallithea/templates/changelog/changelog_summary_data.html:101 msgid "Existing repository?" msgstr "Le dépôt existe déjà ?" #: kallithea/templates/changeset/changeset.html:8 -#: kallithea/tests/data/templates/changeset/changeset.html.py:436 #, python-format msgid "%s Changeset" msgstr "Changeset de %s" #: kallithea/templates/changeset/changeset.html:36 -#: kallithea/tests/data/templates/changeset/changeset.html.py:154 msgid "Parent rev." msgstr "Révision parente" #: kallithea/templates/changeset/changeset.html:42 -#: kallithea/tests/data/templates/changeset/changeset.html.py:156 msgid "Child rev." msgstr "Révision fille" -#: kallithea/templates/changeset/changeset.html:47 -#: kallithea/tests/data/templates/changeset/changeset.html.py:162 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:105 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:154 +#: kallithea/templates/changeset/changeset.html:50 +#: kallithea/templates/changeset/changeset_file_comment.html:39 +#: kallithea/templates/changeset/changeset_range.html:48 msgid "Changeset status" msgstr "Statut du changeset" #: kallithea/templates/changeset/changeset.html:54 -#: kallithea/templates/changeset/diff_block.html:64 -#: kallithea/templates/files/diff_2way.html:47 -#: kallithea/tests/data/templates/changeset/changeset.html.py:169 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:161 +#: kallithea/templates/changeset/diff_block.html:72 +#: kallithea/templates/files/diff_2way.html:49 msgid "Raw diff" msgstr "Diff brut" #: kallithea/templates/changeset/changeset.html:57 -#: kallithea/tests/data/templates/changeset/changeset.html.py:173 msgid "Patch diff" msgstr "Diff patch" #: kallithea/templates/changeset/changeset.html:60 -#: kallithea/templates/changeset/diff_block.html:66 -#: kallithea/templates/files/diff_2way.html:50 -#: kallithea/tests/data/templates/changeset/changeset.html.py:177 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:165 +#: kallithea/templates/changeset/diff_block.html:75 +#: kallithea/templates/files/diff_2way.html:52 msgid "Download diff" msgstr "Télécharger le diff" -#: kallithea/templates/changeset/changeset.html:73 -#: kallithea/templates/changeset/changeset_range.html:80 -#: kallithea/tests/data/templates/changeset/changeset.html.py:210 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:195 +#: kallithea/templates/changeset/changeset.html:89 +#: kallithea/templates/changeset/changeset_range.html:88 msgid "Merge" msgstr "Fusion" -#: kallithea/templates/changeset/changeset.html:117 -#: kallithea/tests/data/templates/changeset/changeset.html.py:250 -msgid "Grafted from:" -msgstr "Grafté depuis :" - #: kallithea/templates/changeset/changeset.html:123 -#: kallithea/tests/data/templates/changeset/changeset.html.py:260 +msgid "Grafted from:" +msgstr "Grafté depuis :" + +#: kallithea/templates/changeset/changeset.html:129 msgid "Transplanted from:" msgstr "Transplanté depuis :" -#: kallithea/templates/changeset/changeset.html:129 -#: kallithea/tests/data/templates/changeset/changeset.html.py:267 +#: kallithea/templates/changeset/changeset.html:135 msgid "Replaced by:" msgstr "Remplacé par :" -#: kallithea/templates/changeset/changeset.html:143 -#: kallithea/tests/data/templates/changeset/changeset.html.py:288 +#: kallithea/templates/changeset/changeset.html:149 msgid "Preceded by:" msgstr "Précédé par :" -#: kallithea/templates/changeset/changeset.html:160 -#: kallithea/templates/compare/compare_diff.html:59 -#: kallithea/templates/pullrequests/pullrequest_show.html:303 -#: kallithea/tests/data/templates/changeset/changeset.html.py:311 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:152 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:396 +#: kallithea/templates/changeset/changeset.html:166 +#: kallithea/templates/compare/compare_diff.html:60 +#: kallithea/templates/pullrequests/pullrequest_show.html:329 #, python-format msgid "%s file changed" msgid_plural "%s files changed" msgstr[0] "%s fichier changé" msgstr[1] "%s fichiers changés" -#: kallithea/templates/changeset/changeset.html:162 -#: kallithea/templates/compare/compare_diff.html:61 -#: kallithea/templates/pullrequests/pullrequest_show.html:305 -#: kallithea/tests/data/templates/changeset/changeset.html.py:315 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:156 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:400 +#: kallithea/templates/changeset/changeset.html:168 +#: kallithea/templates/compare/compare_diff.html:62 +#: kallithea/templates/pullrequests/pullrequest_show.html:331 #, python-format msgid "%s file changed with %s insertions and %s deletions" msgid_plural "%s files changed with %s insertions and %s deletions" msgstr[0] "%s fichier changé avec %s insertions et %s suppressions" msgstr[1] "%s fichiers changés avec %s insertions et %s suppressions" -#: kallithea/templates/changeset/changeset.html:176 +#: kallithea/templates/changeset/changeset.html:182 #: kallithea/templates/changeset/changeset.html:195 -#: kallithea/templates/compare/compare_diff.html:81 -#: kallithea/templates/pullrequests/pullrequest_show.html:322 -#: kallithea/templates/pullrequests/pullrequest_show.html:348 -#: kallithea/tests/data/templates/changeset/changeset.html.py:336 -#: kallithea/tests/data/templates/changeset/changeset.html.py:351 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:424 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:451 +#: kallithea/templates/pullrequests/pullrequest_show.html:350 +#: kallithea/templates/pullrequests/pullrequest_show.html:372 msgid "Show full diff anyway" msgstr "Afficher le diff complet quand même" -#: kallithea/templates/changeset/changeset.html:233 -#: kallithea/templates/changeset/changeset.html:270 -#: kallithea/tests/data/templates/changeset/changeset.html.py:368 -#: kallithea/tests/data/templates/changeset/changeset.html.py:378 +#: kallithea/templates/changeset/changeset.html:231 +#: kallithea/templates/changeset/changeset.html:268 msgid "No revisions" msgstr "Aucune révision" -#: kallithea/templates/changeset/changeset_file_comment.html:19 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:80 +#: kallithea/templates/changeset/changeset_file_comment.html:21 msgid "on pull request" msgstr "sur la requête de pull" -#: kallithea/templates/changeset/changeset_file_comment.html:20 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:84 +#: kallithea/templates/changeset/changeset_file_comment.html:22 msgid "No title" msgstr "Aucun titre" -#: kallithea/templates/changeset/changeset_file_comment.html:22 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:88 +#: kallithea/templates/changeset/changeset_file_comment.html:24 msgid "on this changeset" msgstr "sur ce changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:29 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:96 +#: kallithea/templates/changeset/changeset_file_comment.html:31 msgid "Delete comment?" msgstr "Supprimer le commentaire ?" -#: kallithea/templates/changeset/changeset_file_comment.html:37 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:107 +#: kallithea/templates/changeset/changeset_file_comment.html:39 msgid "Status change" msgstr "Changement de statut" -#: kallithea/templates/changeset/changeset_file_comment.html:57 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:148 +#: kallithea/templates/changeset/changeset_file_comment.html:59 msgid "Commenting on line." msgstr "Création d’un commentaire sur la ligne." -#: kallithea/templates/changeset/changeset_file_comment.html:58 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:150 +#: kallithea/templates/changeset/changeset_file_comment.html:60 msgid "" "Comments are in plain text. Use @username inside this text to notify " "another user." msgstr "" -"Les commentaires sont du texte brut. Utilisez @nomutilisateur dans ce " -"texte pour envoyer une notification à un autre utilisateur." - -#: kallithea/templates/changeset/changeset_file_comment.html:65 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:154 +"Les commentaires sont du texte brut. Utilisez @nomutilisateur dans ce texte " +"pour envoyer une notification à un autre utilisateur." + +#: kallithea/templates/changeset/changeset_file_comment.html:67 msgid "Set changeset status" msgstr "Modifier le statut du changeset" -#: kallithea/templates/changeset/changeset_file_comment.html:67 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:158 +#: kallithea/templates/changeset/changeset_file_comment.html:69 msgid "Vote for pull request status" msgstr "Voter pour le statut de la requête de pull" -#: kallithea/templates/changeset/changeset_file_comment.html:73 -#: kallithea/templates/changeset/diff_block.html:46 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:161 +#: kallithea/templates/changeset/changeset_file_comment.html:75 msgid "No change" msgstr "Aucun changement" -#: kallithea/templates/changeset/changeset_file_comment.html:86 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:178 +#: kallithea/templates/changeset/changeset_file_comment.html:88 msgid "Finish pull request" msgstr "Terminer la requête de pull" -#: kallithea/templates/changeset/changeset_file_comment.html:89 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:180 +#: kallithea/templates/changeset/changeset_file_comment.html:91 msgid "Close" msgstr "Fermer" -#: kallithea/templates/changeset/changeset_file_comment.html:101 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:185 +#: kallithea/templates/changeset/changeset_file_comment.html:103 msgid "Submitting ..." msgstr "Envoi…" -#: kallithea/templates/changeset/changeset_file_comment.html:102 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:187 +#: kallithea/templates/changeset/changeset_file_comment.html:104 msgid "Comment" msgstr "Commentaire" -#: kallithea/templates/changeset/changeset_file_comment.html:110 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:197 +#: kallithea/templates/changeset/changeset_file_comment.html:112 msgid "You need to be logged in to comment." msgstr "Vous devez être connecté pour poster des commentaires." -#: kallithea/templates/changeset/changeset_file_comment.html:110 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:201 +#: kallithea/templates/changeset/changeset_file_comment.html:112 msgid "Login now" msgstr "Se connecter maintenant" -#: kallithea/templates/changeset/changeset_file_comment.html:114 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:203 +#: kallithea/templates/changeset/changeset_file_comment.html:116 msgid "Hide" msgstr "Masquer" -#: kallithea/templates/changeset/changeset_file_comment.html:126 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:41 +#: kallithea/templates/changeset/changeset_file_comment.html:128 #, python-format msgid "%d comment" msgid_plural "%d comments" msgstr[0] "%d commentaire" msgstr[1] "%d commentaires" -#: kallithea/templates/changeset/changeset_file_comment.html:127 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:42 +#: kallithea/templates/changeset/changeset_file_comment.html:129 #, python-format msgid "%d inline" msgid_plural "%d inline" msgstr[0] "%d de ligne" msgstr[1] "%d de ligne" -#: kallithea/templates/changeset/changeset_file_comment.html:128 -#: kallithea/tests/data/templates/changeset/changeset_file_comment.html.py:43 +#: kallithea/templates/changeset/changeset_file_comment.html:130 #, python-format msgid "%d general" msgid_plural "%d general" @@ -5601,296 +5228,189 @@ msgstr[1] "%d généraux" #: kallithea/templates/changeset/changeset_range.html:5 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:272 #, python-format msgid "%s Changesets" msgstr "Changesets de %s" -#: kallithea/templates/changeset/changeset_range.html:43 -#: kallithea/templates/compare/compare_cs.html:37 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:65 -#, python-format -msgid "Changeset status: %s" -msgstr "Statut de changeset : %s" - -#: kallithea/templates/changeset/changeset_range.html:50 -#: kallithea/tests/data/templates/changeset/changeset_range.html.py:162 +#: kallithea/templates/changeset/changeset_range.html:56 msgid "Files affected" msgstr "Fichiers affectés" -#: kallithea/templates/changeset/diff_block.html:30 -msgid "No file before" -msgstr "" - -#: kallithea/templates/changeset/diff_block.html:33 -#, fuzzy -#| msgid "file removed" -msgid "File before" -msgstr "fichier supprimé" - -#: kallithea/templates/changeset/diff_block.html:40 -#, fuzzy -#| msgid "Unmodified" -msgid "Modified" -msgstr "Non modifié" - -#: kallithea/templates/changeset/diff_block.html:42 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:128 +#: kallithea/templates/changeset/diff_block.html:54 msgid "Deleted" msgstr "Supprimé" -#: kallithea/templates/changeset/diff_block.html:44 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:136 +#: kallithea/templates/changeset/diff_block.html:57 msgid "Renamed" msgstr "Renommé" -#: kallithea/templates/changeset/diff_block.html:48 -#, fuzzy, python-format -#| msgid "Unknown revision %s" -msgid "Unknown operation: %r" -msgstr "Révision %s inconnue" - -#: kallithea/templates/changeset/diff_block.html:52 -#, fuzzy -#| msgid "No filename" -msgid "No file after" -msgstr "Aucun nom de fichier" - -#: kallithea/templates/changeset/diff_block.html:55 -#, fuzzy -#| msgid "file added" -msgid "File after" -msgstr "fichier ajouté" - -#: kallithea/templates/changeset/diff_block.html:60 -#: kallithea/templates/files/diff_2way.html:41 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:153 +#: kallithea/templates/changeset/diff_block.html:66 +#: kallithea/templates/files/diff_2way.html:43 msgid "Show full diff for this file" msgstr "Afficher le diff complet pour ce fichier" -#: kallithea/templates/changeset/diff_block.html:62 -#: kallithea/templates/files/diff_2way.html:44 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:157 +#: kallithea/templates/changeset/diff_block.html:69 +#: kallithea/templates/files/diff_2way.html:46 msgid "Show full side-by-side diff for this file" msgstr "Afficher le diff complet côte-à-côte pour ce fichier" -#: kallithea/templates/changeset/diff_block.html:72 -#: kallithea/tests/data/templates/changeset/diff_block.html.py:171 +#: kallithea/templates/changeset/diff_block.html:83 msgid "Show inline comments" msgstr "Afficher les commentaires de ligne" #: kallithea/templates/compare/compare_cs.html:4 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:48 msgid "No changesets" msgstr "Aucun changeset" -#: kallithea/templates/compare/compare_cs.html:11 -msgid "Criss cross merge situation with multiple merge ancestors detected!" -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:14 -msgid "" -"Please merge the target branch to your branch before creating a pull " -"request." -msgstr "" - -#: kallithea/templates/compare/compare_cs.html:18 -#, fuzzy -#| msgid "Common ancestor" -msgid "Merge Ancestor" -msgstr "Ancêtre commun" - -#: kallithea/templates/compare/compare_cs.html:55 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:82 +#: kallithea/templates/compare/compare_cs.html:8 +msgid "Ancestor" +msgstr "Ancêtre" + +#: kallithea/templates/compare/compare_cs.html:24 +#, python-format +msgid "Changeset status: %s" +msgstr "Statut de changeset : %s" + +#: kallithea/templates/compare/compare_cs.html:44 msgid "First (oldest) changeset in this list" msgstr "Premier changeset dans cette liste (le plus vieux)" -#: kallithea/templates/compare/compare_cs.html:57 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:84 +#: kallithea/templates/compare/compare_cs.html:46 msgid "Last (most recent) changeset in this list" msgstr "Dernier changeset dans cette liste (le plus récent)" -#: kallithea/templates/compare/compare_cs.html:59 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:86 +#: kallithea/templates/compare/compare_cs.html:48 msgid "Position in this list of changesets" msgstr "Position dans cette liste de changesets" -#: kallithea/templates/compare/compare_cs.html:98 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:133 +#: kallithea/templates/compare/compare_cs.html:85 msgid "Show merge diff" msgstr "Afficher le diff de fusion" -#: kallithea/templates/compare/compare_cs.html:112 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:157 +#: kallithea/templates/compare/compare_cs.html:95 +#: kallithea/templates/pullrequests/pullrequest_show.html:321 +msgid "Common ancestor" +msgstr "Ancêtre commun" + +#: kallithea/templates/compare/compare_cs.html:99 +msgid "No common ancestor found - repositories are unrelated" +msgstr "Aucun ancêtre commun trouvé - les dépôts n'ont aucun lien entre eux" + +#: kallithea/templates/compare/compare_cs.html:107 msgid "is" msgstr "est" -#: kallithea/templates/compare/compare_cs.html:113 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:161 +#: kallithea/templates/compare/compare_cs.html:108 #, python-format msgid "%s changesets" msgstr "Changesets de %s" -#: kallithea/templates/compare/compare_cs.html:114 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:163 +#: kallithea/templates/compare/compare_cs.html:109 msgid "behind" msgstr "derrière" #: kallithea/templates/compare/compare_diff.html:6 #: kallithea/templates/compare/compare_diff.html:8 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:250 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:254 #, python-format msgid "%s Compare" msgstr "Comparaison de %s" #: kallithea/templates/compare/compare_diff.html:13 #: kallithea/templates/compare/compare_diff.html:41 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:136 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:226 msgid "Compare Revisions" msgstr "Comparer les révisions" #: kallithea/templates/compare/compare_diff.html:39 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:133 msgid "Swap" msgstr "Échanger" #: kallithea/templates/compare/compare_diff.html:48 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:140 msgid "Compare revisions, branches, bookmarks, or tags." msgstr "Comparer les révisions, les branches, les marque-pages ou les tags." #: kallithea/templates/compare/compare_diff.html:53 -#: kallithea/templates/pullrequests/pullrequest_show.html:291 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:145 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:385 +#: kallithea/templates/pullrequests/pullrequest_show.html:316 #, python-format msgid "Showing %s commit" msgid_plural "Showing %s commits" msgstr[0] "Affichage de %s commit" msgstr[1] "Affichage de %s commits" -#: kallithea/templates/compare/compare_diff.html:95 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:184 -#: kallithea/tests/data/templates/compare/compare_diff.html.py:199 +#: kallithea/templates/compare/compare_diff.html:84 +#: kallithea/templates/compare/compare_diff.html:93 msgid "Show full diff" msgstr "Afficher le diff complet" -#: kallithea/templates/data_table/_dt_elements.html:20 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:447 +#: kallithea/templates/data_table/_dt_elements.html:74 msgid "Public repository" msgstr "Dépôt public" -#: kallithea/templates/data_table/_dt_elements.html:31 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:460 +#: kallithea/templates/data_table/_dt_elements.html:84 msgid "Repository creation in progress..." msgstr "Création du dépôt en cours..." -#: kallithea/templates/data_table/_dt_elements.html:45 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:183 +#: kallithea/templates/data_table/_dt_elements.html:98 msgid "No changesets yet" msgstr "Dépôt vide" -#: kallithea/templates/data_table/_dt_elements.html:52 -#: kallithea/templates/data_table/_dt_elements.html:54 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:507 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:513 +#: kallithea/templates/data_table/_dt_elements.html:105 +#: kallithea/templates/data_table/_dt_elements.html:107 #, python-format msgid "Subscribe to %s rss feed" msgstr "S’abonner au flux RSS de %s" -#: kallithea/templates/data_table/_dt_elements.html:60 -#: kallithea/templates/data_table/_dt_elements.html:62 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:360 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:366 +#: kallithea/templates/data_table/_dt_elements.html:113 +#: kallithea/templates/data_table/_dt_elements.html:115 #, python-format msgid "Subscribe to %s atom feed" msgstr "S’abonner au flux ATOM de %s" -#: kallithea/templates/data_table/_dt_elements.html:86 -#: kallithea/tests/data/templates/data_table/_dt_elements.html.py:144 +#: kallithea/templates/data_table/_dt_elements.html:139 msgid "Creating" msgstr "En cours de création" -#: kallithea/templates/email_templates/changeset_comment.html:4 -#, fuzzy, python-format -#| msgid "%(user)s commented on changeset %(age)s" -msgid "Mention in Comment on Changeset \"%s\"" -msgstr "%(user)s a commenté sur le changeset %(age)s" - -#: kallithea/templates/email_templates/changeset_comment.html:4 -#, fuzzy, python-format -#| msgid "Comment from %s on %s changeset %s" -msgid "Comment on Changeset \"%s\"" +#: kallithea/templates/email_templates/changeset_comment.html:5 +#, python-format +msgid "Comment from %s on %s changeset %s mentioned you" +msgstr "Le commentaire de %s sur le changeset de %s (%s) mentionne votre nom" + +#: kallithea/templates/email_templates/changeset_comment.html:7 +#, python-format +msgid "Comment from %s on %s changeset %s" msgstr "Commentaire de %s sur le changeset de %s (%s)" -#: kallithea/templates/email_templates/changeset_comment.html:20 -#, fuzzy -#| msgid "Changeset flow" -msgid "Changeset on" -msgstr "Flux des changesets" - -#: kallithea/templates/email_templates/changeset_comment.html:23 -#: kallithea/templates/email_templates/pull_request_comment.html:23 -#: kallithea/templates/email_templates/pull_request_comment.html:28 -#, fuzzy -#| msgid "Branch" -msgid "branch" -msgstr "Branche" - -#: kallithea/templates/email_templates/changeset_comment.html:29 -#: kallithea/templates/email_templates/pull_request.html:27 -#: kallithea/templates/email_templates/pull_request_comment.html:35 -msgid "by" -msgstr "" - -#: kallithea/templates/email_templates/comment.html:27 -#, fuzzy -#| msgid "Status change" -msgid "Status change:" -msgstr "Changement de statut" - -#: kallithea/templates/email_templates/comment.html:33 -#, fuzzy -#| msgid "This pull request has been closed and can not be updated." -msgid "The pull request has been closed." -msgstr "Cette pull request a été fermée et ne peut pas être mise à jour." - -#: kallithea/templates/email_templates/password_reset.html:9 -#: kallithea/tests/data/templates/email_templates/password_reset.html.py:49 -#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:49 +#: kallithea/templates/email_templates/changeset_comment.html:12 +msgid "The changeset status was changed to" +msgstr "Le statut du changeset a été changé en" + +#: kallithea/templates/email_templates/main.html:6 +msgid "This is an automatic notification. Don't reply to this mail." +msgstr "Ceci est une notification automatique. Ne pas répondre à cet e-mail." + +#: kallithea/templates/email_templates/password_reset.html:4 #, python-format msgid "Hello %s" msgstr "Bonjour %s" -#: kallithea/templates/email_templates/password_reset.html:16 -#: kallithea/tests/data/templates/email_templates/password_reset.html.py:51 -#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:51 +#: kallithea/templates/email_templates/password_reset.html:6 msgid "We have received a request to reset the password for your account." msgstr "" "Nous avons reçu une demande de réinitialisation du mot de passe de votre " "compte." -#: kallithea/templates/email_templates/password_reset.html:25 -#: kallithea/tests/data/templates/email_templates/password_reset.html.py:55 -#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:54 +#: kallithea/templates/email_templates/password_reset.html:8 msgid "" "This account is however managed outside this system and the password " "cannot be changed here." msgstr "" -"Cependant, ce compte est géré hors de ce système et le mot de passe ne " -"peut pas être changé ici." - -#: kallithea/templates/email_templates/password_reset.html:28 -#: kallithea/tests/data/templates/email_templates/password_reset.html.py:59 -#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:57 +"Cependant, ce compte est géré hors de ce système et le mot de passe ne peut " +"pas être changé ici." + +#: kallithea/templates/email_templates/password_reset.html:10 msgid "To set a new password, click the following link" msgstr "Pour choisir un nouveau mot de passe, cliquez sur le lien suivant" -#: kallithea/templates/email_templates/password_reset.html:33 -#: kallithea/tests/data/templates/email_templates/password_reset.html.py:65 -#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:61 +#: kallithea/templates/email_templates/password_reset.html:13 msgid "" "Should you not be able to use the link above, please type the following " "code into the password reset form" @@ -5898,9 +5418,7 @@ "Si vous ne pouvez pas utiliser le lien ci-dessus, merci de saisir le code" " suivant dans le formulaire de réinitialisation de mot de passe" -#: kallithea/templates/email_templates/password_reset.html:44 -#: kallithea/tests/data/templates/email_templates/password_reset.html.py:70 -#: kallithea/tests/data/templates/email_templates/password_reset.txt.py:66 +#: kallithea/templates/email_templates/password_reset.html:16 msgid "" "If it weren't you who requested the password reset, just disregard this " "message." @@ -5908,60 +5426,32 @@ "Si vous n'avez pas demandé la réinitialisation de votre mot de passe, ne " "tenez pas compte de ce message." -#: kallithea/templates/email_templates/pull_request.html:4 -#, fuzzy, python-format -#| msgid "%s mentioned you on %s pull request \"%s\"" -msgid "Mention on Pull Request %s \"%s\" by %s" +#: kallithea/templates/email_templates/pull_request.html:5 +#, python-format +msgid "%s mentioned you on %s pull request \"%s\"" msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" -#: kallithea/templates/email_templates/pull_request.html:4 -#, fuzzy, python-format -#| msgid "%s requested your review of %s pull request \"%s\"" -msgid "Added as Reviewer of Pull Request %s \"%s\" by %s" +#: kallithea/templates/email_templates/pull_request.html:7 +#, python-format +msgid "%s requested your review of %s pull request \"%s\"" msgstr "%s vous demande de vérifier la requête de pull %s « %s »" -#: kallithea/templates/email_templates/pull_request.html:12 -#: kallithea/templates/email_templates/pull_request_comment.html:20 -#, fuzzy -#| msgid "on pull request" -msgid "Pull request from" -msgstr "sur la requête de pull" - -#: kallithea/templates/email_templates/pull_request.html:15 -#: kallithea/templates/email_templates/pull_request.html:20 -#, fuzzy -#| msgid "Date" -msgid "at" -msgstr "Date" - -#: kallithea/templates/email_templates/pull_request.html:17 -#: kallithea/templates/email_templates/pull_request_comment.html:25 -msgid "to" -msgstr "" - #: kallithea/templates/email_templates/pull_request_comment.html:4 -#, fuzzy, python-format -#| msgid "%s mentioned you on %s pull request \"%s\"" -msgid "Mention in Comment on Pull Request %s \"%s\"" -msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" - -#: kallithea/templates/email_templates/pull_request_comment.html:4 -#, fuzzy, python-format -#| msgid "Pull request %s from %s#%s" -msgid "Pull Request %s \"%s\" Closed" -msgstr "Requête de pull %s depuis %s#%s" - -#: kallithea/templates/email_templates/pull_request_comment.html:4 -#, fuzzy, python-format -#| msgid "[commented] on pull request for" -msgid "Comment on Pull Request %s \"%s\"" -msgstr "[a commenté] la requête de pull pour" - -#: kallithea/templates/email_templates/registration.html:22 -#, fuzzy -#| msgid "Group name" -msgid "Full Name" -msgstr "Nom de groupe" +#, python-format +msgid "Comment from %s on %s pull request \"%s\"" +msgstr "Commentaire de %s sur la requête de pull %s « %s »" + +#: kallithea/templates/email_templates/pull_request_comment.html:9 +msgid "The comment closed the pull request with status" +msgstr "Le commentaire a fermé la requête de pull avec le statut" + +#: kallithea/templates/email_templates/pull_request_comment.html:11 +msgid "The comment was made with status" +msgstr "Le commentaire a été fait avec le statut" + +#: kallithea/templates/email_templates/registration.html:6 +msgid "View this user here" +msgstr "Visualiser cet utilisateur ici" #: kallithea/templates/files/diff_2way.html:15 #, python-format @@ -5979,104 +5469,82 @@ msgstr "Diff de fichier pour %s" #: kallithea/templates/files/files.html:4 -#: kallithea/templates/files/files.html:77 -#: kallithea/tests/data/templates/files/files.html.py:138 -#: kallithea/tests/data/templates/files/files.html.py:218 +#: kallithea/templates/files/files.html:80 #, python-format msgid "%s Files" msgstr "Fichiers de %s" #: kallithea/templates/files/files_add.html:4 -#: kallithea/tests/data/templates/files/files_add.html.py:135 #, python-format msgid "%s Files Add" msgstr "Ajout de fichiers pour %s" -#: kallithea/templates/files/files_add.html:39 -#: kallithea/templates/files/files_edit.html:39 +#: kallithea/templates/files/files_add.html:40 +#: kallithea/templates/files/files_edit.html:38 #: kallithea/templates/files/files_ypjax.html:3 -#: kallithea/tests/data/templates/files/files_add.html.py:225 -#: kallithea/tests/data/templates/files/files_ypjax.html.py:35 msgid "Location" msgstr "Emplacement" -#: kallithea/templates/files/files_add.html:41 -#: kallithea/tests/data/templates/files/files_add.html.py:229 +#: kallithea/templates/files/files_add.html:42 msgid "Enter filename..." msgstr "Saisir le nom du fichier..." -#: kallithea/templates/files/files_add.html:43 -#: kallithea/templates/files/files_add.html:47 -#: kallithea/tests/data/templates/files/files_add.html.py:233 -#: kallithea/tests/data/templates/files/files_add.html.py:237 +#: kallithea/templates/files/files_add.html:44 +#: kallithea/templates/files/files_add.html:48 msgid "or" msgstr "ou" -#: kallithea/templates/files/files_add.html:43 -#: kallithea/tests/data/templates/files/files_add.html.py:235 +#: kallithea/templates/files/files_add.html:44 msgid "Upload File" msgstr "Uploader un fichier" -#: kallithea/templates/files/files_add.html:47 -#: kallithea/tests/data/templates/files/files_add.html.py:239 +#: kallithea/templates/files/files_add.html:48 msgid "Create New File" msgstr "Créer un nouveau fichier" #: kallithea/templates/files/files_add.html:53 -#: kallithea/tests/data/templates/files/files_add.html.py:241 msgid "New file type" msgstr "Nouveau type de fichier" -#: kallithea/templates/files/files_add.html:68 -#: kallithea/templates/files/files_delete.html:40 -#: kallithea/templates/files/files_edit.html:71 -#: kallithea/tests/data/templates/files/files_add.html.py:247 +#: kallithea/templates/files/files_add.html:64 +#: kallithea/templates/files/files_delete.html:43 +#: kallithea/templates/files/files_edit.html:67 msgid "Commit Changes" msgstr "Commiter les changements" #: kallithea/templates/files/files_browser.html:33 -#: kallithea/tests/data/templates/files/files_browser.html.py:56 msgid "Previous revision" msgstr "Révision précédente" #: kallithea/templates/files/files_browser.html:35 -#: kallithea/tests/data/templates/files/files_browser.html.py:62 msgid "Next revision" msgstr "Révision suivante" -#: kallithea/templates/files/files_browser.html:42 -#: kallithea/tests/data/templates/files/files_browser.html.py:68 +#: kallithea/templates/files/files_browser.html:41 msgid "Follow current branch" msgstr "Suivre la branche courante" -#: kallithea/templates/files/files_browser.html:46 -#: kallithea/tests/data/templates/files/files_browser.html.py:70 +#: kallithea/templates/files/files_browser.html:44 msgid "Search File List" msgstr "Rechercher dans la liste des fichiers" -#: kallithea/templates/files/files_browser.html:50 -#: kallithea/tests/data/templates/files/files_browser.html.py:72 +#: kallithea/templates/files/files_browser.html:48 msgid "Loading file list..." msgstr "Chargement de la liste des fichiers…" -#: kallithea/templates/files/files_browser.html:63 -#: kallithea/templates/summary/summary.html:144 -#: kallithea/tests/data/templates/files/files_browser.html.py:78 +#: kallithea/templates/files/files_browser.html:61 msgid "Size" msgstr "Taille" +#: kallithea/templates/files/files_browser.html:62 +msgid "Last Revision" +msgstr "Dernière révision" + +#: kallithea/templates/files/files_browser.html:63 +msgid "Last Modified" +msgstr "Dernière modification" + #: kallithea/templates/files/files_browser.html:64 -#: kallithea/tests/data/templates/files/files_browser.html.py:80 -msgid "Last Revision" -msgstr "Dernière révision" - -#: kallithea/templates/files/files_browser.html:65 -#: kallithea/tests/data/templates/files/files_browser.html.py:82 -msgid "Last Modified" -msgstr "Dernière modification" - -#: kallithea/templates/files/files_browser.html:66 -#: kallithea/tests/data/templates/files/files_browser.html.py:84 msgid "Last Committer" msgstr "Dernier commiteur" @@ -6086,7 +5554,7 @@ msgstr "Suppression de fichiers pour %s" #: kallithea/templates/files/files_delete.html:12 -#: kallithea/templates/files/files_delete.html:30 +#: kallithea/templates/files/files_delete.html:31 msgid "Delete file" msgstr "Supprimer le fichier" @@ -6099,133 +5567,113 @@ msgid "Edit file" msgstr "Éditer le fichier" -#: kallithea/templates/files/files_edit.html:51 -#: kallithea/templates/files/files_source.html:28 -#: kallithea/tests/data/templates/files/files_source.html.py:70 +#: kallithea/templates/files/files_edit.html:48 +#: kallithea/templates/files/files_source.html:32 msgid "Show Annotation" msgstr "Afficher l'annotation" +#: kallithea/templates/files/files_edit.html:50 +#: kallithea/templates/files/files_source.html:35 +msgid "Download as Raw" +msgstr "Télécharger au format brut" + #: kallithea/templates/files/files_edit.html:53 -#: kallithea/templates/files/files_source.html:31 -#: kallithea/tests/data/templates/files/files_source.html.py:75 -msgid "Download as Raw" -msgstr "Télécharger au format brut" - -#: kallithea/templates/files/files_edit.html:56 msgid "Source" msgstr "Source" +#: kallithea/templates/files/files_edit.html:58 +msgid "Editing file" +msgstr "Édition du fichier" + #: kallithea/templates/files/files_history_box.html:2 -#: kallithea/tests/data/templates/files/files_history_box.html.py:38 #, python-format msgid "%s author" msgid_plural "%s authors" msgstr[0] "%s auteur" msgstr[1] "%s auteurs" -#: kallithea/templates/files/files_source.html:6 -#: kallithea/tests/data/templates/files/files_source.html.py:44 +#: kallithea/templates/files/files_source.html:7 msgid "Diff to Revision" msgstr "Diff par rapport à une révision" -#: kallithea/templates/files/files_source.html:7 -#: kallithea/tests/data/templates/files/files_source.html.py:46 +#: kallithea/templates/files/files_source.html:8 msgid "Show at Revision" msgstr "Afficher à une révision" -#: kallithea/templates/files/files_source.html:9 -#: kallithea/tests/data/templates/files/files_source.html.py:50 +#: kallithea/templates/files/files_source.html:10 msgid "Show Full History" msgstr "Afficher l'historique complet" -#: kallithea/templates/files/files_source.html:10 -#: kallithea/tests/data/templates/files/files_source.html.py:52 +#: kallithea/templates/files/files_source.html:11 msgid "Show Authors" msgstr "Afficher les auteurs" -#: kallithea/templates/files/files_source.html:26 -#: kallithea/tests/data/templates/files/files_source.html.py:66 +#: kallithea/templates/files/files_source.html:30 msgid "Show Source" msgstr "Afficher la source" -#: kallithea/templates/files/files_source.html:34 -#, fuzzy, python-format -#| msgid "Edit on Branch:%s" -msgid "Edit on Branch: %s" +#: kallithea/templates/files/files_source.html:38 +#, python-format +msgid "Edit on Branch:%s" msgstr "Éditer sur la branche : %s" -#: kallithea/templates/files/files_source.html:37 -#: kallithea/tests/data/templates/files/files_source.html.py:86 +#: kallithea/templates/files/files_source.html:41 msgid "Editing binary files not allowed" msgstr "Édition de fichiers binaires interdite" -#: kallithea/templates/files/files_source.html:40 -#: kallithea/tests/data/templates/files/files_source.html.py:92 +#: kallithea/templates/files/files_source.html:44 msgid "Editing files allowed only when on branch head revision" msgstr "" "Édition de fichiers autorisée uniquement sur la révision de tête (head) " "de la branche" -#: kallithea/templates/files/files_source.html:41 -#: kallithea/tests/data/templates/files/files_source.html.py:94 +#: kallithea/templates/files/files_source.html:45 msgid "Deleting files allowed only when on branch head revision" msgstr "" "Suppression de fichiers autorisée uniquement sur la révision de tête " "(head) de la branche" -#: kallithea/templates/files/files_source.html:58 -#: kallithea/tests/data/templates/files/files_source.html.py:111 +#: kallithea/templates/files/files_source.html:63 #, python-format msgid "Binary file (%s)" msgstr "Fichier binaire (%s)" -#: kallithea/templates/files/files_source.html:69 -#: kallithea/tests/data/templates/files/files_source.html.py:125 +#: kallithea/templates/files/files_source.html:74 msgid "File is too big to display." msgstr "Ce fichier est trop gros pour être affiché." -#: kallithea/templates/files/files_source.html:71 -#: kallithea/tests/data/templates/files/files_source.html.py:129 +#: kallithea/templates/files/files_source.html:76 msgid "Show full annotation anyway." msgstr "Afficher les annotations complètes quand même." -#: kallithea/templates/files/files_source.html:73 -#: kallithea/tests/data/templates/files/files_source.html.py:133 +#: kallithea/templates/files/files_source.html:78 msgid "Show as raw." msgstr "Afficher en tant que texte brut." #: kallithea/templates/files/files_ypjax.html:5 -#: kallithea/tests/data/templates/files/files_ypjax.html.py:41 msgid "annotation" msgstr "annotation" #: kallithea/templates/files/files_ypjax.html:23 -#: kallithea/tests/data/templates/files/files_ypjax.html.py:61 msgid "Go Back" msgstr "Retour" #: kallithea/templates/files/files_ypjax.html:24 -#: kallithea/tests/data/templates/files/files_ypjax.html.py:63 msgid "No files at given path" msgstr "Aucun fichier à cet endroit" #: kallithea/templates/followers/followers.html:5 -#: kallithea/tests/data/templates/followers/followers.html.py:135 #, python-format msgid "%s Followers" msgstr "Followers de %s" #: kallithea/templates/followers/followers.html:9 -#: kallithea/templates/summary/summary.html:129 -#: kallithea/templates/summary/summary.html:130 -#: kallithea/tests/data/templates/followers/followers.html.py:113 -#: kallithea/tests/data/templates/summary/summary.html.py:207 -#: kallithea/tests/data/templates/summary/summary.html.py:211 +#: kallithea/templates/summary/summary.html:142 +#: kallithea/templates/summary/summary.html:143 msgid "Followers" msgstr "Followers" -#: kallithea/templates/followers/followers_data.html:9 -#: kallithea/tests/data/templates/followers/followers_data.html.py:44 +#: kallithea/templates/followers/followers_data.html:12 msgid "Started following -" msgstr "A commencé à suivre le dépôt :" @@ -6234,82 +5682,72 @@ msgid "Fork repository %s" msgstr "Forker le dépôt %s" -#: kallithea/templates/forks/fork.html:25 +#: kallithea/templates/forks/fork.html:27 msgid "Fork name" msgstr "Nom du fork" -#: kallithea/templates/forks/fork.html:53 +#: kallithea/templates/forks/fork.html:62 msgid "Default revision for files page, downloads, whoosh, and readme." msgstr "" "Révision par défaut pour les pages de fichiers, de téléchargements, de " "recherche et de documentation." -#: kallithea/templates/forks/fork.html:58 +#: kallithea/templates/forks/fork.html:68 msgid "Private" msgstr "Privé" -#: kallithea/templates/forks/fork.html:66 +#: kallithea/templates/forks/fork.html:77 msgid "Copy permissions" msgstr "Copier les permissions" -#: kallithea/templates/forks/fork.html:69 +#: kallithea/templates/forks/fork.html:81 msgid "Copy permissions from forked repository" msgstr "Copier les permissions depuis le dépôt forké" -#: kallithea/templates/forks/fork.html:75 +#: kallithea/templates/forks/fork.html:87 msgid "Update after clone" msgstr "MÀJ après le clonage" -#: kallithea/templates/forks/fork.html:78 +#: kallithea/templates/forks/fork.html:91 msgid "Checkout source after making a clone" msgstr "Mettre à jour depuis la source après clonage" -#: kallithea/templates/forks/fork.html:85 +#: kallithea/templates/forks/fork.html:96 msgid "Fork this Repository" msgstr "Forker ce dépôt" #: kallithea/templates/forks/forks.html:5 -#: kallithea/tests/data/templates/forks/forks.html.py:135 #, python-format msgid "%s Forks" msgstr "Forks de %s" #: kallithea/templates/forks/forks.html:9 -#: kallithea/templates/summary/summary.html:135 -#: kallithea/templates/summary/summary.html:136 -#: kallithea/tests/data/templates/forks/forks.html.py:113 -#: kallithea/tests/data/templates/summary/summary.html.py:215 -#: kallithea/tests/data/templates/summary/summary.html.py:219 +#: kallithea/templates/summary/summary.html:148 +#: kallithea/templates/summary/summary.html:149 msgid "Forks" msgstr "Forks" -#: kallithea/templates/forks/forks_data.html:14 -#: kallithea/tests/data/templates/forks/forks_data.html.py:49 +#: kallithea/templates/forks/forks_data.html:17 msgid "Forked" msgstr "Forké" -#: kallithea/templates/forks/forks_data.html:24 -#: kallithea/tests/data/templates/forks/forks_data.html.py:66 +#: kallithea/templates/forks/forks_data.html:30 msgid "There are no forks yet" msgstr "Il n’y a pas encore de forks" -#: kallithea/templates/journal/journal.html:22 -#: kallithea/tests/data/templates/journal/journal.html.py:156 +#: kallithea/templates/journal/journal.html:21 msgid "ATOM journal feed" msgstr "Flux ATOM du journal" -#: kallithea/templates/journal/journal.html:23 -#: kallithea/tests/data/templates/journal/journal.html.py:160 +#: kallithea/templates/journal/journal.html:22 msgid "RSS journal feed" msgstr "Flux RSS du journal" -#: kallithea/templates/journal/journal.html:34 -#: kallithea/tests/data/templates/journal/journal.html.py:200 +#: kallithea/templates/journal/journal.html:56 msgid "My Repositories" msgstr "Mes dépôts" -#: kallithea/templates/journal/journal_data.html:42 -#: kallithea/tests/data/templates/journal/journal_data.html.py:82 +#: kallithea/templates/journal/journal_data.html:43 msgid "No entries yet" msgstr "Aucune entrée pour le moment" @@ -6323,45 +5761,34 @@ #: kallithea/templates/pullrequests/pullrequest.html:4 #: kallithea/templates/pullrequests/pullrequest.html:8 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:188 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:212 msgid "New Pull Request" msgstr "Nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:26 +#: kallithea/templates/pullrequests/pullrequest.html:31 #: kallithea/templates/pullrequests/pullrequest_data.html:15 #: kallithea/templates/pullrequests/pullrequest_show.html:29 -#: kallithea/templates/pullrequests/pullrequest_show.html:51 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:115 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:144 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:164 +#: kallithea/templates/pullrequests/pullrequest_show.html:54 msgid "Title" msgstr "Titre" -#: kallithea/templates/pullrequests/pullrequest.html:28 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:117 +#: kallithea/templates/pullrequests/pullrequest.html:34 msgid "Summarize the changes - or leave empty" msgstr "Résumer les modifications - ou laisser vide" -#: kallithea/templates/pullrequests/pullrequest.html:35 -#: kallithea/templates/pullrequests/pullrequest_show.html:60 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:121 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:170 +#: kallithea/templates/pullrequests/pullrequest.html:43 +#: kallithea/templates/pullrequests/pullrequest_show.html:66 msgid "Write a short description on this pull request" msgstr "Saisir une courte description de cette requête de pull" -#: kallithea/templates/pullrequests/pullrequest.html:40 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:123 +#: kallithea/templates/pullrequests/pullrequest.html:49 msgid "Changeset flow" msgstr "Flux des changesets" -#: kallithea/templates/pullrequests/pullrequest.html:46 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:126 +#: kallithea/templates/pullrequests/pullrequest.html:56 msgid "Origin repository" msgstr "Dépôt d'origine" -#: kallithea/templates/pullrequests/pullrequest.html:62 -#: kallithea/tests/data/templates/pullrequests/pullrequest.html.py:138 +#: kallithea/templates/pullrequests/pullrequest.html:72 msgid "Destination repository" msgstr "Dépôt de destination" @@ -6396,9 +5823,7 @@ #: kallithea/templates/pullrequests/pullrequest_data.html:37 #: kallithea/templates/pullrequests/pullrequest_show.html:31 -#: kallithea/templates/pullrequests/pullrequest_show.html:72 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:150 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:185 +#: kallithea/templates/pullrequests/pullrequest_show.html:83 msgid "Closed" msgstr "Fermée" @@ -6418,74 +5843,60 @@ "commentaires" #: kallithea/templates/pullrequests/pullrequest_show.html:6 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:505 #, python-format msgid "%s Pull Request %s" msgstr "%s Requête de pull %s" #: kallithea/templates/pullrequests/pullrequest_show.html:10 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:483 #, python-format msgid "Pull request %s from %s#%s" msgstr "Requête de pull %s depuis %s#%s" -#: kallithea/templates/pullrequests/pullrequest_show.html:53 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:166 +#: kallithea/templates/pullrequests/pullrequest_show.html:57 msgid "Summarize the changes" msgstr "Résumer les changements" -#: kallithea/templates/pullrequests/pullrequest_show.html:66 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:173 +#: kallithea/templates/pullrequests/pullrequest_show.html:74 msgid "Reviewer voting result" msgstr "Résultat du vote des relecteurs" -#: kallithea/templates/pullrequests/pullrequest_show.html:69 -#: kallithea/templates/pullrequests/pullrequest_show.html:70 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:179 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:181 +#: kallithea/templates/pullrequests/pullrequest_show.html:80 +#: kallithea/templates/pullrequests/pullrequest_show.html:81 msgid "Pull request status calculated from votes" msgstr "Statut de la requête de pull calculé à partir des votes" -#: kallithea/templates/pullrequests/pullrequest_show.html:80 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:191 +#: kallithea/templates/pullrequests/pullrequest_show.html:93 msgid "Still not reviewed by" msgstr "Pas encore relue par" -#: kallithea/templates/pullrequests/pullrequest_show.html:83 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:197 +#: kallithea/templates/pullrequests/pullrequest_show.html:97 #, python-format msgid "%d reviewer" msgid_plural "%d reviewers" msgstr[0] "%d relecteur" msgstr[1] "%d relecteurs" -#: kallithea/templates/pullrequests/pullrequest_show.html:85 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:201 +#: kallithea/templates/pullrequests/pullrequest_show.html:99 msgid "Pull request was reviewed by all reviewers" msgstr "La requête de pull a été relue par tous les relecteurs" -#: kallithea/templates/pullrequests/pullrequest_show.html:87 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:205 +#: kallithea/templates/pullrequests/pullrequest_show.html:101 msgid "There are no reviewers" msgstr "Il n'y a aucun relecteur" -#: kallithea/templates/pullrequests/pullrequest_show.html:92 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:208 +#: kallithea/templates/pullrequests/pullrequest_show.html:107 msgid "Origin" msgstr "Origine" -#: kallithea/templates/pullrequests/pullrequest_show.html:97 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:214 +#: kallithea/templates/pullrequests/pullrequest_show.html:113 msgid "on" msgstr "sur" -#: kallithea/templates/pullrequests/pullrequest_show.html:103 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:219 +#: kallithea/templates/pullrequests/pullrequest_show.html:120 msgid "Target" msgstr "Cible" -#: kallithea/templates/pullrequests/pullrequest_show.html:106 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:223 +#: kallithea/templates/pullrequests/pullrequest_show.html:124 msgid "" "This is just a range of changesets and doesn't have a target or a real " "merge ancestor." @@ -6493,87 +5904,64 @@ "Ceci est juste une série de changesets, et n'a pas de cible ou de " "véritable ancêtre de fusion." -#: kallithea/templates/pullrequests/pullrequest_show.html:114 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:230 +#: kallithea/templates/pullrequests/pullrequest_show.html:133 msgid "Pull changes" msgstr "Puller les modifications" -#: kallithea/templates/pullrequests/pullrequest_show.html:148 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:261 -#, fuzzy -#| msgid "Registration" -msgid "Next iteration" -msgstr "Enregistrement" - -#: kallithea/templates/pullrequests/pullrequest_show.html:165 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:278 +#: kallithea/templates/pullrequests/pullrequest_show.html:173 +msgid "Update" +msgstr "Mettre à jour" + +#: kallithea/templates/pullrequests/pullrequest_show.html:191 msgid "Current revision - no change" msgstr "Révision courante - aucun changement" -#: kallithea/templates/pullrequests/pullrequest_show.html:189 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:304 -#, fuzzy -#| msgid "" "Pull requests do not change once created. Select a revision and -#| save to " "replace this pull request with a new one." +#: kallithea/templates/pullrequests/pullrequest_show.html:215 msgid "" -"Pull request iterations do not change content once created. Select a " -"revision and save to make a new iteration." +"Pull requests do not change once created. Select a revision and save to " +"replace this pull request with a new one." msgstr "" "Les requêtes de pull ne peuvent pas changer après leur création. " -"Sélectionner une révision puis sauvegarder afin de remplacer cette " -"requête de pull par une nouvelle." - -#: kallithea/templates/pullrequests/pullrequest_show.html:197 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:371 +"Sélectionner une révision puis sauvegarder afin de remplacer cette requête " +"de pull par une nouvelle." + +#: kallithea/templates/pullrequests/pullrequest_show.html:224 +msgid "Pull Request Reviewers" +msgstr "Relecteurs de la requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_show.html:249 +msgid "Remove reviewer" +msgstr "Supprimer le relecteur" + +#: kallithea/templates/pullrequests/pullrequest_show.html:261 +msgid "Type name of reviewer to add" +msgstr "Saisir le nom du relecteur à ajouter" + +#: kallithea/templates/pullrequests/pullrequest_show.html:269 +msgid "Potential Reviewers" +msgstr "Relecteurs potentiels" + +#: kallithea/templates/pullrequests/pullrequest_show.html:272 +msgid "Click to add the repository owner as reviewer:" +msgstr "Cliquer pour ajouter le propriétaire du dépôt comme relecteur :" + +#: kallithea/templates/pullrequests/pullrequest_show.html:295 msgid "Save Changes" msgstr "Enregistrer les changements" -#: kallithea/templates/pullrequests/pullrequest_show.html:198 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:373 -msgid "Create New Iteration with Changes" +#: kallithea/templates/pullrequests/pullrequest_show.html:296 +msgid "Save Updates as New Pull Request" msgstr "" - -#: kallithea/templates/pullrequests/pullrequest_show.html:199 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:375 +"Sauvegarder les modifications entrantes en tant que nouvelle requête de pull" + +#: kallithea/templates/pullrequests/pullrequest_show.html:297 msgid "Cancel Changes" msgstr "Annuler les modifications" -#: kallithea/templates/pullrequests/pullrequest_show.html:207 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:310 -msgid "Pull Request Reviewers" -msgstr "Relecteurs de la requête de pull" - -#: kallithea/templates/pullrequests/pullrequest_show.html:233 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:336 -msgid "Remove reviewer" -msgstr "Supprimer le relecteur" - -#: kallithea/templates/pullrequests/pullrequest_show.html:245 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:342 -msgid "Type name of reviewer to add" -msgstr "Saisir le nom du relecteur à ajouter" - -#: kallithea/templates/pullrequests/pullrequest_show.html:253 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:347 -msgid "Potential Reviewers" -msgstr "Relecteurs potentiels" - -#: kallithea/templates/pullrequests/pullrequest_show.html:256 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:349 -msgid "Click to add the repository owner as reviewer:" -msgstr "Cliquer pour ajouter le propriétaire du dépôt comme relecteur :" - -#: kallithea/templates/pullrequests/pullrequest_show.html:281 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:380 +#: kallithea/templates/pullrequests/pullrequest_show.html:307 msgid "Pull Request Content" msgstr "Contenu de la requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show.html:296 -#: kallithea/tests/data/templates/compare/compare_cs.html.py:142 -#: kallithea/tests/data/templates/pullrequests/pullrequest_show.html.py:389 -msgid "Common ancestor" -msgstr "Ancêtre commun" - #: kallithea/templates/pullrequests/pullrequest_show_all.html:6 #, python-format msgid "%s Pull Requests" @@ -6589,501 +5977,244 @@ msgid "Pull Requests to '%s'" msgstr "Requête de pull vers '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:31 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:32 msgid "Open New Pull Request" msgstr "Ouvrir une nouvelle requête de pull" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:34 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:37 #, python-format msgid "Show Pull Requests to %s" msgstr "Afficher les requêtes de pull vers %s" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:36 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:39 #, python-format msgid "Show Pull Requests from '%s'" msgstr "Afficher les requêtes de pull depuis '%s'" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:44 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:49 #: kallithea/templates/pullrequests/pullrequest_show_my.html:28 msgid "Hide closed pull requests (only show open pull requests)" msgstr "" "Cacher les requêtes de pull fermées (afficher uniquement les requêtes de " "pull ouvertes)" -#: kallithea/templates/pullrequests/pullrequest_show_all.html:46 +#: kallithea/templates/pullrequests/pullrequest_show_all.html:51 #: kallithea/templates/pullrequests/pullrequest_show_my.html:30 msgid "Show closed pull requests (in addition to open pull requests)" msgstr "" "Afficher les requêtes de pull fermées (en plus des requêtes de pull " "ouvertes)" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:34 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:35 msgid "Pull Requests Created by Me" msgstr "Requêtes de pull créées par moi" -#: kallithea/templates/pullrequests/pullrequest_show_my.html:37 -#, fuzzy -#| msgid "Pull Request Reviewers" -msgid "Pull Requests Needing My Review" -msgstr "Relecteurs de la requête de pull" - -#: kallithea/templates/pullrequests/pullrequest_show_my.html:40 +#: kallithea/templates/pullrequests/pullrequest_show_my.html:38 msgid "Pull Requests I Participate In" msgstr "Requêtes de pull auxquelles je participe" #: kallithea/templates/search/search.html:6 -#: kallithea/tests/data/templates/search/search.html.py:217 #, python-format msgid "%s Search" msgstr "Recherche pour %s" #: kallithea/templates/search/search.html:8 #: kallithea/templates/search/search.html:16 -#: kallithea/tests/data/templates/search/search.html.py:189 -#: kallithea/tests/data/templates/search/search.html.py:221 msgid "Search in All Repositories" msgstr "Rechercher dans tous les dépôts" -#: kallithea/templates/search/search.html:47 -#: kallithea/tests/data/templates/search/search.html.py:130 +#: kallithea/templates/search/search.html:50 msgid "Search term" msgstr "Termes de la recherches" -#: kallithea/templates/search/search.html:54 -#: kallithea/tests/data/templates/search/search.html.py:138 +#: kallithea/templates/search/search.html:62 msgid "Search in" msgstr "Rechercher dans" -#: kallithea/templates/search/search.html:56 -#: kallithea/tests/data/templates/search/search.html.py:140 +#: kallithea/templates/search/search.html:65 msgid "File contents" msgstr "Le contenu des fichiers" -#: kallithea/templates/search/search.html:57 -#: kallithea/tests/data/templates/search/search.html.py:141 +#: kallithea/templates/search/search.html:66 msgid "Commit messages" msgstr "Les messages de commit" -#: kallithea/templates/search/search.html:58 -#: kallithea/tests/data/templates/search/search.html.py:142 +#: kallithea/templates/search/search.html:67 msgid "File names" msgstr "Les noms de fichiers" -#: kallithea/templates/search/search_commit.html:29 -#: kallithea/templates/search/search_content.html:17 -#: kallithea/templates/search/search_path.html:14 -#: kallithea/tests/data/templates/search/search_commit.html.py:68 -#: kallithea/tests/data/templates/search/search_content.html.py:53 -#: kallithea/tests/data/templates/search/search_path.html.py:47 +#: kallithea/templates/search/search_commit.html:35 +#: kallithea/templates/search/search_content.html:21 +#: kallithea/templates/search/search_path.html:15 msgid "Permission denied" msgstr "Permission refusée" #: kallithea/templates/summary/statistics.html:4 -#: kallithea/tests/data/templates/summary/statistics.html.py:239 #, python-format msgid "%s Statistics" msgstr "Statistiques pour %s" #: kallithea/templates/summary/statistics.html:16 -#: kallithea/templates/summary/summary.html:35 -#: kallithea/tests/data/templates/summary/statistics.html.py:197 -#: kallithea/tests/data/templates/summary/summary.html.py:323 +#: kallithea/templates/summary/summary.html:39 #, python-format msgid "%s ATOM feed" msgstr "Flux ATOM pour %s" #: kallithea/templates/summary/statistics.html:17 -#: kallithea/templates/summary/summary.html:36 -#: kallithea/tests/data/templates/summary/statistics.html.py:201 -#: kallithea/tests/data/templates/summary/summary.html.py:327 +#: kallithea/templates/summary/summary.html:40 #, python-format msgid "%s RSS feed" msgstr "Flux RSS pour %s" -#: kallithea/templates/summary/statistics.html:32 -#: kallithea/templates/summary/summary.html:90 -#: kallithea/templates/summary/summary.html:104 -#: kallithea/tests/data/templates/summary/statistics.html.py:131 -#: kallithea/tests/data/templates/summary/summary.html.py:165 -#: kallithea/tests/data/templates/summary/summary.html.py:182 +#: kallithea/templates/summary/statistics.html:36 +#: kallithea/templates/summary/summary.html:100 +#: kallithea/templates/summary/summary.html:116 msgid "Enable" msgstr "Activer" -#: kallithea/templates/summary/statistics.html:35 -#: kallithea/tests/data/templates/summary/statistics.html.py:135 +#: kallithea/templates/summary/statistics.html:39 msgid "Stats gathered: " msgstr "Statistiques obtenues : " -#: kallithea/templates/summary/statistics.html:84 -#: kallithea/templates/summary/summary.html:323 -#: kallithea/tests/data/templates/summary/statistics.html.py:142 -#: kallithea/tests/data/templates/summary/summary.html.py:289 +#: kallithea/templates/summary/statistics.html:89 +#: kallithea/templates/summary/summary.html:349 msgid "files" msgstr "Fichiers" -#: kallithea/templates/summary/statistics.html:108 -#: kallithea/templates/summary/summary.html:349 -#: kallithea/tests/data/templates/summary/statistics.html.py:144 -#: kallithea/tests/data/templates/summary/summary.html.py:291 +#: kallithea/templates/summary/statistics.html:113 +#: kallithea/templates/summary/summary.html:373 msgid "Show more" msgstr "Afficher plus" -#: kallithea/templates/summary/statistics.html:388 -#: kallithea/tests/data/templates/summary/statistics.html.py:147 +#: kallithea/templates/summary/statistics.html:390 msgid "commits" msgstr "commits" -#: kallithea/templates/summary/statistics.html:389 -#: kallithea/tests/data/templates/summary/statistics.html.py:149 +#: kallithea/templates/summary/statistics.html:391 msgid "files added" msgstr "fichiers ajoutés" -#: kallithea/templates/summary/statistics.html:390 -#: kallithea/tests/data/templates/summary/statistics.html.py:151 +#: kallithea/templates/summary/statistics.html:392 msgid "files changed" msgstr "fichiers modifiés" -#: kallithea/templates/summary/statistics.html:391 -#: kallithea/tests/data/templates/summary/statistics.html.py:153 -msgid "files removed" -msgstr "fichiers supprimés" - #: kallithea/templates/summary/statistics.html:393 -#: kallithea/tests/data/templates/summary/statistics.html.py:155 +msgid "files removed" +msgstr "fichiers supprimés" + +#: kallithea/templates/summary/statistics.html:395 msgid "commit" msgstr "commit" -#: kallithea/templates/summary/statistics.html:394 -#: kallithea/tests/data/templates/summary/statistics.html.py:157 +#: kallithea/templates/summary/statistics.html:396 msgid "file added" msgstr "fichier ajouté" -#: kallithea/templates/summary/statistics.html:395 -#: kallithea/tests/data/templates/summary/statistics.html.py:159 +#: kallithea/templates/summary/statistics.html:397 msgid "file changed" msgstr "fichié modifié" -#: kallithea/templates/summary/statistics.html:396 -#: kallithea/tests/data/templates/summary/statistics.html.py:161 +#: kallithea/templates/summary/statistics.html:398 msgid "file removed" msgstr "fichier supprimé" #: kallithea/templates/summary/summary.html:4 -#: kallithea/tests/data/templates/summary/summary.html.py:406 #, python-format msgid "%s Summary" msgstr "Résumé de %s" #: kallithea/templates/summary/summary.html:13 -#: kallithea/tests/data/templates/summary/summary.html.py:362 #, python-format msgid "Repository locked by %s" msgstr "Dépôt verrouillé par %s" #: kallithea/templates/summary/summary.html:15 -#: kallithea/tests/data/templates/summary/summary.html.py:366 msgid "Repository unlocked" msgstr "Dépôt déverrouillé" -#: kallithea/templates/summary/summary.html:21 -#: kallithea/tests/data/templates/summary/summary.html.py:371 +#: kallithea/templates/summary/summary.html:22 msgid "Fork of" msgstr "Fork de" -#: kallithea/templates/summary/summary.html:26 -#: kallithea/tests/data/templates/summary/summary.html.py:380 +#: kallithea/templates/summary/summary.html:29 msgid "Clone from" msgstr "Cloner depuis" -#: kallithea/templates/summary/summary.html:67 -#: kallithea/tests/data/templates/summary/summary.html.py:145 +#: kallithea/templates/summary/summary.html:72 +msgid "Clone URL" +msgstr "URL de clone" + +#: kallithea/templates/summary/summary.html:78 +msgid "Show by Name" +msgstr "Afficher par nom" + +#: kallithea/templates/summary/summary.html:79 msgid "Show by ID" msgstr "Afficher par ID" -#: kallithea/templates/summary/summary.html:72 -#: kallithea/tests/data/templates/summary/summary.html.py:143 -msgid "Show by Name" -msgstr "Afficher par nom" - -#: kallithea/templates/summary/summary.html:83 -#: kallithea/tests/data/templates/summary/summary.html.py:153 +#: kallithea/templates/summary/summary.html:92 msgid "Trending files" msgstr "Populaires" -#: kallithea/templates/summary/summary.html:97 -#: kallithea/tests/data/templates/summary/summary.html.py:168 +#: kallithea/templates/summary/summary.html:108 msgid "Download" msgstr "Téléchargements" -#: kallithea/templates/summary/summary.html:100 -#: kallithea/tests/data/templates/summary/summary.html.py:174 +#: kallithea/templates/summary/summary.html:112 msgid "There are no downloads yet" msgstr "Il n’y a pas encore de téléchargements proposés" -#: kallithea/templates/summary/summary.html:102 -#: kallithea/tests/data/templates/summary/summary.html.py:178 +#: kallithea/templates/summary/summary.html:114 msgid "Downloads are disabled for this repository" msgstr "Les téléchargements sont désactivés pour ce dépôt" -#: kallithea/templates/summary/summary.html:108 -#: kallithea/tests/data/templates/summary/summary.html.py:190 +#: kallithea/templates/summary/summary.html:120 msgid "Download as zip" msgstr "Télécharger en ZIP" -#: kallithea/templates/summary/summary.html:112 -#: kallithea/tests/data/templates/summary/summary.html.py:194 +#: kallithea/templates/summary/summary.html:125 msgid "Check this to download archive with subrepos" msgstr "Télécharger une archive contenant également les sous-dépôts éventuels" -#: kallithea/templates/summary/summary.html:114 -#: kallithea/tests/data/templates/summary/summary.html.py:196 +#: kallithea/templates/summary/summary.html:125 msgid "With subrepos" msgstr "Avec les sous-dépôts" -#: kallithea/templates/summary/summary.html:152 -#: kallithea/templates/summary/summary.html:154 -#: kallithea/tests/data/templates/summary/summary.html.py:234 -#: kallithea/tests/data/templates/summary/summary.html.py:240 +#: kallithea/templates/summary/summary.html:156 +msgid "Repository Size" +msgstr "Taille du dépôt" + +#: kallithea/templates/summary/summary.html:163 +#: kallithea/templates/summary/summary.html:165 msgid "Feed" msgstr "Flux" -#: kallithea/templates/summary/summary.html:174 -#: kallithea/tests/data/templates/summary/summary.html.py:254 +#: kallithea/templates/summary/summary.html:186 msgid "Latest Changes" msgstr "Derniers changements" -#: kallithea/templates/summary/summary.html:176 -#: kallithea/tests/data/templates/summary/summary.html.py:258 +#: kallithea/templates/summary/summary.html:188 msgid "Quick Start" msgstr "Démarrage rapide" -#: kallithea/templates/summary/summary.html:191 -#: kallithea/tests/data/templates/summary/summary.html.py:265 +#: kallithea/templates/summary/summary.html:202 #, python-format msgid "Readme file from revision %s:%s" msgstr "Fichier Lisez-moi de la revision %s:%s" -#: kallithea/templates/summary/summary.html:267 -#: kallithea/tests/data/templates/summary/summary.html.py:276 +#: kallithea/templates/summary/summary.html:293 #, python-format msgid "Download %s as %s" msgstr "Télécharge %s comme %s" -#: kallithea/tests/data/templates/index.html.py:117 -msgid "Dashboard" -msgstr "Tableau de bord" - -#: kallithea/tests/data/templates/index_base.html.py:98 -msgid "Group Name" -msgstr "Nom du groupe" - -#: kallithea/tests/data/templates/login.html.py:77 -msgid "Remember me" -msgstr "Se souvenir de moi" - -#: kallithea/tests/data/templates/admin/gists/new.html.py:209 -msgid "name this file..." -msgstr "nommez ce fichier…" - -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:43 -msgid "Change your avatar at" -msgstr "Vous pouvez changer votre avatar sur" - -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:45 -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:45 -msgid "Using" -msgstr "en utilisant l’adresse" - -#: kallithea/tests/data/templates/admin/my_account/my_account_profile.html.py:53 -msgid "Missing email, please update your user email address." -msgstr "Adresse courriel manquante, veuillez mettre à jour votre adresse courriel." - -#: kallithea/tests/data/templates/admin/repo_groups/repo_group_show.html.py:152 -#, python-format -msgid "%s Repository group dashboard" -msgstr "Tableau de bord du groupe de dépôts %s" - -#: kallithea/tests/data/templates/admin/settings/settings_mapping.html.py:35 -msgid "Rescan option" -msgstr "Option de scan" - -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:39 -msgid "Web" -msgstr "Web" - -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:43 -msgid "Require SSL for vcs operations" -msgstr "Nécessiter SSL pour les opérations de VCS" - -#: kallithea/tests/data/templates/admin/settings/settings_vcs.html.py:45 -msgid "" -"Activate to require SSL both pushing and pulling. If SSL certificate is " -"missing, it will return an HTTP Error 406: Not Acceptable." -msgstr "" -"Activez pour faire en sorte que Kallithea force l'utilisation de SSL pour" -" pousser ou tirer. Si le certificat SSL est manquant, une erreur « HTTP " -"406: Not Acceptable » sera renvoyée." - -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:51 -msgid "Use Gravatars in Kallithea" -msgstr "Utiliser Gravatar sur Kallithea" - -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:67 -#, fuzzy -#| msgid "" "Schema of clone URL construction eg. -#| '{scheme}://{user}@{netloc}/{repo}'." "\n" " -#| The following " "variables are available:\n" " -#| {scheme} 'http' " "or 'https' sent from running Kallithea server,\n" " -#| {user} current " "user username,\n" " -#| {netloc} network " "location/server host of running Kallithea server,\n" " -#| {repo} full " "repository name,\n" " -#| {repoid} ID of " "repository, can be used to contruct clone-by-id" -msgid "" -"Schema of clone URL construction eg. '{scheme}://{user}@{netloc}/{repo}'." -"\n" -" The following " -"variables are available:\n" -" {scheme} 'http' " -"or 'https' sent from running Kallithea server,\n" -" {user} current " -"user username,\n" -" {netloc} network " -"location/server host of running Kallithea server,\n" -" {repo} full " -"repository name,\n" -" {repoid} ID of " -"repository, can be used to construct clone-by-id" -msgstr "" -"Modèle de construction d'URL de clone. Par exemple : " -"'{scheme}://{user}@{netloc}/{repo}'.\n" -" Les variables " -"suivantes sont disponibles :\n" -" {scheme} " -"'http' ou 'https' envoyé à partir du serveur Kallithea en cours " -"d'utilisation,\n" -" {user} nom de" -" l'utilisateur courant,\n" -" {netloc} " -"emplacement réseau/hôte du serveur Kallithea en cours d'utilisation,\n" -" {repo} nom " -"complet du dépôt,\n" -" {repoid} ID du" -" dépôt, peut être utilisé pour cloner par ID." - -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:75 -msgid "Dashboard items" -msgstr "Élements du tableau de bord" - -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:79 -msgid "" -"Number of items displayed in the main page dashboard before pagination is" -" shown." -msgstr "" -"Nombre d'éléments affichés dans la page principale du tableau de bord " -"avant d'afficher la pagination." - -#: kallithea/tests/data/templates/admin/settings/settings_visual.html.py:81 -msgid "Admin pages items" -msgstr "Élements des pages admin" - -#: kallithea/tests/data/templates/admin/user_groups/user_groups.html.py:142 -#: kallithea/tests/data/templates/journal/journal.html.py:118 -msgid "quick filter..." -msgstr "Filtre rapide…" - -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:43 -msgid "Change avatar at" -msgstr "Changer l'avatar sur" - -#: kallithea/tests/data/templates/admin/users/user_edit_profile.html.py:53 -msgid "Missing email, please update this user email address." -msgstr "" -"E-mail manquant, veuillez mettre à jour l'adresse e-mail de cet " -"utilisateur." - -#: kallithea/tests/data/templates/base/base.html.py:96 -msgid "Keyboard shortcuts" -msgstr "Raccourcis clavier" - -#: kallithea/tests/data/templates/base/base.html.py:98 -msgid "Site-wide shortcuts" -msgstr "Raccourcis globaux" - -#: kallithea/tests/data/templates/base/base.html.py:619 -msgid "Forgot password ?" -msgstr "Mot de passe oublié ?" - -#: kallithea/tests/data/templates/compare/compare_cs.html.py:54 -msgid "Ancestor" -msgstr "Ancêtre" - -#: kallithea/tests/data/templates/compare/compare_cs.html.py:150 -msgid "No common ancestor found - repositories are unrelated" -msgstr "Aucun ancêtre commun trouvé - les dépôts n'ont aucun lien entre eux" - -#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:75 -#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:74 -#, python-format -msgid "Comment from %s on %s changeset %s mentioned you" -msgstr "Le commentaire de %s sur le changeset de %s (%s) mentionne votre nom" - -#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:79 -#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:77 -#, python-format -msgid "Comment from %s on %s changeset %s" -msgstr "Commentaire de %s sur le changeset de %s (%s)" - -#: kallithea/tests/data/templates/email_templates/changeset_comment.html.py:86 -#: kallithea/tests/data/templates/email_templates/changeset_comment.txt.py:82 -msgid "The changeset status was changed to" -msgstr "Le statut du changeset a été changé en" - -#: kallithea/tests/data/templates/email_templates/main.html.py:31 -#: kallithea/tests/data/templates/email_templates/main.txt.py:31 -msgid "This is an automatic notification. Don't reply to this mail." -msgstr "Ceci est une notification automatique. Ne pas répondre à cet e-mail." - -#: kallithea/tests/data/templates/email_templates/pull_request.html.py:75 -#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:74 -#, python-format -msgid "%s mentioned you on %s pull request \"%s\"" -msgstr "%s a mentionné votre nom dans la requête de pull %s « %s »" - -#: kallithea/tests/data/templates/email_templates/pull_request.html.py:79 -#: kallithea/tests/data/templates/email_templates/pull_request.txt.py:77 -#, python-format -msgid "%s requested your review of %s pull request \"%s\"" -msgstr "%s vous demande de vérifier la requête de pull %s « %s »" - -#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:65 -#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:65 -#, python-format -msgid "Comment from %s on %s pull request \"%s\"" -msgstr "Commentaire de %s sur la requête de pull %s « %s »" - -#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:72 -#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:71 -msgid "The comment closed the pull request with status" -msgstr "Le commentaire a fermé la requête de pull avec le statut" - -#: kallithea/tests/data/templates/email_templates/pull_request_comment.html.py:78 -#: kallithea/tests/data/templates/email_templates/pull_request_comment.txt.py:76 -msgid "The comment was made with status" -msgstr "Le commentaire a été fait avec le statut" - -#: kallithea/tests/data/templates/email_templates/registration.html.py:47 -#: kallithea/tests/data/templates/email_templates/registration.txt.py:47 -msgid "View this user here" -msgstr "Visualiser cet utilisateur ici" - -#: kallithea/tests/data/templates/files/files_source.html.py:80 -#, python-format -msgid "Edit on Branch:%s" -msgstr "Éditer sur la branche : %s" - -#: kallithea/tests/data/templates/summary/summary.html.py:227 -msgid "Repository Size" -msgstr "Taille du dépôt" +#: kallithea/templates/tags/tags.html:5 +#, python-format +msgid "%s Tags" +msgstr "Tags de %s" + +#: kallithea/templates/tags/tags.html:26 +msgid "Compare Tags" +msgstr "Comparer les tags" #~ msgid "No comments." #~ msgstr "Aucun commentaire." @@ -7115,6 +6246,11 @@ #~ msgid "No Files" #~ msgstr "Aucun fichier" +#~ msgid "" +#~ "_: \n" +#~ "" +#~ msgstr "" + #~ msgid "Username \"%(username)s\" is forbidden" #~ msgstr "Le nom d’utilisateur « %(username)s » n’est pas autorisé" @@ -7127,6 +6263,12 @@ #~ msgid "invalid clone URL" #~ msgstr "URL de clonage invalide" +#~ msgid "Invalid clone URL, provide a valid clone http(s)/svn+http(s)/ssh URL" +#~ msgstr "" + +#~ msgid "Revisions %(revs)s are already part of pull request or have set status" +#~ msgstr "" + #~ msgid "Defaults" #~ msgstr "Par défaut" @@ -7187,9 +6329,21 @@ #~ msgid "Pull Changes from Remote Location" #~ msgstr "Récupérer les changements depuis le site distant" +#~ msgid "This repository does not have a remote URL set." +#~ msgstr "" + +#~ msgid "Non-changeable id" +#~ msgstr "" + #~ msgid "edit" #~ msgstr "éditer" +#~ msgid "new value" +#~ msgstr "" + +#~ msgid "URL used for doing remote pulls." +#~ msgstr "" + #~ msgid "Email prefix" #~ msgstr "Préfixe courriel" @@ -7229,18 +6383,60 @@ #~ msgid "Default permissions" #~ msgstr "Permissions par défaut" +#~ msgid "user groups" +#~ msgstr "" + +#~ msgid "Inherit from defaults" +#~ msgstr "" + +#~ msgid "show" +#~ msgstr "" + +#~ msgid "parent rev." +#~ msgstr "" + +#~ msgid "child rev." +#~ msgstr "" + +#~ msgid "no revisions" +#~ msgstr "" + #~ msgid "Status change from pull request" #~ msgstr "Changement de statut -> %s" +#~ msgid "Status change on changeset" +#~ msgstr "" + +#~ msgid "Comment on changeset" +#~ msgstr "" + +#~ msgid "revision" +#~ msgstr "" + #~ msgid "Mimetype" #~ msgstr "Type MIME" #~ msgid "My Repos" #~ msgstr "Mes dépôts" +#~ msgid "Latest vote: %s" +#~ msgstr "" + +#~ msgid "Nobody voted" +#~ msgstr "" + +#~ msgid "%s Pull Request #%s" +#~ msgstr "" + +#~ msgid "Pull request #%s from %s#%s" +#~ msgstr "" + #~ msgid "owner" #~ msgstr "Propriétaire" +#~ msgid "reviewer" +#~ msgstr "" + #~ msgid "Your new password" #~ msgstr "Votre nouveau mot de passe" @@ -7250,229 +6446,32 @@ #~ msgid "Open New Pull Request for Selected Changesets" #~ msgstr "Nouvelle requête de pull" +#~ msgid "Show Selected Changesets __S → __E" +#~ msgstr "" + +#~ msgid "We received a request to create a new password for your account." +#~ msgstr "" + +#~ msgid "You can generate it by clicking following URL" +#~ msgstr "" + +#~ msgid "Please ignore this email if you did not request a new password ." +#~ msgstr "" + #~ msgid "Created by" #~ msgstr "créé" -#~ msgid "Closed, replaced by %s ." -#~ msgstr "Fermé, remplacé par %s." - -#~ msgid "Closing." -#~ msgstr "Fermeture." - -#~ msgid "Changeset not found" -#~ msgstr "Ensemble de changements non trouvé" - -#~ msgid "Repository no access" -#~ msgstr "Aucun accès au dépôt" - -#~ msgid "Repository read access" -#~ msgstr "Accès en lecture au dépôt" - -#~ msgid "Repository write access" -#~ msgstr "Accès en écriture au dépôt" - -#~ msgid "Repository admin access" -#~ msgstr "Accès administrateur au dépôt" - -#~ msgid "Repository Group no access" -#~ msgstr "Aucun accès au groupe de dépôts" - -#~ msgid "Repository Group read access" -#~ msgstr "Accès en lecture au groupe de dépôts" - -#~ msgid "Repository Group write access" -#~ msgstr "Accès en écriture au groupe de dépôts" - -#~ msgid "Repository Group admin access" -#~ msgstr "Accès administrateur au groupe de dépôts" - -#~ msgid "Repository creation disabled" -#~ msgstr "Création de dépôt désactivée" - -#~ msgid "Repository creation enabled" -#~ msgstr "Création de dépôt activée" - -#~ msgid "Repository forking disabled" -#~ msgstr "Fork de dépôt désactivé" - -#~ msgid "Repository forking enabled" -#~ msgstr "Fork de dépôt activé" - -#~ msgid "Register disabled" -#~ msgstr "Enregistrement désactivé" - -#~ msgid "Register new user with Kallithea with manual activation" -#~ msgstr "Enregistrer un nouvel utilisateur Kallithea manuellement activé" - -#~ msgid "Register new user with Kallithea with auto activation" -#~ msgstr "Enregistrer un nouvel utilisateur Kallithea auto-activé" - -#~ msgid "Not Reviewed" -#~ msgstr "Pas encore relue" - -#~ msgid "Rejected" -#~ msgstr "Rejetée" - -#~ msgid "Under Review" -#~ msgstr "En cours de relecture" - -#~ msgid "Repository group no access" -#~ msgstr "Groupe de dépôts, pas d'accès" - -#~ msgid "Repository group read access" -#~ msgstr "Groupe de dépôts, accès en lecture" - -#~ msgid "Repository group write access" -#~ msgstr "Groupe de dépôts, accès en écriture" - -#~ msgid "Repository group admin access" -#~ msgstr "Groupe de dépôts, accès d'administration" - -#~ msgid "User group no access" -#~ msgstr "Groupe d'utilisateurs, pas d'accès" - -#~ msgid "User group read access" -#~ msgstr "Groupe d'utilisateurs, accès en lecture" - -#~ msgid "User group write access" -#~ msgstr "Groupe d'utilisateurs, accès en écriture" - -#~ msgid "User group admin access" -#~ msgstr "Groupe d'utilisateurs, accès d'administration" - -#~ msgid "Repository Group creation disabled" -#~ msgstr "Création de groupes de dépôts désactivée" - -#~ msgid "Repository Group creation enabled" -#~ msgstr "Création de groupes de dépôts activée" - -#~ msgid "User Group creation disabled" -#~ msgstr "Création de groupes d'utilisateurs désactivée" - -#~ msgid "User Group creation enabled" -#~ msgstr "Création de groupes d'utilisateurs activée" - -#~ msgid "User Registration with manual account activation" -#~ msgstr "Enregistrement des utilisateurs avec activation de compte manuelle" - -#~ msgid "User Registration with automatic account activation" -#~ msgstr "Enregistrement des utilisateurs avec activation de compte automatique" - -#~ msgid "[Added] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -#~ msgstr "" -#~ "[Ajouté] Demande de pull %(pr_nice_id)s " -#~ "à partir de %(ref)s pour %(repo_name)s" - -#~ msgid "[Comment] %(repo_name)s pull request %(pr_nice_id)s from %(ref)s" -#~ msgstr "" -#~ "[Commentaire] Demande de pull %(pr_nice_id)s" -#~ " à partir de %(ref)s pour " -#~ "%(repo_name)s" - -#~ msgid "repositories" -#~ msgstr "Dépôts" - -#~ msgid "No repositories found." -#~ msgstr "Pas de dépôts trouvés." - -#~ msgid "There are no branches yet" -#~ msgstr "Aucune branche n’a été créée pour le moment" - -#~ msgid "There are no tags yet" -#~ msgstr "Aucun tag n’a été créé pour le moment" - -#~ msgid "There are no bookmarks yet" -#~ msgstr "Aucun signet n’a été créé" - -#~ msgid "Analytics HTML block" -#~ msgstr "Bloc HTML pour l'analytique" - -#~ msgid "" -#~ "HTML with JavaScript for web analytics" -#~ " systems like Google Analytics or " -#~ "Piwik. This will be added at the" -#~ " bottom of every page." -#~ msgstr "" -#~ "HTML avec du JavaScript pour les " -#~ "systèmes d'analyse Web comme Google " -#~ "Analytics ou Piwik. Ceci sera ajouté " -#~ "en bas de chaque page." - -#~ msgid "enabled" -#~ msgstr "activé" - -#~ msgid "%s Bookmarks" -#~ msgstr "Signets de %s" - -#~ msgid "Compare Bookmarks" -#~ msgstr "Comparer les marque-pages" - -#~ msgid "%s Branches" -#~ msgstr "Branches de %s" - -#~ msgid "Compare Branches" -#~ msgstr "Comparer les branches" - -#~ msgid "Editing file" -#~ msgstr "Édition du fichier" - -#~ msgid "Update" -#~ msgstr "Mettre à jour" - -#~ msgid "Save Updates as New Pull Request" -#~ msgstr "" -#~ "Sauvegarder les modifications entrantes en " -#~ "tant que nouvelle requête de pull" - -#~ msgid "%s Tags" -#~ msgstr "Tags de %s" - -#~ msgid "Compare Tags" -#~ msgstr "Comparer les tags" - -#~ msgid "" -#~ "Changing status on a changeset " -#~ "associated with a closed pull request" -#~ " is not allowed" -#~ msgstr "" -#~ "La modification de l'état sur un " -#~ "ensemble de modifications associé à une" -#~ " demande de tirage fermé n'est pas" -#~ " autorisé" - -#~ msgid "You have successfully registered into Kallithea" -#~ msgstr "Vous vous êtes inscrits avec succès à Kallithea" - #~ msgid "This pull request can be updated with changes on %s:" #~ msgstr "" -#~ "Cette demande de pull peut être " -#~ "mise à jour avec les modifications " -#~ "de %s :" #~ msgid "Confirm to invalidate repository cache." #~ msgstr "Voulez-vous vraiment invalider le cache du dépôt ?" -#~ msgid "" -#~ "Changeset status: %s\n" -#~ "Click to open associated pull request %s" -#~ msgstr "" -#~ "Statut du changeset : %s\n" -#~ "Cliquer pour ouvrir la requête de pull %s associée" - -#~ msgid "Commenting on line {1}." -#~ msgstr "Commentaire sur la ligne {1}." - #~ msgid "Comments parsed using %s syntax with %s support." #~ msgstr "" -#~ "Les commentaires sont analysés avec la" -#~ " syntaxe %s, avec le support de " -#~ "la commande %s." #~ msgid "Use @username inside this text to notify another user" #~ msgstr "" -#~ "Utilisez @nomutilisateur dans ce texte " -#~ "pour envoyer une notification à un " -#~ "autre utilisateur" #~ msgid "Comment preview" #~ msgstr "Aperçu du commentaire" @@ -7480,18 +6479,5 @@ #~ msgid "Preview" #~ msgstr "Aperçu" -#~ msgid "Use @username inside this text to notify another user." -#~ msgstr "" -#~ "Utilisez @nomutilisateur dans ce texte " -#~ "pour envoyer une notification à un " -#~ "autre utilisateur." - #~ msgid "New file mode" #~ msgstr "Mode du nouveau fichier" - -#~ msgid "File is too big to display" -#~ msgstr "Ce fichier est trop gros pour être affiché" - -#~ msgid "Save as New Pull Request" -#~ msgstr "Sauvegarder en tant que nouvelle requête de pull" -