Ticket #6153: patch.txt

File patch.txt, 16.4 KB (added by casiope, 15 years ago)

New patch, new translations

Line 
1### Eclipse Workspace Patch 1.0
2#P JOSM
3Index: src/org/openstreetmap/josm/gui/layer/GpxLayer.java
4===================================================================
5--- src/org/openstreetmap/josm/gui/layer/GpxLayer.java (revision 4018)
6+++ src/org/openstreetmap/josm/gui/layer/GpxLayer.java (working copy)
7@@ -635,7 +635,7 @@
8 msg
9 .add(
10 new JLabel(
11- tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:")),
12+ tr("<html>Upload of unprocessed GPS data as map data is considered harmful.<br>If you want to upload traces, look here:</html>")),
13 GBC.eol());
14 msg.add(new UrlLabel(tr("http://www.openstreetmap.org/traces")), GBC.eop());
15 if (!ConditionalOptionPaneUtil.showConfirmationDialog("convert_to_data", Main.parent, msg, tr("Warning"),
16Index: src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java
17===================================================================
18--- src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (revision 4018)
19+++ src/org/openstreetmap/josm/gui/dialogs/InspectPrimitiveDialog.java (working copy)
20@@ -60,7 +60,7 @@
21 boolean mappaintTabLoaded;
22
23 public InspectPrimitiveDialog(Collection<OsmPrimitive> primitives) {
24- super(Main.parent, tr("Advanced object info"), new String[] {"Close"});
25+ super(Main.parent, tr("Advanced object info"), new String[] {tr("Close")});
26 this.primitives = primitives;
27 setPreferredSize(new Dimension(750, 550));
28
29Index: src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java
30===================================================================
31--- src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (revision 4018)
32+++ src/org/openstreetmap/josm/gui/dialogs/changeset/query/AdvancedChangesetQueryPanel.java (working copy)
33@@ -664,7 +664,7 @@
34
35 gc.gridx = 2;
36 gc.weightx = 0.0;
37- pnl.add(new JLabel("Time: "),gc);
38+ pnl.add(new JLabel(tr("Time:")),gc);
39
40 gc.gridx = 3;
41 gc.weightx = 0.3;
42@@ -697,7 +697,7 @@
43 tfClosedAfterDate2.setToolTipText(valClosedAfterDate2.getStandardTooltipTextAsHtml());
44 gc.gridx = 3;
45 gc.weightx = 0.0;
46- pnl.add(new JLabel("Time:"),gc);
47+ pnl.add(new JLabel(tr("Time:")),gc);
48
49 gc.gridx = 4;
50 gc.weightx = 0.3;
51@@ -728,7 +728,7 @@
52
53 gc.gridx = 3;
54 gc.weightx = 0.0;
55- pnl.add(new JLabel("Time:"),gc);
56+ pnl.add(new JLabel(tr("Time:")),gc);
57
58 gc.gridx = 4;
59 gc.weightx = 0.3;
60Index: src/org/openstreetmap/josm/gui/layer/WMSLayer.java
61===================================================================
62--- src/org/openstreetmap/josm/gui/layer/WMSLayer.java (revision 4018)
63+++ src/org/openstreetmap/josm/gui/layer/WMSLayer.java (working copy)
64@@ -231,7 +231,7 @@
65 + "for this WMS layer does neither end with a ''&'' nor with a ''?''.<br>"
66 + "This is likely to lead to invalid WMS request. You should check your<br>"
67 + "preference settings.<br>"
68- + "Do you want to fetch WMS tiles anyway?",
69+ + "Do you want to fetch WMS tiles anyway?</html>",
70 url);
71 String [] options = new String[] {
72 tr("Yes, fetch images"),
73Index: src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java
74===================================================================
75--- src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (revision 4018)
76+++ src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheTableColumnModel.java (working copy)
77@@ -18,7 +18,7 @@
78
79 // column 0 - Id
80 col = new TableColumn(0);
81- col.setHeaderValue("ID");
82+ col.setHeaderValue(tr("ID"));
83 col.setResizable(true);
84 col.setWidth(20);
85 col.setPreferredWidth(20);
86Index: src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java
87===================================================================
88--- src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (revision 4018)
89+++ src/org/openstreetmap/josm/data/validation/tests/DuplicateWay.java (working copy)
90@@ -64,8 +64,8 @@
91 * Constructor
92 */
93 public DuplicateWay() {
94- super(tr("Duplicated ways")+".",
95- tr("This test checks that there are no ways with same tags and same node coordinates."));
96+ super(tr("Duplicated ways."),
97+ tr("This test checks that there are no ways with same tags and same node coordinates."));
98 }
99
100
101@@ -94,7 +94,7 @@
102 List<Node> wNodes = w.getNodes();
103 List<LatLon> wLat = new ArrayList<LatLon>(wNodes.size());
104 for (int i=0;i<wNodes.size();i++) {
105- wLat.add(wNodes.get(i).getCoor());
106+ wLat.add(wNodes.get(i).getCoor());
107 }
108 Map<String, String> wkeys = w.getKeys();
109 wkeys.remove("created_by");
110Index: src/org/openstreetmap/josm/gui/preferences/LafPreference.java
111===================================================================
112--- src/org/openstreetmap/josm/gui/preferences/LafPreference.java (revision 4018)
113+++ src/org/openstreetmap/josm/gui/preferences/LafPreference.java (working copy)
114@@ -100,7 +100,7 @@
115
116 panel.add(Box.createVerticalGlue(), GBC.eol().insets(0, 20, 0, 0));
117
118- panel.add(new JLabel(tr("Look and Feel")), GBC.std().insets(20, 0, 0, 0));
119+ panel.add(new JLabel(tr("Skin")), GBC.std().insets(20, 0, 0, 0));
120 panel.add(GBC.glue(5,0), GBC.std().fill(GBC.HORIZONTAL));
121 panel.add(lafCombo, GBC.eol().fill(GBC.HORIZONTAL));
122
123Index: src/org/openstreetmap/josm/plugins/PluginHandler.java
124===================================================================
125--- src/org/openstreetmap/josm/plugins/PluginHandler.java (revision 4018)
126+++ src/org/openstreetmap/josm/plugins/PluginHandler.java (working copy)
127@@ -26,8 +26,8 @@
128 import java.util.LinkedList;
129 import java.util.List;
130 import java.util.Map;
131-import java.util.Set;
132 import java.util.Map.Entry;
133+import java.util.Set;
134 import java.util.TreeSet;
135 import java.util.concurrent.ExecutionException;
136 import java.util.concurrent.ExecutorService;
137@@ -49,9 +49,9 @@
138 import org.openstreetmap.josm.Main;
139 import org.openstreetmap.josm.data.Version;
140 import org.openstreetmap.josm.gui.HelpAwareOptionPane;
141+import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
142 import org.openstreetmap.josm.gui.JMultilineLabel;
143 import org.openstreetmap.josm.gui.MapFrame;
144-import org.openstreetmap.josm.gui.HelpAwareOptionPane.ButtonSpec;
145 import org.openstreetmap.josm.gui.download.DownloadSelection;
146 import org.openstreetmap.josm.gui.help.HelpUtil;
147 import org.openstreetmap.josm.gui.preferences.PreferenceSettingFactory;
148@@ -86,34 +86,34 @@
149 }
150
151 DEPRECATED_PLUGINS = Arrays.asList(new DeprecatedPlugin[] {
152- new DeprecatedPlugin("mappaint", IN_CORE),
153- new DeprecatedPlugin("unglueplugin", IN_CORE),
154- new DeprecatedPlugin("lang-de", IN_CORE),
155- new DeprecatedPlugin("lang-en_GB", IN_CORE),
156- new DeprecatedPlugin("lang-fr", IN_CORE),
157- new DeprecatedPlugin("lang-it", IN_CORE),
158- new DeprecatedPlugin("lang-pl", IN_CORE),
159- new DeprecatedPlugin("lang-ro", IN_CORE),
160- new DeprecatedPlugin("lang-ru", IN_CORE),
161- new DeprecatedPlugin("ewmsplugin", IN_CORE),
162- new DeprecatedPlugin("ywms", IN_CORE),
163- new DeprecatedPlugin("tways-0.2", IN_CORE),
164- new DeprecatedPlugin("geotagged", IN_CORE),
165- new DeprecatedPlugin("landsat", tr("replaced by new {0} plugin","lakewalker")),
166- new DeprecatedPlugin("namefinder", IN_CORE),
167- new DeprecatedPlugin("waypoints", IN_CORE),
168- new DeprecatedPlugin("slippy_map_chooser", IN_CORE),
169- new DeprecatedPlugin("tcx-support", tr("replaced by new {0} plugin","dataimport")),
170- new DeprecatedPlugin("usertools", IN_CORE),
171- new DeprecatedPlugin("AgPifoJ", IN_CORE),
172- new DeprecatedPlugin("utilsplugin", IN_CORE),
173- new DeprecatedPlugin("ghost", IN_CORE),
174- new DeprecatedPlugin("validator", IN_CORE),
175- new DeprecatedPlugin("multipoly", IN_CORE),
176- new DeprecatedPlugin("remotecontrol", IN_CORE, new RemotecontrolMigration()),
177- new DeprecatedPlugin("imagery", IN_CORE),
178- new DeprecatedPlugin("slippymap", IN_CORE),
179- new DeprecatedPlugin("wmsplugin", IN_CORE),
180+ new DeprecatedPlugin("mappaint", IN_CORE),
181+ new DeprecatedPlugin("unglueplugin", IN_CORE),
182+ new DeprecatedPlugin("lang-de", IN_CORE),
183+ new DeprecatedPlugin("lang-en_GB", IN_CORE),
184+ new DeprecatedPlugin("lang-fr", IN_CORE),
185+ new DeprecatedPlugin("lang-it", IN_CORE),
186+ new DeprecatedPlugin("lang-pl", IN_CORE),
187+ new DeprecatedPlugin("lang-ro", IN_CORE),
188+ new DeprecatedPlugin("lang-ru", IN_CORE),
189+ new DeprecatedPlugin("ewmsplugin", IN_CORE),
190+ new DeprecatedPlugin("ywms", IN_CORE),
191+ new DeprecatedPlugin("tways-0.2", IN_CORE),
192+ new DeprecatedPlugin("geotagged", IN_CORE),
193+ new DeprecatedPlugin("landsat", tr("replaced by new {0} plugin","lakewalker")),
194+ new DeprecatedPlugin("namefinder", IN_CORE),
195+ new DeprecatedPlugin("waypoints", IN_CORE),
196+ new DeprecatedPlugin("slippy_map_chooser", IN_CORE),
197+ new DeprecatedPlugin("tcx-support", tr("replaced by new {0} plugin","dataimport")),
198+ new DeprecatedPlugin("usertools", IN_CORE),
199+ new DeprecatedPlugin("AgPifoJ", IN_CORE),
200+ new DeprecatedPlugin("utilsplugin", IN_CORE),
201+ new DeprecatedPlugin("ghost", IN_CORE),
202+ new DeprecatedPlugin("validator", IN_CORE),
203+ new DeprecatedPlugin("multipoly", IN_CORE),
204+ new DeprecatedPlugin("remotecontrol", IN_CORE, new RemotecontrolMigration()),
205+ new DeprecatedPlugin("imagery", IN_CORE),
206+ new DeprecatedPlugin("slippymap", IN_CORE),
207+ new DeprecatedPlugin("wmsplugin", IN_CORE),
208 });
209 }
210
211@@ -487,13 +487,14 @@
212 e.printStackTrace();
213 if (e.getCause() instanceof ClassNotFoundException) {
214 msg = tr("<html>Could not load plugin {0} because the plugin<br>main class ''{1}'' was not found.<br>"
215- + "Delete from preferences?", plugin.name, plugin.className);
216+ + "Delete from preferences?</html>", plugin.name, plugin.className);
217 }
218 } catch (Throwable e) {
219 e.printStackTrace();
220 }
221- if(msg != null && confirmDisablePlugin(parent, msg, plugin.name))
222+ if(msg != null && confirmDisablePlugin(parent, msg, plugin.name)) {
223 Main.pref.removeFromCollection("plugins", plugin.name);
224+ }
225 }
226
227 /**
228@@ -717,8 +718,8 @@
229 * @throws IllegalArgumentException thrown if plugins is null
230 */
231 public static List<PluginInformation> updatePlugins(Window parent,
232- List<PluginInformation> plugins, ProgressMonitor monitor)
233- throws IllegalArgumentException{
234+ List<PluginInformation> plugins, ProgressMonitor monitor)
235+ throws IllegalArgumentException{
236 CheckParameterUtil.ensureParameterNotNull(plugins, "plugins");
237 if (monitor == null) {
238 monitor = NullProgressMonitor.INSTANCE;
239@@ -1011,11 +1012,12 @@
240 PluginInformation pi = pp.getPluginInformation();
241 pl.remove(pi.name);
242 pl.add(pi.name + " (" + (pi.localversion != null && !pi.localversion.equals("")
243- ? pi.localversion : "unknown") + ")");
244+ ? pi.localversion : "unknown") + ")");
245 }
246 Collections.sort(pl);
247- for (String s : pl)
248+ for (String s : pl) {
249 text += "Plugin: " + s + "\n";
250+ }
251 return text;
252 }
253
254Index: src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java
255===================================================================
256--- src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (revision 4018)
257+++ src/org/openstreetmap/josm/data/validation/tests/UntaggedNode.java (working copy)
258@@ -36,7 +36,7 @@
259 * Constructor
260 */
261 public UntaggedNode() {
262- super(tr("Untagged and unconnected nodes")+".",
263+ super(tr("Untagged and unconnected nodes."),
264 tr("This test checks for untagged nodes that are not part of any way."));
265 }
266
267@@ -68,7 +68,7 @@
268 /* translation note: don't translate quoted words */
269 String msg = marktr("Has tag containing ''fixme'' or ''FIXME''");
270 errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
271- tr(msg), msg, UNTAGGED_NODE_FIXME, n));
272+ tr(msg), msg, UNTAGGED_NODE_FIXME, n));
273 return;
274 }
275
276@@ -93,13 +93,13 @@
277 }
278 if (msg != null) {
279 errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
280- tr(msg), msg, code, n));
281+ tr(msg), msg, code, n));
282 return;
283 }
284 }
285 // Does not happen, but just to be sure. Maybe definition of uninteresting tags changes in future.
286 errors.add(new TestError(this, Severity.WARNING, tr("Unconnected nodes without physical tags"),
287- tr("Other"), "Other", UNTAGGED_NODE_OTHER, n));
288+ tr("Other"), "Other", UNTAGGED_NODE_OTHER, n));
289 }
290 }
291
292@@ -117,11 +117,11 @@
293 if (testError.getTester() instanceof UntaggedNode) {
294 int code = testError.getCode();
295 switch (code) {
296- case UNTAGGED_NODE_BLANK:
297- case UNTAGGED_NODE_CREATED_BY:
298- case UNTAGGED_NODE_WATCH:
299- case UNTAGGED_NODE_SOURCE:
300- return true;
301+ case UNTAGGED_NODE_BLANK:
302+ case UNTAGGED_NODE_CREATED_BY:
303+ case UNTAGGED_NODE_WATCH:
304+ case UNTAGGED_NODE_SOURCE:
305+ return true;
306 }
307 }
308 return false;
309Index: src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java
310===================================================================
311--- src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (revision 4018)
312+++ src/org/openstreetmap/josm/data/validation/tests/SimilarNamedWays.java (working copy)
313@@ -38,8 +38,8 @@
314 * Constructor
315 */
316 public SimilarNamedWays() {
317- super(tr("Similarly named ways")+".",
318- tr("This test checks for ways with similar names that may have been misspelled."));
319+ super(tr("Similarly named ways."),
320+ tr("This test checks for ways with similar names that may have been misspelled."));
321 }
322
323 @Override
324Index: src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java
325===================================================================
326--- src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (revision 4018)
327+++ src/org/openstreetmap/josm/data/validation/tests/DuplicateNode.java (working copy)
328@@ -65,9 +65,8 @@
329 if (precision==0)
330 return ((List<Node>) o).get(0).getCoor().getRoundedToOsmPrecision();
331 return RoundCoord(((List<Node>) o).get(0));
332- } else {
333+ } else
334 throw new AssertionError();
335- }
336 }
337
338 @Override
339@@ -106,7 +105,7 @@
340 * Constructor
341 */
342 public DuplicateNode() {
343- super(tr("Duplicated nodes")+".",
344+ super(tr("Duplicated nodes."),
345 tr("This test checks that there are no nodes at the very same location."));
346 }
347