Ignore:
Timestamp:
2011-09-24T18:48:53+02:00 (14 years ago)
Author:
sbrunner
Message:

fix tr, remove debug logs

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/plugins/merge-overlap/src/mergeoverlap/MyCombinePrimitiveResolverDialog.java

    r26575 r26705  
    173173    protected void updateTitle() {
    174174        if (targetPrimitive == null) {
    175             setTitle(tr("Conflicts when combining primitives"));
     175            setTitle(tr("Conflicts when combining primitives", null));
    176176            return;
    177177        }
    … …  
    324324        JPanel pnl = new JPanel();
    325325        pnl.setLayout(new BorderLayout());
    326         pnl.add(new JLabel(tr("No conflicts to resolve")));
     326        pnl.add(new JLabel(tr("No conflicts to resolve", null)));
    327327        return pnl;
    328328    }
    … …  
    386386
    387387        public CancelAction() {
    388             putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution"));
    389             putValue(Action.NAME, tr("Cancel"));
     388            putValue(Action.SHORT_DESCRIPTION, tr("Cancel conflict resolution", null));
     389            putValue(Action.NAME, tr("Cancel", null));
    390390            putValue(Action.SMALL_ICON, ImageProvider.get("", "cancel"));
    391391            setEnabled(true);
    … …  
    401401
    402402        public ApplyAction() {
    403             putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts"));
    404             putValue(Action.NAME, tr("Apply"));
     403            putValue(Action.SHORT_DESCRIPTION, tr("Apply resolved conflicts", null));
     404            putValue(Action.NAME, tr("Apply", null));
    405405            putValue(Action.SMALL_ICON, ImageProvider.get("ok"));
    406406            updateEnabledState();
    … …  
    800800            JPanel pnl = new JPanel();
    801801            pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
    802             pnl.add(new JLabel(tr("Role:")));
     802            pnl.add(new JLabel(tr("Role:", null)));
    803803            pnl.add(tfRole = new AutoCompletingTextField(10));
    804             tfRole.setToolTipText(tr("Enter a role for all relation memberships"));
     804            tfRole.setToolTipText(tr("Enter a role for all relation memberships", null));
    805805            pnl.add(new JButton(new ApplyRoleAction()));
    806806            tfRole.addActionListener(new ApplyRoleAction());
    … …  
    819819            JPanel pnl = new JPanel();
    820820            pnl.setLayout(new FlowLayout(FlowLayout.LEFT));
    821             cbTagRelations = new JCheckBox(tr("Tag modified relations with "));
     821            cbTagRelations = new JCheckBox(tr("Tag modified relations with ", null));
    822822            cbTagRelations.addChangeListener(new ToggleTagRelationsAction());
    823823            cbTagRelations.setToolTipText(
    824824                    tr("<html>Select to enable entering a tag which will be applied<br>"
    825                             + "to all modified relations.</html>"));
     825                            + "to all modified relations.</html>", null));
    826826            pnl.add(cbTagRelations);
    827827            pnl.add(new JLabel(trc("tag", "Key:")));
    828828            pnl.add(tfKey = new AutoCompletingTextField(10));
    829             tfKey.setToolTipText(tr("<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>"));
    830             pnl.add(new JLabel(tr("Value:")));
     829            tfKey.setToolTipText(tr("<html>Enter a tag key, i.e. <strong><tt>fixme</tt></strong></html>", null));
     830            pnl.add(new JLabel(tr("Value:", null)));
    831831            pnl.add(tfValue = new AutoCompletingTextField(10));
    832             tfValue.setToolTipText(tr("<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>"));
     832            tfValue.setToolTipText(tr("<html>Enter a tag value, i.e. <strong><tt>check members</tt></strong></html>", null));
    833833            cbTagRelations.setSelected(false);
    834834            tfKey.setEnabled(false);
    … …  
    848848                    + "the other ways that are members of the same relation: the combined way will "
    849849                    + "take the place of the original way in the relation."
    850                     + "</html>"));
     850                    + "</html>", null));
    851851            invalidate();
    852852        }
    … …  
    859859                    + "the other nodes that are members of the same relation: the target node will "
    860860                    + "take the place of the original node in the relation."
    861                     + "</html>"));
     861                    + "</html>", null));
    862862            invalidate();
    863863        }
    … …  
    865865        class ApplyRoleAction extends AbstractAction {
    866866            public ApplyRoleAction() {
    867                 putValue(NAME, tr("Apply"));
     867                putValue(NAME, tr("Apply", null));
    868868                putValue(SMALL_ICON, ImageProvider.get("ok"));
    869                 putValue(SHORT_DESCRIPTION, tr("Apply this role to all members"));
     869                putValue(SHORT_DESCRIPTION, tr("Apply this role to all members", null));
    870870            }
    871871
    … …  
    12701270            gc.weightx = 1.0;
    12711271            gc.anchor = GridBagConstraints.LINE_START;
    1272             pnl.add(new JLabel(tr("<html>Please select the values to keep for the following tags.</html>")), gc);
     1272            pnl.add(new JLabel(tr("<html>Please select the values to keep for the following tags.</html>", null)), gc);
    12731273
    12741274            gc.gridy = 1;
    12751275            gc.fill = GridBagConstraints.HORIZONTAL;
    12761276            gc.weighty = 0.0;
    1277             pnl.add(cbShowTagsWithConflictsOnly = new JCheckBox(tr("Show tags with conflicts only")), gc);
    1278             pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only")), gc);
     1277            pnl.add(cbShowTagsWithConflictsOnly = new JCheckBox(tr("Show tags with conflicts only", null)), gc);
     1278            pnl.add(cbShowTagsWithMultiValuesOnly = new JCheckBox(tr("Show tags with multiple values only", null)), gc);
    12791279            cbShowTagsWithConflictsOnly.addChangeListener(
    12801280                    new ChangeListener() {
Note: See TracChangeset for help on using the changeset viewer.