Changeset 13761 in josm for trunk/src/org/openstreetmap/josm/gui

Timestamp:

2018-05-13T22:09:06+02:00 (6 years ago)

Author:

Don-vip

Message:

see #16288 - replace similar i18n strings (removes 35 strings from Launchpad)

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• ExceptionDialogUtil.java (modified) (1 diff)
• MapMover.java (modified) (2 diffs)
• bugreport/BugReportDialog.java (modified) (1 diff)
• conflict/tags/MultiValueResolutionDecision.java (modified) (4 diffs)
• dialogs/ChangesetDialog.java (modified) (1 diff)
• dialogs/ConflictDialog.java (modified) (2 diffs)
• dialogs/InspectPrimitiveDataText.java (modified) (2 diffs)
• dialogs/ValidatorDialog.java (modified) (1 diff)
• dialogs/properties/PropertiesDialog.java (modified) (1 diff)
• dialogs/relation/ChildRelationBrowser.java (modified) (1 diff)
• dialogs/relation/GenericRelationEditor.java (modified) (1 diff)
• dialogs/relation/actions/DownloadIncompleteMembersAction.java (modified) (1 diff)
• dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java (modified) (1 diff)
• download/OverpassQueryWizardDialog.java (modified) (1 diff)
• download/PlaceSelection.java (modified) (1 diff)
• io/ChangesetCellRenderer.java (modified) (1 diff)
• oauth/FullyAutomaticAuthorizationUI.java (modified) (1 diff)
• oauth/FullyAutomaticPropertiesPanel.java (modified) (2 diffs)
• preferences/PreferenceDialog.java (modified) (1 diff)
• preferences/advanced/AdvancedPreference.java (modified) (1 diff)
• preferences/display/ColorPreference.java (modified) (1 diff)
• preferences/display/GPXSettingsPanel.java (modified) (1 diff)
• preferences/imagery/ImageryPreference.java (modified) (1 diff)
• preferences/map/TaggingPresetPreference.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

@@ -281 +281 @@
                 Main.parent,
                 msg,
-                tr("Authentication Failed"),
+                tr("Authentication failed"),
                 JOptionPane.ERROR_MESSAGE,
                 ht("/ErrorMessages#AuthenticationFailed")

trunk/src/org/openstreetmap/josm/gui/MapMover.java

@@ -19 +19 @@
 import org.openstreetmap.josm.Main;
 import org.openstreetmap.josm.actions.mapmode.SelectAction;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
-import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.data.coor.EastNorth;
 import org.openstreetmap.josm.data.preferences.BooleanProperty;
 import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
 import org.openstreetmap.josm.spi.preferences.Config;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
+import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
 import org.openstreetmap.josm.tools.Destroyable;
 import org.openstreetmap.josm.tools.Pair;
@@ -146 +146 @@
         if (!Main.isPlatformOsx()) {
             registerActionShortcut(new ZoomerAction(",", "MapMover.Zoomer.in"),
-                    Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL));
+                    Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom In")), KeyEvent.VK_COMMA, Shortcut.CTRL));
 
             registerActionShortcut(new ZoomerAction(".", "MapMover.Zoomer.out"),
-                    Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL));
+                    Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom Out")), KeyEvent.VK_PERIOD, Shortcut.CTRL));
         }
     }

trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java

@@ -175 +175 @@
         panel.add(settings);
 
-        JButton sendBugReportButton = new JButton(tr("Report Bug"), ImageProvider.getIfAvailable("bug"));
+        JButton sendBugReportButton = new JButton(tr("Report bug"), ImageProvider.getIfAvailable("bug"));
         sendBugReportButton.addActionListener(e -> sendBug());
         panel.add(sendBugReportButton, GBC.eol().insets(0, 0, 0, 0).anchor(GBC.SOUTHEAST));

trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

@@ -143 +143 @@
     public String getChosenValue() {
         switch(type) {
-        case UNDECIDED: throw new IllegalStateException(tr("Not decided yet."));
+        case UNDECIDED: throw new IllegalStateException(tr("Not decided yet"));
         case KEEP_ONE: return value;
         case SUM_ALL_NUMERIC: return tags.getSummedValues(getKey());
@@ -238 +238 @@
         if (primitive == null) return;
         if (!isDecided())
-            throw new IllegalStateException(tr("Not decided yet."));
+            throw new IllegalStateException(tr("Not decided yet"));
         String key = tags.getKeys().iterator().next();
         if (type.equals(MultiValueDecisionType.KEEP_NONE)) {
@@ -274 +274 @@
         CheckParameterUtil.ensureParameterNotNull(primitive, "primitive");
         if (!isDecided())
-            throw new IllegalStateException(tr("Not decided yet."));
+            throw new IllegalStateException(tr("Not decided yet"));
         String key = tags.getKeys().iterator().next();
         return new ChangePropertyCommand(primitive, key, getChosenValue());
@@ -290 +290 @@
         CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
         if (!isDecided())
-            throw new IllegalStateException(tr("Not decided yet."));
+            throw new IllegalStateException(tr("Not decided yet"));
         String key = tags.getKeys().iterator().next();
         return new ChangePropertyCommand(primitives, key, getChosenValue());

trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

@@ -382 +382 @@
         CloseOpenChangesetsAction() {
             putValue(NAME, tr("Close open changesets"));
-            putValue(SHORT_DESCRIPTION, tr("Closes the selected open changesets"));
+            putValue(SHORT_DESCRIPTION, tr("Close the selected open changesets"));
             new ImageProvider("closechangeset").getResource().attachImageIcon(this, true);
             updateEnabledState();

trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

@@ -57 +57 @@
 import org.openstreetmap.josm.gui.MainApplication;
 import org.openstreetmap.josm.gui.NavigatableComponent;
+import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.PrimitiveRenderer;
-import org.openstreetmap.josm.gui.PopupMenuHandler;
 import org.openstreetmap.josm.gui.SideButton;
 import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
@@ -99 +99 @@
      */
     public ConflictDialog() {
-        super(tr("Conflict"), "conflict", tr("Resolve conflicts."),
+        super(tr("Conflict"), "conflict", tr("Resolve conflicts"),
                 Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
                 KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);

trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

@@ -147 +147 @@
         add(tr("Edited by: "), o.getUser() == null ? tr("<new object>")
                 : getNameAndId(o.getUser().getName(), o.getUser().getId()));
-        add(tr("Version: "), Integer.toString(o.getVersion()));
+        add(tr("Version:"), " ", Integer.toString(o.getVersion()));
         add(tr("In changeset: "), Integer.toString(o.getChangesetId()));
     }
@@ -212 +212 @@
     void addCoordinates(Node n) {
         if (n.isLatLonKnown()) {
-            add(tr("Coordinates: "),
+            add(tr("Coordinates:"), " ",
                     Double.toString(n.lat()), ", ",
                     Double.toString(n.lon()));

trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

@@ -99 +99 @@
     public ValidatorDialog() {
         super(tr("Validation Results"), "validator", tr("Open the validation window."),
-                Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation results")),
+                Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation Results")),
                         KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class);
 

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

@@ -676 +676 @@
             }
         } else {
-            setTitle(tr("Tags / Memberships"));
+            setTitle(tr("Tags/Memberships"));
         }
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

@@ -197 +197 @@
     class EditAction extends AbstractAction implements TreeSelectionListener {
         EditAction() {
-            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to."));
+            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to"));
             new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this, true);
             putValue(NAME, tr("Edit"));

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

@@ -800 +800 @@
     protected static JMenuItem addToWindowMenu(IRelationEditor re, String layerName) {
         Relation r = re.getRelation();
-        String name = r == null ? tr("New Relation") : r.getLocalName();
+        String name = r == null ? tr("New relation") : r.getLocalName();
         JosmAction focusAction = new JosmAction(
                 tr("Relation Editor: {0}", name == null && r != null ? r.getId() : name),

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java

@@ -40 +40 @@
         putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tr("Download all incomplete members"), sc));
         new ImageProvider("dialogs/relation", "downloadincomplete").getResource().attachImageIcon(this, true);
-        putValue(NAME, tr("Download Members"));
+        putValue(NAME, tr("Download members"));
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java

@@ -34 +34 @@
         putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members"));
         new ImageProvider("dialogs/relation", "downloadincompleteselected").getResource().attachImageIcon(this, true);
-        putValue(NAME, tr("Download Members"));
+        putValue(NAME, tr("Download members"));
         updateEnabledState();
     }

trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

@@ -81 +81 @@
         JPanel panel = new JPanel(new GridBagLayout());
 
-        JLabel searchLabel = new JLabel(tr("Search :"));
+        JLabel searchLabel = new JLabel(tr("Search:"));
         JTextComponent descPane = buildDescriptionSection();
         JScrollPane scroll = GuiHelper.embedInVerticalScrollPane(descPane);

trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

@@ -179 +179 @@
 
         SearchAction() {
-            putValue(NAME, tr("Search ..."));
+            putValue(NAME, tr("Search..."));
             new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
             putValue(SHORT_DESCRIPTION, tr("Click to start searching for places"));

trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java

@@ -75 +75 @@
             setToolTipText(buildToolTipText(cs));
         } else {
-            setText(tr("No open changeset"));
+            setText(tr("No open changesets"));
         }
         return this;

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

@@ -131 +131 @@
         gc.gridx = 0;
         gc.weightx = 0.0;
-        pnl.add(new JLabel(tr("Password: ")), gc);
+        pnl.add(new JLabel(tr("Password:")), gc);
 
         gc.gridx = 1;

trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java

@@ -20 +20 @@
  * Panel to enter username and password for the "fully automatic" authorization
  * procedure.
- * 
+ *
  * @see AuthorizationProcedure#FULLY_AUTOMATIC
  */
@@ -69 +69 @@
         gc.gridx = 0;
         gc.weightx = 0.0;
-        pnl.add(new JLabel(tr("Password: ")), gc);
+        pnl.add(new JLabel(tr("Password:")), gc);
 
         gc.gridx = 1;

trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

@@ -61 +61 @@
         JPanel pnl = new JPanel(new GridBagLayout());
 
-        JCheckBox expert = new JCheckBox(tr("Expert mode"));
+        JCheckBox expert = new JCheckBox(tr("Expert Mode"));
         expert.setSelected(ExpertToggleAction.isExpert());
         expert.addActionListener(e -> ExpertToggleAction.getInstance().actionPerformed(null));

trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

@@ -105 +105 @@
 
         txtFilter = new JosmTextField();
-        JLabel lbFilter = new JLabel(tr("Search: "));
+        JLabel lbFilter = new JLabel(tr("Search:"));
         lbFilter.setLabelFor(txtFilter);
         p.add(lbFilter);

trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

@@ -290 +290 @@
             }
         });
-        defaultSet = new JButton(tr("Set to default"));
+        defaultSet = new JButton(tr("Reset to default"));
         defaultSet.addActionListener(e -> {
             int sel = colors.getSelectedRow();

trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

@@ -217 +217 @@
 
         // hdopCircleGpsPoints
-        hdopCircleGpsPoints.setToolTipText(tr("Draw a circle from HDOP value."));
+        hdopCircleGpsPoints.setToolTipText(tr("Draw a circle from HDOP value"));
         add(hdopCircleGpsPoints, GBC.eop().insets(20, 0, 0, 0));
         ExpertToggleAction.addVisibilitySwitcher(hdopCircleGpsPoints);

trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

@@ -99 +99 @@
 
     private ImageryPreference() {
-        super(/* ICON(preferences/) */ "imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"),
+        super(/* ICON(preferences/) */ "imagery", tr("Imagery preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"),
                 false, new JTabbedPane());
     }

trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

@@ -82 +82 @@
                         } catch (IOException e) {
                             // Should not happen, but at least show message
-                            String msg = tr("Could not read tagging preset source {0}", source);
+                            String msg = tr("Could not read tagging preset source: {0}", source);
                             Logging.log(Logging.LEVEL_ERROR, msg, e);
                             JOptionPane.showMessageDialog(Main.parent, msg);