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

i18n update

File:
1 edited

Legend:

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

    r20093 r20140  
    1111"Project-Id-Version: JOSM\n"
    1212"Report-Msgid-Bugs-To: \n"
    13 "POT-Creation-Date: 2010-02-21 09:35+0100\n"
    14 "PO-Revision-Date: 2010-02-18 17:18+0000\n"
    15 "Last-Translator: Bruce Cowan <Unknown>\n"
     13"POT-Creation-Date: 2010-02-24 19:46+0100\n"
     14"PO-Revision-Date: 2010-02-21 10:08+0000\n"
     15"Last-Translator: bastik <Unknown>\n"
    1616"Language-Team: German <josm-dev@openstreetmap.org>\n"
    1717"MIME-Version: 1.0\n"
     
    1919"Content-Transfer-Encoding: 8bit\n"
    2020"Plural-Forms: nplurals=2; plural=n != 1;\n"
    21 "X-Launchpad-Export-Date: 2010-02-21 08:13+0000\n"
     21"X-Launchpad-Export-Date: 2010-02-24 18:32+0000\n"
    2222"X-Generator: Launchpad (build Unknown)\n"
    2323
     
    7272#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
    7373#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
    74 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
    75 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
     74#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     75#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
    7676#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
    7777#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
     
    251251#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    252252#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
    253 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
     253#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
    254254#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    255255#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373
     
    397397#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    398398#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    399 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
     399#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    400400#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    401401#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
     
    701701#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    702702#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
    703 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
     703#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
    704704#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
    705705#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
     
    823823#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    824824#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
    825 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
     825#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
    826826msgid "Duplicate"
    827827msgstr "Duplicate"
     
    16791679
    16801680#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
    1681 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    1682 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
     1681#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
     1682#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
    16831683#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    16841684msgid "No, abort"
     
    24072407#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    24082408#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2409 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
     2409#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
    24102410#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    24112411#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
     
    29922992
    29932993#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    2994 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
     2994#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
    29952995msgid "Double conflict"
    29962996msgstr "Double conflict"
     
    30263026#. should not happen
    30273027#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
    3028 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
     3028#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
    30293029msgid "Cannot resolve undecided conflict."
    30303030msgstr "cannot resolve undecided conflict"
     
    32003200msgstr "Resolve version conflict for relation {0}"
    32013201
    3202 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
     3202#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
    32033203#, java-format
    32043204msgid "Resolve conflicts in node list of way {0}"
    32053205msgstr "Resolve conflicts in node list of way {0}"
    32063206
    3207 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
     3207#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
    32083208#, java-format
    32093209msgid "Main dataset does not include node {0}"
     
    35073507"error, it should be safe to continue in your work."
    35083508
    3509 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148
    3510 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
     3509#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150
     3510#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    35113511#, java-format
    35123512msgid "Missing merge target for way with id {0}"
    35133513msgstr "Missing merge target for way with id {0}"
    35143514
    3515 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164
    3516 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228
     3515#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
     3516#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
    35173517#, java-format
    35183518msgid "Missing merge target for node with id {0}"
    35193519msgstr "Missing merge target for node with id {0}"
    35203520
    3521 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187
     3521#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    35223522#, java-format
    35233523msgid "Missing merge target for object with id {0}"
    35243524msgstr "Missing merge target for object with id {0}"
    35253525
    3526 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243
     3526#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250
    35273527#, java-format
    35283528msgid "Missing merge target for relation with id {0}"
    35293529msgstr "Missing merge target for relation with id {0}"
    35303530
    3531 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248
     3531#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255
    35323532#, java-format
    35333533msgid "Missing merge target of type {0} with id {1}"
     
    35373537#. FIXME: this message does not make sense, source version can not be lower than
    35383538#. target version at this point
    3539 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:281
     3539#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292
    35403540#, java-format
    35413541msgid ""
     
    36903690"multiple values."
    36913691
    3692 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
    3693 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3692#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
     3693#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    36943694#, java-format
    36953695msgid "Cannot add node {0} to incomplete way {1}."
     
    38073807#. darker blue
    38083808#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3809 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
     3809#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    38103810#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183
    38113811msgid "background"
     
    40504050#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    40514051#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
    4052 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
     4052#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
    40534053msgid "Conflict"
    40544054msgstr "Conflict"
     
    43064306#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    43074307#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    4308 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
     4308#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
    43094309#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
    43104310#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     
    45484548msgstr "role {0} is not participating in compare pair {1}"
    45494549
    4550 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
    4551 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
     4550#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4551#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
    45524552#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    45534553msgid "Properties"
    45544554msgstr "Properties"
    45554555
    4556 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
    4557 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
     4556#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4557#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
    45584558#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    4559 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235
     4559#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
    45604560#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    45614561#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507
     
    45644564msgstr "Tags"
    45654565
    4566 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
    4567 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
     4566#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4567#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
    45684568#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    45694569#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
     
    45714571msgstr "Nodes"
    45724572
    4573 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
    4574 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    4575 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
     4573#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
     4574#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
     4575#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
    45764576#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    45774577msgid "Members"
    45784578msgstr "Members"
    45794579
    4580 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     4580#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    45814581msgid "No pending tag conflicts to be resolved"
    45824582msgstr "No pending tag conflicts to be resolved"
    45834583
    4584 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
     4584#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
    45854585#, java-format
    45864586msgid "Tags({0} conflict)"
     
    45894589msgstr[1] "Tags({0} conflicts)"
    45904590
    4591 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4591#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
    45924592#, java-format
    45934593msgid "{0} pending tag conflict to be resolved"
     
    45964596msgstr[1] "{0} pending tag conflicts to be resolved"
    45974597
    4598 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
     4598#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
    45994599msgid "Nodes(resolved)"
    46004600msgstr "Nodes(resolved)"
    46014601
    4602 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4602#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    46034603msgid ""
    46044604"Merged node list frozen. No pending conflicts in the node list of this way"
     
    46064606"Merged node list frozen. No pending conflicts in the node list of this way"
    46074607
    4608 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
     4608#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
    46094609msgid "Nodes(with conflicts)"
    46104610msgstr "Nodes(with conflicts)"
    46114611
    4612 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4612#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
    46134613msgid "Pending conflicts in the node list of this way"
    46144614msgstr "Pending conflicts in the node list of this way"
    46154615
    4616 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
     4616#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    46174617msgid "Members(resolved)"
    46184618msgstr "Members(resolved)"
    46194619
    4620 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     4620#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    46214621msgid ""
    46224622"Merged member list frozen. No pending conflicts in the member list of this "
     
    46264626"relation"
    46274627
    4628 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4628#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    46294629msgid "Members(with conflicts)"
    46304630msgstr "Members(with conflicts)"
    46314631
    4632 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4632#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    46334633msgid "Pending conflicts in the member list of this relation"
    46344634msgstr "Pending conflicts in the member list of this relation"
    46354635
    4636 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     4636#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    46374637msgid "No pending property conflicts"
    46384638msgstr "No pending property conflicts"
    46394639
    4640 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
     4640#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
    46414641msgid "Properties(with conflicts)"
    46424642msgstr "Properties(with conflicts)"
    46434643
    4644 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     4644#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
    46454645msgid "Pending property conflicts to be resolved"
    46464646msgstr "Pending property conflicts to be resolved"
    46474647
    4648 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
     4648#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
    46494649msgid "Conflict Resolution"
    46504650msgstr "Conflict Resolution"
     
    46904690
    46914691#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    4692 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4692#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    46934693msgid "My version"
    46944694msgstr "My version"
     
    46994699
    47004700#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    4701 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
    4702 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
     4701#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4702#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    47034703msgid "Merged version"
    47044704msgstr "Merged version"
     
    47134713
    47144714#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    4715 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
     4715#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    47164716msgid "Their version"
    47174717msgstr "Their version"
     
    48944894msgstr "Node"
    48954895
    4896 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4896#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
    48974897msgid "Merged nodes not frozen yet. Cannot build resolution command."
    48984898msgstr "Merged nodes not frozen yet. Cannot build resolution command."
    48994899
    4900 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
     4900#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463
    49014901#, java-format
    49024902msgid ""
     
    49074907"html>"
    49084908
    4909 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
     4909#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    49104910msgid "Communication with server failed"
    49114911msgstr "Communication with server failed"
    49124912
    4913 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
    4914 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
     4913#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509
     4914#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543
    49154915msgid "Yes, undelete them too"
    49164916msgstr "Yes, undelete them too"
    49174917
    4918 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
    4919 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
     4918#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
     4919#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
    49204920msgid "No, cancel operation"
    49214921msgstr "No, cancel operation"
    49224922
    4923 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
     4923#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
    49244924#, java-format
    49254925msgid ""
     
    49364936"server.<br><br>Do you want to undelete these nodes too?"
    49374937
    4938 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
     4938#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524
    49394939msgid "Undelete additional nodes?"
    49404940msgstr "Undelete additional nodes?"
    49414941
    4942 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
     4942#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548
    49434943#, java-format
    49444944msgid ""
     
    49554955"deleted on the server.<br><br>Do you want to undelete them too?"
    49564956
    4957 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
     4957#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558
    49584958msgid "Undelete dependent primitives?"
    49594959msgstr "Undelete dependent primitives?"
    49604960
    4961 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
     4961#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
    49624962msgid "Properties in my dataset, i.e. the local dataset"
    49634963msgstr "Properties in my dataset, i.e. the local dataset"
    49644964
    4965 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4965#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
    49664966msgid ""
    49674967"Properties in the merged element. They will replace properties in my "
     
    49714971"elements when merge decisions are applied."
    49724972
    4973 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
     4973#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
    49744974msgid "Properties in their dataset, i.e. the server dataset"
    49754975msgstr "Properties in their dataset, i.e. the server dataset"
    49764976
    4977 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
     4977#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
    49784978msgid "Coordinates:"
    49794979msgstr "Coordinates:"
    49804980
    4981 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
     4981#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
    49824982msgid "Deleted State:"
    49834983msgstr "Deleted State:"
    49844984
    4985 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
     4985#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
    49864986msgid "Visible State:"
    49874987msgstr "Visible State:"
    49884988
    4989 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     4989#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
    49904990msgid "Referenced by:"
    49914991msgstr ""
    49924992
    4993 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
    4994 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
    4995 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
    4996 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
    4997 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
     4993#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
     4994#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
     4995#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
     4996#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
     4997#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
    49984998#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
    49994999msgid "(none)"
    50005000msgstr "(none)"
    50015001
    5002 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
     5002#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
    50035003#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    50045004msgid "deleted"
    50055005msgstr "deleted"
    50065006
    5007 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
     5007#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
    50085008msgid "not deleted"
    50095009msgstr "not deleted"
    50105010
    5011 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
     5011#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
    50125012msgid "visible (on the server)"
    50135013msgstr "visible (on the server)"
    50145014
    5015 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
     5015#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
    50165016msgid "not visible (on the server)"
    50175017msgstr "not visible (on the server)"
    50185018
    5019 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
     5019#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
    50205020msgid "Keep a clone of the local version"
    50215021msgstr "Keep a clone of the local version"
    50225022
    5023 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
     5023#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
    50245024msgid "Physically delete from local dataset"
    50255025msgstr "Physically delete from local dataset"
    50265026
    5027 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
     5027#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
    50285028msgid "Keep my coordiates"
    50295029msgstr "Keep my coordiates"
    50305030
    5031 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
     5031#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
    50325032msgid "Keep their coordiates"
    50335033msgstr "Keep their coordiates"
    50345034
    5035 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
     5035#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
    50365036msgid "Undecide conflict between different coordinates"
    50375037msgstr "Undecide conflict between different coordinates"
    50385038
    5039 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
     5039#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
    50405040msgid "Keep my deleted state"
    50415041msgstr "Keep my deleted state"
    50425042
    5043 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     5043#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
    50445044msgid "Keep their deleted state"
    50455045msgstr "Keep their deleted state"
    50465046
    5047 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
     5047#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
    50485048msgid "Undecide conflict between deleted state"
    50495049msgstr "Undecide conflict between deleted state"
    50505050
    5051 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     5051#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
    50525052msgid "Keep my visible state"
    50535053msgstr "Keep my visible state"
    50545054
    5055 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
     5055#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    50565056msgid "Yes, reset the id"
    50575057msgstr "Yes, reset the id"
    50585058
    5059 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
     5059#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
    50605060#, java-format
    50615061msgid ""
     
    50685068"yo agree?</html>"
    50695069
    5070 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
     5070#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
    50715071msgid "Reset id to 0"
    50725072msgstr "Reset id to 0"
    50735073
    5074 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
     5074#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
    50755075msgid "Keep their visible state"
    50765076msgstr "Keep their visible state"
    50775077
    5078 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
     5078#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    50795079msgid "Yes, purge it"
    50805080msgstr "Yes, purge it"
    50815081
    5082 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
     5082#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
    50835083#, java-format
    50845084msgid ""
     
    50895089"dataset.<br>Do you agree?</html>"
    50905090
    5091 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
     5091#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
    50925092msgid "Remove from dataset"
    50935093msgstr "Remove from dataset"
    50945094
    5095 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
     5095#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
    50965096msgid "Undecide conflict between visible state"
    50975097msgstr "Undecide conflict between visible state"
     
    51615161msgstr "cannot apply undecided tag merge item"
    51625162
    5163 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
     5163#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
    51645164msgid "My version (local dataset)"
    51655165msgstr "My version (local dataset)"
    51665166
    5167 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
     5167#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
    51685168msgid "Their version (server dataset)"
    51695169msgstr "Their version (server dataset)"
    51705170
    5171 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
     5171#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
    51725172msgid "Keep the selected key/value pairs from the local dataset"
    51735173msgstr "Keep the selected key/value pairs from the local dataset"
    51745174
    5175 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
     5175#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
    51765176msgid "Keep the selected key/value pairs from the server dataset"
    51775177msgstr "Keep the selected key/value pairs from the server dataset"
    51785178
    5179 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
     5179#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
    51805180msgid "Undecide"
    51815181msgstr "Undecide"
    51825182
    5183 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
     5183#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
    51845184msgid "Mark the selected tags as undecided"
    51855185msgstr "Mark the selected tags as undecided"
     
    52225222#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    52235223#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
    5224 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
     5224#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124
    52255225msgid "Apply"
    52265226msgstr "Apply"
     
    55455545msgstr "Resolve conflicts."
    55465546
    5547 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5547#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    55485548#, java-format
    55495549msgid "Conflicts: {0} unresolved"
    55505550msgstr ""
    55515551
    5552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
     5552#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325
    55535553msgid "Resolve"
    55545554msgstr "Resolve"
    55555555
    5556 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
     5556#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
    55575557msgid "Open a merge dialog of all selected items in the list above."
    55585558msgstr "Open a merge dialogue of all selected items in the list above."
    55595559
    5560 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
     5560#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
    55615561#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    55625562#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
     
    56835683
    56845684#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
    5685 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
     5685#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
    56865686#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
    56875687#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
     
    57785778
    57795779#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
    5780 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     5780#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
    57815781msgid "Create a copy of this relation and open it in another editor window"
    57825782msgstr "Create a copy of this relation and open it in another editor window"
     
    58305830
    58315831#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    5832 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
     5832#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
    58335833#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    58345834msgid "Selection"
     
    75587558#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
    75597559#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
    7560 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     7560#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095
    75617561msgid "Conflict in data"
    75627562msgid_plural "Conflicts in data"
     
    76077607msgstr "({0}/{1}): Downloading relation ''{2}''..."
    76087608
    7609 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
     7609#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
    76107610msgid "Tags and Members"
    76117611msgstr "Tags and Members"
    76127612
    7613 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
    7614 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     7613#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
     7614#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
    76157615msgid "Parent Relations"
    76167616msgstr "Parent Relations"
    76177617
    7618 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
     7618#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
    76197619msgid "Child Relations"
    76207620msgstr "Child Relations"
    76217621
    7622 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
     7622#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
    76237623msgid "Apply Role:"
    76247624msgstr "Apply Role:"
    76257625
    7626 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295
     7626#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
    76277627msgid "Enter a role and apply it to the selected relation members"
    76287628msgstr "Enter a role and apply it to the selected relation members"
    76297629
    7630 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
     7630#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
    76317631msgid ""
    76327632"<html>There is at least one member in this relation referring<br>to the "
     
    76387638"<br>How do you want to proceed with circular dependencies?</html>"
    76397639
    7640 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
    7641 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
     7640#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
     7641#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    76427642msgid "Remove them, clean up relation"
    76437643msgstr "Remove them, clean up relation"
    76447644
    7645 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     7645#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
    76467646msgid "Ignore them, leave relation as is"
    76477647msgstr "Ignore them, leave relation as is"
    76487648
    7649 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
     7649#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
    76507650#, java-format
    76517651msgid ""
     
    76587658"html>"
    76597659
    7660 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
     7660#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
    76617661msgid "Multiple members referring to same primitive"
    76627662msgstr "Multiple members referring to same primitive"
    76637663
    7664 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
     7664#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
    76657665#, java-format
    76667666msgid ""
     
    76737673"''{0}''.</html>"
    76747674
    7675 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
     7675#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
    76767676msgid ""
    76777677"Add all primitives selected in the current dataset before the first member"
     
    76797679"Add all primitives selected in the current dataset before the first member"
    76807680
    7681 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
     7681#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
    76827682msgid ""
    76837683"Add all primitives selected in the current dataset after the last member"
     
    76857685"Add all primitives selected in the current dataset after the last member"
    76867686
    7687 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
     7687#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
    76887688msgid ""
    76897689"Add all primitives selected in the current dataset before the first selected "
     
    76937693"member"
    76947694
    7695 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
     7695#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
    76967696msgid ""
    76977697"Add all primitives selected in the current dataset after the last selected "
     
    77017701"member"
    77027702
    7703 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
     7703#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
    77047704msgid "Remove all members referring to one of the selected primitives"
    77057705msgstr "Remove all members referring to one of the selected primitives"
    77067706
    77077707#. putValue(NAME, tr("Remove Selected"));
    7708 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
     7708#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
    77097709msgid "Relation Editor: Remove Selected"
    77107710msgstr "Relation Editor: Remove Selected"
    77117711
    7712 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
    7713 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
     7712#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
     7713#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
    77147714msgid ""
    77157715"Select relation members which refer to primitives in the current selection"
     
    77177717"Select relation members which refer to primitives in the current selection"
    77187718
    7719 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
     7719#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
    77207720#, java-format
    77217721msgid ""
     
    77267726"selection"
    77277727
    7728 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     7728#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
    77297729msgid "Select primitives for selected relation members"
    77307730msgstr "Select primitives for selected relation members"
    77317731
    7732 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
     7732#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
    77337733msgid "Sort the relation members"
    77347734msgstr "Sort the relation members"
    77357735
    7736 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
     7736#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
    77377737msgid "Sort"
    77387738msgstr "Sort"
    77397739
    7740 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
     7740#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
    77417741msgid "Relation Editor: Sort"
    77427742msgstr "Relation Editor: Sort"
    77437743
    7744 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
     7744#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    77457745msgid "Reverse the order of the relation members"
    77467746msgstr "Reverse the order of the relation members"
    77477747
    7748 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
     7748#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
    77497749msgid "Reverse"
    77507750msgstr "Reverse"
    77517751
    7752 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
     7752#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    77537753msgid "Relation Editor: Reverse"
    77547754msgstr "Relation Editor: Reverse"
    77557755
    7756 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
     7756#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
    77577757msgid "Move the currently selected members up"
    77587758msgstr "Move the currently selected members up"
    77597759
    77607760#. putValue(NAME, tr("Move Up"));
    7761 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
     7761#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933
    77627762msgid "Relation Editor: Move Up"
    77637763msgstr "Relation Editor: Move Up"
    77647764
    7765 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
     7765#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
    77667766msgid "Move the currently selected members down"
    77677767msgstr "Move the currently selected members down"
    77687768
    77697769#. putValue(NAME, tr("Move Down"));
    7770 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
     7770#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
    77717771msgid "Relation Editor: Move Down"
    77727772msgstr "Relation Editor: Move Down"
    77737773
    7774 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
     7774#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
    77757775msgid "Remove the currently selected members from this relation"
    77767776msgstr "Remove the currently selected members from this relation"
    77777777
    77787778#. putValue(NAME, tr("Remove"));
    7779 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
     7779#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    77807780msgid "Relation Editor: Remove"
    77817781msgstr "Relation Editor: Remove"
    77827782
    7783 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
     7783#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
    77847784msgid "Delete the currently edited relation"
    77857785msgstr "Delete the currently edited relation"
    77867786
    7787 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     7787#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
    77887788msgid "Yes, create a conflict and close"
    77897789msgstr "Yes, create a conflict and close"
    77907790
    7791 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
     7791#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
    77927792msgid "Click to create a conflict and close this relation editor"
    77937793msgstr "Click to create a conflict and close this relation editor"
    77947794
    7795 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
     7795#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    77967796msgid "No, continue editing"
    77977797msgstr "No, continue editing"
    77987798
    7799 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
     7799#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
    78007800msgid "Click to return to the relation editor and to resume relation editing"
    78017801msgstr "Click to return to the relation editor and to resume relation editing"
    78027802
    7803 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
     7803#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
    78047804msgid ""
    78057805"<html>This relation has been changed outside of the editor.<br>You cannot "
     
    78117811"conflict and close the editor?</html>"
    78127812
    7813 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
     7813#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
    78147814#, java-format
    78157815msgid ""
     
    78207820"<br>Please resolve this conflict first, then try again.</html>"
    78217821
    7822 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
     7822#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
    78237823msgid "Apply the current updates"
    78247824msgstr "Apply the current updates"
    78257825
    7826 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
     7826#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
    78277827msgid "Apply the updates and close the dialog"
    78287828msgstr "Apply the updates and close the dialog"
    78297829
    7830 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
     7830#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    78317831msgid "Cancel the updates and close the dialog"
    78327832msgstr "Cancel the updates and close the dialog"
    78337833
    7834 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7834#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
    78357835msgid "Add an empty tag"
    78367836msgstr "Add an empty tag"
    78377837
    7838 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
     7838#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    78397839msgid "Download all incomplete members"
    78407840msgstr "Download all incomplete members"
    78417841
    7842 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
    7843 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
     7842#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
     7843#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256
    78447844msgid "Download Members"
    78457845msgstr "Download Members"
    78467846
    7847 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    7848 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
     7847#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
     7848#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
    78497849msgid "Relation Editor: Download Members"
    78507850msgstr "Relation Editor: Download Members"
    78517851
    7852 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
     7852#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
    78537853msgid "Download selected incomplete members"
    78547854msgstr "Download selected incomplete members"
    78557855
    7856 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
     7856#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
    78577857msgid "Sets a role for the selected members"
    78587858msgstr "Sets a role for the selected members"
    78597859
    7860 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
     7860#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    78617861msgid "Apply Role"
    78627862msgstr "Apply Role"
    78637863
    7864 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306
     7864#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
    78657865#, java-format
    78667866msgid "You are setting an empty role on {0} primitive."
     
    78697869msgstr[1] "You are setting an empty role on {0} primitives."
    78707870
    7871 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
     7871#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    78727872msgid "This is equal to deleting the roles of these primitives."
    78737873msgstr "This is equal to deleting the roles of these primitives."
    78747874
    7875 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311
     7875#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
    78767876msgid "Do you really want to apply the new role?"
    78777877msgstr "Do you really want to apply the new role?"
    78787878
    7879 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313
     7879#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
    78807880msgid "Yes, apply it"
    78817881msgstr "Yes, apply it"
    78827882
    7883 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
     7883#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
    78847884msgid "No, do not apply"
    78857885msgstr "No, do not apply"
    78867886
    7887 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
     7887#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
    78887888msgid "Confirm empty role"
    78897889msgstr "Confirm empty role"
    78907890
    7891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
     7891#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
    78927892msgid "Edit the relation the currently selected relation member refers to"
    78937893msgstr "Edit the relation the currently selected relation member refers to"
     
    79327932msgstr "including immediate children of parent relations"
    79337933
    7934 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
     7934#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
    79357935msgid "Load parent relations"
    79367936msgstr "Load parent relations"
    79377937
    7938 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
     7938#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
    79397939msgid "Loading parent relations"
    79407940msgstr "Loading parent relations"
    79417941
    7942 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
     7942#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    79437943msgid "Edit the currently selected relation"
    79447944msgstr "Edit the currently selected relation"
     
    1434914349"<br><br>The error message is:<br>{0}</html>"
    1435014350
    14351 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
     14351#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353
    1435214352#, java-format
    1435314353msgid "Unable to find translation for the locale {0}. Reverting to {1}."
     
    1690216902
    1690316903#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291
    16904 #, fuzzy
    1690516904msgid "Abort tag editing and close dialog"
    16906 msgstr "Apply the updates and close the dialog"
     16905msgstr ""
    1690716906
    1690816907#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304
    16909 #, fuzzy
    1691016908msgid "Apply edited tags and close dialog"
    16911 msgstr "Apply the updates and close the dialog"
     16909msgstr ""
    1691216910
    1691316911#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
     
    3115931157msgstr "Sicily - Italy"
    3116031158
    31161 #~ msgid "<multiple>"
    31162 #~ msgstr "<multiple>"
    31163 
    3116431159#~ msgid "Move"
    3116531160#~ msgstr "Move"
     
    3217032165#~ msgstr "Remove route nodes"
    3217132166
     32167#~ msgid "<multiple>"
     32168#~ msgstr "<multiple>"
     32169
    3217232170#~ msgid "Login name (email) to the OSM account."
    3217332171#~ msgstr "Login name (e-mail) to the OSM account."
Note: See TracChangeset for help on using the changeset viewer.