monero-project/monero-site
monero-project/monero-site
1
0
Fork 0
mirror of https://github.com/monero-project/monero-site.git synced 2024-11-17 08:18:03 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge !1070

Browse source 
remove conflict markers from fr.yml

See merge request monero-project/monero-site!1070
This commit is contained in:
luigi1111 2019-05-06 21:16:24 +02:00
commit 53556a6506
1 changed files with 0 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
_i18n/fr.yml
View file

@ -443,11 +443,7 @@ user-guides:
restore-from-keys: Restaurer un portefeuille depuis les clefs
nicehash: Comment miner Monero sans équipement d'extraction minière
ledger-wallet-cli: Comment générer un portefeuille Monero Ledger avec la CLI (monero-wallet-cli)
<<<<<<< HEAD
multisig-messaging-system: Transactions multi-signatures avec MMS et le portefeuille CLI
=======
multisig-messaging-system: Multisig transactions with MMS and CLI wallet
>>>>>>> add missing i18n keys and values in the languages files
roadmap:
translated: "yes"