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

updated

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/i18n/po/sl.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"
    11 "PO-Revision-Date: 2009-06-14 17:32+0000\n"
     10"POT-Creation-Date: 2009-06-27 14:26+0200\n"
     11"PO-Revision-Date: 2009-06-19 21:34+0000\n"
    1212"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
    1313"Language-Team: Slovenian <sl@li.org>\n"
     
    1717"Plural-Forms: nplurals=4; plural=(n%100==1 ? 1 : n%100==2 ? 2 : n%100==3 || n"
    1818"%100==4 ? 3 : 0);\n"
    19 "X-Launchpad-Export-Date: 2009-06-19 19:35+0000\n"
     19"X-Launchpad-Export-Date: 2009-06-27 12:17+0000\n"
    2020"X-Generator: Launchpad (build Unknown)\n"
    2121
     
    2828#: ../core/src/org/openstreetmap/josm/Main.java:198
    2929#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:59
    30 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    31 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:302
     30#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:156
     31#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:305
    3232msgid "Help"
    3333msgstr "Pomoč"
     
    7373#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:89
    7474#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:99
    75 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:341
    76 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
    77 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:312
    78 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:356
     75#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
     76#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:317
     77#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:361
    7978#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:116
    8079#: ../core/src/org/openstreetmap/josm/command/DeleteCommand.java:149
     
    8281#: ../core/src/org/openstreetmap/josm/corrector/TagCorrector.java:42
    8382#: ../core/src/org/openstreetmap/josm/gui/PleaseWaitDialog.java:30
    84 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    85 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
     83#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:152
    8684#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:81
    8785#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:570
     
    10199#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/dialogs/TextInputDialog.java:150
    102100#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:319
    103 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
    104 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
    105 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
     101#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
     102#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
     103#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
    106104#: ../plugins/wmsplugin/src/wmsplugin/Map_Rectifier_WMSmenuAction.java:150
    107105msgid "Cancel"
     
    206204msgid "File could not be found."
    207205msgstr "Datoteke ni bilo moč najti."
     206
     207#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:38
     208#, java-format
     209msgid ""
     210"WARNING: unexpected format of API base URL. Redirection to history page for "
     211"OSM primitive will probably fail. API base URL is: ''{0}''"
     212msgstr ""
     213
     214#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:58
     215#, fuzzy
     216msgid "Please select at least one already uploaded node, way, or relation."
     217msgstr "Izberite vsaj eno pot, ki jo želite poenostaviti."
     218
     219#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:59
     220#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:183
     221#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
     222#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
     223msgid "Warning"
     224msgstr ""
     225
     226#: ../core/src/org/openstreetmap/josm/actions/AbstractInfoAction.java:69
     227#, java-format
     228msgid ""
     229"WARNING: launching browser windows for the first {0} of {1} selected "
     230"primitives only"
     231msgstr ""
    208232
    209233#: ../core/src/org/openstreetmap/josm/actions/AddNodeAction.java:29
     
    249273#: ../plugins/grid/src/grid/GridLayer.java:193
    250274#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:54
    251 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:93
     275#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:83
    252276msgid "Latitude"
    253277msgstr ""
     
    256280#: ../plugins/grid/src/grid/GridLayer.java:195
    257281#: ../plugins/livegps/src/livegps/LiveGpsDialog.java:56
    258 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:96
     282#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:86
    259283msgid "Longitude"
    260284msgstr ""
     
    291315#: ../plugins/tagging-preset-tester/src/org/openstreetmap/josm/plugins/taggingpresettester/TaggingPresetTesterAction.java:25
    292316#: ../plugins/terracer/src/terracer/ReverseTerraceAction.java:40
    293 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
    294 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
    295 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     317#: ../plugins/terracer/src/terracer/TerracerAction.java:72
     318#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
     319#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    296320#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:33
    297321#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidateAction.java:40
     
    324348msgstr "Prosim, izberite vsaj 3 vozlišča."
    325349
     350#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:51
     351#, java-format
     352msgid ""
     353"Current number of changes exceeds the max. number of changes, current is "
     354"{0}, max is {1}"
     355msgstr ""
     356
     357#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:55
     358#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:116
     359msgid "API Capabilities Violation"
     360msgstr ""
     361
     362#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:65
     363msgid "Failed to initialize API. Please try again later."
     364msgstr ""
     365
     366#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:66
     367msgid "API initialization failed"
     368msgstr ""
     369
     370#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:85
     371#, java-format
     372msgid ""
     373"Warning: automatically truncating value of tag ''{0}'' on deleted primitive "
     374"{1}"
     375msgstr ""
     376
     377#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:94
     378#, java-format
     379msgid ""
     380"Length of value for tag ''{0}'' on primitive {1} exceeds the max. allowed "
     381"length {2}. Values length is {3}."
     382msgstr ""
     383
     384#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:97
     385msgid "Precondition Violation"
     386msgstr ""
     387
     388#: ../core/src/org/openstreetmap/josm/actions/ApiPreconditionChecker.java:111
     389#, java-format
     390msgid "{0} nodes in way {1} exceed the max. allowed number of nodes {2}"
     391msgstr ""
     392
    326393#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    327394msgid "data"
     
    337404
    338405#: ../core/src/org/openstreetmap/josm/actions/AutoScaleAction.java:26
    339 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:223
     406#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    340407msgid "conflict"
    341408msgstr "konflikt"
     
    415482#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:190
    416483#: ../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
     484#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:109
     485#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:301
    419486msgid "Enter values for all conflicts."
    420487msgstr ""
     
    422489#: ../core/src/org/openstreetmap/josm/actions/CombineWayAction.java:192
    423490#: ../core/src/org/openstreetmap/josm/actions/MergeNodesAction.java:191
    424 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:318
     491#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:303
    425492msgid "Solve Conflicts"
    426493msgstr ""
     
    639706
    640707#: ../core/src/org/openstreetmap/josm/actions/GpxExportAction.java:167
    641 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:556
     708#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:561
    642709#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:68
    643710#: ../core/src/org/openstreetmap/josm/actions/search/SelectionWebsiteLoader.java:71
    644711#: ../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
     712#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:554
     713#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:557
     714#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:561
    648715#: ../plugins/cadastre-fr/src/cadastre_fr/CacheControl.java:119
    649716#: ../plugins/cadastre-fr/src/cadastre_fr/MenuActionBoundaries.java:28
     
    673740#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:89
    674741#: ../core/src/org/openstreetmap/josm/actions/HelpAction.java:109
    675 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:149
     742#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
    676743#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:617
    677744#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:56
     
    714781msgstr ""
    715782
    716 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:26
    717 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:29
     783#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:15
     784#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:18
    718785msgid "History of Element"
    719786msgstr ""
    720787
    721 #: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:27
    722 msgid "Display history information about OSM ways or nodes."
     788#: ../core/src/org/openstreetmap/josm/actions/HistoryInfoAction.java:16
     789#, fuzzy
     790msgid "Display history information about OSM ways, nodes, or relations."
    723791msgstr "Prikaže podatke o zgodovini vozlišč in poti OSM"
    724792
    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 ""
     793#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:15
     794#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:18
     795msgid "Info about Element"
     796msgstr ""
     797
     798#: ../core/src/org/openstreetmap/josm/actions/InfoAction.java:16
     799#, fuzzy
     800msgid "Display object information about OSM nodes, ways, or relations."
     801msgstr "Prikaže podatke o zgodovini vozlišč in poti OSM"
    730802
    731803#: ../core/src/org/openstreetmap/josm/actions/JoinNodeWayAction.java:29
     
    861933#: ../core/src/org/openstreetmap/josm/actions/OpenFileAction.java:54
    862934#: ../core/src/org/openstreetmap/josm/io/FileImporter.java:24
    863 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:54
    864935#: ../core/src/org/openstreetmap/josm/io/OsmBzip2Importer.java:39
    865936#: ../core/src/org/openstreetmap/josm/io/OsmGzipImporter.java:27
    866937#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:37
    867 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
    868 #: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
    869938#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/CorrelateGpxWithImages.java:174
    870939#, java-format
     
    10471116
    10481117#: ../core/src/org/openstreetmap/josm/actions/SaveActionBase.java:97
    1049 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:180
     1118#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:136
    10501119msgid "Conflicts"
    10511120msgstr "V sporu z"
     
    11911260msgstr ""
    11921261
    1193 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:305
     1262#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:312
    11941263msgid ""
    11951264"A role based relation membership was copied to all new ways.\n"
     
    11971266msgstr ""
    11981267
    1199 #: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:310
     1268#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:314
     1269msgid ""
     1270"A relation membership was copied to all new ways.\n"
     1271"You should verify this and correct it when necessary."
     1272msgstr ""
     1273
     1274#: ../core/src/org/openstreetmap/josm/actions/SplitWayAction.java:319
    12001275#, java-format
    12011276msgid "Split way {0} into {1} parts"
     
    13321407msgstr ""
    13331408
    1334 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:70
    1335 msgid "Undeleting Way..."
    1336 msgstr ""
    1337 
    1338 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:133
    1339 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:247
    1340 msgid "Yes, undelete them too"
    1341 msgstr ""
    1342 
    1343 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:134
    1344 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:248
    1345 msgid "No, cancel operation"
    1346 msgstr ""
    1347 
    1348 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:138
    1349 #, java-format
    1350 msgid ""
    1351 "<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
    1352 "the server.<br><br>Do you want to undelete these nodes too?</html>"
    1353 msgstr ""
    1354 
    1355 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:143
    1356 msgid "Undelete additional nodes?"
    1357 msgstr ""
    1358 
    1359 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:170
    1360 #, java-format
    1361 msgid "Checking whether node {0} is gone ..."
    1362 msgstr ""
    1363 
    1364 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:203
    1365 msgid "Undeleting relation..."
    1366 msgstr ""
    1367 
    1368 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:252
    1369 #, java-format
    1370 msgid ""
    1371 "<html>There are {0} additional primitives referred to by relation {1}"
    1372 "<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
    1373 "</html>"
    1374 msgstr ""
    1375 
    1376 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:257
    1377 msgid "Undelete dependent primitives?"
    1378 msgstr ""
    1379 
    1380 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:284
    1381 #, java-format
    1382 msgid "Checking whether primitive {0} is gone ..."
    1383 msgstr ""
    1384 
    1385 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:339
    1386 msgid "Keep mine"
    1387 msgstr ""
    1388 
    1389 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:340
    1390 msgid "Delete mine"
    1391 msgstr ""
    1392 
    1393 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:344
    1394 #, java-format
    1395 msgid ""
    1396 "<html>The OSM primitive with id <strong>{0}</strong> has been deleted<br>on "
    1397 "the server by another mapper.<br><br>Click <strong>{1}</strong> to keep your "
    1398 "primitive and ignore the deleted state.<br>Your primitive will be assigend a "
    1399 "new id.<br>Click <strong>{2}</strong> to accept the state on the server and "
    1400 "to delete your primitive.<br>Click <strong>{3}</strong> to cancel.<br>"
    1401 msgstr ""
    1402 
    1403 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:356
    1404 msgid "Primitive deleted on the server"
    1405 msgstr ""
    1406 
    1407 #. should not happen
    1408 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:370
    1409 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:344
    1410 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:383
    1411 #, java-format
    1412 msgid "unexpected return value. Got {0}"
    1413 msgstr ""
    1414 
    1415 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:395
     1409#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:58
    14161410msgid "Failed to update the selected primitives."
    14171411msgstr ""
    14181412
    1419 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:396
     1413#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:59
    14201414msgid "Update failed"
    14211415msgstr ""
    14221416
    1423 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:408
     1417#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:71
    14241418#, java-format
    14251419msgid "Could not find primitive with id {0} in the current dataset"
    14261420msgstr ""
    14271421
    1428 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:409
     1422#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:72
    14291423msgid "Missing primitive"
    14301424msgstr ""
    14311425
    1432 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:441
    1433 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:445
     1426#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:103
     1427#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:107
    14341428msgid "Update Selection"
    14351429msgstr ""
    14361430
    1437 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:443
     1431#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:105
    14381432msgid "Updates the currently selected primitives from the server"
    14391433msgstr ""
    14401434
    1441 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:457
     1435#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:119
    14421436msgid "There are no selected primitives to update."
    14431437msgstr ""
    14441438
    1445 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:458
     1439#: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:120
    14461440msgid "Selection empty"
    1447 msgstr ""
    1448 
    1449 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:471
    1450 #, java-format
    1451 msgid ""
    1452 "<html>There are  <strong>{0}</strong> primitives <br>selected for individual "
    1453 "update. Please reduce the selection<br>to max. {1} primitives.</html>"
    1454 msgstr ""
    1455 
    1456 #: ../core/src/org/openstreetmap/josm/actions/UpdateSelectionAction.java:476
    1457 msgid "Selection too big"
    14581441msgstr ""
    14591442
     
    14671450msgstr "Pošlji vse spremembe na strežnik OSM."
    14681451
    1469 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:94
     1452#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:99
    14701453msgid "Objects to add:"
    14711454msgstr "Novi predmeti:"
    14721455
    1473 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:102
     1456#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:107
    14741457msgid "Objects to modify:"
    14751458msgstr "Spremenjeni predmeti:"
    14761459
    1477 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:110
     1460#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:115
    14781461msgid "Objects to delete:"
    14791462msgstr "Izbrisani predmeti:"
    14801463
    1481 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:117
     1464#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:122
    14821465msgid "Provide a brief comment for the changes you are uploading:"
    14831466msgstr "Vpišite kratek opis sprememb, ki jih pošiljate:"
    14841467
    1485 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:126
     1468#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:131
    14861469msgid "Upload these changes?"
    14871470msgstr "Pošljem te spremembe?"
    14881471
    1489 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:128
     1472#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:133
    14901473msgid "Upload Changes"
    14911474msgstr ""
    14921475
    1493 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:152
     1476#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
    14941477msgid "Nothing to upload. Get some data first."
    14951478msgstr "Ni česa poslati. Najprej pridobite kakšne podatke."
    14961479
    1497 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:157
     1480#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:162
    14981481msgid "There are unresolved conflicts. You have to resolve these first."
    14991482msgstr "Obstajajo nerazrešeni konflikti. Razrešite jih."
    15001483
    1501 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:180
     1484#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:185
    15021485msgid "No changes to upload."
    15031486msgstr "Ni sprememb za pošiljanje."
    15041487
    1505 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:203
     1488#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:208
    15061489msgid "Uploading"
    15071490msgstr ""
    15081491
    1509 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:254
     1492#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:259
    15101493msgid "Updating primitive"
    15111494msgstr ""
    15121495
    1513 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:310
     1496#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
    15141497#, java-format
    15151498msgid "Synchronize {0} {1} only"
    15161499msgstr ""
    15171500
    1518 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:311
    1519 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:355
     1501#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:316
     1502#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:360
    15201503msgid "Synchronize entire dataset"
    15211504msgstr ""
    15221505
    1523 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:315
     1506#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:320
    15241507#, java-format
    15251508msgid ""
     
    15331516msgstr ""
    15341517
    1535 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:330
    1536 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:370
     1518#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:335
     1519#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:375
    15371520msgid "Conflict detected"
    15381521msgstr ""
    15391522
    1540 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:359
     1523#. should not happen
     1524#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:349
     1525#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:388
     1526#, java-format
     1527msgid "unexpected return value. Got {0}"
     1528msgstr ""
     1529
     1530#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:364
    15411531#, java-format
    15421532msgid ""
     
    15471537msgstr ""
    15481538
    1549 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:399
     1539#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:404
    15501540#, java-format
    15511541msgid "Warning: error header \"{0}\" did not match expected pattern \"{1}\""
    15521542msgstr ""
    15531543
    1554 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:412
     1544#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:417
    15551545#, java-format
    15561546msgid ""
     
    15601550msgstr ""
    15611551
    1562 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:419
     1552#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:424
    15631553msgid "Precondition violation"
    15641554msgstr ""
    15651555
    1566 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:452
     1556#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:457
    15671557#, java-format
    15681558msgid ""
     
    15721562msgstr ""
    15731563
    1574 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:463
     1564#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:468
    15751565msgid "Primitive already deleted"
    15761566msgstr ""
    15771567
    1578 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:484
    1579 #, java-format
    1580 msgid "Error header \"{0}\" doesn't match expected pattern \"{1}\""
    1581 msgstr ""
    1582 
    1583 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:539
     1568#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:489
     1569#, java-format
     1570msgid "Error header \"{0}\" does not match expected pattern \"{1}\""
     1571msgstr ""
     1572
     1573#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:544
    15841574msgid "Upload to OSM API failed"
    15851575msgstr ""
    15861576
    1587 #: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:552
     1577#: ../core/src/org/openstreetmap/josm/actions/UploadAction.java:557
    15881578#, java-format
    15891579msgid ""
     
    17051695msgstr "Podatki OpenStreetMap"
    17061696
    1707 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:45
     1697#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:44
    17081698msgid "Data Layer"
    17091699msgstr "Podatkovna plast"
    17101700
    1711 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:55
     1701#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:54
    17121702#, java-format
    17131703msgid "Download {0} of {1} ({2} left)"
    17141704msgstr ""
    17151705
     1706#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:94
     1707msgid "The following errors occurred during mass download:"
     1708msgstr ""
     1709
    17161710#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:95
    1717 msgid "The following errors occurred during mass download:"
    1718 msgstr ""
    1719 
    1720 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:96
    17211711msgid "Errors during Download"
    17221712msgstr ""
    17231713
    1724 #: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:135
     1714#: ../core/src/org/openstreetmap/josm/actions/downloadtasks/DownloadOsmTaskList.java:134
    17251715#, java-format
    17261716msgid ""
    17271717"<html>There are {0} primitives in your local dataset which<br>might be "
    1728 "deleted on the server. If you later try to delete or<br>update them on the "
    1729 "server the server is likely to report a<br>conflict.<br><br>Click <strong>{1}"
    1730 "</strong> to check these primitives individually.<br>Click <strong>{2}</"
    1731 "strong> to ignore.<br></html>"
     1718"deleted on the server. If you later try to delete or<br>update them the "
     1719"server is likely to report a<br>conflict.<br><br>Click <strong>{1}</strong> "
     1720"to check the state of these primitives<br>on the server.<br>Click <strong>{2}"
     1721"</strong> to ignore.<br></html>"
    17321722msgstr ""
    17331723
     
    18711861#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:95
    18721862#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:96
    1873 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:54
     1863#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:51
    18741864#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:111
    18751865#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:96
     
    22202210msgstr ""
    22212211
    2222 #: ../core/src/org/openstreetmap/josm/command/ConflictResolveCommand.java:78
    2223 #, java-format
    2224 msgid "Resolve {0} conflicts in {1} objects"
    2225 msgstr "Razreši {0} sporov v {1} predmetih"
    2226 
    22272212#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:54
    22282213#, java-format
     
    22322217#. should not happen
    22332218#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:74
    2234 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:73
     2219#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:83
    22352220msgid "cannot resolve undecided conflict"
    22362221msgstr ""
     
    22962281#: ../core/src/org/openstreetmap/josm/command/MoveCommand.java:118
    22972282#: ../core/src/org/openstreetmap/josm/command/RotateCommand.java:129
    2298 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:112
     2283#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:134
    22992284#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:7
    23002285#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:47
     
    23092294msgstr[3] "vozlišča"
    23102295
    2311 #: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:157
     2296#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:163
    23122297msgid "Purging 1 primitive"
    23132298msgstr ""
    23142299
    23152300#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:188
     2301#, java-format
     2302msgid "removing reference from way {0}"
     2303msgstr ""
     2304
     2305#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:194
    23162306#, java-format
    23172307msgid ""
     
    23202310msgstr ""
    23212311
     2312#: ../core/src/org/openstreetmap/josm/command/PurgePrimitivesCommand.java:202
     2313#, fuzzy, java-format
     2314msgid "removing reference from relation {0}"
     2315msgstr "odstrani iz izbora"
     2316
    23222317#: ../core/src/org/openstreetmap/josm/command/RelationMemberConflictResolverCommand.java:52
    23232318#, java-format
     
    23422337msgstr ""
    23432338
    2344 #: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:61
     2339#: ../core/src/org/openstreetmap/josm/command/UndeletePrimitivesCommand.java:69
    23452340#, java-format
    23462341msgid "Undelete {0} primitives"
    23472342msgstr ""
    23482343
    2349 #: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:44
     2344#: ../core/src/org/openstreetmap/josm/command/VersionConflictResolveCommand.java:41
    23502345#, java-format
    23512346msgid "Resolve version conflicts for {0} {1}"
     
    23612356msgstr "Uveljavim?"
    23622357
    2363 #: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:141
     2358#: ../core/src/org/openstreetmap/josm/corrector/ReverseWayTagCorrector.java:142
    23642359msgid ""
    23652360"When reversing this way, the following changes to properties of the way and "
     
    24482443msgstr ""
    24492444
    2450 #: ../core/src/org/openstreetmap/josm/data/conflict/ConflictItem.java:34
    2451 msgid "different"
    2452 msgstr "različno"
    2453 
    2454 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:15
    2455 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:262
    2456 msgid "deleted"
    2457 msgstr "izbrisano"
    2458 
    2459 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2460 msgid "true"
    2461 msgstr "pravilno"
    2462 
    2463 #: ../core/src/org/openstreetmap/josm/data/conflict/DeleteConflict.java:19
    2464 msgid "false"
    2465 msgstr "napačno"
    2466 
    2467 #: ../core/src/org/openstreetmap/josm/data/conflict/PositionConflict.java:20
    2468 msgid "position"
    2469 msgstr "položaj"
    2470 
    24712445#: ../core/src/org/openstreetmap/josm/data/coor/LatLon.java:30
    24722446msgid "Decimal Degrees"
     
    24932467msgstr "V"
    24942468
    2495 #: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:287
     2469#: ../core/src/org/openstreetmap/josm/data/osm/DataSet.java:288
    24962470#, java-format
    24972471msgid "parameter {0} > 0 required. Got {1}."
    24982472msgstr ""
    24992473
    2500 #: ../core/src/org/openstreetmap/josm/data/osm/Node.java:108
    2501 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:84
    2502 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:115
     2474#: ../core/src/org/openstreetmap/josm/data/osm/Node.java:130
     2475#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:95
     2476#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
    25032477msgid "incomplete"
    25042478msgstr "nepopoln"
    25052479
    2506 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2480#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25072481#, java-format
    25082482msgid "Error: {0}"
    25092483msgstr "Napaka: {0}"
    25102484
    2511 #: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:47
     2485#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitive.java:48
    25122486#, java-format
    25132487msgid "Warning: {0}"
     
    25352509
    25362510#: ../core/src/org/openstreetmap/josm/data/osm/OsmPrimitiveType.java:9
    2537 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:88
     2511#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:99
    25382512#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:69
    25392513#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:99
     
    25682542msgstr ""
    25692543
    2570 #: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:107
     2544#: ../core/src/org/openstreetmap/josm/data/osm/Relation.java:118
    25712545#, java-format
    25722546msgid "{0} member"
     
    25772551msgstr[3] "{0} člani"
    25782552
    2579 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:121
     2553#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:136
    25802554msgid "highway"
    25812555msgstr ""
    25822556
    2583 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:122
     2557#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:137
    25842558#: build/trans_presets.java:2994
    25852559msgid "railway"
    25862560msgstr "železnica"
    25872561
    2588 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:123
     2562#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:138
    25892563msgid "waterway"
    25902564msgstr "vodotok"
    25912565
    2592 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:124
     2566#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:139
    25932567msgid "landuse"
    25942568msgstr ""
    25952569
    2596 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:128
     2570#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:143
    25972571#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:323
    25982572#, java-format
     
    26472621#: ../core/src/org/openstreetmap/josm/data/osm/history/HistoryRelation.java:110
    26482622#: ../core/src/org/openstreetmap/josm/data/osm/history/RelationMember.java:30
     2623#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:306
     2624#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:321
     2625#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:114
    26492626#: ../core/src/org/openstreetmap/josm/io/OsmServerHistoryReader.java:37
    26502627#, java-format
     
    27882765msgstr "besedilo"
    27892766
     2767#. should not happen
     2768#.
     2769#: ../core/src/org/openstreetmap/josm/data/osm/visitor/MergeVisitor.java:225
     2770#, java-format
     2771msgid ""
     2772"My primitive with id {0} and version {1} is visible although their primitive "
     2773"with lower version {2} is not visible. Can't deal with this inconsistency. "
     2774"Keeping my primitive. "
     2775msgstr ""
     2776
    27902777#: ../core/src/org/openstreetmap/josm/data/osm/visitor/NameVisitor.java:79
    27912778#, java-format
     
    28062793
    28072794#: ../core/src/org/openstreetmap/josm/data/osm/visitor/SimplePaintVisitor.java:102
    2808 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:231
     2795#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:187
    28092796#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:144
    28102797msgid "background"
     
    28732860msgstr "Zaznamka ni bilo mogoče zapisati."
    28742861
    2875 #. setting up the properties table
    2876 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2877 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
    2878 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
    2879 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2880 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2881 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2882 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
    2883 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
    2884 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
    2885 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
    2886 msgid "Key"
    2887 msgstr "Ključ"
    2888 
    2889 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:78
    2890 #: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
    2891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
    2892 #: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
    2893 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
    2894 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
    2895 #: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
    2896 #: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
    2897 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
    2898 #: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
    2899 msgid "Value"
    2900 msgstr "Vrednost"
    2901 
    2902 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:224
    2903 #, java-format
    2904 msgid "{0} object has conflicts:"
    2905 msgid_plural "{0} objects have conflicts:"
    2906 msgstr[0] "{0} objektov s konflikti:"
    2907 msgstr[1] "{0} objekt s konfliktom:"
    2908 msgstr[2] "{0} objekta s konflikti:"
    2909 msgstr[3] "{0} objekti s konflikti:"
    2910 
    2911 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:227
    2912 msgid "my version:"
    2913 msgstr "moja različica:"
    2914 
    2915 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:233
    2916 msgid "their version:"
    2917 msgstr "njihova različica:"
    2918 
    2919 #: ../core/src/org/openstreetmap/josm/gui/ConflictResolver.java:239
    2920 msgid "resolved version:"
    2921 msgstr "končna različica:"
    2922 
    29232862#: ../core/src/org/openstreetmap/josm/gui/GettingStarted.java:76
    29242863msgid "Message of the day not available"
     
    30913030msgstr ""
    30923031
    3093 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:148
     3032#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
    30943033msgid "File"
    30953034msgstr "Datoteka"
    30963035
    3097 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:150
     3036#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
    30983037msgid "View"
    30993038msgstr "Pogled"
    31003039
    3101 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:151
     3040#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:153
    31023041msgid "Tools"
    31033042msgstr "Orodja"
    31043043
    3105 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:152
     3044#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:154
    31063045#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:227
    31073046msgid "Presets"
    31083047msgstr "Prednastavitve"
    31093048
    3110 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:177
     3049#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:179
    31113050#: ../plugins/globalsat/src/org/openstreetmap/josm/plugins/globalsat/GlobalsatPlugin.java:113
    31123051#: ../plugins/livegps/src/livegps/LiveGpsPlugin.java:42
     
    31193058
    31203059#. TODO move code to an "action" like the others?
    3121 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:219
     3060#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
    31223061msgid "Wireframe View"
    31233062msgstr ""
    31243063
    3125 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:221
     3064#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:223
    31263065msgid "Toggle Wireframe view"
    31273066msgstr ""
    31283067
    3129 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:247
     3068#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
    31303069msgid "Full Screen"
    31313070msgstr ""
    31323071
    3133 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:249
     3072#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:251
    31343073msgid "Toggle Full Screen view"
    31353074msgstr ""
    31363075
    3137 #: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:289
     3076#: ../core/src/org/openstreetmap/josm/gui/MainMenu.java:292
    31383077msgid "Audio"
    31393078msgstr "Zvok"
     
    32693208msgstr ""
    32703209
    3271 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:63
    3272 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:124
     3210#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:64
     3211#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
    32733212msgid "Properties"
    32743213msgstr ""
    32753214
    3276 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:68
    3277 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:93
     3215#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:69
     3216#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
    32783217#: ../plugins/DirectUpload/src/org/openstreetmap/josm/plugins/DirectUpload/UploadDataGui.java:108
    32793218#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:228
     
    32813220msgstr "Oznake"
    32823221
    3283 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:73
    3284 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:163
     3222#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:74
     3223#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:170
    32853224msgid "Nodes"
    32863225msgstr ""
    32873226
    3288 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:78
    3289 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:158
     3227#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:79
     3228#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:165
    32903229#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:203
    32913230msgid "Members"
    32923231msgstr "Člani"
    32933232
    3294 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:94
     3233#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:95
    32953234msgid "No pending tag conflicts to be resolved"
    32963235msgstr ""
    32973236
    3298 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:97
     3237#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
    32993238#, java-format
    33003239msgid "Tags({0} conflicts)"
    33013240msgstr ""
    33023241
    3303 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:98
     3242#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:99
    33043243#, java-format
    33053244msgid "{0} pending tag conflicts to be resolved"
    33063245msgstr ""
    33073246
    3308 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:104
     3247#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
    33093248msgid "Nodes(resolved)"
    33103249msgstr ""
    33113250
    3312 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:105
     3251#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:106
    33133252msgid ""
    33143253"Merged node list frozen. No pending conflicts in the node list of this way"
    33153254msgstr ""
    33163255
    3317 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:108
     3256#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
    33183257msgid "Nodes(with conflicts)"
    33193258msgstr ""
    33203259
    3321 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:109
     3260#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:110
    33223261msgid "Pending conflicts in the node list of this way"
    33233262msgstr ""
    33243263
    3325 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:113
     3264#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
    33263265msgid "Members(resolved)"
    33273266msgstr ""
    33283267
    3329 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:114
     3268#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:115
    33303269msgid ""
    33313270"Merged member list frozen. No pending conflicts in the member list of this "
     
    33333272msgstr ""
    33343273
    3335 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:117
     3274#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
    33363275msgid "Members(with conflicts)"
    33373276msgstr ""
    33383277
    3339 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:118
     3278#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:119
    33403279msgid "Pending conflicts in the member list of this relation"
    33413280msgstr ""
    33423281
    3343 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:125
     3282#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:126
    33443283msgid "No pending property conflicts"
    33453284msgstr ""
    33463285
    3347 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:128
     3286#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
    33483287msgid "Properties(with conflicts)"
    33493288msgstr ""
    33503289
    3351 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:129
     3290#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:130
    33523291msgid "Pending property conflicts to be resolved"
    33533292msgstr ""
    33543293
    3355 #: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:193
     3294#: ../core/src/org/openstreetmap/josm/gui/conflict/ConflictResolver.java:207
    33563295msgid "Conflict Resolution"
    33573296msgstr ""
     
    33883327
    33893328#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:263
    3390 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:75
     3329#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
    33913330msgid "My version"
    33923331msgstr ""
     
    33973336
    33983337#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:269
    3399 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:81
     3338#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
    34003339#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMerger.java:137
    34013340msgid "Merged version"
     
    34093348
    34103349#: ../core/src/org/openstreetmap/josm/gui/conflict/ListMerger.java:275
    3411 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:87
     3350#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:93
    34123351msgid "Their version"
    34133352msgstr ""
     
    35923531msgstr ""
    35933532
    3594 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:76
     3533#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:430
     3534#, java-format
     3535msgid ""
     3536"<html>An error occurred while communicating with the server<br>Details: {0}</"
     3537"html>"
     3538msgstr ""
     3539
     3540#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:434
     3541#, fuzzy
     3542msgid "Communication with server failed"
     3543msgstr "Povezava ni uspela."
     3544
     3545#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:476
     3546#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:505
     3547msgid "Yes, undelete them too"
     3548msgstr ""
     3549
     3550#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:477
     3551#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:506
     3552msgid "No, cancel operation"
     3553msgstr ""
     3554
     3555#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:481
     3556#, java-format
     3557msgid ""
     3558"<html>There are {0} additional nodes used by way {1}<br>which are deleted on "
     3559"the server.<br><br>Do you want to undelete these nodes too?</html>"
     3560msgstr ""
     3561
     3562#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:486
     3563msgid "Undelete additional nodes?"
     3564msgstr ""
     3565
     3566#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:510
     3567#, java-format
     3568msgid ""
     3569"<html>There are {0} additional primitives referred to by relation {1}"
     3570"<br>which are deleted on the server.<br><br>Do you want to undelete them too?"
     3571"</html>"
     3572msgstr ""
     3573
     3574#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMergeModel.java:515
     3575msgid "Undelete dependent primitives?"
     3576msgstr ""
     3577
     3578#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
    35953579msgid "Properties in my dataset, i.e. the local dataset"
    35963580msgstr ""
    35973581
    3598 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:82
     3582#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
    35993583msgid ""
    36003584"Properties in the merged element. They will replace properties in my "
     
    36023586msgstr ""
    36033587
    3604 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:88
     3588#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:94
    36053589msgid "Properties in their dataset, i.e. the server dataset"
    36063590msgstr ""
    36073591
    3608 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:101
     3592#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:110
    36093593msgid "Coordinates:"
    36103594msgstr ""
    36113595
    3612 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:174
     3596#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:186
    36133597msgid "Deleted State:"
    36143598msgstr ""
    36153599
    3616 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:248
    3617 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:260
     3600#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:263
     3601msgid "Visible State:"
     3602msgstr ""
     3603
     3604#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:343
     3605#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:355
     3606#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3607#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:373
    36183608#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:28
    36193609msgid "(none)"
    36203610msgstr ""
    36213611
    3622 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:264
     3612#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:357
     3613msgid "deleted"
     3614msgstr "izbrisano"
     3615
     3616#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:359
    36233617msgid "not deleted"
    36243618msgstr ""
    36253619
    3626 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:334
     3620#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:366
     3621msgid "visible (on the server)"
     3622msgstr ""
     3623
     3624#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:368
     3625msgid "not visible (on the server)"
     3626msgstr ""
     3627
     3628#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:375
     3629#, fuzzy
     3630msgid "Keep a clone of the local version"
     3631msgstr "Prosim, vnesite ime kraja."
     3632
     3633#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:377
     3634msgid "Physically delete from local dataset"
     3635msgstr ""
     3636
     3637#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:476
    36273638msgid "Keep my coordiates"
    36283639msgstr ""
    36293640
    3630 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:349
     3641#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:491
    36313642msgid "Keep their coordiates"
    36323643msgstr ""
    36333644
    3634 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:364
     3645#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:506
    36353646msgid "Undecide conflict between different coordinates"
    36363647msgstr ""
    36373648
    3638 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:379
     3649#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:521
    36393650msgid "Keep my deleted state"
    36403651msgstr ""
    36413652
    3642 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:394
     3653#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:536
    36433654msgid "Keep their deleted state"
    36443655msgstr ""
    36453656
    3646 #: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:409
     3657#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:551
    36473658msgid "Undecide conflict between deleted state"
     3659msgstr ""
     3660
     3661#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:566
     3662msgid "Keep my visible state"
     3663msgstr ""
     3664
     3665#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:581
     3666msgid "Yes, reset the id"
     3667msgstr ""
     3668
     3669#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:582
     3670#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:624
     3671msgid "No, abort"
     3672msgstr ""
     3673
     3674#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:586
     3675#, java-format
     3676msgid ""
     3677"<html>To keep your local version, JOSM<br>has to reset the id of {0} {1} to "
     3678"0.<br>On the next upload the server will assign<br>it a new id.<br>Do yo "
     3679"agree?</html>"
     3680msgstr ""
     3681
     3682#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:594
     3683msgid "Reset id to 0"
     3684msgstr ""
     3685
     3686#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:608
     3687msgid "Keep their visible state"
     3688msgstr ""
     3689
     3690#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:623
     3691msgid "Yes, purge it"
     3692msgstr ""
     3693
     3694#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:628
     3695#, java-format
     3696msgid ""
     3697"<html>JOSM will have to remove your local primitive with id {0}<br>from the "
     3698"dataset.<br>Do you agree?</html>"
     3699msgstr ""
     3700
     3701#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:633
     3702#, fuzzy
     3703msgid "Remove from dataset"
     3704msgstr "odstrani iz izbora"
     3705
     3706#: ../core/src/org/openstreetmap/josm/gui/conflict/properties/PropertiesMerger.java:647
     3707msgid "Undecide conflict between visible state"
    36483708msgstr ""
    36493709
     
    36883748msgstr ""
    36893749
     3750#. setting up the properties table
     3751#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:18
     3752#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:158
     3753#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3754#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3755#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3756#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:94
     3757#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:218
     3758#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:71
     3759#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:18
     3760msgid "Key"
     3761msgstr "Ključ"
     3762
     3763#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeColumnModel.java:25
     3764#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:189
     3765#: ../core/src/org/openstreetmap/josm/gui/dialogs/PropertiesDialog.java:462
     3766#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:137
     3767#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:69
     3768#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:222
     3769#: ../plugins/routing/src/com/innovant/josm/plugin/routing/gui/RoutingPreferenceDialog.java:119
     3770#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/TagTable.java:78
     3771#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/tagspec/ui/TagsTableColumnModel.java:25
     3772msgid "Value"
     3773msgstr "Vrednost"
     3774
    36903775#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/TagMergeItem.java:108
    36913776msgid "cannot apply undecided tag merge item"
     
    37443829
    37453830#: ../core/src/org/openstreetmap/josm/gui/dialogs/CommandStackDialog.java:31
    3746 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3831#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    37473832#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:92
    37483833#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:165
     
    37663851msgstr ""
    37673852
    3768 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:55
     3853#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:52
    37693854#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:112
    37703855#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:97
     
    37733858msgstr ""
    37743859
    3775 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:64
     3860#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:61
    37763861msgid "Resolve"
    37773862msgstr "Razreši"
    37783863
    3779 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:65
     3864#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:62
    37803865msgid "Open a merge dialog of all selected items in the list above."
    37813866msgstr ""
    37823867
    3783 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
    3784 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:73
     3868#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
     3869#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:70
    37853870msgid "Conflict"
    37863871msgstr "Spor"
    37873872
    3788 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:72
     3873#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:69
    37893874msgid "Merging conflicts."
    37903875msgstr "Spori pri zlivanju"
    37913876
    3792 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:118
    3793 msgid "WARNING: unexpected value for preference conflict.resolution, got "
    3794 msgstr ""
    3795 
    3796 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:159
    3797 msgid "Resolve Conflicts"
    3798 msgstr "Razreši spore"
    3799 
    3800 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:161
    3801 msgid "Solve Conflict"
    3802 msgstr ""
    3803 
    3804 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:178
     3877#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:134
    38053878#, java-format
    38063879msgid "Conflicts: {0}"
    38073880msgstr ""
    38083881
    3809 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:129
     3882#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:130
    38103883msgid "Resolve conflicts"
    38113884msgstr ""
    38123885
    3813 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:150
     3886#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:151
    38143887msgid "Cancel conflict resolution and close the dialog"
    38153888msgstr ""
    38163889
    3817 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:164
     3890#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
    38183891msgid "Apply resolved conflicts and close the dialog"
    38193892msgstr ""
    38203893
    3821 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:165
     3894#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:166
    38223895msgid "Apply Resolution"
    38233896msgstr ""
    38243897
    3825 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:173
     3898#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
    38263899msgid "Apply partial resolutions"
    38273900msgstr ""
    38283901
    3829 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:174
     3902#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:175
    38303903msgid "Continue resolving"
    38313904msgstr ""
    38323905
    3833 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:176
     3906#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:177
    38343907#, java-format
    38353908msgid ""
     
    38383911"remaining conflicts later.<br>Click <strong>{1}</strong> to return to "
    38393912"resolving conflicts.</html>"
    3840 msgstr ""
    3841 
    3842 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictResolutionDialog.java:182
    3843 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:256
    3844 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:53
    3845 #: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/gui/OsbDialog.java:124
    3846 msgid "Warning"
    38473913msgstr ""
    38483914
     
    42714337#. item "Amenities/Toilets" combo "Fee"
    42724338#. item "Health/Pharmacy" combo "Dispensing"
    4273 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4339#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    42744340#: build/trans_presets.java:312 build/trans_presets.java:313
    42754341#: build/trans_presets.java:314 build/trans_presets.java:315
     
    42944360msgstr "da"
    42954361
    4296 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:418
     4362#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:419
    42974363#: build/trans_presets.java:312 build/trans_presets.java:313
    42984364#: build/trans_presets.java:314 build/trans_presets.java:315
     
    43194385msgstr ""
    43204386
    4321 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:423
     4387#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:424
    43224388#, java-format
    43234389msgid "Members: {0}"
    43244390msgstr "Člani: {0}"
    43254391
    4326 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:431
     4392#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:432
    43274393#, java-format
    43284394msgid "Relation Editor: {0}"
    43294395msgstr ""
    43304396
    4331 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:545
     4397#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:543
    43324398msgid "There were conflicts during import."
    43334399msgstr ""
    43344400
    4335 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:555
     4401#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:553
    43364402msgid "Error parsing server response."
    43374403msgstr ""
    43384404
    4339 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:558
     4405#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:556
    43404406msgid "Cannot connect to server."
    43414407msgstr ""
    43424408
    4343 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:562
     4409#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:560
    43444410msgid "Error when communicating with server."
    43454411msgstr ""
     
    45204586msgstr "povečava"
    45214587
    4522 #: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:110
     4588#: ../core/src/org/openstreetmap/josm/gui/download/SlippyMapChooser.java:113
    45234589msgid "Slippy map"
    45244590msgstr ""
     
    45454611msgstr "Številke ploščic"
    45464612
    4547 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:98
     4613#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:279
    45484614#, java-format
    45494615msgid "Images for {0}"
    45504616msgstr ""
    45514617
    4552 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:103
     4618#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:284
    45534619msgid "Read GPX..."
    45544620msgstr ""
    45554621
    4556 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:112
     4622#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:293
    45574623#, java-format
    45584624msgid "No time for point {0} x {1}"
    45594625msgstr "Točka {0} x {1} nima časovne oznake"
    45604626
    4561 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:117
     4627#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:298
    45624628#, java-format
    45634629msgid "Cannot read time \"{0}\" from point {1} x {2}"
    45644630msgstr "Ni mogoče razbrati časa \"{0}\" točke {1} x {2}"
    45654631
    4566 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:125
     4632#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:306
    45674633msgid "No images with readable timestamps found."
    45684634msgstr "Ni moč najti slik z berljivo časovno oznako."
    45694635
    4570 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:136
     4636#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:317
    45714637#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:136
    45724638#, java-format
     
    45744640msgstr "Berem {0}..."
    45754641
    4576 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:203
     4642#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:382
    45774643#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:240
    45784644msgid "Geotagged Images"
    45794645msgstr "Slike z geografskim položajem"
    45804646
    4581 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:255
    4582 #, java-format
    4583 msgid "Image with path {0} does not exist or is not readable."
    4584 msgstr ""
    4585 
    4586 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:363
     4647#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:562
    45874648#, java-format
    45884649msgid "GPS start: {0}"
    45894650msgstr "Začetek GPS sledi: {0}"
    45904651
    4591 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:364
     4652#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:563
    45924653#, java-format
    45934654msgid "GPS end: {0}"
    45944655msgstr "Konec GPS sledi: {0}"
    45954656
    4596 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:366
     4657#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:565
    45974658#, java-format
    45984659msgid "current delta: {0}s"
    45994660msgstr "trenutna razlika: {0}s"
    46004661
    4601 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:367
     4662#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:566
    46024663msgid "timezone difference: "
    46034664msgstr "razlika časovnih pasov: "
    46044665
    4605 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4666#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    46064667#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojLayer.java:278
    46074668msgid "image"
     
    46124673msgstr[3] "slike"
    46134674
    4614 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:391
     4675#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:590
    46154676#, java-format
    46164677msgid "{0} within the track."
    46174678msgstr "{0} znotraj sledi."
    46184679
    4619 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:432
     4680#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:648
    46204681msgid "Sync clock"
    46214682msgstr "Uskladi uro"
    46224683
    4623 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:443
     4684#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:659
    46244685#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:257
    46254686#: ../plugins/agpifoj/src/org/openstreetmap/josm/plugins/agpifoj/AgpifojPlugin.java:39
     
    46274688msgstr "Slike JPEG (*.jpg)"
    46284689
    4629 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:489
     4690#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:707
    46304691#, java-format
    46314692msgid "The date in file \"{0}\" could not be parsed."
    46324693msgstr "Datuma v datoteki \"{0}\" ni bilo možno razbrati."
    46334694
    4634 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:493
     4695#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:711
    46354696#, java-format
    46364697msgid "There is no EXIF time within the file \"{0}\"."
    46374698msgstr "V datoteki \"{0}\" manjka EXIF čas."
    46384699
    4639 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:497
     4700#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:715
    46404701msgid "Image"
    46414702msgstr "Slika"
    46424703
    4643 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:499
     4704#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:717
    46444705msgid "Enter shown date (mm/dd/yyyy HH:MM:SS)"
    46454706msgstr "Vnesite prikazan čas (mm/dd/yyyy HH:MM:SS)"
    46464707
    4647 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:502
     4708#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:720
    46484709msgid "GPS unit timezone (difference to photo)"
    46494710msgstr ""
    46504711
    4651 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:510
     4712#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:728
    46524713msgid "Synchronize Time with GPS Unit"
    46534714msgstr "Uskladite čas z GPS napravo"
    46544715
    4655 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:526
    4656 #: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:528
     4716#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:744
     4717#: ../core/src/org/openstreetmap/josm/gui/layer/GeoImageLayer.java:746
    46574718msgid "Time entered could not be parsed."
    46584719msgstr "Vpisanega časa ni bilo mogoče razpoznati."
     
    48024863
    48034864#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:698
    4804 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:495
     4865#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
    48054866#: ../core/src/org/openstreetmap/josm/gui/layer/RawGpsLayer.java:84
    48064867#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:208
     
    48684929msgstr ""
    48694930
    4870 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:268
     4931#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:265
    48714932msgid "Warning: mixing 0.6 and 0.5 data results in version 0.5"
    48724933msgstr ""
    48734934
    4874 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:280
     4935#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:277
    48754936#, java-format
    48764937msgid "There were {0} conflicts during import."
    48774938msgstr ""
    48784939
    4879 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:388
     4940#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:385
    48804941#, java-format
    48814942msgid "{0} consists of:"
    48824943msgstr "{0} je sestavljen iz:"
    48834944
    4884 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:392
     4945#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:389
    48854946#, java-format
    48864947msgid " ({0} deleted.)"
    48874948msgstr " ({0} izbrisan.)"
    48884949
    4889 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     4950#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    48904951msgid "unset"
    48914952msgstr ""
    48924953
    4893 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:396
     4954#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:393
    48944955#, java-format
    48954956msgid "API version: {0}"
    48964957msgstr ""
    48974958
    4898 #: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:492
     4959#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:489
    48994960#: ../plugins/editgpx/src/org/openstreetmap/josm/plugins/editgpx/EditGpxLayer.java:205
    49004961msgid "Convert to GPX layer"
     
    61036164
    61046165#: ../core/src/org/openstreetmap/josm/gui/preferences/DrawingPreference.java:30
    6105 #: ../plugins/terracer/src/terracer/TerracerAction.java:422
    6106 #: ../plugins/terracer/src/terracer/TerracerAction.java:440
    6107 #: ../plugins/terracer/src/terracer/TerracerAction.java:504
     6166#: ../plugins/terracer/src/terracer/TerracerAction.java:412
     6167#: ../plugins/terracer/src/terracer/TerracerAction.java:430
     6168#: ../plugins/terracer/src/terracer/TerracerAction.java:494
    61086169msgid "All"
    61096170msgstr ""
     
    68126873
    68136874#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:609
    6814 #: ../plugins/terracer/src/terracer/TerracerAction.java:108
     6875#: ../plugins/terracer/src/terracer/TerracerAction.java:98
    68156876#, java-format
    68166877msgid "Change {0} object"
     
    68226883
    68236884#: ../core/src/org/openstreetmap/josm/gui/tagging/TaggingPreset.java:612
    6824 #: ../plugins/terracer/src/terracer/TerracerAction.java:110
     6885#: ../plugins/terracer/src/terracer/TerracerAction.java:100
    68256886msgid "Nothing selected!"
    68266887msgstr ""
     
    68566917
    68576918#: ../core/src/org/openstreetmap/josm/io/BoundingBoxDownloader.java:102
     6919#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:319
     6920#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:345
    68586921#: ../core/src/org/openstreetmap/josm/io/OsmServerLocationReader.java:33
    68596922#: ../core/src/org/openstreetmap/josm/io/OsmServerObjectReader.java:49
     
    68716934msgstr "Pripravljam podatke..."
    68726935
    6873 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:21
     6936#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:22
    68746937msgid "GPX Files"
    68756938msgstr ""
    68766939
    6877 #: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:48
     6940#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:49
    68786941#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:33
     6942#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:85
    68796943#: ../plugins/openvisible/src/at/dallermassl/josm/plugin/openvisible/OpenVisibleAction.java:125
    68806944#: ../plugins/tcxplugin/src/org/openstreetmap/josm/plugins/TcxPlugin.java:86
     
    68836947msgstr ""
    68846948
     6949#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:55
     6950#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:40
     6951#, java-format
     6952msgid "File \"{0}\" does not exist"
     6953msgstr ""
     6954
     6955#: ../core/src/org/openstreetmap/josm/io/GpxImporter.java:58
     6956#: ../core/src/org/openstreetmap/josm/io/OsmImporter.java:43
     6957#, java-format
     6958msgid "Parsing file \"{0}\" failed"
     6959msgstr ""
     6960
    68856961#: ../core/src/org/openstreetmap/josm/io/GpxReader.java:309
    68866962msgid "Parse error: invalid document structure for gpx document"
    68876963msgstr ""
    68886964
     6965#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:118
     6966#, java-format
     6967msgid "no primitive with id {0} in local dataset. Can't infer primitive type"
     6968msgstr ""
     6969
     6970#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:376
     6971#, java-format
     6972msgid "Server replied with response code 404 for id {0}. Skipping."
     6973msgstr ""
     6974
     6975#: ../core/src/org/openstreetmap/josm/io/MultiFetchServerObjectReader.java:412
     6976msgid ""
     6977"Server replied with response code 404, retrying with an individual request "
     6978"for each primitive"
     6979msgstr ""
     6980
    68896981#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:21
    68906982msgid "NMEA-0183 Files"
     
    68926984
    68936985#: ../core/src/org/openstreetmap/josm/io/NMEAImporter.java:43
     6986#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
    68946987msgid "Coordinates imported: "
    68956988msgstr ""
     
    69607053msgstr ""
    69617054
    6962 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:314
     7055#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:313
    69637056msgid "No changeset present for diff upload"
    69647057msgstr ""
    69657058
    6966 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:321
     7059#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:320
    69677060msgid "Preparing..."
    69687061msgstr "Pripravljanje..."
    69697062
    6970 #: ../core/src/org/openstreetmap/josm/io/OsmApi.java:326
     7063#: ../core/src/org/openstreetmap/josm/io/OsmApi.java:325
    69717064msgid "Uploading..."
    69727065msgstr "Pošiljanje ..."
     
    70617154msgstr ""
    70627155
    7063 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:158
     7156#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:166
    70647157msgid "Unknown version"
    70657158msgstr "Neznana različica"
    70667159
    7067 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:161
     7160#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:169
    70687161msgid "Version number missing from OSM data"
    70697162msgstr ""
    70707163
    7071 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:163
     7164#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:171
    70727165#, java-format
    70737166msgid "Unknown version: {0}"
    70747167msgstr ""
    70757168
    7076 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:199
     7169#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:207
    70777170msgid "Found <nd> element in non-way."
    70787171msgstr ""
    70797172
    7080 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:202
     7173#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:210
    70817174msgid "<nd> has zero ref"
    70827175msgstr ""
    70837176
    7084 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:214
     7177#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:222
    70857178msgid "Found <member> element in non-relation."
    70867179msgstr ""
    70877180
    7088 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:219
     7181#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:227
    70897182#, java-format
    70907183msgid "Missing attribute \"ref\" on member in relation {0}"
    70917184msgstr ""
    70927185
    7093 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:224
     7186#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
    70947187#, java-format
    70957188msgid "Illegal value for attribute \"ref\" on member in relation {0}, got {1}"
    70967189msgstr ""
    70977190
    7098 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:228
     7191#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:235
    70997192#, java-format
    71007193msgid "Missing attribute \"type\" on member {0} in relation {1}"
    71017194msgstr ""
    71027195
    7103 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:231
     7196#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:237
    71047197#, java-format
    71057198msgid "Unexpected \"type\" on member {0} in relation {1}, got {2}."
    71067199msgstr ""
    71077200
    7108 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:238
     7201#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:243
    71097202msgid "Incomplete <member> specification with ref=0"
    71107203msgstr ""
    71117204
    7112 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:274
     7205#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:281
    71137206msgid "Illegal object with id=0"
    71147207msgstr "predmet z id=0 ni dovoljen"
    71157208
    7116 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:308
     7209#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:315
    71177210#, java-format
    71187211msgid ""
     
    71207213msgstr ""
    71217214
    7122 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:314
     7215#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:321
    71237216#, java-format
    71247217msgid "Missing attribute \"version\" on OSM primitive with id {0}"
    71257218msgstr ""
    71267219
    7127 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:329
     7220#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:336
    71287221#, java-format
    71297222msgid "Missing required attribute \"{0}\"."
    71307223msgstr ""
    71317224
    7132 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:356
     7225#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:363
    71337226#, java-format
    71347227msgid "Skipping a way because it includes a node that doesn''t exist: {0}\n"
    71357228msgstr ""
    71367229
    7137 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:485
     7230#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:495
    71387231msgid "Prepare OSM data..."
    71397232msgstr "Priprava podatkov OSM..."
    71407233
    7141 #: ../core/src/org/openstreetmap/josm/io/OsmReader.java:499
     7234#: ../core/src/org/openstreetmap/josm/io/OsmReader.java:507
    71427235msgid "Ill-formed node id"
    71437236msgstr "Neveljaven id točke"
     
    71687261"internetom."
    71697262
    7170 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:103
     7263#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:96
    71717264#, java-format
    71727265msgid ""
     
    71757268msgstr ""
    71767269
    7177 #: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:134
     7270#: ../core/src/org/openstreetmap/josm/io/OsmServerWriter.java:129
    71787271#, java-format
    71797272msgid "{0}% ({1}/{2}), {3} left. Uploading {4}: {5} (id: {6})"
     
    74257518msgstr "Napaka pri branju datoteke s podatki o vstavkih: {0}"
    74267519
    7427 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:300
     7520#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:299
    74287521msgid "This is after the end of the recording"
    74297522msgstr ""
    74307523
    7431 #: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:340
     7524#: ../core/src/org/openstreetmap/josm/tools/AudioPlayer.java:339
    74327525msgid "Error playing sound"
    74337526msgstr ""
     
    83778470msgstr ""
    83788471
     8472#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:33
     8473msgid "TangoGPS Files (*.log)"
     8474msgstr ""
     8475
     8476#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:110
     8477msgid "Format errors: "
     8478msgstr ""
     8479
     8480#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:112
     8481#, fuzzy
     8482msgid "TangoGPS import success"
     8483msgstr "Viri prednastavljenih oznak"
     8484
     8485#: ../plugins/dataimport/src/org/openstreetmap/josm/io/TangoGPS.java:114
     8486msgid "TangoGPS import faliure!"
     8487msgstr ""
     8488
    83798489#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayAction.java:75
    83808490#: ../plugins/duplicateway/src/org/openstreetmap/josm/plugins/duplicateway/DuplicateWayPlugin.java:21
     
    90969206msgstr ""
    90979207
     9208#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:97
     9209msgid ""
     9210"<html>The openstreetbus plugin is using the old server at appspot.com.<br>A "
     9211"new server is available at schokokeks.org.<br>Do you want to switch to the "
     9212"new server? (Strongly recommended)</html>"
     9213msgstr ""
     9214
     9215#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbPlugin.java:100
     9216msgid "Switch to new openstreetbugs server?"
     9217msgstr ""
     9218
    90989219#: ../plugins/openstreetbugs/src/org/openstreetmap/josm/plugins/osb/OsbUploadHook.java:51
    90999220msgid ""
     
    91939314msgstr "Neznana končnica datoteke: {0}"
    91949315
    9195 #: ../plugins/osmarender/src/OsmarenderPlugin.java:41
     9316#: ../plugins/osmarender/src/OsmarenderPlugin.java:39
    91969317msgid "Osmarender"
    91979318msgstr ""
    91989319
    9199 #: ../plugins/osmarender/src/OsmarenderPlugin.java:96
     9320#: ../plugins/osmarender/src/OsmarenderPlugin.java:94
    92009321msgid ""
    92019322"Firefox not found. Please set firefox executable in the Map Settings page of "
     
    92039324msgstr ""
    92049325
    9205 #: ../plugins/osmarender/src/OsmarenderPlugin.java:127
     9326#: ../plugins/osmarender/src/OsmarenderPlugin.java:125
    92069327msgid "osmarender options"
    92079328msgstr ""
    92089329
    9209 #: ../plugins/osmarender/src/OsmarenderPlugin.java:128
     9330#: ../plugins/osmarender/src/OsmarenderPlugin.java:126
    92109331msgid "Firefox executable"
    92119332msgstr ""
     
    93499470msgstr ""
    93509471
    9351 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:64
     9472#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:69
    93529473msgid "Slippy Map"
    93539474msgstr ""
    93549475
    9355 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:70
     9476#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:75
    93569477msgid "Load Tile"
    93579478msgstr "Naloži ploščico"
    93589479
    9359 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:81
     9480#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:86
    93609481msgid "Show Tile Status"
    93619482msgstr "Prikaži stanje ploščice"
    93629483
    9363 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:92
     9484#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:97
    93649485msgid "Request Update"
    93659486msgstr "Zahtevaj posodobitev"
    93669487
    9367 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:103
     9488#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:108
    93689489msgid "Load All Tiles"
    93699490msgstr "Naloži vse ploščice"
    93709491
    9371 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:113
     9492#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:118
    93729493msgid "Increase zoom"
    93739494msgstr ""
    93749495
    9375 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:122
     9496#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:127
    93769497msgid "Decrease zoom"
    93779498msgstr ""
    93789499
    9379 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:466
     9500#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:135
     9501msgid "Flush Tile Cache"
     9502msgstr ""
     9503
     9504#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:442
    93809505msgid "image not loaded"
    93819506msgstr "slika ni naložena"
     9507
     9508#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapLayer.java:446
     9509#, fuzzy
     9510msgid "image loading..."
     9511msgstr "Pošiljanje ..."
    93829512
    93839513#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapPreferenceSetting.java:29
     
    94189548msgstr ""
    94199549
    9420 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:95
     9550#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:123
    94219551msgid "error loading metadata"
    94229552msgstr ""
    94239553
    9424 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:110
     9554#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:138
    94259555#, java-format
    94269556msgid "requested: {0}"
    94279557msgstr ""
    94289558
    9429 #: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:114
     9559#: ../plugins/slippymap/src/org/openstreetmap/josm/plugins/slippymap/SlippyMapTile.java:142
    94309560msgid "error requesting update"
    94319561msgstr "napaka pri oddaji zahtevka za pososobitev"
     
    95929722msgstr ""
    95939723
    9594 #: ../plugins/terracer/src/terracer/TerracerAction.java:78
    9595 #: ../plugins/terracer/src/terracer/TerracerAction.java:82
     9724#: ../plugins/terracer/src/terracer/TerracerAction.java:68
     9725#: ../plugins/terracer/src/terracer/TerracerAction.java:72
    95969726msgid "Terrace a building"
    95979727msgstr ""
    95989728
    9599 #: ../plugins/terracer/src/terracer/TerracerAction.java:80
     9729#: ../plugins/terracer/src/terracer/TerracerAction.java:70
    96009730msgid "Creates individual buildings from a long building."
    96019731msgstr ""
    96029732
    9603 #: ../plugins/terracer/src/terracer/TerracerAction.java:140
     9733#: ../plugins/terracer/src/terracer/TerracerAction.java:130
    96049734msgid "Select a single, closed way of at least four nodes."
    96059735msgstr ""
    96069736
    9607 #: ../plugins/terracer/src/terracer/TerracerAction.java:209
     9737#: ../plugins/terracer/src/terracer/TerracerAction.java:199
    96089738msgid "Terrace"
    96099739msgstr ""
    96109740
    9611 #: ../plugins/terracer/src/terracer/TerracerAction.java:423
    9612 #: ../plugins/terracer/src/terracer/TerracerAction.java:447
     9741#: ../plugins/terracer/src/terracer/TerracerAction.java:413
     9742#: ../plugins/terracer/src/terracer/TerracerAction.java:437
    96139743msgid "Even"
    96149744msgstr ""
    96159745
    9616 #: ../plugins/terracer/src/terracer/TerracerAction.java:424
     9746#: ../plugins/terracer/src/terracer/TerracerAction.java:414
    96179747msgid "Odd"
    96189748msgstr ""
    96199749
    9620 #: ../plugins/terracer/src/terracer/TerracerAction.java:482
     9750#: ../plugins/terracer/src/terracer/TerracerAction.java:472
    96219751msgid "Highest number"
    96229752msgstr ""
    96239753
    9624 #: ../plugins/terracer/src/terracer/TerracerAction.java:483
     9754#: ../plugins/terracer/src/terracer/TerracerAction.java:473
    96259755msgid "Lowest number"
    96269756msgstr ""
    96279757
    9628 #: ../plugins/terracer/src/terracer/TerracerAction.java:484
     9758#: ../plugins/terracer/src/terracer/TerracerAction.java:474
    96299759msgid "Interpolation"
    96309760msgstr ""
    96319761
    96329762#. item "Buildings/Addresses" text "House name"
    9633 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     9763#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    96349764#: build/trans_presets.java:2173
    96359765msgid "Street name"
    96369766msgstr "Ime ceste"
    96379767
    9638 #: ../plugins/terracer/src/terracer/TerracerAction.java:485
     9768#: ../plugins/terracer/src/terracer/TerracerAction.java:475
    96399769msgid "Optional"
    96409770msgstr ""
     
    96779807msgstr "Oprostite, to ne deluje z anonimnimi uporabniki"
    96789808
    9679 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     9809#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    96809810msgid "Join overlapping Areas"
    96819811msgstr ""
    96829812
    9683 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:114
     9813#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:99
    96849814msgid "Joins areas that overlap each other"
    96859815msgstr ""
    96869816
    9687 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:125
     9817#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:110
    96889818msgid "THIS IS EXPERIMENTAL. Save your work and verify before uploading."
    96899819msgstr ""
    96909820
    9691 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:126
     9821#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:111
    96929822msgid "Continue anyway"
    96939823msgstr ""
    96949824
    9695 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:148
     9825#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:133
    96969826msgid "Only up to two areas can be joined at the moment."
    96979827msgstr ""
    96989828
    9699 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:153
     9829#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:138
    97009830#, java-format
    97019831msgid "\"{0}\" is not closed and therefore can't be joined."
    97029832msgstr ""
    97039833
    9704 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:170
     9834#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:155
    97059835#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:64
    97069836msgid ""
     
    97109840msgstr ""
    97119841
    9712 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:173
     9842#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:158
    97139843#: ../plugins/utilsplugin/src/UtilsPlugin/SimplifyWayAction.java:67
    97149844msgid "Please abort if you are not sure"
    97159845msgstr ""
    97169846
    9717 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:187
     9847#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:172
    97189848msgid "Please select at least one closed way the should be joined."
    97199849msgstr ""
    97209850
    9721 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:195
     9851#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:180
    97229852msgid "No intersection found. Nothing was changed."
    97239853msgstr ""
    97249854
    9725 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:217
     9855#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:202
    97269856msgid "Added node on all intersections"
    97279857msgstr ""
    97289858
     9859#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:226
     9860msgid "Delete Ways that are not part of an inner multipolygon"
     9861msgstr ""
     9862
     9863#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:231
     9864msgid "Fix relations"
     9865msgstr ""
     9866
     9867#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:236
     9868msgid "Joined self-overlapping area"
     9869msgstr ""
     9870
     9871#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:237
     9872msgid "Joined overlapping areas"
     9873msgstr ""
     9874
    97299875#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:241
    9730 msgid "Delete Ways that are not part of an inner multipolygon"
    9731 msgstr ""
    9732 
    9733 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:246
    9734 msgid "Fix relations"
    9735 msgstr ""
    9736 
    9737 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:251
    9738 msgid "Joined self-overlapping area"
    9739 msgstr ""
    9740 
    9741 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:252
    9742 msgid "Joined overlapping areas"
    9743 msgstr ""
    9744 
    9745 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:256
    97469876msgid ""
    97479877"Some of the ways were part of relations that have been modified. Please "
     
    97499879msgstr ""
    97509880
    9751 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:331
     9881#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:316
    97529882msgid "Fix tag conflicts"
    97539883msgstr ""
    97549884
    9755 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:480
     9885#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:464
    97569886msgid "Removed Element from Relations"
    97579887msgstr ""
    97589888
     9889#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:573
     9890msgid "Join Areas: Remove Short Ways"
     9891msgstr ""
     9892
    97599893#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:589
    9760 msgid "Join Areas: Remove Short Ways"
    9761 msgstr ""
    9762 
    9763 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:605
    97649894msgid "Closed Way"
    97659895msgstr ""
    97669896
    9767 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:872
     9897#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:856
    97689898msgid "Remove tags from inner ways"
    97699899msgstr ""
    97709900
    9771 #: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:901
     9901#: ../plugins/utilsplugin/src/UtilsPlugin/JoinAreasAction.java:885
    97729902msgid "Join Areas Function"
    97739903msgstr ""
    97749904
    9775 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     9905#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    97769906msgid "Jump To Position"
    97779907msgstr ""
    97789908
    9779 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:40
     9909#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:30
    97809910msgid "Opens a dialog that allows to jump to a specific location"
    97819911msgstr ""
    97829912
    9783 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:65
     9913#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:55
    97849914msgid "Enter Lat/Lon to jump to position."
    97859915msgstr ""
    97869916
    9787 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:67
     9917#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:57
    97889918msgid "You can also paste an URL from www.openstreetmap.org"
    97899919msgstr ""
    97909920
    9791 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:99
     9921#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:89
    97929922msgid "Zoom (in metres)"
    97939923msgstr ""
    97949924
     9925#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:92
     9926msgid "URL"
     9927msgstr ""
     9928
     9929#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:95
     9930msgid "Jump there"
     9931msgstr ""
     9932
    97959933#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:102
    9796 msgid "URL"
    9797 msgstr ""
    9798 
    9799 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:105
    9800 msgid "Jump there"
    9801 msgstr ""
    9802 
    9803 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:112
    98049934msgid "Jump to Position"
    98059935msgstr ""
    98069936
    9807 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     9937#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    98089938msgid "Could not parse Latitude, Longitude or Zoom. Please check."
    98099939msgstr ""
    98109940
    9811 #: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:124
     9941#: ../plugins/utilsplugin/src/UtilsPlugin/JumpToAction.java:114
    98129942msgid "Unable to parse Lon/Lat"
    98139943msgstr ""
     
    1084610976msgstr ""
    1084710977
     10978#. Plugin dataimport
     10979#: build/trans_plugins.java:13
     10980msgid "Allows to import various file formats into JOSM directly."
     10981msgstr ""
     10982
    1084810983#. Plugin DirectUpload
    10849 #: build/trans_plugins.java:13
     10984#: build/trans_plugins.java:15
    1085010985msgid ""
    1085110986"This plugin directly upload GPS Traces from current active layer in JOSM to "
     
    1085410989
    1085510990#. Plugin Duplicate-Way
    10856 #: build/trans_plugins.java:15
     10991#: build/trans_plugins.java:17
    1085710992msgid "Duplicate Ways with an offset"
    1085810993msgstr ""
    1085910994
    1086010995#. Plugin editgpx
    10861 #: build/trans_plugins.java:17
     10996#: build/trans_plugins.java:19
    1086210997msgid ""
    1086310998"Allows the user to anonymize timestamps and delete parts of huge GPX tracks "
     
    1086611001
    1086711002#. Plugin globalsat
    10868 #: build/trans_plugins.java:19
     11003#: build/trans_plugins.java:21
    1086911004msgid "Download GPS points from Globalsat dg100 data logger directly in JOSM."
    1087011005msgstr ""
    1087111006
    1087211007#. Plugin grid
    10873 #: build/trans_plugins.java:21
     11008#: build/trans_plugins.java:23
    1087411009msgid "Provide a background layer that displays a map grid"
    1087511010msgstr ""
    1087611011
    1087711012#. Plugin ImageWayPoint
    10878 #: build/trans_plugins.java:23
     11013#: build/trans_plugins.java:25
    1087911014msgid ""
    1088011015"Another plugin to match images to the waypoints in a GPX file. A match is "
     
    1088411019
    1088511020#. Plugin lakewalker
    10886 #: build/trans_plugins.java:25
     11021#: build/trans_plugins.java:27
    1088711022msgid "Helps vectorizing WMS images."
    1088811023msgstr ""
    1088911024
    1089011025#. Plugin livegps
    10891 #: build/trans_plugins.java:27
     11026#: build/trans_plugins.java:29
    1089211027msgid ""
    1089311028"Support live GPS input (moving dot) through a connection to gpsd server."
     
    1089511030
    1089611031#. Plugin measurement
    10897 #: build/trans_plugins.java:29
     11032#: build/trans_plugins.java:31
    1089811033msgid ""
    1089911034"Provide a measurement dialog and a layer to measure length and angle of "
     
    1090311038
    1090411039#. Plugin nearclick
    10905 #: build/trans_plugins.java:31
     11040#: build/trans_plugins.java:33
    1090611041msgid ""
    1090711042"Simulates a click when you do a small and short drag. This is usefull for "
     
    1091111046
    1091211047#. Plugin openlayers
    10913 #: build/trans_plugins.java:33
     11048#: build/trans_plugins.java:35
    1091411049msgid "Displays an OpenLayers background image"
    1091511050msgstr ""
    1091611051
    1091711052#. Plugin openstreetbugs
    10918 #: build/trans_plugins.java:35
     11053#: build/trans_plugins.java:37
    1091911054msgid "Imports issues from OpenStreetBugs"
    1092011055msgstr ""
    1092111056
    1092211057#. Plugin openvisible
    10923 #: build/trans_plugins.java:37
     11058#: build/trans_plugins.java:39
    1092411059msgid ""
    1092511060"Allows opening gpx/osm files that intersect the currently visible screen area"
     
    1092711062
    1092811063#. Plugin osmarender
    10929 #: build/trans_plugins.java:39
     11064#: build/trans_plugins.java:41
    1093011065msgid ""
    1093111066"Launches FireFox to display the current visible screen as a nice SVG image."
     
    1093311068
    1093411069#. Plugin PicLayer
    10935 #: build/trans_plugins.java:41
     11070#: build/trans_plugins.java:43
    1093611071msgid ""
    1093711072"This plugin allows to display any picture as a background in the editor and "
     
    1094011075
    1094111076#. Plugin plastic_laf
    10942 #: build/trans_plugins.java:43
     11077#: build/trans_plugins.java:45
    1094311078msgid "The great JGoodies Plastic Look and Feel."
    1094411079msgstr ""
    1094511080
    1094611081#. Plugin remotecontrol
    10947 #: build/trans_plugins.java:45
     11082#: build/trans_plugins.java:47
    1094811083msgid "Let other applications send commands to JOSM."
    1094911084msgstr ""
    1095011085
    1095111086#. Plugin routing
    10952 #: build/trans_plugins.java:47
     11087#: build/trans_plugins.java:49
    1095311088msgid "Provides routing capabilities."
    1095411089msgstr ""
    1095511090
    1095611091#. Plugin slippymap
    10957 #: build/trans_plugins.java:49
     11092#: build/trans_plugins.java:51
    1095811093msgid ""
    1095911094"Displays a slippy map grid in JOSM. Can load tiles from slippy map as "
     
    1096211097
    1096311098#. Plugin surveyor
    10964 #: build/trans_plugins.java:51
     11099#: build/trans_plugins.java:53
    1096511100msgid "Allow adding markers/nodes on current gps positions."
    1096611101msgstr ""
    1096711102
    1096811103#. Plugin tageditor
    10969 #: build/trans_plugins.java:53
     11104#: build/trans_plugins.java:55
    1097011105msgid "Provides a dialog for editing tags in a tabular grid."
    1097111106msgstr ""
    1097211107
    1097311108#. Plugin tagging-preset-tester
    10974 #: build/trans_plugins.java:55
     11109#: build/trans_plugins.java:57
    1097511110msgid ""
    1097611111"Adds a tagging preset tester to the help menu, which helps you developing of "
     
    1098011115
    1098111116#. Plugin tcx-support
    10982 #: build/trans_plugins.java:57
     11117#: build/trans_plugins.java:59
    1098311118msgid "Directly load TCX files from JOSM."
    1098411119msgstr ""
    1098511120
    1098611121#. Plugin terracer
    10987 #: build/trans_plugins.java:59
     11122#: build/trans_plugins.java:61
    1098811123msgid "Make terraced houses out of single blocks."
    1098911124msgstr ""
    1099011125
    1099111126#. Plugin usertools
    10992 #: build/trans_plugins.java:61
     11127#: build/trans_plugins.java:63
    1099311128msgid ""
    1099411129"Tools to work with authors/users. Selects map data that belongs to selected "
     
    1099711132
    1099811133#. Plugin utilsplugin
    10999 #: build/trans_plugins.java:63
     11134#: build/trans_plugins.java:65
    1100011135msgid ""
    1100111136"Several utilities that make your life easier: e.g. simplify way, join areas, "
     
    1100411139
    1100511140#. Plugin validator
    11006 #: build/trans_plugins.java:65
     11141#: build/trans_plugins.java:67
    1100711142msgid ""
    1100811143"An OSM data validator. It checks for problems in data, and provides fixes "
     
    1101111146
    1101211147#. Plugin waydownloader
    11013 #: build/trans_plugins.java:67
     11148#: build/trans_plugins.java:69
    1101411149msgid "Easy downloading along a long set of interconnected ways"
    1101511150msgstr ""
    1101611151
    1101711152#. Plugin wmsplugin
    11018 #: build/trans_plugins.java:69
     11153#: build/trans_plugins.java:71
    1101911154msgid ""
    1102011155"Display georeferenced images as background in JOSM (WMS servers, Yahoo, ...)."
     
    2217522310msgstr ""
    2217622311
     22312#~ msgid "Uploading data"
     22313#~ msgstr "Pošiljanje podatkov"
     22314
     22315#~ msgid "Email"
     22316#~ msgstr "E-pošta"
     22317
     22318#~ msgid "Resolve Conflicts"
     22319#~ msgstr "Razreši spore"
     22320
     22321#~ msgid "{0} object has conflicts:"
     22322#~ msgid_plural "{0} objects have conflicts:"
     22323#~ msgstr[0] "{0} objektov s konflikti:"
     22324#~ msgstr[1] "{0} objekt s konfliktom:"
     22325#~ msgstr[2] "{0} objekta s konflikti:"
     22326#~ msgstr[3] "{0} objekti s konflikti:"
     22327
     22328#~ msgid "my version:"
     22329#~ msgstr "moja različica:"
     22330
     22331#~ msgid "their version:"
     22332#~ msgstr "njihova različica:"
     22333
     22334#~ msgid "resolved version:"
     22335#~ msgstr "končna različica:"
     22336
     22337#~ msgid "Login name (email) to the OSM account."
     22338#~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
     22339
     22340#~ msgid "OSM username (email)"
     22341#~ msgstr "OSM uporabniško ime (email)"
     22342
     22343#~ msgid "Unknown host"
     22344#~ msgstr "Neznan gostitelj"
     22345
     22346#~ msgid "position"
     22347#~ msgstr "položaj"
     22348
     22349#~ msgid "different"
     22350#~ msgstr "različno"
     22351
     22352#~ msgid "true"
     22353#~ msgstr "pravilno"
     22354
     22355#~ msgid "false"
     22356#~ msgstr "napačno"
     22357
     22358#~ msgid "Resolve {0} conflicts in {1} objects"
     22359#~ msgstr "Razreši {0} sporov v {1} predmetih"
     22360
    2217722361#~ msgid "You can use the mouse or Ctrl+Arrow keys/./ to zoom and pan."
    2217822362#~ msgstr ""
    2217922363#~ "Za premikanje in povečavo lahko uporabite miško ali <ctrl>+<smerne tipke>."
    22180 
    22181 #~ msgid "Uploading data"
    22182 #~ msgstr "Pošiljanje podatkov"
    22183 
    22184 #~ msgid "Email"
    22185 #~ msgstr "E-pošta"
    22186 
    22187 #~ msgid "Login name (email) to the OSM account."
    22188 #~ msgstr "Uporabniško ime (email) vašega računa pri OSM."
    22189 
    22190 #~ msgid "OSM username (email)"
    22191 #~ msgstr "OSM uporabniško ime (email)"
    22192 
    22193 #~ msgid "Unknown host"
    22194 #~ msgstr "Neznan gostitelj"
    2219522364
    2219622365#~ msgid "{0} Plugin successfully updated. Please restart JOSM."
Note: See TracChangeset for help on using the changeset viewer.