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/ar.po

    r20093 r20140  
    88"Project-Id-Version: josm\n"
    99"Report-Msgid-Bugs-To: \n"
    10 "POT-Creation-Date: 2010-02-21 09:35+0100\n"
    11 "PO-Revision-Date: 2010-02-18 00:09+0000\n"
     10"POT-Creation-Date: 2010-02-24 19:46+0100\n"
     11"PO-Revision-Date: 2010-02-21 11:11+0000\n"
    1212"Last-Translator: Dirk Stöcker <launchpad@dstoecker.de>\n"
    1313"Language-Team: Arabic <ar@li.org>\n"
     
    1717"Plural-Forms: nplurals=6; plural=n==0 ? 0 : n==1 ? 1 : n==2 ? 2 : n % 100 >= "
    1818"3 && n % 100 <= 10 ? 3 : n % 100 >= 11 && n % 100 <= 99 ? 4 : 5;\n"
    19 "X-Launchpad-Export-Date: 2010-02-21 08:16+0000\n"
     19"X-Launchpad-Export-Date: 2010-02-24 18:31+0000\n"
    2020"X-Generator: Launchpad (build Unknown)\n"
    2121
     
    7070#: ../core/src/org/openstreetmap/josm/actions/search/SearchAction.java:291
    7171#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:522
    72 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:576
    73 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:639
     72#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     73#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:642
    7474#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ParentRelationLoadingTask.java:189
    7575#: ../core/src/org/openstreetmap/josm/gui/help/HelpBrowser.java:415
     
    243243#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/query/ChangesetQueryDialog.java:207
    244244#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:869
    245 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1188
     245#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1191
    246246#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/RelationEditor.java:120
    247247#: ../core/src/org/openstreetmap/josm/gui/download/DownloadDialog.java:373
     
    387387#: ../core/src/org/openstreetmap/josm/gui/HelpAwareOptionPane.java:80
    388388#: ../core/src/org/openstreetmap/josm/gui/actionsupport/DeleteFromRelationConfirmationDialog.java:350
    389 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1154
     389#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1157
    390390#: ../core/src/org/openstreetmap/josm/gui/layer/GpxLayer.java:169
    391391#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:375
     
    685685#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:276
    686686#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:891
    687 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:986
     687#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:989
    688688#: ../core/src/org/openstreetmap/josm/gui/layer/geoimage/GeoImageLayer.java:597
    689689#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:142
     
    807807#: ../core/src/org/openstreetmap/josm/actions/DuplicateLayerAction.java:21
    808808#: ../core/src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java:498
    809 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
     809#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1371
    810810msgid "Duplicate"
    811811msgstr "نسخة مطابقة"
     
    16391639
    16401640#: ../core/src/org/openstreetmap/josm/actions/SimplifyWayAction.java:71
    1641 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    1642 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
     1641#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:635
     1642#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:676
    16431643#: ../plugins/wmsplugin/src/wmsplugin/WMSLayer.java:215
    16441644msgid "No, abort"
     
    23392339#: ../core/src/org/openstreetmap/josm/actions/mapmode/SelectAction.java:112
    23402340#: ../core/src/org/openstreetmap/josm/gui/dialogs/ChangesetDialog.java:299
    2341 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:347
     2341#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:345
    23422342#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:116
    23432343#: ../core/src/org/openstreetmap/josm/gui/dialogs/UserListDialog.java:149
     
    28882888
    28892889#: ../core/src/org/openstreetmap/josm/command/ConflictAddCommand.java:38
    2890 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1111
     2890#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1114
    28912891msgid "Double conflict"
    28922892msgstr ""
     
    29192919#. should not happen
    29202920#: ../core/src/org/openstreetmap/josm/command/CoordinateConflictResolveCommand.java:68
    2921 #: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:78
     2921#: ../core/src/org/openstreetmap/josm/command/DeletedStateConflictResolveCommand.java:79
    29222922msgid "Cannot resolve undecided conflict."
    29232923msgstr ""
     
    30883088msgstr ""
    30893089
    3090 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:52
     3090#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:53
    30913091#, java-format
    30923092msgid "Resolve conflicts in node list of way {0}"
    30933093msgstr ""
    30943094
    3095 #: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:70
     3095#: ../core/src/org/openstreetmap/josm/command/WayNodesConflictResolverCommand.java:71
    30963096#, java-format
    30973097msgid "Main dataset does not include node {0}"
     
    33663366msgstr ""
    33673367
    3368 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:148
    3369 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:216
     3368#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:150
     3369#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:219
    33703370#, java-format
    33713371msgid "Missing merge target for way with id {0}"
    33723372msgstr ""
    33733373
    3374 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:164
    3375 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:228
     3374#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:167
     3375#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:235
    33763376#, java-format
    33773377msgid "Missing merge target for node with id {0}"
    33783378msgstr ""
    33793379
    3380 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:187
     3380#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:190
    33813381#, java-format
    33823382msgid "Missing merge target for object with id {0}"
    33833383msgstr ""
    33843384
    3385 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:243
     3385#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:250
    33863386#, java-format
    33873387msgid "Missing merge target for relation with id {0}"
    33883388msgstr ""
    33893389
    3390 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:248
     3390#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:255
    33913391#, java-format
    33923392msgid "Missing merge target of type {0} with id {1}"
     
    33963396#. FIXME: this message does not make sense, source version can not be lower than
    33973397#. target version at this point
    3398 #: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:281
     3398#: ../core/src/org/openstreetmap/josm/data/osm/DataSetMerger.java:292
    33993399#, java-format
    34003400msgid ""
     
    35513551msgstr ""
    35523552
    3553 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:291
    3554 #: ../core/src/org/openstreetmap/josm/data/osm/Way.java:313
     3553#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:292
     3554#: ../core/src/org/openstreetmap/josm/data/osm/Way.java:314
    35553555#, java-format
    35563556msgid "Cannot add node {0} to incomplete way {1}."
     
    36683668#. darker blue
    36693669#: ../core/src/org/openstreetmap/josm/data/osm/visitor/paint/PaintColors.java:20
    3670 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:181
     3670#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:179
    36713671#: ../core/src/org/openstreetmap/josm/gui/layer/OsmDataLayer.java:183
    36723672msgid "background"
     
    39123912#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:114
    39133913#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:115
    3914 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:172
     3914#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
    39153915msgid "Conflict"
    39163916msgstr "التناقض"
     
    41564156#: ../core/src/org/openstreetmap/josm/gui/dialogs/properties/PropertiesDialog.java:936
    41574157#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:180
    4158 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:144
     4158#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:143
    41594159#: ../core/src/org/openstreetmap/josm/gui/preferences/AdvancedPreference.java:134
    41604160#: ../core/src/org/openstreetmap/josm/gui/preferences/PluginPreference.java:209
     
    43894389msgstr ""
    43904390
    4391 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:103
    4392 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:207
     4391#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:105
     4392#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:209
    43934393#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:178
    43944394msgid "Properties"
    43954395msgstr ""
    43964396
    4397 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:108
    4398 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:171
     4397#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:110
     4398#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:173
    43994399#: ../core/src/org/openstreetmap/josm/gui/dialogs/changeset/ChangesetCacheManager.java:180
    4400 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:235
     4400#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:239
    44014401#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:132
    44024402#: ../plugins/public_transport/src/public_transport/RoutePatternAction.java:507
     
    44054405msgstr ""
    44064406
    4407 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:113
    4408 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:256
     4407#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:115
     4408#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:259
    44094409#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:139
    44104410#: ../core/src/org/openstreetmap/josm/gui/history/NodeListTableColumnModel.java:21
     
    44124412msgstr ""
    44134413
    4414 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:118
    4415 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:251
    4416 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:271
     4414#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:120
     4415#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:254
     4416#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:275
    44174417#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowser.java:142
    44184418msgid "Members"
    44194419msgstr "الأعضاء"
    44204420
    4421 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:172
     4421#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:174
    44224422msgid "No pending tag conflicts to be resolved"
    44234423msgstr ""
    44244424
    4425 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:175
     4425#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:177
    44264426#, java-format
    44274427msgid "Tags({0} conflict)"
     
    44304430msgstr[1] ""
    44314431
    4432 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:176
     4432#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:178
    44334433#, java-format
    44344434msgid "{0} pending tag conflict to be resolved"
     
    44374437msgstr[1] ""
    44384438
    4439 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:184
     4439#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:186
    44404440msgid "Nodes(resolved)"
    44414441msgstr ""
    44424442
    4443 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:185
     4443#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:187
    44444444msgid ""
    44454445"Merged node list frozen. No pending conflicts in the node list of this way"
    44464446msgstr ""
    44474447
    4448 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:188
     4448#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:190
    44494449msgid "Nodes(with conflicts)"
    44504450msgstr ""
    44514451
    4452 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:189
     4452#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:191
    44534453msgid "Pending conflicts in the node list of this way"
    44544454msgstr ""
    44554455
    4456 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:194
     4456#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:196
    44574457msgid "Members(resolved)"
    44584458msgstr ""
    44594459
    4460 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:195
     4460#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:197
    44614461msgid ""
    44624462"Merged member list frozen. No pending conflicts in the member list of this "
     
    44644464msgstr ""
    44654465
    4466 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:198
     4466#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:200
    44674467msgid "Members(with conflicts)"
    44684468msgstr ""
    44694469
    4470 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:199
     4470#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:201
    44714471msgid "Pending conflicts in the member list of this relation"
    44724472msgstr ""
    44734473
    4474 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:208
     4474#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:210
    44754475msgid "No pending property conflicts"
    44764476msgstr ""
    44774477
    4478 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:211
     4478#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:213
    44794479msgid "Properties(with conflicts)"
    44804480msgstr ""
    44814481
    4482 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:212
     4482#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:214
    44834483msgid "Pending property conflicts to be resolved"
    44844484msgstr ""
    44854485
    4486 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:292
     4486#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ConflictResolver.java:295
    44874487msgid "Conflict Resolution"
    44884488msgstr ""
     
    45284528
    45294529#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:280
    4530 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:85
     4530#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
    45314531msgid "My version"
    45324532msgstr ""
     
    45374537
    45384538#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:286
    4539 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:91
    4540 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:139
     4539#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4540#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:140
    45414541msgid "Merged version"
    45424542msgstr ""
     
    45494549
    45504550#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/ListMerger.java:292
    4551 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:97
     4551#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
    45524552msgid "Their version"
    45534553msgstr ""
     
    47164716msgstr ""
    47174717
    4718 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:71
     4718#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/nodes/NodeListMergeModel.java:68
    47194719msgid "Merged nodes not frozen yet. Cannot build resolution command."
    47204720msgstr ""
    47214721
    4722 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:460
     4722#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:463
    47234723#, java-format
    47244724msgid ""
     
    47274727msgstr ""
    47284728
    4729 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:464
     4729#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:467
    47304730msgid "Communication with server failed"
    47314731msgstr ""
    47324732
    4733 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:506
    4734 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:540
     4733#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:509
     4734#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:543
    47354735msgid "Yes, undelete them too"
    47364736msgstr ""
    47374737
    4738 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:507
    4739 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:541
     4738#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:510
     4739#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:544
    47404740msgid "No, cancel operation"
    47414741msgstr ""
    47424742
    4743 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:511
     4743#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:514
    47444744#, java-format
    47454745msgid ""
     
    47524752msgstr[1] ""
    47534753
    4754 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:521
     4754#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:524
    47554755msgid "Undelete additional nodes?"
    47564756msgstr ""
    47574757
    4758 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:545
     4758#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:548
    47594759#, java-format
    47604760msgid ""
     
    47674767msgstr[1] ""
    47684768
    4769 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:555
     4769#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMergeModel.java:558
    47704770msgid "Undelete dependent primitives?"
    47714771msgstr ""
    47724772
    4773 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:86
     4773#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:87
    47744774msgid "Properties in my dataset, i.e. the local dataset"
    47754775msgstr ""
    47764776
    4777 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:92
     4777#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:93
    47784778msgid ""
    47794779"Properties in the merged element. They will replace properties in my "
     
    47814781msgstr ""
    47824782
    4783 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:98
     4783#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:99
    47844784msgid "Properties in their dataset, i.e. the server dataset"
    47854785msgstr ""
    47864786
    4787 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:114
     4787#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:115
    47884788msgid "Coordinates:"
    47894789msgstr ""
    47904790
    4791 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:188
     4791#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:189
    47924792msgid "Deleted State:"
    47934793msgstr ""
    47944794
    4795 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:264
     4795#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:265
    47964796msgid "Visible State:"
    47974797msgstr ""
    47984798
    4799 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:340
     4799#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:341
    48004800msgid "Referenced by:"
    48014801msgstr ""
    48024802
    4803 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:376
    4804 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:388
    4805 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:397
    4806 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:406
    4807 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:415
     4803#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:377
     4804#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:389
     4805#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:398
     4806#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:407
     4807#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:416
    48084808#: ../plugins/tageditor/src/org/openstreetmap/josm/plugins/tageditor/editor/PresetItemListCellRenderer.java:23
    48094809msgid "(none)"
    48104810msgstr ""
    48114811
    4812 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:390
     4812#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:391
    48134813#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/MultiValueCellRenderer.java:77
    48144814msgid "deleted"
    48154815msgstr "تم حذفه"
    48164816
    4817 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:392
     4817#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:393
    48184818msgid "not deleted"
    48194819msgstr ""
    48204820
    4821 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:399
     4821#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:400
    48224822msgid "visible (on the server)"
    48234823msgstr ""
    48244824
    4825 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:401
     4825#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:402
    48264826msgid "not visible (on the server)"
    48274827msgstr ""
    48284828
    4829 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:408
     4829#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:409
    48304830msgid "Keep a clone of the local version"
    48314831msgstr ""
    48324832
    4833 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:410
     4833#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:411
    48344834msgid "Physically delete from local dataset"
    48354835msgstr ""
    48364836
    4837 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:528
     4837#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:529
    48384838msgid "Keep my coordiates"
    48394839msgstr ""
    48404840
    4841 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:543
     4841#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:544
    48424842msgid "Keep their coordiates"
    48434843msgstr ""
    48444844
    4845 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:558
     4845#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:559
    48464846msgid "Undecide conflict between different coordinates"
    48474847msgstr ""
    48484848
    4849 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:573
     4849#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:574
    48504850msgid "Keep my deleted state"
    48514851msgstr ""
    48524852
    4853 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:588
     4853#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:589
    48544854msgid "Keep their deleted state"
    48554855msgstr ""
    48564856
    4857 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:603
     4857#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:604
    48584858msgid "Undecide conflict between deleted state"
    48594859msgstr ""
    48604860
    4861 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:618
     4861#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:619
    48624862msgid "Keep my visible state"
    48634863msgstr ""
    48644864
    4865 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:633
     4865#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:634
    48664866msgid "Yes, reset the id"
    48674867msgstr ""
    48684868
    4869 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:638
     4869#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:639
    48704870#, java-format
    48714871msgid ""
     
    48754875msgstr ""
    48764876
    4877 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:645
     4877#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:646
    48784878msgid "Reset id to 0"
    48794879msgstr ""
    48804880
    4881 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:659
     4881#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:660
    48824882msgid "Keep their visible state"
    48834883msgstr ""
    48844884
    4885 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:674
     4885#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:675
    48864886msgid "Yes, purge it"
    48874887msgstr ""
    48884888
    4889 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:679
     4889#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:680
    48904890#, java-format
    48914891msgid ""
     
    48944894msgstr ""
    48954895
    4896 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:684
     4896#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:685
    48974897msgid "Remove from dataset"
    48984898msgstr ""
    48994899
    4900 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:698
     4900#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/properties/PropertiesMerger.java:699
    49014901msgid "Undecide conflict between visible state"
    49024902msgstr ""
     
    49664966msgstr ""
    49674967
    4968 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:128
     4968#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:129
    49694969msgid "My version (local dataset)"
    49704970msgstr ""
    49714971
    4972 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:151
     4972#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:152
    49734973msgid "Their version (server dataset)"
    49744974msgstr ""
    49754975
    4976 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:274
     4976#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:275
    49774977msgid "Keep the selected key/value pairs from the local dataset"
    49784978msgstr ""
    49794979
    4980 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:304
     4980#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:305
    49814981msgid "Keep the selected key/value pairs from the server dataset"
    49824982msgstr ""
    49834983
    4984 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:397
     4984#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:398
    49854985msgid "Undecide"
    49864986msgstr ""
    49874987
    4988 #: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:399
     4988#: ../core/src/org/openstreetmap/josm/gui/conflict/pair/tags/TagMerger.java:400
    49894989msgid "Mark the selected tags as undecided"
    49904990msgstr ""
     
    50275027#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/PasteTagsConflictResolverDialog.java:289
    50285028#: ../core/src/org/openstreetmap/josm/gui/conflict/tags/RelationMemberConflictResolver.java:146
    5029 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1121
     5029#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1124
    50305030msgid "Apply"
    50315031msgstr ""
     
    53365336msgstr ""
    53375337
    5338 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:170
     5338#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:168
    53395339#, java-format
    53405340msgid "Conflicts: {0} unresolved"
    53415341msgstr ""
    53425342
    5343 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:327
     5343#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:325
    53445344msgid "Resolve"
    53455345msgstr "حلّ"
    53465346
    5347 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:328
     5347#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:326
    53485348msgid "Open a merge dialog of all selected items in the list above."
    53495349msgstr ""
    53505350
    5351 #: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:348
     5351#: ../core/src/org/openstreetmap/josm/gui/dialogs/ConflictDialog.java:346
    53525352#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:117
    53535353#: ../plugins/validator/src/org/openstreetmap/josm/plugins/validator/ValidatorDialog.java:105
     
    54685468
    54695469#: ../core/src/org/openstreetmap/josm/gui/dialogs/HistoryDialog.java:282
    5470 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:95
     5470#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:94
    54715471#: ../core/src/org/openstreetmap/josm/gui/history/HistoryBrowserDialog.java:148
    54725472#: ../core/src/org/openstreetmap/josm/gui/preferences/StyleSourceEditor.java:513
     
    55635563
    55645564#: ../core/src/org/openstreetmap/josm/gui/dialogs/RelationListDialog.java:389
    5565 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1365
     5565#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1368
    55665566msgid "Create a copy of this relation and open it in another editor window"
    55675567msgstr ""
     
    56155615
    56165616#: ../core/src/org/openstreetmap/josm/gui/dialogs/SelectionListDialog.java:299
    5617 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:349
     5617#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:353
    56185618#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/SelectionTableColumnModel.java:17
    56195619msgid "Selection"
     
    72997299#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:332
    73007300#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ChildRelationBrowser.java:487
    7301 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1092
     7301#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1095
    73027302msgid "Conflict in data"
    73037303msgid_plural "Conflicts in data"
     
    73467346msgstr ""
    73477347
    7348 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:150
     7348#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:154
    73497349msgid "Tags and Members"
    73507350msgstr ""
    73517351
    7352 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:152
    7353 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:160
     7352#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:156
     7353#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:164
    73547354msgid "Parent Relations"
    73557355msgstr ""
    73567356
    7357 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:153
     7357#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:157
    73587358msgid "Child Relations"
    73597359msgstr ""
    73607360
    7361 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:293
     7361#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:297
    73627362msgid "Apply Role:"
    73637363msgstr ""
    73647364
    7365 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:295
     7365#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:299
    73667366msgid "Enter a role and apply it to the selected relation members"
    73677367msgstr ""
    73687368
    7369 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:572
     7369#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:575
    73707370msgid ""
    73717371"<html>There is at least one member in this relation referring<br>to the "
     
    73747374msgstr ""
    73757375
    7376 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
    7377 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:580
     7376#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
     7377#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:583
    73787378msgid "Remove them, clean up relation"
    73797379msgstr ""
    73807380
    7381 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:579
     7381#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:582
    73827382msgid "Ignore them, leave relation as is"
    73837383msgstr ""
    73847384
    7385 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:602
     7385#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:605
    73867386#, java-format
    73877387msgid ""
     
    73917391msgstr ""
    73927392
    7393 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:612
     7393#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:615
    73947394msgid "Multiple members referring to same primitive"
    73957395msgstr ""
    73967396
    7397 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:630
     7397#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:633
    73987398#, java-format
    73997399msgid ""
     
    74037403msgstr ""
    74047404
    7405 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:671
     7405#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:674
    74067406msgid ""
    74077407"Add all primitives selected in the current dataset before the first member"
    74087408msgstr ""
    74097409
    7410 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:697
     7410#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:700
    74117411msgid ""
    74127412"Add all primitives selected in the current dataset after the last member"
    74137413msgstr ""
    74147414
    7415 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:724
     7415#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:727
    74167416msgid ""
    74177417"Add all primitives selected in the current dataset before the first selected "
     
    74197419msgstr ""
    74207420
    7421 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:758
     7421#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:761
    74227422msgid ""
    74237423"Add all primitives selected in the current dataset after the last selected "
     
    74257425msgstr ""
    74267426
    7427 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:790
     7427#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
    74287428msgid "Remove all members referring to one of the selected primitives"
    74297429msgstr ""
    74307430
    74317431#. putValue(NAME, tr("Remove Selected"));
    7432 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:793
     7432#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:796
    74337433msgid "Relation Editor: Remove Selected"
    74347434msgstr ""
    74357435
    7436 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:827
    7437 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:839
     7436#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:830
     7437#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:842
    74387438msgid ""
    74397439"Select relation members which refer to primitives in the current selection"
    74407440msgstr ""
    74417441
    7442 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:837
     7442#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:840
    74437443#, java-format
    74447444msgid ""
     
    74477447msgstr ""
    74487448
    7449 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:861
     7449#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:864
    74507450msgid "Select primitives for selected relation members"
    74517451msgstr ""
    74527452
    7453 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:881
     7453#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
    74547454msgid "Sort the relation members"
    74557455msgstr ""
    74567456
    7457 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:883
     7457#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:886
    74587458msgid "Sort"
    74597459msgstr ""
    74607460
    7461 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:884
     7461#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:887
    74627462msgid "Relation Editor: Sort"
    74637463msgstr ""
    74647464
    7465 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:904
     7465#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
    74667466msgid "Reverse the order of the relation members"
    74677467msgstr ""
    74687468
    7469 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:906
     7469#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:909
    74707470msgid "Reverse"
    74717471msgstr ""
    74727472
    7473 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:907
     7473#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:910
    74747474msgid "Relation Editor: Reverse"
    74757475msgstr ""
    74767476
    7477 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:927
     7477#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
    74787478msgid "Move the currently selected members up"
    74797479msgstr "حرّك الأعضاء المختارة حالياً إلى الأعلى"
    74807480
    74817481#. putValue(NAME, tr("Move Up"));
    7482 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:930
     7482#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:933
    74837483msgid "Relation Editor: Move Up"
    74847484msgstr ""
    74857485
    7486 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:946
     7486#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
    74877487msgid "Move the currently selected members down"
    74887488msgstr "حرّك الأعضاء المختارة حالياً إلى الأسفل"
    74897489
    74907490#. putValue(NAME, tr("Move Down"));
    7491 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:949
     7491#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:952
    74927492msgid "Relation Editor: Move Down"
    74937493msgstr ""
    74947494
    7495 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:965
     7495#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
    74967496msgid "Remove the currently selected members from this relation"
    74977497msgstr ""
    74987498
    74997499#. putValue(NAME, tr("Remove"));
    7500 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:968
     7500#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:971
    75017501msgid "Relation Editor: Remove"
    75027502msgstr ""
    75037503
    7504 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:984
     7504#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:987
    75057505msgid "Delete the currently edited relation"
    75067506msgstr ""
    75077507
    7508 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1073
     7508#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1076
    75097509msgid "Yes, create a conflict and close"
    75107510msgstr ""
    75117511
    7512 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1075
     7512#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1078
    75137513msgid "Click to create a conflict and close this relation editor"
    75147514msgstr ""
    75157515
    7516 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1079
     7516#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1082
    75177517msgid "No, continue editing"
    75187518msgstr ""
    75197519
    7520 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1081
     7520#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1084
    75217521msgid "Click to return to the relation editor and to resume relation editing"
    75227522msgstr ""
    75237523
    7524 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1088
     7524#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1091
    75257525msgid ""
    75267526"<html>This relation has been changed outside of the editor.<br>You cannot "
     
    75297529msgstr ""
    75307530
    7531 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1105
     7531#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1108
    75327532#, java-format
    75337533msgid ""
     
    75367536msgstr ""
    75377537
    7538 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1119
     7538#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1122
    75397539msgid "Apply the current updates"
    75407540msgstr ""
    75417541
    7542 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1152
     7542#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1155
    75437543msgid "Apply the updates and close the dialog"
    75447544msgstr ""
    75457545
    7546 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1186
     7546#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1189
    75477547msgid "Cancel the updates and close the dialog"
    75487548msgstr ""
    75497549
    7550 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1203
     7550#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1206
    75517551msgid "Add an empty tag"
    75527552msgstr ""
    75537553
    7554 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1216
     7554#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
    75557555msgid "Download all incomplete members"
    75567556msgstr ""
    75577557
    7558 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1218
    7559 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1253
     7558#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1221
     7559#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1256
    75607560msgid "Download Members"
    75617561msgstr "نزّل الأعضاء"
    75627562
    7563 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1219
     7563#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1222
     7564#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1257
     7565msgid "Relation Editor: Download Members"
     7566msgstr ""
     7567
    75647568#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1254
    7565 msgid "Relation Editor: Download Members"
    7566 msgstr ""
    7567 
    7568 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1251
    75697569msgid "Download selected incomplete members"
    75707570msgstr ""
    75717571
    7572 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1290
     7572#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1293
    75737573msgid "Sets a role for the selected members"
    75747574msgstr ""
    75757575
    7576 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1292
     7576#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1295
    75777577msgid "Apply Role"
    75787578msgstr ""
    75797579
    7580 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1306
     7580#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
    75817581#, java-format
    75827582msgid "You are setting an empty role on {0} primitive."
     
    75857585msgstr[1] ""
    75867586
    7587 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1309
     7587#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1312
    75887588msgid "This is equal to deleting the roles of these primitives."
    75897589msgstr ""
    75907590
    7591 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1311
     7591#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
    75927592msgid "Do you really want to apply the new role?"
    75937593msgstr ""
    75947594
    7595 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1313
     7595#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1316
    75967596msgid "Yes, apply it"
    75977597msgstr ""
    75987598
    7599 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1314
     7599#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1317
    76007600msgid "No, do not apply"
    76017601msgstr ""
    76027602
    7603 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1320
     7603#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1323
    76047604msgid "Confirm empty role"
    76057605msgstr ""
    76067606
    7607 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1388
     7607#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/GenericRelationEditor.java:1391
    76087608msgid "Edit the relation the currently selected relation member refers to"
    76097609msgstr ""
     
    76487648msgstr ""
    76497649
    7650 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:93
     7650#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:92
    76517651msgid "Load parent relations"
    76527652msgstr ""
    76537653
    7654 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:109
     7654#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:108
    76557655msgid "Loading parent relations"
    76567656msgstr ""
    76577657
    7658 #: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:142
     7658#: ../core/src/org/openstreetmap/josm/gui/dialogs/relation/ReferringRelationsBrowser.java:141
    76597659msgid "Edit the currently selected relation"
    76607660msgstr ""
     
    1363713637msgstr ""
    1363813638
    13639 #: ../core/src/org/openstreetmap/josm/tools/I18n.java:348
     13639#: ../core/src/org/openstreetmap/josm/tools/I18n.java:353
    1364013640#, java-format
    1364113641msgid "Unable to find translation for the locale {0}. Reverting to {1}."
Note: See TracChangeset for help on using the changeset viewer.