Spelling fixes

This commit is contained in:
Jindra Petřík
2025-09-06 02:35:59 +02:00
parent 3b82db57ba
commit 3d2c305846
14 changed files with 64 additions and 64 deletions

Binary file not shown.

View File

@@ -227,7 +227,7 @@ public class Timeline {
static {
DecimalFormatSymbols symbols = new DecimalFormatSymbols(Locale.US);
svgPathDecimalFormat = new DecimalFormat("0.##", symbols); // max 3 desetinná místa, žádné zbytečné nuly
svgPathDecimalFormat = new DecimalFormat("0.##", symbols); // max 3 decimal places, no additional zeros
}
private static String formatDoubleSvg(double value) {

View File

@@ -4,7 +4,7 @@
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 3.0 of the License, or (at your o3ption) any later version.
* version 3.0 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of

View File

@@ -112,10 +112,10 @@
<EventHandler event="actionPerformed" listener="java.awt.event.ActionListener" parameters="java.awt.event.ActionEvent" handler="jBtnNextActionPerformed"/>
</Events>
</Component>
<Component class="javax.swing.JLabel" name="jLblOccurences">
<Component class="javax.swing.JLabel" name="jLblOccurrences">
<Properties>
<Property name="text" type="java.lang.String" editor="org.netbeans.modules.i18n.form.FormI18nStringEditor">
<ResourceString bundle="jsyntaxpane/Bundle.properties" key="QuickFindDialog.Occurences.Zero" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
<ResourceString bundle="jsyntaxpane/Bundle.properties" key="QuickFindDialog.Occurrences.Zero" replaceFormat="java.util.ResourceBundle.getBundle(&quot;{bundleNameSlashes}&quot;).getString(&quot;{key}&quot;)"/>
</Property>
<Property name="border" type="javax.swing.border.Border" editor="org.netbeans.modules.form.editors2.BorderEditor">
<Border info="org.netbeans.modules.form.compat2.border.EmptyBorderInfo">

View File

@@ -160,7 +160,7 @@ public class QuickFindDialog extends javax.swing.JDialog
jSeparator3 = new javax.swing.JToolBar.Separator();
jBtnPrev = new javax.swing.JButton();
jBtnNext = new javax.swing.JButton();
jLblOccurences = new javax.swing.JLabel();
jLblOccurrences = new javax.swing.JLabel();
jChkIgnoreCase = new javax.swing.JCheckBox();
jChkRegExp = new javax.swing.JCheckBox();
jChkWrap = new javax.swing.JCheckBox();
@@ -213,10 +213,10 @@ public class QuickFindDialog extends javax.swing.JDialog
});
jToolBar1.add(jBtnNext);
jLblOccurences.setText(bundle.getString("QuickFindDialog.Occurences.Zero")); // NOI18N
jLblOccurences.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 5, 0, 5));
jToolBar1.add(jLblOccurences);
jLblOccurrences.setText(bundle.getString("QuickFindDialog.Occurrences.Zero")); // NOI18N
jLblOccurrences.setBorder(javax.swing.BorderFactory.createEmptyBorder(0, 5, 0, 5));
jToolBar1.add(jLblOccurrences);
jChkIgnoreCase.setMnemonic('C');
jChkIgnoreCase.setText(bundle.getString("QuickFindDialog.jChkIgnoreCase.text")); // NOI18N
jChkIgnoreCase.setFocusable(false);
@@ -264,7 +264,7 @@ public class QuickFindDialog extends javax.swing.JDialog
} else {
jLblStatus.setText(java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle").getString("QuickFindDialog.NotFound"));
}
updateOccurences();
updateOccurrences();
}//GEN-LAST:event_jBtnNextActionPerformed
private void jBtnPrevActionPerformed(java.awt.event.ActionEvent evt) {//GEN-FIRST:event_jBtnPrevActionPerformed
@@ -273,20 +273,20 @@ public class QuickFindDialog extends javax.swing.JDialog
} else {
jLblStatus.setText(java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle").getString("QuickFindDialog.NotFound"));
}
updateOccurences();
updateOccurrences();
}//GEN-LAST:event_jBtnPrevActionPerformed
//JPEXS
private void updateOccurences() {
private void updateOccurrences() {
if (dsd.get().getOccurrencesCount(target.get()) == 0)
{
jLblOccurences.setText(
java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle").getString("QuickFindDialog.Occurences.Zero")
jLblOccurrences.setText(
java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle").getString("QuickFindDialog.Occurrences.Zero")
);
return;
}
jLblOccurences.setText(
java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle").getString("QuickFindDialog.Occurences")
jLblOccurrences.setText(
java.util.ResourceBundle.getBundle("jsyntaxpane/Bundle").getString("QuickFindDialog.Occurrences")
.replace("%current%", "" + dsd.get().getCurrentOccurrence(target.get()))
.replace("%total%", "" + dsd.get().getOccurrencesCount(target.get()))
);
@@ -299,7 +299,7 @@ public class QuickFindDialog extends javax.swing.JDialog
private javax.swing.JCheckBox jChkRegExp;
private javax.swing.JCheckBox jChkWrap;
private javax.swing.JLabel jLabel1;
private javax.swing.JLabel jLblOccurences;
private javax.swing.JLabel jLblOccurrences;
private javax.swing.JLabel jLblStatus;
private javax.swing.JToolBar.Separator jSeparator1;
private javax.swing.JToolBar.Separator jSeparator2;
@@ -330,7 +330,7 @@ public class QuickFindDialog extends javax.swing.JDialog
String toFind = jTxtFind.getText();
if (toFind == null || toFind.isEmpty()) {
jLblStatus.setText(null);
jLblOccurences.setText(null);
jLblOccurrences.setText(null);
return;
}
try {
@@ -347,7 +347,7 @@ public class QuickFindDialog extends javax.swing.JDialog
} else {
jLblStatus.setText(null);
}
updateOccurences(); //JPEXS
updateOccurrences(); //JPEXS
setSize(getPreferredSize());
pack();
} catch (PatternSyntaxException e) {

View File

@@ -37,5 +37,5 @@ ScriptRunnerAction.ScriptError = Script Error
ScriptRunnerAction.ScriptEngineNotFound = Script Engine for [{0}] not found. Disable this Action?
ShowAbbsAction.NoAbbsForType = No Abbreviations exist for this content type
QuickFindDialog.Occurences = (%current%/%total%)
QuickFindDialog.Occurences.Zero = (0)
QuickFindDialog.Occurrences = (%current%/%total%)
QuickFindDialog.Occurrences.Zero = (0)

View File

@@ -37,5 +37,5 @@ ScriptRunnerAction.ScriptError = Chyba skriptu
ScriptRunnerAction.ScriptEngineNotFound = Engine skriptu [{0}] nenalezen. Zak\u00e1zat tuto akci?
ShowAbbsAction.NoAbbsForType = Pro tento typ obsahu neexistuj\u00ed zkratky
QuickFindDialog.Occurences = (%current%/%total%)
QuickFindDialog.Occurences.Zero = (0)
QuickFindDialog.Occurrences = (%current%/%total%)
QuickFindDialog.Occurrences.Zero = (0)

View File

@@ -40,5 +40,5 @@ ScriptRunnerAction.ErrorExecutingScript = Komut dosyas\u0131 \u00e7al\u0131\u015
ScriptRunnerAction.ScriptError = Komut Dosyas\u0131 Hatas\u0131
ScriptRunnerAction.ScriptEngineNotFound = [{0}] i\u00e7in komut dosyas\u0131 bulunamad\u0131. Bu eylem devre d\u0131\u015f\u0131 b\u0131rak\u0131ls\u0131n m\u0131?
ShowAbbsAction.NoAbbsForType = Bu i\u00e7erik t\u00fcr\u00fc i\u00e7in k\u0131saltmalar yok
QuickFindDialog.Occurences = (%current%/%total%)
QuickFindDialog.Occurences.Zero = (0)
QuickFindDialog.Occurrences = (%current%/%total%)
QuickFindDialog.Occurrences.Zero = (0)

View File

@@ -83,7 +83,7 @@
<li>Configuration is now stored in easily readable/editable textual format (TOML) (saved also to older binary format, but loading is preferred from the new TOML file, when exists)</li>
<li>`-configFile` and `-storeConfigFile` commandline parameters for loading/storing configuration file</li>
<li>Option to .bat and .sh file to enable J2D_D3D_NO_HWCHECK</li>
<li>#2404 Quick find in text/script editors - show number of occurences</li>
<li>#2404 Quick find in text/script editors - show number of occurrences</li>
<li>#1418 Option to make main window Always on top</li>
<li>#289 Support for Aero Snap on Windows</li>
<li>#2412 Show coordinates on stage mouse move for up to 2 decimal places</li>

View File

@@ -135,7 +135,7 @@ public class HighlightsPanel extends JPanel {
return;
}
if (line != currentLine && painter instanceof OccurrencesMarker) {
setToolTipText(AppStrings.translate("highlighter.occurences"));
setToolTipText(AppStrings.translate("highlighter.occurrences"));
return;
}

View File

@@ -146,20 +146,20 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
private KeyEventPostProcessor kevEventPostProcessor;
private Set<Integer> occurencesPositions = new HashSet<>();
private Set<Integer> occurrencesPositions = new HashSet<>();
private Color basicUnderlineColor = new Color(0, 0, 255);
private Color otherScriptUnderlineColor = new Color(0, 255, 0);
private Color otherFileUnderlineColor = new Color(255, 0, 255);
private UnderlinePainter underLinePainter = new UnderlinePainter(basicUnderlineColor, null);
private UnderlinePainter underLineMarkOccurencesPainter = new UnderlinePainter(basicUnderlineColor, DEFAULT_COLOR);
private UnderlinePainter underLineMarkOccurrencesPainter = new UnderlinePainter(basicUnderlineColor, DEFAULT_COLOR);
private UnderlinePainter underLineOtherScriptPainter = new UnderlinePainter(otherScriptUnderlineColor, null);
private UnderlinePainter underLineOtherScriptMarkOccurencesPainter = new UnderlinePainter(otherScriptUnderlineColor, DEFAULT_COLOR);
private UnderlinePainter underLineOtherScriptMarkOccurrencesPainter = new UnderlinePainter(otherScriptUnderlineColor, DEFAULT_COLOR);
private UnderlinePainter underLineOtherFilePainter = new UnderlinePainter(otherFileUnderlineColor, null);
private UnderlinePainter underLineOtherFileMarkOccurencesPainter = new UnderlinePainter(otherFileUnderlineColor, DEFAULT_COLOR);
private UnderlinePainter underLineOtherFileMarkOccurrencesPainter = new UnderlinePainter(otherFileUnderlineColor, DEFAULT_COLOR);
private Token lastUnderlined;
private LinkType lastUnderlinedLinkType = LinkType.NO_LINK;
@@ -278,12 +278,12 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
public void removeMarkers() {
Markers.removeMarkers(pane, marker);
Markers.removeMarkers(pane, underLinePainter);
Markers.removeMarkers(pane, underLineMarkOccurencesPainter);
Markers.removeMarkers(pane, underLineMarkOccurrencesPainter);
Markers.removeMarkers(pane, underLineOtherScriptPainter);
Markers.removeMarkers(pane, underLineOtherScriptMarkOccurencesPainter);
Markers.removeMarkers(pane, underLineOtherScriptMarkOccurrencesPainter);
Markers.removeMarkers(pane, underLineOtherFilePainter);
Markers.removeMarkers(pane, underLineOtherFileMarkOccurencesPainter);
occurencesPositions.clear();
Markers.removeMarkers(pane, underLineOtherFileMarkOccurrencesPainter);
occurrencesPositions.clear();
}
public void removeErrorMarkers() {
@@ -387,15 +387,15 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
Markers.SimpleMarker markerKind = marker;
if (lastUnderlined == referenceToken) {
if (lastUnderlinedLinkType == LinkType.LINK_OTHER_SCRIPT) {
markerKind = underLineOtherScriptMarkOccurencesPainter;
markerKind = underLineOtherScriptMarkOccurrencesPainter;
} else if (lastUnderlinedLinkType == LinkType.LINK_OTHER_FILE) {
markerKind = underLineOtherFileMarkOccurencesPainter;
markerKind = underLineOtherFileMarkOccurrencesPainter;
} else {
markerKind = underLineMarkOccurencesPainter;
markerKind = underLineMarkOccurrencesPainter;
}
}
Markers.markToken(pane, referenceToken, markerKind);
occurencesPositions.add(referenceToken.start);
occurrencesPositions.add(referenceToken.start);
}
}
sDoc.readUnlock();
@@ -412,15 +412,15 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
Markers.SimpleMarker markerKind = marker;
if (lastUnderlined == referenceToken) {
if (lastUnderlinedLinkType == LinkType.LINK_OTHER_SCRIPT) {
markerKind = underLineOtherScriptMarkOccurencesPainter;
markerKind = underLineOtherScriptMarkOccurrencesPainter;
} else if (lastUnderlinedLinkType == LinkType.LINK_OTHER_FILE) {
markerKind = underLineOtherFileMarkOccurencesPainter;
markerKind = underLineOtherFileMarkOccurrencesPainter;
} else {
markerKind = underLineMarkOccurencesPainter;
markerKind = underLineMarkOccurrencesPainter;
}
}
Markers.markToken(pane, referenceToken, markerKind);
occurencesPositions.add(referenceToken.start);
occurrencesPositions.add(referenceToken.start);
}
}
}
@@ -433,17 +433,17 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
Markers.SimpleMarker markerKind = marker;
if (lastUnderlined == definitionToken) {
if (lastUnderlinedLinkType == LinkType.LINK_OTHER_SCRIPT) {
markerKind = underLineOtherScriptMarkOccurencesPainter;
markerKind = underLineOtherScriptMarkOccurrencesPainter;
} else if (lastUnderlinedLinkType == LinkType.LINK_OTHER_FILE) {
markerKind = underLineOtherFileMarkOccurencesPainter;
markerKind = underLineOtherFileMarkOccurrencesPainter;
} else {
markerKind = underLineMarkOccurencesPainter;
markerKind = underLineMarkOccurrencesPainter;
}
}
if (tokenTypes.contains(definitionToken.type)) {
Markers.markToken(pane, definitionToken, markerKind);
}
occurencesPositions.add(definitionToken.start);
occurrencesPositions.add(definitionToken.start);
for (int i : definitionPosToReferences.get(definitionPos)) {
if (separatorPosToType.containsKey(i)) {
continue;
@@ -453,15 +453,15 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
markerKind = marker;
if (lastUnderlined == referenceToken) {
if (lastUnderlinedLinkType == LinkType.LINK_OTHER_SCRIPT) {
markerKind = underLineOtherScriptMarkOccurencesPainter;
markerKind = underLineOtherScriptMarkOccurrencesPainter;
} else if (lastUnderlinedLinkType == LinkType.LINK_OTHER_FILE) {
markerKind = underLineOtherFileMarkOccurencesPainter;
markerKind = underLineOtherFileMarkOccurrencesPainter;
} else {
markerKind = underLineMarkOccurencesPainter;
markerKind = underLineMarkOccurrencesPainter;
}
}
Markers.markToken(pane, referenceToken, markerKind);
occurencesPositions.add(referenceToken.start);
occurrencesPositions.add(referenceToken.start);
}
}
}
@@ -820,11 +820,11 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
if (t != lastUnderlined) {
if (t == null || lastUnderlined == null || !t.equals(lastUnderlined)) {
MyMarkers.removeMarkers(pane, underLinePainter);
MyMarkers.removeMarkers(pane, underLineMarkOccurencesPainter);
MyMarkers.removeMarkers(pane, underLineMarkOccurrencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherScriptPainter);
MyMarkers.removeMarkers(pane, underLineOtherScriptMarkOccurencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherScriptMarkOccurrencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherFilePainter);
MyMarkers.removeMarkers(pane, underLineOtherFileMarkOccurencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherFileMarkOccurrencesPainter);
lastUnderlinedLinkType = t == null ? LinkType.NO_LINK : getLinkType(t);
if (t != null && lastUnderlinedLinkType != LinkType.NO_LINK) {
@@ -844,13 +844,13 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
if (lastUnderlined != null) {
Highlighter.HighlightPainter painter = underLinePainter;
if (occurencesPositions.contains(lastUnderlined.start)) {
if (occurrencesPositions.contains(lastUnderlined.start)) {
if (lastUnderlinedLinkType == LinkType.LINK_OTHER_SCRIPT) {
painter = underLineOtherScriptMarkOccurencesPainter;
painter = underLineOtherScriptMarkOccurrencesPainter;
} else if (lastUnderlinedLinkType == LinkType.LINK_OTHER_FILE) {
painter = underLineOtherFileMarkOccurencesPainter;
painter = underLineOtherFileMarkOccurrencesPainter;
} else {
painter = underLineMarkOccurencesPainter;
painter = underLineMarkOccurrencesPainter;
}
removeMarkers();
markTokenAt(pane.getCaretPosition());
@@ -870,11 +870,11 @@ public class VariableMarker implements SyntaxComponent, CaretListener, PropertyC
if (lastUnderlined != null) {
lastUnderlined = null;
MyMarkers.removeMarkers(pane, underLinePainter);
MyMarkers.removeMarkers(pane, underLineMarkOccurencesPainter);
MyMarkers.removeMarkers(pane, underLineMarkOccurrencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherScriptPainter);
MyMarkers.removeMarkers(pane, underLineOtherScriptMarkOccurencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherScriptMarkOccurrencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherFilePainter);
MyMarkers.removeMarkers(pane, underLineOtherFileMarkOccurencesPainter);
MyMarkers.removeMarkers(pane, underLineOtherFileMarkOccurrencesPainter);
removeMarkers();
markTokenAt(pane.getCaretPosition());

View File

@@ -1059,7 +1059,7 @@ menu.file.view.alwaysOnTop = Always on top
contextmenu.showDetail = Show detail
highlighter.occurences = Mark occurences
highlighter.occurrences = Mark occurrences
highlighter.currentLine = Current line
highlighter.error = Error: %error%

View File

@@ -1058,7 +1058,7 @@ menu.file.view.alwaysOnTop = V\u017edy navrchu
contextmenu.showDetail = Zobrazit detail
highlighter.occurences = Ozna\u010dit v\u00fdskyty
highlighter.occurrences = Ozna\u010dit v\u00fdskyty
highlighter.currentLine = Aktu\u00e1ln\u00ed \u0159\u00e1dek
highlighter.error = Chyba: %error%

View File

@@ -1039,7 +1039,7 @@ contextmenu.showInEasy = Basit d\u00fczenleyicide g\u00f6ster
work.debugging.start = Flash i\u00e7erik hata ay\u0131klay\u0131c\u0131s\u0131n\u0131 ba\u015flatma
menu.file.view.alwaysOnTop = Her zaman \u00fcstte
contextmenu.showDetail = Ayr\u0131nt\u0131lar\u0131 g\u00f6ster
highlighter.occurences = Olu\u015fumlar\u0131 i\u015faretle
highlighter.occurrences = Olu\u015fumlar\u0131 i\u015faretle
highlighter.currentLine = Ge\u00e7erli sat\u0131r
highlighter.error = Hata: %error%
message.link.clicked = Ba\u015fka bir SWF dosyas\u0131na giden bir ba\u011flant\u0131ya t\u0131klad\u0131n\u0131z.