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


Ignore:
Timestamp:
2018-05-13T22:09:06+02:00 (16 months ago)
Author:
Don-vip
Message:

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

Location:
trunk/src/org/openstreetmap/josm
Files:
39 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/org/openstreetmap/josm/actions/CloseChangesetAction.java

    r13329 r13761  
    4545        super(tr("Close open changesets"),
    4646            "closechangeset",
    47             tr("Closes open changesets"),
     47            tr("Close open changesets"),
    4848            Shortcut.registerShortcut("system:closechangeset",
    49                 tr("File: {0}", tr("Closes open changesets")),
     49                tr("File: {0}", tr("Close open changesets")),
    5050                KeyEvent.VK_Q, Shortcut.ALT_CTRL),
    5151            true
  • trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java

    r13106 r13761  
    3333     */
    3434    public DownloadPrimitiveAction() {
    35         super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID."),
     35        super(tr("Download object..."), "downloadprimitive", tr("Download OSM object by ID"),
    3636                SHORTCUT, true);
    3737        putValue("help", ht("/Action/DownloadObject"));
  • trunk/src/org/openstreetmap/josm/actions/ImageryAdjustAction.java

    r13694 r13761  
    254254                    "If you want to save the offset as bookmark, enter the bookmark name below",
    255255                    Main.getProjection().toString())), GBC.eop());
    256             pnl.add(new JLabel(tr("Offset: ")), GBC.std());
     256            pnl.add(new JLabel(tr("Offset:")), GBC.std());
    257257            pnl.add(tOffset, GBC.eol().fill(GBC.HORIZONTAL).insets(0, 0, 0, 5));
    258258            pnl.add(new JLabel(tr("Bookmark name: ")), GBC.std());
  • trunk/src/org/openstreetmap/josm/actions/JumpToAction.java

    r13417 r13761  
    4949     */
    5050    public JumpToAction() {
    51         super(tr("Jump To Position"), (ImageProvider) null, tr("Opens a dialog that allows to jump to a specific location"),
    52                 Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump To Position")),
     51        super(tr("Jump to Position"), (ImageProvider) null, tr("Opens a dialog that allows to jump to a specific location"),
     52                Shortcut.registerShortcut("tools:jumpto", tr("Tool: {0}", tr("Jump to Position")),
    5353                        KeyEvent.VK_J, Shortcut.CTRL), true, "action/jumpto", true);
    5454        putValue("help", ht("/Action/JumpToPosition"));
  • trunk/src/org/openstreetmap/josm/actions/ReverseWayAction.java

    r13453 r13761  
    138138            c.addAll(revResult.getCommands());
    139139        }
    140         MainApplication.undoRedo.add(new SequenceCommand(tr("Reverse ways"), c));
     140        MainApplication.undoRedo.add(new SequenceCommand(tr("Reverse Ways"), c));
    141141    }
    142142
  • trunk/src/org/openstreetmap/josm/actions/SessionSaveAsAction.java

    r12678 r13761  
    118118
    119119        if (zipRequired) {
    120             fc = createAndOpenFileChooser(false, false, tr("Save session"), joz, JFileChooser.FILES_ONLY, "lastDirectory");
     120            fc = createAndOpenFileChooser(false, false, tr("Save Session"), joz, JFileChooser.FILES_ONLY, "lastDirectory");
    121121        } else {
    122             fc = createAndOpenFileChooser(false, false, tr("Save session"), Arrays.asList(jos, joz), jos,
     122            fc = createAndOpenFileChooser(false, false, tr("Save Session"), Arrays.asList(jos, joz), jos,
    123123                    JFileChooser.FILES_ONLY, "lastDirectory");
    124124        }
  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r13434 r13761  
    208208
    209209        private PropertiesMembershipDialog(boolean preselectNew, boolean queryTags, boolean queryMemberships) {
    210             super(Main.parent, tr("Tags / Memberships"), tr("Unglue"), tr("Cancel"));
     210            super(Main.parent, tr("Tags/Memberships"), tr("Unglue"), tr("Cancel"));
    211211            setButtonIcons("unglueways", "cancel");
    212212
  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadNotesTask.java

    r13437 r13761  
    119119
    120120        DownloadTask(OsmServerReader reader, ProgressMonitor progressMonitor) {
    121             super(tr("Downloading Notes"), progressMonitor, false);
     121            super(tr("Downloading notes"), progressMonitor, false);
    122122            this.reader = reader;
    123123        }
  • trunk/src/org/openstreetmap/josm/actions/mapmode/AddNoteAction.java

    r13435 r13761  
    7272        map.selectMapMode(map.mapModeSelect);
    7373
    74         NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create new note"), tr("Create note"));
     74        NoteInputDialog dialog = new NoteInputDialog(Main.parent, tr("Create a new note"), tr("Create note"));
    7575        dialog.showNoteDialog(tr("Enter a detailed comment to create a note"), ImageProvider.get("dialogs/notes", "note_new"));
    7676
  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r13545 r13761  
    171171     */
    172172    public SearchAction() {
    173         super(tr("Search..."), "dialogs/search", tr("Search for objects."),
     173        super(tr("Search..."), "dialogs/search", tr("Search for objects"),
    174174                Shortcut.registerShortcut("system:find", tr("Search..."), KeyEvent.VK_F, Shortcut.CTRL), true);
    175175        putValue("help", ht("/Action/Search"));
  • trunk/src/org/openstreetmap/josm/actions/upload/ApiPreconditionCheckerHook.java

    r13414 r13761  
    7878                                    key, Long.toString(osmPrimitive.getId()), Tagged.MAX_TAG_LENGTH, value.length()
    7979                            ),
    80                             tr("Precondition Violation"),
     80                            tr("Precondition violation"),
    8181                            JOptionPane.ERROR_MESSAGE
    8282                    );
  • trunk/src/org/openstreetmap/josm/data/projection/CustomProjection.java

    r13628 r13761  
    632632    public static double parseDouble(Map<String, String> parameters, String parameterName) throws ProjectionConfigurationException {
    633633        if (!parameters.containsKey(parameterName))
    634             throw new ProjectionConfigurationException(tr("Unknown parameter ''{0}''", parameterName));
     634            throw new ProjectionConfigurationException(tr("Unknown parameter: ''{0}''", parameterName));
    635635        return parseDouble(Optional.ofNullable(parameters.get(parameterName)).orElseThrow(
    636636                () -> new ProjectionConfigurationException(tr("Expected number argument for parameter ''{0}''", parameterName))),
  • trunk/src/org/openstreetmap/josm/gui/ExceptionDialogUtil.java

    r13499 r13761  
    281281                Main.parent,
    282282                msg,
    283                 tr("Authentication Failed"),
     283                tr("Authentication failed"),
    284284                JOptionPane.ERROR_MESSAGE,
    285285                ht("/ErrorMessages#AuthenticationFailed")
  • trunk/src/org/openstreetmap/josm/gui/MapMover.java

    r12881 r13761  
    1919import org.openstreetmap.josm.Main;
    2020import org.openstreetmap.josm.actions.mapmode.SelectAction;
    21 import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
    22 import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
    2321import org.openstreetmap.josm.data.coor.EastNorth;
    2422import org.openstreetmap.josm.data.preferences.BooleanProperty;
    2523import org.openstreetmap.josm.gui.MapViewState.MapViewPoint;
    2624import org.openstreetmap.josm.spi.preferences.Config;
     25import org.openstreetmap.josm.spi.preferences.PreferenceChangeEvent;
     26import org.openstreetmap.josm.spi.preferences.PreferenceChangedListener;
    2727import org.openstreetmap.josm.tools.Destroyable;
    2828import org.openstreetmap.josm.tools.Pair;
     
    146146        if (!Main.isPlatformOsx()) {
    147147            registerActionShortcut(new ZoomerAction(",", "MapMover.Zoomer.in"),
    148                     Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom in")), KeyEvent.VK_COMMA, Shortcut.CTRL));
     148                    Shortcut.registerShortcut("view:zoominalternate", tr("Map: {0}", tr("Zoom In")), KeyEvent.VK_COMMA, Shortcut.CTRL));
    149149
    150150            registerActionShortcut(new ZoomerAction(".", "MapMover.Zoomer.out"),
    151                     Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom out")), KeyEvent.VK_PERIOD, Shortcut.CTRL));
     151                    Shortcut.registerShortcut("view:zoomoutalternate", tr("Map: {0}", tr("Zoom Out")), KeyEvent.VK_PERIOD, Shortcut.CTRL));
    152152        }
    153153    }
  • trunk/src/org/openstreetmap/josm/gui/bugreport/BugReportDialog.java

    r13647 r13761  
    175175        panel.add(settings);
    176176
    177         JButton sendBugReportButton = new JButton(tr("Report Bug"), ImageProvider.getIfAvailable("bug"));
     177        JButton sendBugReportButton = new JButton(tr("Report bug"), ImageProvider.getIfAvailable("bug"));
    178178        sendBugReportButton.addActionListener(e -> sendBug());
    179179        panel.add(sendBugReportButton, GBC.eol().insets(0, 0, 0, 0).anchor(GBC.SOUTHEAST));
  • trunk/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueResolutionDecision.java

    r11553 r13761  
    143143    public String getChosenValue() {
    144144        switch(type) {
    145         case UNDECIDED: throw new IllegalStateException(tr("Not decided yet."));
     145        case UNDECIDED: throw new IllegalStateException(tr("Not decided yet"));
    146146        case KEEP_ONE: return value;
    147147        case SUM_ALL_NUMERIC: return tags.getSummedValues(getKey());
     
    238238        if (primitive == null) return;
    239239        if (!isDecided())
    240             throw new IllegalStateException(tr("Not decided yet."));
     240            throw new IllegalStateException(tr("Not decided yet"));
    241241        String key = tags.getKeys().iterator().next();
    242242        if (type.equals(MultiValueDecisionType.KEEP_NONE)) {
     
    274274        CheckParameterUtil.ensureParameterNotNull(primitive, "primitive");
    275275        if (!isDecided())
    276             throw new IllegalStateException(tr("Not decided yet."));
     276            throw new IllegalStateException(tr("Not decided yet"));
    277277        String key = tags.getKeys().iterator().next();
    278278        return new ChangePropertyCommand(primitive, key, getChosenValue());
     
    290290        CheckParameterUtil.ensureParameterNotNull(primitives, "primitives");
    291291        if (!isDecided())
    292             throw new IllegalStateException(tr("Not decided yet."));
     292            throw new IllegalStateException(tr("Not decided yet"));
    293293        String key = tags.getKeys().iterator().next();
    294294        return new ChangePropertyCommand(primitives, key, getChosenValue());
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java

    r13434 r13761  
    382382        CloseOpenChangesetsAction() {
    383383            putValue(NAME, tr("Close open changesets"));
    384             putValue(SHORT_DESCRIPTION, tr("Closes the selected open changesets"));
     384            putValue(SHORT_DESCRIPTION, tr("Close the selected open changesets"));
    385385            new ImageProvider("closechangeset").getResource().attachImageIcon(this, true);
    386386            updateEnabledState();
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java

    r13564 r13761  
    5757import org.openstreetmap.josm.gui.MainApplication;
    5858import org.openstreetmap.josm.gui.NavigatableComponent;
     59import org.openstreetmap.josm.gui.PopupMenuHandler;
    5960import org.openstreetmap.josm.gui.PrimitiveRenderer;
    60 import org.openstreetmap.josm.gui.PopupMenuHandler;
    6161import org.openstreetmap.josm.gui.SideButton;
    6262import org.openstreetmap.josm.gui.conflict.pair.ConflictResolver;
     
    9999     */
    100100    public ConflictDialog() {
    101         super(tr("Conflict"), "conflict", tr("Resolve conflicts."),
     101        super(tr("Conflict"), "conflict", tr("Resolve conflicts"),
    102102                Shortcut.registerShortcut("subwindow:conflict", tr("Toggle: {0}", tr("Conflict")),
    103103                KeyEvent.VK_C, Shortcut.ALT_SHIFT), 100);
  • trunk/src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDataText.java

    r13186 r13761  
    147147        add(tr("Edited by: "), o.getUser() == null ? tr("<new object>")
    148148                : getNameAndId(o.getUser().getName(), o.getUser().getId()));
    149         add(tr("Version: "), Integer.toString(o.getVersion()));
     149        add(tr("Version:"), " ", Integer.toString(o.getVersion()));
    150150        add(tr("In changeset: "), Integer.toString(o.getChangesetId()));
    151151    }
     
    212212    void addCoordinates(Node n) {
    213213        if (n.isLatLonKnown()) {
    214             add(tr("Coordinates: "),
     214            add(tr("Coordinates:"), " ",
    215215                    Double.toString(n.lat()), ", ",
    216216                    Double.toString(n.lon()));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/ValidatorDialog.java

    r13729 r13761  
    9999    public ValidatorDialog() {
    100100        super(tr("Validation Results"), "validator", tr("Open the validation window."),
    101                 Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation results")),
     101                Shortcut.registerShortcut("subwindow:validator", tr("Toggle: {0}", tr("Validation Results")),
    102102                        KeyEvent.VK_V, Shortcut.ALT_SHIFT), 150, false, ValidatorPreference.class);
    103103
  • trunk/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java

    r13521 r13761  
    676676            }
    677677        } else {
    678             setTitle(tr("Tags / Memberships"));
     678            setTitle(tr("Tags/Memberships"));
    679679        }
    680680    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java

    r13654 r13761  
    197197    class EditAction extends AbstractAction implements TreeSelectionListener {
    198198        EditAction() {
    199             putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to."));
     199            putValue(SHORT_DESCRIPTION, tr("Edit the relation the currently selected relation member refers to"));
    200200            new ImageProvider("dialogs", "edit").getResource().attachImageIcon(this, true);
    201201            putValue(NAME, tr("Edit"));
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java

    r13683 r13761  
    800800    protected static JMenuItem addToWindowMenu(IRelationEditor re, String layerName) {
    801801        Relation r = re.getRelation();
    802         String name = r == null ? tr("New Relation") : r.getLocalName();
     802        String name = r == null ? tr("New relation") : r.getLocalName();
    803803        JosmAction focusAction = new JosmAction(
    804804                tr("Relation Editor: {0}", name == null && r != null ? r.getId() : name),
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadIncompleteMembersAction.java

    r13486 r13761  
    4040        putValue(SHORT_DESCRIPTION, Main.platform.makeTooltip(tr("Download all incomplete members"), sc));
    4141        new ImageProvider("dialogs/relation", "downloadincomplete").getResource().attachImageIcon(this, true);
    42         putValue(NAME, tr("Download Members"));
     42        putValue(NAME, tr("Download members"));
    4343        updateEnabledState();
    4444    }
  • trunk/src/org/openstreetmap/josm/gui/dialogs/relation/actions/DownloadSelectedIncompleteMembersAction.java

    r13486 r13761  
    3434        putValue(SHORT_DESCRIPTION, tr("Download selected incomplete members"));
    3535        new ImageProvider("dialogs/relation", "downloadincompleteselected").getResource().attachImageIcon(this, true);
    36         putValue(NAME, tr("Download Members"));
     36        putValue(NAME, tr("Download members"));
    3737        updateEnabledState();
    3838    }
  • trunk/src/org/openstreetmap/josm/gui/download/OverpassQueryWizardDialog.java

    r13331 r13761  
    8181        JPanel panel = new JPanel(new GridBagLayout());
    8282
    83         JLabel searchLabel = new JLabel(tr("Search :"));
     83        JLabel searchLabel = new JLabel(tr("Search:"));
    8484        JTextComponent descPane = buildDescriptionSection();
    8585        JScrollPane scroll = GuiHelper.embedInVerticalScrollPane(descPane);
  • trunk/src/org/openstreetmap/josm/gui/download/PlaceSelection.java

    r13130 r13761  
    179179
    180180        SearchAction() {
    181             putValue(NAME, tr("Search ..."));
     181            putValue(NAME, tr("Search..."));
    182182            new ImageProvider("dialogs", "search").getResource().attachImageIcon(this, true);
    183183            putValue(SHORT_DESCRIPTION, tr("Click to start searching for places"));
  • trunk/src/org/openstreetmap/josm/gui/io/ChangesetCellRenderer.java

    r12494 r13761  
    7575            setToolTipText(buildToolTipText(cs));
    7676        } else {
    77             setText(tr("No open changeset"));
     77            setText(tr("No open changesets"));
    7878        }
    7979        return this;
  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticAuthorizationUI.java

    r13173 r13761  
    131131        gc.gridx = 0;
    132132        gc.weightx = 0.0;
    133         pnl.add(new JLabel(tr("Password: ")), gc);
     133        pnl.add(new JLabel(tr("Password:")), gc);
    134134
    135135        gc.gridx = 1;
  • trunk/src/org/openstreetmap/josm/gui/oauth/FullyAutomaticPropertiesPanel.java

    r12646 r13761  
    2020 * Panel to enter username and password for the "fully automatic" authorization
    2121 * procedure.
    22  * 
     22 *
    2323 * @see AuthorizationProcedure#FULLY_AUTOMATIC
    2424 */
     
    6969        gc.gridx = 0;
    7070        gc.weightx = 0.0;
    71         pnl.add(new JLabel(tr("Password: ")), gc);
     71        pnl.add(new JLabel(tr("Password:")), gc);
    7272
    7373        gc.gridx = 1;
  • trunk/src/org/openstreetmap/josm/gui/preferences/PreferenceDialog.java

    r13431 r13761  
    6161        JPanel pnl = new JPanel(new GridBagLayout());
    6262
    63         JCheckBox expert = new JCheckBox(tr("Expert mode"));
     63        JCheckBox expert = new JCheckBox(tr("Expert Mode"));
    6464        expert.setSelected(ExpertToggleAction.isExpert());
    6565        expert.addActionListener(e -> ExpertToggleAction.getInstance().actionPerformed(null));
  • trunk/src/org/openstreetmap/josm/gui/preferences/advanced/AdvancedPreference.java

    r13431 r13761  
    105105
    106106        txtFilter = new JosmTextField();
    107         JLabel lbFilter = new JLabel(tr("Search: "));
     107        JLabel lbFilter = new JLabel(tr("Search:"));
    108108        lbFilter.setLabelFor(txtFilter);
    109109        p.add(lbFilter);
  • trunk/src/org/openstreetmap/josm/gui/preferences/display/ColorPreference.java

    r13543 r13761  
    290290            }
    291291        });
    292         defaultSet = new JButton(tr("Set to default"));
     292        defaultSet = new JButton(tr("Reset to default"));
    293293        defaultSet.addActionListener(e -> {
    294294            int sel = colors.getSelectedRow();
  • trunk/src/org/openstreetmap/josm/gui/preferences/display/GPXSettingsPanel.java

    r12987 r13761  
    217217
    218218        // hdopCircleGpsPoints
    219         hdopCircleGpsPoints.setToolTipText(tr("Draw a circle from HDOP value."));
     219        hdopCircleGpsPoints.setToolTipText(tr("Draw a circle from HDOP value"));
    220220        add(hdopCircleGpsPoints, GBC.eop().insets(20, 0, 0, 0));
    221221        ExpertToggleAction.addVisibilitySwitcher(hdopCircleGpsPoints);
  • trunk/src/org/openstreetmap/josm/gui/preferences/imagery/ImageryPreference.java

    r13456 r13761  
    9999
    100100    private ImageryPreference() {
    101         super(/* ICON(preferences/) */ "imagery", tr("Imagery Preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"),
     101        super(/* ICON(preferences/) */ "imagery", tr("Imagery preferences"), tr("Modify list of imagery layers displayed in the Imagery menu"),
    102102                false, new JTabbedPane());
    103103    }
  • trunk/src/org/openstreetmap/josm/gui/preferences/map/TaggingPresetPreference.java

    r12846 r13761  
    8282                        } catch (IOException e) {
    8383                            // Should not happen, but at least show message
    84                             String msg = tr("Could not read tagging preset source {0}", source);
     84                            String msg = tr("Could not read tagging preset source: {0}", source);
    8585                            Logging.log(Logging.LEVEL_ERROR, msg, e);
    8686                            JOptionPane.showMessageDialog(Main.parent, msg);
  • trunk/src/org/openstreetmap/josm/io/OsmServerChangesetReader.java

    r12620 r13761  
    153153                    if (in == null)
    154154                        return null;
    155                     monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2} ...", i, ids.size(), id));
     155                    monitor.indeterminateSubTask(tr("({0}/{1}) Downloading changeset {2}...", i, ids.size(), id));
    156156                    List<Changeset> changesets = OsmChangesetParser.parse(in, monitor.createSubTaskMonitor(1, true));
    157157                    if (changesets == null || changesets.isEmpty()) {
  • trunk/src/org/openstreetmap/josm/plugins/PluginDownloadTask.java

    r13294 r13761  
    107107            ExtendedDialog dialog = new ExtendedDialog(
    108108                    progressMonitor.getWindowParent(),
    109                     tr("Skip download"),
     109                    tr("Skip Download"),
    110110                    tr("Download Plugin"), tr("Skip Download")
    111111            );
  • trunk/src/org/openstreetmap/josm/tools/I18n.java

    r13647 r13761  
    8686    private static volatile String loadedCode = "en";
    8787
    88 
     88    /** Map (english/locale) of singular strings **/
    8989    private static volatile Map<String, String> strings;
     90    /** Map (english/locale) of plural strings **/
    9091    private static volatile Map<String, String[]> pstrings;
    9192    private static Map<String, PluralMode> languages = new HashMap<>();
     
    615616        return 0;
    616617    }
     618
     619    /**
     620     * Returns the map of singular translations.
     621     * @return the map of singular translations.
     622     * @since 13761
     623     */
     624    public static Map<String, String> getSingularTranslations() {
     625        return new HashMap<>(strings);
     626    }
     627
     628    /**
     629     * Returns the map of plural translations.
     630     * @return the map of plural translations.
     631     * @since 13761
     632     */
     633    public static Map<String, String[]> getPluralTranslations() {
     634        return new HashMap<>(pstrings);
     635    }
    617636}
Note: See TracChangeset for help on using the changeset viewer.