Changeset 4096 in josm

Timestamp:

May 25, 2011 5:39:03 PM (2 years ago)

Author:

stoecker

Message:

fix #6376 - wrong translation

Location:

trunk

Files:

• data/defaultpresets.xml (modified) (1 diff)
• src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java (modified) (15 diffs)

trunk/data/defaultpresets.xml

@@ -3834 +3834 @@
             <key key="natural" value="wood" />
             <text key="name" text="Name" default="" delete_if_empty="true" />
-            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" default="" delete_if_empty="true" />
+            <combo key="wood" text="Type" values="coniferous,deciduous,mixed" values_context="wood" default="" delete_if_empty="true" />
         </item>
         <item name="Forest" icon="presets/landuse.png" type="node,closedway,relation">

trunk/src/org/openstreetmap/josm/actions/DownloadPrimitiveAction.java

@@ -4 +4 @@
 import static org.openstreetmap.josm.gui.help.HelpUtil.ht;
 import static org.openstreetmap.josm.tools.I18n.tr;
+import static org.openstreetmap.josm.tools.I18n.trc;
 import static org.openstreetmap.josm.tools.I18n.trn;
 
@@ -57 +58 @@
 
     public void actionPerformed(ActionEvent e) {
-        
+
         JPanel all = new JPanel();
         GroupLayout layout = new GroupLayout(all);
@@ -63 +64 @@
         layout.setAutoCreateGaps(true);
         layout.setAutoCreateContainerGaps(true);
-        
+
         JLabel lbl1 = new JLabel(tr("Object type:"));
         OsmPrimitiveTypesComboBox cbType = new OsmPrimitiveTypesComboBox();
-        cbType.addItem(new SimpleListItem("mixed", tr("mixed")));
+        cbType.addItem(new SimpleListItem("mixed", trc("osm object types", "mixed")));
         cbType.setToolTipText(tr("Choose the OSM object type"));
         JLabel lbl2 = new JLabel(tr("Object ID:"));
@@ -83 +84 @@
                 + " In mixed mode, specify objects like this: <b>w123, n110, w12, r15</b><br/>"));
         help.setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
-        
+
         layout.setVerticalGroup(layout.createSequentialGroup()
             .addGroup(layout.createParallelGroup()
@@ -95 +96 @@
             .addComponent(help)
         );
-        
+
         layout.setHorizontalGroup(layout.createParallelGroup()
             .addGroup(layout.createSequentialGroup()
@@ -110 +111 @@
             .addComponent(help)
         );
-        
+
         ExtendedDialog dialog = new ExtendedDialog(Main.parent,
                 tr("Download object"),
@@ -144 +145 @@
         processItems(layer.isSelected(), cbType.getType(), tfId.getIds(), referrers.isSelected());
     }
-    
-    void processItems(boolean newLayer, OsmPrimitiveType type, 
+
+    void processItems(boolean newLayer, OsmPrimitiveType type,
             final List<PrimitiveId> ids,
             boolean downloadReferrers) {
@@ -155 +156 @@
         final DownloadPrimitivesTask task = new DownloadPrimitivesTask(layer, ids);
         Main.worker.submit(task);
-        
+
         if (downloadReferrers) {
             for (PrimitiveId id : ids) {
@@ -161 +162 @@
             }
         }
-        
+
         Runnable showErrorsAndWarnings = new Runnable() {
             @Override
@@ -169 +170 @@
                     final ExtendedDialog dlg = reportProblemDialog(errs,
                             trn("Object could not be downloaded", "Some objects could not be downloaded", errs.size()),
-                            trn("One object could not be downloaded.<br>", 
+                            trn("One object could not be downloaded.<br>",
                                 "{0} objects could not be downloaded.<br>",
                                 errs.size(),
                                 errs.size())
                             + tr("The server replied with response code 404.<br>"
-                                + "This usually means, the server does not know an object with the requested id."), 
+                                + "This usually means, the server does not know an object with the requested id."),
                             tr("missing objects:"),
                             JOptionPane.ERROR_MESSAGE
@@ -189 +190 @@
                     }
                 }
-                
+
                 Set<PrimitiveId> del = new TreeSet<PrimitiveId>();
                 DataSet ds = getCurrentDataSet();
@@ -202 +203 @@
                             trn("Object deleted", "Objects deleted", del.size()),
                             trn(
-                                "One downloaded object is deleted.", 
+                                "One downloaded object is deleted.",
                                 "{0} downloaded objects are deleted.",
                                 del.size(),
@@ -220 +221 @@
         Main.worker.submit(showErrorsAndWarnings);
     }
-    
-    private ExtendedDialog reportProblemDialog(Set<PrimitiveId> errs, 
+
+    private ExtendedDialog reportProblemDialog(Set<PrimitiveId> errs,
             String TITLE, String TEXT, String LIST_LABEL, int msgType) {
         JPanel p = new JPanel(new GridBagLayout());
@@ -242 +243 @@
         return new ExtendedDialog(
                 Main.parent,
-                TITLE, 
+                TITLE,
                 new String[] { tr("Ok") })
             .setButtonIcons(new String[] { "ok" })
@@ -252 +253 @@
         final String data;
         final String text;
-        
-        public SimpleListItem(String data, String text) {  
-            this.data = data;   
-            this.text = text; 
-        }
-        
-        @Override public String toString() { 
-            return text; 
+
+        public SimpleListItem(String data, String text) {
+            this.data = data;
+            this.text = text;
+        }
+
+        @Override public String toString() {
+            return text;
         }
     }