Ticket #960: presettrans.diff

src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java

@@ -127 +127 @@
                     ((JComboBox)value).getEditor().setItem(DIFFERENT);
                     originalValue = DIFFERENT;
                         }
-                        p.add(new JLabel(text), GBC.std().insets(0,0,10,0));
+                        p.add(new JLabel(tr(text)), GBC.std().insets(0,0,10,0));
                         p.add(value, GBC.eol().fill(GBC.HORIZONTAL));
                 }
                 
@@ -173 +173 @@
                                                         "false".equals(oneValue) ? 
                                                         QuadStateCheckBox.State.NOT_SELECTED :
                                                         QuadStateCheckBox.State.UNSET;
-                                check = new QuadStateCheckBox(text, initialState, 
+                                check = new QuadStateCheckBox(tr(text), initialState, 
                                                 new QuadStateCheckBox.State[] { 
                                                 QuadStateCheckBox.State.SELECTED,
                                                 QuadStateCheckBox.State.NOT_SELECTED,
@@ -183 +183 @@
                                 // else than true/false. we display a quad-state check box
                                 // in "partial" state.
                                 initialState = QuadStateCheckBox.State.PARTIAL;
-                                check = new QuadStateCheckBox(text, QuadStateCheckBox.State.PARTIAL, 
+                                check = new QuadStateCheckBox(tr(text), QuadStateCheckBox.State.PARTIAL, 
                                                 new QuadStateCheckBox.State[] { 
                                                 QuadStateCheckBox.State.PARTIAL,
                                                 QuadStateCheckBox.State.SELECTED,
@@ -249 +249 @@
                         } else {
                                 combo.setSelectedItem(DIFFERENT); originalValue=DIFFERENT;
                         }
-                        p.add(new JLabel(text), GBC.std().insets(0,0,10,0));
+                        p.add(new JLabel(tr(text)), GBC.std().insets(0,0,10,0));
                         p.add(combo, GBC.eol().fill(GBC.HORIZONTAL));
                 }
                 @Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {
@@ -276 +276 @@
                 public String text;
 
                 @Override public void addToPanel(JPanel p, Collection<OsmPrimitive> sel) {
-                        p.add(new JLabel(text), GBC.eol());
+                        p.add(new JLabel(tr(text)), GBC.eol());
                 }
                 @Override public void addCommands(Collection<OsmPrimitive> sel, List<Command> cmds) {}
         }
@@ -309 +309 @@
          * Called from the XML parser to set the name of the tagging preset
          */
         public void setName(String name) {
-                putValue(Action.NAME, name);
+                putValue(Action.NAME, tr(name));
                 putValue("toolbar", "tagging_"+name);
         }