diff kallithea/i18n/fr/LC_MESSAGES/kallithea.po @ 8468:1fa108ad4bc1 i18n

Merge from stable
author Mads Kiilerich <mads@kiilerich.com>
date Mon, 05 Oct 2020 00:03:26 +0200
parents 949e3280200b b2ed5a40094c
children 08117c4db79f
line wrap: on
line diff
--- a/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Fri Oct 02 13:17:55 2020 +0200
+++ b/kallithea/i18n/fr/LC_MESSAGES/kallithea.po	Mon Oct 05 00:03:26 2020 +0200
@@ -4,7 +4,7 @@
 msgstr ""
 "Project-Id-Version: Kallithea 0.3\n"
 "Report-Msgid-Bugs-To: translations@kallithea-scm.org\n"
-"POT-Creation-Date: 2020-05-04 19:12+0200\n"
+"POT-Creation-Date: 2020-10-05 00:01+0200\n"
 "PO-Revision-Date: 2020-07-23 15:41+0000\n"
 "Last-Translator: J. Lavoie <j.lavoie@net-c.ca>\n"
 "Language-Team: French <https://hosted.weblate.org/projects/kallithea/"
@@ -17,7 +17,7 @@
 "X-Generator: Weblate 4.2-dev\n"
 
 #: kallithea/controllers/changelog.py:67
-#: kallithea/controllers/pullrequests.py:247 kallithea/lib/base.py:602
+#: kallithea/controllers/pullrequests.py:249 kallithea/lib/base.py:602
 msgid "There are no changesets yet"
 msgstr "Il n’y a aucun changement pour le moment"
 
@@ -248,12 +248,12 @@
 msgstr "Changesets"
 
 #: kallithea/controllers/files.py:727
-#: kallithea/controllers/pullrequests.py:174 kallithea/model/scm.py:663
+#: kallithea/controllers/pullrequests.py:176 kallithea/model/scm.py:663
 msgid "Branches"
 msgstr "Branches"
 
 #: kallithea/controllers/files.py:728
-#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:674
+#: kallithea/controllers/pullrequests.py:177 kallithea/model/scm.py:674
 msgid "Tags"
 msgstr "Tags"
 
@@ -352,102 +352,102 @@
 msgid "Changeset"
 msgstr "Changements"
 
-#: kallithea/controllers/pullrequests.py:171
+#: kallithea/controllers/pullrequests.py:173
 msgid "Special"
 msgstr "Spécial"
 
-#: kallithea/controllers/pullrequests.py:172
+#: kallithea/controllers/pullrequests.py:174
 msgid "Peer branches"
 msgstr "Branches appairées"
 
-#: kallithea/controllers/pullrequests.py:173 kallithea/model/scm.py:669
+#: kallithea/controllers/pullrequests.py:175 kallithea/model/scm.py:669
 msgid "Bookmarks"
 msgstr "Signets"
 
-#: kallithea/controllers/pullrequests.py:315
+#: kallithea/controllers/pullrequests.py:317
 #, python-format
 msgid "Error creating pull request: %s"
 msgstr "Erreur de création de la demande de pull : %s"
 
-#: kallithea/controllers/pullrequests.py:342
-#: kallithea/controllers/pullrequests.py:365
+#: kallithea/controllers/pullrequests.py:344
+#: kallithea/controllers/pullrequests.py:367
 msgid "Error occurred while creating pull request"
 msgstr "Une erreur est survenue durant la création de la pull request"
 
-#: kallithea/controllers/pullrequests.py:347
+#: kallithea/controllers/pullrequests.py:349
 msgid "Successfully opened new pull request"
 msgstr "La requête de pull a été ouverte avec succès"
 
-#: kallithea/controllers/pullrequests.py:370
+#: kallithea/controllers/pullrequests.py:372
 msgid "New pull request iteration created"
 msgstr "Nouvelle itération de requête de pull créée"
 
-#: kallithea/controllers/pullrequests.py:398
+#: kallithea/controllers/pullrequests.py:400
 #, python-format
 msgid "Meanwhile, the following reviewers have been added: %s"
 msgstr "Entretemps, les relecteurs suivants on été ajoutés : %s"
 
-#: kallithea/controllers/pullrequests.py:402
+#: kallithea/controllers/pullrequests.py:404
 #, python-format
 msgid "Meanwhile, the following reviewers have been removed: %s"
 msgstr "Entretemps, les relecteurs suivants ont été supprimés : %s"
 
-#: kallithea/controllers/pullrequests.py:418
+#: kallithea/controllers/pullrequests.py:420
 #: kallithea/model/pull_request.py:230
 msgid "No description"
 msgstr "Aucune description"
 
-#: kallithea/controllers/pullrequests.py:427
+#: kallithea/controllers/pullrequests.py:429
 msgid "Pull request updated"
 msgstr "Pull request mise à jour"
 
-#: kallithea/controllers/pullrequests.py:440
+#: kallithea/controllers/pullrequests.py:442
 msgid "Successfully deleted pull request"
 msgstr "La requête de pull a été supprimée avec succès"
 
-#: kallithea/controllers/pullrequests.py:476
+#: kallithea/controllers/pullrequests.py:478
 #, python-format
 msgid "Revision %s not found in %s"
 msgstr "Révision %s non trouvée dans %s"
 
-#: kallithea/controllers/pullrequests.py:504
+#: kallithea/controllers/pullrequests.py:506
 #, python-format
 msgid "Error: changesets not found when displaying pull request from %s."
 msgstr ""
 "Erreur : Pas de changeset trouvé lors de l'affichage la requête de pull "
 "de %s."
 
-#: kallithea/controllers/pullrequests.py:518
+#: kallithea/controllers/pullrequests.py:520
 #, 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:520
+#: kallithea/controllers/pullrequests.py:522
 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:539
+#: kallithea/controllers/pullrequests.py:541
 #, python-format
 msgid "The following additional changes are available on %s:"
 msgstr ""
 "Les modifications additionnelles suivantes sont disponibles sur %s :"
 
-#: kallithea/controllers/pullrequests.py:541
-#: kallithea/controllers/pullrequests.py:545
+#: kallithea/controllers/pullrequests.py:543
+#: kallithea/controllers/pullrequests.py:547
 msgid "No additional changesets found for iterating on this pull request."
 msgstr "Pas de changeset additionnel trouvé pour cette requête de pull."
 
-#: kallithea/controllers/pullrequests.py:553
+#: kallithea/controllers/pullrequests.py:555
 #, 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:560
+#: kallithea/controllers/pullrequests.py:562
 msgid "Git pull requests don't support iterating yet."
 msgstr ""
 "Les itérations des requêtes de pull Git ne sont pas encore supportées."
 
-#: kallithea/controllers/pullrequests.py:562
+#: kallithea/controllers/pullrequests.py:564
 #, python-format
 msgid ""
 "Error: some changesets not found when displaying pull request from %s."
@@ -455,7 +455,7 @@
 "Erreur : certains changesets n'ont pas été trouvés lors de l'affichage la "
 "requête de pull depuis %s."
 
-#: kallithea/controllers/pullrequests.py:586
+#: kallithea/controllers/pullrequests.py:588
 msgid "The diff can't be shown - the PR revisions could not be found."
 msgstr ""
 "Le diff ne peut pas être affiché : révisions des requêtes de pull "
@@ -1293,12 +1293,14 @@
 
 #: kallithea/lib/ssh.py:83
 msgid "Incorrect SSH key - it must start with 'ssh-(rsa|dss|ed25519)'"
-msgstr "Clé SSH incorrecte – elle doit commencer par « ssh-(rsa|dss|ed25519) »"
+msgstr ""
+"Clé SSH incorrecte – elle doit commencer par « ssh-(rsa|dss|ed25519) »"
 
 #: kallithea/lib/ssh.py:86
 #, python-format
 msgid "Incorrect SSH key - unexpected characters in base64 part %r"
-msgstr "Clé SSH incorrecte – caractères inattendus dans la partie base 64 %r"
+msgstr ""
+"Clé SSH incorrecte – caractères inattendus dans la partie base 64 %r"
 
 #: kallithea/lib/ssh.py:91
 #, python-format
@@ -1309,7 +1311,8 @@
 #, python-format
 msgid "Incorrect SSH key - base64 part is not %r as claimed but %r"
 msgstr ""
-"Clé SSH incorrecte – la partie base 64 n'est pas %r comme il est dit mais %r"
+"Clé SSH incorrecte – la partie base 64 n'est pas %r comme il est dit mais "
+"%r"
 
 #: kallithea/lib/utils2.py:253
 #, python-format