Changeset 115 in josm
- Timestamp:
- 2006-07-19T01:44:25+02:00 (19 years ago)
- Files:
-
- 5 added
- 12 edited
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
CONTRIBUTION
r109 r115 20 20 Several smaller patches are contributed by community members 21 21 of OSM. 22 23 Internalisation: 24 German (not finished): Sven Anders <sven@anders-hamburg.de> 25 French: Frédéric Bonifas <fredericbonifas@gmail.com> 26 22 27 23 28 All the rest are belong to me. -
build.xml
r113 r115 75 75 <arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lde ${po}/de.po"/> 76 76 </exec> 77 <exec executable="msgfmt"> 78 <arg line="--java2 -d${po} -rorg.openstreetmap.josm.Translation -lfr ${po}/fr.po"/> 79 </exec> 77 80 </target> 78 81 -
po/de.po
r113 r115 6 6 "Project-Id-Version: de\n" 7 7 "Report-Msgid-Bugs-To: \n" 8 "POT-Creation-Date: 2006-07-1 7 02:43+0200\n"8 "POT-Creation-Date: 2006-07-19 01:26+0200\n" 9 9 "PO-Revision-Date: 2006-07-16 23:44+0200\n" 10 10 "Last-Translator: Sven Anders <sven@anders-hamburg.de>\n" … … 23 23 24 24 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:55 25 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:24326 25 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:253 27 26 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/DeleteCommand.java:46 … … 186 185 187 186 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/PreferencesAction.java:21 188 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:17 0187 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:172 189 188 msgid "Preferences" 190 189 msgstr "Einstellungen" … … 298 297 299 298 #: /home/imi/src/josm/src/org/openstreetmap/josm/actions/DownloadAction.java:232 300 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:236301 299 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251 302 300 #: /home/imi/src/josm/src/org/openstreetmap/josm/command/AddCommand.java:52 … … 886 884 msgstr "" 887 885 888 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:238 886 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240 887 msgid "Please select the row to edit." 888 msgstr "" 889 890 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245 891 msgid "Please select the row to delete." 892 msgstr "" 893 894 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251 895 msgid "Add a new key/value pair to all objects" 896 msgstr "" 897 889 898 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252 890 899 #: /home/imi/src/josm/src/org/openstreetmap/josm/Main.java:174 891 900 msgid "Edit" 892 901 msgstr "Bearbeiten" 893 894 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:240895 msgid "Please select the row to edit."896 msgstr ""897 898 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:245899 msgid "Please select the row to delete."900 msgstr ""901 902 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:251903 msgid "Add a new key/value pair to all objects"904 msgstr ""905 902 906 903 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:252 … … 956 953 msgstr "" 957 954 958 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:13 2955 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:138 959 956 msgid "track" 960 957 msgid_plural "tracks" … … 962 959 msgstr[1] "" 963 960 964 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:13 3961 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:139 965 962 msgid "point" 966 963 msgid_plural "points" … … 968 965 msgstr[1] "" 969 966 970 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 55967 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:161 971 968 #, java-format 972 969 msgid "a track with {0} point" … … 975 972 msgstr[1] "" 976 973 977 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 59974 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165 978 975 #, java-format 979 976 msgid "{0} consists of {1} track" 980 977 msgstr "" 981 978 982 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 59979 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:165 983 980 #, java-format 984 981 msgid "{0} point" … … 987 984 msgstr[1] "" 988 985 989 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:16 3986 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:169 990 987 msgid "Customize Color" 991 988 msgstr "" 992 989 993 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 68990 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174 994 991 msgid "OK" 995 992 msgstr "" 996 993 997 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 68994 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174 998 995 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PleaseWaitRunnable.java:55 999 996 msgid "Cancel" 1000 997 msgstr "" 1001 998 1002 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 68999 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:174 1003 1000 msgid "Default" 1004 1001 msgstr "Voreinstellung" 1005 1002 1006 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 691003 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:175 1007 1004 msgid "Choose a color" 1008 1005 msgstr "Farbe auswählen" 1009 1006 1010 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:1 841007 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:190 1011 1008 msgid "Import images" 1012 1009 msgstr "" 1013 1010 1014 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java: 1961011 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:202 1015 1012 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:330 1016 1013 msgid "JPEG images (*.jpg)" … … 1135 1132 msgstr "" 1136 1133 1137 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:1 591138 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:1 231134 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:124 1135 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:138 1139 1136 msgid "Java Open Street Map - Editor" 1140 1137 msgstr "Java OpenStreetMap - Editor " 1141 1138 1142 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:1 991139 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MapView.java:164 1143 1140 msgid "layer not in list." 1144 1141 msgstr "" 1145 1142 1146 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:5 11143 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:52 1147 1144 msgid "Hint: Some changes came from uploading new data to the server." 1148 1145 msgstr "" 1149 1146 1150 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:5 31147 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:54 1151 1148 msgid "There are unsaved changes. Really quit?" 1152 1149 msgstr "" 1153 1150 1154 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:5 41151 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:55 1155 1152 msgid "Unsaved Changes" 1156 1153 msgstr "" 1157 1154 1158 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:74 1159 #, fuzzy 1160 msgid "" 1161 "Java OpenStreetMap Editor\n" 1162 "\n" 1163 "usage:\n" 1164 "\tjava -jar josm.jar <option> <option> <option>...\n" 1165 "\n" 1166 "options:\n" 1167 "\t--help|-?|-h Show this help\n" 1168 "\t--geometry=widthxheight(+|-)x(+|-)y Standard unix geometry argument\n" 1169 "\t[--download=]minlat,minlon,maxlat,maxlon Download the bounding box\n" 1170 "\t[--download=]<url> Download the location at the url " 1171 "(with lat=x&lon=y&zoom=z)\n" 1172 "\t[--download=]<filename> Open file (as raw gps, if .gpx " 1173 "or .csv)\n" 1174 "\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw " 1175 "gps\n" 1176 "\t--selection=<searchstring> Select with the given search\n" 1177 "\t--no-fullscreen Don't launch in fullscreen mode\n" 1178 "\t--reset-preferences Reset the preferences to " 1179 "default\n" 1180 "\n" 1181 "examples:\n" 1182 "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n" 1183 "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?" 1184 "lat=43.2&lon=11.1&zoom=13\n" 1185 "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/" 1186 "OSM_errors_node-duplicate.xml\n" 1187 "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n" 1188 "\n" 1155 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:103 1156 #, fuzzy 1157 msgid "Java OpenStreetMap Editor" 1158 msgstr "Java OpenStreetMap - Editor " 1159 1160 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:104 1161 msgid "usage" 1162 msgstr "" 1163 1164 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:106 1165 msgid "options" 1166 msgstr "" 1167 1168 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:107 1169 msgid "Show this help" 1170 msgstr "" 1171 1172 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:108 1173 msgid "Standard unix geometry argument" 1174 msgstr "" 1175 1176 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:109 1177 msgid "Download the bounding box" 1178 msgstr "" 1179 1180 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:110 1181 msgid "Download the location at the url (with lat=x&lon=y&zoom=z)" 1182 msgstr "" 1183 1184 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:111 1185 msgid "Open file (as raw gps, if .gpx or .csv)" 1186 msgstr "" 1187 1188 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:112 1189 msgid "Download the bounding box as raw gps" 1190 msgstr "" 1191 1192 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:113 1193 msgid "Select with the given search" 1194 msgstr "" 1195 1196 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:114 1197 msgid "Don't launch in fullscreen mode" 1198 msgstr "" 1199 1200 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:115 1201 msgid "Reset the preferences to default" 1202 msgstr "" 1203 1204 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:116 1205 msgid "Set the language. Example: " 1206 msgstr "" 1207 1208 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:117 1209 msgid "examples" 1210 msgstr "" 1211 1212 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:123 1213 msgid "" 1189 1214 "Parameters are read in the order they are specified, so make sure you load\n" 1190 "some data before --selection\n" 1191 "\n" 1192 "Instead of --download=<bbox> you may specify osm://<bbox>\n" 1193 msgstr "" 1194 "Java OpenStreetMap Editor\n" 1195 "\n" 1196 "Aufruf:\n" 1197 "\tjava -jar josm.jar <option> <option> <option>...\n" 1198 "\n" 1199 "options:\n" 1200 "\t--help|-?|-h Zeige diese Hilfe an\n" 1201 "\t--geometry=widthxheight(+|-)x(+|-)y Standard unix Geometry argument\n" 1202 "\t[--download=]minlat,minlon,maxlat,maxlon Download the bounding box\n" 1203 "\t[--download=]<url> Download the location at the url " 1204 "(with lat=x&lon=y&zoom=z)\n" 1205 "\t[--download=]<filename> Datei öffnen (als roh gps, wenn ." 1206 "gpx oder .csv)\n" 1207 "\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw " 1208 "gps\n" 1209 "\t--selection=<searchstring> Select with the given search\n" 1210 "\t--no-fullscreen Nicht im Fullscreenmodus " 1211 "starten\n" 1212 "\t--reset-preferences Einstellungen auf " 1213 "Voreinstellungen zurücksetzen\n" 1214 "\n" 1215 "Beispiele:\n" 1216 "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n" 1217 "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?" 1218 "lat=43.2&lon=11.1&zoom=13\n" 1219 "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/" 1220 "OSM_errors_node-duplicate.xml\n" 1221 "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n" 1222 "\n" 1223 "Parameters are read in the order they are specified, so make sure you load\n" 1224 "some data before --selection\n" 1225 "\n" 1226 "Instead of --download=<bbox> you may specify osm://<bbox>\n" 1227 1228 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:101 1215 "some data before --selection" 1216 msgstr "" 1217 1218 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:125 1219 msgid "Instead of --download=<bbox> you may specify osm://<bbox>\n" 1220 msgstr "" 1221 1222 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/MainApplication.java:131 1229 1223 #, java-format 1230 1224 msgid "Cannot open preferences directory: {0}" … … 1337 1331 msgstr "" 1338 1332 1339 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java: 891333 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:90 1340 1334 msgid "You have to restart JOSM for some settings to take effect." 1341 1335 msgstr "" 1342 1336 1343 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:10 01337 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:101 1344 1338 msgid "OptionPane.cancelButtonText" 1345 1339 msgstr "" 1346 1340 1347 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:15 41341 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:155 1348 1342 msgid "Draw lines between raw gps points." 1349 1343 msgstr "" 1350 1344 1351 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:15 81345 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159 1352 1346 msgid "Force lines if no segments imported." 1353 1347 msgstr "" 1354 1348 1355 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:159 1349 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:160 1350 msgid "Draw large GPS points." 1351 msgstr "" 1352 1353 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:161 1356 1354 msgid "Draw Direction Arrows" 1357 1355 msgstr "" 1358 1356 1359 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 191357 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:221 1360 1358 msgid "" 1361 1359 "Force drawing of lines if the imported data contain no line information." 1362 1360 msgstr "" 1363 1361 1364 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:222 1362 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:225 1363 msgid "Draw larger dots for the GPS points." 1364 msgstr "" 1365 1366 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:226 1365 1367 #, fuzzy 1366 1368 msgid "Draw direction hints for all segments." 1367 1369 msgstr "Falsche Richtung der Abschnitte." 1368 1370 1369 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 371371 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:241 1370 1372 msgid "Color" 1371 1373 msgstr "" 1372 1374 1373 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 381375 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:242 1374 1376 msgid "Name" 1375 1377 msgstr "" 1376 1378 1377 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 591379 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:263 1378 1380 #, fuzzy 1379 1381 msgid "Choose" 1380 1382 msgstr "Bereich auswählen" 1381 1383 1382 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:26 31384 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:267 1383 1385 msgid "Please select a color." 1384 1386 msgstr "" 1385 1387 1386 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 681388 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:272 1387 1389 #, fuzzy, java-format 1388 1390 msgid "Choose a color for {0}" 1389 1391 msgstr "Farbe auswählen" 1390 1392 1391 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:27 51393 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:279 1392 1394 msgid "The base URL to the OSM server (REST API)" 1393 1395 msgstr "" 1394 1396 1395 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 761397 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:280 1396 1398 msgid "Login name (email) to the OSM account." 1397 1399 msgstr "" 1398 1400 1399 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 771401 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:281 1400 1402 msgid "" 1401 1403 "Login password to the OSM account. Leave blank to not store any password." 1402 1404 msgstr "" 1403 1405 1404 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 781406 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:282 1405 1407 msgid "The base URL to the server retrieving WMS background pictures from." 1406 1408 msgstr "" 1407 1409 1408 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 791410 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:283 1409 1411 msgid "" 1410 1412 "<html>Import string specification. lat/lon and time are imported.<br><b>lat</" … … 1416 1418 msgstr "" 1417 1419 1418 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 861420 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:290 1419 1421 msgid "" 1420 1422 "If your gps device draw to few lines, select this to draw lines along your " … … 1422 1424 msgstr "" 1423 1425 1424 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:2 871426 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:291 1425 1427 msgid "Colors used by different objects in JOSM." 1426 1428 msgstr "" 1427 1429 1428 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:29 21430 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296 1429 1431 msgid "Display Settings" 1430 1432 msgstr "" 1431 1433 1432 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:29 21434 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:296 1433 1435 msgid "" 1434 1436 "Various settings that influence the visual representation of the whole " … … 1436 1438 msgstr "" 1437 1439 1438 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:29 31440 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:297 1439 1441 msgid "Look and Feel" 1440 1442 msgstr "" 1441 1443 1442 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java: 2991444 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:304 1443 1445 msgid "Colors" 1444 1446 msgstr "" 1445 1447 1446 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 061448 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311 1447 1449 msgid "Connection Settings" 1448 1450 msgstr "" 1449 1451 1450 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 061452 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:311 1451 1453 #, fuzzy 1452 1454 msgid "Connection Settings to the OSM server." 1453 1455 msgstr "Kartendaten zum OSM Server speichern" 1454 1456 1455 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 071457 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:312 1456 1458 msgid "Base Server URL" 1457 1459 msgstr "" 1458 1460 1459 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 091461 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:314 1460 1462 msgid "OSM username (email)" 1461 1463 msgstr "" 1462 1464 1463 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:31 11465 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:316 1464 1466 msgid "OSM password" 1465 1467 msgstr "" 1466 1468 1467 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:31 31469 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:318 1468 1470 msgid "" 1469 1471 "<html>WARNING: The password is stored in plain text in the preferences file." … … 1472 1474 msgstr "" 1473 1475 1474 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:32 21476 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:327 1475 1477 msgid "CSV import specification (empty: read from first line in data)" 1476 1478 msgstr "" 1477 1479 1478 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 271480 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332 1479 1481 msgid "Map Settings" 1480 1482 msgstr "" 1481 1483 1482 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 271484 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:332 1483 1485 msgid "Settings for the map projection and data interpretation." 1484 1486 msgstr "" 1485 1487 1486 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:3 281488 #: /home/imi/src/josm/src/org/openstreetmap/josm/gui/PreferenceDialog.java:333 1487 1489 msgid "Projection method" 1488 1490 msgstr "" … … 1770 1772 msgstr "" 1771 1773 1774 #, fuzzy 1775 #~ msgid "" 1776 #~ "Java OpenStreetMap Editor\n" 1777 #~ "\n" 1778 #~ "usage:\n" 1779 #~ "\tjava -jar josm.jar <option> <option> <option>...\n" 1780 #~ "\n" 1781 #~ "options:\n" 1782 #~ "\t--help|-?|-h Show this help\n" 1783 #~ "\t--geometry=widthxheight(+|-)x(+|-)y Standard unix geometry " 1784 #~ "argument\n" 1785 #~ "\t[--download=]minlat,minlon,maxlat,maxlon Download the bounding box\n" 1786 #~ "\t[--download=]<url> Download the location at the " 1787 #~ "url (with lat=x&lon=y&zoom=z)\n" 1788 #~ "\t[--download=]<filename> Open file (as raw gps, if ." 1789 #~ "gpx or .csv)\n" 1790 #~ "\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as " 1791 #~ "raw gps\n" 1792 #~ "\t--selection=<searchstring> Select with the given search\n" 1793 #~ "\t--no-fullscreen Don't launch in fullscreen " 1794 #~ "mode\n" 1795 #~ "\t--reset-preferences Reset the preferences to " 1796 #~ "default\n" 1797 #~ "\n" 1798 #~ "examples:\n" 1799 #~ "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n" 1800 #~ "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?" 1801 #~ "lat=43.2&lon=11.1&zoom=13\n" 1802 #~ "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/" 1803 #~ "OSM_errors_node-duplicate.xml\n" 1804 #~ "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n" 1805 #~ "\n" 1806 #~ "Parameters are read in the order they are specified, so make sure you " 1807 #~ "load\n" 1808 #~ "some data before --selection\n" 1809 #~ "\n" 1810 #~ "Instead of --download=<bbox> you may specify osm://<bbox>\n" 1811 #~ msgstr "" 1812 #~ "Java OpenStreetMap Editor\n" 1813 #~ "\n" 1814 #~ "Aufruf:\n" 1815 #~ "\tjava -jar josm.jar <option> <option> <option>...\n" 1816 #~ "\n" 1817 #~ "options:\n" 1818 #~ "\t--help|-?|-h Zeige diese Hilfe an\n" 1819 #~ "\t--geometry=widthxheight(+|-)x(+|-)y Standard unix Geometry " 1820 #~ "argument\n" 1821 #~ "\t[--download=]minlat,minlon,maxlat,maxlon Download the bounding box\n" 1822 #~ "\t[--download=]<url> Download the location at the " 1823 #~ "url (with lat=x&lon=y&zoom=z)\n" 1824 #~ "\t[--download=]<filename> Datei öffnen (als roh gps, " 1825 #~ "wenn .gpx oder .csv)\n" 1826 #~ "\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as " 1827 #~ "raw gps\n" 1828 #~ "\t--selection=<searchstring> Select with the given search\n" 1829 #~ "\t--no-fullscreen Nicht im Fullscreenmodus " 1830 #~ "starten\n" 1831 #~ "\t--reset-preferences Einstellungen auf " 1832 #~ "Voreinstellungen zurücksetzen\n" 1833 #~ "\n" 1834 #~ "Beispiele:\n" 1835 #~ "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n" 1836 #~ "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?" 1837 #~ "lat=43.2&lon=11.1&zoom=13\n" 1838 #~ "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/" 1839 #~ "OSM_errors_node-duplicate.xml\n" 1840 #~ "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n" 1841 #~ "\n" 1842 #~ "Parameters are read in the order they are specified, so make sure you " 1843 #~ "load\n" 1844 #~ "some data before --selection\n" 1845 #~ "\n" 1846 #~ "Instead of --download=<bbox> you may specify osm://<bbox>\n" 1847 1772 1848 #~ msgid "F12" 1773 1849 #~ msgstr "F12" -
src/org/openstreetmap/josm/gui/MainApplication.java
r113 r115 13 13 import java.util.LinkedList; 14 14 import java.util.List; 15 import java.util.Locale; 15 16 import java.util.Map; 16 17 … … 70 71 Thread.setDefaultUncaughtExceptionHandler(new BugReportExceptionHandler()); 71 72 73 // construct argument table 72 74 List<String> argList = Arrays.asList(argArray); 73 if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) {74 System.out.println(tr("Java OpenStreetMap Editor\n\n"+75 "usage:\n"+76 "\tjava -jar josm.jar <option> <option> <option>...\n\n"+77 "options:\n"+78 "\t--help|-?|-h Show this help\n"+79 "\t--geometry=widthxheight(+|-)x(+|-)y Standard unix geometry argument\n"+80 "\t[--download=]minlat,minlon,maxlat,maxlon Download the bounding box\n"+81 "\t[--download=]<url> Download the location at the url (with lat=x&lon=y&zoom=z)\n"+82 "\t[--download=]<filename> Open file (as raw gps, if .gpx or .csv)\n"+83 "\t--downloadgps=minlat,minlon,maxlat,maxlon Download the bounding box as raw gps\n"+84 "\t--selection=<searchstring> Select with the given search\n"+85 "\t--no-fullscreen Don't launch in fullscreen mode\n"+86 "\t--reset-preferences Reset the preferences to default\n\n"+87 "examples:\n"+88 "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+89 "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?lat=43.2&lon=11.1&zoom=13\n"+90 "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+91 "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n\n"+92 93 "Parameters are read in the order they are specified, so make sure you load\n"+94 "some data before --selection\n\n"+95 "Instead of --download=<bbox> you may specify osm://<bbox>\n"));96 System.exit(0);97 }98 99 final File prefDir = new File(Main.pref.getPreferencesDir());100 if (prefDir.exists() && !prefDir.isDirectory()) {101 JOptionPane.showMessageDialog(null, tr("Cannot open preferences directory: {0}",Main.pref.getPreferencesDir()));102 return;103 }104 if (!prefDir.exists())105 prefDir.mkdirs();106 107 // construct argument table108 75 Map<String, Collection<String>> args = new HashMap<String, Collection<String>>(); 109 76 for (String arg : argArray) { … … 120 87 } 121 88 89 // very first thing to do is to setup the locale 90 if (args.containsKey("language") && !args.get("language").isEmpty() && args.get("language").iterator().next().length() >= 2) { 91 String s = args.get("language").iterator().next(); 92 Locale l = null; 93 if (s.length() <= 2 || s.charAt(2) != '_') 94 l = new Locale(s); 95 else if (s.length() <= 5 || s.charAt(5) != '.') 96 l = new Locale(s.substring(0,2), s.substring(3)); 97 else 98 l = new Locale(s.substring(0,2), s.substring(3,5), s.substring(6)); 99 Locale.setDefault(l); 100 } 101 102 if (argList.contains("--help") || argList.contains("-?") || argList.contains("-h")) { 103 System.out.println(tr("Java OpenStreetMap Editor")+"\n\n"+ 104 tr("usage")+":\n"+ 105 "\tjava -jar josm.jar <option> <option> <option>...\n\n"+ 106 tr("options")+":\n"+ 107 "\t--help|-?|-h "+tr("Show this help")+"\n"+ 108 "\t--geometry=widthxheight(+|-)x(+|-)y "+tr("Standard unix geometry argument")+"\n"+ 109 "\t[--download=]minlat,minlon,maxlat,maxlon "+tr("Download the bounding box")+"\n"+ 110 "\t[--download=]<url> "+tr("Download the location at the url (with lat=x&lon=y&zoom=z)")+"\n"+ 111 "\t[--download=]<filename> "+tr("Open file (as raw gps, if .gpx or .csv)")+"\n"+ 112 "\t--downloadgps=minlat,minlon,maxlat,maxlon "+tr("Download the bounding box as raw gps")+"\n"+ 113 "\t--selection=<searchstring> "+tr("Select with the given search")+"\n"+ 114 "\t--no-fullscreen "+tr("Don't launch in fullscreen mode")+"\n"+ 115 "\t--reset-preferences "+tr("Reset the preferences to default")+"\n\n"+ 116 "\t--language=<language> "+tr("Set the language. Example: ")+"\n\n"+ 117 tr("examples")+":\n"+ 118 "\tjava -jar josm.jar track1.gpx track2.gpx london.osm\n"+ 119 "\tjava -jar josm.jar http://www.openstreetmap.org/index.html?lat=43.2&lon=11.1&zoom=13\n"+ 120 "\tjava -jar josm.jar london.osm --selection=http://www.ostertag.name/osm/OSM_errors_node-duplicate.xml\n"+ 121 "\tjava -jar josm.jar 43.2,11.1,43.4,11.4\n\n"+ 122 123 tr("Parameters are read in the order they are specified, so make sure you load\n"+ 124 "some data before --selection")+"\n\n"+ 125 tr("Instead of --download=<bbox> you may specify osm://<bbox>\n")); 126 System.exit(0); 127 } 128 129 final File prefDir = new File(Main.pref.getPreferencesDir()); 130 if (prefDir.exists() && !prefDir.isDirectory()) { 131 JOptionPane.showMessageDialog(null, tr("Cannot open preferences directory: {0}",Main.pref.getPreferencesDir())); 132 return; 133 } 134 if (!prefDir.exists()) 135 prefDir.mkdirs(); 136 122 137 preConstructorInit(args); 123 138 JFrame mainFrame = new JFrame(tr("Java Open Street Map - Editor")); -
src/org/openstreetmap/josm/gui/MapView.java
r113 r115 8 8 import java.awt.event.ComponentAdapter; 9 9 import java.awt.event.ComponentEvent; 10 import java.awt.event.MouseAdapter;11 import java.awt.event.MouseEvent;12 import java.beans.PropertyChangeEvent;13 import java.beans.PropertyChangeListener;14 10 import java.util.ArrayList; 15 11 import java.util.Collection; … … 18 14 19 15 import javax.swing.JOptionPane; 20 import javax.swing.JSlider;21 import javax.swing.event.ChangeEvent;22 import javax.swing.event.ChangeListener;23 16 24 17 import org.openstreetmap.josm.Main; … … 87 80 88 81 89 private final class Scaler extends JSlider implements PropertyChangeListener, ChangeListener {90 boolean clicked = false;91 public Scaler() {92 super(0, 20);93 addMouseListener(new MouseAdapter(){94 @Override public void mousePressed(MouseEvent e) {95 clicked = true;96 }97 @Override public void mouseReleased(MouseEvent e) {98 clicked = false;99 }100 });101 MapView.this.addPropertyChangeListener("scale", this);102 addChangeListener(this);103 }104 public void propertyChange(PropertyChangeEvent evt) {105 if (!getModel().getValueIsAdjusting())106 setValue(zoom());107 }108 public void stateChanged(ChangeEvent e) {109 if (!clicked)110 return;111 EastNorth pos = world;112 for (int zoom = 0; zoom < getValue(); ++zoom)113 pos = new EastNorth(pos.east()/2, pos.north()/2);114 if (MapView.this.getWidth() < MapView.this.getHeight())115 zoomTo(center, pos.east()*2/(MapView.this.getWidth()-20));116 else117 zoomTo(center, pos.north()*2/(MapView.this.getHeight()-20));118 }119 }120 121 82 public MapView(AutoScaleAction autoScaleAction) { 122 83 this.autoScaleAction = autoScaleAction; … … 134 95 } 135 96 }); 136 Scaler zoomScaler = new Scaler(); 137 zoomScaler.setOpaque(false); 138 add(zoomScaler); 139 zoomScaler.setBounds(0,0, 100, 30); 97 98 MapSlider zoomSlider = new MapSlider(this); 99 add(zoomSlider); 100 zoomSlider.setBounds(0,0, 100, 30); 101 102 MapScaler scaler = new MapScaler(this); 103 add(scaler); 104 scaler.setLocation(10,30); 140 105 } 141 106 -
src/org/openstreetmap/josm/gui/PreferenceDialog.java
r113 r115 78 78 Main.pref.put("draw.rawgps.lines", drawRawGpsLines.isSelected()); 79 79 Main.pref.put("draw.rawgps.lines.force", forceRawGpsLines.isSelected()); 80 Main.pref.put("draw.rawgps.large", largeGpsPoints.isSelected()); 80 81 Main.pref.put("draw.segment.direction", directionHint.isSelected()); 81 82 … … 157 158 */ 158 159 private JCheckBox forceRawGpsLines = new JCheckBox(tr("Force lines if no segments imported.")); 160 private JCheckBox largeGpsPoints = new JCheckBox(tr("Draw large GPS points.")); 159 161 private JCheckBox directionHint = new JCheckBox(tr("Draw Direction Arrows")); 160 162 private JTable colors; … … 220 222 forceRawGpsLines.setSelected(Main.pref.getBoolean("draw.rawgps.lines.force")); 221 223 forceRawGpsLines.setEnabled(drawRawGpsLines.isSelected()); 224 largeGpsPoints.setSelected(Main.pref.getBoolean("draw.rawgps.large")); 225 largeGpsPoints.setToolTipText(tr("Draw larger dots for the GPS points.")); 222 226 directionHint.setToolTipText(tr("Draw direction hints for all segments.")); 223 227 directionHint.setSelected(Main.pref.getBoolean("draw.segment.direction")); … … 296 300 display.add(drawRawGpsLines, GBC.eol().insets(20,0,0,0)); 297 301 display.add(forceRawGpsLines, GBC.eop().insets(40,0,0,0)); 302 display.add(largeGpsPoints, GBC.eop().insets(20,0,0,0)); 298 303 display.add(directionHint, GBC.eop().insets(20,0,0,0)); 299 304 display.add(new JLabel(tr("Colors")), GBC.eol()); -
src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java
r113 r115 234 234 public void actionPerformed(ActionEvent e) { 235 235 int sel = propertyTable.getSelectedRow(); 236 if (e.getActionCommand().equals( tr("Add")))236 if (e.getActionCommand().equals("Add")) 237 237 add(); 238 else if (e.getActionCommand().equals( tr("Edit"))) {238 else if (e.getActionCommand().equals("Edit")) { 239 239 if (sel == -1) 240 240 JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to edit.")); 241 241 else 242 242 edit(sel); 243 } else if (e.getActionCommand().equals( tr("Delete"))) {243 } else if (e.getActionCommand().equals("Delete")) { 244 244 if (sel == -1) 245 245 JOptionPane.showMessageDialog(Main.parent, tr("Please select the row to delete.")); -
src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java
r110 r115 41 41 import org.openstreetmap.josm.gui.PleaseWaitRunnable; 42 42 import org.openstreetmap.josm.io.OsmIdReader; 43 import org.openstreetmap.josm.io.Progress Reader;43 import org.openstreetmap.josm.io.ProgressInputStream; 44 44 import org.openstreetmap.josm.tools.GBC; 45 45 import org.openstreetmap.josm.tools.ImageProvider; … … 74 74 try { 75 75 URLConnection con = url.openConnection(); 76 InputStream in = new Progress Reader(con, progress, currentAction);76 InputStream in = new ProgressInputStream(con, progress, currentAction); 77 77 currentAction.setText(tr("Downloading...")); 78 78 Map<Long, String> ids = idReader.parseIds(in); -
src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java
r113 r115 112 112 g.setColor(Color.GRAY); 113 113 Point old = null; 114 115 boolean force = Main.pref.getBoolean("draw.rawgps.lines.force"); 116 boolean lines = Main.pref.getBoolean("draw.rawgps.lines"); 117 boolean large = Main.pref.getBoolean("draw.rawgps.large"); 114 118 for (Collection<GpsPoint> c : data) { 115 if (! Main.pref.getBoolean("draw.rawgps.lines.force"))119 if (!force) 116 120 old = null; 117 121 for (GpsPoint p : c) { 118 122 Point screen = mv.getPoint(p.eastNorth); 119 if ( Main.pref.getBoolean("draw.rawgps.lines")&& old != null)123 if (lines && old != null) 120 124 g.drawLine(old.x, old.y, screen.x, screen.y); 121 else 125 else if (!large) 122 126 g.drawRect(screen.x, screen.y, 0, 0); 127 if (large) 128 g.fillRect(screen.x-1, screen.y-1, 3, 3); 123 129 old = screen; 124 130 } -
src/org/openstreetmap/josm/io/OsmServerReader.java
r104 r115 30 30 if (isAuthCancelled() && activeConnection.getResponseCode() == 401) 31 31 return null; 32 return new Progress Reader(activeConnection, progress, currentAction);32 return new ProgressInputStream(activeConnection, progress, currentAction); 33 33 } 34 34 } -
src/org/openstreetmap/josm/io/ProgressInputStream.java
r109 r115 12 12 * @author Imi 13 13 */ 14 public class Progress Readerextends InputStream {14 public class ProgressInputStream extends InputStream { 15 15 16 16 private final InputStream in; … … 21 21 private final URLConnection connection; 22 22 23 public Progress Reader(URLConnection con, BoundedRangeModel progress, JLabel currentAction) throws IOException {23 public ProgressInputStream(URLConnection con, BoundedRangeModel progress, JLabel currentAction) throws IOException { 24 24 this.connection = con; 25 25 this.in = con.getInputStream(); -
src/org/openstreetmap/josm/tools/I18n.java
r112 r115 20 20 i18n = I18nFactory.getI18n(Main.class); 21 21 } catch (MissingResourceException e) { 22 System.out.println("Locale '"+Locale.getDefault() .getLanguage()+"' not found. Using default.");22 System.out.println("Locale '"+Locale.getDefault()+"' not found. Using default."); 23 23 } 24 24 }
Note:
See TracChangeset
for help on using the changeset viewer.