-
Notifications
You must be signed in to change notification settings - Fork 110
Conversation
Conflicts: README.md authors.txt
Conflicts: src/test/java/org/multibit/functionaltests/GenesisBlockReplayTest.java
Conflicts: pom.xml src/main/java/org/multibit/network/MultiBitService.java src/test/resources/privateKeys/test1.info src/test/resources/privateKeys/test1.key src/test/resources/privateKeys/test1.wallet
You added way to many commits in this one :( It's okay, I'll just merge your translation fixes manually later ;) Thanks again! |
Sorry :( |
No problem, your help is really appreciated :) |
Manually merged in 133ffee |
New update (sorry I do not know where to contact you), which also fixes some things from the previous. I think it is almost done for the French translation, except silliness like "ez" or "er" at the beginning of a sentence, D capital for dogecoin or not etc .... 100: -multiBitFrame.balanceLabel.tooltip=Balance y compris des dogecoins non confirm\u00e9es et changement 198: -sendBitcoinNowAction.bitcoinSentOk=Vos dogecoin ont \u00e9t\u00e9 envoy\u00e9 avec succ\u00e8s. 224: -sendBitcoinPanel.helpLabel1.message=Vous voulez envoyer dogecoin. 225: -sendBitcoinPanel.helpLabel2.message=Entrez ou choisissez une adresse pour envoyer et un montant. 226: -sendBitcoinPanel.helpLabel3.message=\u00c9ventuellement ajouter une \u00e9tiquette. 228: -sendBitcoinPanel.addressLabel.tooltip=L'adresse \u00e0 laquelle vous souhaitez envoyer des dogecoin \u00e0 230: -sendBitcoinPanel.labelLabel.tooltip=Une nom d'transaction descriptive pour cette adresse 248: -receiveBitcoinPanel.title=Recevez des Dogecoin 251: -receiveBitcoinPanel.helpLabel3.message=\u00c9ventuellement entrer une \u00e9tiquette et un montant. 253: -receiveBitcoinPanel.addressLabel.tooltip=L'adresse \u00e0 laquelle vous souhaitez recevoir des dogecoin 254: -receiveBitcoinPanel.labelLabel=Nom d'transaction 278: -createOrEditAddressAction.createReceiving.text=Nouveau 282: -createOrEditAddressAction.createSending.text=Nouveau 328: -validationErrorView.title=Erreur de Validation 329: -validationErrorView.okOption=Ok 358: -singleWalletPanel.dataHasChanged.text=Mises \u00e0 jour s'est arr\u00eat\u00e9. 360: -singleWalletPanel.dataHasChanged.tooltip.2=Pour \u00e9viter des erreurs ce MultiDoge a cess\u00e9 de mises \u00e0 jour. 368: -singleWalletPanel.unencrypted=non crypt\u00e9 |
Thanks again. Can you just paste your update version of the complete .properties file to pastebin.com or something similar? Then I can just copy/paste it :) |
Small fix: |
Sorry sorry last update: (we're in trouble if other translations are also mistranslated by Multibit ^ ^) |
Updated :) |
It's ok ?