Changeset 2842 in josm


Ignore:
Timestamp:
2010-01-13T19:33:42+01:00 (15 years ago)
Author:
mjulius
Message:

fix messages for actions

Location:
trunk/src/org/openstreetmap/josm/actions
Files:
24 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/org/openstreetmap/josm/actions/AbstractInfoAction.java

    r2616 r2842  
    8484    public static boolean confirmLaunchMultiple(int numBrowsers) {
    8585        String msg  = tr(
    86                 "You''re about to launch {0} browser windows.<br>"
     86                "You are about to launch {0} browser windows.<br>"
    8787                + "This may both clutter your screen with browser windows<br>"
    8888                + "and take some time to finish.", numBrowsers);

  • trunk/src/org/openstreetmap/josm/actions/AddNodeAction.java

    r2824 r2842  
    285285            public CancelAction() {
    286286                putValue(NAME, tr("Cancel"));
    287                 putValue(SHORT_DESCRIPTION, tr("Close the dialog, don't create a new node"));
     287                putValue(SHORT_DESCRIPTION, tr("Close the dialog, do not create a new node"));
    288288                putValue(SMALL_ICON, ImageProvider.get("cancel"));
    289289            }

  • trunk/src/org/openstreetmap/josm/actions/DownloadReferrersAction.java

    r2512 r2842  
    44import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trn;
    67
    78import java.awt.event.ActionEvent;
    89import java.awt.event.KeyEvent;
    910import java.io.IOException;
     11import java.text.MessageFormat;
    1012import java.util.Collection;
    1113import java.util.HashMap;
    … …  
    2628import org.openstreetmap.josm.io.OsmServerBackreferenceReader;
    2729import org.openstreetmap.josm.io.OsmTransferException;
     30import org.openstreetmap.josm.tools.CheckParameterUtil;
    2831import org.openstreetmap.josm.tools.ExceptionUtil;
    2932import org.openstreetmap.josm.tools.Shortcut;
    … …  
    8588    static public void downloadReferrers(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException {
    8689        if (id <= 0)
    87             throw new IllegalArgumentException(tr("Id > 0 required, got {0}", id));
    88         if (type == null)
    89             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "type"));
     90            throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id));
     91        CheckParameterUtil.ensureParameterNotNull(type, "type");
    9092        Main.worker.submit(new DownloadReferrersTask(targetLayer, id, type));
    9193    }
    … …  
    125127        public DownloadReferrersTask(OsmDataLayer targetLayer, Collection<OsmPrimitive> children) {
    126128            super("Download referrers", false /* don't ignore exception*/);
    127             if (targetLayer == null)
    128                 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "targetLayer"));
     129            CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
    129130            cancelled = false;
    130131            this.children = new HashMap<Long, OsmPrimitiveType>();
    … …  
    150151        public DownloadReferrersTask(OsmDataLayer targetLayer, Map<Long, OsmPrimitiveType> children) {
    151152            super("Download referrers", false /* don't ignore exception*/);
    152             if (targetLayer == null)
    153                 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "targetLayer"));
     153            CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
    154154            cancelled = false;
    155155            this.children = new HashMap<Long, OsmPrimitiveType>();
    … …  
    178178        public DownloadReferrersTask(OsmDataLayer targetLayer, long id, OsmPrimitiveType type) throws IllegalArgumentException {
    179179            super("Download referrers", false /* don't ignore exception*/);
    180             if (targetLayer == null)
    181                 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "targetLayer"));
     180            CheckParameterUtil.ensureParameterNotNull(targetLayer, "targetLayer");
    182181            if (id <= 0)
    183                 throw new IllegalArgumentException(tr("Id > 0 required, got {0}", id));
    184             if (type == null)
    185                 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "type"));
     182                throw new IllegalArgumentException(MessageFormat.format("Id > 0 required, got {0}", id));
     183            CheckParameterUtil.ensureParameterNotNull(type, "type");
    186184            cancelled = false;
    187185            this.children = new HashMap<Long, OsmPrimitiveType>();
    … …  
    226224            JOptionPane.showMessageDialog(
    227225                    Main.parent,
    228                     tr("There were {0} conflicts during import.",
     226                    trn("There was {0} conflict during import.",
     227                            "There were {0} conflicts during import.",
     228                            visitor.getConflicts().size(),
    229229                            visitor.getConflicts().size()
    230230                    ),
    231                     tr("Conflicts during download"),
     231                    trn("Conflict during download", "Conflicts during download", visitor.getConflicts().size()),
    232232                    JOptionPane.WARNING_MESSAGE
    233233            );

  • trunk/src/org/openstreetmap/josm/actions/GpxExportAction.java

    r2512 r2842  
    1010import java.io.File;
    1111import java.io.IOException;
     12import java.text.MessageFormat;
    1213
    1314import javax.swing.JOptionPane;
    … …  
    1819import org.openstreetmap.josm.gui.layer.OsmDataLayer;
    1920import org.openstreetmap.josm.io.FileExporter;
     21import org.openstreetmap.josm.tools.CheckParameterUtil;
    2022import org.openstreetmap.josm.tools.Shortcut;
    2123
    … …  
    6769     */
    6870    public void export(Layer layer) {
    69         if (layer == null)
    70             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
     71        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
    7172        if (! (layer instanceof OsmDataLayer) && ! (layer instanceof GpxLayer))
    72             throw new IllegalArgumentException(tr("Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName()));
     73            throw new IllegalArgumentException(MessageFormat.format("Expected instance of OsmDataLayer or GpxLayer. Got ''{0}''.", layer.getClass().getName()));
    7374
    7475        File file = createAndOpenSaveFileChooser(tr("Export GPX file"), ".gpx");

  • trunk/src/org/openstreetmap/josm/actions/JoinAreasAction.java

    r2626 r2842  
    44import static org.openstreetmap.josm.tools.I18n.marktr;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trn;
    67
    78import java.awt.GridBagLayout;
    … …  
    136137        for (Way way: ways) {
    137138            if(!way.isClosed()) {
    138                 JOptionPane.showMessageDialog(Main.parent, tr("\"{0}\" is not closed and therefore can't be joined.", way.getName()));
     139                JOptionPane.showMessageDialog(Main.parent, tr("\"{0}\" is not closed and therefore cannot be joined.", way.getName()));
    139140                return;
    140141            }
    … …  
    149150                if (!dataSourceArea.contains(node.getCoor())) {
    150151                    int option = JOptionPane.showConfirmDialog(Main.parent,
    151                             tr("The selected way(s) have nodes outside of the downloaded data region.\n"
    152                                     + "This can lead to nodes being deleted accidentally.\n"
    153                                     + "Are you really sure to continue?"),
     152                            trn("The selected way has nodes outside of the downloaded data region.",
     153                                    "The selected ways have nodes outside of the downloaded data region.",
     154                                    ways.size()) + "\n"
     155                                    + tr("This can lead to nodes being deleted accidentally.") + "\n"
     156                                    + tr("Are you really sure to continue?"),
    154157                                    tr("Please abort if you are not sure"), JOptionPane.YES_NO_OPTION,
    155158                                    JOptionPane.WARNING_MESSAGE);

  • trunk/src/org/openstreetmap/josm/actions/MergeNodesAction.java

    r2711 r2842  
    3535import org.openstreetmap.josm.gui.conflict.tags.CombinePrimitiveResolverDialog;
    3636import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     37import org.openstreetmap.josm.tools.CheckParameterUtil;
    3738import org.openstreetmap.josm.tools.ImageProvider;
    3839import org.openstreetmap.josm.tools.Shortcut;
    … …  
    169170     */
    170171    public static Command mergeNodes(OsmDataLayer layer,Collection<Node> nodes, Node targetNode) {
    171         if (layer == null)
    172             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "nodes"));
    173         if (targetNode == null)
    174             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "targetNode"));
     172        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
     173        CheckParameterUtil.ensureParameterNotNull(targetNode, "targetNode");
    175174        if (nodes == null)
    176175            return null;

  • trunk/src/org/openstreetmap/josm/actions/OpenFileAction.java

    r2798 r2842  
    44import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trn;
    67
    78import java.awt.event.ActionEvent;
    … …  
    161162                    msg = tr("Opening 1 file...");
    162163                } else {
    163                     msg = tr("Opening {0} files...", files.size());
     164                    msg = trn("Opening {0} file...", "Opening {0} files...", files.size(), files.size());
    164165                }
    165166                getProgressMonitor().indeterminateSubTask(msg);

  • trunk/src/org/openstreetmap/josm/actions/OpenLocationAction.java

    r2512 r2842  
    6868
    6969        JCheckBox layer = new JCheckBox(tr("Separate Layer"));
    70         layer.setToolTipText(tr("Select if the data should be downloaded in a new layer"));
     70        layer.setToolTipText(tr("Select if the data should be downloaded into a new layer"));
    7171        layer.setSelected(Main.pref.getBoolean("download.newlayer"));
    7272        JPanel all = new JPanel(new GridBagLayout());

  • trunk/src/org/openstreetmap/josm/actions/OrthogonalizeAction.java

    r2626 r2842  
    3636 */
    3737public final class OrthogonalizeAction extends JosmAction {
    38     String USAGE = "<h3>"+
    39     "When one or more ways are selected, the shape is adjusted, such that all angles are 90 or 180 degrees.<h3>"+
    40     "You can add two nodes to the selection. Then the direction is fixed by these two reference nodes.<h3>"+
     38    String USAGE = tr(
     39    "When one or more ways are selected, the shape is adjusted such, that all angles are 90 or 180 degrees.<h3>"+
     40    "You can add two nodes to the selection. Then, the direction is fixed by these two reference nodes."+
    4141    "(Afterwards, you can undo the movement for certain nodes:<br>"+
    42     "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)";
     42    "Select them and press the shortcut for Orthogonalize / Undo. The default is Shift-Q.)");
    4343
    4444    public OrthogonalizeAction() {
    … …  
    194194                JOptionPane.showMessageDialog(
    195195                        Main.parent,
    196                         "<html><h2>"+tr("Usage")+tr(USAGE),
     196                        "<html><h2>" + tr("Usage") + "</h2>" + USAGE + "</html>",
    197197                        tr("Orthogonalize Shape"),
    198198                        JOptionPane.INFORMATION_MESSAGE);
    … …  
    201201                JOptionPane.showMessageDialog(
    202202                        Main.parent,
    203                         "<html><h3>"+tr(ex.getMessage())+"<br><hr><h3>"+tr("Usage")+tr(USAGE),
     203                        "<html>" + tr(ex.getMessage()) + "<br><hr><h2>" + tr("Usage") + "</h2>" + USAGE + "</html>",
    204204                        tr("Selected Elements cannot be orthogonalized"),
    205205                        JOptionPane.INFORMATION_MESSAGE);

  • trunk/src/org/openstreetmap/josm/actions/SimplifyWayAction.java

    r2575 r2842  
    6363                        if (!isInsideOneBoundingBox) {
    6464                            int option = JOptionPane.showConfirmDialog(Main.parent,
    65                                     tr("The selected way(s) have nodes outside of the downloaded data region.\n"
    66                                             + "This can lead to nodes being deleted accidentally.\n"
    67                                             + "Are you really sure to continue?"),
     65                                    trn("The selected way has nodes outside of the downloaded data region.",
     66                                            "The selected ways have nodes outside of the downloaded data region.",
     67                                            Main.main.getCurrentDataSet().getSelectedWays().size()) + "\n"
     68                                            + tr("This can lead to nodes being deleted accidentally.") + "\n"
     69                                            + tr("Are you really sure to continue?"),
    6870                                    tr("Please abort if you are not sure"), JOptionPane.YES_NO_CANCEL_OPTION,
    6971                                    JOptionPane.WARNING_MESSAGE);

  • trunk/src/org/openstreetmap/josm/actions/UnGlueAction.java

    r2748 r2842  
    44import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trn;
    67
    78import java.awt.event.ActionEvent;
    … …  
    103104                    errMsg =  tr("None of these nodes are glued to anything else.");
    104105                } else {
    105                     errMsg = tr("None of this way's nodes are glued to anything else.");
     106                    errMsg = tr("None of this way''s nodes are glued to anything else.");
    106107                }
    107108            } else {
    … …  
    390391        cmds.add(new ChangeCommand(selectedWay, tmpWay)); // only one changeCommand for a way, else garbage will happen
    391392
    392         Main.main.undoRedo.add(new SequenceCommand(tr("Dupe {0} nodes into {1} nodes", selectedNodes.size(), selectedNodes.size()+allNewNodes.size()), cmds));
     393        Main.main.undoRedo.add(new SequenceCommand(
     394                trn("Dupe {0} node into {1} nodes", "Dupe {0} nodes into {1} nodes", selectedNodes.size(), selectedNodes.size(), selectedNodes.size()+allNewNodes.size()), cmds));
    393395        getCurrentDataSet().setSelected(allNewNodes);
    394396    }

  • trunk/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java

    r2684 r2842  
    7575        OsmPrimitive primitive = getEditLayer().data.getPrimitiveById(id);
    7676        if (primitive == null)
    77             throw new IllegalStateException(tr("Didn''t find an object with id {0} in the current dataset", id));
     77            throw new IllegalStateException(tr("Did not find an object with id {0} in the current dataset", id));
    7878        updatePrimitives(Collections.singleton(primitive));
    7979    }

  • trunk/src/org/openstreetmap/josm/actions/UploadSelectionAction.java

    r2578 r2842  
    3030import org.openstreetmap.josm.io.OsmServerBackreferenceReader;
    3131import org.openstreetmap.josm.io.OsmTransferException;
     32import org.openstreetmap.josm.tools.CheckParameterUtil;
    3233import org.openstreetmap.josm.tools.ExceptionUtil;
    3334import org.xml.sax.SAXException;
    … …  
    233234         */
    234235        public Set<OsmPrimitive> build(Collection<OsmPrimitive> base) throws IllegalArgumentException{
    235             if (base == null)
    236                 throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null", "base"));
     236            CheckParameterUtil.ensureParameterNotNull(base, "base");
    237237            hull = new HashSet<OsmPrimitive>();
    238238            for (OsmPrimitive p: base) {

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioBackAction.java

    r1245 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.event.ActionEvent;
    … …  
    1718    public AudioBackAction() {
    1819        super(tr("Back"), "audio-back", tr("Jump back."),
    19         Shortcut.registerShortcut("audio:back", tr("Audio: {0}", tr("Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true);
     20        Shortcut.registerShortcut("audio:back", tr("Audio: {0}", trc("audio", "Back")), KeyEvent.VK_F6, Shortcut.GROUP_DIRECT), true);
    2021        this.putValue("help", "Action/Back");
    2122    }

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioFasterAction.java

    r2017 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.event.KeyEvent;
    … …  
    1213    public AudioFasterAction() {
    1314        super(tr("Faster"), "audio-faster", tr("Faster Forward"),
    14         Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", tr("Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true);
     15        Shortcut.registerShortcut("audio:faster", tr("Audio: {0}", trc("audio", "Faster")), KeyEvent.VK_F9, Shortcut.GROUP_DIRECT), true);
    1516    }
    1617}

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioFwdAction.java

    r1245 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.event.ActionEvent;
    … …  
    1617    public AudioFwdAction() {
    1718        super(tr("Forward"), "audio-fwd", tr("Jump forward"),
    18         Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", tr("Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true);
     19        Shortcut.registerShortcut("audio:forward", tr("Audio: {0}", trc("audio", "Forward")), KeyEvent.VK_F7, Shortcut.GROUP_DIRECT), true);
    1920    }
    2021

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioNextAction.java

    r1169 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.event.ActionEvent;
    … …  
    1516    public AudioNextAction() {
    1617        super(tr("Next Marker"), "audio-next", tr("Play next marker."),
    17         Shortcut.registerShortcut("audio:next", tr("Audio: {0}", tr("Next Marker")), KeyEvent.VK_F8, Shortcut.GROUP_DIRECT), true);
     18        Shortcut.registerShortcut("audio:next", tr("Audio: {0}", trc("audio", "Next Marker")), KeyEvent.VK_F8, Shortcut.GROUP_DIRECT), true);
    1819    }
    1920

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPlayPauseAction.java

    r1218 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
    5 
     5import static org.openstreetmap.josm.tools.I18n.trc;
    66import java.awt.event.ActionEvent;
    77import java.awt.event.KeyEvent;
    … …  
    1717    public AudioPlayPauseAction() {
    1818        super(tr("Play/Pause"), "audio-playpause", tr("Play/pause audio."),
    19         Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", tr("Play/Pause")), KeyEvent.VK_PERIOD, Shortcut.GROUP_DIRECT), true);
     19        Shortcut.registerShortcut("audio:pause", tr("Audio: {0}", trc("audio", "Play/Pause")), KeyEvent.VK_PERIOD, Shortcut.GROUP_DIRECT), true);
    2020    }
    2121

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioPrevAction.java

    r1169 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.event.ActionEvent;
    … …  
    1516    public AudioPrevAction() {
    1617        super(tr("Previous Marker"), "audio-prev", tr("Play previous marker."),
    17         Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", tr("Previous Marker")), KeyEvent.VK_F5, Shortcut.GROUP_DIRECT), true);
     18        Shortcut.registerShortcut("audio:prev", tr("Audio: {0}", trc("audio", "Previous Marker")), KeyEvent.VK_F5, Shortcut.GROUP_DIRECT), true);
    1819    }
    1920

  • trunk/src/org/openstreetmap/josm/actions/audio/AudioSlowerAction.java

    r2017 r2842  
    33
    44import static org.openstreetmap.josm.tools.I18n.tr;
     5import static org.openstreetmap.josm.tools.I18n.trc;
    56
    67import java.awt.event.KeyEvent;
    … …  
    1213    public AudioSlowerAction() {
    1314        super(tr("Slower"), "audio-slower", tr("Slower Forward"),
    14         Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", tr("Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true);
     15        Shortcut.registerShortcut("audio:slower", tr("Audio: {0}", trc("audio", "Slower")), KeyEvent.VK_F4, Shortcut.GROUP_DIRECT), true);
    1516    }
    1617}

  • trunk/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTask.java

    r2641 r2842  
    9292            } catch(Exception e) {
    9393                if (isCanceled()) {
    94                     logger.warning(tr("Ignoring exception because download has been cancelled. Exception was: {0}" + e.toString()));
     94                    logger.warning(tr("Ignoring exception because download has been cancelled. Exception was: {0}", e.toString()));
    9595                    return;
    9696                }

  • trunk/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java

    r2692 r2842  
    2525import org.openstreetmap.josm.gui.layer.Layer;
    2626import org.openstreetmap.josm.gui.layer.OsmDataLayer;
     27import org.openstreetmap.josm.tools.CheckParameterUtil;
    2728import org.openstreetmap.josm.tools.ImageProvider;
    2829import org.openstreetmap.josm.tools.Shortcut;
    … …  
    243244
    244245    @Override public String getModeHelpText() {
    245         return tr("Click to delete. Shift: delete way segment. Alt: don't delete unused nodes when deleting a way. Ctrl: delete referring objects.");
     246        return tr("Click to delete. Shift: delete way segment. Alt: do not delete unused nodes when deleting a way. Ctrl: delete referring objects.");
    246247    }
    247248
    … …  
    265266     */
    266267    public static void deleteRelation(OsmDataLayer layer, Relation toDelete) {
    267         if (layer == null)
    268             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "layer"));
    269         if (toDelete == null)
    270             throw new IllegalArgumentException(tr("Parameter ''{0}'' must not be null.", "toDelete"));
     268        CheckParameterUtil.ensureParameterNotNull(layer, "layer");
     269        CheckParameterUtil.ensureParameterNotNull(toDelete, "toDelete");
    271270
    272271        Command cmd = DeleteCommand.delete(layer, Collections.singleton(toDelete));

  • trunk/src/org/openstreetmap/josm/actions/search/SearchAction.java

    r2790 r2842  
    44import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
    55import static org.openstreetmap.josm.tools.I18n.tr;
     6import static org.openstreetmap.josm.tools.I18n.trc;
    67
    78import java.awt.Font;
    … …  
    115116        JLabel description =
    116117            new JLabel("<html><ul>"
    117                     + "<li>"+tr("<b>Baker Street</b> - 'Baker' and 'Street' in any key or name.")+"</li>"
    118                     + "<li>"+tr("<b>\"Baker Street\"</b> - 'Baker Street' in any key or name.")+"</li>"
    119                     + "<li>"+tr("<b>name:Bak</b> - 'Bak' anywhere in the name.")+"</li>"
    120                     + "<li>"+tr("<b>type=route</b> - key 'type' with value exactly 'route'.") + "</li>"
    121                     + "<li>"+tr("<b>type=*</b> - key 'type' with any value. Try also <b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>") + "</li>"
    122                     + "<li>"+tr("<b>-name:Bak</b> - not 'Bak' in the name.")+"</li>"
     118                    + "<li>"+tr("<b>Baker Street</b> - ''Baker'' and ''Street'' in any key or name.")+"</li>"
     119                    + "<li>"+tr("<b>\"Baker Street\"</b> - ''Baker Street'' in any key or name.")+"</li>"
     120                    + "<li>"+tr("<b>name:Bak</b> - ''Bak'' anywhere in the name.")+"</li>"
     121                    + "<li>"+tr("<b>type=route</b> - key ''type'' with value exactly ''route''.") + "</li>"
     122                    + "<li>"+tr("<b>type=*</b> - key ''type'' with any value. Try also <b>*=value</b>, <b>type=</b>, <b>*=*</b>, <b>*=</b>") + "</li>"
     123                    + "<li>"+tr("<b>-name:Bak</b> - not ''Bak'' in the name.")+"</li>"
    123124                    + "<li>"+tr("<b>foot:</b> - key=foot set to any value.")+"</li>"
    124125                    + "<li>"+tr("<u>Special targets:</u>")+"</li>"
    … …  
    319320        @Override
    320321        public String toString() {
    321             String cs = caseSensitive ? tr("CS") : tr("CI");
    322             String rx = regexSearch ? (", " + tr("RX")) : "";
     322            String cs = caseSensitive ? trc("case sensitive", "CS") : trc("case insensitive", "CI");
     323            String rx = regexSearch ? (", " + trc("regex search", "RX")) : "";
    323324            return "\"" + text + "\" (" + cs + rx + ", " + mode + ")";
    324325        }

  • trunk/src/org/openstreetmap/josm/actions/upload/RelationUploadOrderHook.java

    r2512 r2842  
    4646        pnl.setLayout(new BorderLayout());
    4747        String msg = tr("<html>{0} relations build a cycle because they refer to each other.<br>"
    48                 + "JOSM can''t upload them. Please edit the relations and remove the "
     48                + "JOSM cannot upload them. Please edit the relations and remove the "
    4949                + "cyclic dependency.</html>", dep.size()-1);
    5050        pnl.add(new JLabel(msg), BorderLayout.NORTH);
Note: See TracChangeset for help on using the changeset viewer.