Skip to content

Commit

Permalink
Merge pull request #235 from WedoneOfficiel/patch-1
Browse files Browse the repository at this point in the history
Added missing translations for the French language.
  • Loading branch information
MightyCreak committed Jul 27, 2024
2 parents c2c40f2 + 81acbcd commit 8502a2c
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

### Changed

- Translation: update French translation (@WedoneOfficiel)
- Translation: update Italian translation (@albanobattistella)

## 0.9.0 - 2024-01-13
Expand Down
21 changes: 14 additions & 7 deletions po/fr.po
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
# Copyright (C) 2021 Romain Failliot <[email protected]>
# This file is distributed under the same license as the Diffuse package.
# Romain Failliot <[email protected]>, 2021.
# Wedone <[email protected]>, 2024.
#
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-04-16 14:09-0400\n"
"PO-Revision-Date: 2022-04-04 11:58-0400\n"
"Last-Translator: Romain Failliot <[email protected]>\n"
"Last-Translator: Wedone <[email protected]>\n"
"Language-Team: French\n"
"Language: fr\n"
"MIME-Version: 1.0\n"
Expand Down Expand Up @@ -55,7 +56,7 @@ msgstr "Copyright"
#: src/diffuse/preferences.py:254 src/diffuse/preferences.py:483
#: src/diffuse/window.py:309 src/diffuse/window.py:1107
msgid "_Cancel"
msgstr ""
msgstr "_Annuler"

#: src/diffuse/dialogs.py:50
msgid "Encoding: "
Expand All @@ -68,7 +69,7 @@ msgstr "Révision: "
#: src/diffuse/dialogs.py:90 src/diffuse/dialogs.py:134
#: src/diffuse/preferences.py:255
msgid "_OK"
msgstr ""
msgstr "_Ok"

#: src/diffuse/dialogs.py:130
msgid "Find..."
Expand Down Expand Up @@ -170,6 +171,12 @@ msgid ""
"ability to manually adjust line matching and directly edit files. Diffuse can\n"
"also retrieve revisions of files from several VCSs for comparison and merging."
msgstr ""
"Diffuse est un outil graphique permettant de fusionner et de comparer des\n"
"fichiers texte. Diffuse est capable de comparer un nombre arbitraire de fichiers\n"
"côte à côte et donne aux utilisateurs la possibilité d'ajuster manuellement la\n"
"correspondance des lignes et de modifier directement les fichiers. Diffuse peut\n"
"également récupérer les révisions des fichiers de plusieurs VCS pour comparaison\n"
"et fusion."

#: src/diffuse/main.py:247 src/diffuse/window.py:420
#, python-format
Expand Down Expand Up @@ -330,7 +337,7 @@ msgstr "Erreur à l'écriture de %s."
#: src/diffuse/preferences.py:483 src/diffuse/window.py:446
#: src/diffuse/window.py:1413 src/diffuse/window.py:1436 src/diffuse/window.py:1459
msgid "_Open"
msgstr ""
msgstr "_Ouvrir"

#: src/diffuse/resources.py:242 src/diffuse/resources.py:246
#: src/diffuse/resources.py:249
Expand Down Expand Up @@ -489,11 +496,11 @@ msgstr "Sauvegarder les changements avant de charger le nouveau fichier?"

#: src/diffuse/window.py:310
msgid "_No"
msgstr ""
msgstr "_Non"

#: src/diffuse/window.py:311
msgid "_Yes"
msgstr ""
msgstr "_Oui"

#: src/diffuse/window.py:417
#, python-format
Expand Down Expand Up @@ -893,7 +900,7 @@ msgstr "Refaire"

#: src/diffuse/window.py:950
msgid "Changes detected"
msgstr ""
msgstr "Modifications détectées"

#: src/diffuse/window.py:954
#, python-format
Expand Down

0 comments on commit 8502a2c

Please sign in to comment.