From 373d9a58baa8212e65372426d31fc956c60d5a24 Mon Sep 17 00:00:00 2001 From: langerhans Date: Thu, 20 Feb 2014 20:17:13 +0100 Subject: [PATCH 01/18] Rebase develop --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 8e1021a87..d11fc3918 100644 --- a/pom.xml +++ b/pom.xml @@ -22,7 +22,7 @@ 4.0.0 org.multibit multidoge - 0.1.1 + develop-SNAPSHOT MultiDoge A Java Swing client for Dogecoin https://multidoge.org From 9bb4e74fbd9b87618805b9501b2951a384b5ec67 Mon Sep 17 00:00:00 2001 From: langerhans Date: Thu, 20 Feb 2014 21:04:04 +0100 Subject: [PATCH 02/18] Japanese Bitcoin -> Dogecoin --- src/main/resources/i18n/ja/viewer.properties | 76 ++++++++++---------- 1 file changed, 38 insertions(+), 38 deletions(-) diff --git a/src/main/resources/i18n/ja/viewer.properties b/src/main/resources/i18n/ja/viewer.properties index a3948372d..629732fd6 100755 --- a/src/main/resources/i18n/ja/viewer.properties +++ b/src/main/resources/i18n/ja/viewer.properties @@ -54,10 +54,10 @@ showPreferencesPanel.size.text={0} \u30d0\u30a4\u30c8 showPreferencesPanel.couldNotUnderstandFee=\u30de\u30eb\u30c1\u30d3\u30c3\u30c8\u306f\u624b\u6570\u6599"{0}"\u3092\u8a8d\u8b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u4ee5\u524d\u306e\u624b\u6570\u6599\u3092\u7d99\u7d9a\u3057\u307e\u3059\u3002 showPreferencesPanel.aFeeMustBeSet=\u53d6\u5f15\u624b\u6570\u6599\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002\u4ee5\u524d\u306e\u624b\u6570\u6599\u3092\u7d99\u7d9a\u3057\u307e\u3059\u3002 showPreferencesPanel.feeCannotBeSmallerThanMinimumFee=\u624b\u6570\u6599\u306f\u5c11\u306a\u304f\u3068\u3082 0.0001 DOGE \u304c\u5fc5\u8981\u3067\u3059\u3002\u4ee5\u524d\u306e\u624b\u6570\u6599\u3092\u7dad\u6301\u3057\u3066\u3044\u307e\u3059\u3002 -showPreferencesPanel.feeCannotBeGreaterThanMaximumFee=\u5c0f\u6570\u70b9\u3092\u30c1\u30a7\u30c3\u30af\u3057\u3001\u624b\u6570\u6599\u306f\uff11\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3088\u308a\u5c11\u306a\u304f\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u53e4\u3044\u624b\u6570\u6599\u3092\u7dad\u6301\u3057\u307e\u3059\u3002 +showPreferencesPanel.feeCannotBeGreaterThanMaximumFee=\u5c0f\u6570\u70b9\u3092\u30c1\u30a7\u30c3\u30af\u3057\u3001\u624b\u6570\u6599\u306f\uff11\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3088\u308a\u5c11\u306a\u304f\u8a2d\u5b9a\u3057\u3066\u304f\u3060\u3055\u3044\u3002\u53e4\u3044\u624b\u6570\u6599\u3092\u7dad\u6301\u3057\u307e\u3059\u3002 showPreferencesPanel.browserIntegrationTitle=\u30d6\u30e9\u30a6\u30b6\u7d71\u5408 -showPreferencesPanel.browserIntegration.messageText=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u652f\u6255\u3044\u8981\u6c42\u304c\u30d6\u30e9\u30a6\u30b6\u5185\u3067\u30af\u30ea\u30c3\u30af\u3055\u308c\u305f\u3068\u304d\u306e\u52d5\u4f5c\u306f\u3069\u306e\u3088\u3046\u306b\u3057\u307e\u3059\u304b\uff1f -showPreferencesPanel.ignoreAll=\u3059\u3079\u3066\u306e\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u652f\u6255\u3044\u8acb\u6c42\u3092\u7121\u8996\u3059\u308b\u3002 +showPreferencesPanel.browserIntegration.messageText=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u652f\u6255\u3044\u8981\u6c42\u304c\u30d6\u30e9\u30a6\u30b6\u5185\u3067\u30af\u30ea\u30c3\u30af\u3055\u308c\u305f\u3068\u304d\u306e\u52d5\u4f5c\u306f\u3069\u306e\u3088\u3046\u306b\u3057\u307e\u3059\u304b\uff1f +showPreferencesPanel.ignoreAll=\u3059\u3079\u3066\u306e\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u652f\u6255\u3044\u8acb\u6c42\u3092\u7121\u8996\u3059\u308b\u3002 showPreferencesPanel.fillAutomatically=\u9001\u4fe1\u30d5\u30a9\u30fc\u30e0\u3092\u81ea\u52d5\u7684\u306b\u5165\u529b\u3057\u307e\u3059\u3002 showPreferencesPanel.askEveryTime=\u6bce\u56de\u78ba\u8a8d\u3059\u308b @@ -78,7 +78,7 @@ showPreferencesPanel.ticker.showSecondRow=2 \u756a\u76ee\u306e\u884c\u3092\u8868 showPreferencesPanel.ticker.exchange=\u53d6\u5f15\u6240 showPreferencesPanel.ticker.currency=\u901a\u8ca8 showPreferencesPanel.ticker.showBitcoinConvertedToFiat=\u6cd5\u5b9a\u8ca8\u5e63\u3092\u8868\u793a -showPreferencesPanel.ticker.exchangeInformation=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306f\u3053\u306e\u901a\u8ca8\u306e\u6700\u65b0\u30ec\u30fc\u30c8\u3092\u5229\u7528\u3057\u3001\u5909\u63db\u8868\u793a\u3055\u308c\u307e\u3059\u3002 +showPreferencesPanel.ticker.exchangeInformation=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306f\u3053\u306e\u901a\u8ca8\u306e\u6700\u65b0\u30ec\u30fc\u30c8\u3092\u5229\u7528\u3057\u3001\u5909\u63db\u8868\u793a\u3055\u308c\u307e\u3059\u3002 showPreferencesPanel.oerLabel.text=OpenExchangeRates \u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 ID showPreferencesPanel.oerLabel.tooltip=OpenExchangeRates.org \u304b\u3089\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 ID \u30a2\u30af\u30bb\u30b9\u30b3\u30fc\u30c9 showPreferencesPanel.oerValidationError.text1=\u7121\u52b9\u306a\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3 ID \u3092\u5165\u529b\u3057\u307e\u3057\u305f\u3002 @@ -98,7 +98,7 @@ multibit.userDataDirectory=\u30e6\u30fc\u30b6\u30fc \u30c7\u30fc\u30bf \u30c7\u3 multibit.installationDirectory=\u30a4\u30f3\u30b9\u30c8\u30fc\u30eb \u30c7\u30a3\u30ec\u30af\u30c8\u30ea\u306f"{0}"\u3067\u3059\u3002 multiBitFrame.title=\u30de\u30eb\u30c1\u30d3\u30c3\u30c8 multiBitFrame.balanceLabel=\u6b8b\u9ad8 -multiBitFrame.balanceLabel.tooltip=\u672a\u78ba\u8a8d\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u304a\u3088\u3073\u5909\u66f4\u3092\u542b\u3080\u6b8b\u9ad8\u3067\u3059\u3002 +multiBitFrame.balanceLabel.tooltip=\u672a\u78ba\u8a8d\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u304a\u3088\u3073\u5909\u66f4\u3092\u542b\u3080\u6b8b\u9ad8\u3067\u3059\u3002 multiBitFrame.ticker.show.text=\u901a\u8ca8\u30c6\u30a3\u30c3\u30ab\u30fc\u3092\u8868\u793a multiBitFrame.ticker.hide.text=\u901a\u8ca8\u30c6\u30a3\u30c3\u30ab\u30fc\u3092\u96a0\u3059 multiBitFrame.statusBar.tooltip1=\u30e1\u30c3\u30bb\u30fc\u30b8\u3002 @@ -146,11 +146,11 @@ multiBitFrame.status.beingConfirmedAndCoinbase=\u3053\u306e\u30b3\u30a4\u30f3\u3 multiBitFrame.availableToSpend=\u9001\u91d1\u3067\u304d\u308b\u6b8b\u9ad8\: {0} multiBitFrame.availableToSpend2=\u9001\u91d1\u3067\u304d\u308b\u6b8b\u9ad8 -multiBitFrame.availableToSpend.tooltip=\u6b8b\u9ad8\u3088\u308a\u6e1b\u5c11\u3057\u305f\u672a\u78ba\u8a8d\u306e\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u304a\u3088\u3073\u5909\u66f4\u306f\u8fd4\u5374\u3055\u308c\u307e\u3059 +multiBitFrame.availableToSpend.tooltip=\u6b8b\u9ad8\u3088\u308a\u6e1b\u5c11\u3057\u305f\u672a\u78ba\u8a8d\u306e\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u304a\u3088\u3073\u5909\u66f4\u306f\u8fd4\u5374\u3055\u308c\u307e\u3059 -multiBitService.errorText=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3078\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a8\u30e9\u30fc\u306f\:{0} -multiBitService.errorTitleText=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3078\u306e\u63a5\u7d9a\u30a8\u30e9\u30fc\u767a\u751f -multiBitService.stoppingBitcoinNetworkConnection=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u63a5\u7d9a\u3092\u505c\u6b62\u3057\u3066\u3044\u307e\u3059... +multiBitService.errorText=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3078\u63a5\u7d9a\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a8\u30e9\u30fc\u306f\:{0} +multiBitService.errorTitleText=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u3078\u306e\u63a5\u7d9a\u30a8\u30e9\u30fc\u767a\u751f +multiBitService.stoppingBitcoinNetworkConnection=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u63a5\u7d9a\u3092\u505c\u6b62\u3057\u3066\u3044\u307e\u3059... multiBitService.couldNotLoadBlockchain=\u30d6\u30ed\u30c3\u30af\u30c1\u30a7\u30a4\u30f3"{0}"\u3092\u30ed\u30fc\u30c9\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002\u30a8\u30e9\u30fc\u306f"{1}"\u3067\u3057\u305f\u3002 multiBitService.replayingFromBlockCache=\u30ed\u30fc\u30ab\u30eb\u30ad\u30e3\u30c3\u30b7\u30e5\u3088\u308a\u518d\u751f\u3057\u3066\u3044\u307e\u3059\u3002 @@ -186,30 +186,30 @@ showHelpContentsAction.mnemonicKey=H helpContentsView.messageTitle=\u30d8\u30eb\u30d7\u306e\u76ee\u6b21 -sendBitcoinAction.text=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u307e\u3059\u3002 -sendBitcoinAction.tooltip=\u76f8\u624b\u306b\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u307e\u3059 +sendBitcoinAction.text=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u307e\u3059\u3002 +sendBitcoinAction.tooltip=\u76f8\u624b\u306b\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u307e\u3059 sendBitcoinAction.pleaseWait.tooltip=\u9001\u4fe1\u3059\u308b\u524d\u306bMultiDoge\u304c\u540c\u671f\u5b8c\u4e86\u307e\u3067\u304a\u5f85\u3061\u304f\u3060\u3055\u3044\u3002 sendBitcoinAction.mnemonicKey=E sendBitcoinConfirmAction.text=\u9001\u91d1 -sendBitcoinConfirmAction.tooltip=\u76f8\u624b\u306b\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3059\u308b +sendBitcoinConfirmAction.tooltip=\u76f8\u624b\u306b\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3059\u308b sendBitcoinConfirmAction.mnemonicKey=E -sendBitcoinNowAction.sendingBitcoin=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u4e2d... -sendBitcoinNowAction.bitcoinSentOk=\u3042\u306a\u305f\u306e\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306f\u6b63\u5e38\u306b\u9001\u91d1\u3055\u308c\u307e\u3057\u305f\u3002 -sendBitcoinNowAction.bitcoinSendFailed=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306e\u9001\u91d1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 +sendBitcoinNowAction.sendingBitcoin=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u4e2d... +sendBitcoinNowAction.bitcoinSentOk=\u3042\u306a\u305f\u306e\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306f\u6b63\u5e38\u306b\u9001\u91d1\u3055\u308c\u307e\u3057\u305f\u3002 +sendBitcoinNowAction.bitcoinSendFailed=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306e\u9001\u91d1\u306b\u5931\u6557\u3057\u307e\u3057\u305f\u3002 sendBitcoinNowAction.pingFailure=\u3059\u3079\u3066\u306e\u30d4\u30a2\u304c\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u30c6\u30b9\u30c8\u3092\u5931\u6557\u3057\u307e\u3057\u305f\u3002\u30cd\u30c3\u30c8\u30ef\u30fc\u30af\u63a5\u7d9a\u3092\u78ba\u8a8d\u3057\u3066\u3001MultiDoge\u3092\u518d\u8d77\u52d5\u3057\u3066\u304f\u3060\u3055\u3044\u3002 sendBitcoinNowAction.thereWereInsufficientFundsForTheSend=\u4e0d\u5341\u5206\u306a\u8cc7\u91d1\u3092\u9001\u4fe1\u3057\u307e\u3057\u305f\u3002 sendBitcoinConfirmView.sendOption=\u9001\u91d1 sendBitcoinConfirmView.cancelOption=\u30ad\u30e3\u30f3\u30bb\u30eb sendBitcoinConfirmView.message=\u9001\u91d1\u5185\u5bb9\u3092\u3054\u78ba\u8a8d\u304f\u3060\u3055\u3044\uff1a -sendBitcoinConfirmView.title=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306e\u9001\u91d1\u3092\u78ba\u8a8d -sendBitcoinConfirmView.multibitMustBeOnline=MultiDoge \u3067\u306e\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u9001\u91d1\u306f 1 \u3064\u4ee5\u4e0a\u306e\u30d4\u30a2\u306b\u63a5\u7d9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 +sendBitcoinConfirmView.title=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306e\u9001\u91d1\u3092\u78ba\u8a8d +sendBitcoinConfirmView.multibitMustBeOnline=MultiDoge \u3067\u306e\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u9001\u91d1\u306f 1 \u3064\u4ee5\u4e0a\u306e\u30d4\u30a2\u306b\u63a5\u7d9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 receiveBitcoinAction.textShort=\u8acb\u6c42 -receiveBitcoinAction.text=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u8acb\u6c42\u3059\u308b -receiveBitcoinAction.tooltip=\u76f8\u624b\u304b\u3089\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u8acb\u6c42\u3057\u307e\u3059\u3002 +receiveBitcoinAction.text=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u8acb\u6c42\u3059\u308b +receiveBitcoinAction.tooltip=\u76f8\u624b\u304b\u3089\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u8acb\u6c42\u3057\u307e\u3059\u3002 receiveBitcoinAction.mnemonicKey=R showPreferencesAction.text=\u8a2d\u5b9a @@ -220,13 +220,13 @@ showPreferencesSubmitAction.text=\u5909\u66f4\u3092\u9069\u7528\u3057\u307e\u305 showPreferencesSubmitAction.tooltip=\u5909\u66f4\u3092\u9069\u7528\u3057\u307e\u3059 showPreferencesSubmitAction.mnemonicKey=S -sendBitcoinPanel.title=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u307e\u3059\u3002 +sendBitcoinPanel.title=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u307e\u3059\u3002 sendBitcoinPanel.sendBitcoinsPanelTitle=\u8a73\u7d30\u3092\u9001\u4fe1\u3057\u307e\u3059\u3002 -sendBitcoinPanel.helpLabel1.message=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u305f\u3044\u3067\u3059\u3002 +sendBitcoinPanel.helpLabel1.message=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u9001\u91d1\u3057\u305f\u3044\u3067\u3059\u3002 sendBitcoinPanel.helpLabel2.message=\u9001\u91d1\u5148\u30a2\u30c9\u30ec\u30b9\u304a\u3088\u3073\u9001\u91d1\u91d1\u984d\u3092\u5165\u529b\u307e\u305f\u306f\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 sendBitcoinPanel.helpLabel3.message=\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u30e9\u30d9\u30eb\u3092\u8ffd\u52a0\u3057\u307e\u3059\u3002 sendBitcoinPanel.addressLabel=\u9001\u91d1\u5148\u30a2\u30c9\u30ec\u30b9 -sendBitcoinPanel.addressLabel.tooltip=\u3053\u306e\u30a2\u30c9\u30ec\u30b9\u306b\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u304c\u9001\u91d1\u3055\u308c\u307e\u3059 +sendBitcoinPanel.addressLabel.tooltip=\u3053\u306e\u30a2\u30c9\u30ec\u30b9\u306b\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u304c\u9001\u91d1\u3055\u308c\u307e\u3059 sendBitcoinPanel.labelLabel=\u30e9\u30d9\u30eb sendBitcoinPanel.labelLabel.tooltip=\u3053\u306e\u30a2\u30c9\u30ec\u30b9\u306e\u8aac\u660e sendBitcoinPanel.amountLabel=\u91d1\u984d @@ -237,7 +237,7 @@ sendBitcoinPanel.sendingAddressesTitle=\u9001\u91d1\u5148\u30a2\u30c9\u30ec\u30b sendBitcoinPanel.sendingAddressesTitle.mayBeOutOfDate=\u3042\u306a\u305f\u306e\u9001\u4fe1\u30a2\u30c9\u30ec\u30b9\u306f(\u671f\u9650\u5207\u308c\u304b\u3082\u3057\u308c\u307e\u305b\u3093) sendBitcoinPanel.couldNotUnderstandQRcode=QR\u30b3\u30fc\u30c9"{0}"\u3092\u7406\u89e3\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 sendBitcoinPanel.dragBitcoinLabelQRcode.text=QR\u30b3\u30fc\u30c9\u3092|\u3053\u3053\u306b|\u30c9\u30e9\u30c3\u30b0\u3057\u3066\u304f\u3060\u3055\u3044 -sendBitcoinPanel.dragBitcoinLabelQRcode.tooltip="\u9001\u4fe1"\u30d5\u30a9\u30fc\u30e0\u3092\u81ea\u52d5\u7684\u306b\u5165\u529b\u3059\u308b\u306b\u306f\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3QR\u30b3\u30fc\u30c9\u3092\u3053\u3053\u306b\u30c9\u30e9\u30c3\u30b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +sendBitcoinPanel.dragBitcoinLabelQRcode.tooltip="\u9001\u4fe1"\u30d5\u30a9\u30fc\u30e0\u3092\u81ea\u52d5\u7684\u306b\u5165\u529b\u3059\u308b\u306b\u306f\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3QR\u30b3\u30fc\u30c9\u3092\u3053\u3053\u306b\u30c9\u30e9\u30c3\u30b0\u3057\u3066\u304f\u3060\u3055\u3044\u3002 sendBitcoinPanel.showMore.text=\u3082\u3063\u3068 sendBitcoinPanel.showMore.tooltip=\u30b5\u30a4\u30c9\u30d1\u30cd\u30eb\u3092\u8868\u793a\u3057\u307e\u3059 sendBitcoinPanel.showMore.mnemonic=S @@ -246,12 +246,12 @@ sendBitcoinPanel.showLess.text=\u5c11\u306a\u304f sendBitcoinPanel.showLess.tooltip=\u30b5\u30a4\u30c9\u30d1\u30cd\u30eb\u3092\u96a0\u3059 sendBitcoinPanel.showLess.mnemonic=H -receiveBitcoinPanel.title=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u53d7\u3051\u53d6\u308a\u307e\u3059 -receiveBitcoinPanel.helpLabel1.message=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u53d7\u3051\u53d6\u308a\u305f\u3044\u3067\u3059\u3002 +receiveBitcoinPanel.title=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u53d7\u3051\u53d6\u308a\u307e\u3059 +receiveBitcoinPanel.helpLabel1.message=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u53d7\u3051\u53d6\u308a\u305f\u3044\u3067\u3059\u3002 receiveBitcoinPanel.helpLabel2.message=\u53d7\u3051\u53d6\u308a\u30a2\u30c9\u30ec\u30b9\u306e1\u3064\u3092\u9078\u629e\u3057\u3066\u304f\u3060\u3055\u3044\u3002 receiveBitcoinPanel.helpLabel3.message=\u30aa\u30d7\u30b7\u30e7\u30f3\u3068\u3057\u3066\u30e9\u30d9\u30eb\u304a\u3088\u3073\u91d1\u984d\u3092\u5165\u529b\u3059\u308b\u3002 receiveBitcoinPanel.addressLabel=\u3042\u306a\u305f\u306e\u53d7\u3051\u53d6\u308a\u30a2\u30c9\u30ec\u30b9\u3067\u3059 -receiveBitcoinPanel.addressLabel.tooltip=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u53d7\u3051\u53d6\u308b\u305f\u3081\u306e\u30a2\u30c9\u30ec\u30b9 +receiveBitcoinPanel.addressLabel.tooltip=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u53d7\u3051\u53d6\u308b\u305f\u3081\u306e\u30a2\u30c9\u30ec\u30b9 receiveBitcoinPanel.labelLabel=\u30e9\u30d9\u30eb receiveBitcoinPanel.labelLabel.tooltip=\u3053\u306e\u30a2\u30c9\u30ec\u30b9\u306e\u8aac\u660e receiveBitcoinPanel.amountLabel=\u91d1\u984d @@ -265,15 +265,15 @@ addressBookTableModel.labelColumnHeader=\u30e9\u30d9\u30eb addressBookTableModel.addressColumnHeader=\u9001\u91d1\u5148\u30a2\u30c9\u30ec\u30b9 copyQRCodeTextAction.text=\u30c6\u30ad\u30b9\u30c8\u3092\u30b3\u30d4\u30fc\u3059\u308b -copyQRCodeTextAction.tooltip=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3URI\u30c6\u30ad\u30b9\u30c8\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3059\u308b +copyQRCodeTextAction.tooltip=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3URI\u30c6\u30ad\u30b9\u30c8\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u306b\u30b3\u30d4\u30fc\u3059\u308b copyQRCodeTextAction.mnemonicKey=C copyQRCodeImageAction.text=\u30b3\u30d4\u30fc -copyQRCodeImageAction.tooltip=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3QR\u30b3\u30fc\u30c9\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u3078\u30b3\u30d4\u30fc\u3059\u308b +copyQRCodeImageAction.tooltip=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3QR\u30b3\u30fc\u30c9\u3092\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u3078\u30b3\u30d4\u30fc\u3059\u308b copyQRCodeImageAction.mnemonicKey=Q pasteSwatchAction.text=\u5f35\u308a\u4ed8\u3051\u308b -pasteSwatchAction.tooltip=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u304b\u3089\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3URI\u30c6\u30ad\u30b9\u30c8\u3082\u3057\u304f\u306fQR\u30b3\u30fc\u30c9\u3092\u30b3\u30d4\u30fc\u3059\u308b +pasteSwatchAction.tooltip=\u30af\u30ea\u30c3\u30d7\u30dc\u30fc\u30c9\u304b\u3089\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3URI\u30c6\u30ad\u30b9\u30c8\u3082\u3057\u304f\u306fQR\u30b3\u30fc\u30c9\u3092\u30b3\u30d4\u30fc\u3059\u308b pasteSwatchAction.mnemonicKey=V createOrEditAddressAction.createReceiving.text=\u65b0\u898f @@ -328,7 +328,7 @@ multiBitModel.debitDescriptionWithLabel="{1}"\u3078\u9001\u91d1\u3057\u307e\u305 validationErrorView.title=\u8a8d\u8a3c\u30a8\u30e9\u30fc validationErrorView.okOption=Ok -validationErrorView.addressInvalidMessage=\u30a2\u30c9\u30ec\u30b9"{0}"\u306f\u6709\u52b9\u306a\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 +validationErrorView.addressInvalidMessage=\u30a2\u30c9\u30ec\u30b9"{0}"\u306f\u6709\u52b9\u306a\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u30a2\u30c9\u30ec\u30b9\u3067\u306f\u3042\u308a\u307e\u305b\u3093\u3002 validationErrorView.amountIsMissingMessage=\u91d1\u984d\u3092\u6307\u5b9a\u3059\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 validationErrorView.amountInvalidMessage=\u91d1\u984d"{0}"\u3092\u6570\u5b57\u3068\u3057\u3066\u8a8d\u8b58\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 validationErrorView.amountIsNegativeOrZeroMessage=0 DOGE\u3088\u308a\u5927\u304d\u3044\u91d1\u984d\u3067\u3042\u308b\u5fc5\u8981\u304c\u3042\u308a\u307e\u3059\u3002 @@ -394,13 +394,13 @@ resetTransactionsPanel.resetDate=\u65e5\u4ed8\u3092\u30ea\u30bb\u30c3\u30c8\u305 resetTransactionsPanel.resetFromFirstTransaction=\u6700\u521d\u306e\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u306e\u65e5\u4ed8\u304b\u3089\u30ea\u30bb\u30c3\u30c8\u3057\u307e\u3059\u3002 resetTransactionsPanel.chooseResetDate=\u30ea\u30bb\u30c3\u30c8\u3059\u308b\u65e5\u4ed8\u3092\u6307\u5b9a\u3057\u307e\u3059\: {0} -showOpenUriView.title=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3URI\u3092\u958b\u304f -showOpenUriView.message1=\u4ed6\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306e\u652f\u6255\u3044\u3092\u8acb\u6c42\u3057\u307e\u3057\u305f\u3002 +showOpenUriView.title=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3URI\u3092\u958b\u304f +showOpenUriView.message1=\u4ed6\u306e\u30a2\u30d7\u30ea\u30b1\u30fc\u30b7\u30e7\u30f3\u304c\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306e\u652f\u6255\u3044\u3092\u8acb\u6c42\u3057\u307e\u3057\u305f\u3002 showOpenUriView.message2=\u8981\u6c42\u3068\u5171\u306b'\u9001\u4fe1'\u30d5\u30a9\u30fc\u30e0\u306b\u8a18\u5165\u3057\u307e\u3059\u304b\uff1f showOpenUriView.yesText=\u306f\u3044 showOpenUriView.noText=\u3044\u3044\u3048 showOpenUriView.rememberMyDecision=\u81ea\u5206\u306e\u6c7a\u5b9a\u3092\u8a18\u61b6\u3057\u307e\u3059\u3002 -showOpenUriViewSubmitAction.tooltip=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u652f\u6255\u3044\u8acb\u6c42\u3092\u30d5\u30a9\u30fc\u30e0\u306b\u5165\u529b\u3057\u307e\u3059 +showOpenUriViewSubmitAction.tooltip=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u652f\u6255\u3044\u8acb\u6c42\u3092\u30d5\u30a9\u30fc\u30e0\u306b\u5165\u529b\u3057\u307e\u3059 showOpenUriViewSubmitAction.mnemonicKey=O showOpenUriView.paymentRequestIgnored=\u652f\u6255\u3044\u8acb\u6c42\u3092\u53d7\u4fe1\u3057\u307e\u3057\u305f\u304c\u74b0\u5883\u8a2d\u5b9a\u306b\u3088\u308a\u7121\u5730\u3055\u308c\u307e\u3059\u3002 showOpenUriViewAction.tooltip=\u306f\u3044\u3001\u652f\u6255\u3044\u8acb\u6c42\u3092\u30d5\u30a9\u30fc\u30e0\u306b\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 @@ -449,7 +449,7 @@ showExportPrivateKeysPanel.filename.tooltip=\u30d7\u30e9\u30a4\u30d9\u30fc\u30c8 showExportPrivateKeysPanel.password.title=\u66f8\u304d\u51fa\u3059\u30d5\u30a1\u30a4\u30eb\u306e\u30d1\u30b9\u30ef\u30fc\u30c9 showExportPrivateKeysPanel.passwordProtect=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u30d1\u30b9\u30ef\u30fc\u30c9\u4fdd\u8b77\u3059\u308b\: showExportPrivateKeysPanel.doNotPasswordProtect=\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u30d1\u30b9\u30ef\u30fc\u30c9\u4fdd\u8b77\u3057\u306a\u3044\u3067\u304f\u3060\u3055\u3044\u3002 -showExportPrivateKeysPanel.doNotPasswordProtectWarningLabel=\u3042\u306a\u305f\u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u308b\u4eba\u306f\u8ab0\u3067\u3082\u3042\u306a\u305f\u306e\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u76d7\u3093\u3067\u4f7f\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u3066\u3057\u307e\u3044\u307e\u3059\u3002 +showExportPrivateKeysPanel.doNotPasswordProtectWarningLabel=\u3042\u306a\u305f\u306e\u30a8\u30af\u30b9\u30dd\u30fc\u30c8\u30d5\u30a1\u30a4\u30eb\u3092\u8aad\u307f\u8fbc\u3081\u308b\u4eba\u306f\u8ab0\u3067\u3082\u3042\u306a\u305f\u306e\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u76d7\u3093\u3067\u4f7f\u7528\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u3066\u3057\u307e\u3044\u307e\u3059\u3002 showExportPrivateKeysPanel.walletPasswordPrompt=\u8ca1\u5e03\u306e\u30d1\u30b9\u30ef\u30fc\u30c9 showExportPrivateKeysPanel.passwordPrompt=\u30d1\u30b9\u30ef\u30fc\u30c9 showExportPrivateKeysPanel.repeatPasswordPrompt=\u78ba\u8a8d @@ -540,7 +540,7 @@ deleteWalletConfirmDialog.newWalletCreated=\u30a6\u30a9\u30ec\u30c3\u30c8\u304c\ welcomePanel.text=\u3088\u3046\u3053\u305d welcomePanel.title=\u30de\u30eb\u30c1\u30d3\u30c3\u30c8\u3078\u3088\u3046\u3053\u305d welcomePanel.mnemonic=W -welcomePanel.paragraph1=\u30de\u30eb\u30c1\u30d3\u30c3\u30c8\u3067\u306f\u3042\u306a\u305f\u306e\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306f\u30a6\u30a9\u30ec\u30c3\u30c8\u306b\u53ce\u3081\u3089\u308c\u3066\u3044\u307e\u3059\u3002\u6574\u7406\u6574\u9813\u306e\u305f\u3081\u306b\u8907\u6570\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u3092\u4fdd\u6301\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u3089\u306f\u5de6\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u30d1\u30cd\u30eb\u306b\u3059\u3079\u3066\u8868\u793a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 +welcomePanel.paragraph1=\u30de\u30eb\u30c1\u30d3\u30c3\u30c8\u3067\u306f\u3042\u306a\u305f\u306e\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306f\u30a6\u30a9\u30ec\u30c3\u30c8\u306b\u53ce\u3081\u3089\u308c\u3066\u3044\u307e\u3059\u3002\u6574\u7406\u6574\u9813\u306e\u305f\u3081\u306b\u8907\u6570\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u3092\u4fdd\u6301\u3067\u304d\u307e\u3059\u3002\u3053\u308c\u3089\u306f\u5de6\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u30d1\u30cd\u30eb\u306b\u3059\u3079\u3066\u8868\u793a\u3055\u308c\u3066\u3044\u307e\u3059\u3002 welcomePanel.paragraph2=\u30e1\u30cb\u30e5\u30fc\u30aa\u30d7\u30b7\u30e7\u30f3\u3092\u4f7f\u7528\u3057\u3066\u76ee\u7684\u306b\u6cbf\u3063\u305f\u65b0\u898f\u30bf\u30d6\u3092\u958b\u3044\u3066\u304f\u3060\u3055\u3044\u3002"\u9001\u91d1"\u3001"\u8acb\u6c42"\u3001\u305d\u3057\u3066"\u53d6\u5f15"\u30bf\u30d6\u306f\u5e38\u306b\u958b\u3044\u3066\u3044\u307e\u3059\u3002\u305d\u306e\u307b\u304b\u306f\u30bf\u30d6\u30bf\u30a4\u30c8\u30eb\u306b\u3042\u308b\u5c0f\u3055\u306a"x"\u3092\u30af\u30ea\u30c3\u30af\u3059\u308b\u3060\u3051\u3067\u9589\u3058\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 welcomePanel.paragraph2.5=\u30e1\u30cb\u30e5\u30fc\u30aa\u30d7\u30b7\u30e7\u30f3\u306e"\u30d5\u30a1\u30a4\u30eb | \u30d1\u30b9\u30ef\u30fc\u30c9\u8ffd\u52a0"\u3088\u308a\u3042\u306a\u305f\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u3092\u30d1\u30b9\u30ef\u30fc\u30c9\u3067\u3088\u308a\u5f37\u56fa\u306b\u4fdd\u8b77\u3059\u308b\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 welcomePanel.paragraph3=\u591a\u304f\u306e\u30b9\u30af\u30ea\u30fc\u30f3\u4e0a\u306e\u30a2\u30a4\u30c6\u30e0\u306b\u306f\u30c4\u30fc\u30eb\u30d2\u30f3\u30c8\u5185\u306e\u8a73\u7d30\u304c\u3042\u308a\u307e\u3059\u3002\u3053\u306e\u30d2\u30f3\u30c8\u3092\u898b\u308b\u306b\u306f\u30a2\u30a4\u30c6\u30e0\u306e\u4e0a\u306b\u30de\u30a6\u30b9\u30ab\u30fc\u30bd\u30eb\u3092\u5408\u308f\u305b\u3066\u304f\u3060\u3055\u3044\u3002 @@ -566,7 +566,7 @@ addPasswordAction.mnemonic=A addPasswordPanel.password.title=\u30d1\u30b9\u30ef\u30fc\u30c9 addPasswordPanel.text=\u6b21\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u304c\u30d1\u30b9\u30ef\u30fc\u30c9\u4fdd\u8b77\u3055\u308c\u307e\u3059\u3002 addPasswordPanel.reminder1=\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u5b89\u5168\u306b\u7ba1\u7406\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -addPasswordPanel.reminder2=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u4f7f\u7528\u3059\u308b\u306b\u306f\u3053\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002 +addPasswordPanel.reminder2=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u4f7f\u7528\u3059\u308b\u306b\u306f\u3053\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002 addPasswordPanel.reminder3=\u5931\u308f\u308c\u305f\u5834\u5408\u306f\u5fa9\u5143\u3067\u304d\u307e\u305b\u3093\u3002 addPasswordPanel.enterPasswords=\u3053\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u306b\u4f7f\u7528\u3057\u305f\u3044\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 addPasswordPanel.addPasswordSuccess=\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u6b63\u5e38\u306b\u8ffd\u52a0\u3055\u308c\u307e\u3057\u305f\u3002 @@ -585,7 +585,7 @@ changePasswordPanel.text=\u3053\u306e\u8ca1\u5e03\u306e\u30d1\u30b9\u30ef\u30fc\ changePasswordPanel.newPasswordPrompt=\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9 changePasswordPanel.repeatNewPasswordPrompt=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u78ba\u8a8d changePasswordPanel.reminder1=\u30d1\u30b9\u30ef\u30fc\u30c9\u306f\u5b89\u5168\u306b\u7ba1\u7406\u3057\u3066\u304f\u3060\u3055\u3044\u3002 -changePasswordPanel.reminder2=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u3092\u4f7f\u7528\u3059\u308b\u306b\u306f\u3053\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002 +changePasswordPanel.reminder2=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u3092\u4f7f\u7528\u3059\u308b\u306b\u306f\u3053\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u304c\u5fc5\u8981\u3067\u3059\u3002 changePasswordPanel.reminder3=\u5931\u308f\u308c\u305f\u5834\u5408\u306f\u5fa9\u5143\u3067\u304d\u307e\u305b\u3093\u3002 changePasswordPanel.enterPasswords=\u3053\u306e\u30a6\u30a9\u30ec\u30c3\u30c8\u306b\u4f7f\u7528\u3057\u305f\u3044\u65b0\u898f\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 changePasswordPanel.enterCurrentPassword=\u73fe\u5728\u306e\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044\u3002 @@ -656,7 +656,7 @@ transactionConfidence.pending=\u4fdd\u7559\u4e2d/\u672a\u78ba\u8a8d transactionConfidence.appearedInBestChain=\u6700\u826f\u306e\u30c1\u30a7\u30a4\u30f3\u306e\u884c{0}\u306b\u51fa\u73fe\u3057\u307e\u3057\u305f\u3002 transactionConfidence.seenByUnknownNumberOfPeers=\u3053\u306e\u30c8\u30e9\u30f3\u30b6\u30af\u30b7\u30e7\u30f3\u304c\u898b\u3064\u304b\u3063\u305f\u30d4\u30a2\u306e\u6570\u306f\u4e0d\u660e\u3067\u3059\u3002 -currencyConverter.btcCanOnlyHaveEightDecimalPlaces=\u30d3\u30c3\u30c8\u30b3\u30a4\u30f3\u306e\u91d1\u984d\u306f\u5c0f\u6570\u70b9\u4ee5\u4e0b8 \u6841\u307e\u3067\u6301\u3064\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 +currencyConverter.btcCanOnlyHaveEightDecimalPlaces=\u30c9\u30fc\u30b8\u30b3\u30a4\u30f3\u306e\u91d1\u984d\u306f\u5c0f\u6570\u70b9\u4ee5\u4e0b8 \u6841\u307e\u3067\u6301\u3064\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 currencyConverter.fiatCanOnlyHaveSetDecimalPlaces=\u300c{0}\u300d\u3067\u6307\u5b9a\u3055\u308c\u305f\u91d1\u984d\u306f\u5c0f\u6570\u70b9\u4ee5\u4e0b{1}\u6841\u3092\u6301\u3064\u3053\u3068\u304c\u3067\u304d\u307e\u3059\u3002 currencyConverter.couldNotUnderstandAmount=\u300c{0}\u300d\u3092\u6570\u5024\u3068\u3057\u3066\u7406\u89e3\u3067\u304d\u307e\u305b\u3093\u3067\u3057\u305f\u3002 From 7b57743b16a4ceab00997b04b3051cfb17fa1252 Mon Sep 17 00:00:00 2001 From: langerhans Date: Thu, 20 Feb 2014 21:11:44 +0100 Subject: [PATCH 03/18] release notes --- release_notes.txt | 1 + release_notes_full.txt | 1 + 2 files changed, 2 insertions(+) diff --git a/release_notes.txt b/release_notes.txt index f3c4d06f9..65f026467 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -6,6 +6,7 @@ MultiDoge release notes: + Only allow nodes with more than 105000 blocks to connect. Prevents running on the wrong side of the recent fork. + Remove blockchain.info wallet import (leftover) + Only allow .wallet files to imported. Prevents users from trying to open .dat files. ++ Update Japanese translation #2: Switched to BitcoinAverage as BTC/fiat rate provider #5: Update French transaltion #7: Allow parallel running of MultiBit and MultiDoge diff --git a/release_notes_full.txt b/release_notes_full.txt index 40005b2b9..3d6314088 100644 --- a/release_notes_full.txt +++ b/release_notes_full.txt @@ -6,6 +6,7 @@ MultiDoge release notes: + Only allow nodes with more than 105000 blocks to connect. Prevents running on the wrong side of the recent fork. + Remove blockchain.info wallet import (leftover) + Only allow .wallet files to imported. Prevents users from trying to open .dat files. ++ Update Japanese translation #2: Switched to BitcoinAverage as BTC/fiat rate provider #5: Update French transaltion #7: Allow parallel running of MultiBit and MultiDoge From 7403f080c6556d94f5a11941ea5bc69918ef432d Mon Sep 17 00:00:00 2001 From: langerhans Date: Fri, 21 Feb 2014 18:50:59 +0100 Subject: [PATCH 04/18] Switch wallet info file saving to a LinkedHashMap to keep a consistent order on save and load. Of course that's just relevant if you haven't set labels, but it can reduce possible confusion. --- src/main/java/org/multibit/model/bitcoin/WalletInfoData.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/org/multibit/model/bitcoin/WalletInfoData.java b/src/main/java/org/multibit/model/bitcoin/WalletInfoData.java index 5d7991b59..174b50d8e 100644 --- a/src/main/java/org/multibit/model/bitcoin/WalletInfoData.java +++ b/src/main/java/org/multibit/model/bitcoin/WalletInfoData.java @@ -304,7 +304,7 @@ public void writeToFile(String walletInfoFilename, MultiBitWalletVersion walletV BufferedWriter out = null; try { // We write out all the receiving addresses. - HashMap allReceivingAddresses = new HashMap(); + LinkedHashMap allReceivingAddresses = new LinkedHashMap(); if (receivingAddresses != null) { for (WalletAddressBookData addressBookData : receivingAddresses) { allReceivingAddresses.put(addressBookData.address, addressBookData); From e596ddb3e14601d6d480873faa0de958e9702e37 Mon Sep 17 00:00:00 2001 From: langerhans Date: Sat, 22 Feb 2014 19:41:45 +0100 Subject: [PATCH 05/18] Remove unneded stuff from installer --- src/main/izpack/linux/install.xml | 2 +- src/main/izpack/windows/install.xml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/izpack/linux/install.xml b/src/main/izpack/linux/install.xml index 741a98d2c..9b1595c2d 100644 --- a/src/main/izpack/linux/install.xml +++ b/src/main/izpack/linux/install.xml @@ -65,7 +65,7 @@ - +