Ignore:
Timestamp:
2010-02-24T19:57:00+01:00 (17 years ago)
Author:
bastik
Message:

i18n update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/i18n/po/sl.po

    r20093 r20140  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2010-02-21 09:35+0100\n"
    11 "PO-Revision-Date: 2010-02-18 00:18+0000\n"
     10"POT-Creation-Date: 2010-02-24 19:46+0100\n"
     11"PO-Revision-Date: 2010-02-21 11:27+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: 2010-02-21 08:16+0000\n"
     19"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n"
    2020"X-Generator: Launchpad (build Unknown)\n"
    2121
     
    7070#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
    7171#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
    72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
    73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
     72#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     73#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
    7474#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
    7575#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
     
    243243#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    244244#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
    245 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
     245#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
    246246#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    247247#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373
     
    387387#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    388388#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
     389#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    390390#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    391391#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
     
    685685#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    686686#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
    687 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
     687#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
    688688#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
    689689#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
     
    807807#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    808808#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
    809 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
     809#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
    810810msgid "Duplicate"
    811811msgstr "Podvoji"
     
    16401640
    16411641#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
    1642 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    1643 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
     1642#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
     1643#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
    16441644#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    16451645msgid "No, abort"
     
    23462346#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    23472347#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
     2348#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
    23492349#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    23502350#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
     
    28972897
    28982898#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    2899 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
     2899#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
    29002900msgid "Double conflict"
    29012901msgstr ""
     
    29282928#. should not happen
    29292929#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
    2930 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
     2930#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
    29312931msgid "Cannot resolve undecided conflict."
    29322932msgstr ""
     
    30973097msgstr ""
    30983098
    3099 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
     3099#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
    31003100#, java-format
    31013101msgid "Resolve conflicts in node list of way {0}"
    31023102msgstr ""
    31033103
    3104 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
     3104#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
    31053105#, java-format
    31063106msgid "Main dataset does not include node {0}"
     
    33753375msgstr ""
    33763376
    3377 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148
    3378 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
     3377#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150
     3378#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    33793379#, java-format
    33803380msgid "Missing merge target for way with id {0}"
    33813381msgstr ""
    33823382
    3383 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164
    3384 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228
     3383#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
     3384#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
    33853385#, java-format
    33863386msgid "Missing merge target for node with id {0}"
    33873387msgstr ""
    33883388
    3389 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187
     3389#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    33903390#, java-format
    33913391msgid "Missing merge target for object with id {0}"
    33923392msgstr ""
    33933393
    3394 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243
     3394#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250
    33953395#, java-format
    33963396msgid "Missing merge target for relation with id {0}"
    33973397msgstr ""
    33983398
    3399 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248
     3399#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255
    34003400#, java-format
    34013401msgid "Missing merge target of type {0} with id {1}"
     
    34053405#. FIXME: this message does not make sense, source version can not be lower than
    34063406#. target version at this point
    3407 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:281
     3407#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292
    34083408#, java-format
    34093409msgid ""
     
    35543554msgstr ""
    35553555
    3556 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
    3557 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3556#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
     3557#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    35583558#, java-format
    35593559msgid "Cannot add node {0} to incomplete way {1}."
     
    36713671#. darker blue
    36723672#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3673 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
     3673#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    36743674#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183
    36753675msgid "background"
     
    39153915#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    39163916#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
    3917 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
     3917#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
    39183918msgid "Conflict"
    39193919msgstr "Spor"
     
    41594159#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    41604160#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    4161 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
     4161#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
    41624162#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
    41634163#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     
    43924392msgstr ""
    43934393
    4394 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
    4395 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
     4394#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4395#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
    43964396#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    43974397msgid "Properties"
    43984398msgstr "Lastnosti"
    43994399
    4400 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
    4401 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
     4400#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4401#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
    44024402#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    4403 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235
     4403#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
    44044404#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    44054405#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507
     
    44084408msgstr "Oznake"
    44094409
    4410 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
    4411 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
     4410#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4411#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
    44124412#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    44134413#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
     
    44154415msgstr "Vozlišča"
    44164416
    4417 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
    4418 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    4419 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
     4417#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
     4418#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
     4419#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
    44204420#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    44214421msgid "Members"
    44224422msgstr "Člani"
    44234423
    4424 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     4424#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    44254425msgid "No pending tag conflicts to be resolved"
    44264426msgstr ""
    44274427
    4428 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
     4428#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
    44294429#, java-format
    44304430msgid "Tags({0} conflict)"
     
    44334433msgstr[1] ""
    44344434
    4435 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4435#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
    44364436#, java-format
    44374437msgid "{0} pending tag conflict to be resolved"
     
    44404440msgstr[1] ""
    44414441
    4442 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
     4442#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
    44434443msgid "Nodes(resolved)"
    44444444msgstr ""
    44454445
    4446 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4446#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    44474447msgid ""
    44484448"Merged node list frozen. No pending conflicts in the node list of this way"
    44494449msgstr ""
    44504450
    4451 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
     4451#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
    44524452msgid "Nodes(with conflicts)"
    44534453msgstr ""
    44544454
    4455 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4455#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
    44564456msgid "Pending conflicts in the node list of this way"
    44574457msgstr ""
    44584458
    4459 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
     4459#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    44604460msgid "Members(resolved)"
    44614461msgstr ""
    44624462
    4463 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     4463#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    44644464msgid ""
    44654465"Merged member list frozen. No pending conflicts in the member list of this "
     
    44674467msgstr ""
    44684468
    4469 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4469#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    44704470msgid "Members(with conflicts)"
    44714471msgstr ""
    44724472
    4473 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4473#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    44744474msgid "Pending conflicts in the member list of this relation"
    44754475msgstr ""
    44764476
    4477 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     4477#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    44784478msgid "No pending property conflicts"
    44794479msgstr ""
    44804480
    4481 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
     4481#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
    44824482msgid "Properties(with conflicts)"
    44834483msgstr ""
    44844484
    4485 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     4485#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
    44864486msgid "Pending property conflicts to be resolved"
    44874487msgstr ""
    44884488
    4489 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
     4489#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
    44904490msgid "Conflict Resolution"
    44914491msgstr "Odpravljanje sporov"
     
    45314531
    45324532#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    4533 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4533#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    45344534msgid "My version"
    45354535msgstr ""
     
    45404540
    45414541#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    4542 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
    4543 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
     4542#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4543#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    45444544msgid "Merged version"
    45454545msgstr ""
     
    45524552
    45534553#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    4554 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
     4554#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    45554555msgid "Their version"
    45564556msgstr ""
     
    47194719msgstr "Vozlišče"
    47204720
    4721 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4721#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
    47224722msgid "Merged nodes not frozen yet. Cannot build resolution command."
    47234723msgstr ""
    47244724
    4725 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
     4725#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463
    47264726#, java-format
    47274727msgid ""
     
    47304730msgstr ""
    47314731
    4732 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
     4732#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    47334733msgid "Communication with server failed"
    47344734msgstr ""
    47354735
    4736 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
    4737 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
     4736#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509
     4737#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543
    47384738msgid "Yes, undelete them too"
    47394739msgstr ""
    47404740
    4741 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
    4742 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
     4741#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
     4742#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
    47434743msgid "No, cancel operation"
    47444744msgstr ""
    47454745
    4746 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
     4746#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
    47474747#, java-format
    47484748msgid ""
     
    47554755msgstr[1] ""
    47564756
    4757 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
     4757#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524
    47584758msgid "Undelete additional nodes?"
    47594759msgstr ""
    47604760
    4761 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
     4761#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548
    47624762#, java-format
    47634763msgid ""
     
    47704770msgstr[1] ""
    47714771
    4772 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
     4772#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558
    47734773msgid "Undelete dependent primitives?"
    47744774msgstr ""
    47754775
    4776 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
     4776#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
    47774777msgid "Properties in my dataset, i.e. the local dataset"
    47784778msgstr ""
    47794779
    4780 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4780#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
    47814781msgid ""
    47824782"Properties in the merged element. They will replace properties in my "
     
    47844784msgstr ""
    47854785
    4786 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
     4786#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
    47874787msgid "Properties in their dataset, i.e. the server dataset"
    47884788msgstr ""
    47894789
    4790 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
     4790#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
    47914791msgid "Coordinates:"
    47924792msgstr ""
    47934793
    4794 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
     4794#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
    47954795msgid "Deleted State:"
    47964796msgstr ""
    47974797
    4798 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
     4798#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
    47994799msgid "Visible State:"
    48004800msgstr ""
    48014801
    4802 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     4802#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
    48034803msgid "Referenced by:"
    48044804msgstr ""
    48054805
    4806 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
    4807 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
    4808 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
    4809 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
    4810 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
     4806#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
     4807#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
     4808#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
     4809#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
     4810#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
    48114811#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
    48124812msgid "(none)"
    48134813msgstr ""
    48144814
    4815 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
     4815#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
    48164816#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    48174817msgid "deleted"
    48184818msgstr "izbrisano"
    48194819
    4820 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
     4820#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
    48214821msgid "not deleted"
    48224822msgstr ""
    48234823
    4824 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
     4824#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
    48254825msgid "visible (on the server)"
    48264826msgstr ""
    48274827
    4828 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
     4828#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
    48294829msgid "not visible (on the server)"
    48304830msgstr ""
    48314831
    4832 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
     4832#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
    48334833msgid "Keep a clone of the local version"
    48344834msgstr ""
    48354835
    4836 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
     4836#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
    48374837msgid "Physically delete from local dataset"
    48384838msgstr ""
    48394839
    4840 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
     4840#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
    48414841msgid "Keep my coordiates"
    48424842msgstr ""
    48434843
    4844 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
     4844#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
    48454845msgid "Keep their coordiates"
    48464846msgstr ""
    48474847
    4848 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
     4848#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
    48494849msgid "Undecide conflict between different coordinates"
    48504850msgstr ""
    48514851
    4852 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
     4852#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
    48534853msgid "Keep my deleted state"
    48544854msgstr ""
    48554855
    4856 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     4856#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
    48574857msgid "Keep their deleted state"
    48584858msgstr ""
    48594859
    4860 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
     4860#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
    48614861msgid "Undecide conflict between deleted state"
    48624862msgstr ""
    48634863
    4864 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     4864#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
    48654865msgid "Keep my visible state"
    48664866msgstr ""
    48674867
    4868 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
     4868#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    48694869msgid "Yes, reset the id"
    48704870msgstr ""
    48714871
    4872 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
     4872#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
    48734873#, java-format
    48744874msgid ""
     
    48784878msgstr ""
    48794879
    4880 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
     4880#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
    48814881msgid "Reset id to 0"
    48824882msgstr ""
    48834883
    4884 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
     4884#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
    48854885msgid "Keep their visible state"
    48864886msgstr ""
    48874887
    4888 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
     4888#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    48894889msgid "Yes, purge it"
    48904890msgstr ""
    48914891
    4892 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
     4892#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
    48934893#, java-format
    48944894msgid ""
     
    48974897msgstr ""
    48984898
    4899 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
     4899#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
    49004900msgid "Remove from dataset"
    49014901msgstr ""
    49024902
    4903 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
     4903#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
    49044904msgid "Undecide conflict between visible state"
    49054905msgstr ""
     
    49694969msgstr ""
    49704970
    4971 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
     4971#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
    49724972msgid "My version (local dataset)"
    49734973msgstr ""
    49744974
    4975 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
     4975#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
    49764976msgid "Their version (server dataset)"
    49774977msgstr ""
    49784978
    4979 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
     4979#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
    49804980msgid "Keep the selected key/value pairs from the local dataset"
    49814981msgstr ""
    49824982
    4983 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
     4983#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
    49844984msgid "Keep the selected key/value pairs from the server dataset"
    49854985msgstr ""
    49864986
    4987 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
     4987#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
    49884988msgid "Undecide"
    49894989msgstr ""
    49904990
    4991 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
     4991#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
    49924992msgid "Mark the selected tags as undecided"
    49934993msgstr ""
     
    50305030#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    50315031#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
    5032 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
     5032#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124
    50335033msgid "Apply"
    50345034msgstr ""
     
    53355335msgstr ""
    53365336
    5337 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5337#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    53385338#, java-format
    53395339msgid "Conflicts: {0} unresolved"
    53405340msgstr ""
    53415341
    5342 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
     5342#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325
    53435343msgid "Resolve"
    53445344msgstr "Razreši"
    53455345
    5346 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
     5346#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
    53475347msgid "Open a merge dialog of all selected items in the list above."
    53485348msgstr ""
    53495349
    5350 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
     5350#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
    53515351#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    53525352#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
     
    54675467
    54685468#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
    5469 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
     5469#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
    54705470#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
    54715471#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
     
    55625562
    55635563#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
    5564 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     5564#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
    55655565msgid "Create a copy of this relation and open it in another editor window"
    55665566msgstr ""
     
    56145614
    56155615#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    5616 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
     5616#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
    56175617#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    56185618msgid "Selection"
     
    73027302#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
    73037303#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
    7304 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     7304#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095
    73057305msgid "Conflict in data"
    73067306msgid_plural "Conflicts in data"
     
    73497349msgstr ""
    73507350
    7351 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
     7351#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
    73527352msgid "Tags and Members"
    73537353msgstr ""
    73547354
    7355 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
    7356 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     7355#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
     7356#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
    73577357msgid "Parent Relations"
    73587358msgstr ""
    73597359
    7360 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
     7360#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
    73617361msgid "Child Relations"
    73627362msgstr ""
    73637363
    7364 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
     7364#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
    73657365msgid "Apply Role:"
    73667366msgstr ""
    73677367
    7368 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295
     7368#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
    73697369msgid "Enter a role and apply it to the selected relation members"
    73707370msgstr ""
    73717371
    7372 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
     7372#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
    73737373msgid ""
    73747374"<html>There is at least one member in this relation referring<br>to the "
     
    73777377msgstr ""
    73787378
    7379 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
    7380 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
     7379#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
     7380#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    73817381msgid "Remove them, clean up relation"
    73827382msgstr ""
    73837383
    7384 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     7384#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
    73857385msgid "Ignore them, leave relation as is"
    73867386msgstr ""
    73877387
    7388 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
     7388#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
    73897389#, java-format
    73907390msgid ""
     
    73947394msgstr ""
    73957395
    7396 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
     7396#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
    73977397msgid "Multiple members referring to same primitive"
    73987398msgstr ""
    73997399
    7400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
     7400#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
    74017401#, java-format
    74027402msgid ""
     
    74067406msgstr ""
    74077407
    7408 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
     7408#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
    74097409msgid ""
    74107410"Add all primitives selected in the current dataset before the first member"
    74117411msgstr ""
    74127412
    7413 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
     7413#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
    74147414msgid ""
    74157415"Add all primitives selected in the current dataset after the last member"
    74167416msgstr ""
    74177417
    7418 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
     7418#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
    74197419msgid ""
    74207420"Add all primitives selected in the current dataset before the first selected "
     
    74227422msgstr ""
    74237423
    7424 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
     7424#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
    74257425msgid ""
    74267426"Add all primitives selected in the current dataset after the last selected "
     
    74287428msgstr ""
    74297429
    7430 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
     7430#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
    74317431msgid "Remove all members referring to one of the selected primitives"
    74327432msgstr ""
    74337433
    74347434#. putValue(NAME, tr("Remove Selected"));
    7435 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
     7435#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
    74367436msgid "Relation Editor: Remove Selected"
    74377437msgstr ""
    74387438
    7439 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
    7440 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
     7439#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
     7440#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
    74417441msgid ""
    74427442"Select relation members which refer to primitives in the current selection"
    74437443msgstr ""
    74447444
    7445 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
     7445#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
    74467446#, java-format
    74477447msgid ""
     
    74507450msgstr ""
    74517451
    7452 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     7452#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
    74537453msgid "Select primitives for selected relation members"
    74547454msgstr ""
    74557455
    7456 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
     7456#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
    74577457msgid "Sort the relation members"
    74587458msgstr ""
    74597459
    7460 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
     7460#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
    74617461msgid "Sort"
    74627462msgstr ""
    74637463
    7464 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
     7464#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
    74657465msgid "Relation Editor: Sort"
    74667466msgstr ""
    74677467
    7468 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
     7468#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    74697469msgid "Reverse the order of the relation members"
    74707470msgstr ""
    74717471
    7472 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
     7472#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
    74737473msgid "Reverse"
    74747474msgstr ""
    74757475
    7476 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
     7476#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    74777477msgid "Relation Editor: Reverse"
    74787478msgstr ""
    74797479
    7480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
     7480#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
    74817481msgid "Move the currently selected members up"
    74827482msgstr "Pomakni izbranega člana vrstico višje."
    74837483
    74847484#. putValue(NAME, tr("Move Up"));
    7485 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
     7485#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933
    74867486msgid "Relation Editor: Move Up"
    74877487msgstr ""
    74887488
    7489 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
     7489#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
    74907490msgid "Move the currently selected members down"
    74917491msgstr "Pomakni izbranega člana vrstico nižje."
    74927492
    74937493#. putValue(NAME, tr("Move Down"));
    7494 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
     7494#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
    74957495msgid "Relation Editor: Move Down"
    74967496msgstr ""
    74977497
    7498 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
     7498#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
    74997499msgid "Remove the currently selected members from this relation"
    75007500msgstr ""
    75017501
    75027502#. putValue(NAME, tr("Remove"));
    7503 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
     7503#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    75047504msgid "Relation Editor: Remove"
    75057505msgstr ""
    75067506
    7507 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
     7507#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
    75087508msgid "Delete the currently edited relation"
    75097509msgstr ""
    75107510
    7511 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     7511#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
    75127512msgid "Yes, create a conflict and close"
    75137513msgstr ""
    75147514
    7515 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
     7515#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
    75167516msgid "Click to create a conflict and close this relation editor"
    75177517msgstr ""
    75187518
    7519 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
     7519#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    75207520msgid "No, continue editing"
    75217521msgstr ""
    75227522
    7523 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
     7523#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
    75247524msgid "Click to return to the relation editor and to resume relation editing"
    75257525msgstr ""
    75267526
    7527 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
     7527#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
    75287528msgid ""
    75297529"<html>This relation has been changed outside of the editor.<br>You cannot "
     
    75327532msgstr ""
    75337533
    7534 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
     7534#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
    75357535#, java-format
    75367536msgid ""
     
    75397539msgstr ""
    75407540
    7541 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
     7541#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
    75427542msgid "Apply the current updates"
    75437543msgstr ""
    75447544
    7545 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
     7545#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
    75467546msgid "Apply the updates and close the dialog"
    75477547msgstr ""
    75487548
    7549 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
     7549#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    75507550msgid "Cancel the updates and close the dialog"
    75517551msgstr ""
    75527552
    7553 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7553#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
    75547554msgid "Add an empty tag"
    75557555msgstr ""
    75567556
    7557 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
     7557#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    75587558msgid "Download all incomplete members"
    75597559msgstr ""
    75607560
    7561 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
    7562 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
     7561#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
     7562#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256
    75637563msgid "Download Members"
    75647564msgstr ""
    75657565
    7566 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
     7566#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
     7567#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
     7568msgid "Relation Editor: Download Members"
     7569msgstr ""
     7570
    75677571#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
    7568 msgid "Relation Editor: Download Members"
    7569 msgstr ""
    7570 
    7571 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
    75727572msgid "Download selected incomplete members"
    75737573msgstr ""
    75747574
    7575 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
     7575#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
    75767576msgid "Sets a role for the selected members"
    75777577msgstr ""
    75787578
    7579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
     7579#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    75807580msgid "Apply Role"
    75817581msgstr ""
    75827582
    7583 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306
     7583#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
    75847584#, java-format
    75857585msgid "You are setting an empty role on {0} primitive."
     
    75887588msgstr[1] ""
    75897589
    7590 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
     7590#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    75917591msgid "This is equal to deleting the roles of these primitives."
    75927592msgstr ""
    75937593
    7594 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311
     7594#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
    75957595msgid "Do you really want to apply the new role?"
    75967596msgstr ""
    75977597
    7598 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313
     7598#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
    75997599msgid "Yes, apply it"
    76007600msgstr ""
    76017601
    7602 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
     7602#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
    76037603msgid "No, do not apply"
    76047604msgstr ""
    76057605
    7606 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
     7606#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
    76077607msgid "Confirm empty role"
    76087608msgstr ""
    76097609
    7610 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
     7610#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
    76117611msgid "Edit the relation the currently selected relation member refers to"
    76127612msgstr ""
     
    76517651msgstr ""
    76527652
    7653 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
     7653#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
    76547654msgid "Load parent relations"
    76557655msgstr ""
    76567656
    7657 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
     7657#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
    76587658msgid "Loading parent relations"
    76597659msgstr ""
    76607660
    7661 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
     7661#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    76627662msgid "Edit the currently selected relation"
    76637663msgstr ""
     
    1364213642msgstr ""
    1364313643
    13644 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
     13644#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353
    1364513645#, java-format
    1364613646msgid "Unable to find translation for the locale {0}. Reverting to {1}."
Note: See TracChangeset for help on using the changeset viewer.