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/es.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-02-14 23:28+0000\n"
    1212"Last-Translator: bastik <Unknown>\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:13+0000\n"
     18"X-Launchpad-Export-Date: 2010-02-24 18:27+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
     
    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
     
    396396#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    397397#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    398 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
     398#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    399399#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    400400#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
     
    700700#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    701701#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
    702 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
     702#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
    703703#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
    704704#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
     
    825825#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    826826#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
    827 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
     827#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
    828828msgid "Duplicate"
    829829msgstr "Duplicar"
     
    16881688
    16891689#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
    1690 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    1691 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
     1690#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
     1691#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
    16921692#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    16931693msgid "No, abort"
     
    24222422#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    24232423#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2424 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
     2424#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
    24252425#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    24262426#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
     
    30223022
    30233023#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    3024 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
     3024#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
    30253025msgid "Double conflict"
    30263026msgstr "Doble conflicto"
     
    30573057#. should not happen
    30583058#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
    3059 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
     3059#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
    30603060msgid "Cannot resolve undecided conflict."
    30613061msgstr "no se puede resolver los conflictos pendientes"
     
    32323232msgstr "Resolver conflicto de versión para la relación {0}"
    32333233
    3234 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
     3234#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
    32353235#, java-format
    32363236msgid "Resolve conflicts in node list of way {0}"
    32373237msgstr "Resolver conflictos en la lista de nodos de la vía {0}"
    32383238
    3239 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
     3239#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
    32403240#, java-format
    32413241msgid "Main dataset does not include node {0}"
     
    35463546"no es un error crítico, puede continuar con su trabajo de manera segura."
    35473547
    3548 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148
    3549 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
     3548#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150
     3549#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    35503550#, java-format
    35513551msgid "Missing merge target for way with id {0}"
    35523552msgstr "Falta de combinación de destino para la direccion con el ID {0}"
    35533553
    3554 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164
    3555 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228
     3554#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
     3555#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
    35563556#, java-format
    35573557msgid "Missing merge target for node with id {0}"
    35583558msgstr "Falta de combinación de destino para el nodo con el ID {0}"
    35593559
    3560 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187
     3560#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    35613561#, java-format
    35623562msgid "Missing merge target for object with id {0}"
    35633563msgstr "Falta de combinación de destino para el objeto con el ID {0}"
    35643564
    3565 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243
     3565#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250
    35663566#, java-format
    35673567msgid "Missing merge target for relation with id {0}"
    35683568msgstr "Falta de combinación de destino para la relación con el ID {0}"
    35693569
    3570 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248
     3570#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255
    35713571#, java-format
    35723572msgid "Missing merge target of type {0} with id {1}"
     
    35763576#. FIXME: this message does not make sense, source version can not be lower than
    35773577#. target version at this point
    3578 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:281
     3578#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292
    35793579#, java-format
    35803580msgid ""
     
    37193719msgstr ""
    37203720
    3721 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
    3722 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3721#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
     3722#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    37233723#, java-format
    37243724msgid "Cannot add node {0} to incomplete way {1}."
     
    38383838#. darker blue
    38393839#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
     3840#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    38413841#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183
    38423842msgid "background"
     
    40824082#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    40834083#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
    4084 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
     4084#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
    40854085msgid "Conflict"
    40864086msgstr "Conflicto"
     
    43404340#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    43414341#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    4342 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
     4342#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
    43434343#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
    43444344#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     
    45854585msgstr "La función {0} no participa en la pareja de comparación {1}"
    45864586
    4587 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
    4588 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
     4587#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4588#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
    45894589#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    45904590msgid "Properties"
    45914591msgstr "Propiedades"
    45924592
    4593 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
    4594 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
     4593#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4594#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
    45954595#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    4596 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235
     4596#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
    45974597#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    45984598#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507
     
    46014601msgstr "Etiquetas"
    46024602
    4603 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
    4604 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
     4603#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4604#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
    46054605#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    46064606#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
     
    46084608msgstr "Nodos"
    46094609
    4610 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
    4611 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    4612 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
     4610#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
     4611#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
     4612#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
    46134613#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    46144614msgid "Members"
    46154615msgstr "Miembros"
    46164616
    4617 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     4617#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    46184618msgid "No pending tag conflicts to be resolved"
    46194619msgstr "Ningún conflito de etiqueta pendiente de ser resuelto"
    46204620
    4621 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
     4621#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
    46224622#, java-format
    46234623msgid "Tags({0} conflict)"
     
    46264626msgstr[1] ""
    46274627
    4628 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4628#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
    46294629#, java-format
    46304630msgid "{0} pending tag conflict to be resolved"
     
    46334633msgstr[1] ""
    46344634
    4635 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
     4635#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
    46364636msgid "Nodes(resolved)"
    46374637msgstr "Nodos (resueltos)"
    46384638
    4639 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4639#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    46404640msgid ""
    46414641"Merged node list frozen. No pending conflicts in the node list of this way"
     
    46444644"lista de nodos de esta vía"
    46454645
    4646 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
     4646#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
    46474647msgid "Nodes(with conflicts)"
    46484648msgstr "Nodos (con conflictos)"
    46494649
    4650 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4650#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
    46514651msgid "Pending conflicts in the node list of this way"
    46524652msgstr "Conflictos pendientes en la lista de nodos de esta vía"
    46534653
    4654 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
     4654#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    46554655msgid "Members(resolved)"
    46564656msgstr "Miembros (resueltos)"
    46574657
    4658 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     4658#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    46594659msgid ""
    46604660"Merged member list frozen. No pending conflicts in the member list of this "
     
    46644664"lista de miembros de esta relación"
    46654665
    4666 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4666#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    46674667msgid "Members(with conflicts)"
    46684668msgstr "Miembros (con conflictos)"
    46694669
    4670 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4670#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    46714671msgid "Pending conflicts in the member list of this relation"
    46724672msgstr "Conflictos pendientes en la lista de miembros de esta relación"
    46734673
    4674 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     4674#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    46754675msgid "No pending property conflicts"
    46764676msgstr "Ningún conflicto de propiedades pendiente"
    46774677
    4678 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
     4678#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
    46794679msgid "Properties(with conflicts)"
    46804680msgstr "Propiedades (con conflictos)"
    46814681
    4682 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     4682#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
    46834683msgid "Pending property conflicts to be resolved"
    46844684msgstr "Conflictos de propiedades pendientes de resolver"
    46854685
    4686 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
     4686#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
    46874687msgid "Conflict Resolution"
    46884688msgstr "Resolución de conflictos"
     
    47284728
    47294729#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    4730 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4730#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    47314731msgid "My version"
    47324732msgstr "Mi versión"
     
    47394739
    47404740#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    4741 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
    4742 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
     4741#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4742#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    47434743msgid "Merged version"
    47444744msgstr "Versión fusionada"
     
    47534753
    47544754#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    4755 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
     4755#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    47564756msgid "Their version"
    47574757msgstr "Su versión"
     
    49414941msgstr "Nodo"
    49424942
    4943 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4943#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
    49444944msgid "Merged nodes not frozen yet. Cannot build resolution command."
    49454945msgstr ""
     
    49474947"de resolución."
    49484948
    4949 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
     4949#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463
    49504950#, java-format
    49514951msgid ""
     
    49564956"{0}</html>"
    49574957
    4958 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
     4958#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    49594959msgid "Communication with server failed"
    49604960msgstr "Comunicación fallida con el servidor"
    49614961
    4962 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
    4963 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
     4962#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509
     4963#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543
    49644964msgid "Yes, undelete them too"
    49654965msgstr "Sí, deshacer el borrado de ellos también"
    49664966
    4967 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
    4968 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
     4967#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
     4968#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
    49694969msgid "No, cancel operation"
    49704970msgstr "No, calcelar la operación"
    49714971
    4972 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
     4972#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
    49734973#, java-format
    49744974msgid ""
     
    49814981msgstr[1] ""
    49824982
    4983 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
     4983#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524
    49844984msgid "Undelete additional nodes?"
    49854985msgstr "¿Deshacer el borrado de los nodos adicionales?"
    49864986
    4987 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
     4987#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548
    49884988#, java-format
    49894989msgid ""
     
    49964996msgstr[1] ""
    49974997
    4998 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
     4998#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558
    49994999msgid "Undelete dependent primitives?"
    50005000msgstr "¿Deshacer borrado de primitivos dependientes?"
    50015001
    5002 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
     5002#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
    50035003msgid "Properties in my dataset, i.e. the local dataset"
    50045004msgstr ""
    50055005"Propiedade de mi conjunto de datos, es decir el conjunto de datos locales"
    50065006
    5007 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     5007#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
    50085008msgid ""
    50095009"Properties in the merged element. They will replace properties in my "
     
    50135013"elementos cuando se apliquen las decisiones de fusionar."
    50145014
    5015 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
     5015#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
    50165016msgid "Properties in their dataset, i.e. the server dataset"
    50175017msgstr ""
     
    50195019"servidor"
    50205020
    5021 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
     5021#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
    50225022msgid "Coordinates:"
    50235023msgstr "Coordenadas:"
    50245024
    5025 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
     5025#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
    50265026msgid "Deleted State:"
    50275027msgstr "Estado borrado:"
    50285028
    5029 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
     5029#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
    50305030msgid "Visible State:"
    50315031msgstr "Estado visible:"
    50325032
    5033 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     5033#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
    50345034msgid "Referenced by:"
    50355035msgstr ""
    50365036
    5037 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
    5038 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
    5039 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
    5040 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
    5041 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
     5037#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
     5038#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
     5039#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
     5040#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
     5041#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
    50425042#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
    50435043msgid "(none)"
    50445044msgstr "(ninguno)"
    50455045
    5046 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
     5046#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
    50475047#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    50485048msgid "deleted"
    50495049msgstr "borrado"
    50505050
    5051 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
     5051#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
    50525052msgid "not deleted"
    50535053msgstr "no borrado"
    50545054
    5055 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
     5055#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
    50565056msgid "visible (on the server)"
    50575057msgstr "visible (en el servidor)"
    50585058
    5059 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
     5059#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
    50605060msgid "not visible (on the server)"
    50615061msgstr "no visible (en el servidor)"
    50625062
    5063 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
     5063#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
    50645064msgid "Keep a clone of the local version"
    50655065msgstr "Mantener un clon de la versión local"
    50665066
    5067 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
     5067#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
    50685068msgid "Physically delete from local dataset"
    50695069msgstr "Eliminar físicamente del conjunto de datos locales"
    50705070
    5071 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
     5071#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
    50725072msgid "Keep my coordiates"
    50735073msgstr "Mantener mis coordenadas"
    50745074
    5075 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
     5075#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
    50765076msgid "Keep their coordiates"
    50775077msgstr "Mantener sus coordenadas"
    50785078
    5079 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
     5079#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
    50805080msgid "Undecide conflict between different coordinates"
    50815081msgstr "Conflicto no resuelto entre las diferentes coordenadas"
    50825082
    5083 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
     5083#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
    50845084msgid "Keep my deleted state"
    50855085msgstr "Mantener mi estado suprimido"
    50865086
    5087 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     5087#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
    50885088msgid "Keep their deleted state"
    50895089msgstr "Mantener su estado suprimido"
    50905090
    5091 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
     5091#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
    50925092msgid "Undecide conflict between deleted state"
    50935093msgstr ""
    50945094
    5095 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     5095#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
    50965096msgid "Keep my visible state"
    50975097msgstr "Mantener mi estado visible"
    50985098
    5099 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
     5099#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    51005100msgid "Yes, reset the id"
    51015101msgstr "Sí, reiniciar el id"
    51025102
    5103 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
     5103#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
    51045104#, java-format
    51055105msgid ""
     
    51125112"nueva ID.<br> ¿Continuar? </html>"
    51135113
    5114 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
     5114#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
    51155115msgid "Reset id to 0"
    51165116msgstr "Reiniciar el id a 0"
    51175117
    5118 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
     5118#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
    51195119msgid "Keep their visible state"
    51205120msgstr "Mantener su estado visible"
    51215121
    5122 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
     5122#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    51235123msgid "Yes, purge it"
    51245124msgstr "Sí, purgarlo"
    51255125
    5126 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
     5126#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
    51275127#, java-format
    51285128msgid ""
     
    51335133"acuerdo?</html>"
    51345134
    5135 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
     5135#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
    51365136msgid "Remove from dataset"
    51375137msgstr "Eliminar desde el conjunto de datos"
    51385138
    5139 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
     5139#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
    51405140msgid "Undecide conflict between visible state"
    51415141msgstr "Conflicto entre estado visibles sin decidir"
     
    52085208msgstr ""
    52095209
    5210 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
     5210#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
    52115211msgid "My version (local dataset)"
    52125212msgstr "Mi versión (conjunto de datos locales)"
    52135213
    5214 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
     5214#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
    52155215msgid "Their version (server dataset)"
    52165216msgstr "Su versión (conjunto de datos del servidor)"
    52175217
    5218 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
     5218#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
    52195219msgid "Keep the selected key/value pairs from the local dataset"
    52205220msgstr ""
    52215221"Mantener la pareja clave/valor seleccionado del conjunto de datos locales"
    52225222
    5223 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
     5223#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
    52245224msgid "Keep the selected key/value pairs from the server dataset"
    52255225msgstr ""
     
    52275227"servidor"
    52285228
    5229 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
     5229#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
    52305230msgid "Undecide"
    52315231msgstr "Pendiente"
    52325232
    5233 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
     5233#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
    52345234msgid "Mark the selected tags as undecided"
    52355235msgstr "Marcar la etiqueta seleccionada como pendiente"
     
    52725272#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    52735273#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
    5274 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
     5274#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124
    52755275msgid "Apply"
    52765276msgstr "Aplicar"
     
    55925592msgstr "Resolver conflictos."
    55935593
    5594 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5594#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    55955595#, java-format
    55965596msgid "Conflicts: {0} unresolved"
    55975597msgstr ""
    55985598
    5599 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
     5599#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325
    56005600msgid "Resolve"
    56015601msgstr "Resolver"
    56025602
    5603 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
     5603#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
    56045604msgid "Open a merge dialog of all selected items in the list above."
    56055605msgstr ""
     
    56075607"en la lista superior."
    56085608
    5609 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
     5609#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
    56105610#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    56115611#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
     
    57275727
    57285728#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
    5729 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
     5729#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
    57305730#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
    57315731#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
     
    58235823
    58245824#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
    5825 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     5825#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
    58265826msgid "Create a copy of this relation and open it in another editor window"
    58275827msgstr "Crear una copia de esta relación y abrirla en otra ventana de edición."
     
    58755875
    58765876#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    5877 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
     5877#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
    58785878#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    58795879msgid "Selection"
     
    75957595#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
    75967596#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
    7597 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     7597#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095
    75987598msgid "Conflict in data"
    75997599msgid_plural "Conflicts in data"
     
    76437643msgstr "({0}/{1}): Descargando relación ''{2}''..."
    76447644
    7645 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
     7645#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
    76467646msgid "Tags and Members"
    76477647msgstr "Etiquetas y miembros"
    76487648
    7649 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
    7650 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     7649#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
     7650#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
    76517651msgid "Parent Relations"
    76527652msgstr "Relaciones padre"
    76537653
    7654 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
     7654#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
    76557655msgid "Child Relations"
    76567656msgstr "Relaciones hijo"
    76577657
    7658 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
     7658#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
    76597659msgid "Apply Role:"
    76607660msgstr "Aplicar función:"
    76617661
    7662 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295
     7662#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
    76637663msgid "Enter a role and apply it to the selected relation members"
    76647664msgstr ""
    76657665
    7666 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
     7666#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
    76677667msgid ""
    76687668"<html>There is at least one member in this relation referring<br>to the "
     
    76717671msgstr ""
    76727672
    7673 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
    7674 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
     7673#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
     7674#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    76757675msgid "Remove them, clean up relation"
    76767676msgstr "Eliminarlos, limpiar la relación"
    76777677
    7678 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     7678#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
    76797679msgid "Ignore them, leave relation as is"
    76807680msgstr "Ignorarlos, dejar la relación como está"
    76817681
    7682 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
     7682#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
    76837683#, java-format
    76847684msgid ""
     
    76887688msgstr ""
    76897689
    7690 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
     7690#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
    76917691msgid "Multiple members referring to same primitive"
    76927692msgstr ""
    76937693
    7694 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
     7694#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
    76957695#, java-format
    76967696msgid ""
     
    77007700msgstr ""
    77017701
    7702 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
     7702#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
    77037703msgid ""
    77047704"Add all primitives selected in the current dataset before the first member"
     
    77077707"del primer miembro"
    77087708
    7709 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
     7709#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
    77107710msgid ""
    77117711"Add all primitives selected in the current dataset after the last member"
     
    77147714"del último miembro"
    77157715
    7716 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
     7716#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
    77177717msgid ""
    77187718"Add all primitives selected in the current dataset before the first selected "
     
    77227722"del primer miembro seleccionado"
    77237723
    7724 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
     7724#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
    77257725msgid ""
    77267726"Add all primitives selected in the current dataset after the last selected "
     
    77307730"del último miembro seleccionado"
    77317731
    7732 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
     7732#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
    77337733msgid "Remove all members referring to one of the selected primitives"
    77347734msgstr ""
    77357735
    77367736#. putValue(NAME, tr("Remove Selected"));
    7737 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
     7737#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
    77387738msgid "Relation Editor: Remove Selected"
    77397739msgstr ""
    77407740
    7741 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
    7742 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
     7741#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
     7742#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
    77437743msgid ""
    77447744"Select relation members which refer to primitives in the current selection"
     
    77477747"la selección actual"
    77487748
    7749 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
     7749#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
    77507750#, java-format
    77517751msgid ""
     
    77567756"la selección actual"
    77577757
    7758 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     7758#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
    77597759msgid "Select primitives for selected relation members"
    77607760msgstr "Seleccionar primitivas para la relación de miembros señalada"
    77617761
    7762 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
     7762#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
    77637763msgid "Sort the relation members"
    77647764msgstr "Ordenar los miembros de la relación"
    77657765
    7766 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
     7766#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
    77677767msgid "Sort"
    77687768msgstr "Ordenar"
    77697769
    7770 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
     7770#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
    77717771msgid "Relation Editor: Sort"
    77727772msgstr "Editor de relaciones: Ordenar"
    77737773
    7774 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
     7774#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    77757775msgid "Reverse the order of the relation members"
    77767776msgstr "Invertir el orden de los miembros de la relación"
    77777777
    7778 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
     7778#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
    77797779msgid "Reverse"
    77807780msgstr "Invertir"
    77817781
    7782 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
     7782#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    77837783msgid "Relation Editor: Reverse"
    77847784msgstr "Editor de relaciones: Invertir"
    77857785
    7786 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
     7786#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
    77877787msgid "Move the currently selected members up"
    77887788msgstr "Mover los miembro(s) seleccionos hacia arriba"
    77897789
    77907790#. putValue(NAME, tr("Move Up"));
    7791 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
     7791#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933
    77927792msgid "Relation Editor: Move Up"
    77937793msgstr "Editor de relaciones: Mover arriba"
    77947794
    7795 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
     7795#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
    77967796msgid "Move the currently selected members down"
    77977797msgstr "Mover los miembros seleccionados hacia abajo"
    77987798
    77997799#. putValue(NAME, tr("Move Down"));
    7800 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
     7800#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
    78017801msgid "Relation Editor: Move Down"
    78027802msgstr "Editor de relaciones: Mover abajo"
    78037803
    7804 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
     7804#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
    78057805msgid "Remove the currently selected members from this relation"
    78067806msgstr ""
    78077807
    78087808#. putValue(NAME, tr("Remove"));
    7809 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
     7809#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    78107810msgid "Relation Editor: Remove"
    78117811msgstr "Editor de relaciones: Borrar"
    78127812
    7813 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
     7813#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
    78147814msgid "Delete the currently edited relation"
    78157815msgstr "Eliminar esta relación"
    78167816
    7817 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     7817#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
    78187818msgid "Yes, create a conflict and close"
    78197819msgstr "Sí, crear un conflicto y cerrar"
    78207820
    7821 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
     7821#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
    78227822msgid "Click to create a conflict and close this relation editor"
    78237823msgstr ""
    78247824
    7825 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
     7825#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    78267826msgid "No, continue editing"
    78277827msgstr "No, continuar editando"
    78287828
    7829 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
     7829#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
    78307830msgid "Click to return to the relation editor and to resume relation editing"
    78317831msgstr ""
    78327832
    7833 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
     7833#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
    78347834msgid ""
    78357835"<html>This relation has been changed outside of the editor.<br>You cannot "
     
    78387838msgstr ""
    78397839
    7840 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
     7840#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
    78417841#, java-format
    78427842msgid ""
     
    78477847"necesario resolver el conflicto antes de continuar.</html>"
    78487848
    7849 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
     7849#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
    78507850msgid "Apply the current updates"
    78517851msgstr "Aplicar las actualizaciones actuales"
    78527852
    7853 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
     7853#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
    78547854msgid "Apply the updates and close the dialog"
    78557855msgstr "Aplicar las actualizaciones y cerrar el diálogo"
    78567856
    7857 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
     7857#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    78587858msgid "Cancel the updates and close the dialog"
    78597859msgstr "Cancelar las actualizaciones y cerrar el cuadro de diálogo"
    78607860
    7861 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7861#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
    78627862msgid "Add an empty tag"
    78637863msgstr "Añadir una etiqueta vacía"
    78647864
    7865 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
     7865#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    78667866msgid "Download all incomplete members"
    78677867msgstr "Descargar todos los miembros incompletos"
    78687868
    7869 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
    7870 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
     7869#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
     7870#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256
    78717871msgid "Download Members"
    78727872msgstr "Descargar miembros"
    78737873
    7874 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
     7874#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
     7875#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
     7876msgid "Relation Editor: Download Members"
     7877msgstr ""
     7878
    78757879#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
    7876 msgid "Relation Editor: Download Members"
    7877 msgstr ""
    7878 
    7879 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
    78807880msgid "Download selected incomplete members"
    78817881msgstr "Descargar los miembros incompletos seleccionados"
    78827882
    7883 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
     7883#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
    78847884msgid "Sets a role for the selected members"
    78857885msgstr "Fijar una función para los miembros seleccionados"
    78867886
    7887 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
     7887#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    78887888msgid "Apply Role"
    78897889msgstr "Aplicar función"
    78907890
    7891 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306
     7891#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
    78927892#, java-format
    78937893msgid "You are setting an empty role on {0} primitive."
     
    78967896msgstr[1] ""
    78977897
    7898 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
     7898#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    78997899msgid "This is equal to deleting the roles of these primitives."
    79007900msgstr ""
    79017901
    7902 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311
     7902#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
    79037903msgid "Do you really want to apply the new role?"
    79047904msgstr ""
    79057905
    7906 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313
     7906#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
    79077907msgid "Yes, apply it"
    79087908msgstr "Sí, aplícalo"
    79097909
    7910 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
     7910#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
    79117911msgid "No, do not apply"
    79127912msgstr "No, no lo apliques"
    79137913
    7914 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
     7914#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
    79157915msgid "Confirm empty role"
    79167916msgstr "Confirmar función vacía"
    79177917
    7918 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
     7918#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
    79197919msgid "Edit the relation the currently selected relation member refers to"
    79207920msgstr ""
     
    79627962msgstr "incluido los hijos inmediatos de las relaciones padre"
    79637963
    7964 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
     7964#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
    79657965msgid "Load parent relations"
    79667966msgstr "Cargar relaciones padre"
    79677967
    7968 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
     7968#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
    79697969msgid "Loading parent relations"
    79707970msgstr "Cargando relaciones padre"
    79717971
    7972 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
     7972#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    79737973msgid "Edit the currently selected relation"
    79747974msgstr "Editar la relación seleccionada"
     
    1413314133msgstr ""
    1413414134
    14135 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
     14135#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353
    1413614136#, java-format
    1413714137msgid "Unable to find translation for the locale {0}. Reverting to {1}."
     
    1668116681
    1668216682#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:291
    16683 #, fuzzy
    1668416683msgid "Abort tag editing and close dialog"
    16685 msgstr "Aplicar las actualizaciones y cerrar el diálogo"
     16684msgstr ""
    1668616685
    1668716686#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/TagEditorDialog.java:304
    16688 #, fuzzy
    1668916687msgid "Apply edited tags and close dialog"
    16690 msgstr "Aplicar las actualizaciones y cerrar el diálogo"
     16688msgstr ""
    1669116689
    1669216690#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetManager.java:53
     
    3099330991msgstr "Sicilia - Italia"
    3099430992
    30995 #~ msgid "<multiple>"
    30996 #~ msgstr "<multiple>"
    30997 
    3099830993#~ msgid "Move"
    3099930994#~ msgstr "Mover"
     
    3195531950#~ msgstr "Carga directamente archivos TCX en JOSM"
    3195631951
     31952#~ msgid "<multiple>"
     31953#~ msgstr "<multiple>"
     31954
    3195731955#~ msgid ""
    3195831956#~ "Another geotag plugin for JOSM. Correlates pictures with GPS tracks or "
Note: See TracChangeset for help on using the changeset viewer.