Ignore:
Timestamp:
2009-06-27T15:59:16+02:00 (15 years ago)
Author:
stoecker
Message:

updated

File:
1 edited

Legend:

Unmodified
Added
Removed

  • applications/editors/josm/i18n/po/en_GB.po

    r16009 r16179  
    1010"Project-Id-Version: JOSM\n"
    1111"Report-Msgid-Bugs-To: \n"
    12 "POT-Creation-Date: 2009-06-19 21:52+0200\n"
    13 "PO-Revision-Date: 2009-06-19 19:26+0000\n"
    14 "Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
     12"POT-Creation-Date: 2009-06-27 14:26+0200\n"
     13"PO-Revision-Date: 2009-06-22 16:57+0000\n"
     14"Last-Translator: Peter Brodersen <Unknown>\n"
    1515"Language-Team: British English <en@li.org>\n"
    1616"MIME-Version: 1.0\n"
    … …  
    1818"Content-Transfer-Encoding: 8bit\n"
    1919"Plural-Forms: nplurals=2; plural=n != 1;\n"
    20 "X-Launchpad-Export-Date: 2009-06-19 19:34+0000\n"
     20"X-Launchpad-Export-Date: 2009-06-27 12:17+0000\n"
    2121"X-Generator: Launchpad (build Unknown)\n"
    2222
    … …  
    2929#: ../core/src/org/openstreetmap/josm/Main.java:198
    3030#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
    31 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    32 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
     31#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
     32#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
    3333msgid "Help"
    3434msgstr "Help"
    … …  
    7272#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
    7373#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
    74 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341
    75 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
    76 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
    77 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
     74#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
     75#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
     76#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
    7877#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
    7978#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
    … …  
    8180#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
    8281#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
    83 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
     82#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
    8583#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
    8684#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
    … …  
    10098#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
    10199#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
    102 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
    103 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
    104 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     100#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
     101#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
     102#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    105103#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    106104msgid "Cancel"
    … …  
    205203msgid "File could not be found."
    206204msgstr "File could not be found."
     205
     206#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
     207#, java-format
     208msgid ""
     209"WARNING: unexpected format of API base URL. Redirection to history page for "
     210"OSM primitive will probably fail. API base URL is: ''{0}''"
     211msgstr ""
     212
     213#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
     214#, fuzzy
     215msgid "Please select at least one already uploaded node, way, or relation."
     216msgstr "Please select at least one node or way."
     217
     218#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
     219#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
     220#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
     221#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
     222msgid "Warning"
     223msgstr "Warning"
     224
     225#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
     226#, java-format
     227msgid ""
     228"WARNING: launching browser windows for the first {0} of {1} selected "
     229"primitives only"
     230msgstr ""
    207231
    208232#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
    … …  
    248272#: ../plugins/grid/src/grid/GridLayer.java:193
    249273#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
    250 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
     274#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
    251275msgid "Latitude"
    252276msgstr "Latitude"
    … …  
    255279#: ../plugins/grid/src/grid/GridLayer.java:195
    256280#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
    257 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
     281#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
    258282msgid "Longitude"
    259283msgstr "Longitude"
    … …  
    290314#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
    291315#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
    292 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
    293 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
    294 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     316#: ../plugins/terracer/src/terracer/TerracerAction.java:72
     317#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
     318#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    295319#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
    296320#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
    … …  
    323347msgstr "Please select at least three nodes."
    324348
     349#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
     350#, java-format
     351msgid ""
     352"Current number of changes exceeds the max. number of changes, current is "
     353"{0}, max is {1}"
     354msgstr ""
     355
     356#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
     357#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
     358msgid "API Capabilities Violation"
     359msgstr ""
     360
     361#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
     362msgid "Failed to initialize API. Please try again later."
     363msgstr ""
     364
     365#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
     366#, fuzzy
     367msgid "API initialization failed"
     368msgstr "Not initialized"
     369
     370#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
     371#, java-format
     372msgid ""
     373"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
     374"{1}"
     375msgstr ""
     376
     377#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
     378#, java-format
     379msgid ""
     380"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
     381"length {2}. Values length is {3}."
     382msgstr ""
     383
     384#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
     385#, fuzzy
     386msgid "Precondition Violation"
     387msgstr "Precondition violation"
     388
     389#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
     390#, java-format
     391msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
     392msgstr ""
     393
    325394#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    326395msgid "data"
    … …  
    336405
    337406#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    338 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
     407#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    339408msgid "conflict"
    340409msgstr "conflict"
    … …  
    418487#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
    419488#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
    420 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
    421 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
     489#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109
     490#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301
    422491msgid "Enter values for all conflicts."
    423492msgstr "Enter values for all conflicts."
    … …  
    425494#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
    426495#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
    427 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
     496#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
    428497msgid "Solve Conflicts"
    429498msgstr "Solve Conflicts"
    … …  
    610679#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:92
    611680msgid "E-Mail"
    612 msgstr ""
     681msgstr "E-Mail"
    613682
    614683#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:96
    … …  
    646715
    647716#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
    648 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556
     717#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
    649718#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
    650719#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
    651720#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
    652 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    653 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559
    654 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563
     721#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
     722#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
     723#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
    655724#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
    656725#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
    … …  
    680749#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
    681750#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
    682 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
     751#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
    683752#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
    684753#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
    … …  
    723792"\">your language</A>."
    724793
    725 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
    726 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29
     794#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
     795#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
    727796msgid "History of Element"
    728797msgstr "History of Element"
    729798
    730 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27
    731 msgid "Display history information about OSM ways or nodes."
     799#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
     800#, fuzzy
     801msgid "Display history information about OSM ways, nodes, or relations."
    732802msgstr "Display history information about OSM ways or nodes."
    733803
    734 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:77
    735 msgid ""
    736 "Please select at least one node, way or relation. Only already uploaded "
    737 "elements have a history."
    738 msgstr ""
    739 "Please select at least one node, way or relation. Only already uploaded "
    740 "elements have a history."
     804#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
     805#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
     806#, fuzzy
     807msgid "Info about Element"
     808msgstr "History of Element"
     809
     810#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
     811#, fuzzy
     812msgid "Display object information about OSM nodes, ways, or relations."
     813msgstr "Display history information about OSM ways or nodes."
    741814
    742815#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
    … …  
    874947#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
    875948#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
    876 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54
    877949#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
    878950#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
    879951#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
    880 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
    881 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
    882952#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
    883953#, java-format
    … …  
    10651135
    10661136#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
    1067 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
     1137#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
    10681138msgid "Conflicts"
    10691139msgstr "Conflicts"
    … …  
    12191289"middle of the way.)"
    12201290
    1221 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305
     1291#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
    12221292msgid ""
    12231293"A role based relation membership was copied to all new ways.\n"
    … …  
    12271297"You should verify this and correct it when necessary."
    12281298
    1229 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310
     1299#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
     1300#, fuzzy
     1301msgid ""
     1302"A relation membership was copied to all new ways.\n"
     1303"You should verify this and correct it when necessary."
     1304msgstr ""
     1305"A role based relation membership was copied to all new ways.\n"
     1306"You should verify this and correct it when necessary."
     1307
     1308#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
    12301309#, java-format
    12311310msgid "Split way {0} into {1} parts"
    … …  
    13691448"No data to update found. Have you already opened or downloaded a data layer?"
    13701449
    1371 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
    1372 msgid "Undeleting Way..."
    1373 msgstr ""
    1374 
    1375 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
    1376 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
    1377 msgid "Yes, undelete them too"
    1378 msgstr ""
    1379 
    1380 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
    1381 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
    1382 msgid "No, cancel operation"
    1383 msgstr ""
    1384 
    1385 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138
    1386 #, java-format
    1387 msgid ""
    1388 "<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
    1389 "the server.<br><br>Do you want to undelete these nodes too?</html>"
    1390 msgstr ""
    1391 
    1392 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
    1393 msgid "Undelete additional nodes?"
    1394 msgstr ""
    1395 
    1396 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
    1397 #, java-format
    1398 msgid "Checking whether node {0} is gone ..."
    1399 msgstr ""
    1400 
    1401 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
    1402 msgid "Undeleting relation..."
    1403 msgstr ""
    1404 
    1405 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252
    1406 #, java-format
    1407 msgid ""
    1408 "<html>There are {0} additional primitives referred to by relation {1}"
    1409 "<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
    1410 "</html>"
    1411 msgstr ""
    1412 
    1413 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
    1414 msgid "Undelete dependent primitives?"
    1415 msgstr ""
    1416 
    1417 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
    1418 #, java-format
    1419 msgid "Checking whether primitive {0} is gone ..."
    1420 msgstr ""
    1421 
    1422 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
    1423 msgid "Keep mine"
    1424 msgstr ""
    1425 
    1426 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
    1427 msgid "Delete mine"
    1428 msgstr ""
    1429 
    1430 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344
    1431 #, java-format
    1432 msgid ""
    1433 "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
    1434 "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
    1435 "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
    1436 "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
    1437 "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
    1438 msgstr ""
    1439 "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
    1440 "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
    1441 "primitive and ignore the deleted state.<br>Your primitive will be assigned a "
    1442 "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
    1443 "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
    1444 
    1445 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
    1446 msgid "Primitive deleted on the server"
    1447 msgstr ""
    1448 
    1449 #. should not happen
    1450 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370
    1451 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344
    1452 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383
    1453 #, java-format
    1454 msgid "unexpected return value. Got {0}"
    1455 msgstr ""
    1456 
    1457 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
     1450#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
    14581451msgid "Failed to update the selected primitives."
    1459 msgstr ""
    1460 
    1461 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
     1452msgstr "Failed to update the selected primitives."
     1453
     1454#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
    14621455msgid "Update failed"
    1463 msgstr ""
    1464 
    1465 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
     1456msgstr "Update failed"
     1457
     1458#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
    14661459#, java-format
    14671460msgid "Could not find primitive with id {0} in the current dataset"
    1468 msgstr ""
    1469 
    1470 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
     1461msgstr "Could not find primitive with id {0} in the current dataset"
     1462
     1463#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
    14711464msgid "Missing primitive"
    1472 msgstr ""
    1473 
    1474 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
    1475 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
     1465msgstr "Missing primitive"
     1466
     1467#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
     1468#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
    14761469msgid "Update Selection"
    1477 msgstr ""
    1478 
    1479 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
     1470msgstr "Update Selection"
     1471
     1472#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
    14801473msgid "Updates the currently selected primitives from the server"
    1481 msgstr ""
    1482 
    1483 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
     1474msgstr "Updates the currently selected primitives from the server"
     1475
     1476#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
    14841477msgid "There are no selected primitives to update."
    1485 msgstr ""
    1486 
    1487 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
     1478msgstr "There are no selected primitives to update."
     1479
     1480#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
    14881481msgid "Selection empty"
    1489 msgstr ""
    1490 
    1491 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471
    1492 #, java-format
    1493 msgid ""
    1494 "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
    1495 "update. Please reduce the selection<br>to max. {1} primitives.</html>"
    1496 msgstr ""
    1497 
    1498 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
    1499 msgid "Selection too big"
    1500 msgstr ""
     1482msgstr "Selection empty"
    15011483
    15021484#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:79
    … …  
    15091491msgstr "Upload all changes to the OSM server."
    15101492
    1511 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
     1493#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
    15121494msgid "Objects to add:"
    15131495msgstr "Objects to add:"
    15141496
    1515 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
     1497#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
    15161498msgid "Objects to modify:"
    15171499msgstr "Objects to modify:"
    15181500
    1519 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
     1501#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
    15201502msgid "Objects to delete:"
    15211503msgstr "Objects to delete:"
    15221504
    1523 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
     1505#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
    15241506msgid "Provide a brief comment for the changes you are uploading:"
    15251507msgstr "Provide a brief comment for the changes you are uploading:"
    15261508
    1527 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
     1509#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
    15281510msgid "Upload these changes?"
    15291511msgstr "Upload these changes?"
    15301512
    1531 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
     1513#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
    15321514msgid "Upload Changes"
    15331515msgstr "Upload Changes"
    15341516
    1535 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152
     1517#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
    15361518msgid "Nothing to upload. Get some data first."
    15371519msgstr "Nothing to upload. Get some data first."
    15381520
    1539 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
     1521#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
    15401522msgid "There are unresolved conflicts. You have to resolve these first."
    15411523msgstr "There are unresolved conflicts. You have to resolve these first."
    15421524
    1543 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
     1525#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    15441526msgid "No changes to upload."
    15451527msgstr "No changes to upload."
    15461528
    1547 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
     1529#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
    15481530msgid "Uploading"
    1549 msgstr ""
    1550 
    1551 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
     1531msgstr "Uploading"
     1532
     1533#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
    15521534msgid "Updating primitive"
    1553 msgstr ""
    1554 
    1555 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
     1535msgstr "Updating primitive"
     1536
     1537#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
    15561538#, java-format
    15571539msgid "Synchronize {0} {1} only"
    1558 msgstr ""
    1559 
    1560 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
    1561 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
     1540msgstr "Synchronize {0} {1} only"
     1541
     1542#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
     1543#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
    15621544msgid "Synchronize entire dataset"
    1563 msgstr ""
    1564 
    1565 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
     1545msgstr "Synchronize entire dataset"
     1546
     1547#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
    15661548#, java-format
    15671549msgid ""
    … …  
    15741556"<strong>{6}</strong> to abort and continue editing.<br></html>"
    15751557msgstr ""
    1576 
    1577 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
    1578 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
     1558"<html>Uploading <strong>failed</strong> because the server has a newer "
     1559"version of one<br>of your nodes, ways, or relations.<br>The conflict is "
     1560"caused by the <strong>{0}</strong> with id <strong>{1}</strong>,<br>the "
     1561"server has version {2}, your version is {3}.<br><br>Click <strong>{4}</"
     1562"strong> to synchronize the conflicting primitive only.<br>Click <strong>{5}</"
     1563"strong> to synchronize the entire local dataset with the server.<br>Click "
     1564"<strong>{6}</strong> to abort and continue editing.<br></html>"
     1565
     1566#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
     1567#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
    15791568msgid "Conflict detected"
    1580 msgstr ""
    1581 
    1582 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
     1569msgstr "Conflict detected"
     1570
     1571#. should not happen
     1572#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
     1573#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
     1574#, java-format
     1575msgid "unexpected return value. Got {0}"
     1576msgstr "unexpected return value. Got {0}"
     1577
     1578#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
    15831579#, java-format
    15841580msgid ""
    … …  
    15881584"<strong>{1}</strong> to abort and continue editing.<br></html>"
    15891585msgstr ""
    1590 
    1591 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
     1586"<html>Uploading <strong>failed</strong> because the server has a newer "
     1587"version of one<br>of your nodes, ways, or relations.<br><br>Click <strong>{0}"
     1588"</strong> to synchronize the entire local dataset with the server.<br>Click "
     1589"<strong>{1}</strong> to abort and continue editing.<br></html>"
     1590
     1591#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
    15921592#, java-format
    15931593msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
    1594 msgstr ""
    1595 
    1596 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
     1594msgstr "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
     1595
     1596#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
    15971597#, java-format
    15981598msgid ""
    … …  
    16011601"html>"
    16021602msgstr ""
    1603 
    1604 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
     1603"<html>Uploading to the server <strong>failed</strong> because your "
     1604"current<br>dataset violates a precondition.<br>The error message is:<br>{0}</"
     1605"html>"
     1606
     1607#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
    16051608msgid "Precondition violation"
    1606 msgstr ""
    1607 
    1608 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452
     1609msgstr "Precondition violation"
     1610
     1611#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
    16091612#, java-format
    16101613msgid ""
    … …  
    16131616"<br>{0}</html>"
    16141617msgstr ""
    1615 
    1616 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
     1618"<html>Uploading <strong>failed</strong> because a primitive you tried "
     1619"to<br>delete on the server is already deleted.<br><br>The error message is:"
     1620"<br>{0}</html>"
     1621
     1622#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
    16171623msgid "Primitive already deleted"
    1618 msgstr ""
    1619 
    1620 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484
    1621 #, java-format
    1622 msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
    1623 msgstr ""
    1624 
    1625 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539
     1624msgstr "Primitive already deleted"
     1625
     1626#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
     1627#, java-format
     1628msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
     1629msgstr "Error header \"{0}\" does not match expected pattern \"{1}\""
     1630
     1631#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
    16261632msgid "Upload to OSM API failed"
    1627 msgstr ""
    1628 
    1629 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
     1633msgstr "Upload to OSM API failed"
     1634
     1635#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
    16301636#, java-format
    16311637msgid ""
    … …  
    17491755msgstr "OpenStreetMap data"
    17501756
    1751 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
     1757#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
    17521758msgid "Data Layer"
    17531759msgstr "Data Layer"
    17541760
    1755 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55
     1761#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
    17561762#, java-format
    17571763msgid "Download {0} of {1} ({2} left)"
    17581764msgstr "Download {0} of {1} ({2} left)"
    17591765
     1766#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
     1767msgid "The following errors occurred during mass download:"
     1768msgstr "The following errors occurred during mass download:"
     1769
    17601770#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
    1761 msgid "The following errors occurred during mass download:"
    1762 msgstr ""
    1763 
    1764 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
    17651771msgid "Errors during Download"
    17661772msgstr "Errors during Download"
    17671773
    1768 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135
    1769 #, java-format
     1774#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
     1775#, fuzzy, java-format
    17701776msgid ""
    17711777"<html>There are {0} primitives in your local dataset which<br>might be "
    1772 "deleted on the server. If you later try to delete or<br>update them on the "
    1773 "server the server is likely to report a<br>conflict.<br><br>Click <strong>{1}"
    1774 "</strong> to check these primitives individually.<br>Click <strong>{2}</"
    1775 "strong> to ignore.<br></html>"
     1778"deleted on the server. If you later try to delete or<br>update them the "
     1779"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
     1780"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
     1781"</strong> to ignore.<br></html>"
    17761782msgstr ""
     1783"<html>There are {0} primitives in your local dataset which<br>might be "
     1784"deleted on the server. If you later try to delete or<br>update them the "
     1785"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
     1786"to check these primitives individually.<br>Click <strong>{2}</strong> to "
     1787"ignore.<br></html>"
    17771788
    17781789#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:150
    17791790msgid "Deleted or moved primitives"
    1780 msgstr ""
     1791msgstr "Deleted or moved primitives"
    17811792
    17821793#: ../core/src/org/openstreetmap/josm/actions/mapmode/DeleteAction.java:45
    … …  
    19191930#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
    19201931#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
    1921 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
     1932#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
    19221933#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
    19231934#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
    … …  
    22252236#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:74
    22262237msgid "Error while communicating with server."
    2227 msgstr ""
     2238msgstr "Error while communicating with server."
    22282239
    22292240#: ../core/src/org/openstreetmap/josm/command/AddCommand.java:67
    … …  
    22792290msgstr "ChangeRelationMemberRole"
    22802291
    2281 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
    2282 #, java-format
    2283 msgid "Resolve {0} conflicts in {1} objects"
    2284 msgstr "Resolve {0} conflicts in {1} objects"
    2285 
    22862292#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
    22872293#, java-format
    … …  
    22912297#. should not happen
    22922298#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
    2293 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
     2299#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
    22942300msgid "cannot resolve undecided conflict"
    22952301msgstr "cannot resolve undecided conflict"
    … …  
    23602366#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
    23612367#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
    2362 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
     2368#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
    23632369#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    23642370#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
    … …  
    23712377msgstr[1] "nodes"
    23722378
    2373 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157
     2379#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
    23742380msgid "Purging 1 primitive"
     2381msgstr "Purging 1 primitive"
     2382
     2383#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
     2384#, java-format
     2385msgid "removing reference from way {0}"
    23752386msgstr ""
    23762387
    2377 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
     2388#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
    23782389#, java-format
    23792390msgid ""
    … …  
    23812392"{1}"
    23822393msgstr ""
     2394"Warning: Purging way {0} because number of nodes dropped below 2. Current is "
     2395"{1}"
     2396
     2397#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
     2398#, fuzzy, java-format
     2399msgid "removing reference from relation {0}"
     2400msgstr "Removed Element from Relations"
    23832401
    23842402#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
    23852403#, java-format
    23862404msgid "Resolve conflicts in member list of relation {0}"
    2387 msgstr ""
     2405msgstr "Resolve conflicts in member list of relation {0}"
    23882406
    23892407#: ../core/src/org/openstreetmap/josm/command/RemoveRelationMemberCommand.java:66
    … …  
    24042422msgstr "Resolve {0} tag conflicts in {1} {2}"
    24052423
    2406 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
     2424#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
    24072425#, java-format
    24082426msgid "Undelete {0} primitives"
    2409 msgstr ""
    2410 
    2411 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
     2427msgstr "Undelete {0} primitives"
     2428
     2429#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
    24122430#, java-format
    24132431msgid "Resolve version conflicts for {0} {1}"
    … …  
    24172435#, java-format
    24182436msgid "Resolve conflicts in node list of of way {0}"
    2419 msgstr "Resolve conflicts in node list of of way {0}"
     2437msgstr "Resolve conflicts in node list of way {0}"
    24202438
    24212439#: ../core/src/org/openstreetmap/josm/corrector/CorrectionTableModel.java:58
    … …  
    24232441msgstr "Apply?"
    24242442
    2425 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
     2443#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
    24262444msgid ""
    24272445"When reversing this way, the following changes to properties of the way and "
    … …  
    25122530msgstr "Could not load preferences from server."
    25132531
    2514 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
    2515 msgid "different"
    2516 msgstr "different"
    2517 
    2518 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
    2519 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
    2520 msgid "deleted"
    2521 msgstr "deleted"
    2522 
    2523 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2524 msgid "true"
    2525 msgstr "true"
    2526 
    2527 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2528 msgid "false"
    2529 msgstr "false"
    2530 
    2531 #: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
    2532 msgid "position"
    2533 msgstr "position"
    2534 
    25352532#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
    25362533msgid "Decimal Degrees"
    … …  
    25572554msgstr "E"
    25582555
    2559 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
     2556#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
    25602557#, java-format
    25612558msgid "parameter {0} > 0 required. Got {1}."
    2562 msgstr ""
    2563 
    2564 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
    2565 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84
    2566 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
     2559msgstr "parameter {0} > 0 required. Got {1}."
     2560
     2561#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
     2562#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
     2563#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
    25672564msgid "incomplete"
    25682565msgstr "incomplete"
    25692566
    2570 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2567#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25712568#, java-format
    25722569msgid "Error: {0}"
    25732570msgstr "Error: {0}"
    25742571
    2575 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2572#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25762573#, java-format
    25772574msgid "Warning: {0}"
    … …  
    25802577#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    25812578msgid "nodes"
    2582 msgstr ""
     2579msgstr "nodes"
    25832580
    25842581#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
    … …  
    25942591#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:8
    25952592msgid "ways"
    2596 msgstr ""
     2593msgstr "ways"
    25972594
    25982595#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    2599 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88
     2596#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99
    26002597#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
    26012598#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
    … …  
    26082605#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    26092606msgid "relations"
    2610 msgstr ""
     2607msgstr "relations"
    26112608
    26122609#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
    26132610msgid "changeset"
    2614 msgstr ""
     2611msgstr "changeset"
    26152612
    26162613#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:10
    26172614msgid "changesets"
    2618 msgstr ""
     2615msgstr "changesets"
    26192616
    26202617#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:38
    26212618#, java-format
    26222619msgid "parameter ''{0}'' is not a valid type name, got ''{1}''"
    2623 msgstr ""
     2620msgstr "parameter ''{0}'' is not a valid type name, got ''{1}''"
    26242621
    26252622#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:50
    26262623#, java-format
    26272624msgid "parameter ''{0}'' is not an acceptable class, got ''{1}''"
    2628 msgstr ""
    2629 
    2630 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
     2625msgstr "parameter ''{0}'' is not an acceptable class, got ''{1}''"
     2626
     2627#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
    26312628#, java-format
    26322629msgid "{0} member"
    … …  
    26352632msgstr[1] "{0} members"
    26362633
    2637 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
     2634#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
    26382635msgid "highway"
    26392636msgstr "highway"
    26402637
    2641 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
     2638#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
    26422639#: build/trans_presets.java:2994
    26432640msgid "railway"
    26442641msgstr "railway"
    26452642
    2646 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
     2643#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
    26472644msgid "waterway"
    26482645msgstr "waterway"
    26492646
    2650 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124
     2647#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
    26512648msgid "landuse"
    26522649msgstr "landuse"
    26532650
    2654 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
     2651#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143
    26552652#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
    26562653#, java-format
    … …  
    26622659#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:153
    26632660msgid "There's no primitive with version {0} in this history"
    2664 msgstr ""
     2661msgstr "There's no primitive with version {0} in this history"
    26652662
    26662663#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:160
    26672664#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:162
    26682665msgid "There's no version valid at date ''{0}'' in this history"
    2669 msgstr ""
     2666msgstr "There's no version valid at date ''{0}'' in this history"
    26702667
    26712668#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:173
    26722669#, java-format
    26732670msgid "parameter ''{0}'' in range 0..{1} expected, got {2}"
    2674 msgstr ""
     2671msgstr "parameter ''{0}'' in range 0..{1} expected, got {2}"
    26752672
    26762673#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:179
    26772674msgid "no earliest version found. History is empty."
    2678 msgstr ""
     2675msgstr "no earliest version found. History is empty."
    26792676
    26802677#: ../core/src/org/openstreetmap/josm/data/osm/history/History.java:185
    26812678msgid "no latest version found. History is empty."
    2682 msgstr ""
     2679msgstr "no latest version found. History is empty."
    26832680
    26842681#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:21
    26852682msgid "Didn't find an  primitive with id {0} in this dataset"
    2686 msgstr ""
     2683msgstr "Didn't find an primitive with id {0} in this dataset"
    26872684
    26882685#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:27
    26892686msgid "Didn't find an primitive with id {0} and version {1} in this dataset"
    2690 msgstr ""
     2687msgstr "Didn't find an primitive with id {0} and version {1} in this dataset"
    26912688
    26922689#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryDataSet.java:46
    26932690msgid "Didn't find an historized primitive with id {0} in this dataset"
    2694 msgstr ""
     2691msgstr "Didn't find an historized primitive with id {0} in this dataset"
    26952692
    26962693#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:29
    … …  
    26982695#, java-format
    26992696msgid "parameter ''{0}'' > 0 expected, got ''{1}''"
    2700 msgstr ""
     2697msgstr "parameter ''{0}'' > 0 expected, got ''{1}''"
    27012698
    27022699#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:34
    27032700#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
    27042701#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
     2702#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
     2703#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
     2704#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
    27052705#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
    27062706#, java-format
    27072707msgid "parameter ''{0}'' must not be null"
    2708 msgstr ""
     2708msgstr "parameter ''{0}'' must not be null"
    27092709
    27102710#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryOsmPrimitive.java:102
    27112711msgid "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
    2712 msgstr ""
     2712msgstr "can't compare primitive with id ''{0}'' to primitive with id ''{1}''"
    27132713
    27142714#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:89
    … …  
    27162716#, java-format
    27172717msgid "parameter {0} not in range 0..{1}, got {2}"
    2718 msgstr ""
     2718msgstr "parameter {0} not in range 0..{1}, got {2}"
    27192719
    27202720#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MapPaintVisitor.java:234
    … …  
    28442844msgstr "text"
    28452845
     2846#. should not happen
     2847#.
     2848#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
     2849#, java-format
     2850msgid ""
     2851"My primitive with id {0} and version {1} is visible although their primitive "
     2852"with lower version {2} is not visible. Can't deal with this inconsistency. "
     2853"Keeping my primitive. "
     2854msgstr ""
     2855
    28462856#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
    28472857#, java-format
    … …  
    28622872
    28632873#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
    2864 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
     2874#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
    28652875#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
    28662876msgid "background"
    … …  
    29452955msgstr "Could not write bookmark."
    29462956
    2947 #. setting up the properties table
    2948 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2949 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
    2950 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
    2951 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2952 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2953 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2954 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
    2955 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
    2956 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
    2957 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
    2958 msgid "Key"
    2959 msgstr "Key"
    2960 
    2961 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2962 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
    2963 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
    2964 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2965 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2966 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2967 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
    2968 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
    2969 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
    2970 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
    2971 msgid "Value"
    2972 msgstr "Value"
    2973 
    2974 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
    2975 #, java-format
    2976 msgid "{0} object has conflicts:"
    2977 msgid_plural "{0} objects have conflicts:"
    2978 msgstr[0] "{0} object has conflicts:"
    2979 msgstr[1] "{0} objects have conflicts:"
    2980 
    2981 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
    2982 msgid "my version:"
    2983 msgstr "my version:"
    2984 
    2985 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
    2986 msgid "their version:"
    2987 msgstr "their version:"
    2988 
    2989 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
    2990 msgid "resolved version:"
    2991 msgstr "resolved version:"
    2992 
    29932957#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
    29942958msgid "Message of the day not available"
    … …  
    31693133msgstr "Preference setting {0} has been removed since it is no longer used."
    31703134
    3171 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
     3135#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
    31723136msgid "File"
    31733137msgstr "File"
    31743138
    3175 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
     3139#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
    31763140msgid "View"
    31773141msgstr "View"
    31783142
    3179 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
     3143#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
    31803144msgid "Tools"
    31813145msgstr "Tools"
    31823146
    3183 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
     3147#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    31843148#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
    31853149msgid "Presets"
    31863150msgstr "Presets"
    31873151
    3188 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
     3152#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
    31893153#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
    31903154#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
    … …  
    31973161
    31983162#. TODO move code to an "action" like the others?
    3199 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
     3163#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
    32003164msgid "Wireframe View"
    32013165msgstr "Wireframe View"
    32023166
    3203 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
     3167#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
    32043168msgid "Toggle Wireframe view"
    32053169msgstr "Toggle Wireframe view"
    32063170
    3207 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
     3171#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
    32083172msgid "Full Screen"
    32093173msgstr "Full Screen"
    32103174
    3211 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
     3175#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
    32123176msgid "Toggle Full Screen view"
    32133177msgstr "Toggle Full Screen view"
    32143178
    3215 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
     3179#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
    32163180msgid "Audio"
    32173181msgstr "Audio"
    … …  
    33483312msgstr "role {0} is not participating in compare pair {1}"
    33493313
    3350 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63
    3351 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124
     3314#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
     3315#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
    33523316msgid "Properties"
    33533317msgstr "Properties"
    33543318
    3355 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68
    3356 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93
     3319#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
     3320#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
    33573321#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
    33583322#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
    … …  
    33603324msgstr "Tags"
    33613325
    3362 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73
    3363 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163
     3326#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
     3327#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
    33643328msgid "Nodes"
    33653329msgstr "Nodes"
    33663330
    3367 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
    3368 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
     3331#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
     3332#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
    33693333#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
    33703334msgid "Members"
    33713335msgstr "Members"
    33723336
    3373 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
     3337#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
    33743338msgid "No pending tag conflicts to be resolved"
    33753339msgstr "No pending tag conflicts to be resolved"
    33763340
    3377 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97
     3341#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
    33783342#, java-format
    33793343msgid "Tags({0} conflicts)"
    33803344msgstr "Tags({0} conflicts)"
    33813345
    3382 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
     3346#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
    33833347#, java-format
    33843348msgid "{0} pending tag conflicts to be resolved"
    33853349msgstr "{0} pending tag conflicts to be resolved"
    33863350
    3387 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104
     3351#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
    33883352msgid "Nodes(resolved)"
    33893353msgstr "Nodes(resolved)"
    33903354
    3391 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
     3355#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
    33923356msgid ""
    33933357"Merged node list frozen. No pending conflicts in the node list of this way"
    … …  
    33953359"Merged node list frozen. No pending conflicts in the node list of this way"
    33963360
    3397 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108
     3361#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
    33983362msgid "Nodes(with conflicts)"
    33993363msgstr "Nodes(with conflicts)"
    34003364
    3401 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
     3365#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
    34023366msgid "Pending conflicts in the node list of this way"
    34033367msgstr "Pending conflicts in the node list of this way"
    34043368
    3405 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113
     3369#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
    34063370msgid "Members(resolved)"
    34073371msgstr "Members(resolved)"
    34083372
    3409 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
     3373#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
    34103374msgid ""
    34113375"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    34153379"relation"
    34163380
    3417 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117
     3381#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
    34183382msgid "Members(with conflicts)"
    34193383msgstr "Members(with conflicts)"
    34203384
    3421 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
     3385#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
    34223386msgid "Pending conflicts in the member list of this relation"
    34233387msgstr "Pending conflicts in the member list of this relation"
    34243388
    3425 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
     3389#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
    34263390msgid "No pending property conflicts"
    34273391msgstr "No pending property conflicts"
    34283392
    3429 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128
     3393#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
    34303394msgid "Properties(with conflicts)"
    34313395msgstr "Properties(with conflicts)"
    34323396
    3433 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
     3397#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
    34343398msgid "Pending property conflicts to be resolved"
    34353399msgstr "Pending property conflicts to be resolved"
    34363400
    3437 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
     3401#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
    34383402msgid "Conflict Resolution"
    34393403msgstr "Conflict Resolution"
    … …  
    34703434
    34713435#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
    3472 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75
     3436#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
    34733437msgid "My version"
    34743438msgstr "My version"
    … …  
    34793443
    34803444#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
    3481 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
     3445#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
    34823446#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
    34833447msgid "Merged version"
    … …  
    34933457
    34943458#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
    3495 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
     3459#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
    34963460msgid "Their version"
    34973461msgstr "Their version"
    … …  
    36903654msgstr "unexpected column index. Got {0}"
    36913655
    3692 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76
     3656#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
     3657#, fuzzy, java-format
     3658msgid ""
     3659"<html>An error occurred while communicating with the server<br>Details: {0}</"
     3660"html>"
     3661msgstr "Error while communicating with server."
     3662
     3663#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
     3664#, fuzzy
     3665msgid "Communication with server failed"
     3666msgstr "Error when communicating with server."
     3667
     3668#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
     3669#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
     3670msgid "Yes, undelete them too"
     3671msgstr "Yes, undelete them too"
     3672
     3673#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
     3674#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
     3675msgid "No, cancel operation"
     3676msgstr "No, cancel operation"
     3677
     3678#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
     3679#, java-format
     3680msgid ""
     3681"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
     3682"the server.<br><br>Do you want to undelete these nodes too?</html>"
     3683msgstr ""
     3684"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
     3685"the server.<br><br>Do you want to undelete these nodes too?</html>"
     3686
     3687#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
     3688msgid "Undelete additional nodes?"
     3689msgstr "Undelete additional nodes?"
     3690
     3691#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
     3692#, java-format
     3693msgid ""
     3694"<html>There are {0} additional primitives referred to by relation {1}"
     3695"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
     3696"</html>"
     3697msgstr ""
     3698"<html>There are {0} additional primitives referred to by relation {1}"
     3699"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
     3700"</html>"
     3701
     3702#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
     3703msgid "Undelete dependent primitives?"
     3704msgstr "Undelete dependent primitives?"
     3705
     3706#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
    36933707msgid "Properties in my dataset, i.e. the local dataset"
    36943708msgstr "Properties in my dataset, i.e. the local dataset"
    36953709
    3696 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
     3710#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
    36973711msgid ""
    36983712"Properties in the merged element. They will replace properties in my "
    36993713"elements when merge decisions are applied."
    37003714msgstr ""
    3701 
    3702 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
     3715"Properties in the merged element. They will replace properties in my "
     3716"elements when merge decisions are applied."
     3717
     3718#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
    37033719msgid "Properties in their dataset, i.e. the server dataset"
    37043720msgstr "Properties in their dataset, i.e. the server dataset"
    37053721
    3706 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101
     3722#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
    37073723msgid "Coordinates:"
    37083724msgstr "Coordinates:"
    37093725
    3710 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174
     3726#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
    37113727msgid "Deleted State:"
    37123728msgstr "Deleted State:"
    37133729
    3714 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248
    3715 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260
     3730#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
     3731#, fuzzy
     3732msgid "Visible State:"
     3733msgstr "Deleted State:"
     3734
     3735#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
     3736#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
     3737#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3738#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
    37163739#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    37173740msgid "(none)"
    37183741msgstr "(none)"
    37193742
    3720 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
     3743#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
     3744msgid "deleted"
     3745msgstr "deleted"
     3746
     3747#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
    37213748msgid "not deleted"
    37223749msgstr "not deleted"
    37233750
    3724 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334
     3751#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
     3752#, fuzzy
     3753msgid "visible (on the server)"
     3754msgstr "Primitive deleted on the server"
     3755
     3756#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
     3757#, fuzzy
     3758msgid "not visible (on the server)"
     3759msgstr "Primitive deleted on the server"
     3760
     3761#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
     3762#, fuzzy
     3763msgid "Keep a clone of the local version"
     3764msgstr "Please enter a name for the location."
     3765
     3766#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
     3767#, fuzzy
     3768msgid "Physically delete from local dataset"
     3769msgstr "My version (local dataset)"
     3770
     3771#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
    37253772msgid "Keep my coordiates"
    37263773msgstr "Keep my coordiates"
    37273774
    3728 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349
     3775#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
    37293776msgid "Keep their coordiates"
    37303777msgstr "Keep their coordiates"
    37313778
    3732 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3779#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
    37333780msgid "Undecide conflict between different coordinates"
    37343781msgstr "Undecide conflict between different coordinates"
    37353782
    3736 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379
     3783#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
    37373784msgid "Keep my deleted state"
    37383785msgstr "Keep my deleted state"
    37393786
    3740 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394
     3787#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
    37413788msgid "Keep their deleted state"
    37423789msgstr "Keep their deleted state"
    37433790
    3744 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409
     3791#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
    37453792msgid "Undecide conflict between deleted state"
     3793msgstr "Undecide conflict between deleted state"
     3794
     3795#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
     3796#, fuzzy
     3797msgid "Keep my visible state"
     3798msgstr "Keep my deleted state"
     3799
     3800#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
     3801#, fuzzy
     3802msgid "Yes, reset the id"
     3803msgstr "Yes, undelete them too"
     3804
     3805#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
     3806#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
     3807#, fuzzy
     3808msgid "No, abort"
     3809msgstr "No date"
     3810
     3811#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
     3812#, java-format
     3813msgid ""
     3814"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
     3815"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
     3816"agree?</html>"
     3817msgstr ""
     3818
     3819#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
     3820msgid "Reset id to 0"
     3821msgstr ""
     3822
     3823#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
     3824#, fuzzy
     3825msgid "Keep their visible state"
     3826msgstr "Keep their deleted state"
     3827
     3828#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
     3829msgid "Yes, purge it"
     3830msgstr ""
     3831
     3832#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
     3833#, java-format
     3834msgid ""
     3835"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
     3836"dataset.<br>Do you agree?</html>"
     3837msgstr ""
     3838
     3839#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
     3840#, fuzzy
     3841msgid "Remove from dataset"
     3842msgstr "remove from selection"
     3843
     3844#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
     3845#, fuzzy
     3846msgid "Undecide conflict between visible state"
    37463847msgstr "Undecide conflict between deleted state"
    37473848
    … …  
    37863887msgstr "My dataset does not include a tag with key {0}"
    37873888
     3889#. setting up the properties table
     3890#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
     3891#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
     3892#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3893#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3894#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3895#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
     3896#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
     3897#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
     3898#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
     3899msgid "Key"
     3900msgstr "Key"
     3901
     3902#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
     3903#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
     3904#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3905#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3906#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3907#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     3908#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
     3909#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
     3910#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
     3911msgid "Value"
     3912msgstr "Value"
     3913
    37883914#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
    37893915msgid "cannot apply undecided tag merge item"
    … …  
    38423968
    38433969#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
    3844 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3970#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    38453971#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
    38463972#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
    … …  
    38643990msgstr "Command Stack: {0}"
    38653991
    3866 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
     3992#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
    38673993#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
    38683994#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
    … …  
    38723998"Set the selected elements on the map to the selected items in the list above."
    38733999
    3874 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
     4000#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
    38754001msgid "Resolve"
    38764002msgstr "Resolve"
    38774003
    3878 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
     4004#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
    38794005msgid "Open a merge dialog of all selected items in the list above."
    38804006msgstr "Open a merge dialogue of all selected items in the list above."
    38814007
    3882 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
    3883 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     4008#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
     4009#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    38844010msgid "Conflict"
    38854011msgstr "Conflict"
    38864012
    3887 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
     4013#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
    38884014msgid "Merging conflicts."
    38894015msgstr "Merging conflicts."
    38904016
    3891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
    3892 msgid "WARNING: unexpected value for preference conflict.resolution, got "
    3893 msgstr "WARNING: unexpected value for preference conflict.resolution, got "
    3894 
    3895 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
    3896 msgid "Resolve Conflicts"
    3897 msgstr "Resolve Conflicts"
    3898 
    3899 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    3900 msgid "Solve Conflict"
    3901 msgstr "Solve Conflict"
    3902 
    3903 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
     4017#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
    39044018#, java-format
    39054019msgid "Conflicts: {0}"
    39064020msgstr "Conflicts: {0}"
    39074021
    3908 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
     4022#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
    39094023msgid "Resolve conflicts"
    39104024msgstr "Resolve conflicts"
    39114025
    3912 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150
     4026#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
    39134027msgid "Cancel conflict resolution and close the dialog"
    39144028msgstr "Cancel conflict resolution and close the dialog"
    39154029
    3916 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164
     4030#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
    39174031msgid "Apply resolved conflicts and close the dialog"
    39184032msgstr "Apply resolved conflicts and close the dialogue"
    39194033
    3920 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
     4034#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
    39214035msgid "Apply Resolution"
    39224036msgstr "Apply Resolution"
    39234037
    3924 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173
     4038#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
    39254039msgid "Apply partial resolutions"
    39264040msgstr "Apply partial resolutions"
    39274041
    3928 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
     4042#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
    39294043msgid "Continue resolving"
    39304044msgstr "Continue resolving"
    39314045
    3932 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176
     4046#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
    39334047#, java-format
    39344048msgid ""
    … …  
    39424056"remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
    39434057"resolving conflicts.</html>"
    3944 
    3945 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182
    3946 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
    3947 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
    3948 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
    3949 msgid "Warning"
    3950 msgstr "Warning"
    39514058
    39524059#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:88
    … …  
    43734480#. item "Amenities/Toilets" combo "Fee"
    43744481#. item "Health/Pharmacy" combo "Dispensing"
    4375 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4482#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    43764483#: build/trans_presets.java:312 build/trans_presets.java:313
    43774484#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    43964503msgstr "yes"
    43974504
    4398 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4505#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    43994506#: build/trans_presets.java:312 build/trans_presets.java:313
    44004507#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    44214528msgstr "no"
    44224529
    4423 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423
     4530#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
    44244531#, java-format
    44254532msgid "Members: {0}"
    44264533msgstr "Members: {0}"
    44274534
    4428 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431
     4535#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
    44294536#, java-format
    44304537msgid "Relation Editor: {0}"
    44314538msgstr "Relation Editor: {0}"
    44324539
    4433 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545
     4540#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
    44344541msgid "There were conflicts during import."
    44354542msgstr "There were conflicts during import."
    44364543
    4437 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
     4544#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
    44384545msgid "Error parsing server response."
    44394546msgstr "Error parsing server response."
    44404547
    4441 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558
     4548#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    44424549msgid "Cannot connect to server."
    44434550msgstr "Cannot connect to server."
    44444551
    4445 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
     4552#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
    44464553msgid "Error when communicating with server."
    4447 msgstr ""
     4554msgstr "Error when communicating with server."
    44484555
    44494556#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:67
    … …  
    46224729msgstr "zoom"
    46234730
    4624 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
     4731#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
    46254732msgid "Slippy map"
    46264733msgstr "Slippy map"
    … …  
    46474754msgstr "Tile Numbers"
    46484755
    4649 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
     4756#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
    46504757#, java-format
    46514758msgid "Images for {0}"
    46524759msgstr "Images for {0}"
    46534760
    4654 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103
     4761#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
    46554762msgid "Read GPX..."
    46564763msgstr "Read GPX..."
    46574764
    4658 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112
     4765#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
    46594766#, java-format
    46604767msgid "No time for point {0} x {1}"
    46614768msgstr "No time for point {0} x {1}"
    46624769
    4663 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117
     4770#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
    46644771#, java-format
    46654772msgid "Cannot read time \"{0}\" from point {1} x {2}"
    46664773msgstr "Cannot read time \"{0}\" from point {1} x {2}"
    46674774
    4668 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
     4775#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
    46694776msgid "No images with readable timestamps found."
    46704777msgstr "No images with readable timestamps found."
    46714778
    4672 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136
     4779#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
    46734780#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
    46744781#, java-format
    … …  
    46764783msgstr "Reading {0}..."
    46774784
    4678 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203
     4785#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
    46794786#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
    46804787msgid "Geotagged Images"
    46814788msgstr "Geotagged Images"
    46824789
    4683 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255
    4684 #, java-format
    4685 msgid "Image with path {0} does not exist or is not readable."
    4686 msgstr "Image with path {0} does not exist or is not readable."
    4687 
    4688 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363
     4790#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
    46894791#, java-format
    46904792msgid "GPS start: {0}"
    46914793msgstr "GPS start: {0}"
    46924794
    4693 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364
     4795#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
    46944796#, java-format
    46954797msgid "GPS end: {0}"
    46964798msgstr "GPS end: {0}"
    46974799
    4698 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366
     4800#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
    46994801#, java-format
    47004802msgid "current delta: {0}s"
    47014803msgstr "current delta: {0}s"
    47024804
    4703 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367
     4805#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
    47044806msgid "timezone difference: "
    47054807msgstr "timezone difference: "
    47064808
    4707 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4809#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    47084810#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
    47094811msgid "image"
    … …  
    47124814msgstr[1] "images"
    47134815
    4714 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4816#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    47154817#, java-format
    47164818msgid "{0} within the track."
    47174819msgstr "{0} within the track."
    47184820
    4719 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
     4821#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
    47204822msgid "Sync clock"
    47214823msgstr "Sync clock"
    47224824
    4723 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
     4825#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
    47244826#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
    47254827#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
    … …  
    47274829msgstr "JPEG images (*.jpg)"
    47284830
    4729 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489
     4831#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
    47304832#, java-format
    47314833msgid "The date in file \"{0}\" could not be parsed."
    47324834msgstr "The date in file \"{0}\" could not be parsed."
    47334835
    4734 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493
     4836#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
    47354837#, java-format
    47364838msgid "There is no EXIF time within the file \"{0}\"."
    47374839msgstr "There is no EXIF time within the file \"{0}\"."
    47384840
    4739 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497
     4841#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
    47404842msgid "Image"
    47414843msgstr "Image"
    47424844
    4743 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499
     4845#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
    47444846msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    47454847msgstr "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    47464848
    4747 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
     4849#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
    47484850msgid "GPS unit timezone (difference to photo)"
    47494851msgstr "GPS unit timezone (difference to photo)"
    47504852
    4751 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510
     4853#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
    47524854msgid "Synchronize Time with GPS Unit"
    47534855msgstr "Synchronise Time with GPS Unit"
    47544856
    4755 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526
    4756 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528
     4857#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
     4858#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
    47574859msgid "Time entered could not be parsed."
    47584860msgstr "Time entered could not be parsed."
    … …  
    49045006
    49055007#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
    4906 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
     5008#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
    49075009#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
    49085010#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
    … …  
    49745076msgstr "version {0}"
    49755077
    4976 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
     5078#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
    49775079msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    4978 msgstr ""
    4979 
    4980 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
     5080msgstr "Warning: mixing 0.6 and 0.5 data results in version 0.5"
     5081
     5082#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
    49815083#, java-format
    49825084msgid "There were {0} conflicts during import."
    4983 msgstr ""
    4984 
    4985 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
     5085msgstr "There were {0} conflicts during import."
     5086
     5087#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
    49865088#, java-format
    49875089msgid "{0} consists of:"
    49885090msgstr "{0} consists of:"
    49895091
    4990 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392
     5092#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
    49915093#, java-format
    49925094msgid " ({0} deleted.)"
    49935095msgstr " ({0} deleted.)"
    49945096
    4995 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     5097#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    49965098msgid "unset"
    49975099msgstr "unset"
    49985100
    4999 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     5101#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    50005102#, java-format
    50015103msgid "API version: {0}"
    50025104msgstr "API version: {0}"
    50035105
    5004 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
     5106#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
    50055107#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
    50065108msgid "Convert to GPX layer"
    … …  
    62226324
    62236325#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
    6224 #: ../plugins/terracer/src/terracer/TerracerAction.java:422
    6225 #: ../plugins/terracer/src/terracer/TerracerAction.java:440
    6226 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
     6326#: ../plugins/terracer/src/terracer/TerracerAction.java:412
     6327#: ../plugins/terracer/src/terracer/TerracerAction.java:430
     6328#: ../plugins/terracer/src/terracer/TerracerAction.java:494
    62276329msgid "All"
    62286330msgstr "All"
    … …  
    66586760#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:36
    66596761msgid "Login name (e-mail) to the OSM account."
    6660 msgstr ""
     6762msgstr "Login name (e-mail) to the OSM account."
    66616763
    66626764#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:37
    … …  
    66726774#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:41
    66736775msgid "OSM username (e-mail)"
    6674 msgstr ""
     6776msgstr "OSM username (e-mail)"
    66756777
    66766778#: ../core/src/org/openstreetmap/josm/gui/preferences/ServerAccessPreference.java:43
    … …  
    66846786"URL.<br><b>Do not use a valuable Password.</b></html>"
    66856787msgstr ""
     6788"<html>WARNING: The password is stored in plain text in the preferences file."
     6789"<br>The password is transferred in plain text to the server, encoded in the "
     6790"URL.<br><b>Do not use a valuable Password.</b></html>"
    66866791
    66876792#. icon source: http://www.iconfinder.net/index.php?q=key&page=icondetails&iconid=8553&size=128&q=key&s12=on&s16=on&s22=on&s32=on&s48=on&s64=on&s128=on
    … …  
    69707075
    69717076#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
    6972 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
     7077#: ../plugins/terracer/src/terracer/TerracerAction.java:98
    69737078#, java-format
    69747079msgid "Change {0} object"
    … …  
    69787083
    69797084#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
    6980 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
     7085#: ../plugins/terracer/src/terracer/TerracerAction.java:100
    69817086msgid "Nothing selected!"
    69827087msgstr "Nothing selected!"
    … …  
    70127117
    70137118#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
     7119#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
     7120#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
    70147121#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
    70157122#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
    … …  
    70277134msgstr "Preparing data..."
    70287135
    7029 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21
     7136#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
    70307137msgid "GPX Files"
    70317138msgstr "GPX Files"
    70327139
    7033 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48
     7140#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
    70347141#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
     7142#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
    70357143#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
    70367144#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
    … …  
    70387146msgid "Markers from {0}"
    70397147msgstr "Markers from {0}"
     7148
     7149#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
     7150#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
     7151#, fuzzy, java-format
     7152msgid "File \"{0}\" does not exist"
     7153msgstr "File {0} exists. Overwrite?"
     7154
     7155#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
     7156#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
     7157#, java-format
     7158msgid "Parsing file \"{0}\" failed"
     7159msgstr ""
    70407160
    70417161#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
    … …  
    70437163msgstr "Parse error: invalid document structure for gpx document"
    70447164
     7165#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
     7166#, java-format
     7167msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
     7168msgstr ""
     7169
     7170#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
     7171#, java-format
     7172msgid "Server replied with response code 404 for id {0}. Skipping."
     7173msgstr ""
     7174
     7175#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
     7176msgid ""
     7177"Server replied with response code 404, retrying with an individual request "
     7178"for each primitive"
     7179msgstr ""
     7180
    70457181#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
    70467182msgid "NMEA-0183 Files"
    … …  
    70487184
    70497185#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
     7186#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
    70507187msgid "Coordinates imported: "
    70517188msgstr "Coordinates imported: "
    … …  
    70797216#, java-format
    70807217msgid "preference ''{0}'' missing. Can't initialize OsmApi"
    7081 msgstr ""
     7218msgstr "preference ''{0}'' missing. Can't initialize OsmApi"
    70827219
    70837220#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:171
    … …  
    71027239#, java-format
    71037240msgid "unexpected format of id replied by the server, got ''{0}''"
    7104 msgstr ""
     7241msgstr "unexpected format of id replied by the server, got ''{0}''"
    71057242
    71067243#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:260
    … …  
    71097246"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
    71107247msgstr ""
     7248"unexpected format of new version of modified primitive ''{0}'', got ''{1}''"
    71117249
    71127250#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:283
    … …  
    71187256msgstr "Closing changeset..."
    71197257
    7120 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
     7258#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
    71217259msgid "No changeset present for diff upload"
    71227260msgstr "No changeset present for diff upload"
    71237261
    7124 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
     7262#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
    71257263msgid "Preparing..."
    71267264msgstr "Preparing..."
    71277265
    7128 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
     7266#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
    71297267msgid "Uploading..."
    71307268msgstr "Uploading..."
    … …  
    71747312#, java-format
    71757313msgid "mandatory attribute ''{0}'' missing"
    7176 msgstr ""
     7314msgstr "mandatory attribute ''{0}'' missing"
    71777315
    71787316#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:74
    … …  
    71807318msgid "illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
    71817319msgstr ""
     7320"illegal value for mandatory attribute ''{0}'' of type long, got ''{1}''"
    71827321
    71837322#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:77
    … …  
    71867325"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
    71877326msgstr ""
     7327"illegal value for mandatory attribute ''{0}'' of type long (>=0), got ''{1}''"
    71887328
    71897329#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:91
    71907330#, java-format
    71917331msgid "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
    7192 msgstr ""
     7332msgstr "illegal value for mandatory attribute ''{0}'' of type int, got ''{1}''"
    71937333
    71947334#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:94
    … …  
    71977337"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
    71987338msgstr ""
     7339"illegal value for mandatory attribute ''{0}'' of type int (>=0), got ''{1}''"
    71997340
    72007341#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:114
    … …  
    72037344"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
    72047345msgstr ""
     7346"illegal value for mandatory attribute ''{0}'' of type boolean, got ''{1}''"
    72057347
    72067348#: ../core/src/org/openstreetmap/josm/io/OsmHistoryReader.java:174
    … …  
    72107352"''{1}''"
    72117353msgstr ""
     7354"illegal value for mandatory attribute ''{0}'' of type OsmPrimitiveType, got "
     7355"''{1}''"
    72127356
    72137357#: ../core/src/org/openstreetmap/josm/io/OsmIdReader.java:38
    … …  
    72197363msgstr "OSM Server Files"
    72207364
    7221 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
     7365#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
    72227366msgid "Unknown version"
    72237367msgstr "Unknown version"
    72247368
    7225 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
     7369#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
    72267370msgid "Version number missing from OSM data"
    72277371msgstr "Version number missing from OSM data"
    72287372
    7229 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
     7373#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
    72307374#, java-format
    72317375msgid "Unknown version: {0}"
    72327376msgstr "Unknown version: {0}"
    72337377
    7234 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
     7378#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
    72357379msgid "Found <nd> element in non-way."
    72367380msgstr "Found <nd> element in non-way."
    72377381
    7238 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
     7382#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
    72397383msgid "<nd> has zero ref"
    72407384msgstr "<nd> has zero ref"
    72417385
    7242 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214
     7386#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
    72437387msgid "Found <member> element in non-relation."
    72447388msgstr "Found <member> element in non-relation."
    72457389
    7246 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219
     7390#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
    72477391#, java-format
    72487392msgid "Missing attribute \"ref\" on member in relation {0}"
    72497393msgstr "Missing attribute \"ref\" on member in relation {0}"
    72507394
    7251 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
     7395#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
    72527396#, java-format
    72537397msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
    72547398msgstr "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
    72557399
    7256 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
     7400#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    72577401#, java-format
    72587402msgid "Missing attribute \"type\" on member {0} in relation {1}"
    72597403msgstr "Missing attribute \"type\" on member {0} in relation {1}"
    72607404
    7261 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
     7405#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
    72627406#, java-format
    72637407msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
    72647408msgstr "Unexpected \"type\" on member {0} in relation {1}, got {2}."
    72657409
    7266 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
     7410#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
    72677411msgid "Incomplete <member> specification with ref=0"
    72687412msgstr "Incomplete <member> specification with ref=0"
    72697413
    7270 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     7414#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
    72717415msgid "Illegal object with id=0"
    72727416msgstr "Illegal object with id=0"
    72737417
    7274 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
     7418#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
    72757419#, java-format
    72767420msgid ""
    … …  
    72797423"Illegal value for attribute \"version\" on OSM primitive with id {0}, got {1}"
    72807424
    7281 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
     7425#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
    72827426#, java-format
    72837427msgid "Missing attribute \"version\" on OSM primitive with id {0}"
    72847428msgstr "Missing attribute \"version\" on OSM primitive with id {0}"
    72857429
    7286 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329
     7430#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
    72877431#, java-format
    72887432msgid "Missing required attribute \"{0}\"."
    72897433msgstr "Missing required attribute \"{0}\"."
    72907434
    7291 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
     7435#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
    72927436#, java-format
    72937437msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
    72947438msgstr "Skipping a way because it includes a node that doesn''t exist: {0}\n"
    72957439
    7296 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485
     7440#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
    72977441msgid "Prepare OSM data..."
    72987442msgstr "Prepare OSM data..."
    72997443
    7300 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
     7444#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
    73017445msgid "Ill-formed node id"
    73027446msgstr "Ill-formed node id"
    … …  
    73057449#, java-format
    73067450msgid "parameter ''{0}'' >= 0 expected, got ''{1}''"
    7307 msgstr ""
     7451msgstr "parameter ''{0}'' >= 0 expected, got ''{1}''"
    73087452
    73097453#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:72
    73107454msgid "Downloading history..."
    7311 msgstr ""
     7455msgstr "Downloading history..."
    73127456
    73137457#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:28
    … …  
    73187462#, java-format
    73197463msgid "Failed to open connection to API {0}"
    7320 msgstr ""
     7464msgstr "Failed to open connection to API {0}"
    73217465
    73227466#: ../core/src/org/openstreetmap/josm/io/OsmServerReader.java:75
    … …  
    73267470"Couldn't connect to the osm server. Please check your internet connection."
    73277471
    7328 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
     7472#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
    73297473#, java-format
    73307474msgid ""
    … …  
    73327476"use changesets, but API is not handle them. Ignoring changesets."
    73337477msgstr ""
    7334 
    7335 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134
     7478"WARNING: preference ''{0}'' or api version ''{1}'' of dataset requires to "
     7479"use changesets, but API is not handle them. Ignoring changesets."
     7480
     7481#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
    73367482#, java-format
    73377483msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
    … …  
    75837729msgstr "Error reading plugin information file: {0}"
    75847730
    7585 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300
     7731#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
    75867732msgid "This is after the end of the recording"
    75877733msgstr "This is after the end of the recording"
    75887734
    7589 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
     7735#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
    75907736msgid "Error playing sound"
    75917737msgstr "Error playing sound"
    … …  
    81038249"adjust the sliders to manually match the photos."
    81048250msgstr ""
     8251"An error occurred while trying to match the photos to the GPX track. You can "
     8252"adjust the sliders to manually match the photos."
    81058253
    81068254#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:853
    … …  
    82108358"Would you like to restore F11 for grab action ?"
    82118359msgstr ""
     8360"Plugin cadastre-fr used traditionaly for grabbing the key shortcut F11\n"
     8361"which is currently allocated for full-screen switch by default\n"
     8362"Would you like to restore F11 for grab action ?"
    82128363
    82138364#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:208
    82148365msgid "Restore grab shortcut F11"
    8215 msgstr ""
     8366msgstr "Restore grab shortcut F11"
    82168367
    82178368#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePlugin.java:213
    82188369msgid "JOSM is stopped for the change to take effect."
    8219 msgstr ""
     8370msgstr "JOSM is stopped for the change to take effect."
    82208371
    82218372#: ../plugins/cadastre-fr/src/cadastre_fr/CadastrePreferenceSetting.java:28
    … …  
    84668617#: ../plugins/cadastre-fr/src/cadastre_fr/WMSAdjustAction.java:35
    84678618msgid "Adjust the position of the WMS layer (raster images only)"
    8468 msgstr ""
     8619msgstr "Adjust the position of the WMS layer (raster images only)"
    84698620
    84708621#: ../plugins/cadastre-fr/src/cadastre_fr/WMSDownloadAction.java:19
    … …  
    85278678#, java-format
    85288679msgid "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
    8529 msgstr ""
     8680msgstr "Lambert zone {0} in cache incompatible with current Lambert zone {1}"
    85308681
    85318682#: ../plugins/cadastre-fr/src/cadastre_fr/WMSLayer.java:419
    … …  
    85858736"Remove the area from the relation before splitting it."
    85868737
     8738#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
     8739msgid "TangoGPS Files (*.log)"
     8740msgstr ""
     8741
     8742#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
     8743#, fuzzy
     8744msgid "Format errors: "
     8745msgstr "File Format Error"
     8746
     8747#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
     8748#, fuzzy
     8749msgid "TangoGPS import success"
     8750msgstr "NMEA import success"
     8751
     8752#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
     8753#, fuzzy
     8754msgid "TangoGPS import faliure!"
     8755msgstr "NMEA import faliure!"
     8756
    85878757#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
    85888758#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
    … …  
    89319101#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerException.java:10
    89329102msgid "An unknown error has occurred"
    8933 msgstr ""
     9103msgstr "An unknown error has occurred"
    89349104
    89359105#: ../plugins/lakewalker/src/org/openstreetmap/josm/plugins/lakewalker/LakewalkerPreferences.java:18
    … …  
    93129482msgstr "Displays OpenStreetBugs issues"
    93139483
     9484#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
     9485msgid ""
     9486"<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
     9487"new server is available at schokokeks.org.<br>Do you want to switch to the "
     9488"new server? (Strongly recommended)</html>"
     9489msgstr ""
     9490
     9491#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
     9492msgid "Switch to new openstreetbugs server?"
     9493msgstr ""
     9494
    93149495#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
    93159496msgid ""
    … …  
    93429523#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:96
    93439524msgid "Opens the OpenStreetBugs window and activates the automatic download"
    9344 msgstr ""
     9525msgstr "Opens the OpenStreetBugs window and activates the automatic download"
    93459526
    93469527#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:123
    … …  
    94159596msgstr "Unknown file extension: {0}"
    94169597
    9417 #: ../plugins/osmarender/src/OsmarenderPlugin.java:41
     9598#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
    94189599msgid "Osmarender"
    94199600msgstr "Osmarender"
    94209601
    9421 #: ../plugins/osmarender/src/OsmarenderPlugin.java:96
     9602#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
    94229603msgid ""
    94239604"Firefox not found. Please set firefox executable in the Map Settings page of "
    … …  
    94279608"the preferences."
    94289609
    9429 #: ../plugins/osmarender/src/OsmarenderPlugin.java:127
     9610#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
    94309611msgid "osmarender options"
    94319612msgstr "osmarender options"
    94329613
    9433 #: ../plugins/osmarender/src/OsmarenderPlugin.java:128
     9614#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
    94349615msgid "Firefox executable"
    94359616msgstr "Firefox executable"
    … …  
    95769757msgstr "Enter weight values"
    95779758
    9578 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
     9759#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69
    95799760msgid "Slippy Map"
    95809761msgstr "Slippy Map"
    95819762
    9582 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
     9763#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75
    95839764msgid "Load Tile"
    95849765msgstr "Load Tile"
    95859766
    9586 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
     9767#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86
    95879768msgid "Show Tile Status"
    95889769msgstr "Show Tile Status"
    95899770
    9590 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
     9771#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97
    95919772msgid "Request Update"
    95929773msgstr "Request Update"
    95939774
    9594 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
     9775#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108
    95959776msgid "Load All Tiles"
    95969777msgstr "Load All Tiles"
    95979778
    9598 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
     9779#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118
    95999780msgid "Increase zoom"
    96009781msgstr "Increase zoom"
    96019782
    9602 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
     9783#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127
    96039784msgid "Decrease zoom"
    96049785msgstr "Decrease zoom"
    96059786
    9606 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
     9787#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
     9788msgid "Flush Tile Cache"
     9789msgstr ""
     9790
     9791#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
    96079792msgid "image not loaded"
    96089793msgstr "image not loaded"
     9794
     9795#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
     9796#, fuzzy
     9797msgid "image loading..."
     9798msgstr "Uploading..."
    96099799
    96109800#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
    … …  
    96459835msgstr "Fade background: "
    96469836
    9647 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
     9837#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123
    96489838msgid "error loading metadata"
    96499839msgstr "error loading metadata"
    96509840
    9651 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
     9841#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138
    96529842#, java-format
    96539843msgid "requested: {0}"
    96549844msgstr "requested: {0}"
    96559845
    9656 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
     9846#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142
    96579847msgid "error requesting update"
    96589848msgstr "error requesting update"
    … …  
    982010010msgstr "Reverse Terrace"
    982110011
    9822 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
    9823 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
     10012#: ../plugins/terracer/src/terracer/TerracerAction.java:68
     10013#: ../plugins/terracer/src/terracer/TerracerAction.java:72
    982410014msgid "Terrace a building"
    982510015msgstr "Terrace a building"
    982610016
    9827 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
     10017#: ../plugins/terracer/src/terracer/TerracerAction.java:70
    982810018msgid "Creates individual buildings from a long building."
    982910019msgstr "Creates individual buildings from a long building."
    983010020
    9831 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
     10021#: ../plugins/terracer/src/terracer/TerracerAction.java:130
    983210022msgid "Select a single, closed way of at least four nodes."
    983310023msgstr "Select a single, closed way of at least four nodes."
    983410024
    9835 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
     10025#: ../plugins/terracer/src/terracer/TerracerAction.java:199
    983610026msgid "Terrace"
    983710027msgstr "Terrace"
    983810028
    9839 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
    9840 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
     10029#: ../plugins/terracer/src/terracer/TerracerAction.java:413
     10030#: ../plugins/terracer/src/terracer/TerracerAction.java:437
    984110031msgid "Even"
    984210032msgstr "Even"
    984310033
    9844 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
     10034#: ../plugins/terracer/src/terracer/TerracerAction.java:414
    984510035msgid "Odd"
    984610036msgstr "Odd"
    984710037
    9848 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
     10038#: ../plugins/terracer/src/terracer/TerracerAction.java:472
    984910039msgid "Highest number"
    985010040msgstr "Highest number"
    985110041
    9852 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
     10042#: ../plugins/terracer/src/terracer/TerracerAction.java:473
    985310043msgid "Lowest number"
    985410044msgstr "Lowest number"
    985510045
    9856 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
     10046#: ../plugins/terracer/src/terracer/TerracerAction.java:474
    985710047msgid "Interpolation"
    985810048msgstr "Interpolation"
    985910049
    986010050#. item "Buildings/Addresses" text "House name"
    9861 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     10051#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    986210052#: build/trans_presets.java:2173
    986310053msgid "Street name"
    986410054msgstr "Street name"
    986510055
    9866 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     10056#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    986710057msgid "Optional"
    986810058msgstr "Optional"
    … …  
    990510095msgstr "Sorry, doesn't work with anonymous users"
    990610096
    9907 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     10097#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    990810098msgid "Join overlapping Areas"
    990910099msgstr "Join overlapping Areas"
    991010100
    9911 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     10101#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    991210102msgid "Joins areas that overlap each other"
    991310103msgstr "Joins areas that overlap each other"
    991410104
    9915 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
     10105#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
    991610106msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
    991710107msgstr "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
    991810108
    9919 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
     10109#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
    992010110msgid "Continue anyway"
    992110111msgstr "Continue anyway"
    992210112
    9923 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
     10113#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
    992410114msgid "Only up to two areas can be joined at the moment."
    992510115msgstr "Only up to two areas can be joined at the moment."
    992610116
    9927 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
     10117#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
    992810118#, java-format
    992910119msgid "\"{0}\" is not closed and therefore can't be joined."
    993010120msgstr "\"{0}\" is not closed and therefore can't be joined."
    993110121
    9932 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
     10122#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
    993310123#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
    993410124msgid ""
    … …  
    994110131"Are you really sure to continue?"
    994210132
    9943 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
     10133#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
    994410134#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
    994510135msgid "Please abort if you are not sure"
    994610136msgstr "Please abort if you are not sure"
    994710137
    9948 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
     10138#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
    994910139msgid "Please select at least one closed way the should be joined."
    995010140msgstr "Please select at least one closed way the should be joined."
    995110141
    9952 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
     10142#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
    995310143msgid "No intersection found. Nothing was changed."
    9954 msgstr ""
    9955 
    9956 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
     10144msgstr "No intersection found. Nothing was changed."
     10145
     10146#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
    995710147msgid "Added node on all intersections"
    995810148msgstr "Added node on all intersections"
    995910149
    9960 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
     10150#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
    996110151msgid "Delete Ways that are not part of an inner multipolygon"
    996210152msgstr "Delete Ways that are not part of an inner multipolygon"
    996310153
    9964 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
     10154#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
    996510155msgid "Fix relations"
    996610156msgstr "Fix relations"
    996710157
    9968 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
     10158#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
    996910159msgid "Joined self-overlapping area"
    997010160msgstr "Joined self-overlapping area"
    997110161
    9972 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
     10162#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
    997310163msgid "Joined overlapping areas"
    997410164msgstr "Joined overlapping areas"
    997510165
    9976 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
     10166#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
    997710167msgid ""
    997810168"Some of the ways were part of relations that have been modified. Please "
    … …  
    998210172"verify no errors have been introduced."
    998310173
    9984 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
     10174#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
    998510175msgid "Fix tag conflicts"
    998610176msgstr "Fix tag conflicts"
    998710177
    9988 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
     10178#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
    998910179msgid "Removed Element from Relations"
    999010180msgstr "Removed Element from Relations"
    999110181
    9992 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
     10182#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
    999310183msgid "Join Areas: Remove Short Ways"
    999410184msgstr "Join Areas: Remove Short Ways"
    999510185
    9996 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
     10186#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
    999710187msgid "Closed Way"
    999810188msgstr "Closed Way"
    999910189
    10000 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
     10190#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
    1000110191msgid "Remove tags from inner ways"
    1000210192msgstr "Remove tags from inner ways"
    1000310193
    10004 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
     10194#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
    1000510195msgid "Join Areas Function"
    1000610196msgstr "Join Areas Function"
    1000710197
    10008 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     10198#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    1000910199msgid "Jump To Position"
    1001010200msgstr "Jump To Position"
    1001110201
    10012 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     10202#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    1001310203msgid "Opens a dialog that allows to jump to a specific location"
    1001410204msgstr "Opens a dialog that allows to jump to a specific location"
    1001510205
    10016 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
     10206#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
    1001710207msgid "Enter Lat/Lon to jump to position."
    1001810208msgstr "Enter Lat/Lon to jump to position."
    1001910209
    10020 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
     10210#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
    1002110211msgid "You can also paste an URL from www.openstreetmap.org"
    1002210212msgstr "You can also paste an URL from www.openstreetmap.org"
    1002310213
    10024 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
     10214#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
    1002510215msgid "Zoom (in metres)"
    1002610216msgstr "Zoom (in metres)"
    1002710217
    10028 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
     10218#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
    1002910219msgid "URL"
    1003010220msgstr "URL"
    1003110221
    10032 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     10222#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    1003310223msgid "Jump there"
    1003410224msgstr "Jump there"
    1003510225
    10036 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
     10226#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
    1003710227msgid "Jump to Position"
    1003810228msgstr "Jump to Position"
    1003910229
    10040 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     10230#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    1004110231msgid "Could not parse Latitude, Longitude or Zoom. Please check."
    1004210232msgstr "Could not parse Latitude, Longitude or Zoom. Please check."
    1004310233
    10044 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     10234#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    1004510235msgid "Unable to parse Lon/Lat"
    1004610236msgstr "Unable to parse Lon/Lat"
    … …  
    1084211032"use."
    1084311033msgstr ""
     11034"You can add, edit and delete WMS entries in the WMSplugin Preference Tab - "
     11035"these will then show up in the WMS menu.\n"
     11036"\n"
     11037"You can also do this manually in the Advanced Preferences, using the "
     11038"following schema:\n"
     11039"wmsplugin.url.1.name=Landsat\n"
     11040"wmsplugin.url.1.url=http://onearth.jpl.nasa.gov....\n"
     11041"wmsplugin.url.2.name=NPE Maps... etc\n"
     11042"\n"
     11043"Full WMS URL input format example (landsat)\n"
     11044"http://onearth.jpl.nasa.gov/wms.cgi?request=GetMap&\n"
     11045"layers=global_mosaic&styles=&srs=EPSG:4326&format=image/jpeg\n"
     11046"\n"
     11047"For Metacarta's Map Rectifier http://labs.metacarta.com/rectifier/ , you "
     11048"only need to input the relevant 'id'.\n"
     11049"To add a Metacarta Map Rectifier menu item, manually create the URL like in "
     11050"this example, replacing 73 with your image id:\n"
     11051"http://labs.metacarta.com/rectifier/wms.cgi?id=73\n"
     11052"&srs=EPSG:4326&Service=WMS&Version=1.1.0&Request=GetMap&format=image/png\n"
     11053"\n"
     11054"Note: Make sure the image is suitable, copyright-wise, if in doubt, don't "
     11055"use."
    1084411056
    1084511057#: ../plugins/wmsplugin/src/wmsplugin/Help_WMSmenuAction.java:53
    … …  
    1085411066#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:68
    1085511067msgid "Download Rectified Images From Various Services"
    10856 msgstr ""
     11068msgstr "Download Rectified Images From Various Services"
    1085711069
    1085811070#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:70
    1085911071#, java-format
    1086011072msgid "WMS: {0}"
    10861 msgstr ""
     11073msgstr "WMS: {0}"
    1086211074
    1086311075#. This service serves the purpose of "just this once" without forcing the user
    … …  
    1086711079#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:106
    1086811080msgid "Custom WMS Link"
    10869 msgstr ""
     11081msgstr "Custom WMS Link"
    1087011082
    1087111083#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:111
    1087211084msgid "Supported Rectifier Services:"
    10873 msgstr ""
     11085msgstr "Supported Rectifier Services:"
    1087411086
    1087511087#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:135
    1087611088msgid "Visit Homepage"
    10877 msgstr ""
     11089msgstr "Visit Homepage"
    1087811090
    1087911091#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:144
    1088011092msgid "WMS URL or Image ID:"
    10881 msgstr ""
     11093msgstr "WMS URL or Image ID:"
    1088211094
    1088311095#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:148
    1088411096#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    1088511097msgid "Add Rectified Image"
    10886 msgstr ""
     11098msgstr "Add Rectified Image"
    1088711099
    1088811100#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:198
    … …  
    1089111103"again."
    1089211104msgstr ""
     11105"Couldn't match the entered link or id to the selected service. Please try "
     11106"again."
    1089311107
    1089411108#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:199
    1089511109msgid "No valid WMS URL or id"
    10896 msgstr ""
     11110msgstr "No valid WMS URL or id"
    1089711111
    1089811112#: ../plugins/wmsplugin/src/wmsplugin/WMSAdjustAction.java:28
    … …  
    1106211276#: build/specialmessages.java:10
    1106311277msgid "Audio Device Unavailable"
    11064 msgstr ""
     11278msgstr "Audio Device Unavailable"
    1106511279
    1106611280#. Java message loading audio data
    … …  
    1111011324"Creating and handling address nodes and buildings within Czech Republic."
    1111111325
     11326#. Plugin dataimport
     11327#: build/trans_plugins.java:13
     11328msgid "Allows to import various file formats into JOSM directly."
     11329msgstr ""
     11330
    1111211331#. Plugin DirectUpload
    11113 #: build/trans_plugins.java:13
     11332#: build/trans_plugins.java:15
    1111411333msgid ""
    1111511334"This plugin directly upload GPS Traces from current active layer in JOSM to "
    … …  
    1112011339
    1112111340#. Plugin Duplicate-Way
    11122 #: build/trans_plugins.java:15
     11341#: build/trans_plugins.java:17
    1112311342msgid "Duplicate Ways with an offset"
    1112411343msgstr "Duplicate Ways with an offset"
    1112511344
    1112611345#. Plugin editgpx
    11127 #: build/trans_plugins.java:17
     11346#: build/trans_plugins.java:19
    1112811347msgid ""
    1112911348"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
    … …  
    1113411353
    1113511354#. Plugin globalsat
    11136 #: build/trans_plugins.java:19
     11355#: build/trans_plugins.java:21
    1113711356msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
    1113811357msgstr "Download GPS points from Globalsat dg100 data logger directly in JOSM."
    1113911358
    1114011359#. Plugin grid
    11141 #: build/trans_plugins.java:21
     11360#: build/trans_plugins.java:23
    1114211361msgid "Provide a background layer that displays a map grid"
    1114311362msgstr "Provide a background layer that displays a map grid"
    1114411363
    1114511364#. Plugin ImageWayPoint
    11146 #: build/trans_plugins.java:23
     11365#: build/trans_plugins.java:25
    1114711366msgid ""
    1114811367"Another plugin to match images to the waypoints in a GPX file. A match is "
    … …  
    1115511374
    1115611375#. Plugin lakewalker
    11157 #: build/trans_plugins.java:25
     11376#: build/trans_plugins.java:27
    1115811377msgid "Helps vectorizing WMS images."
    1115911378msgstr "Helps vectorising WMS images."
    1116011379
    1116111380#. Plugin livegps
    11162 #: build/trans_plugins.java:27
     11381#: build/trans_plugins.java:29
    1116311382msgid ""
    1116411383"Support live GPS input (moving dot) through a connection to gpsd server."
    … …  
    1116711386
    1116811387#. Plugin measurement
    11169 #: build/trans_plugins.java:29
     11388#: build/trans_plugins.java:31
    1117011389msgid ""
    1117111390"Provide a measurement dialog and a layer to measure length and angle of "
    … …  
    1117811397
    1117911398#. Plugin nearclick
    11180 #: build/trans_plugins.java:31
     11399#: build/trans_plugins.java:33
    1118111400msgid ""
    1118211401"Simulates a click when you do a small and short drag. This is usefull for "
    … …  
    1118411403"mouse moving (general Java - tablet problem)."
    1118511404msgstr ""
    11186 "Simulates a click when you do a small and short drag. This is usefull for "
     11405"Simulates a click when you do a small and short drag. This is useful for "
    1118711406"tablet pens, when you have problems just clicking the tablet without the "
    1118811407"mouse moving (general Java - tablet problem)."
    1118911408
    1119011409#. Plugin openlayers
    11191 #: build/trans_plugins.java:33
     11410#: build/trans_plugins.java:35
    1119211411msgid "Displays an OpenLayers background image"
    1119311412msgstr "Displays an OpenLayers background image"
    1119411413
    1119511414#. Plugin openstreetbugs
    11196 #: build/trans_plugins.java:35
     11415#: build/trans_plugins.java:37
    1119711416msgid "Imports issues from OpenStreetBugs"
    1119811417msgstr "Imports issues from OpenStreetBugs"
    1119911418
    1120011419#. Plugin openvisible
    11201 #: build/trans_plugins.java:37
     11420#: build/trans_plugins.java:39
    1120211421msgid ""
    1120311422"Allows opening gpx/osm files that intersect the currently visible screen area"
    … …  
    1120611425
    1120711426#. Plugin osmarender
    11208 #: build/trans_plugins.java:39
     11427#: build/trans_plugins.java:41
    1120911428msgid ""
    1121011429"Launches FireFox to display the current visible screen as a nice SVG image."
    … …  
    1121311432
    1121411433#. Plugin PicLayer
    11215 #: build/trans_plugins.java:41
     11434#: build/trans_plugins.java:43
    1121611435msgid ""
    1121711436"This plugin allows to display any picture as a background in the editor and "
    … …  
    1122211441
    1122311442#. Plugin plastic_laf
    11224 #: build/trans_plugins.java:43
     11443#: build/trans_plugins.java:45
    1122511444msgid "The great JGoodies Plastic Look and Feel."
    1122611445msgstr "The great JGoodies Plastic Look and Feel."
    1122711446
    1122811447#. Plugin remotecontrol
    11229 #: build/trans_plugins.java:45
     11448#: build/trans_plugins.java:47
    1123011449msgid "Let other applications send commands to JOSM."
    1123111450msgstr "Let other applications send commands to JOSM."
    1123211451
    1123311452#. Plugin routing
    11234 #: build/trans_plugins.java:47
     11453#: build/trans_plugins.java:49
    1123511454msgid "Provides routing capabilities."
    1123611455msgstr "Provides routing capabilities."
    1123711456
    1123811457#. Plugin slippymap
    11239 #: build/trans_plugins.java:49
     11458#: build/trans_plugins.java:51
    1124011459msgid ""
    1124111460"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
    … …  
    1124611465
    1124711466#. Plugin surveyor
    11248 #: build/trans_plugins.java:51
     11467#: build/trans_plugins.java:53
    1124911468msgid "Allow adding markers/nodes on current gps positions."
    1125011469msgstr "Allow adding markers/nodes on current gps positions."
    1125111470
    1125211471#. Plugin tageditor
    11253 #: build/trans_plugins.java:53
     11472#: build/trans_plugins.java:55
    1125411473msgid "Provides a dialog for editing tags in a tabular grid."
    1125511474msgstr "Provides a dialog for editing tags in a tabular grid."
    1125611475
    1125711476#. Plugin tagging-preset-tester
    11258 #: build/trans_plugins.java:55
     11477#: build/trans_plugins.java:57
    1125911478msgid ""
    1126011479"Adds a tagging preset tester to the help menu, which helps you developing of "
    … …  
    1126711486
    1126811487#. Plugin tcx-support
    11269 #: build/trans_plugins.java:57
     11488#: build/trans_plugins.java:59
    1127011489msgid "Directly load TCX files from JOSM."
    1127111490msgstr "Directly load TCX files from JOSM."
    1127211491
    1127311492#. Plugin terracer
    11274 #: build/trans_plugins.java:59
     11493#: build/trans_plugins.java:61
    1127511494msgid "Make terraced houses out of single blocks."
    1127611495msgstr "Make terraced houses out of single blocks."
    1127711496
    1127811497#. Plugin usertools
    11279 #: build/trans_plugins.java:61
     11498#: build/trans_plugins.java:63
    1128011499msgid ""
    1128111500"Tools to work with authors/users. Selects map data that belongs to selected "
    … …  
    1128611505
    1128711506#. Plugin utilsplugin
    11288 #: build/trans_plugins.java:63
     11507#: build/trans_plugins.java:65
    1128911508msgid ""
    1129011509"Several utilities that make your life easier: e.g. simplify way, join areas, "
    … …  
    1129511514
    1129611515#. Plugin validator
    11297 #: build/trans_plugins.java:65
     11516#: build/trans_plugins.java:67
    1129811517msgid ""
    1129911518"An OSM data validator. It checks for problems in data, and provides fixes "
    … …  
    1130411523
    1130511524#. Plugin waydownloader
    11306 #: build/trans_plugins.java:67
     11525#: build/trans_plugins.java:69
    1130711526msgid "Easy downloading along a long set of interconnected ways"
    1130811527msgstr "Easy downloading along a long set of interconnected ways"
    1130911528
    1131011529#. Plugin wmsplugin
    11311 #: build/trans_plugins.java:69
     11530#: build/trans_plugins.java:71
    1131211531msgid ""
    1131311532"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
    … …  
    2246922688msgstr "Terraserver Urban"
    2247022689
     22690#~ msgid ""
     22691#~ "Please select at least one node, way or relation. Only already uploaded "
     22692#~ "elements have a history."
     22693#~ msgstr ""
     22694#~ "Please select at least one node, way or relation. Only already uploaded "
     22695#~ "elements have a history."
     22696
     22697#~ msgid "Undeleting Way..."
     22698#~ msgstr "Undeleting Way..."
     22699
     22700#~ msgid "Checking whether node {0} is gone ..."
     22701#~ msgstr "Checking whether node {0} is gone ..."
     22702
     22703#~ msgid "Undeleting relation..."
     22704#~ msgstr "Undeleting relation..."
     22705
     22706#~ msgid "Checking whether primitive {0} is gone ..."
     22707#~ msgstr "Checking whether primitive {0} is gone ..."
     22708
     22709#~ msgid "Keep mine"
     22710#~ msgstr "Keep mine"
     22711
     22712#~ msgid "Delete mine"
     22713#~ msgstr "Delete mine"
     22714
     22715#~ msgid ""
     22716#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
     22717#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
     22718#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
     22719#~ "primitive will be assigend a new id.<br>Click <strong>{2}</strong> to "
     22720#~ "accept the state on the server and to delete your primitive.<br>Click "
     22721#~ "<strong>{3}</strong> to cancel.<br>"
     22722#~ msgstr ""
     22723#~ "<html>The OSM primitive with id <strong>{0}</strong> has been "
     22724#~ "deleted<br>on the server by another mapper.<br><br>Click <strong>{1}</"
     22725#~ "strong> to keep your primitive and ignore the deleted state.<br>Your "
     22726#~ "primitive will be assigned a new id.<br>Click <strong>{2}</strong> to "
     22727#~ "accept the state on the server and to delete your primitive.<br>Click "
     22728#~ "<strong>{3}</strong> to cancel.<br>"
     22729
     22730#~ msgid ""
     22731#~ "<html>There are  <strong>{0}</strong> primitives <br>selected for "
     22732#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
     22733#~ "</html>"
     22734#~ msgstr ""
     22735#~ "<html>There are <strong>{0}</strong> primitives <br>selected for "
     22736#~ "individual update. Please reduce the selection<br>to max. {1} primitives."
     22737#~ "</html>"
     22738
     22739#~ msgid "Selection too big"
     22740#~ msgstr "Selection too big"
     22741
     22742#~ msgid "Image with path {0} does not exist or is not readable."
     22743#~ msgstr "Image with path {0} does not exist or is not readable."
     22744
     22745#~ msgid "Uploading data"
     22746#~ msgstr "Uploading data"
     22747
     22748#~ msgid "Email"
     22749#~ msgstr "E-Mail"
     22750
     22751#~ msgid "Resolve Conflicts"
     22752#~ msgstr "Resolve Conflicts"
     22753
     22754#~ msgid "{0} object has conflicts:"
     22755#~ msgid_plural "{0} objects have conflicts:"
     22756#~ msgstr[0] "{0} object has conflicts:"
     22757#~ msgstr[1] "{0} objects have conflicts:"
     22758
     22759#~ msgid "my version:"
     22760#~ msgstr "my version:"
     22761
     22762#~ msgid "their version:"
     22763#~ msgstr "their version:"
     22764
     22765#~ msgid "resolved version:"
     22766#~ msgstr "resolved version:"
     22767
     22768#~ msgid "Login name (email) to the OSM account."
     22769#~ msgstr "Login name (e-mail) to the OSM account."
     22770
     22771#~ msgid "OSM username (email)"
     22772#~ msgstr "OSM username (e-mail)"
     22773
     22774#~ msgid "Unknown host"
     22775#~ msgstr "Unknown host"
     22776
     22777#~ msgid "position"
     22778#~ msgstr "position"
     22779
     22780#~ msgid "different"
     22781#~ msgstr "different"
     22782
     22783#~ msgid "true"
     22784#~ msgstr "true"
     22785
     22786#~ msgid "false"
     22787#~ msgstr "false"
     22788
     22789#~ msgid "Resolve {0} conflicts in {1} objects"
     22790#~ msgstr "Resolve {0} conflicts in {1} objects"
     22791
    2247122792#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
    2247222793#~ msgstr "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
    22473 
    22474 #~ msgid "Uploading data"
    22475 #~ msgstr "Uploading data"
    22476 
    22477 #~ msgid "Email"
    22478 #~ msgstr "E-Mail"
    22479 
    22480 #~ msgid "Login name (email) to the OSM account."
    22481 #~ msgstr "Login name (e-mail) to the OSM account."
    22482 
    22483 #~ msgid "OSM username (email)"
    22484 #~ msgstr "OSM username (e-mail)"
    22485 
    22486 #~ msgid "Unknown host"
    22487 #~ msgstr "Unknown host"
    2248822794
    2248922795#~ msgid "Add either site-josm.xml or Wiki Pages."
    … …  
    2265222958#~ msgstr "No intersection found. Nothing was changed."
    2265322959
     22960#~ msgid "Solve Conflict"
     22961#~ msgstr "Solve Conflict"
     22962
    2265422963#~ msgid ""
    2265522964#~ "This action will require {0} individual download requests. Do you wish to "
    … …  
    2270323012#~ msgstr "Error processing changeset upload response"
    2270423013
    22705 #~ msgid "Not initialized"
    22706 #~ msgstr "Not initialized"
    22707 
    2270823014#~ msgid "Cannot read numeric value from response"
    2270923015#~ msgstr "Cannot read numeric value from response"
    … …  
    2271423020#~ msgid "Resolve conflicts in member list of of relation {0}"
    2271523021#~ msgstr "Resolve conflicts in member list of relation {0}"
     23022
     23023#~ msgid "WARNING: unexpected value for preference conflict.resolution, got "
     23024#~ msgstr "WARNING: unexpected value for preference conflict.resolution, got "
    2271623025
    2271723026#~ msgid ""
Note: See TracChangeset for help on using the changeset viewer.