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

i18n update

File:
1 edited

Legend:

Unmodified
Added
Removed
  • applications/editors/josm/i18n/po/gl.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"
     10"POT-Creation-Date: 2010-02-24 19:46+0100\n"
    1111"PO-Revision-Date: 2010-01-23 22:22+0000\n"
    1212"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
     
    1616"Content-Transfer-Encoding: 8bit\n"
    1717"Plural-Forms: nplurals=2; plural=n != 1;\n"
    18 "X-Launchpad-Export-Date: 2010-02-21 08:16+0000\n"
     18"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n"
    1919"X-Generator: Launchpad (build Unknown)\n"
    2020
     
    6969#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
    7070#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
    71 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
    72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
     71#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     72#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
    7373#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
    7474#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
     
    242242#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    243243#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
    244 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
     244#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
    245245#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    246246#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373
     
    386386#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    387387#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    388 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
     388#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    389389#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    390390#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
     
    688688#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    689689#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
    690 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
     690#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
    691691#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
    692692#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
     
    811811#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    812812#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
    813 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
     813#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
    814814msgid "Duplicate"
    815815msgstr "Duplicar"
     
    16511651
    16521652#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
    1653 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    1654 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
     1653#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
     1654#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
    16551655#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    16561656msgid "No, abort"
     
    23662366#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    23672367#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2368 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
     2368#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
    23692369#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    23702370#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
     
    29332933
    29342934#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    2935 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
     2935#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
    29362936msgid "Double conflict"
    29372937msgstr ""
     
    29642964#. should not happen
    29652965#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
    2966 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
     2966#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
    29672967msgid "Cannot resolve undecided conflict."
    29682968msgstr ""
     
    31383138msgstr ""
    31393139
    3140 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
     3140#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
    31413141#, java-format
    31423142msgid "Resolve conflicts in node list of way {0}"
    31433143msgstr ""
    31443144
    3145 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
     3145#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
    31463146#, java-format
    31473147msgid "Main dataset does not include node {0}"
     
    34183418msgstr ""
    34193419
    3420 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148
    3421 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
     3420#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150
     3421#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    34223422#, java-format
    34233423msgid "Missing merge target for way with id {0}"
    34243424msgstr ""
    34253425
    3426 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164
    3427 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228
     3426#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
     3427#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
    34283428#, java-format
    34293429msgid "Missing merge target for node with id {0}"
    34303430msgstr ""
    34313431
    3432 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187
     3432#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    34333433#, java-format
    34343434msgid "Missing merge target for object with id {0}"
    34353435msgstr ""
    34363436
    3437 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243
     3437#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250
    34383438#, java-format
    34393439msgid "Missing merge target for relation with id {0}"
    34403440msgstr ""
    34413441
    3442 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248
     3442#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255
    34433443#, java-format
    34443444msgid "Missing merge target of type {0} with id {1}"
     
    34483448#. FIXME: this message does not make sense, source version can not be lower than
    34493449#. target version at this point
    3450 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:281
     3450#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292
    34513451#, java-format
    34523452msgid ""
     
    35913591msgstr ""
    35923592
    3593 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
    3594 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3593#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
     3594#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    35953595#, java-format
    35963596msgid "Cannot add node {0} to incomplete way {1}."
     
    37083708#. darker blue
    37093709#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3710 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
     3710#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    37113711#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183
    37123712msgid "background"
     
    39483948#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    39493949#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
    3950 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
     3950#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
    39513951msgid "Conflict"
    39523952msgstr "Conflito"
     
    41984198#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    41994199#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    4200 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
     4200#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
    42014201#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
    42024202#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     
    44344434msgstr ""
    44354435
    4436 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
    4437 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
     4436#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4437#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
    44384438#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    44394439msgid "Properties"
    44404440msgstr ""
    44414441
    4442 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
    4443 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
     4442#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4443#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
    44444444#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    4445 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235
     4445#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
    44464446#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    44474447#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507
     
    44504450msgstr "Etiquetas"
    44514451
    4452 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
    4453 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
     4452#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4453#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
    44544454#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    44554455#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
     
    44574457msgstr ""
    44584458
    4459 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
    4460 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    4461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
     4459#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
     4460#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
     4461#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
    44624462#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    44634463msgid "Members"
    44644464msgstr "Membros"
    44654465
    4466 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     4466#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    44674467msgid "No pending tag conflicts to be resolved"
    44684468msgstr ""
    44694469
    4470 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
     4470#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
    44714471#, java-format
    44724472msgid "Tags({0} conflict)"
     
    44754475msgstr[1] ""
    44764476
    4477 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4477#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
    44784478#, java-format
    44794479msgid "{0} pending tag conflict to be resolved"
     
    44824482msgstr[1] ""
    44834483
    4484 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
     4484#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
    44854485msgid "Nodes(resolved)"
    44864486msgstr ""
    44874487
    4488 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4488#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    44894489msgid ""
    44904490"Merged node list frozen. No pending conflicts in the node list of this way"
    44914491msgstr ""
    44924492
    4493 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
     4493#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
    44944494msgid "Nodes(with conflicts)"
    44954495msgstr ""
    44964496
    4497 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4497#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
    44984498msgid "Pending conflicts in the node list of this way"
    44994499msgstr ""
    45004500
    4501 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
     4501#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    45024502msgid "Members(resolved)"
    45034503msgstr ""
    45044504
    4505 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     4505#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    45064506msgid ""
    45074507"Merged member list frozen. No pending conflicts in the member list of this "
     
    45094509msgstr ""
    45104510
    4511 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4511#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    45124512msgid "Members(with conflicts)"
    45134513msgstr ""
    45144514
    4515 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4515#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    45164516msgid "Pending conflicts in the member list of this relation"
    45174517msgstr ""
    45184518
    4519 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     4519#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    45204520msgid "No pending property conflicts"
    45214521msgstr ""
    45224522
    4523 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
     4523#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
    45244524msgid "Properties(with conflicts)"
    45254525msgstr ""
    45264526
    4527 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     4527#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
    45284528msgid "Pending property conflicts to be resolved"
    45294529msgstr ""
    45304530
    4531 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
     4531#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
    45324532msgid "Conflict Resolution"
    45334533msgstr ""
     
    45734573
    45744574#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    4575 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4575#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    45764576msgid "My version"
    45774577msgstr ""
     
    45824582
    45834583#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    4584 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
    4585 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
     4584#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4585#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    45864586msgid "Merged version"
    45874587msgstr ""
     
    45944594
    45954595#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    4596 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
     4596#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    45974597msgid "Their version"
    45984598msgstr ""
     
    47614761msgstr ""
    47624762
    4763 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4763#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
    47644764msgid "Merged nodes not frozen yet. Cannot build resolution command."
    47654765msgstr ""
    47664766
    4767 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
     4767#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463
    47684768#, java-format
    47694769msgid ""
     
    47724772msgstr ""
    47734773
    4774 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
     4774#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    47754775msgid "Communication with server failed"
    47764776msgstr ""
    47774777
    4778 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
    4779 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
     4778#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509
     4779#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543
    47804780msgid "Yes, undelete them too"
    47814781msgstr "Si, desfacer o borrado de eles tamén"
    47824782
    4783 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
    4784 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
     4783#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
     4784#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
    47854785msgid "No, cancel operation"
    47864786msgstr "Non, cancelar a operación"
    47874787
    4788 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
     4788#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
    47894789#, java-format
    47904790msgid ""
     
    47974797msgstr[1] ""
    47984798
    4799 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
     4799#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524
    48004800msgid "Undelete additional nodes?"
    48014801msgstr "Desfacer o borrado de nodos adicionais?"
    48024802
    4803 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
     4803#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548
    48044804#, java-format
    48054805msgid ""
     
    48124812msgstr[1] ""
    48134813
    4814 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
     4814#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558
    48154815msgid "Undelete dependent primitives?"
    48164816msgstr "Desfacer o borrado de primitivas dependentes?"
    48174817
    4818 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
     4818#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
    48194819msgid "Properties in my dataset, i.e. the local dataset"
    48204820msgstr ""
    48214821
    4822 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4822#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
    48234823msgid ""
    48244824"Properties in the merged element. They will replace properties in my "
     
    48264826msgstr ""
    48274827
    4828 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
     4828#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
    48294829msgid "Properties in their dataset, i.e. the server dataset"
    48304830msgstr ""
    48314831
    4832 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
     4832#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
    48334833msgid "Coordinates:"
    48344834msgstr ""
    48354835
    4836 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
     4836#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
    48374837msgid "Deleted State:"
    48384838msgstr ""
    48394839
    4840 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
     4840#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
    48414841msgid "Visible State:"
    48424842msgstr ""
    48434843
    4844 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     4844#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
    48454845msgid "Referenced by:"
    48464846msgstr ""
    48474847
    4848 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
    4849 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
    4850 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
    4851 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
    4852 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
     4848#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
     4849#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
     4850#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
     4851#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
     4852#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
    48534853#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
    48544854msgid "(none)"
    48554855msgstr ""
    48564856
    4857 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
     4857#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
    48584858#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    48594859msgid "deleted"
    48604860msgstr "borrado"
    48614861
    4862 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
     4862#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
    48634863msgid "not deleted"
    48644864msgstr ""
    48654865
    4866 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
     4866#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
    48674867msgid "visible (on the server)"
    48684868msgstr ""
    48694869
    4870 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
     4870#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
    48714871msgid "not visible (on the server)"
    48724872msgstr ""
    48734873
    4874 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
     4874#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
    48754875msgid "Keep a clone of the local version"
    48764876msgstr ""
    48774877
    4878 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
     4878#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
    48794879msgid "Physically delete from local dataset"
    48804880msgstr ""
    48814881
    4882 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
     4882#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
    48834883msgid "Keep my coordiates"
    48844884msgstr ""
    48854885
    4886 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
     4886#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
    48874887msgid "Keep their coordiates"
    48884888msgstr ""
    48894889
    4890 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
     4890#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
    48914891msgid "Undecide conflict between different coordinates"
    48924892msgstr ""
    48934893
    4894 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
     4894#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
    48954895msgid "Keep my deleted state"
    48964896msgstr ""
    48974897
    4898 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     4898#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
    48994899msgid "Keep their deleted state"
    49004900msgstr ""
    49014901
    4902 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
     4902#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
    49034903msgid "Undecide conflict between deleted state"
    49044904msgstr ""
    49054905
    4906 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     4906#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
    49074907msgid "Keep my visible state"
    49084908msgstr ""
    49094909
    4910 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
     4910#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    49114911msgid "Yes, reset the id"
    49124912msgstr ""
    49134913
    4914 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
     4914#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
    49154915#, java-format
    49164916msgid ""
     
    49204920msgstr ""
    49214921
    4922 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
     4922#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
    49234923msgid "Reset id to 0"
    49244924msgstr ""
    49254925
    4926 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
     4926#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
    49274927msgid "Keep their visible state"
    49284928msgstr ""
    49294929
    4930 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
     4930#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    49314931msgid "Yes, purge it"
    49324932msgstr ""
    49334933
    4934 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
     4934#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
    49354935#, java-format
    49364936msgid ""
     
    49394939msgstr ""
    49404940
    4941 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
     4941#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
    49424942msgid "Remove from dataset"
    49434943msgstr ""
    49444944
    4945 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
     4945#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
    49464946msgid "Undecide conflict between visible state"
    49474947msgstr ""
     
    50115011msgstr ""
    50125012
    5013 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
     5013#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
    50145014msgid "My version (local dataset)"
    50155015msgstr ""
    50165016
    5017 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
     5017#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
    50185018msgid "Their version (server dataset)"
    50195019msgstr ""
    50205020
    5021 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
     5021#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
    50225022msgid "Keep the selected key/value pairs from the local dataset"
    50235023msgstr ""
    50245024
    5025 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
     5025#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
    50265026msgid "Keep the selected key/value pairs from the server dataset"
    50275027msgstr ""
    50285028
    5029 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
     5029#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
    50305030msgid "Undecide"
    50315031msgstr ""
    50325032
    5033 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
     5033#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
    50345034msgid "Mark the selected tags as undecided"
    50355035msgstr ""
     
    50725072#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    50735073#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
    5074 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
     5074#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124
    50755075msgid "Apply"
    50765076msgstr ""
     
    53775377msgstr ""
    53785378
    5379 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5379#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    53805380#, java-format
    53815381msgid "Conflicts: {0} unresolved"
    53825382msgstr ""
    53835383
    5384 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
     5384#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325
    53855385msgid "Resolve"
    53865386msgstr "Resolver"
    53875387
    5388 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
     5388#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
    53895389msgid "Open a merge dialog of all selected items in the list above."
    53905390msgstr ""
     
    53925392"superior."
    53935393
    5394 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
     5394#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
    53955395#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    53965396#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
     
    55115511
    55125512#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
    5513 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
     5513#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
    55145514#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
    55155515#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
     
    56075607
    56085608#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
    5609 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     5609#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
    56105610msgid "Create a copy of this relation and open it in another editor window"
    56115611msgstr ""
     
    56595659
    56605660#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    5661 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
     5661#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
    56625662#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    56635663msgid "Selection"
     
    73477347#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
    73487348#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
    7349 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     7349#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095
    73507350msgid "Conflict in data"
    73517351msgid_plural "Conflicts in data"
     
    73947394msgstr ""
    73957395
    7396 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
     7396#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
    73977397msgid "Tags and Members"
    73987398msgstr ""
    73997399
    7400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
    7401 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     7400#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
     7401#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
    74027402msgid "Parent Relations"
    74037403msgstr ""
    74047404
    7405 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
     7405#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
    74067406msgid "Child Relations"
    74077407msgstr ""
    74087408
    7409 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
     7409#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
    74107410msgid "Apply Role:"
    74117411msgstr ""
    74127412
    7413 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295
     7413#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
    74147414msgid "Enter a role and apply it to the selected relation members"
    74157415msgstr ""
    74167416
    7417 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
     7417#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
    74187418msgid ""
    74197419"<html>There is at least one member in this relation referring<br>to the "
     
    74227422msgstr ""
    74237423
    7424 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
    7425 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
     7424#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
     7425#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    74267426msgid "Remove them, clean up relation"
    74277427msgstr ""
    74287428
    7429 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     7429#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
    74307430msgid "Ignore them, leave relation as is"
    74317431msgstr ""
    74327432
    7433 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
     7433#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
    74347434#, java-format
    74357435msgid ""
     
    74397439msgstr ""
    74407440
    7441 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
     7441#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
    74427442msgid "Multiple members referring to same primitive"
    74437443msgstr ""
    74447444
    7445 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
     7445#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
    74467446#, java-format
    74477447msgid ""
     
    74517451msgstr ""
    74527452
    7453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
     7453#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
    74547454msgid ""
    74557455"Add all primitives selected in the current dataset before the first member"
    74567456msgstr ""
    74577457
    7458 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
     7458#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
    74597459msgid ""
    74607460"Add all primitives selected in the current dataset after the last member"
    74617461msgstr ""
    74627462
    7463 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
     7463#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
    74647464msgid ""
    74657465"Add all primitives selected in the current dataset before the first selected "
     
    74677467msgstr ""
    74687468
    7469 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
     7469#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
    74707470msgid ""
    74717471"Add all primitives selected in the current dataset after the last selected "
     
    74737473msgstr ""
    74747474
    7475 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
     7475#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
    74767476msgid "Remove all members referring to one of the selected primitives"
    74777477msgstr ""
    74787478
    74797479#. putValue(NAME, tr("Remove Selected"));
    7480 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
     7480#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
    74817481msgid "Relation Editor: Remove Selected"
    74827482msgstr ""
    74837483
    7484 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
    7485 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
     7484#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
     7485#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
    74867486msgid ""
    74877487"Select relation members which refer to primitives in the current selection"
    74887488msgstr ""
    74897489
    7490 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
     7490#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
    74917491#, java-format
    74927492msgid ""
     
    74957495msgstr ""
    74967496
    7497 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     7497#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
    74987498msgid "Select primitives for selected relation members"
    74997499msgstr ""
    75007500
    7501 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
     7501#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
    75027502msgid "Sort the relation members"
    75037503msgstr ""
    75047504
    7505 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
     7505#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
    75067506msgid "Sort"
    75077507msgstr ""
    75087508
    7509 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
     7509#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
    75107510msgid "Relation Editor: Sort"
    75117511msgstr ""
    75127512
    7513 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
     7513#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    75147514msgid "Reverse the order of the relation members"
    75157515msgstr ""
    75167516
    7517 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
     7517#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
    75187518msgid "Reverse"
    75197519msgstr ""
    75207520
    7521 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
     7521#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    75227522msgid "Relation Editor: Reverse"
    75237523msgstr ""
    75247524
    7525 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
     7525#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
    75267526msgid "Move the currently selected members up"
    75277527msgstr "Mover os membros actualmente seleccionados cara arriba"
    75287528
    75297529#. putValue(NAME, tr("Move Up"));
    7530 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
     7530#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933
    75317531msgid "Relation Editor: Move Up"
    75327532msgstr ""
    75337533
    7534 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
     7534#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
    75357535msgid "Move the currently selected members down"
    75367536msgstr "Mover os membros seleccionados actualmente cara abaixo"
    75377537
    75387538#. putValue(NAME, tr("Move Down"));
    7539 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
     7539#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
    75407540msgid "Relation Editor: Move Down"
    75417541msgstr ""
    75427542
    7543 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
     7543#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
    75447544msgid "Remove the currently selected members from this relation"
    75457545msgstr ""
    75467546
    75477547#. putValue(NAME, tr("Remove"));
    7548 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
     7548#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    75497549msgid "Relation Editor: Remove"
    75507550msgstr ""
    75517551
    7552 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
     7552#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
    75537553msgid "Delete the currently edited relation"
    75547554msgstr ""
    75557555
    7556 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     7556#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
    75577557msgid "Yes, create a conflict and close"
    75587558msgstr ""
    75597559
    7560 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
     7560#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
    75617561msgid "Click to create a conflict and close this relation editor"
    75627562msgstr ""
    75637563
    7564 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
     7564#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    75657565msgid "No, continue editing"
    75667566msgstr ""
    75677567
    7568 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
     7568#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
    75697569msgid "Click to return to the relation editor and to resume relation editing"
    75707570msgstr ""
    75717571
    7572 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
     7572#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
    75737573msgid ""
    75747574"<html>This relation has been changed outside of the editor.<br>You cannot "
     
    75777577msgstr ""
    75787578
    7579 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
     7579#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
    75807580#, java-format
    75817581msgid ""
     
    75847584msgstr ""
    75857585
    7586 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
     7586#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
    75877587msgid "Apply the current updates"
    75887588msgstr ""
    75897589
    7590 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
     7590#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
    75917591msgid "Apply the updates and close the dialog"
    75927592msgstr ""
    75937593
    7594 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
     7594#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    75957595msgid "Cancel the updates and close the dialog"
    75967596msgstr ""
    75977597
    7598 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7598#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
    75997599msgid "Add an empty tag"
    76007600msgstr ""
    76017601
    7602 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
     7602#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    76037603msgid "Download all incomplete members"
    76047604msgstr ""
    76057605
    7606 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
    7607 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
     7606#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
     7607#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256
    76087608msgid "Download Members"
    76097609msgstr "Descargar Membros"
    76107610
    7611 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
     7611#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
     7612#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
     7613msgid "Relation Editor: Download Members"
     7614msgstr ""
     7615
    76127616#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
    7613 msgid "Relation Editor: Download Members"
    7614 msgstr ""
    7615 
    7616 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
    76177617msgid "Download selected incomplete members"
    76187618msgstr ""
    76197619
    7620 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
     7620#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
    76217621msgid "Sets a role for the selected members"
    76227622msgstr ""
    76237623
    7624 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
     7624#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    76257625msgid "Apply Role"
    76267626msgstr ""
    76277627
    7628 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306
     7628#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
    76297629#, java-format
    76307630msgid "You are setting an empty role on {0} primitive."
     
    76337633msgstr[1] ""
    76347634
    7635 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
     7635#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    76367636msgid "This is equal to deleting the roles of these primitives."
    76377637msgstr ""
    76387638
    7639 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311
     7639#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
    76407640msgid "Do you really want to apply the new role?"
    76417641msgstr ""
    76427642
    7643 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313
     7643#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
    76447644msgid "Yes, apply it"
    76457645msgstr ""
    76467646
    7647 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
     7647#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
    76487648msgid "No, do not apply"
    76497649msgstr ""
    76507650
    7651 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
     7651#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
    76527652msgid "Confirm empty role"
    76537653msgstr ""
    76547654
    7655 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
     7655#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
    76567656msgid "Edit the relation the currently selected relation member refers to"
    76577657msgstr ""
     
    76967696msgstr ""
    76977697
    7698 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
     7698#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
    76997699msgid "Load parent relations"
    77007700msgstr ""
    77017701
    7702 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
     7702#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
    77037703msgid "Loading parent relations"
    77047704msgstr ""
    77057705
    7706 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
     7706#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    77077707msgid "Edit the currently selected relation"
    77087708msgstr ""
     
    1374713747msgstr ""
    1374813748
    13749 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
     13749#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353
    1375013750#, java-format
    1375113751msgid "Unable to find translation for the locale {0}. Reverting to {1}."
Note: See TracChangeset for help on using the changeset viewer.