Ticket #6589: patch.txt

File patch.txt, 5.3 KB (added by Casiope, 15 years ago)
Line 
1Index: C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/.classpath
2===================================================================
3--- C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/.classpath (revision 26323)
4+++ C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/.classpath (working copy)
5@@ -1,7 +1,7 @@
6-<?xml version="1.0" encoding="UTF-8"?>
7-<classpath>
8- <classpathentry kind="src" path="src"/>
9- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
10- <classpathentry combineaccessrules="false" kind="src" path="/JOSM"/>
11- <classpathentry kind="output" path="build"/>
12-</classpath>
13+<?xml version="1.0" encoding="UTF-8"?>
14+<classpath>
15+ <classpathentry kind="src" path="src"/>
16+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JDK 5"/>
17+ <classpathentry combineaccessrules="false" exported="true" kind="src" path="/JOSM"/>
18+ <classpathentry kind="output" path="build"/>
19+</classpath>
20Index: C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/build.xml
21===================================================================
22--- C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/build.xml (revision 26323)
23+++ C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/build.xml (working copy)
24@@ -25,7 +25,7 @@
25 **
26 -->
27 <project name="cadastre-fr" default="dist" basedir=".">
28- <property name="josm" location="../../core/dist/josm-custom.jar"/>
29+ <property name="josm" location="../JOSM/dist/josm-custom.jar"/>
30 <property name="plugin.dist.dir" value="../../dist"/>
31 <property name="plugin.build.dir" value="build"/>
32 <property name="plugin.jar" value="${plugin.dist.dir}/${ant.project.name}.jar"/>
33Index: C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java
34===================================================================
35--- C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java (revision 26323)
36+++ C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java (working copy)
37@@ -54,19 +54,19 @@
38
39 private JRadioButton grabMultiplier4 = new JRadioButton("", true);
40
41- private JRadioButton crosspiece1 = new JRadioButton("off");
42+ private JRadioButton crosspiece1 = new JRadioButton(tr("off"));
43
44- private JRadioButton crosspiece2 = new JRadioButton("25m");
45+ private JRadioButton crosspiece2 = new JRadioButton(tr("25 m"));
46
47- private JRadioButton crosspiece3 = new JRadioButton("50m");
48+ private JRadioButton crosspiece3 = new JRadioButton(tr("50 m"));
49
50- private JRadioButton crosspiece4 = new JRadioButton("100m");
51+ private JRadioButton crosspiece4 = new JRadioButton(tr("100 m"));
52
53 private JRadioButton grabRes1 = new JRadioButton("high");
54
55- private JRadioButton grabRes2 = new JRadioButton("medium");
56+ private JRadioButton grabRes2 = new JRadioButton(tr("medium"));
57
58- private JRadioButton grabRes3 = new JRadioButton("low");
59+ private JRadioButton grabRes3 = new JRadioButton(tr("low"));
60
61 private JCheckBox layerLS3 = new JCheckBox(tr("water"));
62 private JCheckBox layerLS2 = new JCheckBox(tr("building"));
63Index: C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionGrab.java
64===================================================================
65--- C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionGrab.java (revision 26323)
66+++ C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionGrab.java (working copy)
67@@ -19,7 +19,7 @@
68 */
69 private static final long serialVersionUID = 1L;
70
71- public static String name = "Cadastre grab";
72+ public static String name = tr("Cadastre grab");
73
74 public MenuActionGrab() {
75 super(tr(name), "cadastre_small", tr("Download Image from French Cadastre WMS"),
76Index: C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java
77===================================================================
78--- C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java (revision 26323)
79+++ C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionGrabPlanImage.java (working copy)
80@@ -30,7 +30,7 @@
81 */
82 private static final long serialVersionUID = 1L;
83
84- public static String name = "Georeference an image";
85+ public static String name = tr("Georeference an image");
86
87 private DownloadWMSPlanImage downloadWMSPlanImage;
88 private WMSLayer wmsLayer;
89Index: C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java
90===================================================================
91--- C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java (revision 26323)
92+++ C:/Users/Philippe/Desktop/JOSM-Cadastre-fr/src/cadastre_fr/MenuActionLoadFromCache.java (working copy)
93@@ -18,7 +18,7 @@
94 public class MenuActionLoadFromCache extends JosmAction {
95 private static final long serialVersionUID = 1L;
96
97- public static String name = "Load layer from cache";
98+ public static String name = tr("Load layer from cache");
99
100 public MenuActionLoadFromCache() {
101 super(tr(name), "cadastre_small", tr("Load location from cache (only if cache is enabled)"), null, false);