diff --git a/META-INF/MANIFEST.MF b/META-INF/MANIFEST.MF deleted file mode 100644 index 83370c8576..0000000000 --- a/META-INF/MANIFEST.MF +++ /dev/null @@ -1,3 +0,0 @@ -Manifest-Version: 1.0 -Main-Class: io.bitsquare.BitSquare - diff --git a/src/main/java/META-INF/MANIFEST.MF b/src/main/java/META-INF/MANIFEST.MF index 4a577d5aa6..83370c8576 100644 --- a/src/main/java/META-INF/MANIFEST.MF +++ b/src/main/java/META-INF/MANIFEST.MF @@ -1,3 +1,3 @@ Manifest-Version: 1.0 -Main-Class: io.bitsquare.BootstrapNode_ +Main-Class: io.bitsquare.BitSquare diff --git a/src/main/java/io/bitsquare/gui/market/trade/TakerOfferController.java b/src/main/java/io/bitsquare/gui/market/trade/TakerOfferController.java index 20e75a4ee6..fe4f9e1f50 100644 --- a/src/main/java/io/bitsquare/gui/market/trade/TakerOfferController.java +++ b/src/main/java/io/bitsquare/gui/market/trade/TakerOfferController.java @@ -190,7 +190,7 @@ public class TakerOfferController implements Initializable, ChildController public void onBankTransferInited(String tradeId) { setTradeId(tradeId); - headLineLabel.setText("Bank transfer initialised"); + headLineLabel.setText("Bank transfer initiated"); infoLabel.setText("Check your bank account and continue \n" + "when you have received the money."); receivedFiatButton.setDisable(false); } diff --git a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml index 0e272a9c0e..1331c5397c 100644 --- a/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml +++ b/src/main/java/io/bitsquare/gui/orders/pending/PendingTradeView.fxml @@ -118,7 +118,7 @@ -