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

updated

File:
1 edited

Legend:

Unmodified
Added
Removed

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

    r16009 r16179  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2009-06-19 21:52+0200\n"
     10"POT-Creation-Date: 2009-06-27 14:26+0200\n"
    1111"PO-Revision-Date: 2009-06-07 16:39+0000\n"
    1212"Last-Translator: Margus Värton <margus@dakar.ee>\n"
    … …  
    1616"Content-Transfer-Encoding: 8bit\n"
    1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
    18 "X-Launchpad-Export-Date: 2009-06-19 19:34+0000\n"
     18"X-Launchpad-Export-Date: 2009-06-27 12:18+0000\n"
    1919"X-Generator: Launchpad (build Unknown)\n"
    2020
    … …  
    2727#: ../core/src/org/openstreetmap/josm/Main.java:198
    2828#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
    29 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    30 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
     29#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
     30#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
    3131msgid "Help"
    3232msgstr "Abi"
    … …  
    3434#: ../core/src/org/openstreetmap/josm/Main.java:261
    3535msgid "The projection could not be read from preferences. Using Mercator"
    36 msgstr "Projektsioon ei olnud eelistustest loetav. Kasutan Mercatori."
     36msgstr ""
    3737
    3838#: ../core/src/org/openstreetmap/josm/Main.java:349
    … …  
    7070#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
    7171#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
    72 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341
    73 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
    74 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
    75 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
     72#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
     73#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
     74#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
    7675#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
    7776#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
    … …  
    7978#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
    8079#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
    81 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    82 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
     80#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
    8381#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
    8482#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
    … …  
    9896#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
    9997#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
    100 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
    101 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
    102 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     98#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
     99#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
     100#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    103101#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    104102msgid "Cancel"
    … …  
    203201msgid "File could not be found."
    204202msgstr "Faili ei leitud"
     203
     204#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
     205#, java-format
     206msgid ""
     207"WARNING: unexpected format of API base URL. Redirection to history page for "
     208"OSM primitive will probably fail. API base URL is: ''{0}''"
     209msgstr ""
     210
     211#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
     212#, fuzzy
     213msgid "Please select at least one already uploaded node, way, or relation."
     214msgstr "Palun vali vähemalt üks sõlm või tee."
     215
     216#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
     217#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
     218#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
     219#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
     220msgid "Warning"
     221msgstr ""
     222
     223#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
     224#, java-format
     225msgid ""
     226"WARNING: launching browser windows for the first {0} of {1} selected "
     227"primitives only"
     228msgstr ""
    205229
    206230#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
    … …  
    246270#: ../plugins/grid/src/grid/GridLayer.java:193
    247271#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
    248 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
     272#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
    249273msgid "Latitude"
    250274msgstr "Laiuskraad"
    … …  
    253277#: ../plugins/grid/src/grid/GridLayer.java:195
    254278#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
    255 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
     279#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
    256280msgid "Longitude"
    257281msgstr "Pikkuskraad"
    … …  
    288312#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
    289313#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
    290 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
    291 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
    292 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     314#: ../plugins/terracer/src/terracer/TerracerAction.java:72
     315#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
     316#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    293317#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
    294318#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
    … …  
    321345msgstr "Palun vali vähemalt kolm sõlme."
    322346
     347#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
     348#, java-format
     349msgid ""
     350"Current number of changes exceeds the max. number of changes, current is "
     351"{0}, max is {1}"
     352msgstr ""
     353
     354#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
     355#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
     356msgid "API Capabilities Violation"
     357msgstr ""
     358
     359#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
     360msgid "Failed to initialize API. Please try again later."
     361msgstr ""
     362
     363#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
     364msgid "API initialization failed"
     365msgstr ""
     366
     367#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
     368#, java-format
     369msgid ""
     370"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
     371"{1}"
     372msgstr ""
     373
     374#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
     375#, java-format
     376msgid ""
     377"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
     378"length {2}. Values length is {3}."
     379msgstr ""
     380
     381#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
     382#, fuzzy
     383msgid "Precondition Violation"
     384msgstr "Konfliktne relatsioon"
     385
     386#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
     387#, java-format
     388msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
     389msgstr ""
     390
    323391#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    324392msgid "data"
    … …  
    334402
    335403#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    336 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
     404#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    337405msgid "conflict"
    338406msgstr "konflikt"
    … …  
    415483#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
    416484#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:189
    417 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:124
    418 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
     485#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109
     486#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301
    419487msgid "Enter values for all conflicts."
    420488msgstr "Sisesta kõigi vastuolude kohta väärtused."
    … …  
    422490#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
    423491#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
    424 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
     492#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
    425493msgid "Solve Conflicts"
    426494msgstr "Lahenda vastuolud."
    … …  
    639707
    640708#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
    641 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556
     709#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
    642710#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
    643711#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
    644712#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:75
    645 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    646 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:559
    647 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:563
     713#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
     714#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
     715#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
    648716#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
    649717#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
    … …  
    673741#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
    674742#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
    675 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
     743#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
    676744#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
    677745#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
    … …  
    714782msgstr ""
    715783
    716 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
    717 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29
     784#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
     785#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
    718786msgid "History of Element"
    719787msgstr "Elemendi ajalugu."
    720788
    721 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27
    722 msgid "Display history information about OSM ways or nodes."
     789#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
     790#, fuzzy
     791msgid "Display history information about OSM ways, nodes, or relations."
    723792msgstr "Näita OSM sõlmede ja teede ajalugu."
    724793
    725 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:77
    726 msgid ""
    727 "Please select at least one node, way or relation. Only already uploaded "
    728 "elements have a history."
    729 msgstr ""
    730 "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles laetud "
    731 "elementidel on ajalugu."
     794#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
     795#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
     796#, fuzzy
     797msgid "Info about Element"
     798msgstr "Elemendi ajalugu."
     799
     800#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
     801#, fuzzy
     802msgid "Display object information about OSM nodes, ways, or relations."
     803msgstr "Näita OSM sõlmede ja teede ajalugu."
    732804
    733805#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
    … …  
    863935#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
    864936#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
    865 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54
    866937#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
    867938#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
    868939#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
    869 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
    870 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
    871940#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
    872941#, java-format
    … …  
    10541123
    10551124#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
    1056 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
     1125#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
    10571126msgid "Conflicts"
    10581127msgstr "Konfliktid"
    … …  
    12061275"middle of the way.)"
    12071276
    1208 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305
     1277#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
    12091278msgid ""
    12101279"A role based relation membership was copied to all new ways.\n"
    … …  
    12141283"Vaata need igaks juhuks üle."
    12151284
    1216 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310
     1285#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
     1286#, fuzzy
     1287msgid ""
     1288"A relation membership was copied to all new ways.\n"
     1289"You should verify this and correct it when necessary."
     1290msgstr ""
     1291"Rollipõhised seosed kopeeriti uutele teedele.\n"
     1292"Vaata need igaks juhuks üle."
     1293
     1294#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
    12171295#, java-format
    12181296msgid "Split way {0} into {1} parts"
    … …  
    13591437"laaditud?"
    13601438
    1361 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
    1362 msgid "Undeleting Way..."
    1363 msgstr ""
    1364 
    1365 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
    1366 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
    1367 msgid "Yes, undelete them too"
    1368 msgstr ""
    1369 
    1370 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
    1371 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
    1372 msgid "No, cancel operation"
    1373 msgstr ""
    1374 
    1375 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138
    1376 #, java-format
    1377 msgid ""
    1378 "<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
    1379 "the server.<br><br>Do you want to undelete these nodes too?</html>"
    1380 msgstr ""
    1381 
    1382 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
    1383 msgid "Undelete additional nodes?"
    1384 msgstr ""
    1385 
    1386 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
    1387 #, java-format
    1388 msgid "Checking whether node {0} is gone ..."
    1389 msgstr ""
    1390 
    1391 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
    1392 msgid "Undeleting relation..."
    1393 msgstr ""
    1394 
    1395 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252
    1396 #, java-format
    1397 msgid ""
    1398 "<html>There are {0} additional primitives referred to by relation {1}"
    1399 "<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
    1400 "</html>"
    1401 msgstr ""
    1402 
    1403 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
    1404 msgid "Undelete dependent primitives?"
    1405 msgstr ""
    1406 
    1407 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
    1408 #, java-format
    1409 msgid "Checking whether primitive {0} is gone ..."
    1410 msgstr ""
    1411 
    1412 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
    1413 msgid "Keep mine"
    1414 msgstr ""
    1415 
    1416 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
    1417 msgid "Delete mine"
    1418 msgstr ""
    1419 
    1420 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344
    1421 #, java-format
    1422 msgid ""
    1423 "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
    1424 "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
    1425 "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
    1426 "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
    1427 "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
    1428 msgstr ""
    1429 
    1430 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
    1431 msgid "Primitive deleted on the server"
    1432 msgstr ""
    1433 
    1434 #. should not happen
    1435 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370
    1436 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344
    1437 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383
    1438 #, java-format
    1439 msgid "unexpected return value. Got {0}"
    1440 msgstr ""
    1441 
    1442 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
     1439#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
    14431440msgid "Failed to update the selected primitives."
    14441441msgstr ""
    14451442
    1446 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
     1443#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
    14471444msgid "Update failed"
    14481445msgstr ""
    14491446
    1450 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
     1447#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
    14511448#, java-format
    14521449msgid "Could not find primitive with id {0} in the current dataset"
    14531450msgstr ""
    14541451
    1455 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
     1452#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
    14561453msgid "Missing primitive"
    14571454msgstr ""
    14581455
    1459 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
    1460 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
     1456#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
     1457#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
    14611458msgid "Update Selection"
    14621459msgstr ""
    14631460
    1464 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
     1461#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
    14651462msgid "Updates the currently selected primitives from the server"
    14661463msgstr ""
    14671464
    1468 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
     1465#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
    14691466msgid "There are no selected primitives to update."
    14701467msgstr ""
    14711468
    1472 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
     1469#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
    14731470msgid "Selection empty"
    1474 msgstr ""
    1475 
    1476 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471
    1477 #, java-format
    1478 msgid ""
    1479 "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
    1480 "update. Please reduce the selection<br>to max. {1} primitives.</html>"
    1481 msgstr ""
    1482 
    1483 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
    1484 msgid "Selection too big"
    14851471msgstr ""
    14861472
    … …  
    14941480msgstr "Lae kõik muudatused OSM serverisse üles."
    14951481
    1496 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
     1482#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
    14971483msgid "Objects to add:"
    14981484msgstr "Objektid lisada:"
    14991485
    1500 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
     1486#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
    15011487msgid "Objects to modify:"
    15021488msgstr "Objektid muuta:"
    15031489
    1504 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
     1490#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
    15051491msgid "Objects to delete:"
    15061492msgstr "Objektid kustutada:"
    15071493
    1508 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
     1494#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
    15091495msgid "Provide a brief comment for the changes you are uploading:"
    15101496msgstr "Esitada lühike kommentaar üleslaetavatele muutustele:"
    15111497
    1512 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
     1498#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
    15131499msgid "Upload these changes?"
    15141500msgstr "Kas laen need muudatused üles?"
    15151501
    1516 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
     1502#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
    15171503msgid "Upload Changes"
    15181504msgstr "Lae muudatused üles"
    15191505
    1520 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152
     1506#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
    15211507msgid "Nothing to upload. Get some data first."
    15221508msgstr "Midagi pole üles laadida. Hangi esmalt andmeid."
    15231509
    1524 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
     1510#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
    15251511msgid "There are unresolved conflicts. You have to resolve these first."
    15261512msgstr "Lahendamata konfliktid! Sa pead need enne lahendama."
    15271513
    1528 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
     1514#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    15291515msgid "No changes to upload."
    15301516msgstr "Pole muudatusi mida üles laadida."
    15311517
    1532 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
     1518#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
    15331519msgid "Uploading"
    15341520msgstr ""
    15351521
    1536 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
     1522#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
    15371523msgid "Updating primitive"
    15381524msgstr ""
    15391525
    1540 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
     1526#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
    15411527#, java-format
    15421528msgid "Synchronize {0} {1} only"
    15431529msgstr ""
    15441530
    1545 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
    1546 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
     1531#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
     1532#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
    15471533msgid "Synchronize entire dataset"
    15481534msgstr ""
    15491535
    1550 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
     1536#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
    15511537#, java-format
    15521538msgid ""
    … …  
    15601546msgstr ""
    15611547
    1562 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
    1563 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
     1548#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
     1549#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
    15641550msgid "Conflict detected"
    15651551msgstr ""
    15661552
    1567 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
     1553#. should not happen
     1554#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
     1555#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
     1556#, java-format
     1557msgid "unexpected return value. Got {0}"
     1558msgstr ""
     1559
     1560#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
    15681561#, java-format
    15691562msgid ""
    … …  
    15741567msgstr ""
    15751568
    1576 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
     1569#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
    15771570#, java-format
    15781571msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
    15791572msgstr ""
    15801573
    1581 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
     1574#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
    15821575#, java-format
    15831576msgid ""
    … …  
    15871580msgstr ""
    15881581
    1589 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
     1582#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
    15901583msgid "Precondition violation"
    15911584msgstr ""
    15921585
    1593 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452
     1586#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
    15941587#, java-format
    15951588msgid ""
    … …  
    15991592msgstr ""
    16001593
    1601 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
     1594#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
    16021595msgid "Primitive already deleted"
    16031596msgstr ""
    16041597
    1605 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484
    1606 #, java-format
    1607 msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
    1608 msgstr ""
    1609 
    1610 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539
     1598#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
     1599#, java-format
     1600msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
     1601msgstr ""
     1602
     1603#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
    16111604msgid "Upload to OSM API failed"
    16121605msgstr ""
    16131606
    1614 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
     1607#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
    16151608#, java-format
    16161609msgid ""
    … …  
    17321725msgstr "Openstreetmapi andmed"
    17331726
    1734 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
     1727#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
    17351728msgid "Data Layer"
    17361729msgstr "Andmekiht"
    17371730
    1738 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55
     1731#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
    17391732#, java-format
    17401733msgid "Download {0} of {1} ({2} left)"
    17411734msgstr "Laen alla {0} {1}-st ({2} veel)"
    17421735
     1736#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
     1737msgid "The following errors occurred during mass download:"
     1738msgstr ""
     1739
    17431740#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
    1744 msgid "The following errors occurred during mass download:"
    1745 msgstr ""
    1746 
    1747 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
    17481741msgid "Errors during Download"
    17491742msgstr "Viga allaladimise ajal"
    17501743
    1751 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135
     1744#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
    17521745#, java-format
    17531746msgid ""
    17541747"<html>There are {0} primitives in your local dataset which<br>might be "
    1755 "deleted on the server. If you later try to delete or<br>update them on the "
    1756 "server the server is likely to report a<br>conflict.<br><br>Click <strong>{1}"
    1757 "</strong> to check these primitives individually.<br>Click <strong>{2}</"
    1758 "strong> to ignore.<br></html>"
     1748"deleted on the server. If you later try to delete or<br>update them the "
     1749"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
     1750"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
     1751"</strong> to ignore.<br></html>"
    17591752msgstr ""
    17601753
    … …  
    18981891#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
    18991892#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
    1900 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
     1893#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
    19011894#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
    19021895#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
    … …  
    22432236msgstr ""
    22442237
    2245 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
    2246 #, java-format
    2247 msgid "Resolve {0} conflicts in {1} objects"
    2248 msgstr ""
    2249 
    22502238#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
    22512239#, java-format
    … …  
    22552243#. should not happen
    22562244#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
    2257 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
     2245#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
    22582246msgid "cannot resolve undecided conflict"
    22592247msgstr ""
    … …  
    23172305#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
    23182306#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
    2319 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
     2307#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
    23202308#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    23212309#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
    … …  
    23282316msgstr[1] "punktid"
    23292317
    2330 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157
     2318#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
    23312319msgid "Purging 1 primitive"
    23322320msgstr ""
    23332321
    23342322#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
     2323#, java-format
     2324msgid "removing reference from way {0}"
     2325msgstr ""
     2326
     2327#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
    23352328#, java-format
    23362329msgid ""
    … …  
    23392332msgstr ""
    23402333
     2334#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
     2335#, fuzzy, java-format
     2336msgid "removing reference from relation {0}"
     2337msgstr "eemalda valikust"
     2338
    23412339#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
    23422340#, java-format
    … …  
    23612359msgstr ""
    23622360
    2363 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
     2361#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
    23642362#, java-format
    23652363msgid "Undelete {0} primitives"
    23662364msgstr ""
    23672365
    2368 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
     2366#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
    23692367#, java-format
    23702368msgid "Resolve version conflicts for {0} {1}"
    … …  
    23802378msgstr ""
    23812379
    2382 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
     2380#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
    23832381msgid ""
    23842382"When reversing this way, the following changes to properties of the way and "
    … …  
    24672465msgstr ""
    24682466
    2469 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
    2470 msgid "different"
    2471 msgstr ""
    2472 
    2473 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
    2474 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
    2475 msgid "deleted"
    2476 msgstr ""
    2477 
    2478 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2479 msgid "true"
    2480 msgstr ""
    2481 
    2482 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2483 msgid "false"
    2484 msgstr ""
    2485 
    2486 #: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
    2487 msgid "position"
    2488 msgstr ""
    2489 
    24902467#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
    24912468msgid "Decimal Degrees"
    … …  
    25122489msgstr ""
    25132490
    2514 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
     2491#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
    25152492#, java-format
    25162493msgid "parameter {0} > 0 required. Got {1}."
    25172494msgstr ""
    25182495
    2519 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
    2520 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84
    2521 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
     2496#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
     2497#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
     2498#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
    25222499msgid "incomplete"
    25232500msgstr ""
    25242501
    2525 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2502#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25262503#, java-format
    25272504msgid "Error: {0}"
    25282505msgstr ""
    25292506
    2530 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2507#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25312508#, java-format
    25322509msgid "Warning: {0}"
    … …  
    25522529
    25532530#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    2554 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88
     2531#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99
    25552532#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
    25562533#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
    … …  
    25832560msgstr ""
    25842561
    2585 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
     2562#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
    25862563#, java-format
    25872564msgid "{0} member"
    … …  
    25902567msgstr[1] ""
    25912568
    2592 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
     2569#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
    25932570msgid "highway"
    25942571msgstr ""
    25952572
    2596 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
     2573#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
    25972574#: build/trans_presets.java:2994
    25982575msgid "railway"
    25992576msgstr ""
    26002577
    2601 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
     2578#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
    26022579msgid "waterway"
    26032580msgstr ""
    26042581
    2605 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124
     2582#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
    26062583msgid "landuse"
    26072584msgstr ""
    26082585
    2609 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
     2586#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143
    26102587#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
    26112588#, java-format
    … …  
    26582635#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
    26592636#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
     2637#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
     2638#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
     2639#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
    26602640#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
    26612641#, java-format
    … …  
    27992779msgstr ""
    28002780
     2781#. should not happen
     2782#.
     2783#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
     2784#, java-format
     2785msgid ""
     2786"My primitive with id {0} and version {1} is visible although their primitive "
     2787"with lower version {2} is not visible. Can't deal with this inconsistency. "
     2788"Keeping my primitive. "
     2789msgstr ""
     2790
    28012791#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
    28022792#, java-format
    … …  
    28172807
    28182808#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
    2819 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
     2809#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
    28202810#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
    28212811msgid "background"
    … …  
    28842874msgstr "Ei suutnud salvestada järjehoidjat"
    28852875
    2886 #. setting up the properties table
    2887 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2888 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
    2889 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
    2890 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2892 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2893 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
    2894 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
    2895 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
    2896 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
    2897 msgid "Key"
    2898 msgstr "Võti"
    2899 
    2900 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2901 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
    2902 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
    2903 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2904 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2905 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2906 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
    2907 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
    2908 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
    2909 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
    2910 msgid "Value"
    2911 msgstr "Väärtus"
    2912 
    2913 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
    2914 #, java-format
    2915 msgid "{0} object has conflicts:"
    2916 msgid_plural "{0} objects have conflicts:"
    2917 msgstr[0] ""
    2918 msgstr[1] ""
    2919 
    2920 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
    2921 msgid "my version:"
    2922 msgstr "minu versioon:"
    2923 
    2924 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
    2925 msgid "their version:"
    2926 msgstr "nende versioon:"
    2927 
    2928 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
    2929 msgid "resolved version:"
    2930 msgstr ""
    2931 
    29322876#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
    29332877msgid "Message of the day not available"
    … …  
    31063050msgstr ""
    31073051
    3108 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
     3052#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
    31093053msgid "File"
    31103054msgstr "Fail"
    31113055
    3112 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
     3056#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
    31133057msgid "View"
    31143058msgstr "Vaade"
    31153059
    3116 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
     3060#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
    31173061msgid "Tools"
    31183062msgstr "Tööriistad"
    31193063
    3120 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
     3064#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    31213065#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
    31223066msgid "Presets"
    31233067msgstr "Eelseaded"
    31243068
    3125 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
     3069#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
    31263070#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
    31273071#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
    … …  
    31343078
    31353079#. TODO move code to an "action" like the others?
    3136 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
     3080#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
    31373081msgid "Wireframe View"
    31383082msgstr "Joonvõrgu vaade"
    31393083
    3140 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
     3084#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
    31413085msgid "Toggle Wireframe view"
    31423086msgstr "Lülita joonvõrgu vaade"
    31433087
    3144 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
     3088#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
    31453089msgid "Full Screen"
    31463090msgstr ""
    31473091
    3148 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
     3092#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
    31493093msgid "Toggle Full Screen view"
    31503094msgstr ""
    31513095
    3152 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
     3096#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
    31533097msgid "Audio"
    31543098msgstr "Heli"
    … …  
    32843228msgstr ""
    32853229
    3286 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63
    3287 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124
     3230#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
     3231#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
    32883232msgid "Properties"
    32893233msgstr ""
    32903234
    3291 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68
    3292 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93
     3235#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
     3236#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
    32933237#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
    32943238#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
    … …  
    32963240msgstr ""
    32973241
    3298 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73
    3299 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163
     3242#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
     3243#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
    33003244msgid "Nodes"
    33013245msgstr ""
    33023246
    3303 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
    3304 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
     3247#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
     3248#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
    33053249#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
    33063250msgid "Members"
    33073251msgstr "Liikmed"
    33083252
    3309 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
     3253#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
    33103254msgid "No pending tag conflicts to be resolved"
    33113255msgstr ""
    33123256
    3313 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97
     3257#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
    33143258#, java-format
    33153259msgid "Tags({0} conflicts)"
    33163260msgstr ""
    33173261
    3318 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
     3262#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
    33193263#, java-format
    33203264msgid "{0} pending tag conflicts to be resolved"
    33213265msgstr ""
    33223266
    3323 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104
     3267#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
    33243268msgid "Nodes(resolved)"
    33253269msgstr ""
    33263270
    3327 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
     3271#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
    33283272msgid ""
    33293273"Merged node list frozen. No pending conflicts in the node list of this way"
    33303274msgstr ""
    33313275
    3332 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108
     3276#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
    33333277msgid "Nodes(with conflicts)"
    33343278msgstr ""
    33353279
    3336 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
     3280#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
    33373281msgid "Pending conflicts in the node list of this way"
    33383282msgstr ""
    33393283
    3340 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113
     3284#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
    33413285msgid "Members(resolved)"
    33423286msgstr ""
    33433287
    3344 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
     3288#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
    33453289msgid ""
    33463290"Merged member list frozen. No pending conflicts in the member list of this "
    … …  
    33483292msgstr ""
    33493293
    3350 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117
     3294#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
    33513295msgid "Members(with conflicts)"
    33523296msgstr ""
    33533297
    3354 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
     3298#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
    33553299msgid "Pending conflicts in the member list of this relation"
    33563300msgstr ""
    33573301
    3358 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
     3302#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
    33593303msgid "No pending property conflicts"
    33603304msgstr ""
    33613305
    3362 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128
     3306#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
    33633307msgid "Properties(with conflicts)"
    33643308msgstr ""
    33653309
    3366 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
     3310#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
    33673311msgid "Pending property conflicts to be resolved"
    33683312msgstr ""
    33693313
    3370 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
     3314#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
    33713315msgid "Conflict Resolution"
    33723316msgstr ""
    … …  
    34033347
    34043348#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
    3405 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75
     3349#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
    34063350msgid "My version"
    34073351msgstr ""
    … …  
    34123356
    34133357#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
    3414 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
     3358#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
    34153359#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
    34163360msgid "Merged version"
    … …  
    34243368
    34253369#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
    3426 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
     3370#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
    34273371msgid "Their version"
    34283372msgstr ""
    … …  
    36073551msgstr ""
    36083552
    3609 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76
     3553#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
     3554#, java-format
     3555msgid ""
     3556"<html>An error occurred while communicating with the server<br>Details: {0}</"
     3557"html>"
     3558msgstr ""
     3559
     3560#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
     3561msgid "Communication with server failed"
     3562msgstr ""
     3563
     3564#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
     3565#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
     3566msgid "Yes, undelete them too"
     3567msgstr ""
     3568
     3569#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
     3570#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
     3571msgid "No, cancel operation"
     3572msgstr ""
     3573
     3574#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
     3575#, java-format
     3576msgid ""
     3577"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
     3578"the server.<br><br>Do you want to undelete these nodes too?</html>"
     3579msgstr ""
     3580
     3581#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
     3582msgid "Undelete additional nodes?"
     3583msgstr ""
     3584
     3585#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
     3586#, java-format
     3587msgid ""
     3588"<html>There are {0} additional primitives referred to by relation {1}"
     3589"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
     3590"</html>"
     3591msgstr ""
     3592
     3593#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
     3594msgid "Undelete dependent primitives?"
     3595msgstr ""
     3596
     3597#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
    36103598msgid "Properties in my dataset, i.e. the local dataset"
    36113599msgstr ""
    36123600
    3613 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
     3601#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
    36143602msgid ""
    36153603"Properties in the merged element. They will replace properties in my "
    … …  
    36173605msgstr ""
    36183606
    3619 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
     3607#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
    36203608msgid "Properties in their dataset, i.e. the server dataset"
    36213609msgstr ""
    36223610
    3623 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101
     3611#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
    36243612msgid "Coordinates:"
    36253613msgstr ""
    36263614
    3627 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174
     3615#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
    36283616msgid "Deleted State:"
    36293617msgstr ""
    36303618
    3631 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248
    3632 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260
     3619#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
     3620msgid "Visible State:"
     3621msgstr ""
     3622
     3623#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
     3624#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
     3625#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3626#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
    36333627#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    36343628msgid "(none)"
    36353629msgstr ""
    36363630
    3637 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
     3631#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
     3632msgid "deleted"
     3633msgstr ""
     3634
     3635#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
    36383636msgid "not deleted"
    36393637msgstr ""
    36403638
    3641 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334
     3639#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
     3640msgid "visible (on the server)"
     3641msgstr ""
     3642
     3643#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
     3644msgid "not visible (on the server)"
     3645msgstr ""
     3646
     3647#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
     3648#, fuzzy
     3649msgid "Keep a clone of the local version"
     3650msgstr "Palun sisesta koha nimi."
     3651
     3652#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
     3653msgid "Physically delete from local dataset"
     3654msgstr ""
     3655
     3656#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
    36423657msgid "Keep my coordiates"
    36433658msgstr ""
    36443659
    3645 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349
     3660#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
    36463661msgid "Keep their coordiates"
    36473662msgstr ""
    36483663
    3649 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3664#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
    36503665msgid "Undecide conflict between different coordinates"
    36513666msgstr ""
    36523667
    3653 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379
     3668#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
    36543669msgid "Keep my deleted state"
    36553670msgstr ""
    36563671
    3657 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394
     3672#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
    36583673msgid "Keep their deleted state"
    36593674msgstr ""
    36603675
    3661 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409
     3676#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
    36623677msgid "Undecide conflict between deleted state"
     3678msgstr ""
     3679
     3680#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
     3681msgid "Keep my visible state"
     3682msgstr ""
     3683
     3684#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
     3685msgid "Yes, reset the id"
     3686msgstr ""
     3687
     3688#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
     3689#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
     3690#, fuzzy
     3691msgid "No, abort"
     3692msgstr "Ei ole shortcuti."
     3693
     3694#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
     3695#, java-format
     3696msgid ""
     3697"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
     3698"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
     3699"agree?</html>"
     3700msgstr ""
     3701
     3702#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
     3703msgid "Reset id to 0"
     3704msgstr ""
     3705
     3706#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
     3707msgid "Keep their visible state"
     3708msgstr ""
     3709
     3710#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
     3711msgid "Yes, purge it"
     3712msgstr ""
     3713
     3714#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
     3715#, java-format
     3716msgid ""
     3717"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
     3718"dataset.<br>Do you agree?</html>"
     3719msgstr ""
     3720
     3721#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
     3722#, fuzzy
     3723msgid "Remove from dataset"
     3724msgstr "eemalda valikust"
     3725
     3726#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
     3727msgid "Undecide conflict between visible state"
    36633728msgstr ""
    36643729
    … …  
    37033768msgstr ""
    37043769
     3770#. setting up the properties table
     3771#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
     3772#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
     3773#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3774#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3775#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3776#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
     3777#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
     3778#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
     3779#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
     3780msgid "Key"
     3781msgstr "Võti"
     3782
     3783#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
     3784#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
     3785#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3786#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3787#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3788#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     3789#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
     3790#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
     3791#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
     3792msgid "Value"
     3793msgstr "Väärtus"
     3794
    37053795#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
    37063796msgid "cannot apply undecided tag merge item"
    … …  
    37593849
    37603850#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
    3761 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3851#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    37623852#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
    37633853#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
    … …  
    37813871msgstr "Käsujada: {0}"
    37823872
    3783 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
     3873#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
    37843874#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
    37853875#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
    … …  
    37893879"Pane valitud elemendid kaardil ülal asuvasse valitud objektide nimekirja."
    37903880
    3791 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
     3881#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
    37923882msgid "Resolve"
    37933883msgstr "Lahenda"
    37943884
    3795 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
     3885#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
    37963886msgid "Open a merge dialog of all selected items in the list above."
    37973887msgstr "Ava ülalolevast nimekirjast valitud kõigi objektide ühendamisdialoog."
    37983888
    3799 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
    3800 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3889#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
     3890#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    38013891msgid "Conflict"
    38023892msgstr "Vastuolu"
    38033893
    3804 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
     3894#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
    38053895msgid "Merging conflicts."
    38063896msgstr "Ühendan vastuolusid."
    38073897
    3808 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
    3809 msgid "WARNING: unexpected value for preference conflict.resolution, got "
    3810 msgstr ""
    3811 
    3812 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
    3813 msgid "Resolve Conflicts"
    3814 msgstr "Lahenda konfliktid"
    3815 
    3816 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    3817 msgid "Solve Conflict"
    3818 msgstr ""
    3819 
    3820 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
     3898#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
    38213899#, java-format
    38223900msgid "Conflicts: {0}"
    38233901msgstr "Konfliktid: {0}"
    38243902
    3825 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
     3903#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
    38263904msgid "Resolve conflicts"
    38273905msgstr ""
    38283906
    3829 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150
     3907#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
    38303908msgid "Cancel conflict resolution and close the dialog"
    38313909msgstr ""
    38323910
    3833 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164
     3911#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
    38343912msgid "Apply resolved conflicts and close the dialog"
    38353913msgstr ""
    38363914
    3837 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
     3915#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
    38383916msgid "Apply Resolution"
    38393917msgstr ""
    38403918
    3841 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173
     3919#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
    38423920msgid "Apply partial resolutions"
    38433921msgstr ""
    38443922
    3845 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
     3923#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
    38463924msgid "Continue resolving"
    38473925msgstr ""
    38483926
    3849 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176
     3927#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
    38503928#, java-format
    38513929msgid ""
    … …  
    38543932"remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
    38553933"resolving conflicts.</html>"
    3856 msgstr ""
    3857 
    3858 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182
    3859 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
    3860 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
    3861 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
    3862 msgid "Warning"
    38633934msgstr ""
    38643935
    … …  
    42864357#. item "Amenities/Toilets" combo "Fee"
    42874358#. item "Health/Pharmacy" combo "Dispensing"
    4288 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4359#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    42894360#: build/trans_presets.java:312 build/trans_presets.java:313
    42904361#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    43094380msgstr ""
    43104381
    4311 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4382#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    43124383#: build/trans_presets.java:312 build/trans_presets.java:313
    43134384#: build/trans_presets.java:314 build/trans_presets.java:315
    … …  
    43344405msgstr ""
    43354406
    4336 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423
     4407#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
    43374408#, java-format
    43384409msgid "Members: {0}"
    43394410msgstr "Liikmed: {0}"
    43404411
    4341 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431
     4412#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
    43424413#, java-format
    43434414msgid "Relation Editor: {0}"
    43444415msgstr ""
    43454416
    4346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545
     4417#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
    43474418msgid "There were conflicts during import."
    43484419msgstr "Importimisel tekkisid konfliktid."
    43494420
    4350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
     4421#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
    43514422msgid "Error parsing server response."
    43524423msgstr "Viga serveri vastuse töötlemisel."
    43534424
    4354 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558
     4425#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    43554426msgid "Cannot connect to server."
    43564427msgstr "Ei saa serveriga ühenduda."
    43574428
    4358 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
     4429#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
    43594430msgid "Error when communicating with server."
    43604431msgstr ""
    … …  
    45344605msgstr "suurendus"
    45354606
    4536 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
     4607#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
    45374608msgid "Slippy map"
    45384609msgstr ""
    … …  
    45594630msgstr "Pildi numbrid"
    45604631
    4561 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
     4632#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
    45624633#, java-format
    45634634msgid "Images for {0}"
    45644635msgstr ""
    45654636
    4566 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103
     4637#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
    45674638msgid "Read GPX..."
    45684639msgstr ""
    45694640
    4570 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112
     4641#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
    45714642#, java-format
    45724643msgid "No time for point {0} x {1}"
    45734644msgstr ""
    45744645
    4575 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117
     4646#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
    45764647#, java-format
    45774648msgid "Cannot read time \"{0}\" from point {1} x {2}"
    45784649msgstr ""
    45794650
    4580 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
     4651#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
    45814652msgid "No images with readable timestamps found."
    45824653msgstr ""
    45834654
    4584 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136
     4655#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
    45854656#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
    45864657#, java-format
    … …  
    45884659msgstr ""
    45894660
    4590 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203
     4661#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
    45914662#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
    45924663msgid "Geotagged Images"
    45934664msgstr ""
    45944665
    4595 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255
    4596 #, java-format
    4597 msgid "Image with path {0} does not exist or is not readable."
    4598 msgstr ""
    4599 
    4600 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363
     4666#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
    46014667#, java-format
    46024668msgid "GPS start: {0}"
    46034669msgstr ""
    46044670
    4605 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364
     4671#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
    46064672#, java-format
    46074673msgid "GPS end: {0}"
    46084674msgstr ""
    46094675
    4610 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366
     4676#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
    46114677#, java-format
    46124678msgid "current delta: {0}s"
    46134679msgstr ""
    46144680
    4615 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367
     4681#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
    46164682msgid "timezone difference: "
    46174683msgstr ""
    46184684
    4619 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4685#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    46204686#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
    46214687msgid "image"
    … …  
    46244690msgstr[1] "pildid"
    46254691
    4626 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4692#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    46274693#, java-format
    46284694msgid "{0} within the track."
    46294695msgstr ""
    46304696
    4631 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
     4697#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
    46324698msgid "Sync clock"
    46334699msgstr "Sünkroniseeri kell"
    46344700
    4635 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
     4701#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
    46364702#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
    46374703#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
    … …  
    46394705msgstr ""
    46404706
    4641 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489
     4707#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
    46424708#, java-format
    46434709msgid "The date in file \"{0}\" could not be parsed."
    46444710msgstr ""
    46454711
    4646 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493
     4712#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
    46474713#, java-format
    46484714msgid "There is no EXIF time within the file \"{0}\"."
    46494715msgstr ""
    46504716
    4651 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497
     4717#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
    46524718msgid "Image"
    46534719msgstr "Pilt"
    46544720
    4655 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499
     4721#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
    46564722msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    46574723msgstr ""
    46584724
    4659 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
     4725#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
    46604726msgid "GPS unit timezone (difference to photo)"
    46614727msgstr ""
    46624728
    4663 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510
     4729#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
    46644730msgid "Synchronize Time with GPS Unit"
    46654731msgstr ""
    46664732
    4667 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526
    4668 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528
     4733#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
     4734#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
    46694735msgid "Time entered could not be parsed."
    46704736msgstr ""
    … …  
    48164882
    48174883#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
    4818 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
     4884#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
    48194885#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
    48204886#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
    … …  
    48804946msgstr ""
    48814947
    4882 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
     4948#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
    48834949msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    48844950msgstr ""
    48854951
    4886 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
     4952#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
    48874953#, java-format
    48884954msgid "There were {0} conflicts during import."
    48894955msgstr ""
    48904956
    4891 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
     4957#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
    48924958#, java-format
    48934959msgid "{0} consists of:"
    48944960msgstr ""
    48954961
    4896 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392
     4962#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
    48974963#, java-format
    48984964msgid " ({0} deleted.)"
    48994965msgstr " ({0} kustutatud.)"
    49004966
    4901 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     4967#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    49024968msgid "unset"
    49034969msgstr ""
    49044970
    4905 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     4971#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    49064972#, java-format
    49074973msgid "API version: {0}"
    49084974msgstr ""
    49094975
    4910 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
     4976#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
    49114977#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
    49124978msgid "Convert to GPX layer"
    … …  
    61096175
    61106176#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
    6111 #: ../plugins/terracer/src/terracer/TerracerAction.java:422
    6112 #: ../plugins/terracer/src/terracer/TerracerAction.java:440
    6113 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
     6177#: ../plugins/terracer/src/terracer/TerracerAction.java:412
     6178#: ../plugins/terracer/src/terracer/TerracerAction.java:430
     6179#: ../plugins/terracer/src/terracer/TerracerAction.java:494
    61146180msgid "All"
    61156181msgstr ""
    … …  
    68166882
    68176883#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
    6818 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
     6884#: ../plugins/terracer/src/terracer/TerracerAction.java:98
    68196885#, java-format
    68206886msgid "Change {0} object"
    … …  
    68246890
    68256891#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
    6826 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
     6892#: ../plugins/terracer/src/terracer/TerracerAction.java:100
    68276893msgid "Nothing selected!"
    68286894msgstr "Midagi pole valitud!"
    … …  
    68586924
    68596925#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
     6926#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
     6927#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
    68606928#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
    68616929#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
    … …  
    68736941msgstr "Valmistan andmeid ette..."
    68746942
    6875 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21
     6943#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
    68766944msgid "GPX Files"
    68776945msgstr "GPX failid"
    68786946
    6879 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48
     6947#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
    68806948#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
     6949#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
    68816950#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
    68826951#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
    … …  
    68846953msgid "Markers from {0}"
    68856954msgstr "Markerid {0}"
     6955
     6956#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
     6957#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
     6958#, fuzzy, java-format
     6959msgid "File \"{0}\" does not exist"
     6960msgstr "Fail {0} on juba olemas. Kas kirjutan üle?"
     6961
     6962#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
     6963#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
     6964#, java-format
     6965msgid "Parsing file \"{0}\" failed"
     6966msgstr ""
    68866967
    68876968#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
    … …  
    68896970msgstr "Parse error: vigane gpx dokumendi struktuur"
    68906971
     6972#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
     6973#, java-format
     6974msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
     6975msgstr ""
     6976
     6977#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
     6978#, java-format
     6979msgid "Server replied with response code 404 for id {0}. Skipping."
     6980msgstr ""
     6981
     6982#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
     6983msgid ""
     6984"Server replied with response code 404, retrying with an individual request "
     6985"for each primitive"
     6986msgstr ""
     6987
    68916988#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
    68926989msgid "NMEA-0183 Files"
    … …  
    68946991
    68956992#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
     6993#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
    68966994msgid "Coordinates imported: "
    68976995msgstr "Koordinaadid imporditud: "
    … …  
    69627060msgstr "Sulgen muutustekogumit..."
    69637061
    6964 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
     7062#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
    69657063msgid "No changeset present for diff upload"
    69667064msgstr ""
    69677065
    6968 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
     7066#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
    69697067msgid "Preparing..."
    69707068msgstr "Ettevalmistus..."
    69717069
    6972 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
     7070#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
    69737071msgid "Uploading..."
    69747072msgstr "Üleslaadimine..."
    … …  
    70637161msgstr "OSM serveri failid"
    70647162
    7065 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
     7163#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
    70667164msgid "Unknown version"
    70677165msgstr "Tundmatu versioon"
    70687166
    7069 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
     7167#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
    70707168msgid "Version number missing from OSM data"
    70717169msgstr ""
    70727170
    7073 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
     7171#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
    70747172#, java-format
    70757173msgid "Unknown version: {0}"
    70767174msgstr ""
    70777175
    7078 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
     7176#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
    70797177msgid "Found <nd> element in non-way."
    70807178msgstr "Leidsin <nd> elemendi mitte-tees."
    70817179
    7082 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
     7180#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
    70837181msgid "<nd> has zero ref"
    70847182msgstr "<nd> ei oma ref"
    70857183
    7086 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214
     7184#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
    70877185msgid "Found <member> element in non-relation."
    70887186msgstr "Leidub <member> element, mis ei ole seotud"
    70897187
    7090 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219
     7188#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
    70917189#, java-format
    70927190msgid "Missing attribute \"ref\" on member in relation {0}"
    70937191msgstr ""
    70947192
    7095 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
     7193#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
    70967194#, java-format
    70977195msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
    70987196msgstr ""
    70997197
    7100 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
     7198#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    71017199#, java-format
    71027200msgid "Missing attribute \"type\" on member {0} in relation {1}"
    71037201msgstr ""
    71047202
    7105 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
     7203#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
    71067204#, java-format
    71077205msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
    71087206msgstr ""
    71097207
    7110 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
     7208#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
    71117209msgid "Incomplete <member> specification with ref=0"
    71127210msgstr "Puudulik <member> määratlus ref=0"
    71137211
    7114 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     7212#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
    71157213msgid "Illegal object with id=0"
    71167214msgstr "Illegaalne objekt numbriga id=0"
    71177215
    7118 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
     7216#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
    71197217#, java-format
    71207218msgid ""
    … …  
    71227220msgstr ""
    71237221
    7124 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
     7222#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
    71257223#, java-format
    71267224msgid "Missing attribute \"version\" on OSM primitive with id {0}"
    71277225msgstr ""
    71287226
    7129 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329
     7227#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
    71307228#, java-format
    71317229msgid "Missing required attribute \"{0}\"."
    71327230msgstr "Puudub vajalik atribuut \"{0}\"."
    71337231
    7134 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
     7232#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
    71357233#, java-format
    71367234msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
    71377235msgstr "Jätan tee vahele kuna see sisaldab mitte eksisteerivat : {0}\n"
    71387236
    7139 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485
     7237#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
    71407238msgid "Prepare OSM data..."
    71417239msgstr "Valmistan ette OSM andmeid..."
    71427240
    7143 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
     7241#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
    71447242msgid "Ill-formed node id"
    71457243msgstr ""
    … …  
    71687266msgstr "Ei saanud ühendust osm serveriga. Kontrollige oma interneti-ühendust."
    71697267
    7170 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
     7268#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
    71717269#, java-format
    71727270msgid ""
    … …  
    71757273msgstr ""
    71767274
    7177 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134
     7275#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
    71787276#, java-format
    71797277msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
    … …  
    74137511msgstr ""
    74147512
    7415 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300
     7513#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
    74167514msgid "This is after the end of the recording"
    74177515msgstr "See jääb peale lindistuse lõppu"
    74187516
    7419 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
     7517#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
    74207518msgid "Error playing sound"
    74217519msgstr "Viga heili esitamisel"
    … …  
    83698467msgstr ""
    83708468
     8469#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
     8470msgid "TangoGPS Files (*.log)"
     8471msgstr ""
     8472
     8473#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
     8474#, fuzzy
     8475msgid "Format errors: "
     8476msgstr "Kontrollsumma vead: "
     8477
     8478#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
     8479#, fuzzy
     8480msgid "TangoGPS import success"
     8481msgstr "NMEA import oli edukas."
     8482
     8483#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
     8484#, fuzzy
     8485msgid "TangoGPS import faliure!"
     8486msgstr "NMEA impordi viga!"
     8487
    83718488#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
    83728489#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
    … …  
    90869203msgstr ""
    90879204
     9205#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
     9206msgid ""
     9207"<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
     9208"new server is available at schokokeks.org.<br>Do you want to switch to the "
     9209"new server? (Strongly recommended)</html>"
     9210msgstr ""
     9211
     9212#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
     9213msgid "Switch to new openstreetbugs server?"
     9214msgstr ""
     9215
    90889216#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
    90899217msgid ""
    … …  
    91839311msgstr "Tundmatu faililaiend: {0}"
    91849312
    9185 #: ../plugins/osmarender/src/OsmarenderPlugin.java:41
     9313#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
    91869314msgid "Osmarender"
    91879315msgstr ""
    91889316
    9189 #: ../plugins/osmarender/src/OsmarenderPlugin.java:96
     9317#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
    91909318msgid ""
    91919319"Firefox not found. Please set firefox executable in the Map Settings page of "
    … …  
    91939321msgstr ""
    91949322
    9195 #: ../plugins/osmarender/src/OsmarenderPlugin.java:127
     9323#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
    91969324msgid "osmarender options"
    91979325msgstr ""
    91989326
    9199 #: ../plugins/osmarender/src/OsmarenderPlugin.java:128
     9327#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
    92009328msgid "Firefox executable"
    92019329msgstr ""
    … …  
    93399467msgstr ""
    93409468
    9341 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
     9469#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69
    93429470msgid "Slippy Map"
    93439471msgstr ""
    93449472
    9345 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
     9473#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75
    93469474msgid "Load Tile"
    93479475msgstr ""
    93489476
    9349 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
     9477#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86
    93509478msgid "Show Tile Status"
    93519479msgstr ""
    93529480
    9353 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
     9481#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97
    93549482msgid "Request Update"
    93559483msgstr ""
    93569484
    9357 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
     9485#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108
    93589486msgid "Load All Tiles"
    93599487msgstr ""
    93609488
    9361 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
     9489#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118
    93629490msgid "Increase zoom"
    93639491msgstr ""
    93649492
    9365 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
     9493#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127
    93669494msgid "Decrease zoom"
    93679495msgstr ""
    93689496
    9369 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
     9497#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
     9498msgid "Flush Tile Cache"
     9499msgstr ""
     9500
     9501#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
    93709502msgid "image not loaded"
    93719503msgstr ""
     9504
     9505#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
     9506#, fuzzy
     9507msgid "image loading..."
     9508msgstr "Üleslaadimine..."
    93729509
    93739510#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
    … …  
    94089545msgstr ""
    94099546
    9410 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
     9547#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123
    94119548msgid "error loading metadata"
    94129549msgstr ""
    94139550
    9414 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
     9551#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138
    94159552#, java-format
    94169553msgid "requested: {0}"
    94179554msgstr ""
    94189555
    9419 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
     9556#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142
    94209557msgid "error requesting update"
    94219558msgstr ""
    … …  
    95829719msgstr ""
    95839720
    9584 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
    9585 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
     9721#: ../plugins/terracer/src/terracer/TerracerAction.java:68
     9722#: ../plugins/terracer/src/terracer/TerracerAction.java:72
    95869723msgid "Terrace a building"
    95879724msgstr ""
    95889725
    9589 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
     9726#: ../plugins/terracer/src/terracer/TerracerAction.java:70
    95909727msgid "Creates individual buildings from a long building."
    95919728msgstr ""
    95929729
    9593 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
     9730#: ../plugins/terracer/src/terracer/TerracerAction.java:130
    95949731msgid "Select a single, closed way of at least four nodes."
    95959732msgstr ""
    95969733
    9597 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
     9734#: ../plugins/terracer/src/terracer/TerracerAction.java:199
    95989735msgid "Terrace"
    95999736msgstr ""
    96009737
    9601 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
    9602 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
     9738#: ../plugins/terracer/src/terracer/TerracerAction.java:413
     9739#: ../plugins/terracer/src/terracer/TerracerAction.java:437
    96039740msgid "Even"
    96049741msgstr ""
    96059742
    9606 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
     9743#: ../plugins/terracer/src/terracer/TerracerAction.java:414
    96079744msgid "Odd"
    96089745msgstr ""
    96099746
    9610 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
     9747#: ../plugins/terracer/src/terracer/TerracerAction.java:472
    96119748msgid "Highest number"
    96129749msgstr ""
    96139750
    9614 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
     9751#: ../plugins/terracer/src/terracer/TerracerAction.java:473
    96159752msgid "Lowest number"
    96169753msgstr ""
    96179754
    9618 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
     9755#: ../plugins/terracer/src/terracer/TerracerAction.java:474
    96199756msgid "Interpolation"
    96209757msgstr ""
    96219758
    96229759#. item "Buildings/Addresses" text "House name"
    9623 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     9760#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    96249761#: build/trans_presets.java:2173
    96259762msgid "Street name"
    96269763msgstr ""
    96279764
    9628 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     9765#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    96299766msgid "Optional"
    96309767msgstr ""
    … …  
    96679804msgstr ""
    96689805
    9669 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     9806#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    96709807msgid "Join overlapping Areas"
    96719808msgstr "Kattuvate alade ühendamine"
    96729809
    9673 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     9810#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    96749811msgid "Joins areas that overlap each other"
    96759812msgstr "Ühendab üksteist katvad alad"
    96769813
    9677 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
     9814#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
    96789815msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
    96799816msgstr ""
    96809817
    9681 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
     9818#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
    96829819msgid "Continue anyway"
    96839820msgstr ""
    96849821
    9685 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
     9822#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
    96869823msgid "Only up to two areas can be joined at the moment."
    96879824msgstr "Praegu saab ühendada ainult kuni kaks ala."
    96889825
    9689 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
     9826#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
    96909827#, java-format
    96919828msgid "\"{0}\" is not closed and therefore can't be joined."
    96929829msgstr ""
    96939830
    9694 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
     9831#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
    96959832#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
    96969833msgid ""
    … …  
    97009837msgstr ""
    97019838
    9702 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
     9839#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
    97039840#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
    97049841msgid "Please abort if you are not sure"
    97059842msgstr ""
    97069843
    9707 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
     9844#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
    97089845msgid "Please select at least one closed way the should be joined."
    97099846msgstr ""
    97109847
    9711 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
     9848#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
    97129849msgid "No intersection found. Nothing was changed."
    97139850msgstr ""
    97149851
    9715 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
     9852#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
    97169853msgid "Added node on all intersections"
    97179854msgstr ""
    97189855
     9856#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
     9857msgid "Delete Ways that are not part of an inner multipolygon"
     9858msgstr ""
     9859
     9860#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
     9861msgid "Fix relations"
     9862msgstr ""
     9863
     9864#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
     9865msgid "Joined self-overlapping area"
     9866msgstr ""
     9867
     9868#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
     9869msgid "Joined overlapping areas"
     9870msgstr ""
     9871
    97199872#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
    9720 msgid "Delete Ways that are not part of an inner multipolygon"
    9721 msgstr ""
    9722 
    9723 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
    9724 msgid "Fix relations"
    9725 msgstr ""
    9726 
    9727 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
    9728 msgid "Joined self-overlapping area"
    9729 msgstr ""
    9730 
    9731 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
    9732 msgid "Joined overlapping areas"
    9733 msgstr ""
    9734 
    9735 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
    97369873msgid ""
    97379874"Some of the ways were part of relations that have been modified. Please "
    … …  
    97399876msgstr ""
    97409877
    9741 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
     9878#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
    97429879msgid "Fix tag conflicts"
    97439880msgstr ""
    97449881
    9745 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
     9882#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
    97469883msgid "Removed Element from Relations"
    97479884msgstr ""
    97489885
     9886#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
     9887msgid "Join Areas: Remove Short Ways"
     9888msgstr ""
     9889
    97499890#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
    9750 msgid "Join Areas: Remove Short Ways"
    9751 msgstr ""
    9752 
    9753 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
    97549891msgid "Closed Way"
    97559892msgstr ""
    97569893
    9757 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
     9894#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
    97589895msgid "Remove tags from inner ways"
    97599896msgstr ""
    97609897
    9761 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
     9898#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
    97629899msgid "Join Areas Function"
    97639900msgstr ""
    97649901
    9765 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     9902#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    97669903msgid "Jump To Position"
    97679904msgstr ""
    97689905
    9769 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     9906#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    97709907msgid "Opens a dialog that allows to jump to a specific location"
    97719908msgstr ""
    97729909
    9773 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
     9910#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
    97749911msgid "Enter Lat/Lon to jump to position."
    97759912msgstr ""
    97769913
    9777 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
     9914#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
    97789915msgid "You can also paste an URL from www.openstreetmap.org"
    97799916msgstr ""
    97809917
    9781 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
     9918#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
    97829919msgid "Zoom (in metres)"
    97839920msgstr ""
    97849921
     9922#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
     9923msgid "URL"
     9924msgstr ""
     9925
     9926#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
     9927msgid "Jump there"
     9928msgstr ""
     9929
    97859930#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
    9786 msgid "URL"
    9787 msgstr ""
    9788 
    9789 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
    9790 msgid "Jump there"
    9791 msgstr ""
    9792 
    9793 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
    97949931msgid "Jump to Position"
    97959932msgstr ""
    97969933
    9797 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     9934#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    97989935msgid "Could not parse Latitude, Longitude or Zoom. Please check."
    97999936msgstr ""
    98009937
    9801 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     9938#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    98029939msgid "Unable to parse Lon/Lat"
    98039940msgstr ""
    … …  
    1083610973msgstr ""
    1083710974
     10975#. Plugin dataimport
     10976#: build/trans_plugins.java:13
     10977msgid "Allows to import various file formats into JOSM directly."
     10978msgstr ""
     10979
    1083810980#. Plugin DirectUpload
    10839 #: build/trans_plugins.java:13
     10981#: build/trans_plugins.java:15
    1084010982msgid ""
    1084110983"This plugin directly upload GPS Traces from current active layer in JOSM to "
    … …  
    1084410986
    1084510987#. Plugin Duplicate-Way
    10846 #: build/trans_plugins.java:15
     10988#: build/trans_plugins.java:17
    1084710989msgid "Duplicate Ways with an offset"
    1084810990msgstr ""
    1084910991
    1085010992#. Plugin editgpx
    10851 #: build/trans_plugins.java:17
     10993#: build/trans_plugins.java:19
    1085210994msgid ""
    1085310995"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
    … …  
    1085610998
    1085710999#. Plugin globalsat
    10858 #: build/trans_plugins.java:19
     11000#: build/trans_plugins.java:21
    1085911001msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
    1086011002msgstr ""
    1086111003
    1086211004#. Plugin grid
    10863 #: build/trans_plugins.java:21
     11005#: build/trans_plugins.java:23
    1086411006msgid "Provide a background layer that displays a map grid"
    1086511007msgstr ""
    1086611008
    1086711009#. Plugin ImageWayPoint
    10868 #: build/trans_plugins.java:23
     11010#: build/trans_plugins.java:25
    1086911011msgid ""
    1087011012"Another plugin to match images to the waypoints in a GPX file. A match is "
    … …  
    1087411016
    1087511017#. Plugin lakewalker
    10876 #: build/trans_plugins.java:25
     11018#: build/trans_plugins.java:27
    1087711019msgid "Helps vectorizing WMS images."
    1087811020msgstr ""
    1087911021
    1088011022#. Plugin livegps
    10881 #: build/trans_plugins.java:27
     11023#: build/trans_plugins.java:29
    1088211024msgid ""
    1088311025"Support live GPS input (moving dot) through a connection to gpsd server."
    … …  
    1088511027
    1088611028#. Plugin measurement
    10887 #: build/trans_plugins.java:29
     11029#: build/trans_plugins.java:31
    1088811030msgid ""
    1088911031"Provide a measurement dialog and a layer to measure length and angle of "
    … …  
    1089311035
    1089411036#. Plugin nearclick
    10895 #: build/trans_plugins.java:31
     11037#: build/trans_plugins.java:33
    1089611038msgid ""
    1089711039"Simulates a click when you do a small and short drag. This is usefull for "
    … …  
    1090111043
    1090211044#. Plugin openlayers
    10903 #: build/trans_plugins.java:33
     11045#: build/trans_plugins.java:35
    1090411046msgid "Displays an OpenLayers background image"
    1090511047msgstr ""
    1090611048
    1090711049#. Plugin openstreetbugs
    10908 #: build/trans_plugins.java:35
     11050#: build/trans_plugins.java:37
    1090911051msgid "Imports issues from OpenStreetBugs"
    1091011052msgstr ""
    1091111053
    1091211054#. Plugin openvisible
    10913 #: build/trans_plugins.java:37
     11055#: build/trans_plugins.java:39
    1091411056msgid ""
    1091511057"Allows opening gpx/osm files that intersect the currently visible screen area"
    … …  
    1091711059
    1091811060#. Plugin osmarender
    10919 #: build/trans_plugins.java:39
     11061#: build/trans_plugins.java:41
    1092011062msgid ""
    1092111063"Launches FireFox to display the current visible screen as a nice SVG image."
    … …  
    1092311065
    1092411066#. Plugin PicLayer
    10925 #: build/trans_plugins.java:41
     11067#: build/trans_plugins.java:43
    1092611068msgid ""
    1092711069"This plugin allows to display any picture as a background in the editor and "
    … …  
    1093011072
    1093111073#. Plugin plastic_laf
    10932 #: build/trans_plugins.java:43
     11074#: build/trans_plugins.java:45
    1093311075msgid "The great JGoodies Plastic Look and Feel."
    1093411076msgstr ""
    1093511077
    1093611078#. Plugin remotecontrol
    10937 #: build/trans_plugins.java:45
     11079#: build/trans_plugins.java:47
    1093811080msgid "Let other applications send commands to JOSM."
    1093911081msgstr ""
    1094011082
    1094111083#. Plugin routing
    10942 #: build/trans_plugins.java:47
     11084#: build/trans_plugins.java:49
    1094311085msgid "Provides routing capabilities."
    1094411086msgstr ""
    1094511087
    1094611088#. Plugin slippymap
    10947 #: build/trans_plugins.java:49
     11089#: build/trans_plugins.java:51
    1094811090msgid ""
    1094911091"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
    … …  
    1095211094
    1095311095#. Plugin surveyor
    10954 #: build/trans_plugins.java:51
     11096#: build/trans_plugins.java:53
    1095511097msgid "Allow adding markers/nodes on current gps positions."
    1095611098msgstr ""
    1095711099
    1095811100#. Plugin tageditor
    10959 #: build/trans_plugins.java:53
     11101#: build/trans_plugins.java:55
    1096011102msgid "Provides a dialog for editing tags in a tabular grid."
    1096111103msgstr ""
    1096211104
    1096311105#. Plugin tagging-preset-tester
    10964 #: build/trans_plugins.java:55
     11106#: build/trans_plugins.java:57
    1096511107msgid ""
    1096611108"Adds a tagging preset tester to the help menu, which helps you developing of "
    … …  
    1097011112
    1097111113#. Plugin tcx-support
    10972 #: build/trans_plugins.java:57
     11114#: build/trans_plugins.java:59
    1097311115msgid "Directly load TCX files from JOSM."
    1097411116msgstr ""
    1097511117
    1097611118#. Plugin terracer
    10977 #: build/trans_plugins.java:59
     11119#: build/trans_plugins.java:61
    1097811120msgid "Make terraced houses out of single blocks."
    1097911121msgstr ""
    1098011122
    1098111123#. Plugin usertools
    10982 #: build/trans_plugins.java:61
     11124#: build/trans_plugins.java:63
    1098311125msgid ""
    1098411126"Tools to work with authors/users. Selects map data that belongs to selected "
    … …  
    1098711129
    1098811130#. Plugin utilsplugin
    10989 #: build/trans_plugins.java:63
     11131#: build/trans_plugins.java:65
    1099011132msgid ""
    1099111133"Several utilities that make your life easier: e.g. simplify way, join areas, "
    … …  
    1099411136
    1099511137#. Plugin validator
    10996 #: build/trans_plugins.java:65
     11138#: build/trans_plugins.java:67
    1099711139msgid ""
    1099811140"An OSM data validator. It checks for problems in data, and provides fixes "
    … …  
    1100111143
    1100211144#. Plugin waydownloader
    11003 #: build/trans_plugins.java:67
     11145#: build/trans_plugins.java:69
    1100411146msgid "Easy downloading along a long set of interconnected ways"
    1100511147msgstr ""
    1100611148
    1100711149#. Plugin wmsplugin
    11008 #: build/trans_plugins.java:69
     11150#: build/trans_plugins.java:71
    1100911151msgid ""
    1101011152"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
    … …  
    2216522307msgstr ""
    2216622308
     22309#~ msgid ""
     22310#~ "Please select at least one node, way or relation. Only already uploaded "
     22311#~ "elements have a history."
     22312#~ msgstr ""
     22313#~ "Palun vali vali vähemalt üks sõlm või tee või seos. Ainult juba üles "
     22314#~ "laetud elementidel on ajalugu."
     22315
     22316#~ msgid "Uploading data"
     22317#~ msgstr "Andmete üles laadimine"
     22318
     22319#~ msgid "Email"
     22320#~ msgstr "E-post"
     22321
     22322#~ msgid "Resolve Conflicts"
     22323#~ msgstr "Lahenda konfliktid"
     22324
     22325#~ msgid "my version:"
     22326#~ msgstr "minu versioon:"
     22327
     22328#~ msgid "their version:"
     22329#~ msgstr "nende versioon:"
     22330
     22331#~ msgid "OSM username (email)"
     22332#~ msgstr "OSM kasutajanimi (email)"
     22333
     22334#~ msgid "Unknown host"
     22335#~ msgstr "Tundmatu host"
     22336
    2216722337#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
    2216822338#~ msgstr ""
    2216922339#~ "Saad kasutada hiirt või Ctrl+Nooleklahvid/./ et suurendada ja lohistada"
    22170 
    22171 #~ msgid "Uploading data"
    22172 #~ msgstr "Andmete üles laadimine"
    22173 
    22174 #~ msgid "Email"
    22175 #~ msgstr "E-post"
    22176 
    22177 #~ msgid "OSM username (email)"
    22178 #~ msgstr "OSM kasutajanimi (email)"
    22179 
    22180 #~ msgid "Unknown host"
    22181 #~ msgstr "Tundmatu host"
    2218222340
    2218322341#~ msgid ""
Note: See TracChangeset for help on using the changeset viewer.