Merge pull request #3647 from rex4539/more-typos

Fix some more typos and cleanup

CONTRIBUTING.md

@@ -37,7 +37,7 @@ Anyone may participate in peer review which is expressed by comments in the pull
  - `Concept ACK` means "I agree in the general principle of this pull request";
  - `Nit` refers to trivial, often non-blocking issues.
 
-Please note that Pull Requests marked `NACK` and/or Github's `Change requested` are closed after 30 days if not addressed.
+Please note that Pull Requests marked `NACK` and/or GitHub's `Change requested` are closed after 30 days if not addressed.
 
 
 ## Compensation

desktop/src/main/java/bisq/desktop/components/SeparatedPhaseBars.java

@@ -92,7 +92,7 @@ private void updateWidth(double availableWidth) {
             if (totalDuration > 0) {
                 // We want to have a min. width for the breaks and for the phases which are important to the user but
                 // quite short (blind vote, vote reveal, result). If we display it correctly most of the space is
-                // consumed by the proposal phase. We we apply a min and max width and adjust the available width so
+                // consumed by the proposal phase. We apply a min and max width and adjust the available width so
                 // we have all phases displayed so that the text is fully readable. The proposal phase is shorter as
                 // it would be with correct display but we take that into account to have a better overall overview.
                 final double finalAvailableWidth = availableWidth;

desktop/src/main/java/bisq/desktop/components/TooltipUtil.java

@@ -37,7 +37,7 @@ public static void showTooltipIfTruncated(SkinBase skinBase, Labeled labeled) {
                     final Tooltip tooltip = new Tooltip(untruncatedText);
 
                     // Force tooltip to use color, as it takes in some cases the color of the parent label
-                    // and can't be overriden by class or id
+                    // and can't be overridden by class or id
                     tooltip.setStyle("-fx-text-fill: -bs-rd-tooltip-truncated;");
                     labeled.setTooltip(tooltip);
                 }

desktop/src/main/java/bisq/desktop/components/TxIdTextField.java

@@ -161,7 +161,7 @@ private void updateConfidence(TransactionConfidence confidence) {
         } else {
             //TODO we should show some placeholder in case of a tx which we are not aware of but which can be
             // confirmed already. This is for instance the case of the other peers trade fee tx, as it is not related
-            // to our wallet we don't have a confidence object but we should show that it is in a unknown state instead
+            // to our wallet we don't have a confidence object but we should show that it is in an unknown state instead
             // of not showing anything which causes confusion that the tx was not broadcasted. Best would be to request
             // it from a block explorer service but that is a bit too heavy for that use case...
             // Maybe a question mark with a tooltip explaining why we don't know about the confidence might be ok...

desktop/src/main/java/bisq/desktop/components/controlsfx/control/PopOver.java

@@ -561,7 +561,7 @@ public final BooleanProperty detachedProperty() {
      * Sets the value of the detached property.
      *
      * @param detached
-     *            if true the pop over will change its apperance to "detached"
+     *            if true the pop over will change its appearance to "detached"
      *            mode
      *
      * @see #detachedProperty()

desktop/src/main/java/bisq/desktop/components/paymentmethods/FasterPaymentsForm.java

@@ -44,7 +44,7 @@ public class FasterPaymentsForm extends PaymentMethodForm {
 
     public static int addFormForBuyer(GridPane gridPane, int gridRow,
                                       PaymentAccountPayload paymentAccountPayload) {
-        // do not translate as it is used in english only
+        // do not translate as it is used in English only
         addCompactTopLabelTextField(gridPane, ++gridRow, UK_SORT_CODE,
                 ((FasterPaymentsAccountPayload) paymentAccountPayload).getSortCode());
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.accountNr"),
@@ -66,7 +66,7 @@ public FasterPaymentsForm(PaymentAccount paymentAccount, AccountAgeWitnessServic
     @Override
     public void addFormForAddAccount() {
         gridRowFrom = gridRow + 1;
-        // do not translate as it is used in english only
+        // do not translate as it is used in English only
         sortCodeInputTextField = FormBuilder.addInputTextField(gridPane, ++gridRow, UK_SORT_CODE);
         sortCodeInputTextField.setValidator(inputValidator);
         sortCodeInputTextField.setValidator(new BranchIdValidator("GB"));
@@ -102,7 +102,7 @@ public void addFormForDisplayAccount() {
                 fasterPaymentsAccount.getAccountName(), Layout.FIRST_ROW_AND_GROUP_DISTANCE);
         addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("shared.paymentMethod"),
                 Res.get(fasterPaymentsAccount.getPaymentMethod().getId()));
-        // do not translate as it is used in english only
+        // do not translate as it is used in English only
         addCompactTopLabelTextField(gridPane, ++gridRow, UK_SORT_CODE, fasterPaymentsAccount.getSortCode());
         TextField field = addCompactTopLabelTextField(gridPane, ++gridRow, Res.get("payment.accountNr"),
                 fasterPaymentsAccount.getAccountNr()).second;

desktop/src/main/java/bisq/desktop/components/paymentmethods/JapanBankTransferForm.java

@@ -219,7 +219,7 @@ public String fromString(String s) {
                 String bankNameFull = StringUtils.substringAfter(bank, JapanBankData.SPACE);
                 if (bankNameFull != null)
                 {
-                    // parse beginning as japanese bank name
+                    // parse beginning as Japanese bank name
                     String bankNameJa = StringUtils.substringBefore(bankNameFull, JapanBankData.SPACE);
                     if (bankNameJa != null)
                     {

desktop/src/main/java/bisq/desktop/components/paymentmethods/data/JapanBankData.java

@@ -52,7 +52,7 @@ public class JapanBankData
        Returns the main list of ~500 banks in Japan with bank codes,
        but since 90%+ of people will be using one of ~30 major banks,
        we hard-code those at the top for easier pull-down selection,
-       and add their English names in paranthesis for foreigners.
+       and add their English names in parenthesis for foreigners.
     */
     public static List<String> prettyPrintBankList() // {{{
     {
@@ -863,11 +863,11 @@ public static final String getString(String id)
                 if (ja) return "入力は漢字、ひらがな、またはカタカナでなければなりません";
                 return "Input must be Kanji, Hiragana, or Katakana";
             case "japanese.validation.regex":
-                // epic regex to only match japanese input
-                return "[" + // match any of the these characters:
+                // epic regex to only match Japanese input
+                return "[" + // match any of these characters:
                 // "Ａ-ｚ" + // full-width alphabet
                 // "０-９" + // full-width numerals
-                "一-龯" + // all japanese kanji (0x4e00 ~ 0x9fcf)
+                "一-龯" + // all Japanese kanji (0x4e00 ~ 0x9fcf)
                 "ぁ-ゔ" + // full-width hiragana (0x3041 ~ 0x3094)
                 "ァ-・" + // full-width katakana (0x30a1 ~ 0x30fb)
                 "ぁ-ゞ" + // half-width hiragana

desktop/src/main/java/bisq/desktop/util/GUIUtil.java

@@ -957,7 +957,7 @@ public static void setFitToRowsForTableView(TableView tableView,
         tableView.setVisible(false);
         // We need to delay the setter to the next render frame as otherwise views don' get updated in some cases
         // Not 100% clear what causes that issue, but seems the requestLayout method is not called otherwise.
-        // We still need to set the height immediately, otherwise some views render a incorrect layout.
+        // We still need to set the height immediately, otherwise some views render an incorrect layout.
         tableView.setPrefHeight(height);
 
         UserThread.execute(() -> {

relay/src/main/java/bisq/relay/RelayMain.java

@@ -40,7 +40,7 @@ public class RelayMain {
     private static RelayService relayService;
 
     static {
-        // Need to set default locale initially otherwise we get problems at non-english OS
+        // Need to set default locale initially otherwise we get problems at non-English OS
         Locale.setDefault(new Locale("en", Locale.getDefault().getCountry()));
     }